--- a/qtms/inc/qtmsmembuffer.h	Wed Jun 16 16:05:08 2010 +0100
+++ b/qtms/inc/qtmsmembuffer.h	Thu Jul 22 16:38:21 2010 +0100
@@ -20,6 +20,11 @@
 
 #include <qtmsbuffer.h>
 
+// FORWARD DECLARATION
+namespace TMS {
+class TMSBuffer;
+}
+
 namespace QTMS {
 
 // QTMSMemBuffer class
@@ -29,24 +34,9 @@
     virtual ~QTMSMemBuffer();
 
     /**
-     * Creates Memory Buffer object of the given size.
-     * The memory is allocated on the heap.
-     *
-     * @param  size
-     *      Size of the buffer to be created.
-     *
-     * @param  buffer
-     *      Created buffer object.
-     *
-     * @return
-     *      TMS_RESULT_SUCCESS if buffer is created successfully.
-     *      TMS_RESULT_INSUFFICIENT_MEMORY if buffer creation failed due to
-     *      insufficient memory.
-     *      TMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED if the buffer type is not
-     *      supported.
-     *
+     * Factory methods
      */
-    static gint Create(guint size, QTMSBuffer*& buffer);
+    static gint Create(QTMSBuffer*& buffer, TMS::TMSBuffer*& tmsbuffer);
 
     /**
      * Return buffer type.
@@ -108,11 +98,14 @@
 
 private:
     QTMSMemBuffer();
-    gint PostConstruct(guint size);
+    gint PostConstruct(guint size, TMS::TMSBuffer*& tmsbuffer);
+
+protected:
+    TMS::TMSBuffer* iTmsBuffer;
 
 private:
     guint iBufferSize;
-    guint iTimeStamp;
+    guint64 iTimeStamp;
     guint8* iDataPtr;
     gboolean iOwnsBuffer;
     };