Inverted show/disable osd and free window resizing/limit window aspect options (reverse functionality, users please update your settings as this does not occur automatically) - Patch by foxx1337

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

7 files changed, 22 insertions, 22 deletions

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
index 0adf9db97..42b50e43a 100644
--- a/src/apps/mplayerc/MainFrm.cpp
+++ b/src/apps/mplayerc/MainFrm.cpp
@@ -1243,7 +1243,7 @@ void CMainFrame::OnSizing(UINT fwSide, LPRECT pRect)
 

 	if(m_iMediaLoadState != MLS_LOADED || m_fFullScreen

 	|| s.iDefaultVideoSize == DVS_STRETCH

-	|| (fCtrl ^ s.fFreeWindowResizing))

+	|| (fCtrl == s.fLimitWindowProportions))	// remember that fCtrl is initialized with !!whatever(), same with fLimitWindowProportions

 		return;

 

 	CSize wsize(pRect->right - pRect->left, pRect->bottom - pRect->top);

@@ -5525,7 +5525,7 @@ void CMainFrame::OnViewVSyncOffsetDecrease()
 void CMainFrame::OnUpdateViewRemainingTime(CCmdUI* pCmdUI)

 {

 	AppSettings& s = AfxGetAppSettings();

-	pCmdUI->Enable (s.fShowOSD && (m_iMediaLoadState != MLS_CLOSED));

+	pCmdUI->Enable ((!s.fDisableOSD) && (m_iMediaLoadState != MLS_CLOSED));

 	pCmdUI->SetCheck (m_bRemainingTime);

 }

 

@@ -10156,9 +10156,9 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr<OpenMediaData> pOMD)
 		pGB->FindInterface(__uuidof(IVMRMixerControl9),			(void**)&m_pMC,  TRUE);

 		pGB->FindInterface(__uuidof(IVMRMixerBitmap9),			(void**)&pVMB,	 TRUE);

 		pGB->FindInterface(__uuidof(IMFVideoMixerBitmap),		(void**)&pMFVMB, TRUE);

-		if (pVMB && s.fShowOSD)

+		if (pVMB && (!s.fDisableOSD))

 			m_OSD.Start (m_pVideoWnd, pVMB);

-		else if (pMFVMB && s.fShowOSD)

+		else if (pMFVMB && (!s.fDisableOSD))

 			m_OSD.Start (m_pVideoWnd, pMFVMB);

 		if (m_pMC)

 		{

diff --git a/src/apps/mplayerc/PPagePlayer.cpp b/src/apps/mplayerc/PPagePlayer.cpp
index c30a5bb4e..16102b83c 100644
--- a/src/apps/mplayerc/PPagePlayer.cpp
+++ b/src/apps/mplayerc/PPagePlayer.cpp
@@ -44,10 +44,10 @@ CPPagePlayer::CPPagePlayer()
 	, m_fKeepHistory(FALSE)

 	, m_fHideCDROMsSubMenu(FALSE)

 	, m_priority(FALSE)

-	, m_fShowOSD(FALSE)

+	, m_fDisableOSD(FALSE)

+	, m_fLimitWindowProportions(TRUE)

 	, m_fRememberDVDPos(FALSE)

 	, m_fRememberFilePos(FALSE)

-	, m_fFreeWindowResizing(TRUE)

 {

 }

 

@@ -70,10 +70,10 @@ void CPPagePlayer::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_CHECK1, m_fKeepHistory);

 	DDX_Check(pDX, IDC_CHECK10, m_fHideCDROMsSubMenu);

 	DDX_Check(pDX, IDC_CHECK9, m_priority);

-	DDX_Check(pDX, IDC_SHOW_OSD, m_fShowOSD);

+	DDX_Check(pDX, IDC_SHOW_OSD, m_fDisableOSD);

+	DDX_Check(pDX, IDC_CHECK4, m_fLimitWindowProportions);

 	DDX_Check(pDX, IDC_DVD_POS, m_fRememberDVDPos);

 	DDX_Check(pDX, IDC_FILE_POS, m_fRememberFilePos);

