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

Some code cleanups - more may follow.

Browse Source
This commit is contained in:
rocky
2004-07-13 03:59:09 +00:00
parent 5eb83082eb
commit b45ada9181
2 changed files with 32 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
lib/MSWindows/aspi32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: aspi32.c,v 1.16 2004/07/13 03:45:25 rocky Exp $ $Id: aspi32.c,v 1.17 2004/07/13 03:59:09 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: aspi32.c,v 1.16 2004/07/13 03:45:25 rocky Exp $"; static const char _rcsid[] = "$Id: aspi32.c,v 1.17 2004/07/13 03:59:09 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -677,6 +677,15 @@ wnaspi32_eject_media (void *user_data) {
} }
#endif #endif
#define set_cdtext_field(FIELD) \
if( i_track == 0 ) \
env->cdtext.field[FIELD] = strdup(buffer); \
else \
env->tocent[i_track-1].cdtext.field[FIELD] \
= strdup(buffer); \
i_track++; \
idx = 0;
/*! /*!
Return the value associated with the key "arg". Return the value associated with the key "arg".
*/ */
@@ -739,96 +748,47 @@ get_cdtext_aspi (_img_private_t *env)
int j; int j;
char buffer[256]; char buffer[256];
int idx; int idx;
int track; int i_track;
memset( buffer, 0x00, sizeof(buffer) ); memset( buffer, 0x00, sizeof(buffer) );
idx = 0; idx = 0;
pdata = (CDText_data_t *) (&bigbuffer[4]); pdata = (CDText_data_t *) (&bigbuffer[4]);
for( i=0; i<0xFF; i++ ) { for( i=0; i < CDIO_CDTEXT_MAX_PACK_DATA; i++ ) {
if( pdata->seq != i ) if( pdata->seq != i )
break; break;
if( (pdata->type >= 0x80) if( (pdata->type >= 0x80)
&& (pdata->type <= 0x85) && (pdata->block == 0) ) { && (pdata->type <= 0x85) && (pdata->block == 0) ) {
track = pdata->i_track; i_track = pdata->i_track;
for( j=0; j<12; j++ ) { for( j=0; j < CDIO_CDTEXT_MAX_TEXT_DATA; j++ ) {
if( pdata->text[j] == 0x00 ) if( pdata->text[j] == 0x00 )
{ {
switch( pdata->type) { switch( pdata->type) {
case CDIO_CDTEXT_TITLE: case CDIO_CDTEXT_TITLE:
if( track == 0 ) set_cdtext_field(CDTEXT_TITLE);
env->cdtext.field[CDTEXT_TITLE] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_TITLE]
= strdup(buffer);
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_PERFORMER:
case CDIO_CDTEXT_PERFORMER: // artist set_cdtext_field(CDTEXT_PERFORMER);
if( track == 0 )
env->cdtext.field[CDTEXT_PERFORMER] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_PERFORMER] =
strdup(buffer);
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_SONGWRITER: case CDIO_CDTEXT_SONGWRITER:
if( track == 0 ) set_cdtext_field(CDTEXT_SONGWRITER);
env->cdtext.field[CDTEXT_SONGWRITER]= strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_SONGWRITER] =
strdup( buffer );
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_COMPOSER: case CDIO_CDTEXT_COMPOSER:
if( track == 0 ) set_cdtext_field(CDTEXT_COMPOSER);
env->cdtext.field[CDTEXT_COMPOSER] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_COMPOSER] =
strdup(buffer);
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_ARRANGER: case CDIO_CDTEXT_ARRANGER:
if( track == 0 ) set_cdtext_field(CDTEXT_ARRANGER);
env->cdtext.field[CDTEXT_ARRANGER] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_ARRANGER] =
strdup(buffer);
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_MESSAGE: case CDIO_CDTEXT_MESSAGE:
if( track == 0 ) set_cdtext_field(CDTEXT_MESSAGE);
env->cdtext.field[CDTEXT_MESSAGE] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_MESSAGE] =
strdup(buffer);
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_DISCID: case CDIO_CDTEXT_DISCID:
if( track == 0 ) set_cdtext_field(CDTEXT_DISCID);
env->cdtext.field[CDTEXT_DISCID] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_DISCID] =
strdup(buffer);
track++;
idx = 0;
break; break;
case CDIO_CDTEXT_GENRE: case CDIO_CDTEXT_GENRE:
if( track == 0 ) set_cdtext_field(CDTEXT_GENRE);
env->cdtext.field[CDTEXT_GENRE] = strdup(buffer);
else
env->tocent[track-1].cdtext.field[CDTEXT_GENRE] =
strdup(buffer);
track++;
idx = 0;
break; break;
} }
} }
@@ -841,7 +801,9 @@ get_cdtext_aspi (_img_private_t *env)
pdata++; pdata++;
} }
} }
return NULL;
env->b_cdtext_init = true;
return &(env->cdtext);
} }
/*! /*!
Return the the kind of drive capabilities of device. Return the the kind of drive capabilities of device.

8
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.c,v 1.18 2004/07/13 03:45:26 rocky Exp $ $Id: win32.c,v 1.19 2004/07/13 03:59:10 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: win32.c,v 1.18 2004/07/13 03:45:26 rocky Exp $"; static const char _rcsid[] = "$Id: win32.c,v 1.19 2004/07/13 03:59:10 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -440,10 +440,10 @@ _get_cdtext_win32 (void *user_data)
return &(env->cdtext); return &(env->cdtext);
if (env->hASPI) { if (env->hASPI) {
get_cdtext_aspi(env); return get_cdtext_aspi(env);
} }
return &(env->cdtext); return NULL;
} }
/*! /*!