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

Now unconditional: Cdrskin_progress_track_does_worK

Browse Source
This commit is contained in:
Thomas Schmitt 2011-10-06 11:25:48 +00:00
parent 9b042009fb
commit 15192c2bfa
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cdrskin/cdrskin.c
View File

@ -175,7 +175,7 @@ or
/* 0.2.2 */ /* 0.2.2 */
#define Cdrskin_libburn_does_ejecT 1 #define Cdrskin_libburn_does_ejecT 1
#define Cdrskin_libburn_has_drive_get_adR 1 #define Cdrskin_libburn_has_drive_get_adR 1
#define Cdrskin_progress_track_does_worK 1 /* Cdrskin_progress_track_does_worK */
/* Cdrskin_is_erasable_on_load_does_worK */ /* Cdrskin_is_erasable_on_load_does_worK */
/* Cdrskin_grab_abort_does_worK */ /* Cdrskin_grab_abort_does_worK */
@ -279,12 +279,6 @@ or
#define Cdrskin_burn_drive_eject_brokeN 1 #define Cdrskin_burn_drive_eject_brokeN 1
#endif #endif
/** Work around the fact that burn_drive_get_status() always reports to do
track 0 in icculus.org/burn */
#ifndef Cdrskin_progress_track_does_worK
#define Cdrskin_progress_track_brokeN 1
#endif
/** http://libburnia-project.org/ticket/41 reports of big trouble without /** http://libburnia-project.org/ticket/41 reports of big trouble without
padding any track to a full sector padding any track to a full sector
*/ */
@ -5762,18 +5756,7 @@ int Cdrskin_burn_pacifier(struct CdrskiN *skin,
goto thank_you_for_patience; goto thank_you_for_patience;
old_track_idx= skin->supposed_track_idx; old_track_idx= skin->supposed_track_idx;
#ifdef Cdrskin_progress_track_brokeN
/* with libburn.0.2 there is always reported 0 as p->track */
if(written_bytes<0) { /* track hop ? */
if(skin->supposed_track_idx+1<skin->track_counter)
skin->supposed_track_idx++;
}
/* >>> ask eventual fifo about writing fd */;
if(p->track>0)
skin->supposed_track_idx= p->track; skin->supposed_track_idx= p->track;
#else /* Cdrskin_progress_track_brokeN */
skin->supposed_track_idx= p->track;
#endif /* ! Cdrskin_progress_track_brokeN */
if(old_track_idx>=0 && old_track_idx<skin->supposed_track_idx) { if(old_track_idx>=0 && old_track_idx<skin->supposed_track_idx) {
Cdrtrack_get_size(skin->tracklist[old_track_idx],&fixed_size,&padding, Cdrtrack_get_size(skin->tracklist[old_track_idx],&fixed_size,&padding,

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.10.06.112239" #define Cdrskin_timestamP "2011.10.06.112456"