diff options
| author | Volker Kaiser <volker.kaiser@softwareschneiderei.de> | 2012-04-24 08:53:21 +0200 |
|---|---|---|
| committer | Volker Kaiser <volker.kaiser@softwareschneiderei.de> | 2012-07-26 15:36:43 +0200 |
| commit | b5c90a21f289bb67c4806a8563d96fc674bba583 (patch) | |
| tree | 604d4f0ad4ac6e6c8ebec639995ce02f1a15f4e6 /src/uca-camera.c | |
| parent | 642a047ce60c9e071b9815d11ea9a81761598c9c (diff) | |
| download | uca-b5c90a21f289bb67c4806a8563d96fc674bba583.tar.gz uca-b5c90a21f289bb67c4806a8563d96fc674bba583.tar.bz2 uca-b5c90a21f289bb67c4806a8563d96fc674bba583.tar.xz uca-b5c90a21f289bb67c4806a8563d96fc674bba583.zip | |
pylon (basler) camera added
Diffstat (limited to 'src/uca-camera.c')
| -rw-r--r-- | src/uca-camera.c | 11 |
1 files changed, 11 insertions, 0 deletions
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; |