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

image/common.c, Makefile.am: common image routines.

Browse Source 
src/cd-info.c, *.right: Now show file images under "drive capability"
bincue.c/nrg.c: report file image "drive capability"
This commit is contained in:
rocky
2004-04-23 01:01:35 +00:00
parent 12762d2d7c
commit b6a67c8d94
22 changed files with 173 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
lib/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.9 2004/03/22 01:01:50 rocky Exp $
$Id: bincue.c,v 1.10 2004/04/23 01:01:37 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.9 2004/03/22 01:01:50 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.10 2004/04/23 01:01:37 rocky Exp $";
#include "cdio_assert.h"
#include "cdio_private.h"
@@ -104,6 +104,8 @@ typedef struct {
static bool _cdio_image_read_cue (_img_private_t *_obj);
static uint32_t _cdio_stat_size (void *env);
#include "image/common.c"
/*!
Initialize image structures.
*/
@@ -740,53 +742,6 @@ cdio_get_default_device_bincue(void)
return drive;
}
/*!
Return the number of of the first track.
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_cdio_get_first_track_num(void *env)
{
_img_private_t *_obj = env;
_cdio_init (_obj);
return _obj->first_track_num;
}
/*!
Return the media catalog number (MCN) from the CD or NULL if there
is none or we don't have the ability to get it.
Note: string is malloc'd so caller has to free() the returned
string when done with it.
*/
static char *
_cdio_get_mcn(void *env)
{
_img_private_t *_obj = env;
_cdio_init (_obj);
if (NULL == _obj->mcn) return NULL;
return strdup(_obj->mcn);
}
/*!
Return the number of tracks in the current medium.
If no cuesheet is available, We fake it an just say there's
one big track.
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_cdio_get_num_tracks(void *env)
{
_img_private_t *_obj = env;
_cdio_init (_obj);
return _obj->have_cue && _obj->total_tracks > 0 ? _obj->total_tracks : 1;
}
/*!
Return the number of tracks in the current medium.
CDIO_INVALID_TRACK is returned on error.
@@ -846,30 +801,6 @@ _cdio_get_track_lba(void *env, track_t track_num)
return CDIO_INVALID_LBA;
}
/*!
Return the starting MSF (minutes/secs/frames) for the track number
track_num in obj. Tracks numbers start at 1.
The "leadout" track is specified either by
using track_num LEADOUT_TRACK or the total tracks+1.
*/
static bool
_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
{
_img_private_t *_obj = env;
_cdio_init (_obj);
if (NULL == msf) return false;
if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = _obj->total_tracks+1;
if (track_num <= _obj->total_tracks+1 && track_num != 0) {
*msf = _obj->tocent[track_num-1].start_msf;
return true;
} else
return false;
}
/*!
Return corresponding BIN file if cue_name is a cue file or NULL
if not a CUE file.
@@ -964,13 +895,14 @@ cdio_open_cue (const char *cue_name)
.free = _cdio_bincue_destroy,
.get_arg = _cdio_get_arg,
.get_default_device = cdio_get_default_device_bincue,
.get_first_track_num= _cdio_get_first_track_num,
.get_mcn = _cdio_get_mcn,
.get_num_tracks = _cdio_get_num_tracks,
.get_drive_cap = _cdio_image_get_drive_cap,
.get_first_track_num= _cdio_image_get_first_track_num,
.get_mcn = _cdio_image_get_mcn,
.get_num_tracks = _cdio_image_get_num_tracks,
.get_track_format = _cdio_get_track_format,
.get_track_green = _cdio_get_track_green,
.get_track_lba = _cdio_get_track_lba,
.get_track_msf = _cdio_get_track_msf,
.get_track_msf = _cdio_image_get_track_msf,
.lseek = _cdio_lseek,
.read = _cdio_read,
.read_audio_sectors = _cdio_read_audio_sectors,

103
lib/image/common.c Normal file
View File

@@ -0,0 +1,103 @@
/*
$Id: common.c,v 1.1 2004/04/23 01:01:37 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Common image routines. */
/*!
Return the the kind of drive capabilities of device.
Note: string is malloc'd so caller should free() then returned
string when done with it.
*/
static cdio_drive_cap_t
_cdio_image_get_drive_cap (const void *env) {
const _img_private_t *_obj = env;
if (_obj->gen.fd < 0 )
return CDIO_DRIVE_UNKNOWN;
else
return CDIO_DRIVE_FILE;
}
/*!
Return the media catalog number (MCN) from the CD or NULL if there
is none or we don't have the ability to get it.
Note: string is malloc'd so caller has to free() the returned
string when done with it.
*/
static char *
_cdio_image_get_mcn(void *env)
{
_img_private_t *_obj = env;
if (NULL == _obj->mcn) return NULL;
return strdup(_obj->mcn);
}
/*!
Return the starting MSF (minutes/secs/frames) for the track number
track_num in obj. Tracks numbers start at 1.
The "leadout" track is specified either by
using track_num LEADOUT_TRACK or the total tracks+1.
*/
static bool
_cdio_image_get_track_msf(void *env, track_t track_num, msf_t *msf)
{
_img_private_t *_obj = env;
if (NULL == msf) return false;
if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = _obj->total_tracks+1;
if (track_num <= _obj->total_tracks+1 && track_num != 0) {
*msf = _obj->tocent[track_num-1].start_msf;
return true;
} else
return false;
}
/*!
Return the number of of the first track.
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_cdio_image_get_first_track_num(void *env)
{
_img_private_t *_obj = env;
return _obj->first_track_num;
}
/*!
Return the number of tracks. We fake it an just say there's
one big track.
*/
static track_t
_cdio_image_get_num_tracks(void *env)
{
_img_private_t *_obj = env;
return _obj->total_tracks;
}

