summaryrefslogtreecommitdiffstats
path: root/plugins/mock
diff options
context:
space:
mode:
authorTimo Dritschler <timo.dritschler@kit.edu>2015-03-02 15:57:23 +0100
committerTimo Dritschler <timo.dritschler@kit.edu>2015-03-09 11:12:26 +0100
commit453701eddba38052a466e91d614fd999b52bca4a (patch)
tree2b0c346ab845f1b47f8d18aad675411cedef4673 /plugins/mock
parent43a5d42eeaccb08b7703e01e326e397ed3cd4ac2 (diff)
downloaduca-453701eddba38052a466e91d614fd999b52bca4a.tar.gz
uca-453701eddba38052a466e91d614fd999b52bca4a.tar.bz2
uca-453701eddba38052a466e91d614fd999b52bca4a.tar.xz
uca-453701eddba38052a466e91d614fd999b52bca4a.zip
Added check for 'writable during acquisition' to all set_property calls
Diffstat (limited to 'plugins/mock')
-rw-r--r--plugins/mock/uca-mock-camera.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index eb41fcf..a406f93 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -293,27 +293,32 @@ uca_mock_camera_grab (UcaCamera *camera, gpointer data, GError **error)
static void
uca_mock_camera_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail(UCA_IS_MOCK_CAMERA(object));
- UcaMockCameraPrivate *priv = UCA_MOCK_CAMERA_GET_PRIVATE(object);
+ g_return_if_fail (UCA_IS_MOCK_CAMERA (object));
+ UcaMockCameraPrivate *priv = UCA_MOCK_CAMERA_GET_PRIVATE (object);
+
+ if (uca_camera_is_recording (UCA_CAMERA (object)) && !uca_camera_is_writable_during_acquisition (UCA_CAMERA (object), pspec->name)) {
+ g_warning ("Property '%s' cant be changed during acquisition", pspec->name);
+ return;
+ }
switch (property_id) {
case PROP_EXPOSURE_TIME:
priv->exposure_time = g_value_get_double (value);
break;
case PROP_ROI_X:
- priv->roi_x = g_value_get_uint(value);
+ priv->roi_x = g_value_get_uint (value);
break;
case PROP_ROI_Y:
- priv->roi_y = g_value_get_uint(value);
+ priv->roi_y = g_value_get_uint (value);
break;
case PROP_ROI_WIDTH:
- priv->roi_width = g_value_get_uint(value);
+ priv->roi_width = g_value_get_uint (value);
break;
case PROP_ROI_HEIGHT:
- priv->roi_height = g_value_get_uint(value);
+ priv->roi_height = g_value_get_uint (value);
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
return;
}
}