diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-04-19 17:01:35 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-04-19 17:02:12 +0200 |
| commit | ca22c863746eababadedac5a25f47b1ae5780d20 (patch) | |
| tree | d8ec15c38a104a1d09755c8517a75087b825fee2 /src/uca-camera.c | |
| parent | 8abab6618860f9d8688a4653de258c8673bfc662 (diff) | |
| download | libuca-ca22c863746eababadedac5a25f47b1ae5780d20.tar.gz libuca-ca22c863746eababadedac5a25f47b1ae5780d20.tar.bz2 libuca-ca22c863746eababadedac5a25f47b1ae5780d20.tar.xz libuca-ca22c863746eababadedac5a25f47b1ae5780d20.zip | |
Add Photon Focus
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 4ae4610..67951cb 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -27,6 +27,10 @@ #include "cameras/uca-mock-camera.h" #endif +#ifdef HAVE_PHOTON_FOCUS +#include "cameras/uca-pf-camera.h" +#endif + #define UCA_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_CAMERA, UcaCameraPrivate)) G_DEFINE_TYPE(UcaCamera, uca_camera, G_TYPE_OBJECT) @@ -54,6 +58,9 @@ static gchar *uca_camera_types[] = { #ifdef HAVE_UFO_CAMERA "ufo", #endif +#ifdef HAVE_PHOTON_FOCUS + "pf", +#endif NULL }; @@ -352,6 +359,11 @@ UcaCamera *uca_camera_new(const gchar *type, GError **error) camera = UCA_CAMERA(uca_pco_camera_new(&tmp_error)); #endif +#ifdef HAVE_PHOTON_FOCUS + if (!g_strcmp0(type, "pf")) + camera = UCA_CAMERA(uca_pf_camera_new(&tmp_error)); +#endif + if (tmp_error != NULL) { g_propagate_error(error, tmp_error); return NULL; |