summaryrefslogtreecommitdiffstats
path: root/stream/stream_cdda.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-04 20:20:32 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-04 20:20:32 +0000
commit84c2a2c9271c2577b77aaa191f5e2f951a1b42da (patch)
tree8d96b2f12e90f5dbf95b4232b89b50d748a232cd /stream/stream_cdda.c
parentdcd4fd96ed7747905036bf4f3436cc7bce64529d (diff)
downloadmpv-84c2a2c9271c2577b77aaa191f5e2f951a1b42da.tar.bz2
mpv-84c2a2c9271c2577b77aaa191f5e2f951a1b42da.tar.xz
Add full support for en-/disabling cddb support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21495 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_cdda.c')
-rw-r--r--stream/stream_cdda.c10
1 files changed, 7 insertions, 3 deletions
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
};