Commit e3c06996 authored by Christophe Massiot's avatar Christophe Massiot

* Mac OS X port : menus for Program/Title/Chapter/Languages.

parent fb1e2cb9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk_menu.c : functions to handle menu items. * gtk_menu.c : functions to handle menu items.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_menu.c,v 1.24 2002/04/19 13:56:11 sam Exp $ * $Id: gtk_menu.c,v 1.25 2002/05/12 01:39:36 massiot Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -502,9 +502,6 @@ static gint GtkLanguageMenus( gpointer p_data, ...@@ -502,9 +502,6 @@ static gint GtkLanguageMenus( gpointer p_data,
gint i_item; gint i_item;
gint i; gint i;
/* cast */
p_intf = (intf_thread_t *)p_data; p_intf = (intf_thread_t *)p_data;
/* temporary hack to avoid blank menu when an open menu is removed */ /* temporary hack to avoid blank menu when an open menu is removed */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_macosx.c: MacOS X interface plugin * intf_macosx.c: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: intf_macosx.c,v 1.13 2002/05/06 22:59:46 massiot Exp $ * $Id: intf_macosx.c,v 1.14 2002/05/12 01:39:36 massiot Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
...@@ -68,6 +68,8 @@ static int intf_Open( intf_thread_t *p_intf ) ...@@ -68,6 +68,8 @@ static int intf_Open( intf_thread_t *p_intf )
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
p_intf->p_sys->o_port = [[NSPort port] retain]; p_intf->p_sys->o_port = [[NSPort port] retain];
p_intf->p_sys->b_mute = 0; p_intf->p_sys->b_mute = 0;
p_intf->p_sys->i_part = 0;
p_intf->p_sys->b_disabled_menus = 0;
[[NSApplication sharedApplication] autorelease]; [[NSApplication sharedApplication] autorelease];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_vlc_wrapper.h: MacOS X plugin for vlc * intf_vlc_wrapper.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: intf_vlc_wrapper.h,v 1.6 2002/05/06 22:59:46 massiot Exp $ * $Id: intf_vlc_wrapper.h,v 1.7 2002/05/12 01:39:36 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>
...@@ -70,6 +70,13 @@ ...@@ -70,6 +70,13 @@
- (void)openDisc:(NSString*)o_type device:(NSString*)o_device title:(int)i_title chapter:(int)i_chapter; - (void)openDisc:(NSString*)o_type device:(NSString*)o_device title:(int)i_title chapter:(int)i_chapter;
- (void)openNet:(NSString*)o_protocol addr:(NSString*)o_addr port:(int)i_port baddr:(NSString*)o_baddr; - (void)openNet:(NSString*)o_protocol addr:(NSString*)o_addr port:(int)i_port baddr:(NSString*)o_baddr;
- (void)openNetChannel:(NSString*)o_addr port:(int)i_port; - (void)openNetChannel:(NSString*)o_addr port:(int)i_port;
/* menus management */
- (void)toggleProgram:(id)sender;
- (void)toggleTitle:(id)sender;
- (void)toggleChapter:(id)sender;
- (void)toggleLanguage:(id)sender;
- (void)toggleSubtitle:(id)sender;
- (void)setupMenus; - (void)setupMenus;
@end @end
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* macosx.h: MacOS X plugin for vlc * macosx.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: macosx.h,v 1.8 2002/05/06 22:59:46 massiot Exp $ * $Id: macosx.h,v 1.9 2002/05/12 01:39:36 massiot Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu> * Eugenio Jarosiewicz <ej0@cise.ufl.edu>
...@@ -42,6 +42,7 @@ typedef struct intf_sys_s ...@@ -42,6 +42,7 @@ typedef struct intf_sys_s
int i_saved_volume; int i_saved_volume;
int i_part; int i_part;
boolean_t b_disabled_menus;
} intf_sys_t; } intf_sys_t;
/***************************************************************************** /*****************************************************************************
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders * input_dec.c: Functions for the management of decoders
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: input_dec.c,v 1.32 2002/04/23 14:16:20 sam Exp $ * $Id: input_dec.c,v 1.33 2002/05/12 01:39:36 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -91,6 +91,8 @@ vlc_thread_t input_RunDecoder( input_thread_t * p_input, ...@@ -91,6 +91,8 @@ vlc_thread_t input_RunDecoder( input_thread_t * p_input,
return( 0 ); return( 0 );
} }
p_input->stream.b_changed = 1;
return thread_id; return thread_id;
} }
...@@ -131,6 +133,8 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -131,6 +133,8 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es )
/* Tell the input there is no more decoder */ /* Tell the input there is no more decoder */
p_es->p_decoder_fifo = NULL; p_es->p_decoder_fifo = NULL;
p_input->stream.b_changed = 1;
} }
/***************************************************************************** /*****************************************************************************
......
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