Commit 408240ed authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed 'video-deco' and 'embedded-video' recognition when set on the command-line

Manually back-ported from e5d1d74558f5b116e10792e44e8aa85df0017fd2
parent 39a69156
...@@ -159,7 +159,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -159,7 +159,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
BOOL b_splitviewShouldBeHidden = NO; BOOL b_splitviewShouldBeHidden = NO;
/* setup the styled interface */ /* setup the styled interface */
b_video_deco = config_GetInt( VLCIntf, "video-deco" ); b_video_deco = var_InheritBool( VLCIntf, "video-deco" );
b_nativeFullscreenMode = NO; b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7 #ifdef MAC_OS_X_VERSION_10_7
if( OSX_LION && b_video_deco ) if( OSX_LION && b_video_deco )
...@@ -1571,7 +1571,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1571,7 +1571,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (id)setupVideoView - (id)setupVideoView
{ {
vout_thread_t *p_vout = getVout(); vout_thread_t *p_vout = getVout();
if ((config_GetInt( VLCIntf, "embedded-video" ) || b_nativeFullscreenMode) && b_video_deco) if ((var_InheritBool( VLCIntf, "embedded-video" ) || b_nativeFullscreenMode) && b_video_deco)
{ {
if ([o_video_view window] != self) if ([o_video_view window] != self)
{ {
...@@ -2647,7 +2647,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2647,7 +2647,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
backing:(NSBackingStoreType)backingType defer:(BOOL)flag backing:(NSBackingStoreType)backingType defer:(BOOL)flag
{ {
b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" ); b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
b_video_deco = config_GetInt( VLCIntf, "video-deco" ); b_video_deco = var_InheritBool( VLCIntf, "video-deco" );
if (b_dark_interface || !b_video_deco) if (b_dark_interface || !b_video_deco)
{ {
......
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