60
lib/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.4 2004/03/20 22:46:57 rocky Exp $
$Id: nrg.c,v 1.5 2004/04/23 01:01:37 rocky Exp $
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -48,7 +48,7 @@
#include "cdio_private.h"
#include "_cdio_stdio.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.4 2004/03/20 22:46:57 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.5 2004/04/23 01:01:37 rocky Exp $";
/* structures used */
@@ -177,6 +177,8 @@ typedef struct {
static bool _cdio_parse_nero_footer (_img_private_t *_obj);
static uint32_t _cdio_stat_size (void *env);
#include "image/common.c"
/* Updates internal track TOC, so we can later
simulate ioctl(CDROMREADTOCENTRY).
*/
@@ -1074,30 +1076,6 @@ cdio_get_default_device_nrg(void)
return drive;
}
/*!
Return the number of of the first track.
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_cdio_get_first_track_num(void *env)
{
_img_private_t *_obj = env;
return _obj->first_track_num;
}
/*!
Return the number of tracks. We fake it an just say there's
one big track.
*/
static track_t
_cdio_get_num_tracks(void *env)
{
_img_private_t *_obj = env;
return _obj->total_tracks;
}
/*!
Return the number of tracks in the current medium.
CDIO_INVALID_TRACK is returned on error.
@@ -1144,28 +1122,6 @@ _cdio_get_track_green(void *env, track_t track_num)
return _obj->tocent[track_num-1].track_green;
}
/*!
Return the starting MSF (minutes/secs/frames) for the track number
track_num in obj. Tracks numbers start at 1.
The "leadout" track is specified either by
using track_num LEADOUT_TRACK or the total tracks+1.
*/
static bool
_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
{
_img_private_t *_obj = env;
if (NULL == msf) return 1;
if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = _obj->total_tracks+1;
if (track_num <= _obj->total_tracks+1 && track_num != 0) {
*msf = _obj->tocent[track_num-1].start_msf;
return true;
} else
return false;
}
CdIo *
cdio_open_nrg (const char *source_name)
{
@@ -1178,12 +1134,14 @@ cdio_open_nrg (const char *source_name)
.get_arg = _cdio_get_arg,
.get_devices = cdio_get_devices_nrg,
.get_default_device = cdio_get_default_device_nrg,
.get_first_track_num= _cdio_get_first_track_num,
.get_num_tracks = _cdio_get_num_tracks,
.get_drive_cap = _cdio_image_get_drive_cap,
.get_first_track_num= _cdio_image_get_first_track_num,
.get_mcn = _cdio_image_get_mcn,
.get_num_tracks = _cdio_image_get_num_tracks,
.get_track_format = _cdio_get_track_format,
.get_track_green = _cdio_get_track_green,
.get_track_lba = NULL, /* Will use generic routine via msf */
.get_track_msf = _cdio_get_track_msf,
.get_track_msf = _cdio_image_get_track_msf,
.lseek = _cdio_lseek,
.read = _cdio_read,
.read_audio_sectors = _cdio_read_audio_sectors,