summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tpm@src.gnome.org>2007-01-10 15:51:32 +0000
committerTim-Philipp Müller <tpm@src.gnome.org>2007-01-10 15:51:32 +0000
commita7034228f0192a50727154e2c97c667804ee4fad (patch)
treea1237d03c406e6d0d269738f09631272f24c0f73
parentfe5644c36c9ce5b821da80752585a55e64d15fb5 (diff)
downloadtotem-a7034228f0192a50727154e2c97c667804ee4fad.tar.gz
Use BVW_ERROR_AUDIO_PLUGIN error for audio plugins, not VIDEO.
* src/backend/bacon-video-widget-gst-0.10.c: (bacon_video_widget_new): Use BVW_ERROR_AUDIO_PLUGIN error for audio plugins, not VIDEO. svn path=/branches/gnome-2-16/; revision=3853
-rw-r--r--ChangeLog6
-rw-r--r--src/backend/bacon-video-widget-gst-0.10.c20
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d840004fc..226b44889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-10 Tim-Philipp Müller <tim at centricular dot net>
+
+ * src/backend/bacon-video-widget-gst-0.10.c:
+ (bacon_video_widget_new):
+ Use BVW_ERROR_AUDIO_PLUGIN error for audio plugins, not VIDEO.
+
2007-01-09 Bastien Nocera <hadess@hadess.net>
* src/plparse/totem-disc.c: (canonicalize_filename),
diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index f2557a481..90e227963 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -4422,20 +4422,20 @@ bacon_video_widget_new (int width, int height,
audio_sink = gst_element_factory_make ("fakesink", "audio-sink");
if (audio_sink == NULL) {
if (err && !*err) {
- g_warning ("Should have gotten an error message, please file a bug.");
- g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
- _("Failed to open audio output. You may not have "
- "permission to open the sound device, or the sound "
- "server may not be running. "
- "Please select another audio output in the Multimedia "
- "Systems Selector."));
- }
- goto sink_error;
+ g_warning ("Should have gotten an error message, please file a bug.");
+ g_set_error (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
+ _("Failed to open audio output. You may not have "
+ "permission to open the sound device, or the sound "
+ "server may not be running. "
+ "Please select another audio output in the Multimedia "
+ "Systems Selector."));
+ }
+ goto sink_error;
}
bvw->priv->uses_fakesink = TRUE;
}
} else {
- g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
+ g_set_error (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
_("Could not find the audio output. "
"You may need to install additional GStreamer plugins, or "
"select another audio output in the Multimedia Systems "