GNOME.org
 

[brasero] 2009-04-19 Philippe Rouquier <bonfire-app wanadoo fr>

commit a086c362d955d882ccd97a631c93bf2856baa4dc
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Apr 19 21:09:50 2009 +0200

    2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Another fix for argument types
    
    	* libbrasero-burn/brasero-burn-dialog.c
    	(brasero_burn_dialog_progress_changed_cb):
    	* libbrasero-burn/brasero-burn.c (brasero_burn_status),
    	(brasero_burn_run_tasks):
    	* libbrasero-burn/brasero-burn.h:
    	* libbrasero-burn/burn-job.c (brasero_job_check_output_disc_space),
    	(brasero_job_set_output_file),
    	(brasero_job_get_session_output_size):
    	* libbrasero-burn/burn-job.h:
    	* libbrasero-burn/burn-task-ctx.c (brasero_task_ctx_get_rate),
    	(brasero_task_ctx_get_session_output_size),
    	(brasero_task_ctx_get_progress):
    	* libbrasero-burn/burn-task-ctx.h:
---
 ChangeLog                             |   18 ++++++++++++++++++
 libbrasero-burn/brasero-burn-dialog.c |    6 +++---
 libbrasero-burn/brasero-burn.c        |   10 +++++-----
 libbrasero-burn/brasero-burn.h        |    6 +++---
 libbrasero-burn/burn-job.c            |   12 ++++++------
 libbrasero-burn/burn-job.h            |    4 +++-
 libbrasero-burn/burn-task-ctx.c       |   28 ++++++++++++++--------------
 libbrasero-burn/burn-task-ctx.h       |   21 +++++++++++----------
 8 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6115fd..6bedd5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	Another fix for argument types
