* ./src/misc/configuration.c: fixed the --nofoo option handling.

  * ./src/interface/main.c: fixed two compilation warnings under Solaris.
  * ./plugins/avi/avi.c, ./plugins/mpeg_system/mpeg_audio.c: ES will be
    selected only once.
  * updated TODO list.

diff --git a/ChangeLog b/ChangeLog
index d2a28fec19b637146112c1e8f38a7ffb6aab9685..287e3b82f3dc43c0793a5ab59b0ef37f28eeb407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 
 HEAD
 
+  * ./src/misc/configuration.c: fixed the --nofoo option handling.
+  * ./src/interface/main.c: fixed two compilation warnings under Solaris.
+  * ./plugins/avi/avi.c, ./plugins/mpeg_system/mpeg_audio.c: ES will be
+    selected only once.
   * ./src/misc/netutils.c: factored code common to the interfaces into the
     network_ChannelJoin function.
   * ./plugins/mga/xmga.c, ./plugins/x11/xcommon.c, ./plugins/sdl/vout_sdl.c,

diff --git a/TODO b/TODO
index 3545c770d1a6f5253c3fe976e6423e711039edbb..2b424a5aeec33215b1b2e580e47a98e008eca201 100644 (file)
--- a/TODO
+++ b/TODO
@@ -47,7 +47,7 @@ Urgency: Wishlist
 Description: Share stream information between vlc and vls
  vls should send misc TS packets to let us know what the stream PID
  contain, such as the language, or the subtitle palette.
-Status: Todo
+Status: Done (collective work)
 
 Task: 0x59
 Difficulty: Hard
@@ -137,7 +137,7 @@ Description: Fix all known DVD playback issues
  A few DVDs are still reported not to work at all. Try to find what is
  causing this, have a more robust DVD input, and list all discs reported
  to work flawlessly to prevent bug regression.
-Status: Todo
+Status: Done (collective work)
 
 Task: 0x4e
 Difficulty: Hard
@@ -169,7 +169,7 @@ Urgency: Normal
 Description: Write AVI input plugin
  .avi files can use MPEG codec, if this is the case it shouldn't be
  hard to read those files -> Meuuh
-Status: Todo
+Status: Done 23 Apr 2002 (fenrir)
 
 Task: 0x4a
 Difficulty: Medium
@@ -459,7 +459,7 @@ Difficulty: Hard
 Urgency: Wishlist
 Description: MP3 support
  The vlc cannot play MPEG1/2 layer 3 yet. It might be nice to fix that.
-Status: Todo
+Status: Done 10 May 2002 (fenrir)
 
 Task: 0x25
 Difficulty: Hard

diff --git a/plugins/directx/vout_events.c b/plugins/directx/vout_events.c
index fec99f4c1c85d522b871ae143c176c83ea0605a6..a217523b42263f96455c00c53bb27d7d6ff05632 100644 (file)
--- a/plugins/directx/vout_events.c
+++ b/plugins/directx/vout_events.c
@@ -2,7 +2,7 @@
  * vout_events.c: Windows DirectX video output events handler
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_events.c,v 1.18.2.1 2002/06/03 00:28:07 sam Exp $
+ * $Id: vout_events.c,v 1.18.2.2 2002/06/03 17:19:54 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -197,17 +197,6 @@ void DirectXEventThread( vout_thread_t *p_vout )
                 p_vout->p_sys->i_changes |= VOUT_INTF_CHANGE;
                 break;
 
-            case '0': network_ChannelJoin( 0 ); break;
-            case '1': network_ChannelJoin( 1 ); break;
-            case '2': network_ChannelJoin( 2 ); break;
-            case '3': network_ChannelJoin( 3 ); break;
-            case '4': network_ChannelJoin( 4 ); break;
-            case '5': network_ChannelJoin( 5 ); break;
-            case '6': network_ChannelJoin( 6 ); break;
-            case '7': network_ChannelJoin( 7 ); break;
-            case '8': network_ChannelJoin( 8 ); break;
-            case '9': network_ChannelJoin( 9 ); break;
-
             default:
                 break;
             }

diff --git a/src/interface/main.c b/src/interface/main.c
index 76fa95902cc044d42ea6c0769e6e1e1e2bb2f164..1535d6635753005639e7e11fe406383232d7c56d 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.195.2.1 2002/06/02 23:01:32 sam Exp $
+ * $Id: main.c,v 1.195.2.2 2002/06/03 17:19:54 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -463,12 +463,6 @@ static module_config_t p_help_config[] =
     { MODULE_CONFIG_HINT_END, NULL, '\0', NULL, NULL, NULL, 0, 0,
       NULL, NULL, 0 }
 };
-static module_t help_module = { "help", "help module", NULL, {NULL}, 0, {0}, 0,
-                                NULL, p_help_config, {0},
-                                sizeof(p_help_config)/sizeof(module_config_t),
-                                sizeof(p_help_config)/sizeof(module_config_t)
-};
-
 
 /*****************************************************************************
  * End configuration.
@@ -503,7 +497,9 @@ static void ShowConsole                 ( void );
 
 static jmp_buf env;
 static int     i_illegal;
+#if defined( __i386__ )
 static char   *psz_capability;
+#endif
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads
@@ -611,7 +607,17 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     module_LoadMain();
 
     /* Hack: insert the help module here */
+    help_module.psz_name = "help";
+    help_module.psz_longname = "help module";
+    help_module.psz_program = NULL;
+    help_module.pp_shortcuts[0] = NULL;
+    help_module.i_capabilities = 0;
+    help_module.i_cpu_capabilities = 0;
+    help_module.p_config = p_help_config;
     vlc_mutex_init( &help_module.config_lock );
+    help_module.i_config_items = sizeof(p_help_config)
+                                  / sizeof(module_config_t);
+    help_module.i_bool_items = help_module.i_config_items;
     help_module.next = p_module_bank->first;
     p_module_bank->first = &help_module;
     /* end hack */
@@ -1471,7 +1477,6 @@ static u32 CPUCapabilities( void )
 #   ifdef CAN_COMPILE_ALTIVEC
     signal( SIGILL, IllegalSignalHandler );
 
-    psz_capability = "AltiVec";
     i_illegal = 0;
     if( setjmp( env ) == 0 )
     {

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index 0cb49f4fb5fdfbfaaad945bc85f5d00612e9e47f..89d4f9b9c8e47653157d42100d59a6c4fddeb41c 100644 (file)
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.26.2.1 2002/06/02 23:01:32 sam Exp $
+ * $Id: configuration.c,v 1.26.2.2 2002/06/03 17:19:54 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -950,8 +950,8 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
             module_config_t *p_conf;
             char *psz_name = (char *)p_longopts[i_index].name;
 
-            /* Check if we deal with a --no-foo long option */
-            if( flag ) psz_name += 3;
+            /* Check if we deal with a --nofoo or --no-foo long option */
+            if( flag ) psz_name += psz_name[2] == '-' ? 3 : 2;
 
             /* Store the configuration option */
             p_conf = config_FindConfig( psz_name );