[aravis] stream: remove _with_callback variants, and add callback parameters to _new.

[Emmanuel Pacaud <emmanuel src gnome org>]

commit 2e7ac43e610137f7b2922b249c1133e0f4d039e7
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Apr 12 13:26:47 2010 +0200

    stream: remove _with_callback variants, and add callback parameters to _new.

 src/arvcamera.c     |    4 ++--
 src/arvcamera.h     |    3 ++-
 src/arvcameratest.c |    2 +-
 src/arvdevice.c     |    8 +-------
 src/arvdevice.h     |   25 +++++++++++--------------
 src/arvtest.c       |    2 +-
 6 files changed, 18 insertions(+), 26 deletions(-)
---
diff --git a/src/arvcamera.c b/src/arvcamera.c
index 00d15ef..fe2b4b6 100644
--- a/src/arvcamera.c
+++ b/src/arvcamera.c
@@ -38,11 +38,11 @@ struct _ArvCameraPrivate {
 };
 
 ArvStream *
-arv_camera_new_stream (ArvCamera *camera)
+arv_camera_new_stream (ArvCamera *camera, ArvStreamCallback callback, void *user_data)
 {
 	g_return_val_if_fail (ARV_IS_CAMERA (camera), NULL);
 
-	return arv_device_new_stream (camera->priv->device);
+	return arv_device_new_stream (camera->priv->device, callback, user_data);
 }
 
 const char *
diff --git a/src/arvcamera.h b/src/arvcamera.h
index 6b84bfe..4c8650e 100644
--- a/src/arvcamera.h
+++ b/src/arvcamera.h
@@ -24,6 +24,7 @@
 #define ARV_CAMERA_H
 
 #include <arvtypes.h>
+#include <arvstream.h>
 
 G_BEGIN_DECLS
 
@@ -50,7 +51,7 @@ struct _ArvCameraClass {
 GType arv_camera_get_type (void);
 
 ArvCamera *	arv_camera_new			(const char *name);
-ArvStream *	arv_camera_new_stream		(ArvCamera *camera);
+ArvStream *	arv_camera_new_stream		(ArvCamera *camera, ArvStreamCallback callback, void *user_data);
 const char *	arv_camera_get_vendor_name	(ArvCamera *camera);
 const char *	arv_camera_get_model_name	(ArvCamera *camera);
 const char *	arv_camera_get_device_id	(ArvCamera *camera);
diff --git a/src/arvcameratest.c b/src/arvcameratest.c
index f6732f7..343c101 100644
--- a/src/arvcameratest.c
+++ b/src/arvcameratest.c
@@ -98,7 +98,7 @@ main (int argc, char **argv)
 		g_print ("vertical binning    = %d\n", dy);
 		g_print ("exposure            = %g us\n", exposure);
 
-		stream = arv_camera_new_stream (camera);
+		stream = arv_camera_new_stream (camera, NULL, NULL);
 		if (arv_option_auto_buffer)
 			arv_gv_stream_set_option (ARV_GV_STREAM (stream),
 						  ARV_GV_STREAM_OPTION_SOCKET_BUFFER_AUTO,
diff --git a/src/arvdevice.c b/src/arvdevice.c
index c8b31c3..dd948a7 100644
--- a/src/arvdevice.c
+++ b/src/arvdevice.c
@@ -33,19 +33,13 @@ struct _ArvDevicePrivate {
 };
 
 ArvStream *
-arv_device_new_stream_with_callback (ArvDevice *device, ArvStreamCallback callback, void *user_data)
+arv_device_new_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data)
 {
 	g_return_val_if_fail (ARV_IS_DEVICE (device), NULL);
 
 	return ARV_DEVICE_GET_CLASS (device)->new_stream (device, callback, user_data);
 }
 
-ArvStream *
-arv_device_new_stream (ArvDevice *device)
-{
-	return arv_device_new_stream_with_callback (device, NULL, NULL);
-}
-
 gboolean
 arv_device_read_memory (ArvDevice *device, guint32 address, guint32 size, void *buffer)
 {
diff --git a/src/arvdevice.h b/src/arvdevice.h
index c88b948..c1d81ee 100644
--- a/src/arvdevice.h
+++ b/src/arvdevice.h
@@ -57,20 +57,17 @@ struct _ArvDeviceClass {
 
 GType arv_device_get_type (void);
 
-ArvStream *	arv_device_new_stream_with_callback	(ArvDevice *device, ArvStreamCallback callback,
-							 void *user_data);
-ArvStream *	arv_device_new_stream			(ArvDevice *device);
-
-gboolean	arv_device_read_memory 			(ArvDevice *device, guint32 address, guint32 size,
-							 void *buffer);
-gboolean	arv_device_write_memory	 		(ArvDevice *device, guint32 address, guint32 size,
-							 void *buffer);
-gboolean 	arv_device_read_register		(ArvDevice *device, guint32 address, guint32 *value);
-gboolean	arv_device_write_register 		(ArvDevice *device, guint32 address, guint32 value);
-
-void 		arv_device_set_genicam_data		(ArvDevice *device, char *genicam, size_t size);
-const char * 	arv_device_get_genicam_data		(ArvDevice *device, size_t *size);
-ArvGc *		arv_device_get_genicam			(ArvDevice *device);
+ArvStream *	arv_device_new_stream		(ArvDevice *device, ArvStreamCallback callback, void *user_data);
+gboolean	arv_device_read_memory 		(ArvDevice *device, guint32 address, guint32 size,
+						 void *buffer);
+gboolean	arv_device_write_memory	 	(ArvDevice *device, guint32 address, guint32 size,
+						 void *buffer);
+gboolean 	arv_device_read_register	(ArvDevice *device, guint32 address, guint32 *value);
+gboolean	arv_device_write_register 	(ArvDevice *device, guint32 address, guint32 value);
+
+void 		arv_device_set_genicam_data	(ArvDevice *device, char *genicam, size_t size);
+const char * 	arv_device_get_genicam_data	(ArvDevice *device, size_t *size);
+ArvGc *		arv_device_get_genicam		(ArvDevice *device);
 
 G_END_DECLS
 
diff --git a/src/arvtest.c b/src/arvtest.c
index 898ddea..8361568 100644
--- a/src/arvtest.c
+++ b/src/arvtest.c
@@ -176,7 +176,7 @@ main (int argc, char **argv)
 			g_print ("reverse x          = %s\n", v_boolean ? "TRUE" : "FALSE");
 		}
 
-		stream = arv_device_new_stream (device);
+		stream = arv_device_new_stream (device, NULL, NULL);
 		if (arv_option_auto_buffer)
 			arv_gv_stream_set_option (ARV_GV_STREAM (stream),
 						  ARV_GV_STREAM_OPTION_SOCKET_BUFFER_AUTO,