summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2013-04-19 17:28:44 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2013-04-19 17:28:44 +0200
commit5a147dc45f3d40d6b0c7f880af7e2e6006f41f6a (patch)
tree11eaf2c1bb5da87ce56e91e35900582f87792552
parente4edf31c86f3ea891fe493450c6eb134542095e5 (diff)
downloaduca-5a147dc45f3d40d6b0c7f880af7e2e6006f41f6a.tar.gz
uca-5a147dc45f3d40d6b0c7f880af7e2e6006f41f6a.tar.bz2
uca-5a147dc45f3d40d6b0c7f880af7e2e6006f41f6a.tar.xz
uca-5a147dc45f3d40d6b0c7f880af7e2e6006f41f6a.zip
mock: Do not override trigger mode handling
-rw-r--r--plugins/mock/uca-mock-camera.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index 675d5ec..7219ff2 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -43,7 +43,6 @@ static const gint mock_overrideables[] = {
PROP_SENSOR_VERTICAL_BINNING,
PROP_SENSOR_VERTICAL_BINNINGS,
PROP_EXPOSURE_TIME,
- PROP_TRIGGER_MODE,
PROP_ROI_X,
PROP_ROI_Y,
PROP_ROI_WIDTH,
@@ -59,8 +58,6 @@ static const gint mock_overrideables[] = {
static GParamSpec *mock_properties[N_PROPERTIES] = { NULL, };
struct _UcaMockCameraPrivate {
- UcaCameraTrigger trigger;
-
guint width;
guint height;
guint roi_x, roi_y, roi_width, roi_height;
@@ -281,9 +278,6 @@ uca_mock_camera_set_property (GObject *object, guint property_id, const GValue *
case PROP_ROI_HEIGHT:
priv->roi_height = g_value_get_uint(value);
break;
- case PROP_TRIGGER_MODE:
- priv->trigger = g_value_get_enum (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
return;
@@ -353,9 +347,6 @@ uca_mock_camera_get_property(GObject *object, guint property_id, GValue *value,
case PROP_FRAMERATE:
g_value_set_float(value, priv->frame_rate);
break;
- case PROP_TRIGGER_MODE:
- g_value_set_enum (value, priv->trigger);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;