i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaPlayer: revert hrev38440

Browse Source 
With #6610 fixed, it is now possible to open disabled menus in a
menubar, so the workaround introduced in hrev33840 is no longer
needed.

Signed-off-by: John Scipione <[email protected]>
This commit is contained in:
Jessica Hamilton
2013-08-20 13:47:56 -04:00
committed by John Scipione
parent a17e9da139
commit ffd71d3d19
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/MainWin.cpp
+3 -1
View File
@@ -1626,7 +1626,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
"Audio track menu"), new BMessage(M_DUMMY))); "Audio track menu"), new BMessage(M_DUMMY)));
audioTrackMenu->ItemAt(0)->SetMarked(true); audioTrackMenu->ItemAt(0)->SetMarked(true);
} }
audioTrackMenu->SetEnabled(count > 1);
count = fController->VideoTrackCount(); count = fController->VideoTrackCount();
current = fController->CurrentVideoTrack(); current = fController->CurrentVideoTrack();
@@ -1641,6 +1641,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
videoTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY))); videoTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY)));
videoTrackMenu->ItemAt(0)->SetMarked(true); videoTrackMenu->ItemAt(0)->SetMarked(true);
} }
videoTrackMenu->SetEnabled(count > 1);
count = fController->SubTitleTrackCount(); count = fController->SubTitleTrackCount();
if (count > 0) { if (count > 0) {
@@ -1670,6 +1671,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
new BMessage(M_DUMMY))); new BMessage(M_DUMMY)));
subTitleTrackMenu->ItemAt(0)->SetMarked(true); subTitleTrackMenu->ItemAt(0)->SetMarked(true);
} }
subTitleTrackMenu->SetEnabled(count > 1);
} }