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

Now knows the difference between DATA and Audio tracks on OSX, also temp change to eject command till I find the right way to implement it in code.

Browse Source
This commit is contained in:
thesin
2004-06-01 03:44:55 +00:00
parent f0c376da88
commit ff7a568da5
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/_cdio_osx.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin Exp $ $Id: _cdio_osx.c,v 1.25 2004/06/01 03:44:55 thesin Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
from vcdimager code: from vcdimager code:
@@ -33,7 +33,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin Exp $"; static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.25 2004/06/01 03:44:55 thesin Exp $";
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
@@ -61,11 +61,17 @@ static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.24 2004/05/31 15:21:48 thesin
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/IOBSD.h> #include <IOKit/IOBSD.h>
#include <IOKit/storage/IOCDTypes.h> #include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IODVDTypes.h>
#include <IOKit/storage/IOMedia.h> #include <IOKit/storage/IOMedia.h>
#include <IOKit/storage/IOCDMedia.h> #include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IOCDMediaBSDClient.h> #include <IOKit/storage/IOCDMediaBSDClient.h>
#include <IOKit/storage/IODVDMediaBSDClient.h>
#define TOTAL_TRACKS (_obj->num_tracks) #define TOTAL_TRACKS (_obj->num_tracks)
#define CDROM_DATA_TRACK CDIO_CDROM_DATA_TRACK
#define CDROM_CDI_TRACK 0x10
#define CDROM_XA_TRACK 0x20
typedef enum { typedef enum {
_AM_NONE, _AM_NONE,
@@ -487,7 +493,7 @@ _eject_media_osx (void *env) {
if( ( psz_disk = (char *)strstr( _obj->gen.source_name, "disk" ) ) != NULL && if( ( psz_disk = (char *)strstr( _obj->gen.source_name, "disk" ) ) != NULL &&
strlen( psz_disk ) > 4 ) strlen( psz_disk ) > 4 )
{ {
#define EJECT_CMD "/usr/sbin/disktool -e %s 0" #define EJECT_CMD "/usr/sbin/hdiutil eject %s"
snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_disk ); snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_disk );
#undef EJECT_CMD #undef EJECT_CMD
@@ -641,9 +647,20 @@ _get_track_format_osx(void *env, track_t track_num)
cdio_warn( "trackinfo trackMode: %x dataMode: %x", a_track.trackMode, a_track.dataMode ); cdio_warn( "trackinfo trackMode: %x dataMode: %x", a_track.trackMode, a_track.dataMode );
if (a_track.trackMode == CDROM_DATA_TRACK) {
if (a_track.dataMode == CDROM_CDI_TRACK) {
return TRACK_FORMAT_CDI;
} else if (a_track.dataMode == CDROM_XA_TRACK) {
return TRACK_FORMAT_XA;
} else {
return TRACK_FORMAT_DATA;
}
} else {
return TRACK_FORMAT_AUDIO; return TRACK_FORMAT_AUDIO;
} }
}
/*! /*!
Return true if we have XA data (green, mode2 form1) or Return true if we have XA data (green, mode2 form1) or
XA data (green, mode2 form2). That is track begins: XA data (green, mode2 form2). That is track begins: