[vlc-devel] commit: ncurses: always use vcd ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 23 15:36:50 2010 +0200| [35192dd7729d4c3aae4c2ff28e8a823f95f02705] | committer: Rémi Denis-Courmont 

ncurses: always use vcd

This is consistent with Qt4 behaviour. This also fixes a bug when using
the configuration; the item is called "vcd", not "vcd://".

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35192dd7729d4c3aae4c2ff28e8a823f95f02705
---

 modules/gui/ncurses.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index e0f1208..d1cdba4 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -67,12 +67,6 @@
 #   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;
             }
         }