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

Misc consolidation fixes. Some mode2 reading seems broken still.

Browse Source
This commit is contained in:
rocky
2004-07-27 02:21:23 +00:00
parent 2b67971152
commit 8e3c103b71
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.c,v 1.32 2004/07/27 01:06:02 rocky Exp $ $Id: win32.c,v 1.33 2004/07/27 02:21:23 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.32 2004/07/27 01:06:02 rocky Exp $"; static const char _rcsid[] = "$Id: win32.c,v 1.33 2004/07/27 02:21:23 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -505,7 +505,7 @@ _get_cdtext_win32 (void *user_data, track_t i_track)
if ( NULL == env || if ( NULL == env ||
(0 != i_track (0 != i_track
&& i_track >= env->i_tracks + env->i_first_track ) ) && i_track >= env->i_tracks + env->gen.i_first_track ) )
return NULL; return NULL;
if (env->hASPI) { if (env->hASPI) {
@@ -518,7 +518,7 @@ _get_cdtext_win32 (void *user_data, track_t i_track)
if (0 == i_track) if (0 == i_track)
return &(env->cdtext); return &(env->cdtext);
else else
return &(env->tocent[i_track-env->i_first_track].cdtext); return &(env->tocent[i_track-env->gen.i_first_track].cdtext);
return NULL; return NULL;
} }
@@ -534,7 +534,7 @@ _cdio_get_first_track_num(void *user_data)
if (!env->toc_init) _cdio_read_toc (env) ; if (!env->toc_init) _cdio_read_toc (env) ;
return env->i_first_track; return env->gen.i_first_track;
} }
/*! /*!
@@ -548,7 +548,7 @@ static char *
_cdio_get_mcn (const void *p_user_data) { _cdio_get_mcn (const void *p_user_data) {
const _img_private_t *p_env = p_user_data; const _img_private_t *p_env = p_user_data;
if( _env->hASPI ) { if( p_env->hASPI ) {
return scsi_mmc_get_mcn( p_env->gen.cdio ); return scsi_mmc_get_mcn( p_env->gen.cdio );
} else { } else {
return get_mcn_win32ioctl(p_env); return get_mcn_win32ioctl(p_env);
@@ -575,17 +575,17 @@ _cdio_get_num_tracks(void *user_data)
static track_format_t static track_format_t
_cdio_get_track_format(void *obj, track_t i_track) _cdio_get_track_format(void *obj, track_t i_track)
{ {
_img_private_t *env = obj; _img_private_t *p_env = obj;
if ( NULL == env || if ( NULL == p_env ||
( i_track < env->i_first_track ( i_track < p_env->gen.i_first_track
|| i_track >= env->i_tracks + env->i_first_track ) ) || i_track >= p_env->i_tracks + p_env->gen.i_first_track ) )
return TRACK_FORMAT_ERROR; return TRACK_FORMAT_ERROR;
if( env->hASPI ) { if( p_env->hASPI ) {
return get_track_format_aspi(env, i_track); return get_track_format_aspi(p_env, i_track);
} else { } else {
return get_track_format_win32ioctl(env, i_track); return get_track_format_win32ioctl(p_env, i_track);
} }
} }
@@ -600,9 +600,9 @@ _cdio_get_track_format(void *obj, track_t i_track)
static bool static bool
_cdio_get_track_green(void *obj, track_t i_track) _cdio_get_track_green(void *obj, track_t i_track)
{ {
_img_private_t *env = obj; _img_private_t *p_env = obj;
switch (_cdio_get_track_format(env, i_track)) { switch (_cdio_get_track_format(p_env, i_track)) {
case TRACK_FORMAT_XA: case TRACK_FORMAT_XA:
return true; return true;
case TRACK_FORMAT_ERROR: case TRACK_FORMAT_ERROR:
@@ -610,7 +610,7 @@ _cdio_get_track_green(void *obj, track_t i_track)
case TRACK_FORMAT_AUDIO: case TRACK_FORMAT_AUDIO:
return false; return false;
case TRACK_FORMAT_DATA: case TRACK_FORMAT_DATA:
if (_AM_ASPI == env->access_mode ) if (_AM_ASPI == p_env->access_mode )
return false; return false;
default: default:
break; break;
@@ -619,7 +619,7 @@ _cdio_get_track_green(void *obj, track_t i_track)
/* FIXME: Dunno if this is the right way, but it's what /* FIXME: Dunno if this is the right way, but it's what
I was using in cd-info for a while. I was using in cd-info for a while.
*/ */
return ((env->tocent[i_track-env->i_first_track].Control & 2) != 0); return ((p_env->tocent[i_track-p_env->gen.i_first_track].Control & 2) != 0);
} }
/*! /*!
@@ -630,9 +630,9 @@ _cdio_get_track_green(void *obj, track_t i_track)
False is returned if there is no track entry. False is returned if there is no track entry.
*/ */
static bool static bool
_cdio_get_track_msf(void *env, track_t i_tracks, msf_t *msf) _cdio_get_track_msf(void *p_env, track_t i_tracks, msf_t *msf)
{ {
_img_private_t *_obj = env; _img_private_t *_obj = p_env;
if (NULL == msf) return false; if (NULL == msf) return false;

20
lib/MSWindows/win32_ioctl.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32_ioctl.c,v 1.26 2004/07/27 01:06:02 rocky Exp $ $Id: win32_ioctl.c,v 1.27 2004/07/27 02:21:23 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.26 2004/07/27 01:06:02 rocky Exp $"; static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.27 2004/07/27 02:21:23 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -204,9 +204,9 @@ get_discmode_win32ioctl (_img_private_t *p_env)
dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL; dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL;
dvd.physical.layer_num = 0; dvd.physical.layer_num = 0;
if (0 == get_dvd_struct_physical_mmc (p_env, if (0 == scsi_mmc_get_dvd_struct_physical_private (p_env,
&scsi_mmc_run_cmd_win32ioctl, &scsi_mmc_run_cmd_win32ioctl,
&dvd)) { &dvd)) {
switch(dvd.physical.layer[0].book_type) { switch(dvd.physical.layer[0].book_type) {
case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM; case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM;
case CDIO_DVD_BOOK_DVD_RAM: return CDIO_DISC_MODE_DVD_RAM; case CDIO_DVD_BOOK_DVD_RAM: return CDIO_DISC_MODE_DVD_RAM;
@@ -482,7 +482,7 @@ read_toc_win32ioctl (_img_private_t *env)
return false; return false;
} }
env->i_first_track = cdrom_toc.FirstTrack; env->gen.i_first_track = cdrom_toc.FirstTrack;
env->i_tracks = cdrom_toc.LastTrack - cdrom_toc.FirstTrack + 1; env->i_tracks = cdrom_toc.LastTrack - cdrom_toc.FirstTrack + 1;
@@ -510,7 +510,7 @@ read_toc_win32ioctl (_img_private_t *env)
bool bool
init_cdtext_win32ioctl (_img_private_t *p_env) init_cdtext_win32ioctl (_img_private_t *p_env)
{ {
return scsi_mmc_cdtext_init_private( p_env->gen.cdio, return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
&scsi_mmc_run_cmd_win32ioctl, &scsi_mmc_run_cmd_win32ioctl,
set_cdtext_field_win32 set_cdtext_field_win32
); );
@@ -556,10 +556,10 @@ get_track_format_win32ioctl(const _img_private_t *env, track_t i_track)
/* This is pretty much copied from the "badly broken" cdrom_count_tracks /* This is pretty much copied from the "badly broken" cdrom_count_tracks
in linux/cdrom.c. in linux/cdrom.c.
*/ */
if (env->tocent[i_track - env->i_first_track].Control & 0x04) { if (env->tocent[i_track - env->gen.i_first_track].Control & 0x04) {
if (env->tocent[i_track - env->i_first_track].Format == 0x10) if (env->tocent[i_track - env->gen.i_first_track].Format == 0x10)
return TRACK_FORMAT_CDI; return TRACK_FORMAT_CDI;
else if (env->tocent[i_track - env->i_first_track].Format == 0x20) else if (env->tocent[i_track - env->gen.i_first_track].Format == 0x20)
return TRACK_FORMAT_XA; return TRACK_FORMAT_XA;
else else
return TRACK_FORMAT_DATA; return TRACK_FORMAT_DATA;