Commit 6368b52d authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

qt4/macosx: fixed the embedded vout setting

parent 343baae5
...@@ -180,7 +180,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -180,7 +180,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_intf_meta_ckb setState: config_GetInt( p_intf, "fetch-meta" )]; [o_intf_meta_ckb setState: config_GetInt( p_intf, "fetch-meta" )];
[o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )]; [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )];
[o_intf_embedded_ckb setState: config_GetInt( p_intf, "embeded-video" )]; [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )];
/****************** /******************
...@@ -305,6 +305,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -305,6 +305,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i_return == NSAlertAlternateReturn ) if( i_return == NSAlertAlternateReturn )
{ {
config_ResetAll( p_intf ); config_ResetAll( p_intf );
b_intfSettingChanged, b_videoSettingChanged, b_audioSettingChanged = YES;
[self resetControls]; [self resetControls];
} }
} }
......
...@@ -749,7 +749,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -749,7 +749,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{ {
if ( VLCIntf && !(p_vout->b_fullscreen) && if ( VLCIntf && !(p_vout->b_fullscreen) &&
!(var_GetBool( p_vout, "macosx-background" )) && !(var_GetBool( p_vout, "macosx-background" )) &&
var_GetBool( p_vout, "video-embeded") ) var_GetBool( p_vout, "embedded-video") )
{ {
o_return = [[[VLCMain sharedInstance] getEmbeddedList] o_return = [[[VLCMain sharedInstance] getEmbeddedList]
getEmbeddedVout]; getEmbeddedVout];
...@@ -1030,7 +1030,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1030,7 +1030,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
p_real_vout = [VLCVoutView getRealVout: p_vout]; p_real_vout = [VLCVoutView getRealVout: p_vout];
i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" ); i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
b_black = NO; b_black = NO;
b_embedded = var_GetBool( p_vout, "video-embeded" ); b_embedded = var_GetBool( p_vout, "embedded-video" );
/* Find out on which screen to open the window */ /* Find out on which screen to open the window */
o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device]; o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];
......
...@@ -451,7 +451,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -451,7 +451,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.updatesDays->hide(); ui.updatesDays->hide();
#endif #endif
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo ); CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
skinBrowse ); skinBrowse );
#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__) #if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__)
......
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