summaryrefslogtreecommitdiff
path: root/transmitters
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-07-25 19:24:34 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2011-10-11 15:36:05 -0400
commit720630513361d7f4ce7fe4e4108a96d6d5914fd3 (patch)
treee1727fba5d0a436967dc7899458a7b37cd5fe5e6 /transmitters
parenta0b8044350a2030402a220555003f24964309d2b (diff)
downloadfarstream-720630513361d7f4ce7fe4e4108a96d6d5914fd3.tar.gz
rawudp component: Remove error debug msg
Diffstat (limited to 'transmitters')
-rw-r--r--transmitters/rawudp/fs-rawudp-component.c25
-rw-r--r--transmitters/rawudp/fs-rawudp-stream-transmitter.c6
2 files changed, 13 insertions, 18 deletions
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 25649c56..ee5aec7f 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -209,8 +209,7 @@ fs_rawudp_component_emit_local_candidates (FsRawUdpComponent *self,
static void
fs_rawudp_component_emit_error (FsRawUdpComponent *self,
gint error_no,
- gchar *error_msg,
- gchar *debug_msg);
+ gchar *error_msg);
static void
fs_rawudp_component_maybe_new_active_candidate_pair (FsRawUdpComponent *self);
static void
@@ -490,8 +489,7 @@ fs_rawudp_component_class_init (FsRawUdpComponentClass *klass)
* FsRawUdpComponent::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
*
* This signal is emitted in any error condition
*
@@ -502,8 +500,8 @@ fs_rawudp_component_class_init (FsRawUdpComponentClass *klass)
0,
NULL,
NULL,
- _fs_rawudp_marshal_VOID__ENUM_STRING_STRING,
- G_TYPE_NONE, 3, FS_TYPE_ERROR, G_TYPE_STRING, G_TYPE_STRING);
+ _fs_rawudp_marshal_VOID__ENUM_STRING,
+ G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);
g_type_class_add_private (klass, sizeof (FsRawUdpComponentPrivate));
@@ -1070,10 +1068,10 @@ fs_rawudp_component_maybe_emit_local_candidates (FsRawUdpComponent *self)
{
if (error->domain == FS_ERROR)
fs_rawudp_component_emit_error (self, error->code,
- error->message, error->message);
+ error->message);
else
fs_rawudp_component_emit_error (self, FS_ERROR_INTERNAL,
- "Error emitting local candidates", NULL);
+ "Error emitting local candidates");
}
g_clear_error (&error);
@@ -1481,7 +1479,7 @@ stun_timeout_func (gpointer user_data)
if (sysclock == NULL)
{
fs_rawudp_component_emit_error (self, FS_ERROR_INTERNAL,
- "Could not obtain gst system clock", NULL);
+ "Could not obtain gst system clock");
FS_RAWUDP_COMPONENT_LOCK(self);
goto interrupt;
}
@@ -1505,8 +1503,7 @@ stun_timeout_func (gpointer user_data)
!fs_rawudp_component_send_stun_locked (self, &error))
{
FS_RAWUDP_COMPONENT_UNLOCK(self);
- fs_rawudp_component_emit_error (self, error->code, "Could not send stun",
- error->message);
+ fs_rawudp_component_emit_error (self, error->code, error->message);
g_clear_error (&error);
FS_RAWUDP_COMPONENT_LOCK (self);
fs_rawudp_component_stop_stun_locked (self);
@@ -1567,11 +1564,9 @@ stun_timeout_func (gpointer user_data)
static void
fs_rawudp_component_emit_error (FsRawUdpComponent *self,
gint error_no,
- gchar *error_msg,
- gchar *debug_msg)
+ gchar *error_msg)
{
- g_signal_emit (self, signals[ERROR_SIGNAL], 0, error_no, error_msg,
- debug_msg);
+ g_signal_emit (self, signals[ERROR_SIGNAL], 0, error_no, error_msg);
}
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index b107683d..85aa7bbd 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -193,7 +193,7 @@ _component_new_active_candidate_pair (FsRawUdpComponent *component,
FsCandidate *local, FsCandidate *remote, gpointer user_data);
static void
_component_error (FsRawUdpComponent *component,
- FsError error_no, gchar *error_msg, gchar *debug_msg, gpointer user_data);
+ FsError error_no, gchar *error_msg, gpointer user_data);
static void
_component_known_source_packet_received (FsRawUdpComponent *component,
guint component_id, GstBuffer *buffer, gpointer user_data);
@@ -891,12 +891,12 @@ _component_new_active_candidate_pair (FsRawUdpComponent *component,
static void
_component_error (FsRawUdpComponent *component,
- FsError error_no, gchar *error_msg, gchar *debug_msg, gpointer user_data)
+ FsError error_no, gchar *error_msg, gpointer user_data)
{
FsRawUdpStreamTransmitter *self = FS_RAWUDP_STREAM_TRANSMITTER (user_data);
fs_stream_transmitter_emit_error (FS_STREAM_TRANSMITTER (self), error_no,
- error_msg, debug_msg);
+ error_msg, NULL);
}
static void