From 3d037dbe86665b59c6bb5d71f3d58558a5848d38 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>
Date: Wed, 16 Mar 2011 09:25:02 +0100
Subject: Add soft MJSON dependency to load configuration/calibration data

---
 src/uca.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/uca.c')

diff --git a/src/uca.c b/src/uca.c
index cf6e5ec..0f02ce1 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -6,6 +6,10 @@
 #include "uca-cam.h"
 #include "uca-grabber.h"
 
+#ifdef HAVE_MJSON
+#include "json.h"
+#endif
+
 #ifdef HAVE_DUMMY_CAMERA
 #include "cameras/dummy.h"
 #endif
@@ -86,7 +90,7 @@ static struct uca_property_t property_map[UCA_PROP_LAST+1] = {
     { NULL, 0, 0, 0 }
 };
 
-struct uca_t *uca_init(void)
+struct uca_t *uca_init(const char *config_filename)
 {
     struct uca_t *uca = (struct uca_t *) malloc(sizeof(struct uca_t));
     uca->cameras = NULL;
-- 
cgit v1.2.3