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

cooked -> cddap. It has been observed that the use of "cooked" causes

Browse Source 
confusion and derision among the small-minded; and the code doesn't
use cooked reading anyway.
This commit is contained in:
rocky
2005-02-05 16:25:51 +00:00
parent 81e6bf4c95
commit 840330127a
4 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cdda_interface/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.3 2005/01/15 16:05:44 rocky Exp $ # $Id: Makefile.am,v 1.4 2005/02/05 16:25:51 rocky Exp $
# #
# Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
# #
@@ -50,7 +50,7 @@ libcdio_cdda_la_AGE := 0
noinst_HEADERS = common_interface.h drive_exceptions.h low_interface.h \ noinst_HEADERS = common_interface.h drive_exceptions.h low_interface.h \
smallft.h utils.h smallft.h utils.h
libcdio_cdda_sources = common_interface.c cooked_interface.c interface.c \ libcdio_cdda_sources = common_interface.c cddap_interface.c interface.c \
scan_devices.c smallft.c toc.c utils.c scan_devices.c smallft.c toc.c utils.c
lib_LTLIBRARIES = libcdio_cdda.la lib_LTLIBRARIES = libcdio_cdda.la

16
lib/cdda_interface/cooked_interface.c → lib/cdda_interface/cddap_interface.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cooked_interface.c,v 1.14 2005/01/25 11:04:45 rocky Exp $ $Id: cddap_interface.c,v 1.1 2005/02/05 16:25:51 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Original interface.c Copyright (C) 1994-1997 Original interface.c Copyright (C) 1994-1997
@@ -35,7 +35,7 @@
0 is returned if there was an error. 0 is returned if there was an error.
*/ */
static int static int
cooked_readtoc (cdrom_drive_t *d) cddap_readtoc (cdrom_drive_t *d)
{ {
int i; int i;
track_t i_track; track_t i_track;
@@ -64,7 +64,7 @@ cooked_readtoc (cdrom_drive_t *d)
/* Set operating speed */ /* Set operating speed */
static int static int
cooked_setspeed(cdrom_drive_t *d, int i_speed) cddap_setspeed(cdrom_drive_t *d, int i_speed)
{ {
return cdio_set_speed(d->p_cdio, i_speed); return cdio_set_speed(d->p_cdio, i_speed);
} }
@@ -204,7 +204,7 @@ jitter_read (cdrom_drive_t *d, void *p, lsn_t begin, long i_sectors,
*/ */
static long int static long int
cooked_read (cdrom_drive_t *d, void *p, lsn_t begin, long i_sectors) cddap_read (cdrom_drive_t *d, void *p, lsn_t begin, long i_sectors)
{ {
jitter_baddness_t jitter_badness = d->i_test_flags & 0x3; jitter_baddness_t jitter_badness = d->i_test_flags & 0x3;
@@ -297,7 +297,7 @@ check_exceptions(cdrom_drive_t *d, const exception_t *list)
/* set function pointers to use the ioctl routines */ /* set function pointers to use the ioctl routines */
int int
cooked_init_drive (cdrom_drive_t *d) cddap_init_drive (cdrom_drive_t *d)
{ {
int ret; int ret;
@@ -366,9 +366,9 @@ cooked_init_drive (cdrom_drive_t *d)
#endif /*HAVE_LINUX_MAJOR_H*/ #endif /*HAVE_LINUX_MAJOR_H*/
d->enable_cdda = Dummy; d->enable_cdda = Dummy;
d->set_speed = cooked_setspeed; d->set_speed = cddap_setspeed;
d->read_toc = cooked_readtoc; d->read_toc = cddap_readtoc;
d->read_audio = cooked_read; d->read_audio = cddap_read;
ret = d->tracks = d->read_toc(d); ret = d->tracks = d->read_toc(d);
if(d->tracks<1) if(d->tracks<1)

4
lib/cdda_interface/interface.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: interface.c,v 1.19 2005/02/05 04:23:56 rocky Exp $ $Id: interface.c,v 1.20 2005/02/05 16:25:51 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -97,7 +97,7 @@ cdio_cddap_open(cdrom_drive_t *d)
int ret; int ret;
if(d->opened)return(0); if(d->opened)return(0);
if ( (ret=cooked_init_drive(d)) ) if ( (ret=cddap_init_drive(d)) )
return(ret); return(ret);
/* Check TOC, enable for CDDA */ /* Check TOC, enable for CDDA */

15
lib/cdda_interface/low_interface.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: low_interface.h,v 1.6 2005/02/03 07:28:40 rocky Exp $ $Id: low_interface.h,v 1.7 2005/02/05 16:25:51 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -62,19 +62,8 @@
#define MIN_BIG_BUFF_SIZE 4096 #define MIN_BIG_BUFF_SIZE 4096
#define SG_OFF sizeof(struct sg_header) #define SG_OFF sizeof(struct sg_header)
#ifndef SG_EMULATED_HOST extern int cddap_init_drive (cdrom_drive_t *d);
/* old kernel version; the check for the ioctl is still runtime, this
is just to build */
#define SG_EMULATED_HOST 0x2203
#define SG_SET_TRANSFORM 0x2204
#define SG_GET_TRANSFORM 0x2205
#endif
extern int cooked_init_drive (cdrom_drive_t *d);
extern unsigned char *scsi_inquiry (cdrom_drive_t *d); extern unsigned char *scsi_inquiry (cdrom_drive_t *d);
extern int scsi_init_drive (cdrom_drive_t *d); extern int scsi_init_drive (cdrom_drive_t *d);
#ifdef CDDA_TEST
extern int test_init_drive (cdrom_drive_t *d);
#endif
#endif /*_CDDA_LOW_INTERFACE_*/ #endif /*_CDDA_LOW_INTERFACE_*/