[brasero: 4/6] 2009-04-19 Philippe Rouquier <bonfire-app wanadoo fr>



commit 97caf3957c3d99aeb93af2132e00c44b59af08d7
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Apr 19 15:25:23 2009 +0200

    2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Move all API that deals with size to goffset
    
    	* libbrasero-burn/brasero-session-cfg.c
    	(brasero_session_cfg_check_size):
    	* libbrasero-burn/brasero-session.c
    	(brasero_burn_session_get_size):
    	* libbrasero-burn/brasero-session.h:
    	* libbrasero-burn/brasero-src-image.c (brasero_src_image_update),
    	(brasero_src_image_set_property):
    	* libbrasero-burn/brasero-status-dialog.c
    	(brasero_status_dialog_update):
    	* libbrasero-burn/brasero-track-data.c
    	(brasero_track_data_set_data_blocks),
    	(brasero_track_data_get_size):
    	* libbrasero-burn/brasero-track-data.h:
    	* libbrasero-burn/brasero-track-disc.c
    	(brasero_track_disc_get_size):
    	* libbrasero-burn/brasero-track-image.c
    	(brasero_track_image_set_block_num),
    	(brasero_track_image_get_size):
    	* libbrasero-burn/brasero-track-image.h:
    	* libbrasero-burn/brasero-track-stream.c
    	(brasero_track_stream_set_boundaries),
    	(brasero_track_stream_get_size):
    	* libbrasero-burn/brasero-track-stream.h:
    	* libbrasero-burn/brasero-track.c (brasero_track_get_size):
    	* libbrasero-burn/brasero-track.h:
    	* libbrasero-burn/burn-job.c
    	(brasero_job_get_last_session_address),
    	(brasero_job_get_next_writable_address):
    	* libbrasero-burn/burn-job.h:
    	* libbrasero-burn/burn-task.c
    	(brasero_task_set_track_output_size_default):
    	* libbrasero-media/brasero-medium.c
    	(brasero_medium_get_last_data_track_address),
    	(brasero_medium_get_last_data_track_space),
    	(brasero_medium_get_track_space),
    	(brasero_medium_get_track_address):
    	* libbrasero-media/brasero-medium.h:
    	* plugins/cdrdao/burn-cdrdao.c (brasero_cdrdao_set_argv):
    	* plugins/cdrkit/burn-genisoimage.c
    	(brasero_genisoimage_set_argv_image):
    	* plugins/cdrkit/burn-readom.c
    	(brasero_readom_argv_set_iso_boundary), (brasero_readom_get_size):
    	* plugins/cdrkit/burn-wodim.c (brasero_wodim_write_infs):
    	* plugins/cdrtools/burn-cdrecord.c (brasero_cdrecord_write_infs):
    	* plugins/cdrtools/burn-mkisofs.c (brasero_mkisofs_set_argv_image):
    	* plugins/cdrtools/burn-readcd.c
    	(brasero_readcd_argv_set_iso_boundary), (brasero_readcd_get_size):
    	* plugins/checksum/burn-checksum-files.c
    	(brasero_checksum_files_merge_with_former_session),
    	(brasero_checksum_files_check_files):
    	* plugins/checksum/burn-checksum-image.c:
    	* plugins/dvdcss/burn-dvdcss.c (brasero_dvdcss_start):
    	* plugins/libburnia/burn-libburn.c
    	(brasero_libburn_setup_session_file),
    	(brasero_libburn_start_record):
    	* plugins/libburnia/burn-libisofs.c
    	(brasero_libisofs_import_last_session),
    	(brasero_libisofs_create_volume_thread):
    	* plugins/local-track/burn-local-image.c
    	(brasero_local_track_update_track):
    	* plugins/local-track/burn-uri.c (brasero_burn_uri_thread):
    	* src/brasero-data-session.c
    	(brasero_data_session_load_directory_contents_real):
---
 ChangeLog                               |   68 +++++++++++++++++++++++++++++++
 libbrasero-burn/brasero-session-cfg.c   |    2 +-
 libbrasero-burn/brasero-session.c       |    8 ++--
 libbrasero-burn/brasero-session.h       |    8 +---
 libbrasero-burn/brasero-src-image.c     |    8 ++--
 libbrasero-burn/brasero-status-dialog.c |    2 +-
 libbrasero-burn/brasero-track-data.c    |    6 +-
 libbrasero-burn/brasero-track-data.h    |    2 +-
 libbrasero-burn/brasero-track-disc.c    |    8 ++--
 libbrasero-burn/brasero-track-image.c   |    6 +-
 libbrasero-burn/brasero-track-image.h   |    2 +-
 libbrasero-burn/brasero-track-stream.c  |   10 ++--
 libbrasero-burn/brasero-track-stream.h  |    6 +-
 libbrasero-burn/brasero-track.c         |   12 +++---
 libbrasero-burn/brasero-track.h         |    8 ++--
 libbrasero-burn/burn-job.c              |    4 +-
 libbrasero-burn/burn-job.h              |    4 +-
 libbrasero-burn/burn-task.c             |    8 ++--
 libbrasero-media/brasero-medium.c       |   42 +++++++++---------
 libbrasero-media/brasero-medium.h       |   28 ++++++------
 plugins/cdrdao/burn-cdrdao.c            |    2 +-
 plugins/cdrkit/burn-genisoimage.c       |    2 +-
 plugins/cdrkit/burn-readom.c            |    8 ++--
 plugins/cdrkit/burn-wodim.c             |    2 +-
 plugins/cdrtools/burn-cdrecord.c        |    4 +-
 plugins/cdrtools/burn-mkisofs.c         |    2 +-
 plugins/cdrtools/burn-readcd.c          |    8 ++--
 plugins/checksum/burn-checksum-files.c  |    4 +-
 plugins/checksum/burn-checksum-image.c  |    4 +-
 plugins/dvdcss/burn-dvdcss.c            |    2 +-
 plugins/libburnia/burn-libburn.c        |    8 ++--
 plugins/libburnia/burn-libisofs.c       |    6 +-
 plugins/local-track/burn-local-image.c  |    2 +-
 plugins/local-track/burn-uri.c          |    2 +-
 src/brasero-data-session.c              |    2 +-
 35 files changed, 182 insertions(+), 118 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8fc0986..766038e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,73 @@
 2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	Move all API that deals with size to goffset
