revert r1783

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 167 insertions, 170 deletions

diff --git a/src/apps/mplayerc/RealMediaGraph.h b/src/apps/mplayerc/RealMediaGraph.h
index 8b3d0ad49..706eec4cd 100644
--- a/src/apps/mplayerc/RealMediaGraph.h
+++ b/src/apps/mplayerc/RealMediaGraph.h
@@ -49,187 +49,184 @@
 namespace DSObjects

 {

 

-class CRealMediaGraph;

+	class CRealMediaGraph;

+

+	class CRealMediaPlayer

+		: public CUnknown

+		, public IRMAErrorSink

+		, public IRMAClientAdviseSink

+		, public IRMAAuthenticationManager

+		, public IRMASiteSupplier

+		, public IRMAPassiveSiteWatcher

+		, public IRMAAudioHook

+

+	{

+	protected:

+		friend class CRealMediaGraph;

+		CRealMediaGraph* m_pRMG; // IMPORTANT: do not ever AddRef on this from here

+

+		HWND m_hWndParent;

+		CSize m_VideoSize;

+		bool m_fVideoSizeChanged;

+

+		//

+

+		DWORD m_wndStyle;

+		CPlayerWindow m_wndWindowFrame, m_wndDestFrame;

+

+		//

+

+		FPRMCREATEENGINE	m_fpCreateEngine;

+		FPRMCLOSEENGINE		m_fpCloseEngine;

+		FPRMSETDLLACCESSPATH	m_fpSetDLLAccessPath;

+		HMODULE			m_hRealMediaCore;

+

+		CComPtr<IRMAClientEngine> m_pEngine;

+		CComPtr<IRMAPlayer> m_pPlayer;

+		CComQIPtr<IRMAAudioPlayer, &IID_IRMAAudioPlayer> m_pAudioPlayer;

+		CComPtr<IRMAVolume> m_pVolume;

+		CComQIPtr<IRMASiteManager, &IID_IRMASiteManager> m_pSiteManager;

+		CComQIPtr<IRMACommonClassFactory, &IID_IRMACommonClassFactory> m_pCommonClassFactory;

 

-class CRealMediaPlayer

-    : public CUnknown

-    , public IRMAErrorSink

-    , public IRMAClientAdviseSink

-    , public IRMAAuthenticationManager

-    , public IRMASiteSupplier

-    , public IRMAPassiveSiteWatcher

-    , public IRMAAudioHook

+		CComQIPtr<IRMASite, &IID_IRMASite> m_pTheSite;

+		CComQIPtr<IRMASite2, &IID_IRMASite2> m_pTheSite2;

+		CMap<UINT32, UINT32&, IRMASite*, IRMASite*&> m_CreatedSites;

 

-{

-protected:

-    friend class CRealMediaGraph;

-    CRealMediaGraph* m_pRMG; // IMPORTANT: do not ever AddRef on this from here

-

-    HWND m_hWndParent;

-    CSize m_VideoSize;

-    bool m_fVideoSizeChanged;

-

-    //

-

-    DWORD m_wndStyle;

-    CPlayerWindow m_wndWindowFrame, m_wndDestFrame;

-

-    //

-

-    FPRMCREATEENGINE	m_fpCreateEngine;

-    FPRMCLOSEENGINE		m_fpCloseEngine;

-    FPRMSETDLLACCESSPATH	m_fpSetDLLAccessPath;

-    HMODULE			m_hRealMediaCore;

-

-    CComPtr<IRMAClientEngine> m_pEngine;

-    CComPtr<IRMAPlayer> m_pPlayer;

-    CComQIPtr<IRMAAudioPlayer, &IID_IRMAAudioPlayer> m_pAudioPlayer;

-    CComPtr<IRMAVolume> m_pVolume;

-    CComQIPtr<IRMASiteManager, &IID_IRMASiteManager> m_pSiteManager;

-    CComQIPtr<IRMACommonClassFactory, &IID_IRMACommonClassFactory> m_pCommonClassFactory;

-

-    CComQIPtr<IRMASite, &IID_IRMASite> m_pTheSite;

-    CComQIPtr<IRMASite2, &IID_IRMASite2> m_pTheSite2;

-    CMap<UINT32, UINT32&, IRMASite*, IRMASite*&> m_CreatedSites;

-

-    //

-

-    OAFilterState m_State, m_UserState;

-    REFERENCE_TIME m_nCurrent, m_nDuration;

-

-    UINT16 m_unPercentComplete;

-

-    //

-

-public:

-    CRealMediaPlayer(HWND hWndParent, CRealMediaGraph* pRMG);

-    virtual ~CRealMediaPlayer();

-

-    DECLARE_IUNKNOWN;

-    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

-

-    bool Init();

-    void Deinit();

-

-    virtual CSize GetVideoSize()

-    {

-        return(m_VideoSize);

-    }

-    virtual void SetWindowRect(CRect r) {}

-    virtual void SetDestRect(CRect r) {}

-    virtual bool CreateSite(IRMASite** pSite) = 0;

-    virtual void DestroySite(IRMASite* pSite) = 0;

-

-    // IRMAErrorSink

-    STDMETHODIMP ErrorOccurred(const UINT8 unSeverity, const UINT32 ulRMACode, const UINT32 ulUserCode, const char* pUserString, const char* pMoreInfoURL);

-

-    // IRMAClientAdviseSink

-    STDMETHODIMP OnPosLength(UINT32 ulPosition, UINT32 ulLength);

-    STDMETHODIMP OnPresentationOpened();

-    STDMETHODIMP OnPresentationClosed();

-    STDMETHODIMP OnStatisticsChanged();

-    STDMETHODIMP OnPreSeek(UINT32 ulOldTime, UINT32 ulNewTime);

-    STDMETHODIMP OnPostSeek(UINT32 ulOldTime, UINT32 ulNewTime);

-    STDMETHODIMP OnStop();

-    STDMETHODIMP OnPause(UINT32 ulTime);

-    STDMETHODIMP OnBegin(UINT32 ulTime);

-    STDMETHODIMP OnBuffering(UINT32 ulFlags, UINT16 unPercentComplete);

-    STDMETHODIMP OnContacting(const char* pHostName);

-

-    // IRMAAuthenticationManager

-    STDMETHODIMP HandleAuthenticationRequest(IRMAAuthenticationManagerResponse* pResponse);

-

-    // IRMASiteSupplier

-    STDMETHODIMP SitesNeeded(UINT32 uRequestID, IRMAValues* pSiteProps);

-    STDMETHODIMP SitesNotNeeded(UINT32 uRequestID);

-    STDMETHODIMP BeginChangeLayout();

-    STDMETHODIMP DoneChangeLayout();

-

-    // IRMAPassiveSiteWatcher

-    STDMETHODIMP PositionChanged(PNxPoint* pos);

-    STDMETHODIMP SizeChanged(PNxSize* size);

-

-    // IRMAAudioHook

-    STDMETHODIMP OnBuffer(RMAAudioData* pAudioInData, RMAAudioData* pAudioOutData);

-    STDMETHODIMP OnInit(RMAAudioFormat* pFormat);

-};

-

-class CRealMediaPlayerWindowed

-    : public CRealMediaPlayer

-{

-public:

-    CRealMediaPlayerWindowed(HWND hWndParent, CRealMediaGraph* pRMG);

-    virtual ~CRealMediaPlayerWindowed();

-

-    void SetWindowRect(CRect r);

-    void SetDestRect(CRect r);

-

-    bool CreateSite(IRMASite** pSite);

-    void DestroySite(IRMASite* pSite);

-};

-

-class CRealMediaPlayerWindowless

-    : public CRealMediaPlayer

-{

-    CComPtr<ISubPicAllocatorPresenter> m_pRMAP;

-

-public:

-    CRealMediaPlayerWindowless(HWND hWndParent, CRealMediaGraph* pRMG);

-    virtual ~CRealMediaPlayerWindowless();

-

-    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

-

-    bool CreateSite(IRMASite** pSite);

-    void DestroySite(IRMASite* pSite);

-

-    STDMETHODIMP SizeChanged(PNxSize* size);

-};

-

-class CRealMediaGraph : public CBaseGraph

-{

-    CRealMediaPlayer* m_pRMP; // TODO: access m_pRMP through a private interface

-

-    CStringW m_fn;

-

-public:

-    CRealMediaGraph(HWND hWndParent, HRESULT& hr); // in windowless mode IVideoWindow::* will return E_NOTIMPL, use ISubPicAllocatorPresenter instead

-    virtual ~CRealMediaGraph();

+		//

+

+		OAFilterState m_State, m_UserState;

+		REFERENCE_TIME m_nCurrent, m_nDuration;

+

+		UINT16 m_unPercentComplete;

 

-    DECLARE_IUNKNOWN;

-    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+		//

+

+	public:

+		CRealMediaPlayer(HWND hWndParent, CRealMediaGraph* pRMG);

+		virtual ~CRealMediaPlayer();

+

+		DECLARE_IUNKNOWN;

+		STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+

+		bool Init();

+		void Deinit();

+

+		virtual CSize GetVideoSize() {return(m_VideoSize);}

+		virtual void SetWindowRect(CRect r) {}

+		virtual void SetDestRect(CRect r) {}

+		virtual bool CreateSite(IRMASite** pSite) = 0;

+		virtual void DestroySite(IRMASite* pSite) = 0;

+

+		// IRMAErrorSink

+		STDMETHODIMP ErrorOccurred(const UINT8 unSeverity, const UINT32 ulRMACode, const UINT32 ulUserCode, const char* pUserString, const char* pMoreInfoURL);

+

+		// IRMAClientAdviseSink

+		STDMETHODIMP OnPosLength(UINT32 ulPosition, UINT32 ulLength);

+		STDMETHODIMP OnPresentationOpened();

+		STDMETHODIMP OnPresentationClosed();

+		STDMETHODIMP OnStatisticsChanged();

+		STDMETHODIMP OnPreSeek(UINT32 ulOldTime, UINT32 ulNewTime);

+		STDMETHODIMP OnPostSeek(UINT32 ulOldTime, UINT32 ulNewTime);

+		STDMETHODIMP OnStop();

+		STDMETHODIMP OnPause(UINT32 ulTime);

+		STDMETHODIMP OnBegin(UINT32 ulTime);

+		STDMETHODIMP OnBuffering(UINT32 ulFlags, UINT16 unPercentComplete);

+		STDMETHODIMP OnContacting(const char* pHostName);

+

+		// IRMAAuthenticationManager

+		STDMETHODIMP HandleAuthenticationRequest(IRMAAuthenticationManagerResponse* pResponse);

+

+		// IRMASiteSupplier

+		STDMETHODIMP SitesNeeded(UINT32 uRequestID, IRMAValues* pSiteProps);

+		STDMETHODIMP SitesNotNeeded(UINT32 uRequestID);

+		  STDMETHODIMP BeginChangeLayout();

+		STDMETHODIMP DoneChangeLayout();

+

+		// IRMAPassiveSiteWatcher

+		STDMETHODIMP PositionChanged(PNxPoint* pos);

+		STDMETHODIMP SizeChanged(PNxSize* size);

+

+		// IRMAAudioHook

+		STDMETHODIMP OnBuffer(RMAAudioData* pAudioInData, RMAAudioData* pAudioOutData);

+		STDMETHODIMP OnInit(RMAAudioFormat* pFormat);

+	};

+

+	class CRealMediaPlayerWindowed

+		: public CRealMediaPlayer

+	{

+	public:

+		CRealMediaPlayerWindowed(HWND hWndParent, CRealMediaGraph* pRMG);

+		virtual ~CRealMediaPlayerWindowed();

 

-protected:

-    // IGraphBuilder

-    STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

+		void SetWindowRect(CRect r);

+		void SetDestRect(CRect r);

 

-    // IMediaControl

-    STDMETHODIMP Run();

-    STDMETHODIMP Pause();

-    STDMETHODIMP Stop();

-    STDMETHODIMP GetState(LONG msTimeout, OAFilterState* pfs);

+		bool CreateSite(IRMASite** pSite);

+		void DestroySite(IRMASite* pSite);

+	};

 

-    // IMediaSeeking

-    STDMETHODIMP GetDuration(LONGLONG* pDuration);

-    STDMETHODIMP GetCurrentPosition(LONGLONG* pCurrent);

-    STDMETHODIMP SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags);

+	class CRealMediaPlayerWindowless

+		: public CRealMediaPlayer

+	{

+		CComPtr<ISubPicAllocatorPresenter> m_pRMAP;

 

-    // IVideoWindow

-    STDMETHODIMP SetWindowPosition(long Left, long Top, long Width, long Height);

+	public:

+		CRealMediaPlayerWindowless(HWND hWndParent, CRealMediaGraph* pRMG);

+		virtual ~CRealMediaPlayerWindowless();

 

-    // IBasicVideo

-    STDMETHODIMP SetDestinationPosition(long Left, long Top, long Width, long Height);

-    STDMETHODIMP GetVideoSize(long* pWidth, long* pHeight);

+		STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+

+		bool CreateSite(IRMASite** pSite);

+		void DestroySite(IRMASite* pSite);

+

+		STDMETHODIMP SizeChanged(PNxSize* size);

+	};

+

+	class CRealMediaGraph : public CBaseGraph

+	{

+		CRealMediaPlayer* m_pRMP; // TODO: access m_pRMP through a private interface

 

-    // IBasicAudio

-    STDMETHODIMP put_Volume(long lVolume);

-    STDMETHODIMP get_Volume(long* plVolume);

+		CStringW m_fn;

 

-    // IAMOpenProgress

-    STDMETHODIMP QueryProgress(LONGLONG* pllTotal, LONGLONG* pllCurrent);

+	public:

+		CRealMediaGraph(HWND hWndParent, HRESULT& hr); // in windowless mode IVideoWindow::* will return E_NOTIMPL, use ISubPicAllocatorPresenter instead

+		virtual ~CRealMediaGraph();

 

-    // IGraphEngine

-    STDMETHODIMP_(engine_t) GetEngine();

-};

+		DECLARE_IUNKNOWN;

+		STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+

+	protected:

+		// IGraphBuilder

+		STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

+

+		// IMediaControl

+		STDMETHODIMP Run();

+		STDMETHODIMP Pause();

+		STDMETHODIMP Stop();

+		STDMETHODIMP GetState(LONG msTimeout, OAFilterState* pfs);

+

+		// IMediaSeeking

+		STDMETHODIMP GetDuration(LONGLONG* pDuration);

+		STDMETHODIMP GetCurrentPosition(LONGLONG* pCurrent);

+		STDMETHODIMP SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags);

+

+		// IVideoWindow

+		STDMETHODIMP SetWindowPosition(long Left, long Top, long Width, long Height);

+

+		// IBasicVideo

+		STDMETHODIMP SetDestinationPosition(long Left, long Top, long Width, long Height);

+		STDMETHODIMP GetVideoSize(long* pWidth, long* pHeight);

+

+		// IBasicAudio

+		STDMETHODIMP put_Volume(long lVolume);

+		STDMETHODIMP get_Volume(long* plVolume);

+

+		// IAMOpenProgress

+		STDMETHODIMP QueryProgress(LONGLONG* pllTotal, LONGLONG* pllCurrent);

+

+		// IGraphEngine

+		STDMETHODIMP_(engine_t) GetEngine();

+	};

 

 }

 using namespace DSObjects;