From 470edcc1847258bbeb911a5857e3397008393d7b Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Tue, 20 Aug 2013 13:04:55 +1200
Subject: [PATCH] MediaPlayer: revert hrev38440
With #6610 fixed, it is now possible to open disabled menus in a
menubar, so the workaround introduced in hrev33840 is no longer
needed.
---
src/apps/mediaplayer/MainWin.cpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index d2754a8..f105240
|
a
|
b
|
MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
|
| 1626 | 1626 | "Audio track menu"), new BMessage(M_DUMMY))); |
| 1627 | 1627 | audioTrackMenu->ItemAt(0)->SetMarked(true); |
| 1628 | 1628 | } |
| 1629 | | |
| | 1629 | audioTrackMenu->SetEnabled(count > 1); |
| 1630 | 1630 | |
| 1631 | 1631 | count = fController->VideoTrackCount(); |
| 1632 | 1632 | current = fController->CurrentVideoTrack(); |
| … |
… |
MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
|
| 1641 | 1641 | videoTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY))); |
| 1642 | 1642 | videoTrackMenu->ItemAt(0)->SetMarked(true); |
| 1643 | 1643 | } |
| | 1644 | videoTrackMenu->SetEnabled(count > 1); |
| 1644 | 1645 | |
| 1645 | 1646 | count = fController->SubTitleTrackCount(); |
| 1646 | 1647 | if (count > 0) { |
| … |
… |
MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
|
| 1670 | 1671 | new BMessage(M_DUMMY))); |
| 1671 | 1672 | subTitleTrackMenu->ItemAt(0)->SetMarked(true); |
| 1672 | 1673 | } |
| | 1674 | subTitleTrackMenu->SetEnabled(count > 1); |
| 1673 | 1675 | } |
| 1674 | 1676 | |
| 1675 | 1677 | |
