[farsight2/master] Remove useless GError in fs_transmitter_get_stream_transmitter_type()
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:25:22 PST 2008
---
gst-libs/gst/farsight/fs-transmitter.c | 6 ++----
gst-libs/gst/farsight/fs-transmitter.h | 6 ++----
python/pyfarsight.override | 5 +----
transmitters/multicast/fs-multicast-transmitter.c | 6 ++----
transmitters/rawudp/fs-rawudp-transmitter.c | 6 ++----
5 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index bd1e325..e1491bf 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -309,7 +309,6 @@ fs_transmitter_new (const gchar *type, guint components, GError **error)
/**
* fs_transmitter_get_stream_transmitter_type:
* @transmitter: A #FsTransmitter object
- * @error: location of a #GError, or NULL if no error occured
*
* This function returns the GObject type for the stream transmitter.
* This is meant for bindings that need to introspect the type of arguments
@@ -319,15 +318,14 @@ fs_transmitter_new (const gchar *type, guint components, GError **error)
*/
GType
-fs_transmitter_get_stream_transmitter_type (FsTransmitter *transmitter,
- GError **error)
+fs_transmitter_get_stream_transmitter_type (FsTransmitter *transmitter)
{
FsTransmitterClass *klass = FS_TRANSMITTER_GET_CLASS (transmitter);
g_return_val_if_fail (klass, 0);
g_return_val_if_fail (klass->get_stream_transmitter_type, 0);
- return klass->get_stream_transmitter_type (transmitter, error);
+ return klass->get_stream_transmitter_type (transmitter);
}
diff --git a/gst-libs/gst/farsight/fs-transmitter.h b/gst-libs/gst/farsight/fs-transmitter.h
index a07741f..68c434c 100644
--- a/gst-libs/gst/farsight/fs-transmitter.h
+++ b/gst-libs/gst/farsight/fs-transmitter.h
@@ -72,8 +72,7 @@ struct _FsTransmitterClass
guint n_parameters,
GParameter *parameters,
GError **error);
- GType (*get_stream_transmitter_type) (FsTransmitter *transmitter,
- GError **error);
+ GType (*get_stream_transmitter_type) (FsTransmitter *transmitter);
/*< private >*/
gpointer _padding[8];
@@ -108,8 +107,7 @@ FsStreamTransmitter *fs_transmitter_new_stream_transmitter (
FsTransmitter *fs_transmitter_new (const gchar *type, guint components,
GError **error);
-GType fs_transmitter_get_stream_transmitter_type (FsTransmitter *transmitter,
- GError **error);
+GType fs_transmitter_get_stream_transmitter_type (FsTransmitter *transmitter);
void fs_transmitter_emit_error (FsTransmitter *transmitter,
gint error_no,
diff --git a/python/pyfarsight.override b/python/pyfarsight.override
index 11cca4b..1cfbb7e 100644
--- a/python/pyfarsight.override
+++ b/python/pyfarsight.override
@@ -207,11 +207,8 @@ _wrap_fs_session_new_stream(PyGObject *self, PyObject *args, PyObject *kwargs)
Py_BEGIN_ALLOW_THREADS
st_class = g_type_class_ref (
- fs_transmitter_get_stream_transmitter_type (
- transmitter, &error));
+ fs_transmitter_get_stream_transmitter_type (transmitter));
Py_END_ALLOW_THREADS
- if (!st_class)
- goto error;
if (!FS_IS_STREAM_TRANSMITTER_CLASS (st_class))
{
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index 7fb4447..7b70d76 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -116,8 +116,7 @@ static FsStreamTransmitter *fs_multicast_transmitter_new_stream_transmitter (
FsTransmitter *transmitter, FsParticipant *participant,
guint n_parameters, GParameter *parameters, GError **error);
static GType fs_multicast_transmitter_get_stream_transmitter_type (
- FsTransmitter *transmitter,
- GError **error);
+ FsTransmitter *transmitter);
static GObjectClass *parent_class = NULL;
//static guint signals[LAST_SIGNAL] = { 0 };
@@ -930,8 +929,7 @@ fs_multicast_transmitter_udpsock_dec_sending (UdpSock *udpsock)
static GType
fs_multicast_transmitter_get_stream_transmitter_type (
- FsTransmitter *transmitter,
- GError **error)
+ FsTransmitter *transmitter)
{
return FS_TYPE_MULTICAST_STREAM_TRANSMITTER;
}
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index 9b8f6f7..fc50164 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -118,8 +118,7 @@ static FsStreamTransmitter *fs_rawudp_transmitter_new_stream_transmitter (
GParameter *parameters,
GError **error);
static GType fs_rawudp_transmitter_get_stream_transmitter_type (
- FsTransmitter *transmitter,
- GError **error);
+ FsTransmitter *transmitter);
static GObjectClass *parent_class = NULL;
@@ -938,8 +937,7 @@ fs_rawudp_transmitter_udpport_get_port (UdpPort *udpport)
static GType
-fs_rawudp_transmitter_get_stream_transmitter_type (FsTransmitter *transmitter,
- GError **error)
+fs_rawudp_transmitter_get_stream_transmitter_type (FsTransmitter *transmitter)
{
return FS_TYPE_RAWUDP_STREAM_TRANSMITTER;
}
--
1.5.6.5
More information about the farsight-commits
mailing list