Implemented first use of API-experimental burn_drive_info_forget() in cdrskin signal handler

trunk/libburn/drive.c

@@ -51,6 +51,63 @@ void burn_drive_free_all(void)
 	memset(drive_array, 0, sizeof(drive_array));
 }
 
+
+/* ts A60822 */
+int burn_drive_is_open(struct burn_drive *d)
+{
+	/* a bit more detailed case distinction than needed */
+	if (d->fd == -1337)
+		return 0;
+	if (d->fd < 0)
+		return 0;
+	return 1;
+}
+
+
+/* ts A60906 */
+int burn_drive_force_idle(struct burn_drive *d)
+{
+	d->busy = BURN_DRIVE_IDLE;
+	return 1;
+}
+
+
+/* ts A60906 */
+int burn_drive_is_released(struct burn_drive *d)
+{
+        return !!d->released;
+}
+
+
+/* ts A60906 */
+/** Inquires drive status in respect to degree of app usage.
+    @param return -2 = drive is forgotten 
+                  -1 = drive is closed (i.e. released explicitely)
+                   0 = drive is open, not grabbed (after scan, before 1st grab)
+                   1 = drive is grabbed but BURN_DRIVE_IDLE
+                  10 = drive is grabbing (BURN_DRIVE_GRABBING)
+                 100 = drive is busy in cancelable state
+                1000 = drive is in non-cancelable state 
+           Expect a monotonous sequence of usage severity to emerge in future.
+*/
+int burn_drive_is_occupied(struct burn_drive *d)
+{
+	if(d->global_index < 0)
+		return -2;
+	if(!burn_drive_is_open(d))
+		return -1;
+	if(d->busy == BURN_DRIVE_GRABBING)
+		return 10;
+	if(d->released)
+		return 0;
+	if(d->busy == BURN_DRIVE_IDLE)
+		return 1;
+	if(d->busy == BURN_DRIVE_READING || d->busy == BURN_DRIVE_WRITING)
+		return 50;
+	return 1000;
+}
+
+
 /*
 void drive_read_lead_in(int dnum)
 {
@@ -145,7 +202,10 @@ void burn_drive_release(struct burn_drive *d, int le)
 {
 	if (d->released)
 		burn_print(1, "second release on drive!\n");
-	assert(!d->busy);
+
+	/* ts A60906: one should not assume BURN_DRIVE_IDLE == 0 */
+	assert(d->busy == BURN_DRIVE_IDLE);
+
 	d->unlock(d);
 	if (le)
 		d->eject(d);
@@ -404,7 +464,26 @@ void burn_drive_info_free(struct burn_drive_info drive_infos[])
 /* Experimental API call */
 int burn_drive_info_forget(struct burn_drive_info *info, int force)
 {
-	burn_drive_free(info->drive);
+	int occup;
+	struct burn_drive *d;
+
+	d = info->drive;
+	occup = burn_drive_is_occupied(d);
+	if(occup <= -2)
+		return 2;
+	if(occup > 0)
+		if(force < 1)
+			return 0; 
+	if(occup > 10)
+		return 0;
+
+	/* >>> do any drive calming here */;
+
+
+	burn_drive_force_idle(d);
+	if(occup > 0 && !burn_drive_is_released(d))
+		burn_drive_release(d,0);
+	burn_drive_free(d);
 	return 1;
 }
 
@@ -484,17 +563,6 @@ int burn_drive_is_banned(char *device_address)
 	return 1;
 }
 
-/* ts A60822 */
-int burn_drive_is_open(struct burn_drive *d)
-{
-	/* a bit more detailed case distinction than needed */
-	if (d->fd == -1337)
-		return 0;
-	if (d->fd < 0)
-		return 0;
-	return 1;
-}
-
 /* ts A60823 */
 /** Aquire a drive with known persistent address. 
 */

trunk/libburn/libburn.h

@@ -552,12 +552,13 @@ int burn_drive_scan(struct burn_drive_info *drive_infos[],
     @param drive_info pointer to a single element out of the array
                       obtained from burn_drive_scan() : &(drive_infos[driveno])
     @param force controls degree of permissible drive usage at the moment this
-                 function is called and amount of automatically provided drive
-                 shutdown : 
+                 function is called, and the amount of automatically provided
+                 drive shutdown : 
                   0= drive must be ungrabbed and BURN_DRIVE_IDLE
                   1= try to release drive resp. accept BURN_DRIVE_GRABBING 
                  Use these two only. Further values are to be defined.
-    @return 1 on success, <=0 on failure
+    @return 1 on success, 2 if drive was already forgotten,
+            0 if not permissible, <0 on other failures, 
 */
 int burn_drive_info_forget(struct burn_drive_info *drive_info, int force);