Corrected some minor differences between SVN and local development tree

1.2.0
Thomas Schmitt 11 years ago
parent e0d7eb4820
commit 3ea4892040
  1. 2
      cdrskin/cdrskin_timestamp.h
  2. 3
      libburn/crc.c
  3. 2
      libburn/libdax_msgs.h
  4. 2
      libburn/mmc.c
  5. 2
      libburn/options.c
  6. 3
      libburn/sg-freebsd-port.c
  7. 5
      libburn/write.c

@ -1 +1 @@
#define Cdrskin_timestamP "2012.01.22.194131"
#define Cdrskin_timestamP "2012.01.23.102720"

@ -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)
{

@ -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:

@ -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 <scdbackup@gmx.net>
Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net>
Provided under GPL version 2 or later.
*/

@ -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);
}

@ -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,

@ -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;

Loading…
Cancel
Save