+
+	* libbrasero-burn/brasero-burn-dialog.c
+	(brasero_burn_dialog_progress_changed_cb):
+	* libbrasero-burn/brasero-burn.c (brasero_burn_status),
+	(brasero_burn_run_tasks):
+	* libbrasero-burn/brasero-burn.h:
+	* libbrasero-burn/burn-job.c (brasero_job_check_output_disc_space),
+	(brasero_job_set_output_file),
+	(brasero_job_get_session_output_size):
+	* libbrasero-burn/burn-job.h:
+	* libbrasero-burn/burn-task-ctx.c (brasero_task_ctx_get_rate),
+	(brasero_task_ctx_get_session_output_size),
+	(brasero_task_ctx_get_progress):
+	* libbrasero-burn/burn-task-ctx.h:
+
+2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
+
 	Move some helper functions out of public header
 
 	* libbrasero-burn/Makefile.am:
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index bcbcfeb..f50dda5 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -1101,9 +1101,9 @@ brasero_burn_dialog_progress_changed_cb (BraseroBurn *burn,
 {
 	BraseroMedia media = BRASERO_MEDIUM_NONE;
 	BraseroBurnDialogPrivate *priv;
-	gint64 isosize = -1;
-	gint64 written = -1;
-	gint64 rate = -1;
+	goffset isosize = -1;
+	goffset written = -1;
+	guint64 rate = -1;
 
 	priv = BRASERO_BURN_DIALOG_PRIVATE (dialog);
 
diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
index becb788..0fc79f0 100644
--- a/libbrasero-burn/brasero-burn.c
+++ b/libbrasero-burn/brasero-burn.c
@@ -1210,9 +1210,9 @@ brasero_burn_get_action_string (BraseroBurn *burn,
 BraseroBurnResult
 brasero_burn_status (BraseroBurn *burn,
 		     BraseroMedia *media,
-		     gint64 *isosize,
-		     gint64 *written,
-		     gint64 *rate)
+		     goffset *isosize,
+		     goffset *written,
+		     guint64 *rate)
 {
 	BraseroBurnPrivate *priv;
 	BraseroBurnResult result;
@@ -1225,7 +1225,7 @@ brasero_burn_status (BraseroBurn *burn,
 		return BRASERO_BURN_NOT_READY;
 
 	if (isosize) {
-		guint64 size_local = 0;
+		goffset size_local = 0;
 
 		result = brasero_task_ctx_get_session_output_size (BRASERO_TASK_CTX (priv->task),
 								   NULL,
@@ -1782,7 +1782,7 @@ brasero_burn_run_tasks (BraseroBurn *burn,
 
 		/* try to get the output size */
 		if (BRASERO_MEDIUM_RANDOM_WRITABLE (brasero_burn_session_get_dest_media (priv->session))) {
-			guint64 len = 0;
+			goffset len = 0;
 			BraseroDrive *drive;
 			BraseroMedium *medium;
 
diff --git a/libbrasero-burn/brasero-burn.h b/libbrasero-burn/brasero-burn.h
index 681154b..e04fbbf 100644
--- a/libbrasero-burn/brasero-burn.h
+++ b/libbrasero-burn/brasero-burn.h
@@ -108,9 +108,9 @@ brasero_burn_cancel (BraseroBurn *burn,
 BraseroBurnResult
 brasero_burn_status (BraseroBurn *burn,
 		     BraseroMedia *info,
-		     gint64 *isosize,
-		     gint64 *written,
-		     gint64 *rate);
+		     goffset *isosize,
+		     goffset *written,
+		     guint64 *rate);
 
 void
 brasero_burn_get_action_string (BraseroBurn *burn,
diff --git a/libbrasero-burn/burn-job.c b/libbrasero-burn/burn-job.c
index aca7aee..4d7fb7a 100644
--- a/libbrasero-burn/burn-job.c
+++ b/libbrasero-burn/burn-job.c
@@ -381,8 +381,8 @@ brasero_job_check_output_disc_space (BraseroJob *self,
 				     GError **error)
 {
 	BraseroBurnSession *session;
-	guint64 output_blocks = 0;
-	gint64 media_blocks = 0;
+	goffset output_blocks = 0;
+	goffset media_blocks = 0;
 	BraseroJobPrivate *priv;
 	BraseroBurnFlag flags;
 	BraseroMedium *medium;
@@ -570,7 +570,7 @@ brasero_job_set_output_file (BraseroJob *self,
 	BraseroBurnResult result;
 	BraseroJobPrivate *priv;
 	BraseroBurnFlag flags;
-	guint64 output_size = 0;
+	goffset output_size = 0;
 	gchar *image = NULL;
 	gchar *toc = NULL;
 
@@ -1792,15 +1792,15 @@ brasero_job_get_data_label (BraseroJob *self, gchar **label)
 
 BraseroBurnResult
 brasero_job_get_session_output_size (BraseroJob *self,
-				     guint64 *blocks,
-				     guint64 *size)
+				     goffset *blocks,
+				     goffset *bytes)
 {
 	BraseroJobPrivate *priv;
 
 	BRASERO_JOB_DEBUG (self);
 
 	priv = BRASERO_JOB_PRIVATE (self);
-	return brasero_task_ctx_get_session_output_size (priv->ctx, blocks, size);
+	return brasero_task_ctx_get_session_output_size (priv->ctx, blocks, bytes);
 }
 
 /**
diff --git a/libbrasero-burn/burn-job.h b/libbrasero-burn/burn-job.h
index b5dcebb..b0a540e 100644
--- a/libbrasero-burn/burn-job.h
+++ b/libbrasero-burn/burn-job.h
@@ -143,7 +143,9 @@ BraseroBurnResult
 brasero_job_get_data_label (BraseroJob *job, gchar **label);
 
 BraseroBurnResult
-brasero_job_get_session_output_size (BraseroJob *job, guint64 *blocks, guint64 *size);
+brasero_job_get_session_output_size (BraseroJob *job,
+				     goffset *blocks,
+				     goffset *bytes);
 
 /**
  * Used to get information of the destination media
diff --git a/libbrasero-burn/burn-task-ctx.c b/libbrasero-burn/burn-task-ctx.c
index 7e78183..e53fc45 100644
--- a/libbrasero-burn/burn-task-ctx.c
+++ b/libbrasero-burn/burn-task-ctx.c
@@ -57,22 +57,22 @@ struct _BraseroTaskCtxPrivate
 
 	/* used to poll for progress (every 0.5 sec) */
 	gdouble progress;
-	gint64 track_bytes;
-	gint64 session_bytes;
+	goffset track_bytes;
+	goffset session_bytes;
 
-	gint64 size;
-	gint64 blocks;
+	goffset size;
+	goffset blocks;
 
 	/* keep track of time */
 	GTimer *timer;
-	gint64 first_written;
+	goffset first_written;
 	gdouble first_progress;
 
 	/* used for immediate rate */
 	gdouble current_elapsed;
 	gdouble last_elapsed;
 
-	gint64 last_written;
+	goffset last_written;
 	gdouble last_progress;
 
 	/* used for remaining time */
@@ -80,7 +80,7 @@ struct _BraseroTaskCtxPrivate
 	gdouble total_time;
 
 	/* used for rates that certain jobs are able to report */
-	gint64 rate;
+	guint64 rate;
 
 	/* the current action */
 	BraseroBurnAction current_action;
@@ -702,7 +702,7 @@ brasero_task_ctx_set_use_average (BraseroTaskCtx *self,
 
 BraseroBurnResult
 brasero_task_ctx_get_rate (BraseroTaskCtx *self,
-			   gint64 *rate)
+			   guint64 *rate)
 {
 	BraseroTaskCtxPrivate *priv;
 
@@ -782,21 +782,21 @@ brasero_task_ctx_get_remaining_time (BraseroTaskCtx *self,
 
 BraseroBurnResult
 brasero_task_ctx_get_session_output_size (BraseroTaskCtx *self,
-					  guint64 *blocks,
-					  guint64 *size)
+					  goffset *blocks,
+					  goffset *bytes)
 {
 	BraseroTaskCtxPrivate *priv;
 
 	g_return_val_if_fail (BRASERO_IS_TASK_CTX (self), BRASERO_BURN_ERR);
-	g_return_val_if_fail (blocks != NULL || size != NULL, BRASERO_BURN_ERR);
+	g_return_val_if_fail (blocks != NULL || bytes != NULL, BRASERO_BURN_ERR);
 
 	priv = BRASERO_TASK_CTX_PRIVATE (self);
 
 	if (priv->size <= 0 && priv->blocks <= 0)
 		return BRASERO_BURN_NOT_READY;
 
-	if (size)
-		*size = priv->size;
+	if (bytes)
+		*bytes = priv->size;
 
 	if (blocks)
 		*blocks = priv->blocks;
@@ -852,7 +852,7 @@ brasero_task_ctx_get_progress (BraseroTaskCtx *self,
 	BraseroTaskCtxPrivate *priv;
 	gdouble track_num = 0;
 	gdouble track_nb = 0;
-	guint64 total = 0;
+	goffset total = 0;
 
 	priv = BRASERO_TASK_CTX_PRIVATE (self);
 
diff --git a/libbrasero-burn/burn-task-ctx.h b/libbrasero-burn/burn-task-ctx.h
index 39673a3..3df80c8 100644
--- a/libbrasero-burn/burn-task-ctx.h
+++ b/libbrasero-burn/burn-task-ctx.h
@@ -59,9 +59,9 @@ struct _BraseroTaskCtxClass
 {
 	GObjectClass parent_class;
 
-	void	(* finished)	(BraseroTaskCtx *ctx,
-				 BraseroBurnResult retval,
-				 GError *error);
+	void			(* finished)		(BraseroTaskCtx *ctx,
+							 BraseroBurnResult retval,
+							 GError *error);
 
 	/* signals */
 	void			(*progress_changed)	(BraseroTaskCtx *task,
@@ -86,7 +86,8 @@ brasero_task_ctx_set_fake (BraseroTaskCtx *ctx,
 			   gboolean fake);
 
 void
-brasero_task_ctx_set_dangerous (BraseroTaskCtx *ctx, gboolean value);
+brasero_task_ctx_set_dangerous (BraseroTaskCtx *ctx,
+				gboolean value);
 
 guint
 brasero_task_ctx_get_dangerous (BraseroTaskCtx *ctx);
@@ -171,8 +172,8 @@ brasero_task_ctx_set_use_average (BraseroTaskCtx *ctx,
 				  gboolean use_average);
 BraseroBurnResult
 brasero_task_ctx_set_output_size_for_current_track (BraseroTaskCtx *ctx,
-						    gint64 sectors,
-						    gint64 size);
+						    goffset sectors,
+						    goffset bytes);
 
 /**
  * task progress for library
@@ -180,17 +181,17 @@ brasero_task_ctx_set_output_size_for_current_track (BraseroTaskCtx *ctx,
 
 BraseroBurnResult
 brasero_task_ctx_get_rate (BraseroTaskCtx *ctx,
-			   gint64 *rate);
+			   guint64 *rate);
 BraseroBurnResult
 brasero_task_ctx_get_remaining_time (BraseroTaskCtx *ctx,
 				     long *remaining);
 BraseroBurnResult
 brasero_task_ctx_get_session_output_size (BraseroTaskCtx *ctx,
-					  guint64 *blocks,
-					  guint64 *size);
+					  goffset *blocks,
+					  goffset *bytes);
 BraseroBurnResult
 brasero_task_ctx_get_written (BraseroTaskCtx *ctx,
-			      gint64 *written);
+			      goffset *written);
 BraseroBurnResult
 brasero_task_ctx_get_current_action_string (BraseroTaskCtx *ctx,
 					    BraseroBurnAction action,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]