Fix #69: revert back to fixed mock camera settings

The combination of CONSTRUCT_ONLY and READWRITE causes a) unnecessary warnings
and b) confuses the TANGO server down below (see SCHNEIDE-661). Since adapting
the mock camera size and bitdepth at run-time is not a high-priority feature, we
reverted that change. In the future and if still required this should be solved
through either compile-time defines or an environment variable.

2 files changed, 13 insertions, 26 deletions

diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index c4e2f75..badc042 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -371,15 +371,6 @@ uca_mock_camera_set_property (GObject *object, guint property_id, const GValue *
     }
 
     switch (property_id) {
-        case PROP_SENSOR_WIDTH:
-            priv->width = g_value_get_uint (value);
-            break;
-        case PROP_SENSOR_HEIGHT:
-            priv->height = g_value_get_uint (value);
-            break;
-        case PROP_SENSOR_BITDEPTH:
-            priv->bits = g_value_get_uint (value);
-            break;
         case PROP_EXPOSURE_TIME:
             priv->exposure_time = g_value_get_double (value);
             break;
@@ -477,26 +468,22 @@ ufo_mock_camera_initable_init (GInitable *initable,
                                GCancellable *cancellable,
                                GError **error)
 {
-    g_return_val_if_fail (UCA_IS_MOCK_CAMERA (initable), FALSE);
-    UcaMockCameraPrivate *priv = UCA_MOCK_CAMERA_GET_PRIVATE (UCA_MOCK_CAMERA (initable));
+    UcaMockCameraPrivate *priv;
+    gdouble step_size;
 
-    g_object_get (G_OBJECT (initable),
-                "sensor-width", &priv->width,
-                "sensor-height", &priv->height,
-                "sensor-bitdepth", &priv->bits,
-                NULL);
+    g_return_val_if_fail (UCA_IS_MOCK_CAMERA (initable), FALSE);
+    priv = UCA_MOCK_CAMERA_GET_PRIVATE (UCA_MOCK_CAMERA (initable));
 
-    priv->roi_width = priv->width;
-    priv->roi_height = priv->height;
     priv->bytes = ceil (priv->bits / 8.);
-
     priv->max_val = 0;
+
     for (guint i = 0; i < priv->bits; i++) {
         priv->max_val |= 1 << i;
     }
 
     priv->default_line = g_malloc0 (priv->width * priv->bytes);
-    gdouble step_size = ((gdouble) priv->max_val) / priv->width;
+    step_size = ((gdouble) priv->max_val) / priv->width;
+
     for (guint p = 0; p < priv->roi_width; p++) {
         guint val = round (p * step_size);
         set_pixel (priv->default_line, p, 0, val, priv->bytes, priv->max_val, priv->width);
@@ -567,9 +554,9 @@ uca_mock_camera_init(UcaMockCamera *self)
 
 
     /* will be set in initable_init */
-    self->priv->width = self->priv->roi_width = 0;
-    self->priv->height = self->priv->roi_height = 0;
-    self->priv->bits = 0;
+    self->priv->width = self->priv->roi_width = 512;
+    self->priv->height = self->priv->roi_height = 512;
+    self->priv->bits = 8;
     self->priv->bytes = 0;
     self->priv->max_val = 0;
     self->priv->default_line = NULL;
diff --git a/src/uca-camera.c b/src/uca-camera.c
index 7d55f92..eb1c825 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -402,14 +402,14 @@ uca_camera_class_init (UcaCameraClass *klass)
             "Width of sensor",
             "Width of the sensor in pixels",
             1, G_MAXUINT, 512,
-            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+            G_PARAM_READABLE);
 
     camera_properties[PROP_SENSOR_HEIGHT] =
         g_param_spec_uint(uca_camera_props[PROP_SENSOR_HEIGHT],
             "Height of sensor",
             "Height of the sensor in pixels",
             1, G_MAXUINT, 512,
-            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+            G_PARAM_READABLE);
 
     camera_properties[PROP_SENSOR_PIXEL_WIDTH] =
         g_param_spec_double (uca_camera_props[PROP_SENSOR_PIXEL_WIDTH],
@@ -430,7 +430,7 @@ uca_camera_class_init (UcaCameraClass *klass)
             "Number of bits per pixel",
             "Number of bits per pixel",
             1, 32, 8,
-            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+            G_PARAM_READABLE);
 
     camera_properties[PROP_SENSOR_HORIZONTAL_BINNING] =
         g_param_spec_uint(uca_camera_props[PROP_SENSOR_HORIZONTAL_BINNING],