diff -r 1f58177f6740 -r 9894ed580e4a mmserv/tms/tmsserver/src/tmsserver.cpp --- a/mmserv/tms/tmsserver/src/tmsserver.cpp Thu Aug 12 20:27:32 2010 -0500 +++ b/mmserv/tms/tmsserver/src/tmsserver.cpp Tue Aug 24 03:16:41 2010 -0500 @@ -801,20 +801,27 @@ TRACE_PRN_FN_ENT; TInt vol; - iCurrentRouting = routingpckg().iOutput; - if (iCurrentRouting == TMS_AUDIO_OUTPUT_PUBLIC || - iCurrentRouting == TMS_AUDIO_OUTPUT_LOUDSPEAKER) + TInt status(TMS_RESULT_SUCCESS); + FindActiveCallType(); + + if (iActiveCallType == TMS_CALL_CS) { - iEffectSettings->GetLoudSpkrVolume(vol); - TRACE_PRN_N1(_L("TMSServer::NotifyTarClients loudspkr vol %d"),vol); + + iCurrentRouting = routingpckg().iOutput; + if (iCurrentRouting == TMS_AUDIO_OUTPUT_PUBLIC || + iCurrentRouting == TMS_AUDIO_OUTPUT_LOUDSPEAKER) + { + iEffectSettings->GetLoudSpkrVolume(vol); + TRACE_PRN_N1(_L("TMSServer::NotifyTarClients loudspkr vol %d"),vol); + } + else + { + iEffectSettings->GetEarPieceVolume(vol); + TRACE_PRN_N1(_L("TMSServer::NotifyTarClients ear vol %d"),vol); + } + + status = SendMessageToCallServ(TMS_EFFECT_GLOBAL_VOL_SET, vol); } - else - { - iEffectSettings->GetEarPieceVolume(vol); - TRACE_PRN_N1(_L("TMSServer::NotifyTarClients ear vol %d"),vol); - } - - TInt status = SendMessageToCallServ(TMS_EFFECT_GLOBAL_VOL_SET, vol); iSessionIter.SetToFirst(); TMSServerSession* ss = static_cast (iSessionIter++); @@ -825,8 +832,11 @@ { ss->HandleRoutingChange(routingpckg); } - ss->HandleGlobalEffectChange(TMS_EVENT_EFFECT_VOL_CHANGED, vol, ETrue, - iCurrentRouting); + if (iActiveCallType == TMS_CALL_CS) + { + ss->HandleGlobalEffectChange(TMS_EVENT_EFFECT_VOL_CHANGED, vol, + ETrue, iCurrentRouting); + } ss = static_cast (iSessionIter++); }