From f111dd5b0c80206d79bb73f0e5b546ae7d5e34a7 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 17 Jul 2013 10:49:19 +0200 Subject: Provide binning default and let cameras use that --- plugins/pf/uca-pf-camera.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'plugins/pf/uca-pf-camera.c') diff --git a/plugins/pf/uca-pf-camera.c b/plugins/pf/uca-pf-camera.c index 1771798..bc98e31 100644 --- a/plugins/pf/uca-pf-camera.c +++ b/plugins/pf/uca-pf-camera.c @@ -71,18 +71,12 @@ static gint base_overrideables[] = { PROP_SENSOR_WIDTH, PROP_SENSOR_HEIGHT, PROP_SENSOR_BITDEPTH, - PROP_SENSOR_HORIZONTAL_BINNING, - PROP_SENSOR_HORIZONTAL_BINNINGS, - PROP_SENSOR_VERTICAL_BINNING, - PROP_SENSOR_VERTICAL_BINNINGS, PROP_SENSOR_MAX_FRAME_RATE, PROP_EXPOSURE_TIME, PROP_ROI_X, PROP_ROI_Y, PROP_ROI_WIDTH, PROP_ROI_HEIGHT, - PROP_ROI_WIDTH_MULTIPLIER, - PROP_ROI_HEIGHT_MULTIPLIER, PROP_HAS_STREAMING, PROP_HAS_CAMRAM_RECORDING, 0 @@ -235,14 +229,6 @@ uca_pf_camera_get_property(GObject *object, guint property_id, GValue *value, GP case PROP_SENSOR_BITDEPTH: g_value_set_uint(value, 8); break; - case PROP_SENSOR_HORIZONTAL_BINNING: - break; - case PROP_SENSOR_HORIZONTAL_BINNINGS: - break; - case PROP_SENSOR_VERTICAL_BINNING: - break; - case PROP_SENSOR_VERTICAL_BINNINGS: - break; case PROP_SENSOR_MAX_FRAME_RATE: g_value_set_float(value, 488.0); break; @@ -267,12 +253,6 @@ uca_pf_camera_get_property(GObject *object, guint property_id, GValue *value, GP case PROP_ROI_HEIGHT: g_value_set_uint(value, 1024); break; - case PROP_ROI_WIDTH_MULTIPLIER: - g_value_set_uint(value, 1); - break; - case PROP_ROI_HEIGHT_MULTIPLIER: - g_value_set_uint(value, 1); - break; case PROP_NAME: g_value_set_string(value, "Photon Focus MV2-D1280-640-CL"); break; -- cgit v1.2.3