Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Steve Lhomme
VLC
Commits
7b2a882b
Commit
7b2a882b
authored
Jun 16, 2016
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: minor cleanup
parent
c98243a2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
8 deletions
+4
-8
modules/gui/macosx/InputManager.m
modules/gui/macosx/InputManager.m
+0
-3
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+1
-2
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+3
-0
modules/gui/macosx/MainWindowTitle.m
modules/gui/macosx/MainWindowTitle.m
+0
-3
No files found.
modules/gui/macosx/InputManager.m
View file @
7b2a882b
...
...
@@ -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
)
{
...
...
modules/gui/macosx/MainWindow.h
View file @
7b2a882b
...
...
@@ -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
,
...
...
modules/gui/macosx/MainWindow.m
View file @
7b2a882b
...
...
@@ -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"
...
...
modules/gui/macosx/MainWindowTitle.m
View file @
7b2a882b
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment