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

cdparanoia: add ability to disable byte swapping

Browse Source 
configure.ac: remove AIX driver for now - it doesn't really work
remove some (but not all) of the valgrind errors in cd-text
Some stylistic things, doxygen comment improvements typos, etc.
This commit is contained in:
rocky
2005-01-27 03:10:06 +00:00
parent e30c3a3eb8
commit 9e2eaf7546
15 changed files with 97 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/driver/_cdio_generic.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_generic.c,v 1.12 2005/01/26 01:03:16 rocky Exp $
$Id: _cdio_generic.c,v 1.13 2005/01/27 03:10:06 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -25,7 +25,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.12 2005/01/26 01:03:16 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.13 2005/01/27 03:10:06 rocky Exp $";
#include <stdio.h>
#include <stdlib.h>
@@ -256,7 +256,7 @@ cdio_add_device_list(char **device_list[], const char *drive,
@return the CD-TEXT object or NULL if obj is NULL
or CD-TEXT information does not exist.
*/
const cdtext_t *
cdtext_t *
get_cdtext_generic (void *p_user_data, track_t i_track)
{
generic_img_private_t *p_env = p_user_data;
@@ -409,26 +409,27 @@ get_num_tracks_generic(void *p_user_data)
}
void
set_cdtext_field_generic(void *user_data, track_t i_track,
set_cdtext_field_generic(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;
generic_img_private_t *env = user_data;
generic_img_private_t *p_env = p_user_data;
if( i_track == 0 )
pp_field = &(env->cdtext.field[e_field]);
pp_field = &(p_env->cdtext.field[e_field]);
else
pp_field = &(env->cdtext_track[i_track-i_first_track].field[e_field]);
pp_field = &(p_env->cdtext_track[i_track-i_first_track].field[e_field]);
*pp_field = strdup(psz_value);
if (*pp_field) free(*pp_field);
*pp_field = (psz_value) ? strdup(psz_value) : NULL;
}
/*!
Read CD-Text information for a CdIo_t object .
return true on success, false on error or CD-TEXT information does
return true on success, false on error or CD-Text information does
not exist.
*/
bool

6
lib/driver/cdio.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdio.c,v 1.11 2005/01/20 00:36:38 rocky Exp $
$Id: cdio.c,v 1.12 2005/01/27 03:10:06 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -35,7 +35,7 @@
#include <cdio/util.h>
#include "cdio_private.h"
static const char _rcsid[] = "$Id: cdio.c,v 1.11 2005/01/20 00:36:38 rocky Exp $";
static const char _rcsid[] = "$Id: cdio.c,v 1.12 2005/01/27 03:10:06 rocky Exp $";
/*!
@@ -61,7 +61,7 @@ cdio_get_arg (const CdIo *obj, const char key[])
@return the CD-TEXT object or NULL if obj is NULL
or CD-TEXT information does not exist.
*/
const cdtext_t *
cdtext_t *
cdio_get_cdtext (CdIo *obj, track_t i_track)
{
if (obj == NULL) return NULL;

4
lib/driver/cdio_private.h
View File

@@ -1,5 +1,5 @@
/*
$Id: cdio_private.h,v 1.10 2005/01/24 00:06:31 rocky Exp $
$Id: cdio_private.h,v 1.11 2005/01/27 03:10:06 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -85,7 +85,7 @@ extern "C" {
If i_track is 0 or CDIO_CDROM_LEADOUT_TRACK the track returned
is the information assocated with the CD.
*/
const cdtext_t * (*get_cdtext) (void *p_env, track_t i_track);
cdtext_t * (*get_cdtext) (void *p_env, track_t i_track);
/*!
Return an array of device names. if CdIo is NULL (we haven't

57
lib/driver/cdtext.c
View File

@@ -1,7 +1,7 @@
/*
$Id: cdtext.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
$Id: cdtext.c,v 1.2 2005/01/27 03:10:06 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools
Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
@@ -66,15 +66,18 @@ cdtext_field2str (cdtext_field_t i)
return cdtext_keywords[i];
}
/*! Free memory assocated with cdtext*/
void
cdtext_destroy (cdtext_t *cdtext)
cdtext_destroy (cdtext_t *p_cdtext)
{
cdtext_field_t i;
for (i=0; i < MAX_CDTEXT_FIELDS; i++) {
if (cdtext->field[i]) free(cdtext->field[i]);
if (p_cdtext->field[i]) {
free(p_cdtext->field[i]);
p_cdtext->field[i] = NULL;
}
}
}
@@ -82,11 +85,11 @@ cdtext_destroy (cdtext_t *cdtext)
returns the CDTEXT value associated with key. NULL is returned
if key is CDTEXT_INVALID or the field is not set.
*/
const char *
cdtext_get (cdtext_field_t key, const cdtext_t *cdtext)
char *
cdtext_get (cdtext_field_t key, const cdtext_t *p_cdtext)
{
if (key == CDTEXT_INVALID) return NULL;
return cdtext->field[key];
return strdup(p_cdtext->field[key]);
}
/*! Initialize a new cdtext structure.
@@ -94,12 +97,12 @@ cdtext_get (cdtext_field_t key, const cdtext_t *cdtext)
resources using cdtext_delete.
*/
void
cdtext_init (cdtext_t *cdtext)
cdtext_init (cdtext_t *p_cdtext)
{
cdtext_field_t i;
for (i=0; i < MAX_CDTEXT_FIELDS; i++) {
cdtext->field[i] = NULL;
p_cdtext->field[i] = NULL;
}
}
@@ -132,27 +135,27 @@ cdtext_is_keyword (const char *key)
/*! sets cdtext's keyword entry to field.
*/
void
cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext)
cdtext_set (cdtext_field_t key, const char *p_value, cdtext_t *p_cdtext)
{
if (NULL == value || key == CDTEXT_INVALID) return;
if (NULL == p_value || key == CDTEXT_INVALID) return;
if (cdtext->field[key]) free (cdtext->field[key]);
cdtext->field[key] = strdup (value);
if (p_cdtext->field[key]) free (p_cdtext->field[key]);
p_cdtext->field[key] = strdup (p_value);
}
#define SET_CDTEXT_FIELD(FIELD) \
(*set_cdtext_field_fn)(user_data, i_track, i_first_track, FIELD, buffer);
(*set_cdtext_field_fn)(p_user_data, i_track, i_first_track, FIELD, buffer);
/*
parse all CD-TEXT data retrieved.
*/
bool
cdtext_data_init(void *user_data, track_t i_first_track,
cdtext_data_init(void *p_user_data, track_t i_first_track,
unsigned char *wdata,
set_cdtext_field_fn_t set_cdtext_field_fn)
{
CDText_data_t *pdata;
CDText_data_t *p_data;
int i;
int j;
char buffer[256];
@@ -163,27 +166,27 @@ cdtext_data_init(void *user_data, track_t i_first_track,
memset( buffer, 0x00, sizeof(buffer) );
idx = 0;
pdata = (CDText_data_t *) (&wdata[4]);
p_data = (CDText_data_t *) (&wdata[4]);
for( i=0; i < CDIO_CDTEXT_MAX_PACK_DATA; i++ ) {
#if TESTED
if ( pdata->bDBC ) {
if ( p_data->bDBC ) {
cdio_warn("Double-byte characters not supported");
return false;
}
#endif
if( pdata->seq != i )
if( p_data->seq != i )
break;
if( (pdata->type >= 0x80)
&& (pdata->type <= 0x85) && (pdata->block == 0) ) {
i_track = pdata->i_track;
if( (p_data->type >= 0x80)
&& (p_data->type <= 0x85) && (p_data->block == 0) ) {
i_track = p_data->i_track;
for( j=0; j < CDIO_CDTEXT_MAX_TEXT_DATA; j++ ) {
if( pdata->text[j] == 0x00 ) {
if( p_data->text[j] == 0x00 ) {
bool b_field_set=true;
switch( pdata->type) {
switch( p_data->type) {
case CDIO_CDTEXT_TITLE:
SET_CDTEXT_FIELD(CDTEXT_TITLE);
break;
@@ -216,12 +219,12 @@ cdtext_data_init(void *user_data, track_t i_first_track,
idx = 0;
}
} else {
buffer[idx++] = pdata->text[j];
buffer[idx++] = p_data->text[j];
}
buffer[idx] = 0x00;
}
}
pdata++;
p_data++;
}
return b_ret;
}

4
lib/driver/generic.h
View File

@@ -1,5 +1,5 @@
/*
$Id: generic.h,v 1.10 2005/01/21 02:59:32 rocky Exp $
$Id: generic.h,v 1.11 2005/01/27 03:10:06 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -155,7 +155,7 @@ extern "C" {
@return the CD-TEXT object or NULL if obj is NULL
or CD-TEXT information does not exist.
*/
const cdtext_t *get_cdtext_generic (void *p_user_data, track_t i_track);
cdtext_t *get_cdtext_generic (void *p_user_data, track_t i_track);
/*!
Return the number of of the first track.