Commit 35192dd7 authored by Rémi Denis-Courmont's avatar 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://".
parent 832df23a
...@@ -67,12 +67,6 @@ ...@@ -67,12 +67,6 @@
# include <dirent.h> # include <dirent.h>
#endif #endif
#ifdef HAVE_VCDX
#define VCD_MRL "vcdx://"
#else
#define VCD_MRL "vcd://"
#endif
#define SEARCH_CHAIN_SIZE 20 #define SEARCH_CHAIN_SIZE 20
#define OPEN_CHAIN_SIZE 50 #define OPEN_CHAIN_SIZE 50
...@@ -2405,17 +2399,17 @@ static void Eject( intf_thread_t *p_intf ) ...@@ -2405,17 +2399,17 @@ static void Eject( intf_thread_t *p_intf )
break; 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 '\0':
case '@': case '@':
psz_device = config_GetPsz( p_intf, VCD_MRL ); psz_device = config_GetPsz( p_intf, "vcd" );
break; break;
default: default:
/* Omit the beginning MRL-selector characters */ /* Omit the beginning MRL-selector characters */
psz_device = strdup( psz_name + strlen(VCD_MRL) ); psz_device = strdup( psz_name + 6 );
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment