From 3ea4892040be0188753c3e61beceb04cabdab143 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 23 Jan 2012 10:27:13 +0000 Subject: [PATCH] Corrected some minor differences between SVN and local development tree --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/crc.c | 3 +++ libburn/libdax_msgs.h | 2 +- libburn/mmc.c | 2 +- libburn/options.c | 2 +- libburn/sg-freebsd-port.c | 3 +-- libburn/write.c | 5 ----- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index f06eca3..c3d371e 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2012.01.22.194131" +#define Cdrskin_timestamP "2012.01.23.102720" diff --git a/libburn/crc.c b/libburn/crc.c index 10bcf69..c32a576 100644 --- a/libburn/crc.c +++ b/libburn/crc.c @@ -116,6 +116,9 @@ unsigned long crc32_table[256] = { Use in libburn for raw write modes in sector.c. There is also disabled code in read.c which would use it. + + ts B11222: + libburn/cdtext.c uses a simple bit shifting function : crc_11021() */ unsigned short crc_ccitt(unsigned char *q, int len) { diff --git a/libburn/libdax_msgs.h b/libburn/libdax_msgs.h index 5afa9bd..371cb93 100644 --- a/libburn/libdax_msgs.h +++ b/libburn/libdax_msgs.h @@ -594,7 +594,7 @@ Range "scdbackup" : 0x00020000 to 0x0002ffff 0x00020199 (SORRY,HIGH) = Text input file reading aborted 0x0002019a (SORRY,HIGH) = Bad track index number 0x0002019b (SORRY,HIGH) = CD track number exceeds range of 1 to 99 - 0x0002019c (FAILURE,HIGH) = Session has no defined tracks + 0x0002019c (SORRY,HIGH) = Session has no defined tracks libdax_audioxtr: diff --git a/libburn/mmc.c b/libburn/mmc.c index 2cd7bb5..4383778 100644 --- a/libburn/mmc.c +++ b/libburn/mmc.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */ /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens - Copyright (c) 2006 - 2011 Thomas Schmitt + Copyright (c) 2006 - 2012 Thomas Schmitt Provided under GPL version 2 or later. */ diff --git a/libburn/options.c b/libburn/options.c index 61f832f..eeafea2 100644 --- a/libburn/options.c +++ b/libburn/options.c @@ -186,7 +186,7 @@ void burn_write_opts_set_has_mediacatalog(struct burn_write_opts *opts, void burn_write_opts_set_mediacatalog(struct burn_write_opts *opts, unsigned char mediacatalog[13]) { - memcpy(opts->mediacatalog, &mediacatalog, 13); + memcpy(opts->mediacatalog, mediacatalog, 13); } diff --git a/libburn/sg-freebsd-port.c b/libburn/sg-freebsd-port.c index a5ccc97..bb89edc 100644 --- a/libburn/sg-freebsd-port.c +++ b/libburn/sg-freebsd-port.c @@ -548,8 +548,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c) ccb->csio.cdb_len = c->oplen; memcpy(&ccb->csio.cdb_io.cdb_bytes, &c->opcode, c->oplen); - memset(&ccb->csio.sense_data, 0, sizeof (ccb->csio.sense_data)); - if (c->page) { ccb->csio.data_ptr = c->page->data; if (c->dir == FROM_DRIVE) { @@ -570,6 +568,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c) } do { + memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data)); err = cam_send_ccb(d->cam, ccb); if (err == -1) { libdax_msgs_submit(libdax_messenger, diff --git a/libburn/write.c b/libburn/write.c index bb748a6..f0e77d6 100644 --- a/libburn/write.c +++ b/libburn/write.c @@ -610,11 +610,6 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o, */ track_length = burn_track_get_sectors_2(tar[i], 1); if (track_length < 300 && !burn_track_is_open_ended(tar[i])) { - - -/* >>> ??? Does this work properly with burn_offst_source ? */; - - track_length = 300; if (!tar[i]->pad) tar[i]->pad = 1;