[Goodies-commits] r5989 - xfburn/trunk/xfburn

[David Mohr]

Author: squisher
Date: 2008-11-06 05:51:39 +0000 (Thu, 06 Nov 2008)
New Revision: 5989

Modified:
   xfburn/trunk/xfburn/xfburn-disc-usage.c
   xfburn/trunk/xfburn/xfburn-transcoder-basic.c
   xfburn/trunk/xfburn/xfburn-transcoder-gst.c
Log:
Improving error messages

Modified: xfburn/trunk/xfburn/xfburn-disc-usage.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-disc-usage.c	2008-11-06 05:05:40 UTC (rev 5988)
+++ xfburn/trunk/xfburn/xfburn-disc-usage.c	2008-11-06 05:51:39 UTC (rev 5989)
@@ -182,7 +182,7 @@
   if (du->size <= class->labels[gtk_combo_box_get_active (GTK_COMBO_BOX (du->combo))].size) {
     g_signal_emit (G_OBJECT (du), signals[BEGIN_BURN], 0);
   } else {
-    xfce_err (_("You are trying to burn more data than the disc can contain !"));
+    xfce_err (_("You are trying to burn more onto the disc than it can hold."));
   }
 }
 

Modified: xfburn/trunk/xfburn/xfburn-transcoder-basic.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-basic.c	2008-11-06 05:05:40 UTC (rev 5988)
+++ xfburn/trunk/xfburn/xfburn-transcoder-basic.c	2008-11-06 05:51:39 UTC (rev 5989)
@@ -72,6 +72,10 @@
   gboolean dummy;
 } XfburnTranscoderBasicPrivate;
 
+/* globals */
+
+static const gchar *errormsg_libburn_setup = "An error occurred while setting the burning backend up";
+
 /*********************/
 /* class declaration */
 /*********************/
@@ -313,16 +317,19 @@
 
   atrack->src = burn_fd_source_new (atrack->fd, -1 , 0);
   if (atrack->src == NULL) {
+    g_warning ("Could not create burn_source from %s!", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
-                 _("Could not create burn_source from %s!"), atrack->inputfile);
+                 _(errormsg_libburn_setup));
     return NULL;
   }
 
   track = burn_track_create ();
   
   if (burn_track_set_source (track, atrack->src) != BURN_SOURCE_OK) {
+    g_warning ("Could not add source to track %s!", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
-                 _("Could not add source to track %s!"), atrack->inputfile);
+                 _(errormsg_libburn_setup));
+                 
     return NULL;
   }
 

Modified: xfburn/trunk/xfburn/xfburn-transcoder-gst.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-gst.c	2008-11-06 05:05:40 UTC (rev 5988)
+++ xfburn/trunk/xfburn/xfburn-transcoder-gst.c	2008-11-06 05:51:39 UTC (rev 5989)
@@ -55,6 +55,7 @@
    Set DEBUG_GST > 1 to also get a lot of gst state change messages */
 #define DEBUG_GST 1
 
+
 /** Prototypes **/
 /* class initialization */
 static void xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass);
@@ -141,6 +142,9 @@
 static guint64 total_size = 0;
 #endif
 
+static const gchar *errormsg_gst_setup = "An error occurred setting gstreamer up for transcoding";
+static const gchar *errormsg_libburn_setup = "An error occurred while setting the burning backend up";
+
 /*********************/
 /* class declaration */
 /*********************/
@@ -271,15 +275,17 @@
   //DBG ("\npipeline = %p\nsource = %p\ndecoder = %p\nconv = %p\nsink = %p", pipeline, source, decoder, conv, sink);
 
   if (!pipeline || !source || !decoder || !conv || !sink) {
+    g_warning ("A pipeline element could not be created");
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_CREATION,
-                 _("A pipeline element could not be created"));
+                 _(errormsg_gst_setup));
     return;
   }
 
 #ifdef DEBUG_GST
   if (!id) {
+    g_warning ("The debug identity element could not be created");
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_CREATION,
-                 _("The debug identity element could not be created"));
+                 _(errormsg_gst_setup));
     return;
   }
 #endif
@@ -313,8 +319,9 @@
 #else
   if (!gst_element_link_filtered (conv, sink, caps)) {
 #endif
+    g_warning ("Could not setup filtered gstreamer link");
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_CREATION,
-                 _("Could not setup filtered gstreamer link"));
+                 _(errormsg_gst_setup));
     gst_caps_unref (caps);
     return;
   }
@@ -676,7 +683,7 @@
   priv->state = XFBURN_TRANSCODER_GST_STATE_IDENTIFYING;
   g_object_set (G_OBJECT (priv->source), "location", fn, NULL);
   if (gst_element_set_state (priv->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
-    g_warning ("Supposedly failed to change gstreamer state, ignoring it.");
+    g_message ("Supposedly failed to change gstreamer state, ignoring it usually it does it anyways.");
     /*
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_GST_STATE,
                  _("Failed to change state!"));
@@ -753,8 +760,9 @@
 
   atrack->src = burn_fd_source_new (atrack->fd, -1 , gtrack->size);
   if (atrack->src == NULL) {
+    g_warning ("Could not create burn_source from %s.", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
-                 _("Could not create burn_source from %s!"), atrack->inputfile);
+                 _(errormsg_libburn_setup));
     XFBURN_AUDIO_TRACK_DELETE_DATA (atrack);
     atrack->fd = -1;
     close (pipe_fd[0]);  close (pipe_fd[1]);
@@ -771,8 +779,9 @@
   track = burn_track_create ();
   
   if (burn_track_set_source (track, atrack->src) != BURN_SOURCE_OK) {
+    g_warning ("Could not add source to track %s.", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
-                 _("Could not add source to track %s!"), atrack->inputfile);
+                 _(errormsg_libburn_setup));
     XFBURN_AUDIO_TRACK_DELETE_DATA (atrack);
     burn_source_free (atrack->src);
     atrack->fd = -1;
@@ -849,6 +858,7 @@
 #endif
 
   if (gst_element_set_state (priv->pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
+    g_warning ("Failed to change songs.");
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_GST_STATE,
                  _("Failed to change songs while transcoding"));
     return FALSE;