diff --git a/example/Makefile.am b/example/Makefile.am index aaecfda4..6c78e66b 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.20 2005/02/19 11:44:06 rocky Exp $ +# $Id: Makefile.am,v 1.21 2005/03/15 04:17:05 rocky Exp $ # # Copyright (C) 2003, 2004, 2005 Rocky Bernstein # @@ -23,11 +23,13 @@ if !DISABLE_CPP SUBDIRS = C++ endif -noinst_PROGRAMS = cdtext device drives iso1 iso2 iso3 isofuzzy mmc1 mmc2 \ - paranoia paranoia2 tracks sample3 sample4 +noinst_PROGRAMS = audio cdtext device drives iso1 iso2 iso3 isofuzzy \ + mmc1 mmc2 paranoia paranoia2 tracks sample3 sample4 INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) +audio_LDADD = $(LIBCDIO_LIBS) + cdtext_LDADD = $(LIBCDIO_LIBS) device_LDADD = $(LIBCDIO_LIBS) diff --git a/src/cd-info.c b/src/cd-info.c index 990eb21f..83b88e31 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -1,5 +1,5 @@ /* - $Id: cd-info.c,v 1.134 2005/03/12 06:02:36 rocky Exp $ + $Id: cd-info.c,v 1.135 2005/03/15 04:17:05 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein Copyright (C) 1996, 1997, 1998 Gerd Knorr @@ -1066,8 +1066,6 @@ main(int argc, const char *argv[]) driver_return_code_t rc; memset(&subchannel, 0, sizeof(subchannel)); - subchannel.format = CDIO_CDROM_MSF; - report( stdout, "audio status: "); fflush(stdout); rc = cdio_audio_read_subchannel(p_cdio, &subchannel); diff --git a/src/cdda-player.c b/src/cdda-player.c index ead4b467..adf8cca0 100644 --- a/src/cdda-player.c +++ b/src/cdda-player.c @@ -1,5 +1,5 @@ /* - $Id: cdda-player.c,v 1.11 2005/03/14 02:03:33 rocky Exp $ + $Id: cdda-player.c,v 1.12 2005/03/15 04:17:05 rocky Exp $ Copyright (C) 2005 Rocky Bernstein @@ -350,7 +350,6 @@ read_subchannel(CdIo_t *p_cdio) { if (!b_cd) return; - sub.format = CDIO_CDROM_MSF; if (DRIVER_OP_SUCCESS != cdio_audio_read_subchannel(p_cdio, &sub)) { xperror("read subchannel"); b_cd = 0;