From f111dd5b0c80206d79bb73f0e5b546ae7d5e34a7 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@kit.edu>
Date: Wed, 17 Jul 2013 10:49:19 +0200
Subject: Provide binning default and let cameras use that

---
 plugins/mock/uca-mock-camera.c | 24 ------------------------
 plugins/pf/uca-pf-camera.c     | 20 --------------------
 plugins/ufo/uca-ufo-camera.c   | 16 ----------------
 3 files changed, 60 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index 7219ff2..207a958 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -38,17 +38,11 @@ static const gint mock_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_EXPOSURE_TIME,
     PROP_ROI_X,
     PROP_ROI_Y,
     PROP_ROI_WIDTH,
     PROP_ROI_HEIGHT,
-    PROP_ROI_HEIGHT_MULTIPLIER,
-    PROP_ROI_WIDTH_MULTIPLIER,
     PROP_SENSOR_MAX_FRAME_RATE,
     PROP_HAS_STREAMING,
     PROP_HAS_CAMRAM_RECORDING,
@@ -302,18 +296,6 @@ uca_mock_camera_get_property(GObject *object, guint property_id, GValue *value,
         case PROP_SENSOR_BITDEPTH:
             g_value_set_uint(value, 8);
             break;
-        case PROP_SENSOR_HORIZONTAL_BINNING:
-            g_value_set_uint(value, 1);
-            break;
-        case PROP_SENSOR_HORIZONTAL_BINNINGS:
-            g_value_set_boxed(value, priv->binnings);
-            break;
-        case PROP_SENSOR_VERTICAL_BINNING:
-            g_value_set_uint(value, 1);
-            break;
-        case PROP_SENSOR_VERTICAL_BINNINGS:
-            g_value_set_boxed(value, priv->binnings);
-            break;
         case PROP_EXPOSURE_TIME:
             g_value_set_double(value, priv->exposure_time);
             break;
@@ -329,12 +311,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_ROI_WIDTH_MULTIPLIER:
-            g_value_set_uint(value, 1);
-            break;
-        case PROP_ROI_HEIGHT_MULTIPLIER:
-            g_value_set_uint(value, 1);
-            break;
         case PROP_SENSOR_MAX_FRAME_RATE:
             g_value_set_float(value, priv->max_frame_rate);
             break;
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;
diff --git a/plugins/ufo/uca-ufo-camera.c b/plugins/ufo/uca-ufo-camera.c
index 3f6d42c..16530cb 100644
--- a/plugins/ufo/uca-ufo-camera.c
+++ b/plugins/ufo/uca-ufo-camera.c
@@ -81,8 +81,6 @@ static gint base_overrideables[] = {
     PROP_NAME,
     PROP_SENSOR_WIDTH,
     PROP_SENSOR_HEIGHT,
-    PROP_SENSOR_HORIZONTAL_BINNING,
-    PROP_SENSOR_VERTICAL_BINNING,
     PROP_SENSOR_MAX_FRAME_RATE,
     PROP_SENSOR_BITDEPTH,
     PROP_EXPOSURE_TIME,
@@ -91,8 +89,6 @@ static gint base_overrideables[] = {
     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,
@@ -461,12 +457,6 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G
         case PROP_SENSOR_BITDEPTH:
             g_value_set_uint (value, priv->n_bits);
             break;
-        case PROP_SENSOR_HORIZONTAL_BINNING:
-            g_value_set_uint(value, 1);
-            break;
-        case PROP_SENSOR_VERTICAL_BINNING:
-            g_value_set_uint(value, 1);
-            break;
         case PROP_SENSOR_MAX_FRAME_RATE:
             g_value_set_float(value, 340.0);
             break;
@@ -533,12 +523,6 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G
         case PROP_ROI_HEIGHT:
             g_value_set_uint(value, SENSOR_HEIGHT);
             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, "Ufo Camera w/ CMOSIS CMV2000");
             break;
-- 
cgit v1.2.3