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

equal deleted inserted replaced

-:4a629bc82c5e
+:b67dd1fc57c5
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::InitStream
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSCallCSAdpt::InitStreamL(TMSCallType /*callType*/,
+gint TMSCallCSAdpt::InitStream(TMSCallType /*callType*/, TMSStreamType strmType,
-TMSStreamType strmType, gint strmId, TMSFormatType /*frmtType*/,
+gint strmId, TMSFormatType /*frmtType*/, const RMessage2& message)
-const RMessage2& aMessage)
 {
 TRACE_PRN_FN_ENT;
 gint status(TMS_RESULT_SUCCESS);
 switch (strmType)
 {
 case TMS_STREAM_UPLINK:
+{
 if (strmId == iUplinkStreamId)
 {
 // Open message queue handling client-server communication
 if (iMsgQueueUp.Handle() <= 0)
 {
 // Third argument in TMSCallProxy::InitStream
-status = iMsgQueueUp.Open(aMessage, 1);
+status = iMsgQueueUp.Open(message, 1);
 }
 if (status == TMS_RESULT_SUCCESS)
 {
 TRAP(status, iCSUplink = TMSCSUplink::NewL(*this));
 if (status == TMS_RESULT_SUCCESS)
 {
-iDTMFUplinkPlayer =  TMSDTMFProvider::NewL();
+TRAP(status, iDTMFUplinkPlayer =
-iDTMFUplinkPlayer->AddObserverL(*this);
+TMSDTMFProvider::NewL());
-if(!iDTMFNotifier)
+iDTMFUplinkPlayer->AddObserver(*this);
+if (!iDTMFNotifier)
 {
-iDTMFNotifier = TMSDtmfNotifier::NewL();
+TRAP(status, iDTMFNotifier =
+TMSDtmfNotifier::NewL());
 }
 }
 }
 iStrmtype = TMS_STREAM_UPLINK;
 }
 else
 {
 status = TMS_RESULT_DOES_NOT_EXIST;
 }
 break;
+}
 case TMS_STREAM_DOWNLINK:
+{
 if (strmId == iDnlinkStreamId)
 {
 // Open message queue handling client-server communication
 if (iMsgQueueDn.Handle() <= 0)
 {
 // Third argument in TMSCallProxy::InitStream
-status = iMsgQueueDn.Open(aMessage, 1);
+status = iMsgQueueDn.Open(message, 1);
 }
 if (status == TMS_RESULT_SUCCESS)
 {
 TRAP(status, iCSDownlink = TMSCSDownlink::NewL(*this));
 if (status == TMS_RESULT_SUCCESS)
 {
 TRAP(status, iRouting =
 CTelephonyAudioRouting::NewL(*this));
 if (status == TMS_RESULT_SUCCESS)
 {
-iTarSettings = TMSTarSettings::NewL();
+TRAP(status, iTarSettings = TMSTarSettings::NewL());
 }
 if (status == TMS_RESULT_SUCCESS)
 {
 TRAP(status, iDTMFDnlinkPlayer =
 TMSAudioDtmfTonePlayer::NewL(*this,
-KAudioPrefKeyDownDTMF,
+KAudioDTMFString,
-KAudioPriorityDtmfKeyPress));
+KAudioPriorityDTMFString));
-if(!iDTMFNotifier)
+if (!iDTMFNotifier)
 {
-iDTMFNotifier = TMSDtmfNotifier::NewL();
+TRAP(status, iDTMFNotifier =
+TMSDtmfNotifier::NewL());
 }
 }
 }
 }
 iStrmtype = TMS_STREAM_DOWNLINK;
 else
 {
 status = TMS_RESULT_DOES_NOT_EXIST;
 }
 break;
+}
 default:
+{
 status = TMS_RESULT_STREAM_TYPE_NOT_SUPPORTED;
 break;
+}
 }
 TRACE_PRN_IF_ERR(status);
 TRACE_PRN_FN_EXT;
 return status;
 count = numOfItems;
 for (guint i = 0; i < numOfItems; i++)
 {
 tmsoutput = TOTMSOUTPUT(availableOutputs[i]);
 stream.WriteUint32L(tmsoutput);
-//TRACE_PRN_N1(_L("TMS->CallIPAdpt: outputs: [%d]"), availableOutputs[i]);
 }
 CleanupStack::PopAndDestroy(&stream);
 status = TMS_RESULT_SUCCESS;
 }
 {
 iDTMFDnlinkPlayer->PlayDtmfTone(dtmfstring);
 }
 dtmfpckg().iStatus = TMS_RESULT_SUCCESS;
