diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 03:56:53 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 03:56:53 +0000 |
| commit | 7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff (patch) | |
| tree | 0a0917e11f12a7e607eac702edd5eef574edc360 /media/player/mainfrm.h | |
| parent | 51046488738f8a3fdd7f55fc046a93f89e0294f7 (diff) | |
| download | chromium_src-7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff.zip chromium_src-7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff.tar.gz chromium_src-7091ca47e63c66e8f9f9b02508ea4cbc25ab3aff.tar.bz2 | |
Revert r15615, build errors on linux and mac.
Review URL: http://codereview.chromium.org/113135
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/player/mainfrm.h')
| -rw-r--r-- | media/player/mainfrm.h | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/media/player/mainfrm.h b/media/player/mainfrm.h index 7874a01..e1c9978 100644 --- a/media/player/mainfrm.h +++ b/media/player/mainfrm.h @@ -77,12 +77,7 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, UIEnable(ID_VIEW_FITTOSCREEN, false); // Not currently implemented. UIEnable(ID_VIEW_FULLSCREEN, false); // Not currently implemented. UIEnable(ID_VIEW_PROPERTIES, bEnable); - UIEnable(ID_VIEW_ROTATE0, true); - UIEnable(ID_VIEW_ROTATE90, false); - UIEnable(ID_VIEW_ROTATE180, true); - UIEnable(ID_VIEW_ROTATE270, false); - UIEnable(ID_VIEW_MIRROR_HORIZONTAL, true); - UIEnable(ID_VIEW_MIRROR_VERTICAL, true); + UIEnable(ID_PLAY_PLAY_PAUSE, bMovieOpen); // if no movie open. UIEnable(ID_PLAY_HALFSPEED, true); UIEnable(ID_PLAY_NORMALSPEED, true); @@ -212,8 +207,6 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, COMMAND_RANGE_HANDLER_EX(ID_VIEW_HALFSIZE, ID_VIEW_FULLSCREEN, OnViewSize) COMMAND_ID_HANDLER_EX(ID_VIEW_TOOLBAR, OnViewToolBar) COMMAND_ID_HANDLER_EX(ID_VIEW_STATUS_BAR, OnViewStatusBar) - COMMAND_RANGE_HANDLER_EX(ID_VIEW_ROTATE0, ID_VIEW_MIRROR_VERTICAL, - OnViewRotate) COMMAND_ID_HANDLER_EX(ID_VIEW_PROPERTIES, OnViewProperties) COMMAND_ID_HANDLER_EX(ID_PLAY_PLAY_PAUSE, OnPlayPlayPause) COMMAND_RANGE_HANDLER_EX(ID_PLAY_HALFSPEED, ID_PLAY_DOUBLESPEED, @@ -243,12 +236,6 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, UPDATE_ELEMENT(ID_VIEW_FULLSCREEN, UPDUI_MENUPOPUP) UPDATE_ELEMENT(ID_VIEW_TOOLBAR, UPDUI_MENUPOPUP) UPDATE_ELEMENT(ID_VIEW_STATUS_BAR, UPDUI_MENUPOPUP) - UPDATE_ELEMENT(ID_VIEW_ROTATE0, UPDUI_MENUPOPUP) - UPDATE_ELEMENT(ID_VIEW_ROTATE90, UPDUI_MENUPOPUP) - UPDATE_ELEMENT(ID_VIEW_ROTATE180, UPDUI_MENUPOPUP) - UPDATE_ELEMENT(ID_VIEW_ROTATE270, UPDUI_MENUPOPUP) - UPDATE_ELEMENT(ID_VIEW_MIRROR_HORIZONTAL, UPDUI_MENUPOPUP) - UPDATE_ELEMENT(ID_VIEW_MIRROR_VERTICAL, UPDUI_MENUPOPUP) UPDATE_ELEMENT(ID_VIEW_PROPERTIES, UPDUI_MENUPOPUP | UPDUI_TOOLBAR) UPDATE_ELEMENT(ID_PLAY_PLAY_PAUSE, UPDUI_MENUPOPUP | UPDUI_TOOLBAR) UPDATE_ELEMENT(ID_PLAY_HALFSPEED, UPDUI_MENUPOPUP) @@ -273,22 +260,10 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, } void UpdateSpeedUICheck() { - if (media::Movie::get()) { - float play_rate = media::Movie::get()->GetPlayRate(); - UISetCheck(ID_PLAY_HALFSPEED, (play_rate == 0.5f)); - UISetCheck(ID_PLAY_NORMALSPEED, (play_rate == 1.0f)); - UISetCheck(ID_PLAY_DOUBLESPEED, (play_rate == 2.0f)); - } - } - - void UpdateRotateUICheck() { - int view_rotate = m_view.GetViewRotate(); - UISetCheck(ID_VIEW_ROTATE0, (view_rotate == 0)); - UISetCheck(ID_VIEW_ROTATE90, (view_rotate == 1)); - UISetCheck(ID_VIEW_ROTATE180, (view_rotate == 2)); - UISetCheck(ID_VIEW_ROTATE270, (view_rotate == 3)); - UISetCheck(ID_VIEW_MIRROR_HORIZONTAL, (view_rotate == 4)); - UISetCheck(ID_VIEW_MIRROR_VERTICAL, (view_rotate == 5)); + float play_rate = media::Movie::get()->GetPlayRate(); + UISetCheck(ID_PLAY_HALFSPEED, (play_rate == 0.5f)); + UISetCheck(ID_PLAY_NORMALSPEED, (play_rate == 1.0f)); + UISetCheck(ID_PLAY_DOUBLESPEED, (play_rate == 2.0f)); } int OnCreate(LPCREATESTRUCT /*lpCreateStruct*/) { @@ -337,7 +312,6 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, UISetCheck(ID_PLAY_NORMALSPEED, 1); UISetCheck(ID_VIEW_TOOLBAR, 1); UISetCheck(ID_VIEW_STATUS_BAR, 1); - UISetCheck(ID_VIEW_ROTATE0, 1); UISetCheck(ID_OPTIONS_OPENMP, 0); UISetCheck(ID_OPTIONS_DRAW, 1); UISetCheck(ID_OPTIONS_AUDIO, 1); @@ -416,9 +390,9 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, void OnFileOpen(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wnd*/) { CFileDialog dlg(TRUE, L"bmp", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - L"Movie Files (*.mp4;*.ogg;*.ogv)\0" - L"*.mp4;*.ogg;*.ogv\0" - L"Audio Files (*.mp3;*.m4a)\0*.mp3;*.m4a\0All Files (*.*)\0*.*\0", + L"Movie Files (*.mp4;*.mov;*.mkv;*.flv;*.avi;*.264)\0" + L"*.mp4;*.mov;*.mkv;*.flv;*.avi;*.264\0" + L"Bitmap Files (*.bmp)\0*.bmp\0All Files (*.*)\0*.*\0", m_hWnd); if (dlg.DoModal() == IDOK) { MovieOpenFile(dlg.m_szFileName); @@ -563,12 +537,6 @@ class CMainFrame : public CFrameWindowImpl<CMainFrame>, UpdateLayout(); } - void OnViewRotate(UINT /*uNotifyCode*/, int nID, CWindow /*wnd*/) { - m_view.SetViewRotate(nID - ID_VIEW_ROTATE0); - UpdateRotateUICheck(); - UpdateLayout(); - } - void OnViewToolBar(UINT /*uNotifyCode*/, int /*nID*/, CWindow /*wnd*/) { static BOOL bNew = TRUE; // initially visible bNew = !bNew; |