mmserv/tms/tmsserver/src/tmsrtplayer.cpp
changeset 42 1fa3fb47b1e3
parent 31 8dfd592727cb
child 55 e267340986c9
--- a/mmserv/tms/tmsserver/src/tmsrtplayer.cpp	Tue Jul 06 14:50:35 2010 +0300
+++ b/mmserv/tms/tmsserver/src/tmsrtplayer.cpp	Wed Aug 18 10:17:22 2010 +0300
@@ -48,7 +48,7 @@
 
 _LIT(KTMSTtsHeader, "(tts)");
 
-#ifdef __WINS__
+#ifdef __WINSCW__
 //_LIT(KTMSDefaultSoundFile, "z:\\data\\sounds\\digital\\Nokia_tune.aac");
 _LIT(KTMSDefaultSoundFile, "Z:\\Data\\Sounds\\Digital\\Nokia tune.aac");
 //_LIT(KTMSDefaultSoundFile, "c:\\data\\sounds\\digital\\test_8khz.wav");
@@ -67,7 +67,7 @@
 \x40\x64\x06\x0B");
 _LIT8(KTMSUnsecureVoIPCall, "\x00\x11\x0B\x67\x04\x40\x04\x67\x04\x40\x04\
 \x6C\x04\x40\x04\x6D\x04\x0B");
-#endif // __WINS__
+#endif // __WINSCW__
 
 // -----------------------------------------------------------------------------
 // TMSRingTonePlayer::NewL
@@ -115,7 +115,7 @@
 
     iEngine =  ProEngFactory::NewEngineL();
 
-    InitRtParamsL(EPlayerBackup);
+    InitRtParams(EPlayerBackup);
     //CreateDefaultRingToneL();
     CreateBkpRtPlayerL();
     //GetMaxToneFileSizeL(iToneFileSizeLimitKB);
@@ -152,10 +152,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSRingTonePlayer::InitRtParamsL
+// TMSRingTonePlayer::InitRtParams
 // -----------------------------------------------------------------------------
 //
-void TMSRingTonePlayer::InitRtParamsL(TRtPlayerType aPlayerType)
+void TMSRingTonePlayer::InitRtParams(TRtPlayerType aPlayerType)
     {
     TRACE_PRN_FN_ENT;
 
@@ -183,7 +183,7 @@
     {
     TRACE_PRN_FN_ENT;
 
-    InitRtParamsL(EPlayerDefault);
+    InitRtParams(EPlayerDefault);
     LoadProfileRingToneL();
 
     TRACE_PRN_FN_EXT;
@@ -371,7 +371,7 @@
     delete iBeepOncePlayer;
     iBeepOncePlayer = NULL;
 
-#ifdef __WINS__
+#ifdef __WINSCW__
     TParse* fp = new (ELeave) TParse();
     fp->Set(KTMSBeepSequence, NULL, NULL);
     TFileName fileName(fp->FullName());
@@ -381,7 +381,7 @@
 #else
     iBeepOncePlayer = TMSRtAudioHdlr::NewSeqL(KTMSBeepSequence(),
             iRtParam.iPriority, iRtParam.iPreference, *this, EPlayerBeepOnce);
-#endif // __WINS__
+#endif // __WINSCW__
 
     iRtParam.iType = EPlayerBeepOnce;
     TRACE_PRN_FN_EXT;
@@ -399,7 +399,7 @@
     delete iSilentPlayer;
     iSilentPlayer = NULL;
 
-#ifdef __WINS__
+#ifdef __WINSCW__
     TParse* fp = new (ELeave) TParse();
     fp->Set(KTMSNoSoundSequence, NULL, NULL);
     TFileName fileName(fp->FullName());
@@ -409,7 +409,7 @@
 #else
     iSilentPlayer = TMSRtAudioHdlr::NewSeqL(KTMSNoSoundSequence(),
             iRtParam.iPriority, iRtParam.iPreference, *this, EPlayerSilent);
-#endif // __WINS__
+#endif // __WINSCW__
 
     iRtParam.iType = EPlayerSilent;
     TRACE_PRN_FN_EXT;
@@ -426,7 +426,7 @@
     delete iUnsecureVoIPTonePlayer;
     iUnsecureVoIPTonePlayer = NULL;
 
-#ifdef __WINS__
+#ifdef __WINSCW__
     TParse* fp = new (ELeave) TParse();
     fp->Set(KTMSUnsecureVoIPCall, NULL, NULL);
     TFileName fileName(fp->FullName());
@@ -438,7 +438,7 @@
     iUnsecureVoIPTonePlayer = TMSRtAudioHdlr::NewSeqL(KTMSUnsecureVoIPCall(),
             iRtParam.iPriority, iRtParam.iPreference, *this,
             EPlayerUnsecureVoIP);
-#endif // __WINS__
+#endif // __WINSCW__
 
     iRtParam.iType = EPlayerUnsecureVoIP;
     TRACE_PRN_FN_EXT;
@@ -449,7 +449,7 @@
 // -----------------------------------------------------------------------------
 //
 void TMSRingTonePlayer::CreateCustomSequencePlayerL(const TDesC8&
-#ifdef __WINS__
+#ifdef __WINSCW__
         /*aSequence*/)
 #else
         aSequence)
@@ -460,7 +460,7 @@
     delete iSequencePlayer;
     iSequencePlayer = NULL;
 
-#ifdef __WINS__
+#ifdef __WINSCW__
     TParse* fp = new (ELeave) TParse();
     fp->Set(KTMSBeepSequence, NULL, NULL);
     TFileName fileName(fp->FullName());
@@ -470,7 +470,7 @@
 #else
     iSequencePlayer = TMSRtAudioHdlr::NewSeqL(aSequence, iRtParam.iPriority,
             iRtParam.iPreference, *this, EPlayerSequence);
-#endif // __WINS__
+#endif // __WINSCW__
 
     iRtParam.iType = EPlayerSequence;
     TRACE_PRN_FN_EXT;
@@ -1378,12 +1378,12 @@
                 iAudioPlayer = NULL;
                 }
 
-#ifdef __WINS__
+#ifdef __WINSCW__
             TRAP_IGNORE(PlayAudioRingToneL());
             iTonePlayingStatus = EDefaultTonePlaying;
 #else
             TRAP_IGNORE(PlayDefaultToneL());
-#endif
+#endif //__WINSCW__
             break;
             }
         case EDefaultTonePlaying:
@@ -1710,4 +1710,3 @@
     return audioHdlr;
     }
 
-//  End of File