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

Use generic routines for getting first track and number of tracks.

Browse Source
This commit is contained in:
rocky
2004-08-30 01:21:59 +00:00
parent c5d4c75599
commit 770244c186
1 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/_cdio_osx.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_osx.c,v 1.65 2004/08/30 01:14:14 rocky Exp $
$Id: _cdio_osx.c,v 1.66 2004/08/30 01:21:59 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
from vcdimager code:
@@ -34,7 +34,7 @@
#include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.65 2004/08/30 01:14:14 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.66 2004/08/30 01:21:59 rocky Exp $";
#include <cdio/sector.h>
#include <cdio/util.h>
@@ -1087,21 +1087,6 @@ _get_arg_osx (void *user_data, const char key[])
return NULL;
}
/*!
Return the number of the first track.
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_get_first_track_num_osx(void *user_data)
{
_img_private_t *p_env = user_data;
if (!p_env->gen.toc_init) read_toc_osx (p_env) ;
if (!p_env->gen.toc_init) return CDIO_INVALID_TRACK;
return p_env->i_first_track;
}
/*!
Return the media catalog number MCN.
*/
@@ -1121,22 +1106,6 @@ get_mcn_osx (const void *user_data) {
}
/*!
Return the number of tracks in the current medium.
CDIO_INVALID_TRACK is returned on error.
This is the externally called interface.
*/
static track_t
_get_num_tracks_osx(void *user_data)
{
_img_private_t *p_env = user_data;
if (!p_env->gen.toc_init) read_toc_osx (p_env) ;
if (!p_env->gen.toc_init) return CDIO_INVALID_TRACK;
return( TOTAL_TRACKS );
}
/*!
Get format of track.
*/
@@ -1425,10 +1394,10 @@ cdio_open_osx (const char *psz_orig_source)
.get_devices = cdio_get_devices_osx,
.get_discmode = get_discmode_osx,
.get_drive_cap = get_drive_cap_osx,
.get_first_track_num= _get_first_track_num_osx,
.get_first_track_num= get_first_track_num_generic,
.get_hwinfo = get_hwinfo_osx,
.get_mcn = get_mcn_osx,
.get_num_tracks = _get_num_tracks_osx,
.get_num_tracks = get_num_tracks_generic,
.get_track_format = get_track_format_osx,
.get_track_green = get_track_green_osx,
.get_track_lba = get_track_lba_osx,