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

Add get_hwinfo functions in image drivers.

Browse Source
This commit is contained in:
rocky
2004-09-04 00:06:50 +00:00
parent c1905e6879
commit 40332db672
22 changed files with 60 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp $
$Id: bincue.c,v 1.43 2004/09/04 00:06:50 rocky Exp $
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.43 2004/09/04 00:06:50 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -35,6 +35,7 @@ static const char _rcsid[] = "$Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp
#include <cdio/logging.h>
#include <cdio/util.h>
#include <cdio/version.h>
#ifdef HAVE_STDIO_H
#include <stdio.h>
@@ -973,6 +974,16 @@ cdio_get_default_device_bincue(void)
return drive;
}
static bool
get_hwinfo_bincue ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strcpy(hw_info->psz_vendor, "libcdio");
strcpy(hw_info->psz_model, "CDRWIN");
strcpy(hw_info->psz_revision, CDIO_VERSION);
return true;
}
/*!
Return the number of tracks in the current medium.
CDIO_INVALID_TRACK is returned on error.
@@ -1151,6 +1162,7 @@ cdio_open_cue (const char *psz_cue_name)
_funcs.get_discmode = _get_discmode_image;
_funcs.get_drive_cap = _get_drive_cap_image;
_funcs.get_first_track_num= _get_first_track_num_image;
_funcs.get_hwinfo = get_hwinfo_bincue;
_funcs.get_mcn = _get_mcn_image;
_funcs.get_num_tracks = _get_num_tracks_image;
_funcs.get_track_format = _get_track_format_bincue;

16
lib/image/cdrdao.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp $
$Id: cdrdao.c,v 1.28 2004/09/04 00:06:50 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp $";
static const char _rcsid[] = "$Id: cdrdao.c,v 1.28 2004/09/04 00:06:50 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -34,6 +34,7 @@ static const char _rcsid[] = "$Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp
#include <cdio/logging.h>
#include <cdio/sector.h>
#include <cdio/util.h>
#include <cdio/version.h>
#ifdef HAVE_STDIO_H
#include <stdio.h>
@@ -1017,6 +1018,16 @@ cdio_get_default_device_cdrdao(void)
return drive;
}
static bool
get_hwinfo_cdrdao ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strcpy(hw_info->psz_vendor, "libcdio");
strcpy(hw_info->psz_model, "cdrdao");
strcpy(hw_info->psz_revision, CDIO_VERSION);
return true;
}
/*!
Return the number of tracks in the current medium.
CDIO_INVALID_TRACK is returned on error.
@@ -1135,6 +1146,7 @@ cdio_open_cdrdao (const char *psz_cue_name)
_funcs.get_discmode = _get_discmode_image;
_funcs.get_drive_cap = _get_drive_cap_image;
_funcs.get_first_track_num= _get_first_track_num_image;
_funcs.get_hwinfo = get_hwinfo_cdrdao;
_funcs.get_mcn = _get_mcn_image;
_funcs.get_num_tracks = _get_num_tracks_image;
_funcs.get_track_format = _get_track_format_cdrdao;

20
lib/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.39 2004/09/03 23:20:11 rocky Exp $
$Id: nrg.c,v 1.40 2004/09/04 00:06:50 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -39,13 +39,14 @@
#include <cdio/logging.h>
#include <cdio/util.h>
#include <cdio/version.h>
#include "cdio_assert.h"
#include "bytesex.h"
#include "ds.h"
#include "_cdio_stdio.h"
#include "nrg.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.39 2004/09/03 23:20:11 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.40 2004/09/04 00:06:50 rocky Exp $";
/* reader */
@@ -1091,12 +1092,22 @@ cdio_get_default_device_nrg(void)
return drive;
}
static bool
get_hwinfo_nrg ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strcpy(hw_info->psz_vendor, "libcdio");
strcpy(hw_info->psz_model, "Nero");
strcpy(hw_info->psz_revision, CDIO_VERSION);
return true;
}
/*!
Return the number of tracks in the current medium.
CDIO_INVALID_TRACK is returned on error.
*/
static track_format_t
_get_track_format_nrg(void *user_data, track_t track_num)
get_track_format_nrg(void *user_data, track_t track_num)
{
_img_private_t *env = user_data;
@@ -1196,9 +1207,10 @@ cdio_open_nrg (const char *psz_source)
_funcs.get_discmode = _get_discmode_image;
_funcs.get_drive_cap = _get_drive_cap_image;
_funcs.get_first_track_num= _get_first_track_num_image;
_funcs.get_hwinfo = get_hwinfo_nrg;
_funcs.get_mcn = _get_mcn_image;
_funcs.get_num_tracks = _get_num_tracks_image;
_funcs.get_track_format = _get_track_format_nrg;
_funcs.get_track_format = get_track_format_nrg;
_funcs.get_track_green = _get_track_green_nrg;
_funcs.get_track_lba = NULL; /* Will use generic routine via msf */
_funcs.get_track_msf = _get_track_msf_image;