--- a/mmserv/tms/tmsserver/src/tmsglobaleffectssettings.cpp	Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/tms/tmsserver/src/tmsglobaleffectssettings.cpp	Wed Sep 01 12:23:00 2010 +0100
@@ -18,7 +18,6 @@
 // INCLUDE FILES
 #include "tmsglobaleffectssettings.h"
 #include "tmsclientserver.h"
-#include "tmsutility.h"
 
 using namespace TMS;
 
@@ -27,7 +26,7 @@
 const TInt KDefaultMaxVolume = 10;
 const TInt KDefaultGain = 1;
 
-#ifndef __WINSCW__
+#ifndef __WINS__
 const TInt KDefaultMaxGain = 1;
 #else
 const TInt KDefaultMaxGain = 64;
@@ -60,17 +59,13 @@
 //
 void TMSGlobalEffectsSettings::ConstructL()
     {
-    TRACE_PRN_FN_ENT;
     // Create repository instance
     iRepository = CRepository::NewL(KCRUidTmseffects);
     if (iRepository)
         {
         iRepository->Get(KTmsLoudSpkrVolume, iLoudSpkrVolume);
         iRepository->Get(KTmsEarPieceVolume, iEarVolume);
-        TRACE_PRN_N1(_L("loud spkr vol %d"),iLoudSpkrVolume);
-        TRACE_PRN_N1(_L("ear piece vol %d"),iEarVolume);
         }
-    TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
@@ -99,27 +94,15 @@
 //
 void TMSGlobalEffectsSettings::SetLoudSpkrVolume(TInt aVolume)
     {
-    TRACE_PRN_FN_ENT;
     TInt status(KErrNone);
     if (iRepository)
         {
-        if (aVolume > 0)
-            {
-            status = iRepository->Set(KTmsLoudSpkrVolume, aVolume);
-            TRACE_PRN_N2(_L("status %d loud spkr vol %d"),status,aVolume);
-            }
-        else
-            {
-            status = iRepository->Set(KTmsLoudSpkrVolume, KDefaultVolume);
-            TRACE_PRN_N(_L("loud spkr level 0 store default"));
-            }
+        status = iRepository->Set(KTmsLoudSpkrVolume, aVolume);
         if (status == KErrNone)
             {
             iLoudSpkrVolume = aVolume;
-            TRACE_PRN_N1(_L("cached loud spkr vol %d"),iLoudSpkrVolume);
             }
         }
-    TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
@@ -128,27 +111,15 @@
 //
 void TMSGlobalEffectsSettings::SetEarPieceVolume(TInt aVolume)
     {
-    TRACE_PRN_FN_ENT;
     TInt status(KErrNone);
     if (iRepository)
         {
-        if (aVolume > 0)
-            {
-            status = iRepository->Set(KTmsEarPieceVolume, aVolume);
-            TRACE_PRN_N2(_L("status %d ear vol %d"),status,aVolume);
-            }
-        else
-            {
-            status = iRepository->Set(KTmsEarPieceVolume, KDefaultVolume);
-            TRACE_PRN_N(_L("ear piece vol level 0 store default"));
-            }
+        status = iRepository->Set(KTmsEarPieceVolume, aVolume);
         if (status == KErrNone)
             {
             iEarVolume = aVolume;
-            TRACE_PRN_N1(_L("cached ear piece vol %d"),iEarVolume);
             }
         }
-    TRACE_PRN_FN_EXT;
     }
 
 // -----------------------------------------------------------------------------
@@ -158,7 +129,6 @@
 void TMSGlobalEffectsSettings::GetLoudSpkrVolume(TInt& aVolume)
     {
     aVolume = iLoudSpkrVolume;
-    TRACE_PRN_N1(_L("TMSGlobalEffectsSettings GetLoudSpkrVolume %d"),aVolume);
     }
 
 // -----------------------------------------------------------------------------
@@ -168,7 +138,6 @@
 void TMSGlobalEffectsSettings::GetEarPieceVolume(TInt& aVolume)
     {
     aVolume = iEarVolume;
-    TRACE_PRN_N1(_L("TMSGlobalEffectsSettings GetEarPieceVolume  %d"),aVolume);
     }
 
 // -----------------------------------------------------------------------------
@@ -207,21 +176,4 @@
     return iMaxGain;
     }
 
-// -----------------------------------------------------------------------------
-// TMSGlobalEffectsSettings::ResetDefaultVolume
-// -----------------------------------------------------------------------------
-//
-void TMSGlobalEffectsSettings::ResetDefaultVolume()
-    {
-    if (iLoudSpkrVolume == 0)
-        {
-        iRepository->Get(KTmsLoudSpkrVolume, iLoudSpkrVolume);
-        TRACE_PRN_N1(_L("Needed to reset default loudspkr vol %d"),iLoudSpkrVolume);
-        }
-    if (iEarVolume == 0)
-        {
-        iRepository->Get(KTmsEarPieceVolume, iEarVolume);
-        TRACE_PRN_N1(_L("Needed to reset default ear vol %d"),iEarVolume);
-        }
-    }
-
+//  End of File