Added a 'dvdold' shortcut to force the use of the dvd plugin in case

another plugin with higher priority wants to use 'dvd' as shortcut.

diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index 4dae73c1aff2001fc4b564d1742c3be17aa61669..1948fda2115d37c44444adaed9d6574792ab23c5 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.32 2002/06/01 12:31:58 sam Exp $
+ * $Id: dvd.c,v 1.33 2002/07/17 21:28:19 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -75,6 +75,7 @@ MODULE_INIT_START
     SET_DESCRIPTION( _("DVD input module, uses libdvdcss") )
     ADD_CAPABILITY( ACCESS, 100 )
 #endif
+    ADD_SHORTCUT( "dvdold" );
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START

diff --git a/plugins/dvd/dvd_access.c b/plugins/dvd/dvd_access.c
index 78a80b67b7d3b1d78d57d05e5f66dfec413d9989..b6ae7a0bce48a934fa747f818e24fcfe723ea070 100644 (file)
--- a/plugins/dvd/dvd_access.c
+++ b/plugins/dvd/dvd_access.c
@@ -8,7 +8,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_access.c,v 1.20 2002/06/01 12:31:58 sam Exp $
+ * $Id: dvd_access.c,v 1.21 2002/07/17 21:28:19 stef Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -239,7 +239,7 @@ static int DVDOpen( input_thread_t *p_input )
 
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    p_input->psz_demux = "dvd";
+    p_input->psz_demux = "dvdold";
 
     return 0;
 }