videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-08-18 23:45:06 +02:00
Code Releases Activity

macosx/main menu: iterate on dynamic menu activation and creation

Browse Source
This commit is contained in:
Felix Paul Kühne 2019-04-10 18:53:06 +02:00
parent 92ba6d9fab
commit 4569ba9ee8
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gui/macosx/coreinteraction/VLCInputManager.m
View File

@ -242,8 +242,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
}
if (state != PLAYING_S) {
[[o_main mainMenu] setSubmenusEnabled: FALSE];
if (state == END_S || state == -1) {
/* continue playback where you left off */
if (p_current_input)
@ -266,7 +264,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
- (void)updateMainMenu
{
[[o_main mainMenu] setupMenus];
}
- (BOOL)hasInput

2
modules/gui/macosx/menus/VLCMainMenu.h
View File

@ -211,8 +211,6 @@
- (void)releaseRepresentedObjects:(NSMenu *)the_menu;
- (void)setupMenus;
- (void)setSubmenusEnabled:(BOOL)b_enabled;
- (void)setRateControlsEnabled:(BOOL)b_enabled;
- (void)updateSidebarMenuItem:(BOOL)show;

25
modules/gui/macosx/menus/VLCMainMenu.m
View File

@ -118,16 +118,16 @@
[self initStrings];
[self setupKeyboardShortcuts];
[self setSubmenusEnabled: YES];
/* configure playback / controls menu */
self.controlsMenu.delegate = self;
[_rendererNoneItem setState:NSOnState];
_rendererMenuController = [[VLCRendererMenuController alloc] init];
_rendererMenuController.rendererNoneItem = _rendererNoneItem;
_rendererMenuController.rendererMenu = _rendererMenu;
[self updateTrackHandlingMenus:nil];
[self mediaItemChanged:nil];
[self updateTitleAndChapterMenus:nil];
[self updateProgramMenu:nil];
NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
[notificationCenter addObserver:self
@ -158,10 +158,6 @@
selector:@selector(updateTrackHandlingMenus:)
name:VLCPlayerTrackListChanged
object:nil];
[notificationCenter addObserver:self
selector:@selector(updateTrackHandlingMenus:)
name:VLCPlayerCurrentMediaItemChanged
object:nil];
[notificationCenter addObserver:self
selector:@selector(updateTitleAndChapterMenus:)
name:VLCPlayerTitleListChanged
@ -182,6 +178,10 @@
selector:@selector(updateProgramMenu:)
name:VLCPlayerProgramSelectionChanged
object:nil];
[notificationCenter addObserver:self
selector:@selector(mediaItemChanged:)
name:VLCPlaylistCurrentItemChanged
object:nil];
[self setupVarMenuItem:_add_intf
target:VLC_OBJECT(getIntf())
@ -578,8 +578,10 @@
#pragma mark - Interface update
- (void)setupMenus
- (void)mediaItemChanged:(NSNotification *)aNotification
{
[self updateTrackHandlingMenus:aNotification];
input_item_t *p_mediaItem = _playerController.currentMedia;
if (p_mediaItem != NULL) {
@ -612,9 +614,11 @@
[self refreshVoutDeviceMenu:nil];
}
[_postprocessing setEnabled:YES];
[self setSubmenusEnabled:YES];
input_item_Release(p_mediaItem);
} else {
[_postprocessing setEnabled:NO];
[self setSubmenusEnabled:NO];
}
}
@ -1725,7 +1729,6 @@
if (mi == _stop || mi == _voutMenustop || mi == _dockMenustop) {
if (!inputItem)
enabled = NO;
[self setupMenus]; /* Make sure input menu is up to date */
} else if (mi == _previous ||
mi == _voutMenuprev ||
mi == _dockMenuprevious) {
@ -1753,7 +1756,6 @@
enabled = _playerController.seekable;
} else if (mi == _mute || mi == _dockMenumute || mi == _voutMenumute) {
[mi setState: _playerController.mute ? NSOnState : NSOffState];
[self setupMenus]; /* Make sure audio menu is up to date */
[self refreshAudioDeviceList];
} else if (mi == _half_window ||
mi == _normal_window ||
@ -1779,11 +1781,8 @@
vout_Release(p_vout);
}
[self setupMenus]; /* Make sure video menu is up to date */
} else if (mi == _openSubtitleFile) {
enabled = YES;
[self setupMenus]; /* Make sure subtitles menu is up to date */
} else {
NSMenuItem *_parent = [mi parentItem];
if (_parent == _subtitle_size || mi == _subtitle_size ||