diff -r ab526b8cacfb -r 60e492b28869 mmserv/tms/tmsimpl/inc/tmsclientsourcebodyimpl.h
--- a/mmserv/tms/tmsimpl/inc/tmsclientsourcebodyimpl.h	Mon Jun 21 16:15:34 2010 +0300
+++ b/mmserv/tms/tmsimpl/inc/tmsclientsourcebodyimpl.h	Thu Jul 15 19:13:36 2010 +0300
@@ -27,6 +27,7 @@
 // FORWARD DECLARATIONS
 class TMSClientSourceObserver;
 class TMSBuffer;
+class TMSGlobalContext;
 class TMSCallProxy;
 
 // TMSClientSourceBodyImpl class
@@ -35,13 +36,11 @@
     {
 public:
     static gint Create(TMSClientSourceBody*& bodyimpl);
-    // From TMSClientSourceBody begins
 
     virtual ~TMSClientSourceBodyImpl();
 
     virtual gint AddObserver(TMSClientSourceObserver& obsrvr,
             gpointer user_data);
-
     virtual gint RemoveObserver(TMSClientSourceObserver& obsrvr);
 
     // In pull mode, client calls this.??? How to identify last buffer.
@@ -60,13 +59,10 @@
 
     virtual gint GetType(TMSSourceType& sourcetype);
 
-    // From TMSClientSourceBody ends
-
-    // From MQueueHandlerObserver starts
+    // From MQueueHandlerObserver
     virtual void QueueEvent(TInt aEventType, TInt aError, void* user_data);
-    // From MQueueHandlerObserver ends
 
-    void SetProxy(TMSCallProxy* aProxy, gint strmid, gpointer queuehandler);
+    void SetProxy(TMSGlobalContext* context, gpointer queuehandler);
 
 private:
     TMSClientSourceBodyImpl();
@@ -75,9 +71,9 @@
 private:
     TMSClientSourceObserver* iObserver;
     gpointer iUserData;
+    TMSGlobalContext* iContext;
     TMSCallProxy* iProxy;
     gboolean iQueueMode;
-    gint iStreamId;
     };
 
 } //namespace TMS