--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsclientsource.h	Thu Jun 17 11:11:56 2010 -0500
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsclientsource.h	Fri Jun 25 17:07:52 2010 -0500
@@ -18,15 +18,15 @@
 #ifndef QTMS_CLIENT_SOURCE_H
 #define QTMS_CLIENT_SOURCE_H
 
+#include <QObject>
 #include <qtms.h>
+#include <qtmsbuffer.h>
 #include <qtmssource.h>
-#include <QObject>
 #include "qtmswrapperexport.h"
 
 // FORWARD DECLARATIONS
 namespace TMS {
 class TMSSource;
-class TMSBuffer;
 }
 
 namespace QTMS {
@@ -68,7 +68,7 @@
      *      Status of the operation.
      *
      */
-    gint BufferFilled(TMS::TMSBuffer& buffer);
+    gint BufferFilled(QTMSBuffer& buffer);
 
     /**
      * In the PUSH MODE, tell the source that the supplied buffer filled in
@@ -83,7 +83,7 @@
      *      The buffer with audio data supplied by the client for playback.
      *
      */
-    gint ProcessBuffer(TMS::TMSBuffer* buffer);
+    gint ProcessBuffer(QTMSBuffer* buffer);
 
     /**
      * PUSH MODE ONLY
@@ -152,8 +152,8 @@
     virtual gint GetType(QTMSSourceType& sourcetype);
 
     Q_SIGNALS:
-    void FillBuffer(TMS::TMSBuffer& buffer);
-    void BufferProcessed(const TMS::TMSBuffer* buffer, gint reason);
+    void FillBuffer(QTMSBuffer& buffer);
+    void BufferProcessed(const QTMSBuffer* buffer, gint reason);
 
 protected:
     /**