diff --git a/src/arvcamera.c b/src/arvcamera.c index d7c05be7f..7e7624270 100644 --- a/src/arvcamera.c +++ b/src/arvcamera.c @@ -2428,9 +2428,8 @@ arv_camera_is_binning_available (ArvCamera *camera, GError **error) } /** - * arv_camera_get_representation_gain: + * arv_camera_get_gain_representation: * @camera: a #ArvCamera - * @error: a #GError placeholder, %NULL to ignore * * Return: enum ArvGcRepresentation, -1 if not available. * @@ -2438,27 +2437,26 @@ arv_camera_is_binning_available (ArvCamera *camera, GError **error) */ ArvGcRepresentation -arv_camera_get_representation_gain (ArvCamera *camera, GError **error) +arv_camera_get_gain_representation (ArvCamera *camera) { ArvCameraPrivate *priv = arv_camera_get_instance_private (camera); g_return_val_if_fail (ARV_IS_CAMERA (camera), FALSE); if (priv->has_gain) - return arv_device_get_representation (priv->device, "Gain", error); + return arv_device_get_representation (priv->device, "Gain"); if (priv->gain_raw_as_float) - return arv_device_get_representation (priv->device, "GainRaw", error); + return arv_device_get_representation (priv->device, "GainRaw"); if (priv->gain_abs_as_float) - return arv_device_get_representation (priv->device, "GainAbs", error); + return arv_device_get_representation (priv->device, "GainAbs"); - return arv_device_get_representation (priv->device, "GainRaw", error); + return arv_device_get_representation (priv->device, "GainRaw"); } /** - * arv_camera_get_representation_exposure_time: + * arv_camera_get_exposure_time_representation: * @camera: a #ArvCamera - * @error: a #GError placeholder, %NULL to ignore * * Return: enum ArvGcRepresentation, -1 if not available. * @@ -2466,7 +2464,7 @@ arv_camera_get_representation_gain (ArvCamera *camera, GError **error) */ ArvGcRepresentation -arv_camera_get_representation_exposure_time (ArvCamera *camera, GError **error) +arv_camera_get_exposure_time_representation (ArvCamera *camera) { ArvCameraPrivate *priv = arv_camera_get_instance_private (camera); @@ -2474,15 +2472,14 @@ arv_camera_get_representation_exposure_time (ArvCamera *camera, GError **error) switch (priv->series) { case ARV_CAMERA_SERIES_XIMEA: - return arv_device_get_representation (priv->device, "ExposureTime", error); + return arv_device_get_representation (priv->device, "ExposureTime"); case ARV_CAMERA_SERIES_RICOH: - return arv_device_get_representation (priv->device, "ExposureTimeRaw", error); + return arv_device_get_representation (priv->device, "ExposureTimeRaw"); case ARV_CAMERA_SERIES_IMPERX_CHEETAH: - return arv_device_get_representation (priv->device, "ExposureMode", error); + return arv_device_get_representation (priv->device, "ExposureMode"); default: return arv_device_get_representation (priv->device, - priv->has_exposure_time ? "ExposureTime" : "ExposureTimeAbs", - error); + priv->has_exposure_time ? "ExposureTime" : "ExposureTimeAbs"); } } @@ -3027,7 +3024,6 @@ arv_camera_is_feature_implemented (ArvCamera *camera, const char *feature, GErro * arv_camera_get_representation: * @camera: a #ArvCamera * @feature: feature name - * @error: a #GError placeholder, %NULL to ignore * * Return: enum ArvGcRepresentation, -1 if not available. * @@ -3035,13 +3031,13 @@ arv_camera_is_feature_implemented (ArvCamera *camera, const char *feature, GErro */ ArvGcRepresentation -arv_camera_get_representation (ArvCamera *camera, const char *feature, GError **error) +arv_camera_get_representation (ArvCamera *camera, const char *feature) { ArvCameraPrivate *priv = arv_camera_get_instance_private (camera); g_return_val_if_fail (ARV_IS_CAMERA (camera), FALSE); - return arv_device_get_representation (priv->device, feature, error); + return arv_device_get_representation (priv->device, feature); } /** diff --git a/src/arvcamera.h b/src/arvcamera.h index c489a4503..c4882beb8 100644 --- a/src/arvcamera.h +++ b/src/arvcamera.h @@ -134,7 +134,7 @@ ARV_API double arv_camera_get_exposure_time (ArvCamera *camera, GError **error ARV_API void arv_camera_get_exposure_time_bounds (ArvCamera *camera, double *min, double *max, GError **error); ARV_API void arv_camera_set_exposure_time_auto (ArvCamera *camera, ArvAuto auto_mode, GError **error); ARV_API ArvAuto arv_camera_get_exposure_time_auto (ArvCamera *camera, GError **error); -ARV_API ArvGcRepresentation arv_camera_get_representation_exposure_time(ArvCamera *camera, GError **error); +ARV_API ArvGcRepresentation arv_camera_get_exposure_time_representation(ArvCamera *camera); ARV_API void arv_camera_set_exposure_mode (ArvCamera *camera, ArvExposureMode mode, GError **error); @@ -150,7 +150,7 @@ ARV_API double arv_camera_get_gain (ArvCamera *camera, GError **error); ARV_API void arv_camera_get_gain_bounds (ArvCamera *camera, double *min, double *max, GError **error); ARV_API void arv_camera_set_gain_auto (ArvCamera *camera, ArvAuto auto_mode, GError **error); ARV_API ArvAuto arv_camera_get_gain_auto (ArvCamera *camera, GError **error); -ARV_API ArvGcRepresentation arv_camera_get_representation_gain (ArvCamera *camera, GError **error); +ARV_API ArvGcRepresentation arv_camera_get_gain_representation (ArvCamera *camera); ARV_API gboolean arv_camera_is_black_level_available (ArvCamera *camera, GError **error); ARV_API gboolean arv_camera_is_black_level_auto_available(ArvCamera *camera, GError **error); @@ -210,7 +210,7 @@ ARV_API gboolean arv_camera_is_enumeration_entry_available ARV_API gboolean arv_camera_is_feature_available (ArvCamera *camera, const char *feature, GError **error); ARV_API gboolean arv_camera_is_feature_implemented (ArvCamera *camera, const char *feature, GError **error); -ARV_API ArvGcRepresentation arv_camera_get_representation (ArvCamera *camera, const char *feature, GError **error); +ARV_API ArvGcRepresentation arv_camera_get_representation (ArvCamera *camera, const char *feature); /* Runtime policies */ diff --git a/src/arvdevice.c b/src/arvdevice.c index f270a0385..da008ed62 100644 --- a/src/arvdevice.c +++ b/src/arvdevice.c @@ -397,7 +397,6 @@ _get_feature (ArvDevice *device, GType node_type, const char *feature, GError ** * arv_device_get_representation: * @device: a #ArvDevice * @feature: feature name - * @error: a #GError placeholder, %NULL to ignore * * Return: enum ArvGcRepresentation, -1 if not available. * @@ -405,7 +404,7 @@ _get_feature (ArvDevice *device, GType node_type, const char *feature, GError ** */ ArvGcRepresentation -arv_device_get_representation (ArvDevice *device, const char *feature, GError **error) +arv_device_get_representation (ArvDevice *device, const char *feature) { ArvGcNode* node; diff --git a/src/arvdevice.h b/src/arvdevice.h index c58443df5..f973c510c 100644 --- a/src/arvdevice.h +++ b/src/arvdevice.h @@ -112,7 +112,7 @@ ARV_API gboolean arv_device_is_feature_available (ArvDevice *device, const cha ARV_API gboolean arv_device_is_feature_implemented (ArvDevice *device, const char *feature, GError **error); ARV_API ArvGcNode * arv_device_get_feature (ArvDevice *device, const char *feature); ARV_API ArvGcAccessMode arv_device_get_feature_access_mode (ArvDevice *device, const char *feature); -ARV_API ArvGcRepresentation arv_device_get_representation (ArvDevice *device, const char *feature, GError **error); +ARV_API ArvGcRepresentation arv_device_get_representation (ArvDevice *device, const char *feature); ARV_API ArvChunkParser *arv_device_create_chunk_parser (ArvDevice *device); diff --git a/viewer/arvviewer.c b/viewer/arvviewer.c index d3228e6b9..de5c2d08d 100644 --- a/viewer/arvviewer.c +++ b/viewer/arvviewer.c @@ -770,7 +770,7 @@ set_camera_widgets(ArvViewer *viewer) // enables gtk widget based on feature representation is_gain_available = arv_camera_is_gain_available (viewer->camera, NULL); if (is_gain_available){ - viewer->gain_representation = (gint)(arv_camera_get_representation_gain(viewer->camera, NULL)); + viewer->gain_representation = (gint)(arv_camera_get_gain_representation(viewer->camera)); switch(viewer->gain_representation){ case ARV_GC_REPRESENTATION_UNDEFINED: case ARV_GC_REPRESENTATION_LINEAR: @@ -802,7 +802,7 @@ set_camera_widgets(ArvViewer *viewer) is_exposure_available = arv_camera_is_exposure_time_available (viewer->camera, NULL); if (is_exposure_available){ - viewer->exposure_time_representation = (gint)(arv_camera_get_representation_exposure_time(viewer->camera, NULL)); + viewer->exposure_time_representation = (gint)(arv_camera_get_exposure_time_representation(viewer->camera)); switch(viewer->exposure_time_representation){ case ARV_GC_REPRESENTATION_UNDEFINED: case ARV_GC_REPRESENTATION_LINEAR: