[aravis] stream: rename _new_stream to _create_stream.
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aravis] stream: rename _new_stream to _create_stream.
- Date: Wed, 19 May 2010 18:44:29 +0000 (UTC)
commit f536ffbb36b32f5138a22b4ed165c5ba3f875a99
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Wed May 19 20:35:24 2010 +0200
stream: rename _new_stream to _create_stream.
It helps for gobject-introspection which thinks they are
constructors otherwise.
gst/gstaravis.c | 2 +-
src/arvcamera.c | 4 ++--
src/arvcamera.h | 3 ++-
src/arvcameratest.c | 2 +-
src/arvdevice.c | 4 ++--
src/arvdevice.h | 4 ++--
src/arvfakedevice.c | 4 ++--
src/arvgvdevice.c | 4 ++--
src/arvtest.c | 2 +-
9 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/gst/gstaravis.c b/gst/gstaravis.c
index 954bd61..91d6440 100644
--- a/gst/gstaravis.c
+++ b/gst/gstaravis.c
@@ -120,7 +120,7 @@ gst_aravis_start (GstBaseSrc *src)
g_object_unref (gst_aravis->stream);
gst_aravis->camera = arv_camera_new (gst_aravis->camera_name);
- gst_aravis->stream = arv_camera_new_stream (gst_aravis->camera, NULL, NULL);
+ gst_aravis->stream = arv_camera_create_stream (gst_aravis->camera, NULL, NULL);
arv_camera_set_region (gst_aravis->camera, 0, 0, gst_aravis->width, gst_aravis->height);
arv_camera_set_binning (gst_aravis->camera, gst_aravis->h_binning, gst_aravis->v_binning);
diff --git a/src/arvcamera.c b/src/arvcamera.c
index 3e794f0..bf9dbcb 100644
--- a/src/arvcamera.c
+++ b/src/arvcamera.c
@@ -41,11 +41,11 @@ struct _ArvCameraPrivate {
};
ArvStream *
-arv_camera_new_stream (ArvCamera *camera, ArvStreamCallback callback, void *user_data)
+arv_camera_create_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, callback, user_data);
+ return arv_device_create_stream (camera->priv->device, callback, user_data);
}
/* Device control */
diff --git a/src/arvcamera.h b/src/arvcamera.h
index 723769e..7e79cf2 100644
--- a/src/arvcamera.h
+++ b/src/arvcamera.h
@@ -57,7 +57,8 @@ struct _ArvCameraClass {
GType arv_camera_get_type (void);
ArvCamera * arv_camera_new (const char *name);
-ArvStream * arv_camera_new_stream (ArvCamera *camera, ArvStreamCallback callback, void *user_data);
+
+ArvStream * arv_camera_create_stream (ArvCamera *camera, ArvStreamCallback callback, void *user_data);
/* Device control */
diff --git a/src/arvcameratest.c b/src/arvcameratest.c
index faf0c47..bffe6a2 100644
--- a/src/arvcameratest.c
+++ b/src/arvcameratest.c
@@ -104,7 +104,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, NULL, NULL);
+ stream = arv_camera_create_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 645d253..9e24935 100644
--- a/src/arvdevice.c
+++ b/src/arvdevice.c
@@ -33,11 +33,11 @@
static GObjectClass *parent_class = NULL;
ArvStream *
-arv_device_new_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data)
+arv_device_create_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);
+ return ARV_DEVICE_GET_CLASS (device)->create_stream (device, callback, user_data);
}
gboolean
diff --git a/src/arvdevice.h b/src/arvdevice.h
index 44b56e8..3e871a3 100644
--- a/src/arvdevice.h
+++ b/src/arvdevice.h
@@ -44,7 +44,7 @@ struct _ArvDevice {
struct _ArvDeviceClass {
GObjectClass parent_class;
- ArvStream * (*new_stream) (ArvDevice *device, ArvStreamCallback callback, void *user_data);
+ ArvStream * (*create_stream) (ArvDevice *device, ArvStreamCallback callback, void *user_data);
ArvGc * (*get_genicam) (ArvDevice *device);
@@ -56,7 +56,7 @@ struct _ArvDeviceClass {
GType arv_device_get_type (void);
-ArvStream * arv_device_new_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data);
+ArvStream * arv_device_create_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,
diff --git a/src/arvfakedevice.c b/src/arvfakedevice.c
index 9d02839..9a1dc1d 100644
--- a/src/arvfakedevice.c
+++ b/src/arvfakedevice.c
@@ -37,7 +37,7 @@ struct _ArvFakeDevicePrivate {
/* ArvDevice implemenation */
static ArvStream *
-arv_fake_device_new_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data)
+arv_fake_device_create_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data)
{
ArvFakeDevice *fake_device = ARV_FAKE_DEVICE (device);
ArvStream *stream;
@@ -127,7 +127,7 @@ arv_fake_device_class_init (ArvFakeDeviceClass *fake_device_class)
object_class->finalize = arv_fake_device_finalize;
- device_class->new_stream = arv_fake_device_new_stream;
+ device_class->create_stream = arv_fake_device_create_stream;
device_class->get_genicam = arv_fake_device_get_genicam;
device_class->read_memory = arv_fake_device_read_memory;
device_class->write_memory = arv_fake_device_write_memory;
diff --git a/src/arvgvdevice.c b/src/arvgvdevice.c
index 8b8d5b8..ec79e6b 100644
--- a/src/arvgvdevice.c
+++ b/src/arvgvdevice.c
@@ -429,7 +429,7 @@ arv_gv_device_load_genicam (ArvGvDevice *gv_device)
/* ArvDevice implemenation */
static ArvStream *
-arv_gv_device_new_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data)
+arv_gv_device_create_stream (ArvDevice *device, ArvStreamCallback callback, void *user_data)
{
ArvGvDevice *gv_device = ARV_GV_DEVICE (device);
ArvGvDeviceIOData *io_data = gv_device->priv->io_data;
@@ -634,7 +634,7 @@ arv_gv_device_class_init (ArvGvDeviceClass *gv_device_class)
object_class->finalize = arv_gv_device_finalize;
- device_class->new_stream = arv_gv_device_new_stream;
+ device_class->create_stream = arv_gv_device_create_stream;
device_class->get_genicam = arv_gv_device_get_genicam;
device_class->read_memory = arv_gv_device_read_memory;
device_class->write_memory = arv_gv_device_write_memory;
diff --git a/src/arvtest.c b/src/arvtest.c
index 8361568..ac66da4 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, NULL, NULL);
+ stream = arv_device_create_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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]