[telepathy-gabble/master] Delete old per-RTP-content state code.
Will Thompson
will.thompson at collabora.co.uk
Thu May 21 03:40:57 PDT 2009
---
src/jingle-content.c | 33 ----------------
src/jingle-content.h | 12 ------
src/jingle-media-rtp.c | 100 ------------------------------------------------
src/jingle-media-rtp.h | 14 -------
4 files changed, 0 insertions(+), 159 deletions(-)
diff --git a/src/jingle-content.c b/src/jingle-content.c
index 09916b7..723d1a3 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -1041,39 +1041,6 @@ gabble_jingle_content_is_created_by_us (GabbleJingleContent *c)
return c->priv->created_by_us;
}
-/**
- * gabble_jingle_content_handle_info:
- * @self: a jingle content
- * @session_info_payload: a child node of a <jingle action='session-info'>
- * stanza
- * @handled: a location at which to store whether this content handled the
- * payload
- * @error: a location at which to store an error if the content handled the
- * payload, but it was malformed.
- *
- * Returns: %FALSE if handling @session_info_payload caused an error; %TRUE if
- * it was handled successfully or not handled.
- */
-gboolean
-gabble_jingle_content_handle_info (GabbleJingleContent *self,
- LmMessageNode *session_info_payload,
- gboolean *handled,
- GError **error)
-{
- GabbleJingleContentHandleInfoFunc f =
- GABBLE_JINGLE_CONTENT_GET_CLASS (self)->handle_info;
-
- if (f == NULL)
- {
- *handled = FALSE;
- return TRUE;
- }
- else
- {
- return f (self, session_info_payload, handled, error);
- }
-}
-
const gchar *
gabble_jingle_content_get_name (GabbleJingleContent *self)
{
diff --git a/src/jingle-content.h b/src/jingle-content.h
index 73f9a5d..0bed069 100644
--- a/src/jingle-content.h
+++ b/src/jingle-content.h
@@ -56,11 +56,6 @@ struct _JingleCandidate {
int network;
};
-typedef gboolean (*GabbleJingleContentHandleInfoFunc)(GabbleJingleContent *self,
- LmMessageNode *session_info_payload,
- gboolean *handled,
- GError **error);
-
typedef struct _GabbleJingleContentClass GabbleJingleContentClass;
GType gabble_jingle_content_get_type (void);
@@ -88,8 +83,6 @@ struct _GabbleJingleContentClass {
void (*parse_description) (GabbleJingleContent *, LmMessageNode *,
GError **);
void (*produce_description) (GabbleJingleContent *, LmMessageNode *);
-
- GabbleJingleContentHandleInfoFunc handle_info;
};
typedef struct _GabbleJingleContentPrivate GabbleJingleContentPrivate;
@@ -131,10 +124,5 @@ const gchar *gabble_jingle_content_get_name (GabbleJingleContent *self);
void gabble_jingle_content_maybe_send_description (GabbleJingleContent *self);
-gboolean gabble_jingle_content_handle_info (GabbleJingleContent *self,
- LmMessageNode *session_info_payload,
- gboolean *handled,
- GError **error);
-
#endif /* __JINGLE_CONTENT_H__ */
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index d944b73..e03f04e 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -57,7 +57,6 @@ static guint signals[LAST_SIGNAL] = {0};
enum
{
PROP_MEDIA_TYPE = 1,
- PROP_REMOTE_STATE,
PROP_REMOTE_MUTE,
LAST_PROPERTY
};
@@ -78,7 +77,6 @@ struct _GabbleJingleMediaRtpPrivate
GList *remote_codecs;
JingleMediaType media_type;
- JingleRtpRemoteState remote_state;
gboolean remote_mute;
gboolean dispose_has_run;
@@ -191,9 +189,6 @@ gabble_jingle_media_rtp_get_property (GObject *object,
case PROP_MEDIA_TYPE:
g_value_set_uint (value, priv->media_type);
break;
- case PROP_REMOTE_STATE:
- g_value_set_uint (value, priv->remote_state);
- break;
case PROP_REMOTE_MUTE:
g_value_set_boolean (value, priv->remote_mute);
break;
@@ -229,11 +224,6 @@ static void parse_description (GabbleJingleContent *content,
LmMessageNode *desc_node, GError **error);
static void produce_description (GabbleJingleContent *obj,
LmMessageNode *content_node);
-static gboolean gabble_jingle_media_rtp_handle_info (
- GabbleJingleContent *content,
- LmMessageNode *payload,
- gboolean *handled,
- GError **error);
static void
gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
@@ -250,7 +240,6 @@ gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
content_class->parse_description = parse_description;
content_class->produce_description = produce_description;
- content_class->handle_info = gabble_jingle_media_rtp_handle_info;
param_spec = g_param_spec_uint ("media-type", "RTP media type",
"Media type.",
@@ -259,14 +248,6 @@ gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
g_object_class_install_property (object_class, PROP_MEDIA_TYPE, param_spec);
- param_spec = g_param_spec_uint ("remote-state", "Remote state",
- "Whether the peer is muted, has us on hold, is ringing, or is active on "
- "this content",
- JINGLE_RTP_REMOTE_STATE_ACTIVE, JINGLE_RTP_REMOTE_STATE_ALL_FLAGS,
- JINGLE_RTP_REMOTE_STATE_ACTIVE,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (object_class, PROP_REMOTE_STATE, param_spec);
-
param_spec = g_param_spec_boolean ("remote-mute", "Remote mute",
"TRUE if the peer has muted this stream", FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -831,84 +812,3 @@ gabble_jingle_media_rtp_get_remote_codecs (GabbleJingleMediaRtp *self)
{
return self->priv->remote_codecs;
}
-
-static gboolean
-gabble_jingle_media_rtp_handle_info (GabbleJingleContent *content,
- LmMessageNode *payload,
- gboolean *handled,
- GError **error)
-{
- GabbleJingleMediaRtp *self = GABBLE_JINGLE_MEDIA_RTP (content);
- const gchar *ns = lm_message_node_get_namespace (payload);
- const gchar *elt = lm_message_node_get_name (payload);
- const gchar *name_attr = lm_message_node_get_attribute (payload, "name");
- const gchar *content_name = gabble_jingle_content_get_name (content);
- JingleRtpRemoteState state = self->priv->remote_state;
-
- if (tp_strdiff (ns, NS_JINGLE_RTP_INFO))
- {
- *handled = FALSE;
- return TRUE;
- }
-
- *handled = TRUE;
-
- if (!tp_strdiff (elt, "active"))
- {
- /* Clear all states, we're active */
- state = JINGLE_RTP_REMOTE_STATE_ACTIVE;
- }
- else if (!tp_strdiff (elt, "ringing"))
- {
- state |= JINGLE_RTP_REMOTE_STATE_RINGING;
- }
- else if (!tp_strdiff (elt, "hold"))
- {
- state |= JINGLE_RTP_REMOTE_STATE_HOLD;
- }
- else if (!tp_strdiff (elt, "unhold"))
- {
- state &= ~JINGLE_RTP_REMOTE_STATE_HOLD;
- }
- /* XEP-0178 says that only <mute/> and <unmute/> can have a name='' attribute. */
- else if (!tp_strdiff (elt, "mute"))
- {
- if (name_attr != NULL && tp_strdiff (name_attr, content_name))
- return TRUE;
-
- state |= JINGLE_RTP_REMOTE_STATE_MUTE;
- }
- else if (!tp_strdiff (elt, "unmute"))
- {
- if (name_attr != NULL && tp_strdiff (name_attr, content_name))
- return TRUE;
-
- state &= ~JINGLE_RTP_REMOTE_STATE_MUTE;
- }
- else
- {
- g_set_error (error, GABBLE_XMPP_ERROR, XMPP_ERROR_JINGLE_UNSUPPORTED_INFO,
- "<%s> is not known in namespace %s", elt, ns);
- return FALSE;
- }
-
- if (state != self->priv->remote_state)
- {
- DEBUG ("moving from remote state %u to %u (due to <%s/>)",
- self->priv->remote_state, state, elt);
- self->priv->remote_state = state;
- g_object_notify ((GObject *) self, "remote-state");
- }
- else
- {
- DEBUG ("already in state %u (<%s/> had no effect)", state, elt);
- }
-
- return TRUE;
-}
-
-JingleRtpRemoteState
-gabble_jingle_media_rtp_get_remote_state (GabbleJingleMediaRtp *self)
-{
- return self->priv->remote_state;
-}
diff --git a/src/jingle-media-rtp.h b/src/jingle-media-rtp.h
index eb0b727..5666a24 100644
--- a/src/jingle-media-rtp.h
+++ b/src/jingle-media-rtp.h
@@ -28,17 +28,6 @@
G_BEGIN_DECLS
-typedef enum {
- JINGLE_RTP_REMOTE_STATE_ACTIVE = 0,
- JINGLE_RTP_REMOTE_STATE_RINGING = 1 << 0,
- JINGLE_RTP_REMOTE_STATE_MUTE = 1 << 1,
- JINGLE_RTP_REMOTE_STATE_HOLD = 1 << 2,
-} JingleRtpRemoteState;
-
-#define JINGLE_RTP_REMOTE_STATE_ALL_FLAGS \
- ( JINGLE_RTP_REMOTE_STATE_RINGING | JINGLE_RTP_REMOTE_STATE_MUTE \
- | JINGLE_RTP_REMOTE_STATE_HOLD )
-
typedef struct _GabbleJingleMediaRtpClass GabbleJingleMediaRtpClass;
GType gabble_jingle_media_rtp_get_type (void);
@@ -89,8 +78,5 @@ GList *gabble_jingle_media_rtp_get_remote_codecs (GabbleJingleMediaRtp *self);
JingleCodec * jingle_media_rtp_codec_new (guint id, const gchar *name,
guint clockrate, guint channels, GHashTable *params);
-JingleRtpRemoteState gabble_jingle_media_rtp_get_remote_state (
- GabbleJingleMediaRtp *self);
-
#endif /* __JINGLE_MEDIA_RTP_H__ */
--
1.5.6.5
More information about the telepathy-commits
mailing list