vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Mar 2 13:05:11 2019 +0100| [4fac10ca089591125f1e036ab8db0136a5e87bd6] | committer: Felix Paul Kühne
macosx: minor cleanup > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4fac10ca089591125f1e036ab8db0136a5e87bd6 --- extras/package/macosx/VLC.xcodeproj/project.pbxproj | 2 -- modules/gui/macosx/coreinteraction/VLCInputManager.h | 1 - modules/gui/macosx/menus/VLCMainMenu.m | 6 +----- modules/gui/macosx/menus/VLCStatusBarIcon.h | 5 +---- modules/gui/macosx/menus/VLCStatusBarIcon.m | 3 +-- modules/gui/macosx/preferences/VLCSimplePrefsController.m | 1 - modules/gui/macosx/preferences/prefs.m | 1 - 7 files changed, 3 insertions(+), 16 deletions(-) diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj index b14551d29c..ef9ee2d129 100644 --- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj +++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj @@ -149,7 +149,6 @@ 7DB7F20B20CC082800C2CAED /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DB7F20A20CC082800C2CAED /* QuartzCore.framework */; }; 7DC21A7422049A6600F98A02 /* VLCOpenInputMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DC21A7322049A6600F98A02 /* VLCOpenInputMetadata.m */; }; 7DD2F5C52081B73B007EE187 /* VLCRemoteControlService.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DD2F5C42081B73B007EE187 /* VLCRemoteControlService.m */; }; - 7DE9C7D82205EF030089108F /* VLCPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE9C7D72205EF030089108F /* VLCPlayerController.m */; }; 7DE9C7DD220728420089108F /* VLCPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DE9C7DC220728420089108F /* VLCPlayerController.m */; }; /* End PBXBuildFile section */ @@ -1535,7 +1534,6 @@ 1CCC88F82078A3D500E5626F /* CoreDialogs.xib in Sources */, 1CCC88F92078A3D500E5626F /* DetachedVideoWindow.xib in Sources */, 1CCC88FA2078A3D500E5626F /* ErrorPanel.xib in Sources */, - 7DE9C7D82205EF030089108F /* VLCPlayerController.m in Sources */, 1CCC88FB2078A3D500E5626F /* Help.xib in Sources */, 1CCC88FC2078A3D500E5626F /* LogMessageWindow.xib in Sources */, 1CCC88FD2078A3D500E5626F /* Open.xib in Sources */, diff --git a/modules/gui/macosx/coreinteraction/VLCInputManager.h b/modules/gui/macosx/coreinteraction/VLCInputManager.h index 68a701c3db..7187d83b0f 100644 --- a/modules/gui/macosx/coreinteraction/VLCInputManager.h +++ b/modules/gui/macosx/coreinteraction/VLCInputManager.h @@ -35,7 +35,6 @@ - (void)inputThreadChanged; - (void)playbackStatusUpdated; -- (void)playbackPositionUpdated; - (void)onPlaybackHasEnded:(id)sender; diff --git a/modules/gui/macosx/menus/VLCMainMenu.m b/modules/gui/macosx/menus/VLCMainMenu.m index 6d1a92c363..c100b44f4c 100644 --- a/modules/gui/macosx/menus/VLCMainMenu.m +++ b/modules/gui/macosx/menus/VLCMainMenu.m @@ -24,7 +24,6 @@ #import "main/VLCMain.h" #import <vlc_common.h> -#import <vlc_playlist_legacy.h> #import <vlc_input.h> #import "coreinteraction/VLCCoreInteraction.h" @@ -672,10 +671,7 @@ - (void)setRateControlsEnabled:(BOOL)b_enabled { [_rate_sld setEnabled: b_enabled]; - [_rate_sld setIntValue: [[VLCCoreInteraction sharedInstance] playbackRate]]; - int i = [[VLCCoreInteraction sharedInstance] playbackRate]; - double speed = pow(2, (double)i / 17); - [_rateTextField setStringValue: [NSString stringWithFormat:@"%.2fx", speed]]; + [self updatePlaybackRate]; NSColor *color = b_enabled ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]; diff --git a/modules/gui/macosx/menus/VLCStatusBarIcon.h b/modules/gui/macosx/menus/VLCStatusBarIcon.h index f189698949..494e1a21f6 100644 --- a/modules/gui/macosx/menus/VLCStatusBarIcon.h +++ b/modules/gui/macosx/menus/VLCStatusBarIcon.h @@ -1,7 +1,7 @@ /***************************************************************************** * VLCStatusBarIcon.h: Status bar icon controller/delegate ***************************************************************************** - * Copyright (C) 2016 VLC authors and VideoLAN + * Copyright (C) 2016-2019 VLC authors and VideoLAN * * Authors: Goran Dokic <vlc at 8hz dot com> * @@ -30,9 +30,6 @@ @property (strong) IBOutlet NSView *playbackInfoView; @property (strong) IBOutlet NSView *controlsView; -// Get data from VLC and update the little status menu -- (void)updateMenuItemRandom; - - (IBAction)restoreMainWindow:(id)sender; - (IBAction)statusBarIconTogglePlayPause:(id)sender; - (IBAction)statusBarIconStop:(id)sender; diff --git a/modules/gui/macosx/menus/VLCStatusBarIcon.m b/modules/gui/macosx/menus/VLCStatusBarIcon.m index 8dc5e7deb1..17eac4c612 100644 --- a/modules/gui/macosx/menus/VLCStatusBarIcon.m +++ b/modules/gui/macosx/menus/VLCStatusBarIcon.m @@ -28,7 +28,6 @@ #import <vlc_input.h> #import <vlc_url.h> -#import "coreinteraction/VLCCoreInteraction.h" #import "extensions/NSString+Helpers.h" #import "main/VLCMain.h" #import "playlist/VLCPlaylistController.h" @@ -148,7 +147,7 @@ } } -- (void)configurationChanged:(id)obj +- (void)configurationChanged:(NSNotification *)aNotification { if (var_InheritBool(getIntf(), "macosx-statusicon")) [self enableMenuIcon]; diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.m b/modules/gui/macosx/preferences/VLCSimplePrefsController.m index 99df174ba9..26d9589022 100644 --- a/modules/gui/macosx/preferences/VLCSimplePrefsController.m +++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.m @@ -36,7 +36,6 @@ #import <vlc_plugin.h> #import <vlc_config_cat.h> -#import "coreinteraction/VLCCoreInteraction.h" #import "extensions/misc.h" #import "extensions/NSScreen+VLCAdditions.h" #import "main/CompatibilityFixes.h" diff --git a/modules/gui/macosx/preferences/prefs.m b/modules/gui/macosx/preferences/prefs.m index 5917747250..05ff44056b 100644 --- a/modules/gui/macosx/preferences/prefs.m +++ b/modules/gui/macosx/preferences/prefs.m @@ -56,7 +56,6 @@ #import <vlc_modules.h> #import <vlc_plugin.h> -#import "coreinteraction/VLCCoreInteraction.h" #import "main/CompatibilityFixes.h" #import "main/VLCMain.h" #import "preferences/prefs.h" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
