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

Add a couple of routines to pass back the driver used in getting a

Browse Source 
drive.  Speeds up a little the task of opening the drive. Is now used
in cd-drive and cd-info.
This commit is contained in:
rocky
2004-08-27 04:17:08 +00:00
parent 8b61fa9ea5
commit 7454e4375e
4 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/cdio/cdio.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: cdio.h,v 1.61 2004/08/27 02:50:13 rocky Exp $ $Id: cdio.h,v 1.62 2004/08/27 04:17:08 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -145,7 +145,7 @@ extern "C" {
@param cd_obj the CD object to eliminated. @param cd_obj the CD object to eliminated.
*/ */
void cdio_destroy (CdIo *cd_obj); void cdio_destroy (CdIo *p_cdio);
/*! /*!
Free device list returned by cdio_get_devices or Free device list returned by cdio_get_devices or
@@ -198,9 +198,19 @@ extern "C" {
after dereferencing the the value is NULL. This also means nothing after dereferencing the the value is NULL. This also means nothing
was found. was found.
*/ */
char ** cdio_get_devices_with_cap (char* search_devices[], char ** cdio_get_devices_with_cap (char* ppsz_search_devices[],
cdio_fs_anal_t capabilities, bool any); cdio_fs_anal_t capabilities, bool any);
/*!
Like cdio_get_devices_with_cap but we return the driver we found
as well. This is because often one wants to search for kind of drive
and then *open* it afterwards. Giving the driver back facilitates this,
and speeds things up for libcdio as well.
*/
char ** cdio_get_devices_with_cap_ret (/*out*/ char* ppsz_search_devices[],
cdio_fs_anal_t capabilities, bool any,
/*out*/ driver_id_t *p_driver_id);
/*! Return an array of device names. If you want a specific /*! Return an array of device names. If you want a specific
devices for a driver, give that device. If you want hardware devices for a driver, give that device. If you want hardware
devices, give DRIVER_DEVICE and if you want all possible devices, devices, give DRIVER_DEVICE and if you want all possible devices,
@@ -212,7 +222,16 @@ extern "C" {
there is no media in it and it is possible for this routine to return there is no media in it and it is possible for this routine to return
NULL even though there may be a hardware CD-ROM. NULL even though there may be a hardware CD-ROM.
*/ */
char ** cdio_get_devices (driver_id_t driver); char ** cdio_get_devices (driver_id_t driver_id);
/*! Like cdio_get_devices, but we may change the p_driver_id if we
were given DRIVER_DEVICE or DRIVER_UNKNOWN. This is because
often one wants to get a drive name and then *open* it
afterwards. Giving the driver back facilitates this, and speeds
things up for libcdio as well.
*/
char ** cdio_get_devices_ret (/*in/out*/ driver_id_t *p_driver_id);
/*! /*!
Get the default CD device. Get the default CD device.
@@ -227,7 +246,7 @@ extern "C" {
there is no media in it and it is possible for this routine to return there is no media in it and it is possible for this routine to return
NULL even though there may be a hardware CD-ROM. NULL even though there may be a hardware CD-ROM.
*/ */
char * cdio_get_default_device (const CdIo *cd_obj); char * cdio_get_default_device (const CdIo *p_cdio);
/*! /*!
Get the what kind of device we've got. Get the what kind of device we've got.
@@ -239,7 +258,7 @@ extern "C" {
there is no media in it and it is possible for this routine to return there is no media in it and it is possible for this routine to return
NULL even though there may be a hardware CD-ROM. NULL even though there may be a hardware CD-ROM.
*/ */
void cdio_get_drive_cap (const CdIo *cd_obj, void cdio_get_drive_cap (const CdIo *p_cdio,
cdio_drive_read_cap_t *p_read_cap, cdio_drive_read_cap_t *p_read_cap,
cdio_drive_write_cap_t *p_write_cap, cdio_drive_write_cap_t *p_write_cap,
cdio_drive_misc_cap_t *p_misc_cap); cdio_drive_misc_cap_t *p_misc_cap);
@@ -276,7 +295,7 @@ extern "C" {
string when done with it. string when done with it.
*/ */
char * cdio_get_mcn (const CdIo *cd_obj); char * cdio_get_mcn (const CdIo *p_cdio);
/*! /*!
Get a string containing the name of the driver in use. Get a string containing the name of the driver in use.
@@ -284,7 +303,7 @@ extern "C" {
@return a string with driver name or NULL if CdIo is NULL (we @return a string with driver name or NULL if CdIo is NULL (we
haven't initialized a specific device. haven't initialized a specific device.
*/ */
const char * cdio_get_driver_name (const CdIo *cd_obj); const char * cdio_get_driver_name (const CdIo *p_cdio);
/*! /*!
Get the driver id. Get the driver id.
@@ -293,7 +312,7 @@ extern "C" {
@return the driver id.. @return the driver id..
*/ */
driver_id_t cdio_get_driver_id (const CdIo *cd_obj); driver_id_t cdio_get_driver_id (const CdIo *p_cdio);
/*! /*!
Get the number of the first track. Get the number of the first track.
@@ -301,14 +320,14 @@ extern "C" {
@return the track number or CDIO_INVALID_TRACK @return the track number or CDIO_INVALID_TRACK
on error. on error.
*/ */
track_t cdio_get_first_track_num(const CdIo *cd_obj); track_t cdio_get_first_track_num(const CdIo *p_cdio);
/*! /*!
Get disc mode - the kind of CD (CD-DA, CD-ROM mode 1, CD-MIXED, etc. Get disc mode - the kind of CD (CD-DA, CD-ROM mode 1, CD-MIXED, etc.
that we've got. The notion of "CD" is extended a little to include that we've got. The notion of "CD" is extended a little to include
DVD's. DVD's.
*/ */
discmode_t cdio_get_discmode (CdIo *cd_obj); discmode_t cdio_get_discmode (CdIo *p_cdio);
/*! /*!
Get the number of tracks on the CD. Get the number of tracks on the CD.
@@ -316,12 +335,12 @@ extern "C" {
@return the number of tracks, or CDIO_INVALID_TRACK if there is @return the number of tracks, or CDIO_INVALID_TRACK if there is
an error. an error.
*/ */
track_t cdio_get_num_tracks (const CdIo *cd_obj); track_t cdio_get_num_tracks (const CdIo *p_cdio);
/*! /*!
Get the format (audio, mode2, mode1) of track. Get the format (audio, mode2, mode1) of track.
*/ */
track_format_t cdio_get_track_format(const CdIo *cd_obj, track_t i_track); track_format_t cdio_get_track_format(const CdIo *p_cdio, track_t i_track);
/*! /*!
Return true if we have XA data (green, mode2 form1) or Return true if we have XA data (green, mode2 form1) or
@@ -331,7 +350,7 @@ extern "C" {
FIXME: there's gotta be a better design for this and get_track_format? FIXME: there's gotta be a better design for this and get_track_format?
*/ */
bool cdio_get_track_green(const CdIo *cd_obj, track_t i_track); bool cdio_get_track_green(const CdIo *p_cdio, track_t i_track);
/*! /*!
Get the starting LBA for track number Get the starting LBA for track number

47
lib/cdio.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio.c,v 1.68 2004/08/27 02:50:13 rocky Exp $ $Id: cdio.c,v 1.69 2004/08/27 04:17:08 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -39,7 +39,7 @@
#include <cdio/logging.h> #include <cdio/logging.h>
#include "cdio_private.h" #include "cdio_private.h"
static const char _rcsid[] = "$Id: cdio.c,v 1.68 2004/08/27 02:50:13 rocky Exp $"; static const char _rcsid[] = "$Id: cdio.c,v 1.69 2004/08/27 04:17:08 rocky Exp $";
const char *track_format2str[6] = const char *track_format2str[6] =
@@ -340,22 +340,31 @@ cdio_get_default_device (const CdIo *obj)
char ** char **
cdio_get_devices (driver_id_t driver_id) cdio_get_devices (driver_id_t driver_id)
{ {
CdIo *cdio; /* Probably could get away with &driver_id below. */
driver_id_t driver_id_temp = driver_id;
return cdio_get_devices_ret (&driver_id_temp);
}
switch (driver_id) { char **
cdio_get_devices_ret (/*in/out*/ driver_id_t *p_driver_id)
{
CdIo *p_cdio;
switch (*p_driver_id) {
/* FIXME: spit out unknown to give image drivers as well. */ /* FIXME: spit out unknown to give image drivers as well. */
case DRIVER_UNKNOWN: case DRIVER_UNKNOWN:
case DRIVER_DEVICE: case DRIVER_DEVICE:
cdio = scan_for_driver(DRIVER_UNKNOWN, CDIO_MAX_DRIVER, NULL, NULL); p_cdio = scan_for_driver(DRIVER_UNKNOWN, CDIO_MAX_DRIVER, NULL, NULL);
*p_driver_id = cdio_get_driver_id(p_cdio);
break; break;
default: default:
return (*CdIo_all_drivers[driver_id].get_devices)(); return (*CdIo_all_drivers[*p_driver_id].get_devices)();
} }
if (cdio == NULL) return NULL; if (p_cdio == NULL) return NULL;
if (cdio->op.get_devices) { if (p_cdio->op.get_devices) {
char **devices = cdio->op.get_devices (); char **devices = p_cdio->op.get_devices ();
cdio_destroy(cdio); cdio_destroy(p_cdio);
return devices; return devices;
} else { } else {
return NULL; return NULL;
@@ -379,14 +388,26 @@ cdio_get_devices (driver_id_t driver_id)
the value is NULL. This also means nothing was found. the value is NULL. This also means nothing was found.
*/ */
char ** char **
cdio_get_devices_with_cap (char* search_devices[], cdio_get_devices_with_cap (/*out*/ char* search_devices[],
cdio_fs_anal_t capabilities, bool any) cdio_fs_anal_t capabilities, bool any)
{
driver_id_t p_driver_id;
return cdio_get_devices_with_cap_ret (search_devices, capabilities, any,
&p_driver_id);
}
char **
cdio_get_devices_with_cap_ret (/*out*/ char* search_devices[],
cdio_fs_anal_t capabilities, bool any,
/*out*/ driver_id_t *p_driver_id)
{ {
char **drives=search_devices; char **drives=search_devices;
char **drives_ret=NULL; char **drives_ret=NULL;
int num_drives=0; int num_drives=0;
if (NULL == drives) drives=cdio_get_devices(DRIVER_DEVICE); *p_driver_id = DRIVER_DEVICE;
if (NULL == drives) drives=cdio_get_devices_ret(p_driver_id);
if (NULL == drives) return NULL; if (NULL == drives) return NULL;
if (capabilities == CDIO_FS_MATCH_ALL) { if (capabilities == CDIO_FS_MATCH_ALL) {
@@ -404,7 +425,7 @@ cdio_get_devices_with_cap (char* search_devices[],
need_fs_ext = capabilities & ~CDIO_FS_MASK; need_fs_ext = capabilities & ~CDIO_FS_MASK;
for( ; *d != NULL; d++ ) { for( ; *d != NULL; d++ ) {
CdIo *cdio = cdio_open(*d, DRIVER_UNKNOWN); CdIo *cdio = cdio_open(*d, *p_driver_id);
if (NULL != cdio) { if (NULL != cdio) {
track_t first_track = cdio_get_first_track_num(cdio); track_t first_track = cdio_get_first_track_num(cdio);

7
src/cd-drive.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-drive.c,v 1.7 2004/08/27 02:50:13 rocky Exp $ $Id: cd-drive.c,v 1.8 2004/08/27 04:17:08 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -226,15 +226,16 @@ main(int argc, const char *argv[])
/* Print out a list of CD-drives */ /* Print out a list of CD-drives */
char **ppsz_cdrives=NULL, **ppsz_cd; char **ppsz_cdrives=NULL, **ppsz_cd;
driver_id_t driver_id = DRIVER_DEVICE;
ppsz_cdrives = cdio_get_devices(DRIVER_DEVICE); ppsz_cdrives = cdio_get_devices_ret(&driver_id);
if (NULL != ppsz_cdrives) if (NULL != ppsz_cdrives)
for( ppsz_cd = ppsz_cdrives; *ppsz_cd != NULL; ppsz_cd++ ) { for( ppsz_cd = ppsz_cdrives; *ppsz_cd != NULL; ppsz_cd++ ) {
cdio_drive_read_cap_t i_read_cap; cdio_drive_read_cap_t i_read_cap;
cdio_drive_write_cap_t i_write_cap; cdio_drive_write_cap_t i_write_cap;
cdio_drive_misc_cap_t i_misc_cap; cdio_drive_misc_cap_t i_misc_cap;
cdio_hwinfo_t hwinfo; cdio_hwinfo_t hwinfo;
CdIo *p_cdio = cdio_open(*ppsz_cd, DRIVER_UNKNOWN); CdIo *p_cdio = cdio_open(*ppsz_cd, driver_id);
cdio_get_drive_cap_dev(*ppsz_cd, &i_read_cap, &i_write_cap, cdio_get_drive_cap_dev(*ppsz_cd, &i_read_cap, &i_write_cap,
&i_misc_cap); &i_misc_cap);

7
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.82 2004/08/27 02:50:13 rocky Exp $ $Id: cd-info.c,v 1.83 2004/08/27 04:17:08 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -997,13 +997,14 @@ main(int argc, const char *argv[])
} }
if (opts.list_drives) { if (opts.list_drives) {
char ** device_list = cdio_get_devices(DRIVER_DEVICE); driver_id_t driver_id = DRIVER_DEVICE;
char ** device_list = cdio_get_devices_ret(&driver_id);
char ** d = device_list; char ** d = device_list;
printf("list of devices found:\n"); printf("list of devices found:\n");
if (NULL != d) { if (NULL != d) {
for ( ; *d != NULL ; d++ ) { for ( ; *d != NULL ; d++ ) {
CdIo *p_cdio = cdio_open(source_name, DRIVER_UNKNOWN); CdIo *p_cdio = cdio_open(source_name, driver_id);
cdio_hwinfo_t hwinfo; cdio_hwinfo_t hwinfo;
printf("Drive %s\n", *d); printf("Drive %s\n", *d);
if (scsi_mmc_get_hwinfo(p_cdio, &hwinfo)) { if (scsi_mmc_get_hwinfo(p_cdio, &hwinfo)) {