Commit 832df23a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

HAVE_CDDAX is never defined (anymore)

parent f9f69cb5
......@@ -67,12 +67,6 @@
# include <dirent.h>
#endif
#ifdef HAVE_CDDAX
#define CDDA_MRL "cddax://"
#else
#define CDDA_MRL "cdda://"
#endif
#ifdef HAVE_VCDX
#define VCD_MRL "vcdx://"
#else
......@@ -2425,9 +2419,9 @@ static void Eject( intf_thread_t *p_intf )
break;
}
}
else if( !strncmp(psz_name, CDDA_MRL, strlen(CDDA_MRL) ) )
else if( !strncmp(psz_name, "cdda://", 7 ) )
{
switch( psz_name[strlen(CDDA_MRL)] )
switch( psz_name[7] )
{
case '\0':
case '@':
......@@ -2435,7 +2429,7 @@ static void Eject( intf_thread_t *p_intf )
break;
default:
/* Omit the beginning MRL-selector characters */
psz_device = strdup( psz_name + strlen(CDDA_MRL) );
psz_device = strdup( psz_name + 7 );
break;
}
}
......
......@@ -853,14 +853,8 @@ static const char *const ppsz_clock_descriptions[] =
#endif
#define CDAUDIO_DEV_TEXT N_("Audio CD device")
#ifdef HAVE_CDDAX
#define CDAUDIO_DEV_LONGTEXT N_( \
"This is the default Audio CD device to use. " \
"If you don't specify anything, we'll scan for a suitable CD-ROM device." )
#else
#define CDAUDIO_DEV_LONGTEXT N_( \
"This is the default Audio CD device to use." )
#endif
#define IPV6_TEXT N_("Force IPv6")
#define IPV6_LONGTEXT N_( \
......
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