Update of /cvsroot/player/kit/jsr135/pub
In directory cvs02.internal.helixcommunity.org:/tmp/cvs-serv30597/pub

Modified Files:
	player.h tonecontrol.h videocontrol.h 
Log Message:
Incremental update for getSnapshot

Index: player.h
===================================================================
RCS file: /cvsroot/player/kit/jsr135/pub/player.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- player.h	10 Mar 2006 01:21:01 -0000	1.12
+++ player.h	12 Apr 2006 18:18:47 -0000	1.13
@@ -160,6 +160,8 @@
                              UINT16 uOldState,
                              UINT16 uNewState);
 
+    void Unblock(TransState eState);
+    void Block(TransState eState);
 #endif
     /*
 
@@ -332,8 +334,6 @@
 		   TransState toState,
 		   IHXCallback* pCallback,
 		   HXBOOL bWait);
-    void Unblock(TransState eState);
-    void Block(TransState eState);
 
     TransState m_eTransState;
 

Index: tonecontrol.h
===================================================================
RCS file: /cvsroot/player/kit/jsr135/pub/tonecontrol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tonecontrol.h	20 Jan 2006 21:01:27 -0000	1.1
+++ tonecontrol.h	12 Apr 2006 18:18:47 -0000	1.2
@@ -31,6 +31,7 @@
 private:
     IHXPlayer* m_pPlayer;
     IHXPlayer2* m_pPlayer2;
+    IHXCommonClassFactory* m_pCCF;
 };
 
 #endif

Index: videocontrol.h
===================================================================
RCS file: /cvsroot/player/kit/jsr135/pub/videocontrol.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- videocontrol.h	4 Mar 2006 00:54:08 -0000	1.6
+++ videocontrol.h	12 Apr 2006 18:18:47 -0000	1.7
@@ -40,6 +40,8 @@
 #include "jsr135interface.h"
 #include "fivemmap.h"
 #include "hxsite2.h"
+#include "hxvsurf.h"
+//#include "png.h"
 
 struct IHXCommonClassFactory;
 struct IHXSiteSupplier;
@@ -47,6 +49,7 @@
 struct IHXPlayer;
 struct IHXValues;
 struct IHXSiteWindowed;
+struct IHXSiteCaptureResponse;
 class FiveMinuteMap;
 class _Player;
 class _MediaException;
@@ -57,7 +60,7 @@
 
 class _VideoControl 
 #ifndef SWIG
-	: public IHXSiteSupplier, public IControl, public IHXCallback
+	: public IHXSiteSupplier, public IControl, public IHXCallback, public IHXSiteCaptureResponse
 #endif
 {
 public:
@@ -88,9 +91,12 @@
 
     int getDisplayHeight();
 
-    BYTE* getSnapshot(char* imageType); // throw( _MediaException );
+    unsigned char* getSnapshot(char* imageType); // throw( _MediaException );
 
 #ifndef SWIG
+
+    int getSnapshotSize() { return m_dSnapshotSize; }
+
     /*
      * IUnknown methods
      */
@@ -159,11 +165,24 @@
     // IHXCallback
     STDMETHOD(Func)            (THIS);
 
+    /*
+     * IHXSiteCaptureResponse
+     */
+    STDMETHOD(CaptureDone)	(THIS_
+				REF(HX_RESULT) 		 status,
+                        	REF(HXBitmapInfoHeader)  bmiOutputFormat,
+                        	REF(IHXBuffer*)          pImageDataBuffer
+				);
+
     void setWindowHandle(void* hWnd) { m_hWnd = hWnd; }
 #endif
 
 private:
     HX_RESULT initHelixVideo();
+    HX_RESULT formatImage(char* imageType);
+    HX_RESULT setOutputFormat(char* imageType, HXxSize& ouptutSize, INT32& nOutputCID);
+    //static void png_write_data_buffer(png_structp png_ptr, png_bytep data, png_size_t length);
+    //HX_RESULT write_png(IHXBuffer* pImageBuffer, HXBitmapInfoHeader bmiHeader);
 
     IHXPlayer*			m_pPlayer;
     IHXSiteWindowed*		m_pSiteWindowed;
@@ -177,13 +196,18 @@
     IHXSite2*			m_pSite2;
     IHXSiteFullScreen*		m_pSiteFullScreen;
     IHXSiteManager*		m_pSiteManager;
+    IHXSiteCapture*		m_pSiteCapture;
     IHXCommonClassFactory*	m_pCCF;
     FiveMinuteMap		m_CreatedSites;
     UINT32			m_uRequestID;
     IHXValues*			m_pProps;
     IHXScheduler*		m_pScheduler;
+    IHXBuffer*			m_pCaptureBuffer;
+    HXBitmapInfoHeader		m_bmiOutputFormat;
+    HXEvent*			m_pCaptureDoneEvent;
     HXEvent*			m_pEvent;
     void* 			m_hWnd;
+    UINT32			m_dSnapshotSize;
 };
 
 #endif