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: minor cleanup

Browse Source
This commit is contained in:
Felix Paul Kühne 2019-03-02 13:05:11 +01:00
parent 5fd031e33e
commit 4fac10ca08
7 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/package/macosx/VLC.xcodeproj/project.pbxproj
View File

@ -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 */,

1
modules/gui/macosx/coreinteraction/VLCInputManager.h
View File

@ -35,7 +35,6 @@
- (void)inputThreadChanged;
- (void)playbackStatusUpdated;
- (void)playbackPositionUpdated;
- (void)onPlaybackHasEnded:(id)sender;

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

@ -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];

5
modules/gui/macosx/menus/VLCStatusBarIcon.h
View File

@ -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;

3
modules/gui/macosx/menus/VLCStatusBarIcon.m
View File

@ -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];

1
modules/gui/macosx/preferences/VLCSimplePrefsController.m
View File

@ -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"

1
modules/gui/macosx/preferences/prefs.m
View File

@ -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"