mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: The dc1394 plugin seems to use API that was removed or changed before the final 2.0.0 release, so only ...

Browse source 
Original commit message from CVS:
* configure.ac:
The dc1394 plugin seems to use API that was removed or changed
before the final 2.0.0 release, so only build it if 2.0.0-rc5
is available. Someone needs to port it to the final API.
* ext/dc1394/gstdc1394.c: (gst_dc1394_change_camera_transmission):
Include string.h for memcpy and use g_usleep instead of usleep.
This commit is contained in:
Tim-Philipp Müller 2008-02-07 12:05:44 +00:00
parent b11181550e
commit 120a00c2e7
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-02-07 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
The dc1394 plugin seems to use API that was removed or changed
before the final 2.0.0 release, so only build it if 2.0.0-rc5
is available. Someone needs to port it to the final API.
* ext/dc1394/gstdc1394.c: (gst_dc1394_change_camera_transmission):
Include string.h for memcpy and use g_usleep instead of usleep.
2008-02-07 Sebastian Dröge <slomo@circular-chaos.org> 2008-02-07 Sebastian Dröge <slomo@circular-chaos.org>
* gst/filter/gstlpwsinc.c: * gst/filter/gstlpwsinc.c:

2
configure.ac
View file

@ -377,7 +377,7 @@ AG_GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
dnl *** dc1394 *** dnl *** dc1394 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DC1394, true) translit(dnm, m, l) AM_CONDITIONAL(USE_DC1394, true)
AG_GST_CHECK_FEATURE(DC1394, [libdc1394], dc1394, [ AG_GST_CHECK_FEATURE(DC1394, [libdc1394], dc1394, [
PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.0-rc5, HAVE_DC1394="yes", [ PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 == 2.0.0-rc5, HAVE_DC1394="yes", [
HAVE_DC1394="no" HAVE_DC1394="no"
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
]) ])

3
ext/dc1394/gstdc1394.c
View file

@ -42,6 +42,7 @@
#include "gstdc1394.h" #include "gstdc1394.h"
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <string.h>
GST_DEBUG_CATEGORY (dc1394_debug); GST_DEBUG_CATEGORY (dc1394_debug);
#define GST_CAT_DEFAULT dc1394_debug #define GST_CAT_DEFAULT dc1394_debug
@ -1175,7 +1176,7 @@ gst_dc1394_change_camera_transmission (GstDc1394 * src, gboolean on)
i = 0; i = 0;
while (status == DC1394_OFF && i++ < 5) { while (status == DC1394_OFF && i++ < 5) {
usleep (50000); g_usleep (50000);
if (dc1394_video_get_transmission (src->camera, if (dc1394_video_get_transmission (src->camera,
&status) != DC1394_SUCCESS) { &status) != DC1394_SUCCESS) {
if (status == DC1394_OFF) { if (status == DC1394_OFF) {