I hope you liked this bug: DVD demux was always used.

diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index 3cf50189e4ef025496d464489ce5c6831b74928f..cc428cbd4d17f11337a0c4f76c5dd2b0b90d5666 100644 (file)
--- a/plugins/dvd/dvd.c
+++ b/plugins/dvd/dvd.c
@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: dvd.c,v 1.25 2002/03/05 18:17:52 stef Exp $
+ * $Id: dvd.c,v 1.26 2002/03/06 16:39:36 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -57,7 +57,7 @@ ADD_CATEGORY_HINT( "[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]",
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    ADD_CAPABILITY( DEMUX, 200 )
+    ADD_CAPABILITY( DEMUX, 0 )
 #ifndef WIN32
 #  ifdef GOD_DAMN_DMCA
     SET_DESCRIPTION( "DVD input module, uses libdvdcss if present" )

diff --git a/plugins/dvdread/dvdread.c b/plugins/dvdread/dvdread.c
index 9999ac3aa63cfaf8445c79c73cf79b91ba7dfa8d..f529867ec08c3d3a12bca329fd19e4c5cdf613d2 100644 (file)
--- a/plugins/dvdread/dvdread.c
+++ b/plugins/dvdread/dvdread.c
@@ -2,7 +2,7 @@
  * dvdread.c : DvdRead input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dvdread.c,v 1.12 2002/03/04 01:53:56 stef Exp $
+ * $Id: dvdread.c,v 1.13 2002/03/06 16:39:37 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,7 +44,7 @@ MODULE_CONFIG_STOP
 
 MODULE_INIT_START
     SET_DESCRIPTION( "DVDRead input module" )
-    ADD_CAPABILITY( DEMUX, 210 )
+    ADD_CAPABILITY( DEMUX, 0 )
     ADD_CAPABILITY( ACCESS, 110 )
     ADD_SHORTCUT( "dvdread" )
 MODULE_INIT_STOP

diff --git a/plugins/dvdread/input_dvdread.c b/plugins/dvdread/input_dvdread.c
index 3290d4f944845595ef466ae16133a13d1c77b5c9..8e946cd9b4a5c48bd94f6f610eb16bfe673d13fb 100644 (file)
--- a/plugins/dvdread/input_dvdread.c
+++ b/plugins/dvdread/input_dvdread.c
@@ -6,7 +6,7 @@
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.30 2002/03/06 01:20:56 stef Exp $
+ * $Id: input_dvdread.c,v 1.31 2002/03/06 16:39:37 stef Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -131,11 +131,6 @@ void _M( demux_getfunctions )( function_list_t * p_function_list )
  *****************************************************************************/
 static int DvdReadInit( input_thread_t * p_input )
 {
-    if( strncmp( p_input->p_access_module->psz_name, "dvdread", 7 ) )
-    {
-        return -1;
-    }
-
     vlc_mutex_lock( &p_input->stream.stream_lock );
     
     DvdReadLauchDecoders( p_input );
@@ -415,6 +410,8 @@ static int DvdReadOpen( struct input_thread_s *p_input )
 
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
+    p_input->psz_demux = "dvdread";
+
     return 0;
 }
 

diff --git a/plugins/vcd/vcd.c b/plugins/vcd/vcd.c
index efdc73e1dc10cc6e41bbbe51fb7ea5ae91cc8ac1..bb3aa15e023f727eaa76dd5a3d2b60bfd074960d 100644 (file)
--- a/plugins/vcd/vcd.c
+++ b/plugins/vcd/vcd.c
@@ -2,7 +2,7 @@
  * vcd.c : VCD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: vcd.c,v 1.7 2002/03/06 01:20:56 stef Exp $
+ * $Id: vcd.c,v 1.8 2002/03/06 16:39:37 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -43,7 +43,7 @@ MODULE_CONFIG_STOP
 
 MODULE_INIT_START
     SET_DESCRIPTION( "VCD input module" )
-    ADD_CAPABILITY( DEMUX, 180 )
+    ADD_CAPABILITY( DEMUX, 0 )
     ADD_CAPABILITY( ACCESS, 80 )
     ADD_SHORTCUT( "vcd" )
 MODULE_INIT_STOP