diff options
Diffstat (limited to 'src/filters/renderer/VideoRenderers')
11 files changed, 25 insertions, 13 deletions
diff --git a/src/filters/renderer/VideoRenderers/AllocatorCommon.h b/src/filters/renderer/VideoRenderers/AllocatorCommon.h index e132c3c44..b0a9b8981 100644 --- a/src/filters/renderer/VideoRenderers/AllocatorCommon.h +++ b/src/filters/renderer/VideoRenderers/AllocatorCommon.h @@ -27,7 +27,6 @@ #include <d3dx9.h>
#include <Vmr9.h>
#include "../SubPic/ISubPic.h"
-#include "../SubPic/DX9SubPic.h"
#include "PixelShaderCompiler.h"
// {4E4834FA-22C2-40e2-9446-F77DD05D245E}
diff --git a/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.cpp index e15e9cf2d..d1a0785cb 100644 --- a/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.cpp @@ -25,7 +25,8 @@ #include "RenderersSettings.h"
#include "DX7AllocatorPresenter.h"
-#include "../SubPic/DX7SubPic.h"
+#include "../../../SubPic/DX7SubPic.h"
+#include "../../../SubPic/SubPicQueueImpl.h"
using namespace DSObjects;
@@ -107,7 +108,7 @@ static HRESULT TextureBlt(IDirect3DDevice7* pD3DDev, IDirectDrawSurface7* pTextu //
CDX7AllocatorPresenter::CDX7AllocatorPresenter(HWND hWnd, HRESULT& hr)
- : ISubPicAllocatorPresenterImpl(hWnd, hr, NULL)
+ : CSubPicAllocatorPresenterImpl(hWnd, hr, NULL)
, m_ScreenSize(0, 0)
{
if(FAILED(hr)) return;
diff --git a/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h b/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h index da59c1ef8..a98438695 100644 --- a/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h @@ -26,12 +26,13 @@ #include "AllocatorCommon7.h"
#include <ddraw.h>
#include <d3d.h>
+#include "../SubPic/SubPicAllocatorPresenterImpl.h"
namespace DSObjects
{
class CDX7AllocatorPresenter
- : public ISubPicAllocatorPresenterImpl
+ : public CSubPicAllocatorPresenterImpl
{
protected:
CSize m_ScreenSize;
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp index f126c8f6d..662af1e1a 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp @@ -27,7 +27,8 @@ #include <initguid.h>
#include <utility>
#include "../apps/mplayerc/resource.h"
-#include "../SubPic/DX9SubPic.h"
+#include "../../../SubPic/DX9SubPic.h"
+#include "../../../SubPic/SubPicQueueImpl.h"
#include "IPinHook.h"
CCritSec g_ffdshowReceive;
@@ -197,7 +198,7 @@ using namespace std; // CDX9AllocatorPresenter
CDX9AllocatorPresenter::CDX9AllocatorPresenter(HWND hWnd, bool bFullscreen, HRESULT& hr, bool bIsEVR, CString &_Error)
- : ISubPicAllocatorPresenterImpl(hWnd, hr, &_Error)
+ : CSubPicAllocatorPresenterImpl(hWnd, hr, &_Error)
, m_ScreenSize(0, 0)
, m_RefreshRate(0)
, m_bicubicA(0)
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.h b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.h index c3346cf76..a3785046b 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.h @@ -26,6 +26,7 @@ #include "AllocatorCommon.h"
#include "RenderersSettings.h"
#include <d3d9.h>
+#include "../SubPic/SubPicAllocatorPresenterImpl.h"
#define VMRBITMAP_UPDATE 0x80000000
#define MAX_PICTURE_SLOTS (60+2) // Last 2 for pixels shader!
@@ -39,7 +40,7 @@ namespace DSObjects {
class CDX9AllocatorPresenter
- : public ISubPicAllocatorPresenterImpl
+ : public CSubPicAllocatorPresenterImpl
{
public:
CCritSec m_VMR9AlphaBitmapLock;
diff --git a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp index 941d1b9ec..114a0c281 100644 --- a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp @@ -23,6 +23,8 @@ #include "stdafx.h"
#include "RenderersSettings.h"
#include "DXRAllocatorPresenter.h"
+#include "../../../SubPic/DX9SubPic.h"
+#include "../../../SubPic/SubPicQueueImpl.h"
#include <moreuuids.h>
using namespace DSObjects;
@@ -32,7 +34,7 @@ using namespace DSObjects; //
CDXRAllocatorPresenter::CDXRAllocatorPresenter(HWND hWnd, HRESULT& hr, CString &_Error)
- : ISubPicAllocatorPresenterImpl(hWnd, hr, &_Error)
+ : CSubPicAllocatorPresenterImpl(hWnd, hr, &_Error)
, m_ScreenSize(0, 0)
{
if(FAILED(hr))
diff --git a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h index fef02e56c..5f8bd3cd8 100644 --- a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.h @@ -23,11 +23,13 @@ #pragma once
#include "AllocatorCommon.h"
+#include "../SubPic/SubPicAllocatorPresenterImpl.h"
+#include "../SubPic/ISubRender.h"
namespace DSObjects
{
class CDXRAllocatorPresenter
- : public ISubPicAllocatorPresenterImpl
+ : public CSubPicAllocatorPresenterImpl
{
class CSubRenderCallback : public CUnknown, public ISubRenderCallback, public CCritSec
{
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index 3806759c0..29cfc4c02 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -38,6 +38,7 @@ #include <Mferror.h>
#include <vector>
#include "../../../SubPic/DX9SubPic.h"
+#include "../../../SubPic/SubPicQueueImpl.h"
#include <moreuuids.h>
#include "MacrovisionKicker.h"
#include "IPinHook.h"
@@ -133,7 +134,7 @@ CString GothSyncErrorMessage(HRESULT _Error, HMODULE _Module) }
CBaseAP::CBaseAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString &_Error):
- ISubPicAllocatorPresenterImpl(hWnd, hr, &_Error),
+ CSubPicAllocatorPresenterImpl(hWnd, hr, &_Error),
m_ScreenSize(0, 0),
m_bicubicA(0),
m_nDXSurface(1),
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.h b/src/filters/renderer/VideoRenderers/SyncRenderer.h index 3e8f3bf5a..9635d741a 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.h +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.h @@ -109,7 +109,7 @@ class CSyncRenderer; // Base allocator-presenter
class CBaseAP:
- public ISubPicAllocatorPresenterImpl
+ public CSubPicAllocatorPresenterImpl
{
protected:
CRenderersSettings::CRendererSettingsEVR m_LastRendererSettings;
diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp index 9da9fdeec..5a590f604 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp @@ -22,6 +22,8 @@ #include "stdafx.h"
#include "madVRAllocatorPresenter.h"
+#include "../../../SubPic/DX9SubPic.h"
+#include "../../../SubPic/SubPicQueueImpl.h"
#include "RenderersSettings.h"
#include <moreuuids.h>
@@ -32,7 +34,7 @@ using namespace DSObjects; //
CmadVRAllocatorPresenter::CmadVRAllocatorPresenter(HWND hWnd, HRESULT& hr, CString &_Error)
- : ISubPicAllocatorPresenterImpl(hWnd, hr, &_Error)
+ : CSubPicAllocatorPresenterImpl(hWnd, hr, &_Error)
, m_ScreenSize(0, 0)
{
if(FAILED(hr))
diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h index 1bf230a71..a245a1581 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.h @@ -23,11 +23,13 @@ #pragma once
#include "AllocatorCommon.h"
+#include "../SubPic/SubPicAllocatorPresenterImpl.h"
+#include "../SubPic/ISubRender.h"
namespace DSObjects
{
class CmadVRAllocatorPresenter
- : public ISubPicAllocatorPresenterImpl
+ : public CSubPicAllocatorPresenterImpl
{
class CSubRenderCallback : public CUnknown, public ISubRenderCallback, public CCritSec
{
|