diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-03-23 02:16:51 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-03-23 02:16:51 +0300 |
commit | 99f2b84d13996e5dd9bb66ada53759e0eecbd92d (patch) | |
tree | 3b6730cca41248fb5cc949809879da135fc29125 /src/apps | |
parent | 770f266fc50b63c7c2e2b4394e0ff3589d77555b (diff) |
partially reverted r1755 (the OSD change)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1760 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps')
-rw-r--r-- | src/apps/mplayerc/MainFrm.cpp | 6 | ||||
-rw-r--r-- | src/apps/mplayerc/PPagePlayer.cpp | 8 | ||||
-rw-r--r-- | src/apps/mplayerc/PPagePlayer.h | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/SettingsDefines.h | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/mplayerc.cpp | 4 | ||||
-rw-r--r-- | src/apps/mplayerc/mplayerc.h | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/mplayerc.rc | bin | 323584 -> 323576 bytes | |||
-rw-r--r-- | src/apps/mplayerc/mplayerc.ru.rc | bin | 314672 -> 314670 bytes |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index c23138904..cb4b83dc4 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -5523,7 +5523,7 @@ void CMainFrame::OnViewVSyncOffsetDecrease() void CMainFrame::OnUpdateViewRemainingTime(CCmdUI* pCmdUI)
{
AppSettings& s = AfxGetAppSettings();
- pCmdUI->Enable ((!s.fDisableOSD) && (m_iMediaLoadState != MLS_CLOSED));
+ pCmdUI->Enable (s.fShowOSD && (m_iMediaLoadState != MLS_CLOSED));
pCmdUI->SetCheck (m_bRemainingTime);
}
@@ -10159,9 +10159,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.fDisableOSD))
+ if (pVMB && s.fShowOSD)
m_OSD.Start (m_pVideoWnd, pVMB);
- else if (pMFVMB && (!s.fDisableOSD))
+ else if (pMFVMB && s.fShowOSD)
m_OSD.Start (m_pVideoWnd, pMFVMB);
if (m_pMC)
{
diff --git a/src/apps/mplayerc/PPagePlayer.cpp b/src/apps/mplayerc/PPagePlayer.cpp index 16102b83c..85a8e5d06 100644 --- a/src/apps/mplayerc/PPagePlayer.cpp +++ b/src/apps/mplayerc/PPagePlayer.cpp @@ -44,7 +44,7 @@ CPPagePlayer::CPPagePlayer() , m_fKeepHistory(FALSE)
, m_fHideCDROMsSubMenu(FALSE)
, m_priority(FALSE)
- , m_fDisableOSD(FALSE)
+ , m_fShowOSD(FALSE)
, m_fLimitWindowProportions(TRUE)
, m_fRememberDVDPos(FALSE)
, m_fRememberFilePos(FALSE)
@@ -70,7 +70,7 @@ 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_fDisableOSD);
+ DDX_Check(pDX, IDC_SHOW_OSD, m_fShowOSD);
DDX_Check(pDX, IDC_CHECK4, m_fLimitWindowProportions);
DDX_Check(pDX, IDC_DVD_POS, m_fRememberDVDPos);
DDX_Check(pDX, IDC_FILE_POS, m_fRememberFilePos);
@@ -103,7 +103,7 @@ BOOL CPPagePlayer::OnInitDialog() m_fKeepHistory = s.fKeepHistory;
m_fHideCDROMsSubMenu = s.fHideCDROMsSubMenu;
m_priority = s.priority != NORMAL_PRIORITY_CLASS;
- m_fDisableOSD = s.fDisableOSD;
+ m_fShowOSD = s.fShowOSD;
m_fRememberDVDPos = s.fRememberDVDPos;
m_fRememberFilePos = s.fRememberFilePos;
m_fLimitWindowProportions = s.fLimitWindowProportions;
@@ -134,7 +134,7 @@ 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.fDisableOSD = !!m_fDisableOSD;
+ s.fShowOSD = !!m_fShowOSD;
s.fLimitWindowProportions = !!m_fLimitWindowProportions;
s.fRememberDVDPos = m_fRememberDVDPos ? true : false;
s.fRememberFilePos = m_fRememberFilePos ? true : false;
diff --git a/src/apps/mplayerc/PPagePlayer.h b/src/apps/mplayerc/PPagePlayer.h index 920a753f0..dd1f77ee0 100644 --- a/src/apps/mplayerc/PPagePlayer.h +++ b/src/apps/mplayerc/PPagePlayer.h @@ -48,7 +48,7 @@ public: BOOL m_fKeepHistory;
BOOL m_fHideCDROMsSubMenu;
BOOL m_priority;
- BOOL m_fDisableOSD;
+ BOOL m_fShowOSD;
BOOL m_fLimitWindowProportions;
BOOL m_fRememberDVDPos;
BOOL m_fRememberFilePos;
diff --git a/src/apps/mplayerc/SettingsDefines.h b/src/apps/mplayerc/SettingsDefines.h index 4f21b2152..a71b323b3 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_DISABLEOSD _T("Disable OSD")
+#define IDS_RS_SHOWOSD _T("Show OSD")
#define IDS_RS_LANGUAGE _T("InterfaceLanguage")
#define IDS_RS_GLOBALMEDIA _T("UseGlobalMedia")
#define IDS_RS_DXVAFILTERS _T("DXVAFilters")
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 52ea55b23..be23a9d6e 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_DISABLEOSD, (int)fDisableOSD);
+ pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_SHOWOSD, (int)fShowOSD);
pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_ENABLEEDLEDITOR, (int)fEnableEDLEditor);
pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_LANGUAGE, (int)iLanguage);
@@ -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);
- fDisableOSD = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_DISABLEOSD, 0);
+ fShowOSD = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_SHOWOSD, 1);
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 7181611e9..67cd7843d 100644 --- a/src/apps/mplayerc/mplayerc.h +++ b/src/apps/mplayerc/mplayerc.h @@ -781,7 +781,7 @@ public: bool fRememberDVDPos;
bool fRememberFilePos;
- bool fDisableOSD;
+ bool fShowOSD;
int iEvrBuffers;
int iLanguage;
diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc Binary files differindex 2b1ea6fa1..b06c4babb 100644 --- a/src/apps/mplayerc/mplayerc.rc +++ b/src/apps/mplayerc/mplayerc.rc diff --git a/src/apps/mplayerc/mplayerc.ru.rc b/src/apps/mplayerc/mplayerc.ru.rc Binary files differindex 562e39c9a..5014ac906 100644 --- a/src/apps/mplayerc/mplayerc.ru.rc +++ b/src/apps/mplayerc/mplayerc.ru.rc |