various #include cosmetics

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

13 files changed, 29 insertions, 29 deletions

diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp
index 076f48485..515702c4b 100644
--- a/src/apps/mplayerc/FGFilter.cpp
+++ b/src/apps/mplayerc/FGFilter.cpp
@@ -26,9 +26,9 @@
 #include "FGFilter.h"

 #include "MainFrm.h"

 #include "../../DSUtil/DSUtil.h"

-#include "AllocatorCommon7.h"

-#include "AllocatorCommon.h"

-#include "SyncAllocatorPresenter.h"

+#include <AllocatorCommon7.h>

+#include <AllocatorCommon.h>

+#include <SyncAllocatorPresenter.h>

 #include <moreuuids.h>

 

 

diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp
index eb61d6c48..aed4ca21f 100644
--- a/src/apps/mplayerc/FGManager.cpp
+++ b/src/apps/mplayerc/FGManager.cpp
@@ -27,13 +27,13 @@
 #include "FGManager.h"

 #include "../../DSUtil/DSUtil.h"

 #include "../../filters/Filters.h"

-#include "AllocatorCommon7.h"

-#include "AllocatorCommon.h"

-#include "SyncAllocatorPresenter.h"

+#include <AllocatorCommon7.h>

+#include <AllocatorCommon.h>

+#include <SyncAllocatorPresenter.h>

 #include "DeinterlacerFilter.h"

 #include "WinAPIUtils.h"

 #include "../../DeCSS/VobFile.h"

-#include <initguid.h>

+#include <InitGuid.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 d8ebdb1b7..9d3ad6440 100644
--- a/src/apps/mplayerc/FakeFilterMapper2.cpp
+++ b/src/apps/mplayerc/FakeFilterMapper2.cpp
@@ -23,10 +23,10 @@
 

 #include "stdafx.h"

 #include "FakeFilterMapper2.h"

-#include "MacrovisionKicker.h"

+#include <MacrovisionKicker.h>

 #include "../../DSUtil/DSUtil.h"

 

-#include <initguid.h>

+#include <InitGuid.h>

 #include <qedit.h>

 #include <detours/detours.h>

 

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
index 949ab8268..aef8238ad 100644
--- a/src/apps/mplayerc/MainFrm.cpp
+++ b/src/apps/mplayerc/MainFrm.cpp
@@ -57,7 +57,7 @@
 #include <dvdevcod.h>

 #include <dsound.h>

 

-#include <initguid.h>

+#include <InitGuid.h>

 #include <uuids.h>

 #include <moreuuids.h>

 #include <qnetwork.h>

@@ -72,16 +72,16 @@
 #include "../../filters/Filters.h"

 #include "../../filters/PinInfoWnd.h"

 

-#include "AllocatorCommon7.h"

-#include "AllocatorCommon.h"

-#include "SyncAllocatorPresenter.h"

+#include <AllocatorCommon7.h>

+#include <AllocatorCommon.h>

+#include <SyncAllocatorPresenter.h>

 

 #include "../../Subtitles/SSF.h"

 #include "ComPropertySheet.h"

 #include "LcdSupport.h"

 #include "SettingsDefines.h"

 

-#include "IPinHook.h"

+#include <IPinHook.h>

 

 #include "jpeg.h"

 #include <pngdib/pngdib.h>

@@ -15478,4 +15478,4 @@ void CMainFrame::WTSUnRegisterSessionNotification()
 		FreeLibrary( hWtsLib );

 		hWtsLib = NULL;

 	}

-}
\ No newline at end of file
+}

diff --git a/src/apps/mplayerc/PPageExternalFilters.cpp b/src/apps/mplayerc/PPageExternalFilters.cpp
index ea73d5024..55e4f03a0 100644
--- a/src/apps/mplayerc/PPageExternalFilters.cpp
+++ b/src/apps/mplayerc/PPageExternalFilters.cpp
@@ -23,7 +23,7 @@
 

 #include "stdafx.h"

 #include <atlpath.h>

-#include <initguid.h>

+#include <InitGuid.h>

 #include <dmoreg.h>

 #include "mplayerc.h"

 #include "PPageExternalFilters.h"

diff --git a/src/apps/mplayerc/PPageFileMediaInfo.cpp b/src/apps/mplayerc/PPageFileMediaInfo.cpp
index 4b62a9273..db4133ed5 100644
--- a/src/apps/mplayerc/PPageFileMediaInfo.cpp
+++ b/src/apps/mplayerc/PPageFileMediaInfo.cpp
@@ -28,7 +28,7 @@
 #include "PPageFileMediaInfo.h"

 

 #ifdef USE_MEDIAINFO_STATIC

-#include <MediaInfo.h>

+#include <MediaInfo/MediaInfo.h>

 using namespace MediaInfoLib;

 #else

 #include <MediaInfoDLL.h>

