diff -up cdiopara/icedax/global.h.wrk cdiopara/icedax/global.h

diff -up cdiopara/icedax/icedax.c.wrk cdiopara/icedax/icedax.c

--- cdiopara/icedax/icedax.c.wrk	2013-05-14 14:53:18.446879592 +0200

+++ cdiopara/icedax/icedax.c	2013-05-20 14:38:29.724047315 +0200

@@ -1149,15 +1149,15 @@ static void paranoia_reset()

 	para_stat->skips = 0;

 }

-static void paranoia_callback(long inpos, int function);

+static void paranoia_callback(long inpos, paranoia_cb_mode_t function);

-static void paranoia_callback(long inpos, int function)

+static void paranoia_callback(long inpos, paranoia_cb_mode_t function)

 {

 	struct timeval thistime;

 	long	test;

 	switch (function) {

-		case	-2:

+/*		case	-2:

 			para_stat->v_sector = inpos / CD_FRAMEWORDS;

 			return;

 		case	-1:

@@ -1165,7 +1165,7 @@ static void paranoia_callback(long inpos

 			para_stat->heartbeat = '*';

 			para_stat->slevel = 0;

 			para_stat->v_sector = inpos / CD_FRAMEWORDS;

-		break;

+		break;*/

 		case	PARANOIA_CB_VERIFY:

 			if (para_stat->stimeout >= 30) {

 				if (para_stat->curoverlap > CD_FRAMEWORDS) {

@@ -1232,6 +1232,12 @@ static void paranoia_callback(long inpos

 			para_stat->slevel = 5;

 			para_stat->fixup_dupeds++;

 		break;

+

+		case PARANOIA_CB_REPAIR:

+		case PARANOIA_CB_BACKOFF:

+		default:

+			fprintf(stderr, "ERROR: Unknown function requested from paranoia_callback. REPORT THIS AS A BUG!/n");

+		break;

 	}

 	gettimeofday(&thistime, NULL);

@@ -2895,7 +2901,7 @@ Rate   Divider      Rate   Divider

 		long paranoia_mode;

 		cdrom_drive *tmpdrive;

 		usal_close(get_scsi_p());

-

+//		global.cdp = paranoia_init(get_scsi_p()/*, global.nsectors*/);

 		tmpdrive = cdda_identify(global.dev_name, 0, NULL);

 		if (!tmpdrive)

 		{

@@ -2906,7 +2912,7 @@ Rate   Divider      Rate   Divider

 		if(global.nsectors)

 		{

 		  tmpdrive->nsectors = global.nsectors;

-		  tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW;

+//		  tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW;

 		}

 		if (cdda_open(tmpdrive) != 0)

 		{

diff -up cdiopara/icedax/icedax.h.wrk cdiopara/icedax/icedax.h

--- cdiopara/icedax/icedax.h.wrk	2013-05-14 14:35:09.646871797 +0200

+++ cdiopara/icedax/icedax.h	2013-05-14 14:35:55.114209747 +0200

@@ -71,7 +71,8 @@ unsigned int get_current_track(void);

 #define CD_XA_SYNC_HEAD   (CD_SYNC_SIZE+CD_XA_HEAD)/* sync bytes + header of XA frame */

 #define CD_FRAMESIZE      2048 /* bytes per frame, "cooked" mode */

-#define CD_FRAMESIZE_RAW  2352 /* bytes per frame, "raw" mode */

+//defined in libcdio:

+//#define CD_FRAMESIZE_RAW  2352 /* bytes per frame, "raw" mode */

 /* most drives don't deliver everything: */

 #define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /* 2340 */

 #define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /* 2336 */

diff -up cdiopara/icedax/interface.c.wrk cdiopara/icedax/interface.c

--- cdiopara/icedax/interface.c.wrk	2013-05-20 14:54:28.400943735 +0200

+++ cdiopara/icedax/interface.c	2013-06-25 17:31:18.912450933 +0200

@@ -75,15 +75,15 @@

 #include "mytype.h"

 #include "byteorder.h"

-#include "interface.h"

 #include "icedax.h"

 #include "semshm.h"

 #include "setuid.h"

+#include "global.h"

 #include "ringbuff.h"

 #include "toc.h"

-#include "global.h"

 #include "ioctl.h"

 #include "exitcodes.h"

+#include "interface.h"

 #include "scsi_cmds.h"

 #include <utypes.h>

diff -up cdiopara/icedax/interface.h.wrk cdiopara/icedax/interface.h

--- cdiopara/icedax/interface.h.wrk	2013-05-22 15:24:17.117837738 +0200

+++ cdiopara/icedax/interface.h	2013-06-25 17:23:38.155611522 +0200

@@ -26,7 +26,11 @@

 #define CD_FRAMESIZE_RAW 2352

 #endif

+#ifndef _CDDA_INTERFACE_H_

+//#ifndef CD_FRAMESAMPLES

 #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4)

+//#endif

+#endif

 extern unsigned interface;

diff -up cdiopara/icedax/ioctl.c.wrk cdiopara/icedax/ioctl.c

--- cdiopara/icedax/ioctl.c.wrk	2013-06-25 17:35:30.494695270 +0200

+++ cdiopara/icedax/ioctl.c	2013-06-25 17:36:21.377147425 +0200

@@ -55,11 +55,11 @@

 #include "mytype.h"

 #include "byteorder.h"

+#include "global.h"

 #include "interface.h"

 #include "toc.h"

 #include "icedax.h"

 #include "ioctl.h"

-#include "global.h"

 #include "exitcodes.h"

 #include <utypes.h>

diff -up cdiopara/icedax/resample.c.wrk cdiopara/icedax/resample.c

--- cdiopara/icedax/resample.c.wrk	2013-06-25 17:38:40.413456990 +0200

+++ cdiopara/icedax/resample.c	2013-06-25 17:39:00.557653547 +0200

@@ -42,6 +42,7 @@

 #include "mytype.h"

 #include "icedax.h"

+#include "global.h"

 #include "interface.h"

 #include "byteorder.h"

 #include "ringbuff.h"

@@ -49,7 +50,6 @@

 #include "toc.h"

 #include "sndfile.h"

 #include "sndconfig.h"

-#include "global.h"

 #include "exitcodes.h"

diff -up cdiopara/icedax/scsi_cmds.c.wrk cdiopara/icedax/scsi_cmds.c

--- cdiopara/icedax/scsi_cmds.c.wrk	2013-06-25 17:40:24.592486996 +0200

+++ cdiopara/icedax/scsi_cmds.c	2013-06-25 17:40:42.189663871 +0200

@@ -40,9 +40,9 @@

 #include "mytype.h"

 #include "icedax.h"

+#include "global.h"

 #include "interface.h"

 #include "byteorder.h"

-#include "global.h"

 #include "wodim.h"

 #include "toc.h"

 #include "scsi_cmds.h"

diff -up cdiopara/icedax/semshm.c.wrk cdiopara/icedax/semshm.c

--- cdiopara/icedax/semshm.c.wrk	2013-06-25 17:59:53.181820740 +0200

+++ cdiopara/icedax/semshm.c	2013-06-25 18:00:35.372272020 +0200

@@ -90,9 +90,9 @@

 #endif

 #include "mytype.h"

+#include "global.h"

 #include "interface.h"

 #include "ringbuff.h"

-#include "global.h"

 #include "exitcodes.h"

 #include "semshm.h"

diff -up cdiopara/icedax/toc.c.wrk cdiopara/icedax/toc.c

--- cdiopara/icedax/toc.c.wrk	2013-06-25 18:11:05.910961694 +0200

+++ cdiopara/icedax/toc.c	2013-06-25 18:32:39.559603392 +0200

@@ -58,9 +58,9 @@

 #include "mytype.h"

 #include "byteorder.h"

+#include "global.h"

 #include "interface.h"

 #include "icedax.h"

-#include "global.h"

 #include "sha.h"

 #include "base64.h"

 #include "toc.h"

@@ -379,7 +379,7 @@ static void emit_cddb_form(char *fname_b

 static void emit_cdindex_form(char *fname_baseval);

 #endif

-typedef struct TOC_t {	/* structure of table of contents (cdrom) */

+typedef struct icedax_TOC_t {	/* structure of table of contents (cdrom) */

 	unsigned char reserved1;

 	unsigned char bFlags;

 	unsigned char bTrack;

@@ -390,7 +390,7 @@ typedef struct TOC_t {	/* structure of t

 	int frms;

 	unsigned char ISRC[16];

 	int	SCMS;

-} TOC_t;

+} icedax_TOC_t;

 /* Flags contains two fields:

     bits 7-4 (ADR)

@@ -430,7 +430,7 @@ struct iterator {

 	int index;

 	int startindex;

 	void        (*reset)(struct iterator *this);

-	struct TOC_t *(*getNextTrack)(struct iterator *this);

+	struct icedax_TOC_t *(*getNextTrack)(struct iterator *this);

 	int         (*hasNextTrack)(struct iterator *this);

 };

@@ -516,7 +516,7 @@ unsigned FixupTOC(unsigned no_tracks)

 		    InitIterator(&i, 1);

 	    while (i.hasNextTrack(&i)) {

-		    struct TOC_t *p = i.getNextTrack(&i);

+		    struct icedax_TOC_t *p = i.getNextTrack(&i);

 		    if (IS__AUDIO(p)) count_audio_tracks++;

 	    }

@@ -731,7 +731,7 @@ static void emit_cddb_form(char *fname_b

   fprintf( cddb_form, "# Track frame offsets:\n#\n");

   while (i.hasNextTrack(&i)) {

-	  struct TOC_t *p = i.getNextTrack(&i);

+	  struct icedax_TOC_t *p = i.getNextTrack(&i);

 	  if (GETTRACK(p) == CDROM_LEADOUT) break;

 	  fprintf( cddb_form,

 		   "# %lu\n", 150 + Get_AudioStartSector(GETTRACK(p)));

@@ -763,7 +763,7 @@ static void emit_cddb_form(char *fname_b

   i.reset(&i);

   while (i.hasNextTrack(&i)) {

-	  struct TOC_t *p = i.getNextTrack(&i);

+	  struct icedax_TOC_t *p = i.getNextTrack(&i);

 	  int ii;

 	  ii = GETTRACK(p);

@@ -786,7 +786,7 @@ static void emit_cddb_form(char *fname_b

   i.reset(&i);

   while (i.hasNextTrack(&i)) {

-	  struct TOC_t *p = i.getNextTrack(&i);

+	  struct icedax_TOC_t *p = i.getNextTrack(&i);

 	  int ii;

 	  ii = GETTRACK(p);

@@ -1493,7 +1493,7 @@ static int IsSingleArtist(void)

 	InitIterator(&i, 1);

 	while (i.hasNextTrack(&i)) {

-		struct TOC_t *p = i.getNextTrack(&i);

+		struct icedax_TOC_t *p = i.getNextTrack(&i);

 		int ii;

 		if (IS__DATA(p) || GETTRACK(p) == CDROM_LEADOUT) continue;

@@ -1679,7 +1679,7 @@ static void emit_cdindex_form(char *fnam

 	 global.creator ? ascii2html(global.creator) : "");

     while (i.hasNextTrack(&i)) {

-	    struct TOC_t *p = i.getNextTrack(&i);

+	    struct icedax_TOC_t *p = i.getNextTrack(&i);

 	    int ii = GETTRACK(p);

 	    if (ii == CDROM_LEADOUT) break;

@@ -1701,7 +1701,7 @@ static void emit_cdindex_form(char *fnam

     fprintf( cdindex_form, "   <MultipleArtistCD>\n");

     while (i.hasNextTrack(&i)) {

-	    struct TOC_t *p = i.getNextTrack(&i);

+	    struct icedax_TOC_t *p = i.getNextTrack(&i);

 	    int ii = GETTRACK(p);

 	    if (ii == CDROM_LEADOUT) break;

@@ -1940,9 +1940,9 @@ static void DisplayToc_with_gui(unsigned

 	if ((global.verbose & (SHOW_TOC | SHOW_STARTPOSITIONS | SHOW_SUMMARY | SHOW_TITLES)) != 0

 	    && i.hasNextTrack(&i)) {

-		TOC_t *o = i.getNextTrack(&i);

+		icedax_TOC_t *o = i.getNextTrack(&i);

 		while (i.hasNextTrack(&i)) {

-			TOC_t *p = i.getNextTrack(&i);

+			icedax_TOC_t *p = i.getNextTrack(&i);

 			int from;

 			from = GETTRACK(o);

@@ -2070,9 +2070,9 @@ static void DisplayToc_no_gui(unsigned l

 	count_audio_trks = 0;

 	if (i.hasNextTrack(&i)) {

-		TOC_t *o = i.getNextTrack(&i);

+		icedax_TOC_t *o = i.getNextTrack(&i);

 		while (i.hasNextTrack(&i)) {

-			TOC_t *p = i.getNextTrack(&i);

+			icedax_TOC_t *p = i.getNextTrack(&i);

 			int from;

 			from = GETTRACK(o);

@@ -2129,10 +2129,10 @@ static void DisplayToc_no_gui(unsigned l

 	i.reset(&i);

 	if ((global.verbose & SHOW_TOC) != 0 &&

 		i.hasNextTrack(&i)) {

-		TOC_t *o = i.getNextTrack(&i);

+		icedax_TOC_t *o = i.getNextTrack(&i);

 		for (; i.hasNextTrack(&i);) {

-			TOC_t *p = i.getNextTrack(&i);

+			icedax_TOC_t *p = i.getNextTrack(&i);

 			if ( GETTRACK(o) <= MAXTRK ) {

 				unsigned char brace1, brace2;

@@ -2187,9 +2187,9 @@ static void DisplayToc_no_gui(unsigned l

 		ii = 0;

 		i.reset(&i);

 		if (i.hasNextTrack(&i)) {

-			TOC_t *o = i.getNextTrack(&i);

+			icedax_TOC_t *o = i.getNextTrack(&i);

 			for ( ; i.hasNextTrack(&i);) {

-				TOC_t *p = i.getNextTrack(&i);

+				icedax_TOC_t *p = i.getNextTrack(&i);

 				fprintf ( stderr,

 					  " %2u.(%8u)",

 					  GETTRACK(o),

@@ -2246,7 +2246,7 @@ static void DisplayToc_no_gui(unsigned l

 		i.reset(&i);

 		for ( ; i.hasNextTrack(&i);) {

-			TOC_t *p = i.getNextTrack(&i);

+			icedax_TOC_t *p = i.getNextTrack(&i);

 			int jj = GETTRACK(p);

 			if ( global.tracktitle[jj] != NULL ) {

@@ -2258,7 +2258,7 @@ static void DisplayToc_no_gui(unsigned l

 		i.reset(&i);

 		for ( ; i.hasNextTrack(&i); ) {

-			TOC_t *p = i.getNextTrack(&i);

+			icedax_TOC_t *p = i.getNextTrack(&i);

 			int jj;

 			if (IS__DATA(p))

@@ -2718,7 +2718,7 @@ void Read_MCN_ISRC(void)

 		InitIterator(&i, 1);

 		while (i.hasNextTrack(&i)) {

-			struct TOC_t *p = i.getNextTrack(&i);

+			struct icedax_TOC_t *p = i.getNextTrack(&i);

 			unsigned ii = GETTRACK(p);

 			if (ii == CDROM_LEADOUT) break;

@@ -3153,7 +3153,7 @@ unsigned ScanIndices(unsigned track, uns

   while (i.hasNextTrack(&i)) {

-	  struct TOC_t *p = i.getNextTrack(&i);

+	  struct icedax_TOC_t *p = i.getNextTrack(&i);

 	  unsigned ii = GETTRACK(p);

 	  if ( ii < starttrack || IS__DATA(p) )

@@ -3320,7 +3320,7 @@ unsigned char *Get_MCN(void)

 }

-static TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */

+static icedax_TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */

 /*#define IS_AUDIO(i) (!(g_toc[i].bFlags & 0x40))*/

@@ -3395,10 +3395,10 @@ static int patch_cd_extra(unsigned track

 static int restrict_tracks_illleadout(void)

 {

-	struct TOC_t *o = &g_toc[cdtracks+1];

+	struct icedax_TOC_t *o = &g_toc[cdtracks+1];

 	int i;

 	for (i = cdtracks; i >= 0; i--) {

-		struct TOC_t *p = &g_toc[i];

+		struct icedax_TOC_t *p = &g_toc[i];

 		if (GETSTART(o) > GETSTART(p)) break;

 	}

 	patch_cd_extra(i+1, GETSTART(o));

@@ -3521,7 +3521,7 @@ static void it_reset(struct iterator *th

 static int it_hasNextTrack(struct iterator *this);

-static struct TOC_t *it_getNextTrack(struct iterator *this);

+static struct icedax_TOC_t *it_getNextTrack(struct iterator *this);

 static int it_hasNextTrack(struct iterator *this)

 {

@@ -3530,7 +3530,7 @@ static int it_hasNextTrack(struct iterat

-static struct TOC_t *it_getNextTrack(struct iterator *this)

+static struct icedax_TOC_t *it_getNextTrack(struct iterator *this)

 {

 	/* if ( (*this->hasNextTrack)(this) == 0 ) return NULL; */

 	if ( this->index > (int)cdtracks+1 ) return NULL;

@@ -3581,7 +3581,7 @@ long Get_AudioStartSector(unsigned long

 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (GETTRACK(p) == p_track) {

 			if (IS__DATA(p)) {

@@ -3611,7 +3611,7 @@ long Get_StartSector(unsigned long p_tra

 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (GETTRACK(p) == p_track) {

 			return GETSTART(p);

@@ -3635,7 +3635,7 @@ long Get_EndSector(unsigned long p_track

 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (GETTRACK(p) == p_track) {

 			p = i.getNextTrack(&i);

 			if (p == NULL) {

@@ -3667,7 +3667,7 @@ long FirstAudioTrack(void)

 	else i.reset(&i);

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		unsigned ii = GETTRACK(p);

 		if (ii == CDROM_LEADOUT) break;

@@ -3685,7 +3685,7 @@ long FirstDataTrack(void)

 	else i.reset(&i);

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (IS__DATA(p)) {

 			return GETTRACK(p);

 		}

@@ -3706,7 +3706,7 @@ long LastAudioTrack(void)

 	else i.reset(&i);

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (IS__AUDIO(p) && (GETTRACK(p) != CDROM_LEADOUT)) {

 			j = GETTRACK(p);

 		}

@@ -3728,7 +3728,7 @@ long Get_LastSectorOnCd(unsigned long p_

 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (GETTRACK(p) < p_track)

 			continue;

@@ -3747,9 +3747,9 @@ int Get_Track(unsigned long sector)

 	else i.reset(&i);

 	if (i.hasNextTrack(&i)) {

-		TOC_t *o = i.getNextTrack(&i);

+		icedax_TOC_t *o = i.getNextTrack(&i);

 		while (i.hasNextTrack(&i)) {

-			TOC_t *p = i.getNextTrack(&i);

+			icedax_TOC_t *p = i.getNextTrack(&i);

 			if ((GETSTART(o) <= sector) && (GETSTART(p) > sector)) {

 				if (IS__DATA(o)) {

 					return -1;

@@ -3770,7 +3770,7 @@ int CheckTrackrange(unsigned long from,

 	else i.reset(&i);

 	while (i.hasNextTrack(&i)) {

-		TOC_t *p = i.getNextTrack(&i);

+		icedax_TOC_t *p = i.getNextTrack(&i);

 		if (GETTRACK(p) < from)

 			continue;

diff -up cdiopara/icedax/toc.h.wrk cdiopara/icedax/toc.h

--- cdiopara/icedax/toc.h.wrk	2013-05-14 14:41:35.646726988 +0200

+++ cdiopara/icedax/toc.h	2013-05-14 14:42:06.556954562 +0200

@@ -12,7 +12,8 @@

 /* @(#)toc.h	1.9 06/02/19 Copyright 1998,1999 Heiko Eissfeldt, Copyright 2006 J. Schilling */

-#define	MAXTRK	100	/* maximum of audio tracks (without a hidden track) */

+//defined in libcdio:

+//#define	MAXTRK	100	/* maximum of audio tracks (without a hidden track) */

 extern	unsigned cdtracks;

 extern	int	have_multisession;

diff -up cdiopara/readom/readom.c.wrk cdiopara/readom/readom.c

--- cdiopara/readom/readom.c.wrk	2013-06-25 16:13:03.587078284 +0200

+++ cdiopara/readom/readom.c	2013-06-25 16:13:27.466480361 +0200

@@ -1146,7 +1146,7 @@ fread_2448_16(SCSI *usalp, rparm_t *rp,

 {

 	if (rp->ismmc) {

-		track_t trackdesc;

+		wodim_track_t trackdesc;

 		int	ret;

 		int	i;

 		char	*p;

diff -up cdiopara/wodim/auinfo.c.wrk cdiopara/wodim/auinfo.c

--- cdiopara/wodim/auinfo.c.wrk	2013-06-25 16:40:14.572918883 +0200

+++ cdiopara/wodim/auinfo.c	2013-06-25 16:40:45.335248444 +0200

@@ -46,16 +46,16 @@

 extern	int	debug;

 extern	int	xdebug;

-BOOL			auinfosize(char *name, track_t *trackp);

-void			auinfo(char *name, int track, track_t *trackp);

-textptr_t 	*gettextptr(int track, track_t *trackp);

+BOOL			auinfosize(char *name, wodim_track_t *trackp);

+void			auinfo(char *name, int track, wodim_track_t *trackp);

+textptr_t 	*gettextptr(int track, wodim_track_t *trackp);

 static char *savestr(char *name);

 static char *readtag(char *name);

 static char *readtstr(char *name);

-void			setmcn(char *mcn, track_t *trackp);

+void			setmcn(char *mcn, wodim_track_t *trackp);

 static void	isrc_illchar(char *isrc, int c);

-void			setisrc(char *isrc, track_t *trackp);

-void			setindex(char *tindex, track_t *trackp);

+void			setisrc(char *isrc, wodim_track_t *trackp);

+void			setindex(char *tindex, wodim_track_t *trackp);

 #ifdef	XXX

 int 

@@ -68,7 +68,7 @@ main(int argc, char *argv[])

 #endif

 BOOL 

-auinfosize(char *name, track_t *trackp)

+auinfosize(char *name, wodim_track_t *trackp)

 {

 	const	char	*p;

 	const	char	*tlp;

@@ -145,11 +145,11 @@ auinfosize(char *name, track_t *trackp)

 }

 void 

-auinfo(char *name, int track, track_t *trackp)

+auinfo(char *name, int track, wodim_track_t *trackp)

 {

 	char	infname[1024];

 	char	*p;

-	track_t	*tp = &trackp[track];

+	wodim_track_t	*tp = &trackp[track];

 	textptr_t *txp;

 	long	l;

 	long	tno = -1;

@@ -303,7 +303,7 @@ auinfo(char *name, int track, track_t *t

 }

 textptr_t *

-gettextptr(int track, track_t *trackp)

+gettextptr(int track, wodim_track_t *trackp)

 {

 	register textptr_t *txp;

@@ -366,7 +366,7 @@ readtstr(char *name)

  * Media catalog number is a 13 digit number.

  */

 void 

-setmcn(char *mcn, track_t *trackp)

+setmcn(char *mcn, wodim_track_t *trackp)

 {

 	register char	*p;

@@ -404,7 +404,7 @@ isrc_illchar(char *isrc, int c)

  *	CC-OOO-YY-SSSSS

  */

 void 

-setisrc(char *isrc, track_t *trackp)

+setisrc(char *isrc, wodim_track_t *trackp)

 {

 	char	ibuf[13];

 	char	*ip;

@@ -482,7 +482,7 @@ illchar:

 }

 void 

-setindex(char *tindex, track_t *trackp)

+setindex(char *tindex, wodim_track_t *trackp)

 {

 	char	*p;

 	int	i;

diff -up cdiopara/wodim/cd_misc.c.wrk cdiopara/wodim/cd_misc.c

--- cdiopara/wodim/cd_misc.c.wrk	2013-06-25 16:52:56.893056513 +0200

+++ cdiopara/wodim/cd_misc.c	2013-06-25 16:54:56.960519199 +0200

@@ -42,8 +42,8 @@

 int	from_bcd(int b);

 int	to_bcd(int i);

 long	msf_to_lba(int m, int s, int f, BOOL force_positive);

-BOOL	lba_to_msf(long lba, msf_t *mp);

-void	sec_to_msf(long sec, msf_t *mp);

+BOOL	lba_to_msf(long lba, wodim_msf_t *mp);

+void	sec_to_msf(long sec, wodim_msf_t *mp);

 void	print_min_atip(long li, long lo);

 int 

@@ -73,7 +73,7 @@ msf_to_lba(int m, int s, int f, BOOL for

 }

 BOOL 

-lba_to_msf(long lba, msf_t *mp)

+lba_to_msf(long lba, wodim_msf_t *mp)

 {

 	int	m;

 	int	s;

@@ -110,7 +110,7 @@ lba_to_msf(long lba, msf_t *mp)

 }

 void 

-sec_to_msf(long sec, msf_t *mp)

+sec_to_msf(long sec, wodim_msf_t *mp)

 {

 	int	m;

 	int	s;

@@ -128,7 +128,7 @@ sec_to_msf(long sec, msf_t *mp)

 void 

 print_min_atip(long li, long lo)

 {

-	msf_t	msf;

+	wodim_msf_t	msf;

 	if (li < 0) {

 		lba_to_msf(li, &msf;;

diff -up cdiopara/wodim/cdr_drv.c.wrk cdiopara/wodim/cdr_drv.c

--- cdiopara/wodim/cdr_drv.c.wrk	2013-06-25 16:42:28.603492864 +0200

+++ cdiopara/wodim/cdr_drv.c	2013-06-25 16:43:07.938976575 +0200

@@ -77,7 +77,7 @@ int	format_dummy(SCSI *usalp, cdr_t *, i

 int	drive_getdisktype(SCSI *usalp, cdr_t *dp);

 int	cmd_ill(SCSI *usalp);

 int	cmd_dummy(SCSI *usalp, cdr_t *);

-int	no_sendcue(SCSI *usalp, cdr_t *, track_t *trackp);

+int	no_sendcue(SCSI *usalp, cdr_t *, wodim_track_t *trackp);

 int	buf_dummy(SCSI *usalp, long *sp, long *fp);

 BOOL	set_cdrcmds(char *name, cdr_t **dpp);

 cdr_t	*get_cdrcmds(SCSI *usalp);

@@ -165,7 +165,7 @@ cmd_dummy(SCSI *usalp, cdr_t *dp)

 }

 int 

-no_sendcue(SCSI *usalp, cdr_t *dp, track_t *trackp)

+no_sendcue(SCSI *usalp, cdr_t *dp, wodim_track_t *trackp)

 {

 	errmsgno(EX_BAD, "SAO writing not available or not implemented for this drive.\n");

 	return (-1);

diff -up cdiopara/wodim/cdtext.c.wrk cdiopara/wodim/cdtext.c

--- cdiopara/wodim/cdtext.c.wrk	2013-06-25 16:44:38.388059921 +0200

+++ cdiopara/wodim/cdtext.c	2013-06-25 16:44:59.599309190 +0200

@@ -119,8 +119,8 @@ int	textlen;

 BOOL			checktextfile(char *fname);

 static void	setuptextdata(Uchar *bp, int len);

 static BOOL	cdtext_crc_ok(struct textpack *p);

-void			packtext(int tracks, track_t *trackp);

-static BOOL	anytext(int pack_type, int tracks, track_t *trackp);

+void			packtext(int tracks, wodim_track_t *trackp);

+static BOOL	anytext(int pack_type, int tracks, wodim_track_t *trackp);

 static void	fillup_pack(txtarg_t *ap);

 static void	fillpacks(txtarg_t *ap, char *from, int len, int track_no, int pack_type);

 int			write_cdtext(SCSI *usalp, cdr_t *dp, long startsec);

@@ -295,7 +295,7 @@ static BOOL cdtext_crc_ok(struct textpac

 }

-void packtext(int tracks, track_t *trackp)

+void packtext(int tracks, wodim_track_t *trackp)

 {

 	int	type;

 	int	i;

@@ -373,7 +373,7 @@ void packtext(int tracks, track_t *track

 #endif

 }

-static BOOL anytext(int pack_type, int tracks, track_t *trackp)

+static BOOL anytext(int pack_type, int tracks, wodim_track_t *trackp)

 {

 	register int	i;

 	register char	*p;

diff -up cdiopara/wodim/clone.c.wrk cdiopara/wodim/clone.c

--- cdiopara/wodim/clone.c.wrk	2013-06-25 17:33:21.013643927 +0200

+++ cdiopara/wodim/clone.c	2013-06-25 17:43:07.932151568 +0200

@@ -52,8 +52,8 @@

 /*#define	SAO_RAW*/

-void	clone_toc(track_t *trackp);

-void	clone_tracktype(track_t *trackp);

+void	clone_toc(wodim_track_t *trackp);

+void	clone_tracktype(wodim_track_t *trackp);

 extern	int	lverbose;

 extern	int	xdebug;

@@ -72,11 +72,11 @@ static	long	loutstart;

 /*

  * Read Clone TOC description from full toc file.

  */

-void clone_toc(track_t *trackp)

+void clone_toc(wodim_track_t *trackp)

 {

 	char	filename[1024];

-	msf_t	m;

-	msf_t	mr;

+	wodim_msf_t	m;

+	wodim_msf_t	mr;

 	struct	tocheader *tp;