summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-01-28 16:35:47 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-01-28 16:35:47 +0000
commited8f44a90ef09b908c804fed55c60bd6fee20f1e (patch)
treea6857a8a4f5ae55d6a8449155a1c1da4e30b25e6
parenteed2e762b8fc1afb84942ce3259de42d4655c670 (diff)
sys/v4l/v4l_calls.c: check for and throw RESOURCE_BUSY
Original commit message from CVS: * sys/v4l/v4l_calls.c: (gst_v4l_open): check for and throw RESOURCE_BUSY
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l/v4l_calls.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f3c3bb0..e5b21c3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-28 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * sys/v4l/v4l_calls.c: (gst_v4l_open):
+ check for and throw RESOURCE_BUSY
+
2006-01-27 David Schleef <ds@schleef.org>
* gst/videoscale/vs_scanline.c: Oops, *that's* why I never
diff --git a/sys/v4l/v4l_calls.c b/sys/v4l/v4l_calls.c
index 0f92c4ee..285ac26e 100644
--- a/sys/v4l/v4l_calls.c
+++ b/sys/v4l/v4l_calls.c
@@ -168,6 +168,12 @@ gst_v4l_open (GstV4lElement * v4lelement)
(_("Device \"%s\" does not exist."), v4lelement->videodev), (NULL));
return FALSE;
}
+ if (errno == EBUSY) {
+ GST_ELEMENT_ERROR (v4lelement, RESOURCE, BUSY,
+ (_("Device \"%s\" is already being used."), v4lelement->videodev),
+ (NULL));
+ return FALSE;
+ }
GST_ELEMENT_ERROR (v4lelement, RESOURCE, OPEN_READ_WRITE,
(_("Could not open device \"%s\" for reading and writing."),
v4lelement->videodev), GST_ERROR_SYSTEM);