libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected write count for tracks with post-gap

Browse Source
This commit is contained in:
Thomas Schmitt 2012-01-13 14:27:21 +00:00
parent 0c01912143
commit 0e9a79e352
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2012.01.13.141517" #define Cdrskin_timestamP "2012.01.13.142723"

32
libburn/write.c
View File

@ -301,6 +301,7 @@ int burn_write_close_session(struct burn_write_opts *o)
This is useful only when changes about CD SAO get tested. This is useful only when changes about CD SAO get tested.
# define Libburn_write_with_function_print_cuE yes # define Libburn_write_with_function_print_cuE yes
*/ */
#define Libburn_write_with_function_print_cuE yes
#ifdef Libburn_write_with_function_print_cuE #ifdef Libburn_write_with_function_print_cuE
@ -1127,7 +1128,7 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
t->entry->control, t->mode)) t->entry->control, t->mode))
{ ret = 0; goto ex; } { ret = 0; goto ex; }
/* Flush buffer to avoid influence of previous track or pregap /* ts B20113 : Flush buffer to avoid influence pregap
on track counter */ on track counter */
ret = sector_write_buffer(d, NULL, 0); ret = sector_write_buffer(d, NULL, 0);
if (ret <= 0) if (ret <= 0)
@ -1215,29 +1216,20 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
d->progress.sector++; d->progress.sector++;
} }
if (t->postgap) /* ts B20113 : Flush buffer to get buffered bytes assigned to the
track counter */
ret = sector_write_buffer(d, t, 0);
if (ret <= 0)
goto ex;
if (t->postgap && o->write_type != BURN_WRITE_TAO) {
for (i = 0; i < t->postgap_size; i++) for (i = 0; i < t->postgap_size; i++)
if (!sector_postgap(o, t->entry->point, if (!sector_postgap(o, t->entry->point,
t->entry->control, t->mode)) t->entry->control, t->mode))
{ ret = 0; goto ex; } { ret = 0; goto ex; }
i = t->offset; ret = sector_write_buffer(d, NULL, 0);
if (o->write_type == BURN_WRITE_SAO) { if (ret <= 0)
if (d->buffer->bytes) { goto ex;
int err;
err = d->write(d, d->nwa, d->buffer);
if (err == BE_CANCELLED)
{ ret = 0; goto ex; }
/* A61101 : probably this is not all payload data */
/* A61108 : but audio count is short without this */
t->writecount += d->buffer->bytes;
t->written_sectors += d->buffer->sectors;
d->progress.buffered_bytes += d->buffer->bytes;
d->nwa += d->buffer->sectors;
d->buffer->bytes = 0;
d->buffer->sectors = 0;
}
} }
/* ts A61103 */ /* ts A61103 */