[farsight2/master] Seems like windows has an ERROR macro, renamed our signal to ERROR_SIGNAL Original patch from Haakon Sporsheim <haakon.sporsheim at tandberg.com>

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


---
 gst-libs/gst/farsight/fs-participant.c        |    4 ++--
 gst-libs/gst/farsight/fs-session.c            |   12 ++++++------
 gst-libs/gst/farsight/fs-stream-transmitter.c |    8 ++++----
 gst-libs/gst/farsight/fs-stream.c             |    7 ++++---
 gst-libs/gst/farsight/fs-transmitter.c        |    4 ++--
 gst/fsrtpconference/fs-rtp-substream.c        |    7 ++++---
 transmitters/rawudp/fs-rawudp-component.c     |    5 +++--
 7 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farsight/fs-participant.c
index cdc16b1..0e92c7a 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farsight/fs-participant.c
@@ -42,7 +42,7 @@
 /* Signals */
 enum
 {
-  ERROR,
+  ERROR_SIGNAL,
   LAST_SIGNAL
 };
 
@@ -118,7 +118,7 @@ fs_participant_class_init (FsParticipantClass *klass)
    *
    * This signal is emitted in any error condition
    */
-  signals[ERROR] = g_signal_new ("error",
+  signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index 0e5d9b9..b3b1159 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -71,7 +71,7 @@
 /* Signals */
 enum
 {
-  ERROR,
+  ERROR_SIGNAL,
   LAST_SIGNAL
 };
 
@@ -262,7 +262,7 @@ fs_session_class_init (FsSessionClass *klass)
    * thread. Applications should listen to the GstBus for errors.
    *
    */
-  signals[ERROR] = g_signal_new ("error",
+  signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
@@ -310,8 +310,8 @@ fs_session_error_forward (GObject *signal_src,
 {
   /* We just need to forward the error signal including a ref to the stream
    * object (signal_src) */
-  g_signal_emit (session, signals[ERROR], 0, signal_src, error_no, error_msg,
-      debug_msg);
+  g_signal_emit (session, signals[ERROR_SIGNAL], 0, signal_src, error_no,
+      error_msg, debug_msg);
 }
 
 /**
@@ -504,6 +504,6 @@ void
 fs_session_emit_error (FsSession *session, gint error_no,
                        gchar *error_msg, gchar *debug_msg)
 {
-  g_signal_emit (session, signals[ERROR], 0, session, error_no, error_msg,
-                 debug_msg);
+  g_signal_emit (session, signals[ERROR_SIGNAL], 0, session, error_no,
+      error_msg, debug_msg);
 }
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index 954feff..f0f533f 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -51,7 +51,7 @@
 /* Signals */
 enum
 {
-  ERROR,
+  ERROR_SIGNAL,
   NEW_LOCAL_CANDIDATE,
   NEW_ACTIVE_CANDIDATE_PAIR,
   LOCAL_CANDIDATES_PREPARED,
@@ -147,7 +147,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
    * This signal is emitted in any error condition
    *
    */
-  signals[ERROR] = g_signal_new ("error",
+  signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
@@ -398,6 +398,6 @@ void
 fs_stream_transmitter_emit_error (FsStreamTransmitter *streamtransmitter,
   gint error_no, gchar *error_msg, gchar *debug_msg)
 {
-  g_signal_emit (streamtransmitter, signals[ERROR], 0, error_no, error_msg,
-    debug_msg);
+  g_signal_emit (streamtransmitter, signals[ERROR_SIGNAL], 0, error_no,
+      error_msg, debug_msg);
 }
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index 1963195..afef43f 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -105,7 +105,7 @@
 /* Signals */
 enum
 {
-  ERROR,
+  ERROR_SIGNAL,
   SRC_PAD_ADDED,
   LAST_SIGNAL
 };
@@ -286,7 +286,7 @@ fs_stream_class_init (FsStreamClass *klass)
    * This signal is emitted in any error condition
    *
    */
-  signals[ERROR] = g_signal_new ("error",
+  signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
@@ -474,7 +474,8 @@ void
 fs_stream_emit_error (FsStream *stream, gint error_no,
                       gchar *error_msg, gchar *debug_msg)
 {
-  g_signal_emit (stream, signals[ERROR], 0, error_no, error_msg, debug_msg);
+  g_signal_emit (stream, signals[ERROR_SIGNAL], 0, error_no, error_msg,
+      debug_msg);
 }
 
 
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index e4d38b7..58b9640 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -51,7 +51,7 @@
 /* Signals */
 enum
 {
-  ERROR,
+  ERROR_SIGNAL,
   LAST_SIGNAL
 };
 
@@ -165,7 +165,7 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
    * This signal is emitted in any error condition
    *
    */
-  signals[ERROR] = g_signal_new ("error",
+  signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index 008b597..bda4929 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -51,7 +51,7 @@ enum
   NO_RTCP_TIMEDOUT,
   SRC_PAD_ADDED,
   CODEC_CHANGED,
-  ERROR,
+  ERROR_SIGNAL,
   LAST_SIGNAL
 };
 
@@ -303,7 +303,7 @@ fs_rtp_sub_stream_class_init (FsRtpSubStreamClass *klass)
    * This signal is emitted in any error condition
    *
    */
-  signals[ERROR] = g_signal_new ("error",
+  signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
@@ -1080,5 +1080,6 @@ fs_rtp_sub_stream_emit_error (FsRtpSubStream *substream,
     gchar *error_msg,
     gchar *debug_msg)
 {
-  g_signal_emit (substream, signals[ERROR], 0, error_no, error_msg, debug_msg);
+  g_signal_emit (substream, signals[ERROR_SIGNAL], 0, error_no, error_msg,
+      debug_msg);
 }
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 5beef69..0a9fb88 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -60,7 +60,7 @@ enum
   NEW_LOCAL_CANDIDATE,
   LOCAL_CANDIDATES_PREPARED,
   NEW_ACTIVE_CANDIDATE_PAIR,
-  ERROR,
+  ERROR_SIGNAL,
   LAST_SIGNAL
 };
 
@@ -953,7 +953,8 @@ fs_rawudp_component_emit_error (FsRawUdpComponent *self,
     gchar *error_msg,
     gchar *debug_msg)
 {
-  g_signal_emit (self, signals[ERROR], 0, error_no, error_msg, debug_msg);
+  g_signal_emit (self, signals[ERROR_SIGNAL], 0, error_no, error_msg,
+      debug_msg);
 }
 
 
-- 
1.5.6.5




More information about the farsight-commits mailing list