Fixed Mac OS X VOUT_SIZE_CHANGE signal.

diff --git a/plugins/macosx/intf_vlc_wrapper.c b/plugins/macosx/intf_vlc_wrapper.c
index 000c56eb92ae09033056b341b9ae8972a343aa8d..45a6afa209cf6254a095d2fc55c0233ad00333bc 100644 (file)
--- a/plugins/macosx/intf_vlc_wrapper.c
+++ b/plugins/macosx/intf_vlc_wrapper.c
@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.c,v 1.11 2002/05/06 22:59:46 massiot Exp $
+ * $Id: intf_vlc_wrapper.c,v 1.12 2002/05/07 20:17:07 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -86,6 +86,7 @@ static Intf_VLCWrapper *o_intf = nil;
         return( 1 );
     }
 
+#if 0
     if( p_input_bank->pp_input[0] != NULL )
     {
         vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock );
@@ -107,6 +108,7 @@ static Intf_VLCWrapper *o_intf = nil;
     {
         [self setupMenus];
     }
+#endif
 
     return( 0 );
 }
@@ -497,14 +499,16 @@ static Intf_VLCWrapper *o_intf = nil;
     if( p_input_bank->pp_input[0] == NULL )
     {
         NSMenu * o_program = [o_program_item submenu];
-        [o_program_item setEnabled:0];
-        [o_program removeItemAtIndex:0];
+//        [o_program_item setEnabled:0];
+//        [o_program removeItemAtIndex:0];
+[o_program addItemWithTitle:@"Toto" action:nil keyEquivalent:@""]
     }
     else
     {
         NSMenu * o_program = [o_program_item submenu];
-        [o_program_item setEnabled:1];
-        [o_program removeItemAtIndex:0];
+//        [o_program_item setEnabled:1];
+//        [o_program removeItemAtIndex:0];
+[o_program addItemWithTitle:@"Toto" action:nil keyEquivalent:@""]
     }
 #endif
 }

diff --git a/plugins/macosx/vout_qdview.c b/plugins/macosx/vout_qdview.c
index 60f738c9298977a192ea1ef10a50c3970398af8a..c9a086d5806cb1216a6e57beb1b69be1547480fd 100644 (file)
--- a/plugins/macosx/vout_qdview.c
+++ b/plugins/macosx/vout_qdview.c
@@ -2,7 +2,7 @@
  * vout_qdview.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_qdview.c,v 1.3 2002/04/25 23:07:23 massiot Exp $
+ * $Id: vout_qdview.c,v 1.4 2002/05/07 20:17:07 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -48,7 +48,6 @@
 - (void)drawRect:(NSRect)rect
 {
     [super drawRect: rect];
-    [o_wrapper voutDidResize: p_vout];
     [[NSColor blackColor] set];
     NSRectFill(rect);
 }

diff --git a/plugins/macosx/vout_vlc_wrapper.c b/plugins/macosx/vout_vlc_wrapper.c
index 2c9af4b446057277234a26794c082ad590790cb6..b6e53555eece782d91b7d3cd9fce9f38be30afff 100644 (file)
--- a/plugins/macosx/vout_vlc_wrapper.c
+++ b/plugins/macosx/vout_vlc_wrapper.c
@@ -2,7 +2,7 @@
  * vout_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_vlc_wrapper.c,v 1.1 2002/03/19 03:33:52 jlj Exp $
+ * $Id: vout_vlc_wrapper.c,v 1.2 2002/05/07 20:17:07 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -71,14 +71,6 @@ static Vout_VLCWrapper *o_vout = nil;
     return( p_main->p_intf->p_sys->o_port );
 }
 
-- (void)voutDidResize:(void *)_p_vout
-{
-    struct vout_thread_s *p_vout =
-        (struct vout_thread_s *)_p_vout;
-
-    p_vout->i_changes |= VOUT_SIZE_CHANGE;
-}
-
 - (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout
 {
     struct vout_thread_s *p_vout =

diff --git a/plugins/macosx/vout_vlc_wrapper.h b/plugins/macosx/vout_vlc_wrapper.h
index 8429dced99de8f5bb179d31e4bbe988657179034..a8234a420710eef59824f8df2d4f7bd80eb75de7 100644 (file)
--- a/plugins/macosx/vout_vlc_wrapper.h
+++ b/plugins/macosx/vout_vlc_wrapper.h
@@ -2,7 +2,7 @@
  * vout_vlc_wrapper.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_vlc_wrapper.h,v 1.1 2002/03/19 03:33:52 jlj Exp $
+ * $Id: vout_vlc_wrapper.h,v 1.2 2002/05/07 20:17:07 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -34,7 +34,6 @@
 + (Vout_VLCWrapper *)instance;
 + (NSPort *)sendPort;
 
-- (void)voutDidResize:(void *)_p_vout;
 - (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout;
 - (BOOL)keyDown:(NSEvent *)o_event forVout:(void *)_p_vout;