]> git.sesse.net Git - vlc/commitdiff
ncurses: always use vcd
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 13:36:50 +0000 (15:36 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 13:37:55 +0000 (15:37 +0200)
This is consistent with Qt4 behaviour. This also fixes a bug when using
the configuration; the item is called "vcd", not "vcd://".

modules/gui/ncurses.c

index e0f12087ea1e11c427f520567d84d710ecd55208..d1cdba433d534e88754748975ea28147c14b7f6a 100644 (file)
 #   include <dirent.h>
 #endif
 
-#ifdef HAVE_VCDX
-#define VCD_MRL "vcdx://"
-#else
-#define VCD_MRL "vcd://"
-#endif
-
 #define SEARCH_CHAIN_SIZE 20
 #define OPEN_CHAIN_SIZE 50
 
@@ -2405,17 +2399,17 @@ static void Eject( intf_thread_t *p_intf )
                 break;
             }
         }
-        else if( !strncmp(psz_name, VCD_MRL, strlen(VCD_MRL)) )
+        else if( !strncmp(psz_name, "vcd://", 6) )
         {
-            switch( psz_name[strlen(VCD_MRL)] )
+            switch( psz_name[6] )
             {
             case '\0':
             case '@':
-                psz_device = config_GetPsz( p_intf, VCD_MRL );
+                psz_device = config_GetPsz( p_intf, "vcd" );
                 break;
             default:
                 /* Omit the beginning MRL-selector characters */
-                psz_device = strdup( psz_name + strlen(VCD_MRL) );
+                psz_device = strdup( psz_name + 6 );
                 break;
             }
         }