-	DDX_Check(pDX, IDC_CHECK4, m_fFreeWindowResizing);

 }

 

 BEGIN_MESSAGE_MAP(CPPagePlayer, CPPageBase)

@@ -103,10 +103,10 @@ BOOL CPPagePlayer::OnInitDialog()
 	m_fKeepHistory = s.fKeepHistory;

 	m_fHideCDROMsSubMenu = s.fHideCDROMsSubMenu;

 	m_priority = s.priority != NORMAL_PRIORITY_CLASS;

-	m_fShowOSD = s.fShowOSD;

+	m_fDisableOSD = s.fDisableOSD;

 	m_fRememberDVDPos = s.fRememberDVDPos;

 	m_fRememberFilePos = s.fRememberFilePos;

-	m_fFreeWindowResizing = s.fFreeWindowResizing;

+	m_fLimitWindowProportions = s.fLimitWindowProportions;

 

 	UpdateData(FALSE);

 

@@ -134,10 +134,10 @@ BOOL CPPagePlayer::OnApply()
 	s.fKeepHistory = !!m_fKeepHistory;

 	s.fHideCDROMsSubMenu = !!m_fHideCDROMsSubMenu;

 	s.priority = !m_priority ? NORMAL_PRIORITY_CLASS : GetVersion() < 0 ? HIGH_PRIORITY_CLASS : ABOVE_NORMAL_PRIORITY_CLASS;

-	s.fShowOSD = !!m_fShowOSD;

+	s.fDisableOSD = !!m_fDisableOSD;

+	s.fLimitWindowProportions = !!m_fLimitWindowProportions;

 	s.fRememberDVDPos = m_fRememberDVDPos ? true : false;

 	s.fRememberFilePos = m_fRememberFilePos ? true : false;

-	s.fFreeWindowResizing = !!m_fFreeWindowResizing;

 

 	if(!m_fKeepHistory)

 	{

diff --git a/src/apps/mplayerc/PPagePlayer.h b/src/apps/mplayerc/PPagePlayer.h
index 396e7b055..920a753f0 100644
--- a/src/apps/mplayerc/PPagePlayer.h
+++ b/src/apps/mplayerc/PPagePlayer.h
@@ -48,10 +48,10 @@ public:
 	BOOL m_fKeepHistory;

 	BOOL m_fHideCDROMsSubMenu;

 	BOOL m_priority;

-	BOOL m_fShowOSD;

+	BOOL m_fDisableOSD;

+	BOOL m_fLimitWindowProportions;

 	BOOL m_fRememberDVDPos;

 	BOOL m_fRememberFilePos;

-	BOOL m_fFreeWindowResizing;

 

 // Dialog Data

 	enum { IDD = IDD_PPAGEPLAYER };

diff --git a/src/apps/mplayerc/SettingsDefines.h b/src/apps/mplayerc/SettingsDefines.h
index 888da9db5..4f21b2152 100644
--- a/src/apps/mplayerc/SettingsDefines.h
+++ b/src/apps/mplayerc/SettingsDefines.h
@@ -41,7 +41,7 @@
 #define IDS_RS_FILEPOS						_T("Remember File Pos")

 #define IDS_RS_LASTFULLSCREEN				_T("LastFullScreen")

 #define IDS_RS_EVR_BUFFERS					_T("EVRBuffers")

-#define IDS_RS_SHOWOSD						_T("Show OSD")

+#define IDS_RS_DISABLEOSD					_T("Disable OSD")

 #define IDS_RS_LANGUAGE						_T("InterfaceLanguage")

 #define IDS_RS_GLOBALMEDIA					_T("UseGlobalMedia")

 #define IDS_RS_DXVAFILTERS					_T("DXVAFilters")

@@ -184,7 +184,7 @@
 #define IDS_RS_DX9_RESIZER					_T("DX9Resizer")

 #define IDS_RS_WEBSERVERCGI					_T("WebServerCGI")

 #define IDS_RS_WEBDEFINDEX					_T("WebDefIndex")

-#define IDS_RS_FREEWINDOWRESIZING			_T("FreeWindowResizing")

+#define IDS_RS_LIMITWINDOWPROPORTIONS		_T("LimitWindowProportions")

 #define IDS_RS_NOTIFYMSN					_T("NotifyMSN2")

 #define IDS_RS_NOTIFYGTSDLL					_T("NotifyGTSdll")

 #define IDS_RS_VMR9MIXERMODE				_T("VMR9MixerMode")

diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp
index 77ac0951b..52ea55b23 100644
--- a/src/apps/mplayerc/mplayerc.cpp
+++ b/src/apps/mplayerc/mplayerc.cpp
@@ -1771,7 +1771,7 @@ void CMPlayerCApp::Settings::UpdateData(bool fSave)
 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_TOGGLESHADERSSCREENSPACE, (int)m_bToggleShaderScreenSpace);

 

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_EVR_BUFFERS, iEvrBuffers);

