diff -r 71ca22bcf22a -r 4f62049db6ac mmserv/tms/tmscallserver/src/ipcalldownlink.cpp
--- a/mmserv/tms/tmscallserver/src/ipcalldownlink.cpp	Tue Feb 02 01:08:46 2010 +0200
+++ b/mmserv/tms/tmscallserver/src/ipcalldownlink.cpp	Fri Feb 19 23:19:48 2010 +0200
@@ -28,7 +28,7 @@
 
 using namespace TMS;
 
-static TMSVoIPDownlink* iSelfDn;
+static TMSIPDownlink* iSelfDn;
 #ifdef _DEBUG
 static TInt iHeap;
 #endif //_DEBUG
@@ -41,10 +41,10 @@
 #endif
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::cb_raw_playback_handoff
+// TMSIPDownlink::cb_raw_playback_handoff
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::cb_raw_playback_handoff(GstElement* /*appsrc*/,
+void TMSIPDownlink::cb_raw_playback_handoff(GstElement* /*appsrc*/,
         guint size)
     {
     TRACE_PRN_N(_L("TMS->DNL: cb_raw_playback_handoff"));
@@ -63,10 +63,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::bus_call
+// TMSIPDownlink::bus_call
 // -----------------------------------------------------------------------------
 //
-gboolean TMSVoIPDownlink::bus_call(GstBus* /*bus*/, GstMessage* msg,
+gboolean TMSIPDownlink::bus_call(GstBus* /*bus*/, GstMessage* msg,
         gpointer /*data*/)
     {
     switch (GST_MESSAGE_TYPE(msg))
@@ -97,10 +97,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::gst_initialize_play
+// TMSIPDownlink::gst_initialize_play
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::gst_initialize_play()
+gint TMSIPDownlink::gst_initialize_play()
     {
     TRACE_PRN_FN_ENT;
 
@@ -119,7 +119,7 @@
         }
 
     iBusPlay = gst_pipeline_get_bus(GST_PIPELINE(iPipelinePlay));
-    gst_bus_add_watch(iBusPlay, TMSVoIPDownlink::bus_call, NULL);
+    gst_bus_add_watch(iBusPlay, TMSIPDownlink::bus_call, NULL);
     gst_object_unref(iBusPlay);
 
     iMaxBufLen = ConfigureMedia(iCodecID);
@@ -160,10 +160,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::gst_play_raw
+// TMSIPDownlink::gst_play_raw
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::gst_play_raw()
+gint TMSIPDownlink::gst_play_raw()
     {
     TRACE_PRN_FN_ENT;
 
@@ -179,21 +179,21 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::TMSVoIPDownlink
+// TMSIPDownlink::TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink::TMSVoIPDownlink()
+TMSIPDownlink::TMSIPDownlink()
     {
     iSelfDn = this;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::~TMSVoIPDownlink
+// TMSIPDownlink::~TMSIPDownlink
 // Standard Constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink::~TMSVoIPDownlink()
+TMSIPDownlink::~TMSIPDownlink()
     {
     TRACE_PRN_FN_ENT;
 
@@ -216,14 +216,14 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::NewL
+// TMSIPDownlink::NewL
 // Symbian two-phase constructor
 // -----------------------------------------------------------------------------
 //
-TMSVoIPDownlink* TMSVoIPDownlink::NewL(const guint32 codecID,
+TMSIPDownlink* TMSIPDownlink::NewL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
-    TMSVoIPDownlink* self = new (ELeave) TMSVoIPDownlink();
+    TMSIPDownlink* self = new (ELeave) TMSIPDownlink();
     CleanupStack::PushL(self);
     self->ConstructL(codecID, priority);
     CleanupStack::Pop(self);
@@ -231,11 +231,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::ConstructL
+// TMSIPDownlink::ConstructL
 // Part two of Symbian two phase construction
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::ConstructL(const guint32 codecID,
+void TMSIPDownlink::ConstructL(const guint32 codecID,
         const TMMFPrioritySettings priority)
     {
     TRACE_PRN_FN_ENT;
@@ -279,11 +279,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::Start
+// TMSIPDownlink::Start
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::Start()
+void TMSIPDownlink::Start()
     {
     TRACE_PRN_FN_ENT;
 
@@ -294,11 +294,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::Stop
+// TMSIPDownlink::Stop
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::Stop()
+void TMSIPDownlink::Stop()
     {
     TRACE_PRN_FN_ENT;
 
@@ -322,10 +322,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BufferToBeFilled
+// TMSIPDownlink::BufferToBeFilled
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::BufferToBeFilled()
+void TMSIPDownlink::BufferToBeFilled()
     {
     TRACE_PRN_N1(_L("TMS->DNL->BTBF: requestBufLen[%d]"), requestBufLen);
 
@@ -366,11 +366,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BufferFilled
+// TMSIPDownlink::BufferFilled
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::BufferFilled(const guint buflen)
+void TMSIPDownlink::BufferFilled(const guint buflen)
     {
 #ifndef __PLAY_WAV_FROM_FILE__
     gstDnlBuffer = gst_buffer_new();
@@ -418,22 +418,22 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCodecCi
+// TMSIPDownlink::SetCodecCi
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetCodecCi()
+gint TMSIPDownlink::SetCodecCi()
     {
     TRAPD(err, SetCodecCiL());
     return err;
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCodecCiL
+// TMSIPDownlink::SetCodecCiL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::SetCodecCiL()
+void TMSIPDownlink::SetCodecCiL()
     {
     TRACE_PRN_FN_ENT;
 
@@ -489,11 +489,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetVolume
+// TMSIPDownlink::SetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetVolume(const guint volume)
+gint TMSIPDownlink::SetVolume(const guint volume)
     {
     g_object_set(G_OBJECT(iSink), "volume", volume, NULL);
     TRACE_PRN_N1(_L("TMS->DNL: SetVolume [%d]"), volume);
@@ -501,11 +501,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetVolume
+// TMSIPDownlink::GetVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetVolume(guint& volume)
+gint TMSIPDownlink::GetVolume(guint& volume)
     {
     g_object_get(G_OBJECT(iSink), "volume", &volume, NULL);
     TRACE_PRN_N1(_L("TMS->DNL: GetVolume [%d]"), volume);
@@ -513,11 +513,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetMaxVolume
+// TMSIPDownlink::GetMaxVolume
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetMaxVolume(guint& volume)
+gint TMSIPDownlink::GetMaxVolume(guint& volume)
     {
     g_object_get(G_OBJECT(iSink), "maxvolume", &volume, NULL);
     TRACE_PRN_N1(_L("TMS->DNL: MaxVolume [%d]"), volume);
@@ -525,11 +525,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetDataXferChunkHndl
+// TMSIPDownlink::GetDataXferChunkHndl
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
+gint TMSIPDownlink::GetDataXferChunkHndl(const TUint32 key, RChunk& chunk)
     {
     gint status = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -553,11 +553,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetIlbcCodecMode
+// TMSIPDownlink::SetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetIlbcCodecMode(gint mode)
+gint TMSIPDownlink::SetIlbcCodecMode(gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -585,11 +585,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetIlbcCodecMode
+// TMSIPDownlink::GetIlbcCodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetIlbcCodecMode(gint& mode)
+gint TMSIPDownlink::GetIlbcCodecMode(gint& mode)
     {
     // not available through CIs -> return cashed value
     mode = iILBCDecodeMode;
@@ -598,11 +598,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetG711CodecMode
+// TMSIPDownlink::SetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetG711CodecMode(gint mode)
+gint TMSIPDownlink::SetG711CodecMode(gint mode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -630,11 +630,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetG711CodecMode
+// TMSIPDownlink::GetG711CodecMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetG711CodecMode(gint& mode)
+gint TMSIPDownlink::GetG711CodecMode(gint& mode)
     {
     // not available through CIs -> return cached value
     mode = iG711DecodeMode;
@@ -643,11 +643,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::FrameModeRqrdForEC
+// TMSIPDownlink::FrameModeRqrdForEC
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::FrameModeRqrdForEC(gboolean& frmodereq)
+gint TMSIPDownlink::FrameModeRqrdForEC(gboolean& frmodereq)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -665,11 +665,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetFrameMode
+// TMSIPDownlink::SetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetFrameMode(const gboolean frmode)
+gint TMSIPDownlink::SetFrameMode(const gboolean frmode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -689,11 +689,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetFrameMode
+// TMSIPDownlink::GetFrameMode
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetFrameMode(gboolean& frmode)
+gint TMSIPDownlink::GetFrameMode(gboolean& frmode)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -710,11 +710,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::ConcealErrorForNextBuffer
+// TMSIPDownlink::ConcealErrorForNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::ConcealErrorForNextBuffer()
+gint TMSIPDownlink::ConcealErrorForNextBuffer()
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -729,11 +729,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetCng
+// TMSIPDownlink::SetCng
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetCng(const TMSFormatType fmttype, const gboolean cng)
+gint TMSIPDownlink::SetCng(const TMSFormatType fmttype, const gboolean cng)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -756,11 +756,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetCng
+// TMSIPDownlink::GetCng
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetCng(const TMSFormatType fmttype, gboolean& cng)
+gint TMSIPDownlink::GetCng(const TMSFormatType fmttype, gboolean& cng)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -783,11 +783,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetPlc
+// TMSIPDownlink::SetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::SetPlc(const TMSFormatType fmttype, const gboolean plc)
+gint TMSIPDownlink::SetPlc(const TMSFormatType fmttype, const gboolean plc)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -806,11 +806,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetPlc
+// TMSIPDownlink::GetPlc
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::GetPlc(const TMSFormatType fmttype, gboolean& plc)
+gint TMSIPDownlink::GetPlc(const TMSFormatType fmttype, gboolean& plc)
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -827,11 +827,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::BadLsfNextBuffer
+// TMSIPDownlink::BadLsfNextBuffer
 //
 // -----------------------------------------------------------------------------
 //
-gint TMSVoIPDownlink::BadLsfNextBuffer()
+gint TMSIPDownlink::BadLsfNextBuffer()
     {
     gint err = TMS_RESULT_DOES_NOT_EXIST;
 
@@ -849,10 +849,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::SetAudioDeviceL
+// TMSIPDownlink::SetAudioDeviceL
 //
 // -----------------------------------------------------------------------------
-void TMSVoIPDownlink::SetAudioDeviceL(TMSAudioOutput output)
+void TMSIPDownlink::SetAudioDeviceL(TMSAudioOutput output)
     {
     gint outputDev;
 
@@ -877,11 +877,11 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSVoIPDownlink::GetAudioDeviceL
+// TMSIPDownlink::GetAudioDeviceL
 //
 // -----------------------------------------------------------------------------
 //
-void TMSVoIPDownlink::GetAudioDeviceL(TMSAudioOutput& output)
+void TMSIPDownlink::GetAudioDeviceL(TMSAudioOutput& output)
     {
     TRACE_PRN_FN_ENT;