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

Make like the others.

Browse Source
This commit is contained in:
rocky
2004-08-07 23:17:36 +00:00
parent 87f0c9334f
commit 2ed97633f7
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/_cdio_bsdi.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_bsdi.c,v 1.36 2004/08/07 22:58:51 rocky Exp $ $Id: _cdio_bsdi.c,v 1.37 2004/08/07 23:17:36 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_bsdi.c,v 1.36 2004/08/07 22:58:51 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.37 2004/08/07 23:17:36 rocky Exp $";
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
@@ -79,9 +79,6 @@ typedef struct {
cdtext_t cdtext; /* CD-TEXT */ cdtext_t cdtext; /* CD-TEXT */
bool b_cdtext_init;
bool b_cdtext_error;
/* Some of the more OS specific things. */ /* Some of the more OS specific things. */
cdtext_t cdtext_track[CDIO_CD_MAX_TRACKS+1]; /*CD-TEXT for each track*/ cdtext_t cdtext_track[CDIO_CD_MAX_TRACKS+1]; /*CD-TEXT for each track*/
/* Track information */ /* Track information */
@@ -548,7 +545,7 @@ set_cdtext_field_bsdi(void *p_user_data, track_t i_track,
not exist. not exist.
*/ */
static bool static bool
_init_cdtext_bsdi (_img_private_t *p_env) init_cdtext_bsdi (_img_private_t *p_env)
{ {
return scsi_mmc_init_cdtext_private( p_env->gen.cdio, return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
&run_scsi_cmd_bsdi, &run_scsi_cmd_bsdi,
@@ -570,14 +567,12 @@ get_cdtext_bsdi (void *p_user_data, track_t i_track)
if ( NULL == p_env || if ( NULL == p_env ||
(0 != i_track (0 != i_track
&& i_track >= p_env->gen.i_tracks+p_env->gen.i_first_track ) && i_track >= p_env->gen.i_tracks+p_env->gen.i_first_track ) )
|| p_env ->b_cdtext_error )
return NULL; return NULL;
if (!p_env->b_cdtext_init) if (!p_env->gen.b_cdtext_init)
p_env->b_cdtext_init = _init_cdtext_bsdi(p_env); init_cdtext_bsdi(p_env);
if (!p_env->gen.b_cdtext_init) return NULL;
if (!p_env->b_cdtext_init) return NULL;
if (0 == i_track) if (0 == i_track)
return &(p_env->cdtext); return &(p_env->cdtext);