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

1st attempt to reduce duplicate CD-Text code. (It works on GNU/Linux)...

Browse Source
This commit is contained in:
rocky
2004-08-10 03:03:27 +00:00
parent 993ec7356f
commit e39890f7c8
9 changed files with 82 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_sunos.c,v 1.69 2004/08/07 22:58:51 rocky Exp $
$Id: _cdio_sunos.c,v 1.70 2004/08/10 03:03:27 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.69 2004/08/07 22:58:51 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.70 2004/08/10 03:03:27 rocky Exp $";
#ifdef HAVE_GLOB_H
#include <glob.h>
@@ -86,15 +86,12 @@ typedef struct {
This must be first. */
generic_img_private_t gen;
/* Entry info for each track, add 1 for leadout. */
struct cdrom_tocentry tocent[CDIO_CD_MAX_TRACKS+1];
cdtext_t cdtext; /* CD-TEXT */
access_mode_t access_mode;
/* Some of the more OS specific things. */
cdtext_t cdtext_track[CDIO_CD_MAX_TRACKS+1]; /*CD-TEXT for each track*/
/* Entry info for each track, add 1 for leadout. */
struct cdrom_tocentry tocent[CDIO_CD_MAX_TRACKS+1];
/* Track information */
struct cdrom_tochdr tochdr;
} _img_private_t;
@@ -448,38 +445,6 @@ read_toc_solaris (void *p_user_data)
return true;
}
static void
set_cdtext_field_solaris(void *p_user_data, track_t i_track,
track_t i_first_track,
cdtext_field_t e_field, const char *psz_value)
{
char **pp_field;
_img_private_t *p_env = p_user_data;
if( i_track == 0 )
pp_field = &(p_env->cdtext.field[e_field]);
else
pp_field = &(p_env->cdtext_track[i_track-i_first_track].field[e_field]);
*pp_field = strdup(psz_value);
}
/*
Read cdtext information for a CdIo object .
return true on success, false on error or CD-TEXT information does
not exist.
*/
static bool
init_cdtext_solaris (_img_private_t *p_env)
{
return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
&run_scsi_cmd_solaris,
set_cdtext_field_solaris
);
}
/*!
Get cdtext information for a CdIo object .
@@ -498,14 +463,14 @@ get_cdtext_solaris (void *p_user_data, track_t i_track)
return NULL;
if (!p_env->gen.b_cdtext_init)
init_cdtext_solaris(p_env);
init_cdtext_generic(&p_env->gen));
if (!p_env->gen.b_cdtext_init) return NULL;
if (0 == i_track)
return &(p_env->cdtext);
return &(p_env->gen.cdtext);
else
return &(p_env->cdtext_track[i_track-p_env->gen.i_first_track]);
return &(p_env->gen.cdtext_track[i_track-p_env->gen.i_first_track]);
}
/*!