# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286140761 -10800
# Node ID a1340495b0e15119af5bc81bfc9f107a704e34cf
# Parent  7510ce99d5ea0f2976e5b16600593328883ad65e
Revision: 201037
Kit: 201039

diff -r 7510ce99d5ea -r a1340495b0e1 vtengines/videoteleng/Src/Base/CVtEngSettings.cpp
--- a/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Fri Sep 17 08:30:07 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Mon Oct 04 00:19:21 2010 +0300
@@ -69,6 +69,7 @@
 
     // Ear volume CR listener.
     iCRProxy = &CVtEngUtility::CRProxy();
+#if 0
     CreateDataObserverL( this, KCRUidInCallVolume, KTelIncallEarVolume, 
         CCenRepNotifyHandler::EIntKey );   
     
@@ -76,7 +77,7 @@
     CreateDataObserverL( 
         this, KCRUidInCallVolume, KTelIncallLoudspeakerVolume,
         CCenRepNotifyHandler::EIntKey );
-    
+#endif    
     // Call duration listener.
     CreateDataObserverL( this, KCRUidLogs, KLogsShowCallDuration, 
         CCenRepNotifyHandler::EIntKey );
@@ -273,7 +274,7 @@
     const TBool aHandsfree,
     const TBool aInternal ) const
     {
-    __VTPRINTEXIT( "Settings.GetVolume" )
+    __VTPRINTENTER( "Settings.GetVolume" )
     TInt res( KErrNone );
     if ( aInternal )
         {
diff -r 7510ce99d5ea -r a1340495b0e1 vtengines/videoteleng/Src/Commands/CVtEngCommandHandler.cpp
--- a/vtengines/videoteleng/Src/Commands/CVtEngCommandHandler.cpp	Fri Sep 17 08:30:07 2010 +0300
+++ b/vtengines/videoteleng/Src/Commands/CVtEngCommandHandler.cpp	Mon Oct 04 00:19:21 2010 +0300
@@ -390,7 +390,7 @@
         case KVtEngSetAudioRouting:
         case KVtEngMuteOutgoingAudio:
         case KVtEngUnmuteOutgoingAudio:
-        case KVtEngSetAudioVolume:
+        //case KVtEngSetAudioVolume:
         case KVtEngHandleLayoutChange:
         case KVtEngUnfreeze:
 
diff -r 7510ce99d5ea -r a1340495b0e1 vtuis/lcvtplugin/src/base/clcvtsession.cpp
--- a/vtuis/lcvtplugin/src/base/clcvtsession.cpp	Fri Sep 17 08:30:07 2010 +0300
+++ b/vtuis/lcvtplugin/src/base/clcvtsession.cpp	Mon Oct 04 00:19:21 2010 +0300
@@ -649,19 +649,24 @@
     {   
     __VTPRINTENTER( "CLcVtSession.SetLcVolumeL" )
     MVtEngAudio& audio = iModel->Audio();
-    const TInt HandsetVolume( audio.OutputVolume(ETrue) );    
-    const TInt HandsfreeVolume( audio.OutputVolume(EFalse) );    
+    const TInt HandsetVolume( audio.OutputVolume( ETrue ) );    
+    const TInt HandsfreeVolume( audio.OutputVolume( EFalse ) );    
+    
     MVtEngAudio::TVtEngOutputVolume volume;
     volume.iHandsetVolume = HandsetVolume;
     volume.iHandsfreeVolume = HandsfreeVolume;
 
     MVtEngAudio::TAudioRoutingState audioRouting;
     User::LeaveIfError( audio.GetRoutingState( audioRouting ) );    
-    if(audioRouting == MVtEngAudio::EAudioHandset)
+    if ( audioRouting == MVtEngAudio::EAudioHandset )
+        {
         volume.iHandsetVolume = aValue;
+        }
     else
+        {
         volume.iHandsfreeVolume = aValue;    
-    
+        }
+
     ExecuteCmdL( KVtEngSetAudioVolume, volume );
     __VTPRINTEXIT( "CLcVtSession.SetLcVolumeL" )
     }
@@ -2149,10 +2154,15 @@
             iSession.iState->HandleVtEventL( aEvent )
             == TLcVtStateBase::EEventHandled )
         {
-        __VTPRINTEXITR( "CEventObserver.HandleVtEventL %d", 0 )
+        __VTPRINTEXITR( "CEventObserver.HandleVtEventL %d skipped", aEvent )
         return;
         }
-    
+
+    if ( aEvent == KVtEngAudioOutputVolumeChanged )
+        {
+        __VTPRINTEXITR( "CEventObserver.HandleVtEventL %d skipped", aEvent )
+        return;
+        }
     iSession.iLcVtStates->Update();
     
     iSession.iObserver->Updated(*(iSession.iLocalVideoPlayer));