[brasero/gnome-2-28] Revert "Let BraseroProcess derived plugins add a track of their own and if so don't automatically ad



commit d60cbb4a7675328121cc9f77dbe408378bc30bb7
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Wed Oct 7 22:16:53 2009 +0200

    Revert "Let BraseroProcess derived plugins add a track of their own and if so don't automatically add one"
    
    This reverts commit 981290362cced79dc0681a92ff76ef1bf53b5847.

 libbrasero-burn/brasero-caps-session.c |    2 +-
 libbrasero-burn/burn-process.c         |   10 +---------
 libbrasero-burn/burn-task-ctx.c        |    9 +--------
 3 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/libbrasero-burn/brasero-caps-session.c b/libbrasero-burn/brasero-caps-session.c
index 34ecc40..6cab60d 100644
--- a/libbrasero-burn/brasero-caps-session.c
+++ b/libbrasero-burn/brasero-caps-session.c
@@ -888,7 +888,7 @@ brasero_burn_caps_is_session_supported_same_src_dest (BraseroBurnCaps *self,
 			if (result) {
 				if (tmp_type) {
 					tmp_type->type = BRASERO_TRACK_TYPE_IMAGE;
-					tmp_type->subtype.img_format = brasero_track_type_get_image_format (&output);
+					tmp_type->subtype.img_format = format;
 				}
 					
 				return BRASERO_BURN_OK;
diff --git a/libbrasero-burn/burn-process.c b/libbrasero-burn/burn-process.c
index 5b6c169..bee6042 100644
--- a/libbrasero-burn/burn-process.c
+++ b/libbrasero-burn/burn-process.c
@@ -253,15 +253,6 @@ brasero_process_finished (BraseroProcess *self)
 		return BRASERO_BURN_OK;
 	}
 
-	klass->post (BRASERO_JOB (self));
-
-	/* See if the plugin already added some new tracks
-	 * if so don't add it automatically */
-	if (brasero_job_get_done_tracks (BRASERO_JOB (self), NULL) == BRASERO_BURN_OK) {
-		brasero_track_type_free (type);
-		return BRASERO_BURN_OK;
-	}
-
 	if (brasero_track_type_get_has_image (type)) {
 		gchar *toc = NULL;
 		gchar *image = NULL;
@@ -304,6 +295,7 @@ brasero_process_finished (BraseroProcess *self)
 		g_object_unref (track);
 	}
 
+	klass->post (BRASERO_JOB (self));
 	return BRASERO_BURN_OK;
 }
 
diff --git a/libbrasero-burn/burn-task-ctx.c b/libbrasero-burn/burn-task-ctx.c
index b7082d9..6680d75 100644
--- a/libbrasero-burn/burn-task-ctx.c
+++ b/libbrasero-burn/burn-task-ctx.c
@@ -233,14 +233,7 @@ brasero_task_ctx_get_stored_tracks (BraseroTaskCtx *self,
 	if (!priv->current_track)
 		return BRASERO_BURN_ERR;
 
-	if (tracks)
-		*tracks = priv->tracks;
-
-	/* If no track has been added let the caller
-	 * know with BRASERO_BURN_NOT_READY */
-	if (!priv->tracks)
-		return BRASERO_BURN_NOT_READY;
-
+	*tracks = priv->tracks;
 	return BRASERO_BURN_OK;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]