summaryrefslogtreecommitdiffstats
path: root/sys/qcam
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-04-29 17:37:01 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-04-29 17:37:01 +0000
commita5a1ec4610e4d267e0f71afc38047dd6070143ea (patch)
treecc4f935a1e296c192dd353584ddbb867c9a0aff3 /sys/qcam
parentee9e8618ff3f0685e85e343863b234299f6bc838 (diff)
downloadgst-plugins-bad-a5a1ec4610e4d267e0f71afc38047dd6070143ea.tar.gz
gst-plugins-bad-a5a1ec4610e4d267e0f71afc38047dd6070143ea.tar.bz2
gst-plugins-bad-a5a1ec4610e4d267e0f71afc38047dd6070143ea.zip
ext/jpeg/: move format setting to inner loop
Original commit message from CVS: * ext/jpeg/gstjpegdec.c: (gst_jpegdec_get_type): * ext/jpeg/gstjpegenc.c: (gst_jpegenc_get_type), (gst_jpegenc_getcaps): move format setting to inner loop * gst/ffmpegcolorspace/gstffmpegcolorspace.c: (gst_ffmpegcolorspace_getcaps): use GST_PAD_CAPS if available so that we use already negotiated caps * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header), (qtdemux_parse_moov), (qtdemux_parse): extra debugging * sys/qcam/qcam-Linux.c: (qc_lock_wait), (qc_unlock): * sys/qcam/qcam-os.c: (qc_lock_wait), (qc_unlock): move hardcoded path to DEFINE
Diffstat (limited to 'sys/qcam')
-rw-r--r--sys/qcam/qcam-Linux.c8
-rw-r--r--sys/qcam/qcam-os.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/qcam/qcam-Linux.c b/sys/qcam/qcam-Linux.c
index 41f7046c..07e69170 100644
--- a/sys/qcam/qcam-Linux.c
+++ b/sys/qcam/qcam-Linux.c
@@ -3,6 +3,8 @@
/* Version 0.1, January 2, 1996 */
/* Version 0.5, August 24, 1996 */
+#define LOCALSTATEDIR ""
+//#define LOCALSTATEDIR "/var/run"
/******************************************************************
@@ -118,7 +120,7 @@ qc_lock_wait (struct qcam *q, int wait)
if (-1 == q->fd) { /* we've yet to open the lock file */
static char lockfile[128];
- sprintf (lockfile, "/var/run/LOCK.qcam.0x%x", q->port);
+ sprintf (lockfile, LOCALSTATEDIR "/LOCK.qcam.0x%x", q->port);
if (-1 == (q->fd = open (lockfile, O_WRONLY | O_CREAT, 0666))) {
perror ("open");
return 1;
@@ -160,7 +162,7 @@ qc_lock_wait (struct qcam *q, int wait)
char lockfile[128], tmp[128];
struct stat statbuf;
- sprintf (lockfile, "/var/run/LOCK.qcam.0x%x", q->port);
+ sprintf (lockfile, LOCALSTATEDIR "/LOCK.qcam.0x%x", q->port);
sprintf (tmp, "%s-%d", lockfile, getpid ());
if ((creat (tmp, 0) == -1) ||
@@ -219,7 +221,7 @@ qc_unlock (struct qcam *q)
#else
char lockfile[128];
- sprintf (lockfile, "/var/run/LOCK.qcam.0x%x", q->port);
+ sprintf (lockfile, LOCALSTATEDIR "/LOCK.qcam.0x%x", q->port);
unlink (lockfile); /* What would I do with an error? */
#endif
diff --git a/sys/qcam/qcam-os.c b/sys/qcam/qcam-os.c
index 41f7046c..5a8f1259 100644
--- a/sys/qcam/qcam-os.c
+++ b/sys/qcam/qcam-os.c
@@ -3,6 +3,8 @@
/* Version 0.1, January 2, 1996 */
/* Version 0.5, August 24, 1996 */
+#define LOCALSTATEDIR ""
+//#define LOCALSTATEDIR "/var/run"
/******************************************************************
@@ -118,7 +120,7 @@ qc_lock_wait (struct qcam *q, int wait)
if (-1 == q->fd) { /* we've yet to open the lock file */
static char lockfile[128];
- sprintf (lockfile, "/var/run/LOCK.qcam.0x%x", q->port);
+ sprintf (lockfile, LOCALSTATEDIR "LOCK.qcam.0x%x", q->port);
if (-1 == (q->fd = open (lockfile, O_WRONLY | O_CREAT, 0666))) {
perror ("open");
return 1;
@@ -160,7 +162,7 @@ qc_lock_wait (struct qcam *q, int wait)
char lockfile[128], tmp[128];
struct stat statbuf;
- sprintf (lockfile, "/var/run/LOCK.qcam.0x%x", q->port);
+ sprintf (lockfile, LOCALSTATEDIR "/LOCK.qcam.0x%x", q->port);
sprintf (tmp, "%s-%d", lockfile, getpid ());
if ((creat (tmp, 0) == -1) ||
@@ -219,7 +221,7 @@ qc_unlock (struct qcam *q)
#else
char lockfile[128];
- sprintf (lockfile, "/var/run/LOCK.qcam.0x%x", q->port);
+ sprintf (lockfile, LOCALSTATEDIR "/LOCK.qcam.0x%x", q->port);
unlink (lockfile); /* What would I do with an error? */
#endif