[farsight2/master] Use the enum types in for the error signals

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:22:26 PST 2008


---
 gst-libs/gst/farsight/fs-base-conference.c         |    4 ++--
 gst-libs/gst/farsight/fs-marshal.list              |    4 ++--
 gst-libs/gst/farsight/fs-participant.c             |    6 ++++--
 gst-libs/gst/farsight/fs-session.c                 |    9 +++++----
 gst-libs/gst/farsight/fs-stream-transmitter.c      |    4 ++--
 gst-libs/gst/farsight/fs-stream.c                  |    4 ++--
 gst-libs/gst/farsight/fs-transmitter.c             |    4 ++--
 transmitters/rawudp/fs-rawudp-component.c          |    4 ++--
 transmitters/rawudp/fs-rawudp-marshal.list         |    2 +-
 transmitters/rawudp/fs-rawudp-stream-transmitter.c |    4 ++--
 10 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-base-conference.c b/gst-libs/gst/farsight/fs-base-conference.c
index 6141737..43d96fc 100644
--- a/gst-libs/gst/farsight/fs-base-conference.c
+++ b/gst-libs/gst/farsight/fs-base-conference.c
@@ -83,7 +83,7 @@ static FsParticipant *fs_base_conference_new_participant (FsConference *conf,
     GError **error);
 
 void fs_base_conference_error (GObject *signal_src, GObject *error_src,
-                               gint error_no, gchar *error_msg,
+                               FsError error_no, gchar *error_msg,
                                gchar *debug_msg, FsBaseConference *conf);
 
 void
@@ -172,7 +172,7 @@ fs_base_conference_new_session (FsConference *conf,
 
 void
 fs_base_conference_error (GObject *signal_src, GObject *error_src,
-                          gint error_no, gchar *error_msg,
+                          FsError error_no, gchar *error_msg,
                           gchar *debug_msg, FsBaseConference *conf)
 {
   GstMessage *gst_msg = NULL;
diff --git a/gst-libs/gst/farsight/fs-marshal.list b/gst-libs/gst/farsight/fs-marshal.list
index e16bb50..f2628a5 100644
--- a/gst-libs/gst/farsight/fs-marshal.list
+++ b/gst-libs/gst/farsight/fs-marshal.list
@@ -1,4 +1,4 @@
-VOID:OBJECT,INT,STRING,STRING
-VOID:INT,STRING,STRING
+VOID:OBJECT,ENUM,STRING,STRING
+VOID:ENUM,STRING,STRING
 VOID:BOXED,BOXED
 VOID:OBJECT,OBJECT
diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farsight/fs-participant.c
index 0e92c7a..d43f493 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farsight/fs-participant.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "fs-participant.h"
+#include "fs-enum-types.h"
 #include "fs-marshal.h"
 
 /* Signals */
@@ -124,8 +125,9 @@ fs_participant_class_init (FsParticipantClass *klass)
       0,
       NULL,
       NULL,
-      _fs_marshal_VOID__OBJECT_INT_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_OBJECT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+      _fs_marshal_VOID__OBJECT_ENUM_STRING_STRING,
+      G_TYPE_NONE, 4, G_TYPE_OBJECT, FS_TYPE_ERROR, G_TYPE_STRING,
+      G_TYPE_STRING);
 
   gobject_class->dispose = fs_participant_dispose;
   gobject_class->finalize = fs_participant_finalize;
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index b3b1159..7a62a19 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -268,8 +268,9 @@ fs_session_class_init (FsSessionClass *klass)
       0,
       NULL,
       NULL,
-      _fs_marshal_VOID__OBJECT_INT_STRING_STRING,
-      G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+      _fs_marshal_VOID__OBJECT_ENUM_STRING_STRING,
+      G_TYPE_NONE, 4, G_TYPE_OBJECT, FS_TYPE_ERROR, G_TYPE_STRING,
+      G_TYPE_STRING);
 }
 
 static void
