--- a/mmserv/tms/tmsserver/src/tmsaudioinbandtoneplayer.cpp	Fri Jun 25 17:36:03 2010 -0500
+++ b/mmserv/tms/tmsserver/src/tmsaudioinbandtoneplayer.cpp	Fri Jul 09 16:43:35 2010 -0500
@@ -263,7 +263,7 @@
                 default:
                     break;
                 }
-#ifndef __WINS__
+#ifndef __WINSCW__
             //Play the tone
             iPlayer->Play();
 #endif
@@ -285,22 +285,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// TMSAudioInbandTonePlayer::MatoPrepareComplete
-// Updates flag values and plays current inbandtone.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void TMSAudioInbandTonePlayer::MatoPrepareComplete(TInt aError)
-    {
-    TRACE_PRN_FN_ENT;
-    if (aError == KErrNone)
-        {
-        PlayCurrentTone();
-        }
-    TRACE_PRN_FN_EXT;
-    }
-
-// -----------------------------------------------------------------------------
 // TMSAudioInbandTonePlayer::SetVolume
 // -----------------------------------------------------------------------------
 //
@@ -322,15 +306,40 @@
     }
 
 // -----------------------------------------------------------------------------
+// TMSAudioInbandTonePlayer::MatoPrepareComplete
+// Updates flag values and plays current inbandtone.
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+void TMSAudioInbandTonePlayer::MatoPrepareComplete(TInt aError)
+    {
+    TRACE_PRN_FN_ENT;
+    if (aError == KErrNone)
+        {
+        PlayCurrentTone();
+        }
+    TRACE_PRN_IF_ERR(aError);
+    TRACE_PRN_FN_EXT;
+    }
+
+// -----------------------------------------------------------------------------
 // TMSAudioInbandTonePlayer::MatoPlayComplete
 // -
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-void TMSAudioInbandTonePlayer::MatoPlayComplete(TInt /*aError*/)
+void TMSAudioInbandTonePlayer::MatoPlayComplete(
+#ifdef _DEBUG
+        TInt aError)
+#else
+        TInt /*aError*/)
+#endif
     {
     TRACE_PRN_FN_ENT;
     // TODO: process error?
+#ifdef _DEBUG
+    TRACE_PRN_IF_ERR(aError);
+#endif
     TRACE_PRN_FN_EXT;
     }
 
@@ -360,4 +369,3 @@
     TRACE_PRN_FN_EXT;
     }
 
-// End of File