FCL/sf/mw/mmmw: comparison mmserv/tms/tmsproxy/src/tmsproxy.cpp

equal deleted inserted replaced

-:a493a607b5bf
+:eabc8c503852
 ResetObjectLists();
 if (iMsgQHandler)
 {
 iMsgQHandler->Cancel();
+iMsgQHandler->RemoveObserver(*this);
 }
 delete iMsgQHandler;
 if (iMsgQueue.Handle() > 0)
 {
 iMsgQueue.Close();
 {
 status = TMS_RESULT_INVALID_ARGUMENT;
 }
 else
 {
-status = RSessionBase::SendReceive(ETMSSetOutput, TIpcArgs(output));
+status = SendReceive(ETMSSetOutput, TIpcArgs(output));
 }
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::GetOutput(TMSAudioOutput& output)
+{
+TRACE_PRN_FN_ENT;
+TPckgBuf<gint> pckg;
+TIpcArgs args(&pckg);
+gint status = SendReceive(ETMSGetOutput, args);
+if (status == TMS_RESULT_SUCCESS)
+{
+output = pckg();
+}
+TRACE_PRN_FN_EXT;
+return TMSRESULT(status);
+}
+EXPORT_C gint TMSProxy::GetPreviousOutput(TMSAudioOutput& output)
 {
 TRACE_PRN_FN_ENT;
 TPckgBuf<guint> pckg;
 TIpcArgs args(&pckg);
-gint status = RSessionBase::SendReceive(ETMSGetOutput, args);
+gint status = SendReceive(ETMSGetPreviousOutput, args);
-if (status == TMS_RESULT_SUCCESS)
-{
-output = pckg();
-}
-TRACE_PRN_FN_EXT;
-return TMSRESULT(status);
-}
-EXPORT_C gint TMSProxy::GetPreviousOutput(TMSAudioOutput& output)
-{
-TRACE_PRN_FN_ENT;
-TPckgBuf<guint> pckg;
-TIpcArgs args(&pckg);
-gint status = RSessionBase::SendReceive(ETMSGetPreviousOutput, args);
 if (status == TMS_RESULT_SUCCESS)
 {
 output = pckg();
 }
 TRACE_PRN_FN_EXT;
 EXPORT_C gint TMSProxy::GetLevel(guint& level)
 {
 TRACE_PRN_FN_ENT;
 TPckgBuf<guint> pckg;
 TIpcArgs args(&pckg);
-gint status = RSessionBase::SendReceive(ETMSGetGlobalVol, args);
+gint status = SendReceive(ETMSGetGlobalVol, args);
 if (status == TMS_RESULT_SUCCESS)
 {
 level = pckg();
 }
 TRACE_PRN_FN_EXT;
 EXPORT_C gint TMSProxy::GetMaxLevel(guint& level)
 {
 TRACE_PRN_FN_ENT;
 TPckgBuf<guint> pckg;
 TIpcArgs args(&pckg);
-gint status = RSessionBase::SendReceive(ETMSGetMaxGlobalVol, args);
+gint status = SendReceive(ETMSGetMaxGlobalVol, args);
 if (status == TMS_RESULT_SUCCESS)
 {
 level = pckg();
 }
 TRACE_PRN_FN_EXT;
 }
 EXPORT_C gint TMSProxy::SetLevel(guint level)
 {
 TRACE_PRN_FN_ENT;
-gint status = RSessionBase::SendReceive(ETMSSetGlobalVol, TIpcArgs(level));
+gint status = SendReceive(ETMSSetGlobalVol, TIpcArgs(level));
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::GetGain(guint& level)
 {
 TRACE_PRN_FN_ENT;
 TPckgBuf<guint> pckg;
 TIpcArgs args(&pckg);
-gint status = RSessionBase::SendReceive(ETMSGetGlobalGain, args);
+gint status = SendReceive(ETMSGetGlobalGain, args);
 if (status == TMS_RESULT_SUCCESS)
 {
 level = pckg();
 }
 TRACE_PRN_FN_EXT;
 EXPORT_C gint TMSProxy::GetMaxGain(guint& level)
 {
 TRACE_PRN_FN_ENT;
 TPckgBuf<guint> pckg;
 TIpcArgs args(&pckg);
-gint status = RSessionBase::SendReceive(ETMSGetMaxGlobalGain, args);
+gint status = SendReceive(ETMSGetMaxGlobalGain, args);
 if (status == TMS_RESULT_SUCCESS)
 {
 level = pckg();
 }
 TRACE_PRN_FN_EXT;
 }
 EXPORT_C gint TMSProxy::SetGain(guint level)
 {
 TRACE_PRN_FN_ENT;
-gint status = RSessionBase::SendReceive(ETMSSetGlobalGain,
+gint status = SendReceive(ETMSSetGlobalGain,
 TIpcArgs(level));
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 switch (type)
 {
 case TMS_RINGTONE_DEFAULT:
 {
-status = RSessionBase::SendReceive(ETMSRingToneInitDefault, args);
+status = SendReceive(ETMSRingToneInitDefault, args);
 break;
 }
 case TMS_RINGTONE_FILE:
 {
 if (str)
 {
 TPtr p = buf->Des();
 p.Copy((TUint16*) str->str, unilen);
 TIpcArgs args;
 args.Set(0, &p);
-status = RSessionBase::SendReceive(ETMSRingToneInitFile,
+status = SendReceive(ETMSRingToneInitFile, args);
-args);
 }
 delete buf;
 buf = NULL;
 }
 break;
 }
 case TMS_RINGTONE_BEEP_ONCE:
 {
-status = RSessionBase::SendReceive(ETMSRingToneInitBeepOnce);
+status = SendReceive(ETMSRingToneInitBeepOnce);
 break;
 }
 case TMS_RINGTONE_SILENT:
 {
-status = RSessionBase::SendReceive(ETMSRingToneInitSilent);
+status = SendReceive(ETMSRingToneInitSilent);
 break;
 }
 case TMS_RINGTONE_UNSECURE_VOIP:
 {
-status = RSessionBase::SendReceive(ETMSRingToneInitUnsecureVoIP);
+status = SendReceive(ETMSRingToneInitUnsecureVoIP);
 break;
 }
 case TMS_RINGTONE_SEQUENCE:
 {
 if (str)
 {
 TPtr8 p = buf->Des();
 p.Copy((TUint8*) str->str, len);
 TIpcArgs args;
 args.Set(0, &p);
-status = RSessionBase::SendReceive(
+status = SendReceive(ETMSRingToneInitSequence, args);
-ETMSRingToneInitSequence, args);
 }
 delete buf;
 buf = NULL;
 }
 break;
 }
 EXPORT_C gint TMSProxy::DeinitRT()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSRingToneDeinit);
+status = SendReceive(ETMSRingToneDeinit);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::PlayRT()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSRingTonePlay);
+status = SendReceive(ETMSRingTonePlay);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::StopRT()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSRingToneStop);
+status = SendReceive(ETMSRingToneStop);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::PauseRT()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSRingTonePause);
+status = SendReceive(ETMSRingTonePause);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::MuteRT()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSRingToneMute);
+status = SendReceive(ETMSRingToneMute);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::InitDTMFPlayer(TMSStreamType streamtype)
 {
 gint status(TMS_RESULT_SUCCESS);
 TIpcArgs args;
 args.Set(0, streamtype);
-status = RSessionBase::SendReceive(ETMSInitDTMF, args);
+status = SendReceive(ETMSInitDTMF, args);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::StartDTMF(TMSStreamType streamtype, GString* tone)
 {
 TRACE_PRN_N(p1);
 TIpcArgs args;
 args.Set(0, streamtype);
 args.Set(1, &p1);
-status = RSessionBase::SendReceive(ETMSStartDTMF, args);
+status = SendReceive(ETMSStartDTMF, args);
 }
 delete buf;
 buf = NULL;
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 EXPORT_C gint TMSProxy::StopDTMF(TMSStreamType streamtype)
 {
 TRACE_PRN_FN_ENT;
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSStopDTMF, TIpcArgs(streamtype));
+status = SendReceive(ETMSStopDTMF, TIpcArgs(streamtype));
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::ContinueDTMFStringSending(gboolean continuesending)
 {
 TRACE_PRN_FN_ENT;
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSContinueDTMF,
+status = SendReceive(ETMSContinueDTMF, TIpcArgs(continuesending));
-TIpcArgs(continuesending));
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::StartInbandTone(TMSInbandToneType inbandtonetype)
 {
 TRACE_PRN_FN_ENT;
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSStartInbandTone,
+status = SendReceive(ETMSStartInbandTone, TIpcArgs(inbandtonetype));
-TIpcArgs(inbandtonetype));
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::StopInbandTone()
 {
 TRACE_PRN_FN_ENT;
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSStopInbandTone);
+status = SendReceive(ETMSStopInbandTone);
 TRACE_PRN_FN_EXT;
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::StartGlobalEffectNotifier()
 {
 gint status(TMS_RESULT_SUCCESS);
-RSessionBase::SendReceive(ETMSStartGlobalEffectNotifier); //CenRepHandler
+SendReceive(ETMSStartGlobalEffectNotifier); //CenRepHandler
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::CancelGlobalEffectNotifier()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSCancelGlobalEffectNotifier);
+status = SendReceive(ETMSCancelGlobalEffectNotifier);
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::StartRoutingNotifier()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSStartRoutingNotifier); //TAR
+status = SendReceive(ETMSStartRoutingNotifier); //TAR
 return TMSRESULT(status);
 }
 EXPORT_C gint TMSProxy::CancelRoutingNotifier()
 {
 gint status(TMS_RESULT_SUCCESS);
-status = RSessionBase::SendReceive(ETMSCancelRoutingNotifier);
+status = SendReceive(ETMSCancelRoutingNotifier);
 return TMSRESULT(status);
 }
 // ---------------------------------------------------------------------------
 // TMSProxy::SetMsgQueueNotifier
 break;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::TermSrv
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void TMSProxy::TermSrv()
+{
+SendReceive(ETMSTermSrv);
+}
+// ---------------------------------------------------------------------------
+// TMSProxy::PopulateArrayL
+// ---------------------------------------------------------------------------
+//
 void TMSProxy::PopulateArrayL(TMSClientServerRequest aRequest,
 RArray<TUint32>& aDecoders, gint aCount)
 {
 HBufC8* buf = HBufC8::NewLC(aCount * sizeof(TUint32));
 TPtr8 ptr = buf->Des();
 CleanupStack::PopAndDestroy(&stream);
 }
 CleanupStack::PopAndDestroy(buf);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::AddGlobalEffectObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::AddGlobalEffectObserver(TMSEffectObserver& obsrv,
 TMSEffect& parent, gint /*clientid*/)
 {
 gint status = iEffectsObsrvrList.Find(&obsrv);
 if (status == KErrNotFound)
 status = TMS_RESULT_ALREADY_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::RemoveGlobalEffectObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::RemoveGlobalEffectObserver(TMSEffectObserver& obsrv)
 {
 gint status(TMS_RESULT_SUCCESS);
 gint index = iEffectsObsrvrList.Find(&obsrv);
 if (index >= 0)
 status = TMS_RESULT_DOES_NOT_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::AddRoutingObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::AddRoutingObserver(TMSGlobalRoutingObserver& obsrv,
 TMSGlobalRouting& parent, gint /*clientid*/)
 {
 gint status = iRoutingObsrvrList.Find(&obsrv);
 if (status == KErrNotFound)
 status = TMS_RESULT_ALREADY_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::RemoveRoutingObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::RemoveRoutingObserver(TMSGlobalRoutingObserver& obsrv)
 {
 gint status(TMS_RESULT_SUCCESS);
 gint index = iRoutingObsrvrList.Find(&obsrv);
 if (index >= 0)
 status = TMS_RESULT_DOES_NOT_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::AddRingToneObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::AddRingToneObserver(TMSRingToneObserver& obsrv,
 TMSRingTone& parent, gint /*clientid*/)
 {
 gint status = iRingToneObsrvrList.Find(&obsrv);
 if (status == KErrNotFound)
 status = TMS_RESULT_ALREADY_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::RemoveRingToneObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::RemoveRingToneObserver(TMSRingToneObserver& obsrv)
 {
 gint status(TMS_RESULT_SUCCESS);
 gint index = iRingToneObsrvrList.Find(&obsrv);
 if (index >= 0)
 status = TMS_RESULT_DOES_NOT_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::AddDTMFObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::AddDTMFObserver(TMSDTMFObserver& obsrv, TMSDTMF& parent,
 gint /*clientid*/)
 {
 // Add to list if observer is not already added
 gint status = iDTMFObsrvrList.Find(&obsrv);
 status = TMS_RESULT_ALREADY_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::RemoveDTMFObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::RemoveDTMFObserver(TMSDTMFObserver& obsrv)
 {
 gint status(TMS_RESULT_SUCCESS);
 gint index = iDTMFObsrvrList.Find(&obsrv);
 if (index >= 0)
 status = TMS_RESULT_DOES_NOT_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::AddInbandToneObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::AddInbandToneObserver(TMSInbandToneObserver& obsrv,
 TMSInbandTone& parent, gint /*clientid*/)
 {
 // Add to list if observer is not already added
 gint status = iInbandToneObsrvrList.Find(&obsrv);
 status = TMS_RESULT_ALREADY_EXIST;
 }
 return TMSRESULT(status);
 }
+// ---------------------------------------------------------------------------
+// TMSProxy::RemoveInbandToneObserver
+// ---------------------------------------------------------------------------
+//
 gint TMSProxy::RemoveInbandToneObserver(TMSInbandToneObserver& obsrv)
 {
 gint status(TMS_RESULT_SUCCESS);
 gint index = iInbandToneObsrvrList.Find(&obsrv);
 if (index >= 0)
 TRAP(status, ReceiveMsgQHandlerEventsL());
 if (status == TMS_RESULT_SUCCESS)
 {
 TIpcArgs args;
 args.Set(0, iMsgQueue);
-status = RSessionBase::SendReceive(ETMSSetMsgQueueHandle,
+status = SendReceive(ETMSSetMsgQueueHandle, args);
-args);
 }
 }
 }
 return TMSRESULT(status);
 }

changeset 53	eabc8c503852
parent 36	73253677b50a