[vlc-devel] commit: macosx: remove the show window hack. (Pierre d'Herbemont )

git version control git at videolan.org
Sat Jul 12 17:34:12 CEST 2008


vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat Jul 12 15:02:15 2008 +0200| [95779dd92c4f142b59944db7966ff7c7fa873db5]

macosx: remove the show window hack.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=95779dd92c4f142b59944db7966ff7c7fa873db5
---

 modules/gui/macosx/vout.h |    3 ---
 modules/gui/macosx/vout.m |   12 ++----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 66f0a72..1c6a4aa 100644
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -102,9 +102,6 @@
     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;
 - (BOOL)isUsed;
 
diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 1c3f3a3..3961e0b 100644
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -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
-                 frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window
+                 frame: (NSRect *)s_arg_frame
 {
     BOOL b_return;
 
@@ -906,8 +906,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     if( b_return )
     {
         o_window = [self window];
-        if (b_show_window)
-            [o_window makeKeyAndOrderFront: self];
+
         [o_window setAcceptsMouseMovedEvents: TRUE];
 
         if( var_GetBool( p_real_vout, "video-on-top" ) )
@@ -950,13 +949,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     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
 {
     b_used = b_new_used;




More information about the vlc-devel mailing list