From 58e855f24b49fb211d8da50240b0278bfdf71413 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 8 Aug 2014 09:39:22 +0200 Subject: Refactor out get_param_spec_by_name --- src/uca-camera.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/uca-camera.c b/src/uca-camera.c index 27af765..46e7cb7 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -980,6 +980,26 @@ uca_camera_grab (UcaCamera *camera, gpointer data, GError **error) return result; } +static GParamSpec * +get_param_spec_by_name (UcaCamera *camera, + const gchar *prop_name) +{ + UcaCameraClass *klass; + GObjectClass *oclass; + GParamSpec *pspec; + + klass = UCA_CAMERA_GET_CLASS (camera); + oclass = G_OBJECT_CLASS (klass); + pspec = g_object_class_find_property (oclass, prop_name); + + if (pspec == NULL) { + g_warning ("Camera does not have property `%s'", prop_name); + return NULL; + } + + return pspec; +} + /** * uca_camera_register_unit: * @camera: A #UcaCamera object @@ -995,20 +1015,12 @@ uca_camera_register_unit (UcaCamera *camera, const gchar *prop_name, UcaUnit unit) { - UcaCameraClass *klass; - GObjectClass *oclass; GParamSpec *pspec; - klass = UCA_CAMERA_GET_CLASS (camera); - oclass = G_OBJECT_CLASS (klass); - pspec = g_object_class_find_property (oclass, prop_name); - - if (pspec == NULL) { - g_warning ("Camera does not have property `%s'", prop_name); - return; - } + pspec = get_param_spec_by_name (camera, prop_name); - uca_camera_set_property_unit (pspec, unit); + if (pspec != NULL) + uca_camera_set_property_unit (pspec, unit); } /** @@ -1026,19 +1038,13 @@ UcaUnit uca_camera_get_unit (UcaCamera *camera, const gchar *prop_name) { - UcaCameraClass *klass; - GObjectClass *oclass; GParamSpec *pspec; gpointer data; - klass = UCA_CAMERA_GET_CLASS (camera); - oclass = G_OBJECT_CLASS (klass); - pspec = g_object_class_find_property (oclass, prop_name); + pspec = get_param_spec_by_name (camera, prop_name); - if (pspec == NULL) { - g_warning ("Camera does not have property `%s'", prop_name); + if (pspec == NULL) return UCA_UNIT_NA; - } data = g_param_spec_get_qdata (pspec, UCA_UNIT_QUARK); return data == NULL ? UCA_UNIT_NA : GPOINTER_TO_INT (data); -- cgit v1.2.3 From a389a30e57a038dcfc83dc2814d56a4a1c9a6084 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 8 Aug 2014 10:08:52 +0200 Subject: Fix #41: add write accessibility API --- src/uca-camera.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/uca-camera.h | 9 +++++++++ 2 files changed, 64 insertions(+) (limited to 'src') diff --git a/src/uca-camera.c b/src/uca-camera.c index 46e7cb7..fce3d12 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -76,6 +76,11 @@ GQuark uca_unit_quark () return g_quark_from_static_string ("uca-unit-quark"); } +GQuark uca_writable_quark () +{ + return g_quark_from_static_string ("uca-writable-quark"); +} + enum { LAST_SIGNAL }; @@ -1050,3 +1055,53 @@ uca_camera_get_unit (UcaCamera *camera, return data == NULL ? UCA_UNIT_NA : GPOINTER_TO_INT (data); } +/** + * uca_camera_set_writable: + * @camera: A #UcaCamera object + * @prop_name: Name of property + * @writable: %TRUE if property can be written during acquisition + * + * Sets a flag that defines if @prop_name can be written during an acquisition. + * + * Since: 1.6 + */ +void +uca_camera_set_writable (UcaCamera *camera, + const gchar *prop_name, + gboolean writable) +{ + GParamSpec *pspec; + + pspec = get_param_spec_by_name (camera, prop_name); + + if (pspec != NULL) { + if (g_param_spec_get_qdata (pspec, UCA_WRITABLE_QUARK) != NULL) + g_warning ("::%s is already fixed", pspec->name); + else + g_param_spec_set_qdata (pspec, UCA_WRITABLE_QUARK, GINT_TO_POINTER (writable)); + } +} + +/** + * uca_camera_is_writable_during_acquisition: + * @camera: A #UcaCamera object + * @prop_name: Name of property + * + * Check if @prop_name can be written at run-time. This is %FALSE if the + * property is read-only, if uca_camera_set_writable() has not been called or + * uca_camera_set_writable() was called with %FALSE. + * + * Returns: %TRUE if the property can be written at acquisition time. + * Since: 1.6 + */ +gboolean +uca_camera_is_writable_during_acquisition (UcaCamera *camera, + const gchar *prop_name) +{ + GParamSpec *pspec; + + pspec = get_param_spec_by_name (camera, prop_name); + + return (pspec->flags & G_PARAM_WRITABLE) && + g_param_spec_get_qdata (pspec, UCA_WRITABLE_QUARK); +} diff --git a/src/uca-camera.h b/src/uca-camera.h index f4030d6..d958870 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -31,9 +31,11 @@ G_BEGIN_DECLS #define UCA_CAMERA_ERROR uca_camera_error_quark() #define UCA_UNIT_QUARK uca_unit_quark() +#define UCA_WRITABLE_QUARK uca_writable_quark() GQuark uca_camera_error_quark(void); GQuark uca_unit_quark(void); +GQuark uca_writable_quark(void); typedef enum { UCA_CAMERA_ERROR_NOT_FOUND, @@ -162,6 +164,13 @@ void uca_camera_register_unit (UcaCamera *camera, UcaUnit unit); UcaUnit uca_camera_get_unit (UcaCamera *camera, const gchar *prop_name); +void uca_camera_set_writable (UcaCamera *camera, + const gchar *prop_name, + gboolean writable); +gboolean uca_camera_is_writable_during_acquisition + (UcaCamera *camera, + const gchar *prop_name); + GType uca_camera_get_type(void); -- cgit v1.2.3