--- a/mmserv/tms/tmsimpl/src/tmsstreambodyimpl.cpp	Fri May 28 19:26:28 2010 -0500
+++ b/mmserv/tms/tmsimpl/src/tmsstreambodyimpl.cpp	Fri Jun 11 19:59:23 2010 -0500
@@ -374,7 +374,7 @@
             switch (effecttype)
                 {
                 case TMS_EFFECT_GAIN:
-                    static_cast<TMSGainEffectImpl*>(iEffectsList[i])->SetProxy(
+                    static_cast<TMSGainEffectImpl*> (iEffectsList[i])->SetProxy(
                             iContext.CallProxy, iMsgQHandler);
                     break;
                 case TMS_EFFECT_VOLUME:
@@ -396,23 +396,23 @@
         switch (fmttype)
             {
             case TMS_FORMAT_PCM:
-                static_cast<TMSPCMFormatImpl*>(iFormat)->SetProxy(&iContext,
+                static_cast<TMSPCMFormatImpl*> (iFormat)->SetProxy(&iContext,
                         iMsgQHandler);
                 break;
             case TMS_FORMAT_AMR:
-                static_cast<TMSAMRFormatImpl*>(iFormat)->SetProxy(&iContext,
+                static_cast<TMSAMRFormatImpl*> (iFormat)->SetProxy(&iContext,
                         iMsgQHandler);
                 break;
             case TMS_FORMAT_G711:
-                static_cast<TMSG711FormatImpl*>(iFormat)->SetProxy(&iContext,
+                static_cast<TMSG711FormatImpl*> (iFormat)->SetProxy(&iContext,
                         iMsgQHandler);
                 break;
             case TMS_FORMAT_G729:
-                static_cast<TMSG729FormatImpl*>(iFormat)->SetProxy(&iContext,
+                static_cast<TMSG729FormatImpl*> (iFormat)->SetProxy(&iContext,
                         iMsgQHandler);
                 break;
             case TMS_FORMAT_ILBC:
-                static_cast<TMSILBCFormatImpl*>(iFormat)->SetProxy(&iContext,
+                static_cast<TMSILBCFormatImpl*> (iFormat)->SetProxy(&iContext,
                         iMsgQHandler);
                 break;
             default:
@@ -430,8 +430,8 @@
             switch (sinkType)
                 {
                 case TMS_SINK_CLIENT:
-                    static_cast<TMSClientSinkImpl*>(iSink)->SetProxy(
-                            iContext.CallProxy, iMsgQHandler);
+                    static_cast<TMSClientSinkImpl*> (iSink)->SetProxy(&iContext,
+                            iMsgQHandler);
                     break;
                 case TMS_SINK_MODEM:
                 case TMS_SINK_SPEAKER:
@@ -455,9 +455,8 @@
             switch (sourceType)
                 {
                 case TMS_SOURCE_CLIENT:
-                    static_cast<TMSClientSourceImpl*>(iSource)->SetProxy(
-                            iContext.CallProxy, iContext.StreamId,
-                            iMsgQHandler);
+                    static_cast<TMSClientSourceImpl*> (iSource)->SetProxy(
+                            &iContext, iMsgQHandler);
                     break;
                 case TMS_SOURCE_MODEM:
                 case TMS_SOURCE_MIC:
@@ -737,8 +736,7 @@
                 {
                 if (aError != TMS_RESULT_SUCCESS)
                     {
-					//event.type = TMS_EVENT_STREAM_STATE_CHANGE_ERROR;
-                    event.type = TMS_EVENT_STREAM_STATE_CHANGED;
+                    event.type = TMS_EVENT_STREAM_STATE_CHANGE_ERROR;
                     }
                 else
                     {