Commit 6e8cd7e0 authored by Christophe Massiot's avatar Christophe Massiot

Fixed Mac OS X VOUT_SIZE_CHANGE signal.

parent 35178899
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_vlc_wrapper.c: MacOS X plugin for vlc * intf_vlc_wrapper.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -86,6 +86,7 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -86,6 +86,7 @@ static Intf_VLCWrapper *o_intf = nil;
return( 1 ); return( 1 );
} }
#if 0
if( p_input_bank->pp_input[0] != NULL ) if( p_input_bank->pp_input[0] != NULL )
{ {
vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock ); vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock );
...@@ -107,6 +108,7 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -107,6 +108,7 @@ static Intf_VLCWrapper *o_intf = nil;
{ {
[self setupMenus]; [self setupMenus];
} }
#endif
return( 0 ); return( 0 );
} }
...@@ -497,14 +499,16 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -497,14 +499,16 @@ static Intf_VLCWrapper *o_intf = nil;
if( p_input_bank->pp_input[0] == NULL ) if( p_input_bank->pp_input[0] == NULL )
{ {
NSMenu * o_program = [o_program_item submenu]; NSMenu * o_program = [o_program_item submenu];
[o_program_item setEnabled:0]; // [o_program_item setEnabled:0];
[o_program removeItemAtIndex:0]; // [o_program removeItemAtIndex:0];
[o_program addItemWithTitle:@"Toto" action:nil keyEquivalent:@""]
} }
else else
{ {
NSMenu * o_program = [o_program_item submenu]; NSMenu * o_program = [o_program_item submenu];
[o_program_item setEnabled:1]; // [o_program_item setEnabled:1];
[o_program removeItemAtIndex:0]; // [o_program removeItemAtIndex:0];
[o_program addItemWithTitle:@"Toto" action:nil keyEquivalent:@""]
} }
#endif #endif
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_qdview.c: MacOS X plugin for vlc * vout_qdview.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
- (void)drawRect:(NSRect)rect - (void)drawRect:(NSRect)rect
{ {
[super drawRect: rect]; [super drawRect: rect];
[o_wrapper voutDidResize: p_vout];
[[NSColor blackColor] set]; [[NSColor blackColor] set];
NSRectFill(rect); NSRectFill(rect);
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_vlc_wrapper.c: MacOS X plugin for vlc * vout_vlc_wrapper.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
...@@ -71,14 +71,6 @@ static Vout_VLCWrapper *o_vout = nil; ...@@ -71,14 +71,6 @@ static Vout_VLCWrapper *o_vout = nil;
return( p_main->p_intf->p_sys->o_port ); 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 - (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout
{ {
struct vout_thread_s *p_vout = struct vout_thread_s *p_vout =
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_vlc_wrapper.h: MacOS X plugin for vlc * vout_vlc_wrapper.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
+ (Vout_VLCWrapper *)instance; + (Vout_VLCWrapper *)instance;
+ (NSPort *)sendPort; + (NSPort *)sendPort;
- (void)voutDidResize:(void *)_p_vout;
- (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout; - (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout;
- (BOOL)keyDown:(NSEvent *)o_event forVout:(void *)_p_vout; - (BOOL)keyDown:(NSEvent *)o_event forVout:(void *)_p_vout;
......
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