summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gst-libs/gst/farsight/fs-stream-transmitter.c15
-rw-r--r--gst-libs/gst/farsight/fs-stream-transmitter.h3
-rw-r--r--gst/fsrtpconference/fs-rtp-stream.c4
-rw-r--r--tests/check/transmitter/generic.c6
-rw-r--r--tests/check/transmitter/generic.h2
-rw-r--r--transmitters/nice/fs-nice-stream-transmitter.c7
-rw-r--r--transmitters/rawudp/fs-rawudp-stream-transmitter.c2
7 files changed, 16 insertions, 23 deletions
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index a919eb9a..f1b2ff4c 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -153,8 +153,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
* FsStreamTransmitter::error:
* @self: #FsStreamTransmitter that emitted the signal
* @errorno: The number of the error
- * @error_msg: Error message to be displayed to user
- * @debug_msg: Debugging error message
+ * @error_msg: Error message (for the programmer)
*
* This signal is emitted in any error condition
*
@@ -165,8 +164,8 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
0,
NULL,
NULL,
- _fs_marshal_VOID__ENUM_STRING_STRING,
- G_TYPE_NONE, 3, FS_TYPE_ERROR, G_TYPE_STRING, G_TYPE_STRING);
+ _fs_marshal_VOID__ENUM_STRING,
+ G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);
/**
* FsStreamTransmitter::new-active-candidate-pair:
@@ -439,8 +438,7 @@ fs_stream_transmitter_stop (FsStreamTransmitter *streamtransmitter)
* fs_stream_transmitter_emit_error:
* @streamtransmitter: #FsStreamTransmitter on which to emit the error signal
* @error_no: The number of the error
- * @error_msg: Error message to be displayed to user
- * @debug_msg: Debugging error message
+ * @error_msg: Error message (for the programmer)
*
* This function emit the "error" signal on a #FsStreamTransmitter, it should
* only be called by subclasses.
@@ -448,9 +446,8 @@ fs_stream_transmitter_stop (FsStreamTransmitter *streamtransmitter)
void
fs_stream_transmitter_emit_error (FsStreamTransmitter *streamtransmitter,
gint error_no,
- const gchar *error_msg,
- const gchar *debug_msg)
+ const gchar *error_msg)
{
g_signal_emit (streamtransmitter, signals[ERROR_SIGNAL], 0, error_no,
- error_msg, debug_msg);
+ error_msg);
}
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.h b/gst-libs/gst/farsight/fs-stream-transmitter.h
index 3a01a515..812e093b 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.h
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.h
@@ -119,8 +119,7 @@ void fs_stream_transmitter_stop (FsStreamTransmitter *streamtransmitter);
void fs_stream_transmitter_emit_error (FsStreamTransmitter *streamtransmitter,
gint error_no,
- const gchar *error_msg,
- const gchar *debug_msg);
+ const gchar *error_msg);
G_END_DECLS
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index f3dad7da..5d661afe 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -146,7 +146,6 @@ static void _transmitter_error (
FsStreamTransmitter *stream_transmitter,
gint errorno,
gchar *error_msg,
- gchar *debug_msg,
gpointer user_data);
static void _substream_codec_changed (FsRtpSubStream *substream,
FsRtpStream *stream);
@@ -883,12 +882,11 @@ _transmitter_error (
FsStreamTransmitter *stream_transmitter,
gint errorno,
gchar *error_msg,
- gchar *debug_msg,
gpointer user_data)
{
FsStream *stream = FS_STREAM (user_data);
- fs_stream_emit_error (stream, errorno, error_msg, debug_msg);
+ fs_stream_emit_error (stream, errorno, error_msg, NULL);
}
static void
diff --git a/tests/check/transmitter/generic.c b/tests/check/transmitter/generic.c
index 0784f1a6..1083e16a 100644
--- a/tests/check/transmitter/generic.c
+++ b/tests/check/transmitter/generic.c
@@ -42,10 +42,10 @@ _transmitter_error (FsTransmitter *transmitter, gint errorno, gchar *error_msg,
void
stream_transmitter_error (FsStreamTransmitter *streamtransmitter,
- gint errorno, gchar *error_msg, gchar *debug_msg, gpointer user_data)
+ gint errorno, gchar *error_msg, gpointer user_data)
{
- ts_fail ("StreamTransmitter(%x) error(%d) msg:%s debug:%s", streamtransmitter,
- errorno, error_msg, debug_msg);
+ ts_fail ("StreamTransmitter(%x) error(%d) msg:%s", streamtransmitter,
+ errorno, error_msg);
}
void
diff --git a/tests/check/transmitter/generic.h b/tests/check/transmitter/generic.h
index 200b4c8e..4aadf80c 100644
--- a/tests/check/transmitter/generic.h
+++ b/tests/check/transmitter/generic.h
@@ -31,7 +31,7 @@ void setup_fakesrc (FsTransmitter *trans, GstElement *pipeline,
guint component_id);
void stream_transmitter_error (FsStreamTransmitter *streamtransmitter,
- gint errorno, gchar *error_msg, gchar *debug_msg, gpointer user_data);
+ gint errorno, gchar *error_msg, gpointer user_data);
gboolean bus_error_callback (GstBus *bus, GstMessage *message,
gpointer user_data);
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index 7754c83d..3ffe91c0 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -1741,7 +1741,7 @@ agent_gathering_done_idle (gpointer data)
remote_candidates))
{
fs_stream_transmitter_emit_error (FS_STREAM_TRANSMITTER (self),
- FS_ERROR_INTERNAL, "Could not set forced candidates",
+ FS_ERROR_INTERNAL,
"Error setting delayed forced remote candidates");
}
}
@@ -1758,7 +1758,7 @@ agent_gathering_done_idle (gpointer data)
self->priv->password))
{
fs_stream_transmitter_emit_error (FS_STREAM_TRANSMITTER (self),
- FS_ERROR_INTERNAL, "Error setting delayed remote candidates",
+ FS_ERROR_INTERNAL,
"Could not set the security credentials");
fs_candidate_list_destroy (remote_candidates);
return FALSE;
@@ -1771,8 +1771,7 @@ agent_gathering_done_idle (gpointer data)
remote_candidates, &error))
{
fs_stream_transmitter_emit_error (FS_STREAM_TRANSMITTER (self),
- error->code, error->message, "Error setting delayed remote"
- " candidates");
+ error->code, error->message);
}
g_clear_error (&error);
}
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 85aa7bbd..35940f3d 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -896,7 +896,7 @@ _component_error (FsRawUdpComponent *component,
FsRawUdpStreamTransmitter *self = FS_RAWUDP_STREAM_TRANSMITTER (user_data);
fs_stream_transmitter_emit_error (FS_STREAM_TRANSMITTER (self), error_no,
- error_msg, NULL);
+ error_msg);
}
static void
View Lorry Controller Status