diff -r 095bea5f582e -r 0ac9a5310753 mmserv/tms/tmscallserver/src/tmscsuplink.cpp --- a/mmserv/tms/tmscallserver/src/tmscsuplink.cpp Tue Aug 31 15:43:02 2010 +0300 +++ b/mmserv/tms/tmscallserver/src/tmscsuplink.cpp Wed Sep 01 12:23:00 2010 +0100 @@ -16,7 +16,6 @@ */ #include -#include "tmsutility.h" #include "tmscsuplink.h" #include "tmscsdevsoundobserver.h" @@ -35,21 +34,20 @@ // Second phase constructor // ----------------------------------------------------------------------------- // -void TMSCSUplink::ConstructL(const gint retrytime) +void TMSCSUplink::ConstructL() { - TMSCSDevSound::ConstructL(TMS_STREAM_UPLINK, retrytime); + TMSCSDevSound::ConstructL(TMS_STREAM_UPLINK); } // ----------------------------------------------------------------------------- // Static constructor // ----------------------------------------------------------------------------- // -TMSCSUplink* TMSCSUplink::NewL(TMSCSDevSoundObserver& observer, - const gint retrytime) +TMSCSUplink* TMSCSUplink::NewL(TMSCSDevSoundObserver& observer) { TMSCSUplink* self = new (ELeave) TMSCSUplink(observer); CleanupStack::PushL(self); - self->ConstructL(retrytime); + self->ConstructL(); CleanupStack::Pop(self); return self; } @@ -124,7 +122,7 @@ // void TMSCSUplink::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/) { - TRACE_PRN_N(_L("TMSCSUplink::BufferToBeEmptied")); + //TRACE_PRN_N(_L("TMSCSUplink::BufferToBeEmptied")); // We dont react to devsound messages unless we are activating. if (iActivationOngoing) @@ -142,22 +140,13 @@ // void TMSCSUplink::RecordError(TInt aError) { - TRACE_PRN_N1(_L("TMSCSUplink::RecordError[%d]"), aError); + //TRACE_PRN_N1(_L("TMSCSUplink::RecordError[%d]"), aError); // We dont react to devsound messages unless we are activating. - if (iActivationOngoing && (aError == KErrAccessDenied || - aError == KErrInUse)) + if (iActivationOngoing && aError == KErrAccessDenied) { - if (iStartRetryTime != 0) - { - StartTimer(); - } - else - { - CancelTimer(); - iActivationOngoing = EFalse; - iObserver.UplinkActivationCompleted(aError); - } + iActivationOngoing = EFalse; + iObserver.UplinkActivationCompleted(aError); } }