diff options
| author | Volker Kaiser <volker.kaiser@softwareschneiderei.de> | 2012-07-26 15:36:02 +0200 |
|---|---|---|
| committer | Volker Kaiser <volker.kaiser@softwareschneiderei.de> | 2012-07-26 15:36:43 +0200 |
| commit | 310c98755e0c8fe1d95d4e4e43b7d08c70d06353 (patch) | |
| tree | f8729a48289445cdc632f4bb86bb53f4e7503ff4 /src | |
| parent | c16b7cccb72374be1ad6aed2310c137dc4ed4e0c (diff) | |
| download | uca-310c98755e0c8fe1d95d4e4e43b7d08c70d06353.tar.gz uca-310c98755e0c8fe1d95d4e4e43b7d08c70d06353.tar.bz2 uca-310c98755e0c8fe1d95d4e4e43b7d08c70d06353.tar.xz uca-310c98755e0c8fe1d95d4e4e43b7d08c70d06353.zip | |
adjusted pylon additions
Diffstat (limited to 'src')
| -rw-r--r-- | src/uca-camera.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c index 602a3c4..78adae3 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -382,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)); @@ -425,10 +430,6 @@ 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; |