[aravis] Rename create_device functions to open_device.



commit 5754a7915a13d85d964faaf4a4a5df1c4cb0df86
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Sep 27 14:30:00 2010 +0200

    Rename create_device functions to open_device.
    
    That's consistent with the genicam transport layer standard.

 docs/reference/aravis/aravis-sections.txt |    4 ++--
 src/arvcamera.c                           |    2 +-
 src/arvfakeinterface.c                    |    4 ++--
 src/arvgvinterface.c                      |    4 ++--
 src/arvinterface.c                        |   10 +++++-----
 src/arvinterface.h                        |    4 ++--
 src/arvsystem.c                           |    4 ++--
 src/arvsystem.h                           |    2 +-
 tests/arvtest.c                           |    2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/docs/reference/aravis/aravis-sections.txt b/docs/reference/aravis/aravis-sections.txt
index 60649a2..ff7d3f7 100644
--- a/docs/reference/aravis/aravis-sections.txt
+++ b/docs/reference/aravis/aravis-sections.txt
@@ -73,11 +73,11 @@ arv_get_interface_id
 arv_get_n_devices
 arv_get_n_interfaces
 arv_update_device_list
-arv_create_device
+arv_open_device
 arv_interface_update_device_list
 arv_interface_get_device_id
 arv_interface_get_n_devices
-arv_interface_create_device
+arv_interface_open_device
 <SUBSECTION Standard>
 ARV_INTERFACE
 ARV_IS_INTERFACE
diff --git a/src/arvcamera.c b/src/arvcamera.c
index f90d7e0..25e5763 100644
--- a/src/arvcamera.c
+++ b/src/arvcamera.c
@@ -564,7 +564,7 @@ arv_camera_new (const char *name)
 	ArvCameraVendor vendor;
 	const char *vendor_name;
 
-	device = arv_create_device (name);
+	device = arv_open_device (name);
 
 	if (!ARV_IS_DEVICE (device))
 		return NULL;
diff --git a/src/arvfakeinterface.c b/src/arvfakeinterface.c
index e99688a..70e0d79 100644
--- a/src/arvfakeinterface.c
+++ b/src/arvfakeinterface.c
@@ -48,7 +48,7 @@ arv_fake_interface_update_device_list (ArvInterface *interface, GArray *device_i
 }
 
 static ArvDevice *
-arv_fake_interface_create_device (ArvInterface *interface, const char *name)
+arv_fake_interface_open_device (ArvInterface *interface, const char *name)
 {
 	if (g_strcmp0 (name, ARV_FAKE_DEVICE_ID) == 0)
 		return arv_fake_device_new ("1");
@@ -108,7 +108,7 @@ arv_fake_interface_class_init (ArvFakeInterfaceClass *fake_interface_class)
 	object_class->finalize = arv_fake_interface_finalize;
 
 	interface_class->update_device_list = arv_fake_interface_update_device_list;
-	interface_class->create_device = arv_fake_interface_create_device;
+	interface_class->open_device = arv_fake_interface_open_device;
 }
 
 G_DEFINE_TYPE (ArvFakeInterface, arv_fake_interface, ARV_TYPE_INTERFACE)
diff --git a/src/arvgvinterface.c b/src/arvgvinterface.c
index b1da82e..ad6060d 100644
--- a/src/arvgvinterface.c
+++ b/src/arvgvinterface.c
@@ -300,7 +300,7 @@ arv_gv_interface_update_device_list (ArvInterface *interface, GArray *device_ids
 }
 
 static ArvDevice *
-arv_gv_interface_create_device (ArvInterface *interface, const char *name)
+arv_gv_interface_open_device (ArvInterface *interface, const char *name)
 {
 	ArvGvInterface *gv_interface;
 	ArvDevice *device = NULL;
@@ -386,7 +386,7 @@ arv_gv_interface_class_init (ArvGvInterfaceClass *gv_interface_class)
 	object_class->finalize = arv_gv_interface_finalize;
 
 	interface_class->update_device_list = arv_gv_interface_update_device_list;
-	interface_class->create_device = arv_gv_interface_create_device;
+	interface_class->open_device = arv_gv_interface_open_device;
 }
 
 G_DEFINE_TYPE (ArvGvInterface, arv_gv_interface, ARV_TYPE_INTERFACE)
