diff options
112 files changed, 358 insertions, 936 deletions
diff --git a/src/apps/mplayerc/ConvertDlg.cpp b/src/apps/mplayerc/ConvertDlg.cpp index 258854500..38033da46 100644 --- a/src/apps/mplayerc/ConvertDlg.cpp +++ b/src/apps/mplayerc/ConvertDlg.cpp @@ -26,7 +26,7 @@ #include <mmreg.h>
#include "mplayerc.h"
#include "..\..\filters\filters.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "FGManager.h"
#include "ConvertPropsDlg.h"
#include "ConvertResDlg.h"
diff --git a/src/apps/mplayerc/DX7AllocatorPresenter.cpp b/src/apps/mplayerc/DX7AllocatorPresenter.cpp index 9b57feee0..5933807ec 100644 --- a/src/apps/mplayerc/DX7AllocatorPresenter.cpp +++ b/src/apps/mplayerc/DX7AllocatorPresenter.cpp @@ -30,10 +30,10 @@ #include <ddraw.h>
#include <d3d.h>
#include "..\..\SubPic\DX7SubPic.h"
-#include "..\..\..\include\RealMedia\pntypes.h"
-#include "..\..\..\include\RealMedia\pnwintyp.h"
-#include "..\..\..\include\RealMedia\pncom.h"
-#include "..\..\..\include\RealMedia\rmavsurf.h"
+#include <RealMedia\pntypes.h>
+#include <RealMedia\pnwintyp.h>
+#include <RealMedia\pncom.h>
+#include <RealMedia\rmavsurf.h>
#include "IQTVideoSurface.h"
#include "IPinHook.h"
diff --git a/src/apps/mplayerc/DX9AllocatorPresenter.cpp b/src/apps/mplayerc/DX9AllocatorPresenter.cpp index ed519a1f9..fc33caf51 100644 --- a/src/apps/mplayerc/DX9AllocatorPresenter.cpp +++ b/src/apps/mplayerc/DX9AllocatorPresenter.cpp @@ -33,12 +33,12 @@ #include <d3dx9.h>
#include <Vmr9.h>
#include "..\..\SubPic\DX9SubPic.h"
-#include "..\..\..\include\RealMedia\pntypes.h"
-#include "..\..\..\include\RealMedia\pnwintyp.h"
-#include "..\..\..\include\RealMedia\pncom.h"
-#include "..\..\..\include\RealMedia\rmavsurf.h"
+#include <RealMedia\pntypes.h>
+#include <RealMedia\pnwintyp.h>
+#include <RealMedia\pncom.h>
+#include <RealMedia\rmavsurf.h>
#include "IQTVideoSurface.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "MacrovisionKicker.h"
#include "IPinHook.h"
diff --git a/src/apps/mplayerc/DeinterlacerFilter.cpp b/src/apps/mplayerc/DeinterlacerFilter.cpp index 972b071aa..803927c5d 100644 --- a/src/apps/mplayerc/DeinterlacerFilter.cpp +++ b/src/apps/mplayerc/DeinterlacerFilter.cpp @@ -1,7 +1,7 @@ #include "stdafx.h"
-#include ".\deinterlacerfilter.h"
+#include "deinterlacerfilter.h"
#include "..\..\DSUtil\MediaTypes.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
CDeinterlacerFilter::CDeinterlacerFilter(LPUNKNOWN punk, HRESULT* phr)
: CTransformFilter(NAME("CDeinterlacerFilter"), punk, __uuidof(CDeinterlacerFilter))
diff --git a/src/apps/mplayerc/EVRAllocatorPresenter.cpp b/src/apps/mplayerc/EVRAllocatorPresenter.cpp index 07c3d958a..dd933d90e 100644 --- a/src/apps/mplayerc/EVRAllocatorPresenter.cpp +++ b/src/apps/mplayerc/EVRAllocatorPresenter.cpp @@ -40,7 +40,7 @@ #include <Mferror.h>
#include "..\..\SubPic\DX9SubPic.h"
#include "IQTVideoSurface.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "MacrovisionKicker.h"
#include "IPinHook.h"
diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index 0399b19fd..972f69c89 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -25,7 +25,7 @@ #include "DX7AllocatorPresenter.h"
#include "DX9AllocatorPresenter.h"
#include "EVRAllocatorPresenter.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
// CFGFilter
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index c2f76963d..275f7d706 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -29,7 +29,7 @@ #include "EVRAllocatorPresenter.h"
#include "DeinterlacerFilter.h"
#include <initguid.h>
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include <dmodshow.h>
#include <D3d9.h>
#include <Vmr9.h>
diff --git a/src/apps/mplayerc/FakeFilterMapper2.cpp b/src/apps/mplayerc/FakeFilterMapper2.cpp index 216c9b2d5..fcbb49dae 100644 --- a/src/apps/mplayerc/FakeFilterMapper2.cpp +++ b/src/apps/mplayerc/FakeFilterMapper2.cpp @@ -22,7 +22,7 @@ #include "stdafx.h"
#include "fakefiltermapper2.h"
#include "MacrovisionKicker.h"
-#include "..\..\..\include\detours\detours.h"
+#include <detours\detours.h>
#include "..\..\DSUtil\DSUtil.h"
#include <initguid.h>
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 504832d0c..5ffd6640a 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -58,7 +58,7 @@ #include <initguid.h>
#include <uuids.h>
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include <Qnetwork.h>
//#include <qedit.h> // Casimir666 : incompatible avec D3D.h
diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h index 4f60c2e1c..394985634 100644 --- a/src/apps/mplayerc/MainFrm.h +++ b/src/apps/mplayerc/MainFrm.h @@ -48,9 +48,9 @@ #include "QuicktimeGraph.h"
#include "ShockwaveGraph.h"
-#include "..\..\..\include\IChapterInfo.h"
-#include "..\..\..\include\IKeyFrameInfo.h"
-#include "..\..\..\include\IBufferInfo.h"
+#include <IChapterInfo.h>
+#include <IKeyFrameInfo.h>
+#include <IBufferInfo.h>
#include "WebServer.h"
#include <D3d9.h>
diff --git a/src/apps/mplayerc/MediaTypesDlg.cpp b/src/apps/mplayerc/MediaTypesDlg.cpp index aa8b7d260..548b5fda9 100644 --- a/src/apps/mplayerc/MediaTypesDlg.cpp +++ b/src/apps/mplayerc/MediaTypesDlg.cpp @@ -26,7 +26,7 @@ #include "mplayerc.h"
#include "MediaTypesDlg.h"
#include "..\..\DSUtil\DSUtil.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
// CMediaTypesDlg dialog
diff --git a/src/apps/mplayerc/PPageCasimir.cpp b/src/apps/mplayerc/PPageCasimir.cpp index 591bcfcdd..689460bf3 100644 --- a/src/apps/mplayerc/PPageCasimir.cpp +++ b/src/apps/mplayerc/PPageCasimir.cpp @@ -26,8 +26,8 @@ #include "mplayerc.h"
#include "MainFrm.h"
#include "PPageOutput.h"
-#include "../../../include/moreuuids.h"
-#include ".\ppagecasimir.h"
+#include <moreuuids.h>
+#include "ppagecasimir.h"
#include <psapi.h>
// CPPageCasimir dialog
diff --git a/src/apps/mplayerc/PPageExternalFilters.cpp b/src/apps/mplayerc/PPageExternalFilters.cpp index 6810bf0d9..cedd25d48 100644 --- a/src/apps/mplayerc/PPageExternalFilters.cpp +++ b/src/apps/mplayerc/PPageExternalFilters.cpp @@ -29,7 +29,7 @@ #include "RegFilterChooserDlg.h"
#include "SelectMediaType.h"
#include "FGFilter.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include <initguid.h>
#include <Dmoreg.h>
diff --git a/src/apps/mplayerc/PPageFileInfoDetails.cpp b/src/apps/mplayerc/PPageFileInfoDetails.cpp index 4067bb3b0..3f93f4d27 100644 --- a/src/apps/mplayerc/PPageFileInfoDetails.cpp +++ b/src/apps/mplayerc/PPageFileInfoDetails.cpp @@ -29,7 +29,7 @@ #include "..\..\DSUtil\DSUtil.h"
#include "d3d9.h"
#include "Vmr9.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
// CPPageFileInfoDetails dialog
diff --git a/src/apps/mplayerc/PPageOutput.cpp b/src/apps/mplayerc/PPageOutput.cpp index c3c2a4f59..929e0df69 100644 --- a/src/apps/mplayerc/PPageOutput.cpp +++ b/src/apps/mplayerc/PPageOutput.cpp @@ -26,7 +26,7 @@ #include "mplayerc.h"
#include "MainFrm.h"
#include "PPageOutput.h"
-#include "../../../include/moreuuids.h"
+#include <moreuuids.h>
// CPPageOutput dialog
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index 16624aaf9..bec6afcd5 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -27,7 +27,7 @@ #include "mainfrm.h"
#include "PlayerCaptureDialog.h"
#include "..\..\DSUtil\DSUtil.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "..\..\filters\muxer\wavdest\wavdest.h"
#include "..\..\filters\muxer\MatroskaMuxer\MatroskaMuxer.h"
#include "..\..\filters\muxer\DSMMuxer\DSMMuxer.h"
diff --git a/src/apps/mplayerc/RealMediaGraph.cpp b/src/apps/mplayerc/RealMediaGraph.cpp index 719b5282c..c5318538a 100644 --- a/src/apps/mplayerc/RealMediaGraph.cpp +++ b/src/apps/mplayerc/RealMediaGraph.cpp @@ -27,9 +27,9 @@ #include <initguid.h>
#include "RealMediaGraph.h"
#include "RealMediaWindowlessSite.h"
-#include "..\..\..\include\RealMedia\rmavsurf.h"
-#include "..\..\..\include\RealMedia\rmaevent.h"
-#include "..\..\..\include\RealMedia\rmaprefs.h"
+#include <RealMedia\rmavsurf.h>
+#include <RealMedia\rmaevent.h>
+#include <RealMedia\rmaprefs.h>
#include "..\..\DSUtil\DSUtil.h"
#include "AuthDlg.h"
diff --git a/src/apps/mplayerc/RealMediaGraph.h b/src/apps/mplayerc/RealMediaGraph.h index 3e085f6bb..7419c9d97 100644 --- a/src/apps/mplayerc/RealMediaGraph.h +++ b/src/apps/mplayerc/RealMediaGraph.h @@ -26,22 +26,22 @@ #include "DX7AllocatorPresenter.h"
#include "DX9AllocatorPresenter.h"
-#include "..\..\..\include\RealMedia\pntypes.h"
-#include "..\..\..\include\RealMedia\pnwintyp.h"
-#include "..\..\..\include\RealMedia\pncom.h"
-#include "..\..\..\include\RealMedia\rmapckts.h"
-#include "..\..\..\include\RealMedia\rmacomm.h"
-#include "..\..\..\include\RealMedia\rmamon.h"
-#include "..\..\..\include\RealMedia\rmafiles.h"
-#include "..\..\..\include\RealMedia\rmaengin.h"
-#include "..\..\..\include\RealMedia\rmacore.h"
-#include "..\..\..\include\RealMedia\rmaclsnk.h"
-#include "..\..\..\include\RealMedia\rmaerror.h"
-#include "..\..\..\include\RealMedia\rmaauth.h"
-#include "..\..\..\include\RealMedia\rmawin.h"
-#include "..\..\..\include\RealMedia\rmasite2.h"
-#include "..\..\..\include\RealMedia\rmaausvc.h"
-#include "..\..\..\include\RealMedia\rmavsurf.h"
+#include <RealMedia\pntypes.h>
+#include <RealMedia\pnwintyp.h>
+#include <RealMedia\pncom.h>
+#include <RealMedia\rmapckts.h>
+#include <RealMedia\rmacomm.h>
+#include <RealMedia\rmamon.h>
+#include <RealMedia\rmafiles.h>
+#include <RealMedia\rmaengin.h>
+#include <RealMedia\rmacore.h>
+#include <RealMedia\rmaclsnk.h>
+#include <RealMedia\rmaerror.h>
+#include <RealMedia\rmaauth.h>
+#include <RealMedia\rmawin.h>
+#include <RealMedia\rmasite2.h>
+#include <RealMedia\rmaausvc.h>
+#include <RealMedia\rmavsurf.h>
namespace DSObjects
{
diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.h b/src/apps/mplayerc/RealMediaWindowlessSite.h index d96f49d94..a25b28747 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.h +++ b/src/apps/mplayerc/RealMediaWindowlessSite.h @@ -21,23 +21,23 @@ #pragma once
-#include "..\..\..\include\RealMedia\pntypes.h"
-#include "..\..\..\include\RealMedia\pnwintyp.h"
-#include "..\..\..\include\RealMedia\pncom.h"
-#include "..\..\..\include\RealMedia\rmapckts.h"
-#include "..\..\..\include\RealMedia\rmacomm.h"
-#include "..\..\..\include\RealMedia\rmamon.h"
-#include "..\..\..\include\RealMedia\rmafiles.h"
-#include "..\..\..\include\RealMedia\rmaengin.h"
-#include "..\..\..\include\RealMedia\rmacore.h"
-#include "..\..\..\include\RealMedia\rmaclsnk.h"
-#include "..\..\..\include\RealMedia\rmaerror.h"
-#include "..\..\..\include\RealMedia\rmaauth.h"
-#include "..\..\..\include\RealMedia\rmawin.h"
-#include "..\..\..\include\RealMedia\rmasite2.h"
-#include "..\..\..\include\RealMedia\rmaausvc.h"
-#include "..\..\..\include\RealMedia\rmavsurf.h"
-#include "..\..\..\include\RealMedia\rmaevent.h"
+#include <RealMedia\pntypes.h>
+#include <RealMedia\pnwintyp.h>
+#include <RealMedia\pncom.h>
+#include <RealMedia\rmapckts.h>
+#include <RealMedia\rmacomm.h>
+#include <RealMedia\rmamon.h>
+#include <RealMedia\rmafiles.h>
+#include <RealMedia\rmaengin.h>
+#include <RealMedia\rmacore.h>
+#include <RealMedia\rmaclsnk.h>
+#include <RealMedia\rmaerror.h>
+#include <RealMedia\rmaauth.h>
+#include <RealMedia\rmawin.h>
+#include <RealMedia\rmasite2.h>
+#include <RealMedia\rmaausvc.h>
+#include <RealMedia\rmavsurf.h>
+#include <RealMedia\rmaevent.h>
namespace DSObjects
{
diff --git a/src/apps/mplayerc/StdAfx.h b/src/apps/mplayerc/StdAfx.h index b65ccf497..3126285ca 100644 --- a/src/apps/mplayerc/StdAfx.h +++ b/src/apps/mplayerc/StdAfx.h @@ -58,7 +58,7 @@ #include <streams.h>
#include <dvdmedia.h>
#include <mpconfig.h>
-#include "..\..\..\include\qt\qt.h"
+#include <qt\qt.h>
#include "..\..\ui\ui.h"
#include "..\..\DSUtil\DSUtil.h"
diff --git a/src/apps/mplayerc/TextPassThruFilter.cpp b/src/apps/mplayerc/TextPassThruFilter.cpp index 842b23c9a..a7ed4e8f7 100644 --- a/src/apps/mplayerc/TextPassThruFilter.cpp +++ b/src/apps/mplayerc/TextPassThruFilter.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h"
#include "mainfrm.h"
#include "TextPassThruFilter.h"
-#include "..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "..\..\DSUtil\DSUtil.h"
#include "..\..\subtitles\SubtitleInputPin.h"
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 9fc599409..bba6a05f9 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -453,8 +453,8 @@ void CMPlayerCApp::SendCommandLine(HWND hWnd) /////////////////////////////////////////////////////////////////////////////
// CMPlayerCApp initialization
-#include "..\..\..\include\detours\detours.h"
-#include "..\..\..\include\winddk\ntddcdvd.h"
+#include <detours\detours.h>
+#include <winddk\ntddcdvd.h>
DETOUR_TRAMPOLINE(BOOL WINAPI Real_IsDebuggerPresent(), IsDebuggerPresent);
BOOL WINAPI Mine_IsDebuggerPresent()
diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj index 525c6d30e..bca8cc1ae 100644 --- a/src/apps/mplayerc/mplayerc.vcproj +++ b/src/apps/mplayerc/mplayerc.vcproj @@ -45,7 +45,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
+ AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
@@ -129,7 +129,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
+ AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
@@ -209,7 +209,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
+ AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
@@ -293,7 +293,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
+ AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"
diff --git a/src/decss/DeCSSInputPin.cpp b/src/decss/DeCSSInputPin.cpp index 2d121bf4c..85ba18246 100644 --- a/src/decss/DeCSSInputPin.cpp +++ b/src/decss/DeCSSInputPin.cpp @@ -31,7 +31,7 @@ #include "CSSscramble.h"
#include <initguid.h>
-#include "..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
// CDeCSSInputPin
diff --git a/src/decss/VobFile.h b/src/decss/VobFile.h index 4be1dbcb7..c5688c2fc 100644 --- a/src/decss/VobFile.h +++ b/src/decss/VobFile.h @@ -5,7 +5,7 @@ #include <atlbase.h>
#include <atlcoll.h>
//#include <winioctl.h> // platform sdk
-#include "..\..\include\winddk\ntddcdvd.h"
+#include <winddk\ntddcdvd.h>
class CDVDSession
{
diff --git a/src/decss/decss.vcproj b/src/decss/decss.vcproj index efc339df5..ff51e7508 100644 --- a/src/decss/decss.vcproj +++ b/src/decss/decss.vcproj @@ -40,8 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,10 +95,8 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -155,8 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -211,10 +207,8 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/decss/decss.vcproj.vspscc b/src/decss/decss.vcproj.vspscc deleted file mode 100644 index 78331ece4..000000000 --- a/src/decss/decss.vcproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = "relative:decss"
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
diff --git a/src/dsutil/DSUtil.cpp b/src/dsutil/DSUtil.cpp index 502768826..784d19c1b 100644 --- a/src/dsutil/DSUtil.cpp +++ b/src/dsutil/DSUtil.cpp @@ -21,10 +21,10 @@ #include "stdafx.h"
#include <Vfw.h>
-#include "..\..\include\winddk\devioctl.h"
-#include "..\..\include\winddk\ntddcdrm.h"
+#include <winddk\devioctl.h>
+#include <winddk\ntddcdrm.h>
#include "DSUtil.h"
-#include "..\..\include\moreuuids.h"
+#include <moreuuids.h>
void DumpStreamConfig(TCHAR* fn, IAMStreamConfig* pAMVSCCap)
{
diff --git a/src/dsutil/MediaTypeEx.cpp b/src/dsutil/MediaTypeEx.cpp index b674f2c73..c3bc9b67a 100644 --- a/src/dsutil/MediaTypeEx.cpp +++ b/src/dsutil/MediaTypeEx.cpp @@ -4,7 +4,7 @@ #include <mmreg.h>
#include <initguid.h>
-#include "..\..\include\moreuuids.h"
+#include <moreuuids.h>
#pragma pack(push, 1)
typedef struct
diff --git a/src/dsutil/MediaTypes.cpp b/src/dsutil/MediaTypes.cpp index 622177fc8..b7ccd18a1 100644 --- a/src/dsutil/MediaTypes.cpp +++ b/src/dsutil/MediaTypes.cpp @@ -21,7 +21,7 @@ #include "stdafx.h"
#include <initguid.h>
-#include "..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "MediaTypes.h"
#include "DSUtil.h"
diff --git a/src/dsutil/NullRenderers.cpp b/src/dsutil/NullRenderers.cpp index f92438401..0b4aa3ae7 100644 --- a/src/dsutil/NullRenderers.cpp +++ b/src/dsutil/NullRenderers.cpp @@ -21,7 +21,7 @@ #include "StdAfx.h"
#include "NullRenderers.h"
-#include "..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
// CNullRenderer
diff --git a/src/dsutil/dsutil.vcproj b/src/dsutil/dsutil.vcproj index 9daa1f469..c66a299ad 100644 --- a/src/dsutil/dsutil.vcproj +++ b/src/dsutil/dsutil.vcproj @@ -40,8 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -98,10 +97,8 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -158,8 +155,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -215,10 +211,8 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" - - + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/filters.sln b/src/filters/filters.sln index 1a248c157..76be665a1 100644 --- a/src/filters/filters.sln +++ b/src/filters/filters.sln @@ -183,13 +183,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subtitlesource", "source\su {273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baseclasses", "C:\Programme\Microsoft SDKs\Windows\v6.0\Samples\Multimedia\DirectShow\BaseClasses\baseclasses.vcproj", "{7CDC5863-9F36-468D-A634-6D7799E0A15E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MP4Splitter", "parser\mp4splitter\MP4Splitter.vcproj", "{9ED4B036-7399-4128-868D-6E71188E0277}"
ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
- {7CDC5863-9F36-468D-A634-6D7799E0A15E} = {7CDC5863-9F36-468D-A634-6D7799E0A15E}
{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49} = {2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}
EndProjectSection
EndProject
@@ -206,7 +203,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FLVSplitter", "parser\flvsp {54DDA60F-E528-4D07-A152-960A1E818680} = {54DDA60F-E528-4D07-A152-960A1E818680}
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
- {7CDC5863-9F36-468D-A634-6D7799E0A15E} = {7CDC5863-9F36-468D-A634-6D7799E0A15E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisidec", "transform\mpadecfilter\libvorbisidec\libvorbisidec.vcproj", "{A7134255-DFF3-42F7-9BC2-FAC6E71CFFAE}"
@@ -215,7 +211,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSFSplitter", "parser\ssfsp ProjectSection(ProjectDependencies) = postProject
{37768B3F-89BC-4C16-B2A8-767C5DA84C3F} = {37768B3F-89BC-4C16-B2A8-767C5DA84C3F}
{273B3149-3192-4B75-A791-470320B90812} = {273B3149-3192-4B75-A791-470320B90812}
- {7CDC5863-9F36-468D-A634-6D7799E0A15E} = {7CDC5863-9F36-468D-A634-6D7799E0A15E}
EndProjectSection
EndProject
Global
@@ -1150,38 +1145,6 @@ Global {8F998497-9C51-4FAA-83E4-1D85B22CBA13}.Release|Win32.ActiveCfg = Release|Win32
{8F998497-9C51-4FAA-83E4-1D85B22CBA13}.Release|Win32.Build.0 = Release|Win32
{8F998497-9C51-4FAA-83E4-1D85B22CBA13}.Release|x64.ActiveCfg = Release|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug lib|Win32.ActiveCfg = Debug|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug lib|Win32.Build.0 = Debug|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug lib|x64.ActiveCfg = Debug Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug lib|x64.Build.0 = Debug Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode lib|Win32.ActiveCfg = Debug Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode lib|Win32.Build.0 = Debug Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode lib|x64.ActiveCfg = Debug Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode lib|x64.Build.0 = Debug Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug|Win32.ActiveCfg = Debug|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug|Win32.Build.0 = Debug|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug|x64.ActiveCfg = Debug|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Debug|x64.Build.0 = Debug|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release lib|Win32.ActiveCfg = Release|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release lib|Win32.Build.0 = Release|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release lib|x64.ActiveCfg = Release Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release lib|x64.Build.0 = Release Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode lib|Win32.ActiveCfg = Release Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode lib|Win32.Build.0 = Release Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode lib|x64.ActiveCfg = Release Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode lib|x64.Build.0 = Release Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release Unicode|x64.Build.0 = Release Unicode|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release|Win32.ActiveCfg = Release|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release|Win32.Build.0 = Release|Win32
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release|x64.ActiveCfg = Release|x64
- {7CDC5863-9F36-468D-A634-6D7799E0A15E}.Release|x64.Build.0 = Release|x64
{9ED4B036-7399-4128-868D-6E71188E0277}.Debug lib|Win32.ActiveCfg = Debug|Win32
{9ED4B036-7399-4128-868D-6E71188E0277}.Debug lib|Win32.Build.0 = Debug|Win32
{9ED4B036-7399-4128-868D-6E71188E0277}.Debug lib|x64.ActiveCfg = Debug lib|Win32
diff --git a/src/filters/muxer/basemuxer/BaseMuxer.vcproj b/src/filters/muxer/basemuxer/BaseMuxer.vcproj index 889daa33c..3017b7c28 100644 --- a/src/filters/muxer/basemuxer/BaseMuxer.vcproj +++ b/src/filters/muxer/basemuxer/BaseMuxer.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp b/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp index 181328cc6..e2d924116 100644 --- a/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp +++ b/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp @@ -24,7 +24,7 @@ #include "BaseMuxer.h"
#include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#define MAXQUEUESIZE 100
diff --git a/src/filters/muxer/basemuxer/BaseMuxerOutputPin.cpp b/src/filters/muxer/basemuxer/BaseMuxerOutputPin.cpp index 303137e28..a00d6f503 100644 --- a/src/filters/muxer/basemuxer/BaseMuxerOutputPin.cpp +++ b/src/filters/muxer/basemuxer/BaseMuxerOutputPin.cpp @@ -27,7 +27,7 @@ #include <atlpath.h>
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
// CBaseMuxerOutputPin
diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.cpp b/src/filters/muxer/dsmmuxer/DSMMuxer.cpp index 837530949..6a03e8c59 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer.cpp +++ b/src/filters/muxer/dsmmuxer/DSMMuxer.cpp @@ -26,7 +26,7 @@ #include <initguid.h>
#include <qnetwork.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.h b/src/filters/muxer/dsmmuxer/DSMMuxer.h index a46201597..6d00eee7f 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer.h +++ b/src/filters/muxer/dsmmuxer/DSMMuxer.h @@ -22,7 +22,7 @@ #pragma once
#include "..\basemuxer\basemuxer.h"
-#include "..\..\..\..\include\dsm\dsm.h"
+#include <dsm\dsm.h>
[uuid("C6590B76-587E-4082-9125-680D0693A97B")]
class CDSMMuxerFilter : public CBaseMuxerFilter
diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj b/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj index 917fdfd82..c2e36c320 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj +++ b/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -260,6 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -331,6 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -403,6 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -475,6 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp b/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp index 4283aa325..2d593ff76 100644 --- a/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp @@ -25,7 +25,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
using namespace MatroskaWriter;
diff --git a/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj b/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj index 18ca7438b..d73cc7e24 100644 --- a/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj +++ b/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -260,6 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -331,6 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -403,6 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -475,6 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/avisplitter/AviSplitter.vcproj b/src/filters/parser/avisplitter/AviSplitter.vcproj index a0e03fc98..26a7a4559 100644 --- a/src/filters/parser/avisplitter/AviSplitter.vcproj +++ b/src/filters/parser/avisplitter/AviSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -409,7 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -482,7 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/basesplitter/BaseSplitter.cpp b/src/filters/parser/basesplitter/BaseSplitter.cpp index e1590e8d9..1991b1929 100644 --- a/src/filters/parser/basesplitter/BaseSplitter.cpp +++ b/src/filters/parser/basesplitter/BaseSplitter.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h"
#include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "..\..\switcher\AudioSwitcher\AudioSwitcher.h"
#include "BaseSplitter.h"
diff --git a/src/filters/parser/basesplitter/BaseSplitter.h b/src/filters/parser/basesplitter/BaseSplitter.h index b7c4b9f35..a0be5f146 100644 --- a/src/filters/parser/basesplitter/BaseSplitter.h +++ b/src/filters/parser/basesplitter/BaseSplitter.h @@ -24,9 +24,9 @@ #include <atlbase.h>
#include <atlcoll.h>
#include <qnetwork.h>
-#include "..\..\..\..\include\IKeyFrameInfo.h"
-#include "..\..\..\..\include\IBufferInfo.h"
-#include "..\..\..\..\include\IBitRateInfo.h"
+#include <IKeyFrameInfo.h>
+#include <IBufferInfo.h>
+#include <IBitRateInfo.h>
#include "BaseSplitterFileEx.h"
#include "AsyncReader.h"
#include "..\..\..\DSUtil\DSMPropertyBag.h"
diff --git a/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp b/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp index edd3c9429..27b1e710e 100644 --- a/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp @@ -24,7 +24,7 @@ #include <mmreg.h>
#include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
// CBaseSplitterFileEx
diff --git a/src/filters/parser/basesplitter/basesplitter.vcproj b/src/filters/parser/basesplitter/basesplitter.vcproj index 432ffd854..ae6d06e4d 100644 --- a/src/filters/parser/basesplitter/basesplitter.vcproj +++ b/src/filters/parser/basesplitter/basesplitter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/diracsplitter/DiracSplitter.cpp b/src/filters/parser/diracsplitter/DiracSplitter.cpp index 700e4ff30..2eeb175b0 100644 --- a/src/filters/parser/diracsplitter/DiracSplitter.cpp +++ b/src/filters/parser/diracsplitter/DiracSplitter.cpp @@ -23,7 +23,7 @@ #include <mmreg.h>
#include <initguid.h>
#include "DiracSplitter.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/diracsplitter/DiracSplitter.vcproj b/src/filters/parser/diracsplitter/DiracSplitter.vcproj index 4366bd412..da88f89e9 100644 --- a/src/filters/parser/diracsplitter/DiracSplitter.vcproj +++ b/src/filters/parser/diracsplitter/DiracSplitter.vcproj @@ -39,9 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -97,9 +96,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -155,9 +153,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -213,9 +210,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -271,9 +267,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -344,9 +339,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -418,9 +412,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - /> <Tool Name="VCManagedResourceCompilerTool" @@ -492,9 +485,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./libdirac" + AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/diracsplitter/DiracSplitterFile.cpp b/src/filters/parser/diracsplitter/DiracSplitterFile.cpp index 5603fe136..8c8052c60 100644 --- a/src/filters/parser/diracsplitter/DiracSplitterFile.cpp +++ b/src/filters/parser/diracsplitter/DiracSplitterFile.cpp @@ -3,7 +3,7 @@ #include "DiracSplitterFile.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
CDiracSplitterFile::CDiracSplitterFile(IAsyncReader* pAsyncReader, HRESULT& hr)
: CBaseSplitterFile(pAsyncReader, hr)
diff --git a/src/filters/parser/dsmsplitter/DSMSplitter.cpp b/src/filters/parser/dsmsplitter/DSMSplitter.cpp index 86e0eb9d1..81a350af9 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitter.cpp +++ b/src/filters/parser/dsmsplitter/DSMSplitter.cpp @@ -24,7 +24,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/dsmsplitter/DSMSplitter.vcproj b/src/filters/parser/dsmsplitter/DSMSplitter.vcproj index 74b675c0e..08c8c71b9 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitter.vcproj +++ b/src/filters/parser/dsmsplitter/DSMSplitter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -260,6 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -331,6 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -403,6 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -476,6 +483,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp b/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp index 796aec1b1..4a780f43b 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp +++ b/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h"
#include "DSMSplitterFile.h"
#include "..\..\..\DSUtil\DSUtil.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
CDSMSplitterFile::CDSMSplitterFile(IAsyncReader* pReader, HRESULT& hr, IDSMResourceBagImpl& res, IDSMChapterBagImpl& chap)
: CBaseSplitterFile(pReader, hr, DEFAULT_CACHE_LENGTH, false)
diff --git a/src/filters/parser/dsmsplitter/DSMSplitterFile.h b/src/filters/parser/dsmsplitter/DSMSplitterFile.h index cc7b70dd5..4a3679cab 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitterFile.h +++ b/src/filters/parser/dsmsplitter/DSMSplitterFile.h @@ -1,7 +1,7 @@ #pragma once
#include "..\BaseSplitter\BaseSplitter.h"
-#include "..\..\..\..\include\dsm\dsm.h"
+#include <dsm\dsm.h>
#include "..\..\..\DSUtil\DSMPropertyBag.h"
class CDSMSplitterFile : public CBaseSplitterFile
diff --git a/src/filters/parser/flvsplitter/FLVSplitter.cpp b/src/filters/parser/flvsplitter/FLVSplitter.cpp index 68c410bc7..0b781bae6 100644 --- a/src/filters/parser/flvsplitter/FLVSplitter.cpp +++ b/src/filters/parser/flvsplitter/FLVSplitter.cpp @@ -24,7 +24,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/flvsplitter/FLVSplitter.vcproj b/src/filters/parser/flvsplitter/FLVSplitter.vcproj index 8eaefc641..55f942f39 100644 --- a/src/filters/parser/flvsplitter/FLVSplitter.vcproj +++ b/src/filters/parser/flvsplitter/FLVSplitter.vcproj @@ -40,6 +40,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -95,6 +96,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -150,6 +152,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -205,6 +208,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -260,6 +264,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -330,6 +335,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -401,6 +407,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -473,6 +480,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp b/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp index d4906b9bd..8128b39c5 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp @@ -25,7 +25,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
using namespace MatroskaReader;
diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.h b/src/filters/parser/matroskasplitter/MatroskaSplitter.h index 1d65a26dc..bd093ff80 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter.h +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.h @@ -25,7 +25,7 @@ #include <atlcoll.h>
#include "MatroskaFile.h"
#include "..\BaseSplitter\BaseSplitter.h"
-#include "..\..\..\..\include\ITrackInfo.h"
+#include <ITrackInfo.h>
class MatroskaPacket : public Packet
{
diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj b/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj index 75e21b4ca..13e38eaa0 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -409,7 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -483,7 +483,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/mp4splitter/MP4Splitter.cpp b/src/filters/parser/mp4splitter/MP4Splitter.cpp index 4a329e850..d6cc329d2 100644 --- a/src/filters/parser/mp4splitter/MP4Splitter.cpp +++ b/src/filters/parser/mp4splitter/MP4Splitter.cpp @@ -25,7 +25,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "Ap4.h"
#include "Ap4File.h"
diff --git a/src/filters/parser/mp4splitter/MP4Splitter.vcproj b/src/filters/parser/mp4splitter/MP4Splitter.vcproj index c8811b4d5..465fc6f00 100644 --- a/src/filters/parser/mp4splitter/MP4Splitter.vcproj +++ b/src/filters/parser/mp4splitter/MP4Splitter.vcproj @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" DisableSpecificWarnings="4812" /> @@ -96,7 +96,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" DisableSpecificWarnings="4812" /> @@ -153,7 +153,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" DisableSpecificWarnings="4812" /> @@ -210,7 +210,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" DisableSpecificWarnings="4812" /> @@ -267,7 +267,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" DisableSpecificWarnings="4812" /> @@ -339,7 +339,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" DisableSpecificWarnings="4812" /> @@ -410,7 +410,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" DisableSpecificWarnings="4812" /> @@ -484,7 +484,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto" + AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" DisableSpecificWarnings="4812" /> diff --git a/src/filters/parser/mpasplitter/MpaSplitter.cpp b/src/filters/parser/mpasplitter/MpaSplitter.cpp index 9094738ca..dc7578836 100644 --- a/src/filters/parser/mpasplitter/MpaSplitter.cpp +++ b/src/filters/parser/mpasplitter/MpaSplitter.cpp @@ -23,7 +23,7 @@ #include <mmreg.h>
#include <initguid.h>
#include "MpaSplitter.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/mpasplitter/MpaSplitter.vcproj b/src/filters/parser/mpasplitter/MpaSplitter.vcproj index 6dc4d3d16..4517a244c 100644 --- a/src/filters/parser/mpasplitter/MpaSplitter.vcproj +++ b/src/filters/parser/mpasplitter/MpaSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -409,7 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -482,7 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/mpasplitter/MpaSplitterFile.cpp b/src/filters/parser/mpasplitter/MpaSplitterFile.cpp index 27410a2b8..24fb6edb4 100644 --- a/src/filters/parser/mpasplitter/MpaSplitterFile.cpp +++ b/src/filters/parser/mpasplitter/MpaSplitterFile.cpp @@ -24,7 +24,7 @@ #include "MpaSplitterFile.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
diff --git a/src/filters/parser/mpegsplitter/MpegSplitter.cpp b/src/filters/parser/mpegsplitter/MpegSplitter.cpp index c93444ab0..c2150ce6a 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitter.cpp +++ b/src/filters/parser/mpegsplitter/MpegSplitter.cpp @@ -23,7 +23,7 @@ #include <mmreg.h>
#include <initguid.h>
#include "MpegSplitter.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/mpegsplitter/MpegSplitter.vcproj b/src/filters/parser/mpegsplitter/MpegSplitter.vcproj index 1941cbcbe..5136a46d1 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitter.vcproj +++ b/src/filters/parser/mpegsplitter/MpegSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -409,7 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -482,7 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/mpegsplitter/MpegSplitterFile.cpp b/src/filters/parser/mpegsplitter/MpegSplitterFile.cpp index 0f4d2200d..a7beccd62 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitterFile.cpp +++ b/src/filters/parser/mpegsplitter/MpegSplitterFile.cpp @@ -24,7 +24,7 @@ #include "MpegSplitterFile.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#define MEGABYTE 1024*1024
#define ISVALIDPID(pid) (pid >= 0x10 && pid < 0x1fff)
diff --git a/src/filters/parser/nutsplitter/NutSplitter.cpp b/src/filters/parser/nutsplitter/NutSplitter.cpp index 1cc941d44..ca2bbcff5 100644 --- a/src/filters/parser/nutsplitter/NutSplitter.cpp +++ b/src/filters/parser/nutsplitter/NutSplitter.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h"
#include <initguid.h>
#include "NutSplitter.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/nutsplitter/NutSplitter.vcproj b/src/filters/parser/nutsplitter/NutSplitter.vcproj index ebcc5ede4..1671dea5e 100644 --- a/src/filters/parser/nutsplitter/NutSplitter.vcproj +++ b/src/filters/parser/nutsplitter/NutSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -410,7 +410,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -483,7 +483,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/oggsplitter/OggSplitter.cpp b/src/filters/parser/oggsplitter/OggSplitter.cpp index 6c4fe7c35..a24a68bc8 100644 --- a/src/filters/parser/oggsplitter/OggSplitter.cpp +++ b/src/filters/parser/oggsplitter/OggSplitter.cpp @@ -24,7 +24,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/oggsplitter/OggSplitter.vcproj b/src/filters/parser/oggsplitter/OggSplitter.vcproj index a8d521e3d..8f850a98d 100644 --- a/src/filters/parser/oggsplitter/OggSplitter.vcproj +++ b/src/filters/parser/oggsplitter/OggSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -409,7 +409,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -482,7 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp b/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp index e685ba91e..d667a578b 100644 --- a/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp @@ -33,7 +33,7 @@ //
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
template<typename T>
static void bswap(T& var)
diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj index 14ff162e1..6504e063d 100644 --- a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj +++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -97,6 +98,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -154,6 +156,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -211,6 +214,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -268,6 +272,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -339,6 +344,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -412,6 +418,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -485,6 +492,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/roqsplitter/RoQSplitter.cpp b/src/filters/parser/roqsplitter/RoQSplitter.cpp index 2c35ae4b1..775de44e0 100644 --- a/src/filters/parser/roqsplitter/RoQSplitter.cpp +++ b/src/filters/parser/roqsplitter/RoQSplitter.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h"
#include <initguid.h>
#include "RoQSplitter.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/roqsplitter/RoQSplitter.vcproj b/src/filters/parser/roqsplitter/RoQSplitter.vcproj index 957c34ba7..91dcf3b10 100644 --- a/src/filters/parser/roqsplitter/RoQSplitter.vcproj +++ b/src/filters/parser/roqsplitter/RoQSplitter.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -96,7 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -152,7 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -208,7 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -264,7 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -336,7 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -410,7 +410,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -483,7 +483,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" - + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/parser/ssfsplitter/SSFSplitter.cpp b/src/filters/parser/ssfsplitter/SSFSplitter.cpp index 5f0bedc40..3cbcf3530 100644 --- a/src/filters/parser/ssfsplitter/SSFSplitter.cpp +++ b/src/filters/parser/ssfsplitter/SSFSplitter.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h"
#include <initguid.h>
#include "SSFSplitter.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/parser/ssfsplitter/SSFSplitter.vcproj b/src/filters/parser/ssfsplitter/SSFSplitter.vcproj index 2454ada65..67e351c7e 100644 --- a/src/filters/parser/ssfsplitter/SSFSplitter.vcproj +++ b/src/filters/parser/ssfsplitter/SSFSplitter.vcproj @@ -40,7 +40,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -96,7 +96,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -152,7 +152,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -208,7 +208,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -264,7 +264,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -336,7 +336,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -410,7 +410,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -483,7 +483,7 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"
-
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/reader/cddareader/CDDAReader.h b/src/filters/reader/cddareader/CDDAReader.h index 329da086f..019864d3b 100644 --- a/src/filters/reader/cddareader/CDDAReader.h +++ b/src/filters/reader/cddareader/CDDAReader.h @@ -22,8 +22,8 @@ #pragma once
#include <atlbase.h>
-#include "..\..\..\..\include\winddk\devioctl.h"
-#include "..\..\..\..\include\winddk\ntddcdrm.h"
+#include <winddk\devioctl.h>
+#include <winddk\ntddcdrm.h>
#include <qnetwork.h>
#include "..\asyncreader\asyncio.h"
#include "..\asyncreader\asyncrdr.h"
diff --git a/src/filters/reader/cddareader/cddareader.vcproj b/src/filters/reader/cddareader/cddareader.vcproj index 7432dd60c..45b53ebc6 100644 --- a/src/filters/reader/cddareader/cddareader.vcproj +++ b/src/filters/reader/cddareader/cddareader.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -112,6 +113,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -184,6 +186,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -255,6 +258,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -327,6 +331,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -382,6 +387,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -437,6 +443,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -492,6 +499,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/reader/cdxareader/CDXAReader.cpp b/src/filters/reader/cdxareader/CDXAReader.cpp index b48537c6d..ac17ffb83 100644 --- a/src/filters/reader/cdxareader/CDXAReader.cpp +++ b/src/filters/reader/cdxareader/CDXAReader.cpp @@ -24,7 +24,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
#include <uuids.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
/////////
diff --git a/src/filters/reader/cdxareader/cdxareader.vcproj b/src/filters/reader/cdxareader/cdxareader.vcproj index 67bd6c415..888117c7b 100644 --- a/src/filters/reader/cdxareader/cdxareader.vcproj +++ b/src/filters/reader/cdxareader/cdxareader.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,6 +112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -183,6 +185,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -254,6 +257,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -326,6 +330,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -381,6 +386,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -436,6 +442,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -491,6 +498,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/reader/vtsreader/vtsreader.vcproj b/src/filters/reader/vtsreader/vtsreader.vcproj index 5972f1da6..74bfefdea 100644 --- a/src/filters/reader/vtsreader/vtsreader.vcproj +++ b/src/filters/reader/vtsreader/vtsreader.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -260,6 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -331,6 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -402,6 +408,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -475,6 +482,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/source/dtsac3source/DTSAC3Source.cpp b/src/filters/source/dtsac3source/DTSAC3Source.cpp index 6c47fcee3..c6101da70 100644 --- a/src/filters/source/dtsac3source/DTSAC3Source.cpp +++ b/src/filters/source/dtsac3source/DTSAC3Source.cpp @@ -24,7 +24,7 @@ #include <ks.h>
#include <initguid.h>
#include <uuids.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "dtsac3source.h"
#include "..\..\..\DSUtil\DSUtil.h"
diff --git a/src/filters/source/dtsac3source/dtsac3source.vcproj b/src/filters/source/dtsac3source/dtsac3source.vcproj index c3eada9bc..f91d37a32 100644 --- a/src/filters/source/dtsac3source/dtsac3source.vcproj +++ b/src/filters/source/dtsac3source/dtsac3source.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -260,6 +264,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -331,6 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -402,6 +408,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -474,6 +481,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/source/shoutcastsource/ShoutcastSource.cpp b/src/filters/source/shoutcastsource/ShoutcastSource.cpp index f6d17183d..9cbb8f409 100644 --- a/src/filters/source/shoutcastsource/ShoutcastSource.cpp +++ b/src/filters/source/shoutcastsource/ShoutcastSource.cpp @@ -23,7 +23,7 @@ #include <initguid.h>
#include "shoutcastsource.h"
#include "..\..\..\DSUtil\DSUtil.h"
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#define MAXFRAMESIZE ((144 * 320000 / 8000) + 1)
#define BUFFERS 2
diff --git a/src/filters/source/shoutcastsource/shoutcastsource.vcproj b/src/filters/source/shoutcastsource/shoutcastsource.vcproj index bb5e5a0bc..7c2aa4e0a 100644 --- a/src/filters/source/shoutcastsource/shoutcastsource.vcproj +++ b/src/filters/source/shoutcastsource/shoutcastsource.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,6 +112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -184,6 +186,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -255,6 +258,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -328,6 +332,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -383,6 +388,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -438,6 +444,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -493,6 +500,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/source/subtitlesource/SubtitleSource.cpp b/src/filters/source/subtitlesource/SubtitleSource.cpp index ba8af232c..ca0e08a5d 100644 --- a/src/filters/source/subtitlesource/SubtitleSource.cpp +++ b/src/filters/source/subtitlesource/SubtitleSource.cpp @@ -24,7 +24,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
static int _WIDTH = 640;
static int _HEIGHT = 480;
diff --git a/src/filters/source/subtitlesource/subtitlesource.vcproj b/src/filters/source/subtitlesource/subtitlesource.vcproj index fa961675a..b6a916b82 100644 --- a/src/filters/source/subtitlesource/subtitlesource.vcproj +++ b/src/filters/source/subtitlesource/subtitlesource.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,6 +112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -184,6 +186,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -255,6 +258,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -328,6 +332,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -383,6 +388,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -438,6 +444,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -493,6 +500,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/switcher/audioswitcher/AudioSwitcher.cpp b/src/filters/switcher/audioswitcher/AudioSwitcher.cpp index f85a69ae4..8b3682e9f 100644 --- a/src/filters/switcher/audioswitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/audioswitcher/AudioSwitcher.cpp @@ -32,7 +32,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/switcher/audioswitcher/StreamSwitcher.cpp b/src/filters/switcher/audioswitcher/StreamSwitcher.cpp index a470059b9..b3c770608 100644 --- a/src/filters/switcher/audioswitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/audioswitcher/StreamSwitcher.cpp @@ -29,7 +29,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#define BLOCKSTREAM
diff --git a/src/filters/switcher/audioswitcher/audioswitcher.vcproj b/src/filters/switcher/audioswitcher/audioswitcher.vcproj index 205bd8d1f..2258a3bad 100644 --- a/src/filters/switcher/audioswitcher/audioswitcher.vcproj +++ b/src/filters/switcher/audioswitcher/audioswitcher.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -112,6 +113,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -186,6 +188,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -258,6 +261,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -332,6 +336,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -387,6 +392,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -442,6 +448,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -497,6 +504,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/transform/QTDec/QTDec.cpp b/src/filters/transform/QTDec/QTDec.cpp deleted file mode 100644 index 1bf81d72a..000000000 --- a/src/filters/transform/QTDec/QTDec.cpp +++ /dev/null @@ -1,506 +0,0 @@ -/*
- * Copyright (C) 2003-2005 Gabest
- * http://www.gabest.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "StdAfx.h"
-#include <atlbase.h>
-#include "..\..\..\DSUtil\MediaTypes.h"
-#include <initguid.h>
-#include "qtdec.h"
-
-using namespace QT;
-
-static DWORD DWSWAP(DWORD dw) {return(((dw&0xff)<<24)|((dw&0xff00)<<8)|((dw&0xff0000)>>8)|((dw&0xff000000)>>24));}
-
-#ifdef REGISTER_FILTER
-
-const AMOVIESETUP_MEDIATYPE sudPinTypesIn[] =
-{
- {&MEDIATYPE_Video, &MEDIASUBTYPE_NULL},
-};
-
-const AMOVIESETUP_MEDIATYPE sudPinTypesOut[] =
-{
- {&MEDIATYPE_Video, &MEDIASUBTYPE_NULL},
-};
-
-const AMOVIESETUP_PIN sudpPins[] =
-{
- { L"Input", // Pins string name
- FALSE, // Is it rendered
- FALSE, // Is it an output
- FALSE, // Are we allowed none
- FALSE, // And allowed many
- &CLSID_NULL, // Connects to filter
- NULL, // Connects to pin
- countof(sudPinTypesIn), // Number of types
- sudPinTypesIn // Pin information
- },
- { L"Output", // Pins string name
- FALSE, // Is it rendered
- TRUE, // Is it an output
- FALSE, // Are we allowed none
- FALSE, // And allowed many
- &CLSID_NULL, // Connects to filter
- NULL, // Connects to pin
- countof(sudPinTypesOut), // Number of types
- sudPinTypesOut // Pin information
- }
-};
-
-const AMOVIESETUP_FILTER sudFilter =
-{
- &CLSID_QTDec, // Filter CLSID
- L"QuickTime Decoder", // String name
- MERIT_DO_NOT_USE/*MERIT_NORMAL*/, // Filter merit
- countof(sudpPins), // Number of pins
- sudpPins // Pin information
-};
-
-CFactoryTemplate g_Templates[] =
-{
- { L"QuickTime Decoder"
- , &CLSID_QTDec
- , CQTDec::CreateInstance
- , NULL
- , &sudFilter }
-};
-
-int g_cTemplates = countof(g_Templates);
-
-STDAPI DllRegisterServer()
-{
- return AMovieDllRegisterServer2(TRUE);
-}
-
-STDAPI DllUnregisterServer()
-{
- return AMovieDllRegisterServer2(FALSE);
-}
-
-extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
-
-BOOL APIENTRY DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
-{
- return DllEntryPoint((HINSTANCE)hModule, dwReason, 0); // "DllMain" of the dshow baseclasses;
-}
-
-//
-// CQTDec
-//
-
-CUnknown* WINAPI CQTDec::CreateInstance(LPUNKNOWN lpunk, HRESULT* phr)
-{
- CUnknown* punk = new CQTDec(lpunk, phr);
- if(punk == NULL) *phr = E_OUTOFMEMORY;
- return punk;
-}
-
-#endif
-
-CQTDec::CQTDec(LPUNKNOWN lpunk, HRESULT* phr)
- : CTransformFilter(NAME("CQTDec"), lpunk, CLSID_QTDec)
- , m_fQtInitialized(false)
- , m_pImageGWorld(NULL)
- , m_hImageDesc(NULL)
- , m_cinst(NULL)
-{
- if(phr) *phr = S_OK;
-
- m_fQtInitialized = false;
- if(InitializeQTML(0) != 0) {if(phr) *phr = E_FAIL; return;}
-// if(EnterMovies() != 0) {TerminateQTML(); if(phr) *phr = E_FAIL; return;}
- m_fQtInitialized = true;
-}
-
-CQTDec::~CQTDec()
-{
- if(m_cinst)
- CloseComponent(m_cinst),
- m_cinst = NULL;
-
- if(m_hImageDesc)
- DisposeHandle((Handle)m_hImageDesc),
- m_hImageDesc = NULL;
-
- FreeGWorld(m_pImageGWorld);
-
- if(m_fQtInitialized)
- {
-// ExitMovies();
- TerminateQTML();
- }
-}
-
-//
-
-GWorldPtr CQTDec::MakeGWorld()
-{
- if(!m_pOutput->IsConnected())
- return NULL;
-
- const CMediaType& mt = m_pOutput->CurrentMediaType();
- VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)mt.pbFormat;
- BITMAPINFOHEADER& bih = vih->bmiHeader;
-
- GWorldPtr pImageWorld = NULL;
- Rect rect = {0, 0, (short)abs(bih.biHeight), (short)bih.biWidth};
-
- OSType PixelFormat =
- mt.subtype == MEDIASUBTYPE_YUY2 ? kYUVSPixelFormat : // 'yuvs'
- mt.subtype == MEDIASUBTYPE_UYVY ? k2vuyPixelFormat : // '2vuy'
- mt.subtype == MEDIASUBTYPE_RGB32 ? k32BGRAPixelFormat : // 'BGRA'
- mt.subtype == MEDIASUBTYPE_RGB565 ? k16LE565PixelFormat : // 'L565'
- mt.subtype == MEDIASUBTYPE_RGB555 ? k16LE555PixelFormat : // 'L555'
- 0;
-
- if(!PixelFormat || noErr != QTNewGWorld(&pImageWorld, PixelFormat, &rect, NULL, NULL, 0))
- pImageWorld = NULL;
-
- if(pImageWorld)
- LockPixels(GetGWorldPixMap(pImageWorld));
-
- return pImageWorld;
-}
-
-void CQTDec::FreeGWorld(GWorldPtr& pImageGWorld)
-{
- if(pImageGWorld)
- {
- UnlockPixels(GetGWorldPixMap(pImageGWorld));
- DisposeGWorld(pImageGWorld);
- pImageGWorld = NULL;
- }
-}
-
-bool CQTDec::InitComponent()
-{
- if(m_cinst)
- CloseComponent(m_cinst),
- m_cinst = NULL;
-
- if(m_hImageDesc)
- DisposeHandle((Handle)m_hImageDesc),
- m_hImageDesc = NULL;
-
- if(!m_pInput->IsConnected())
- return NULL;
-
- BITMAPINFOHEADER& bih = ((VIDEOINFOHEADER*)m_pInput->CurrentMediaType().pbFormat)->bmiHeader;
-
- ComponentDescription cd = {decompressorComponentType, DWSWAP(bih.biCompression), 0, 0, 0};
- Component c = FindNextComponent(0, &cd);
- if(!c) return(false);
-
- m_cinst = OpenComponent(c);
- if(!m_cinst) return(false);
-
- ComponentResult cres;
-
- ImageSubCodecDecompressCapabilities icap;
- memset(&icap, 0, sizeof(icap));
- cres = ImageCodecInitialize(m_cinst, &icap);
-
- CodecInfo cinfo;
- memset(&cinfo, 0, sizeof(cinfo));
- cres = ImageCodecGetCodecInfo(m_cinst, &cinfo);
-
- m_hImageDesc = (ImageDescriptionHandle)NewHandleClear(sizeof(ImageDescription));
- if(!m_hImageDesc)
- return(false);
-
- (**m_hImageDesc).idSize = sizeof(ImageDescription);
- (**m_hImageDesc).cType = DWSWAP(bih.biCompression);
- (**m_hImageDesc).temporalQuality = 0;
- (**m_hImageDesc).spatialQuality = codecNormalQuality;
- (**m_hImageDesc).width = (short)bih.biWidth;
- (**m_hImageDesc).height = (short)abs(bih.biHeight);
- (**m_hImageDesc).hRes = 72 << 16;
- (**m_hImageDesc).vRes = 72 << 16;
- (**m_hImageDesc).frameCount = 1; // ?
- (**m_hImageDesc).depth = bih.biBitCount; // should be 24 for unknown/compressed types
- (**m_hImageDesc).clutID = -1;
-
- memset(&m_cdpar, 0, sizeof(m_cdpar));
- m_cdpar.imageDescription = m_hImageDesc;
- m_cdpar.startLine = 0;
- m_cdpar.stopLine = (**m_hImageDesc).height;
- m_cdpar.frameNumber = 1;
- m_cdpar.matrixFlags = 0;
- m_cdpar.matrixType = 0;
- m_cdpar.matrix = 0;
- m_cdpar.capabilities = &m_ccap;
- memset(&m_ccap, 0, sizeof(m_ccap));
- m_cdpar.accuracy = codecNormalQuality;
- m_cdpar.port = m_pImageGWorld;
- Rect rect = {0, 0, (**m_hImageDesc).height, (**m_hImageDesc).width};
- m_cdpar.srcRect = rect;
- m_cdpar.transferMode = srcCopy;
- m_cdpar.dstPixMap = **GetGWorldPixMap(m_pImageGWorld);
-
- cres = ImageCodecPreDecompress(m_cinst, &m_cdpar);
-
- return(true);
-}
-
-//
-
-HRESULT CQTDec::BreakConnect(PIN_DIRECTION dir)
-{
- if(dir == PINDIR_INPUT)
- {
- m_mts.RemoveAll();
- }
- else if(dir == PINDIR_OUTPUT)
- {
- FreeGWorld(m_pImageGWorld);
- }
-
- return __super::BreakConnect(dir);
-}
-
-HRESULT CQTDec::CompleteConnect(PIN_DIRECTION dir, IPin* pReceivePin)
-{
- if(dir == PINDIR_INPUT)
- {
- m_mts.RemoveAll();
-
- VIDEOINFOHEADER* vihin = (VIDEOINFOHEADER*)m_pInput->CurrentMediaType().pbFormat;
- BITMAPINFOHEADER& bihin = vihin->bmiHeader;
-
- CMediaType mt;
- mt.majortype = MEDIATYPE_Video;
- mt.subtype = MEDIASUBTYPE_None;
- mt.formattype = FORMAT_VideoInfo;
- mt.bFixedSizeSamples = TRUE;
- mt.bTemporalCompression = FALSE;
- mt.lSampleSize = 0;
- mt.pUnk = NULL;
-
- VIDEOINFOHEADER vih;
- memset(&vih, 0, sizeof(vih));
- vih.AvgTimePerFrame = vihin->AvgTimePerFrame;
- vih.rcSource = vihin->rcSource;
- vih.rcTarget = vihin->rcTarget;
- vih.dwBitRate = vihin->dwBitRate;
- vih.dwBitErrorRate = vihin->dwBitErrorRate;
-
- BITMAPINFOHEADER& bih = vih.bmiHeader;
- bih.biSize = sizeof(bih);
- bih.biWidth = bihin.biWidth;
- bih.biHeight = abs(bihin.biHeight);
- bih.biPlanes = 1;
- bih.biXPelsPerMeter = bih.biYPelsPerMeter = 0;
- bih.biClrUsed = bih.biClrImportant = 0;
-
-// if(fRGB32) // always can decompress to (?)
- {
- VIDEOINFOHEADER* vihout = (VIDEOINFOHEADER*)mt.AllocFormatBuffer(sizeof(VIDEOINFOHEADER));
- memcpy(vihout, &vih, sizeof(vih));
-
- BITMAPINFOHEADER& bihout = vihout->bmiHeader;
- bihout.biBitCount = 32;
- bihout.biSizeImage = bihout.biWidth*abs(bihout.biHeight)*bihout.biBitCount>>3;
-
- mt.subtype = MEDIASUBTYPE_RGB32;
-
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biCompression = BI_BITFIELDS;
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biHeight = -bih.biHeight;
- CorrectMediaType(&mt);
- m_mts.Add(mt);
-
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biCompression = BI_RGB;
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biHeight = bih.biHeight;
- CorrectMediaType(&mt);
- m_mts.Add(mt);
- }
-
-// if(fRGB16) // always can decompress to (?)
- {
- VIDEOINFOHEADER* vihout = (VIDEOINFOHEADER*)mt.AllocFormatBuffer(sizeof(VIDEOINFOHEADER));
- memcpy(vihout, &vih, sizeof(vih));
-
- BITMAPINFOHEADER& bihout = vihout->bmiHeader;
- bihout.biBitCount = 16;
- bihout.biSizeImage = bihout.biWidth*abs(bihout.biHeight)*bihout.biBitCount>>3;
-
- mt.subtype = MEDIASUBTYPE_RGB565;
-
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biCompression = BI_BITFIELDS;
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biHeight = -bih.biHeight;
- CorrectMediaType(&mt);
- m_mts.Add(mt);
-
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biCompression = BI_RGB;
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biHeight = bih.biHeight;
- CorrectMediaType(&mt);
- m_mts.Add(mt);
-
- mt.subtype = MEDIASUBTYPE_RGB555;
-
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biCompression = BI_BITFIELDS;
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biHeight = -bih.biHeight;
- CorrectMediaType(&mt);
- m_mts.Add(mt);
-
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biCompression = BI_RGB;
- ((VIDEOINFOHEADER*)mt.pbFormat)->bmiHeader.biHeight = bih.biHeight;
- CorrectMediaType(&mt);
- m_mts.Add(mt);
- }
- }
- else if(dir == PINDIR_OUTPUT)
- {
- FreeGWorld(m_pImageGWorld);
- m_pImageGWorld = MakeGWorld();
- }
-
- return __super::CompleteConnect(dir, pReceivePin);
-}
-
-HRESULT CQTDec::Transform(IMediaSample* pSample, IMediaSample* pOutSample)
-{
- HRESULT hr;
-
- BYTE* pIn = NULL;
- if(FAILED(hr = pSample->GetPointer(&pIn))) return hr;
- long len = pSample->GetActualDataLength();
- if(len <= 0) return S_FALSE;
-
- BYTE* pOut = NULL;
- if(FAILED(hr = pOutSample->GetPointer(&pOut))) return hr;
- int size = pOutSample->GetSize();
-
- VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)m_pOutput->CurrentMediaType().pbFormat;
- BITMAPINFOHEADER& bih = vih->bmiHeader;
-
- bool fInitialized = true;
-
- if(m_cinst)
- {
- AM_MEDIA_TYPE* pmt = NULL;
- if(S_OK == pSample->GetMediaType((AM_MEDIA_TYPE**)&pmt) && pmt)
- {
- CMediaType mt(*pmt);
- DeleteMediaType(pmt), pmt = NULL;
-
- if(mt != m_pInput->CurrentMediaType())
- {
- m_pInput->SetMediaType(&mt);
- fInitialized = InitComponent();
- }
- }
- }
- else
- {
- fInitialized = InitComponent();
- }
-
- if(!fInitialized)
- return E_FAIL;
-
- m_cdpar.data = (Ptr)pIn;
- m_cdpar.bufferSize = len;
- (**m_cdpar.imageDescription).dataSize = len;
- ComponentResult cres = ImageCodecBandDecompress(m_cinst, &m_cdpar);
- m_cdpar.frameNumber++;
-
- if(cres == noErr)
- {
- PixMapHandle hPixMap = GetGWorldPixMap(m_pImageGWorld);
- Ptr pPixels = GetPixBaseAddr(hPixMap);
- long theRowBytes = QTGetPixMapHandleRowBytes(hPixMap);
-
- DWORD pitch = bih.biWidth*bih.biBitCount>>3;
-
- for(int i = 0, h = abs(bih.biHeight); i < h; i++)
- {
- memcpy(pOut + i*pitch, (BYTE*)pPixels + i*theRowBytes, min(pitch, theRowBytes));
- }
- }
-
- return S_OK;
-}
-
-HRESULT CQTDec::CheckInputType(const CMediaType* mtIn)
-{
- if(mtIn->majortype != MEDIATYPE_Video || mtIn->formattype != FORMAT_VideoInfo)
- return VFW_E_TYPE_NOT_ACCEPTED;
-
- VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)mtIn->pbFormat;
- BITMAPINFOHEADER& bih = vih->bmiHeader;
-
- OSErr err;
- ComponentInstance ci;
- if(noErr == (err = OpenADefaultComponent('imdc', DWSWAP(bih.biCompression), &ci)))
- {
- err = CloseComponent(ci);
- return S_OK;
- }
-
- return VFW_E_TYPE_NOT_ACCEPTED;
-}
-
-HRESULT CQTDec::CheckTransform(const CMediaType* mtIn, const CMediaType* mtOut)
-{
- return S_OK;
- // TODO
- return VFW_E_TYPE_NOT_ACCEPTED;
-}
-
-HRESULT CQTDec::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROPERTIES* pProperties)
-{
- if(m_pInput->IsConnected() == FALSE) return E_UNEXPECTED;
-
- CComPtr<IMemAllocator> pAllocatorIn;
- m_pInput->GetAllocator(&pAllocatorIn);
- if(!pAllocatorIn) return E_UNEXPECTED;
-
- pAllocatorIn->GetProperties(pProperties);
-
- VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)m_pInput->CurrentMediaType().pbFormat;
- BITMAPINFOHEADER& bih = vih->bmiHeader;
-
- pProperties->cBuffers = 1;
- pProperties->cbBuffer = bih.biWidth*abs(bih.biHeight)*4; // TODO
- pProperties->cbAlign = 1;
- pProperties->cbPrefix = 0;
-
- HRESULT hr;
- ALLOCATOR_PROPERTIES Actual;
- if(FAILED(hr = pAllocator->SetProperties(pProperties, &Actual)))
- return hr;
-
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
- ? E_FAIL
- : NOERROR);
-}
-
-HRESULT CQTDec::GetMediaType(int iPosition, CMediaType* pmt)
-{
- if(m_pInput->IsConnected() == FALSE) return E_UNEXPECTED;
-
- if(iPosition < 0) return E_INVALIDARG;
- if(iPosition >= m_mts.GetCount()) return VFW_S_NO_MORE_ITEMS;
-
- *pmt = m_mts[iPosition];
-
- return S_OK;
-}
diff --git a/src/filters/transform/QTDec/QTDec.def b/src/filters/transform/QTDec/QTDec.def deleted file mode 100644 index f8822eac2..000000000 --- a/src/filters/transform/QTDec/QTDec.def +++ /dev/null @@ -1,7 +0,0 @@ -LIBRARY "QTDec.ax"
-
-EXPORTS
- DllCanUnloadNow PRIVATE
- DllGetClassObject PRIVATE
- DllRegisterServer PRIVATE
- DllUnregisterServer PRIVATE
diff --git a/src/filters/transform/QTDec/QTDec.h b/src/filters/transform/QTDec/QTDec.h deleted file mode 100644 index 37f7fc3b0..000000000 --- a/src/filters/transform/QTDec/QTDec.h +++ /dev/null @@ -1,66 +0,0 @@ -/*
- * Copyright (C) 2003-2005 Gabest
- * http://www.gabest.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#pragma once
-
-#include <afxtempl.h>
-#include "..\..\..\..\include\qt\qt.h"
-
-//
-// CQTDec
-//
-
-// {2D261619-3822-4856-A422-DC77BF0FB947}
-DEFINE_GUID(CLSID_QTDec,
-0x2d261619, 0x3822, 0x4856, 0xa4, 0x22, 0xdc, 0x77, 0xbf, 0xf, 0xb9, 0x47);
-
-class CQTDec : public CTransformFilter
-{
- bool m_fQtInitialized;
- CArray<CMediaType> m_mts;
-
- QT::GWorldPtr m_pImageGWorld;
- QT::GWorldPtr MakeGWorld();
- void FreeGWorld(QT::GWorldPtr& pImageGWorld);
-
- QT::ComponentInstance m_cinst;
- QT::CodecCapabilities m_ccap;
- QT::CodecDecompressParams m_cdpar;
- QT::ImageDescriptionHandle m_hImageDesc;
- bool InitComponent();
-
-public:
- CQTDec(LPUNKNOWN lpunk, HRESULT* phr);
- virtual ~CQTDec();
-
-#ifdef REGISTER_FILTER
- static CUnknown* WINAPI CreateInstance(LPUNKNOWN lpunk, HRESULT* phr);
-#endif
-
- HRESULT BreakConnect(PIN_DIRECTION dir);
- HRESULT CompleteConnect(PIN_DIRECTION dir, IPin* pReceivePin);
-
- HRESULT Transform(IMediaSample* pIn, IMediaSample* pOut);
- HRESULT CheckInputType(const CMediaType* mtIn);
- HRESULT CheckTransform(const CMediaType* mtIn, const CMediaType* mtOut);
- HRESULT DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROPERTIES* pProperties);
- HRESULT GetMediaType(int iPosition, CMediaType* pMediaType);
-};
diff --git a/src/filters/transform/QTDec/stdafx.cpp b/src/filters/transform/QTDec/stdafx.cpp deleted file mode 100644 index 12d18da8e..000000000 --- a/src/filters/transform/QTDec/stdafx.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/*
- * Copyright (C) 2003-2005 Gabest
- * http://www.gabest.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-// stdafx.cpp : source file that includes just the standard includes
-// QTDec.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/filters/transform/QTDec/stdafx.h b/src/filters/transform/QTDec/stdafx.h deleted file mode 100644 index 25d525b95..000000000 --- a/src/filters/transform/QTDec/stdafx.h +++ /dev/null @@ -1,43 +0,0 @@ -/*
- * Copyright (C) 2003-2005 Gabest
- * http://www.gabest.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-// TODO: reference additional headers your program requires here
-
-#include <streams.h>
-#include <dvdmedia.h>
-#include "..\..\..\..\include\qt\qt.h"
diff --git a/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp b/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp index f3daf455f..b3f06d565 100644 --- a/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp +++ b/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp @@ -25,7 +25,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#ifdef REGISTER_FILTER
diff --git a/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj b/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj index 60238dd75..07c33b3f9 100644 --- a/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj +++ b/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,6 +112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -184,6 +186,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -255,6 +258,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -328,6 +332,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -383,6 +388,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -438,6 +444,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -493,6 +500,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp index 6255a0a85..c4b701c37 100644 --- a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp +++ b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp @@ -26,7 +26,7 @@ #include "..\..\..\DSUtil\MediaTypes.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
//
// CBaseVideoFilter
diff --git a/src/filters/transform/basevideofilter/basevideofilter.vcproj b/src/filters/transform/basevideofilter/basevideofilter.vcproj index 6eeef0d0a..07de5709d 100644 --- a/src/filters/transform/basevideofilter/basevideofilter.vcproj +++ b/src/filters/transform/basevideofilter/basevideofilter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.cpp b/src/filters/transform/mpadecfilter/MpaDecFilter.cpp index 7abbfc7a1..d1a89a7c0 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.cpp +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.cpp @@ -28,7 +28,7 @@ #include "..\..\..\DSUtil\DSUtil.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#include "faad2\include\neaacdec.h"
diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj b/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj index 10787b1bb..9a37037a1 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,6 +112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -183,6 +185,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -254,6 +257,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -326,6 +330,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -383,6 +388,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -440,6 +446,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -497,6 +504,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp index 42bc95313..924337cf3 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp @@ -34,7 +34,7 @@ #include "..\..\..\DSUtil\MediaTypes.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
#define EPSILON 1e-4
@@ -86,7 +86,7 @@ STDAPI DllUnregisterServer() //
-#include "..\..\..\..\include\detours\detours.h"
+#include <detours\detours.h>
DETOUR_TRAMPOLINE(BOOL WINAPI Real_IsDebuggerPresent(), IsDebuggerPresent);
BOOL WINAPI Mine_IsDebuggerPresent()
@@ -777,7 +777,7 @@ HRESULT CMpeg2DecFilter::Deliver(bool fRepeatLast) return hr;
}
-#include "..\..\..\..\include\IFilterVersion.h"
+#include <IFilterVersion.h>
HRESULT CMpeg2DecFilter::CheckConnect(PIN_DIRECTION dir, IPin* pPin)
{
diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj index be1f67f29..ca7cb2565 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -111,6 +112,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -185,6 +187,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -257,6 +260,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -329,6 +333,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -386,6 +391,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -443,6 +449,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -500,6 +507,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG" + AdditionalIncludeDirectories="..\..\..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/src/filters/transform/vsfilter/Copy.cpp b/src/filters/transform/vsfilter/Copy.cpp index 9d19b6222..ea8cffcd3 100644 --- a/src/filters/transform/vsfilter/Copy.cpp +++ b/src/filters/transform/vsfilter/Copy.cpp @@ -23,7 +23,7 @@ #include "..\..\..\DSUtil\MediaTypes.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
extern int c2y_yb[256];
extern int c2y_yg[256];
diff --git a/src/filters/transform/vsfilter/DirectVobSub.h b/src/filters/transform/vsfilter/DirectVobSub.h index 1f44b33a6..58a88a59c 100644 --- a/src/filters/transform/vsfilter/DirectVobSub.h +++ b/src/filters/transform/vsfilter/DirectVobSub.h @@ -22,7 +22,7 @@ #pragma once
#include "IDirectVobSub.h"
-#include "..\..\..\..\include\IFilterVersion.h"
+#include <IFilterVersion.h>
class CDirectVobSub : public IDirectVobSub2, public IFilterVersion
{
diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp index 7cd0cf319..185c631e8 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp @@ -31,7 +31,7 @@ #include "..\..\..\SubPic\MemSubPic.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
///////////////////////////////////////////////////////////////////////////
diff --git a/src/filters/transform/vsfilter/VSFilter.cpp b/src/filters/transform/vsfilter/VSFilter.cpp index 0ace5ae2c..40fcbd45c 100644 --- a/src/filters/transform/vsfilter/VSFilter.cpp +++ b/src/filters/transform/vsfilter/VSFilter.cpp @@ -26,7 +26,7 @@ #include "..\..\..\DSUtil\MediaTypes.h"
#include <initguid.h>
-#include "..\..\..\..\include\moreuuids.h"
+#include <moreuuids.h>
/////////////////////////////////////////////////////////////////////////////
// CVSFilterApp
diff --git a/src/filters/transform/vsfilter/VSFilter.vcproj b/src/filters/transform/vsfilter/VSFilter.vcproj index 4cc2b38a6..52e65116f 100644 --- a/src/filters/transform/vsfilter/VSFilter.vcproj +++ b/src/filters/transform/vsfilter/VSFilter.vcproj @@ -44,6 +44,7 @@ PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;WINVER=0x0500;_WIN32_WINNT=0x501;ISOLATION_AWARE_ENABLED;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\$(OutDir)/$(ProjectName).pch"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -120,6 +121,7 @@ PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;WINVER=0x0500;_WIN32_WINNT=0x501;ISOLATION_AWARE_ENABLED;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\$(OutDir)/$(ProjectName).pch"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -197,6 +199,7 @@ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;WINVER=0x0500;_WIN32_WINNT=0x501;ISOLATION_AWARE_ENABLED;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\$(OutDir)/$(ProjectName).pch"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -276,6 +279,7 @@ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;WINVER=0x0500;_WIN32_WINNT=0x501;ISOLATION_AWARE_ENABLED;"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\$(OutDir)/$(ProjectName).pch"
+ AdditionalIncludeDirectories="..\..\..\..\include"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/src/filters/transform/vsfilter/plugins.cpp b/src/filters/transform/vsfilter/plugins.cpp index 4d3c969b9..7101a7198 100644 --- a/src/filters/transform/vsfilter/plugins.cpp +++ b/src/filters/transform/vsfilter/plugins.cpp @@ -240,7 +240,7 @@ public: namespace VirtualDub
{
- #include "..\..\..\..\include\VirtualDub\VirtualDub.h"
+ #include <VirtualDub\VirtualDub.h>
class CVirtualDubFilter : virtual public CFilter
{
@@ -500,7 +500,7 @@ namespace VirtualDub namespace AviSynth1
{
- #include "..\..\..\..\include\avisynth\avisynth1.h"
+ #include <avisynth\avisynth1.h>
class CAvisynthFilter : public GenericVideoFilter, virtual public CFilter
{
@@ -589,7 +589,7 @@ namespace AviSynth1 namespace AviSynth25
{
- #include "..\..\..\..\include\avisynth\avisynth25.h"
+ #include <avisynth\avisynth25.h>
static bool s_fSwapUV = false;
diff --git a/src/subtitles/SubtitleInputPin.cpp b/src/subtitles/SubtitleInputPin.cpp index 4f44b293c..9b730ec9d 100644 --- a/src/subtitles/SubtitleInputPin.cpp +++ b/src/subtitles/SubtitleInputPin.cpp @@ -26,7 +26,7 @@ #include "SSF.h"
#include <initguid.h>
-#include "..\..\include\moreuuids.h"
+#include <moreuuids.h>
// our first format id
#define __GAB1__ "GAB1"
diff --git a/src/subtitles/VobSubFile.cpp b/src/subtitles/VobSubFile.cpp index 02ccd5c4c..ae208014e 100644 --- a/src/subtitles/VobSubFile.cpp +++ b/src/subtitles/VobSubFile.cpp @@ -22,7 +22,7 @@ #include "stdafx.h"
#include <winioctl.h>
#include "TextFile.h"
-#include "..\..\include\unrar\unrar.h"
+#include <unrar\unrar.h>
#include "VobSubFile.h"
//
diff --git a/src/subtitles/subtitles.vcproj b/src/subtitles/subtitles.vcproj index 96e2074b3..beccfc6e1 100644 --- a/src/subtitles/subtitles.vcproj +++ b/src/subtitles/subtitles.vcproj @@ -40,6 +40,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;" + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -95,6 +96,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;" + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -150,6 +152,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;_DEBUG;" + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -205,6 +208,7 @@ <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;" + AdditionalIncludeDirectories="..\..\include" /> <Tool Name="VCManagedResourceCompilerTool" |