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

Add b_cdtext_init and b_cdtext_error to generic structure. If we

Browse Source 
can't read cdtext once, mark as an error and don't try to read again.
This commit is contained in:
rocky
2004-08-07 22:58:51 +00:00
parent 14b373d90e
commit 87f0c9334f
9 changed files with 73 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_sunos.c,v 1.68 2004/08/03 11:30:42 imacintosh Exp $
$Id: _cdio_sunos.c,v 1.69 2004/08/07 22:58:51 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.68 2004/08/03 11:30:42 imacintosh Exp $";
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.69 2004/08/07 22:58:51 rocky Exp $";
#ifdef HAVE_GLOB_H
#include <glob.h>
@@ -92,8 +92,6 @@ typedef struct {
cdtext_t cdtext; /* CD-TEXT */
access_mode_t access_mode;
bool b_cdtext_init;
bool b_cdtext_error;
/* Some of the more OS specific things. */
cdtext_t cdtext_track[CDIO_CD_MAX_TRACKS+1]; /*CD-TEXT for each track*/
@@ -474,7 +472,7 @@ set_cdtext_field_solaris(void *p_user_data, track_t i_track,
not exist.
*/
static bool
_init_cdtext_solaris (_img_private_t *p_env)
init_cdtext_solaris (_img_private_t *p_env)
{
return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
&run_scsi_cmd_solaris,
@@ -496,14 +494,13 @@ get_cdtext_solaris (void *p_user_data, track_t i_track)
if ( NULL == p_env ||
(0 != i_track
&& i_track >= p_env->gen.i_tracks+p_env->gen.i_first_track )
|| p_env ->b_cdtext_error )
&& i_track >= p_env->gen.i_tracks+p_env->gen.i_first_track ) )
return NULL;
if (!p_env->b_cdtext_init)
p_env->b_cdtext_init = _init_cdtext_solaris(p_env);
if (!p_env->gen.b_cdtext_init)
init_cdtext_solaris(p_env);
if (!p_env->b_cdtext_init) return NULL;
if (!p_env->gen.b_cdtext_init) return NULL;
if (0 == i_track)
return &(p_env->cdtext);
@@ -928,8 +925,8 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode)
_data->access_mode = _AM_SUN_CTRL_SCSI;
_data->gen.init = false;
_data->gen.fd = -1;
_data->b_cdtext_init = false;
_data->b_cdtext_error = false;
_data->gen.b_cdtext_init = false;
_data->gen.b_cdtext_error = false;
if (NULL == psz_orig_source) {
psz_source = cdio_get_default_device_solaris();