Commit 0e4d920e authored by Felix Paul Kühne's avatar Felix Paul Kühne

* back-port [17498]

parent a92e6ad7
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
vout_thread_t * p_real_vout; vout_thread_t * p_real_vout;
vlc_bool_t b_init_ok; vlc_bool_t b_init_ok;
vlc_bool_t b_black; vlc_bool_t b_black;
vlc_bool_t b_embedded;
} }
- (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view - (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view
......
...@@ -919,6 +919,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -919,6 +919,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_vlc, "video-device" ); i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
b_black = var_GetBool( p_vout, "macosx-black" ); b_black = var_GetBool( p_vout, "macosx-black" );
b_embedded = var_GetBool( p_vout, "macosx-embedded" );
/* Find out on which screen to open the window */ /* Find out on which screen to open the window */
if( i_device <= 0 || i_device > (int)[o_screens count] ) if( i_device <= 0 || i_device > (int)[o_screens count] )
...@@ -1081,7 +1082,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1081,7 +1082,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
} }
SetSystemUIMode( kUIModeNormal, 0); SetSystemUIMode( kUIModeNormal, 0);
[super close]; [super close];
[[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self];
/* this does only work in embedded mode */
if( b_embedded == VLC_TRUE )
[[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self];
return NULL; return NULL;
} }
......
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