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

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug 16 13:44:56 2012 +0200| [408240ed21b1ea0249b9552ba516cdbe835478ca] | committer: Felix Paul Kühne

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

Manually back-ported from e5d1d74558f5b116e10792e44e8aa85df0017fd2

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=408240ed21b1ea0249b9552ba516cdbe835478ca
---

 modules/gui/macosx/MainWindow.m |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 59da5fd..ae1e897 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -159,7 +159,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     BOOL b_splitviewShouldBeHidden = NO;
 
     /* setup the styled interface */
-    b_video_deco = config_GetInt( VLCIntf, "video-deco" );
+    b_video_deco = var_InheritBool( VLCIntf, "video-deco" );
     b_nativeFullscreenMode = NO;
 #ifdef MAC_OS_X_VERSION_10_7
     if( OSX_LION && b_video_deco )
@@ -1571,7 +1571,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (id)setupVideoView
 {
     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)
         {
@@ -2647,7 +2647,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
                   backing:(NSBackingStoreType)backingType defer:(BOOL)flag
 {
     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)
     {