From b5c90a21f289bb67c4806a8563d96fc674bba583 Mon Sep 17 00:00:00 2001
From: Volker Kaiser <volker.kaiser@softwareschneiderei.de>
Date: Tue, 24 Apr 2012 08:53:21 +0200
Subject: pylon (basler) camera added

---
 src/uca-camera.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/uca-camera.c')

diff --git a/src/uca-camera.c b/src/uca-camera.c
index 1584569..602a3c4 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -24,6 +24,10 @@
 #include "cameras/uca-pco-camera.h"
 #endif
 
+#ifdef HAVE_PYLON_CAMERA
+#include "cameras/uca-pylon-camera.h"
+#endif
+
 #ifdef HAVE_MOCK_CAMERA
 #include "cameras/uca-mock-camera.h"
 #endif
@@ -65,6 +69,9 @@ static gchar *uca_camera_types[] = {
 #ifdef HAVE_PCO_CL
         "pco",
 #endif
+#ifdef HAVE_PYLON_CAMERA
+        "pylon",
+#endif
 #ifdef HAVE_MOCK_CAMERA
         "mock",
 #endif
@@ -418,6 +425,10 @@ UcaCamera *uca_camera_new(const gchar *type, GError **error)
 
     camera = uca_camera_new_from_type(type, &tmp_error);
 
+#ifdef HAVE_PYLON_CAMERA
+    if (!g_strcmp0(type, "pylon"))
+        camera = UCA_CAMERA(uca_pylon_camera_new(&tmp_error));
+#endif
     if (tmp_error != NULL) {
         g_propagate_error(error, tmp_error);
         return NULL;
-- 
cgit v1.2.3