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

mmc.c: fix up read_audio_subchannel_mmc

Browse Source 
audio.h: more direct field names
mmc.h: add mmc_subchannel_t;  scsi_mmc -> mmc
cdio-linux.c: remove deprecated from_bcd8
This commit is contained in:
rocky
2005-03-01 10:53:15 +00:00
parent cd328dac84
commit 881d4fcf8f
9 changed files with 128 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cd-info.c,v 1.122 2005/03/01 07:54:09 rocky Exp $
$Id: cd-info.c,v 1.123 2005/03/01 10:53:15 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -1150,7 +1150,7 @@ main(int argc, const char *argv[])
driver_return_code_t rc;
memset(&subchannel, 0, sizeof(subchannel));
subchannel.cdsc_format = CDIO_CDROM_MSF;
subchannel.format = CDIO_CDROM_MSF;
rc = cdio_audio_read_subchannel(p_cdio, &subchannel);
@@ -1158,7 +1158,7 @@ main(int argc, const char *argv[])
report( stdout, "audio status: "); fflush(stdout);
switch (subchannel.cdsc_audiostatus) {
switch (subchannel.audio_status) {
case CDIO_MMC_READ_SUB_ST_INVALID:
report( stdout, "invalid\n" ); break;
case CDIO_MMC_READ_SUB_ST_PLAY:
@@ -1175,14 +1175,14 @@ main(int argc, const char *argv[])
default:
report( stdout, "Oops: unknown\n" );
}
if (subchannel.cdsc_audiostatus == CDIO_MMC_READ_SUB_ST_PLAY ||
subchannel.cdsc_audiostatus == CDIO_MMC_READ_SUB_ST_PAUSED) {
if (subchannel.audio_status == CDIO_MMC_READ_SUB_ST_PLAY ||
subchannel.audio_status == CDIO_MMC_READ_SUB_ST_PAUSED) {
report( stdout, " at: %02d:%02d abs / %02d:%02d track %d\n",
subchannel.cdsc_absaddr.msf.m,
subchannel.cdsc_absaddr.msf.s,
subchannel.cdsc_reladdr.msf.m,
subchannel.cdsc_reladdr.msf.s,
subchannel.cdsc_trk );
subchannel.abs_addr.msf.m,
subchannel.abs_addr.msf.s,
subchannel.rel_addr.msf.m,
subchannel.rel_addr.msf.s,
subchannel.track );
}
} else {
report( stdout, "FAILED\n" );

4
src/cdinfo-linux.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdinfo-linux.c,v 1.2 2003/09/25 10:28:22 rocky Exp $
$Id: cdinfo-linux.c,v 1.3 2005/03/01 10:53:15 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
@@ -541,7 +541,7 @@ cddb_dec_digit_sum(int n)
static inline unsigned int
msf_seconds(msf_t *msf)
{
return from_bcd8(msf->m)*60 + from_bcd8(msf->s);
return cdio_from_bcd8(msf->m)*60 + cdio_from_bcd8(msf->s);
}
/*