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

Avoided unsuitable media complaint on burn_drive_grab() with load==0

Browse Source
This commit is contained in:
Thomas Schmitt 2006-12-02 20:13:31 +00:00
parent 9ed55d050a
commit 87a0a6a3d5
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2006.12.02.130631" #define Cdrskin_timestamP "2006.12.02.201405"

9
libburn/trunk/libburn/drive.c
View File

@ -201,8 +201,8 @@ int burn_drive_inquire_media(struct burn_drive *d)
int burn_drive_grab(struct burn_drive *d, int le) int burn_drive_grab(struct burn_drive *d, int le)
{ {
int errcode; int errcode;
/* ts A61125 */ /* ts A61125 - A61202 */
int ret; int ret, sose;
if (!d->released) { if (!d->released) {
burn_print(1, "can't grab - already grabbed\n"); burn_print(1, "can't grab - already grabbed\n");
@ -225,8 +225,13 @@ int burn_drive_grab(struct burn_drive *d, int le)
/* ts A61118 */ /* ts A61118 */
d->start_unit(d); d->start_unit(d);
/* ts A61202 : gave bit1 of le a meaning */
sose = d->silent_on_scsi_error;
if (!le)
d->silent_on_scsi_error = 1;
/* ts A61125 : outsourced media state inquiry aspects */ /* ts A61125 : outsourced media state inquiry aspects */
ret = burn_drive_inquire_media(d); ret = burn_drive_inquire_media(d);
d->silent_on_scsi_error = sose;
return ret; return ret;
} }

15
libburn/trunk/libburn/mmc.c
View File

@ -478,12 +478,15 @@ void mmc_read_disc_info(struct burn_drive *d)
mmc_get_configuration(d); mmc_get_configuration(d);
if ((d->current_profile != 0 || d->status != BURN_DISC_UNREADY) if ((d->current_profile != 0 || d->status != BURN_DISC_UNREADY)
&& ! d->current_is_cd_profile) { && ! d->current_is_cd_profile) {
sprintf(msg, "Unsuitable media detected. Profile %4.4Xh %s", if (!d->silent_on_scsi_error) {
d->current_profile, d->current_profile_text); sprintf(msg,
libdax_msgs_submit(libdax_messenger, d->global_index, "Unsuitable media detected. Profile %4.4Xh %s",
0x0002011e, d->current_profile, d->current_profile_text);
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, libdax_msgs_submit(libdax_messenger, d->global_index,
msg, 0,0); 0x0002011e,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
msg, 0,0);
}
d->status = BURN_DISC_UNSUITABLE; d->status = BURN_DISC_UNSUITABLE;
return; return;
} }