From 84c2a2c9271c2577b77aaa191f5e2f951a1b42da Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 4 Dec 2006 20:20:32 +0000 Subject: Add full support for en-/disabling cddb support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21495 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_cdda.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'stream/stream_cdda.c') diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 3eb08d4350..3601a46725 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -124,7 +124,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { p->device = strdup(DEFAULT_CDROM_DEVICE); } -#ifdef MPLAYER_NETWORK +#ifdef HAVE_CDDB // cdd_identify returns -1 if it cannot read the TOC, // in which case there is no point in calling cddb_resolve if(cdd_identify(p->device) >= 0 && strncmp(st->url,"cddb",4) == 0) { @@ -251,7 +251,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { paranoia_seek(priv->cdp,priv->start_sector,SEEK_SET); priv->sector = priv->start_sector; -#ifdef MPLAYER_NETWORK +#ifdef HAVE_CDDB if(cddb_info) { cd_info_free(cd_info); priv->cd_info = cddb_info; @@ -388,7 +388,11 @@ stream_info_t stream_info_cdda = { "Albeu", "", open_cdda, - { "cdda", "cddb", NULL }, + { "cdda", +#ifdef HAVE_CDDB + "cddb", +#endif + NULL }, &stream_opts, 1 // Urls are an option string }; -- cgit v1.2.3