-//TMS_EVENT_DTMF_TONE_STARTED;
+dtmfpckg().iRequest = ECmdDTMFToneDnlPlayStarted;
-dtmfpckg().iRequest = ECmdDTMFOpenDnlinkComplete;
 if (iDTMFNotifier)
 {
 iDTMFNotifier->SetDtmf(dtmfpckg, TRUE);
 }
 }
 {
 status = iDTMFUplinkPlayer->SendDtmfToneString(dtmfstring);
 }
 dtmfpckg().iStatus = TMSUtility::EtelToTMSResult(status);
-//TMS_EVENT_DTMF_TONE_STARTED;
+dtmfpckg().iRequest = ECmdDTMFToneUplPlayStarted;
-dtmfpckg().iRequest = ECmdDTMFOpenUplinkComplete;
 if (iDTMFNotifier)
 {
 iDTMFNotifier->SetDtmf(dtmfpckg, TRUE);
 }
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::ContinueDTMF
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSCallCSAdpt::ContinueDTMF(TBool continuesending)
+gint TMSCallCSAdpt::ContinueDTMF(gboolean continuesending)
 {
 TRACE_PRN_FN_ENT;
 gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
 if (iDTMFUplinkPlayer)
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::DTMFInitCompleted
 //
 // -----------------------------------------------------------------------------
 //
-void TMSCallCSAdpt::DTMFInitCompleted(TInt /*error*/)
+void TMSCallCSAdpt::DTMFInitCompleted(gint /*error*/)
 {
 TRACE_PRN_FN_ENT;
+// TODO: process error
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::DTMFToneFinished
 //
 // -----------------------------------------------------------------------------
 //
-void TMSCallCSAdpt::DTMFToneFinished(TInt error)
+void TMSCallCSAdpt::DTMFToneFinished(gint error)
 {
 TRACE_PRN_FN_ENT;
 TmsMsgBufPckg dtmfpckg;
 if (error == KErrUnderflow || error == KErrInUse)
 {
 error = TMS_RESULT_SUCCESS;
 }
 dtmfpckg().iStatus = TMSUtility::TMSResult(error);
-//TMS_EVENT_DTMF_TONE_STOPPED
 dtmfpckg().iRequest = ECmdDTMFTonePlayFinished;
 if (iDTMFNotifier)
 {
 iDTMFNotifier->SetDtmf(dtmfpckg, TRUE);
 }
 // TMSCallCSAdpt::HandleDTMFEvent
 //
 // -----------------------------------------------------------------------------
 //
 void TMSCallCSAdpt::HandleDTMFEvent(
-const TMSDTMFObserver::TCCPDtmfEvent aEvent, const TInt aError,
+const TMSDTMFObserver::TCCPDtmfEvent aEvent, const gint aError,
 const TChar /*aTone*/)
 {
 TRACE_PRN_FN_ENT;
 TmsMsgBufPckg dtmfpckg;
 dtmfpckg().iStatus = TMSUtility::EtelToTMSResult(aError);
 switch (aEvent)
 {
-/** Unknown */
-case ECCPDtmfUnknown:
+case ECCPDtmfUnknown:               //Unknown
 break;
-/** DTMF sending started manually */
+case ECCPDtmfManualStart:           //DTMF sending started manually
-case ECCPDtmfManualStart:
+case ECCPDtmfSequenceStart:         //Automatic DTMF sending initialized
-/** Automatic DTMF sending initialized */
+dtmfpckg().iRequest = ECmdDTMFToneUplPlayStarted;
-case ECCPDtmfSequenceStart:
+break;
-//TMS_EVENT_DTMF_TONE_STARTED
+case ECCPDtmfManualStop:            //DTMF sending stopped manually
-dtmfpckg().iRequest = ECmdDTMFOpenUplinkComplete;
+case ECCPDtmfManualAbort:           //DTMF sending aborted manually
-break;
+case ECCPDtmfSequenceStop:          //Automatic DTMF sending stopped
+case ECCPDtmfSequenceAbort:         //Automatic DTMF sending aborted
-/** DTMF sending stopped manually */
+case ECCPDtmfStopInDtmfString:      //There was stop mark in DTMF string
-case ECCPDtmfManualStop:
+case ECCPDtmfStringSendingCompleted: //DTMF sending success
-//break;
-/** DTMF sending aborted manually */
-case ECCPDtmfManualAbort:
-//break;
-/** Automatic DTMF sending stopped */
-case ECCPDtmfSequenceStop:
-//break;
-/** Automatic DTMF sending aborted */
-case ECCPDtmfSequenceAbort:
-//break;
-/** There was stop mark in DTMF string */
-case ECCPDtmfStopInDtmfString:
-//break;
-/** DTMF sending completed succesfully */
-case ECCPDtmfStringSendingCompleted:
-//TMS_EVENT_DTMF_TONE_STOPPED
 dtmfpckg().iRequest = ECmdDTMFTonePlayFinished;
 break;
 default:
 break;
 }
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::DownlinkInitCompleted
 //
 // -----------------------------------------------------------------------------
 //
-void TMSCallCSAdpt::DownlinkInitCompleted(TInt status)
+void TMSCallCSAdpt::DownlinkInitCompleted(gint status)
 {
 TRACE_PRN_FN_ENT;
 NotifyClient(iDnlinkStreamId, ECmdDownlinkInitComplete, status, 0);
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::UplinkInitCompleted
 //
 // -----------------------------------------------------------------------------
 //
-void TMSCallCSAdpt::UplinkInitCompleted(TInt status)
+void TMSCallCSAdpt::UplinkInitCompleted(gint status)
 {
 TRACE_PRN_FN_ENT;
 NotifyClient(iUplinkStreamId, ECmdUplinkInitComplete, status, 0);
 TRACE_PRN_FN_EXT;
 }
 pckg().iOutput = TOTMSOUTPUT(aTelephonyAudioRouting.Output());
 if (iTarSettings)
 {
 iTarSettings->SetTar(pckg, ETrue);
 }
-//TRACE_PRN_IF_ERR(aError);
 TRACE_PRN_FN_EXT;
 }
 // -----------------------------------------------------------------------------
 // TMSCallCSAdpt::NotifyClient
 //
 // -----------------------------------------------------------------------------
 //
-void TMSCallCSAdpt::NotifyClient(const gint strmId, const gint aCommand,
+void TMSCallCSAdpt::NotifyClient(const gint strmId, const gint command,
-const gint aStatus, const gint64 /*aInt64*/)
+const gint status, const gint64 /*int64*/)
 {
-iMsgBuffer.iRequest = aCommand;
+iMsgBuffer.iRequest = command;
-iMsgBuffer.iStatus = aStatus;
+iMsgBuffer.iStatus = status;
 if (strmId == iUplinkStreamId)
 {
 iMsgQueueUp.Send(iMsgBuffer);
 }

changeset 20	b67dd1fc57c5
parent 19	4a629bc82c5e
child 21	2ed61feeead6