diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-09-10 11:09:39 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2014-09-10 11:09:39 +0200 |
| commit | 499a4716e19b115d68c39385a87f9bbe4b44bb4e (patch) | |
| tree | 7d759e2332d3df0f9d3c8d0392fea28498269b5b /plugins/mock | |
| parent | d4a7a6b344d89ba36963cfca60db5586b4597855 (diff) | |
| download | uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.tar.gz uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.tar.bz2 uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.tar.xz uca-499a4716e19b115d68c39385a87f9bbe4b44bb4e.zip | |
Fix #54: remove sensor-max-frame-rate
Diffstat (limited to 'plugins/mock')
| -rw-r--r-- | plugins/mock/uca-mock-camera.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c index 4ae4077..e4fb872 100644 --- a/plugins/mock/uca-mock-camera.c +++ b/plugins/mock/uca-mock-camera.c @@ -44,7 +44,6 @@ static const gint mock_overrideables[] = { PROP_ROI_Y, PROP_ROI_WIDTH, PROP_ROI_HEIGHT, - PROP_SENSOR_MAX_FRAME_RATE, PROP_HAS_STREAMING, PROP_HAS_CAMRAM_RECORDING, 0, @@ -293,20 +292,7 @@ uca_mock_camera_set_property (GObject *object, guint property_id, const GValue * switch (property_id) { case PROP_EXPOSURE_TIME: - { - gdouble exp_t; - exp_t = g_value_get_double(value); - - gfloat max_framerate; - g_object_get (object, "sensor-max-frame-rate", &max_framerate, NULL); - - gdouble min_exposure_time = 1. / max_framerate; - - if (exp_t < min_exposure_time) - exp_t = min_exposure_time; - - priv->exposure_time = exp_t; - } + priv->exposure_time = g_value_get_double (value); break; case PROP_ROI_X: priv->roi_x = g_value_get_uint(value); @@ -359,9 +345,6 @@ uca_mock_camera_get_property(GObject *object, guint property_id, GValue *value, case PROP_ROI_HEIGHT: g_value_set_uint(value, priv->roi_height); break; - case PROP_SENSOR_MAX_FRAME_RATE: - g_value_set_float(value, priv->max_frame_rate); - break; case PROP_HAS_STREAMING: g_value_set_boolean(value, TRUE); break; |