[gnome-disk-utility] GduDVDSupport: Update comments and add some more debug.
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] GduDVDSupport: Update comments and add some more debug.
- Date: Tue, 11 Mar 2014 21:24:24 +0000 (UTC)
commit 0acae34413393af79f5eea9db3b8a058b89be82e
Author: David Zeuthen <zeuthen gmail com>
Date: Tue Mar 11 14:21:24 2014 -0700
GduDVDSupport: Update comments and add some more debug.
Signed-off-by: David Zeuthen <zeuthen gmail com>
src/disks/gdudvdsupport.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/disks/gdudvdsupport.c b/src/disks/gdudvdsupport.c
index 748e828..2fcabeb 100644
--- a/src/disks/gdudvdsupport.c
+++ b/src/disks/gdudvdsupport.c
@@ -229,8 +229,11 @@ gdu_dvd_support_new (const gchar *device_file,
range->end = range->start + rounded_vob_size;
range->scrambled = TRUE;
- /*g_print ("%s: %10" G_GUINT64_FORMAT " -> %10" G_GUINT64_FORMAT ": scrambled=%d\n",
- vob_filename, range->start, range->end, range->scrambled);*/
+ if (G_UNLIKELY (support->debug))
+ {
+ g_print ("%s: %10" G_GUINT64_FORMAT " -> %10" G_GUINT64_FORMAT ": scrambled=%d\n",
+ vob_filename, range->start, range->end, range->scrambled);
+ }
scrambled_ranges = g_list_prepend (scrambled_ranges, range);
}
@@ -240,13 +243,10 @@ gdu_dvd_support_new (const gchar *device_file,
if (scrambled_ranges == NULL)
goto fail;
- /* Otherwise, build an array of ranges
- *
- * TODO: ensure ranges are not overlapping
- */
+ /* Otherwise, sort the ranges... */
scrambled_ranges = g_list_sort (scrambled_ranges, (GCompareFunc) range_compare_func);
- /* Remove overlapping ranges */
+ /* ... remove overlapping ranges ... */
prev_range = NULL;
l = scrambled_ranges;
while (l != NULL)
@@ -279,6 +279,7 @@ gdu_dvd_support_new (const gchar *device_file,
l = next;
}
+ /* ... and build an array of ranges covering the entire disc */
a = g_array_new (FALSE, /* zero-terminated */
FALSE, /* clear */
sizeof (Range));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]