diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-11-18 10:38:10 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-11-18 10:38:10 +0100 |
| commit | 8dba9a00e8e3ea97c554098272c8ff99455a778d (patch) | |
| tree | 10faa8de4ec9498d20d63dcb3b5e533c2932580d /src/uca-camera.c | |
| parent | fd32db445e07fcbd4dd0a82b3538c396f9c44cdf (diff) | |
| download | uca-8dba9a00e8e3ea97c554098272c8ff99455a778d.tar.gz uca-8dba9a00e8e3ea97c554098272c8ff99455a778d.tar.bz2 uca-8dba9a00e8e3ea97c554098272c8ff99455a778d.tar.xz uca-8dba9a00e8e3ea97c554098272c8ff99455a778d.zip | |
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.
Diffstat (limited to 'src/uca-camera.c')
| -rw-r--r-- | src/uca-camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
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], |