diff --git a/Makefile.am b/Makefile.am index 1e35eddf..80e7ec21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.15 2003/09/19 04:38:39 rocky Exp $ +# $Id: Makefile.am,v 1.16 2003/09/28 22:11:00 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -21,14 +21,9 @@ ## which make can then use to produce stuff. Isn't configuration simple? EXTRA_DIST = libpopt.m4 THANKS libcdio.spec.in libcdio.spec \ - example/Makefile \ - example/README \ - example/sample1.c \ - example/sample2.c \ - example/sample3.c \ - example/sample4.c + example/README -SUBDIRS = doc include lib src test +SUBDIRS = doc include lib src test example # pkg-config(1) related rules pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 8f2fc25f..84eb5a9b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA dnl 02111-1307, USA. AC_PREREQ(2.54) -AC_REVISION([$Id: configure.ac,v 1.46 2003/09/27 23:29:29 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.47 2003/09/28 22:11:00 rocky Exp $])dnl AC_INIT(lib/cdio.c) AM_INIT_AUTOMAKE(libcdio, 0.64-cvs) AM_CONFIG_HEADER(config.h) @@ -315,6 +315,7 @@ AC_CONFIG_FILES([ \ libcdio.pc \ libcdio.spec \ libiso9660.pc \ + example/Makefile \ include/Makefile \ include/cdio/Makefile \ include/cdio/version.h \ diff --git a/example/.cvsignore b/example/.cvsignore index 83f6e3ff..c16cffc9 100644 --- a/example/.cvsignore +++ b/example/.cvsignore @@ -1,5 +1,9 @@ +.cvsignore +Makefile.in +Makfile sample1 sample2 sample3 sample4 +sample5 diff --git a/example/Makefile b/example/Makefile index fcc80226..a2ad56e7 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,15 +1,409 @@ -all: sample1 sample2 sample3 sample4 sample5 -sample1: sample1.c - gcc -g -Wall $< -l cdio -o $@ -sample2: sample2.c - gcc -g -Wall $< -l cdio -o $@ +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# example/Makefile. Generated from Makefile.in by configure. -sample3: sample3.c - gcc -g -Wall $< -l cdio -o $@ +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -sample4: sample4.c - gcc -g -Wall $< -l cdio -o $@ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -sample5: sample5.c - gcc -g -Wall $< -l cdio -o $@ +SHELL = /bin/sh + +srcdir = . +top_srcdir = .. + +prefix = /usr/local +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = ${prefix}/etc +sharedstatedir = ${prefix}/com +localstatedir = ${prefix}/var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include +pkgdatadir = $(datadir)/libcdio +pkglibdir = $(libdir)/libcdio +pkgincludedir = $(includedir)/libcdio +top_builddir = .. + +ACLOCAL = ${SHELL} /home/src/external-cvs/libcdio/missing --run aclocal-1.6 +AUTOCONF = ${SHELL} /home/src/external-cvs/libcdio/missing --run autoconf +AUTOMAKE = ${SHELL} /home/src/external-cvs/libcdio/missing --run automake-1.6 +AUTOHEADER = ${SHELL} /home/src/external-cvs/libcdio/missing --run autoheader + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} +INSTALL_DATA = ${INSTALL} -m 644 +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = ${INSTALL} +INSTALL_HEADER = $(INSTALL_DATA) +transform = s,x,x, +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = +host_triplet = i686-pc-linux-gnu + +EXEEXT = +OBJEXT = o +PATH_SEPARATOR = : +ACLOCAL_AMFLAGS = -I . +AMTAR = ${SHELL} /home/src/external-cvs/libcdio/missing --run tar +AS = @AS@ +AWK = gawk +CC = gcc +CDDB_LIBS = -L/usr/local/lib -lcddb +DEPDIR = .deps +DIFF = /usr/bin/diff +DIFF_OPTS = -w --unified +DLLTOOL = @DLLTOOL@ +ECHO = echo +HAVE_BSDI_CDROM = +HAVE_DARWIN_CDROM = +HAVE_LINUX_CDROM = +HAVE_SOLARIS_CDROM = +HAVE_WIN32_CDROM = +HELP2MAN = ${SHELL} /home/src/external-cvs/libcdio/missing --run help2man +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LIBCDIO_CFLAGS = -I$(top_srcdir)/lib/ -I$(top_srcdir)/include/ +LIBCDIO_LIBS = $(top_builddir)/lib/libcdio.la +LIBISO9660_LIBS = $(top_builddir)/lib/libiso9660.la +LIBPOPT_CFLAGS = +LIBPOPT_LIBS = -lpopt +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LINUX_CDROM_TIMEOUT = +LN_S = ln -s +MAINT = +OBJDUMP = @OBJDUMP@ +PACKAGE = libcdio +PERL = /usr/bin/perl +PKG_CONFIG = /usr/bin/pkg-config +RANLIB = ranlib +STRIP = strip +VCDINFO_CFLAGS = -I/usr/local/include +VCDINFO_LIBS = -L/usr/local/lib -lvcdinfo -lvcd -liso9660 -lcdio +VERSION = 0.64-cvs +am__include = include +am__quote = +install_sh = /home/src/external-cvs/libcdio/install-sh + +# $Id: Makefile,v 1.5 2003/09/28 22:11:00 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 regression testing +#################################################### +# +noinst_PROGRAMS = sample1 sample2 sample3 sample4 sample5 + +INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) + +sample1_LDADD = $(LIBCDIO_LIBS) +sample2_LDADD = $(LIBCDIO_LIBS) +sample3_LDADD = $(LIBCDIO_LIBS) +sample4_LDADD = $(LIBCDIO_LIBS) +sample5_LDADD = $(LIBCDIO_LIBS) +subdir = example +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +noinst_PROGRAMS = sample1$(EXEEXT) sample2$(EXEEXT) sample3$(EXEEXT) \ + sample4$(EXEEXT) sample5$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) + +sample1_SOURCES = sample1.c +sample1_OBJECTS = sample1.$(OBJEXT) +sample1_DEPENDENCIES = +sample1_LDFLAGS = +sample2_SOURCES = sample2.c +sample2_OBJECTS = sample2.$(OBJEXT) +sample2_DEPENDENCIES = +sample2_LDFLAGS = +sample3_SOURCES = sample3.c +sample3_OBJECTS = sample3.$(OBJEXT) +sample3_DEPENDENCIES = +sample3_LDFLAGS = +sample4_SOURCES = sample4.c +sample4_OBJECTS = sample4.$(OBJEXT) +sample4_DEPENDENCIES = +sample4_LDFLAGS = +sample5_SOURCES = sample5.c +sample5_OBJECTS = sample5.$(OBJEXT) +sample5_DEPENDENCIES = +sample5_LDFLAGS = + +DEFS = -DHAVE_CONFIG_H +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +CPPFLAGS = +LDFLAGS = +LIBS = -lm +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +DEP_FILES = ./$(DEPDIR)/sample1.Po ./$(DEPDIR)/sample2.Po \ + ./$(DEPDIR)/sample3.Po ./$(DEPDIR)/sample4.Po \ + ./$(DEPDIR)/sample5.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = -g -O3 -march=athlon -Wall -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wunused -Wpointer-arith -Wwrite-strings -Wnested-externs -Wno-sign-compare +DIST_SOURCES = sample1.c sample2.c sample3.c sample4.c sample5.c +DIST_COMMON = README Makefile.am Makefile.in +SOURCES = sample1.c sample2.c sample3.c sample4.c sample5.c + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu example/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +sample1$(EXEEXT): $(sample1_OBJECTS) $(sample1_DEPENDENCIES) + @rm -f sample1$(EXEEXT) + $(LINK) $(sample1_LDFLAGS) $(sample1_OBJECTS) $(sample1_LDADD) $(LIBS) +sample2$(EXEEXT): $(sample2_OBJECTS) $(sample2_DEPENDENCIES) + @rm -f sample2$(EXEEXT) + $(LINK) $(sample2_LDFLAGS) $(sample2_OBJECTS) $(sample2_LDADD) $(LIBS) +sample3$(EXEEXT): $(sample3_OBJECTS) $(sample3_DEPENDENCIES) + @rm -f sample3$(EXEEXT) + $(LINK) $(sample3_LDFLAGS) $(sample3_OBJECTS) $(sample3_LDADD) $(LIBS) +sample4$(EXEEXT): $(sample4_OBJECTS) $(sample4_DEPENDENCIES) + @rm -f sample4$(EXEEXT) + $(LINK) $(sample4_LDFLAGS) $(sample4_OBJECTS) $(sample4_LDADD) $(LIBS) +sample5$(EXEEXT): $(sample5_OBJECTS) $(sample5_DEPENDENCIES) + @rm -f sample5$(EXEEXT) + $(LINK) $(sample5_LDFLAGS) $(sample5_OBJECTS) $(sample5_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/sample1.Po +include ./$(DEPDIR)/sample2.Po +include ./$(DEPDIR)/sample3.Po +include ./$(DEPDIR)/sample4.Po +include ./$(DEPDIR)/sample5.Po + +distclean-depend: + -rm -rf ./$(DEPDIR) + +.c.o: + source='$<' object='$@' libtool=no \ + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ + $(CCDEPMODE) $(depcomp) \ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + +.c.obj: + source='$<' object='$@' libtool=no \ + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ + $(CCDEPMODE) $(depcomp) \ + $(COMPILE) -c `cygpath -w $<` + +.c.lo: + source='$<' object='$@' libtool=yes \ + depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \ + $(CCDEPMODE) $(depcomp) \ + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +CCDEPMODE = depmode=gcc3 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ETAGS = etags +ETAGSFLAGS = + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) + +installdirs: + +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + tags uninstall uninstall-am uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/example/Makefile.am b/example/Makefile.am new file mode 100644 index 00000000..d7d53cae --- /dev/null +++ b/example/Makefile.am @@ -0,0 +1,31 @@ +# $Id: Makefile.am,v 1.1 2003/09/28 22:11:00 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 regression testing +#################################################### +# +noinst_PROGRAMS = sample1 sample2 sample3 sample4 sample5 + +INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) + +sample1_LDADD = $(LIBCDIO_LIBS) +sample2_LDADD = $(LIBCDIO_LIBS) +sample3_LDADD = $(LIBCDIO_LIBS) +sample4_LDADD = $(LIBCDIO_LIBS) +sample5_LDADD = $(LIBCDIO_LIBS) diff --git a/example/sample1.c b/example/sample1.c index f1c0e691..9fa750b5 100644 --- a/example/sample1.c +++ b/example/sample1.c @@ -1,5 +1,5 @@ /* - $Id: sample1.c,v 1.2 2003/08/09 11:52:00 rocky Exp $ + $Id: sample1.c,v 1.3 2003/09/28 22:11:00 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -20,6 +20,9 @@ /* Simple program to list track numbers and logical sector numbers of a Compact Disc using libcdio. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include diff --git a/example/sample2.c b/example/sample2.c index 56fff53f..4b2e1c57 100644 --- a/example/sample2.c +++ b/example/sample2.c @@ -1,5 +1,5 @@ /* - $Id: sample2.c,v 1.2 2003/08/09 11:52:00 rocky Exp $ + $Id: sample2.c,v 1.3 2003/09/28 22:11:00 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -20,6 +20,9 @@ /* Simple program to show drivers installed and what the default CD-ROM drive is. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include diff --git a/example/sample3.c b/example/sample3.c index c38bf861..c7df279a 100644 --- a/example/sample3.c +++ b/example/sample3.c @@ -1,5 +1,5 @@ /* - $Id: sample3.c,v 1.3 2003/08/17 07:16:10 rocky Exp $ + $Id: sample3.c,v 1.4 2003/09/28 22:11:00 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -22,6 +22,9 @@ A somewhat simplified program to show the use of cdio_guess_cd_type(). Figure out the kind of CD image we've got. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include @@ -34,7 +37,7 @@ print_analysis(cdio_analysis_t cdio_analysis, track_t num_tracks, track_t first_track_num, CdIo *cdio) { switch(CDIO_FSTYPE(fs)) { - case CDIO_FS_NO_DATA: + case CDIO_FS_AUDIO: break; case CDIO_FS_ISO_9660: printf("CD-ROM with ISO 9660 filesystem"); @@ -98,7 +101,7 @@ print_analysis(cdio_analysis_t cdio_analysis, printf("CD-Plus/Extra "); if (fs & CDIO_FS_ANAL_BOOTABLE) printf("bootable CD "); - if (fs & CDIO_FS_ANAL_VIDEOCDI && num_audio == 0) { + if (fs & CDIO_FS_ANAL_VIDEOCD && num_audio == 0) { printf("Video CD "); } if (fs & CDIO_FS_ANAL_SVCD) diff --git a/example/sample4.c b/example/sample4.c index c60afe64..48a341f9 100644 --- a/example/sample4.c +++ b/example/sample4.c @@ -1,5 +1,5 @@ /* - $Id: sample4.c,v 1.1 2003/08/17 07:12:45 rocky Exp $ + $Id: sample4.c,v 1.2 2003/09/28 22:11:00 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -22,6 +22,9 @@ A slightly improved sample3 program: we handle cdio logging and take an optional CD-location. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include @@ -47,7 +50,7 @@ print_analysis(cdio_analysis_t cdio_analysis, track_t num_tracks, track_t first_track_num, CdIo *cdio) { switch(CDIO_FSTYPE(fs)) { - case CDIO_FS_NO_DATA: + case CDIO_FS_AUDIO: break; case CDIO_FS_ISO_9660: printf("CD-ROM with ISO 9660 filesystem"); @@ -111,7 +114,7 @@ print_analysis(cdio_analysis_t cdio_analysis, printf("CD-Plus/Extra "); if (fs & CDIO_FS_ANAL_BOOTABLE) printf("bootable CD "); - if (fs & CDIO_FS_ANAL_VIDEOCDI && num_audio == 0) { + if (fs & CDIO_FS_ANAL_VIDEOCD && num_audio == 0) { printf("Video CD "); } if (fs & CDIO_FS_ANAL_SVCD) diff --git a/example/sample5.c b/example/sample5.c index 804f06e9..ebc61b2a 100644 --- a/example/sample5.c +++ b/example/sample5.c @@ -1,5 +1,5 @@ /* - $Id: sample5.c,v 1.1 2003/09/28 17:14:20 rocky Exp $ + $Id: sample5.c,v 1.2 2003/09/28 22:11:00 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -20,6 +20,9 @@ /* Simple program to show drivers installed and what the default CD-ROM drive is and what CD drives are available. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include