* OS X interface : Added new access modules to the Open panel,

* Updated po files,
* Fixed a very nasty side effect in the dvd and dvdread plug-ins,
regarding the audio-channel and spu-channel configuration variables.

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -101,10 +101,13 @@
                 openDiscStepperChanged = id; 
                 openDiscTypeChanged = id; 
                 openFile = id; 
+                openFileBrowse = id; 
                 openFileGeneric = id; 
+                openFileStreamChanged = id; 
                 openNet = id; 
                 openNetModeChanged = id; 
                 openNetStepperChanged = id; 
+                openVTSBrowse = id; 
                 panelCancel = id; 
                 panelOk = id; 
             }; 
@@ -122,10 +125,13 @@
                 "o_disc_title_lbl" = id; 
                 "o_disc_title_stp" = id; 
                 "o_disc_type" = id; 
-                "o_disc_type_lbl" = id; 
+                "o_disc_videots_btn_browse" = id; 
+                "o_disc_videots_folder" = id; 
                 "o_file_btn_browse" = id; 
                 "o_file_path" = id; 
+                "o_file_stream" = id; 
                 "o_mrl" = id; 
+                "o_mrl_lbl" = id; 
                 "o_net_cs_addr" = id; 
                 "o_net_cs_addr_lbl" = id; 
                 "o_net_cs_port" = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -15,8 +15,8 @@
 	<string>291.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>636</integer>
 		<integer>29</integer>
+		<integer>636</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>6G30</string>

include/vlc_config.h

@@ -270,7 +270,7 @@
  *****************************************************************************/
 
 /* Maximal size of a message to be stored in the mesage queue,
- * it is needed when vasprintf is not avalaible */
+ * it is needed when vasprintf is not available */
 #define INTF_MAX_MSG_SIZE               512
 
 /* Maximal size of the message queue - in case of overflow, all messages in the

modules/access/dvd/access.c

@@ -8,7 +8,7 @@
  *  -udf.* to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: access.c,v 1.6 2002/12/06 16:34:04 sam Exp $
+ * $Id: access.c,v 1.7 2002/12/30 23:45:21 massiot Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -268,6 +268,13 @@ void E_(DVDClose) ( vlc_object_t *p_this )
     input_thread_t * p_input = (input_thread_t *)p_this;
     thread_dvd_data_t *p_dvd = (thread_dvd_data_t*)p_input->p_access_data;
 
+    /* This is a very nasty side-effect in the DVD plug-in : language
+     * selection here influences language selection of other streams. So
+     * unset those variables (may not be what the user wants).
+     * FIXME FIXME FIXME FIXME FIXME FIXME FIXME --Meuuh */
+    config_PutInt( p_input, "audio-channel", -1 );
+    config_PutInt( p_input, "spu-channel", -1 );
+
     IfoDestroy( p_dvd->p_ifo );
     dvdcss_close( p_dvd->dvdhandle );
     free( p_dvd );

modules/access/dvdread/input.c

@@ -6,7 +6,7 @@
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input.c,v 1.9 2002/11/13 20:23:21 fenrir Exp $
+ * $Id: input.c,v 1.10 2002/12/30 23:45:21 massiot Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -435,6 +435,13 @@ void E_(CloseDVD) ( vlc_object_t *p_this )
     input_thread_t *    p_input = (input_thread_t *)p_this;
     thread_dvd_data_t * p_dvd = (thread_dvd_data_t *)p_input->p_access_data;
 
+    /* This is a very nasty side-effect in the DVD plug-in : language
+     * selection here influences language selection of other streams. So
+     * unset those variables (may not be what the user wants).
+     * FIXME FIXME FIXME FIXME FIXME FIXME FIXME --Meuuh */
+    config_PutInt( p_input, "audio-channel", -1 );
+    config_PutInt( p_input, "spu-channel", -1 );
+
     /* close libdvdread */
     DVDCloseFile( p_dvd->p_title );
     ifoClose( p_dvd->p_vts_file );

modules/gui/macosx/open.h

@@ -2,7 +2,7 @@
  * open.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: open.h,v 1.3 2002/12/08 23:38:02 massiot Exp $
+ * $Id: open.h,v 1.4 2002/12/30 23:45:21 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -33,6 +33,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_panel;
 
     IBOutlet id o_mrl;
+    IBOutlet id o_mrl_lbl;
     IBOutlet id o_tabview;
 
     IBOutlet id o_btn_ok;
@@ -40,9 +41,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
     IBOutlet id o_file_path;
     IBOutlet id o_file_btn_browse;
+    IBOutlet id o_file_stream;
 
     IBOutlet id o_disc_type;
-    IBOutlet id o_disc_type_lbl;
     IBOutlet id o_disc_device;
     IBOutlet id o_disc_device_lbl;
     IBOutlet id o_disc_title;
@@ -51,6 +52,8 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_disc_chapter;
     IBOutlet id o_disc_chapter_lbl;
     IBOutlet id o_disc_chapter_stp;
+    IBOutlet id o_disc_videots_folder;
+    IBOutlet id o_disc_videots_btn_browse;
 
     IBOutlet id o_net_mode;
     IBOutlet id o_net_udp_port;
@@ -74,13 +77,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
 
 - (IBAction)openFileGeneric:(id)sender;
-- (IBAction)openFile:(id)sender;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
+- (IBAction)openFileBrowse:(id)sender;
+- (IBAction)openFileStreamChanged:(id)sender;
 
 - (IBAction)openDisc:(id)sender;
 - (IBAction)openDiscTypeChanged:(id)sender;
 - (IBAction)openDiscStepperChanged:(id)sender;
 - (void)openDiscInfoChanged:(NSNotification *)o_notification;
+- (IBAction)openVTSBrowse:(id)sender;
 
 - (IBAction)openNet:(id)sender;
 - (IBAction)openNetModeChanged:(id)sender;
@@ -90,4 +95,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (IBAction)panelCancel:(id)sender;
 - (IBAction)panelOk:(id)sender;
 
+- (IBAction)openFile:(id)sender;
+
 @end

modules/gui/macosx/prefs.m

@@ -2,7 +2,7 @@
  * prefs.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: prefs.m,v 1.4 2002/12/29 01:16:28 massiot Exp $
+ * $Id: prefs.m,v 1.5 2002/12/30 23:45:21 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -545,6 +545,7 @@
 
     s_rc.origin.x -= s_rc.size.width;
     DEF_PANEL_BUTTON( 1, _NS("Cancel"), clickedCancelOK: );
+    [o_button setKeyEquivalent: @"\E"];
 
     s_rc.origin.x -= s_rc.size.width;
     DEF_PANEL_BUTTON( 2, _NS("Apply"), clickedApply: );

po/POTFILES.in

@@ -9,7 +9,6 @@ modules/access/dvd/dvd.c
 modules/access/v4l/v4l.c
 modules/access/file.c
 modules/access/http.c
-modules/access/rtp.c
 modules/access/udp.c
 modules/access/dvdread/dvdread.c
 modules/access/satellite/satellite.c