radioengine/engine/src/cradioengineimp.cpp
changeset 44 0a3ad94fc71c
parent 38 f8c3d4e6102c
child 47 74b7c6e79031
--- a/radioengine/engine/src/cradioengineimp.cpp	Fri Aug 06 09:29:48 2010 +0300
+++ b/radioengine/engine/src/cradioengineimp.cpp	Mon Aug 23 14:17:50 2010 +0300
@@ -833,7 +833,7 @@
             TInt min = iSettings->EngineSettings().DefaultMinVolumeLevel();
             if ( --volume < min )
                 {
-                volume = min;
+                volume = 0;
                 }
             }
         else if ( aDirection == RadioEngine::ERadioIncVolume )
@@ -868,18 +868,17 @@
 
         if ( aVolume == 0 )
             {
+            iSettings->RadioSetter().SetVolume( aVolume );
+            NotifyRadioEvent( ERadioEventVolume, KErrNone );
             SetVolumeMuted( ETrue );
             }
         else
             {
-            if ( iSettings->EngineSettings().IsVolMuted() )
-                {
-                SetVolumeMuted( EFalse );
-                }
-            else if ( iPlayerUtility->SetVolume( TunerVolumeForUiVolume( aVolume ) ) == KErrNone )
+            if ( iPlayerUtility->SetVolume( TunerVolumeForUiVolume( aVolume ) ) == KErrNone )
                 {
                 iSettings->RadioSetter().SetVolume( aVolume );
                 NotifyRadioEvent( ERadioEventVolume, KErrNone );
+                SetVolumeMuted( EFalse );
                 }
             }
         }
@@ -1132,6 +1131,7 @@
 
         case ERadioCallDeactivated:
             {
+            iPlayerUtility->Play();
             SwitchPower( ETrue );
             }
             break;