--- a/mmserv/tms/tmscallserver/src/tmscallcsadpt.cpp Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/tms/tmscallserver/src/tmscallcsadpt.cpp Wed Sep 01 12:23:00 2010 +0100
@@ -26,7 +26,6 @@
#include "tmsshared.h"
#include "tmsclientserver.h"
#include "tmstarsettings.h"
-#include "tmssyncvol.h"
using namespace TMS;
@@ -56,7 +55,6 @@
iCSUplink = NULL;
iRouting = NULL;
iTarSettings = NULL;
- iResetVolNotifier = NULL;
TRACE_PRN_FN_EXT;
}
@@ -82,7 +80,6 @@
delete iTarSettings;
delete iCSUplink;
delete iCSDownlink;
- delete iResetVolNotifier;
if (iMsgQueueUp.Handle() > 0)
{
@@ -106,8 +103,8 @@
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_SUCCESS);
iNextStreamId = 1;
- iUplState = EIdle;
- iDnlState = EIdle;
+ iUplinkInitialized = FALSE;
+ iDnlinkInitialized = FALSE;
TRACE_PRN_FN_EXT;
return status;
}
@@ -127,11 +124,12 @@
case TMS_STREAM_UPLINK:
{
status = TMS_RESULT_ALREADY_EXIST;
- if (iUplState == EIdle)
+ if (!iUplinkInitialized)
{
iUplinkStreamId = iNextStreamId;
outStrmId = iUplinkStreamId;
iNextStreamId++;
+ //iUplinkInitialized = TRUE; //not initialized yet!
status = TMS_RESULT_SUCCESS;
}
break;
@@ -139,11 +137,12 @@
case TMS_STREAM_DOWNLINK:
{
status = TMS_RESULT_ALREADY_EXIST;
- if (iDnlState == EIdle)
+ if (!iDnlinkInitialized)
{
iDnlinkStreamId = iNextStreamId;
outStrmId = iDnlinkStreamId;
iNextStreamId++;
+ //iDnlinkInitialized = TRUE; //not initialized yet!
status = TMS_RESULT_SUCCESS;
}
break;
@@ -165,8 +164,7 @@
//
gint TMSCallCSAdpt::InitStream(const TMSCallType /*callType*/,
const TMSStreamType strmType, const gint strmId,
- const TMSFormatType /*frmtType*/, const gint retrytime,
- const RMessage2& message)
+ const TMSFormatType /*frmtType*/, const RMessage2& message)
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_SUCCESS);
@@ -186,7 +184,7 @@
}
if (status == TMS_RESULT_SUCCESS)
{
- status = InitUplink(retrytime);
+ status = InitUplink();
}
}
break;
@@ -204,7 +202,7 @@
}
if (status == TMS_RESULT_SUCCESS)
{
- status = InitDownlink(retrytime);
+ status = InitDownlink();
}
}
break;
@@ -226,13 +224,12 @@
//
// -----------------------------------------------------------------------------
//
-gint TMSCallCSAdpt::InitUplink(const gint retrytime)
+gint TMSCallCSAdpt::InitUplink()
{
gint status(TMS_RESULT_SUCCESS);
-
if (!iCSUplink)
{
- TRAP(status, iCSUplink = TMSCSUplink::NewL(*this, retrytime));
+ TRAP(status, iCSUplink = TMSCSUplink::NewL(*this));
}
return status;
}
@@ -242,13 +239,13 @@
//
// -----------------------------------------------------------------------------
//
-gint TMSCallCSAdpt::InitDownlink(const gint retrytime)
+gint TMSCallCSAdpt::InitDownlink()
{
gint status(TMS_RESULT_SUCCESS);
if (!iCSDownlink)
{
- TRAP(status, iCSDownlink = TMSCSDownlink::NewL(*this, retrytime));
+ TRAP(status, iCSDownlink = TMSCSDownlink::NewL(*this));
}
if (!iRouting && status == TMS_RESULT_SUCCESS)
{
@@ -267,7 +264,7 @@
// -----------------------------------------------------------------------------
//
gint TMSCallCSAdpt::StartStream(const TMSCallType /*callType*/,
- const TMSStreamType strmType, const gint strmId, const gint retrytime)
+ const TMSStreamType strmType, const gint strmId)
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
@@ -275,28 +272,18 @@
{
case TMS_STREAM_UPLINK:
{
- if (iCSUplink && strmId == iUplinkStreamId &&
- iUplState == EInitialized)
+ if (iCSUplink && strmId == iUplinkStreamId)
{
- iCSUplink->Activate(retrytime);
+ iCSUplink->Activate();
status = TMS_RESULT_SUCCESS;
}
break;
}
case TMS_STREAM_DOWNLINK:
{
- if(!iResetVolNotifier)
- {
- TRAP(status, iResetVolNotifier = TMSSyncVol::NewL());
- }
- if(iResetVolNotifier)
+ if (iCSDownlink && strmId == iDnlinkStreamId)
{
- iResetVolNotifier->SetSyncVol();
- }
- if (iCSDownlink && strmId == iDnlinkStreamId &&
- iDnlState == EInitialized)
- {
- iCSDownlink->Activate(retrytime);
+ iCSDownlink->Activate();
status = TMS_RESULT_SUCCESS;
}
break;
@@ -343,7 +330,6 @@
if (iCSUplink && strmId == iUplinkStreamId)
{
iCSUplink->Deactivate();
- iUplState = EInitialized;
status = TMS_RESULT_SUCCESS;
NotifyClient(iUplinkStreamId, ECmdUplinkInitComplete, status);
}
@@ -354,7 +340,6 @@
if (iCSDownlink && strmId == iDnlinkStreamId)
{
iCSDownlink->Deactivate();
- iDnlState = EInitialized;
status = TMS_RESULT_SUCCESS;
NotifyClient(iDnlinkStreamId, ECmdDownlinkInitComplete, status);
}
@@ -388,18 +373,16 @@
if (iCSUplink && strmId == iUplinkStreamId)
{
iCSUplink->Deactivate();
- iUplState = EIdle;
+ iUplinkInitialized = FALSE;
status = TMS_RESULT_SUCCESS;
NotifyClient(iUplinkStreamId, ECmdUplinkDeInitComplete, status);
}
break;
- }
case TMS_STREAM_DOWNLINK:
- {
if (iCSDownlink && strmId == iDnlinkStreamId)
{
iCSDownlink->Deactivate();
- iDnlState = EIdle;
+ iDnlinkInitialized = FALSE;
status = TMS_RESULT_SUCCESS;
NotifyClient(iDnlinkStreamId, ECmdDownlinkDeInitComplete,
status);
@@ -433,7 +416,7 @@
if (strmId == iUplinkStreamId)
{
iUplinkStreamId = -1;
- iUplState = EIdle;
+ iUplinkInitialized = FALSE;
}
break;
}
@@ -442,7 +425,7 @@
if (strmId == iDnlinkStreamId)
{
iDnlinkStreamId = -1;
- iDnlState = EIdle;
+ iDnlinkInitialized = FALSE;
}
break;
}
@@ -509,7 +492,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSDownlink && iDnlState != EIdle)
+ if (iCSDownlink && iDnlinkInitialized)
{
volume = iCSDownlink->MaxVolume();
status = TMS_RESULT_SUCCESS;
@@ -528,7 +511,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSDownlink && iDnlState != EIdle)
+ if (iCSDownlink && iDnlinkInitialized)
{
iCSDownlink->SetVolume(volume);
status = TMS_RESULT_SUCCESS;
@@ -547,7 +530,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSDownlink && iDnlState != EIdle)
+ if (iCSDownlink && iDnlinkInitialized)
{
volume = iCSDownlink->Volume();
status = TMS_RESULT_SUCCESS;
@@ -565,7 +548,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSUplink && iUplState != EIdle)
+ if (iCSUplink && iUplinkInitialized)
{
gain = iCSUplink->MaxGain();
status = TMS_RESULT_SUCCESS;
@@ -584,7 +567,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSUplink && iUplState != EIdle)
+ if (iCSUplink && iUplinkInitialized)
{
iCSUplink->SetGain(gain);
status = TMS_RESULT_SUCCESS;
@@ -603,7 +586,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSUplink && iUplState != EIdle)
+ if (iCSUplink && iUplinkInitialized)
{
gain = iCSUplink->Gain();
status = TMS_RESULT_SUCCESS;
@@ -621,7 +604,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSDownlink && iDnlState != EIdle)
+ if (iCSDownlink && iDnlinkInitialized)
{
volume = iCSDownlink->MaxVolume();
status = TMS_RESULT_SUCCESS;
@@ -641,7 +624,7 @@
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
iGlobalVol = volume;
- if (iCSDownlink && iDnlState != EIdle)
+ if (iCSDownlink && iDnlinkInitialized)
{
iCSDownlink->SetVolume(volume);
status = TMS_RESULT_SUCCESS;
@@ -659,7 +642,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSDownlink && iDnlState != EIdle)
+ if (iCSDownlink && iDnlinkInitialized)
{
volume = iCSDownlink->Volume();
status = TMS_RESULT_SUCCESS;
@@ -677,7 +660,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSUplink && iUplState != EIdle)
+ if (iCSUplink && iUplinkInitialized)
{
gain = iCSUplink->MaxGain();
status = TMS_RESULT_SUCCESS;
@@ -697,7 +680,7 @@
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
iGlobalGain = gain;
- if (iCSUplink && iUplState != EIdle)
+ if (iCSUplink && iUplinkInitialized)
{
iCSUplink->SetGain(gain);
status = TMS_RESULT_SUCCESS;
@@ -715,7 +698,7 @@
{
TRACE_PRN_FN_ENT;
gint status(TMS_RESULT_INVALID_STATE);
- if (iCSUplink && iUplState != EIdle)
+ if (iCSUplink && iUplinkInitialized)
{
gain = iCSUplink->Gain();
status = TMS_RESULT_SUCCESS;
@@ -930,6 +913,7 @@
status = TMS_RESULT_SUCCESS;
output = TOTMSOUTPUT(taroutput);
}
+
TRACE_PRN_FN_EXT;
return status;
}
@@ -971,8 +955,10 @@
RBufWriteStream stream;
stream.Open(*outputsbuf);
CleanupClosePushL(stream);
+
TArray<CTelephonyAudioRouting::TAudioOutput>
availableOutputs = iRouting->AvailableOutputs();
+
guint numOfItems = availableOutputs.Count();
count = numOfItems;
for (guint i = 0; i < numOfItems; i++)
@@ -980,6 +966,7 @@
tmsoutput = TOTMSOUTPUT(availableOutputs[i]);
stream.WriteUint32L(tmsoutput);
}
+
CleanupStack::PopAndDestroy(&stream);
status = TMS_RESULT_SUCCESS;
}
@@ -988,6 +975,9 @@
return status;
}
+
+// From TMSCSPDevSoundObserver
+
// -----------------------------------------------------------------------------
// TMSCallCSAdpt::DownlinkInitCompleted
// From TMSCSDevSoundObserver
@@ -998,7 +988,7 @@
TRACE_PRN_FN_ENT;
if (status == TMS_RESULT_SUCCESS)
{
- iDnlState = EInitialized;
+ iDnlinkInitialized = TRUE;
}
NotifyClient(iDnlinkStreamId, ECmdDownlinkInitComplete, status);
TRACE_PRN_FN_EXT;
@@ -1014,7 +1004,7 @@
TRACE_PRN_FN_ENT;
if (status == TMS_RESULT_SUCCESS)
{
- iUplState = EInitialized;
+ iUplinkInitialized = TRUE;
}
NotifyClient(iUplinkStreamId, ECmdUplinkInitComplete, status);
TRACE_PRN_FN_EXT;
@@ -1028,10 +1018,6 @@
void TMSCallCSAdpt::UplinkActivationCompleted(gint status)
{
TRACE_PRN_FN_ENT;
- if (status == TMS_RESULT_SUCCESS)
- {
- iUplState = EActivated;
- }
NotifyClient(iUplinkStreamId, ECmdUplinkStarted, status);
TRACE_PRN_FN_EXT;
}
@@ -1044,10 +1030,6 @@
void TMSCallCSAdpt::DownlinkActivationCompleted(gint status)
{
TRACE_PRN_FN_ENT;
- if (status == TMS_RESULT_SUCCESS)
- {
- iDnlState = EActivated;
- }
NotifyClient(iDnlinkStreamId, ECmdDownlinkStarted, status);
TRACE_PRN_FN_EXT;
}