[brasero] Added a new string to help users work around some problems with copying encrypted video DVDs. In som
- From: Philippe Rouquier <philippr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] Added a new string to help users work around some problems with copying encrypted video DVDs. In som
- Date: Sun, 12 Sep 2010 13:42:33 +0000 (UTC)
commit 499b0efd5beb40b4071272a86d48b84d0bca54e7
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Sun Sep 12 05:29:56 2010 +0200
Added a new string to help users work around some problems with copying encrypted video DVDs.
In some cases encryption keys cannot be retrieved for a video DVD and (among other things) setting region code helps.
libbrasero-burn/brasero-error.h | 3 ++-
plugins/dvdcss/burn-dvdcss.c | 12 ++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/libbrasero-burn/brasero-error.h b/libbrasero-burn/brasero-error.h
index 4937470..a2aa33c 100644
--- a/libbrasero-burn/brasero-error.h
+++ b/libbrasero-burn/brasero-error.h
@@ -80,7 +80,8 @@ typedef enum {
BRASERO_BURN_WARNING_CHECKSUM,
BRASERO_BURN_WARNING_INSERT_AFTER_COPY,
- BRASERO_BURN_ERROR_TMP_DIRECTORY
+ BRASERO_BURN_ERROR_TMP_DIRECTORY,
+ BRASERO_BURN_ERROR_ENCRYPTION_KEY
} BraseroBurnError;
/**
diff --git a/plugins/dvdcss/burn-dvdcss.c b/plugins/dvdcss/burn-dvdcss.c
index 8f796c8..032e443 100644
--- a/plugins/dvdcss/burn-dvdcss.c
+++ b/plugins/dvdcss/burn-dvdcss.c
@@ -240,6 +240,7 @@ typedef struct _BraseroScrambledSectorRange BraseroScrambledSectorRange;
static gboolean
brasero_dvdcss_create_scrambled_sectors_map (BraseroDvdcss *self,
+ BraseroDrive *drive,
GQueue *map,
dvdcss_handle *handle,
BraseroVolFile *parent,
@@ -289,14 +290,17 @@ brasero_dvdcss_create_scrambled_sectors_map (BraseroDvdcss *self,
g_set_error (error,
BRASERO_BURN_ERROR,
BRASERO_BURN_ERROR_GENERAL,
- _("Error while reading video DVD (%s)"),
- dvdcss_error (handle));
+ /* Translators: %s is the path to a drive. "regionset %s"
+ * should be left as is just like "DVDCSS_METHOD=title
+ * brasero --no-existing-session" */
+ _("Error while retrieving a key used for encryption. You may solve such a problem with one of the following methods: in a terminal either set the proper DVD region code for your CD/DVD player with the \"regionset %s\" command or run the \"DVDCSS_METHOD=title brasero --no-existing-session\" command"),
+ brasero_drive_get_device (drive));
return FALSE;
}
}
}
}
- else if (!brasero_dvdcss_create_scrambled_sectors_map (self, map, handle, file, error))
+ else if (!brasero_dvdcss_create_scrambled_sectors_map (self, drive, map, handle, file, error))
return FALSE;
}
@@ -376,7 +380,7 @@ brasero_dvdcss_write_image_thread (gpointer data)
/* look through the files to get the ranges of encrypted sectors
* and cache the CSS keys while at it. */
map = g_queue_new ();
- if (!brasero_dvdcss_create_scrambled_sectors_map (self, map, handle, files, &priv->error))
+ if (!brasero_dvdcss_create_scrambled_sectors_map (self, drive, map, handle, files, &priv->error))
goto end;
BRASERO_JOB_LOG (self, "DVD map created (keys retrieved)");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]