From 02183f6e47ad4ea1057de9950482f291f2ae4290 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 9 Feb 2010 20:12:31 +0000 Subject: Converted #include slashes from \ to / (makes the code more portable) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Nicolás Alvarez. git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1647 10f7b99b-c216-0410-bff0-8a66a9350fd8 --- src/apps/MPCTestAPI/MPCTestAPIDlg.h | 2 +- src/apps/asf2mkv/asf2mkv.cpp | 2 +- src/apps/asf2mkv/asf2mkvDlg.cpp | 2 +- src/apps/asf2mkv/stdafx.h | 6 +- src/apps/mplayerc/AllocatorCommon.h | 4 +- src/apps/mplayerc/BaseGraph.cpp | 2 +- src/apps/mplayerc/ComPropertySheet.cpp | 4 +- src/apps/mplayerc/ConvertDlg.cpp | 2 +- src/apps/mplayerc/ConvertDlg.h | 2 +- src/apps/mplayerc/ConvertPropsDlg.h | 2 +- src/apps/mplayerc/DX7AllocatorPresenter.cpp | 12 ++-- src/apps/mplayerc/DX7AllocatorPresenter.h | 2 +- src/apps/mplayerc/DX9AllocatorPresenter.cpp | 2 +- src/apps/mplayerc/DeinterlacerFilter.cpp | 2 +- src/apps/mplayerc/EditListEditor.cpp | 2 +- src/apps/mplayerc/FGFilter.cpp | 2 +- src/apps/mplayerc/FGManager.cpp | 6 +- src/apps/mplayerc/FGManagerBDA.cpp | 6 +- src/apps/mplayerc/FakeFilterMapper2.cpp | 4 +- src/apps/mplayerc/FavoriteOrganizeDlg.h | 2 +- src/apps/mplayerc/FullscreenWnd.cpp | 2 +- src/apps/mplayerc/KeyProvider.cpp | 2 +- src/apps/mplayerc/MainFrm.cpp | 10 +-- src/apps/mplayerc/MainFrm.h | 4 +- src/apps/mplayerc/MediaTypesDlg.cpp | 2 +- src/apps/mplayerc/Mpeg2SectionData.cpp | 2 +- src/apps/mplayerc/OpenCapDeviceDlg.cpp | 2 +- src/apps/mplayerc/PPageAudioSwitcher.h | 2 +- src/apps/mplayerc/PPageCapture.cpp | 2 +- src/apps/mplayerc/PPageFileInfoClip.cpp | 2 +- src/apps/mplayerc/PPageFileInfoDetails.cpp | 2 +- src/apps/mplayerc/PPageFileInfoDetails.h | 2 +- src/apps/mplayerc/PPageFileInfoRes.cpp | 2 +- src/apps/mplayerc/PPageFileInfoRes.h | 2 +- src/apps/mplayerc/PPageInternalFilters.cpp | 2 +- src/apps/mplayerc/PPageSubStyle.h | 2 +- src/apps/mplayerc/PPageSubtitles.h | 2 +- src/apps/mplayerc/PlayerCaptureDialog.cpp | 8 +-- src/apps/mplayerc/PlayerCaptureDialog.h | 2 +- src/apps/mplayerc/PlayerListCtrl.cpp | 2 +- src/apps/mplayerc/PlayerPlaylistBar.cpp | 4 +- src/apps/mplayerc/PlayerStatusBar.cpp | 2 +- src/apps/mplayerc/PlayerSubresyncBar.h | 4 +- src/apps/mplayerc/QuicktimeGraph.cpp | 2 +- src/apps/mplayerc/RM9AllocatorPresenter.h | 8 +-- src/apps/mplayerc/RealMediaGraph.cpp | 8 +-- src/apps/mplayerc/RealMediaGraph.h | 32 +++++----- src/apps/mplayerc/RealMediaWindowlessSite.cpp | 2 +- src/apps/mplayerc/RealMediaWindowlessSite.h | 34 +++++----- src/apps/mplayerc/RegFilterChooserDlg.cpp | 2 +- src/apps/mplayerc/SaveDlg.cpp | 2 +- src/apps/mplayerc/SaveTextFileDialog.h | 2 +- src/apps/mplayerc/SelectMediaType.cpp | 2 +- src/apps/mplayerc/ShaderEditorDlg.h | 2 +- src/apps/mplayerc/ShockwaveGraph.cpp | 2 +- src/apps/mplayerc/StdAfx.h | 8 +-- src/apps/mplayerc/SyncRenderer.cpp | 6 +- src/apps/mplayerc/SyncRenderer.h | 2 +- src/apps/mplayerc/TextPassThruFilter.cpp | 4 +- src/apps/mplayerc/VMROSD.cpp | 2 +- src/apps/mplayerc/WebClientSocket.cpp | 6 +- src/apps/mplayerc/WebServer.cpp | 2 +- src/apps/mplayerc/WebServerSocket.cpp | 4 +- src/apps/mplayerc/libpng.c | 2 +- src/apps/mplayerc/mplayerc.cpp | 6 +- src/apps/mplayerc/mplayerc.h | 2 +- src/apps/mplayerc/pngdib.c | 2 +- src/apps/vsconv/vsconv.cpp | 2 +- src/apps/vsrip/VSRipFileDlg.cpp | 4 +- src/apps/vsrip/VSRipPGCDlg.cpp | 2 +- src/apps/vsrip/VSRipPage.h | 2 +- src/decss/DeCSSInputPin.cpp | 2 +- src/decss/VobFile.h | 2 +- src/decss/stdafx.h | 2 +- src/dsutil/DSUtil.cpp | 4 +- src/dsutil/FontInstaller.cpp | 2 +- src/filters/InternalPropertyPage.cpp | 2 +- src/filters/PinInfoWnd.cpp | 2 +- src/filters/filters.h | 74 +++++++++++----------- src/filters/misc/SyncClock/SyncClock.cpp | 4 +- src/filters/misc/SyncClock/stdafx.h | 2 +- src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp | 2 +- src/filters/muxer/basemuxer/BaseMuxerInputPin.h | 2 +- src/filters/muxer/basemuxer/BaseMuxerOutputPin.h | 2 +- src/filters/muxer/basemuxer/stdafx.h | 4 +- src/filters/muxer/dsmmuxer/DSMMuxer.cpp | 4 +- src/filters/muxer/dsmmuxer/DSMMuxer.h | 4 +- src/filters/muxer/dsmmuxer/stdafx.h | 2 +- src/filters/muxer/matroskamuxer/MatroskaFile.cpp | 2 +- src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp | 4 +- src/filters/muxer/matroskamuxer/stdafx.h | 2 +- src/filters/muxer/wavdest/stdafx.h | 2 +- src/filters/muxer/wavdest/wavdest.cpp | 4 +- src/filters/parser/avisplitter/AviFile.h | 2 +- src/filters/parser/avisplitter/AviSplitter.h | 2 +- src/filters/parser/avisplitter/stdafx.h | 4 +- src/filters/parser/basesplitter/AsyncReader.cpp | 2 +- src/filters/parser/basesplitter/BaseSplitter.cpp | 4 +- src/filters/parser/basesplitter/BaseSplitter.h | 4 +- .../parser/basesplitter/BaseSplitterFile.cpp | 2 +- .../parser/basesplitter/BaseSplitterFileEx.cpp | 4 +- src/filters/parser/basesplitter/MultiFiles.h | 2 +- src/filters/parser/basesplitter/stdafx.h | 2 +- src/filters/parser/diracsplitter/DiracSplitter.cpp | 2 +- src/filters/parser/diracsplitter/DiracSplitter.h | 2 +- .../parser/diracsplitter/DiracSplitterFile.h | 2 +- .../libdirac/libdirac_decoder/dirac_parser.h | 2 +- src/filters/parser/diracsplitter/stdafx.h | 8 +-- src/filters/parser/dsmsplitter/DSMSplitter.cpp | 4 +- src/filters/parser/dsmsplitter/DSMSplitter.h | 2 +- src/filters/parser/dsmsplitter/DSMSplitterFile.cpp | 2 +- src/filters/parser/dsmsplitter/DSMSplitterFile.h | 6 +- src/filters/parser/dsmsplitter/stdafx.h | 2 +- src/filters/parser/flvsplitter/FLVSplitter.cpp | 4 +- src/filters/parser/flvsplitter/FLVSplitter.h | 4 +- src/filters/parser/flvsplitter/stdafx.h | 2 +- .../parser/matroskasplitter/MatroskaFile.cpp | 4 +- src/filters/parser/matroskasplitter/MatroskaFile.h | 2 +- .../parser/matroskasplitter/MatroskaSplitter.cpp | 4 +- .../parser/matroskasplitter/MatroskaSplitter.h | 2 +- src/filters/parser/matroskasplitter/stdafx.h | 4 +- .../mp4splitter/AP4/Source/Core/Ap4MoovAtom.cpp | 2 +- .../parser/mp4splitter/Ap4AsyncReaderStream.h | 2 +- src/filters/parser/mp4splitter/MP4Splitter.cpp | 4 +- src/filters/parser/mp4splitter/MP4Splitter.h | 2 +- src/filters/parser/mp4splitter/MP4SplitterFile.h | 2 +- src/filters/parser/mp4splitter/stdafx.h | 2 +- src/filters/parser/mpasplitter/MpaSplitter.cpp | 2 +- src/filters/parser/mpasplitter/MpaSplitter.h | 2 +- src/filters/parser/mpasplitter/MpaSplitterFile.h | 2 +- src/filters/parser/mpasplitter/stdafx.h | 8 +-- src/filters/parser/mpegsplitter/MpegSplitter.cpp | 4 +- src/filters/parser/mpegsplitter/MpegSplitter.h | 2 +- src/filters/parser/mpegsplitter/MpegSplitterFile.h | 2 +- src/filters/parser/mpegsplitter/stdafx.h | 8 +-- src/filters/parser/nutsplitter/NutFile.h | 2 +- src/filters/parser/nutsplitter/NutSplitter.cpp | 2 +- src/filters/parser/nutsplitter/NutSplitter.h | 2 +- src/filters/parser/nutsplitter/stdafx.h | 8 +-- src/filters/parser/oggsplitter/OggFile.cpp | 2 +- src/filters/parser/oggsplitter/OggFile.h | 2 +- src/filters/parser/oggsplitter/OggSplitter.cpp | 6 +- src/filters/parser/oggsplitter/OggSplitter.h | 2 +- src/filters/parser/oggsplitter/stdafx.h | 4 +- .../parser/realmediasplitter/RealMediaSplitter.cpp | 8 +-- .../parser/realmediasplitter/RealMediaSplitter.h | 4 +- src/filters/parser/realmediasplitter/stdafx.h | 2 +- src/filters/parser/roqsplitter/RoQSplitter.cpp | 2 +- src/filters/parser/roqsplitter/RoQSplitter.h | 2 +- src/filters/parser/roqsplitter/stdafx.h | 8 +-- src/filters/parser/ssfsplitter/SSFSplitter.cpp | 2 +- src/filters/parser/ssfsplitter/SSFSplitter.h | 4 +- src/filters/parser/ssfsplitter/stdafx.h | 4 +- .../parser/streamdrivethru/StreamDriveThru.cpp | 4 +- .../parser/streamdrivethru/StreamDriveThru.h | 2 +- src/filters/parser/streamdrivethru/stdafx.h | 2 +- src/filters/reader/asyncreader/stdafx.h | 2 +- src/filters/reader/cddareader/CDDAReader.cpp | 4 +- src/filters/reader/cddareader/CDDAReader.h | 8 +-- src/filters/reader/cddareader/stdafx.h | 2 +- src/filters/reader/cdxareader/CDXAReader.cpp | 4 +- src/filters/reader/cdxareader/CDXAReader.h | 4 +- src/filters/reader/cdxareader/stdafx.h | 2 +- src/filters/reader/udpreader/UDPReader.cpp | 4 +- src/filters/reader/udpreader/UDPReader.h | 4 +- src/filters/reader/udpreader/stdafx.h | 2 +- src/filters/reader/vtsreader/VTSReader.cpp | 6 +- src/filters/reader/vtsreader/VTSReader.h | 4 +- src/filters/reader/vtsreader/stdafx.h | 2 +- .../renderer/MpcAudioRenderer/MpcAudioRenderer.cpp | 4 +- .../renderer/MpcAudioRenderer/MpcAudioRenderer.h | 2 +- src/filters/renderer/MpcAudioRenderer/stdafx.h | 2 +- src/filters/source/basesource/BaseSource.cpp | 2 +- src/filters/source/basesource/BaseSource.h | 2 +- src/filters/source/basesource/stdafx.h | 2 +- src/filters/source/d2vsource/D2VSource.cpp | 4 +- src/filters/source/d2vsource/D2VSource.h | 2 +- src/filters/source/d2vsource/stdafx.h | 2 +- src/filters/source/dtsac3source/DTSAC3Source.cpp | 4 +- src/filters/source/dtsac3source/DTSAC3Source.h | 2 +- src/filters/source/dtsac3source/stdafx.h | 2 +- src/filters/source/flacsource/FlacSource.cpp | 6 +- src/filters/source/flacsource/FlacSource.h | 2 +- src/filters/source/flacsource/stdafx.h | 2 +- src/filters/source/flicsource/FLICSource.cpp | 4 +- src/filters/source/flicsource/stdafx.h | 2 +- .../source/shoutcastsource/ShoutcastSource.cpp | 4 +- src/filters/source/shoutcastsource/stdafx.h | 2 +- .../source/subtitlesource/SubtitleSource.cpp | 4 +- src/filters/source/subtitlesource/SubtitleSource.h | 2 +- src/filters/source/subtitlesource/stdafx.h | 2 +- src/filters/stdafx.h | 2 +- .../switcher/audioswitcher/AudioSwitcher.cpp | 4 +- .../switcher/audioswitcher/StreamSwitcher.cpp | 2 +- src/filters/switcher/audioswitcher/stdafx.h | 2 +- .../transform/avi2ac3filter/AVI2AC3Filter.cpp | 4 +- src/filters/transform/avi2ac3filter/stdafx.h | 2 +- .../transform/basevideofilter/BaseVideoFilter.cpp | 4 +- src/filters/transform/basevideofilter/stdafx.h | 2 +- .../transform/bufferfilter/BufferFilter.cpp | 4 +- src/filters/transform/bufferfilter/stdafx.h | 2 +- src/filters/transform/decssfilter/DeCSSFilter.cpp | 6 +- src/filters/transform/decssfilter/stdafx.h | 2 +- .../transform/mpadecfilter/MpaDecFilter.cpp | 8 +-- src/filters/transform/mpadecfilter/MpaDecFilter.h | 14 ++-- .../transform/mpadecfilter/MpaDecSettingsWnd.cpp | 2 +- .../transform/mpadecfilter/MpaDecSettingsWnd.h | 2 +- src/filters/transform/mpadecfilter/stdafx.h | 2 +- src/filters/transform/mpcvideodec/DXVADecoder.cpp | 2 +- .../transform/mpcvideodec/DXVADecoderH264.cpp | 2 +- .../transform/mpcvideodec/MPCAudioDecFilter.cpp | 2 +- src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp | 4 +- .../transform/mpcvideodec/MPCVideoDecFilter.cpp | 8 +-- .../transform/mpcvideodec/MPCVideoDecFilter.h | 4 +- .../mpcvideodec/MPCVideoDecSettingsWnd.cpp | 2 +- .../transform/mpcvideodec/MPCVideoDecSettingsWnd.h | 2 +- .../transform/mpcvideodec/VideoDecOutputPin.cpp | 2 +- .../transform/mpcvideodec/VideoDecOutputPin.h | 2 +- .../mpcvideodec/ffmpeg/libavcodec/tableprint.c | 2 +- src/filters/transform/mpcvideodec/stdafx.h | 2 +- .../transform/mpeg2decfilter/Mpeg2DecFilter.cpp | 8 +-- .../transform/mpeg2decfilter/Mpeg2DecFilter.h | 4 +- .../mpeg2decfilter/Mpeg2DecSettingsWnd.cpp | 2 +- .../transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h | 2 +- src/filters/transform/mpeg2decfilter/idct_sse2.cpp | 2 +- src/filters/transform/mpeg2decfilter/libmpeg2.cpp | 2 +- src/filters/transform/mpeg2decfilter/mc_sse2.cpp | 2 +- src/filters/transform/vsfilter/Copy.cpp | 4 +- .../transform/vsfilter/DirectVobSubFilter.cpp | 4 +- .../transform/vsfilter/DirectVobSubFilter.h | 8 +-- .../transform/vsfilter/DirectVobSubPropPage.cpp | 4 +- src/filters/transform/vsfilter/IDirectVobSub.h | 2 +- src/filters/transform/vsfilter/StdAfx.h | 4 +- src/filters/transform/vsfilter/StyleEditorDialog.h | 2 +- src/filters/transform/vsfilter/Systray.cpp | 2 +- src/filters/transform/vsfilter/TextInputPin.cpp | 2 +- src/filters/transform/vsfilter/TextInputPin.h | 2 +- src/filters/transform/vsfilter/VSFilter.cpp | 2 +- src/filters/transform/vsfilter/csriapi.cpp | 8 +-- src/filters/transform/vsfilter/plugins.cpp | 14 ++-- src/filters/transform/vsfilter/valami.cpp | 2 +- src/subpic/ISubPic.cpp | 2 +- src/subpic/stdafx.h | 4 +- src/subtitles/CompositionObject.cpp | 2 +- src/subtitles/DVBSub.cpp | 2 +- src/subtitles/HdmvSub.cpp | 2 +- src/subtitles/RTS.h | 2 +- src/subtitles/Rasterizer.h | 2 +- src/subtitles/RenderedHdmvSubtitle.h | 2 +- src/subtitles/SSF.cpp | 2 +- src/subtitles/SSF.h | 6 +- src/subtitles/SubtitleInputPin.h | 2 +- src/subtitles/VobSubFile.cpp | 2 +- src/subtitles/VobSubFile.h | 2 +- src/subtitles/VobSubFileRipper.cpp | 4 +- src/subtitles/VobSubFileRipper.h | 2 +- src/subtitles/libssf/Rasterizer.h | 2 +- src/subtitles/libssf/stdafx.h | 6 +- src/subtitles/stdafx.h | 4 +- src/ui/CmdUI/stdafx.h | 2 +- src/ui/ResizableLib/ResizableDialog.h | 2 +- src/ui/TreePropSheet/stdafx.h | 2 +- src/ui/sizecbar/stdafx.h | 2 +- src/ui/ui.h | 16 ++--- 264 files changed, 492 insertions(+), 492 deletions(-) (limited to 'src') diff --git a/src/apps/MPCTestAPI/MPCTestAPIDlg.h b/src/apps/MPCTestAPI/MPCTestAPIDlg.h index ea5cab096..4c4c66504 100644 --- a/src/apps/MPCTestAPI/MPCTestAPIDlg.h +++ b/src/apps/MPCTestAPI/MPCTestAPIDlg.h @@ -8,7 +8,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "..\mplayerc\MpcApi.h" +#include "../mplayerc/MpcApi.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/apps/asf2mkv/asf2mkv.cpp b/src/apps/asf2mkv/asf2mkv.cpp index 61178b2af..a5ab8533d 100644 --- a/src/apps/asf2mkv/asf2mkv.cpp +++ b/src/apps/asf2mkv/asf2mkv.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "asf2mkv.h" #include "asf2mkvDlg.h" -#include ".\asf2mkv.h" +#include "./asf2mkv.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/apps/asf2mkv/asf2mkvDlg.cpp b/src/apps/asf2mkv/asf2mkvDlg.cpp index 051692f32..d16e34d88 100644 --- a/src/apps/asf2mkv/asf2mkvDlg.cpp +++ b/src/apps/asf2mkv/asf2mkvDlg.cpp @@ -29,7 +29,7 @@ #endif #include -#include ".\asf2mkvdlg.h" +#include "./asf2mkvdlg.h" // {6B6D0800-9ADA-11d0-A520-00A0D10129C0} DEFINE_GUID(CLSID_NetShowSource, diff --git a/src/apps/asf2mkv/stdafx.h b/src/apps/asf2mkv/stdafx.h index 60d4e0e5f..f870d61bb 100644 --- a/src/apps/asf2mkv/stdafx.h +++ b/src/apps/asf2mkv/stdafx.h @@ -67,8 +67,8 @@ #include #include -#include "..\..\ui\ui.h" -#include "..\..\DSUtil\DSUtil.h" -#include "..\..\filters\filters.h" +#include "../../ui/ui.h" +#include "../../DSUtil/DSUtil.h" +#include "../../filters/filters.h" #define ResStr(id) CString(MAKEINTRESOURCE(id)) \ No newline at end of file diff --git a/src/apps/mplayerc/AllocatorCommon.h b/src/apps/mplayerc/AllocatorCommon.h index 88e6b7295..f5113eff0 100644 --- a/src/apps/mplayerc/AllocatorCommon.h +++ b/src/apps/mplayerc/AllocatorCommon.h @@ -26,8 +26,8 @@ #include #include #include -#include "..\..\SubPic\ISubPic.h" -#include "..\..\SubPic\DX9SubPic.h" +#include "../../SubPic/ISubPic.h" +#include "../../SubPic/DX9SubPic.h" #include "PixelShaderCompiler.h" // {4E4834FA-22C2-40e2-9446-F77DD05D245E} diff --git a/src/apps/mplayerc/BaseGraph.cpp b/src/apps/mplayerc/BaseGraph.cpp index 59d0aef3e..e262f6553 100644 --- a/src/apps/mplayerc/BaseGraph.cpp +++ b/src/apps/mplayerc/BaseGraph.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "basegraph.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" // diff --git a/src/apps/mplayerc/ComPropertySheet.cpp b/src/apps/mplayerc/ComPropertySheet.cpp index f5ff62813..70b2ea4b5 100644 --- a/src/apps/mplayerc/ComPropertySheet.cpp +++ b/src/apps/mplayerc/ComPropertySheet.cpp @@ -24,8 +24,8 @@ #include "stdafx.h" #include "mplayerc.h" #include "ComPropertySheet.h" -#include "..\..\DSUtil\DSUtil.h" -#include "..\..\filters\InternalPropertyPage.h" +#include "../../DSUtil/DSUtil.h" +#include "../../filters/InternalPropertyPage.h" // CComPropertyPageSite diff --git a/src/apps/mplayerc/ConvertDlg.cpp b/src/apps/mplayerc/ConvertDlg.cpp index f80536f59..1e49fabae 100644 --- a/src/apps/mplayerc/ConvertDlg.cpp +++ b/src/apps/mplayerc/ConvertDlg.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include #include "mplayerc.h" -#include "..\..\filters\filters.h" +#include "../../filters/filters.h" #include #include "FGManager.h" #include "ConvertPropsDlg.h" diff --git a/src/apps/mplayerc/ConvertDlg.h b/src/apps/mplayerc/ConvertDlg.h index 5aecf20b5..7965cded0 100644 --- a/src/apps/mplayerc/ConvertDlg.h +++ b/src/apps/mplayerc/ConvertDlg.h @@ -24,7 +24,7 @@ #pragma once #include "IGraphBuilder2.h" -#include "..\..\DSUtil\DSMPropertyBag.h" +#include "../../DSUtil/DSMPropertyBag.h" class CFilterTreeCtrl : public CTreeCtrl diff --git a/src/apps/mplayerc/ConvertPropsDlg.h b/src/apps/mplayerc/ConvertPropsDlg.h index abe65cfb8..5f188e3c6 100644 --- a/src/apps/mplayerc/ConvertPropsDlg.h +++ b/src/apps/mplayerc/ConvertPropsDlg.h @@ -23,7 +23,7 @@ #pragma once -#include "..\..\DSUtil\DSMPropertyBag.h" +#include "../../DSUtil/DSMPropertyBag.h" #include "afxwin.h" #include "afxcmn.h" diff --git a/src/apps/mplayerc/DX7AllocatorPresenter.cpp b/src/apps/mplayerc/DX7AllocatorPresenter.cpp index b1828e794..3343751ea 100644 --- a/src/apps/mplayerc/DX7AllocatorPresenter.cpp +++ b/src/apps/mplayerc/DX7AllocatorPresenter.cpp @@ -25,17 +25,17 @@ #include "mplayerc.h" #include #include -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include #include "DX7AllocatorPresenter.h" #include #include -#include "..\..\SubPic\DX7SubPic.h" -#include -#include -#include -#include +#include "../../SubPic/DX7SubPic.h" +#include +#include +#include +#include #include "IQTVideoSurface.h" #include "IPinHook.h" diff --git a/src/apps/mplayerc/DX7AllocatorPresenter.h b/src/apps/mplayerc/DX7AllocatorPresenter.h index e8e9fd05e..914a95cc2 100644 --- a/src/apps/mplayerc/DX7AllocatorPresenter.h +++ b/src/apps/mplayerc/DX7AllocatorPresenter.h @@ -23,7 +23,7 @@ #pragma once -#include "..\..\SubPic\ISubPic.h" +#include "../../SubPic/ISubPic.h" // {495CF191-810D-44c7-92C5-E7D46AE00F44} diff --git a/src/apps/mplayerc/DX9AllocatorPresenter.cpp b/src/apps/mplayerc/DX9AllocatorPresenter.cpp index 5ded57927..e2a6e0f72 100644 --- a/src/apps/mplayerc/DX9AllocatorPresenter.cpp +++ b/src/apps/mplayerc/DX9AllocatorPresenter.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "DX9AllocatorPresenter.h" #include -#include "..\..\SubPic\DX9SubPic.h" +#include "../../SubPic/DX9SubPic.h" #include "IPinHook.h" #include "MainFrm.h" diff --git a/src/apps/mplayerc/DeinterlacerFilter.cpp b/src/apps/mplayerc/DeinterlacerFilter.cpp index 10e6aa055..36e353ebd 100644 --- a/src/apps/mplayerc/DeinterlacerFilter.cpp +++ b/src/apps/mplayerc/DeinterlacerFilter.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "deinterlacerfilter.h" -#include "..\..\DSUtil\MediaTypes.h" +#include "../../DSUtil/MediaTypes.h" #include diff --git a/src/apps/mplayerc/EditListEditor.cpp b/src/apps/mplayerc/EditListEditor.cpp index 68acabcbf..8af6de2b3 100644 --- a/src/apps/mplayerc/EditListEditor.cpp +++ b/src/apps/mplayerc/EditListEditor.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "resource.h" #include "EditListEditor.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" CClip::CClip() diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index 86e5b60ab..6955e30ec 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "FGFilter.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include "DX7AllocatorPresenter.h" #include "AllocatorCommon.h" #include "SyncAllocatorPresenter.h" diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index e7be86586..458445cd4 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -24,8 +24,8 @@ #include "stdafx.h" #include "mplayerc.h" #include "FGManager.h" -#include "..\..\DSUtil\DSUtil.h" -#include "..\..\Filters\Filters.h" +#include "../../DSUtil/DSUtil.h" +#include "../../Filters/Filters.h" #include "DX7AllocatorPresenter.h" #include "AllocatorCommon.h" #include "SyncAllocatorPresenter.h" @@ -2570,7 +2570,7 @@ CFGManagerDVD::CFGManagerDVD(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd) m_transform.AddTail(DNew CFGFilterRegistry(GUIDFromCString(_T("{F50B3F13-19C4-11CF-AA9A-02608C9BABA2}")), MERIT64_DO_NOT_USE)); } -#include "..\..\decss\VobFile.h" +#include "../../decss/VobFile.h" class CResetDVD : public CDVDSession { diff --git a/src/apps/mplayerc/FGManagerBDA.cpp b/src/apps/mplayerc/FGManagerBDA.cpp index 13f46fd9a..f3c384ee3 100644 --- a/src/apps/mplayerc/FGManagerBDA.cpp +++ b/src/apps/mplayerc/FGManagerBDA.cpp @@ -29,9 +29,9 @@ #include #include -#include "..\..\DSUtil\DSUtil.h" -#include "..\..\DSUtil\GolombBuffer.h" -#include "..\..\filters\switcher\AudioSwitcher\AudioSwitcher.h" +#include "../../DSUtil/DSUtil.h" +#include "../../DSUtil/GolombBuffer.h" +#include "../../filters/switcher/AudioSwitcher/AudioSwitcher.h" #include #include "mplayerc.h" #include "FGManagerBDA.h" diff --git a/src/apps/mplayerc/FakeFilterMapper2.cpp b/src/apps/mplayerc/FakeFilterMapper2.cpp index ebf95ebdd..ece6ab55e 100644 --- a/src/apps/mplayerc/FakeFilterMapper2.cpp +++ b/src/apps/mplayerc/FakeFilterMapper2.cpp @@ -24,13 +24,13 @@ #include "stdafx.h" #include "fakefiltermapper2.h" #include "MacrovisionKicker.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include #include -#include +#include HRESULT (__stdcall * Real_CoCreateInstance)(CONST IID& a0, LPUNKNOWN a1, diff --git a/src/apps/mplayerc/FavoriteOrganizeDlg.h b/src/apps/mplayerc/FavoriteOrganizeDlg.h index f099bb06b..c784913db 100644 --- a/src/apps/mplayerc/FavoriteOrganizeDlg.h +++ b/src/apps/mplayerc/FavoriteOrganizeDlg.h @@ -25,7 +25,7 @@ #include "afxcmn.h" #include "afxwin.h" -#include "..\..\ui\ResizableLib\ResizableDialog.h" +#include "../../ui/ResizableLib/ResizableDialog.h" // CFavoriteOrganizeDlg dialog diff --git a/src/apps/mplayerc/FullscreenWnd.cpp b/src/apps/mplayerc/FullscreenWnd.cpp index c4e5cea82..455510876 100644 --- a/src/apps/mplayerc/FullscreenWnd.cpp +++ b/src/apps/mplayerc/FullscreenWnd.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "FullscreenWnd.h" #include "MainFrm.h" -#include ".\fullscreenwnd.h" +#include "./fullscreenwnd.h" // CFullscreenWnd diff --git a/src/apps/mplayerc/KeyProvider.cpp b/src/apps/mplayerc/KeyProvider.cpp index 94e72fa7b..cce0cab37 100644 --- a/src/apps/mplayerc/KeyProvider.cpp +++ b/src/apps/mplayerc/KeyProvider.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "keyprovider.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" CKeyProvider::CKeyProvider() diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 9e7e978fd..fddb59879 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -65,18 +65,18 @@ #include //#include // Casimir666 : incompatible avec D3D.h -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include "FGManager.h" #include "FGManagerBDA.h" #include "textpassthrufilter.h" -#include "..\..\filters\filters.h" -#include "..\..\filters\PinInfoWnd.h" +#include "../../filters/filters.h" +#include "../../filters/PinInfoWnd.h" #include "DX7AllocatorPresenter.h" #include "AllocatorCommon.h" -#include "..\..\subtitles\SSF.h" +#include "../../subtitles/SSF.h" #include "ComPropertySheet.h" #include "LcdSupport.h" #include "SettingsDefines.h" @@ -90,7 +90,7 @@ static UINT s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); static UINT WM_NOTIFYICON = RegisterWindowMessage(TEXT("MYWM_NOTIFYICON")); static UINT s_uTBBC = RegisterWindowMessage(TEXT("TaskbarButtonCreated")); -#include "..\..\filters\transform\vsfilter\IDirectVobSub.h" +#include "../../filters/transform/vsfilter/IDirectVobSub.h" #include "Monitors.h" #include "MultiMonitor.h" diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h index 6508c73c0..57f89b8e4 100644 --- a/src/apps/mplayerc/MainFrm.h +++ b/src/apps/mplayerc/MainFrm.h @@ -43,7 +43,7 @@ #include "KeyProvider.h" -#include "..\..\subpic\ISubPic.h" +#include "../../subpic/ISubPic.h" #include "IGraphBuilder2.h" @@ -68,7 +68,7 @@ #include "VMROSD.h" #include "LcdSupport.h" #include "MpcApi.h" -#include "..\..\filters\misc\SyncClock\SyncClock.h" +#include "../../filters/misc/SyncClock/SyncClock.h" class CFullscreenWnd; diff --git a/src/apps/mplayerc/MediaTypesDlg.cpp b/src/apps/mplayerc/MediaTypesDlg.cpp index 4b3d7da7b..b261bdde9 100644 --- a/src/apps/mplayerc/MediaTypesDlg.cpp +++ b/src/apps/mplayerc/MediaTypesDlg.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "mplayerc.h" #include "MediaTypesDlg.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index 35084f3df..997b8769f 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -3,7 +3,7 @@ #include #include -#include "..\..\DSUtil\GolombBuffer.h" +#include "../../DSUtil/GolombBuffer.h" #include "Mpeg2SectionData.h" #define BeginEnumDescriptors(gb, nType, nLength) \ diff --git a/src/apps/mplayerc/OpenCapDeviceDlg.cpp b/src/apps/mplayerc/OpenCapDeviceDlg.cpp index 50c5fee88..b65123c92 100644 --- a/src/apps/mplayerc/OpenCapDeviceDlg.cpp +++ b/src/apps/mplayerc/OpenCapDeviceDlg.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "mplayerc.h" #include "OpenCapDeviceDlg.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" static struct cc_t {long code; AnalogVideoStandard standard; const TCHAR* str;} s_countrycodes[] = diff --git a/src/apps/mplayerc/PPageAudioSwitcher.h b/src/apps/mplayerc/PPageAudioSwitcher.h index 10eb509b7..2254d52f5 100644 --- a/src/apps/mplayerc/PPageAudioSwitcher.h +++ b/src/apps/mplayerc/PPageAudioSwitcher.h @@ -25,7 +25,7 @@ #include "PPageBase.h" #include "FloatEdit.h" -#include "..\..\filters\switcher\AudioSwitcher\AudioSwitcher.h" +#include "../../filters/switcher/AudioSwitcher/AudioSwitcher.h" // CPPageAudioSwitcher dialog diff --git a/src/apps/mplayerc/PPageCapture.cpp b/src/apps/mplayerc/PPageCapture.cpp index 44880340d..85bef548c 100644 --- a/src/apps/mplayerc/PPageCapture.cpp +++ b/src/apps/mplayerc/PPageCapture.cpp @@ -32,7 +32,7 @@ #include "mplayerc.h" #include "PPageCapture.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" static struct cc_t {long code; AnalogVideoStandard standard; const TCHAR* str;} s_countrycodes[] = diff --git a/src/apps/mplayerc/PPageFileInfoClip.cpp b/src/apps/mplayerc/PPageFileInfoClip.cpp index 70467066b..e323c8552 100644 --- a/src/apps/mplayerc/PPageFileInfoClip.cpp +++ b/src/apps/mplayerc/PPageFileInfoClip.cpp @@ -26,7 +26,7 @@ #include "PPageFileInfoClip.h" #include #include -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" // CPPageFileInfoClip dialog diff --git a/src/apps/mplayerc/PPageFileInfoDetails.cpp b/src/apps/mplayerc/PPageFileInfoDetails.cpp index 6071ef172..8f8348c1b 100644 --- a/src/apps/mplayerc/PPageFileInfoDetails.cpp +++ b/src/apps/mplayerc/PPageFileInfoDetails.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "PPageFileInfoDetails.h" #include -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include "d3d9.h" #include "Vmr9.h" #include diff --git a/src/apps/mplayerc/PPageFileInfoDetails.h b/src/apps/mplayerc/PPageFileInfoDetails.h index e7515e38e..829a9a60a 100644 --- a/src/apps/mplayerc/PPageFileInfoDetails.h +++ b/src/apps/mplayerc/PPageFileInfoDetails.h @@ -23,7 +23,7 @@ #pragma once -#include "..\..\subpic\ISubPic.h" +#include "../../subpic/ISubPic.h" #include "afxwin.h" diff --git a/src/apps/mplayerc/PPageFileInfoRes.cpp b/src/apps/mplayerc/PPageFileInfoRes.cpp index 9c9954dac..6697050ad 100644 --- a/src/apps/mplayerc/PPageFileInfoRes.cpp +++ b/src/apps/mplayerc/PPageFileInfoRes.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "mplayerc.h" #include "PPageFileInfoRes.h" -#include ".\ppagefileinfores.h" +#include "./ppagefileinfores.h" // CPPageFileInfoRes dialog diff --git a/src/apps/mplayerc/PPageFileInfoRes.h b/src/apps/mplayerc/PPageFileInfoRes.h index 3184365ee..5882ff16d 100644 --- a/src/apps/mplayerc/PPageFileInfoRes.h +++ b/src/apps/mplayerc/PPageFileInfoRes.h @@ -25,7 +25,7 @@ #include "afxwin.h" #include "afxcmn.h" -#include "..\..\DSUtil\DSMPropertyBag.h" +#include "../../DSUtil/DSMPropertyBag.h" #include "PPageBase.h" diff --git a/src/apps/mplayerc/PPageInternalFilters.cpp b/src/apps/mplayerc/PPageInternalFilters.cpp index 03f1c5283..eed37fde8 100644 --- a/src/apps/mplayerc/PPageInternalFilters.cpp +++ b/src/apps/mplayerc/PPageInternalFilters.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "PPageInternalFilters.h" #include "ComPropertySheet.h" -#include "..\..\filters\filters.h" +#include "../../filters/filters.h" #include "internal_filter_config.h" diff --git a/src/apps/mplayerc/PPageSubStyle.h b/src/apps/mplayerc/PPageSubStyle.h index 1b40df5cd..955d9b010 100644 --- a/src/apps/mplayerc/PPageSubStyle.h +++ b/src/apps/mplayerc/PPageSubStyle.h @@ -24,7 +24,7 @@ #pragma once #include "PPageBase.h" -#include "..\..\subtitles\STS.h" +#include "../../subtitles/STS.h" class CColorStatic : public CStatic diff --git a/src/apps/mplayerc/PPageSubtitles.h b/src/apps/mplayerc/PPageSubtitles.h index ed642c0d3..2ebb6c442 100644 --- a/src/apps/mplayerc/PPageSubtitles.h +++ b/src/apps/mplayerc/PPageSubtitles.h @@ -23,7 +23,7 @@ #pragma once -#include "..\..\subtitles\STS.h" +#include "../../subtitles/STS.h" // CPPageSubtitles dialog diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index 9a360e01c..4b58f546b 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -25,11 +25,11 @@ #include "mplayerc.h" #include "mainfrm.h" #include "PlayerCaptureDialog.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include -#include "..\..\filters\muxer\wavdest\wavdest.h" -#include "..\..\filters\muxer\MatroskaMuxer\MatroskaMuxer.h" -#include "..\..\filters\muxer\DSMMuxer\DSMMuxer.h" +#include "../../filters/muxer/wavdest/wavdest.h" +#include "../../filters/muxer/MatroskaMuxer/MatroskaMuxer.h" +#include "../../filters/muxer/DSMMuxer/DSMMuxer.h" static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h index 2d5bd5e30..8d3811a1d 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.h +++ b/src/apps/mplayerc/PlayerCaptureDialog.h @@ -25,7 +25,7 @@ #include "afxwin.h" #include "afxcmn.h" -#include "..\..\filters\transform\bufferfilter\bufferfilter.h" +#include "../../filters/transform/bufferfilter/bufferfilter.h" #include "FloatEdit.h" diff --git a/src/apps/mplayerc/PlayerListCtrl.cpp b/src/apps/mplayerc/PlayerListCtrl.cpp index e81f58264..b275619b5 100644 --- a/src/apps/mplayerc/PlayerListCtrl.cpp +++ b/src/apps/mplayerc/PlayerListCtrl.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "mplayerc.h" #include "PlayerListCtrl.h" -#include ".\playerlistctrl.h" +#include "./playerlistctrl.h" // CInPlaceEdit diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp index 2fa07d8b0..d96dfb377 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.cpp +++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp @@ -28,9 +28,9 @@ #include #include "mplayerc.h" #include "mainfrm.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include "SaveTextFileDialog.h" -#include ".\playerplaylistbar.h" +#include "./playerplaylistbar.h" #include "SettingsDefines.h" IMPLEMENT_DYNAMIC(CPlayerPlaylistBar, CSizingControlBarG) diff --git a/src/apps/mplayerc/PlayerStatusBar.cpp b/src/apps/mplayerc/PlayerStatusBar.cpp index 7cddff7fa..1e984bfd9 100644 --- a/src/apps/mplayerc/PlayerStatusBar.cpp +++ b/src/apps/mplayerc/PlayerStatusBar.cpp @@ -25,7 +25,7 @@ #include "mplayerc.h" #include "PlayerStatusBar.h" #include "MainFrm.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" // CPlayerStatusBar diff --git a/src/apps/mplayerc/PlayerSubresyncBar.h b/src/apps/mplayerc/PlayerSubresyncBar.h index 8c2f72d21..e9ecdaba7 100644 --- a/src/apps/mplayerc/PlayerSubresyncBar.h +++ b/src/apps/mplayerc/PlayerSubresyncBar.h @@ -25,8 +25,8 @@ #include #include "PlayerListCtrl.h" -#include "..\..\subtitles\RTS.h" -#include "..\..\subtitles\VobSubFile.h" +#include "../../subtitles/RTS.h" +#include "../../subtitles/VobSubFile.h" // CPlayerSubresyncBar diff --git a/src/apps/mplayerc/QuicktimeGraph.cpp b/src/apps/mplayerc/QuicktimeGraph.cpp index 03a728029..7d8c38326 100644 --- a/src/apps/mplayerc/QuicktimeGraph.cpp +++ b/src/apps/mplayerc/QuicktimeGraph.cpp @@ -26,7 +26,7 @@ #include "QuicktimeGraph.h" #include "IQTVideoSurface.h" #include "mplayerc.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" // diff --git a/src/apps/mplayerc/RM9AllocatorPresenter.h b/src/apps/mplayerc/RM9AllocatorPresenter.h index b55269533..fd7673a42 100644 --- a/src/apps/mplayerc/RM9AllocatorPresenter.h +++ b/src/apps/mplayerc/RM9AllocatorPresenter.h @@ -23,10 +23,10 @@ #pragma once #include "DX9AllocatorPresenter.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "IQTVideoSurface.h" namespace DSObjects diff --git a/src/apps/mplayerc/RealMediaGraph.cpp b/src/apps/mplayerc/RealMediaGraph.cpp index 38895a6dc..6784a1234 100644 --- a/src/apps/mplayerc/RealMediaGraph.cpp +++ b/src/apps/mplayerc/RealMediaGraph.cpp @@ -29,10 +29,10 @@ #include #include "RealMediaGraph.h" #include "RealMediaWindowlessSite.h" -#include -#include -#include -#include "..\..\DSUtil\DSUtil.h" +#include +#include +#include +#include "../../DSUtil/DSUtil.h" #include "AuthDlg.h" diff --git a/src/apps/mplayerc/RealMediaGraph.h b/src/apps/mplayerc/RealMediaGraph.h index 587cf48ba..706eec4cd 100644 --- a/src/apps/mplayerc/RealMediaGraph.h +++ b/src/apps/mplayerc/RealMediaGraph.h @@ -28,22 +28,22 @@ #include "DX7AllocatorPresenter.h" #include "DX9AllocatorPresenter.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace DSObjects diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.cpp b/src/apps/mplayerc/RealMediaWindowlessSite.cpp index 4faab798f..55a3b4d94 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.cpp +++ b/src/apps/mplayerc/RealMediaWindowlessSite.cpp @@ -27,7 +27,7 @@ #include #include #include "realmediawindowlesssite.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" void DSObjects::ExtractRects(REGION* pRegion) diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.h b/src/apps/mplayerc/RealMediaWindowlessSite.h index 460b5e355..0551b5bb9 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.h +++ b/src/apps/mplayerc/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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace DSObjects diff --git a/src/apps/mplayerc/RegFilterChooserDlg.cpp b/src/apps/mplayerc/RegFilterChooserDlg.cpp index ab11a9aaa..ad17a2fbb 100644 --- a/src/apps/mplayerc/RegFilterChooserDlg.cpp +++ b/src/apps/mplayerc/RegFilterChooserDlg.cpp @@ -26,7 +26,7 @@ #include #include "RegFilterChooserDlg.h" #include "FGFilter.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" // CRegFilterChooserDlg dialog diff --git a/src/apps/mplayerc/SaveDlg.cpp b/src/apps/mplayerc/SaveDlg.cpp index 4369a847b..9fd53afcb 100644 --- a/src/apps/mplayerc/SaveDlg.cpp +++ b/src/apps/mplayerc/SaveDlg.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "mplayerc.h" #include "SaveDlg.h" -#include "..\..\filters\filters.h" +#include "../../filters/filters.h" #include "internal_filter_config.h" diff --git a/src/apps/mplayerc/SaveTextFileDialog.h b/src/apps/mplayerc/SaveTextFileDialog.h index 0b4c7b60c..0f62bb134 100644 --- a/src/apps/mplayerc/SaveTextFileDialog.h +++ b/src/apps/mplayerc/SaveTextFileDialog.h @@ -23,7 +23,7 @@ #pragma once -#include "..\..\subtitles\TextFile.h" +#include "../../subtitles/TextFile.h" // CSaveTextFileDialog diff --git a/src/apps/mplayerc/SelectMediaType.cpp b/src/apps/mplayerc/SelectMediaType.cpp index 7fb769324..192dc1d1f 100644 --- a/src/apps/mplayerc/SelectMediaType.cpp +++ b/src/apps/mplayerc/SelectMediaType.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "mplayerc.h" #include "SelectMediaType.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" // CSelectMediaType dialog diff --git a/src/apps/mplayerc/ShaderEditorDlg.h b/src/apps/mplayerc/ShaderEditorDlg.h index eaf543227..db2d5226c 100644 --- a/src/apps/mplayerc/ShaderEditorDlg.h +++ b/src/apps/mplayerc/ShaderEditorDlg.h @@ -23,7 +23,7 @@ #pragma once -#include "..\..\subpic\ISubPic.h" +#include "../../subpic/ISubPic.h" #include "LineNumberEdit.h" #include "ShaderAutoCompleteDlg.h" #include "mplayerc.h" diff --git a/src/apps/mplayerc/ShockwaveGraph.cpp b/src/apps/mplayerc/ShockwaveGraph.cpp index e34c086f0..958d99076 100644 --- a/src/apps/mplayerc/ShockwaveGraph.cpp +++ b/src/apps/mplayerc/ShockwaveGraph.cpp @@ -24,7 +24,7 @@ #include "stdafx.h" #include "shockwavegraph.h" #include "resource.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" CShockwaveGraph::CShockwaveGraph(HWND hParent, HRESULT& hr) : m_fs(State_Stopped) diff --git a/src/apps/mplayerc/StdAfx.h b/src/apps/mplayerc/StdAfx.h index 2782329d9..05798764a 100644 --- a/src/apps/mplayerc/StdAfx.h +++ b/src/apps/mplayerc/StdAfx.h @@ -30,7 +30,7 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include "..\..\DSUtil\SharedInclude.h" +#include "../../DSUtil/SharedInclude.h" // VS2005 changed result of OnNCHitTest #if _MSC_VER >= 1400 @@ -68,11 +68,11 @@ #include #ifdef _WIN64 #else -#include +#include #endif -#include "..\..\ui\ui.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../ui/ui.h" +#include "../../DSUtil/DSUtil.h" #include #pragma comment(lib, "gdiplus.lib") diff --git a/src/apps/mplayerc/SyncRenderer.cpp b/src/apps/mplayerc/SyncRenderer.cpp index 3c4de7aa8..581d818f6 100644 --- a/src/apps/mplayerc/SyncRenderer.cpp +++ b/src/apps/mplayerc/SyncRenderer.cpp @@ -22,11 +22,11 @@ */ #include "stdafx.h" -#include "..\..\filters\misc\SyncClock\Interfaces.h" +#include "../../filters/misc/SyncClock/Interfaces.h" #include "mplayerc.h" #include #include -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include // Required in CGenlock #include #include @@ -36,7 +36,7 @@ #include #include #include -#include "..\..\SubPic\DX9SubPic.h" +#include "../../SubPic/DX9SubPic.h" #include #include "MacrovisionKicker.h" #include "IPinHook.h" diff --git a/src/apps/mplayerc/SyncRenderer.h b/src/apps/mplayerc/SyncRenderer.h index f16e2aefc..8e4320bf7 100644 --- a/src/apps/mplayerc/SyncRenderer.h +++ b/src/apps/mplayerc/SyncRenderer.h @@ -22,7 +22,7 @@ */ #pragma once -#include "..\..\SubPic\ISubPic.h" +#include "../../SubPic/ISubPic.h" #include "SyncAllocatorPresenter.h" #define VMRBITMAP_UPDATE 0x80000000 diff --git a/src/apps/mplayerc/TextPassThruFilter.cpp b/src/apps/mplayerc/TextPassThruFilter.cpp index d883657a0..8bffc4200 100644 --- a/src/apps/mplayerc/TextPassThruFilter.cpp +++ b/src/apps/mplayerc/TextPassThruFilter.cpp @@ -28,8 +28,8 @@ #include "mainfrm.h" #include "TextPassThruFilter.h" #include -#include "..\..\DSUtil\DSUtil.h" -#include "..\..\subtitles\SubtitleInputPin.h" +#include "../../DSUtil/DSUtil.h" +#include "../../subtitles/SubtitleInputPin.h" // // CTextPassThruInputPin diff --git a/src/apps/mplayerc/VMROSD.cpp b/src/apps/mplayerc/VMROSD.cpp index cdd257596..02f0fa66c 100644 --- a/src/apps/mplayerc/VMROSD.cpp +++ b/src/apps/mplayerc/VMROSD.cpp @@ -21,7 +21,7 @@ */ #include "stdafx.h" -#include ".\vmrosd.h" +#include "./vmrosd.h" #include "mplayerc.h" #define SEEKBAR_HEIGHT 60 diff --git a/src/apps/mplayerc/WebClientSocket.cpp b/src/apps/mplayerc/WebClientSocket.cpp index 9299e9c5c..2339631e7 100644 --- a/src/apps/mplayerc/WebClientSocket.cpp +++ b/src/apps/mplayerc/WebClientSocket.cpp @@ -26,9 +26,9 @@ #include "mplayerc.h" #include "resource.h" #include "MainFrm.h" -#include "..\..\subtitles\TextFile.h" -#include ".\webserver.h" -#include ".\webclientsocket.h" +#include "../../subtitles/TextFile.h" +#include "./webserver.h" +#include "./webclientsocket.h" CWebClientSocket::CWebClientSocket(CWebServer* pWebServer, CMainFrame* pMainFrame) : m_pWebServer(pWebServer) diff --git a/src/apps/mplayerc/WebServer.cpp b/src/apps/mplayerc/WebServer.cpp index f5a9b21db..c7c1cdd55 100644 --- a/src/apps/mplayerc/WebServer.cpp +++ b/src/apps/mplayerc/WebServer.cpp @@ -21,7 +21,7 @@ * */ -#include "..\..\zlib\zlib.h" +#include "../../zlib/zlib.h" #include "stdafx.h" #include "mplayerc.h" #include "resource.h" diff --git a/src/apps/mplayerc/WebServerSocket.cpp b/src/apps/mplayerc/WebServerSocket.cpp index f1820dac9..d1409c8c4 100644 --- a/src/apps/mplayerc/WebServerSocket.cpp +++ b/src/apps/mplayerc/WebServerSocket.cpp @@ -22,8 +22,8 @@ */ #include "stdafx.h" -#include ".\webserver.h" -#include ".\webserversocket.h" +#include "./webserver.h" +#include "./webserversocket.h" CWebServerSocket::CWebServerSocket(CWebServer* pWebServer, int port) : m_pWebServer(pWebServer) diff --git a/src/apps/mplayerc/libpng.c b/src/apps/mplayerc/libpng.c index 26864f235..ee43b788e 100644 --- a/src/apps/mplayerc/libpng.c +++ b/src/apps/mplayerc/libpng.c @@ -24,7 +24,7 @@ #include #include #include "libpng.h" -#include "..\..\libpng\png.h" +#include "../../libpng/png.h" static void read_data_fn(png_structp png_ptr, png_bytep data, png_size_t length) diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index eefd198b5..f2daf6cd2 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -26,7 +26,7 @@ #include #include #include "MainFrm.h" -#include "..\..\DSUtil\DSUtil.h" +#include "../../DSUtil/DSUtil.h" #include "struct.h" #include "FileVersionInfo.h" #include @@ -469,9 +469,9 @@ void CMPlayerCApp::SendCommandLine(HWND hWnd) ///////////////////////////////////////////////////////////////////////////// // CMPlayerCApp initialization -#include +#include -#include +#include BOOL (__stdcall * Real_IsDebuggerPresent)(void) = IsDebuggerPresent; diff --git a/src/apps/mplayerc/mplayerc.h b/src/apps/mplayerc/mplayerc.h index 7d5c4fc33..355678ebc 100644 --- a/src/apps/mplayerc/mplayerc.h +++ b/src/apps/mplayerc/mplayerc.h @@ -30,7 +30,7 @@ #include "resource.h" // main symbols #include #include -#include "..\..\subtitles\STS.h" +#include "../../subtitles/STS.h" #include "MediaFormats.h" #include "fakefiltermapper2.h" #include "DVBChannel.h" diff --git a/src/apps/mplayerc/pngdib.c b/src/apps/mplayerc/pngdib.c index 187c8aa32..68ce18420 100644 --- a/src/apps/mplayerc/pngdib.c +++ b/src/apps/mplayerc/pngdib.c @@ -12,7 +12,7 @@ #include #include -#include "..\..\libpng\png.h" +#include "../../libpng/png.h" #define PNGDIB_INTERNALS #include "pngdib.h" diff --git a/src/apps/vsconv/vsconv.cpp b/src/apps/vsconv/vsconv.cpp index 27152b2f4..4208b2a2d 100644 --- a/src/apps/vsconv/vsconv.cpp +++ b/src/apps/vsconv/vsconv.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "vsconv.h" #include "vsconvDlg.h" -#include "..\..\subtitles\VobSubFile.h" +#include "../../subtitles/VobSubFile.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/apps/vsrip/VSRipFileDlg.cpp b/src/apps/vsrip/VSRipFileDlg.cpp index 8f499f251..36b8903a4 100644 --- a/src/apps/vsrip/VSRipFileDlg.cpp +++ b/src/apps/vsrip/VSRipFileDlg.cpp @@ -23,8 +23,8 @@ #include "stdafx.h" #include "VSRip.h" #include -#include "..\..\..\include\winddk\devioctl.h" -#include "..\..\..\include\winddk\ntddcdrm.h" +#include "../../../include/winddk/devioctl.h" +#include "../../../include/winddk/ntddcdrm.h" #include "VSRipFileDlg.h" diff --git a/src/apps/vsrip/VSRipPGCDlg.cpp b/src/apps/vsrip/VSRipPGCDlg.cpp index 52b81e365..c4126725e 100644 --- a/src/apps/vsrip/VSRipPGCDlg.cpp +++ b/src/apps/vsrip/VSRipPGCDlg.cpp @@ -24,7 +24,7 @@ #include #include "VSRip.h" #include "VSRipPGCDlg.h" -#include "..\..\subtitles\VobSubFile.h" +#include "../../subtitles/VobSubFile.h" // CVSRipPGCDlg dialog diff --git a/src/apps/vsrip/VSRipPage.h b/src/apps/vsrip/VSRipPage.h index ad67080ca..a97b5e3a3 100644 --- a/src/apps/vsrip/VSRipPage.h +++ b/src/apps/vsrip/VSRipPage.h @@ -23,7 +23,7 @@ #pragma once #include -#include "..\..\subtitles\VobSubFileRipper.h" +#include "../../subtitles/VobSubFileRipper.h" // CVSRipPage dialog diff --git a/src/decss/DeCSSInputPin.cpp b/src/decss/DeCSSInputPin.cpp index 85ba18246..87f51e6d4 100644 --- a/src/decss/DeCSSInputPin.cpp +++ b/src/decss/DeCSSInputPin.cpp @@ -26,7 +26,7 @@ #include #include #include "DeCSSInputPin.h" -#include "..\DSUtil\DSUtil.h" +#include "../DSUtil/DSUtil.h" #include "CSSauth.h" #include "CSSscramble.h" diff --git a/src/decss/VobFile.h b/src/decss/VobFile.h index c5688c2fc..97b4c7a25 100644 --- a/src/decss/VobFile.h +++ b/src/decss/VobFile.h @@ -5,7 +5,7 @@ #include #include //#include // platform sdk -#include +#include class CDVDSession { diff --git a/src/decss/stdafx.h b/src/decss/stdafx.h index 8a8c808cb..0a35b4558 100644 --- a/src/decss/stdafx.h +++ b/src/decss/stdafx.h @@ -4,7 +4,7 @@ // #pragma once -#include "..\DSUtil\SharedInclude.h" +#include "../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/dsutil/DSUtil.cpp b/src/dsutil/DSUtil.cpp index c7ed7d0c3..4ef3254b7 100644 --- a/src/dsutil/DSUtil.cpp +++ b/src/dsutil/DSUtil.cpp @@ -21,8 +21,8 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include "DSUtil.h" #include "Mpeg2Def.h" #include diff --git a/src/dsutil/FontInstaller.cpp b/src/dsutil/FontInstaller.cpp index fedc60abe..8862bfabd 100644 --- a/src/dsutil/FontInstaller.cpp +++ b/src/dsutil/FontInstaller.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include ".\fontinstaller.h" +#include "./fontinstaller.h" CFontInstaller::CFontInstaller() { diff --git a/src/filters/InternalPropertyPage.cpp b/src/filters/InternalPropertyPage.cpp index 4231ab8ca..dc3300009 100644 --- a/src/filters/InternalPropertyPage.cpp +++ b/src/filters/InternalPropertyPage.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "InternalPropertyPage.h" -#include "..\dsutil\dsutil.h" +#include "../dsutil/dsutil.h" // // CInternalPropertyPageWnd diff --git a/src/filters/PinInfoWnd.cpp b/src/filters/PinInfoWnd.cpp index 9fba29686..24dd52c59 100644 --- a/src/filters/PinInfoWnd.cpp +++ b/src/filters/PinInfoWnd.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "PinInfoWnd.h" -#include "..\dsutil\dsutil.h" +#include "../dsutil/dsutil.h" // // CPinInfoWnd diff --git a/src/filters/filters.h b/src/filters/filters.h index 9a41cd1e2..8b62a54ab 100644 --- a/src/filters/filters.h +++ b/src/filters/filters.h @@ -16,41 +16,41 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit // http://www.gnu.org/copyleft/gpl.html -#include ".\reader\CDDAReader\CDDAReader.h" -#include ".\reader\CDXAReader\CDXAReader.h" -#include ".\reader\UDPReader\UDPReader.h" -#include ".\reader\VTSReader\VTSReader.h" -#include ".\source\D2VSource\D2VSource.h" -#include ".\source\DTSAC3Source\DTSAC3Source.h" -#include ".\source\FLICSource\FLICSource.h" -#include ".\source\FlacSource\FlacSource.h" -#include ".\source\ShoutcastSource\ShoutcastSource.h" -#include ".\source\SubtitleSource\SubtitleSource.h" -#include ".\switcher\AudioSwitcher\AudioSwitcher.h" -#include ".\transform\avi2ac3filter\AVI2AC3Filter.h" -#include ".\transform\BufferFilter\BufferFilter.h" -#include ".\transform\DeCSSFilter\DeCSSFilter.h" -#include ".\transform\Mpeg2DecFilter\Mpeg2DecFilter.h" -#include ".\transform\MpaDecFilter\MpaDecFilter.h" -#include ".\transform\mpcvideodec\MPCVideoDecFilter.h" -#include ".\muxer\wavdest\wavdest.h" -#include ".\muxer\DSMMuxer\DSMMuxer.h" -#include ".\muxer\MatroskaMuxer\MatroskaMuxer.h" -#include ".\parser\StreamDriveThru\StreamDriveThru.h" -#include ".\parser\MatroskaSplitter\MatroskaSplitter.h" -#include ".\parser\RealMediaSplitter\RealMediaSplitter.h" -#include ".\parser\AviSplitter\AviSplitter.h" -//#include ".\parser\RadGtSplitter\RadGtSplitter.h" -#include ".\parser\RoQSplitter\RoQSplitter.h" -#include ".\parser\OggSplitter\OggSplitter.h" -#include ".\parser\NutSplitter\NutSplitter.h" -#include ".\parser\MpegSplitter\MpegSplitter.h" -#include ".\parser\DiracSplitter\DiracSplitter.h" -#include ".\parser\MpaSplitter\MpaSplitter.h" -#include ".\parser\DSMSplitter\DSMSplitter.h" -#include ".\parser\MP4Splitter\MP4Splitter.h" -#include ".\parser\FLVSplitter\FLVSplitter.h" -#include ".\parser\SSFSplitter\SSFSplitter.h" -#include ".\renderer\MpcAudioRenderer\MpcAudioRenderer.h" -#include ".\misc\SyncClock\SyncClock.h" +#include "./reader/CDDAReader/CDDAReader.h" +#include "./reader/CDXAReader/CDXAReader.h" +#include "./reader/UDPReader/UDPReader.h" +#include "./reader/VTSReader/VTSReader.h" +#include "./source/D2VSource/D2VSource.h" +#include "./source/DTSAC3Source/DTSAC3Source.h" +#include "./source/FLICSource/FLICSource.h" +#include "./source/FlacSource/FlacSource.h" +#include "./source/ShoutcastSource/ShoutcastSource.h" +#include "./source/SubtitleSource/SubtitleSource.h" +#include "./switcher/AudioSwitcher/AudioSwitcher.h" +#include "./transform/avi2ac3filter/AVI2AC3Filter.h" +#include "./transform/BufferFilter/BufferFilter.h" +#include "./transform/DeCSSFilter/DeCSSFilter.h" +#include "./transform/Mpeg2DecFilter/Mpeg2DecFilter.h" +#include "./transform/MpaDecFilter/MpaDecFilter.h" +#include "./transform/mpcvideodec/MPCVideoDecFilter.h" +#include "./muxer/wavdest/wavdest.h" +#include "./muxer/DSMMuxer/DSMMuxer.h" +#include "./muxer/MatroskaMuxer/MatroskaMuxer.h" +#include "./parser/StreamDriveThru/StreamDriveThru.h" +#include "./parser/MatroskaSplitter/MatroskaSplitter.h" +#include "./parser/RealMediaSplitter/RealMediaSplitter.h" +#include "./parser/AviSplitter/AviSplitter.h" +//#include "./parser/RadGtSplitter/RadGtSplitter.h" +#include "./parser/RoQSplitter/RoQSplitter.h" +#include "./parser/OggSplitter/OggSplitter.h" +#include "./parser/NutSplitter/NutSplitter.h" +#include "./parser/MpegSplitter/MpegSplitter.h" +#include "./parser/DiracSplitter/DiracSplitter.h" +#include "./parser/MpaSplitter/MpaSplitter.h" +#include "./parser/DSMSplitter/DSMSplitter.h" +#include "./parser/MP4Splitter/MP4Splitter.h" +#include "./parser/FLVSplitter/FLVSplitter.h" +#include "./parser/SSFSplitter/SSFSplitter.h" +#include "./renderer/MpcAudioRenderer/MpcAudioRenderer.h" +#include "./misc/SyncClock/SyncClock.h" diff --git a/src/filters/misc/SyncClock/SyncClock.cpp b/src/filters/misc/SyncClock/SyncClock.cpp index 51f70c74c..51743b592 100644 --- a/src/filters/misc/SyncClock/SyncClock.cpp +++ b/src/filters/misc/SyncClock/SyncClock.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include "SyncClock.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #pragma warning(disable:4355) @@ -30,7 +30,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/misc/SyncClock/stdafx.h b/src/filters/misc/SyncClock/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/misc/SyncClock/stdafx.h +++ b/src/filters/misc/SyncClock/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp b/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp index ab1660db7..ed60fa26f 100644 --- a/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp +++ b/src/filters/muxer/basemuxer/BaseMuxerInputPin.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h" #include #include "BaseMuxer.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include diff --git a/src/filters/muxer/basemuxer/BaseMuxerInputPin.h b/src/filters/muxer/basemuxer/BaseMuxerInputPin.h index cdae44041..7b10c3474 100644 --- a/src/filters/muxer/basemuxer/BaseMuxerInputPin.h +++ b/src/filters/muxer/basemuxer/BaseMuxerInputPin.h @@ -22,7 +22,7 @@ #pragma once #include "BaseMuxerRelatedPin.h" -#include "..\..\..\DSUtil\DSMPropertyBag.h" +#include "../../../DSUtil/DSMPropertyBag.h" class CBaseMuxerInputPin; diff --git a/src/filters/muxer/basemuxer/BaseMuxerOutputPin.h b/src/filters/muxer/basemuxer/BaseMuxerOutputPin.h index b6d17d7e8..616943d3e 100644 --- a/src/filters/muxer/basemuxer/BaseMuxerOutputPin.h +++ b/src/filters/muxer/basemuxer/BaseMuxerOutputPin.h @@ -24,7 +24,7 @@ #include "BitStream.h" #include "BaseMuxerInputPin.h" #include "BaseMuxerRelatedPin.h" -#include "..\..\..\subtitles\libssf\SubtitleFile.h" +#include "../../../subtitles/libssf/SubtitleFile.h" class CBaseMuxerOutputPin : public CBaseOutputPin { diff --git a/src/filters/muxer/basemuxer/stdafx.h b/src/filters/muxer/basemuxer/stdafx.h index 63864cff8..a2674a8f9 100644 --- a/src/filters/muxer/basemuxer/stdafx.h +++ b/src/filters/muxer/basemuxer/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -46,4 +46,4 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.cpp b/src/filters/muxer/dsmmuxer/DSMMuxer.cpp index a6b61f21b..555d8d872 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer.cpp +++ b/src/filters/muxer/dsmmuxer/DSMMuxer.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h" #include #include "DSMMuxer.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -63,7 +63,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.h b/src/filters/muxer/dsmmuxer/DSMMuxer.h index 6d00eee7f..271e6d089 100644 --- a/src/filters/muxer/dsmmuxer/DSMMuxer.h +++ b/src/filters/muxer/dsmmuxer/DSMMuxer.h @@ -21,8 +21,8 @@ #pragma once -#include "..\basemuxer\basemuxer.h" -#include +#include "../basemuxer/basemuxer.h" +#include [uuid("C6590B76-587E-4082-9125-680D0693A97B")] class CDSMMuxerFilter : public CBaseMuxerFilter diff --git a/src/filters/muxer/dsmmuxer/stdafx.h b/src/filters/muxer/dsmmuxer/stdafx.h index 771620b3c..7be94a40c 100644 --- a/src/filters/muxer/dsmmuxer/stdafx.h +++ b/src/filters/muxer/dsmmuxer/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/muxer/matroskamuxer/MatroskaFile.cpp b/src/filters/muxer/matroskamuxer/MatroskaFile.cpp index f8da890ee..1de7b2956 100644 --- a/src/filters/muxer/matroskamuxer/MatroskaFile.cpp +++ b/src/filters/muxer/matroskamuxer/MatroskaFile.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "MatroskaFile.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" using namespace MatroskaWriter; diff --git a/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp b/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp index be22a0863..36d523dcb 100644 --- a/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/matroskamuxer/MatroskaMuxer.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h" #include #include "MatroskaMuxer.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -64,7 +64,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/muxer/matroskamuxer/stdafx.h b/src/filters/muxer/matroskamuxer/stdafx.h index 3c154d6ee..22cb54295 100644 --- a/src/filters/muxer/matroskamuxer/stdafx.h +++ b/src/filters/muxer/matroskamuxer/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/muxer/wavdest/stdafx.h b/src/filters/muxer/wavdest/stdafx.h index b410f737b..2b6b600ac 100644 --- a/src/filters/muxer/wavdest/stdafx.h +++ b/src/filters/muxer/wavdest/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/muxer/wavdest/wavdest.cpp b/src/filters/muxer/wavdest/wavdest.cpp index d1c3cc174..8ed9412c8 100644 --- a/src/filters/muxer/wavdest/wavdest.cpp +++ b/src/filters/muxer/wavdest/wavdest.cpp @@ -23,7 +23,7 @@ #include #include #include "wavdest.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -65,7 +65,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/avisplitter/AviFile.h b/src/filters/parser/avisplitter/AviFile.h index 62b0d45a5..6ef8cf9d3 100644 --- a/src/filters/parser/avisplitter/AviFile.h +++ b/src/filters/parser/avisplitter/AviFile.h @@ -1,7 +1,7 @@ #pragma once #include // conflicts with vfw.h... -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" class CAviFile : public CBaseSplitterFile { diff --git a/src/filters/parser/avisplitter/AviSplitter.h b/src/filters/parser/avisplitter/AviSplitter.h index cd29dc0cc..f3e0c50cf 100644 --- a/src/filters/parser/avisplitter/AviSplitter.h +++ b/src/filters/parser/avisplitter/AviSplitter.h @@ -23,7 +23,7 @@ #include #include -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" class CAviFile; diff --git a/src/filters/parser/avisplitter/stdafx.h b/src/filters/parser/avisplitter/stdafx.h index f57822752..5f53f59b5 100644 --- a/src/filters/parser/avisplitter/stdafx.h +++ b/src/filters/parser/avisplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -42,4 +42,4 @@ #include #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/parser/basesplitter/AsyncReader.cpp b/src/filters/parser/basesplitter/AsyncReader.cpp index c3a9cbb1b..e3ee3378e 100644 --- a/src/filters/parser/basesplitter/AsyncReader.cpp +++ b/src/filters/parser/basesplitter/AsyncReader.cpp @@ -24,7 +24,7 @@ #include "AsyncReader.h" #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" // // CAsyncFileReader diff --git a/src/filters/parser/basesplitter/BaseSplitter.cpp b/src/filters/parser/basesplitter/BaseSplitter.cpp index 617b63004..72b137964 100644 --- a/src/filters/parser/basesplitter/BaseSplitter.cpp +++ b/src/filters/parser/basesplitter/BaseSplitter.cpp @@ -20,10 +20,10 @@ */ #include "StdAfx.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include -#include "..\..\switcher\AudioSwitcher\AudioSwitcher.h" +#include "../../switcher/AudioSwitcher/AudioSwitcher.h" #include "BaseSplitter.h" #pragma warning(disable: 4355) diff --git a/src/filters/parser/basesplitter/BaseSplitter.h b/src/filters/parser/basesplitter/BaseSplitter.h index 9752cd083..68114f7e7 100644 --- a/src/filters/parser/basesplitter/BaseSplitter.h +++ b/src/filters/parser/basesplitter/BaseSplitter.h @@ -29,8 +29,8 @@ #include #include "BaseSplitterFileEx.h" #include "AsyncReader.h" -#include "..\..\..\DSUtil\DSMPropertyBag.h" -#include "..\..\..\DSUtil\FontInstaller.h" +#include "../../../DSUtil/DSMPropertyBag.h" +#include "../../../DSUtil/FontInstaller.h" class Packet : public CAtlArray { diff --git a/src/filters/parser/basesplitter/BaseSplitterFile.cpp b/src/filters/parser/basesplitter/BaseSplitterFile.cpp index edbf0fa03..42fb1be4b 100644 --- a/src/filters/parser/basesplitter/BaseSplitterFile.cpp +++ b/src/filters/parser/basesplitter/BaseSplitterFile.cpp @@ -21,7 +21,7 @@ #include "StdAfx.h" #include "BaseSplitterFile.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" // // CBaseSplitterFile diff --git a/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp b/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp index 4e20e0df4..5cbf66d5c 100644 --- a/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/basesplitter/BaseSplitterFileEx.cpp @@ -22,8 +22,8 @@ #include "StdAfx.h" #include "BaseSplitterFileEx.h" #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\GolombBuffer.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/GolombBuffer.h" #include #include diff --git a/src/filters/parser/basesplitter/MultiFiles.h b/src/filters/parser/basesplitter/MultiFiles.h index b56708b30..b07862a0a 100644 --- a/src/filters/parser/basesplitter/MultiFiles.h +++ b/src/filters/parser/basesplitter/MultiFiles.h @@ -24,7 +24,7 @@ //#include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" class CMultiFiles : public CObject { diff --git a/src/filters/parser/basesplitter/stdafx.h b/src/filters/parser/basesplitter/stdafx.h index 5a2d7facf..f7ba733d1 100644 --- a/src/filters/parser/basesplitter/stdafx.h +++ b/src/filters/parser/basesplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/parser/diracsplitter/DiracSplitter.cpp b/src/filters/parser/diracsplitter/DiracSplitter.cpp index 80655c72b..46da8f69a 100644 --- a/src/filters/parser/diracsplitter/DiracSplitter.cpp +++ b/src/filters/parser/diracsplitter/DiracSplitter.cpp @@ -89,7 +89,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; #endif diff --git a/src/filters/parser/diracsplitter/DiracSplitter.h b/src/filters/parser/diracsplitter/DiracSplitter.h index a95b4acb5..0ed5d14cb 100644 --- a/src/filters/parser/diracsplitter/DiracSplitter.h +++ b/src/filters/parser/diracsplitter/DiracSplitter.h @@ -21,7 +21,7 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #include "DiracSplitterFile.h" [uuid("5899CFB9-948F-4869-A999-5544ECB38BA5")] diff --git a/src/filters/parser/diracsplitter/DiracSplitterFile.h b/src/filters/parser/diracsplitter/DiracSplitterFile.h index 027cd7f19..cc2ec185a 100644 --- a/src/filters/parser/diracsplitter/DiracSplitterFile.h +++ b/src/filters/parser/diracsplitter/DiracSplitterFile.h @@ -3,7 +3,7 @@ #include #include #include -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" class CDiracSplitterFile : public CBaseSplitterFile { diff --git a/src/filters/parser/diracsplitter/libdirac/libdirac_decoder/dirac_parser.h b/src/filters/parser/diracsplitter/libdirac/libdirac_decoder/dirac_parser.h index e46bb8d18..75bdcc7c2 100644 --- a/src/filters/parser/diracsplitter/libdirac/libdirac_decoder/dirac_parser.h +++ b/src/filters/parser/diracsplitter/libdirac/libdirac_decoder/dirac_parser.h @@ -51,7 +51,7 @@ a brief description of the "C" interface usage. \verbatim - #include \n + #include /n Initialise the decoder dirac_decoder_t *decoder_handle = dirac_decoder_init(); diff --git a/src/filters/parser/diracsplitter/stdafx.h b/src/filters/parser/diracsplitter/stdafx.h index ee9da4d11..b76a35484 100644 --- a/src/filters/parser/diracsplitter/stdafx.h +++ b/src/filters/parser/diracsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -46,9 +46,9 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../DSUtil/vd.h" #pragma warning(disable: 4355) // 'this' : used in base member initializer list diff --git a/src/filters/parser/dsmsplitter/DSMSplitter.cpp b/src/filters/parser/dsmsplitter/DSMSplitter.cpp index 15ded8616..fef9a9044 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitter.cpp +++ b/src/filters/parser/dsmsplitter/DSMSplitter.cpp @@ -21,7 +21,7 @@ #include "StdAfx.h" #include "DSMSplitter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -75,7 +75,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/dsmsplitter/DSMSplitter.h b/src/filters/parser/dsmsplitter/DSMSplitter.h index 4fdb9f850..77bc53cad 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitter.h +++ b/src/filters/parser/dsmsplitter/DSMSplitter.h @@ -24,7 +24,7 @@ #include #include #include "DSMSplitterFile.h" -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" [uuid("0912B4DD-A30A-4568-B590-7179EBB420EC")] class CDSMSplitterFilter : public CBaseSplitterFilter diff --git a/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp b/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp index 4a780f43b..58aed9f67 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp +++ b/src/filters/parser/dsmsplitter/DSMSplitterFile.cpp @@ -1,6 +1,6 @@ #include "StdAfx.h" #include "DSMSplitterFile.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include CDSMSplitterFile::CDSMSplitterFile(IAsyncReader* pReader, HRESULT& hr, IDSMResourceBagImpl& res, IDSMChapterBagImpl& chap) diff --git a/src/filters/parser/dsmsplitter/DSMSplitterFile.h b/src/filters/parser/dsmsplitter/DSMSplitterFile.h index 4a3679cab..7c350db2f 100644 --- a/src/filters/parser/dsmsplitter/DSMSplitterFile.h +++ b/src/filters/parser/dsmsplitter/DSMSplitterFile.h @@ -1,8 +1,8 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" -#include -#include "..\..\..\DSUtil\DSMPropertyBag.h" +#include "../BaseSplitter/BaseSplitter.h" +#include +#include "../../../DSUtil/DSMPropertyBag.h" class CDSMSplitterFile : public CBaseSplitterFile { diff --git a/src/filters/parser/dsmsplitter/stdafx.h b/src/filters/parser/dsmsplitter/stdafx.h index 42dcfd9f5..e8beccd47 100644 --- a/src/filters/parser/dsmsplitter/stdafx.h +++ b/src/filters/parser/dsmsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/parser/flvsplitter/FLVSplitter.cpp b/src/filters/parser/flvsplitter/FLVSplitter.cpp index 9c4cb6786..e6a4db694 100644 --- a/src/filters/parser/flvsplitter/FLVSplitter.cpp +++ b/src/filters/parser/flvsplitter/FLVSplitter.cpp @@ -21,7 +21,7 @@ #include "StdAfx.h" #include "FLVSplitter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -75,7 +75,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/flvsplitter/FLVSplitter.h b/src/filters/parser/flvsplitter/FLVSplitter.h index b8d0148e5..62ab89abc 100644 --- a/src/filters/parser/flvsplitter/FLVSplitter.h +++ b/src/filters/parser/flvsplitter/FLVSplitter.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" [uuid("47E792CF-0BBE-4F7A-859C-194B0768650A")] class CFLVSplitterFilter : public CBaseSplitterFilter @@ -91,4 +91,4 @@ public: CFLVSourceFilter(LPUNKNOWN pUnk, HRESULT* phr); }; -#include "..\..\transform\BaseVideoFilter\BaseVideoFilter.h" +#include "../../transform/BaseVideoFilter/BaseVideoFilter.h" diff --git a/src/filters/parser/flvsplitter/stdafx.h b/src/filters/parser/flvsplitter/stdafx.h index 42dcfd9f5..e8beccd47 100644 --- a/src/filters/parser/flvsplitter/stdafx.h +++ b/src/filters/parser/flvsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/parser/matroskasplitter/MatroskaFile.cpp b/src/filters/parser/matroskasplitter/MatroskaFile.cpp index 4f611b4f2..141a232ab 100644 --- a/src/filters/parser/matroskasplitter/MatroskaFile.cpp +++ b/src/filters/parser/matroskasplitter/MatroskaFile.cpp @@ -21,8 +21,8 @@ #include "stdafx.h" #include "MatroskaFile.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\zlib\zlib.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../zlib/zlib.h" #define DOCTYPE _T("matroska") #define DOCTYPEVERSION 2 diff --git a/src/filters/parser/matroskasplitter/MatroskaFile.h b/src/filters/parser/matroskasplitter/MatroskaFile.h index 05ed308ba..4d6d7562b 100644 --- a/src/filters/parser/matroskasplitter/MatroskaFile.h +++ b/src/filters/parser/matroskasplitter/MatroskaFile.h @@ -23,7 +23,7 @@ #include #include -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" namespace MatroskaReader { diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp b/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp index f6b3b29d2..0e636c0da 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h" #include #include "MatroskaSplitter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -75,7 +75,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.h b/src/filters/parser/matroskasplitter/MatroskaSplitter.h index bd093ff80..05eb7d814 100644 --- a/src/filters/parser/matroskasplitter/MatroskaSplitter.h +++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.h @@ -24,7 +24,7 @@ #include #include #include "MatroskaFile.h" -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #include class MatroskaPacket : public Packet diff --git a/src/filters/parser/matroskasplitter/stdafx.h b/src/filters/parser/matroskasplitter/stdafx.h index f57822752..5f53f59b5 100644 --- a/src/filters/parser/matroskasplitter/stdafx.h +++ b/src/filters/parser/matroskasplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -42,4 +42,4 @@ #include #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/parser/mp4splitter/AP4/Source/Core/Ap4MoovAtom.cpp b/src/filters/parser/mp4splitter/AP4/Source/Core/Ap4MoovAtom.cpp index c1a3326ef..a50080cf1 100644 --- a/src/filters/parser/mp4splitter/AP4/Source/Core/Ap4MoovAtom.cpp +++ b/src/filters/parser/mp4splitter/AP4/Source/Core/Ap4MoovAtom.cpp @@ -36,7 +36,7 @@ // ==> Start patch MPC #include "AP4DcomAtom.h" #include "AP4CmvdAtom.h" -#include "..\..\..\..\..\..\zlib\zlib.h" +#include "../../../../../../zlib/zlib.h" // <== End patch MPC /*---------------------------------------------------------------------- diff --git a/src/filters/parser/mp4splitter/Ap4AsyncReaderStream.h b/src/filters/parser/mp4splitter/Ap4AsyncReaderStream.h index 9e5ba4b28..28e5f1c06 100644 --- a/src/filters/parser/mp4splitter/Ap4AsyncReaderStream.h +++ b/src/filters/parser/mp4splitter/Ap4AsyncReaderStream.h @@ -1,6 +1,6 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #include "Ap4.h" #include "Ap4File.h" diff --git a/src/filters/parser/mp4splitter/MP4Splitter.cpp b/src/filters/parser/mp4splitter/MP4Splitter.cpp index 3ee562d98..18421f5b1 100644 --- a/src/filters/parser/mp4splitter/MP4Splitter.cpp +++ b/src/filters/parser/mp4splitter/MP4Splitter.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h" #include "Mmreg.h" #include "MP4Splitter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -98,7 +98,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/mp4splitter/MP4Splitter.h b/src/filters/parser/mp4splitter/MP4Splitter.h index d7b697439..e7b36dc04 100644 --- a/src/filters/parser/mp4splitter/MP4Splitter.h +++ b/src/filters/parser/mp4splitter/MP4Splitter.h @@ -24,7 +24,7 @@ #include #include #include "MP4SplitterFile.h" -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" [uuid("61F47056-E400-43d3-AF1E-AB7DFFD4C4AD")] class CMP4SplitterFilter : public CBaseSplitterFilter diff --git a/src/filters/parser/mp4splitter/MP4SplitterFile.h b/src/filters/parser/mp4splitter/MP4SplitterFile.h index 78494727b..ef1557b9f 100644 --- a/src/filters/parser/mp4splitter/MP4SplitterFile.h +++ b/src/filters/parser/mp4splitter/MP4SplitterFile.h @@ -1,6 +1,6 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" // #include "Ap4AsyncReaderStream.h" // FIXME class CMP4SplitterFile : public CBaseSplitterFileEx diff --git a/src/filters/parser/mp4splitter/stdafx.h b/src/filters/parser/mp4splitter/stdafx.h index 42dcfd9f5..e8beccd47 100644 --- a/src/filters/parser/mp4splitter/stdafx.h +++ b/src/filters/parser/mp4splitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/parser/mpasplitter/MpaSplitter.cpp b/src/filters/parser/mpasplitter/MpaSplitter.cpp index 468384880..d2a72c272 100644 --- a/src/filters/parser/mpasplitter/MpaSplitter.cpp +++ b/src/filters/parser/mpasplitter/MpaSplitter.cpp @@ -68,7 +68,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/mpasplitter/MpaSplitter.h b/src/filters/parser/mpasplitter/MpaSplitter.h index 97dced5cc..c2ce4c934 100644 --- a/src/filters/parser/mpasplitter/MpaSplitter.h +++ b/src/filters/parser/mpasplitter/MpaSplitter.h @@ -21,7 +21,7 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #include "MpaSplitterFile.h" [uuid("0E9D4BF7-CBCB-46C7-BD80-4EF223A3DC2B")] diff --git a/src/filters/parser/mpasplitter/MpaSplitterFile.h b/src/filters/parser/mpasplitter/MpaSplitterFile.h index 74aaaf7a4..ee2e0d799 100644 --- a/src/filters/parser/mpasplitter/MpaSplitterFile.h +++ b/src/filters/parser/mpasplitter/MpaSplitterFile.h @@ -21,7 +21,7 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" class CMpaSplitterFile : public CBaseSplitterFileEx { diff --git a/src/filters/parser/mpasplitter/stdafx.h b/src/filters/parser/mpasplitter/stdafx.h index c06b53b78..32d2f51d8 100644 --- a/src/filters/parser/mpasplitter/stdafx.h +++ b/src/filters/parser/mpasplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -45,9 +45,9 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../DSUtil/vd.h" diff --git a/src/filters/parser/mpegsplitter/MpegSplitter.cpp b/src/filters/parser/mpegsplitter/MpegSplitter.cpp index c92fe8045..890da5ff3 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitter.cpp +++ b/src/filters/parser/mpegsplitter/MpegSplitter.cpp @@ -25,7 +25,7 @@ #include #include "MpegSplitter.h" #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -85,7 +85,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/mpegsplitter/MpegSplitter.h b/src/filters/parser/mpegsplitter/MpegSplitter.h index 49cba387a..fb20de487 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitter.h +++ b/src/filters/parser/mpegsplitter/MpegSplitter.h @@ -21,7 +21,7 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #include "MpegSplitterFile.h" [uuid("DC257063-045F-4BE2-BD5B-E12279C464F0")] diff --git a/src/filters/parser/mpegsplitter/MpegSplitterFile.h b/src/filters/parser/mpegsplitter/MpegSplitterFile.h index 915bf7dd3..d9bee0f42 100644 --- a/src/filters/parser/mpegsplitter/MpegSplitterFile.h +++ b/src/filters/parser/mpegsplitter/MpegSplitterFile.h @@ -23,7 +23,7 @@ #include #include -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #define NO_SUBTITLE_PID 1 // Fake PID use for the "No subtitle" entry diff --git a/src/filters/parser/mpegsplitter/stdafx.h b/src/filters/parser/mpegsplitter/stdafx.h index c1030c834..aefacf4f0 100644 --- a/src/filters/parser/mpegsplitter/stdafx.h +++ b/src/filters/parser/mpegsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -45,9 +45,9 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../DSUtil/vd.h" #define EVO_SUPPORT 0 \ No newline at end of file diff --git a/src/filters/parser/nutsplitter/NutFile.h b/src/filters/parser/nutsplitter/NutFile.h index 970edf571..ab2a0a7e1 100644 --- a/src/filters/parser/nutsplitter/NutFile.h +++ b/src/filters/parser/nutsplitter/NutFile.h @@ -1,6 +1,6 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" class CNutFile : public CBaseSplitterFile { diff --git a/src/filters/parser/nutsplitter/NutSplitter.cpp b/src/filters/parser/nutsplitter/NutSplitter.cpp index d0712bd9d..34ee773db 100644 --- a/src/filters/parser/nutsplitter/NutSplitter.cpp +++ b/src/filters/parser/nutsplitter/NutSplitter.cpp @@ -66,7 +66,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/nutsplitter/NutSplitter.h b/src/filters/parser/nutsplitter/NutSplitter.h index 29d9ca9fd..3eb99904d 100644 --- a/src/filters/parser/nutsplitter/NutSplitter.h +++ b/src/filters/parser/nutsplitter/NutSplitter.h @@ -21,7 +21,7 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #include "NutFile.h" // {5EB7173E-AA71-4a54-BDD1-1CA57D20405F} diff --git a/src/filters/parser/nutsplitter/stdafx.h b/src/filters/parser/nutsplitter/stdafx.h index 83d054334..e3ebbbb58 100644 --- a/src/filters/parser/nutsplitter/stdafx.h +++ b/src/filters/parser/nutsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -45,7 +45,7 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../DSUtil/vd.h" diff --git a/src/filters/parser/oggsplitter/OggFile.cpp b/src/filters/parser/oggsplitter/OggFile.cpp index 7c70cb814..e8e51bef3 100644 --- a/src/filters/parser/oggsplitter/OggFile.cpp +++ b/src/filters/parser/oggsplitter/OggFile.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include ".\oggfile.h" +#include "./oggfile.h" COggFile::COggFile(IAsyncReader* pAsyncReader, HRESULT& hr) : CBaseSplitterFile(pAsyncReader, hr, DEFAULT_CACHE_LENGTH, false) diff --git a/src/filters/parser/oggsplitter/OggFile.h b/src/filters/parser/oggsplitter/OggFile.h index 12eb64d1b..f37f01c0c 100644 --- a/src/filters/parser/oggsplitter/OggFile.h +++ b/src/filters/parser/oggsplitter/OggFile.h @@ -1,6 +1,6 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" #pragma pack(push, 1) diff --git a/src/filters/parser/oggsplitter/OggSplitter.cpp b/src/filters/parser/oggsplitter/OggSplitter.cpp index 9160f9dec..64eee8445 100644 --- a/src/filters/parser/oggsplitter/OggSplitter.cpp +++ b/src/filters/parser/oggsplitter/OggSplitter.cpp @@ -21,8 +21,8 @@ #include "StdAfx.h" #include "OggSplitter.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\GolombBuffer.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/GolombBuffer.h" #include #include @@ -81,7 +81,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/oggsplitter/OggSplitter.h b/src/filters/parser/oggsplitter/OggSplitter.h index bf29ccb4c..b033f76bb 100644 --- a/src/filters/parser/oggsplitter/OggSplitter.h +++ b/src/filters/parser/oggsplitter/OggSplitter.h @@ -24,7 +24,7 @@ #include #include #include "OggFile.h" -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" class OggPacket : public Packet { diff --git a/src/filters/parser/oggsplitter/stdafx.h b/src/filters/parser/oggsplitter/stdafx.h index a4637ab33..0910f1e05 100644 --- a/src/filters/parser/oggsplitter/stdafx.h +++ b/src/filters/parser/oggsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -41,4 +41,4 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp b/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp index fef82b64a..cf0a033af 100644 --- a/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.cpp @@ -25,10 +25,10 @@ #include #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include "RealMediaSplitter.h" -#include "..\..\..\subtitles\SubtitleInputPin.h" +#include "../../../subtitles/SubtitleInputPin.h" // @@ -169,7 +169,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.h b/src/filters/parser/realmediasplitter/RealMediaSplitter.h index f814272e4..42b28e5da 100644 --- a/src/filters/parser/realmediasplitter/RealMediaSplitter.h +++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.h @@ -23,8 +23,8 @@ #include #include -#include "..\BaseSplitter\BaseSplitter.h" -#include "..\..\transform\BaseVideoFilter\BaseVideoFilter.h" +#include "../BaseSplitter/BaseSplitter.h" +#include "../../transform/BaseVideoFilter/BaseVideoFilter.h" #pragma pack(push, 1) diff --git a/src/filters/parser/realmediasplitter/stdafx.h b/src/filters/parser/realmediasplitter/stdafx.h index 5a2d7facf..f7ba733d1 100644 --- a/src/filters/parser/realmediasplitter/stdafx.h +++ b/src/filters/parser/realmediasplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/parser/roqsplitter/RoQSplitter.cpp b/src/filters/parser/roqsplitter/RoQSplitter.cpp index 8ac7a9abb..c669ee893 100644 --- a/src/filters/parser/roqsplitter/RoQSplitter.cpp +++ b/src/filters/parser/roqsplitter/RoQSplitter.cpp @@ -102,7 +102,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/roqsplitter/RoQSplitter.h b/src/filters/parser/roqsplitter/RoQSplitter.h index e3abb3330..c7fa21108 100644 --- a/src/filters/parser/roqsplitter/RoQSplitter.h +++ b/src/filters/parser/roqsplitter/RoQSplitter.h @@ -21,7 +21,7 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" +#include "../BaseSplitter/BaseSplitter.h" // {48B93619-A959-45d9-B5FD-E12A67A96CF1} DEFINE_GUID(MEDIASUBTYPE_RoQ, diff --git a/src/filters/parser/roqsplitter/stdafx.h b/src/filters/parser/roqsplitter/stdafx.h index 83d054334..e3ebbbb58 100644 --- a/src/filters/parser/roqsplitter/stdafx.h +++ b/src/filters/parser/roqsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -45,7 +45,7 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../DSUtil/vd.h" diff --git a/src/filters/parser/ssfsplitter/SSFSplitter.cpp b/src/filters/parser/ssfsplitter/SSFSplitter.cpp index 1b70c663b..7af8706a7 100644 --- a/src/filters/parser/ssfsplitter/SSFSplitter.cpp +++ b/src/filters/parser/ssfsplitter/SSFSplitter.cpp @@ -66,7 +66,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/ssfsplitter/SSFSplitter.h b/src/filters/parser/ssfsplitter/SSFSplitter.h index a3383e46f..abd82b5fe 100644 --- a/src/filters/parser/ssfsplitter/SSFSplitter.h +++ b/src/filters/parser/ssfsplitter/SSFSplitter.h @@ -21,8 +21,8 @@ #pragma once -#include "..\BaseSplitter\BaseSplitter.h" -#include "..\..\..\subtitles\libssf\SubtitleFile.h" +#include "../BaseSplitter/BaseSplitter.h" +#include "../../../subtitles/libssf/SubtitleFile.h" [uuid("95C3F9F6-1E05-4C34-8122-504476EACB51")] class CSSFSplitterFilter : public CBaseSplitterFilter diff --git a/src/filters/parser/ssfsplitter/stdafx.h b/src/filters/parser/ssfsplitter/stdafx.h index 02875c68a..043e18b3c 100644 --- a/src/filters/parser/ssfsplitter/stdafx.h +++ b/src/filters/parser/ssfsplitter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -45,5 +45,5 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" diff --git a/src/filters/parser/streamdrivethru/StreamDriveThru.cpp b/src/filters/parser/streamdrivethru/StreamDriveThru.cpp index c7fc614b6..0eae15220 100644 --- a/src/filters/parser/streamdrivethru/StreamDriveThru.cpp +++ b/src/filters/parser/streamdrivethru/StreamDriveThru.cpp @@ -21,7 +21,7 @@ #include "StdAfx.h" #include "streamdrivethru.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -63,7 +63,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/parser/streamdrivethru/StreamDriveThru.h b/src/filters/parser/streamdrivethru/StreamDriveThru.h index 9c5c36be8..08a2ebe16 100644 --- a/src/filters/parser/streamdrivethru/StreamDriveThru.h +++ b/src/filters/parser/streamdrivethru/StreamDriveThru.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" class CStreamDriveThruInputPin : public CBasePin diff --git a/src/filters/parser/streamdrivethru/stdafx.h b/src/filters/parser/streamdrivethru/stdafx.h index 15330b1ee..e0482b2bb 100644 --- a/src/filters/parser/streamdrivethru/stdafx.h +++ b/src/filters/parser/streamdrivethru/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/reader/asyncreader/stdafx.h b/src/filters/reader/asyncreader/stdafx.h index ae8a67615..811820782 100644 --- a/src/filters/reader/asyncreader/stdafx.h +++ b/src/filters/reader/asyncreader/stdafx.h @@ -4,7 +4,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/src/filters/reader/cddareader/CDDAReader.cpp b/src/filters/reader/cddareader/CDDAReader.cpp index 18311b3e2..67052b96d 100644 --- a/src/filters/reader/cddareader/CDDAReader.cpp +++ b/src/filters/reader/cddareader/CDDAReader.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include #include "cddareader.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #define RAW_SECTOR_SIZE 2352 #define MSF2UINT(hgs) ((hgs[1]*4500)+(hgs[2]*75)+(hgs[3])) @@ -82,7 +82,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/reader/cddareader/CDDAReader.h b/src/filters/reader/cddareader/CDDAReader.h index 019864d3b..d3ac17c0a 100644 --- a/src/filters/reader/cddareader/CDDAReader.h +++ b/src/filters/reader/cddareader/CDDAReader.h @@ -22,11 +22,11 @@ #pragma once #include -#include -#include +#include +#include #include -#include "..\asyncreader\asyncio.h" -#include "..\asyncreader\asyncrdr.h" +#include "../asyncreader/asyncio.h" +#include "../asyncreader/asyncrdr.h" typedef struct {UINT chunkID; long chunkSize;} ChunkHeader; diff --git a/src/filters/reader/cddareader/stdafx.h b/src/filters/reader/cddareader/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/reader/cddareader/stdafx.h +++ b/src/filters/reader/cddareader/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/reader/cdxareader/CDXAReader.cpp b/src/filters/reader/cdxareader/CDXAReader.cpp index dabc76765..30d2e1f52 100644 --- a/src/filters/reader/cdxareader/CDXAReader.cpp +++ b/src/filters/reader/cdxareader/CDXAReader.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "cdxareader.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include #include @@ -153,7 +153,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/reader/cdxareader/CDXAReader.h b/src/filters/reader/cdxareader/CDXAReader.h index 79c63cfbc..56a34be86 100644 --- a/src/filters/reader/cdxareader/CDXAReader.h +++ b/src/filters/reader/cdxareader/CDXAReader.h @@ -22,8 +22,8 @@ #pragma once #include -#include "..\asyncreader\asyncio.h" -#include "..\asyncreader\asyncrdr.h" +#include "../asyncreader/asyncio.h" +#include "../asyncreader/asyncrdr.h" class CCDXAStream : public CAsyncStream { diff --git a/src/filters/reader/cdxareader/stdafx.h b/src/filters/reader/cdxareader/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/reader/cdxareader/stdafx.h +++ b/src/filters/reader/cdxareader/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/reader/udpreader/UDPReader.cpp b/src/filters/reader/udpreader/UDPReader.cpp index f9e1ea307..fa4f63419 100644 --- a/src/filters/reader/udpreader/UDPReader.cpp +++ b/src/filters/reader/udpreader/UDPReader.cpp @@ -21,7 +21,7 @@ #include "StdAfx.h" #include "udpreader.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -62,7 +62,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/reader/udpreader/UDPReader.h b/src/filters/reader/udpreader/UDPReader.h index 961d068fb..863fa277d 100644 --- a/src/filters/reader/udpreader/UDPReader.h +++ b/src/filters/reader/udpreader/UDPReader.h @@ -22,8 +22,8 @@ #pragma once #include -#include "..\asyncreader\asyncio.h" -#include "..\asyncreader\asyncrdr.h" +#include "../asyncreader/asyncio.h" +#include "../asyncreader/asyncrdr.h" class CUDPStream : public CAsyncStream, public CAMThread { diff --git a/src/filters/reader/udpreader/stdafx.h b/src/filters/reader/udpreader/stdafx.h index 47fb81eda..f4d095421 100644 --- a/src/filters/reader/udpreader/stdafx.h +++ b/src/filters/reader/udpreader/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/reader/vtsreader/VTSReader.cpp b/src/filters/reader/vtsreader/VTSReader.cpp index 305760b3f..81b416bff 100644 --- a/src/filters/reader/vtsreader/VTSReader.cpp +++ b/src/filters/reader/vtsreader/VTSReader.cpp @@ -20,9 +20,9 @@ */ #include "StdAfx.h" -#include "..\..\..\decss\VobFile.h" +#include "../../../decss/VobFile.h" #include "vtsreader.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -71,7 +71,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/reader/vtsreader/VTSReader.h b/src/filters/reader/vtsreader/VTSReader.h index 020240e42..992351bfc 100644 --- a/src/filters/reader/vtsreader/VTSReader.h +++ b/src/filters/reader/vtsreader/VTSReader.h @@ -22,8 +22,8 @@ #pragma once #include -#include "..\asyncreader\asyncio.h" -#include "..\asyncreader\asyncrdr.h" +#include "../asyncreader/asyncio.h" +#include "../asyncreader/asyncrdr.h" class CVobFile; diff --git a/src/filters/reader/vtsreader/stdafx.h b/src/filters/reader/vtsreader/stdafx.h index fccd33b00..4c5d23feb 100644 --- a/src/filters/reader/vtsreader/stdafx.h +++ b/src/filters/reader/vtsreader/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 3596c9366..df623f2b2 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -26,7 +26,7 @@ #include #endif #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -98,7 +98,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h index 97ed54ab9..83b937b08 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h @@ -33,7 +33,7 @@ #include -#include "SoundTouch\Include\SoundTouch.h" +#include "SoundTouch/Include/SoundTouch.h" // REFERENCE_TIME time units per second and per millisecond #define REFTIMES_PER_SEC 10000000 diff --git a/src/filters/renderer/MpcAudioRenderer/stdafx.h b/src/filters/renderer/MpcAudioRenderer/stdafx.h index d1676211f..4f2979b53 100644 --- a/src/filters/renderer/MpcAudioRenderer/stdafx.h +++ b/src/filters/renderer/MpcAudioRenderer/stdafx.h @@ -22,7 +22,7 @@ #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS diff --git a/src/filters/source/basesource/BaseSource.cpp b/src/filters/source/basesource/BaseSource.cpp index 6fe6eca98..00ab0cc8e 100644 --- a/src/filters/source/basesource/BaseSource.cpp +++ b/src/filters/source/basesource/BaseSource.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "BaseSource.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" // // CBaseSource diff --git a/src/filters/source/basesource/BaseSource.h b/src/filters/source/basesource/BaseSource.h index 15a550a2d..91e2ccdb8 100644 --- a/src/filters/source/basesource/BaseSource.h +++ b/src/filters/source/basesource/BaseSource.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" template class CBaseSource diff --git a/src/filters/source/basesource/stdafx.h b/src/filters/source/basesource/stdafx.h index 3c154d6ee..22cb54295 100644 --- a/src/filters/source/basesource/stdafx.h +++ b/src/filters/source/basesource/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/source/d2vsource/D2VSource.cpp b/src/filters/source/d2vsource/D2VSource.cpp index 90f3a794a..8984bf360 100644 --- a/src/filters/source/d2vsource/D2VSource.cpp +++ b/src/filters/source/d2vsource/D2VSource.cpp @@ -20,7 +20,7 @@ #include "stdafx.h" #include "D2VSource.h" #include "mpeg2dec.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -71,7 +71,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/source/d2vsource/D2VSource.h b/src/filters/source/d2vsource/D2VSource.h index 4fb92faa2..bf2e18f9a 100644 --- a/src/filters/source/d2vsource/D2VSource.h +++ b/src/filters/source/d2vsource/D2VSource.h @@ -19,7 +19,7 @@ #pragma once #include -#include "..\BaseSource\BaseSource.h" +#include "../BaseSource/BaseSource.h" class CD2VStream; diff --git a/src/filters/source/d2vsource/stdafx.h b/src/filters/source/d2vsource/stdafx.h index 5936de250..e596301ef 100644 --- a/src/filters/source/d2vsource/stdafx.h +++ b/src/filters/source/d2vsource/stdafx.h @@ -4,7 +4,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/source/dtsac3source/DTSAC3Source.cpp b/src/filters/source/dtsac3source/DTSAC3Source.cpp index 5ab9fe3eb..5c1accd04 100644 --- a/src/filters/source/dtsac3source/DTSAC3Source.cpp +++ b/src/filters/source/dtsac3source/DTSAC3Source.cpp @@ -26,7 +26,7 @@ #include #include #include "dtsac3source.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -110,7 +110,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/source/dtsac3source/DTSAC3Source.h b/src/filters/source/dtsac3source/DTSAC3Source.h index 8b40d6e7a..6c9a30140 100644 --- a/src/filters/source/dtsac3source/DTSAC3Source.h +++ b/src/filters/source/dtsac3source/DTSAC3Source.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\BaseSource\BaseSource.h" +#include "../BaseSource/BaseSource.h" class CDTSAC3Stream; diff --git a/src/filters/source/dtsac3source/stdafx.h b/src/filters/source/dtsac3source/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/source/dtsac3source/stdafx.h +++ b/src/filters/source/dtsac3source/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/source/flacsource/FlacSource.cpp b/src/filters/source/flacsource/FlacSource.cpp index e9cecdf0a..e3f1df264 100644 --- a/src/filters/source/flacsource/FlacSource.cpp +++ b/src/filters/source/flacsource/FlacSource.cpp @@ -26,8 +26,8 @@ #include #include #include "flacsource.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "FLAC\stream_decoder.h" +#include "../../../DSUtil/DSUtil.h" +#include "FLAC/stream_decoder.h" #define _DECODER_ (FLAC__StreamDecoder*)m_pDecoder @@ -80,7 +80,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/source/flacsource/FlacSource.h b/src/filters/source/flacsource/FlacSource.h index 861f3c4e7..3b7f87969 100644 --- a/src/filters/source/flacsource/FlacSource.h +++ b/src/filters/source/flacsource/FlacSource.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\BaseSource\BaseSource.h" +#include "../BaseSource/BaseSource.h" class CFlacStream; diff --git a/src/filters/source/flacsource/stdafx.h b/src/filters/source/flacsource/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/source/flacsource/stdafx.h +++ b/src/filters/source/flacsource/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/source/flicsource/FLICSource.cpp b/src/filters/source/flicsource/FLICSource.cpp index f2003a210..188a15b18 100644 --- a/src/filters/source/flicsource/FLICSource.cpp +++ b/src/filters/source/flicsource/FLICSource.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "flicsource.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -81,7 +81,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/source/flicsource/stdafx.h b/src/filters/source/flicsource/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/source/flicsource/stdafx.h +++ b/src/filters/source/flicsource/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/source/shoutcastsource/ShoutcastSource.cpp b/src/filters/source/shoutcastsource/ShoutcastSource.cpp index f5f4d93ef..729aecde7 100644 --- a/src/filters/source/shoutcastsource/ShoutcastSource.cpp +++ b/src/filters/source/shoutcastsource/ShoutcastSource.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include #include "shoutcastsource.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #define MAXFRAMESIZE ((144 * 320000 / 8000) + 1) @@ -111,7 +111,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" class CShoutcastSourceApp : public CFilterApp { diff --git a/src/filters/source/shoutcastsource/stdafx.h b/src/filters/source/shoutcastsource/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/source/shoutcastsource/stdafx.h +++ b/src/filters/source/shoutcastsource/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/source/subtitlesource/SubtitleSource.cpp b/src/filters/source/subtitlesource/SubtitleSource.cpp index f763a617e..23533da1a 100644 --- a/src/filters/source/subtitlesource/SubtitleSource.cpp +++ b/src/filters/source/subtitlesource/SubtitleSource.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "subtitlesource.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -117,7 +117,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" class CSubtitleSourceApp : public CFilterApp { diff --git a/src/filters/source/subtitlesource/SubtitleSource.h b/src/filters/source/subtitlesource/SubtitleSource.h index c3501f0ff..77ef35581 100644 --- a/src/filters/source/subtitlesource/SubtitleSource.h +++ b/src/filters/source/subtitlesource/SubtitleSource.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\..\..\subtitles\RTS.h" +#include "../../../subtitles/RTS.h" class CSubtitleSource : public CSource diff --git a/src/filters/source/subtitlesource/stdafx.h b/src/filters/source/subtitlesource/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/source/subtitlesource/stdafx.h +++ b/src/filters/source/subtitlesource/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/stdafx.h b/src/filters/stdafx.h index 6e3fd91ac..b5b447c08 100644 --- a/src/filters/stdafx.h +++ b/src/filters/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\DSUtil\SharedInclude.h" +#include "../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/switcher/audioswitcher/AudioSwitcher.cpp b/src/filters/switcher/audioswitcher/AudioSwitcher.cpp index 4f43061bd..f1593eeb9 100644 --- a/src/filters/switcher/audioswitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/audioswitcher/AudioSwitcher.cpp @@ -29,7 +29,7 @@ #include #include "AudioSwitcher.h" #include "Audio.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -75,7 +75,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/switcher/audioswitcher/StreamSwitcher.cpp b/src/filters/switcher/audioswitcher/StreamSwitcher.cpp index aac61a321..9cc87973f 100644 --- a/src/filters/switcher/audioswitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/audioswitcher/StreamSwitcher.cpp @@ -26,7 +26,7 @@ #include #include "AudioSwitcher.h" #include "Audio.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include diff --git a/src/filters/switcher/audioswitcher/stdafx.h b/src/filters/switcher/audioswitcher/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/switcher/audioswitcher/stdafx.h +++ b/src/filters/switcher/audioswitcher/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp b/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp index 2167a6502..13a5d4619 100644 --- a/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp +++ b/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include #include "avi2ac3filter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -68,7 +68,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/avi2ac3filter/stdafx.h b/src/filters/transform/avi2ac3filter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/avi2ac3filter/stdafx.h +++ b/src/filters/transform/avi2ac3filter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp index 7edce914b..f7e7f6f30 100644 --- a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp +++ b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp @@ -22,8 +22,8 @@ #include "StdAfx.h" #include #include "BaseVideoFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include #include diff --git a/src/filters/transform/basevideofilter/stdafx.h b/src/filters/transform/basevideofilter/stdafx.h index fd4805916..8068e9c6e 100644 --- a/src/filters/transform/basevideofilter/stdafx.h +++ b/src/filters/transform/basevideofilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/bufferfilter/BufferFilter.cpp b/src/filters/transform/bufferfilter/BufferFilter.cpp index a8d862cfe..0e8ba715f 100644 --- a/src/filters/transform/bufferfilter/BufferFilter.cpp +++ b/src/filters/transform/bufferfilter/BufferFilter.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "bufferfilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -63,7 +63,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/bufferfilter/stdafx.h b/src/filters/transform/bufferfilter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/bufferfilter/stdafx.h +++ b/src/filters/transform/bufferfilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/decssfilter/DeCSSFilter.cpp b/src/filters/transform/decssfilter/DeCSSFilter.cpp index 97c99b3df..5159cb776 100644 --- a/src/filters/transform/decssfilter/DeCSSFilter.cpp +++ b/src/filters/transform/decssfilter/DeCSSFilter.cpp @@ -22,8 +22,8 @@ #include "stdafx.h" #include #include "DeCSSFilter.h" -#include "..\..\..\decss\DeCSSInputPin.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../decss/DeCSSInputPin.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -66,7 +66,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/decssfilter/stdafx.h b/src/filters/transform/decssfilter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/decssfilter/stdafx.h +++ b/src/filters/transform/decssfilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.cpp b/src/filters/transform/mpadecfilter/MpaDecFilter.cpp index b13a24d99..7cb691923 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.cpp +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.cpp @@ -25,7 +25,7 @@ #include #include "MpaDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -34,8 +34,8 @@ #include "PODtypes.h" #include "avcodec.h" -#include "faad2\include\neaacdec.h" -#include "FLAC\stream_decoder.h" +#include "faad2/include/neaacdec.h" +#include "FLAC/stream_decoder.h" #define INT24_MAX 0x7FFFFF #define EAC3_FRAME_TYPE_RESERVED 3 @@ -151,7 +151,7 @@ STDAPI DllUnregisterServer() // -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.h b/src/filters/transform/mpadecfilter/MpaDecFilter.h index 0acd9da20..6c1711fae 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.h +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.h @@ -23,13 +23,13 @@ #include #include -#include "libmad\msvc++\mad.h" -#include "a52dec\include\a52.h" -#include "libdca\include\dts.h" -//#include "faad2\include\neaacdec.h" // conflicts with dxtrans.h -//#include "libvorbisidec\ivorbiscodec.h" -#include "libvorbisidec\vorbis/codec.h" -#include "..\..\..\decss\DeCSSInputPin.h" +#include "libmad/msvc++/mad.h" +#include "a52dec/include/a52.h" +#include "libdca/include/dts.h" +//#include "faad2/include/neaacdec.h" // conflicts with dxtrans.h +//#include "libvorbisidec/ivorbiscodec.h" +#include "libvorbisidec/vorbis/codec.h" +#include "../../../decss/DeCSSInputPin.h" #include "IMpaDecFilter.h" #include "MpaDecSettingsWnd.h" diff --git a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp index 002730428..e0509bc7c 100644 --- a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp +++ b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "resource.h" #include "MpaDecSettingsWnd.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" // ==>>> Resource identifier from "resource.h" present in mplayerc project! diff --git a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h index 59c12aeae..cf459b705 100644 --- a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h +++ b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\InternalPropertyPage.h" +#include "../../InternalPropertyPage.h" #include "MpaDecFilter.h" #include diff --git a/src/filters/transform/mpadecfilter/stdafx.h b/src/filters/transform/mpadecfilter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/mpadecfilter/stdafx.h +++ b/src/filters/transform/mpadecfilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/mpcvideodec/DXVADecoder.cpp b/src/filters/transform/mpcvideodec/DXVADecoder.cpp index c407d4dd9..8c28598ac 100644 --- a/src/filters/transform/mpcvideodec/DXVADecoder.cpp +++ b/src/filters/transform/mpcvideodec/DXVADecoder.cpp @@ -21,7 +21,7 @@ */ #include "stdafx.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include #include "DXVADecoderH264.h" diff --git a/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp b/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp index e21a1fade..de1aecbd7 100644 --- a/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp +++ b/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp @@ -21,7 +21,7 @@ */ #include "stdafx.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include "DXVADecoderH264.h" #include "MPCVideoDecFilter.h" #include "VideoDecDXVAAllocator.h" diff --git a/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp b/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp index a9403432b..fb69949dc 100644 --- a/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp +++ b/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp @@ -31,7 +31,7 @@ #include "MPCAudioDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include diff --git a/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp b/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp index 626a2b6d2..838ab5b0e 100644 --- a/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp +++ b/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "MPCVideoDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" @@ -66,7 +66,7 @@ STDAPI DllUnregisterServer() // -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp index a875c138e..c0df4e01c 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp @@ -36,14 +36,14 @@ extern "C" { #include "FfmpegContext.h" - #include "libswscale\swscale.h" + #include "libswscale/swscale.h" extern void init_libvo(); } -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\parser\mpegsplitter\MpegSplitter.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../parser/mpegsplitter/MpegSplitter.h" #include diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h index 6e5ad6362..7e8febb37 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h +++ b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h @@ -26,11 +26,11 @@ #include // DXVA1 #include #include // DXVA2 -#include "..\BaseVideoFilter\BaseVideoFilter.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" #include "IMPCVideoDecFilter.h" #include "MPCVideoDecSettingsWnd.h" -#include "..\..\..\decss\DeCSSInputPin.h" +#include "../../../decss/DeCSSInputPin.h" #include "DXVADecoder.h" #include "TlibavcodecExt.h" diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp index bc33092a8..cfc88e0e8 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp +++ b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "resource.h" #include "MPCVideoDecSettingsWnd.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" #include "../../../apps/mplayerc/internal_filter_config.h" diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h index 9d3cfec60..01979df3f 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h +++ b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h @@ -22,7 +22,7 @@ #pragma once -#include "..\..\InternalPropertyPage.h" +#include "../../InternalPropertyPage.h" #include "IMPCVideoDecFilter.h" #include diff --git a/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp b/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp index 677a6f752..377a0a652 100644 --- a/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp +++ b/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp @@ -24,7 +24,7 @@ #include "VideoDecOutputPin.h" #include "VideoDecDXVAAllocator.h" #include "MPCVideoDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" CVideoDecOutputPin::CVideoDecOutputPin(TCHAR* pObjectName, CBaseVideoFilter* pFilter, HRESULT* phr, LPCWSTR pName) : CBaseVideoOutputPin(pObjectName, pFilter, phr, pName) diff --git a/src/filters/transform/mpcvideodec/VideoDecOutputPin.h b/src/filters/transform/mpcvideodec/VideoDecOutputPin.h index cbb898294..d6de33575 100644 --- a/src/filters/transform/mpcvideodec/VideoDecOutputPin.h +++ b/src/filters/transform/mpcvideodec/VideoDecOutputPin.h @@ -24,7 +24,7 @@ #pragma once #include -#include "..\BaseVideoFilter\BaseVideoFilter.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" class CMPCVideoDecFilter; diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c index 8bffc2c0e..bca94e8d4 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c +++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c @@ -62,7 +62,7 @@ WRITE_2D_FUNC(uint32, uint32_t) // int i; // // printf("/* This file was generated by libavcodec/tableprint */\n"); -// printf("#include \n"); +// printf("#include /n"); // tableinit(); // // for (i = 0; tables[i].declaration; i++) { diff --git a/src/filters/transform/mpcvideodec/stdafx.h b/src/filters/transform/mpcvideodec/stdafx.h index 0ba3a2a4d..41d2d3d49 100644 --- a/src/filters/transform/mpcvideodec/stdafx.h +++ b/src/filters/transform/mpcvideodec/stdafx.h @@ -22,7 +22,7 @@ #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp index 3dbe069f0..81c31982b 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp @@ -30,8 +30,8 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include #include @@ -92,7 +92,7 @@ STDAPI DllUnregisterServer() // -#include +#include BOOL (__stdcall * Real_IsDebuggerPresent)(void) = IsDebuggerPresent; @@ -156,7 +156,7 @@ LONG WINAPI Mine_ChangeDisplaySettingsExW(LPCWSTR lpszDeviceName, LPDEVMODEW lpD // -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" class CMpeg2DecFilterApp : public CFilterApp { diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h index ceb9cdd82..66a0acdd6 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h @@ -23,8 +23,8 @@ #include #include -#include "..\..\..\decss\DeCSSInputPin.h" -#include "..\BaseVideoFilter\BaseVideoFilter.h" +#include "../../../decss/DeCSSInputPin.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" #include "IMpeg2DecFilter.h" #include "Mpeg2DecSettingsWnd.h" diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp index 08314c0cd..cfd2ddee1 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "resource.h" #include "Mpeg2DecSettingsWnd.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" // ==>>> Resource identifier from "resource.h" present in mplayerc project! #define ResStr(id) CString(MAKEINTRESOURCE(id)) diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h index 35329f48c..4f694d8cb 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\InternalPropertyPage.h" +#include "../../InternalPropertyPage.h" #include "IMpeg2DecFilter.h" #include diff --git a/src/filters/transform/mpeg2decfilter/idct_sse2.cpp b/src/filters/transform/mpeg2decfilter/idct_sse2.cpp index e1132722c..134707c76 100644 --- a/src/filters/transform/mpeg2decfilter/idct_sse2.cpp +++ b/src/filters/transform/mpeg2decfilter/idct_sse2.cpp @@ -25,7 +25,7 @@ #include #include "libmpeg2.h" #include "attributes.h" -#include "..\..\..\DSUtil\simd.h" +#include "../../../DSUtil/simd.h" // Intel's SSE2 implementation of iDCT // AP-945 diff --git a/src/filters/transform/mpeg2decfilter/libmpeg2.cpp b/src/filters/transform/mpeg2decfilter/libmpeg2.cpp index 9f5767708..bb3aceb00 100644 --- a/src/filters/transform/mpeg2decfilter/libmpeg2.cpp +++ b/src/filters/transform/mpeg2decfilter/libmpeg2.cpp @@ -25,7 +25,7 @@ #include #include #include "libmpeg2.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/vd.h" // decode diff --git a/src/filters/transform/mpeg2decfilter/mc_sse2.cpp b/src/filters/transform/mpeg2decfilter/mc_sse2.cpp index 9c9cfa0e3..3d5061bd0 100644 --- a/src/filters/transform/mpeg2decfilter/mc_sse2.cpp +++ b/src/filters/transform/mpeg2decfilter/mc_sse2.cpp @@ -25,7 +25,7 @@ #include #include "libmpeg2.h" #include "attributes.h" -#include "..\..\..\DSUtil\simd.h" +#include "../../../DSUtil/simd.h" static const __m128i const_1_16_bytes=_mm_set1_epi16(1); diff --git a/src/filters/transform/vsfilter/Copy.cpp b/src/filters/transform/vsfilter/Copy.cpp index ea8cffcd3..25038f83c 100644 --- a/src/filters/transform/vsfilter/Copy.cpp +++ b/src/filters/transform/vsfilter/Copy.cpp @@ -19,8 +19,8 @@ #include "stdafx.h" #include #include "DirectVobSubFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include #include diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp index 3cdc03ae9..8a7a13c1c 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp @@ -27,8 +27,8 @@ #include "DirectVobSubPropPage.h" #include "VSFilter.h" #include "systray.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\SubPic\MemSubPic.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../SubPic/MemSubPic.h" #include #include diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.h b/src/filters/transform/vsfilter/DirectVobSubFilter.h index 39272ce99..56f1cb8de 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.h +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.h @@ -23,10 +23,10 @@ #include #include "DirectVobSub.h" -#include "..\BaseVideoFilter\BaseVideoFilter.h" -#include "..\..\..\subtitles\VobSubFile.h" -#include "..\..\..\subtitles\RTS.h" -#include "..\..\..\subtitles\SSF.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" +#include "../../../subtitles/VobSubFile.h" +#include "../../../subtitles/RTS.h" +#include "../../../subtitles/SSF.h" typedef struct { diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp index 52b45c84b..675848a1a 100644 --- a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp @@ -27,8 +27,8 @@ #include "VSFilter.h" #include "StyleEditorDialog.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" BOOL WINAPI MyGetDialogSize(int iResourceID, DLGPROC pDlgProc, LPARAM lParam, SIZE* pResult) { diff --git a/src/filters/transform/vsfilter/IDirectVobSub.h b/src/filters/transform/vsfilter/IDirectVobSub.h index 4d22120e3..a789c5a66 100644 --- a/src/filters/transform/vsfilter/IDirectVobSub.h +++ b/src/filters/transform/vsfilter/IDirectVobSub.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\..\subtitles\STS.h" +#include "../../../subtitles/STS.h" #ifdef __cplusplus extern "C" { diff --git a/src/filters/transform/vsfilter/StdAfx.h b/src/filters/transform/vsfilter/StdAfx.h index 2830e436b..3c6c2a063 100644 --- a/src/filters/transform/vsfilter/StdAfx.h +++ b/src/filters/transform/vsfilter/StdAfx.h @@ -39,7 +39,7 @@ #undef WINVER #define WINVER 0x0501 // <= Force WINVER 0x0501 with Visual Studio 2008 (fix compilation error) -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #include #include @@ -54,7 +54,7 @@ extern CComModule _Module; #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/filters/transform/vsfilter/StyleEditorDialog.h b/src/filters/transform/vsfilter/StyleEditorDialog.h index 0c5c2054d..1d74eb757 100644 --- a/src/filters/transform/vsfilter/StyleEditorDialog.h +++ b/src/filters/transform/vsfilter/StyleEditorDialog.h @@ -23,7 +23,7 @@ #include "resource.h" #include "afxwin.h" #include "afxcmn.h" -#include "..\..\..\subtitles\STS.h" +#include "../../../subtitles/STS.h" // CColorStatic dialog diff --git a/src/filters/transform/vsfilter/Systray.cpp b/src/filters/transform/vsfilter/Systray.cpp index 9a4655316..3df0bafb4 100644 --- a/src/filters/transform/vsfilter/Systray.cpp +++ b/src/filters/transform/vsfilter/Systray.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "resource.h" #include "DirectVobSubFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" // hWnd == INVALID_HANDLE_VALUE - get name, hWnd != INVALID_HANDLE_VALUE - show ppage static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd); diff --git a/src/filters/transform/vsfilter/TextInputPin.cpp b/src/filters/transform/vsfilter/TextInputPin.cpp index 2abd2b431..9935f6a13 100644 --- a/src/filters/transform/vsfilter/TextInputPin.cpp +++ b/src/filters/transform/vsfilter/TextInputPin.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "DirectVobSubFilter.h" #include "TextInputPin.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" CTextInputPin::CTextInputPin(CDirectVobSubFilter* pFilter, CCritSec* pLock, CCritSec* pSubLock, HRESULT* phr) : CSubtitleInputPin(pFilter, pLock, pSubLock, phr) diff --git a/src/filters/transform/vsfilter/TextInputPin.h b/src/filters/transform/vsfilter/TextInputPin.h index 4a3d1debf..b28f71890 100644 --- a/src/filters/transform/vsfilter/TextInputPin.h +++ b/src/filters/transform/vsfilter/TextInputPin.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\..\subtitles\SubtitleInputPin.h" +#include "../../../subtitles/SubtitleInputPin.h" class CDirectVobSubFilter; diff --git a/src/filters/transform/vsfilter/VSFilter.cpp b/src/filters/transform/vsfilter/VSFilter.cpp index 32a769114..f772cc5cf 100644 --- a/src/filters/transform/vsfilter/VSFilter.cpp +++ b/src/filters/transform/vsfilter/VSFilter.cpp @@ -23,7 +23,7 @@ #include "DirectVobSubFilter.h" #include "DirectVobSubPropPage.h" #include "VSFilter.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/MediaTypes.h" #include #include diff --git a/src/filters/transform/vsfilter/csriapi.cpp b/src/filters/transform/vsfilter/csriapi.cpp index eed931f5b..17dec964e 100644 --- a/src/filters/transform/vsfilter/csriapi.cpp +++ b/src/filters/transform/vsfilter/csriapi.cpp @@ -23,10 +23,10 @@ #include #include #include "resource.h" -#include "..\..\..\subtitles\VobSubFile.h" -#include "..\..\..\subtitles\RTS.h" -#include "..\..\..\subtitles\SSF.h" -#include "..\..\..\SubPic\MemSubPic.h" +#include "../../../subtitles/VobSubFile.h" +#include "../../../subtitles/RTS.h" +#include "../../../subtitles/SSF.h" +#include "../../../SubPic/MemSubPic.h" #define CSRIAPI extern "C" __declspec(dllexport) #define CSRI_OWN_HANDLES diff --git a/src/filters/transform/vsfilter/plugins.cpp b/src/filters/transform/vsfilter/plugins.cpp index 158cf4b17..2ff493991 100644 --- a/src/filters/transform/vsfilter/plugins.cpp +++ b/src/filters/transform/vsfilter/plugins.cpp @@ -23,10 +23,10 @@ #include #include #include "resource.h" -#include "..\..\..\subtitles\VobSubFile.h" -#include "..\..\..\subtitles\RTS.h" -#include "..\..\..\subtitles\SSF.h" -#include "..\..\..\SubPic\MemSubPic.h" +#include "../../../subtitles/VobSubFile.h" +#include "../../../subtitles/RTS.h" +#include "../../../subtitles/SSF.h" +#include "../../../SubPic/MemSubPic.h" // // Generic interface @@ -240,7 +240,7 @@ public: namespace VirtualDub { - #include + #include class CVirtualDubFilter : virtual public CFilter { @@ -500,7 +500,7 @@ namespace VirtualDub namespace AviSynth1 { - #include + #include class CAvisynthFilter : public GenericVideoFilter, virtual public CFilter { @@ -614,7 +614,7 @@ namespace AviSynth1 namespace AviSynth25 { - #include + #include static bool s_fSwapUV = false; diff --git a/src/filters/transform/vsfilter/valami.cpp b/src/filters/transform/vsfilter/valami.cpp index b2115e6f7..4ebc21c84 100644 --- a/src/filters/transform/vsfilter/valami.cpp +++ b/src/filters/transform/vsfilter/valami.cpp @@ -19,7 +19,7 @@ * */ -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" static TCHAR str1[][256] = /* diff --git a/src/subpic/ISubPic.cpp b/src/subpic/ISubPic.cpp index 1a2bf032f..6861a1906 100644 --- a/src/subpic/ISubPic.cpp +++ b/src/subpic/ISubPic.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "ISubPic.h" -#include "..\DSUtil\DSUtil.h" +#include "../DSUtil/DSUtil.h" // // ISubPicImpl diff --git a/src/subpic/stdafx.h b/src/subpic/stdafx.h index 1d55b960e..1703b181b 100644 --- a/src/subpic/stdafx.h +++ b/src/subpic/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\DSUtil\SharedInclude.h" +#include "../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -42,4 +42,4 @@ #include #include -#include "..\DSUtil\DSUtil.h" +#include "../DSUtil/DSUtil.h" diff --git a/src/subtitles/CompositionObject.cpp b/src/subtitles/CompositionObject.cpp index c2d9b6a7c..02002fa52 100644 --- a/src/subtitles/CompositionObject.cpp +++ b/src/subtitles/CompositionObject.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "CompositionObject.h" -#include "..\DSUtil\GolombBuffer.h" +#include "../DSUtil/GolombBuffer.h" diff --git a/src/subtitles/DVBSub.cpp b/src/subtitles/DVBSub.cpp index 183c4eabf..e1267a2d6 100644 --- a/src/subtitles/DVBSub.cpp +++ b/src/subtitles/DVBSub.cpp @@ -23,7 +23,7 @@ #include "StdAfx.h" #include "DVBSub.h" -#include "..\DSUtil\GolombBuffer.h" +#include "../DSUtil/GolombBuffer.h" #if (1) // Set to 1 to activate DVB subtitles traces #define TRACE_DVB TRACE diff --git a/src/subtitles/HdmvSub.cpp b/src/subtitles/HdmvSub.cpp index 4e3df6d0e..acec58846 100644 --- a/src/subtitles/HdmvSub.cpp +++ b/src/subtitles/HdmvSub.cpp @@ -22,7 +22,7 @@ #include "StdAfx.h" #include "HdmvSub.h" -#include "..\DSUtil\GolombBuffer.h" +#include "../DSUtil/GolombBuffer.h" #if (0) // Set to 1 to activate HDMV subtitles traces #define TRACE_HDMVSUB TRACE diff --git a/src/subtitles/RTS.h b/src/subtitles/RTS.h index be50a19be..6b48f4cf8 100644 --- a/src/subtitles/RTS.h +++ b/src/subtitles/RTS.h @@ -23,7 +23,7 @@ #include "STS.h" #include "Rasterizer.h" -#include "..\SubPic\ISubPic.h" +#include "../SubPic/ISubPic.h" class CMyFont : public CFont { diff --git a/src/subtitles/Rasterizer.h b/src/subtitles/Rasterizer.h index 0d3460b15..a7211dc70 100644 --- a/src/subtitles/Rasterizer.h +++ b/src/subtitles/Rasterizer.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\SubPic\ISubPic.h" +#include "../SubPic/ISubPic.h" #define PT_MOVETONC 0xfe #define PT_BSPLINETO 0xfc diff --git a/src/subtitles/RenderedHdmvSubtitle.h b/src/subtitles/RenderedHdmvSubtitle.h index 1c1a36b68..8b2c280a6 100644 --- a/src/subtitles/RenderedHdmvSubtitle.h +++ b/src/subtitles/RenderedHdmvSubtitle.h @@ -24,7 +24,7 @@ #pragma once #include "Rasterizer.h" -#include "..\SubPic\ISubPic.h" +#include "../SubPic/ISubPic.h" #include "HdmvSub.h" #include "BaseSub.h" diff --git a/src/subtitles/SSF.cpp b/src/subtitles/SSF.cpp index 3eb87224a..c731d0003 100644 --- a/src/subtitles/SSF.cpp +++ b/src/subtitles/SSF.cpp @@ -27,7 +27,7 @@ #include #include #include "SSF.h" -#include "..\subpic\MemSubPic.h" +#include "../subpic/MemSubPic.h" namespace ssf { diff --git a/src/subtitles/SSF.h b/src/subtitles/SSF.h index a047ffa55..ac19b02f8 100644 --- a/src/subtitles/SSF.h +++ b/src/subtitles/SSF.h @@ -21,9 +21,9 @@ #pragma once -#include "..\SubPic\ISubPic.h" -#include ".\libssf\SubtitleFile.h" -#include ".\libssf\Renderer.h" +#include "../SubPic/ISubPic.h" +#include "./libssf/SubtitleFile.h" +#include "./libssf/Renderer.h" #pragma once diff --git a/src/subtitles/SubtitleInputPin.h b/src/subtitles/SubtitleInputPin.h index fbe60051b..ce6ca1de2 100644 --- a/src/subtitles/SubtitleInputPin.h +++ b/src/subtitles/SubtitleInputPin.h @@ -21,7 +21,7 @@ #pragma once -#include "..\subpic\ISubPic.h" +#include "../subpic/ISubPic.h" // // CSubtitleInputPin diff --git a/src/subtitles/VobSubFile.cpp b/src/subtitles/VobSubFile.cpp index 7805102f6..4857b793d 100644 --- a/src/subtitles/VobSubFile.cpp +++ b/src/subtitles/VobSubFile.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include #include "TextFile.h" -#include +#include #include "VobSubFile.h" // diff --git a/src/subtitles/VobSubFile.h b/src/subtitles/VobSubFile.h index 3ce9c374c..a1a14c163 100644 --- a/src/subtitles/VobSubFile.h +++ b/src/subtitles/VobSubFile.h @@ -23,7 +23,7 @@ #include #include "VobSubImage.h" -#include "..\SubPic\ISubPic.h" +#include "../SubPic/ISubPic.h" #define VOBSUBIDXVER 7 diff --git a/src/subtitles/VobSubFileRipper.cpp b/src/subtitles/VobSubFileRipper.cpp index 206e55ad6..6f5a27ce0 100644 --- a/src/subtitles/VobSubFileRipper.cpp +++ b/src/subtitles/VobSubFileRipper.cpp @@ -21,8 +21,8 @@ #include "StdAfx.h" #include "vobsubfileripper.h" -#include "..\decss\VobDec.h" -#include "..\subtitles\CCDecoder.h" +#include "../decss/VobDec.h" +#include "../subtitles/CCDecoder.h" // // CVobSubFileRipper diff --git a/src/subtitles/VobSubFileRipper.h b/src/subtitles/VobSubFileRipper.h index 2abccc4ad..a9c272f8c 100644 --- a/src/subtitles/VobSubFileRipper.h +++ b/src/subtitles/VobSubFileRipper.h @@ -22,7 +22,7 @@ #pragma once #include -#include "..\decss\VobFile.h" +#include "../decss/VobFile.h" #include "VobSubFile.h" #pragma pack(push) diff --git a/src/subtitles/libssf/Rasterizer.h b/src/subtitles/libssf/Rasterizer.h index 25a929aac..9c6815944 100644 --- a/src/subtitles/libssf/Rasterizer.h +++ b/src/subtitles/libssf/Rasterizer.h @@ -25,7 +25,7 @@ #include "SubtitleFile.h" #include "Array.h" #include "GlyphPath.h" -#include "..\..\SubPic\ISubPic.h" +#include "../../SubPic/ISubPic.h" namespace ssf { diff --git a/src/subtitles/libssf/stdafx.h b/src/subtitles/libssf/stdafx.h index 946d47359..659ca7fb8 100644 --- a/src/subtitles/libssf/stdafx.h +++ b/src/subtitles/libssf/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\DSUtil\SharedInclude.h" +#include "../../DSUtil/SharedInclude.h" // Modify the following defines if you have to target a platform prior to the ones specified below. // Refer to MSDN for the latest info on corresponding values for different platforms. @@ -59,8 +59,8 @@ // TODO: reference additional headers your program requires here #include -#include "..\..\DSUtil\DSUtil.h" -#include "..\..\dsutil\vd.h" +#include "../../DSUtil/DSUtil.h" +#include "../../dsutil/vd.h" #include #include diff --git a/src/subtitles/stdafx.h b/src/subtitles/stdafx.h index 6f2138b72..214f0c923 100644 --- a/src/subtitles/stdafx.h +++ b/src/subtitles/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\DSUtil\SharedInclude.h" +#include "../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -41,4 +41,4 @@ // TODO: reference additional headers your program requires here #include -#include "..\DSUtil\DSUtil.h" +#include "../DSUtil/DSUtil.h" diff --git a/src/ui/CmdUI/stdafx.h b/src/ui/CmdUI/stdafx.h index 8adb7dd15..3b566bf95 100644 --- a/src/ui/CmdUI/stdafx.h +++ b/src/ui/CmdUI/stdafx.h @@ -4,7 +4,7 @@ // #pragma once -#include "..\..\DSUtil\SharedInclude.h" +#include "../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/src/ui/ResizableLib/ResizableDialog.h b/src/ui/ResizableLib/ResizableDialog.h index 49a016d65..c16c52fb5 100644 --- a/src/ui/ResizableLib/ResizableDialog.h +++ b/src/ui/ResizableLib/ResizableDialog.h @@ -25,7 +25,7 @@ #include "ResizableGrip.h" #include "ResizableMinMax.h" #include "ResizableState.h" -#include "..\CmdUI\CmdUI.h" +#include "../CmdUI/CmdUI.h" ///////////////////////////////////////////////////////////////////////////// // CResizableDialog window diff --git a/src/ui/TreePropSheet/stdafx.h b/src/ui/TreePropSheet/stdafx.h index 8917673d9..f8ad3928c 100644 --- a/src/ui/TreePropSheet/stdafx.h +++ b/src/ui/TreePropSheet/stdafx.h @@ -4,7 +4,7 @@ // #pragma once -#include "..\..\DSUtil\SharedInclude.h" +#include "../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/ui/sizecbar/stdafx.h b/src/ui/sizecbar/stdafx.h index 8917673d9..f8ad3928c 100644 --- a/src/ui/sizecbar/stdafx.h +++ b/src/ui/sizecbar/stdafx.h @@ -4,7 +4,7 @@ // #pragma once -#include "..\..\DSUtil\SharedInclude.h" +#include "../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/ui/ui.h b/src/ui/ui.h index dfca00217..13add29b3 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -1,10 +1,10 @@ #pragma once -#include "CmdUI\CmdUI.h" -#include "ResizableLib\ResizableDialog.h" -#include "ResizableLib\ResizablePage.h" -#include "ResizableLib\ResizableSheet.h" -#include "sizecbar\sizecbar.h" -#include "sizecbar\scbarcf.h" -#include "sizecbar\scbarg.h" -#include "TreePropSheet\TreePropSheet.h" +#include "CmdUI/CmdUI.h" +#include "ResizableLib/ResizableDialog.h" +#include "ResizableLib/ResizablePage.h" +#include "ResizableLib/ResizableSheet.h" +#include "sizecbar/sizecbar.h" +#include "sizecbar/scbarcf.h" +#include "sizecbar/scbarg.h" +#include "TreePropSheet/TreePropSheet.h" -- cgit v1.2.3