revert r1783

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

1 files changed, 70 insertions, 70 deletions

diff --git a/src/apps/mplayerc/QuicktimeGraph.h b/src/apps/mplayerc/QuicktimeGraph.h
index b88d48f1e..a64be3b83 100644
--- a/src/apps/mplayerc/QuicktimeGraph.h
+++ b/src/apps/mplayerc/QuicktimeGraph.h
@@ -30,99 +30,99 @@
 namespace DSObjects

 {

 

-class CQuicktimeGraph;

+	class CQuicktimeGraph;

 

-class CQuicktimeWindow : public CPlayerWindow

-{

-    CDC m_dc;

-    CBitmap m_bm;

-    QT::GWorldPtr m_offscreenGWorld;

+	class CQuicktimeWindow : public CPlayerWindow

+	{

+		CDC m_dc;

+		CBitmap m_bm;

+		QT::GWorldPtr m_offscreenGWorld;

 

-    CQuicktimeGraph* m_pGraph;

-    FILTER_STATE m_fs;

-    UINT m_idEndPoller;

+		CQuicktimeGraph* m_pGraph;

+		FILTER_STATE m_fs;

+		UINT m_idEndPoller;

 

-    static QT::OSErr MyMovieDrawingCompleteProc(QT::Movie theMovie, long refCon);

+		static QT::OSErr MyMovieDrawingCompleteProc(QT::Movie theMovie, long refCon);

 

-    void ProcessMovieEvent(unsigned int message, unsigned int wParam, long lParam);

+		void ProcessMovieEvent(unsigned int message, unsigned int wParam, long lParam);

 

-protected:

-    virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);

+	protected:

+		virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);

 

-public:

-    CQuicktimeWindow(CQuicktimeGraph* pGraph);

+	public:

+		CQuicktimeWindow(CQuicktimeGraph* pGraph);

 

-    bool OpenMovie(CString fn);

-    void CloseMovie();

+		bool OpenMovie(CString fn);

+		void CloseMovie();

 

-    void Run(), Pause(), Stop();

-    FILTER_STATE GetState();

+		void Run(), Pause(), Stop();

+		FILTER_STATE GetState();

 

-    QT::Movie		theMovie;

-    QT::MovieController	theMC;

-    CSize			m_size;

+		QT::Movie		theMovie;

+		QT::MovieController	theMC;

+		CSize			m_size;

 

-public:

-    DECLARE_MESSAGE_MAP()

-    afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);

-    afx_msg void OnDestroy();

-    afx_msg BOOL OnEraseBkgnd(CDC* pDC);

-    afx_msg void OnTimer(UINT_PTR nIDEvent);

-};

+	public:

+		DECLARE_MESSAGE_MAP()

+		afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);

+		afx_msg void OnDestroy();

+		afx_msg BOOL OnEraseBkgnd(CDC* pDC);

+		afx_msg void OnTimer(UINT_PTR nIDEvent);

+	};

 

-class CQuicktimeGraph : public CBaseGraph, public IVideoFrameStep

-{

-protected:

-    bool m_fQtInitialized;

+	class CQuicktimeGraph : public CBaseGraph, public IVideoFrameStep

+	{

+	protected:

+		bool m_fQtInitialized;

 

-    CPlayerWindow m_wndWindowFrame;

-    CQuicktimeWindow m_wndDestFrame;

+		CPlayerWindow m_wndWindowFrame;

+		CQuicktimeWindow m_wndDestFrame;

 

-    CComPtr<ISubPicAllocatorPresenter> m_pQTAP;

+		CComPtr<ISubPicAllocatorPresenter> m_pQTAP;

 

-public:

-    CQuicktimeGraph(HWND hParent, HRESULT& hr);

-    virtual ~CQuicktimeGraph();

+	public:

+		CQuicktimeGraph(HWND hParent, HRESULT& hr);

+		virtual ~CQuicktimeGraph();

 

-    DECLARE_IUNKNOWN;

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

+		DECLARE_IUNKNOWN;

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

 

-protected:

-    // IGraphBuilder

-    STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

+	protected:

+		// IGraphBuilder

+		STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

 

-    // IMediaControl

-    STDMETHODIMP Run();

-    STDMETHODIMP Pause();

-    STDMETHODIMP Stop();

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

+		// 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);

-    STDMETHODIMP SetRate(double dRate);

-    STDMETHODIMP GetRate(double* pdRate);

+		// IMediaSeeking

+		STDMETHODIMP GetDuration(LONGLONG* pDuration);

+		STDMETHODIMP GetCurrentPosition(LONGLONG* pCurrent);

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

+		STDMETHODIMP SetRate(double dRate);

+		STDMETHODIMP GetRate(double* pdRate);

 

-    // IVideoWindow

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

+		// 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);

+		// 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);

+		// IBasicAudio

+		STDMETHODIMP put_Volume(long lVolume);

+		STDMETHODIMP get_Volume(long* plVolume);

 

-    // IVideoFrameStep

-    STDMETHODIMP Step(DWORD dwFrames, IUnknown* pStepObject);

-    STDMETHODIMP CanStep(long bMultiple, IUnknown* pStepObject);

-    STDMETHODIMP CancelStep();

+			// IVideoFrameStep

+		STDMETHODIMP Step(DWORD dwFrames, IUnknown* pStepObject);

+		STDMETHODIMP CanStep(long bMultiple, IUnknown* pStepObject);    

+		STDMETHODIMP CancelStep();

 

-    // IGraphEngine

-    STDMETHODIMP_(engine_t) GetEngine();

-};

+		// IGraphEngine

+		STDMETHODIMP_(engine_t) GetEngine();

+	};

 

 }

 using namespace DSObjects;