From 8cdbaaa0d247edef9e4c367c1c74654060de73a3 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 18 Oct 2006 17:48:04 +0000 Subject: [PATCH] Removed assumption BURN_DRIVE_IDLE==0 --- trunk/cdrskin/cdrskin.c | 12 ++++++------ trunk/cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/cdrskin/cdrskin.c b/trunk/cdrskin/cdrskin.c index f2f84956..3da7fc3f 100644 --- a/trunk/cdrskin/cdrskin.c +++ b/trunk/cdrskin/cdrskin.c @@ -3325,9 +3325,9 @@ int Cdrskin_atip(struct CdrskiN *skin, int flag) if(ret<=0) return(ret); drive= skin->drives[skin->driveno].drive; - while(burn_drive_get_status(drive,NULL)) + while(burn_drive_get_status(drive,NULL) != BURN_DRIVE_IDLE) usleep(100002); - while ((s = burn_disc_get_status(drive)) == BURN_DISC_UNREADY) + while ((s= burn_disc_get_status(drive)) == BURN_DISC_UNREADY) usleep(100002); Cdrskin_report_disc_status(skin,s,0); if(s==BURN_DISC_APPENDABLE && skin->no_blank_appendable) { @@ -3472,7 +3472,7 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag) return(ret); drive= skin->drives[skin->driveno].drive; - while(burn_drive_get_status(drive,NULL)) + while(burn_drive_get_status(drive,NULL) != BURN_DRIVE_IDLE) usleep(100002); while ((s = burn_disc_get_status(drive)) == BURN_DISC_UNREADY) usleep(100002); @@ -3516,7 +3516,7 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag) loop_counter= 0; start_time= Sfile_microtime(0); - while (burn_drive_get_status(drive, &p)!=BURN_DRIVE_IDLE) { + while(burn_drive_get_status(drive, &p) != BURN_DRIVE_IDLE) { if(loop_counter>0) if(skin->verbosity>=Cdrskin_verbose_progresS) fprintf(stderr, @@ -3850,10 +3850,10 @@ int Cdrskin_burn(struct CdrskiN *skin, int flag) return(ret); drive= skin->drives[skin->driveno].drive; - while (burn_drive_get_status(drive, NULL)) + while(burn_drive_get_status(drive, NULL) != BURN_DRIVE_IDLE) usleep(100002); /* >>> ??? add a timeout ? */ - while ((s = burn_disc_get_status(drive)) == BURN_DISC_UNREADY) + while((s= burn_disc_get_status(drive)) == BURN_DISC_UNREADY) usleep(100002); /* >>> ??? add a timeout ? */ if(skin->verbosity>=Cdrskin_verbose_progresS) diff --git a/trunk/cdrskin/cdrskin_timestamp.h b/trunk/cdrskin/cdrskin_timestamp.h index c28f3574..389aab88 100644 --- a/trunk/cdrskin/cdrskin_timestamp.h +++ b/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2006.10.17.164140" +#define Cdrskin_timestamP "2006.10.18.174334"