diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-12-12 15:52:35 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-12-12 15:52:35 +0100 |
| commit | 1c358be868c74bb01efd3819e6ef65cde7fe7017 (patch) | |
| tree | 4d237dc45da67783207eb801edcacba3aa394bd5 | |
| parent | 5e0222e521c43ccc7074856cf43ecc8d1bcaaec8 (diff) | |
| download | libuca-1c358be868c74bb01efd3819e6ef65cde7fe7017.tar.gz libuca-1c358be868c74bb01efd3819e6ef65cde7fe7017.tar.bz2 libuca-1c358be868c74bb01efd3819e6ef65cde7fe7017.tar.xz libuca-1c358be868c74bb01efd3819e6ef65cde7fe7017.zip | |
Fix #20: don't query props if pco is recording
| -rw-r--r-- | plugins/pco/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/pco/uca-pco-camera.c | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/plugins/pco/CMakeLists.txt b/plugins/pco/CMakeLists.txt index 25f1ca8..1ab4c50 100644 --- a/plugins/pco/CMakeLists.txt +++ b/plugins/pco/CMakeLists.txt @@ -7,9 +7,9 @@ find_package(ClSerMe4) if (PCO_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND) set(UCA_CAMERA_NAME "pco") - set(PLUGIN_VERSION "1.1.0") + set(PLUGIN_VERSION "1.2.0") set(PLUGIN_REVISION "1") - set(PLUGIN_REQUIRES "libuca >= 1.1.0") + set(PLUGIN_REQUIRES "libuca >= 1.5.0") set(PLUGIN_SUMMARY "libpco plugin for libuca") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in diff --git a/plugins/pco/uca-pco-camera.c b/plugins/pco/uca-pco-camera.c index bae7b53..6e53279 100644 --- a/plugins/pco/uca-pco-camera.c +++ b/plugins/pco/uca-pco-camera.c @@ -819,9 +819,19 @@ uca_pco_camera_set_property(GObject *object, guint property_id, const GValue *va static void uca_pco_camera_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(object); + UcaPcoCameraPrivate *priv; guint err = PCO_NOERROR; + priv = UCA_PCO_CAMERA_GET_PRIVATE(object); + + /* Should fix #20 */ + if (uca_camera_is_recording (UCA_CAMERA (object))) { + if (priv->description->type == CAMERATYPE_PCO_EDGE || + priv->description->type == CAMERATYPE_PCO4000) { + return; + } + } + switch (property_id) { case PROP_SENSOR_EXTENDED: { |