summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorEdward Hervey <edward@centricular.com>2016-12-12 16:19:13 +0100
committerEdward Hervey <bilboed@bilboed.com>2016-12-12 16:19:13 +0100
commit6b73bf38d1ee2869d94801d6cd601f83d05951de (patch)
tree226b49cd8b83cb231d76bc9cbbd8327969375eb4 /plugins
parentce11ddeb0c3be4ce51a0033c59baefb12f368cdb (diff)
filesrc: Set GError in another error case
When changing the location while open, properly set the GError regarding the failure.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/elements/gstfilesrc.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index 42dda4cb4..15dd5a96b 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -236,7 +236,8 @@ gst_file_src_finalize (GObject * object)
}
static gboolean
-gst_file_src_set_location (GstFileSrc * src, const gchar * location)
+gst_file_src_set_location (GstFileSrc * src, const gchar * location,
+ GError ** err)
{
GstState state;
@@ -272,6 +273,10 @@ wrong_state:
{
g_warning ("Changing the `location' property on filesrc when a file is "
"open is not supported.");
+ if (err)
+ g_set_error (err, GST_URI_ERROR, GST_URI_ERROR_BAD_STATE,
+ "Changing the `location' property on filesrc when a file is "
+ "open is not supported.");
GST_OBJECT_UNLOCK (src);
return FALSE;
}
@@ -289,7 +294,7 @@ gst_file_src_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_LOCATION:
- gst_file_src_set_location (src, g_value_get_string (value));
+ gst_file_src_set_location (src, g_value_get_string (value), NULL);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -621,7 +626,7 @@ gst_file_src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
/* Special case for "file://" as this is used by some applications
* to test with gst_element_make_from_uri if there's an element
* that supports the URI protocol. */
- gst_file_src_set_location (src, NULL);
+ gst_file_src_set_location (src, NULL, NULL);
return TRUE;
}
@@ -650,7 +655,7 @@ gst_file_src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
memmove (location, location + 1, strlen (location + 1) + 1);
#endif
- ret = gst_file_src_set_location (src, location);
+ ret = gst_file_src_set_location (src, location, err);
beach:
if (location)