vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu Jun 16 20:20:58 2016 +0200| [7b2a882b6e1e8c5a28462cf90355e85537bb48d9] | committer: Felix Paul Kühne
macosx: minor cleanup > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b2a882b6e1e8c5a28462cf90355e85537bb48d9 --- modules/gui/macosx/InputManager.m | 3 --- modules/gui/macosx/MainWindow.h | 3 +-- modules/gui/macosx/MainWindow.m | 3 +++ modules/gui/macosx/MainWindowTitle.m | 3 --- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/gui/macosx/InputManager.m b/modules/gui/macosx/InputManager.m index e019fec..9cff0e4 100644 --- a/modules/gui/macosx/InputManager.m +++ b/modules/gui/macosx/InputManager.m @@ -292,8 +292,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var, /* Declare user activity. This wakes the display if it is off, and postpones display sleep according to the users system preferences Available from 10.7.3 */ - -#ifdef MAC_OS_X_VERSION_10_7 if ([o_main activeVideoPlayback] && &IOPMAssertionDeclareUserActivity && shouldDisableScreensaver) { CFStringRef reasonForActivity = CFStringCreateWithCString(kCFAllocatorDefault, _("VLC media playback"), kCFStringEncodingUTF8); @@ -306,7 +304,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var, msg_Warn(getIntf(), "failed to declare user activity"); } -#endif /* prevent the system from sleeping */ if (systemSleepAssertionID > 0) { diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h index 28c0e2a..404b21a 100644 --- a/modules/gui/macosx/MainWindow.h +++ b/modules/gui/macosx/MainWindow.h @@ -26,8 +26,6 @@ *****************************************************************************/ #import <Cocoa/Cocoa.h> -#import "PXSourceList.h" -#import "PXSourceListDataSource.h" #import <vlc_input.h> #import <vlc_vout_window.h> @@ -40,6 +38,7 @@ @class VLCDetachedVideoWindow; @class VLCMainWindowControlsBar; @class VLCVoutView; +@class PXSourceList; typedef enum { psUserEvent, diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index f6bfe54..4043b39 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -41,6 +41,9 @@ #import <vlc_services_discovery.h> #import "PLModel.h" +#import "PXSourceList.h" +#import "PXSourceListDataSource.h" + #import "ControlsBar.h" #import "VideoView.h" #import "VLCVoutWindowController.h" diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/MainWindowTitle.m index 1e45be5..7c7997a 100644 --- a/modules/gui/macosx/MainWindowTitle.m +++ b/modules/gui/macosx/MainWindowTitle.m @@ -494,12 +494,9 @@ @implementation VLCCustomWindowFullscreenButton -#ifdef MAC_OS_X_VERSION_10_7 - (id)extendedAccessibilityAttributeValue: (NSString*)theAttributeName { return ([theAttributeName isEqualToString: NSAccessibilitySubroleAttribute] ? NSAccessibilityFullScreenButtonAttribute : nil); } -#endif - @end _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