diff --git a/src/apps/mplayerc/QuicktimeGraph.cpp b/src/apps/mplayerc/QuicktimeGraph.cpp
index a3c2826bc..9ff556e06 100644
--- a/src/apps/mplayerc/QuicktimeGraph.cpp
+++ b/src/apps/mplayerc/QuicktimeGraph.cpp
@@ -24,7 +24,7 @@
 #include "stdafx.h"

 #include <math.h>

 #include "QuicktimeGraph.h"

-#include "IQTVideoSurface.h"

+#include <IQTVideoSurface.h>

 #include "mplayerc.h"

 #include "MainFrm.h"

 #include "../../DSUtil/DSUtil.h"

diff --git a/src/apps/mplayerc/QuicktimeGraph.h b/src/apps/mplayerc/QuicktimeGraph.h
index f3e14fc8b..5b3f9f07e 100644
--- a/src/apps/mplayerc/QuicktimeGraph.h
+++ b/src/apps/mplayerc/QuicktimeGraph.h
@@ -24,8 +24,8 @@
 #pragma once

 

 #include "BaseGraph.h"

-#include "AllocatorCommon7.h"

-#include "AllocatorCommon.h"

+#include <AllocatorCommon7.h>

+#include <AllocatorCommon.h>

 

 #ifndef _WIN64

 #include <qt/qt.h>

diff --git a/src/apps/mplayerc/RealMediaGraph.cpp b/src/apps/mplayerc/RealMediaGraph.cpp
index d7ce447e6..02ed5835e 100644
--- a/src/apps/mplayerc/RealMediaGraph.cpp
+++ b/src/apps/mplayerc/RealMediaGraph.cpp
@@ -27,7 +27,7 @@
 #include <math.h>

 #include <atlbase.h>

 #include <atlcoll.h>

-#include <initguid.h>

+#include <InitGuid.h>

 #include "RealMediaGraph.h"

 #include "RealMediaWindowlessSite.h"

 #include <realmedia/rmavsurf.h>

diff --git a/src/apps/mplayerc/RealMediaGraph.h b/src/apps/mplayerc/RealMediaGraph.h
index c4e874e69..f1c0a0cf3 100644
--- a/src/apps/mplayerc/RealMediaGraph.h
+++ b/src/apps/mplayerc/RealMediaGraph.h
@@ -24,8 +24,8 @@
 #pragma once

 

 #include "BaseGraph.h"

-#include "AllocatorCommon7.h"

-#include "AllocatorCommon.h"

+#include <AllocatorCommon7.h>

+#include <AllocatorCommon.h>

 

 #include <realmedia/pntypes.h>

 #include <realmedia/pnwintyp.h>

diff --git a/src/apps/mplayerc/ShaderEditorDlg.cpp b/src/apps/mplayerc/ShaderEditorDlg.cpp
index 56e6be8cb..9f1e39924 100644
--- a/src/apps/mplayerc/ShaderEditorDlg.cpp
+++ b/src/apps/mplayerc/ShaderEditorDlg.cpp
@@ -23,7 +23,7 @@
 

 #include "stdafx.h"

 #include "mplayerc.h"

-#include "PixelShaderCompiler.h"

+#include <PixelShaderCompiler.h>

 #include "ShaderEditorDlg.h"

 #include "MainFrm.h"

 

diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h
index ae51b2157..61477a6f9 100644
--- a/src/apps/mplayerc/VMROSD.h
+++ b/src/apps/mplayerc/VMROSD.h
@@ -26,7 +26,7 @@
 #include <d3d9.h>

 #include <evr9.h>

 #include <vmr9.h>

-#include "madVRAllocatorPresenter.h"

+#include <madVRAllocatorPresenter.h>

 

 

 typedef enum {

diff --git a/src/apps/mplayerc/mplayerc.vcxproj b/src/apps/mplayerc/mplayerc.vcxproj
index cce541ccb..565f93c6d 100644
--- a/src/apps/mplayerc/mplayerc.vcxproj
+++ b/src/apps/mplayerc/mplayerc.vcxproj
@@ -81,7 +81,7 @@ update_version.bat
 </Command>

     </PreBuildEvent>

     <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\filters\renderer\VideoRenderers;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

@@ -109,7 +109,7 @@ update_version.bat
 </Command>

     </PreBuildEvent>

     <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\filters\renderer\VideoRenderers;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

@@ -138,7 +138,7 @@ update_version.bat
 </Command>

     </PreBuildEvent>

     <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\filters\renderer\VideoRenderers;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

@@ -165,7 +165,7 @@ update_version.bat
 </Command>

     </PreBuildEvent>

     <ClCompile>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\filters\renderer\VideoRenderers;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>