From 8148f22a09501192ad785e3243e01da7f467d8fe Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 15 Jun 2012 22:34:54 +0000 Subject: use double quotes for our includes git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5146 10f7b99b-c216-0410-bff0-8a66a9350fd8 --- src/DSUtil/DSUtil.cpp | 6 ++-- src/DSUtil/MediaTypeEx.cpp | 2 +- src/DSUtil/MediaTypes.cpp | 2 +- src/DSUtil/NullRenderers.cpp | 2 +- src/DSUtil/NullRenderers.h | 2 +- src/DSUtil/deinterlace.cpp | 6 ++-- src/DSUtil/vd.cpp | 12 +++---- src/DeCSS/DeCSSInputPin.cpp | 4 +-- src/DeCSS/VobFile.h | 2 +- src/SubPic/DX7SubPic.h | 2 +- src/SubPic/stdafx.h | 2 +- src/Subtitles/STS.h | 2 +- src/Subtitles/SubtitleInputPin.cpp | 2 +- src/Subtitles/VobSubFile.cpp | 4 +-- src/Subtitles/stdafx.h | 2 +- src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp | 2 +- src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp | 2 +- src/filters/muxer/BaseMuxer/stdafx.h | 2 +- src/filters/muxer/DSMMuxer/DSMMuxer.cpp | 2 +- src/filters/muxer/DSMMuxer/DSMMuxer.h | 2 +- src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp | 2 +- src/filters/muxer/WavDest/WavDest.cpp | 2 +- src/filters/parser/AviSplitter/AviFile.h | 2 +- src/filters/parser/BaseSplitter/BaseSplitter.cpp | 2 +- src/filters/parser/BaseSplitter/BaseSplitter.h | 6 ++-- .../parser/BaseSplitter/BaseSplitterFileEx.cpp | 2 +- src/filters/parser/DSMSplitter/DSMSplitter.cpp | 2 +- src/filters/parser/DSMSplitter/DSMSplitterFile.cpp | 2 +- src/filters/parser/DSMSplitter/DSMSplitterFile.h | 2 +- src/filters/parser/FLVSplitter/FLVSplitter.cpp | 2 +- src/filters/parser/MP4Splitter/MP4Splitter.cpp | 2 +- .../parser/MatroskaSplitter/MatroskaFile.cpp | 2 +- .../parser/MatroskaSplitter/MatroskaSplitter.cpp | 2 +- .../parser/MatroskaSplitter/MatroskaSplitter.h | 2 +- src/filters/parser/MpaSplitter/MpaSplitter.cpp | 2 +- src/filters/parser/MpaSplitter/MpaSplitterFile.cpp | 2 +- src/filters/parser/MpegSplitter/MpegSplitter.cpp | 2 +- src/filters/parser/MpegSplitter/MpegSplitter.h | 2 +- .../parser/MpegSplitter/MpegSplitterFile.cpp | 2 +- src/filters/parser/OggSplitter/OggSplitter.cpp | 2 +- .../parser/RealMediaSplitter/RealMediaSplitter.cpp | 2 +- src/filters/reader/CDDAReader/CDDAReader.h | 8 ++--- src/filters/reader/CDXAReader/CDXAReader.cpp | 2 +- src/filters/reader/CDXAReader/CDXAReader.h | 4 +-- src/filters/reader/UDPReader/UDPReader.h | 4 +-- src/filters/reader/VTSReader/VTSReader.h | 6 ++-- .../renderer/MpcAudioRenderer/MpcAudioRenderer.cpp | 2 +- .../renderer/MpcAudioRenderer/MpcAudioRenderer.h | 4 +-- src/filters/renderer/SyncClock/stdafx.h | 2 +- .../VideoRenderers/DX7AllocatorPresenter.h | 2 +- .../VideoRenderers/DX9AllocatorPresenter.cpp | 2 +- .../renderer/VideoRenderers/DX9RenderingEngine.cpp | 2 +- .../VideoRenderers/DXRAllocatorPresenter.cpp | 2 +- src/filters/renderer/VideoRenderers/IPinHook.cpp | 2 +- .../VideoRenderers/RM7AllocatorPresenter.h | 8 ++--- .../VideoRenderers/RM9AllocatorPresenter.h | 8 ++--- .../renderer/VideoRenderers/RenderersSettings.cpp | 2 +- .../renderer/VideoRenderers/SyncRenderer.cpp | 4 +-- .../VideoRenderers/madVRAllocatorPresenter.cpp | 2 +- src/filters/renderer/VideoRenderers/stdafx.h | 2 +- src/filters/source/BaseSource/stdafx.h | 2 +- src/filters/source/DTSAC3Source/DTSAC3Source.cpp | 4 +-- src/filters/source/FLACSource/FLACSource.cpp | 4 +-- .../source/ShoutcastSource/ShoutcastSource.cpp | 2 +- .../source/SubtitleSource/SubtitleSource.cpp | 2 +- .../switcher/AudioSwitcher/AudioSwitcher.cpp | 2 +- .../switcher/AudioSwitcher/StreamSwitcher.cpp | 2 +- .../transform/AVI2AC3Filter/AVI2AC3Filter.cpp | 2 +- .../transform/BaseVideoFilter/BaseVideoFilter.cpp | 2 +- src/filters/transform/MPCVideoDec/DXVADecoder.cpp | 2 +- .../transform/MPCVideoDec/DXVADecoderH264.cpp | 2 +- .../transform/MPCVideoDec/DXVADecoderVC1.cpp | 2 +- .../transform/MPCVideoDec/FfmpegContext.cpp | 18 +++++----- .../transform/MPCVideoDec/H264RandomAccess.cpp | 2 +- .../transform/MPCVideoDec/MPCVideoDecFilter.cpp | 6 ++-- .../MPCVideoDec/MPCVideoDecSettingsWnd.cpp | 4 +-- .../transform/MPCVideoDec/TlibavcodecExt.cpp | 2 +- src/filters/transform/MPCVideoDec/ffImgfmt.cpp | 4 +-- src/filters/transform/MPCVideoDec/ffImgfmt.h | 2 +- .../transform/MpaDecFilter/MpaDecFilter.cpp | 6 ++-- src/filters/transform/MpaDecFilter/MpaDecFilter.h | 4 +-- .../transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp | 7 ++-- src/filters/transform/VSFilter/Copy.cpp | 2 +- src/filters/transform/VSFilter/DirectVobSub.h | 2 +- .../transform/VSFilter/DirectVobSubFilter.cpp | 2 +- .../transform/VSFilter/DirectVobSubPropPage.cpp | 2 +- src/filters/transform/VSFilter/Scale2x.cpp | 2 +- src/filters/transform/VSFilter/VSFilter.cpp | 2 +- src/filters/transform/VSFilter/plugins.cpp | 10 +++--- src/mpc-hc/DeinterlacerFilter.cpp | 2 +- src/mpc-hc/FGFilter.cpp | 8 ++--- src/mpc-hc/FGManager.cpp | 8 ++--- src/mpc-hc/FGManagerBDA.cpp | 4 +-- src/mpc-hc/FakeFilterMapper2.cpp | 4 +-- src/mpc-hc/FavoriteAddDlg.h | 2 +- src/mpc-hc/FavoriteOrganizeDlg.h | 2 +- src/mpc-hc/LcdSupport.h | 2 +- src/mpc-hc/MainFrm.cpp | 16 ++++----- src/mpc-hc/MainFrm.h | 8 ++--- src/mpc-hc/MediaTypesDlg.cpp | 2 +- src/mpc-hc/MediaTypesDlg.h | 2 +- src/mpc-hc/Mpeg2SectionData.cpp | 2 +- src/mpc-hc/OpenDlg.h | 2 +- src/mpc-hc/PPageBase.h | 2 +- src/mpc-hc/PPageExternalFilters.cpp | 2 +- src/mpc-hc/PPageFileInfoDetails.cpp | 2 +- src/mpc-hc/PPageFileMediaInfo.cpp | 4 +-- src/mpc-hc/PPageMisc.cpp | 2 +- src/mpc-hc/PPageOutput.cpp | 2 +- src/mpc-hc/PPageSheet.h | 2 +- src/mpc-hc/PlayerBar.h | 2 +- src/mpc-hc/PlayerCaptureDialog.cpp | 2 +- src/mpc-hc/PlayerCaptureDialog.h | 2 +- src/mpc-hc/PlayerNavigationDialog.cpp | 2 +- src/mpc-hc/PlayerNavigationDialog.h | 2 +- src/mpc-hc/PnSPresetsDlg.h | 2 +- src/mpc-hc/QuicktimeGraph.cpp | 2 +- src/mpc-hc/QuicktimeGraph.h | 6 ++-- src/mpc-hc/RealMediaGraph.cpp | 6 ++-- src/mpc-hc/RealMediaGraph.h | 38 +++++++++++----------- src/mpc-hc/RealMediaWindowlessSite.h | 34 +++++++++---------- src/mpc-hc/RegFilterChooserDlg.h | 2 +- src/mpc-hc/SaveDlg.h | 2 +- src/mpc-hc/SelectMediaType.h | 2 +- src/mpc-hc/ShaderAutoCompleteDlg.h | 2 +- src/mpc-hc/ShaderCombineDlg.h | 2 +- src/mpc-hc/ShaderEditorDlg.cpp | 2 +- src/mpc-hc/ShaderEditorDlg.h | 2 +- src/mpc-hc/SubtitleDlDlg.h | 2 +- src/mpc-hc/TextPassThruFilter.cpp | 2 +- src/mpc-hc/VMROSD.h | 2 +- src/mpc-hc/WebServer.cpp | 2 +- src/mpc-hc/mplayerc.cpp | 4 +-- src/thirdparty/AsyncReader/stdafx.h | 2 +- src/thirdparty/Bento4/Core/Ap4MoovAtom.cpp | 2 +- src/thirdparty/ui/LCDUI/LCDGfx.h | 2 +- src/thirdparty/ui/LCDUI/LCDOutput.h | 2 +- 137 files changed, 246 insertions(+), 247 deletions(-) diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index 3f8108a6e..ea5b6f358 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -23,12 +23,12 @@ #include "stdafx.h" #include -#include -#include +#include "winddk/devioctl.h" +#include "winddk/ntddcdrm.h" #include "DSUtil.h" #include "Mpeg2Def.h" #include "vd.h" -#include +#include "moreuuids.h" #include #include #include diff --git a/src/DSUtil/MediaTypeEx.cpp b/src/DSUtil/MediaTypeEx.cpp index 36c40d9b2..19965eafc 100644 --- a/src/DSUtil/MediaTypeEx.cpp +++ b/src/DSUtil/MediaTypeEx.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include "moreuuids.h" #pragma pack(push, 1) typedef struct { diff --git a/src/DSUtil/MediaTypes.cpp b/src/DSUtil/MediaTypes.cpp index f01b69918..4039fea27 100644 --- a/src/DSUtil/MediaTypes.cpp +++ b/src/DSUtil/MediaTypes.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include -#include +#include "moreuuids.h" #include "MediaTypes.h" #include "DSUtil.h" diff --git a/src/DSUtil/NullRenderers.cpp b/src/DSUtil/NullRenderers.cpp index f005d2eb9..9eeec3451 100644 --- a/src/DSUtil/NullRenderers.cpp +++ b/src/DSUtil/NullRenderers.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "NullRenderers.h" -#include +#include "moreuuids.h" #define USE_DXVA diff --git a/src/DSUtil/NullRenderers.h b/src/DSUtil/NullRenderers.h index f56c14112..0420523a1 100644 --- a/src/DSUtil/NullRenderers.h +++ b/src/DSUtil/NullRenderers.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include "BaseClasses/streams.h" class CNullRenderer : public CBaseRenderer { diff --git a/src/DSUtil/deinterlace.cpp b/src/DSUtil/deinterlace.cpp index ab0ceb110..0ec385051 100644 --- a/src/DSUtil/deinterlace.cpp +++ b/src/DSUtil/deinterlace.cpp @@ -17,9 +17,9 @@ #include "stdafx.h" #include -#include -#include -#include +#include "vd2/system/memory.h" +#include "vd2/system/cpuaccel.h" +#include "vd2/system/vdstl.h" #pragma warning(disable: 4799) // warning C4799: function has no EMMS instruction diff --git a/src/DSUtil/vd.cpp b/src/DSUtil/vd.cpp index a78a625a1..1769ea0a0 100644 --- a/src/DSUtil/vd.cpp +++ b/src/DSUtil/vd.cpp @@ -27,13 +27,13 @@ #include "vd_asm.h" #include -#include -#include -#include +#include "vd2/system/cpuaccel.h" +#include "vd2/system/memory.h" +#include "vd2/system/vdstl.h" -#include -#include -#include +#include "vd2/Kasumi/pixmap.h" +#include "vd2/Kasumi/pixmaputils.h" +#include "vd2/Kasumi/pixmapops.h" #pragma warning(disable : 4799) // no emms... blahblahblah diff --git a/src/DeCSS/DeCSSInputPin.cpp b/src/DeCSS/DeCSSInputPin.cpp index 4331688a4..86b698f1d 100644 --- a/src/DeCSS/DeCSSInputPin.cpp +++ b/src/DeCSS/DeCSSInputPin.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include -#include +#include "BaseClasses/streams.h" #include #include #include @@ -33,7 +33,7 @@ #include "CSSscramble.h" #include -#include +#include "moreuuids.h" // // CDeCSSInputPin diff --git a/src/DeCSS/VobFile.h b/src/DeCSS/VobFile.h index 650a57869..b3ebad844 100644 --- a/src/DeCSS/VobFile.h +++ b/src/DeCSS/VobFile.h @@ -2,7 +2,7 @@ #include #include -#include +#include "winddk/ntddcdvd.h" class CDVDSession { diff --git a/src/SubPic/DX7SubPic.h b/src/SubPic/DX7SubPic.h index e19cc52b3..ba02be26f 100644 --- a/src/SubPic/DX7SubPic.h +++ b/src/SubPic/DX7SubPic.h @@ -25,7 +25,7 @@ #include "SubPicImpl.h" #include "SubPicAllocatorPresenterImpl.h" -#include +#include "dx/d3d.h" // CDX7SubPic diff --git a/src/SubPic/stdafx.h b/src/SubPic/stdafx.h index 2cd56ad19..d279c283a 100644 --- a/src/SubPic/stdafx.h +++ b/src/SubPic/stdafx.h @@ -37,6 +37,6 @@ #include #include // MFC core and standard components -#include +#include "BaseClasses/streams.h" #include #include "../DSUtil/DSUtil.h" diff --git a/src/Subtitles/STS.h b/src/Subtitles/STS.h index e65534188..ce7a54fe2 100644 --- a/src/Subtitles/STS.h +++ b/src/Subtitles/STS.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include "BaseClasses/wxutil.h" #include "TextFile.h" #include "GFN.h" diff --git a/src/Subtitles/SubtitleInputPin.cpp b/src/Subtitles/SubtitleInputPin.cpp index 2f9e16a7b..0c719c8e7 100644 --- a/src/Subtitles/SubtitleInputPin.cpp +++ b/src/Subtitles/SubtitleInputPin.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include "moreuuids.h" // our first format id #define __GAB1__ "GAB1" diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp index e5ceb8f86..e55ca9c0f 100644 --- a/src/Subtitles/VobSubFile.cpp +++ b/src/Subtitles/VobSubFile.cpp @@ -29,9 +29,9 @@ #define USE_UNRAR_STATIC #endif #ifndef USE_UNRAR_STATIC -#include +#include "unrar.h" #else -#include +#include "unrar/dll.hpp" #endif #include "RTS.h" diff --git a/src/Subtitles/stdafx.h b/src/Subtitles/stdafx.h index 370b3298d..5665d55a5 100644 --- a/src/Subtitles/stdafx.h +++ b/src/Subtitles/stdafx.h @@ -38,6 +38,6 @@ #include // MFC core and standard components #include -#include +#include "BaseClasses/streams.h" #include "../DSUtil/DSUtil.h" diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp b/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp index ad2ad9767..d8465153d 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp +++ b/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp @@ -26,7 +26,7 @@ #include "BaseMuxer.h" #include "../../../DSUtil/DSUtil.h" #include -#include +#include "moreuuids.h" #define MAXQUEUESIZE 100 diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp index baae85b9c..fe1faef09 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp +++ b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include "moreuuids.h" // // CBaseMuxerOutputPin diff --git a/src/filters/muxer/BaseMuxer/stdafx.h b/src/filters/muxer/BaseMuxer/stdafx.h index 789cc67f2..058baca3e 100644 --- a/src/filters/muxer/BaseMuxer/stdafx.h +++ b/src/filters/muxer/BaseMuxer/stdafx.h @@ -41,7 +41,7 @@ #include #include -#include +#include "BaseClasses/streams.h" #include #include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.cpp b/src/filters/muxer/DSMMuxer/DSMMuxer.cpp index c542e1d70..a10414a1d 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.cpp +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.cpp @@ -30,7 +30,7 @@ #include #endif #include -#include +#include "moreuuids.h" #ifdef REGISTER_FILTER diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.h b/src/filters/muxer/DSMMuxer/DSMMuxer.h index 8b5f00af6..100bdbd3e 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.h +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.h @@ -24,7 +24,7 @@ #pragma once #include "../BaseMuxer/BaseMuxer.h" -#include +#include "dsm/dsm.h" #define DSMMuxerName L"MPC DSM Muxer" diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp index a936b7455..cb64886b5 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp @@ -29,7 +29,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" using namespace MatroskaWriter; diff --git a/src/filters/muxer/WavDest/WavDest.cpp b/src/filters/muxer/WavDest/WavDest.cpp index 348b2bb43..6ece25dd6 100644 --- a/src/filters/muxer/WavDest/WavDest.cpp +++ b/src/filters/muxer/WavDest/WavDest.cpp @@ -22,7 +22,7 @@ */ #include "stdafx.h" -#include +#include "BaseClasses/streams.h" #include #include "WavDest.h" #include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/parser/AviSplitter/AviFile.h b/src/filters/parser/AviSplitter/AviFile.h index 4f81dc793..353c2f208 100644 --- a/src/filters/parser/AviSplitter/AviFile.h +++ b/src/filters/parser/AviSplitter/AviFile.h @@ -23,7 +23,7 @@ #pragma once -#include // conflicts with vfw.h... +#include // conflicts with vfw.h... #include "../BaseSplitter/BaseSplitter.h" class CAviFile : public CBaseSplitterFile diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 4e71285e0..e7c7afb38 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "../../../DSUtil/DSUtil.h" #include -#include +#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 b4dfce18f..a28dd7db7 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.h @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#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 78182827c..0b8b04b11 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -28,7 +28,7 @@ #include "../../../DSUtil/GolombBuffer.h" #include "../../../DSUtil/AudioParser.h" #include -#include +#include "moreuuids.h" // // CBaseSplitterFileEx diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.cpp b/src/filters/parser/DSMSplitter/DSMSplitter.cpp index 81f17ae6b..6eb6dd6e0 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitter.cpp @@ -28,7 +28,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #ifdef REGISTER_FILTER diff --git a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp index 3a0acf454..876346a3b 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "DSMSplitterFile.h" #include "../../../DSUtil/DSUtil.h" -#include +#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 da3c26f3f..b144e6c06 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitterFile.h +++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.h @@ -24,7 +24,7 @@ #pragma once #include "../BaseSplitter/BaseSplitter.h" -#include +#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 91d240abc..34d38d65b 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.cpp +++ b/src/filters/parser/FLVSplitter/FLVSplitter.cpp @@ -28,7 +28,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #define FLV_AUDIODATA 8 #define FLV_VIDEODATA 9 diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.cpp b/src/filters/parser/MP4Splitter/MP4Splitter.cpp index 42882d536..d3c7aa0ff 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.cpp +++ b/src/filters/parser/MP4Splitter/MP4Splitter.cpp @@ -30,7 +30,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #include "Ap4.h" #include "Ap4File.h" diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp index 714074ea3..419b6d8cf 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "MatroskaFile.h" #include "../../../DSUtil/DSUtil.h" -#include +#include "zlib/zlib.h" #define DOCTYPE _T("matroska") #define DOCTYPE_WEBM _T("webm") diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 43d7a64b5..74717ae3a 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -29,7 +29,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #include using namespace MatroskaReader; diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h index 959e33995..712aa5ccf 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h @@ -27,7 +27,7 @@ #include #include "MatroskaFile.h" #include "../BaseSplitter/BaseSplitter.h" -#include +#include "ITrackInfo.h" #define MatroskaSplitterName L"MPC Matroska Splitter" #define MatroskaSourceName L"MPC Matroska Source" diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.cpp b/src/filters/parser/MpaSplitter/MpaSplitter.cpp index ae738753d..141e7f807 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.cpp +++ b/src/filters/parser/MpaSplitter/MpaSplitter.cpp @@ -27,7 +27,7 @@ #include #endif #include "MpaSplitter.h" -#include +#include "moreuuids.h" #ifdef REGISTER_FILTER diff --git a/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp b/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp index a05a880b3..9584eaeb3 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp +++ b/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp @@ -28,7 +28,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #define FRAMES_FLAG 0x0001 #define MPA_HEADER_SIZE 4 // MPEG-Audio Header Size diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 58532cd4a..916a62ce0 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -28,7 +28,7 @@ #endif #include #include "MpegSplitter.h" -#include +#include "moreuuids.h" #include "../../../DSUtil/AudioParser.h" #include "../../../mpc-hc/SettingsDefines.h" diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.h b/src/filters/parser/MpegSplitter/MpegSplitter.h index ef12de2d4..e39c9313b 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.h +++ b/src/filters/parser/MpegSplitter/MpegSplitter.h @@ -26,7 +26,7 @@ #include "../BaseSplitter/BaseSplitter.h" #include "MpegSplitterFile.h" #include "MpegSplitterSettingsWnd.h" -#include +#include "ITrackInfo.h" #define MpegSplitterName L"MPC MPEG Splitter" #define MpegSourceName L"MPC MPEG Source" diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp index 599f00f6a..4b058d72d 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp @@ -28,7 +28,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #define MEGABYTE 1024*1024 diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index f304b5fd7..5cbaa5dc2 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -29,7 +29,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" # define TH_VERSION_CHECK(version_major,version_minor,version_subminor,_maj,_min,_sub) \ (version_major>(_maj)||version_major==(_maj)&& \ diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 5e858baac..09204561c 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -35,7 +35,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #define MAXPACKETS_RV MAXPACKETS*10 diff --git a/src/filters/reader/CDDAReader/CDDAReader.h b/src/filters/reader/CDDAReader/CDDAReader.h index 2ed9f2daf..1b5c6bd25 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.h +++ b/src/filters/reader/CDDAReader/CDDAReader.h @@ -24,11 +24,11 @@ #pragma once #include -#include -#include +#include "winddk/devioctl.h" +#include "winddk/ntddcdrm.h" #include -#include -#include +#include "AsyncReader/asyncio.h" +#include "AsyncReader/asyncrdr.h" #define CCDDAReaderName L"MPC CDDA Reader" diff --git a/src/filters/reader/CDXAReader/CDXAReader.cpp b/src/filters/reader/CDXAReader/CDXAReader.cpp index 6d9e32687..2ab033c2d 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.cpp +++ b/src/filters/reader/CDXAReader/CDXAReader.cpp @@ -28,7 +28,7 @@ #include #endif #include -#include +#include "moreuuids.h" ///////// diff --git a/src/filters/reader/CDXAReader/CDXAReader.h b/src/filters/reader/CDXAReader/CDXAReader.h index 01a721c93..2dd4f7f6b 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.h +++ b/src/filters/reader/CDXAReader/CDXAReader.h @@ -24,8 +24,8 @@ #pragma once #include -#include -#include +#include "AsyncReader/asyncio.h" +#include "AsyncReader/asyncrdr.h" #define CCDXAReaderName L"MPC CDXA Reader" diff --git a/src/filters/reader/UDPReader/UDPReader.h b/src/filters/reader/UDPReader/UDPReader.h index 8cce7a74f..ab339f1fd 100644 --- a/src/filters/reader/UDPReader/UDPReader.h +++ b/src/filters/reader/UDPReader/UDPReader.h @@ -24,8 +24,8 @@ #pragma once #include -#include -#include +#include "AsyncReader/asyncio.h" +#include "AsyncReader/asyncrdr.h" #define UDPReaderName L"MPC UDP Reader" diff --git a/src/filters/reader/VTSReader/VTSReader.h b/src/filters/reader/VTSReader/VTSReader.h index 6eeab899e..896d59d64 100644 --- a/src/filters/reader/VTSReader/VTSReader.h +++ b/src/filters/reader/VTSReader/VTSReader.h @@ -24,10 +24,10 @@ #pragma once #include -#include -#include +#include "AsyncReader/asyncio.h" +#include "AsyncReader/asyncrdr.h" -#include +#include "ITrackInfo.h" #include "../../../DSUtil/DSMPropertyBag.h" #define VTSReaderName L"MPC VTS Reader" diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 26adf5cb0..4c0a23dfb 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -25,7 +25,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #include "../../../DSUtil/DSUtil.h" #include #include diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h index 9bd0ea496..480da8cc4 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h @@ -22,7 +22,7 @@ #pragma once -#include +#include "BaseClasses/streams.h" #include #include //must be before other Wasapi headers @@ -34,7 +34,7 @@ #include #include "MpcAudioRendererSettingsWnd.h" -#include +#include "SoundTouch/include/SoundTouch.h" #define MpcAudioRendererName L"MPC Audio Renderer" diff --git a/src/filters/renderer/SyncClock/stdafx.h b/src/filters/renderer/SyncClock/stdafx.h index c8671082d..5920935e4 100644 --- a/src/filters/renderer/SyncClock/stdafx.h +++ b/src/filters/renderer/SyncClock/stdafx.h @@ -35,5 +35,5 @@ #include #include // MFC core and standard components -#include +#include "BaseClasses/streams.h" #include diff --git a/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h b/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h index 4f098ec27..1df544a89 100644 --- a/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/DX7AllocatorPresenter.h @@ -25,7 +25,7 @@ #include "AllocatorCommon7.h" #include -#include +#include "dx/d3d.h" #include "../SubPic/SubPicAllocatorPresenterImpl.h" namespace DSObjects diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp index 4a3585b46..efeab7a69 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp @@ -29,7 +29,7 @@ #include "../../../SubPic/DX9SubPic.h" #include "../../../SubPic/SubPicQueueImpl.h" #include "IPinHook.h" -#include +#include "Version.h" CCritSec g_ffdshowReceive; bool queue_ffdshow_support = false; diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp index 2fa4a9d7d..298b45a64 100644 --- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp +++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include -#include +#include "lcms2/include/lcms2.h" #include "../../../mpc-hc/resource.h" #include "Dither.h" #include "DX9RenderingEngine.h" diff --git a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp index 2cb61d6d2..a6c4f707a 100644 --- a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp @@ -25,7 +25,7 @@ #include "DXRAllocatorPresenter.h" #include "../../../SubPic/DX9SubPic.h" #include "../../../SubPic/SubPicQueueImpl.h" -#include +#include "moreuuids.h" using namespace DSObjects; diff --git a/src/filters/renderer/VideoRenderers/IPinHook.cpp b/src/filters/renderer/VideoRenderers/IPinHook.cpp index 006970cfe..2645a0c07 100644 --- a/src/filters/renderer/VideoRenderers/IPinHook.cpp +++ b/src/filters/renderer/VideoRenderers/IPinHook.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include "moreuuids.h" #include "IPinHook.h" #include "AllocatorCommon.h" diff --git a/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.h b/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.h index 998181f6e..43145206f 100644 --- a/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.h @@ -24,10 +24,10 @@ #pragma once #include "DX7AllocatorPresenter.h" -#include -#include -#include -#include +#include "realmedia/pntypes.h" +#include "realmedia/pnwintyp.h" +#include "realmedia/pncom.h" +#include "realmedia/rmavsurf.h" namespace DSObjects { diff --git a/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.h b/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.h index 859b04282..9e782d826 100644 --- a/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.h @@ -23,10 +23,10 @@ #pragma once #include "DX9AllocatorPresenter.h" -#include -#include -#include -#include +#include "realmedia/pntypes.h" +#include "realmedia/pnwintyp.h" +#include "realmedia/pncom.h" +#include "realmedia/rmavsurf.h" #include "IQTVideoSurface.h" namespace DSObjects diff --git a/src/filters/renderer/VideoRenderers/RenderersSettings.cpp b/src/filters/renderer/VideoRenderers/RenderersSettings.cpp index 40db3b7a5..bf4de2188 100644 --- a/src/filters/renderer/VideoRenderers/RenderersSettings.cpp +++ b/src/filters/renderer/VideoRenderers/RenderersSettings.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "RenderersSettings.h" #include "../../../mpc-hc/mplayerc.h" -#include +#include "Version.h" #include void CRenderersSettings::UpdateData(bool fSave) diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index b26d3e424..938c545a8 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -40,12 +40,12 @@ #include #include "../../../SubPic/DX9SubPic.h" #include "../../../SubPic/SubPicQueueImpl.h" -#include +#include "moreuuids.h" #include "MacrovisionKicker.h" #include "IPinHook.h" #include "PixelShaderCompiler.h" #include "SyncRenderer.h" -#include +#include "Version.h" // only for debugging //#define DISABLE_USING_D3D9EX diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp index a304476b2..05ce4749c 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp @@ -25,7 +25,7 @@ #include "../../../SubPic/DX9SubPic.h" #include "../../../SubPic/SubPicQueueImpl.h" #include "RenderersSettings.h" -#include +#include "moreuuids.h" using namespace DSObjects; diff --git a/src/filters/renderer/VideoRenderers/stdafx.h b/src/filters/renderer/VideoRenderers/stdafx.h index 9796ec998..19d1f3778 100644 --- a/src/filters/renderer/VideoRenderers/stdafx.h +++ b/src/filters/renderer/VideoRenderers/stdafx.h @@ -32,7 +32,7 @@ #include #include -#include +#include "BaseClasses/streams.h" #include #include diff --git a/src/filters/source/BaseSource/stdafx.h b/src/filters/source/BaseSource/stdafx.h index 51281debe..e0cc1fefa 100644 --- a/src/filters/source/BaseSource/stdafx.h +++ b/src/filters/source/BaseSource/stdafx.h @@ -37,5 +37,5 @@ #include // MFC core and standard components #include -#include +#include "BaseClasses/streams.h" #include diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.cpp b/src/filters/source/DTSAC3Source/DTSAC3Source.cpp index 11b0c928d..5eedbc01b 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.cpp +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.cpp @@ -28,7 +28,7 @@ #include #endif #include -#include +#include "moreuuids.h" #include "DTSAC3Source.h" #include "../../../DSUtil/AudioParser.h" #include @@ -38,7 +38,7 @@ #pragma warning(disable: 4005) #include #pragma warning(pop) -#include +#include "libdca/include/dts.h" enum { unknown, diff --git a/src/filters/source/FLACSource/FLACSource.cpp b/src/filters/source/FLACSource/FLACSource.cpp index 3dba4bd8a..6fc9c974d 100644 --- a/src/filters/source/FLACSource/FLACSource.cpp +++ b/src/filters/source/FLACSource/FLACSource.cpp @@ -28,10 +28,10 @@ #include #endif #include -#include +#include "moreuuids.h" #include "FLACSource.h" #include "../../../DSUtil/DSUtil.h" -#include +#include "libflac/include/FLAC/stream_decoder.h" #define _DECODER_ (FLAC__StreamDecoder*)m_pDecoder diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp index b7d9c6d80..639d101e4 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp @@ -27,7 +27,7 @@ #endif #include "ShoutcastSource.h" #include "../../../DSUtil/DSUtil.h" -#include +#include "moreuuids.h" #define MAXFRAMESIZE ((144 * 320000 / 8000) + 1) #define BUFFERS 2 diff --git a/src/filters/source/SubtitleSource/SubtitleSource.cpp b/src/filters/source/SubtitleSource/SubtitleSource.cpp index cf6424169..62fa77966 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.cpp +++ b/src/filters/source/SubtitleSource/SubtitleSource.cpp @@ -28,7 +28,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" static int _WIDTH = 640; static int _HEIGHT = 480; diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp index 4ba2ff5d4..2fd11eb52 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp @@ -36,7 +36,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #define INT24_MAX 8388607 #define INT24_MIN (-8388608) diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index ffa66a1b7..76ae75102 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -36,7 +36,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #define BLOCKSTREAM diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp index 37d212064..7f4f35a4f 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp @@ -29,7 +29,7 @@ #ifdef REGISTER_FILTER #include #endif -#include +#include "moreuuids.h" #ifdef REGISTER_FILTER diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp index 9465047cb..746055152 100644 --- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp +++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp @@ -28,7 +28,7 @@ #include "../../../DSUtil/MediaTypes.h" #include -#include +#include "moreuuids.h" // // CBaseVideoFilter diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp index a16a991a9..43b65e970 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include -#include +#include "moreuuids.h" #include "DXVADecoderH264.h" #include "DXVADecoderVC1.h" #include "DXVADecoderMpeg2.h" diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp index e6d2a5e0c..621dfe2c8 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp @@ -25,7 +25,7 @@ #include "DXVADecoderH264.h" #include "MPCVideoDecFilter.h" #include "VideoDecDXVAAllocator.h" -#include +#include "ffmpeg/libavcodec/avcodec.h" #include "FfmpegContext.h" diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp index 6996bccff..b7def54d1 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "DXVADecoderVC1.h" #include "MPCVideoDecFilter.h" -#include +#include "ffmpeg/libavcodec/avcodec.h" #include "FfmpegContext.h" diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp index 4660e79e2..36e94d2c2 100644 --- a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp +++ b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp @@ -34,18 +34,18 @@ #include "../../../DSUtil/SysVersion.h" extern "C" { -#include -#include - // This is kind of an hack but it avoids using a C++ keyword as a struct member name +#include "ffmpeg/libavcodec/dsputil.h" +#include "ffmpeg/libavcodec/avcodec.h" + // This is kind of a hack but it avoids using a C++ keyword as a struct member name #define class classFFMPEG -#include +#include "ffmpeg/libavcodec/mpegvideo.h" #undef class -#include +#include "ffmpeg/libavcodec/golomb.h" -#include -#include -#include -#include +#include "ffmpeg/libavcodec/h264.h" +#include "ffmpeg/libavcodec/h264data.h" +#include "ffmpeg/libavcodec/vc1.h" +#include "ffmpeg/libavcodec/mpeg12.h" int av_h264_decode_frame(struct AVCodecContext* avctx, int* nOutPOC, int64_t* rtStartTime, uint8_t* buf, int buf_size); int av_vc1_decode_frame(AVCodecContext* avctx, uint8_t* buf, int buf_size, int* nFrameSize); diff --git a/src/filters/transform/MPCVideoDec/H264RandomAccess.cpp b/src/filters/transform/MPCVideoDec/H264RandomAccess.cpp index d2462187b..8be63823d 100644 --- a/src/filters/transform/MPCVideoDec/H264RandomAccess.cpp +++ b/src/filters/transform/MPCVideoDec/H264RandomAccess.cpp @@ -18,7 +18,7 @@ */ #include "stdafx.h" -#include +#include "ffmpeg/libavcodec/avcodec.h" #include "H264RandomAccess.h" CH264RandomAccess::CH264RandomAccess() diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 421a7abc0..9495844f7 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include "ffmpeg/libavcodec/avcodec.h" #ifdef REGISTER_FILTER #include @@ -38,7 +38,7 @@ #include "FfmpegContext.h" extern "C" { -#include +#include "ffmpeg/libswscale/swscale.h" } #include "../../../DSUtil/DSUtil.h" @@ -48,7 +48,7 @@ extern "C" #include "../../parser/MpegSplitter/MpegSplitter.h" #include "../../parser/OggSplitter/OggSplitter.h" #include "../../parser/RealMediaSplitter/RealMediaSplitter.h" -#include +#include "moreuuids.h" #include "DXVADecoderH264.h" #include "../../../mpc-hc/FilterEnum.h" diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp index a8b8d6a12..106628eed 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp @@ -25,11 +25,11 @@ #include "MPCVideoDecSettingsWnd.h" #include "../../../DSUtil/DSUtil.h" -#include +#include "ffmpeg/libavcodec/avcodec.h" #include "../../../mpc-hc/InternalFiltersConfig.h" -// ==>>> Resource identifier from "resource.h" present in mplayerc project! +// ==>>> Resource identifier from "resource.h" present in mpc-hc project! #define ResStr(id) CString(MAKEINTRESOURCE(id)) #define LEFT_SPACING 20 diff --git a/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp b/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp index 383c0c08b..4d7a874a5 100644 --- a/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp +++ b/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" -#include +#include "ffmpeg/libavcodec/avcodec.h" #include "TlibavcodecExt.h" diff --git a/src/filters/transform/MPCVideoDec/ffImgfmt.cpp b/src/filters/transform/MPCVideoDec/ffImgfmt.cpp index 631c05bcb..1f6358e3b 100644 --- a/src/filters/transform/MPCVideoDec/ffImgfmt.cpp +++ b/src/filters/transform/MPCVideoDec/ffImgfmt.cpp @@ -18,9 +18,9 @@ #include "stdafx.h" #include -#include +#include "ffmpeg/libavcodec/avcodec.h" #include -#include +#include "moreuuids.h" #include "char_t.h" #include "ffImgfmt.h" diff --git a/src/filters/transform/MPCVideoDec/ffImgfmt.h b/src/filters/transform/MPCVideoDec/ffImgfmt.h index 23173b754..ea61fbbe5 100644 --- a/src/filters/transform/MPCVideoDec/ffImgfmt.h +++ b/src/filters/transform/MPCVideoDec/ffImgfmt.h @@ -1,7 +1,7 @@ #ifndef _FFIMGFMT_H_ #define _FFIMGFMT_H_ -#include +#include "ffmpeg/libavutil/pixfmt.h" //================================ ffdshow ================================== // the RGB related values in this enum refers to the "memory byte order" (byte order as stored in memory). diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 065f400bd..490028841 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -42,11 +42,11 @@ void* __imp_time64 = _time64; #include #endif -#include +#include "moreuuids.h" #include -#include -#include +#include "ffmpeg/libavcodec/avcodec.h" +#include "ffmpeg/libavutil/intreadwrite.h" #define INT8_PEAK 128 #define INT16_PEAK 32768 diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.h b/src/filters/transform/MpaDecFilter/MpaDecFilter.h index 8aaf1deb1..e5faf5450 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.h +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.h @@ -30,8 +30,8 @@ #pragma warning(disable: 4005) #include #pragma warning(pop) -#include -#include +#include "a52dec/include/a52.h" +#include "libdca/include/dts.h" #include "../../../DeCSS/DeCSSInputPin.h" #include "IMpaDecFilter.h" #include "MpaDecSettingsWnd.h" diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index db8c7a9a4..a151b5d07 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -39,8 +39,9 @@ #ifdef REGISTER_FILTER #include #endif -#include -#include +#include "moreuuids.h" +#include "IFilterVersion.h" +#include "detours/detours.h" #define EPSILON 1e-4 @@ -90,8 +91,6 @@ STDAPI DllUnregisterServer() // -#include - BOOL (__stdcall* Real_IsDebuggerPresent)(void) = IsDebuggerPresent; diff --git a/src/filters/transform/VSFilter/Copy.cpp b/src/filters/transform/VSFilter/Copy.cpp index 3ddefafb7..64c6c51e7 100644 --- a/src/filters/transform/VSFilter/Copy.cpp +++ b/src/filters/transform/VSFilter/Copy.cpp @@ -29,7 +29,7 @@ #include "../../../DSUtil/MediaTypes.h" #include -#include +#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 3c307b1e8..046d3f010 100644 --- a/src/filters/transform/VSFilter/DirectVobSub.h +++ b/src/filters/transform/VSFilter/DirectVobSub.h @@ -24,7 +24,7 @@ #pragma once #include "IDirectVobSub.h" -#include +#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 f0a402c2e..a7b7b9737 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp @@ -35,7 +35,7 @@ #include "../../../SubPic/SubPicQueueImpl.h" #include -#include +#include "moreuuids.h" /////////////////////////////////////////////////////////////////////////// diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp index 405fd3e86..da9d1d03d 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp @@ -32,7 +32,7 @@ #include "../../../DSUtil/DSUtil.h" #include "../../../DSUtil/MediaTypes.h" -#include +#include "Version.h" BOOL WINAPI MyGetDialogSize(int iResourceID, DLGPROC pDlgProc, LPARAM lParam, SIZE* pResult) diff --git a/src/filters/transform/VSFilter/Scale2x.cpp b/src/filters/transform/VSFilter/Scale2x.cpp index 5607d5876..890df62da 100644 --- a/src/filters/transform/VSFilter/Scale2x.cpp +++ b/src/filters/transform/VSFilter/Scale2x.cpp @@ -22,7 +22,7 @@ */ #include "stdafx.h" -#include +#include "moreuuids.h" // For CPUID usage #include "../../../DSUtil/vd.h" diff --git a/src/filters/transform/VSFilter/VSFilter.cpp b/src/filters/transform/VSFilter/VSFilter.cpp index 96a4c18d6..92b4b576d 100644 --- a/src/filters/transform/VSFilter/VSFilter.cpp +++ b/src/filters/transform/VSFilter/VSFilter.cpp @@ -28,7 +28,7 @@ #include "../../../DSUtil/MediaTypes.h" #include -#include +#include "moreuuids.h" ///////////////////////////////////////////////////////////////////////////// // CVSFilterApp diff --git a/src/filters/transform/VSFilter/plugins.cpp b/src/filters/transform/VSFilter/plugins.cpp index fc80c0074..330f0cde6 100644 --- a/src/filters/transform/VSFilter/plugins.cpp +++ b/src/filters/transform/VSFilter/plugins.cpp @@ -235,7 +235,7 @@ namespace Plugin namespace VirtualDub { -#include +#include "vd2/extras/FilterSDK/VirtualDub.h" class CVirtualDubFilter : virtual public CFilter { @@ -506,8 +506,8 @@ namespace Plugin // namespace VirtualDubNew { -#include -#include +#include "vd2/plugin/vdplugin.h" +#include "vd2/plugin/vdvideofilt.h" class CVirtualDubFilter : virtual public CFilter { @@ -778,7 +778,7 @@ namespace Plugin namespace AviSynth1 { -#include +#include "avisynth/avisynth1.h" class CAvisynthFilter : public GenericVideoFilter, virtual public CFilter { @@ -891,7 +891,7 @@ namespace Plugin namespace AviSynth25 { -#include +#include "avisynth/avisynth25.h" static bool s_fSwapUV = false; diff --git a/src/mpc-hc/DeinterlacerFilter.cpp b/src/mpc-hc/DeinterlacerFilter.cpp index 397be2839..289487039 100644 --- a/src/mpc-hc/DeinterlacerFilter.cpp +++ b/src/mpc-hc/DeinterlacerFilter.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "DeinterlacerFilter.h" #include "../DSUtil/MediaTypes.h" -#include +#include "moreuuids.h" CDeinterlacerFilter::CDeinterlacerFilter(LPUNKNOWN punk, HRESULT* phr) diff --git a/src/mpc-hc/FGFilter.cpp b/src/mpc-hc/FGFilter.cpp index 9eb4056b5..c4b552679 100644 --- a/src/mpc-hc/FGFilter.cpp +++ b/src/mpc-hc/FGFilter.cpp @@ -26,10 +26,10 @@ #include "FGFilter.h" #include "MainFrm.h" #include "../DSUtil/DSUtil.h" -#include -#include -#include -#include +#include "AllocatorCommon7.h" +#include "AllocatorCommon.h" +#include "SyncAllocatorPresenter.h" +#include "moreuuids.h" // diff --git a/src/mpc-hc/FGManager.cpp b/src/mpc-hc/FGManager.cpp index 08993b65e..5daa024f0 100644 --- a/src/mpc-hc/FGManager.cpp +++ b/src/mpc-hc/FGManager.cpp @@ -29,9 +29,9 @@ #include "../DSUtil/FileVersionInfo.h" #include "../DSUtil/WinAPIUtils.h" #include "../filters/Filters.h" -#include -#include -#include +#include "AllocatorCommon7.h" +#include "AllocatorCommon.h" +#include "SyncAllocatorPresenter.h" #include "DeinterlacerFilter.h" #include "../DeCSS/VobFile.h" #include @@ -41,7 +41,7 @@ #include #include #include -#include +#include "moreuuids.h" // {212690FB-83E5-4526-8FD7-74478B7939CD} from wmcodecdsp.h diff --git a/src/mpc-hc/FGManagerBDA.cpp b/src/mpc-hc/FGManagerBDA.cpp index f85f06ad3..34076c06f 100644 --- a/src/mpc-hc/FGManagerBDA.cpp +++ b/src/mpc-hc/FGManagerBDA.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include "BaseClasses/streams.h" #include #include #include @@ -33,7 +33,7 @@ #include "../DSUtil/DSUtil.h" #include "../DSUtil/GolombBuffer.h" #include "../filters/switcher/AudioSwitcher/AudioSwitcher.h" -#include +#include "moreuuids.h" #include "mplayerc.h" #include "FGManagerBDA.h" #include "DVBChannel.h" diff --git a/src/mpc-hc/FakeFilterMapper2.cpp b/src/mpc-hc/FakeFilterMapper2.cpp index caffca07f..c57a75eb6 100644 --- a/src/mpc-hc/FakeFilterMapper2.cpp +++ b/src/mpc-hc/FakeFilterMapper2.cpp @@ -23,11 +23,11 @@ #include "stdafx.h" #include "FakeFilterMapper2.h" -#include +#include "MacrovisionKicker.h" #include "../DSUtil/DSUtil.h" #include -#include +#include "detours/detours.h" HRESULT(__stdcall* Real_CoCreateInstance)(CONST IID& a0, diff --git a/src/mpc-hc/FavoriteAddDlg.h b/src/mpc-hc/FavoriteAddDlg.h index 6a1fc4297..f989126be 100644 --- a/src/mpc-hc/FavoriteAddDlg.h +++ b/src/mpc-hc/FavoriteAddDlg.h @@ -23,7 +23,7 @@ #pragma once -#include +#include "ResizableLib/ResizableDialog.h" // CFavoriteAddDlg dialog diff --git a/src/mpc-hc/FavoriteOrganizeDlg.h b/src/mpc-hc/FavoriteOrganizeDlg.h index a32a0bb5b..eefa61681 100644 --- a/src/mpc-hc/FavoriteOrganizeDlg.h +++ b/src/mpc-hc/FavoriteOrganizeDlg.h @@ -25,7 +25,7 @@ #include #include -#include +#include "ResizableLib/ResizableDialog.h" // CFavoriteOrganizeDlg dialog diff --git a/src/mpc-hc/LcdSupport.h b/src/mpc-hc/LcdSupport.h index 933a07d59..4f5cbb1fc 100644 --- a/src/mpc-hc/LcdSupport.h +++ b/src/mpc-hc/LcdSupport.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include "lglcd/lglcd.h" #include #include #include diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 84b3d25ca..4dc0cf3b5 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -54,7 +54,7 @@ #include "UpdateChecker.h" #include "UpdateCheckerDlg.h" -#include +#include "BaseClasses/mtype.h" #include #include #include @@ -63,7 +63,7 @@ #include #include -#include +#include "moreuuids.h" #include #include @@ -75,15 +75,15 @@ #include "../filters/Filters.h" #include "../filters/PinInfoWnd.h" -#include -#include -#include +#include "AllocatorCommon7.h" +#include "AllocatorCommon.h" +#include "SyncAllocatorPresenter.h" #include "ComPropertySheet.h" #include "LcdSupport.h" #include "SettingsDefines.h" -#include +#include "IPinHook.h" #include #include "MPCPngImage.h" @@ -103,10 +103,10 @@ static UINT s_uTBBC = RegisterWindowMessage(_T("TaskbarButtonCreated")); #include "MultiMonitor.h" #ifdef USE_MEDIAINFO_STATIC -#include +#include "MediaInfo/MediaInfo.h" using namespace MediaInfoLib; #else -#include +#include "MediaInfoDLL.h" using namespace MediaInfoDLL; #endif diff --git a/src/mpc-hc/MainFrm.h b/src/mpc-hc/MainFrm.h index 5d62f49bd..a5ff6627b 100644 --- a/src/mpc-hc/MainFrm.h +++ b/src/mpc-hc/MainFrm.h @@ -52,9 +52,9 @@ #endif /* _WIN64 */ #include "ShockwaveGraph.h" -#include -#include -#include +#include "IChapterInfo.h" +#include "IKeyFrameInfo.h" +#include "IBufferInfo.h" #include "WebServer.h" #include @@ -66,7 +66,7 @@ #include "LcdSupport.h" #include "MpcApi.h" #include "../filters/renderer/SyncClock/SyncClock.h" -#include +#include "sizecbar/scbarg.h" class CFullscreenWnd; diff --git a/src/mpc-hc/MediaTypesDlg.cpp b/src/mpc-hc/MediaTypesDlg.cpp index da0987a1a..2ac94d497 100644 --- a/src/mpc-hc/MediaTypesDlg.cpp +++ b/src/mpc-hc/MediaTypesDlg.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "MediaTypesDlg.h" #include "../DSUtil/DSUtil.h" -#include +#include "moreuuids.h" // CMediaTypesDlg dialog diff --git a/src/mpc-hc/MediaTypesDlg.h b/src/mpc-hc/MediaTypesDlg.h index d11360977..ab355ad5d 100644 --- a/src/mpc-hc/MediaTypesDlg.h +++ b/src/mpc-hc/MediaTypesDlg.h @@ -26,7 +26,7 @@ #include #include #include "IGraphBuilder2.h" -#include +#include "ResizableLib/ResizableDialog.h" // CMediaTypesDlg dialog diff --git a/src/mpc-hc/Mpeg2SectionData.cpp b/src/mpc-hc/Mpeg2SectionData.cpp index d87f05bc2..f9fe7323d 100644 --- a/src/mpc-hc/Mpeg2SectionData.cpp +++ b/src/mpc-hc/Mpeg2SectionData.cpp @@ -21,7 +21,7 @@ */ #include "stdafx.h" -#include +#include "BaseClasses/streams.h" #include #include "../DSUtil/GolombBuffer.h" diff --git a/src/mpc-hc/OpenDlg.h b/src/mpc-hc/OpenDlg.h index 03a2777b9..8cc002ff3 100644 --- a/src/mpc-hc/OpenDlg.h +++ b/src/mpc-hc/OpenDlg.h @@ -24,7 +24,7 @@ #pragma once #include "resource.h" -#include +#include "ResizableLib/ResizableDialog.h" // COpenDlg dialog diff --git a/src/mpc-hc/PPageBase.h b/src/mpc-hc/PPageBase.h index 11ba5e90e..0d894ad03 100644 --- a/src/mpc-hc/PPageBase.h +++ b/src/mpc-hc/PPageBase.h @@ -23,7 +23,7 @@ #pragma once -#include +#include "ResizableLib/ResizableDialog.h" // CPPageBase dialog diff --git a/src/mpc-hc/PPageExternalFilters.cpp b/src/mpc-hc/PPageExternalFilters.cpp index 5086a7c5a..1d38f7a7c 100644 --- a/src/mpc-hc/PPageExternalFilters.cpp +++ b/src/mpc-hc/PPageExternalFilters.cpp @@ -31,7 +31,7 @@ #include "RegFilterChooserDlg.h" #include "SelectMediaType.h" #include "FGFilter.h" -#include +#include "moreuuids.h" // CPPageExternalFilters dialog diff --git a/src/mpc-hc/PPageFileInfoDetails.cpp b/src/mpc-hc/PPageFileInfoDetails.cpp index a3e1f27ac..81c06f050 100644 --- a/src/mpc-hc/PPageFileInfoDetails.cpp +++ b/src/mpc-hc/PPageFileInfoDetails.cpp @@ -28,7 +28,7 @@ #include "../DSUtil/DSUtil.h" #include #include -#include +#include "moreuuids.h" // CPPageFileInfoDetails dialog diff --git a/src/mpc-hc/PPageFileMediaInfo.cpp b/src/mpc-hc/PPageFileMediaInfo.cpp index bfd85c7ce..b013097cf 100644 --- a/src/mpc-hc/PPageFileMediaInfo.cpp +++ b/src/mpc-hc/PPageFileMediaInfo.cpp @@ -29,10 +29,10 @@ #include "../DSUtil/WinAPIUtils.h" #ifdef USE_MEDIAINFO_STATIC -#include +#include "MediaInfo/MediaInfo.h" using namespace MediaInfoLib; #else -#include +#include "MediaInfoDLL.h" using namespace MediaInfoDLL; #endif diff --git a/src/mpc-hc/PPageMisc.cpp b/src/mpc-hc/PPageMisc.cpp index aa0bdcb86..f9ead0627 100644 --- a/src/mpc-hc/PPageMisc.cpp +++ b/src/mpc-hc/PPageMisc.cpp @@ -24,7 +24,7 @@ #include "mplayerc.h" #include "MainFrm.h" #include "PPageOutput.h" -#include +#include "moreuuids.h" #include "PPageMisc.h" #include diff --git a/src/mpc-hc/PPageOutput.cpp b/src/mpc-hc/PPageOutput.cpp index 44068ae16..5e6458b7a 100644 --- a/src/mpc-hc/PPageOutput.cpp +++ b/src/mpc-hc/PPageOutput.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "PPageOutput.h" #include "../DSUtil/SysVersion.h" -#include +#include "moreuuids.h" #include "Monitors.h" // CPPageOutput dialog diff --git a/src/mpc-hc/PPageSheet.h b/src/mpc-hc/PPageSheet.h index a83c48d2d..075f9db44 100644 --- a/src/mpc-hc/PPageSheet.h +++ b/src/mpc-hc/PPageSheet.h @@ -42,7 +42,7 @@ #include "PPageTweaks.h" #include "PPageMisc.h" #include "PPageCapture.h" -#include +#include "TreePropSheet/TreePropSheet.h" // CTreePropSheetTreeCtrl diff --git a/src/mpc-hc/PlayerBar.h b/src/mpc-hc/PlayerBar.h index 121dbe651..fd1ade88a 100644 --- a/src/mpc-hc/PlayerBar.h +++ b/src/mpc-hc/PlayerBar.h @@ -22,7 +22,7 @@ #pragma once -#include +#include "sizecbar/scbarg.h" class CPlayerBar : public CSizingControlBarG diff --git a/src/mpc-hc/PlayerCaptureDialog.cpp b/src/mpc-hc/PlayerCaptureDialog.cpp index 60c267b64..6f8d17b36 100644 --- a/src/mpc-hc/PlayerCaptureDialog.cpp +++ b/src/mpc-hc/PlayerCaptureDialog.cpp @@ -26,7 +26,7 @@ #include "MainFrm.h" #include "PlayerCaptureDialog.h" #include "../DSUtil/DSUtil.h" -#include +#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/mpc-hc/PlayerCaptureDialog.h b/src/mpc-hc/PlayerCaptureDialog.h index 59ef79f4b..d7c4ee90c 100644 --- a/src/mpc-hc/PlayerCaptureDialog.h +++ b/src/mpc-hc/PlayerCaptureDialog.h @@ -27,7 +27,7 @@ #include #include "../filters/transform/BufferFilter/BufferFilter.h" #include "FloatEdit.h" -#include +#include "ResizableLib/ResizableDialog.h" // diff --git a/src/mpc-hc/PlayerNavigationDialog.cpp b/src/mpc-hc/PlayerNavigationDialog.cpp index 7a785d75c..f86df207b 100644 --- a/src/mpc-hc/PlayerNavigationDialog.cpp +++ b/src/mpc-hc/PlayerNavigationDialog.cpp @@ -25,7 +25,7 @@ #include "MainFrm.h" #include "PlayerNavigationDialog.h" #include "../DSUtil/DSUtil.h" -#include +#include "moreuuids.h" // CPlayerNavigationDialog dialog diff --git a/src/mpc-hc/PlayerNavigationDialog.h b/src/mpc-hc/PlayerNavigationDialog.h index e4c9167d7..0f7c171fa 100644 --- a/src/mpc-hc/PlayerNavigationDialog.h +++ b/src/mpc-hc/PlayerNavigationDialog.h @@ -27,7 +27,7 @@ #include "../filters/transform/BufferFilter/BufferFilter.h" #include "FloatEdit.h" #include "DVBChannel.h" -#include +#include "ResizableLib/ResizableDialog.h" #define MAX_CHANNELS_ALLOWED 200 diff --git a/src/mpc-hc/PnSPresetsDlg.h b/src/mpc-hc/PnSPresetsDlg.h index 674f0cfde..282af3625 100644 --- a/src/mpc-hc/PnSPresetsDlg.h +++ b/src/mpc-hc/PnSPresetsDlg.h @@ -25,7 +25,7 @@ #include "FloatEdit.h" #include "resource.h" -#include +#include "ResizableLib/ResizableDialog.h" // CPnSPresetsDlg dialog diff --git a/src/mpc-hc/QuicktimeGraph.cpp b/src/mpc-hc/QuicktimeGraph.cpp index c4babb55b..240e0dc41 100644 --- a/src/mpc-hc/QuicktimeGraph.cpp +++ b/src/mpc-hc/QuicktimeGraph.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include #include "QuicktimeGraph.h" -#include +#include "IQTVideoSurface.h" #include "mplayerc.h" #include "MainFrm.h" #include "../DSUtil/DSUtil.h" diff --git a/src/mpc-hc/QuicktimeGraph.h b/src/mpc-hc/QuicktimeGraph.h index eeb650b92..59f85b75a 100644 --- a/src/mpc-hc/QuicktimeGraph.h +++ b/src/mpc-hc/QuicktimeGraph.h @@ -24,11 +24,11 @@ #pragma once #include "BaseGraph.h" -#include -#include +#include "AllocatorCommon7.h" +#include "AllocatorCommon.h" #ifndef _WIN64 -#include +#include "qt/qt.h" #endif diff --git a/src/mpc-hc/RealMediaGraph.cpp b/src/mpc-hc/RealMediaGraph.cpp index 2b5701509..aa7a58efd 100644 --- a/src/mpc-hc/RealMediaGraph.cpp +++ b/src/mpc-hc/RealMediaGraph.cpp @@ -30,9 +30,9 @@ #include #include "RealMediaGraph.h" #include "RealMediaWindowlessSite.h" -#include -#include -#include +#include "realmedia/rmavsurf.h" +#include "realmedia/rmaevent.h" +#include "realmedia/rmaprefs.h" #include "../DSUtil/DSUtil.h" #include "AuthDlg.h" diff --git a/src/mpc-hc/RealMediaGraph.h b/src/mpc-hc/RealMediaGraph.h index 66e184c1d..9932d91c1 100644 --- a/src/mpc-hc/RealMediaGraph.h +++ b/src/mpc-hc/RealMediaGraph.h @@ -24,25 +24,25 @@ #pragma once #include "BaseGraph.h" -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "AllocatorCommon7.h" +#include "AllocatorCommon.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/mpc-hc/RealMediaWindowlessSite.h b/src/mpc-hc/RealMediaWindowlessSite.h index 15ac94b2c..73dc21073 100644 --- a/src/mpc-hc/RealMediaWindowlessSite.h +++ b/src/mpc-hc/RealMediaWindowlessSite.h @@ -23,23 +23,23 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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/mpc-hc/RegFilterChooserDlg.h b/src/mpc-hc/RegFilterChooserDlg.h index de5474873..e1d4f2028 100644 --- a/src/mpc-hc/RegFilterChooserDlg.h +++ b/src/mpc-hc/RegFilterChooserDlg.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include "ResizableLib/ResizableDialog.h" // CRegFilterChooserDlg dialog diff --git a/src/mpc-hc/SaveDlg.h b/src/mpc-hc/SaveDlg.h index 2679b41eb..aa493989f 100644 --- a/src/mpc-hc/SaveDlg.h +++ b/src/mpc-hc/SaveDlg.h @@ -25,7 +25,7 @@ #include #include -#include +#include "ResizableLib/ResizableDialog.h" // CSaveDlg dialog diff --git a/src/mpc-hc/SelectMediaType.h b/src/mpc-hc/SelectMediaType.h index 5eb6146f5..1f955cdbe 100644 --- a/src/mpc-hc/SelectMediaType.h +++ b/src/mpc-hc/SelectMediaType.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include "ResizableLib/ResizableDialog.h" // CSelectMediaType dialog diff --git a/src/mpc-hc/ShaderAutoCompleteDlg.h b/src/mpc-hc/ShaderAutoCompleteDlg.h index a90b66bc2..2b179687a 100644 --- a/src/mpc-hc/ShaderAutoCompleteDlg.h +++ b/src/mpc-hc/ShaderAutoCompleteDlg.h @@ -24,7 +24,7 @@ #pragma once #include "resource.h" -#include +#include "ResizableLib/ResizableDialog.h" // CShaderAutoCompleteDlg dialog diff --git a/src/mpc-hc/ShaderCombineDlg.h b/src/mpc-hc/ShaderCombineDlg.h index b11b695f9..1ad0e1368 100644 --- a/src/mpc-hc/ShaderCombineDlg.h +++ b/src/mpc-hc/ShaderCombineDlg.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include "ResizableLib/ResizableDialog.h" // CShaderCombineDlg dialog diff --git a/src/mpc-hc/ShaderEditorDlg.cpp b/src/mpc-hc/ShaderEditorDlg.cpp index ae1a741c1..bd7ce91ef 100644 --- a/src/mpc-hc/ShaderEditorDlg.cpp +++ b/src/mpc-hc/ShaderEditorDlg.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "mplayerc.h" -#include +#include "PixelShaderCompiler.h" #include "ShaderEditorDlg.h" #include "MainFrm.h" diff --git a/src/mpc-hc/ShaderEditorDlg.h b/src/mpc-hc/ShaderEditorDlg.h index a5c4c32d0..363f7c233 100644 --- a/src/mpc-hc/ShaderEditorDlg.h +++ b/src/mpc-hc/ShaderEditorDlg.h @@ -26,7 +26,7 @@ #include "LineNumberEdit.h" #include "ShaderAutoCompleteDlg.h" #include "mplayerc.h" -#include +#include "ResizableLib/ResizableDialog.h" // Q174667 diff --git a/src/mpc-hc/SubtitleDlDlg.h b/src/mpc-hc/SubtitleDlDlg.h index f58ca9659..84922b179 100644 --- a/src/mpc-hc/SubtitleDlDlg.h +++ b/src/mpc-hc/SubtitleDlDlg.h @@ -25,7 +25,7 @@ #include "ISDb.h" #include "resource.h" -#include +#include "ResizableLib/ResizableDialog.h" class CInternetSession; diff --git a/src/mpc-hc/TextPassThruFilter.cpp b/src/mpc-hc/TextPassThruFilter.cpp index 3ddf7bc17..7c35e1a35 100644 --- a/src/mpc-hc/TextPassThruFilter.cpp +++ b/src/mpc-hc/TextPassThruFilter.cpp @@ -27,7 +27,7 @@ #include "mplayerc.h" #include "MainFrm.h" #include "TextPassThruFilter.h" -#include +#include "moreuuids.h" #include "../DSUtil/DSUtil.h" #include "../Subtitles/SubtitleInputPin.h" diff --git a/src/mpc-hc/VMROSD.h b/src/mpc-hc/VMROSD.h index e973e6cdf..cbc1dd4c2 100644 --- a/src/mpc-hc/VMROSD.h +++ b/src/mpc-hc/VMROSD.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include "madVRAllocatorPresenter.h" typedef enum { diff --git a/src/mpc-hc/WebServer.cpp b/src/mpc-hc/WebServer.cpp index e181590a2..368e5a131 100644 --- a/src/mpc-hc/WebServer.cpp +++ b/src/mpc-hc/WebServer.cpp @@ -27,7 +27,7 @@ #include "MainFrm.h" #include #include -#include +#include "zlib/zlib.h" #include "WebServerSocket.h" #include "WebClientSocket.h" #include "WebServer.h" diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index 2dd834431..a7bd06602 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -34,8 +34,8 @@ #include "Monitors.h" #include "../DSUtil/WinAPIUtils.h" #include "UpdateChecker.h" -#include -#include +#include "winddk/ntddcdvd.h" +#include "detours/detours.h" #include #include #include diff --git a/src/thirdparty/AsyncReader/stdafx.h b/src/thirdparty/AsyncReader/stdafx.h index b7f4a5ad0..fe192889f 100644 --- a/src/thirdparty/AsyncReader/stdafx.h +++ b/src/thirdparty/AsyncReader/stdafx.h @@ -30,4 +30,4 @@ #endif #include -#include +#include "BaseClasses/streams.h" diff --git a/src/thirdparty/Bento4/Core/Ap4MoovAtom.cpp b/src/thirdparty/Bento4/Core/Ap4MoovAtom.cpp index e092881bc..1284c78d6 100644 --- a/src/thirdparty/Bento4/Core/Ap4MoovAtom.cpp +++ b/src/thirdparty/Bento4/Core/Ap4MoovAtom.cpp @@ -35,7 +35,7 @@ #include "Ap4AtomFactory.h" #include "Ap4DcomAtom.h" #include "Ap4CmvdAtom.h" -#include +#include "zlib/zlib.h" /*---------------------------------------------------------------------- | AP4_TrakAtomCollector diff --git a/src/thirdparty/ui/LCDUI/LCDGfx.h b/src/thirdparty/ui/LCDUI/LCDGfx.h index 880e825d6..901c2d15f 100644 --- a/src/thirdparty/ui/LCDUI/LCDGfx.h +++ b/src/thirdparty/ui/LCDUI/LCDGfx.h @@ -15,7 +15,7 @@ #include #include -#include +#include "lglcd/lglcd.h" #if _MSC_VER >= 1400 #define LCDUI_tcsncpy(x, y, z) _tcsncpy_s(x, _countof(x), y, z) diff --git a/src/thirdparty/ui/LCDUI/LCDOutput.h b/src/thirdparty/ui/LCDUI/LCDOutput.h index 7a379aea0..789e2bee7 100644 --- a/src/thirdparty/ui/LCDUI/LCDOutput.h +++ b/src/thirdparty/ui/LCDUI/LCDOutput.h @@ -14,7 +14,7 @@ #define _CLCDOUTPUT_H_INCLUDED_ #include "LCDManager.h" -#include +#include "lglcd/lglcd.h" #include using namespace std; -- cgit v1.2.3