-		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_SHOWOSD, (int)fShowOSD);

+		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_DISABLEOSD, (int)fDisableOSD);

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_ENABLEEDLEDITOR, (int)fEnableEDLEditor);

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_LANGUAGE, (int)iLanguage);

 

@@ -1929,7 +1929,7 @@ void CMPlayerCApp::Settings::UpdateData(bool fSave)
 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_JUMPDISTS, nJumpDistS);

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_JUMPDISTM, nJumpDistM);

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_JUMPDISTL, nJumpDistL);

-		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_FREEWINDOWRESIZING, fFreeWindowResizing);

+		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_LIMITWINDOWPROPORTIONS, fLimitWindowProportions);

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_NOTIFYMSN, fNotifyMSN);		

 		pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_NOTIFYGTSDLL, fNotifyGTSdll);

 

@@ -2358,7 +2358,7 @@ void CMPlayerCApp::Settings::UpdateData(bool fSave)
 		nJumpDistS = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_JUMPDISTS, 1000);

 		nJumpDistM = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_JUMPDISTM, 5000);

 		nJumpDistL = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_JUMPDISTL, 20000);

-		fFreeWindowResizing = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_FREEWINDOWRESIZING, TRUE);

+		fLimitWindowProportions = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_LIMITWINDOWPROPORTIONS, FALSE);

 		fNotifyMSN = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_NOTIFYMSN, FALSE);

 		fNotifyGTSdll = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_NOTIFYGTSDLL, FALSE);

 

@@ -2508,7 +2508,7 @@ void CMPlayerCApp::Settings::UpdateData(bool fSave)
 		m_bToggleShaderScreenSpace = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_TOGGLESHADERSSCREENSPACE, 0);

 

 		iEvrBuffers		= pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_EVR_BUFFERS, 5);

-		fShowOSD		= !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_SHOWOSD, 1);

+		fDisableOSD		= !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_DISABLEOSD, 0);

 		fEnableEDLEditor= !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_ENABLEEDLEDITOR, FALSE);

 

 		// Save analog capture settings

diff --git a/src/apps/mplayerc/mplayerc.h b/src/apps/mplayerc/mplayerc.h
index 535982372..7181611e9 100644
--- a/src/apps/mplayerc/mplayerc.h
+++ b/src/apps/mplayerc/mplayerc.h
@@ -697,7 +697,7 @@ public:
 		int nJumpDistS;

 		int nJumpDistM;

 		int nJumpDistL;

-		bool fFreeWindowResizing;

+		bool fLimitWindowProportions;

 		bool fNotifyMSN;

 		bool fNotifyGTSdll;

 

@@ -781,7 +781,7 @@ public:
 

 		bool			fRememberDVDPos;

 		bool			fRememberFilePos;

-		bool			fShowOSD;

+		bool			fDisableOSD;

 		int				iEvrBuffers;

 		int				iLanguage;

 

diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc
index dbdaca46b..0536440bf 100644
--- a/src/apps/mplayerc/mplayerc.rc
+++ b/src/apps/mplayerc/mplayerc.rc