* access2: added shortcuts for vcd/svcd.

diff --git a/modules/access/access2.c b/modules/access/access2.c
index 58d4c69f2421d90b4429d74dc39b90dc8cef0931..5daf70f9a7fe5c7eeb4f248b15eeddf9f9589d36 100644 (file)
--- a/modules/access/access2.c
+++ b/modules/access/access2.c
@@ -67,6 +67,8 @@ vlc_module_begin();
 
     add_shortcut( "vcd" );
     add_shortcut( "svcd" );
+
+    add_shortcut( "v4l" );
 vlc_module_end();
 
 /*****************************************************************************

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 2849d12c39f71179fe10224b8f4f0d13ff5b2b06..9c496b695ce89b19a56a75e0206caf13e674b511 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -112,7 +112,7 @@ static int Open( vlc_object_t *p_this )
         free( psz_dup );
 
         /* Only when selected */
-        if( *p_access->psz_access == '\0' )
+        if( strcmp( p_access->psz_access, "cdda" ) )
             return VLC_EGENERIC;
 
 

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index c01a146d8bf0675f26a054878e16afe6b0ca624f..f78b4a44f1a067d4e5962158efc278b562fd7baf 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -110,7 +110,8 @@ static int Open( vlc_object_t *p_this )
         free( psz_dup );
 
         /* Only when selected */
-        if( *p_access->psz_access == '\0' )
+        if( strcmp( p_access->psz_access, "vcd" ) &&
+            strcmp( p_access->psz_access, "svcd" ) )
             return VLC_EGENERIC;
 
         psz_dup = var_CreateGetString( p_access, "vcd" );