diff --git a/ChangeLog b/ChangeLog index 6caa40b5..0be32b60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,116 @@ +2003-04-14 19:11 rocky + + * lib/_cdio_bincue.c: Bug-causing typo. + +2003-04-14 06:03 rocky + + * configure.ac, tests/Makefile.am, tests/check_opts.sh, + tests/check_opts.sh.in: Need to conditionally add --no-cddb so we + added check_opts.sh.in. Rewrite for loop in lower-level + Bourne-shell style. + +2003-04-14 06:01 rocky + + * src/cdinfo.c: One cddb reference not conditionally included. + +2003-04-14 04:54 rocky + + * tests/Makefile.am: Add check files to distribution. + +2003-04-14 04:51 rocky + + * tests/: Makefile.am, check_cue.sh, check_opts.sh, + check_opts0.right, check_opts1.right, check_opts2.right, + check_opts3.right, check_opts4.right, check_opts5.right, + check_opts6.right, check_opts7.right: Add regression test to check + cdinfo options processing. + +2003-04-14 00:58 rocky + + * src/cdinfo.c: libpopt options need to be integers. Change order + of include to accomodate libcddb. Make distcheck now works. + +2003-04-14 00:29 rocky + + * src/Makefile.am: Add CDDB_LIB for cdinfo. + +2003-04-14 00:29 rocky + + * configure.ac: Check for libcddb and use that if it's there. + +2003-04-14 00:28 rocky + + * tests/check_cue.sh: Don't give CDDB info for audio test since + it's not valid and we can't assume we're connected to the Internet. + +2003-04-14 00:27 rocky + + * lib/_cdio_bincue.c: If we don't think this is a cue file, we now + report that rather than give the cryptic message about a null + source. + +2003-04-14 00:26 rocky + + * src/cdinfo.c: CDDB lookup for audio CD via libcddb. + +2003-04-14 00:24 rocky + + * lib/cdio.c: Bad linux default_device initialization. + +2003-04-11 23:38 rocky + + * lib/: _cdio_bincue.c, _cdio_bsdi.h, cdio.c, cdio.h: Add routine + cdio_is_bincue to test if file is a cue file. cdio_open does a + better job in automatically determining the type of file. + +2003-04-11 13:33 rocky + + * lib/: sector.c, sector.h: Tired of all those unused warings. + Remove the static inline stuff. It's probably not worth the + performance gains. (And if it is we can turn into a #define) + +2003-04-11 13:31 rocky + + * lib/_cdio_sunos.c: Move used #include outside of + conditional compilation since strdup's used to get default device. + +2003-04-11 13:30 rocky + + * lib/: _cdio_bincue.c, _cdio_nrg.c: Forgot to add recently added + read_audio_sector to op structure. + +2003-04-10 03:22 rocky + + * configure.ac, lib/_cdio_bincue.c, lib/_cdio_nrg.c: configure.ac: + bump version bincue/nrg: add cdio_read_audio_sector + +2003-04-10 03:19 rocky + + * lib/_cdio_sunos.c: read_mode_audio_sector now works. + +2003-04-10 00:13 rocky + + * lib/: _cdio_bincue.c, _cdio_bsdi.c, _cdio_freebsd.c, + _cdio_generic.c, _cdio_nrg.c, _cdio_sunos.c, cdio.c, cdio.h, + cdio_private.h: get_default_device with NULL will get device + *without* trying to open cd. Add read_audio call. + +2003-04-10 00:11 rocky + + * lib/_cdio_linux.c: Add ability to read audio (CD-DA) sector. + +2003-04-10 00:10 rocky + + * lib/types.h: Add CDIO_INVALID_LSN definition + +2003-04-09 07:15 rocky + + * lib/sector.h: CD_MAX_TRACKS -> CDIO_CD_MAX_TRACKS + +2003-04-08 17:30 rocky + + * ChangeLog: [no log message] + 2003-04-08 17:12 rocky * lib/_cdio_linux.c: Small name changes. diff --git a/Makefile.am b/Makefile.am index 9ec89c7c..1c4a5699 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.1 2003/03/24 19:01:09 rocky Exp $ +# $Id: Makefile.am,v 1.2 2003/04/19 08:29:14 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -20,10 +20,10 @@ ## which configure then turns into a Makefile ... ## which make can then use to produce stuff. Isn't configuration simple? -EXTRA_DIST = libpopt.m4 +EXTRA_DIST = libpopt.m4 THANKS -# SUBDIRS = doc lib src tests -SUBDIRS = lib src tests +# SUBDIRS = doc include lib src tests +SUBDIRS = include lib src tests diff --git a/configure.ac b/configure.ac index 0a23d9e9..7ef8cb17 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_REVISION([$Id: configure.ac,v 1.9 2003/04/19 00:50:39 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.10 2003/04/19 08:29:14 rocky Exp $])dnl AC_INIT(lib/cdio.c) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(libcdio, 0.2) @@ -138,7 +138,7 @@ AC_STDC_HEADERS AC_HAVE_HEADERS( stdbool.h stdlib.h stdint.h stdio.h string.h strings.h linux/version.h sys/cdio.h sys/stat.h sys/types.h ) -LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/' +LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/ -I$(top_srcdir)/include/cdio' LIBCDIO_LIBS='$(top_builddir)/lib/libcdio.la' AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_LIBS) @@ -193,15 +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_TRY_COMPILE([#include ],[ -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) + AC_DEFINE([HAVE_CDDB],[], + [Define this if you have libcddb installed]) +dnl AC_TRY_COMPILE([#include ],[ +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) fi @@ -211,6 +213,8 @@ AC_CONFIG_COMMANDS([check-opts], [chmod +x tests/check_opts.sh]) AC_OUTPUT([ \ Makefile \ + include/Makefile \ + include/cdio/Makefile \ lib/Makefile \ src/Makefile \ tests/check_opts.sh \ diff --git a/include/.cvsignore b/include/.cvsignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/include/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 00000000..836f0420 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,2 @@ + +SUBDIRS = cdio diff --git a/include/cdio/.cvsignore b/include/cdio/.cvsignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/include/cdio/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am new file mode 100644 index 00000000..f8d584f4 --- /dev/null +++ b/include/cdio/Makefile.am @@ -0,0 +1,26 @@ +# $Id: Makefile.am,v 1.1 2003/04/19 08:29:14 rocky Exp $ +# +# Copyright (C) 2003 Rocky Bernstein +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +######################################################## +# Things to make the install (public) libcdio headers +######################################################## +# +pkgincludedir=$(includedir)/cdio + +pkginclude_HEADERS = cdio.h logging.h sector.h types.h util.h + diff --git a/lib/cdio.h b/include/cdio/cdio.h similarity index 99% rename from lib/cdio.h rename to include/cdio/cdio.h index 579f7654..637ff466 100644 --- a/lib/cdio.h +++ b/include/cdio/cdio.h @@ -1,5 +1,5 @@ /* - $Id: cdio.h,v 1.10 2003/04/19 00:52:16 rocky Exp $ + $Id: cdio.h,v 1.1 2003/04/19 08:29:14 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein diff --git a/lib/logging.h b/include/cdio/logging.h similarity index 96% rename from lib/logging.h rename to include/cdio/logging.h index cfc52c1a..61fb4005 100644 --- a/lib/logging.h +++ b/include/cdio/logging.h @@ -1,5 +1,5 @@ /* - $Id: logging.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ + $Id: logging.h,v 1.1 2003/04/19 08:29:14 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel diff --git a/lib/sector.h b/include/cdio/sector.h similarity index 99% rename from lib/sector.h rename to include/cdio/sector.h index f34ec6b7..17aa2d1d 100644 --- a/lib/sector.h +++ b/include/cdio/sector.h @@ -1,5 +1,5 @@ /* - $Id: sector.h,v 1.9 2003/04/11 17:33:03 rocky Exp $ + $Id: sector.h,v 1.1 2003/04/19 08:29:14 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein diff --git a/lib/types.h b/include/cdio/types.h similarity index 99% rename from lib/types.h rename to include/cdio/types.h index 0c439722..aa834d42 100644 --- a/lib/types.h +++ b/include/cdio/types.h @@ -1,5 +1,5 @@ /* - $Id: types.h,v 1.3 2003/04/10 04:10:38 rocky Exp $ + $Id: types.h,v 1.1 2003/04/19 08:29:14 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein diff --git a/lib/util.h b/include/cdio/util.h similarity index 97% rename from lib/util.h rename to include/cdio/util.h index 3fdde828..729110b1 100644 --- a/lib/util.h +++ b/include/cdio/util.h @@ -1,5 +1,5 @@ /* - $Id: util.h,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: util.h,v 1.1 2003/04/19 08:29:14 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel diff --git a/lib/Makefile.am b/lib/Makefile.am index d43ac1bd..5fcd1be9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.4 2003/04/03 12:16:27 rocky Exp $ +# $Id: Makefile.am,v 1.5 2003/04/19 08:29:14 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -23,8 +23,6 @@ noinst_HEADERS = cdio_assert.h bytesex.h bytesex_asm.h \ cdio_private.h ds.h -include_HEADERS = cdio.h logging.h sector.h types.h util.h - libcdio_sources = \ _cdio_bincue.c \ _cdio_bsdi.c \ @@ -40,21 +38,16 @@ libcdio_sources = \ bytesex.h \ bytesex_asm.h \ cdio.c \ - cdio.h \ ds.c \ ds.h \ - types.h \ logging.c \ - logging.h \ sector.c \ - sector.h \ - util.c \ - util.h - + util.c lib_LTLIBRARIES = libcdio.la libcdio_la_SOURCES = $(libcdio_sources) +INCLUDES = -I$(LIBCDIO_CFLAGS) ### # Install header files (default=$includedir/cdio) # diff --git a/src/cdinfo.c b/src/cdinfo.c index 1ed70098..316d9ced 100644 --- a/src/cdinfo.c +++ b/src/cdinfo.c @@ -1,5 +1,5 @@ /* - $Id: cdinfo.c,v 1.11 2003/04/19 00:53:27 rocky Exp $ + $Id: cdinfo.c,v 1.12 2003/04/19 08:29:14 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 1996,1997,1998 Gerd Knorr @@ -718,11 +718,11 @@ 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); + cddb_http_enable(conn, 0); disc = cddb_disc_new(); if (!disc) { - fprintf(stderr, "%s unable to create CDDB disc structure", program_name); + fprintf(stderr, "%s: unable to create CDDB disc structure", program_name); goto cddb_destroy; } for(i = 0; i < num_tracks; i++) { @@ -743,6 +743,7 @@ print_cddb_info() { matches = cddb_query(conn, disc); + printf("%s: Found %d matches in CDDB\n", program_name, matches); for (i=1; i<=matches; i++) { cddb_read(conn, disc); cddb_disc_print(disc); diff --git a/tests/.cvsignore b/tests/.cvsignore index 6c2d8db4..7b489577 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -1,5 +1,6 @@ Makefile Makefile.in +check_opts.sh *.dump *.cue *.bin