[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] flash/flashhost/pub flash_guest_player.h, 1.38,
From: ping () helixcommunity ! org
Date: 2008-04-25 22:58:42
Message-ID: 200804252259.m3PMx0oY016303 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/flash/flashhost/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv3601/pub
Modified Files:
flash_guest_player.h flash_guest_player_ns.h
Log Message:
Overhaul windowless Flash support
Index: flash_guest_player.h
===================================================================
RCS file: /cvsroot/datatype/flash/flashhost/pub/flash_guest_player.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- flash_guest_player.h 21 Apr 2008 21:47:45 -0000 1.38
+++ flash_guest_player.h 25 Apr 2008 22:58:40 -0000 1.39
@@ -106,6 +106,8 @@
// Forward declarations
class CHXSimpleList;
+class CFlashSiteWatcher;
+class CFlashPassiveSiteWatcher;
struct IHXCommonClassFactory;
struct IHXFileObject;
//struct IHXRequest;
@@ -113,8 +115,10 @@
#define SOURCE_URL_FLASH_CUSTOM_VAR "sourceURL"
class CFlashGuestPlayer : public IHXGuestPlayer,
+ public IHXSiteUser,
public IHXExternalInterface,
- public IHXFileMimeMapperResponse
+ public IHXFileMimeMapperResponse,
+ public IHXPassiveSiteWatcher2
{
public:
CFlashGuestPlayer();
@@ -178,12 +182,24 @@
STDMETHOD(NextPlaylistEntry) (THIS);
STDMETHOD(PreviousPlaylistEntry) (THIS);
+ // IHXSiteUser methods
+ STDMETHOD(AttachSite) (THIS_ IHXSite* pSite) PURE;
+ STDMETHOD(DetachSite) (THIS) PURE;
+ STDMETHOD(HandleEvent) (THIS_ HXxEvent* pEvent) PURE;
+ STDMETHOD_(HXBOOL,NeedsWindowedSites) (THIS) PURE;
+
// IHXExternalInterface methods
STDMETHOD(CallExternalFunction) (THIS_ IHXBuffer* pFunction) PURE;
// IHXFileMimeMapperResponse methods
STDMETHOD(MimeTypeFound) (THIS_ HX_RESULT status, const char* \
pMimeType);
+ // IHXPassiveSiteWatcher2 methods
+ STDMETHOD(PositionChanged) (THIS_ HXxPoint* pPoint);
+ STDMETHOD(SizeChanged) (THIS_ HXxSize* pSize);
+ STDMETHOD(FullScreenEntered) (THIS_ HX_RESULT status);
+ STDMETHOD(FullScreenExited) (THIS_ HX_RESULT status);
+
// Factory function for IHXGuestPlayer
static HX_RESULT STDAPICALLTYPE CreateGuestPlayer(IUnknown* pContext, \
REF(IHXGuestPlayer*) rpPlayer);
static void FixFlashURL(CHXString& pszURL, IUnknown* \
pContext, @@ -193,6 +209,9 @@
static HX_RESULT LoadResourceSWF(INT32 dResourceId, IUnknown *pContext, \
REF(IHXFileObject*) rpFileObject, REF(UINT32) ulSizeRes); #endif
+ virtual HX_RESULT _FullScreenEntered(HX_RESULT status){ return HXR_OK; };
+ virtual HX_RESULT _ExitingFullScreen(HXBOOL& bAllow) { return HXR_OK; };
+
protected:
INT32 m_lRefCount;
IUnknown* m_pContext;
@@ -243,6 +262,13 @@
IHXValues* m_pStats; // values to keep the statistics
+ CFlashSiteWatcher* m_pRootSiteWatcher;
+ CFlashPassiveSiteWatcher* m_pRootPassiveSiteWatcher;
+
+ void AddRemovePassiveSiteWatcher(IHXSite* pSite, IUnknown* pWatcher, \
HXBOOL bAdd); + void AddRemoveSiteWatcher(IHXSite* pSite, IUnknown* \
pWatcher, HXBOOL bAdd); + HX_RESULT SetWindowSizeAndPosition(void);
+
// These two methods should only be called from within the Flash plug-in \
callback method NPN_SetValue
void SetWindowless(HXBOOL bWindowless) { m_bWindowless = bWindowless; }
void SetTransparent(HXBOOL bTransparent) { m_bTransparent = bTransparent; \
}
Index: flash_guest_player_ns.h
===================================================================
RCS file: /cvsroot/datatype/flash/flashhost/pub/flash_guest_player_ns.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- flash_guest_player_ns.h 21 Apr 2008 21:47:45 -0000 1.27
+++ flash_guest_player_ns.h 25 Apr 2008 22:58:40 -0000 1.28
@@ -79,8 +79,6 @@
struct IHXFileSystemManager;
class CFlashGuestPlayerNS : public CFlashGuestPlayer
- , public IHXSiteUser
- , public IHXPassiveSiteWatcher
, public IHXFileResponse
, public IHXFileStatResponse
, public IHXFileSystemManagerResponse
@@ -121,10 +119,6 @@
STDMETHOD(HandleEvent) (THIS_ HXxEvent* pEvent);
STDMETHOD_(HXBOOL,NeedsWindowedSites) (THIS);
- // IHXPassiveSiteWatcher methods
- STDMETHOD(PositionChanged) (THIS_ HXxPoint* pPoint);
- STDMETHOD(SizeChanged) (THIS_ HXxSize* pSize);
-
// IHXExternalInterface methods
STDMETHOD(CallExternalFunction) (THIS_ IHXBuffer* pFunction);
@@ -256,8 +250,6 @@
HXBOOL CopyBitmapToOffscreenBuffer(NPRect* pInvalidRect);
HX_RESULT SurfaceUpdate(IHXVideoSurface* pVideoSurface);
- void AddRemovePassiveSiteWatcher(IHXSite* pSite, HXBOOL bAdd);
- HX_RESULT SetWindowSizeAndPosition(void);
void FinishFile();
HX_RESULT ParseNativeMediaSize(IHXBuffer* pBuffer, REF(HXxSize) rSize);
void OnFlashPlayerStateChange(const char* pszGuestState);
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic