Changed : merge with Beliyaal branch

Added : support for madVR (new Video Renderer)

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

10 files changed, 15 insertions, 6 deletions

diff --git a/src/filters/reader/asyncreader/asyncio.cpp b/src/filters/reader/asyncreader/asyncio.cpp
index 9428dd052..3f6494a6f 100644
--- a/src/filters/reader/asyncreader/asyncio.cpp
+++ b/src/filters/reader/asyncreader/asyncio.cpp
@@ -161,7 +161,7 @@ CAsyncIo::Request(
         }

     }

 

-    CAsyncRequest* pRequest = new CAsyncRequest;

+    CAsyncRequest* pRequest = DNew CAsyncRequest;

 

     HRESULT hr = pRequest->Request(

                             this,

diff --git a/src/filters/reader/asyncreader/asyncrdr.cpp b/src/filters/reader/asyncreader/asyncrdr.cpp
index b41c55d7e..5e807f8cc 100644
--- a/src/filters/reader/asyncreader/asyncrdr.cpp
+++ b/src/filters/reader/asyncreader/asyncrdr.cpp
@@ -85,7 +85,7 @@ CAsyncOutputPin::InitAllocator(IMemAllocator **ppAlloc)
     CMemAllocator *pMemObject = NULL;

 

     /* Create a default memory allocator */

-    pMemObject = new CMemAllocator(NAME("Base memory allocator"),NULL, &hr);

+    pMemObject = DNew CMemAllocator(NAME("Base memory allocator"),NULL, &hr);

     if (pMemObject == NULL) {

     	return E_OUTOFMEMORY;

     }

diff --git a/src/filters/reader/asyncreader/asyncreader.vcproj b/src/filters/reader/asyncreader/asyncreader.vcproj
index c4b478812..29b12559b 100644
--- a/src/filters/reader/asyncreader/asyncreader.vcproj
+++ b/src/filters/reader/asyncreader/asyncreader.vcproj
@@ -42,6 +42,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 			/>

 			<Tool

@@ -99,6 +100,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

@@ -154,6 +156,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				DisableSpecificWarnings="4244"

 			/>

@@ -212,6 +215,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

diff --git a/src/filters/reader/asyncreader/stdafx.h b/src/filters/reader/asyncreader/stdafx.h
index 2f0ead283..ae8a67615 100644
--- a/src/filters/reader/asyncreader/stdafx.h
+++ b/src/filters/reader/asyncreader/stdafx.h
@@ -4,10 +4,11 @@
 //

 

 #pragma once

+#include "..\..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 

 // TODO: reference additional headers your program requires here

-

+#include <afx.h>

 #include <streams.h>

 

diff --git a/src/filters/reader/cddareader/stdafx.h b/src/filters/reader/cddareader/stdafx.h
index 0029f3c7e..31d136cf9 100644
--- a/src/filters/reader/cddareader/stdafx.h
+++ b/src/filters/reader/cddareader/stdafx.h
@@ -25,6 +25,7 @@
 //

 

 #pragma once

+#include "..\..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

diff --git a/src/filters/reader/cdxareader/stdafx.h b/src/filters/reader/cdxareader/stdafx.h
index 0029f3c7e..31d136cf9 100644
--- a/src/filters/reader/cdxareader/stdafx.h
+++ b/src/filters/reader/cdxareader/stdafx.h
@@ -25,6 +25,7 @@
 //

 

 #pragma once

+#include "..\..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

diff --git a/src/filters/reader/udpreader/UDPReader.cpp b/src/filters/reader/udpreader/UDPReader.cpp
index b927df68d..996496165 100644
--- a/src/filters/reader/udpreader/UDPReader.cpp
+++ b/src/filters/reader/udpreader/UDPReader.cpp
@@ -172,7 +172,7 @@ void CUDPStream::Append(BYTE* buff, int len)
 		if(m_drop) return;

 	}

 

-	m_packets.AddTail(new packet_t(buff, m_len, m_len + len));

+	m_packets.AddTail(DNew packet_t(buff, m_len, m_len + len));

 	m_len += len;

 }

 

@@ -442,6 +442,6 @@ CUDPStream::packet_t::packet_t(BYTE* p, __int64 start, __int64 end)
 	, m_end(end)

 {

 	int size = end - start;

-	m_buff = new BYTE[size];

+	m_buff = DNew BYTE[size];

 	memcpy(m_buff, p, size);

 }

diff --git a/src/filters/reader/udpreader/stdafx.h b/src/filters/reader/udpreader/stdafx.h
index 4f7b860b0..47fb81eda 100644
--- a/src/filters/reader/udpreader/stdafx.h
+++ b/src/filters/reader/udpreader/stdafx.h
@@ -25,6 +25,7 @@
 //

 

 #pragma once

+#include "..\..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

diff --git a/src/filters/reader/vtsreader/VTSReader.cpp b/src/filters/reader/vtsreader/VTSReader.cpp
index 2be16e51b..a2c6935c7 100644
--- a/src/filters/reader/vtsreader/VTSReader.cpp
+++ b/src/filters/reader/vtsreader/VTSReader.cpp
@@ -139,7 +139,7 @@ STDMETHODIMP CVTSReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)
 

 CVTSStream::CVTSStream() : m_off(0)

 {

-	m_vob.Attach(new CVobFile());

+	m_vob.Attach(DNew CVobFile());

 }

 

 CVTSStream::~CVTSStream()

diff --git a/src/filters/reader/vtsreader/stdafx.h b/src/filters/reader/vtsreader/stdafx.h
index b971954ab..fccd33b00 100644
--- a/src/filters/reader/vtsreader/stdafx.h
+++ b/src/filters/reader/vtsreader/stdafx.h
@@ -25,6 +25,7 @@
 //

 

 #pragma once

+#include "..\..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit