--- a/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp Fri Sep 03 13:48:38 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp Fri Sep 17 16:39:45 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 )
{
--- a/vtengines/videoteleng/Src/Commands/CVtEngCommandHandler.cpp Fri Sep 03 13:48:38 2010 +0300
+++ b/vtengines/videoteleng/Src/Commands/CVtEngCommandHandler.cpp Fri Sep 17 16:39:45 2010 +0300
@@ -390,7 +390,7 @@
case KVtEngSetAudioRouting:
case KVtEngMuteOutgoingAudio:
case KVtEngUnmuteOutgoingAudio:
- case KVtEngSetAudioVolume:
+ //case KVtEngSetAudioVolume:
case KVtEngHandleLayoutChange:
case KVtEngUnfreeze:
--- a/vtuis/lcvtplugin/src/base/clcvtsession.cpp Fri Sep 03 13:48:38 2010 +0300
+++ b/vtuis/lcvtplugin/src/base/clcvtsession.cpp Fri Sep 17 16:39:45 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));