use new error signal and classification

Original commit message from CVS:
use new error signal and classification

3 files changed, 46 insertions, 64 deletions

diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index 58709e80..847c34b7 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -309,10 +309,9 @@ dxr3audiosink_open (Dxr3AudioSink *sink)
 
   sink->audio_fd = open (sink->audio_filename, O_WRONLY);
   if (sink->audio_fd < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                      g_strconcat ("Error opening device file \"",
-                                  sink->audio_filename, "\": ",
-                                  g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, OPEN_WRITE,
+                       (_("Could not open audio device \"%s\" for writing"), sink->audio_filename),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -322,10 +321,9 @@ dxr3audiosink_open (Dxr3AudioSink *sink)
 
   sink->control_fd = open (sink->control_filename, O_WRONLY);
   if (sink->control_fd < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error opening device file \"",
-                                    sink->control_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, OPEN_WRITE,
+                       (_("Could not open control device \"%s\" for writing"), sink->control_filename),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -357,10 +355,9 @@ dxr3audiosink_set_mode_pcm (Dxr3AudioSink *sink)
   tmp = oss_mode;
   if (ioctl (sink->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 ||
       tmp != oss_mode) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error configuring device mode for \"",
-                                    sink->audio_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, SETTINGS,
+                       (_("Could not configure audio device \"%s\""), sink->audio_filename),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -372,11 +369,9 @@ dxr3audiosink_set_mode_pcm (Dxr3AudioSink *sink)
   /* Set the sampling rate. */
   tmp = sink->rate;
   if (ioctl (sink->audio_fd, SNDCTL_DSP_SPEED, &tmp) < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error configuring device "
-                                    "sampling rate for \"",
-                                    sink->audio_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, SETTINGS,
+                       (_("Could not set audio device \"%s\" to %d Hz"), sink->audio_filename, sink->rate),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -411,11 +406,9 @@ dxr3audiosink_set_mode_ac3 (Dxr3AudioSink *sink)
   tmp = AC3_BYTE_RATE;
   if (ioctl (sink->audio_fd, SNDCTL_DSP_SPEED, &tmp) < 0 ||
       tmp != AC3_BYTE_RATE) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error configuring device "
-                                    "sampling rate for \"",
-                                    sink->audio_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, SETTINGS,
+                       (_("Could not set audio device \"%s\" to %d Hz"), sink->audio_filename, AC3_BYTE_RATE),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -441,18 +434,16 @@ dxr3audiosink_close (Dxr3AudioSink *sink)
   g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN));
 
   if (close (sink->audio_fd) != 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error closing file \"",
-                                    sink->audio_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, CLOSE,
+                       (_("Could not close audio device \"%s\""), sink->audio_filename),
+                        GST_ERROR_SYSTEM);
     return;
   }
 
   if (close (sink->control_fd) != 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error closing file \"",
-                                    sink->control_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, CLOSE,
+                       (_("Could not close control device \"%s\""), sink->audio_filename),
+                        GST_ERROR_SYSTEM);
     return;
   }
 
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index 0b1ba010..6ce1bf6b 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -280,10 +280,8 @@ dxr3spusink_open (Dxr3SpuSink *sink)
 
   sink->spu_fd = open (sink->spu_filename, O_WRONLY);
   if (sink->spu_fd < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error opening device file \"",
-                                    sink->spu_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, OPEN_WRITE,
+                       (_("Could not open spu device \"%s\" for writing"), sink->spu_filename),                         GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -293,10 +291,8 @@ dxr3spusink_open (Dxr3SpuSink *sink)
 
   sink->control_fd = open (sink->control_filename, O_WRONLY);
   if (sink->control_fd < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error opening device file \"",
-                                    sink->control_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, OPEN_WRITE,
+                       (_("Could not open control device \"%s\" for writing"), sink->control_filename),                         GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -312,19 +308,17 @@ dxr3spusink_close (Dxr3SpuSink *sink)
   g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN));
 
   if (close (sink->spu_fd) != 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error closing file \"",
-                                    sink->spu_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, CLOSE,
+                       (_("Could not close spu device \"%s\""), sink->spu_filename),
+                        GST_ERROR_SYSTEM);
     return;
   }
 
   if (close (sink->control_fd) != 0)
   {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error closing file \"",
-                                    sink->control_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, CLOSE,
+                       (_("Could not close control device \"%s\""), sink->audio_filename),
+                        GST_ERROR_SYSTEM);
     return;
   }
 
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index 9c4605e5..75a2d1c3 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -276,10 +276,9 @@ dxr3videosink_open (Dxr3VideoSink *sink)
 
   sink->video_fd = open (sink->video_filename, O_WRONLY);
   if (sink->video_fd < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error opening device file \"",
-                                    sink->video_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, OPEN_WRITE,
+                       (_("Could not open video device \"%s\" for writing"), sink->video_filename),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -289,10 +288,9 @@ dxr3videosink_open (Dxr3VideoSink *sink)
 
   sink->control_fd = open (sink->control_filename, O_WRONLY);
   if (sink->control_fd < 0) {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error opening device file \"",
-                                    sink->control_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, OPEN_WRITE,
+                       (_("Could not open control device \"%s\" for writing"), sink->control_filename),
+                        GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -309,19 +307,17 @@ dxr3videosink_close (Dxr3VideoSink *sink)
 
   if (close (sink->video_fd) != 0)
   {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error closing file \"",
-                                    sink->video_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, CLOSE,
+                       (_("Could not close video device \"%s\""), sink->video_filename),
+                        GST_ERROR_SYSTEM);
     return;
   }
 
   if (close (sink->control_fd) != 0)
   {
-    gst_element_error (GST_ELEMENT (sink),
-                       g_strconcat ("Error closing file \"",
-                                    sink->control_filename, "\": ",
-                                    g_strerror (errno), NULL));
+    gst_element_error (sink, RESOURCE, CLOSE,
+                       (_("Could not close control device \"%s\""), sink->audio_filename),
+                        GST_ERROR_SYSTEM);
     return;
   }
 
@@ -467,8 +463,9 @@ dxr3videosink_write_data (Dxr3VideoSink *sink, guint cut)
     while (size > 0) {
       written = write (sink->video_fd, data, size);
       if (written < 0) {
-        gst_element_error (GST_ELEMENT (sink), "Writing to %s: %s",
-                           sink->video_filename, strerror (errno));
+        gst_element_error (sink, RESOURCE, WRITE,
+                           (_("Could not write to device %s"), sink->video_filename),
+                           GST_ERROR_SYSTEM);
         break;
       }
       size = size - written;