Browse Source

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

tags/ZeroThreeZero
Thomas Schmitt 13 years ago
parent
commit
e29f13980b
3 changed files with 17 additions and 9 deletions
  1. +1
    -1
      cdrskin/cdrskin_timestamp.h
  2. +7
    -2
      libburn/drive.c
  3. +9
    -6
      libburn/mmc.c

+ 1
- 1
cdrskin/cdrskin_timestamp.h View File

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

+ 7
- 2
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 errcode;
/* ts A61125 */
int ret;
/* ts A61125 - A61202 */
int ret, sose;

if (!d->released) {
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 */
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 */
ret = burn_drive_inquire_media(d);
d->silent_on_scsi_error = sose;
return ret;
}



+ 9
- 6
libburn/mmc.c View File

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


Loading…
Cancel
Save