From 832df23afaf5500ce2b00a1cce1c340383e3073c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 23 Jan 2010 15:34:10 +0200 Subject: [PATCH] HAVE_CDDAX is never defined (anymore) --- modules/gui/ncurses.c | 12 +++--------- src/libvlc-module.c | 6 ------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 57732deb81..e0f12087ea 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -67,12 +67,6 @@ # include #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; } } diff --git a/src/libvlc-module.c b/src/libvlc-module.c index cde971b153..ac1e92b7d5 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -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_( \ -- 2.39.2