Commit 7b2a882b authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: minor cleanup

parent c98243a2
......@@ -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) {
......
......@@ -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,
......
......@@ -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"
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment