|
 |
224c4d |
diff -up cdrkit-1.1.11/CMakeLists.txt.paranoiacdda cdrkit-1.1.11/CMakeLists.txt
|
|
|
224c4d |
--- cdrkit-1.1.11/CMakeLists.txt.paranoiacdda 2012-07-31 14:27:15.166155309 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/CMakeLists.txt 2012-07-31 14:27:28.469613175 +0200
|
|
|
224c4d |
@@ -1,3 +1,3 @@
|
|
|
224c4d |
PROJECT (cdrkit C)
|
|
|
224c4d |
-SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
|
|
|
224c4d |
+SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
|
|
|
224c4d |
|
|
|
224c4d |
diff -up cdrkit-1.1.11/icedax/CMakeLists.txt.paranoiacdda cdrkit-1.1.11/icedax/CMakeLists.txt
|
|
|
224c4d |
--- cdrkit-1.1.11/icedax/CMakeLists.txt.paranoiacdda 2012-07-31 14:27:15.228157411 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/icedax/CMakeLists.txt 2012-07-31 14:27:15.239157786 +0200
|
|
|
224c4d |
@@ -1,8 +1,9 @@
|
|
|
224c4d |
PROJECT (icedax C)
|
|
|
224c4d |
-INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
|
|
|
224c4d |
+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
|
|
|
224c4d |
include(../include/AddScgBits.cmake)
|
|
|
224c4d |
include(../include/AddSchilyBits.cmake)
|
|
|
224c4d |
include(../include/AddNetworkBits.cmake)
|
|
|
224c4d |
+INCLUDE (CheckLibraryExists)
|
|
|
224c4d |
|
|
|
224c4d |
FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
|
|
|
224c4d |
IF(HAVE_SYS_SOUNDCARD_H)
|
|
|
224c4d |
@@ -18,12 +19,20 @@ IF(HAVE_LIBOSSAUDIO)
|
|
|
224c4d |
LIST(APPEND EXTRA_LIBS "ossaudio")
|
|
|
224c4d |
ENDIF(HAVE_LIBOSSAUDIO)
|
|
|
224c4d |
|
|
|
224c4d |
-LIST(APPEND EXTRA_LIBS paranoia)
|
|
|
224c4d |
+CHECK_INCLUDE_FILES(cdio/cdda.h HAVE_CDDA_INTERFACE_H)
|
|
|
224c4d |
+CHECK_LIBRARY_EXISTS (cdio_paranoia cdio_paranoia_init "" HAVE_LIBPARANOIA)
|
|
|
224c4d |
+IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
|
|
|
224c4d |
+ LIST(APPEND EXTRA_LIBS cdio_paranoia cdio_cdda)
|
|
|
224c4d |
+ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
|
|
|
224c4d |
+ MESSAGE(FATAL_ERROR "You need cdparanoia library installed")
|
|
|
224c4d |
+ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
|
|
|
224c4d |
+
|
|
|
224c4d |
+LIST(APPEND EXTRA_LIBS)
|
|
|
224c4d |
IF (WIN32)
|
|
|
224c4d |
LIST(APPEND EXTRA_LIBS winmm)
|
|
|
224c4d |
ENDIF (WIN32)
|
|
|
224c4d |
|
|
|
224c4d |
-LINK_DIRECTORIES(../librols ../libusal ../libparanoia)
|
|
|
224c4d |
+LINK_DIRECTORIES(../librols ../libusal)
|
|
|
224c4d |
ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
|
|
|
224c4d |
TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
|
|
|
224c4d |
SET_TARGET_PROPERTIES(icedax PROPERTIES SKIP_BUILD_RPATH TRUE)
|
|
|
224c4d |
diff -up cdrkit-1.1.11/icedax/global.h.paranoiacdda cdrkit-1.1.11/icedax/global.h
|
|
|
224c4d |
--- cdrkit-1.1.11/icedax/global.h.paranoiacdda 2012-07-31 14:27:15.232157548 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/icedax/global.h 2012-07-31 14:27:15.226157345 +0200
|
|
|
224c4d |
@@ -17,7 +17,8 @@
|
|
|
224c4d |
#include "md5.h"
|
|
|
224c4d |
#endif
|
|
|
224c4d |
#ifdef USE_PARANOIA
|
|
|
224c4d |
-#include "cdda_paranoia.h"
|
|
|
224c4d |
+#include <cdio/cdda.h>
|
|
|
224c4d |
+#include <cdio/paranoia.h>
|
|
|
224c4d |
#endif
|
|
|
224c4d |
|
|
|
224c4d |
typedef struct index_list
|
|
|
224c4d |
@@ -102,10 +103,10 @@ typedef struct global
|
|
|
224c4d |
|
|
|
224c4d |
struct paranoia_parms_t
|
|
|
224c4d |
{
|
|
|
224c4d |
- Ucbit disable_paranoia:1;
|
|
|
224c4d |
- Ucbit disable_extra_paranoia:1;
|
|
|
224c4d |
- Ucbit disable_scratch_detect:1;
|
|
|
224c4d |
- Ucbit disable_scratch_repair:1;
|
|
|
224c4d |
+ char disable_paranoia:1;
|
|
|
224c4d |
+ char disable_extra_paranoia:1;
|
|
|
224c4d |
+ char disable_scratch_detect:1;
|
|
|
224c4d |
+ char disable_scratch_repair:1;
|
|
|
224c4d |
int retries;
|
|
|
224c4d |
int overlap;
|
|
|
224c4d |
int mindynoverlap;
|
|
|
224c4d |
diff -up cdrkit-1.1.11/icedax/icedax.c.paranoiacdda cdrkit-1.1.11/icedax/icedax.c
|
|
|
224c4d |
--- cdrkit-1.1.11/icedax/icedax.c.paranoiacdda 2012-07-31 14:27:15.237157718 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/icedax/icedax.c 2012-07-31 14:27:15.238157752 +0200
|
|
|
224c4d |
@@ -120,6 +120,10 @@
|
|
|
224c4d |
#ifdef USE_LAME
|
|
|
224c4d |
#include "mp3.h" /* mp3 file handling */
|
|
|
224c4d |
#endif
|
|
|
224c4d |
+#ifdef USE_PARANOIA
|
|
|
224c4d |
+#include <cdio/cdda.h>
|
|
|
224c4d |
+#include <cdio/paranoia.h>
|
|
|
224c4d |
+#endif
|
|
|
224c4d |
#include "interface.h" /* low level cdrom interfacing */
|
|
|
224c4d |
#include "icedax.h"
|
|
|
224c4d |
#include "resample.h"
|
|
|
224c4d |
@@ -128,9 +132,6 @@
|
|
|
224c4d |
#include "ringbuff.h"
|
|
|
224c4d |
#include "global.h"
|
|
|
224c4d |
#include "exitcodes.h"
|
|
|
224c4d |
-#ifdef USE_PARANOIA
|
|
|
224c4d |
-#include "cdda_paranoia.h"
|
|
|
224c4d |
-#endif
|
|
|
224c4d |
#include "defaults.h"
|
|
|
224c4d |
|
|
|
224c4d |
static void RestrictPlaybackRate(long newrate);
|
|
|
224c4d |
@@ -800,7 +801,7 @@ static void init_globals()
|
|
|
224c4d |
global.useroverlap = -1; /* amount of overlapping sectors user override */
|
|
|
224c4d |
global.need_hostorder = 0; /* processing needs samples in host endianess */
|
|
|
224c4d |
global.in_lendian = -1; /* input endianess from SetupSCSI() */
|
|
|
224c4d |
- global.outputendianess = NONE; /* user specified output endianess */
|
|
|
224c4d |
+ global.outputendianess = NONE_EN; /* user specified output endianess */
|
|
|
224c4d |
global.findminmax = 0; /* flag find extrem amplitudes */
|
|
|
224c4d |
#ifdef HAVE_LIMITS_H
|
|
|
224c4d |
global.maxamp[0] = INT_MIN; /* maximum amplitude */
|
|
|
224c4d |
@@ -2418,7 +2419,7 @@ Rate Divider Rate Divider
|
|
|
224c4d |
if (bulk == -1) bulk = 0;
|
|
|
224c4d |
|
|
|
224c4d |
global.need_big_endian = global.audio_out->need_big_endian;
|
|
|
224c4d |
- if (global.outputendianess != NONE)
|
|
|
224c4d |
+ if (global.outputendianess != NONE_EN)
|
|
|
224c4d |
global.need_big_endian = global.outputendianess == BIG;
|
|
|
224c4d |
|
|
|
224c4d |
if (global.no_file) global.fname_base[0] = '\0';
|
|
|
224c4d |
@@ -2602,7 +2603,7 @@ Rate Divider Rate Divider
|
|
|
224c4d |
fputs( ", soundcard", stderr );
|
|
|
224c4d |
#endif
|
|
|
224c4d |
#if defined USE_PARANOIA
|
|
|
224c4d |
- fputs( ", libparanoia", stderr );
|
|
|
224c4d |
+ fputs( ", libcdio_paranoia", stderr );
|
|
|
224c4d |
#endif
|
|
|
224c4d |
fputs( " support\n", stderr );
|
|
|
224c4d |
}
|
|
|
224c4d |
@@ -2892,8 +2893,28 @@ Rate Divider Rate Divider
|
|
|
224c4d |
#ifdef USE_PARANOIA
|
|
|
224c4d |
if (global.paranoia_selected) {
|
|
|
224c4d |
long paranoia_mode;
|
|
|
224c4d |
+ cdrom_drive *tmpdrive;
|
|
|
224c4d |
+ usal_close(get_scsi_p());
|
|
|
224c4d |
|
|
|
224c4d |
- global.cdp = paranoia_init(get_scsi_p(), global.nsectors);
|
|
|
224c4d |
+ tmpdrive = cdda_identify(global.dev_name, 0, NULL);
|
|
|
224c4d |
+ if (!tmpdrive)
|
|
|
224c4d |
+ {
|
|
|
224c4d |
+ fputs("Can't identify disc\n", stderr);
|
|
|
224c4d |
+ return 1;
|
|
|
224c4d |
+ }
|
|
|
224c4d |
+
|
|
|
224c4d |
+ if(global.nsectors)
|
|
|
224c4d |
+ {
|
|
|
224c4d |
+ tmpdrive->nsectors = global.nsectors;
|
|
|
224c4d |
+ tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW;
|
|
|
224c4d |
+ }
|
|
|
224c4d |
+ if (cdda_open(tmpdrive) != 0)
|
|
|
224c4d |
+ {
|
|
|
224c4d |
+ fputs("Can't open disc\n", stderr);
|
|
|
224c4d |
+ cdda_close(tmpdrive);
|
|
|
224c4d |
+ return 1;
|
|
|
224c4d |
+ }
|
|
|
224c4d |
+ global.cdp = paranoia_init(tmpdrive);
|
|
|
224c4d |
|
|
|
224c4d |
if (global.paranoia_parms.overlap >= 0) {
|
|
|
224c4d |
int overlap = global.paranoia_parms.overlap;
|
|
|
224c4d |
@@ -2902,17 +2923,7 @@ Rate Divider Rate Divider
|
|
|
224c4d |
overlap = global.nsectors - 1;
|
|
|
224c4d |
paranoia_overlapset(global.cdp, overlap);
|
|
|
224c4d |
}
|
|
|
224c4d |
- /*
|
|
|
224c4d |
- * Default to a minimum of dynamic overlapping == 0.5 sectors.
|
|
|
224c4d |
- * If we don't do this, we get the default from libparanoia
|
|
|
224c4d |
- * which is approx. 0.1.
|
|
|
224c4d |
- */
|
|
|
224c4d |
- if (global.paranoia_parms.mindynoverlap < 0)
|
|
|
224c4d |
- paranoia_dynoverlapset(global.cdp, CD_FRAMEWORDS/2, -1);
|
|
|
224c4d |
- paranoia_dynoverlapset(global.cdp,
|
|
|
224c4d |
- global.paranoia_parms.mindynoverlap * CD_FRAMEWORDS,
|
|
|
224c4d |
- global.paranoia_parms.maxdynoverlap * CD_FRAMEWORDS);
|
|
|
224c4d |
-
|
|
|
224c4d |
+
|
|
|
224c4d |
paranoia_mode = PARANOIA_MODE_FULL ^ PARANOIA_MODE_NEVERSKIP;
|
|
|
224c4d |
|
|
|
224c4d |
if (global.paranoia_parms.disable_paranoia) {
|
|
|
224c4d |
diff -up cdrkit-1.1.11/icedax/icedax.h.paranoiacdda cdrkit-1.1.11/icedax/icedax.h
|
|
|
224c4d |
--- cdrkit-1.1.11/icedax/icedax.h.paranoiacdda 2012-07-31 14:27:15.216157005 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/icedax/icedax.h 2012-07-31 14:27:15.217157039 +0200
|
|
|
224c4d |
@@ -41,7 +41,7 @@
|
|
|
224c4d |
|
|
|
224c4d |
/* Endianess */
|
|
|
224c4d |
#define GUESS (-2)
|
|
|
224c4d |
-#define NONE (-1)
|
|
|
224c4d |
+#define NONE_EN (-1)
|
|
|
224c4d |
#define LITTLE 0
|
|
|
224c4d |
#define BIG 1
|
|
|
224c4d |
|
|
|
224c4d |
diff -up cdrkit-1.1.11/icedax/interface.c.paranoiacdda cdrkit-1.1.11/icedax/interface.c
|
|
|
224c4d |
--- cdrkit-1.1.11/icedax/interface.c.paranoiacdda 2012-07-31 14:27:15.235157650 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/icedax/interface.c 2012-07-31 14:27:15.232157548 +0200
|
|
|
224c4d |
@@ -116,7 +116,7 @@ int (*Play_at)(SCSI *usalp, unsigned in
|
|
|
224c4d |
int (*StopPlay)(SCSI *usalp);
|
|
|
224c4d |
void (*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal);
|
|
|
224c4d |
|
|
|
224c4d |
-#if defined USE_PARANOIA
|
|
|
224c4d |
+#if 0 //defined USE_PARANOIA
|
|
|
224c4d |
long cdda_read(void *d, void *buffer, long beginsector, long sectors);
|
|
|
224c4d |
|
|
|
224c4d |
long cdda_read(void *d, void *buffer, long beginsector, long sectors)
|
|
|
224c4d |
diff -up cdrkit-1.1.11/icedax/toc.c.paranoiacdda cdrkit-1.1.11/icedax/toc.c
|
|
|
224c4d |
--- cdrkit-1.1.11/icedax/toc.c.paranoiacdda 2012-07-31 14:27:15.225157311 +0200
|
|
|
224c4d |
+++ cdrkit-1.1.11/icedax/toc.c 2012-07-31 14:27:15.230157480 +0200
|
|
|
224c4d |
@@ -379,8 +379,7 @@ static void emit_cddb_form(char *fname_b
|
|
|
224c4d |
static void emit_cdindex_form(char *fname_baseval);
|
|
|
224c4d |
#endif
|
|
|
224c4d |
|
|
|
224c4d |
-
|
|
|
224c4d |
-typedef struct TOC { /* structure of table of contents (cdrom) */
|
|
|
224c4d |
+typedef struct TOC_t { /* structure of table of contents (cdrom) */
|
|
|
224c4d |
unsigned char reserved1;
|
|
|
224c4d |
unsigned char bFlags;
|
|
|
224c4d |
unsigned char bTrack;
|
|
|
224c4d |
@@ -391,8 +390,7 @@ typedef struct TOC { /* structure of tab
|
|
|
224c4d |
int frms;
|
|
|
224c4d |
unsigned char ISRC[16];
|
|
|
224c4d |
int SCMS;
|
|
|
224c4d |
-} TOC;
|
|
|
224c4d |
-
|
|
|
224c4d |
+} TOC_t;
|
|
|
224c4d |
|
|
|
224c4d |
/* Flags contains two fields:
|
|
|
224c4d |
bits 7-4 (ADR)
|
|
|
224c4d |
@@ -432,7 +430,7 @@ struct iterator {
|
|
|
224c4d |
int index;
|
|
|
224c4d |
int startindex;
|
|
|
224c4d |
void (*reset)(struct iterator *this);
|
|
|
224c4d |
- struct TOC *(*getNextTrack)(struct iterator *this);
|
|
|
224c4d |
+ struct TOC_t *(*getNextTrack)(struct iterator *this);
|
|
|
224c4d |
int (*hasNextTrack)(struct iterator *this);
|
|
|
224c4d |
};
|
|
|
224c4d |
|
|
|
224c4d |
@@ -518,7 +516,7 @@ unsigned FixupTOC(unsigned no_tracks)
|
|
|
224c4d |
InitIterator(&i, 1);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
if (IS__AUDIO(p)) count_audio_tracks++;
|
|
|
224c4d |
}
|
|
|
224c4d |
|
|
|
224c4d |
@@ -733,7 +731,7 @@ static void emit_cddb_form(char *fname_b
|
|
|
224c4d |
fprintf( cddb_form, "# Track frame offsets:\n#\n");
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
if (GETTRACK(p) == CDROM_LEADOUT) break;
|
|
|
224c4d |
fprintf( cddb_form,
|
|
|
224c4d |
"# %lu\n", 150 + Get_AudioStartSector(GETTRACK(p)));
|
|
|
224c4d |
@@ -765,7 +763,7 @@ static void emit_cddb_form(char *fname_b
|
|
|
224c4d |
|
|
|
224c4d |
i.reset(&i);
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int ii;
|
|
|
224c4d |
|
|
|
224c4d |
ii = GETTRACK(p);
|
|
|
224c4d |
@@ -788,7 +786,7 @@ static void emit_cddb_form(char *fname_b
|
|
|
224c4d |
|
|
|
224c4d |
i.reset(&i);
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int ii;
|
|
|
224c4d |
|
|
|
224c4d |
ii = GETTRACK(p);
|
|
|
224c4d |
@@ -1495,7 +1493,7 @@ static int IsSingleArtist(void)
|
|
|
224c4d |
InitIterator(&i, 1);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int ii;
|
|
|
224c4d |
|
|
|
224c4d |
if (IS__DATA(p) || GETTRACK(p) == CDROM_LEADOUT) continue;
|
|
|
224c4d |
@@ -1681,7 +1679,7 @@ static void emit_cdindex_form(char *fnam
|
|
|
224c4d |
global.creator ? ascii2html(global.creator) : "");
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int ii = GETTRACK(p);
|
|
|
224c4d |
|
|
|
224c4d |
if (ii == CDROM_LEADOUT) break;
|
|
|
224c4d |
@@ -1703,7 +1701,7 @@ static void emit_cdindex_form(char *fnam
|
|
|
224c4d |
fprintf( cdindex_form, " <MultipleArtistCD>\n");
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int ii = GETTRACK(p);
|
|
|
224c4d |
|
|
|
224c4d |
if (ii == CDROM_LEADOUT) break;
|
|
|
224c4d |
@@ -1942,9 +1940,9 @@ static void DisplayToc_with_gui(unsigned
|
|
|
224c4d |
|
|
|
224c4d |
if ((global.verbose & (SHOW_TOC | SHOW_STARTPOSITIONS | SHOW_SUMMARY | SHOW_TITLES)) != 0
|
|
|
224c4d |
&& i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *o = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *o = i.getNextTrack(&i);
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int from;
|
|
|
224c4d |
from = GETTRACK(o);
|
|
|
224c4d |
|
|
|
224c4d |
@@ -2072,9 +2070,9 @@ static void DisplayToc_no_gui(unsigned l
|
|
|
224c4d |
count_audio_trks = 0;
|
|
|
224c4d |
|
|
|
224c4d |
if (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *o = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *o = i.getNextTrack(&i);
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int from;
|
|
|
224c4d |
from = GETTRACK(o);
|
|
|
224c4d |
|
|
|
224c4d |
@@ -2131,10 +2129,10 @@ static void DisplayToc_no_gui(unsigned l
|
|
|
224c4d |
i.reset(&i);
|
|
|
224c4d |
if ((global.verbose & SHOW_TOC) != 0 &&
|
|
|
224c4d |
i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *o = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *o = i.getNextTrack(&i);
|
|
|
224c4d |
|
|
|
224c4d |
for (; i.hasNextTrack(&i);) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
|
|
|
224c4d |
if ( GETTRACK(o) <= MAXTRK ) {
|
|
|
224c4d |
unsigned char brace1, brace2;
|
|
|
224c4d |
@@ -2189,9 +2187,9 @@ static void DisplayToc_no_gui(unsigned l
|
|
|
224c4d |
ii = 0;
|
|
|
224c4d |
i.reset(&i);
|
|
|
224c4d |
if (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *o = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *o = i.getNextTrack(&i);
|
|
|
224c4d |
for ( ; i.hasNextTrack(&i);) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
fprintf ( stderr,
|
|
|
224c4d |
" %2u.(%8u)",
|
|
|
224c4d |
GETTRACK(o),
|
|
|
224c4d |
@@ -2248,7 +2246,7 @@ static void DisplayToc_no_gui(unsigned l
|
|
|
224c4d |
|
|
|
224c4d |
i.reset(&i);
|
|
|
224c4d |
for ( ; i.hasNextTrack(&i);) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int jj = GETTRACK(p);
|
|
|
224c4d |
|
|
|
224c4d |
if ( global.tracktitle[jj] != NULL ) {
|
|
|
224c4d |
@@ -2260,7 +2258,7 @@ static void DisplayToc_no_gui(unsigned l
|
|
|
224c4d |
|
|
|
224c4d |
i.reset(&i);
|
|
|
224c4d |
for ( ; i.hasNextTrack(&i); ) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
int jj;
|
|
|
224c4d |
|
|
|
224c4d |
if (IS__DATA(p))
|
|
|
224c4d |
@@ -2720,7 +2718,7 @@ void Read_MCN_ISRC(void)
|
|
|
224c4d |
InitIterator(&i, 1);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
unsigned ii = GETTRACK(p);
|
|
|
224c4d |
|
|
|
224c4d |
if (ii == CDROM_LEADOUT) break;
|
|
|
224c4d |
@@ -3155,7 +3153,7 @@ unsigned ScanIndices(unsigned track, uns
|
|
|
224c4d |
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- struct TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ struct TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
unsigned ii = GETTRACK(p);
|
|
|
224c4d |
|
|
|
224c4d |
if ( ii < starttrack || IS__DATA(p) )
|
|
|
224c4d |
@@ -3322,7 +3320,7 @@ unsigned char *Get_MCN(void)
|
|
|
224c4d |
}
|
|
|
224c4d |
|
|
|
224c4d |
|
|
|
224c4d |
-static TOC g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
|
|
|
224c4d |
+static TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
|
|
|
224c4d |
|
|
|
224c4d |
/*#define IS_AUDIO(i) (!(g_toc[i].bFlags & 0x40))*/
|
|
|
224c4d |
|
|
|
224c4d |
@@ -3397,10 +3395,10 @@ static int patch_cd_extra(unsigned track
|
|
|
224c4d |
|
|
|
224c4d |
static int restrict_tracks_illleadout(void)
|
|
|
224c4d |
{
|
|
|
224c4d |
- struct TOC *o = &g_toc[cdtracks+1];
|
|
|
224c4d |
+ struct TOC_t *o = &g_toc[cdtracks+1];
|
|
|
224c4d |
int i;
|
|
|
224c4d |
for (i = cdtracks; i >= 0; i--) {
|
|
|
224c4d |
- struct TOC *p = &g_toc[i];
|
|
|
224c4d |
+ struct TOC_t *p = &g_toc[i];
|
|
|
224c4d |
if (GETSTART(o) > GETSTART(p)) break;
|
|
|
224c4d |
}
|
|
|
224c4d |
patch_cd_extra(i+1, GETSTART(o));
|
|
|
224c4d |
@@ -3523,7 +3521,7 @@ static void it_reset(struct iterator *th
|
|
|
224c4d |
|
|
|
224c4d |
|
|
|
224c4d |
static int it_hasNextTrack(struct iterator *this);
|
|
|
224c4d |
-static struct TOC *it_getNextTrack(struct iterator *this);
|
|
|
224c4d |
+static struct TOC_t *it_getNextTrack(struct iterator *this);
|
|
|
224c4d |
|
|
|
224c4d |
static int it_hasNextTrack(struct iterator *this)
|
|
|
224c4d |
{
|
|
|
224c4d |
@@ -3532,7 +3530,7 @@ static int it_hasNextTrack(struct iterat
|
|
|
224c4d |
|
|
|
224c4d |
|
|
|
224c4d |
|
|
|
224c4d |
-static struct TOC *it_getNextTrack(struct iterator *this)
|
|
|
224c4d |
+static struct TOC_t *it_getNextTrack(struct iterator *this)
|
|
|
224c4d |
{
|
|
|
224c4d |
/* if ( (*this->hasNextTrack)(this) == 0 ) return NULL; */
|
|
|
224c4d |
if ( this->index > (int)cdtracks+1 ) return NULL;
|
|
|
224c4d |
@@ -3583,7 +3581,7 @@ long Get_AudioStartSector(unsigned long
|
|
|
224c4d |
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
|
|
|
224c4d |
if (GETTRACK(p) == p_track) {
|
|
|
224c4d |
if (IS__DATA(p)) {
|
|
|
224c4d |
@@ -3613,7 +3611,7 @@ long Get_StartSector(unsigned long p_tra
|
|
|
224c4d |
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
|
|
|
224c4d |
if (GETTRACK(p) == p_track) {
|
|
|
224c4d |
return GETSTART(p);
|
|
|
224c4d |
@@ -3637,7 +3635,7 @@ long Get_EndSector(unsigned long p_track
|
|
|
224c4d |
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
if (GETTRACK(p) == p_track) {
|
|
|
224c4d |
p = i.getNextTrack(&i);
|
|
|
224c4d |
if (p == NULL) {
|
|
|
224c4d |
@@ -3669,7 +3667,7 @@ long FirstAudioTrack(void)
|
|
|
224c4d |
else i.reset(&i);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
unsigned ii = GETTRACK(p);
|
|
|
224c4d |
|
|
|
224c4d |
if (ii == CDROM_LEADOUT) break;
|
|
|
224c4d |
@@ -3687,7 +3685,7 @@ long FirstDataTrack(void)
|
|
|
224c4d |
else i.reset(&i);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
if (IS__DATA(p)) {
|
|
|
224c4d |
return GETTRACK(p);
|
|
|
224c4d |
}
|
|
|
224c4d |
@@ -3708,7 +3706,7 @@ long LastAudioTrack(void)
|
|
|
224c4d |
else i.reset(&i);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
if (IS__AUDIO(p) && (GETTRACK(p) != CDROM_LEADOUT)) {
|
|
|
224c4d |
j = GETTRACK(p);
|
|
|
224c4d |
}
|
|
|
224c4d |
@@ -3730,7 +3728,7 @@ long Get_LastSectorOnCd(unsigned long p_
|
|
|
224c4d |
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
|
|
|
224c4d |
if (GETTRACK(p) < p_track)
|
|
|
224c4d |
continue;
|
|
|
224c4d |
@@ -3749,9 +3747,9 @@ int Get_Track(unsigned long sector)
|
|
|
224c4d |
else i.reset(&i);
|
|
|
224c4d |
|
|
|
224c4d |
if (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *o = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *o = i.getNextTrack(&i);
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
if ((GETSTART(o) <= sector) && (GETSTART(p) > sector)) {
|
|
|
224c4d |
if (IS__DATA(o)) {
|
|
|
224c4d |
return -1;
|
|
|
224c4d |
@@ -3772,7 +3770,7 @@ int CheckTrackrange(unsigned long from,
|
|
|
224c4d |
else i.reset(&i);
|
|
|
224c4d |
|
|
|
224c4d |
while (i.hasNextTrack(&i)) {
|
|
|
224c4d |
- TOC *p = i.getNextTrack(&i);
|
|
|
224c4d |
+ TOC_t *p = i.getNextTrack(&i);
|
|
|
224c4d |
|
|
|
224c4d |
if (GETTRACK(p) < from)
|
|
|
224c4d |
continue;
|
|
|
224c4d |
@@ -3788,54 +3786,3 @@ int CheckTrackrange(unsigned long from,
|
|
|
224c4d |
return 0;
|
|
|
224c4d |
}
|
|
|
224c4d |
|
|
|
224c4d |
-#ifdef USE_PARANOIA
|
|
|
224c4d |
-long cdda_disc_firstsector(void *d);
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_disc_firstsector(void *d)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return Get_StartSector(FirstAudioTrack());
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-int cdda_tracks(void *d);
|
|
|
224c4d |
-
|
|
|
224c4d |
-int cdda_tracks(void *d)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return LastAudioTrack() - FirstAudioTrack() +1;
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-int cdda_track_audiop(void *d, int track);
|
|
|
224c4d |
-
|
|
|
224c4d |
-int cdda_track_audiop(void *d, int track)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return Get_Datatrack(track) == 0;
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_track_firstsector(void *d, int track);
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_track_firstsector(void *d, int track)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return Get_AudioStartSector(track);
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_track_lastsector(void *d, int track);
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_track_lastsector(void *d, int track)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return Get_EndSector(track);
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_disc_lastsector(void *d);
|
|
|
224c4d |
-
|
|
|
224c4d |
-long cdda_disc_lastsector(void *d)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return Get_LastSectorOnCd(cdtracks) - 1;
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-int cdda_sector_gettrack(void *d,long sector);
|
|
|
224c4d |
-
|
|
|
224c4d |
-int cdda_sector_gettrack(void *d, long sector)
|
|
|
224c4d |
-{
|
|
|
224c4d |
- return Get_Track(sector);
|
|
|
224c4d |
-}
|
|
|
224c4d |
-
|
|
|
224c4d |
-#endif
|