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

example: add sample audio program.

Browse Source 
cd-info.c cdda-player.c: read_subchannel sets format MSF. So caller no
longer has to.
This commit is contained in:
rocky
2005-03-15 04:17:05 +00:00
parent 8aaeb8d71c
commit 8af9063b84
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/Makefile.am
View File

@@ -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 <rocky@panix.com> # Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
# #
@@ -23,11 +23,13 @@
if !DISABLE_CPP if !DISABLE_CPP
SUBDIRS = C++ SUBDIRS = C++
endif endif
noinst_PROGRAMS = cdtext device drives iso1 iso2 iso3 isofuzzy mmc1 mmc2 \ noinst_PROGRAMS = audio cdtext device drives iso1 iso2 iso3 isofuzzy \
paranoia paranoia2 tracks sample3 sample4 mmc1 mmc2 paranoia paranoia2 tracks sample3 sample4
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
audio_LDADD = $(LIBCDIO_LIBS)
cdtext_LDADD = $(LIBCDIO_LIBS) cdtext_LDADD = $(LIBCDIO_LIBS)
device_LDADD = $(LIBCDIO_LIBS) device_LDADD = $(LIBCDIO_LIBS)

4
src/cd-info.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -1066,8 +1066,6 @@ main(int argc, const char *argv[])
driver_return_code_t rc; driver_return_code_t rc;
memset(&subchannel, 0, sizeof(subchannel)); memset(&subchannel, 0, sizeof(subchannel));
subchannel.format = CDIO_CDROM_MSF;
report( stdout, "audio status: "); fflush(stdout); report( stdout, "audio status: "); fflush(stdout);
rc = cdio_audio_read_subchannel(p_cdio, &subchannel); rc = cdio_audio_read_subchannel(p_cdio, &subchannel);

3
src/cdda-player.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -350,7 +350,6 @@ read_subchannel(CdIo_t *p_cdio)
{ {
if (!b_cd) return; if (!b_cd) return;
sub.format = CDIO_CDROM_MSF;
if (DRIVER_OP_SUCCESS != cdio_audio_read_subchannel(p_cdio, &sub)) { if (DRIVER_OP_SUCCESS != cdio_audio_read_subchannel(p_cdio, &sub)) {
xperror("read subchannel"); xperror("read subchannel");
b_cd = 0; b_cd = 0;