@@ -305,7 +306,7 @@ fs_session_set_property (GObject *object,
 
 static void
 fs_session_error_forward (GObject *signal_src,
-                          gint error_no, gchar *error_msg,
+                          FsError error_no, gchar *error_msg,
                           gchar *debug_msg, FsSession *session)
 {
   /* We just need to forward the error signal including a ref to the stream
@@ -493,7 +494,7 @@ fs_session_set_local_codecs_config (FsSession *session,
 /**
  * fs_session_emit_error:
  * @session: #FsSession on which to emit the error signal
- * @error_no: The number of the error
+ * @error_no: The number of the error of type #FsError
  * @error_msg: Error message to be displayed to user
  * @debug_msg: Debugging error message
  *
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index f0f533f..4294e5c 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -153,8 +153,8 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
       0,
       NULL,
       NULL,
-      _fs_marshal_VOID__INT_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+      _fs_marshal_VOID__ENUM_STRING_STRING,
+      G_TYPE_NONE, 3, FS_TYPE_ERROR, G_TYPE_STRING, G_TYPE_STRING);
 
     /**
    * FsStreamTransmitter::new-active-candidate-pair:
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index afef43f..14edb6f 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -292,8 +292,8 @@ fs_stream_class_init (FsStreamClass *klass)
       0,
       NULL,
       NULL,
-      _fs_marshal_VOID__INT_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+      _fs_marshal_VOID__ENUM_STRING_STRING,
+      G_TYPE_NONE, 3, FS_TYPE_ERROR, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
    * FsStream::src-pad-added:
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index 58b9640..5cb94c4 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -171,8 +171,8 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
       0,
       NULL,
       NULL,
-      _fs_marshal_VOID__OBJECT_INT_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+      _fs_marshal_VOID__ENUM_STRING_STRING,
+      G_TYPE_NONE, 3, FS_TYPE_ERROR, G_TYPE_STRING, G_TYPE_STRING);
 
 
   gobject_class->dispose = fs_transmitter_dispose;
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 21b0781..4776c1c 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -363,8 +363,8 @@ fs_rawudp_component_class_init (FsRawUdpComponentClass *klass)
       0,
       NULL,
       NULL,
-      _fs_rawudp_marshal_VOID__INT_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+      _fs_rawudp_marshal_VOID__ENUM_STRING_STRING,
+      G_TYPE_NONE, 3, FS_TYPE_ERROR, G_TYPE_STRING, G_TYPE_STRING);
 
 
   g_type_class_add_private (klass, sizeof (FsRawUdpComponentPrivate));
diff --git a/transmitters/rawudp/fs-rawudp-marshal.list b/transmitters/rawudp/fs-rawudp-marshal.list
index 2c46dad..8e0b0a7 100644
--- a/transmitters/rawudp/fs-rawudp-marshal.list
+++ b/transmitters/rawudp/fs-rawudp-marshal.list
@@ -1,2 +1,2 @@
 VOID:BOXED,BOXED
-VOID:INT,STRING,STRING
+VOID:ENUM,STRING,STRING
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index bd5ad51..f241074 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -174,7 +174,7 @@ _component_new_active_candidate_pair (FsRawUdpComponent *component,
     FsCandidate *local, FsCandidate *remote, gpointer user_data);
 static void
 _component_error (FsRawUdpComponent *component,
-    gint error_no, gchar *error_msg, gchar *debug_msg, gpointer user_data);
+    FsError error_no, gchar *error_msg, gchar *debug_msg, gpointer user_data);
 
 
 static GObjectClass *parent_class = NULL;
@@ -716,7 +716,7 @@ _component_new_active_candidate_pair (FsRawUdpComponent *component,
 
 static void
 _component_error (FsRawUdpComponent *component,
-    gint error_no, gchar *error_msg, gchar *debug_msg, gpointer user_data)
+    FsError error_no, gchar *error_msg, gchar *debug_msg, gpointer user_data)
 {
   FsRawUdpStreamTransmitter *self = FS_RAWUDP_STREAM_TRANSMITTER (user_data);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list