diff options
95 files changed, 125 insertions, 63 deletions
diff --git a/src/apps/mplayerc/AppSettings.cpp b/src/apps/mplayerc/AppSettings.cpp index 2699bd463..78a1b97bb 100644 --- a/src/apps/mplayerc/AppSettings.cpp +++ b/src/apps/mplayerc/AppSettings.cpp @@ -23,11 +23,10 @@ #include "stdafx.h"
#include "mplayerc.h"
+#include "AppSettings.h"
#include "MiniDump.h"
#include "WinAPIUtils.h"
-#include "AppSettings.h"
-
CAppSettings::CAppSettings()
: fInitialized(false)
diff --git a/src/apps/mplayerc/CShockwaveFlash.h b/src/apps/mplayerc/CShockwaveFlash.h index aac5998e4..0d293130c 100644 --- a/src/apps/mplayerc/CShockwaveFlash.h +++ b/src/apps/mplayerc/CShockwaveFlash.h @@ -23,6 +23,7 @@ #pragma once
+
/////////////////////////////////////////////////////////////////////////////
// CShockwaveFlash
diff --git a/src/apps/mplayerc/ChildView.h b/src/apps/mplayerc/ChildView.h index 338c9605f..4bfe1e5b2 100644 --- a/src/apps/mplayerc/ChildView.h +++ b/src/apps/mplayerc/ChildView.h @@ -25,6 +25,7 @@ #include "PngImage.h"
+
class CChildView : public CWnd
{
CRect m_vrect;
diff --git a/src/apps/mplayerc/ComPropertyPage.h b/src/apps/mplayerc/ComPropertyPage.h index ba09ab502..04142ab1c 100644 --- a/src/apps/mplayerc/ComPropertyPage.h +++ b/src/apps/mplayerc/ComPropertyPage.h @@ -23,6 +23,7 @@ #pragma once
+
// CComPropertyPage dialog
class CComPropertyPage : public CPropertyPage
diff --git a/src/apps/mplayerc/DVBChannel.cpp b/src/apps/mplayerc/DVBChannel.cpp index 9d140fc55..9f5e75eae 100644 --- a/src/apps/mplayerc/DVBChannel.cpp +++ b/src/apps/mplayerc/DVBChannel.cpp @@ -24,6 +24,7 @@ #include "stdafx.h"
#include "DVBChannel.h"
+
CDVBChannel::CDVBChannel(void)
{
m_ulFrequency = 0;
diff --git a/src/apps/mplayerc/DeinterlacerFilter.h b/src/apps/mplayerc/DeinterlacerFilter.h index b092e690e..3235b2ff5 100644 --- a/src/apps/mplayerc/DeinterlacerFilter.h +++ b/src/apps/mplayerc/DeinterlacerFilter.h @@ -23,6 +23,7 @@ #pragma once
+
class __declspec(uuid("96F3E0BE-1BA4-4E79-973D-191FE425C86B"))
CDeinterlacerFilter : public CTransformFilter
{
diff --git a/src/apps/mplayerc/EditListEditor.h b/src/apps/mplayerc/EditListEditor.h index 717ec70e8..f3a533d89 100644 --- a/src/apps/mplayerc/EditListEditor.h +++ b/src/apps/mplayerc/EditListEditor.h @@ -22,7 +22,9 @@ #pragma once
+
#include "PlayerListCtrl.h"
+#include <sizecbar/scbarg.h>
class CClip
diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index 3bda3f703..076f48485 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -22,6 +22,7 @@ */
#include "stdafx.h"
+#include <mpconfig.h>
#include "FGFilter.h"
#include "MainFrm.h"
#include "../../DSUtil/DSUtil.h"
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index 17668a7ad..3eab93e5c 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -22,6 +22,7 @@ */
#include "stdafx.h"
+#include <mpconfig.h>
#include "mplayerc.h"
#include "FGManager.h"
#include "../../DSUtil/DSUtil.h"
@@ -33,13 +34,14 @@ #include "WinAPIUtils.h"
#include "../../DeCSS/VobFile.h"
#include <initguid.h>
-#include <moreuuids.h>
#include <dmodshow.h>
#include <d3d9.h>
#include <vmr9.h>
#include <evr.h>
#include <evr9.h>
#include <ksproxy.h>
+#include <moreuuids.h>
+
// {212690FB-83E5-4526-8FD7-74478B7939CD}
DEFINE_GUID (CLSID_CMPEG2VidDecoderDS, 0x212690FB, 0x83E5, 0x4526, 0x8F, 0xD7, 0x74, 0x47, 0x8B, 0x79, 0x39, 0xCD);
diff --git a/src/apps/mplayerc/FGManagerBDA.h b/src/apps/mplayerc/FGManagerBDA.h index b03ec01a7..17760fd1f 100644 --- a/src/apps/mplayerc/FGManagerBDA.h +++ b/src/apps/mplayerc/FGManagerBDA.h @@ -26,7 +26,6 @@ #include <bdatypes.h>
#include <bdamedia.h>
#include <bdaiface.h>
-
#include "FGManager.h"
diff --git a/src/apps/mplayerc/FakeFilterMapper2.cpp b/src/apps/mplayerc/FakeFilterMapper2.cpp index d518e5e7a..d8ebdb1b7 100644 --- a/src/apps/mplayerc/FakeFilterMapper2.cpp +++ b/src/apps/mplayerc/FakeFilterMapper2.cpp @@ -28,10 +28,9 @@ #include <initguid.h>
#include <qedit.h>
-
-
#include <detours/detours.h>
+
HRESULT (__stdcall * Real_CoCreateInstance)(CONST IID& a0,
LPUNKNOWN a1,
DWORD a2,
diff --git a/src/apps/mplayerc/FavoriteAddDlg.h b/src/apps/mplayerc/FavoriteAddDlg.h index 619d64ff1..fa6a196c3 100644 --- a/src/apps/mplayerc/FavoriteAddDlg.h +++ b/src/apps/mplayerc/FavoriteAddDlg.h @@ -23,6 +23,9 @@ #pragma once
+#include <ResizableLib/ResizableDialog.h>
+
+
// CFavoriteAddDlg dialog
class CFavoriteAddDlg : public CCmdUIDialog
diff --git a/src/apps/mplayerc/FavoriteOrganizeDlg.h b/src/apps/mplayerc/FavoriteOrganizeDlg.h index cf26fa004..4fa45d62f 100644 --- a/src/apps/mplayerc/FavoriteOrganizeDlg.h +++ b/src/apps/mplayerc/FavoriteOrganizeDlg.h @@ -25,7 +25,7 @@ #include <afxcmn.h>
#include <afxwin.h>
-#include "../../thirdparty/ui/ResizableLib/ResizableDialog.h"
+#include <ResizableLib/ResizableDialog.h>
// CFavoriteOrganizeDlg dialog
diff --git a/src/apps/mplayerc/FilterEnum.h b/src/apps/mplayerc/FilterEnum.h index f8bef66f5..f62833a2e 100644 --- a/src/apps/mplayerc/FilterEnum.h +++ b/src/apps/mplayerc/FilterEnum.h @@ -24,6 +24,7 @@ #include "InternalFiltersConfig.h"
+
enum {
SOURCE_FILTER,
DECODER,
diff --git a/src/apps/mplayerc/FloatEdit.h b/src/apps/mplayerc/FloatEdit.h index 127383f9c..6f63d3537 100644 --- a/src/apps/mplayerc/FloatEdit.h +++ b/src/apps/mplayerc/FloatEdit.h @@ -23,6 +23,7 @@ #pragma once
+
// CFloatEdit
class CFloatEdit : public CEdit
diff --git a/src/apps/mplayerc/FullscreenWnd.h b/src/apps/mplayerc/FullscreenWnd.h index d3c2ef7b3..6087ac1d7 100644 --- a/src/apps/mplayerc/FullscreenWnd.h +++ b/src/apps/mplayerc/FullscreenWnd.h @@ -23,6 +23,7 @@ #pragma once
+
class CMainFrame;
class CFullscreenWnd : public CWnd
diff --git a/src/apps/mplayerc/GoToDlg.cpp b/src/apps/mplayerc/GoToDlg.cpp index b8cfa62c3..02b587e4d 100644 --- a/src/apps/mplayerc/GoToDlg.cpp +++ b/src/apps/mplayerc/GoToDlg.cpp @@ -28,6 +28,7 @@ #include <atlrx.h>
#include "SettingsDefines.h"
+
// CGoToDlg dialog
IMPLEMENT_DYNAMIC(CGoToDlg, CDialog)
diff --git a/src/apps/mplayerc/IGraphBuilder2.h b/src/apps/mplayerc/IGraphBuilder2.h index 20633c66e..13b23020f 100644 --- a/src/apps/mplayerc/IGraphBuilder2.h +++ b/src/apps/mplayerc/IGraphBuilder2.h @@ -23,6 +23,7 @@ #pragma once
+
typedef struct {
CString cPresent;
CString SummaryDesc;
diff --git a/src/apps/mplayerc/ISDb.cpp b/src/apps/mplayerc/ISDb.cpp index c4f21b5ae..20ac1c505 100644 --- a/src/apps/mplayerc/ISDb.cpp +++ b/src/apps/mplayerc/ISDb.cpp @@ -22,6 +22,7 @@ */
#include "stdafx.h"
+#include <atlpath.h>
#include "ISDb.h"
#include "mplayerc.h"
diff --git a/src/apps/mplayerc/ISDb.h b/src/apps/mplayerc/ISDb.h index 9fe50988f..96e3badb9 100644 --- a/src/apps/mplayerc/ISDb.h +++ b/src/apps/mplayerc/ISDb.h @@ -27,6 +27,7 @@ #include <afxinet.h>
#include "Playlist.h"
+
#define ISDb_PROTOCOL_VERSION 1
diff --git a/src/apps/mplayerc/LcdSupport.cpp b/src/apps/mplayerc/LcdSupport.cpp index 2db44c426..1c61d074c 100644 --- a/src/apps/mplayerc/LcdSupport.cpp +++ b/src/apps/mplayerc/LcdSupport.cpp @@ -30,6 +30,7 @@ #include "LcdSupport.h"
+
#define LCD_APP_NAME "Media Player Classic"
#define LCD_UPD_TIMER 40
diff --git a/src/apps/mplayerc/LcdSupport.h b/src/apps/mplayerc/LcdSupport.h index 44ed3d306..92ccbcbbc 100644 --- a/src/apps/mplayerc/LcdSupport.h +++ b/src/apps/mplayerc/LcdSupport.h @@ -23,14 +23,13 @@ #pragma once
-#include <windows.h>
-
+#include <Windows.h>
#include <lglcd/lglcd.h>
-#include "../../thirdparty/ui/LCDUI/LCDManager.h"
-#include "../../thirdparty/ui/LCDUI/LCDOutput.h"
-#include "../../thirdparty/ui/LCDUI/LCDScrollingText.h"
-#include "../../thirdparty/ui/LCDUI/LCDProgressBar.h"
-#include "../../thirdparty/ui/LCDUI/LCDAnimatedBitmap.h"
+#include <LCDUI/LCDManager.h>
+#include <LCDUI/LCDOutput.h>
+#include <LCDUI/LCDScrollingText.h>
+#include <LCDUI/LCDProgressBar.h>
+#include <LCDUI/LCDAnimatedBitmap.h>
class CLCDMyManager : public CLCDManager
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index d6e0c3d48..f2aeb8ff8 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -84,7 +84,8 @@ #include "IPinHook.h"
#include "jpeg.h"
-#include "pngdib/pngdib.h"
+#include <pngdib/pngdib.h>
+
#define DEFCLIENTW 292
#define DEFCLIENTH 200
diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h index 48c282199..a0996c97b 100644 --- a/src/apps/mplayerc/MainFrm.h +++ b/src/apps/mplayerc/MainFrm.h @@ -65,6 +65,8 @@ #include "LcdSupport.h"
#include "MpcApi.h"
#include "../../filters/renderer/SyncClock/SyncClock.h"
+#include <sizecbar/scbarg.h>
+
class CFullscreenWnd;
diff --git a/src/apps/mplayerc/MediaFormats.cpp b/src/apps/mplayerc/MediaFormats.cpp index 27ee773bb..c8b464c37 100644 --- a/src/apps/mplayerc/MediaFormats.cpp +++ b/src/apps/mplayerc/MediaFormats.cpp @@ -23,6 +23,7 @@ #include "stdafx.h"
#include <atlbase.h>
+#include <atlpath.h>
#include "MediaFormats.h"
#include "resource.h"
diff --git a/src/apps/mplayerc/MediaTypesDlg.h b/src/apps/mplayerc/MediaTypesDlg.h index 1ba83bc2d..21ef39e13 100644 --- a/src/apps/mplayerc/MediaTypesDlg.h +++ b/src/apps/mplayerc/MediaTypesDlg.h @@ -26,6 +26,7 @@ #include <afxwin.h>
#include <atlcoll.h>
#include "IGraphBuilder2.h"
+#include <ResizableLib/ResizableDialog.h>
// CMediaTypesDlg dialog
diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index 348d6009f..7b90ab216 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -27,6 +27,7 @@ #include "../../DSUtil/GolombBuffer.h"
#include "Mpeg2SectionData.h"
+
#define BeginEnumDescriptors(gb, nType, nLength) \
{ \
BYTE DescBuffer[256]; \
diff --git a/src/apps/mplayerc/OpenDirHelper.cpp b/src/apps/mplayerc/OpenDirHelper.cpp index 727347521..5fb196ac4 100644 --- a/src/apps/mplayerc/OpenDirHelper.cpp +++ b/src/apps/mplayerc/OpenDirHelper.cpp @@ -25,6 +25,7 @@ #include "MainFrm.h"
#include "OpenDirHelper.h"
+
WNDPROC COpenDirHelper::CBProc;
bool COpenDirHelper::m_incl_subdir;
CString COpenDirHelper::strLastOpenDir;
diff --git a/src/apps/mplayerc/OpenDlg.cpp b/src/apps/mplayerc/OpenDlg.cpp index 4f45785dc..67beddf49 100644 --- a/src/apps/mplayerc/OpenDlg.cpp +++ b/src/apps/mplayerc/OpenDlg.cpp @@ -22,6 +22,7 @@ */
#include "stdafx.h"
+#include <atlpath.h>
#include "mplayerc.h"
#include "OpenDlg.h"
#include "OpenFileDlg.h"
diff --git a/src/apps/mplayerc/OpenDlg.h b/src/apps/mplayerc/OpenDlg.h index c4ccbb91c..b303cc655 100644 --- a/src/apps/mplayerc/OpenDlg.h +++ b/src/apps/mplayerc/OpenDlg.h @@ -24,6 +24,7 @@ #pragma once
#include "resource.h"
+#include <ResizableLib/ResizableDialog.h>
// COpenDlg dialog
diff --git a/src/apps/mplayerc/PPageBase.cpp b/src/apps/mplayerc/PPageBase.cpp index e58b539a8..69ba8e3fd 100644 --- a/src/apps/mplayerc/PPageBase.cpp +++ b/src/apps/mplayerc/PPageBase.cpp @@ -26,6 +26,7 @@ #include "PPageBase.h"
#include "SettingsDefines.h"
+
// CPPageBase dialog
IMPLEMENT_DYNAMIC(CPPageBase, CCmdUIPropertyPage)
diff --git a/src/apps/mplayerc/PPageBase.h b/src/apps/mplayerc/PPageBase.h index b1bc4aaac..5eb9fdf62 100644 --- a/src/apps/mplayerc/PPageBase.h +++ b/src/apps/mplayerc/PPageBase.h @@ -23,6 +23,9 @@ #pragma once
+#include <ResizableLib/ResizableDialog.h>
+
+
// CPPageBase dialog
class CPPageBase : public CCmdUIPropertyPage
diff --git a/src/apps/mplayerc/PPageCapture.h b/src/apps/mplayerc/PPageCapture.h index bbe8501ef..22ceaa932 100644 --- a/src/apps/mplayerc/PPageCapture.h +++ b/src/apps/mplayerc/PPageCapture.h @@ -26,6 +26,7 @@ #include <afxcmn.h>
#include <afxwin.h>
+
// CPPageCapture dialog
class CPPageCapture : public CPPageBase
diff --git a/src/apps/mplayerc/PPageExternalFilters.cpp b/src/apps/mplayerc/PPageExternalFilters.cpp index 09f49e605..ea73d5024 100644 --- a/src/apps/mplayerc/PPageExternalFilters.cpp +++ b/src/apps/mplayerc/PPageExternalFilters.cpp @@ -22,6 +22,9 @@ */
#include "stdafx.h"
+#include <atlpath.h>
+#include <initguid.h>
+#include <dmoreg.h>
#include "mplayerc.h"
#include "PPageExternalFilters.h"
#include "ComPropertySheet.h"
@@ -30,9 +33,6 @@ #include "FGFilter.h"
#include <moreuuids.h>
-#include <initguid.h>
-#include <dmoreg.h>
-
// CPPageExternalFilters dialog
diff --git a/src/apps/mplayerc/PPageFileInfoSheet.cpp b/src/apps/mplayerc/PPageFileInfoSheet.cpp index 6e0ed5e3d..0940cd58d 100644 --- a/src/apps/mplayerc/PPageFileInfoSheet.cpp +++ b/src/apps/mplayerc/PPageFileInfoSheet.cpp @@ -27,6 +27,7 @@ #include "PPageFileInfoSheet.h"
#include "PPageFileMediaInfo.h"
+
// CPPageFileInfoSheet
IMPLEMENT_DYNAMIC(CPPageFileInfoSheet, CPropertySheet)
diff --git a/src/apps/mplayerc/PPageFileInfoSheet.h b/src/apps/mplayerc/PPageFileInfoSheet.h index 6697ef5ba..42f0ae373 100644 --- a/src/apps/mplayerc/PPageFileInfoSheet.h +++ b/src/apps/mplayerc/PPageFileInfoSheet.h @@ -28,6 +28,7 @@ #include "PPageFileInfoRes.h"
#include "PPageFileMediaInfo.h"
+
class CMainFrame;
// CPPageFileInfoSheet
diff --git a/src/apps/mplayerc/PPageFormats.cpp b/src/apps/mplayerc/PPageFormats.cpp index 36c69bdfa..d653474dd 100644 --- a/src/apps/mplayerc/PPageFormats.cpp +++ b/src/apps/mplayerc/PPageFormats.cpp @@ -28,6 +28,7 @@ #include <psapi.h>
#include <string>
+
// CPPageFormats dialog
diff --git a/src/apps/mplayerc/PPageFormats.h b/src/apps/mplayerc/PPageFormats.h index 2dcdc1980..7e181d57a 100644 --- a/src/apps/mplayerc/PPageFormats.h +++ b/src/apps/mplayerc/PPageFormats.h @@ -23,9 +23,9 @@ #pragma once
+#include <afxwin.h>
#include "PPageBase.h"
#include "PlayerListCtrl.h"
-#include <afxwin.h>
// CPPageFormats dialog
diff --git a/src/apps/mplayerc/PPageFullscreen.cpp b/src/apps/mplayerc/PPageFullscreen.cpp index 6072cf4c4..39b12e3a9 100644 --- a/src/apps/mplayerc/PPageFullscreen.cpp +++ b/src/apps/mplayerc/PPageFullscreen.cpp @@ -29,6 +29,7 @@ #include "Monitors.h"
#include "MultiMonitor.h"
+
// CPPagePlayer dialog
IMPLEMENT_DYNAMIC(CPPageFullscreen, CPPageBase)
diff --git a/src/apps/mplayerc/PPageFullscreen.h b/src/apps/mplayerc/PPageFullscreen.h index a38ea1127..ccc7d9743 100644 --- a/src/apps/mplayerc/PPageFullscreen.h +++ b/src/apps/mplayerc/PPageFullscreen.h @@ -21,7 +21,6 @@ *
*/
-
#pragma once
#include "PPageBase.h"
diff --git a/src/apps/mplayerc/PPageInternalFilters.h b/src/apps/mplayerc/PPageInternalFilters.h index f269c9095..77c63ebba 100644 --- a/src/apps/mplayerc/PPageInternalFilters.h +++ b/src/apps/mplayerc/PPageInternalFilters.h @@ -23,8 +23,8 @@ #pragma once
-#include "PPageBase.h"
#include <afxwin.h>
+#include "PPageBase.h"
class CPPageInternalFiltersListBox : public CCheckListBox
diff --git a/src/apps/mplayerc/PPageMisc.h b/src/apps/mplayerc/PPageMisc.h index b50738a38..99d8fbb5c 100644 --- a/src/apps/mplayerc/PPageMisc.h +++ b/src/apps/mplayerc/PPageMisc.h @@ -22,8 +22,8 @@ #pragma once
-#include "PPageBase.h"
#include <afxcmn.h>
+#include "PPageBase.h"
// CPPageMisc dialog
diff --git a/src/apps/mplayerc/PPageOutput.h b/src/apps/mplayerc/PPageOutput.h index 45336afdf..c6ffb3faf 100644 --- a/src/apps/mplayerc/PPageOutput.h +++ b/src/apps/mplayerc/PPageOutput.h @@ -23,9 +23,8 @@ #pragma once
-#include "PPageBase.h"
-
#include <d3dx9.h>
+#include "PPageBase.h"
// CPPageOutput dialog
diff --git a/src/apps/mplayerc/PPagePlayback.cpp b/src/apps/mplayerc/PPagePlayback.cpp index 97e9e2cb7..dcbf2eadc 100644 --- a/src/apps/mplayerc/PPagePlayback.cpp +++ b/src/apps/mplayerc/PPagePlayback.cpp @@ -25,7 +25,6 @@ #include "mplayerc.h"
#include "MainFrm.h"
#include "PPagePlayback.h"
-
#include "Monitors.h"
#include "MultiMonitor.h"
diff --git a/src/apps/mplayerc/PPageSheet.cpp b/src/apps/mplayerc/PPageSheet.cpp index 8fa5e6b05..ef0b1fe11 100644 --- a/src/apps/mplayerc/PPageSheet.cpp +++ b/src/apps/mplayerc/PPageSheet.cpp @@ -28,6 +28,7 @@ using namespace TreePropSheet;
+
// CPPageSheet
IMPLEMENT_DYNAMIC(CPPageSheet, CTreePropSheet)
diff --git a/src/apps/mplayerc/PPageSheet.h b/src/apps/mplayerc/PPageSheet.h index 8f56359cc..1563f46b7 100644 --- a/src/apps/mplayerc/PPageSheet.h +++ b/src/apps/mplayerc/PPageSheet.h @@ -42,6 +42,7 @@ #include "PPageTweaks.h"
#include "PPageMisc.h"
#include "PPageCapture.h"
+#include <TreePropSheet/TreePropSheet.h>
// CTreePropSheetTreeCtrl
diff --git a/src/apps/mplayerc/PPageSubMisc.h b/src/apps/mplayerc/PPageSubMisc.h index 4417b8c23..2dbb7a53d 100644 --- a/src/apps/mplayerc/PPageSubMisc.h +++ b/src/apps/mplayerc/PPageSubMisc.h @@ -24,6 +24,7 @@ #include "PPageBase.h"
+
// CPPageSubMisc dialog
class CPPageSubMisc : public CPPageBase
diff --git a/src/apps/mplayerc/PPageSync.cpp b/src/apps/mplayerc/PPageSync.cpp index 797b07a92..7ea3856f2 100644 --- a/src/apps/mplayerc/PPageSync.cpp +++ b/src/apps/mplayerc/PPageSync.cpp @@ -23,6 +23,7 @@ #include "MainFrm.h"
#include "PPageSync.h"
+
IMPLEMENT_DYNAMIC(CPPageSync, CPPageBase)
CPPageSync::CPPageSync()
diff --git a/src/apps/mplayerc/PPageSync.h b/src/apps/mplayerc/PPageSync.h index 2bb7803df..02ddad1a4 100644 --- a/src/apps/mplayerc/PPageSync.h +++ b/src/apps/mplayerc/PPageSync.h @@ -23,6 +23,7 @@ #include "PPageBase.h"
#include "StaticLink.h"
+
class CPPageSync: public CPPageBase
{
DECLARE_DYNAMIC(CPPageSync)
diff --git a/src/apps/mplayerc/PPageTweaks.h b/src/apps/mplayerc/PPageTweaks.h index 66313414d..7d99e2cd5 100644 --- a/src/apps/mplayerc/PPageTweaks.h +++ b/src/apps/mplayerc/PPageTweaks.h @@ -26,6 +26,7 @@ #include "PPageBase.h"
#include "StaticLink.h"
+
// CPPageTweaks dialog
class CPPageTweaks : public CPPageBase
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h index fcd700b23..4f3da8e35 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.h +++ b/src/apps/mplayerc/PlayerCaptureDialog.h @@ -27,6 +27,7 @@ #include <afxcmn.h>
#include "../../filters/transform/BufferFilter/BufferFilter.h"
#include "FloatEdit.h"
+#include <ResizableLib/ResizableDialog.h>
//
diff --git a/src/apps/mplayerc/PlayerNavigationDialog.h b/src/apps/mplayerc/PlayerNavigationDialog.h index db8f36857..d97e33bfb 100644 --- a/src/apps/mplayerc/PlayerNavigationDialog.h +++ b/src/apps/mplayerc/PlayerNavigationDialog.h @@ -27,6 +27,8 @@ #include "../../filters/transform/BufferFilter/BufferFilter.h"
#include "FloatEdit.h"
#include "DVBChannel.h"
+#include <ResizableLib/ResizableDialog.h>
+
#define MAX_CHANNELS_ALLOWED 200
diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp index 974ade5e4..4a394b331 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.cpp +++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp @@ -34,6 +34,7 @@ #include "SettingsDefines.h"
#include "InternalFiltersConfig.h"
+
IMPLEMENT_DYNAMIC(CPlayerPlaylistBar, CSizingControlBarG)
CPlayerPlaylistBar::CPlayerPlaylistBar()
: m_list(0)
diff --git a/src/apps/mplayerc/PlayerShaderEditorBar.h b/src/apps/mplayerc/PlayerShaderEditorBar.h index e68d467d5..1116501ef 100644 --- a/src/apps/mplayerc/PlayerShaderEditorBar.h +++ b/src/apps/mplayerc/PlayerShaderEditorBar.h @@ -24,6 +24,7 @@ #pragma once
#include "ShaderEditorDlg.h"
+#include <sizecbar/scbarg.h>
#ifndef baseCPlayerShaderEditorBar
#define baseCPlayerShaderEditorBar CSizingControlBarG
diff --git a/src/apps/mplayerc/PlayerSubresyncBar.h b/src/apps/mplayerc/PlayerSubresyncBar.h index f23f62b19..61f66244b 100644 --- a/src/apps/mplayerc/PlayerSubresyncBar.h +++ b/src/apps/mplayerc/PlayerSubresyncBar.h @@ -27,6 +27,7 @@ #include "PlayerListCtrl.h"
#include "../../Subtitles/RTS.h"
#include "../../Subtitles/VobSubFile.h"
+#include <sizecbar/scbarg.h>
// CPlayerSubresyncBar
diff --git a/src/apps/mplayerc/PlayerToolBar.cpp b/src/apps/mplayerc/PlayerToolBar.cpp index c190b5fc3..ca0759c1c 100644 --- a/src/apps/mplayerc/PlayerToolBar.cpp +++ b/src/apps/mplayerc/PlayerToolBar.cpp @@ -29,6 +29,7 @@ #include "PlayerToolBar.h"
#include "MainFrm.h"
+
typedef HRESULT (__stdcall * SetWindowThemeFunct)(HWND hwnd, LPCWSTR pszSubAppName, LPCWSTR pszSubIdList);
diff --git a/src/apps/mplayerc/Playlist.cpp b/src/apps/mplayerc/Playlist.cpp index 5f4428328..1acbf3773 100644 --- a/src/apps/mplayerc/Playlist.cpp +++ b/src/apps/mplayerc/Playlist.cpp @@ -26,6 +26,7 @@ #include "Playlist.h"
#include "SettingsDefines.h"
+
//
// CPlaylistItem
//
diff --git a/src/apps/mplayerc/PnSPresetsDlg.h b/src/apps/mplayerc/PnSPresetsDlg.h index bb21a8a1f..b5133504c 100644 --- a/src/apps/mplayerc/PnSPresetsDlg.h +++ b/src/apps/mplayerc/PnSPresetsDlg.h @@ -24,6 +24,7 @@ #pragma once
#include "FloatEdit.h"
+#include <ResizableLib/ResizableDialog.h>
// CPnSPresetsDlg dialog
diff --git a/src/apps/mplayerc/PngImage.cpp b/src/apps/mplayerc/PngImage.cpp index cff55d815..4ae9ff61d 100644 --- a/src/apps/mplayerc/PngImage.cpp +++ b/src/apps/mplayerc/PngImage.cpp @@ -24,8 +24,9 @@ #include "stdafx.h"
#include <malloc.h>
#include "PngImage.h"
-#include "libpng/png.h"
-#include "libpng/pnginfo.h"
+#include <libpng/png.h>
+#include <libpng/pnginfo.h>
+
struct png_t {
unsigned char* data;
diff --git a/src/apps/mplayerc/PngImage.h b/src/apps/mplayerc/PngImage.h index fb8dd8f1b..440b16193 100644 --- a/src/apps/mplayerc/PngImage.h +++ b/src/apps/mplayerc/PngImage.h @@ -26,6 +26,7 @@ #include <atlimage.h>
#include "mplayerc.h"
+
class CPngImage : public CImage
{
public:
diff --git a/src/apps/mplayerc/QuicktimeGraph.cpp b/src/apps/mplayerc/QuicktimeGraph.cpp index 029eceac1..a3c2826bc 100644 --- a/src/apps/mplayerc/QuicktimeGraph.cpp +++ b/src/apps/mplayerc/QuicktimeGraph.cpp @@ -31,6 +31,7 @@ using namespace DSObjects;
+
//
// CQuicktimeGraph
//
diff --git a/src/apps/mplayerc/QuicktimeGraph.h b/src/apps/mplayerc/QuicktimeGraph.h index 412fe3a30..f3e14fc8b 100644 --- a/src/apps/mplayerc/QuicktimeGraph.h +++ b/src/apps/mplayerc/QuicktimeGraph.h @@ -27,6 +27,11 @@ #include "AllocatorCommon7.h"
#include "AllocatorCommon.h"
+#ifndef _WIN64
+#include <qt/qt.h>
+#endif
+
+
namespace DSObjects
{
diff --git a/src/apps/mplayerc/RealMediaGraph.h b/src/apps/mplayerc/RealMediaGraph.h index e097dd478..c4e874e69 100644 --- a/src/apps/mplayerc/RealMediaGraph.h +++ b/src/apps/mplayerc/RealMediaGraph.h @@ -24,7 +24,6 @@ #pragma once
#include "BaseGraph.h"
-
#include "AllocatorCommon7.h"
#include "AllocatorCommon.h"
diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.cpp b/src/apps/mplayerc/RealMediaWindowlessSite.cpp index 1ee746620..a019b74cf 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.cpp +++ b/src/apps/mplayerc/RealMediaWindowlessSite.cpp @@ -31,6 +31,7 @@ using namespace DSObjects;
+
void DSObjects::ExtractRects(REGION* pRegion)
{
LPRGNDATA lpRgnData;
diff --git a/src/apps/mplayerc/RegFilterChooserDlg.h b/src/apps/mplayerc/RegFilterChooserDlg.h index eefc1cb4b..9d33ea69c 100644 --- a/src/apps/mplayerc/RegFilterChooserDlg.h +++ b/src/apps/mplayerc/RegFilterChooserDlg.h @@ -24,6 +24,7 @@ #pragma once
#include <afxwin.h>
+#include <ResizableLib/ResizableDialog.h>
// CRegFilterChooserDlg dialog
diff --git a/src/apps/mplayerc/SaveDlg.h b/src/apps/mplayerc/SaveDlg.h index 6d1943180..99945f5ef 100644 --- a/src/apps/mplayerc/SaveDlg.h +++ b/src/apps/mplayerc/SaveDlg.h @@ -25,6 +25,7 @@ #include <afxcmn.h>
#include <afxwin.h>
+#include <ResizableLib/ResizableDialog.h>
// CSaveDlg dialog
diff --git a/src/apps/mplayerc/SelectMediaType.h b/src/apps/mplayerc/SelectMediaType.h index 5d82466de..a60d01693 100644 --- a/src/apps/mplayerc/SelectMediaType.h +++ b/src/apps/mplayerc/SelectMediaType.h @@ -24,6 +24,7 @@ #pragma once
#include <afxwin.h>
+#include <ResizableLib/ResizableDialog.h>
// CSelectMediaType dialog
diff --git a/src/apps/mplayerc/SettingsDefines.h b/src/apps/mplayerc/SettingsDefines.h index 883ce3c37..8b3d6b424 100644 --- a/src/apps/mplayerc/SettingsDefines.h +++ b/src/apps/mplayerc/SettingsDefines.h @@ -20,9 +20,9 @@ *
*/
-
#pragma once
+
#define IDS_R_SETTINGS _T("Settings")
#define IDS_R_FILTERS _T("Filters")
#define IDS_R_INTERNAL_FILTERS _T("Internal Filters")
diff --git a/src/apps/mplayerc/ShaderAutoCompleteDlg.h b/src/apps/mplayerc/ShaderAutoCompleteDlg.h index 392572e81..8ef6e4af8 100644 --- a/src/apps/mplayerc/ShaderAutoCompleteDlg.h +++ b/src/apps/mplayerc/ShaderAutoCompleteDlg.h @@ -24,6 +24,7 @@ #pragma once
#include "resource.h"
+#include <ResizableLib/ResizableDialog.h>
// CShaderAutoCompleteDlg dialog
diff --git a/src/apps/mplayerc/ShaderCombineDlg.cpp b/src/apps/mplayerc/ShaderCombineDlg.cpp index 15322f9c2..16b9989d9 100644 --- a/src/apps/mplayerc/ShaderCombineDlg.cpp +++ b/src/apps/mplayerc/ShaderCombineDlg.cpp @@ -25,6 +25,7 @@ #include "mplayerc.h"
#include "ShaderCombineDlg.h"
+
// CShaderCombineDlg dialog
CShaderCombineDlg::CShaderCombineDlg(CAtlList<CString>& labels, CWnd* pParent , bool bScreenSpace)
diff --git a/src/apps/mplayerc/ShaderCombineDlg.h b/src/apps/mplayerc/ShaderCombineDlg.h index 896b96965..9eabe5fac 100644 --- a/src/apps/mplayerc/ShaderCombineDlg.h +++ b/src/apps/mplayerc/ShaderCombineDlg.h @@ -24,6 +24,7 @@ #pragma once
#include <afxwin.h>
+#include <ResizableLib/ResizableDialog.h>
// CShaderCombineDlg dialog
diff --git a/src/apps/mplayerc/ShaderEditorDlg.h b/src/apps/mplayerc/ShaderEditorDlg.h index 2775a4097..0a93472ee 100644 --- a/src/apps/mplayerc/ShaderEditorDlg.h +++ b/src/apps/mplayerc/ShaderEditorDlg.h @@ -26,6 +26,7 @@ #include "LineNumberEdit.h"
#include "ShaderAutoCompleteDlg.h"
#include "mplayerc.h"
+#include <ResizableLib/ResizableDialog.h>
// Q174667
diff --git a/src/apps/mplayerc/ShockwaveGraph.cpp b/src/apps/mplayerc/ShockwaveGraph.cpp index 0db13edb6..d37828aef 100644 --- a/src/apps/mplayerc/ShockwaveGraph.cpp +++ b/src/apps/mplayerc/ShockwaveGraph.cpp @@ -29,6 +29,7 @@ using namespace DSObjects;
+
CShockwaveGraph::CShockwaveGraph(HWND hParent, HRESULT& hr)
: m_fs(State_Stopped)
{
diff --git a/src/apps/mplayerc/StaticLink.h b/src/apps/mplayerc/StaticLink.h index d02195eb6..b80aef35f 100644 --- a/src/apps/mplayerc/StaticLink.h +++ b/src/apps/mplayerc/StaticLink.h @@ -23,6 +23,7 @@ #pragma once
+
// CHyperlink
class CHyperlink : public CString
diff --git a/src/apps/mplayerc/StatusLabel.h b/src/apps/mplayerc/StatusLabel.h index 15e77e117..f85ac11df 100644 --- a/src/apps/mplayerc/StatusLabel.h +++ b/src/apps/mplayerc/StatusLabel.h @@ -23,6 +23,7 @@ #pragma once
+
// CStatusLabel
class CStatusLabel : public CStatic
diff --git a/src/apps/mplayerc/SubtitleDlDlg.h b/src/apps/mplayerc/SubtitleDlDlg.h index 19af52c47..4dbcdabd6 100644 --- a/src/apps/mplayerc/SubtitleDlDlg.h +++ b/src/apps/mplayerc/SubtitleDlDlg.h @@ -23,8 +23,9 @@ #pragma once
-#include "ISDb.h"
#include <afxwin.h>
+#include "ISDb.h"
+#include <ResizableLib/ResizableDialog.h>
// CSubtitleDlDlg dialog
diff --git a/src/apps/mplayerc/TextPassThruFilter.cpp b/src/apps/mplayerc/TextPassThruFilter.cpp index e4c68d686..5ce835679 100644 --- a/src/apps/mplayerc/TextPassThruFilter.cpp +++ b/src/apps/mplayerc/TextPassThruFilter.cpp @@ -22,7 +22,7 @@ */
#include "stdafx.h"
-#include <windows.h>
+#include <Windows.h>
#include <commdlg.h>
#include "mplayerc.h"
#include "MainFrm.h"
diff --git a/src/apps/mplayerc/TextPassThruFilter.h b/src/apps/mplayerc/TextPassThruFilter.h index 9b7fc6b2b..4e4628ebc 100644 --- a/src/apps/mplayerc/TextPassThruFilter.h +++ b/src/apps/mplayerc/TextPassThruFilter.h @@ -23,6 +23,7 @@ #pragma once
+
class CTextPassThruInputPin;
class __declspec(uuid("E2BA9B7B-B65D-4804-ACB2-89C3E55511DB"))
diff --git a/src/apps/mplayerc/TunerScanDlg.cpp b/src/apps/mplayerc/TunerScanDlg.cpp index 7be17cdea..8b84cbc9a 100644 --- a/src/apps/mplayerc/TunerScanDlg.cpp +++ b/src/apps/mplayerc/TunerScanDlg.cpp @@ -29,6 +29,7 @@ #include "TunerScanDlg.h"
#include "DVBChannel.h"
+
enum TSC_COLUMN {
TSCC_NUMBER,
TSCC_NAME,
diff --git a/src/apps/mplayerc/TunerScanDlg.h b/src/apps/mplayerc/TunerScanDlg.h index 20642bcb1..663cdb4d7 100644 --- a/src/apps/mplayerc/TunerScanDlg.h +++ b/src/apps/mplayerc/TunerScanDlg.h @@ -21,6 +21,7 @@ */
#pragma once
+
#include <afxcmn.h>
#include <afxwin.h>
diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h index 0a4e692ce..ae51b2157 100644 --- a/src/apps/mplayerc/VMROSD.h +++ b/src/apps/mplayerc/VMROSD.h @@ -24,10 +24,11 @@ #include <atlbase.h>
#include <d3d9.h>
-#include <vmr9.h>
#include <evr9.h>
+#include <vmr9.h>
#include "madVRAllocatorPresenter.h"
+
typedef enum {
OSD_TRANSPARENT,
OSD_BACKGROUND,
diff --git a/src/apps/mplayerc/VolumeCtrl.h b/src/apps/mplayerc/VolumeCtrl.h index a5cd69136..d5229661b 100644 --- a/src/apps/mplayerc/VolumeCtrl.h +++ b/src/apps/mplayerc/VolumeCtrl.h @@ -23,6 +23,7 @@ #pragma once
+
// CVolumeCtrl
class CVolumeCtrl : public CSliderCtrl
diff --git a/src/apps/mplayerc/WebClientSocket.cpp b/src/apps/mplayerc/WebClientSocket.cpp index 1c9e5abe9..df7d0c6dc 100644 --- a/src/apps/mplayerc/WebClientSocket.cpp +++ b/src/apps/mplayerc/WebClientSocket.cpp @@ -31,6 +31,7 @@ #include "WebClientSocket.h"
#include "jpeg.h"
+
CWebClientSocket::CWebClientSocket(CWebServer* pWebServer, CMainFrame* pMainFrame)
: m_pWebServer(pWebServer)
, m_pMainFrame(pMainFrame)
diff --git a/src/apps/mplayerc/WebClientSocket.h b/src/apps/mplayerc/WebClientSocket.h index b2714b086..9b3fc15c6 100644 --- a/src/apps/mplayerc/WebClientSocket.h +++ b/src/apps/mplayerc/WebClientSocket.h @@ -23,6 +23,7 @@ #pragma once
+
class CWebServer;
class CWebClientSocket : public CAsyncSocket
diff --git a/src/apps/mplayerc/WebServer.cpp b/src/apps/mplayerc/WebServer.cpp index a050c30b2..aafd8308d 100644 --- a/src/apps/mplayerc/WebServer.cpp +++ b/src/apps/mplayerc/WebServer.cpp @@ -31,6 +31,7 @@ #include "WebClientSocket.h"
#include "WebServer.h"
+
CAtlStringMap<CWebServer::RequestHandler> CWebServer::m_internalpages;
CAtlStringMap<UINT> CWebServer::m_downloads;
CAtlStringMap<CStringA, CStringA> CWebServer::m_mimes;
diff --git a/src/apps/mplayerc/WebServer.h b/src/apps/mplayerc/WebServer.h index d60859200..e2e84e1b9 100644 --- a/src/apps/mplayerc/WebServer.h +++ b/src/apps/mplayerc/WebServer.h @@ -25,6 +25,7 @@ #include <afxsock.h>
#include <atlcoll.h>
+#include <atlpath.h>
#define UTF8(str) UTF16To8(TToW(str))
#define UTF8Arg(str) UrlEncode(UTF8(str))
diff --git a/src/apps/mplayerc/WebServerSocket.cpp b/src/apps/mplayerc/WebServerSocket.cpp index f502023c4..7c3f52a04 100644 --- a/src/apps/mplayerc/WebServerSocket.cpp +++ b/src/apps/mplayerc/WebServerSocket.cpp @@ -25,6 +25,7 @@ #include "WebServer.h"
#include "WebServerSocket.h"
+
CWebServerSocket::CWebServerSocket(CWebServer* pWebServer, int port)
: m_pWebServer(pWebServer)
{
diff --git a/src/apps/mplayerc/WebServerSocket.h b/src/apps/mplayerc/WebServerSocket.h index db6265bad..a01f64c02 100644 --- a/src/apps/mplayerc/WebServerSocket.h +++ b/src/apps/mplayerc/WebServerSocket.h @@ -23,6 +23,7 @@ #pragma once
+
class CWebServer;
class CWebServerSocket : public CAsyncSocket
diff --git a/src/apps/mplayerc/WinAPIUtils.cpp b/src/apps/mplayerc/WinAPIUtils.cpp index 91a0d17ca..faca0d2fb 100644 --- a/src/apps/mplayerc/WinAPIUtils.cpp +++ b/src/apps/mplayerc/WinAPIUtils.cpp @@ -23,6 +23,7 @@ #include "stdafx.h"
#include "WinAPIUtils.h"
+
BOOL IsWinXPOrLater()
{
OSVERSIONINFOEX osvi = {0};
diff --git a/src/apps/mplayerc/WinAPIUtils.h b/src/apps/mplayerc/WinAPIUtils.h index 7fead5d32..d801002fc 100644 --- a/src/apps/mplayerc/WinAPIUtils.h +++ b/src/apps/mplayerc/WinAPIUtils.h @@ -24,6 +24,7 @@ #include <Windows.h>
+
BOOL IsWinXPOrLater();
BOOL IsWinVistaOrLater();
BOOL IsWinSeven();
diff --git a/src/apps/mplayerc/jpeg.h b/src/apps/mplayerc/jpeg.h index 89f96517d..71068e7c1 100644 --- a/src/apps/mplayerc/jpeg.h +++ b/src/apps/mplayerc/jpeg.h @@ -23,6 +23,7 @@ #pragma once
+
class CJpegEncoder
{
static const int ColorComponents = 3;
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 91b6237b2..0f22153b9 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -34,6 +34,7 @@ #include "Version.h"
#include "WinAPIUtils.h"
+
extern "C" {
int mingw_app_type = 1;
}
diff --git a/src/apps/mplayerc/mplayerc.h b/src/apps/mplayerc/mplayerc.h index 6f6c5a324..f7b57ebb6 100644 --- a/src/apps/mplayerc/mplayerc.h +++ b/src/apps/mplayerc/mplayerc.h @@ -31,13 +31,15 @@ #include <afxadv.h>
#include <atlsync.h>
#include "FakeFilterMapper2.h"
-
#include "AppSettings.h"
+
+
#define MPC_WND_CLASS_NAME L"MediaPlayerClassicW"
//define the default logo we use
#define DEF_LOGO IDF_LOGO3
+
enum {
WM_GRAPHNOTIFY = WM_RESET_DEVICE+1,
WM_RESUMEFROMSTATE,
diff --git a/src/apps/mplayerc/mplayerc.vcxproj b/src/apps/mplayerc/mplayerc.vcxproj index 216fdb030..cce541ccb 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj +++ b/src/apps/mplayerc/mplayerc.vcxproj @@ -81,7 +81,7 @@ update_version.bat </Command>
</PreBuildEvent>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
@@ -109,7 +109,7 @@ update_version.bat </Command>
</PreBuildEvent>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -138,7 +138,7 @@ update_version.bat </Command>
</PreBuildEvent>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;DETOURS_X32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
@@ -165,7 +165,7 @@ update_version.bat </Command>
</PreBuildEvent>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\atl;..\..\..\include\dx;..\..\filters\BaseClasses;..\..\thirdparty;..\..\thirdparty\MediaInfo;..\..\thirdparty\MediaInfo\MediaInfo;..\..\thirdparty\ui;..\..\thirdparty\ZenLib;..\..\filters\renderer\VideoRenderers;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;DETOURS_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
diff --git a/src/apps/mplayerc/stdafx.h b/src/apps/mplayerc/stdafx.h index f61549544..a982d0861 100644 --- a/src/apps/mplayerc/stdafx.h +++ b/src/apps/mplayerc/stdafx.h @@ -23,38 +23,17 @@ #pragma once
-#include "../../../DSUtil/SharedInclude.h"
-#include "../../../../include/stdafx_common.h"
+#include "../../DSUtil/SharedInclude.h"
+#include "../../../include/stdafx_common.h"
#undef _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
-#include "../../../../include/stdafx_common_afx2.h"
-#include "../../../../include/stdafx_common_dshow.h"
-
-#include <afxdlgs.h>
-
-#include <Shlwapi.h>
-#include <atlcoll.h>
-#include <atlpath.h>
+#include "../../../include/stdafx_common_afx2.h"
+#include "../../../include/stdafx_common_dshow.h"
#define HITTEST_RET LRESULT
-#include "../../thirdparty/zlib/zlib.h"
-#include "../../CmdUI/CmdUI.h"
-#include "../../thirdparty/ui/ResizableLib/ResizableDialog.h"
-#include "../../thirdparty/ui/ResizableLib/ResizablePage.h"
-#include "../../thirdparty/ui/ResizableLib/ResizableSheet.h"
-#include "../../thirdparty/ui/sizecbar/sizecbar.h"
-#include "../../thirdparty/ui/sizecbar/scbarcf.h"
-#include "../../thirdparty/ui/sizecbar/scbarg.h"
-#include "../../thirdparty/ui/TreePropSheet/TreePropSheet.h"
+#include <zlib/zlib.h>
#include "../../DSUtil/DSUtil.h"
-#ifndef _WIN64
-#include <qt/qt.h>
-#endif
-
-#include <gdiplus.h>
-#include <mpconfig.h>
-
#define ResStr(id) CString(MAKEINTRESOURCE(id))
template <class T = CString, class S = CString>
|