summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-28 11:17:08 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-28 11:17:08 +0100
commitcdca4954a292dc53b67fa616bad94ad9c2f31e54 (patch)
tree7f7f30b69d0def78982aa7d4ed545e7581249797 /src
parentf200da9c7915521f77c6c23e825181da73db474d (diff)
downloadlibuca-cdca4954a292dc53b67fa616bad94ad9c2f31e54.tar.gz
libuca-cdca4954a292dc53b67fa616bad94ad9c2f31e54.tar.bz2
libuca-cdca4954a292dc53b67fa616bad94ad9c2f31e54.tar.xz
libuca-cdca4954a292dc53b67fa616bad94ad9c2f31e54.zip
Add preliminary "support" for Photron cameras
Diffstat (limited to 'src')
-rw-r--r--src/config.h.in1
-rw-r--r--src/uca.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/config.h.in b/src/config.h.in
index c556dc3..301b731 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -2,4 +2,5 @@
#cmakedefine HAVE_ME4_FRAMEGRABBER
#cmakedefine HAVE_PCO_EDGE
#cmakedefine HAVE_PHOTON_FOCUS
+#cmakedefine HAVE_PHOTRON_FASTCAM
#cmakedefine HAVE_IPE_CAMERA
diff --git a/src/uca.c b/src/uca.c
index 0e9e184..cf9d9ed 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -15,6 +15,10 @@
#include "cameras/uca_ipe.h"
#endif
+#ifdef HAVE_PHOTRON_FASTCAM
+#include "cameras/uca_photron.h"
+#endif
+
struct uca_t *uca_init()
{
@@ -31,6 +35,9 @@ struct uca_t *uca_init()
#ifdef HAVE_IPE_CAM
uca_ipe_init,
#endif
+#ifdef HAVE_PH
+ uca_photron_init,
+#endif
NULL };
int i = 0;