diff -r 095bea5f582e -r 0ac9a5310753 mmserv/tms/tmscallserver/src/tmsipcalldownlinkds.cpp --- a/mmserv/tms/tmscallserver/src/tmsipcalldownlinkds.cpp Tue Aug 31 15:43:02 2010 +0300 +++ b/mmserv/tms/tmscallserver/src/tmsipcalldownlinkds.cpp Wed Sep 01 12:23:00 2010 +0100 @@ -63,12 +63,11 @@ // ----------------------------------------------------------------------------- // TMSIPDownlink* TMSIPDownlink::NewL(TMSIPDevSoundObserver& observer, - const guint32 codecID, const TMMFPrioritySettings priority, - const gint retrytime) + const guint32 codecID, const TMMFPrioritySettings priority) { TMSIPDownlink* self = new (ELeave) TMSIPDownlink(observer); CleanupStack::PushL(self); - self->ConstructL(codecID, priority, retrytime); + self->ConstructL(codecID, priority); CleanupStack::Pop(self); return self; } @@ -79,7 +78,7 @@ // ----------------------------------------------------------------------------- // void TMSIPDownlink::ConstructL(const guint32 codecID, - const TMMFPrioritySettings priority, const gint /*retrytime*/) + const TMMFPrioritySettings priority) { TRACE_PRN_FN_ENT; iCodecID = codecID; @@ -103,7 +102,7 @@ // // ----------------------------------------------------------------------------- // -void TMSIPDownlink::Start(const gint /*retrytime*/) +void TMSIPDownlink::Start() { TRACE_PRN_FN_ENT; gint err = TMS_RESULT_ILLEGAL_OPERATION; @@ -112,7 +111,11 @@ { TRAP(err, iDevSound->PlayInitL()); TRACE_PRN_IF_ERR(err); - iObserver.DownlinkStarted(err); + if (err != TMS_RESULT_SUCCESS) + { + iStatus = EReady; + iObserver.DownlinkStarted(err); + } } TRACE_PRN_FN_EXT; } @@ -706,13 +709,15 @@ 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;