Commit 95779dd9 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx: remove the show window hack.

parent 1af1638e
...@@ -102,9 +102,6 @@ ...@@ -102,9 +102,6 @@
id o_embeddedwindow; id o_embeddedwindow;
} }
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window;
- (void)setUsed: (BOOL)b_new_used; - (void)setUsed: (BOOL)b_new_used;
- (BOOL)isUsed; - (BOOL)isUsed;
......
...@@ -896,7 +896,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -896,7 +896,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
} }
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window frame: (NSRect *)s_arg_frame
{ {
BOOL b_return; BOOL b_return;
...@@ -906,8 +906,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -906,8 +906,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( b_return ) if( b_return )
{ {
o_window = [self window]; o_window = [self window];
if (b_show_window)
[o_window makeKeyAndOrderFront: self];
[o_window setAcceptsMouseMovedEvents: TRUE]; [o_window setAcceptsMouseMovedEvents: TRUE];
if( var_GetBool( p_real_vout, "video-on-top" ) ) if( var_GetBool( p_real_vout, "video-on-top" ) )
...@@ -950,13 +949,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -950,13 +949,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return b_return; return b_return;
} }
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
}
- (void)setUsed: (BOOL)b_new_used - (void)setUsed: (BOOL)b_new_used
{ {
b_used = b_new_used; b_used = b_new_used;
......
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