Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
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
videolan
vlc
Commits
ba62dea9
Commit
ba62dea9
authored
Oct 26, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: rename macro for mavericks detection since its out now
parent
ec415df3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
modules/gui/macosx/CompatibilityFixes.h
modules/gui/macosx/CompatibilityFixes.h
+1
-1
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+2
-2
modules/gui/macosx/macosx.m
modules/gui/macosx/macosx.m
+1
-1
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+1
-1
No files found.
modules/gui/macosx/CompatibilityFixes.h
View file @
ba62dea9
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
#define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2)
#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2)
#define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 && NSAppKitVersionNumber >= 1162)
#define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 && NSAppKitVersionNumber >= 1162)
#define OSX_
REDACTED
NSAppKitVersionNumber >= 1244
#define OSX_
MAVERICKS
NSAppKitVersionNumber >= 1244
#pragma mark -
#pragma mark -
#pragma Fixes for OS X Snow Leopard (10.6)
#pragma Fixes for OS X Snow Leopard (10.6)
...
...
modules/gui/macosx/intf.m
View file @
ba62dea9
...
@@ -1511,7 +1511,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1511,7 +1511,7 @@ static VLCMain *_o_sharedMainInstance = nil;
IOReturn
success
;
IOReturn
success
;
/* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x < 10.7.4, 10.8 and 10.6 */
/* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x < 10.7.4, 10.8 and 10.6 */
if
((
NSAppKitVersionNumber
>=
1115
.
2
&&
NSAppKitVersionNumber
<
1138
.
45
)
||
OSX_MOUNTAIN_LION
||
OSX_
REDACTED
||
OSX_SNOW_LEOPARD
)
{
if
((
NSAppKitVersionNumber
>=
1115
.
2
&&
NSAppKitVersionNumber
<
1138
.
45
)
||
OSX_MOUNTAIN_LION
||
OSX_
MAVERICKS
||
OSX_SNOW_LEOPARD
)
{
CFStringRef
reasonForActivity
=
CFStringCreateWithCString
(
kCFAllocatorDefault
,
_
(
"VLC media playback"
),
kCFStringEncodingUTF8
);
CFStringRef
reasonForActivity
=
CFStringCreateWithCString
(
kCFAllocatorDefault
,
_
(
"VLC media playback"
),
kCFStringEncodingUTF8
);
if
([
self
activeVideoPlayback
])
if
([
self
activeVideoPlayback
])
success
=
IOPMAssertionCreateWithName
(
kIOPMAssertionTypeNoDisplaySleep
,
kIOPMAssertionLevelOn
,
reasonForActivity
,
&
systemSleepAssertionID
);
success
=
IOPMAssertionCreateWithName
(
kIOPMAssertionTypeNoDisplaySleep
,
kIOPMAssertionLevelOn
,
reasonForActivity
,
&
systemSleepAssertionID
);
...
@@ -1778,7 +1778,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1778,7 +1778,7 @@ static VLCMain *_o_sharedMainInstance = nil;
-
(
NSString
*
)
latestCrashLogPathPreviouslySeen
:(
BOOL
)
previouslySeen
-
(
NSString
*
)
latestCrashLogPathPreviouslySeen
:(
BOOL
)
previouslySeen
{
{
NSString
*
crashReporter
;
NSString
*
crashReporter
;
if
(
OSX_MOUNTAIN_LION
||
OSX_
REDACTED
)
if
(
OSX_MOUNTAIN_LION
||
OSX_
MAVERICKS
)
crashReporter
=
[
@"~/Library/Logs/DiagnosticReports"
stringByExpandingTildeInPath
];
crashReporter
=
[
@"~/Library/Logs/DiagnosticReports"
stringByExpandingTildeInPath
];
else
else
crashReporter
=
[
@"~/Library/Logs/CrashReporter"
stringByExpandingTildeInPath
];
crashReporter
=
[
@"~/Library/Logs/CrashReporter"
stringByExpandingTildeInPath
];
...
...
modules/gui/macosx/macosx.m
View file @
ba62dea9
...
@@ -141,7 +141,7 @@ vlc_module_begin()
...
@@ -141,7 +141,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_INTERFACE_MAIN)
set_subcategory(SUBCAT_INTERFACE_MAIN)
cannot_unload_broken_library()
cannot_unload_broken_library()
BOOL b_have_mavericks = OSX_
REDACTED
;
BOOL b_have_mavericks = OSX_
MAVERICKS
;
set_section(N_("Appearance"), 0)
set_section(N_("Appearance"), 0)
add_bool("macosx-interfacestyle", false, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false)
add_bool("macosx-interfacestyle", false, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false)
...
...
modules/gui/macosx/misc.m
View file @
ba62dea9
...
@@ -172,7 +172,7 @@ static bool b_old_spaces_style = YES;
...
@@ -172,7 +172,7 @@ static bool b_old_spaces_style = YES;
/* init our fake object attribute */
/* init our fake object attribute */
blackoutWindows
=
[[
NSMutableArray
alloc
]
initWithCapacity
:
1
];
blackoutWindows
=
[[
NSMutableArray
alloc
]
initWithCapacity
:
1
];
if
(
OSX_
REDACTED
)
{
if
(
OSX_
MAVERICKS
)
{
NSUserDefaults
*
userDefaults
=
[[
NSUserDefaults
alloc
]
init
];
NSUserDefaults
*
userDefaults
=
[[
NSUserDefaults
alloc
]
init
];
[
userDefaults
addSuiteNamed
:
@"com.apple.spaces"
];
[
userDefaults
addSuiteNamed
:
@"com.apple.spaces"
];
/* this is system settings -> mission control -> monitors using different spaces */
/* this is system settings -> mission control -> monitors using different spaces */
...
...
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