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

Add track flags for solaris. Regression test without vcdinfo corrected.

Browse Source
This commit is contained in:
rocky
2004-12-31 08:27:49 +00:00
parent 97a51c3c26
commit 1022ccd689
4 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/driver/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.2 2004/12/31 05:47:36 rocky Exp $ $Id: _cdio_linux.c,v 1.3 2004/12/31 08:27:49 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.2 2004/12/31 05:47:36 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.3 2004/12/31 08:27:49 rocky Exp $";
#include <string.h> #include <string.h>
@@ -848,7 +848,7 @@ read_toc_linux (void *p_user_data)
return false; return false;
} }
/** FIXME: Move into generic. **/ /** FIXME: Do in a more generic place? **/
p_env->gen.track_flags[i].preemphasis = p_env->gen.track_flags[i].preemphasis =
p_toc->cdte_ctrl & 0x1 ? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE; p_toc->cdte_ctrl & 0x1 ? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;

31
lib/driver/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.1 2004/12/18 17:29:32 rocky Exp $ $Id: _cdio_sunos.c,v 1.2 2004/12/31 08:27:49 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.1 2004/12/18 17:29:32 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.2 2004/12/31 08:27:49 rocky Exp $";
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>
@@ -420,14 +420,28 @@ read_toc_solaris (void *p_user_data)
/* read individual tracks */ /* read individual tracks */
for (i=p_env->gen.i_first_track; i<=p_env->gen.i_tracks; i++) { for (i=p_env->gen.i_first_track; i<=p_env->gen.i_tracks; i++) {
p_env->tocent[i-1].cdte_track = i; struct cdrom_tocentry *p_toc =
p_env->tocent[i-1].cdte_format = CDIO_CDROM_MSF; &(p_env->tocent[i-p_env->gen.i_first_track]);
if ( ioctl(p_env->gen.fd, CDROMREADTOCENTRY, &p_env->tocent[i-1]) == -1 ) {
p_toc->cdte_track = i;
p_toc->cdte_format = CDIO_CDROM_MSF;
if ( ioctl(p_env->gen.fd, CDROMREADTOCENTRY, p_toc) == -1 ) {
cdio_warn("%s %d: %s\n", cdio_warn("%s %d: %s\n",
"error in ioctl CDROMREADTOCENTRY for track", "error in ioctl CDROMREADTOCENTRY for track",
i, strerror(errno)); i, strerror(errno));
return false; return false;
} }
/** FIXME: Do in a more generic place? **/
p_env->gen.track_flags[i].preemphasis =
p_toc->cdte_ctrl & 0x1 ? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
p_env->gen.track_flags[i].copy_permit =
p_toc->cdte_ctrl & 0x2 ? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
p_env->gen.track_flags[i].channels =
p_toc->cdte_ctrl & 0x8 ? 4 : 2;
} }
/* read the lead-out track */ /* read the lead-out track */
@@ -854,13 +868,16 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode)
_funcs.get_devices = cdio_get_devices_solaris; _funcs.get_devices = cdio_get_devices_solaris;
_funcs.get_discmode = get_discmode_solaris; _funcs.get_discmode = get_discmode_solaris;
_funcs.get_drive_cap = scsi_mmc_get_drive_cap_generic; _funcs.get_drive_cap = scsi_mmc_get_drive_cap_generic;
_funcs.get_first_track_num= get_first_track_num_generic; _funcs.get_first_track_num = get_first_track_num_generic;
_funcs.get_hwinfo = NULL; _funcs.get_hwinfo = NULL;
_funcs.get_mcn = scsi_mmc_get_mcn_generic, _funcs.get_mcn = scsi_mmc_get_mcn_generic,
_funcs.get_num_tracks = get_num_tracks_generic; _funcs.get_num_tracks = get_num_tracks_generic;
_funcs.get_track_channels = get_track_channels_generic,
_funcs.get_track_copy_permit = get_track_copy_permit_generic,
_funcs.get_track_format = get_track_format_solaris; _funcs.get_track_format = get_track_format_solaris;
_funcs.get_track_green = _cdio_get_track_green; _funcs.get_track_green = _cdio_get_track_green;
_funcs.get_track_lba = NULL; /* This could be implemented if need be. */ _funcs.get_track_lba = NULL; /* This could be done if need be. */
_funcs.get_track_preemphasis = get_track_preemphasis_generic,
_funcs.get_track_msf = _cdio_get_track_msf; _funcs.get_track_msf = _cdio_get_track_msf;
_funcs.lseek = cdio_generic_lseek; _funcs.lseek = cdio_generic_lseek;
_funcs.read = cdio_generic_read; _funcs.read = cdio_generic_read;

4
test/check_cue.sh.in
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
#$Id: check_cue.sh.in,v 1.22 2004/12/31 07:51:43 rocky Exp $ #$Id: check_cue.sh.in,v 1.23 2004/12/31 08:27:49 rocky Exp $
# Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct # Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
# (via cd-info). # (via cd-info).
@@ -72,7 +72,7 @@ if test -f ${srcdir}/${fname}.bin ; then
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts" check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
if test -z "@VCDINFO_LIBS@" ; then if test -z "@VCDINFO_LIBS@" ; then
right=${srcdir}/${fname}.right right=${srcdir}/${fname}_toc.right
else else
right=${srcdir}/${fname}_vcdinfo_toc.right right=${srcdir}/${fname}_vcdinfo_toc.right
fi fi

8
test/vcd_demo.right
View File

@@ -4,10 +4,10 @@ PARTICULAR PURPOSE.
__________________________________ __________________________________
CD-ROM Track List (1 - 3) CD-ROM Track List (1 - 3)
#: MSF LSN Type Green? #: MSF LSN Type Green? Copy?
1: 00:02:00 000000 XA true 1: 00:02:00 000000 XA true yes
2: 00:17:57 001182 XA true 2: 00:17:57 001182 XA true yes
3: 00:24:71 001721 XA true 3: 00:24:71 001721 XA true yes
170: 00:30:10 002110 leadout (4 MB) 170: 00:30:10 002110 leadout (4 MB)
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________