Improved subtitle handling (should be refactored later)

Removed unnecessary methods CComPtr<> parameters

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

15 files changed, 55 insertions, 54 deletions

diff --git a/src/apps/mplayerc/ComPropertySheet.cpp b/src/apps/mplayerc/ComPropertySheet.cpp
index 1418b2ada..6f7ed3f8e 100644
--- a/src/apps/mplayerc/ComPropertySheet.cpp
+++ b/src/apps/mplayerc/ComPropertySheet.cpp
@@ -92,7 +92,7 @@ CComPropertySheet::~CComPropertySheet()
 {

 }

 

-int CComPropertySheet::AddPages(CComPtr<ISpecifyPropertyPages> pSPP)

+int CComPropertySheet::AddPages(ISpecifyPropertyPages* pSPP)

 {

     if(!pSPP) return(0);

 

@@ -102,7 +102,7 @@ int CComPropertySheet::AddPages(CComPtr<ISpecifyPropertyPages> pSPP)
         return(0);

 

     IUnknown* lpUnk = NULL;

-    if(FAILED(pSPP.QueryInterface(&lpUnk)))

+    if(FAILED(pSPP->QueryInterface(&lpUnk)))

         return(0);

 

     m_spp.AddTail(pSPP);

diff --git a/src/apps/mplayerc/ComPropertySheet.h b/src/apps/mplayerc/ComPropertySheet.h
index ada078a44..1b3b0c730 100644
--- a/src/apps/mplayerc/ComPropertySheet.h
+++ b/src/apps/mplayerc/ComPropertySheet.h
@@ -47,7 +47,7 @@ public:
     CComPropertySheet(LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);

     virtual ~CComPropertySheet();

 

-    int AddPages(CComPtr<ISpecifyPropertyPages> pSPP);

+    int AddPages(ISpecifyPropertyPages* pSPP);

     bool AddPage(IPropertyPage* pPage, IUnknown* pUnk);

 

     void OnActivated(CPropertyPage* pPage);

diff --git a/src/apps/mplayerc/DX7AllocatorPresenter.cpp b/src/apps/mplayerc/DX7AllocatorPresenter.cpp
index 2f5a2333f..89332aa73 100644
--- a/src/apps/mplayerc/DX7AllocatorPresenter.cpp
+++ b/src/apps/mplayerc/DX7AllocatorPresenter.cpp
@@ -31,11 +31,12 @@ using namespace DSObjects;
 

 //

 

-static HRESULT TextureBlt(CComPtr<IDirect3DDevice7> pD3DDev, CComPtr<IDirectDrawSurface7> pTexture, Vector dst[4], CRect src)

+static HRESULT TextureBlt(IDirect3DDevice7* pD3DDev, IDirectDrawSurface7* pTexture, Vector dst[4], CRect src)

 {

 	if(!pTexture)

 		return E_POINTER;

 

+	ASSERT(pD3DDev);

 	HRESULT hr;

 

 	do

diff --git a/src/apps/mplayerc/DX9AllocatorPresenter.cpp b/src/apps/mplayerc/DX9AllocatorPresenter.cpp
index 4c1f586c6..a3ac6dea5 100644
--- a/src/apps/mplayerc/DX9AllocatorPresenter.cpp
+++ b/src/apps/mplayerc/DX9AllocatorPresenter.cpp
@@ -82,7 +82,7 @@ static void AdjustQuad(MYD3DVERTEX<texcoords>* v, double dx, double dy)
 }

 

 template<int texcoords>

-static HRESULT TextureBlt(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<texcoords> v[4], D3DTEXTUREFILTERTYPE filter = D3DTEXF_LINEAR)

+static HRESULT TextureBlt(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<texcoords> v[4], D3DTEXTUREFILTERTYPE filter = D3DTEXF_LINEAR)

 {

     if(!pD3DDev)

         return E_POINTER;

@@ -166,7 +166,7 @@ static HRESULT TextureBlt(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<texcoor
     return E_FAIL;

 }

 

-static HRESULT DrawRect(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<0> v[4])

+static HRESULT DrawRect(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<0> v[4])

 {

     if(!pD3DDev)

         return E_POINTER;

@@ -759,7 +759,7 @@ void CDX9AllocatorPresenter::VSyncThread()
 

 DWORD WINAPI CDX9AllocatorPresenter::VSyncThreadStatic(LPVOID lpParam)

 {

-	SetThreadName(-1, "CEVRAllocatorPresenter::VSyncThread");

+	SetThreadName(-1, "CDX9Presenter::VSyncThread");

     CDX9AllocatorPresenter*		pThis = (CDX9AllocatorPresenter*) lpParam;

     pThis->VSyncThread();

     return 0;

@@ -1541,7 +1541,7 @@ HRESULT CDX9AllocatorPresenter::InitResizers(float bicubicA, bool bNeedScreenSiz
     return S_OK;

 }

 

-HRESULT CDX9AllocatorPresenter::TextureCopy(CComPtr<IDirect3DTexture9> pTexture)

+HRESULT CDX9AllocatorPresenter::TextureCopy(IDirect3DTexture9* pTexture)

 {

     HRESULT hr;

 

@@ -1591,7 +1591,7 @@ HRESULT CDX9AllocatorPresenter::DrawRect(DWORD _Color, DWORD _Alpha, const CRect
     return ::DrawRect(m_pD3DDev, v);

 }

 

-HRESULT CDX9AllocatorPresenter::TextureResize(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect)

+HRESULT CDX9AllocatorPresenter::TextureResize(IDirect3DTexture9* pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect)

 {

     HRESULT hr;

 

@@ -1626,7 +1626,7 @@ HRESULT CDX9AllocatorPresenter::TextureResize(CComPtr<IDirect3DTexture9> pTextur
     return hr;

 }

 

-HRESULT CDX9AllocatorPresenter::TextureResizeBilinear(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect)

+HRESULT CDX9AllocatorPresenter::TextureResizeBilinear(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect)

 {

     HRESULT hr;

 

@@ -1669,7 +1669,7 @@ HRESULT CDX9AllocatorPresenter::TextureResizeBilinear(CComPtr<IDirect3DTexture9>
     return hr;

 }

 

-HRESULT CDX9AllocatorPresenter::TextureResizeBicubic1pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect)

+HRESULT CDX9AllocatorPresenter::TextureResizeBicubic1pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect)

 {

     HRESULT hr;

 

@@ -1709,7 +1709,7 @@ HRESULT CDX9AllocatorPresenter::TextureResizeBicubic1pass(CComPtr<IDirect3DTextu
     return hr;

 }

 

-HRESULT CDX9AllocatorPresenter::TextureResizeBicubic2pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect)

+HRESULT CDX9AllocatorPresenter::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect)

 {

     // The 2 pass sampler is incorrect in that it only does bilinear resampling in the y direction.

     return TextureResizeBicubic1pass(pTexture, dst, SrcRect);

@@ -1822,7 +1822,7 @@ HRESULT CDX9AllocatorPresenter::TextureResizeBicubic2pass(CComPtr<IDirect3DTextu
     return hr;

 }

 

-HRESULT CDX9AllocatorPresenter::AlphaBlt(RECT* pSrc, RECT* pDst, CComPtr<IDirect3DTexture9> pTexture)

+HRESULT CDX9AllocatorPresenter::AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture)

 {

     if(!pSrc || !pDst)

         return E_POINTER;

@@ -1986,7 +1986,7 @@ bool CDX9AllocatorPresenter::GetVBlank(int &_ScanLine, int &_bInVBlank, bool _bM
     {

         D3DRASTER_STATUS RasterStatus;

         if (m_pD3DDev->GetRasterStatus(0, &RasterStatus) != S_OK)

-            return false;;

+            return false;

         ScanLine = RasterStatus.ScanLine;

         _bInVBlank = RasterStatus.InVBlank;

     }

diff --git a/src/apps/mplayerc/DX9AllocatorPresenter.h b/src/apps/mplayerc/DX9AllocatorPresenter.h
index 38d600c78..b982c4062 100644
--- a/src/apps/mplayerc/DX9AllocatorPresenter.h
+++ b/src/apps/mplayerc/DX9AllocatorPresenter.h
@@ -169,11 +169,11 @@ protected:
     virtual void OnVBlankFinished(bool fAll, LONGLONG PerformanceCounter) {}

 

     HRESULT DrawRect(DWORD _Color, DWORD _Alpha, const CRect &_Rect);

-    HRESULT TextureCopy(CComPtr<IDirect3DTexture9> pTexture);

-    HRESULT TextureResize(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect);

-    HRESULT TextureResizeBilinear(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect);

-    HRESULT TextureResizeBicubic1pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect);

-    HRESULT TextureResizeBicubic2pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect);

+    HRESULT TextureCopy(IDirect3DTexture9* pTexture);

+    HRESULT TextureResize(IDirect3DTexture9* pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect);

+    HRESULT TextureResizeBilinear(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect);

+    HRESULT TextureResizeBicubic1pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect);

+    HRESULT TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect);

 

     // Casimir666

     typedef HRESULT (WINAPI * D3DXLoadSurfaceFromMemoryPtr)(

@@ -207,7 +207,7 @@ protected:
 

     void				DrawText(const RECT &rc, const CString &strText, int _Priority);

     void				DrawStats();

-    HRESULT				AlphaBlt(RECT* pSrc, RECT* pDst, CComPtr<IDirect3DTexture9> pTexture);

+    HRESULT				AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture);

 	virtual void		OnResetDevice() {};

 	void				SendResetRequest();

 

diff --git a/src/apps/mplayerc/EVRAllocatorPresenter.cpp b/src/apps/mplayerc/EVRAllocatorPresenter.cpp
index 371b3ba73..2606150a6 100644
--- a/src/apps/mplayerc/EVRAllocatorPresenter.cpp
+++ b/src/apps/mplayerc/EVRAllocatorPresenter.cpp
@@ -1609,7 +1609,7 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(AM_MEDIA_TYPE*	pMediaType)
 

 DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)

 {

-	SetThreadName(-1, "CEVRAllocatorPresenter::MixerThread");

+	SetThreadName(-1, "CEVRPresenter::MixerThread");

     CEVRAllocatorPresenter*		pThis = (CEVRAllocatorPresenter*) lpParam;

     pThis->GetMixerThread();

     return 0;

@@ -1618,7 +1618,7 @@ DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)
 

 DWORD WINAPI CEVRAllocatorPresenter::PresentThread(LPVOID lpParam)

 {

-	SetThreadName(-1, "CEVRAllocatorPresenter::PresentThread");

+	SetThreadName(-1, "CEVRPresenter::PresentThread");

     CEVRAllocatorPresenter*		pThis = (CEVRAllocatorPresenter*) lpParam;

     pThis->RenderThread();

     return 0;

diff --git a/src/apps/mplayerc/MacrovisionKicker.cpp b/src/apps/mplayerc/MacrovisionKicker.cpp
index 9d65ab2e0..7933fbc18 100644
--- a/src/apps/mplayerc/MacrovisionKicker.cpp
+++ b/src/apps/mplayerc/MacrovisionKicker.cpp
@@ -38,7 +38,7 @@ CMacrovisionKicker::~CMacrovisionKicker()
 {

 }

 

-void CMacrovisionKicker::SetInner(CComPtr<IUnknown> pUnk)

+void CMacrovisionKicker::SetInner(IUnknown* pUnk)

 {

     m_pInner = pUnk;

 }

diff --git a/src/apps/mplayerc/MacrovisionKicker.h b/src/apps/mplayerc/MacrovisionKicker.h
index f635ea927..f033aaf0f 100644
--- a/src/apps/mplayerc/MacrovisionKicker.h
+++ b/src/apps/mplayerc/MacrovisionKicker.h
@@ -33,7 +33,7 @@ public:
     CMacrovisionKicker(const TCHAR* pName, LPUNKNOWN pUnk);

     virtual ~CMacrovisionKicker();

 

-    void SetInner(CComPtr<IUnknown> pUnk);

+    void SetInner(IUnknown* pUnk);

 

     DECLARE_IUNKNOWN;

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

diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp
index 25ecfde63..f60c9b931 100644
--- a/src/apps/mplayerc/PlayerCaptureDialog.cpp
+++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp
@@ -179,7 +179,7 @@ static void SetupDefaultCaps(AM_MEDIA_TYPE* pmt, AUDIO_STREAM_CONFIG_CAPS& caps)
 }

 

 template<class T>

-static void SetupMediaTypes(CComPtr<IAMStreamConfig> pAMSC, CFormatArray<T>& tfa, CComboBox& type, CComboBox& dim, CMediaType& mt)

+static void SetupMediaTypes(IAMStreamConfig* pAMSC, CFormatArray<T>& tfa, CComboBox& type, CComboBox& dim, CMediaType& mt)

 {

     tfa.RemoveAll();

     type.ResetContent();

@@ -898,7 +898,7 @@ void CPlayerCaptureDialog::EnableControls(CWnd* pWnd, bool fEnable)
 

 void CPlayerCaptureDialog::SetupVideoControls(

     CStringW DisplayName,

-    CComPtr<IAMStreamConfig> pAMSC, CComPtr<IAMCrossbar> pAMXB, CComPtr<IAMTVTuner> pAMTuner)

+    IAMStreamConfig* pAMSC, IAMCrossbar* pAMXB, IAMTVTuner* pAMTuner)

 {

     EmptyVideo();

 

@@ -1047,7 +1047,7 @@ void CPlayerCaptureDialog::SetupVideoControls(
 

 void CPlayerCaptureDialog::SetupVideoControls(

     CStringW DisplayName,

-    CComPtr<IAMStreamConfig> pAMSC, CComPtr<IAMVfwCaptureDialogs> pAMVfwCD)

+    IAMStreamConfig* pAMSC, IAMVfwCaptureDialogs* pAMVfwCD)

 {

     EmptyVideo();

 

@@ -1107,7 +1107,7 @@ void CPlayerCaptureDialog::SetupVideoControls(
 

 void CPlayerCaptureDialog::SetupAudioControls(

     CStringW DisplayName,

-    CComPtr<IAMStreamConfig> pAMSC, CInterfaceArray<IAMAudioInputMixer>& pAMAIM)

+    IAMStreamConfig* pAMSC, CInterfaceArray<IAMAudioInputMixer>& pAMAIM)

 {

     EmptyAudio();

 

diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h
index b6f321fc0..c2c26df8a 100644
--- a/src/apps/mplayerc/PlayerCaptureDialog.h
+++ b/src/apps/mplayerc/PlayerCaptureDialog.h
@@ -442,9 +442,9 @@ public:
     CComPtr<IBaseFilter> m_pVidBuffer, m_pAudBuffer;

 

 public:

-    void SetupVideoControls(CStringW DisplayName, CComPtr<IAMStreamConfig> pAMSC, CComPtr<IAMCrossbar> pAMXB, CComPtr<IAMTVTuner> pAMTuner);

-    void SetupVideoControls(CStringW DisplayName, CComPtr<IAMStreamConfig> pAMSC, CComPtr<IAMVfwCaptureDialogs> pAMVfwCD);

-    void SetupAudioControls(CStringW DisplayName, CComPtr<IAMStreamConfig> pAMSC, CInterfaceArray<IAMAudioInputMixer>& pAMAIM);

+    void SetupVideoControls(CStringW DisplayName, IAMStreamConfig* pAMSC, IAMCrossbar* pAMXB, IAMTVTuner* pAMTuner);

+    void SetupVideoControls(CStringW DisplayName, IAMStreamConfig* pAMSC, IAMVfwCaptureDialogs* pAMVfwCD);

+    void SetupAudioControls(CStringW DisplayName, IAMStreamConfig* pAMSC, CInterfaceArray<IAMAudioInputMixer>& pAMAIM);

 

     bool IsTunerActive();

 

diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp
index 48aa713e4..5e82767f8 100644
--- a/src/apps/mplayerc/PlayerPlaylistBar.cpp
+++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp
@@ -447,7 +447,7 @@ void CPlayerPlaylistBar::Open(CAtlList<CString>& fns, bool fMulti, CAtlList<CStr
 {

     if (!fMulti)

     {

-        ASSERT(fns.GetCount() == 1);

+        ASSERT(fns.GetCount() == 1 || fns.GetCount() == 2 && fns.GetTail().IsEmpty());

         ResolveLinkFiles(fns);

         if (SelectFileInPlaylist(fns.GetHead().GetString()))

             return;

diff --git a/src/apps/mplayerc/SyncRenderer.cpp b/src/apps/mplayerc/SyncRenderer.cpp
index a099f00ad..7beee7156 100644
--- a/src/apps/mplayerc/SyncRenderer.cpp
+++ b/src/apps/mplayerc/SyncRenderer.cpp
@@ -308,7 +308,7 @@ void CBaseAP::AdjustQuad(MYD3DVERTEX<texcoords>* v, double dx, double dy)
 }

 

 template<int texcoords>

-HRESULT CBaseAP::TextureBlt(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<texcoords> v[4], D3DTEXTUREFILTERTYPE filter = D3DTEXF_LINEAR)

+HRESULT CBaseAP::TextureBlt(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<texcoords> v[4], D3DTEXTUREFILTERTYPE filter = D3DTEXF_LINEAR)

 {

     if(!pD3DDev) return E_POINTER;

 

@@ -383,7 +383,7 @@ HRESULT CBaseAP::TextureBlt(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<texco
     return E_FAIL;

 }

 

-HRESULT CBaseAP::DrawRectBase(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<0> v[4])

+HRESULT CBaseAP::DrawRectBase(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<0> v[4])

 {

     if(!pD3DDev) return E_POINTER;

 

@@ -1271,7 +1271,7 @@ HRESULT CBaseAP::InitResizers(float bicubicA, bool bNeedScreenSizeTexture)
     return S_OK;

 }

 

-HRESULT CBaseAP::TextureCopy(CComPtr<IDirect3DTexture9> pTexture)

+HRESULT CBaseAP::TextureCopy(IDirect3DTexture9* pTexture)

 {

     HRESULT hr;

 

@@ -1315,7 +1315,7 @@ HRESULT CBaseAP::DrawRect(DWORD _Color, DWORD _Alpha, const CRect &_Rect)
     return DrawRectBase(m_pD3DDev, v);

 }

 

-HRESULT CBaseAP::TextureResize(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect)

+HRESULT CBaseAP::TextureResize(IDirect3DTexture9* pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect)

 {

     HRESULT hr;

 

@@ -1345,7 +1345,7 @@ HRESULT CBaseAP::TextureResize(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4
     return hr;

 }

 

-HRESULT CBaseAP::TextureResizeBilinear(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect)

+HRESULT CBaseAP::TextureResizeBilinear(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect)

 {

     HRESULT hr;

 

@@ -1380,7 +1380,7 @@ HRESULT CBaseAP::TextureResizeBilinear(CComPtr<IDirect3DTexture9> pTexture, Vect
     return hr;

 }

 

-HRESULT CBaseAP::TextureResizeBicubic1pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect)

+HRESULT CBaseAP::TextureResizeBicubic1pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect)

 {

     HRESULT hr;

 

@@ -1421,7 +1421,7 @@ HRESULT CBaseAP::TextureResizeBicubic1pass(CComPtr<IDirect3DTexture9> pTexture,
     return hr;

 }

 

-HRESULT CBaseAP::TextureResizeBicubic2pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect)

+HRESULT CBaseAP::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect)

 {

     // The 2 pass sampler is incorrect in that it only does bilinear resampling in the y direction.

     return TextureResizeBicubic1pass(pTexture, dst, SrcRect);

@@ -1516,7 +1516,7 @@ HRESULT CBaseAP::TextureResizeBicubic2pass(CComPtr<IDirect3DTexture9> pTexture,
     return hr;

 }

 

-HRESULT CBaseAP::AlphaBlt(RECT* pSrc, RECT* pDst, CComPtr<IDirect3DTexture9> pTexture)

+HRESULT CBaseAP::AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture)

 {

     if(!pSrc || !pDst)

         return E_POINTER;

@@ -4436,7 +4436,7 @@ HRESULT CGenlock::SetDisplayResolution(UINT columns, UINT lines)
     return S_OK;

 }

 

-HRESULT CGenlock::AdviseSyncClock(CComPtr<ISyncClock> sC)

+HRESULT CGenlock::AdviseSyncClock(ISyncClock* sC)

 {

     if (!sC) return E_FAIL;

     if (syncClock) syncClock = NULL; // Release any outstanding references if this is called repeatedly

diff --git a/src/apps/mplayerc/SyncRenderer.h b/src/apps/mplayerc/SyncRenderer.h
index d1bb1ed2b..1338333a0 100644
--- a/src/apps/mplayerc/SyncRenderer.h
+++ b/src/apps/mplayerc/SyncRenderer.h
@@ -181,18 +181,18 @@ protected:
     template<int texcoords>

     void AdjustQuad(MYD3DVERTEX<texcoords>* v, double dx, double dy);

     template<int texcoords>

-    HRESULT TextureBlt(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<texcoords> v[4], D3DTEXTUREFILTERTYPE filter);

+    HRESULT TextureBlt(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<texcoords> v[4], D3DTEXTUREFILTERTYPE filter);

     MFOffset GetOffset(float v);

     MFVideoArea GetArea(float x, float y, DWORD width, DWORD height);

     bool ClipToSurface(IDirect3DSurface9* pSurface, CRect& s, CRect& d);

 

-    HRESULT DrawRectBase(CComPtr<IDirect3DDevice9> pD3DDev, MYD3DVERTEX<0> v[4]);

+    HRESULT DrawRectBase(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<0> v[4]);

     HRESULT DrawRect(DWORD _Color, DWORD _Alpha, const CRect &_Rect);

-    HRESULT TextureCopy(CComPtr<IDirect3DTexture9> pTexture);

-    HRESULT TextureResize(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect);

-    HRESULT TextureResizeBilinear(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect);

-    HRESULT TextureResizeBicubic1pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect);

-    HRESULT TextureResizeBicubic2pass(CComPtr<IDirect3DTexture9> pTexture, Vector dst[4], const CRect &SrcRect);

+    HRESULT TextureCopy(IDirect3DTexture9* pTexture);

+    HRESULT TextureResize(IDirect3DTexture9* pTexture, Vector dst[4], D3DTEXTUREFILTERTYPE filter, const CRect &SrcRect);

+    HRESULT TextureResizeBilinear(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect);

+    HRESULT TextureResizeBicubic1pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect);

+    HRESULT TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector dst[4], const CRect &SrcRect);

 

     typedef HRESULT (WINAPI * D3DXLoadSurfaceFromMemoryPtr)(

         LPDIRECT3DSURFACE9 pDestSurface,

@@ -224,7 +224,7 @@ protected:
         LPCWSTR pFaceName,

         LPD3DXFONT* ppFont);

 

-    HRESULT AlphaBlt(RECT* pSrc, RECT* pDst, CComPtr<IDirect3DTexture9> pTexture);

+    HRESULT AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture);

 

     virtual void OnResetDevice() {};

 

@@ -630,7 +630,7 @@ public:
     HRESULT SetControlLimit(DOUBLE cL);

     HRESULT GetControlLimit(DOUBLE *cL);

     HRESULT SetDisplayResolution(UINT columns, UINT lines);

-    HRESULT AdviseSyncClock(CComPtr<ISyncClock> sC);

+    HRESULT AdviseSyncClock(ISyncClock* sC);

     HRESULT SetMonitor(UINT mon); // Set the number of the monitor to synchronize

     HRESULT ResetStats(); // Reset timing statistics

 

diff --git a/src/apps/mplayerc/VMROSD.cpp b/src/apps/mplayerc/VMROSD.cpp
index 5cae05db0..d9a25250e 100644
--- a/src/apps/mplayerc/VMROSD.cpp
+++ b/src/apps/mplayerc/VMROSD.cpp
@@ -142,7 +142,7 @@ void CVMROSD::UpdateBitmap()
 

 }

 

-void CVMROSD::Start (CWnd* pWnd, CComPtr<IVMRMixerBitmap9> pVMB)

+void CVMROSD::Start (CWnd* pWnd, IVMRMixerBitmap9* pVMB)

 {

     m_pVMB   = pVMB;

     m_pMFVMB = NULL;

@@ -151,7 +151,7 @@ void CVMROSD::Start (CWnd* pWnd, CComPtr<IVMRMixerBitmap9> pVMB)
 }

 

 

-void CVMROSD::Start (CWnd* pWnd, CComPtr<IMFVideoMixerBitmap> pMFVMB)

+void CVMROSD::Start (CWnd* pWnd, IMFVideoMixerBitmap* pMFVMB)

 {

     m_pMFVMB = pMFVMB;

     m_pVMB   = NULL;

diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h
index d9f2d05ec..58dc78fa0 100644
--- a/src/apps/mplayerc/VMROSD.h
+++ b/src/apps/mplayerc/VMROSD.h
@@ -53,8 +53,8 @@ public:
     CVMROSD(void);

     ~CVMROSD(void);

 

-    void Start (CWnd* pWnd, CComPtr<IVMRMixerBitmap9> pVMB);

-    void Start (CWnd* pWnd, CComPtr<IMFVideoMixerBitmap> pVMB);

+    void Start (CWnd* pWnd, IVMRMixerBitmap9* pVMB);

+    void Start (CWnd* pWnd, IMFVideoMixerBitmap* pVMB);

     void Stop();

 

     void DisplayMessage (OSD_MESSAGEPOS nPos, LPCTSTR strMsg, int nDuration = 5000, int FontSize = 0, CString OSD_Font = _T(""));