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

image/common.h -> image_common.h. I'd rather switch than fight. I

Browse Source 
still hate automake.
This commit is contained in:
rocky
2004-04-23 02:18:07 +00:00
parent b6a67c8d94
commit a516b22565
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.10 2004/04/23 01:01:37 rocky Exp $
$Id: bincue.c,v 1.11 2004/04/23 02:18:07 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.10 2004/04/23 01:01:37 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.11 2004/04/23 02:18:07 rocky Exp $";
#include "cdio_assert.h"
#include "cdio_private.h"
@@ -104,7 +104,7 @@ typedef struct {
static bool _cdio_image_read_cue (_img_private_t *_obj);
static uint32_t _cdio_stat_size (void *env);
#include "image/common.c"
#include "image_common.h"
/*!
Initialize image structures.

103
lib/image/common.c
View File

@@ -1,103 +0,0 @@
/*
$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;
}

6
lib/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.5 2004/04/23 01:01:37 rocky Exp $
$Id: nrg.c,v 1.6 2004/04/23 02:18:07 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.5 2004/04/23 01:01:37 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.6 2004/04/23 02:18:07 rocky Exp $";
/* structures used */
@@ -177,7 +177,7 @@ typedef struct {
static bool _cdio_parse_nero_footer (_img_private_t *_obj);
static uint32_t _cdio_stat_size (void *env);
#include "image/common.c"
#include "image_common.h"
/* Updates internal track TOC, so we can later
simulate ioctl(CDROMREADTOCENTRY).