diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-25 20:18:04 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-09-25 20:18:04 +0400 |
commit | 4e5596b78cfa32d6c28b3faa033fe58b3e9c5a2a (patch) | |
tree | 9d06782a93b3ec706362e33fd0f48893f935ab81 /src/apps/mplayerc | |
parent | 7cab39fd0e4c98cfa4ab3bd676a55ad1dafa577e (diff) |
legacy branch: merge changes from trunk 2629-2631, updated apps project files
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2632 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc')
-rw-r--r-- | src/apps/mplayerc/Changelog.txt | 7 | ||||
-rw-r--r-- | src/apps/mplayerc/ChildView.cpp | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/MainFrm.cpp | 11 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/apps/mplayerc/Changelog.txt b/src/apps/mplayerc/Changelog.txt index 6979c6c4b..bb34f3dee 100644 --- a/src/apps/mplayerc/Changelog.txt +++ b/src/apps/mplayerc/Changelog.txt @@ -5,9 +5,8 @@ v1.5.xxxx.0 - unreleased NEW : Added new options to always default to external subtitles, ignore
embedded subtitles and to set the autoload subtitle paths
NEW : LCN support for DVB
- NEW : Added support for 'in24', 'fl64' and 8-bit 'sowt' audio
- NEW : Added support for 'IMA4' audio
- NEW : Added support for 'NONE' audio (old QuickTime PCM)
+ NEW : Added support for 'in24', 'fl64', 8-bit 'sowt', 'IMA4' and 'NONE'
+ audio (old QuickTime PCM)
NEW : Added channel encryption detection for DVB-t during scan
NEW : Ticket #784, Enable ctrl+A in the MediaInfo window
CHANGED: Updated FFmpeg
@@ -29,8 +28,10 @@ v1.5.xxxx.0 - unreleased FIXED : Ticket #724, Frequency range and bandwidth value are currently
not taken into account when doing a scan
FIXED : Ticket #753, DVB-T, internal MPEG-2 filter & wrong aspect ratio
+ FIXED : Ticket #778, Playlist interface problem
FIXED : Ticket #782, VMR-7 & 9 filter names misspelled
FIXED : Ticket #791, Change the cursor behavior
+ FIXED : Ticket #809, Resize-arrows no longer appear with caption hidden
v1.4.2499.0 - 7 September 2010
diff --git a/src/apps/mplayerc/ChildView.cpp b/src/apps/mplayerc/ChildView.cpp index 8a93b9e20..2314edf0f 100644 --- a/src/apps/mplayerc/ChildView.cpp +++ b/src/apps/mplayerc/ChildView.cpp @@ -254,7 +254,7 @@ BOOL CChildView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) SetCursor(NULL);
return TRUE;
}
- if(((CMainFrame*)GetParentFrame())->IsSomethingLoaded())
+ if(((CMainFrame*)GetParentFrame())->IsSomethingLoaded() && (nHitTest == HTCLIENT))
{
::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND));
return TRUE;
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index a4fe9dd60..7b0e93309 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -128,8 +128,6 @@ public: }
};
-bool m_PlayListBarVisible = false;
-
//
#define SaveMediaState \
@@ -155,8 +153,6 @@ bool m_PlayListBarVisible = false; SendMessage(WM_COMMAND, ID_PLAY_PLAY); \
} \
-bool m_Change_Monitor = false;
-
/////////////////////////////////////////////////////////////////////////////
// CMainFrame
@@ -1006,6 +1002,9 @@ void CMainFrame::RestoreFloatingControlBars() if(str.IsEmpty()) return;
CString section = _T("ToolBars\\") + str;
+ if((pBar == &m_wndPlaylistBar) && pApp->GetProfileInt(section, _T("Visible"), FALSE))
+ pBar->ShowWindow(SW_SHOW);
+
if(pApp->GetProfileInt(section, _T("DockState"), ~AFX_IDW_DOCKBAR_FLOAT) == AFX_IDW_DOCKBAR_FLOAT)
{
CPoint p;
@@ -1448,7 +1447,7 @@ void CMainFrame::OnSizing(UINT fwSide, LPRECT pRect) {
CSizingControlBar *pCB = m_dockingbars.GetNext( pos );
- if ( IsWindow(pCB->m_hWnd) && pCB->IsWindowVisible() )
+ if ( IsWindow(pCB->m_hWnd) && pCB->IsWindowVisible() && !pCB->IsFloating() )
{
if ( pCB->IsHorzDocked() )
fsize.cy += pCB->CalcFixedLayout(TRUE, TRUE).cy - 2;
@@ -9494,6 +9493,7 @@ void CMainFrame::ToggleFullscreen(bool fToNearest, bool fSwitchScreenResWhenHasT HMONITOR hm_cur = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
CMonitors monitors;
+ bool m_PlayListBarVisible = false;
if(!m_fFullScreen)
{
@@ -9557,6 +9557,7 @@ void CMainFrame::ToggleFullscreen(bool fToNearest, bool fSwitchScreenResWhenHasT ModifyStyleEx(dwRemoveEx, dwAddEx, SWP_NOZORDER);
::SetMenu(m_hWnd, hMenu);
+ bool m_Change_Monitor = false;
// try disable shader when move from one monitor to other ...
if(m_fFullScreen)
{
|