brasero r1728 - in trunk: . docs/reference libbrasero-media src
- From: philippr svn gnome org
- To: svn-commits-list gnome org
- Subject: brasero r1728 - in trunk: . docs/reference libbrasero-media src
- Date: Sun, 11 Jan 2009 14:06:17 +0000 (UTC)
Author: philippr
Date: Sun Jan 11 14:06:17 2009
New Revision: 1728
URL: http://svn.gnome.org/viewvc/brasero?rev=1728&view=rev
Log:
2009-01-11 Philippe Rouquier <ykw localhost localdomain>
Polish API, add more documentation, add more checks
* docs/reference/Makefile.am:
* libbrasero-media/Makefile.am:
* libbrasero-media/brasero-drive.c (brasero_drive_get_gdrive),
(brasero_drive_get_bus_target_lun_string), (brasero_drive_is_fake),
(brasero_drive_is_door_open), (brasero_drive_can_use_exclusively),
(brasero_drive_lock), (brasero_drive_unlock),
(brasero_drive_get_display_name), (brasero_drive_get_device),
(brasero_drive_get_block_device), (brasero_drive_get_medium),
(brasero_drive_get_caps), (brasero_drive_can_write),
(brasero_drive_probing), (brasero_drive_reprobe):
* libbrasero-media/brasero-media-private.h:
* libbrasero-media/brasero-media.c:
* libbrasero-media/brasero-media.h:
* libbrasero-media/brasero-medium-monitor.c:
* libbrasero-media/brasero-medium-selection.c
(brasero_medium_selection_set_property),
(brasero_medium_selection_get_property),
(brasero_medium_selection_class_init):
* libbrasero-media/brasero-medium-selection.h:
* libbrasero-media/brasero-medium.c:
* libbrasero-media/brasero-medium.h:
* libbrasero-media/brasero-units.h:
* libbrasero-media/brasero-volume.c:
* libbrasero-media/brasero-volume.h:
* libbrasero-media/burn-hal-watch.c:
* libbrasero-media/burn-iso9660.c:
* libbrasero-media/burn-volume-source.c:
* libbrasero-media/burn-volume.c (brasero_volume_file_size):
* libbrasero-media/scsi-get-configuration.c:
* libbrasero-media/scsi-get-performance.c:
* libbrasero-media/scsi-mode-sense.c:
* libbrasero-media/scsi-read-disc-info.c:
* libbrasero-media/scsi-read-disc-structure.c:
* libbrasero-media/scsi-read-format-capacities.c:
* libbrasero-media/scsi-read-toc-pma-atip.c:
* libbrasero-media/scsi-read-track-information.c:
* libbrasero-media/scsi-sense-data.c:
* libbrasero-media/scsi-sg.c:
* src/brasero-data-project.c (brasero_data_project_node_loaded),
(brasero_data_project_node_reloaded),
(brasero_data_project_add_node_from_info):
* src/brasero-data-session.c:
* src/brasero-file-node.c (brasero_file_node_set_from_info),
(brasero_file_node_new_imported_session_file):
* src/burn-caps.c:
* src/burn-debug.c:
* src/burn-image-format.c (brasero_image_format_get_DATAFILE_info),
(brasero_image_format_get_FILE_info),
(brasero_image_format_get_cue_size):
* src/burn-plugin.c:
Added:
trunk/libbrasero-media/brasero-media-private.h
Modified:
trunk/ChangeLog
trunk/docs/reference/Makefile.am
trunk/libbrasero-media/Makefile.am
trunk/libbrasero-media/brasero-drive.c
trunk/libbrasero-media/brasero-media.c
trunk/libbrasero-media/brasero-media.h
trunk/libbrasero-media/brasero-medium-monitor.c
trunk/libbrasero-media/brasero-medium-selection.c
trunk/libbrasero-media/brasero-medium-selection.h
trunk/libbrasero-media/brasero-medium.c
trunk/libbrasero-media/brasero-medium.h
trunk/libbrasero-media/brasero-units.h
trunk/libbrasero-media/brasero-volume.c
trunk/libbrasero-media/brasero-volume.h
trunk/libbrasero-media/burn-hal-watch.c
trunk/libbrasero-media/burn-iso9660.c
trunk/libbrasero-media/burn-volume-source.c
trunk/libbrasero-media/burn-volume.c
trunk/libbrasero-media/scsi-get-configuration.c
trunk/libbrasero-media/scsi-get-performance.c
trunk/libbrasero-media/scsi-mode-sense.c
trunk/libbrasero-media/scsi-read-disc-info.c
trunk/libbrasero-media/scsi-read-disc-structure.c
trunk/libbrasero-media/scsi-read-format-capacities.c
trunk/libbrasero-media/scsi-read-toc-pma-atip.c
trunk/libbrasero-media/scsi-read-track-information.c
trunk/libbrasero-media/scsi-sense-data.c
trunk/libbrasero-media/scsi-sg.c
trunk/src/brasero-data-project.c
trunk/src/brasero-data-session.c
trunk/src/brasero-file-node.c
trunk/src/burn-caps.c
trunk/src/burn-debug.c
trunk/src/burn-image-format.c
trunk/src/burn-plugin.c
Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am (original)
+++ trunk/docs/reference/Makefile.am Sun Jan 11 14:06:17 2009
@@ -78,6 +78,7 @@
burn-iso9660.h \
burn-volume.h \
burn-volume-source.h \
+ brasero-media-private.h \
burn-susp.h \
burn-hal-watch.h \
libbrasero-marshal.h
Modified: trunk/libbrasero-media/Makefile.am
==============================================================================
--- trunk/libbrasero-media/Makefile.am (original)
+++ trunk/libbrasero-media/Makefile.am Sun Jan 11 14:06:17 2009
@@ -124,7 +124,8 @@
brasero-medium-selection.c \
brasero-units.c \
brasero-drive-selection.c \
- brasero-drive-selection.h
+ brasero-drive-selection.h \
+ brasero-media-private.h
# FreeBSD's SCSI CAM interface
if HAVE_CAM_LIB_H
Modified: trunk/libbrasero-media/brasero-drive.c
==============================================================================
--- trunk/libbrasero-media/brasero-drive.c (original)
+++ trunk/libbrasero-media/brasero-drive.c Sun Jan 11 14:06:17 2009
@@ -34,6 +34,8 @@
#include <libhal.h>
#include <gio/gio.h>
+#include "brasero-media-private.h"
+
#include "brasero-medium.h"
#include "brasero-volume.h"
#include "brasero-drive.h"
@@ -84,7 +86,20 @@
G_DEFINE_TYPE (BraseroDrive, brasero_drive, G_TYPE_OBJECT);
+/**
+ * This is private API. The function is defined in brasero-volume.c
+ */
+BraseroVolume *
+brasero_volume_new (BraseroDrive *drive, const gchar *udi);
+/**
+ * brasero_drive_get_gdrive:
+ * @drive: a #BraseroDrive
+ *
+ * Returns the #GDrive corresponding to this #BraseroDrive
+ *
+ * Return value: a #GDrive or NULL.
+ **/
GDrive *
brasero_drive_get_gdrive (BraseroDrive *drive)
{
@@ -94,6 +109,11 @@
GList *drives;
GList *iter;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+
+ if (brasero_drive_is_fake (drive))
+ return NULL;
+
#if defined(HAVE_STRUCT_USCSI_CMD)
volume_path = brasero_drive_get_block_device (drive);
#else
@@ -140,16 +160,16 @@
* Returns the bus, target, lun ("{bus},{target},{lun}") as a string which is
* sometimes needed by some backends like cdrecord.
*
- * Return value: a string or NULL.
+ * Return value: a string or NULL. The string must be freed when not needed
**/
-
gchar *
brasero_drive_get_bus_target_lun_string (BraseroDrive *drive)
{
BraseroDrivePrivate *priv;
- priv = BRASERO_DRIVE_PRIVATE (drive);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+ priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->udi)
return NULL;
@@ -173,6 +193,8 @@
{
BraseroDrivePrivate *priv;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+
priv = BRASERO_DRIVE_PRIVATE (drive);
return (priv->path == NULL);
}
@@ -192,8 +214,9 @@
BraseroDeviceHandle *handle;
BraseroScsiMechStatusHdr hdr;
- priv = BRASERO_DRIVE_PRIVATE (drive);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+ priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->udi)
return FALSE;
@@ -225,6 +248,8 @@
BraseroDeviceHandle *handle;
const gchar *device;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+
#if defined(HAVE_STRUCT_USCSI_CMD)
device = brasero_drive_get_block_device (drive);
#else
@@ -261,8 +286,9 @@
gboolean result;
gchar *failure;
- priv = BRASERO_DRIVE_PRIVATE (drive);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+ priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->udi)
return FALSE;
@@ -312,6 +338,8 @@
DBusError error;
gboolean result;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+
priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->udi)
return FALSE;
@@ -347,8 +375,9 @@
BraseroHALWatch *watch;
LibHalContext *ctx;
- priv = BRASERO_DRIVE_PRIVATE (drive);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+ priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->udi) {
/* Translators: This is a fake drive, a file, and means that
* when we're writing, we're writing to a file and create an
@@ -377,6 +406,8 @@
{
BraseroDrivePrivate *priv;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+
priv = BRASERO_DRIVE_PRIVATE (drive);
return priv->path;
}
@@ -396,6 +427,8 @@
{
BraseroDrivePrivate *priv;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+
priv = BRASERO_DRIVE_PRIVATE (drive);
return priv->block_path;
}
@@ -407,7 +440,7 @@
* Gets a string holding the HAL udi corresponding to this device. It can be used
* to uniquely identify the drive.
*
- * Return value: a string holding the HAL udi
+ * Return value: a string holding the HAL udi. Not to be freed
**/
const gchar *
brasero_drive_get_udi (BraseroDrive *drive)
@@ -438,6 +471,8 @@
if (!drive)
return NULL;
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+
priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->probed && priv->udi)
@@ -446,21 +481,41 @@
return priv->medium;
}
+/**
+ * brasero_drive_get_caps:
+ * @drive: a #BraseroDrive
+ *
+ * Returns what type(s) of disc the drive can write to.
+ *
+ * Return value: a #BraseroDriveCaps.
+ **/
BraseroDriveCaps
-brasero_drive_get_caps (BraseroDrive *self)
+brasero_drive_get_caps (BraseroDrive *drive)
{
BraseroDrivePrivate *priv;
- priv = BRASERO_DRIVE_PRIVATE (self);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), BRASERO_DRIVE_CAPS_NONE);
+
+ priv = BRASERO_DRIVE_PRIVATE (drive);
return priv->caps;
}
+/**
+ * brasero_drive_can_write:
+ * @drive: a #BraseroDrive
+ *
+ * Returns whether the disc can burn any disc at all.
+ *
+ * Return value: a #gboolean. TRUE if the drive can write a disc and FALSE otherwise
+ **/
gboolean
-brasero_drive_can_write (BraseroDrive *self)
+brasero_drive_can_write (BraseroDrive *drive)
{
BraseroDrivePrivate *priv;
- priv = BRASERO_DRIVE_PRIVATE (self);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+
+ priv = BRASERO_DRIVE_PRIVATE (drive);
return (priv->caps & (BRASERO_DRIVE_CAPS_CDR|
BRASERO_DRIVE_CAPS_DVDR|
BRASERO_DRIVE_CAPS_DVDR_PLUS|
@@ -539,11 +594,13 @@
* This is not public API. Defined in burn-monitor.h.
*/
gboolean
-brasero_drive_probing (BraseroDrive *self)
+brasero_drive_probing (BraseroDrive *drive)
{
BraseroDrivePrivate *priv;
- priv = BRASERO_DRIVE_PRIVATE (self);
+ g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
+
+ priv = BRASERO_DRIVE_PRIVATE (drive);
return priv->probed != TRUE;
}
@@ -564,8 +621,9 @@
BraseroDrivePrivate *priv;
BraseroMedium *medium;
- priv = BRASERO_DRIVE_PRIVATE (drive);
+ g_return_if_fail (BRASERO_IS_DRIVE (drive));
+ priv = BRASERO_DRIVE_PRIVATE (drive);
if (!priv->medium)
return;
Added: trunk/libbrasero-media/brasero-media-private.h
==============================================================================
--- (empty file)
+++ trunk/libbrasero-media/brasero-media-private.h Sun Jan 11 14:06:17 2009
@@ -0,0 +1,67 @@
+/***************************************************************************
+ * burn-media-private.h
+ *
+ * Wed Oct 8 16:42:17 2008
+ * Copyright 2008 ykw
+ * <ykw localhost localdomain>
+ ****************************************************************************/
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ */
+
+#ifndef _BURN_MEDIA_PRIV_H_
+#define _BURN_MEDIA_PRIV_H_
+
+#include <glib.h>
+
+#include "brasero-media.h"
+
+G_BEGIN_DECLS
+
+/**
+ * These functions will be exposed when the burn backend will be split
+ */
+
+GSList *
+brasero_media_get_all_list (BraseroMedia type);
+
+BraseroMedia
+brasero_media_capabilities (BraseroMedia media);
+
+
+/**
+ * For internal debugging purposes
+ */
+
+void
+brasero_media_to_string (BraseroMedia media,
+ gchar *string);
+
+#define BRASERO_MEDIA_LOG(format, ...) \
+ brasero_media_message (G_STRLOC, \
+ format, \
+ ##__VA_ARGS__);
+
+void
+brasero_media_message (const gchar *location,
+ const gchar *format,
+ ...);
+
+G_END_DECLS
+
+#endif /* _BURN_MEDIA_PRIV_H_ */
+
+
Modified: trunk/libbrasero-media/brasero-media.c
==============================================================================
--- trunk/libbrasero-media/brasero-media.c (original)
+++ trunk/libbrasero-media/brasero-media.c Sun Jan 11 14:06:17 2009
@@ -445,6 +445,14 @@
#define BRASERO_MEDIA_LOG_DOMAIN "BraseroMedia"
+/**
+ * brasero_media_get_option_group:
+ *
+ * Returns a GOptionGroup for the commandline arguments recognized by libbrasero-media.
+ * You should add this to your GOptionContext if your are using g_option_context_parse ()
+ * to parse your commandline arguments.
+ *
+ **/
GOptionGroup *
brasero_media_get_option_group (void)
{
Modified: trunk/libbrasero-media/brasero-media.h
==============================================================================
--- trunk/libbrasero-media/brasero-media.h (original)
+++ trunk/libbrasero-media/brasero-media.h Sun Jan 11 14:06:17 2009
@@ -29,9 +29,6 @@
G_BEGIN_DECLS
-GQuark brasero_media_quark (void);
-#define BRASERO_MEDIA_ERROR brasero_media_quark()
-
/**
* To start and stop the library
*/
@@ -42,43 +39,41 @@
void
brasero_media_library_stop (void);
-typedef enum {
- BRASERO_MEDIA_ERROR_NONE,
- BRASERO_MEDIA_ERROR_GENERAL, /******/
-
- BRASERO_MEDIA_ERROR_PLUGIN_MISBEHAVIOR,
-
- BRASERO_MEDIA_ERROR_SLOW_DMA,
- BRASERO_MEDIA_ERROR_PERMISSION,
- BRASERO_MEDIA_ERROR_DRIVE_BUSY,
- BRASERO_MEDIA_ERROR_DISK_SPACE,
-
- BRASERO_MEDIA_ERROR_INPUT_INVALID,
-
- BRASERO_MEDIA_ERROR_OUTPUT_NONE,
-
- BRASERO_MEDIA_ERROR_FILE_INVALID,
- BRASERO_MEDIA_ERROR_FILE_NOT_FOUND,
- BRASERO_MEDIA_ERROR_FILE_NOT_LOCAL,
+GOptionGroup *
+brasero_media_get_option_group (void);
- BRASERO_MEDIA_ERROR_WRITE_MEDIUM,
- BRASERO_MEDIA_ERROR_WRITE_IMAGE,
+/**
+ * Errors
+ */
- BRASERO_MEDIA_ERROR_IMAGE_INVALID, /**/
- BRASERO_MEDIA_ERROR_IMAGE_JOLIET,
- BRASERO_MEDIA_ERROR_IMAGE_LAST_SESSION,
+GQuark brasero_media_quark (void);
- BRASERO_MEDIA_ERROR_MEDIUM_NONE,
- BRASERO_MEDIA_ERROR_MEDIUM_INVALID,
- BRASERO_MEDIA_ERROR_MEDIUM_SPACE,
- BRASERO_MEDIA_ERROR_MEDIUM_NO_DATA,
- BRASERO_MEDIA_ERROR_MEDIUM_NOT_WRITABLE,
- BRASERO_MEDIA_ERROR_MEDIUM_NOT_REWRITABLE,
- BRASERO_MEDIA_ERROR_MEDIUM_NEED_RELOADING,
+/**
+ * BRASERO_MEDIA_ERROR:
+ *
+ * The GQuark used for BraseroMediaError
+ */
+#define BRASERO_MEDIA_ERROR brasero_media_quark()
- BRASERO_MEDIA_ERROR_BAD_CHECKSUM,
+/**
+ * BraseroMediaError:
+ *
+ * Error codes returned by libbrasero-media
+ *
+ */
+typedef enum {
+ BRASERO_MEDIA_ERROR_NONE,
+ BRASERO_MEDIA_ERROR_GENERAL,
+ BRASERO_MEDIA_ERROR_IMAGE_INVALID,
} BraseroMediaError;
+/**
+ * BraseroMedia:
+ *
+ * This enum allows to define all characteristics for a media (closed, writable, ...)
+ * and identify all types of optical media.
+ *
+ */
typedef enum {
BRASERO_MEDIUM_UNSUPPORTED = -2,
BRASERO_MEDIUM_BUSY = -1,
@@ -215,32 +210,6 @@
BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_BDR_SRM_POW) || \
BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_BDRE))
-GSList *
-brasero_media_get_all_list (BraseroMedia type);
-
-BraseroMedia
-brasero_media_capabilities (BraseroMedia media);
-
-GOptionGroup *
-brasero_media_get_option_group (void);
-
-/**
- * For debugging purposes
- */
-
-void
-brasero_media_to_string (BraseroMedia media,
- gchar *string);
-
-#define BRASERO_MEDIA_LOG(format, ...) \
- brasero_media_message (G_STRLOC, \
- format, \
- ##__VA_ARGS__);
-
-void
-brasero_media_message (const gchar *location,
- const gchar *format,
- ...);
G_END_DECLS
Modified: trunk/libbrasero-media/brasero-medium-monitor.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium-monitor.c (original)
+++ trunk/libbrasero-media/brasero-medium-monitor.c Sun Jan 11 14:06:17 2009
@@ -37,6 +37,8 @@
#include <libhal.h>
+#include "brasero-media-private.h"
+
#include "brasero-drive.h"
#include "brasero-medium.h"
#include "burn-hal-watch.h"
@@ -95,7 +97,6 @@
*
* Return value: a #BraseroDrive or NULL
**/
-
BraseroDrive *
brasero_medium_monitor_get_drive (BraseroMediumMonitor *monitor,
const gchar *device)
@@ -127,7 +128,6 @@
*
* Return value: %TRUE if it is still probing some media
**/
-
gboolean
brasero_medium_monitor_is_probing (BraseroMediumMonitor *monitor)
{
@@ -159,7 +159,6 @@
*
* Return value: a #GSList or NULL
**/
-
GSList *
brasero_medium_monitor_get_drives (BraseroMediumMonitor *monitor,
BraseroDriveType type)
@@ -206,7 +205,6 @@
*
* Return value: a #GSList or NULL
**/
-
GSList *
brasero_medium_monitor_get_media (BraseroMediumMonitor *monitor,
BraseroMediaType type)
@@ -566,7 +564,6 @@
*
* Return value: a #BraseroMediumMonitor. Unref when it is not needed anymore.
**/
-
BraseroMediumMonitor *
brasero_medium_monitor_get_default (void)
{
Modified: trunk/libbrasero-media/brasero-medium-selection.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium-selection.c (original)
+++ trunk/libbrasero-media/brasero-medium-selection.c Sun Jan 11 14:06:17 2009
@@ -56,7 +56,7 @@
enum {
PROP_0,
- PROP_DEVICE,
+ PROP_MEDIUM,
PROP_MEDIA_TYPE
};
@@ -270,38 +270,6 @@
}
/**
- * brasero_medium_selection_set_device:
- * @selector: a #BraseroMediumSelection
- * @device: a #gchar * to set as the active medium in the selector
- *
- * Sets the active medium.
- *
- * Return value: a #gboolean. TRUE if it succeeded, FALSE otherwise.
- **/
-gboolean
-brasero_medium_selection_set_device (BraseroMediumSelection *selector,
- const gchar *device)
-{
- BraseroMediumMonitor *monitor;
- BraseroDrive *drive;
- gboolean res;
-
- monitor = brasero_medium_monitor_get_default ();
- drive = brasero_medium_monitor_get_drive (monitor, device);
- g_object_unref (monitor);
-
- if (!drive) {
- g_object_unref (drive);
- return FALSE;
- }
-
- res = brasero_medium_selection_set_active (selector, brasero_drive_get_medium (drive));
- g_object_unref (drive);
-
- return res;
-}
-
-/**
* brasero_medium_selection_get_active:
* @selector: a #BraseroMediumSelection
*
@@ -326,26 +294,6 @@
return medium;
}
-/**
- * brasero_medium_selection_get_device:
- * @selector: a #BraseroMediumSelection
- *
- * Gets the active medium device.
- *
- * Return value: a #char * or NULL.
- **/
-const gchar *
-brasero_medium_selection_get_device (BraseroMediumSelection *self)
-{
- BraseroMedium *medium;
-
- medium = brasero_medium_selection_get_active (self);
- if (brasero_medium_get_status (medium) & BRASERO_MEDIUM_FILE)
- return NULL;
-
- return brasero_drive_get_device (brasero_medium_get_drive (medium));
-}
-
static void
brasero_medium_selection_update_no_disc_entry (BraseroMediumSelection *self,
GtkTreeModel *model,
@@ -751,14 +699,14 @@
switch (prop_id)
{
- case PROP_DEVICE:
- brasero_medium_selection_set_device (BRASERO_MEDIUM_SELECTION (object),
- g_value_get_string (value));
- break;
case PROP_MEDIA_TYPE:
brasero_medium_selection_show_media_type (BRASERO_MEDIUM_SELECTION (object),
g_value_get_uint (value));
break;
+ case PROP_MEDIUM:
+ brasero_medium_selection_set_active (BRASERO_MEDIUM_SELECTION (object),
+ BRASERO_MEDIUM (g_value_get_object (value)));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -779,12 +727,12 @@
switch (prop_id)
{
- case PROP_DEVICE:
- g_value_set_string (value, brasero_medium_selection_get_device (BRASERO_MEDIUM_SELECTION (object)));
- break;
case PROP_MEDIA_TYPE:
g_value_set_uint (value, priv->type);
break;
+ case PROP_MEDIUM:
+ g_value_set_object (value, brasero_medium_selection_get_active (BRASERO_MEDIUM_SELECTION (object)));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -805,9 +753,9 @@
combo_class->changed = brasero_medium_selection_changed;
- g_object_class_install_property (object_class, PROP_DEVICE,
- g_param_spec_string ("device", NULL, NULL,
- NULL, G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_MEDIUM,
+ g_param_spec_object ("medium", NULL, NULL,
+ BRASERO_TYPE_MEDIUM, G_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_MEDIA_TYPE,
g_param_spec_uint ("media-type", NULL, NULL,
Modified: trunk/libbrasero-media/brasero-medium-selection.h
==============================================================================
--- trunk/libbrasero-media/brasero-medium-selection.h (original)
+++ trunk/libbrasero-media/brasero-medium-selection.h Sun Jan 11 14:06:17 2009
@@ -68,12 +68,7 @@
gboolean
brasero_medium_selection_set_active (BraseroMediumSelection *selection,
BraseroMedium *medium);
-const gchar *
-brasero_medium_selection_get_device (BraseroMediumSelection *self);
-gboolean
-brasero_medium_selection_set_device (BraseroMediumSelection *selector,
- const gchar *device);
void
brasero_medium_selection_show_media_type (BraseroMediumSelection *selection,
BraseroMediaType type);
Modified: trunk/libbrasero-media/brasero-medium.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium.c (original)
+++ trunk/libbrasero-media/brasero-medium.c Sun Jan 11 14:06:17 2009
@@ -35,6 +35,8 @@
#include "burn-basics.h"
+#include "brasero-media-private.h"
+
#include "brasero-medium.h"
#include "brasero-drive.h"
@@ -124,6 +126,26 @@
#define BUSY_RETRY_TIME 1000
+typedef enum {
+ BRASERO_MEDIUM_TRACK_NONE = 0,
+ BRASERO_MEDIUM_TRACK_DATA = 1,
+ BRASERO_MEDIUM_TRACK_AUDIO = 1 << 1,
+ BRASERO_MEDIUM_TRACK_COPY = 1 << 2,
+ BRASERO_MEDIUM_TRACK_PREEMP = 1 << 3,
+ BRASERO_MEDIUM_TRACK_4_CHANNELS = 1 << 4,
+ BRASERO_MEDIUM_TRACK_INCREMENTAL = 1 << 5,
+ BRASERO_MEDIUM_TRACK_LEADOUT = 1 << 6
+} BraseroMediumTrackType;
+
+typedef struct _BraseroMediumTrack BraseroMediumTrack;
+
+struct _BraseroMediumTrack {
+ guint session;
+ BraseroMediumTrackType type;
+ guint64 start;
+ guint64 blocks_num;
+};
+
enum
{
PROP_0,
@@ -296,15 +318,6 @@
return TRUE;
}
-GSList *
-brasero_medium_get_tracks (BraseroMedium *medium)
-{
- BraseroMediumPrivate *priv;
-
- priv = BRASERO_MEDIUM_PRIVATE (medium);
- return g_slist_copy (priv->tracks);
-}
-
gboolean
brasero_medium_get_last_data_track_address (BraseroMedium *medium,
gint64 *byte,
Modified: trunk/libbrasero-media/brasero-medium.h
==============================================================================
--- trunk/libbrasero-media/brasero-medium.h (original)
+++ trunk/libbrasero-media/brasero-medium.h Sun Jan 11 14:06:17 2009
@@ -29,46 +29,6 @@
G_BEGIN_DECLS
-/* Data Transfer Speeds: rates are in KiB/sec */
-/* NOTE: rates for audio and data transfer speeds are different:
- * - Data : 150 KiB/sec
- * - Audio : 172.3 KiB/sec
- * Source Wikipedia.com =)
- * Apparently most drives return rates that should be used with Audio factor
- */
-
-#define CD_RATE 176400 /* bytes by second */
-#define DVD_RATE 1387500
-#define BD_RATE 4500000
-
-typedef struct _BraseroDrive BraseroDrive;
-
-#define BRASERO_SPEED_TO_RATE_CD(speed) (guint) ((speed) * CD_RATE)
-#define BRASERO_SPEED_TO_RATE_DVD(speed) (guint) ((speed) * DVD_RATE)
-#define BRASERO_RATE_TO_SPEED_CD(rate) (gdouble) ((gdouble) (rate) / (gdouble) CD_RATE)
-#define BRASERO_RATE_TO_SPEED_DVD(rate) (gdouble) ((gdouble) (rate) / (gdouble) DVD_RATE)
-#define BRASERO_RATE_TO_SPEED_BD(rate) (gdouble) ((gdouble) (rate) / (gdouble) BD_RATE)
-
-typedef enum {
- BRASERO_MEDIUM_TRACK_NONE = 0,
- BRASERO_MEDIUM_TRACK_DATA = 1,
- BRASERO_MEDIUM_TRACK_AUDIO = 1 << 1,
- BRASERO_MEDIUM_TRACK_COPY = 1 << 2,
- BRASERO_MEDIUM_TRACK_PREEMP = 1 << 3,
- BRASERO_MEDIUM_TRACK_4_CHANNELS = 1 << 4,
- BRASERO_MEDIUM_TRACK_INCREMENTAL = 1 << 5,
- BRASERO_MEDIUM_TRACK_LEADOUT = 1 << 6
-} BraseroMediumTrackType;
-
-typedef struct _BraseroMediumTrack BraseroMediumTrack;
-
-struct _BraseroMediumTrack {
- guint session;
- BraseroMediumTrackType type;
- guint64 start;
- guint64 blocks_num;
-};
-
#define BRASERO_TYPE_MEDIUM (brasero_medium_get_type ())
#define BRASERO_MEDIUM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_MEDIUM, BraseroMedium))
#define BRASERO_MEDIUM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_MEDIUM, BraseroMediumClass))
@@ -78,6 +38,7 @@
typedef struct _BraseroMediumClass BraseroMediumClass;
typedef struct _BraseroMedium BraseroMedium;
+typedef struct _BraseroDrive BraseroDrive;
struct _BraseroMediumClass
{
@@ -95,37 +56,6 @@
BraseroMedia
brasero_medium_get_status (BraseroMedium *medium);
-GSList *
-brasero_medium_get_tracks (BraseroMedium *medium);
-
-gboolean
-brasero_medium_get_last_data_track_space (BraseroMedium *medium,
- gint64 *size,
- gint64 *blocks);
-
-gboolean
-brasero_medium_get_last_data_track_address (BraseroMedium *medium,
- gint64 *byte,
- gint64 *sector);
-guint
-brasero_medium_get_track_num (BraseroMedium *medium);
-
-gboolean
-brasero_medium_get_track_space (BraseroMedium *medium,
- guint num,
- gint64 *size,
- gint64 *blocks);
-
-gboolean
-brasero_medium_get_track_address (BraseroMedium *medium,
- guint num,
- gint64 *byte,
- gint64 *sector);
-
-
-gint64
-brasero_medium_get_next_writable_address (BraseroMedium *medium);
-
gint64
brasero_medium_get_max_write_speed (BraseroMedium *medium);
@@ -147,6 +77,9 @@
gint64 *size,
gint64 *blocks);
+gint64
+brasero_medium_get_next_writable_address (BraseroMedium *medium);
+
gboolean
brasero_medium_can_be_rewritten (BraseroMedium *medium);
@@ -165,6 +98,31 @@
BraseroDrive *
brasero_medium_get_drive (BraseroMedium *self);
+guint
+brasero_medium_get_track_num (BraseroMedium *medium);
+
+gboolean
+brasero_medium_get_last_data_track_space (BraseroMedium *medium,
+ gint64 *size,
+ gint64 *blocks);
+
+gboolean
+brasero_medium_get_last_data_track_address (BraseroMedium *medium,
+ gint64 *byte,
+ gint64 *sector);
+
+gboolean
+brasero_medium_get_track_space (BraseroMedium *medium,
+ guint num,
+ gint64 *size,
+ gint64 *blocks);
+
+gboolean
+brasero_medium_get_track_address (BraseroMedium *medium,
+ guint num,
+ gint64 *byte,
+ gint64 *sector);
+
G_END_DECLS
#endif /* _BURN_MEDIUM_H_ */
Modified: trunk/libbrasero-media/brasero-units.h
==============================================================================
--- trunk/libbrasero-media/brasero-units.h (original)
+++ trunk/libbrasero-media/brasero-units.h Sun Jan 11 14:06:17 2009
@@ -21,6 +21,37 @@
G_BEGIN_DECLS
+/* Data Transfer Speeds: rates are in KiB/sec */
+/* NOTE: rates for audio and data transfer speeds are different:
+ * - Data : 150 KiB/sec
+ * - Audio : 172.3 KiB/sec
+ * Source Wikipedia.com =)
+ * Apparently most drives return rates that should be used with Audio factor
+ */
+
+#define CD_RATE 176400 /* bytes by second */
+#define DVD_RATE 1387500 /* bytes by second */
+#define BD_RATE 4500000 /* bytes by second */
+
+#define BRASERO_SPEED_TO_RATE_CD(speed) \
+ (guint) ((speed) * CD_RATE)
+
+#define BRASERO_SPEED_TO_RATE_DVD(speed) \
+ (guint) ((speed) * DVD_RATE)
+
+#define BRASERO_SPEED_TO_RATE_BD(speed) \
+ (guint) ((speed) * BD_RATE)
+
+#define BRASERO_RATE_TO_SPEED_CD(rate) \
+ (gdouble) ((gdouble) (rate) / (gdouble) CD_RATE)
+
+#define BRASERO_RATE_TO_SPEED_DVD(rate) \
+ (gdouble) ((gdouble) (rate) / (gdouble) DVD_RATE)
+
+#define BRASERO_RATE_TO_SPEED_BD(rate) \
+ (gdouble) ((gdouble) (rate) / (gdouble) BD_RATE)
+
+
/**
* Used to convert between known units
**/
@@ -28,11 +59,14 @@
#define BRASERO_DURATION_TO_BYTES(duration) \
((gint64) (duration) * 75 * 2352 / 1000000000 + \
(((gint64) ((duration) * 75 * 2352) % 1000000000) ? 1:0))
+
#define BRASERO_DURATION_TO_SECTORS(duration) \
((gint64) (duration) * 75 / 1000000000 + \
(((gint64) ((duration) * 75) % 1000000000) ? 1:0))
-#define BRASERO_SIZE_TO_SECTORS(size, secsize) \
+
+#define BRASERO_BYTES_TO_SECTORS(size, secsize) \
(((size) / (secsize)) + (((size) % (secsize)) ? 1:0))
+
#define BRASERO_BYTES_TO_DURATION(bytes) \
(guint64) ((guint64) ((guint64) (bytes) * 1000000000) / (guint64) (2352 * 75) + \
(guint64) (((guint64) ((guint64) (bytes) * 1000000000) % (guint64) (2352 * 75)) ? 1:0))
Modified: trunk/libbrasero-media/brasero-volume.c
==============================================================================
--- trunk/libbrasero-media/brasero-volume.c (original)
+++ trunk/libbrasero-media/brasero-volume.c Sun Jan 11 14:06:17 2009
@@ -29,6 +29,7 @@
#include <gio/gio.h>
+#include "brasero-media-private.h"
#include "brasero-volume.h"
typedef struct _BraseroVolumePrivate BraseroVolumePrivate;
Modified: trunk/libbrasero-media/brasero-volume.h
==============================================================================
--- trunk/libbrasero-media/brasero-volume.h (original)
+++ trunk/libbrasero-media/brasero-volume.h Sun Jan 11 14:06:17 2009
@@ -52,10 +52,6 @@
GType brasero_volume_get_type (void) G_GNUC_CONST;
-BraseroVolume *
-brasero_volume_new (BraseroDrive *drive,
- const gchar *udi);
-
gchar *
brasero_volume_get_name (BraseroVolume *volume);
Modified: trunk/libbrasero-media/burn-hal-watch.c
==============================================================================
--- trunk/libbrasero-media/burn-hal-watch.c (original)
+++ trunk/libbrasero-media/burn-hal-watch.c Sun Jan 11 14:06:17 2009
@@ -31,6 +31,7 @@
#include <libhal.h>
#include "brasero-media.h"
+#include "brasero-media-private.h"
#include "burn-hal-watch.h"
#include "libbrasero-marshal.h"
Modified: trunk/libbrasero-media/burn-iso9660.c
==============================================================================
--- trunk/libbrasero-media/burn-iso9660.c (original)
+++ trunk/libbrasero-media/burn-iso9660.c Sun Jan 11 14:06:17 2009
@@ -37,6 +37,7 @@
#include "brasero-units.h"
#include "brasero-media.h"
+#include "brasero-media-private.h"
#include "burn-iso9660.h"
#include "burn-iso-field.h"
#include "burn-susp.h"
@@ -125,7 +126,7 @@
BRASERO_ISO_ERROR
} BraseroIsoResult;
-#define ISO9660_BYTES_TO_BLOCKS(size) BRASERO_SIZE_TO_SECTORS ((size), ISO9660_BLOCK_SIZE)
+#define ISO9660_BYTES_TO_BLOCKS(size) BRASERO_BYTES_TO_SECTORS ((size), ISO9660_BLOCK_SIZE)
static GList *
brasero_iso9660_load_directory_records (BraseroIsoCtx *ctx,
Modified: trunk/libbrasero-media/burn-volume-source.c
==============================================================================
--- trunk/libbrasero-media/burn-volume-source.c (original)
+++ trunk/libbrasero-media/burn-volume-source.c Sun Jan 11 14:06:17 2009
@@ -33,6 +33,7 @@
#include "burn-volume-source.h"
#include "burn-iso9660.h"
#include "brasero-media.h"
+#include "brasero-media-private.h"
#include "scsi-mmc1.h"
#include "scsi-mmc2.h"
Modified: trunk/libbrasero-media/burn-volume.c
==============================================================================
--- trunk/libbrasero-media/burn-volume.c (original)
+++ trunk/libbrasero-media/burn-volume.c Sun Jan 11 14:06:17 2009
@@ -40,6 +40,7 @@
#include "burn-volume.h"
#include "burn-iso9660.h"
#include "brasero-media.h"
+#include "brasero-media-private.h"
#include "brasero-units.h"
struct _BraseroTagDesc {
@@ -313,7 +314,7 @@
extent = extents->data;
size += extent->size;
}
- return BRASERO_SIZE_TO_SECTORS (size, 2048);
+ return BRASERO_BYTES_TO_SECTORS (size, 2048);
}
for (iter = file->specific.dir.children; iter; iter = iter->next) {
@@ -322,7 +323,7 @@
if (file->isdir)
size += brasero_volume_file_size (file);
else
- size += BRASERO_SIZE_TO_SECTORS (file->specific.file.size_bytes, 2048);
+ size += BRASERO_BYTES_TO_SECTORS (file->specific.file.size_bytes, 2048);
}
return size;
Modified: trunk/libbrasero-media/scsi-get-configuration.c
==============================================================================
--- trunk/libbrasero-media/scsi-get-configuration.c (original)
+++ trunk/libbrasero-media/scsi-get-configuration.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-get-performance.c
==============================================================================
--- trunk/libbrasero-media/scsi-get-performance.c (original)
+++ trunk/libbrasero-media/scsi-get-performance.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-command.h"
Modified: trunk/libbrasero-media/scsi-mode-sense.c
==============================================================================
--- trunk/libbrasero-media/scsi-mode-sense.c (original)
+++ trunk/libbrasero-media/scsi-mode-sense.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-read-disc-info.c
==============================================================================
--- trunk/libbrasero-media/scsi-read-disc-info.c (original)
+++ trunk/libbrasero-media/scsi-read-disc-info.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-read-disc-structure.c
==============================================================================
--- trunk/libbrasero-media/scsi-read-disc-structure.c (original)
+++ trunk/libbrasero-media/scsi-read-disc-structure.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-base.h"
#include "scsi-command.h"
Modified: trunk/libbrasero-media/scsi-read-format-capacities.c
==============================================================================
--- trunk/libbrasero-media/scsi-read-format-capacities.c (original)
+++ trunk/libbrasero-media/scsi-read-format-capacities.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-read-toc-pma-atip.c
==============================================================================
--- trunk/libbrasero-media/scsi-read-toc-pma-atip.c (original)
+++ trunk/libbrasero-media/scsi-read-toc-pma-atip.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-read-track-information.c
==============================================================================
--- trunk/libbrasero-media/scsi-read-track-information.c (original)
+++ trunk/libbrasero-media/scsi-read-track-information.c Sun Jan 11 14:06:17 2009
@@ -28,6 +28,8 @@
#include <glib.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-sense-data.c
==============================================================================
--- trunk/libbrasero-media/scsi-sense-data.c (original)
+++ trunk/libbrasero-media/scsi-sense-data.c Sun Jan 11 14:06:17 2009
@@ -29,6 +29,8 @@
#include <errno.h>
#include <stdio.h>
+#include "brasero-media-private.h"
+
#include "scsi-error.h"
#include "scsi-utils.h"
#include "scsi-base.h"
Modified: trunk/libbrasero-media/scsi-sg.c
==============================================================================
--- trunk/libbrasero-media/scsi-sg.c (original)
+++ trunk/libbrasero-media/scsi-sg.c Sun Jan 11 14:06:17 2009
@@ -38,6 +38,8 @@
#include <scsi/scsi.h>
#include <scsi/sg.h>
+#include "brasero-media-private.h"
+
#include "scsi-command.h"
#include "scsi-utils.h"
#include "scsi-error.h"
Modified: trunk/src/brasero-data-project.c
==============================================================================
--- trunk/src/brasero-data-project.c (original)
+++ trunk/src/brasero-data-project.c Sun Jan 11 14:06:17 2009
@@ -1861,7 +1861,7 @@
size = g_file_info_get_size (info);
if (type != G_FILE_TYPE_DIRECTORY) {
- if (BRASERO_SIZE_TO_SECTORS (size, 2048) > BRASERO_FILE_2G_LIMIT
+ if (BRASERO_BYTES_TO_SECTORS (size, 2048) > BRASERO_FILE_2G_LIMIT
&& BRASERO_FILE_NODE_SECTORS (node) < BRASERO_FILE_2G_LIMIT) {
if (brasero_data_project_file_signal (self, G2_FILE_SIGNAL, g_file_info_get_name (info))) {
brasero_data_project_remove_node (self, node);
@@ -1876,7 +1876,7 @@
return;
}
- size_changed = (BRASERO_SIZE_TO_SECTORS (size, 2048) != BRASERO_FILE_NODE_SECTORS (node));
+ size_changed = (BRASERO_BYTES_TO_SECTORS (size, 2048) != BRASERO_FILE_NODE_SECTORS (node));
stats = brasero_file_node_get_tree_stats (priv->root, NULL);
brasero_file_node_set_from_info (node, stats, info);
@@ -1949,7 +1949,7 @@
size = g_file_info_get_size (info);
name = g_file_info_get_name (info);
- if (BRASERO_SIZE_TO_SECTORS (size, 2048) > BRASERO_FILE_2G_LIMIT
+ if (BRASERO_BYTES_TO_SECTORS (size, 2048) > BRASERO_FILE_2G_LIMIT
&& BRASERO_FILE_NODE_SECTORS (node) < BRASERO_FILE_2G_LIMIT) {
if (brasero_data_project_file_signal (self, G2_FILE_SIGNAL, name)) {
brasero_data_project_remove_node (self, node);
@@ -1957,7 +1957,7 @@
}
}
- size_changed = (BRASERO_SIZE_TO_SECTORS (size, 2048) == BRASERO_FILE_NODE_SECTORS (node));
+ size_changed = (BRASERO_BYTES_TO_SECTORS (size, 2048) == BRASERO_FILE_NODE_SECTORS (node));
if (BRASERO_FILE_NODE_MIME (node) && !size_changed)
return;
@@ -2123,7 +2123,7 @@
guint64 size;
size = g_file_info_get_size (info);
- if (BRASERO_SIZE_TO_SECTORS (size, 2048) > BRASERO_FILE_2G_LIMIT)
+ if (BRASERO_BYTES_TO_SECTORS (size, 2048) > BRASERO_FILE_2G_LIMIT)
if (brasero_data_project_file_signal (self, G2_FILE_SIGNAL, name))
return NULL;
}
Modified: trunk/src/brasero-data-session.c
==============================================================================
--- trunk/src/brasero-data-session.c (original)
+++ trunk/src/brasero-data-session.c Sun Jan 11 14:06:17 2009
@@ -27,6 +27,8 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
+#include "brasero-media-private.h"
+
#include "burn-basics.h"
#include "burn-caps.h"
Modified: trunk/src/brasero-file-node.c
==============================================================================
--- trunk/src/brasero-file-node.c (original)
+++ trunk/src/brasero-file-node.c Sun Jan 11 14:06:17 2009
@@ -771,7 +771,7 @@
node->union2.mime = brasero_utils_register_string (mime);
}
- sectors = BRASERO_SIZE_TO_SECTORS (g_file_info_get_size (info), 2048);
+ sectors = BRASERO_BYTES_TO_SECTORS (g_file_info_get_size (info), 2048);
if (sectors > BRASERO_FILE_2G_LIMIT && BRASERO_FILE_NODE_SECTORS (node) <= BRASERO_FILE_2G_LIMIT)
stats->num_2GiB ++;
@@ -875,7 +875,7 @@
node->union3.imported_address = g_file_info_get_attribute_int64 (info, BRASERO_IO_DIR_CONTENTS_ADDR);
}
else
- node->union3.sectors = BRASERO_SIZE_TO_SECTORS (g_file_info_get_size (info), 2048);
+ node->union3.sectors = BRASERO_BYTES_TO_SECTORS (g_file_info_get_size (info), 2048);
/* Add it (we must add a graft) */
brasero_file_node_add (parent, node, sort_func);
Modified: trunk/src/burn-caps.c
==============================================================================
--- trunk/src/burn-caps.c (original)
+++ trunk/src/burn-caps.c Sun Jan 11 14:06:17 2009
@@ -36,6 +36,8 @@
#include <gconf/gconf-client.h>
+#include "brasero-media-private.h"
+
#include "burn-basics.h"
#include "burn-debug.h"
#include "brasero-drive.h"
Modified: trunk/src/burn-debug.c
==============================================================================
--- trunk/src/burn-debug.c (original)
+++ trunk/src/burn-debug.c Sun Jan 11 14:06:17 2009
@@ -31,6 +31,8 @@
#include <glib.h>
#include <gmodule.h>
+#include "brasero-media-private.h"
+
#include "burn-debug.h"
#include "burn-track.h"
#include "brasero-media.h"
Modified: trunk/src/burn-image-format.c
==============================================================================
--- trunk/src/burn-image-format.c (original)
+++ trunk/src/burn-image-format.c Sun Jan 11 14:06:17 2009
@@ -312,7 +312,7 @@
}
if (size)
- *size = BRASERO_SIZE_TO_SECTORS (buffer.st_size, 2352);
+ *size = BRASERO_BYTES_TO_SECTORS (buffer.st_size, 2352);
return TRUE;
}
@@ -399,7 +399,7 @@
}
if (size)
- *size = BRASERO_SIZE_TO_SECTORS (buffer.st_size, 2352) - start;
+ *size = BRASERO_BYTES_TO_SECTORS (buffer.st_size, 2352) - start;
return TRUE;
}
@@ -648,7 +648,7 @@
if (size)
*size = cue_size;
if (blocks)
- *blocks = BRASERO_SIZE_TO_SECTORS (cue_size, 2352);
+ *blocks = BRASERO_BYTES_TO_SECTORS (cue_size, 2352);
return TRUE;
}
Modified: trunk/src/burn-plugin.c
==============================================================================
--- trunk/src/burn-plugin.c (original)
+++ trunk/src/burn-plugin.c Sun Jan 11 14:06:17 2009
@@ -31,6 +31,8 @@
#include <gconf/gconf-client.h>
+#include "brasero-media-private.h"
+
#include "burn-basics.h"
#include "burn-debug.h"
#include "burn-plugin.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
