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

Disc mode detection done for aspi.

Browse Source
This commit is contained in:
rocky
2004-07-25 21:43:30 +00:00
parent 9f6a77d296
commit a0f928de45
1 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
lib/MSWindows/aspi32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: aspi32.c,v 1.35 2004/07/25 17:32:19 rocky Exp $ $Id: aspi32.c,v 1.36 2004/07/25 21:43:30 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.35 2004/07/25 17:32:19 rocky Exp $"; static const char _rcsid[] = "$Id: aspi32.c,v 1.36 2004/07/25 21:43:30 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -238,7 +238,8 @@ get_dvd_struct_physical (_img_private_t *p_env, cdio_dvd_struct_t *s)
discmode_t discmode_t
get_discmode_aspi (_img_private_t *p_env) get_discmode_aspi (_img_private_t *p_env)
{ {
int32_t i_discmode; track_t i_track;
discmode_t discmode=CDIO_DISC_MODE_NO_INFO;
/* See if this is a DVD. */ /* See if this is a DVD. */
cdio_dvd_struct_t dvd; /* DVD READ STRUCT for layer 0. */ cdio_dvd_struct_t dvd; /* DVD READ STRUCT for layer 0. */
@@ -257,33 +258,67 @@ get_discmode_aspi (_img_private_t *p_env)
} }
} }
#if 1 if (!p_env->gen.toc_init)
return CDIO_DISC_MODE_ERROR; read_toc_aspi (p_env);
#else
i_discmode = ioctl (p_env->gen.fd, CDROM_DISC_STATUS);
if (i_discmode < 0) return CDIO_DISC_MODE_ERROR; if (!p_env->gen.toc_init)
return CDIO_DISC_MODE_NO_INFO;
for (i_track = p_env->i_first_track;
i_track < p_env->i_first_track + p_env->i_tracks ;
i_track ++) {
track_format_t track_fmt=get_track_format_aspi(p_env, i_track);
/* FIXME Need to add getting DVD types. */ /* FIXME Need to add getting DVD types. */
switch(i_discmode) { switch(track_fmt) {
case CDS_AUDIO: case TRACK_FORMAT_AUDIO:
return CDIO_DISC_MODE_CD_DA; switch(discmode) {
case CDS_DATA_1: case CDIO_DISC_MODE_NO_INFO:
return CDIO_DISC_MODE_CD_DATA_1; discmode = CDIO_DISC_MODE_CD_DA;
case CDS_DATA_2: break;
return CDIO_DISC_MODE_CD_DATA_2; case CDIO_DISC_MODE_CD_DA:
case CDS_MIXED: case CDIO_DISC_MODE_CD_MIXED:
return CDIO_DISC_MODE_CD_MIXED; case CDIO_DISC_MODE_ERROR:
case CDS_XA_2_1: /* No change*/
return CDIO_DISC_MODE_CD_XA_2_1; break;
case CDS_XA_2_2:
return CDIO_DISC_MODE_CD_XA_2_2;
case CDS_NO_INFO:
return CDIO_DISC_MODE_NO_INFO;
default: default:
return CDIO_DISC_MODE_ERROR; discmode = CDIO_DISC_MODE_CD_MIXED;
} }
#endif break;
case TRACK_FORMAT_XA:
switch(discmode) {
case CDIO_DISC_MODE_NO_INFO:
discmode = CDIO_DISC_MODE_CD_XA;
break;
case CDIO_DISC_MODE_CD_XA:
case CDIO_DISC_MODE_CD_MIXED:
case CDIO_DISC_MODE_ERROR:
/* No change*/
break;
default:
discmode = CDIO_DISC_MODE_CD_MIXED;
}
break;
case TRACK_FORMAT_DATA:
switch(discmode) {
case CDIO_DISC_MODE_NO_INFO:
discmode = CDIO_DISC_MODE_CD_DATA;
break;
case CDIO_DISC_MODE_CD_DATA:
case CDIO_DISC_MODE_CD_MIXED:
case CDIO_DISC_MODE_ERROR:
/* No change*/
break;
default:
discmode = CDIO_DISC_MODE_CD_MIXED;
}
break;
case TRACK_FORMAT_ERROR:
default:
discmode = CDIO_DISC_MODE_ERROR;
}
}
return discmode;
} }
const char * const char *
@@ -912,7 +947,7 @@ get_mcn_aspi (const _img_private_t *p_env)
Get format of track. Get format of track.
*/ */
track_format_t track_format_t
get_track_format_aspi(const _img_private_t *env, track_t track_num) get_track_format_aspi(const _img_private_t *p_env, track_t track_num)
{ {
MCI_OPEN_PARMS op; MCI_OPEN_PARMS op;
MCI_STATUS_PARMS st; MCI_STATUS_PARMS st;
@@ -921,7 +956,7 @@ get_track_format_aspi(const _img_private_t *env, track_t track_num)
memset( &op, 0, sizeof(MCI_OPEN_PARMS) ); memset( &op, 0, sizeof(MCI_OPEN_PARMS) );
op.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO; op.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO;
op.lpstrElementName = env->gen.source_name; op.lpstrElementName = p_env->gen.source_name;
/* Set the flags for the device type */ /* Set the flags for the device type */
i_flags = MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID | i_flags = MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID |