summaryrefslogtreecommitdiffstats
path: root/src/uca.c
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-10 16:30:09 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-10 16:30:09 +0100
commit423e180f3a55cd4b3350d0f50d71685f3052d145 (patch)
treea76ef30a6512facd2299e2f9c1f264db05c2a367 /src/uca.c
parentf0cb3317a0cf8333c03b0a45e3bb25c7490f85ef (diff)
downloaduca-423e180f3a55cd4b3350d0f50d71685f3052d145.tar.gz
uca-423e180f3a55cd4b3350d0f50d71685f3052d145.tar.bz2
uca-423e180f3a55cd4b3350d0f50d71685f3052d145.tar.xz
uca-423e180f3a55cd4b3350d0f50d71685f3052d145.zip
Add dummy camera with frame counter
Diffstat (limited to 'src/uca.c')
-rw-r--r--src/uca.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/uca.c b/src/uca.c
index 58125b3..35d2e4f 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -4,6 +4,7 @@
#include "uca.h"
#include "uca-cam.h"
#include "uca-grabber.h"
+#include "cameras/dummy.h"
#ifdef HAVE_ME4
#include "grabbers/me4.h"
@@ -98,13 +99,12 @@ struct uca_t *uca_init(void)
#ifdef HAVE_PH
uca_photron_init,
#endif
+ uca_dummy_init,
NULL
};
- int i = 0;
- struct uca_camera_t *current = NULL;
-
/* Probe each frame grabber that is configured */
+ int i = 0;
struct uca_grabber_t *grabber = NULL;
while (grabber_inits[i] != NULL) {
uca_grabber_init init = grabber_inits[i];
@@ -125,6 +125,7 @@ struct uca_t *uca_init(void)
/* Probe each camera that is configured */
i = 0;
+ struct uca_camera_t *current = NULL;
while (cam_inits[i] != NULL) {
struct uca_camera_t *cam = NULL;
uca_cam_init init = cam_inits[i];