diff -r 71ca22bcf22a -r 4f62049db6ac mmserv/tms/tmscallserver/src/cspdevsound.cpp
--- a/mmserv/tms/tmscallserver/src/cspdevsound.cpp	Tue Feb 02 01:08:46 2010 +0200
+++ b/mmserv/tms/tmscallserver/src/cspdevsound.cpp	Fri Feb 19 23:19:48 2010 +0200
@@ -23,20 +23,20 @@
 
 using namespace TMS;
 
-// ---------------------------------------------------------------------------
-// CSPDevSound
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// TMSCSPDevSound
+// -----------------------------------------------------------------------------
 //
-CSPDevSound::CSPDevSound(MCSPDevSoundObserver& aObserver) :
+TMSCSPDevSound::TMSCSPDevSound(TMSCSPDevSoundObserver& aObserver) :
     iObserver(aObserver)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // ConstructL
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::ConstructL(TMMFState aMode, gint aAudioPreference,
+void TMSCSPDevSound::ConstructL(TMMFState aMode, gint aAudioPreference,
         gint aAudioPriority)
     {
     TMMFPrioritySettings audioPriority;
@@ -58,21 +58,21 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CSPDevSound::~CSPDevSound()
+TMSCSPDevSound::~TMSCSPDevSound()
     {
     delete iDevSound;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Tries to activate the audio stream if not active or activating
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::Activate()
+void TMSCSPDevSound::Activate()
     {
     if (!IsActive() && !IsActivationOngoing())
         {
@@ -82,11 +82,11 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // Deactivates the audio device.
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::Deactivate()
+void TMSCSPDevSound::Deactivate()
     {
     if (iDevSound && (IsActive() || IsActivationOngoing()))
         {
@@ -96,39 +96,39 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // ActivationOngoing
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TBool CSPDevSound::IsActivationOngoing() const
+TBool TMSCSPDevSound::IsActivationOngoing() const
     {
     return iActivationOngoing;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // IsActive
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-TBool CSPDevSound::IsActive() const
+TBool TMSCSPDevSound::IsActive() const
     {
     return iActive;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // DevSound
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-CMMFDevSound& CSPDevSound::DevSound()
+CMMFDevSound& TMSCSPDevSound::DevSound()
     {
     return *iDevSound;
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::InitializeComplete(TInt aError)
+void TMSCSPDevSound::InitializeComplete(TInt aError)
     {
     if (iStreamType == KAudioPrefCSCallDownlink)
         {
@@ -140,66 +140,67 @@
         }
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::BufferToBeFilled(CMMFBuffer* /*aBuffer*/)
+void TMSCSPDevSound::BufferToBeFilled(CMMFBuffer* /*aBuffer*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::PlayError(TInt /*aError*/)
+void TMSCSPDevSound::PlayError(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::ToneFinished(TInt /*aError*/)
+void TMSCSPDevSound::ToneFinished(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/)
+void TMSCSPDevSound::BufferToBeEmptied(CMMFBuffer* /*aBuffer*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::RecordError(TInt /*aError*/)
+void TMSCSPDevSound::RecordError(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::ConvertError(TInt /*aError*/)
+void TMSCSPDevSound::ConvertError(TInt /*aError*/)
     {
     }
 
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // From class MDevSoundObserver
 // Not implemented
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
-void CSPDevSound::DeviceMessage(TUid /*aMessageType*/, const TDesC8& /*aMsg*/)
+void TMSCSPDevSound::DeviceMessage(TUid /*aMessageType*/,
+        const TDesC8& /*aMsg*/)
     {
     }