--- a/mmserv/tms/tmscallserver/src/tmsipcalldownlinkds.cpp Thu Aug 19 10:26:11 2010 +0300
+++ b/mmserv/tms/tmscallserver/src/tmsipcalldownlinkds.cpp Tue Aug 31 15:43:02 2010 +0300
@@ -63,11 +63,12 @@
// -----------------------------------------------------------------------------
//
TMSIPDownlink* TMSIPDownlink::NewL(TMSIPDevSoundObserver& observer,
- const guint32 codecID, const TMMFPrioritySettings priority)
+ const guint32 codecID, const TMMFPrioritySettings priority,
+ const gint retrytime)
{
TMSIPDownlink* self = new (ELeave) TMSIPDownlink(observer);
CleanupStack::PushL(self);
- self->ConstructL(codecID, priority);
+ self->ConstructL(codecID, priority, retrytime);
CleanupStack::Pop(self);
return self;
}
@@ -78,7 +79,7 @@
// -----------------------------------------------------------------------------
//
void TMSIPDownlink::ConstructL(const guint32 codecID,
- const TMMFPrioritySettings priority)
+ const TMMFPrioritySettings priority, const gint /*retrytime*/)
{
TRACE_PRN_FN_ENT;
iCodecID = codecID;
@@ -102,7 +103,7 @@
//
// -----------------------------------------------------------------------------
//
-void TMSIPDownlink::Start()
+void TMSIPDownlink::Start(const gint /*retrytime*/)
{
TRACE_PRN_FN_ENT;
gint err = TMS_RESULT_ILLEGAL_OPERATION;
@@ -111,11 +112,7 @@
{
TRAP(err, iDevSound->PlayInitL());
TRACE_PRN_IF_ERR(err);
- if (err != TMS_RESULT_SUCCESS)
- {
- iStatus = EReady;
- iObserver.DownlinkStarted(err);
- }
+ iObserver.DownlinkStarted(err);
}
TRACE_PRN_FN_EXT;
}
@@ -709,15 +706,13 @@
switch (outputDev)
{
+ case CAudioOutput::EPublic:
+ output = TMS_AUDIO_OUTPUT_PUBLIC;
+ break;
case CAudioOutput::ENoPreference:
case CAudioOutput::EAll:
case CAudioOutput::ENoOutput:
case CAudioOutput::EPrivate:
- output = TMS_AUDIO_OUTPUT_PRIVATE;
- break;
- case CAudioOutput::EPublic:
- output = TMS_AUDIO_OUTPUT_PUBLIC;
- break;
default:
output = TMS_AUDIO_OUTPUT_PRIVATE;
break;