claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Put back in libcddb 0.9.0 checking and use cddb_http_disable().

Browse Source
This commit is contained in:
rocky
2003-04-20 01:39:23 +00:00
parent e90a24d448
commit b0d26dcda4
4 changed files with 83 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
ChangeLog
View File

@@ -1,3 +1,71 @@
2003-04-19 16:49 rocky
* lib/_cdio_freebsd.c: Add _cdio_read_audio_sector. Try to sync up
with other drivers.
2003-04-19 15:12 rocky
* Makefile.am, NEWS, configure.ac, tests/Makefile.am,
tests/check_common_fn, tests/check_cue.sh, tests/check_nrg.sh,
tests/check_opts.sh.in, tests/check_opts0.right,
tests/check_opts1.right, tests/check_opts2.right,
tests/check_opts3.right, tests/check_opts4.right,
tests/check_opts5.right, tests/check_opts6.right,
tests/check_opts7.right: Break most of the larger regression tests
into a separate package.
2003-04-19 05:13 rocky
* include/cdio/: Makefile.am, cdio.h, cdio.h.in: Add package
version
2003-04-19 05:02 rocky
* include/cdio/cdio.h: Add an API version number.
2003-04-19 04:29 rocky
* ChangeLog, Makefile.am, configure.ac, include/.cvsignore,
include/Makefile.am, include/cdio/.cvsignore,
include/cdio/Makefile.am, include/cdio/cdio.h,
include/cdio/logging.h, include/cdio/sector.h,
include/cdio/types.h, include/cdio/util.h, lib/Makefile.am,
lib/cdio.h, lib/logging.h, lib/sector.h, lib/types.h, lib/util.h,
src/cdinfo.c, tests/.cvsignore: Move public includes to
include/cdio. This should facilitate having this source installed
locally since it allows #include <cdio/cdio.h> in the source tree.
2003-04-18 20:53 rocky
* src/cdinfo.c: Revise to to handle libcddb 0.90.
2003-04-18 20:52 rocky
* lib/cdio.h: Remove a compile warning noticed by Kris Verbeeck.
2003-04-18 20:50 rocky
* configure.ac: do chmod +x for test/check_opts.sh Test to see if
we have new enough libcddb.
2003-04-18 20:49 rocky
* README: Update to include CDDB information and note this is ued
by CD-DA plugin.
2003-04-15 01:19 rocky
* lib/_cdio_linux.c: Remove compile warning on non-GNU/Linux
servers.
2003-04-14 19:30 rocky
* THANKS: Need to start *somewhere*.
2003-04-14 19:29 rocky
* NEWS: Wha's happenin'
2003-04-14 19:11 rocky
* lib/_cdio_bincue.c: Bug-causing typo.

24
configure.ac
View File

@@ -1,4 +1,4 @@
AC_REVISION([$Id: configure.ac,v 1.11 2003/04/19 19:12:06 rocky Exp $])dnl
AC_REVISION([$Id: configure.ac,v 1.12 2003/04/20 01:39:23 rocky Exp $])dnl
AC_INIT(lib/cdio.c)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(libcdio, 0.3)
@@ -193,17 +193,17 @@ fi
if test x$enable_cddb = xyes; then
AC_CHECK_LIB(cddb, cddb_disc_calc_discid,
[ CDDB_LIB="-lcddb"; ac_have_cddb=yes ])
AC_DEFINE([HAVE_CDDB],[],
[Define this if you have libcddb installed])
dnl AC_TRY_COMPILE([#include <cddb/cddb.h>],[
dnl cddb_conn_t *conn;
dnl cddb_http_enable(conn);
dnl ], [
dnl HAVE_CDDB=yes
dnl AC_DEFINE(HAVE_CDDB, [], [Define this if you have libcddb installed])
dnl ],
dnl AC_MSG_WARN(libcddb library might not be new enough; need version 0.90 or greater),
dnl HAVE_CDDB=no)
dnl AC_DEFINE([HAVE_CDDB],[],
dnl [Define this if you have libcddb installed])
AC_TRY_COMPILE([#include <cddb/cddb.h>],[
cddb_conn_t *conn;
cddb_http_enable(conn);
], [
HAVE_CDDB=yes
AC_DEFINE(HAVE_CDDB, [], [Define this if you have libcddb installed])
],
AC_MSG_WARN(libcddb library might not be new enough; need version 0.90 or greater),
HAVE_CDDB=no)
fi

24
lib/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.5 2003/04/19 08:29:14 rocky Exp $
# $Id: Makefile.am,v 1.6 2003/04/20 01:39:23 rocky Exp $
#
# Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
#
@@ -48,25 +48,3 @@ lib_LTLIBRARIES = libcdio.la
libcdio_la_SOURCES = $(libcdio_sources)
INCLUDES = -I$(LIBCDIO_CFLAGS)
###
# Install header files (default=$includedir/cdio)
#
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)/cdio
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/cdio/"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/cdio/; \
done
###
# Remove them
#
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
list='$(include_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(includedir)/cdio/$$p; \
done

4
src/cdinfo.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdinfo.c,v 1.12 2003/04/19 08:29:14 rocky Exp $
$Id: cdinfo.c,v 1.13 2003/04/20 01:39:23 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
@@ -718,7 +718,7 @@ print_cddb_info() {
cddb_set_email_address(conn, "me@home");
cddb_set_server_name(conn, "freedb.freedb.org");
cddb_set_server_port(conn, 8880);
cddb_http_enable(conn, 0);
cddb_http_disable(conn);
disc = cddb_disc_new();
if (!disc) {