github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-08-04 14:59:58 +02:00
Code Releases Activity

Add full support for en-/disabling cddb support

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21495 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-04 20:20:32 +00:00
parent dcd4fd96ed
commit 84c2a2c927
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -248,6 +248,7 @@ Optional features:
--disable-dvdread-internal disable internal libdvdread [autodetect]
--disable-libdvdcss-internal disable internal libdvdcss [autodetect]
--disable-cdparanoia disable cdparanoia [autodetect]
--disable-cddb disable cddb [autodetect]
--disable-bitmap-font disable bitmap font support [enable]
--disable-freetype disable FreeType 2 font rendering [autodetect]
--disable-fontconfig disable fontconfig font lookup [autodetect]
@ -1721,6 +1722,7 @@ _crash_debug=no
_sighandler=yes
_libdv=auto
_cdparanoia=auto
_cddb=auto
_big_endian=auto
_bitmap_font=yes
_freetype=auto
@ -2041,6 +2043,8 @@ for ac_option do
--disable-linux-devfs) _linux_devfs=no ;;
--enable-cdparanoia) _cdparanoia=yes ;;
--disable-cdparanoia) _cdparanoia=no ;;
--enable-cddb) _cddb=yes ;;
--disable-cddb) _cddb=no ;;
--enable-big-endian) _big_endian=yes ;;
--disable-big-endian) _big_endian=no ;;
--enable-bitmap-font) _bitmap_font=yes ;;
@ -5246,7 +5250,7 @@ if test "$_cdparanoia" = yes ; then
_cdda='yes'
_ld_extra="$_ld_extra -lcdda_interface -lcdda_paranoia"
openbsd && _ld_extra="$_ld_extra -lutil"
test $_network = yes && not darwin && _cddb=yes
test $_cddb = auto && test $_network = yes && not darwin && _cddb=yes
fi
echores "$_cdparanoia"
@ -5300,6 +5304,15 @@ else
_noinputmodules="cdda $_noinputmodules"
fi
if test "$_cddb" = yes ; then
_def_cddb='#define HAVE_CDDB'
_inputmodules="cddb $_inputmodules"
else
_cddb=no
_def_cddb='#undef HAVE_CDDB'
_noinputmodules="cddb $_noinputmodules"
fi
echocheck "bitmap font support"
if test "$_bitmap_font" = yes ; then
_def_bitmap_font="#define HAVE_BITMAP_FONT 1"
@ -8130,6 +8143,7 @@ $_def_use_aton
/* enables / disables cdparanoia support */
$_def_cdparanoia
$_def_cddb
/* enables / disables VIDIX usage */
$_def_vidix

10
stream/stream_cdda.c
View File

@ -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
};