+
+	* libbrasero-burn/brasero-session-cfg.c
+	(brasero_session_cfg_check_size):
+	* libbrasero-burn/brasero-session.c
+	(brasero_burn_session_get_size):
+	* libbrasero-burn/brasero-session.h:
+	* libbrasero-burn/brasero-src-image.c (brasero_src_image_update),
+	(brasero_src_image_set_property):
+	* libbrasero-burn/brasero-status-dialog.c
+	(brasero_status_dialog_update):
+	* libbrasero-burn/brasero-track-data.c
+	(brasero_track_data_set_data_blocks),
+	(brasero_track_data_get_size):
+	* libbrasero-burn/brasero-track-data.h:
+	* libbrasero-burn/brasero-track-disc.c
+	(brasero_track_disc_get_size):
+	* libbrasero-burn/brasero-track-image.c
+	(brasero_track_image_set_block_num),
+	(brasero_track_image_get_size):
+	* libbrasero-burn/brasero-track-image.h:
+	* libbrasero-burn/brasero-track-stream.c
+	(brasero_track_stream_set_boundaries),
+	(brasero_track_stream_get_size):
+	* libbrasero-burn/brasero-track-stream.h:
+	* libbrasero-burn/brasero-track.c (brasero_track_get_size):
+	* libbrasero-burn/brasero-track.h:
+	* libbrasero-burn/burn-job.c
+	(brasero_job_get_last_session_address),
+	(brasero_job_get_next_writable_address):
+	* libbrasero-burn/burn-job.h:
+	* libbrasero-burn/burn-task.c
+	(brasero_task_set_track_output_size_default):
+	* libbrasero-media/brasero-medium.c
+	(brasero_medium_get_last_data_track_address),
+	(brasero_medium_get_last_data_track_space),
+	(brasero_medium_get_track_space),
+	(brasero_medium_get_track_address):
+	* libbrasero-media/brasero-medium.h:
+	* plugins/cdrdao/burn-cdrdao.c (brasero_cdrdao_set_argv):
+	* plugins/cdrkit/burn-genisoimage.c
+	(brasero_genisoimage_set_argv_image):
+	* plugins/cdrkit/burn-readom.c
+	(brasero_readom_argv_set_iso_boundary), (brasero_readom_get_size):
+	* plugins/cdrkit/burn-wodim.c (brasero_wodim_write_infs):
+	* plugins/cdrtools/burn-cdrecord.c (brasero_cdrecord_write_infs):
+	* plugins/cdrtools/burn-mkisofs.c (brasero_mkisofs_set_argv_image):
+	* plugins/cdrtools/burn-readcd.c
+	(brasero_readcd_argv_set_iso_boundary), (brasero_readcd_get_size):
+	* plugins/checksum/burn-checksum-files.c
+	(brasero_checksum_files_merge_with_former_session),
+	(brasero_checksum_files_check_files):
+	* plugins/checksum/burn-checksum-image.c:
+	* plugins/dvdcss/burn-dvdcss.c (brasero_dvdcss_start):
+	* plugins/libburnia/burn-libburn.c
+	(brasero_libburn_setup_session_file),
+	(brasero_libburn_start_record):
+	* plugins/libburnia/burn-libisofs.c
+	(brasero_libisofs_import_last_session),
+	(brasero_libisofs_create_volume_thread):
+	* plugins/local-track/burn-local-image.c
+	(brasero_local_track_update_track):
+	* plugins/local-track/burn-uri.c (brasero_burn_uri_thread):
+	* src/brasero-data-session.c
+	(brasero_data_session_load_directory_contents_real):
+
+2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
+
 	Cleaned up some headers
 
 	* libbrasero-burn/brasero-blank-dialog.h:
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index f78ce26..04bc94f 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -536,7 +536,7 @@ brasero_session_cfg_check_size (BraseroSessionCfg *self)
 
 		track = iter->data;
 		if (!BRASERO_IS_TRACK_DATA (track)) {
-			guint64 sectors = 0;
+			goffset sectors = 0;
 
 			brasero_track_get_size (track, &sectors, NULL);
 			session_size += sectors;
diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
index 1b9dcdf..89d9359 100644
--- a/libbrasero-burn/brasero-session.c
+++ b/libbrasero-burn/brasero-session.c
@@ -346,8 +346,8 @@ brasero_burn_session_get_status (BraseroBurnSession *session,
 
 BraseroBurnResult
 brasero_burn_session_get_size (BraseroBurnSession *session,
-			       gsize *blocks,
-			       gsize *bytes)
+			       goffset *blocks,
+			       goffset *bytes)
 {
 	BraseroBurnSessionPrivate *priv;
 	gsize session_blocks = 0;
@@ -363,8 +363,8 @@ brasero_burn_session_get_size (BraseroBurnSession *session,
 	for (iter = priv->tracks; iter; iter = iter->next) {
 		BraseroBurnResult res;
 		BraseroTrack *track;
-		gsize track_blocks;
-		gsize track_bytes;
+		goffset track_blocks;
+		goffset track_bytes;
 
 		track = iter->data;
 		track_blocks = 0;
diff --git a/libbrasero-burn/brasero-session.h b/libbrasero-burn/brasero-session.h
index b2e7059..eeac827 100644
--- a/libbrasero-burn/brasero-session.h
+++ b/libbrasero-burn/brasero-session.h
@@ -92,8 +92,8 @@ brasero_burn_session_get_status (BraseroBurnSession *session,
 
 BraseroBurnResult
 brasero_burn_session_get_size (BraseroBurnSession *session,
-			       gsize *blocks,
-			       gsize *bytes);
+			       goffset *blocks,
+			       goffset *bytes);
 
 BraseroTrackDataType
 brasero_burn_session_get_input_type (BraseroBurnSession *session,
@@ -309,10 +309,6 @@ brasero_burn_session_log (BraseroBurnSession *session,
 			  ...);
 
 
-/**
- * These should be converted to tags
- */
-
 const gchar *
 brasero_burn_session_get_label (BraseroBurnSession *session);
 
diff --git a/libbrasero-burn/brasero-src-image.c b/libbrasero-burn/brasero-src-image.c
index bdbf491..f5f0301 100644
--- a/libbrasero-burn/brasero-src-image.c
+++ b/libbrasero-burn/brasero-src-image.c
@@ -174,7 +174,7 @@ brasero_src_image_update (BraseroSrcImage *self)
 	gchar *path;
 	GFile *file;
 	gchar *string;
-	guint64 size = 0;
+	goffset bytes = 0;
 	GError *error = NULL;
 	BraseroStatus *status;
 	BraseroBurnResult result;
@@ -248,8 +248,8 @@ brasero_src_image_update (BraseroSrcImage *self)
 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), NULL);
 
 	/* Deal with size */
-	brasero_track_get_size (BRASERO_TRACK (priv->track), NULL, &size);
-	size_string = g_format_size_for_display (size);
+	brasero_track_get_size (BRASERO_TRACK (priv->track), NULL, &bytes);
+	size_string = g_format_size_for_display (bytes);
 
 	/* NOTE to translators, the first %s is the path of the image
 	 * file and the second its size. */
@@ -674,7 +674,7 @@ brasero_src_image_set_property (GObject *object,
 		if (track) {
 			if (!BRASERO_IS_TRACK_IMAGE_CFG (track)) {
 				BraseroImageFormat format;
-				guint64 blocks = 0;
+				goffset blocks = 0;
 				gchar *image = NULL;
 				gchar *toc = NULL;
 
diff --git a/libbrasero-burn/brasero-status-dialog.c b/libbrasero-burn/brasero-status-dialog.c
index 52fe517..5725301 100644
--- a/libbrasero-burn/brasero-status-dialog.c
+++ b/libbrasero-burn/brasero-status-dialog.c
@@ -63,7 +63,7 @@ brasero_status_dialog_update (BraseroStatusDialog *self,
 {
 	gchar *string;
 	gchar *size_str;
-	gsize session_bytes;
+	goffset session_bytes;
 	gchar *current_action;
 	BraseroBurnResult res;
 	BraseroTrackType *type;
diff --git a/libbrasero-burn/brasero-track-data.c b/libbrasero-burn/brasero-track-data.c
index 1c47e41..5e025a6 100644
--- a/libbrasero-burn/brasero-track-data.c
+++ b/libbrasero-burn/brasero-track-data.c
@@ -163,7 +163,7 @@ brasero_track_data_get_fs (BraseroTrackData *track)
 
 BraseroBurnResult
 brasero_track_data_set_data_blocks (BraseroTrackData *track,
-				    guint64 blocks)
+				    goffset blocks)
 {
 	BraseroTrackDataPrivate *priv;
 
@@ -269,8 +269,8 @@ brasero_track_data_get_file_num (BraseroTrackData *track,
 
 static BraseroBurnResult
 brasero_track_data_get_size (BraseroTrack *track,
-			     guint64 *blocks,
-			     guint *block_size)
+			     goffset *blocks,
+			     goffset *block_size)
 {
 	BraseroTrackDataPrivate *priv;
 
diff --git a/libbrasero-burn/brasero-track-data.h b/libbrasero-burn/brasero-track-data.h
index e323d47..1264a86 100644
--- a/libbrasero-burn/brasero-track-data.h
+++ b/libbrasero-burn/brasero-track-data.h
@@ -90,7 +90,7 @@ brasero_track_data_rm_fs (BraseroTrackData *track,
 
 BraseroBurnResult
 brasero_track_data_set_data_blocks (BraseroTrackData *track,
-				    guint64 blocks);
+				    goffset blocks);
 
 BraseroBurnResult
 brasero_track_data_set_file_num (BraseroTrackData *track,
diff --git a/libbrasero-burn/brasero-track-disc.c b/libbrasero-burn/brasero-track-disc.c
index 7c397f0..f92ff13 100644
--- a/libbrasero-burn/brasero-track-disc.c
+++ b/libbrasero-burn/brasero-track-disc.c
@@ -171,12 +171,12 @@ brasero_track_disc_get_medium_type (BraseroTrackDisc *track)
 
 static BraseroBurnResult
 brasero_track_disc_get_size (BraseroTrack *track,
-			     guint64 *blocks,
-			     guint *block_size)
+			     goffset *blocks,
+			     goffset *block_size)
 {
 	BraseroMedium *medium;
-	gint64 medium_size = 0;
-	gint64 medium_blocks = 0;
+	goffset medium_size = 0;
+	goffset medium_blocks = 0;
 	BraseroTrackDiscPrivate *priv;
 
 	priv = BRASERO_TRACK_DISC_PRIVATE (track);
diff --git a/libbrasero-burn/brasero-track-image.c b/libbrasero-burn/brasero-track-image.c
index c2dd433..5608aad 100644
--- a/libbrasero-burn/brasero-track-image.c
+++ b/libbrasero-burn/brasero-track-image.c
@@ -87,7 +87,7 @@ brasero_track_image_set_source (BraseroTrackImage *track,
 
 void
 brasero_track_image_set_block_num (BraseroTrackImage *track,
-				   guint64 blocks)
+				   goffset blocks)
 {
 	BraseroTrackImagePrivate *priv;
 
@@ -194,8 +194,8 @@ brasero_track_image_get_track_type (BraseroTrack *track,
 
 static BraseroBurnResult
 brasero_track_image_get_size (BraseroTrack *track,
-			      guint64 *blocks,
-			      guint *block_size)
+			      goffset *blocks,
+			      goffset *block_size)
 {
 	BraseroTrackImagePrivate *priv;
 
diff --git a/libbrasero-burn/brasero-track-image.h b/libbrasero-burn/brasero-track-image.h
index 5b759cb..cc85acf 100644
--- a/libbrasero-burn/brasero-track-image.h
+++ b/libbrasero-burn/brasero-track-image.h
@@ -71,7 +71,7 @@ brasero_track_image_set_source (BraseroTrackImage *track,
 
 void
 brasero_track_image_set_block_num (BraseroTrackImage *track,
-				   guint64 blocks);
+				   goffset blocks);
 
 gchar *
 brasero_track_image_get_source (BraseroTrackImage *track,
diff --git a/libbrasero-burn/brasero-track-stream.c b/libbrasero-burn/brasero-track-stream.c
index 6c9203f..a190a3f 100644
--- a/libbrasero-burn/brasero-track-stream.c
+++ b/libbrasero-burn/brasero-track-stream.c
@@ -108,9 +108,9 @@ brasero_track_stream_set_format (BraseroTrackStream *track,
 
 BraseroBurnResult
 brasero_track_stream_set_boundaries (BraseroTrackStream *track,
-				     gint64 start,
-				     gint64 end,
-				     gint64 gap)
+				     guint64 start,
+				     guint64 end,
+				     guint64 gap)
 {
 	BraseroTrackStreamPrivate *priv;
 
@@ -200,8 +200,8 @@ brasero_track_stream_get_length (BraseroTrackStream *track,
 
 static BraseroBurnResult
 brasero_track_stream_get_size (BraseroTrack *track,
-			       guint64 *blocks,
-			       guint *block_size)
+			       goffset *blocks,
+			       goffset *block_size)
 {
 	BraseroTrackStreamPrivate *priv;
 
diff --git a/libbrasero-burn/brasero-track-stream.h b/libbrasero-burn/brasero-track-stream.h
index 6ab61e5..3c9aff6 100644
--- a/libbrasero-burn/brasero-track-stream.h
+++ b/libbrasero-burn/brasero-track-stream.h
@@ -86,9 +86,9 @@ brasero_track_stream_set_format (BraseroTrackStream *track,
 
 BraseroBurnResult
 brasero_track_stream_set_boundaries (BraseroTrackStream *track,
-				     gint64 start,
-				     gint64 end,
-				     gint64 gap);
+				     guint64 start,
+				     guint64 end,
+				     guint64 gap);
 
 gchar *
 brasero_track_stream_get_source (BraseroTrackStream *track,
diff --git a/libbrasero-burn/brasero-track.c b/libbrasero-burn/brasero-track.c
index 145e349..2408ecd 100644
--- a/libbrasero-burn/brasero-track.c
+++ b/libbrasero-burn/brasero-track.c
@@ -79,13 +79,13 @@ brasero_track_get_track_type (BraseroTrack *track,
 
 BraseroBurnResult
 brasero_track_get_size (BraseroTrack *track,
-			guint64 *blocks,
-			guint64 *size)
+			goffset *blocks,
+			goffset *bytes)
 {
 	BraseroBurnResult res;
 	BraseroTrackClass *klass;
-	guint64 blocks_local = 0;
-	guint block_size_local = 0;
+	goffset blocks_local = 0;
+	goffset block_size_local = 0;
 
 	g_return_val_if_fail (BRASERO_IS_TRACK (track), BRASERO_TRACK_TYPE_NONE);
 
@@ -100,8 +100,8 @@ brasero_track_get_size (BraseroTrack *track,
 	if (blocks)
 		*blocks = blocks_local;
 
-	if (size)
-		*size = blocks_local * block_size_local;
+	if (bytes)
+		*bytes = blocks_local * block_size_local;
 
 	return BRASERO_BURN_OK;
 }
diff --git a/libbrasero-burn/brasero-track.h b/libbrasero-burn/brasero-track.h
index b77b4bc..30f1015 100644
--- a/libbrasero-burn/brasero-track.h
+++ b/libbrasero-burn/brasero-track.h
@@ -64,8 +64,8 @@ struct _BraseroTrackClass
 							 BraseroStatus *status);
 
 	BraseroBurnResult	(* get_size)		(BraseroTrack *track,
-							 guint64 *blocks,
-							 guint *block_size);
+							 goffset *blocks,
+							 goffset *block_size);
 
 	BraseroTrackDataType	(* get_type)		(BraseroTrack *track,
 							 BraseroTrackType *type);
@@ -92,8 +92,8 @@ brasero_track_changed (BraseroTrack *track);
 
 BraseroBurnResult
 brasero_track_get_size (BraseroTrack *track,
-			guint64 *blocks,
-			guint64 *size);
+			goffset *blocks,
+			goffset *bytes);
 
 BraseroTrackDataType
 brasero_track_get_track_type (BraseroTrack *track,
diff --git a/libbrasero-burn/burn-job.c b/libbrasero-burn/burn-job.c
index 67323e5..b1c4020 100644
--- a/libbrasero-burn/burn-job.c
+++ b/libbrasero-burn/burn-job.c
@@ -1569,7 +1569,7 @@ brasero_job_get_medium (BraseroJob *job, BraseroMedium **medium)
 }
 
 BraseroBurnResult
-brasero_job_get_last_session_address (BraseroJob *self, guint64 *address)
+brasero_job_get_last_session_address (BraseroJob *self, goffset *address)
 {
 	BraseroBurnSession *session;
 	BraseroJobPrivate *priv;
@@ -1591,7 +1591,7 @@ brasero_job_get_last_session_address (BraseroJob *self, guint64 *address)
 }
 
 BraseroBurnResult
-brasero_job_get_next_writable_address (BraseroJob *self, guint64 *address)
+brasero_job_get_next_writable_address (BraseroJob *self, goffset *address)
 {
 	BraseroBurnSession *session;
 	BraseroJobPrivate *priv;
diff --git a/libbrasero-burn/burn-job.h b/libbrasero-burn/burn-job.h
index bc8fd21..b5dcebb 100644
--- a/libbrasero-burn/burn-job.h
+++ b/libbrasero-burn/burn-job.h
@@ -162,10 +162,10 @@ BraseroBurnResult
 brasero_job_get_media (BraseroJob *job, BraseroMedia *media);
 
 BraseroBurnResult
-brasero_job_get_last_session_address (BraseroJob *job, guint64 *address);
+brasero_job_get_last_session_address (BraseroJob *job, goffset *address);
 
 BraseroBurnResult
-brasero_job_get_next_writable_address (BraseroJob *job, guint64 *address);
+brasero_job_get_next_writable_address (BraseroJob *job, goffset *address);
 
 BraseroBurnResult
 brasero_job_get_rate (BraseroJob *job, guint64 *rate);
diff --git a/libbrasero-burn/burn-task.c b/libbrasero-burn/burn-task.c
index 446b103..5dba675 100644
--- a/libbrasero-burn/burn-task.c
+++ b/libbrasero-burn/burn-task.c
@@ -403,19 +403,19 @@ brasero_task_set_track_output_size_default (BraseroTask *self,
 	if (BRASERO_IS_TRACK_IMAGE (track)
 	||  BRASERO_IS_TRACK_STREAM (track)) {
 		BraseroBurnResult result;
-		guint64 sectors = 0;
-		guint64 size = 0;
+		goffset sectors = 0;
+		goffset bytes = 0;
 
 		result = brasero_track_get_size (track,
 						 &sectors,
-						 &size);
+						 &bytes);
 		if (result != BRASERO_BURN_OK)
 			return result;
 
 		BRASERO_BURN_LOG ("Got a default image or stream track length %lli", sectors);
 		brasero_task_ctx_set_output_size_for_current_track (BRASERO_TASK_CTX (self),
 								    sectors,
-								    size);
+								    bytes);
 	}
 
 	return BRASERO_BURN_OK;
diff --git a/libbrasero-media/brasero-medium.c b/libbrasero-media/brasero-medium.c
index ad294a0..1e1a88d 100644
--- a/libbrasero-media/brasero-medium.c
+++ b/libbrasero-media/brasero-medium.c
@@ -99,11 +99,11 @@ struct _BraseroMediumPrivate
 	guint *rd_speeds;
 	guint *wr_speeds;
 
-	gint64 block_num;
-	gint64 block_size;
+	goffset block_num;
+	goffset block_size;
 
 	guint first_open_track;
-	guint64 next_wr_add;
+	goffset next_wr_add;
 
 	BraseroMedia info;
 	BraseroDrive *drive;
@@ -145,8 +145,8 @@ typedef struct _BraseroMediumTrack BraseroMediumTrack;
 struct _BraseroMediumTrack {
 	guint session;
 	BraseroMediumTrackType type;
-	guint64 start;
-	guint64 blocks_num;
+	goffset start;
+	goffset blocks_num;
 };
 
 enum
@@ -290,8 +290,8 @@ brasero_medium_get_status (BraseroMedium *medium)
 /**
  * brasero_medium_get_last_data_track_address:
  * @medium: #BraseroMedium
- * @byte: a #guint64 * or NULL
- * @sector: a #guint64 * or NULL
+ * @byte: a #goffset * or NULL
+ * @sector: a #goffset * or NULL
  *
  * Stores in either @byte (in bytes) or in @sector (in blocks) the address where
  * the last session starts. This is useful when creating a multisession image or
@@ -300,8 +300,8 @@ brasero_medium_get_status (BraseroMedium *medium)
  **/
 gboolean
 brasero_medium_get_last_data_track_address (BraseroMedium *medium,
-					    guint64 *bytes,
-					    guint64 *sectors)
+					    goffset *bytes,
+					    goffset *sectors)
 {
 	GSList *iter;
 	BraseroMediumPrivate *priv;
@@ -335,8 +335,8 @@ brasero_medium_get_last_data_track_address (BraseroMedium *medium,
 /**
  * brasero_medium_get_last_data_track_space:
  * @medium: #BraseroMedium
- * @size: a #guint64 * or NULL
- * @blocks: a #guint64 * or NULL
+ * @size: a #goffset * or NULL
+ * @blocks: a #goffset * or NULL
  *
  * Stores in either @size (in bytes) or in @blocks (in blocks) the space used by
  * the last track on the medium.
@@ -344,8 +344,8 @@ brasero_medium_get_last_data_track_address (BraseroMedium *medium,
  **/
 gboolean
 brasero_medium_get_last_data_track_space (BraseroMedium *medium,
-					  guint64 *bytes,
-					  guint64 *sectors)
+					  goffset *bytes,
+					  goffset *sectors)
 {
 	GSList *iter;
 	BraseroMediumPrivate *priv;
@@ -443,8 +443,8 @@ brasero_medium_get_track (BraseroMedium *medium,
  * brasero_medium_get_track_space:
  * @medium: a #BraseroMedium
  * @num: a #guint
- * @size: a #guint64 * or NULL
- * @blocks: a #guint64 * or NULL
+ * @size: a #goffset * or NULL
+ * @blocks: a #goffset * or NULL
  *
  * Stores in either @size (in bytes) or in @blocks (in blocks) the space used
  * by session @num on the disc.
@@ -456,8 +456,8 @@ brasero_medium_get_track (BraseroMedium *medium,
 gboolean
 brasero_medium_get_track_space (BraseroMedium *medium,
 				guint num,
-				guint64 *bytes,
-				guint64 *sectors)
+				goffset *bytes,
+				goffset *sectors)
 {
 	BraseroMediumPrivate *priv;
 	BraseroMediumTrack *track;
@@ -488,8 +488,8 @@ brasero_medium_get_track_space (BraseroMedium *medium,
  * brasero_medium_get_track_address:
  * @medium: a #BraseroMedium
  * @num: a #guint
- * @byte: a #guint64 * or NULL
- * @sector: a #guint64 * or NULL
+ * @byte: a #goffset * or NULL
+ * @sector: a #goffset * or NULL
  *
  * Stores in either @byte (in bytes) or in @sector (in blocks) the address at
  * which the session identified by @num starts.
@@ -501,8 +501,8 @@ brasero_medium_get_track_space (BraseroMedium *medium,
 gboolean
 brasero_medium_get_track_address (BraseroMedium *medium,
 				  guint num,
-				  guint64 *bytes,
-				  guint64 *sectors)
+				  goffset *bytes,
+				  goffset *sectors)
 {
 	BraseroMediumPrivate *priv;
 	BraseroMediumTrack *track;
diff --git a/libbrasero-media/brasero-medium.h b/libbrasero-media/brasero-medium.h
index 45581a6..ad7c9ec 100644
--- a/libbrasero-media/brasero-medium.h
+++ b/libbrasero-media/brasero-medium.h
@@ -72,18 +72,18 @@ brasero_medium_get_write_speeds (BraseroMedium *medium);
 
 void
 brasero_medium_get_free_space (BraseroMedium *medium,
-			       gint64 *bytes,
-			       gint64 *blocks);
+			       goffset *bytes,
+			       goffset *blocks);
 
 void
 brasero_medium_get_capacity (BraseroMedium *medium,
-			     gint64 *bytes,
-			     gint64 *blocks);
+			     goffset *bytes,
+			     goffset *blocks);
 
 void
 brasero_medium_get_data_size (BraseroMedium *medium,
-			      gint64 *bytes,
-			      gint64 *blocks);
+			      goffset *bytes,
+			      goffset *blocks);
 
 gint64
 brasero_medium_get_next_writable_address (BraseroMedium *medium);
@@ -111,25 +111,25 @@ brasero_medium_get_track_num (BraseroMedium *medium);
 
 gboolean
 brasero_medium_get_last_data_track_space (BraseroMedium *medium,
-					  guint64 *bytes,
-					  guint64 *sectors);
+					  goffset *bytes,
+					  goffset *sectors);
 
 gboolean
 brasero_medium_get_last_data_track_address (BraseroMedium *medium,
-					    guint64 *bytes,
-					    guint64 *sectors);
+					    goffset *bytes,
+					    goffset *sectors);
 
 gboolean
 brasero_medium_get_track_space (BraseroMedium *medium,
 				guint num,
-				guint64 *bytes,
-				guint64 *sectors);
+				goffset *bytes,
+				goffset *sectors);
 
 gboolean
 brasero_medium_get_track_address (BraseroMedium *medium,
 				  guint num,
-				  guint64 *bytes,
-				  guint64 *sectors);
+				  goffset *bytes,
+				  goffset *sectors);
 
 gboolean
 brasero_medium_can_use_dummy_for_sao (BraseroMedium *medium);
diff --git a/plugins/cdrdao/burn-cdrdao.c b/plugins/cdrdao/burn-cdrdao.c
index 080ed27..dc2ddd9 100644
--- a/plugins/cdrdao/burn-cdrdao.c
+++ b/plugins/cdrdao/burn-cdrdao.c
@@ -541,7 +541,7 @@ brasero_cdrdao_set_argv (BraseroProcess *process,
 
 		brasero_job_get_current_track (BRASERO_JOB (cdrdao), &track);
 		if (BRASERO_IS_TRACK_DISC (track)) {
-			guint64 sectors = 0;
+			goffset sectors = 0;
 
 			brasero_track_get_size (track, &sectors, NULL);
 
diff --git a/plugins/cdrkit/burn-genisoimage.c b/plugins/cdrkit/burn-genisoimage.c
index 7bae00e..fa631f1 100644
--- a/plugins/cdrkit/burn-genisoimage.c
+++ b/plugins/cdrkit/burn-genisoimage.c
@@ -346,7 +346,7 @@ brasero_genisoimage_set_argv_image (BraseroGenisoimage *genisoimage,
 
 	brasero_job_get_flags (BRASERO_JOB (genisoimage), &flags);
 	if (flags & (BRASERO_BURN_FLAG_APPEND|BRASERO_BURN_FLAG_MERGE)) {
-		guint64 last_session = 0, next_wr_add = 0;
+		goffset last_session = 0, next_wr_add = 0;
 		gchar *startpoint = NULL;
 
 		brasero_job_get_last_session_address (BRASERO_JOB (genisoimage), &last_session);
diff --git a/plugins/cdrkit/burn-readom.c b/plugins/cdrkit/burn-readom.c
index f7c7ce9..e8504d2 100644
--- a/plugins/cdrkit/burn-readom.c
+++ b/plugins/cdrkit/burn-readom.c
@@ -125,7 +125,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
 				      GPtrArray *argv,
 				      GError **error)
 {
-	guint64 nb_blocks;
+	goffset nb_blocks;
 	BraseroTrack *track;
 	GValue *value = NULL;
 	BraseroTrackType *output = NULL;
@@ -162,7 +162,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
 	}
 	/* 0 means all disc, -1 problem */
 	else if (brasero_track_disc_get_track_num (BRASERO_TRACK_DISC (track)) > 0) {
-		guint64 start;
+		goffset start;
 		BraseroDrive *drive;
 		BraseroMedium *medium;
 
@@ -188,7 +188,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
 	}
 	/* if it's BIN output just read the last track */
 	else if (brasero_track_type_get_image_format (output) == BRASERO_IMAGE_FORMAT_BIN) {
-		guint64 start;
+		goffset start;
 		BraseroDrive *drive;
 		BraseroMedium *medium;
 
@@ -222,7 +222,7 @@ static BraseroBurnResult
 brasero_readom_get_size (BraseroReadom *self,
 			 GError **error)
 {
-	guint64 blocks;
+	goffset blocks;
 	GValue *value = NULL;
 	BraseroTrack *track = NULL;
 	BraseroTrackType *output = NULL;
diff --git a/plugins/cdrkit/burn-wodim.c b/plugins/cdrkit/burn-wodim.c
index 6b63471..0f519c1 100644
--- a/plugins/cdrkit/burn-wodim.c
+++ b/plugins/cdrkit/burn-wodim.c
@@ -695,7 +695,7 @@ brasero_wodim_write_infs (BraseroWodim *wodim,
 	start = 0;
 
 	for (iter = tracks; iter; iter = iter->next) {
-		guint64 sectors;
+		goffset sectors;
 		BraseroTrack *track;
 
 		track = iter->data;
diff --git a/plugins/cdrtools/burn-cdrecord.c b/plugins/cdrtools/burn-cdrecord.c
index d8b599a..d07cc18 100644
--- a/plugins/cdrtools/burn-cdrecord.c
+++ b/plugins/cdrtools/burn-cdrecord.c
@@ -665,10 +665,10 @@ brasero_cdrecord_write_infs (BraseroCDRecord *cdrecord,
 	BraseroBurnResult result;
 	gchar *tmpdir = NULL;
 	GSList *tracks;
+	goffset start;
 	GSList *iter;
 	gchar *album;
 	gint index;
-	gint start;
 
 	priv = BRASERO_CD_RECORD_PRIVATE (cdrecord);
 
@@ -678,7 +678,7 @@ brasero_cdrecord_write_infs (BraseroCDRecord *cdrecord,
 	start = 0;
 
 	for (iter = tracks; iter; iter = iter->next) {
-		guint64 sectors;
+		goffset sectors;
 		BraseroTrack *track;
 
 		track = iter->data;
diff --git a/plugins/cdrtools/burn-mkisofs.c b/plugins/cdrtools/burn-mkisofs.c
index 2d2b146..778d2dc 100644
--- a/plugins/cdrtools/burn-mkisofs.c
+++ b/plugins/cdrtools/burn-mkisofs.c
@@ -347,7 +347,7 @@ brasero_mkisofs_set_argv_image (BraseroMkisofs *mkisofs,
 
 	brasero_job_get_flags (BRASERO_JOB (mkisofs), &flags);
 	if (flags & (BRASERO_BURN_FLAG_APPEND|BRASERO_BURN_FLAG_MERGE)) {
-		guint64 last_session = 0, next_wr_add = 0;
+		goffset last_session = 0, next_wr_add = 0;
 		gchar *startpoint = NULL;
 
 		brasero_job_get_last_session_address (BRASERO_JOB (mkisofs), &last_session);
diff --git a/plugins/cdrtools/burn-readcd.c b/plugins/cdrtools/burn-readcd.c
index 5f21e97..2176f10 100644
--- a/plugins/cdrtools/burn-readcd.c
+++ b/plugins/cdrtools/burn-readcd.c
@@ -127,7 +127,7 @@ brasero_readcd_argv_set_iso_boundary (BraseroReadcd *readcd,
 				      GPtrArray *argv,
 				      GError **error)
 {
-	guint64 nb_blocks;
+	goffset nb_blocks;
 	BraseroTrack *track;
 	GValue *value = NULL;
 	BraseroTrackType *output = NULL;
@@ -164,7 +164,7 @@ brasero_readcd_argv_set_iso_boundary (BraseroReadcd *readcd,
 	}
 	/* 0 means all disc, -1 problem */
 	else if (brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track)) > 0) {
-		guint64 start;
+		goffset start;
 		BraseroDrive *drive;
 		BraseroMedium *medium;
 
@@ -190,7 +190,7 @@ brasero_readcd_argv_set_iso_boundary (BraseroReadcd *readcd,
 	}
 	/* if it's BIN output just read the last track */
 	else if (brasero_track_type_get_image_format (output) == BRASERO_IMAGE_FORMAT_BIN) {
-		guint64 start;
+		goffset start;
 		BraseroDrive *drive;
 		BraseroMedium *medium;
 
@@ -224,7 +224,7 @@ static BraseroBurnResult
 brasero_readcd_get_size (BraseroReadcd *self,
 			 GError **error)
 {
-	guint64 blocks;
+	goffset blocks;
 	GValue *value = NULL;
 	BraseroImageFormat format;
 	BraseroTrack *track = NULL;
diff --git a/plugins/checksum/burn-checksum-files.c b/plugins/checksum/burn-checksum-files.c
index 02a8cd9..756c3df 100644
--- a/plugins/checksum/burn-checksum-files.c
+++ b/plugins/checksum/burn-checksum-files.c
@@ -386,7 +386,7 @@ brasero_checksum_files_merge_with_former_session (BraseroChecksumFiles *self,
 	BraseroTrack *track;
 	gchar buffer [2048];
 	BraseroVolSrc *vol;
-	guint64 start_block;
+	goffset start_block;
 	gchar *device;
 
 	priv = BRASERO_CHECKSUM_FILES_PRIVATE (self);
@@ -800,7 +800,7 @@ brasero_checksum_files_check_files (BraseroChecksumFiles *self,
 	guint file_num;
 	gint checksum_len;
 	BraseroVolSrc *vol;
-	guint64 start_block;
+	goffset start_block;
 	BraseroTrack *track;
 	const gchar *device;
 	BraseroVolFile *file;
diff --git a/plugins/checksum/burn-checksum-image.c b/plugins/checksum/burn-checksum-image.c
index e71072f..ba4a238 100644
--- a/plugins/checksum/burn-checksum-image.c
+++ b/plugins/checksum/burn-checksum-image.c
@@ -60,8 +60,8 @@ struct _BraseroChecksumImagePrivate {
 	BraseroChecksumType checksum_type;
 
 	/* That's for progress reporting */
-	guint64 total;
-	guint64 bytes;
+	goffset total;
+	goffset bytes;
 
 	/* this is for the thread and the end of it */
 	GThread *thread;
diff --git a/plugins/dvdcss/burn-dvdcss.c b/plugins/dvdcss/burn-dvdcss.c
index 3c4a4d5..ce08939 100644
--- a/plugins/dvdcss/burn-dvdcss.c
+++ b/plugins/dvdcss/burn-dvdcss.c
@@ -531,7 +531,7 @@ brasero_dvdcss_start (BraseroJob *job,
 
 	brasero_job_get_action (job, &action);
 	if (action == BRASERO_JOB_ACTION_SIZE) {
-		guint64 blocks = 0;
+		goffset blocks = 0;
 		BraseroTrack *track;
 
 		brasero_job_get_current_track (job, &track);
diff --git a/plugins/libburnia/burn-libburn.c b/plugins/libburnia/burn-libburn.c
index 2725cbe..92b4d89 100644
--- a/plugins/libburnia/burn-libburn.c
+++ b/plugins/libburnia/burn-libburn.c
@@ -401,7 +401,7 @@ brasero_libburn_setup_session_file (BraseroLibburn *self,
 		else if (BRASERO_IS_TRACK_IMAGE (track)) {
 			BraseroImageFormat format;
 			gchar *imagepath;
-			guint64 size;
+			goffset bytes;
 			gint mode;
 
 			format = brasero_track_image_get_format (BRASERO_TRACK_IMAGE (track));
@@ -421,14 +421,14 @@ brasero_libburn_setup_session_file (BraseroLibburn *self,
 
 			result = brasero_track_get_size (track,
 							 NULL,
-							 &size);
+							 &bytes);
 			if (result != BRASERO_BURN_OK)
 				return BRASERO_BURN_ERR;
 
 			result = brasero_libburn_add_file_track (session,
 								 imagepath,
 								 mode,
-								 size,
+								 bytes,
 								 priv->pvd,
 								 error);
 			g_free (imagepath);
@@ -520,7 +520,7 @@ brasero_libburn_start_record (BraseroLibburn *self,
 		 * handles all by himself where to start writing. */
 		if (BRASERO_MEDIUM_RANDOM_WRITABLE (media)
 		&& (flags & BRASERO_BURN_FLAG_MERGE)) {
-			guint64 address = 0;
+			goffset address = 0;
 
 			brasero_job_get_next_writable_address (BRASERO_JOB (self), &address);
 
diff --git a/plugins/libburnia/burn-libisofs.c b/plugins/libburnia/burn-libisofs.c
index 55402f9..cd3b2bb 100644
--- a/plugins/libburnia/burn-libisofs.c
+++ b/plugins/libburnia/burn-libisofs.c
@@ -433,8 +433,8 @@ brasero_libisofs_import_last_session (BraseroLibisofs *self,
 	IsoReadOpts *opts;
 	BraseroMedia media;
 	IsoDataSource *src;
-	guint64 start_block;
-	guint64 session_block;
+	goffset start_block;
+	goffset session_block;
 	BraseroLibisofsPrivate *priv;
 
 	priv = BRASERO_LIBISOFS_PRIVATE (self);
@@ -566,7 +566,7 @@ brasero_libisofs_create_volume_thread (gpointer data)
 			goto end;
 	}
 	else if (flags & BRASERO_BURN_FLAG_APPEND) {
-		guint64 start_block;
+		goffset start_block;
 
 		brasero_job_get_next_writable_address (BRASERO_JOB (self), &start_block);
 		iso_write_opts_set_ms_block (opts, start_block);
diff --git a/plugins/local-track/burn-local-image.c b/plugins/local-track/burn-local-image.c
index e0e50e8..e347dfd 100644
--- a/plugins/local-track/burn-local-image.c
+++ b/plugins/local-track/burn-local-image.c
@@ -430,7 +430,7 @@ brasero_local_track_update_track (BraseroLocalTrack *self)
 		gchar *uri;
 		gchar *newtoc;
 		gchar *newimage;
-		guint64 blocks = 0;
+		goffset blocks = 0;
 
 		uri = brasero_track_image_get_source (BRASERO_TRACK_IMAGE (current), TRUE);
 		newimage = brasero_local_track_translate_uri (self, uri);
diff --git a/plugins/local-track/burn-uri.c b/plugins/local-track/burn-uri.c
index e420548..843131f 100644
--- a/plugins/local-track/burn-uri.c
+++ b/plugins/local-track/burn-uri.c
@@ -319,7 +319,7 @@ brasero_burn_uri_thread (gpointer data)
 		gchar *uri;
 		gchar *path_toc;
 		gchar *path_image;
-		guint64 blocks = 0;
+		goffset blocks = 0;
 		BraseroTrackImage *image;
 
 		path_image = NULL;
diff --git a/src/brasero-data-session.c b/src/brasero-data-session.c
index 6ec6f6a..b93d6f7 100644
--- a/src/brasero-data-session.c
+++ b/src/brasero-data-session.c
@@ -274,7 +274,7 @@ brasero_data_session_load_directory_contents_real (BraseroDataSession *self,
 						   GError **error)
 {
 	BraseroDataSessionPrivate *priv;
-	guint64 session_block;
+	goffset session_block;
 	const gchar *device;
 	gint reference = -1;
 



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