diff --git a/src/arvinterface.c b/src/arvinterface.c
index 559d8eb..4809925 100644
--- a/src/arvinterface.c
+++ b/src/arvinterface.c
@@ -28,7 +28,7 @@
  * list of the available devices and help to instantiate the corresponding
  * #ArvDevice object. If user already knows he name of the device, he should
  * not worry about this class and just use arv_camera_new() or
- * arv_create_device().
+ * arv_open_device().
  */
 
 #include <arvinterface.h>
@@ -97,7 +97,7 @@ arv_interface_get_device_id (ArvInterface *interface, unsigned int index)
 }
 
 /**
- * arv_interface_create_device
+ * arv_interface_open_device
  * @interface: a #ArvInterface
  * @name: device unique id or name
  *
@@ -105,20 +105,20 @@ arv_interface_get_device_id (ArvInterface *interface, unsigned int index)
  **/
 
 ArvDevice *
-arv_interface_create_device (ArvInterface *interface, const char *name)
+arv_interface_open_device (ArvInterface *interface, const char *name)
 {
 	ArvDevice *device;
 
 	g_return_val_if_fail (ARV_IS_INTERFACE (interface), NULL);
 
-	device = ARV_INTERFACE_GET_CLASS (interface)->create_device (interface, name);
+	device = ARV_INTERFACE_GET_CLASS (interface)->open_device (interface, name);
 
 	if (device != NULL)
 		return device;
 
 	arv_interface_update_device_list (interface);
 
-	return ARV_INTERFACE_GET_CLASS (interface)->create_device (interface, name);
+	return ARV_INTERFACE_GET_CLASS (interface)->open_device (interface, name);
 }
 
 static void
diff --git a/src/arvinterface.h b/src/arvinterface.h
index efc7f5f..343a39b 100644
--- a/src/arvinterface.h
+++ b/src/arvinterface.h
@@ -47,7 +47,7 @@ struct _ArvInterfaceClass {
 	GObjectClass parent_class;
 
 	void 		(*update_device_list)		(ArvInterface *interface, GArray *device_ids);
-	ArvDevice *	(*create_device)		(ArvInterface *interface, const char *name);
+	ArvDevice *	(*open_device)			(ArvInterface *interface, const char *name);
 };
 
 GType arv_interface_get_type (void);
@@ -55,7 +55,7 @@ GType arv_interface_get_type (void);
 void 			arv_interface_update_device_list 	(ArvInterface *interface);
 unsigned int 		arv_interface_get_n_devices 		(ArvInterface *interface);
 const char * 		arv_interface_get_device_id 		(ArvInterface *interface, unsigned int index);
-ArvDevice * 		arv_interface_create_device 		(ArvInterface *interface, const char *name);
+ArvDevice * 		arv_interface_open_device 		(ArvInterface *interface, const char *name);
 
 G_END_DECLS
 
diff --git a/src/arvsystem.c b/src/arvsystem.c
index 365e67a..944ead5 100644
--- a/src/arvsystem.c
+++ b/src/arvsystem.c
@@ -102,7 +102,7 @@ arv_get_device_id (unsigned int index)
 }
 
 ArvDevice *
-arv_create_device (const char *name)
+arv_open_device (const char *name)
 {
 	unsigned int i;
 
@@ -111,7 +111,7 @@ arv_create_device (const char *name)
 		ArvDevice *device;
 
 		interface = interfaces[i].get_interface_instance ();
-		device = arv_interface_create_device (interface, name);
+		device = arv_interface_open_device (interface, name);
 		if (device != NULL)
 			return device;
 	}
diff --git a/src/arvsystem.h b/src/arvsystem.h
index 9667020..0c27335 100644
--- a/src/arvsystem.h
+++ b/src/arvsystem.h
@@ -34,7 +34,7 @@ void 			arv_update_device_list 		(void);
 unsigned int 		arv_get_n_devices 		(void);
 const char * 		arv_get_device_id 		(unsigned int index);
 
-ArvDevice * 		arv_create_device 		(const char *name);
+ArvDevice * 		arv_open_device 		(const char *name);
 
 G_END_DECLS
 
diff --git a/tests/arvtest.c b/tests/arvtest.c
index 6f85b68..98b4fe9 100644
--- a/tests/arvtest.c
+++ b/tests/arvtest.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
 	else
 		g_print ("Looking for camera '%s'\n", arv_option_camera_name);
 
-	device = arv_create_device (arv_option_camera_name);
+	device = arv_open_device (arv_option_camera_name);
 	if (device != NULL) {
 		ArvGc *genicam;
 		ArvGcNode *node;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]