--- a/mmserv/tms/tmsserver/src/tmsserver.cpp Tue Jul 06 14:50:35 2010 +0300
+++ b/mmserv/tms/tmsserver/src/tmsserver.cpp Wed Aug 18 10:17:22 2010 +0300
@@ -30,7 +30,9 @@
#include "tmsglobaleffectssettings.h"
#include "tmstareventhandler.h"
#include "tmscenrepaudiohandler.h"
-#include "tmsdtmfeventhandler.h"
+#include "tmsdtmftoneplayer.h"
+#include "tmsdtmfprovider.h"
+#include "tmspubsublistener.h"
#include "tmsrtparam.h"
#include "tmsserver.h"
@@ -83,10 +85,12 @@
delete iEffectSettings;
delete iTarHandler;
delete iAudioCenRepHandler;
- delete iDTMFHandler;
DeinitRingTonePlayer();
delete iTMSRtPlayer;
-
+ delete iDTMFUplinkPlayer;
+ delete iDTMFUplinkPlayerEtel;
+ delete iDTMFDnlinkPlayer;
+ delete iSyncVol;
TRACE_PRN_FN_EXT;
}
@@ -134,8 +138,12 @@
iEffectSettings = TMSGlobalEffectsSettings::NewL();
iTarHandler = NULL;
iAudioCenRepHandler = NULL;
- iDTMFHandler = NULL;
iCurrentRouting = TMS_AUDIO_OUTPUT_PRIVATE;
+ iDTMFDnlinkPlayer = NULL;
+ iDTMFUplinkPlayer = NULL;
+ iDTMFUplinkPlayerEtel = NULL;
+ iActiveCallType = -1;
+ iSyncVol = TMSPubSubListener::NewL(KTMSPropertyCategory,ESyncVolume, this);
//TODO: EUnit fails to initialize ProfileEngine in RT in eshell mode
TRAP_IGNORE(InitRingTonePlayerL());
@@ -190,46 +198,6 @@
}
// -----------------------------------------------------------------------------
-// TMSServer::SetDnLinkSession
-//
-// -----------------------------------------------------------------------------
-//
-void TMSServer::SetDnLinkSession(const TBool aSession)
- {
- iDnlinkSession = aSession;
- }
-
-// -----------------------------------------------------------------------------
-// TMSServer::SetUpLinkSession
-//
-// -----------------------------------------------------------------------------
-//
-void TMSServer::SetUpLinkSession(const TBool aSession)
- {
- iUplinkSession = aSession;
- }
-
-// -----------------------------------------------------------------------------
-// TMSServer::HasDnLinkSession
-//
-// -----------------------------------------------------------------------------
-//
-TBool TMSServer::HasDnLinkSession() const
- {
- return iDnlinkSession;
- }
-
-// -----------------------------------------------------------------------------
-// TMSServer::HasUpLinkSession
-//
-// -----------------------------------------------------------------------------
-//
-TBool TMSServer::HasUpLinkSession() const
- {
- return iUplinkSession;
- }
-
-// -----------------------------------------------------------------------------
// TMSServer::GetNewTMSCallSessionHandleL
//
// -----------------------------------------------------------------------------
@@ -272,7 +240,7 @@
TInt status = TMS_RESULT_SUCCESS;
TMSStartAndMonitorTMSCallThread* callServerThread = NULL;
- TRAP(status, callServerThread =TMSStartAndMonitorTMSCallThread::NewL(
+ TRAP(status, callServerThread = TMSStartAndMonitorTMSCallThread::NewL(
const_cast<TMSServer*>(this)));
if (status != TMS_RESULT_SUCCESS)
{
@@ -297,11 +265,13 @@
case TMS_AUDIO_OUTPUT_LOUDSPEAKER:
{
iEffectSettings->GetLoudSpkrVolume(volume);
+ TRACE_PRN_N1(_L("loudspk vol %d"),volume);
}
break;
default:
{
iEffectSettings->GetEarPieceVolume(volume);
+ TRACE_PRN_N1(_L("ear vol %d"),volume);
}
break;
}
@@ -389,40 +359,6 @@
}
// -----------------------------------------------------------------------------
-// TMSServer::StartDTMFNotifierL
-//
-// -----------------------------------------------------------------------------
-//
-void TMSServer::StartDTMFNotifierL()
- {
- TRACE_PRN_FN_ENT;
-
- if (!iDTMFHandler)
- {
- iDTMFHandlerCount = 0;
- iDTMFHandler = TMSDtmfEventHandler::NewL(
- (const_cast<TMSServer*> (this)));
- }
- iDTMFHandlerCount++;
-
- TRACE_PRN_FN_EXT;
- }
-
-// -----------------------------------------------------------------------------
-// TMSServer::CancelDTMFNotifier
-//
-// -----------------------------------------------------------------------------
-//
-void TMSServer::CancelDTMFNotifier()
- {
- if (--iDTMFHandlerCount <= 0)
- {
- delete iDTMFHandler;
- iDTMFHandler = NULL;
- }
- }
-
-// -----------------------------------------------------------------------------
// TMSServer::SetOutput
//
// -----------------------------------------------------------------------------
@@ -608,9 +544,11 @@
case TMS_AUDIO_OUTPUT_PUBLIC:
case TMS_AUDIO_OUTPUT_LOUDSPEAKER:
iEffectSettings->GetLoudSpkrVolume(volume);
+ TRACE_PRN_N1(_L("TMSServer::GetLevel loudspkr vol %d"),volume);
break;
default:
iEffectSettings->GetEarPieceVolume(volume);
+ TRACE_PRN_N1(_L("TMSServer::GetLevel ear vol %d"),volume);
break;
}
@@ -668,16 +606,12 @@
}
iSessionIter.SetToFirst();
- TMSServerSession* serverSession =
- static_cast<TMSServerSession*> (iSessionIter++);
-
- while (serverSession != NULL)
+ TMSServerSession* ss = static_cast<TMSServerSession*> (iSessionIter++);
+ while (ss != NULL)
{
- serverSession->HandleGlobalEffectChange(
- TMS_EVENT_EFFECT_VOL_CHANGED, level, EFalse,
- iCurrentRouting);
-
- serverSession = static_cast<TMSServerSession*> (iSessionIter++);
+ ss->HandleGlobalEffectChange(TMS_EVENT_EFFECT_VOL_CHANGED, level,
+ EFalse, iCurrentRouting);
+ ss = static_cast<TMSServerSession*> (iSessionIter++);
}
}
@@ -744,15 +678,11 @@
iAudioCenRepHandler->SetMuteState(level);
iEffectSettings->SetGain(level);
iSessionIter.SetToFirst();
-
- TMSServerSession* serverSession =
- static_cast<TMSServerSession*> (iSessionIter++);
-
- while (serverSession != NULL)
+ TMSServerSession* ss = static_cast<TMSServerSession*> (iSessionIter++);
+ while (ss != NULL)
{
- serverSession->HandleGlobalEffectChange(
- TMS_EVENT_EFFECT_GAIN_CHANGED, level);
- serverSession = static_cast<TMSServerSession*> (iSessionIter++);
+ ss->HandleGlobalEffectChange(TMS_EVENT_EFFECT_GAIN_CHANGED, level);
+ ss = static_cast<TMSServerSession*> (iSessionIter++);
}
}
@@ -876,27 +806,28 @@
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);
}
TInt status = SendMessageToCallServ(TMS_EFFECT_GLOBAL_VOL_SET, vol);
iSessionIter.SetToFirst();
- TMSServerSession* serverSession =
- static_cast<TMSServerSession*> (iSessionIter++);
- while (serverSession != NULL)
+ TMSServerSession* ss = static_cast<TMSServerSession*> (iSessionIter++);
+ while (ss != NULL)
{
// Send only if there is a subscriber to TMS routing notifications.
if (iTarHandlerCount > 1)
{
- serverSession->HandleRoutingChange(routingpckg);
+ ss->HandleRoutingChange(routingpckg);
}
- serverSession->HandleGlobalEffectChange(TMS_EVENT_EFFECT_VOL_CHANGED,
- vol, ETrue, iCurrentRouting);
- serverSession = static_cast<TMSServerSession*> (iSessionIter++);
+ ss->HandleGlobalEffectChange(TMS_EVENT_EFFECT_VOL_CHANGED, vol, ETrue,
+ iCurrentRouting);
+ ss = static_cast<TMSServerSession*> (iSessionIter++);
}
TRACE_PRN_FN_EXT;
@@ -904,6 +835,49 @@
}
// -----------------------------------------------------------------------------
+// TMSServer::InitDTMF
+//
+// -----------------------------------------------------------------------------
+//
+TInt TMSServer::InitDTMF(const RMessage2& aMessage)
+ {
+ TRACE_PRN_FN_ENT;
+ TInt status(TMS_RESULT_SUCCESS);
+ TMSStreamType strmtype;
+ strmtype = (TMSStreamType) aMessage.Int0();
+
+ if (strmtype == TMS_STREAM_UPLINK)
+ {
+ if (!iDTMFUplinkPlayerEtel) //CS call
+ {
+ // Uses ETel for uplink
+ TRAP(status, iDTMFUplinkPlayerEtel = TMSDTMFProvider::NewL());
+ if (iDTMFUplinkPlayerEtel && status == TMS_RESULT_SUCCESS)
+ {
+ iDTMFUplinkPlayerEtel->AddObserver(*this);
+ }
+ }
+ if (!iDTMFUplinkPlayer) //IP call
+ {
+ TRAP(status, iDTMFUplinkPlayer = TMSAudioDtmfTonePlayer::NewL(*this,
+ KAudioDTMFString, KAudioPriorityDTMFString));
+ }
+ }
+ else if (strmtype == TMS_STREAM_DOWNLINK)
+ {
+ if (!iDTMFDnlinkPlayer) //CS or IP call
+ {
+ TRAP(status, iDTMFDnlinkPlayer = TMSAudioDtmfTonePlayer::NewL(*this,
+ KAudioDTMFString, KAudioPriorityDTMFString));
+ }
+ }
+
+ aMessage.Complete(status);
+ TRACE_PRN_FN_EXT;
+ return status;
+ }
+
+// -----------------------------------------------------------------------------
// TMSServer::StartDTMF
//
// -----------------------------------------------------------------------------
@@ -915,31 +889,62 @@
TInt status(TMS_RESULT_SUCCESS);
TInt len(0);
TMSStreamType strmtype;
-
strmtype = (TMSStreamType) aMessage.Int0();
len = aMessage.GetDesLength(1);
- HBufC* tone(NULL);
if (len > 0)
{
- delete tone;
- tone = NULL;
- TRAP(status,tone = HBufC::NewL(len));
+ HBufC* tone(NULL);
+ TRAP(status, tone = HBufC::NewL(len));
if (status == TMS_RESULT_SUCCESS)
{
TPtr ptr = tone->Des();
status = aMessage.Read(1, ptr);
TRACE_PRN_N(ptr);
- TIpcArgs args;
- args.Set(0, strmtype);
- args.Set(1, &ptr);
- status = SendMessageToCallServ(TMS_DTMF_START, args);
- delete tone;
- tone = NULL;
+ if (strmtype == TMS_STREAM_UPLINK)
+ {
+#ifdef __WINSCW__
+ // Just to hear DTMF tones in Wins
+ iActiveCallType = TMS_CALL_IP;
+#else
+ FindActiveCallType();
+#endif
+ if (iActiveCallType == TMS_CALL_IP && iDTMFUplinkPlayer)
+ {
+ iDTMFUplinkPlayer->PlayDtmfTone(ptr);
+ status = TMS_RESULT_SUCCESS;
+ }
+ else if (iActiveCallType == TMS_CALL_CS &&
+ iDTMFUplinkPlayerEtel)
+ {
+ status = iDTMFUplinkPlayerEtel->SendDtmfToneString(ptr);
+ }
+ else
+ {
+ status = TMS_RESULT_INVALID_STATE;
+ }
+ NotifyDtmfClients(ECmdDTMFToneUplPlayStarted, status);
+ }
+ else if (strmtype == TMS_STREAM_DOWNLINK)
+ {
+ status = TMS_RESULT_INVALID_STATE;
+ if (iDTMFDnlinkPlayer)
+ {
+ iDTMFDnlinkPlayer->PlayDtmfTone(ptr);
+ status = TMS_RESULT_SUCCESS;
+ }
+ NotifyDtmfClients(ECmdDTMFToneDnlPlayStarted, status);
+ }
+ else
+ {
+ status = TMS_RESULT_STREAM_TYPE_NOT_SUPPORTED;
+ }
}
+ delete tone;
+ tone = NULL;
}
+
aMessage.Complete(status);
-
TRACE_PRN_FN_EXT;
return status;
}
@@ -953,12 +958,35 @@
{
TRACE_PRN_FN_ENT;
- TInt status(TMS_RESULT_SUCCESS);
+ TInt status(TMS_RESULT_INVALID_STATE);
TMSStreamType streamtype;
streamtype = (TMSStreamType) aMessage.Int0();
- status = SendMessageToCallServ(TMS_DTMF_STOP, streamtype);
+
+ if (streamtype == TMS_STREAM_UPLINK)
+ {
+ if (iActiveCallType == TMS_CALL_IP && iDTMFUplinkPlayer)
+ {
+ iDTMFUplinkPlayer->Cancel();
+ status = TMS_RESULT_SUCCESS;
+ }
+ else if (iActiveCallType == TMS_CALL_CS &&
+ iDTMFUplinkPlayerEtel)
+ {
+ status = iDTMFUplinkPlayerEtel->StopDtmfTone();
+ status = TMSUtility::EtelToTMSResult(status);
+ }
+ }
+ else if (streamtype == TMS_STREAM_DOWNLINK)
+ {
+ if (iDTMFDnlinkPlayer)
+ {
+ iDTMFDnlinkPlayer->Cancel();
+ status = TMS_RESULT_SUCCESS;
+ }
+ }
+ iActiveCallType = -1;
+ NotifyDtmfClients(ECmdDTMFTonePlayFinished, status);
aMessage.Complete(status);
-
TRACE_PRN_FN_EXT;
return status;
}
@@ -971,13 +999,14 @@
TInt TMSServer::ContinueSendingDTMF(const RMessage2& aMessage)
{
TRACE_PRN_FN_ENT;
-
- TInt status(TMS_RESULT_SUCCESS);
- TBool continuesending;
- continuesending = (TBool) aMessage.Int0();
- status = SendMessageToCallServ(TMS_DTMF_CONTINUE, continuesending);
+ TInt status(TMS_RESULT_INVALID_STATE);
+ if (iActiveCallType == TMS_CALL_CS && iDTMFUplinkPlayerEtel)
+ {
+ TBool continuesnd = (TBool) aMessage.Int0();
+ status = iDTMFUplinkPlayerEtel->ContinueDtmfStringSending(continuesnd);
+ status = TMSUtility::EtelToTMSResult(status);
+ }
aMessage.Complete(status);
-
TRACE_PRN_FN_EXT;
return status;
}
@@ -987,22 +1016,117 @@
//
// -----------------------------------------------------------------------------
//
-TInt TMSServer::NotifyDtmfClients(TmsMsgBufPckg dtmfpckg)
+TInt TMSServer::NotifyDtmfClients(gint aEventType, gint aError)
+ {
+ TRACE_PRN_FN_ENT;
+ iSessionIter.SetToFirst();
+ TMSServerSession* ss = static_cast<TMSServerSession*> (iSessionIter++);
+ while (ss != NULL)
+ {
+ ss->NotifyClient(aEventType, aError);
+ ss = static_cast<TMSServerSession*> (iSessionIter++);
+ }
+ TRACE_PRN_FN_EXT;
+ return TMS_RESULT_SUCCESS;
+ }
+
+//From DTMFTonePlayerObserver
+// -----------------------------------------------------------------------------
+// TMSServer::DTMFInitCompleted
+//
+// -----------------------------------------------------------------------------
+//
+void TMSServer::DTMFInitCompleted(gint status)
+ {
+ TRACE_PRN_FN_ENT;
+ if (status != TMS_RESULT_SUCCESS)
+ {
+ NotifyDtmfClients(ECmdDTMFTonePlayFinished, status);
+ }
+ TRACE_PRN_FN_EXT;
+ }
+
+// -----------------------------------------------------------------------------
+// TMSServer::DTMFToneFinished
+//
+// -----------------------------------------------------------------------------
+//
+void TMSServer::DTMFToneFinished(gint status)
{
TRACE_PRN_FN_ENT;
+ TRACE_PRN_IF_ERR(status);
- iSessionIter.SetToFirst();
- TMSServerSession* serverSession =
- static_cast<TMSServerSession*> (iSessionIter++);
+ // KErrUnderflow indicates end of DTMF playback.
+ if (status == KErrUnderflow /*|| status == KErrInUse*/)
+ {
+ status = TMS_RESULT_SUCCESS;
+ }
+ NotifyDtmfClients(ECmdDTMFTonePlayFinished, status);
+ TRACE_PRN_FN_EXT;
+ }
- while (serverSession != NULL)
+// -----------------------------------------------------------------------------
+// TMSServer::FindActiveCallType
+//
+// -----------------------------------------------------------------------------
+//
+gint TMSServer::FindActiveCallType()
+ {
+ TInt status(TMS_RESULT_INVALID_STATE);
+ iActiveCallType = -1;
+ TInt i = 0;
+ while (i < iTMSCallServList.Count())
{
- serverSession->NotifyClient(dtmfpckg().iRequest, dtmfpckg().iStatus);
- serverSession = static_cast<TMSServerSession*> (iSessionIter++);
+ TMSStartAndMonitorTMSCallThread* callThread = iTMSCallServList[i];
+ if (callThread)
+ {
+ TmsCallMsgBufPckg pckg;
+ TIpcArgs args(&pckg);
+ status = callThread->iTMSCallProxyLocal.ReceiveFromCallServer(
+ TMS_GET_ACTIVE_CALL_PARAMS, args);
+ if (pckg().iBool || status != TMS_RESULT_SUCCESS)
+ {
+ iActiveCallType = static_cast<TMSCallType> (pckg().iInt);
+ break;
+ }
+ }
+ i++;
+ }
+ return status;
+ }
+
+// -----------------------------------------------------------------------------
+// TMSServer::HandleDTMFEvent
+//
+// -----------------------------------------------------------------------------
+//
+void TMSServer::HandleDTMFEvent(const TMSDTMFObserver::TCCPDtmfEvent event,
+ const gint status, const TChar /*tone*/)
+ {
+ TRACE_PRN_FN_ENT;
+ TRACE_PRN_IF_ERR(status);
+ gint cmd = ECmdDTMFTonePlayFinished;
+
+ switch (event)
+ {
+ case ECCPDtmfUnknown: //Unknown
+ break;
+ case ECCPDtmfManualStart: //DTMF sending started manually
+ case ECCPDtmfSequenceStart: //Automatic DTMF sending initialized
+ cmd = ECmdDTMFToneUplPlayStarted;
+ break;
+ case ECCPDtmfManualStop: //DTMF sending stopped manually
+ case ECCPDtmfManualAbort: //DTMF sending aborted manually
+ case ECCPDtmfSequenceStop: //Automatic DTMF sending stopped
+ case ECCPDtmfSequenceAbort: //Automatic DTMF sending aborted
+ case ECCPDtmfStopInDtmfString: //There was stop mark in DTMF string
+ case ECCPDtmfStringSendingCompleted://DTMF sending success
+ default:
+ break;
}
+ NotifyDtmfClients(cmd, status);
TRACE_PRN_FN_EXT;
- return TMS_RESULT_SUCCESS;
}
// -----------------------------------------------------------------------------
@@ -1292,6 +1416,22 @@
}
// -----------------------------------------------------------------------------
+// TMSServer::HandleNotifyPSL
+//
+// -----------------------------------------------------------------------------
+//
+void TMSServer::HandleNotifyPSL(const TUid aUid, const TInt& aKey,
+ const TRequestStatus& aStatus)
+ {
+ TRACE_PRN_FN_ENT;
+ if(iEffectSettings)
+ {
+ iEffectSettings->ResetDefaultVolume();
+ }
+ TRACE_PRN_FN_EXT;
+ }
+
+// -----------------------------------------------------------------------------
// TMSServer::RunServerL
//
// -----------------------------------------------------------------------------
@@ -1575,4 +1715,3 @@
return r;
}
-// End of file