dom: make genicam integer and boolean tests pass.

durnezj · Feb 28, 2012 · f793360 · f793360
1 parent ce0ca78
commit f793360
Show file tree

Hide file tree

Showing 41 changed files with 885 additions and 694 deletions.
diff --git a/src/arvcamera.c b/src/arvcamera.c
@@ -347,7 +347,7 @@ arv_camera_get_pixel_format (ArvCamera *camera)
 gint64 *
 arv_camera_get_available_pixel_formats (ArvCamera *camera, guint *n_pixel_formats)
 {
-	ArvGcFeatureNode *enumeration;
+	ArvGcNode *enumeration;
 
 	g_return_val_if_fail (ARV_IS_CAMERA (camera), NULL);
 

diff --git a/src/arvdevice.c b/src/arvdevice.c
@@ -150,7 +150,7 @@ void
 arv_device_execute_command (ArvDevice *device, const char *feature)
 {
 	ArvGc *genicam;
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	genicam = arv_device_get_genicam (device);
 	g_return_if_fail (ARV_IS_GC (genicam));
@@ -168,7 +168,7 @@ arv_device_execute_command (ArvDevice *device, const char *feature)
  * Return value: (transfer none): the genicam node corresponding to the feature name, NULL if not found.
  */
 
-ArvGcFeatureNode *
+ArvGcNode *
 arv_device_get_feature (ArvDevice *device, const char *feature)
 {
 	ArvGc *genicam;
@@ -182,7 +182,7 @@ arv_device_get_feature (ArvDevice *device, const char *feature)
 void
 arv_device_set_string_feature_value (ArvDevice *device, const char *feature, const char *value)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -195,7 +195,7 @@ arv_device_set_string_feature_value (ArvDevice *device, const char *feature, con
 const char *
 arv_device_get_string_feature_value (ArvDevice *device, const char *feature)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -210,7 +210,7 @@ arv_device_get_string_feature_value (ArvDevice *device, const char *feature)
 void
 arv_device_set_integer_feature_value (ArvDevice *device, const char *feature, gint64 value)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -225,7 +225,7 @@ arv_device_set_integer_feature_value (ArvDevice *device, const char *feature, gi
 gint64
 arv_device_get_integer_feature_value (ArvDevice *device, const char *feature)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -242,7 +242,7 @@ arv_device_get_integer_feature_value (ArvDevice *device, const char *feature)
 void
 arv_device_get_integer_feature_bounds (ArvDevice *device, const char *feature, gint64 *min, gint64 *max)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -258,7 +258,7 @@ arv_device_get_integer_feature_bounds (ArvDevice *device, const char *feature, g
 void
 arv_device_set_float_feature_value (ArvDevice *device, const char *feature, double value)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -269,7 +269,7 @@ arv_device_set_float_feature_value (ArvDevice *device, const char *feature, doub
 double
 arv_device_get_float_feature_value (ArvDevice *device, const char *feature)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 
@@ -282,7 +282,7 @@ arv_device_get_float_feature_value (ArvDevice *device, const char *feature)
 void
 arv_device_get_float_feature_bounds (ArvDevice *device, const char *feature, double *min, double *max)
 {
-	ArvGcFeatureNode *node;
+	ArvGcNode *node;
 
 	node = arv_device_get_feature (device, feature);
 

diff --git a/src/arvdevice.h b/src/arvdevice.h
@@ -73,7 +73,7 @@ ArvGc *		arv_device_get_genicam			(ArvDevice *device);
 
 void 		arv_device_execute_command 		(ArvDevice *device, const char *feature);
 
-ArvGcFeatureNode *	arv_device_get_feature			(ArvDevice *device, const char *feature);
+ArvGcNode *	arv_device_get_feature			(ArvDevice *device, const char *feature);
 
 void		arv_device_set_string_feature_value	(ArvDevice *device, const char *feature, const char *value);
 const char *	arv_device_get_string_feature_value	(ArvDevice *device, const char *feature);