diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-10 10:56:54 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-10 10:56:54 +0200 |
| commit | 1ae9dcd4ae312d497f8aa2381efee1b49b727a90 (patch) | |
| tree | 685693acdb44cc51424b7b25877cd6a2d0d82fe6 /src/uca-camera.c | |
| parent | bf30a848ad7ac00218aab6589df7a19d868728cd (diff) | |
| parent | 859a6a6802e1891628af988a83a3e24b5b75c007 (diff) | |
| download | uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.gz uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.bz2 uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.xz uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.zip | |
Merge branch 'ipe-basler'
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/uca-camera.c')
| -rw-r--r-- | src/uca-camera.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c index 1584569..78adae3 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 @@ -375,6 +382,11 @@ static UcaCamera *uca_camera_new_from_type(const gchar *type, GError **error) return UCA_CAMERA(uca_pco_camera_new(error)); #endif +#ifdef HAVE_PYLON_CAMERA + if (!g_strcmp0(type, "pylon")) + return UCA_CAMERA(uca_pylon_camera_new(error)); +#endif + #ifdef HAVE_UFO_CAMERA if (!g_strcmp0(type, "ufo")) return UCA_CAMERA(uca_ufo_camera_new(error)); |