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

Small stylistic changes. More will go on in main branch

Browse Source
This commit is contained in:
R. Bernstein
2012-03-10 13:46:22 -05:00
parent ac5e935d41
commit 0c7c1104fd
4 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/cdio/track.h
View File

@@ -1,6 +1,4 @@
/*
$Id: track.h,v 1.14 2008/03/25 15:59:09 karl Exp $
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify

43
lib/driver/cdtext.c
View File

@@ -39,6 +39,10 @@
#define MAX_CDTEXT_GENRE_CODE 28
#define MAX_CDTEXT_LANGUAGE_CODE 127
#ifndef CDIO_CD_MAX_TRACKS
# define CDIO_CD_MAX_TRACKS 99 /* Largest CD track number */
#endif
const char *cdtext_field[MAX_CDTEXT_FIELDS] =
{
"TITLE",
@@ -197,7 +201,7 @@ const char *cdtext_language[MAX_CDTEXT_LANGUAGE_CODE] =
Return string representation of given field type.
*/
const char *
cdtext_field2str (cdtext_field_t i)
cdtext_field2str(cdtext_field_t i)
{
if (i >= MAX_CDTEXT_FIELDS)
return "INVALID";
@@ -209,7 +213,7 @@ cdtext_field2str (cdtext_field_t i)
Return string representation of the given genre code.
*/
const char *
cdtext_genre2str (cdtext_genre_t i)
cdtext_genre2str(cdtext_genre_t i)
{
if (i >= MAX_CDTEXT_GENRE_CODE)
return "INVALID";
@@ -221,7 +225,7 @@ cdtext_genre2str (cdtext_genre_t i)
Return string representation of the given language code.
*/
const char *
cdtext_lang2str (cdtext_lang_t i)
cdtext_lang2str(cdtext_lang_t i)
{
if (i >= MAX_CDTEXT_LANGUAGE_CODE)
return "INVALID";
@@ -235,7 +239,7 @@ cdtext_lang2str (cdtext_lang_t i)
@param p_cdtext the CD-TEXT object
*/
void
cdtext_destroy (cdtext_t *p_cdtext)
cdtext_destroy(cdtext_t *p_cdtext)
{
cdtext_field_t k;
track_t j;
@@ -261,7 +265,7 @@ cdtext_destroy (cdtext_t *p_cdtext)
@see cdtext_get_const
*/
char *
cdtext_get (const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
cdtext_get(const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
{
const char *ret = cdtext_get_const(p_cdtext, field, track);
if (NULL == ret)
@@ -281,12 +285,12 @@ cdtext_get (const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
@param track specifies the track, 0 stands for disc
*/
const char *
cdtext_get_const (const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
cdtext_get_const(const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
{
if (CDTEXT_FIELD_INVALID == field
|| NULL == p_cdtext
|| 0 > track
|| 99 < track)
|| CDIO_CD_MAX_TRACKS < track)
return NULL;
return p_cdtext->block[p_cdtext->block_i].track[track].field[field];
@@ -299,7 +303,7 @@ cdtext_get_const (const cdtext_t *p_cdtext, cdtext_field_t field, track_t track)
@param p_cdtext the CD-TEXT object
*/
cdtext_lang_t
cdtext_get_language (const cdtext_t *p_cdtext)
cdtext_get_language(const cdtext_t *p_cdtext)
{
if (NULL == p_cdtext)
return CDTEXT_LANGUAGE_UNKNOWN;
@@ -314,7 +318,7 @@ cdtext_get_language (const cdtext_t *p_cdtext)
@param p_cdtext the CD-TEXT object
*/
cdtext_lang_t
*cdtext_languages_available (const cdtext_t *p_cdtext)
*cdtext_languages_available(const cdtext_t *p_cdtext)
{
static cdtext_lang_t avail[CDTEXT_NUM_BLOCKS_MAX];
int i, j=0;
@@ -343,7 +347,7 @@ cdtext_lang_t
@return true on success, false if language is not available
*/
bool
cdtext_select_language (cdtext_t *p_cdtext, const char *language)
cdtext_select_language(cdtext_t *p_cdtext, const char *language)
{
cdtext_lang_t lang_id;
lang_id = cdtext_is_language(language);
@@ -374,14 +378,14 @@ cdtext_select_language (cdtext_t *p_cdtext, const char *language)
*/
cdtext_t
*cdtext_init (void)
*cdtext_init(void)
{
cdtext_field_t k;
track_t j;
int i;
cdtext_t *p_cdtext;
p_cdtext = (cdtext_t *) malloc (sizeof (struct cdtext_s));
p_cdtext = (cdtext_t *) malloc(sizeof(struct cdtext_s));
for (i=0; i<CDTEXT_NUM_BLOCKS_MAX; i++) {
for (j=0; j<CDTEXT_NUM_TRACKS_MAX; j++) {
@@ -413,7 +417,7 @@ cdtext_is_field (const char *key)
unsigned int i;
for (i = 0; i < MAX_CDTEXT_FIELDS ; i++)
if (0 == strcmp (cdtext_field[i], key)) {
if (0 == strcmp(cdtext_field[i], key)) {
return i;
}
return CDTEXT_FIELD_INVALID;
@@ -429,12 +433,12 @@ cdtext_is_field (const char *key)
@return CDTEXT_LANGUAGE_UNKNOWN if language is not supported
*/
cdtext_lang_t
cdtext_is_language (const char *lang)
cdtext_is_language(const char *lang)
{
unsigned int i;
for (i = 0; i < MAX_CDTEXT_LANGUAGE_CODE; i++)
if (0 == strcmp (cdtext_language[i], lang)) {
if (0 == strcmp(cdtext_language[i], lang)) {
return i;
}
return CDTEXT_LANGUAGE_UNKNOWN;
@@ -452,15 +456,16 @@ cdtext_is_language (const char *lang)
@param charset charset to convert from
*/
void
cdtext_set (cdtext_t *p_cdtext, cdtext_field_t key, const uint8_t *value,
cdtext_set(cdtext_t *p_cdtext, cdtext_field_t key, const uint8_t *value,
track_t track, const char *charset)
{
if (NULL == value || key == CDTEXT_FIELD_INVALID || 0 > track || 99 < track)
if (NULL == value || key == CDTEXT_FIELD_INVALID || 0 > track
|| CDIO_CD_MAX_TRACKS < track)
return;
/* free old memory */
if (p_cdtext->block[p_cdtext->block_i].track[track].field[key])
free (p_cdtext->block[p_cdtext->block_i].track[track].field[key]);
free(p_cdtext->block[p_cdtext->block_i].track[track].field[key]);
/* recode to UTF-8 */
if (NULL != charset) {
@@ -469,7 +474,7 @@ cdtext_set (cdtext_t *p_cdtext, cdtext_field_t key, const uint8_t *value,
&utf8_str, charset);
p_cdtext->block[p_cdtext->block_i].track[track].field[key] = (char *)utf8_str;
} else
p_cdtext->block[p_cdtext->block_i].track[track].field[key] = strdup ((const char *)value);
p_cdtext->block[p_cdtext->block_i].track[track].field[key] = strdup((const char *)value);
}
/*!

52
lib/driver/image/bincue.c
View File

@@ -66,15 +66,15 @@
#define DEFAULT_CDIO_DEVICE "videocd.bin"
#define DEFAULT_CDIO_CUE "videocd.cue"
static lsn_t get_disc_last_lsn_bincue (void *p_user_data);
static lsn_t get_disc_last_lsn_bincue(void *p_user_data);
#include "image_common.h"
static bool parse_cuefile (_img_private_t *cd, const char *toc_name);
static bool parse_cuefile(_img_private_t *cd, const char *toc_name);
/*!
Initialize image structures.
*/
static bool
_init_bincue (_img_private_t *p_env)
_init_bincue(_img_private_t *p_env)
{
lsn_t lead_lsn;
@@ -342,18 +342,20 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
const char *psz_filename = cdio_abspath (dirname, psz_field);
if(NULL == (source = cdio_stdio_new(psz_filename))) {
cdio_log (log_level, "%s line %d: can't open file `%s' for reading", psz_cue_name, i_line, psz_field);
cdio_log(log_level, "%s line %d: can't open file `%s' for reading",
psz_cue_name, i_line, psz_field);
goto err_exit;
}
size = cdio_stream_read(source, cdt_data, CDTEXT_LEN_BINARY_MAX, 1);
if (size < 5) {
cdio_log (log_level, "%s line %d: file `%s' is too small to contain CD-TEXT",
cdio_log(log_level,
"%s line %d: file `%s' is too small to contain CD-TEXT",
psz_cue_name, i_line, (char *) psz_filename);
goto err_exit;
}
/* cut header */
/* Truncate header when it is too large. */
if (cdt_data[0] > 0x80) {
ptr = &cdt_data[4];
size -= 4;
@@ -390,10 +392,10 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
/* TRACK N <mode> */
} else if (0 == strcmp ("TRACK", psz_keyword)) {
} else if (0 == strcmp("TRACK", psz_keyword)) {
int i_track;
if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
if (NULL != (psz_field = strtok(NULL, " \t\n\r"))) {
if (1!=sscanf(psz_field, "%d", &i_track)) {
cdio_log(log_level,
"%s line %d after word TRACK:",
@@ -403,7 +405,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
goto err_exit;
}
}
if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
if (NULL != (psz_field = strtok(NULL, " \t\n\r"))) {
track_info_t *this_track=NULL;
if (cd) {
@@ -415,7 +417,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
i++;
if (0 == strcmp ("AUDIO", psz_field)) {
if (0 == strcmp("AUDIO", psz_field)) {
if (cd) {
this_track->mode = AUDIO;
this_track->blocksize = CDIO_CD_FRAMESIZE_RAW;
@@ -441,7 +443,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE1/2048", psz_field)) {
} else if (0 == strcmp("MODE1/2048", psz_field)) {
if (cd) {
this_track->mode = MODE1;
this_track->blocksize = 2048;
@@ -468,7 +470,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE1/2352", psz_field)) {
} else if (0 == strcmp("MODE1/2352", psz_field)) {
if (cd) {
this_track->blocksize = 2352;
this_track->track_format= TRACK_FORMAT_DATA;
@@ -496,7 +498,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE2/2336", psz_field)) {
} else if (0 == strcmp("MODE2/2336", psz_field)) {
if (cd) {
this_track->blocksize = 2336;
this_track->track_format= TRACK_FORMAT_XA;
@@ -523,7 +525,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE2/2048", psz_field)) {
} else if (0 == strcmp("MODE2/2048", psz_field)) {
if (cd) {
this_track->blocksize = 2048;
this_track->track_format= TRACK_FORMAT_XA;
@@ -546,7 +548,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE2/2324", psz_field)) {
} else if (0 == strcmp("MODE2/2324", psz_field)) {
if (cd) {
this_track->blocksize = 2324;
this_track->track_format= TRACK_FORMAT_XA;
@@ -569,7 +571,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE2/2336", psz_field)) {
} else if (0 == strcmp("MODE2/2336", psz_field)) {
if (cd) {
this_track->blocksize = 2336;
this_track->track_format= TRACK_FORMAT_XA;
@@ -596,7 +598,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->disc_mode = CDIO_DISC_MODE_ERROR;
}
}
} else if (0 == strcmp ("MODE2/2352", psz_field)) {
} else if (0 == strcmp("MODE2/2352", psz_field)) {
if (cd) {
this_track->blocksize = 2352;
this_track->track_format= TRACK_FORMAT_XA;
@@ -636,7 +638,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
/* FLAGS flag1 flag2 ... */
} else if (0 == strcmp ("FLAGS", psz_keyword)) {
} else if (0 == strcmp("FLAGS", psz_keyword)) {
if (0 <= i) {
while (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
if (0 == strcmp ("PRE", psz_field)) {
@@ -656,7 +658,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
/* ISRC CCOOOYYSSSSS */
} else if (0 == strcmp ("ISRC", psz_keyword)) {
} else if (0 == strcmp("ISRC", psz_keyword)) {
if (0 <= i) {
if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
if (cd) cd->tocent[i].isrc = strdup (psz_field);
@@ -668,9 +670,9 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
/* PREGAP MM:SS:FF */
} else if (0 == strcmp ("PREGAP", psz_keyword)) {
} else if (0 == strcmp("PREGAP", psz_keyword)) {
if (0 <= i) {
if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
if (NULL != (psz_field = strtok(NULL, " \t\n\r"))) {
lba_t lba = cdio_lsn_to_lba(cdio_mmssff_to_lba (psz_field));
if (CDIO_INVALID_LBA == lba) {
cdio_log(log_level, "%s line %d: after word PREGAP:",
@@ -684,7 +686,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
} else {
goto format_error;
} if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
} if (NULL != (psz_field = strtok(NULL, " \t\n\r"))) {
goto format_error;
}
} else {
@@ -694,7 +696,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
/* INDEX [##] MM:SS:FF */
} else if (0 == strcmp ("INDEX", psz_keyword)) {
if (0 <= i) {
if (NULL != (psz_field = strtok (NULL, " \t\n\r")))
if (NULL != (psz_field = strtok(NULL, " \t\n\r")))
if (1!=sscanf(psz_field, "%d", &start_index)) {
cdio_log(log_level,
"%s line %d after word INDEX:",
@@ -704,7 +706,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
psz_field);
goto err_exit;
}
if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
if (NULL != (psz_field = strtok(NULL, " \t\n\r"))) {
lba_t lba = cdio_mmssff_to_lba (psz_field);
if (CDIO_INVALID_LBA == lba) {
cdio_log(log_level, "%s line %d: after word INDEX:",
@@ -786,7 +788,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cd->gen.cdtext = cdtext_init ();
cd->gen.cdtext->block[cd->gen.cdtext->block_i].language_code = CDTEXT_LANGUAGE_ENGLISH;
}
cdtext_set (cd->gen.cdtext, cdtext_key, (uint8_t*) strtok (NULL, "\"\t\n\r"),
cdtext_set (cd->gen.cdtext, cdtext_key, (uint8_t*) strtok(NULL, "\"\t\n\r"),
(-1 == i ? 0 : cd->gen.i_first_track + i + 1),
"ISO-8859-1");
}

10
lib/driver/logging.c
View File

@@ -30,12 +30,10 @@
#include "cdio_assert.h"
#include "portable.h"
static const char _rcsid[] = "$Id: logging.c,v 1.2 2008/04/22 15:29:12 karl Exp $";
cdio_log_level_t cdio_loglevel_default = CDIO_LOG_WARN;
static void
default_cdio_log_handler (cdio_log_level_t level, const char message[])
default_cdio_log_handler(cdio_log_level_t level, const char message[])
{
switch (level)
{
@@ -79,7 +77,7 @@ default_cdio_log_handler (cdio_log_level_t level, const char message[])
static cdio_log_handler_t _handler = default_cdio_log_handler;
cdio_log_handler_t
cdio_log_set_handler (cdio_log_handler_t new_handler)
cdio_log_set_handler(cdio_log_handler_t new_handler)
{
cdio_log_handler_t old_handler = _handler;
@@ -89,7 +87,7 @@ cdio_log_set_handler (cdio_log_handler_t new_handler)
}
static void
cdio_logv (cdio_log_level_t level, const char format[], va_list args)
cdio_logv(cdio_log_level_t level, const char format[], va_list args)
{
char buf[1024] = { 0, };
static int in_recursion = 0;
@@ -107,7 +105,7 @@ cdio_logv (cdio_log_level_t level, const char format[], va_list args)
}
void
cdio_log (cdio_log_level_t level, const char format[], ...)
cdio_log(cdio_log_level_t level, const char format[], ...)
{
va_list args;
va_start (args, format);