[farsight2/master] Remove the state property from the nice transmitter

[Olivier Crête]

---
 transmitters/nice/fs-nice-stream-transmitter.c |   38 ------------------------
 1 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index c9e07db..958d941 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -62,7 +62,6 @@ enum
   PROP_0,
   PROP_SENDING,
   PROP_PREFERRED_LOCAL_CANDIDATES,
-  PROP_STATE,
   PROP_STUN_IP,
   PROP_STUN_PORT,
   PROP_TURN_IP,
@@ -109,9 +108,6 @@ struct _FsNiceStreamTransmitterPrivate
   GList *candidates_to_set;
 
   NiceGstStream *gststream;
-
-  FsStreamState state;
-  FsStreamState *component_states;
 };
 
 #define FS_NICE_STREAM_TRANSMITTER_GET_PRIVATE(o)  \
@@ -235,8 +231,6 @@ fs_nice_stream_transmitter_class_init (FsNiceStreamTransmitterClass *klass)
   g_object_class_override_property (gobject_class, PROP_SENDING, "sending");
   g_object_class_override_property (gobject_class,
       PROP_PREFERRED_LOCAL_CANDIDATES, "preferred-local-candidates");
-  g_object_class_override_property (gobject_class,
-      PROP_STATE, "state");
 
   g_object_class_install_property (gobject_class, PROP_STUN_IP,
       g_param_spec_string (
@@ -309,7 +303,6 @@ fs_nice_stream_transmitter_init (FsNiceStreamTransmitter *self)
   self->priv = FS_NICE_STREAM_TRANSMITTER_GET_PRIVATE (self);
 
   self->priv->sending = TRUE;
-  self->priv->state = FS_STREAM_STATE_DISCONNECTED;
   self->priv->mutex = g_mutex_new ();
 
   self->priv->controlling_mode = TRUE;
@@ -374,8 +367,6 @@ fs_nice_stream_transmitter_finalize (GObject *object)
 
   fs_candidate_list_destroy (self->priv->preferred_local_candidates);
 
-  g_free (self->priv->component_states);
-
   g_free (self->priv->stun_ip);
   g_free (self->priv->turn_ip);
 
@@ -400,11 +391,6 @@ fs_nice_stream_transmitter_get_property (GObject *object,
     case PROP_PREFERRED_LOCAL_CANDIDATES:
       g_value_set_boxed (value, self->priv->preferred_local_candidates);
       break;
-    case PROP_STATE:
-      FS_NICE_STREAM_TRANSMITTER_LOCK (self);
-      g_value_set_enum (value, self->priv->state);
-      FS_NICE_STREAM_TRANSMITTER_UNLOCK (self);
-      break;
     case PROP_STUN_IP:
       if (self->priv->agent)
         g_object_get_property (G_OBJECT (self->priv->agent->agent),
@@ -997,10 +983,6 @@ fs_nice_stream_transmitter_build (FsNiceStreamTransmitter *self,
 
   FS_PARTICIPANT_DATA_UNLOCK (participant);
 
-  self->priv->component_states = g_new0 (FsStreamState,
-      self->priv->transmitter->components);
-
-
   self->priv->stream_id = nice_agent_add_stream (
       self->priv->agent->agent,
       self->priv->transmitter->components);
@@ -1084,8 +1066,6 @@ agent_state_changed (NiceAgent *agent,
 {
   FsNiceStreamTransmitter *self = FS_NICE_STREAM_TRANSMITTER (user_data);
   FsStreamState fs_state = nice_component_state_to_fs_stream_state (state);
-  gboolean identical = TRUE;
-  gint i;
 
   if (stream_id != self->priv->stream_id)
     return;
@@ -1094,24 +1074,6 @@ agent_state_changed (NiceAgent *agent,
       self->priv->stream_id, component_id, state);
 
   g_signal_emit_by_name (self, "state-changed", component_id, fs_state);
-
-  FS_NICE_STREAM_TRANSMITTER_LOCK (self);
-
-  self->priv->component_states[component_id - 1] = fs_state;
-
-  for (i = 0; i < self->priv->transmitter->components; i++)
-    if (self->priv->component_states[i] != fs_state)
-    {
-      identical = FALSE;
-      break;
-    }
-  if (identical)
-    self->priv->state = fs_state;
-
-  FS_NICE_STREAM_TRANSMITTER_UNLOCK (self);
-
-  if (identical)
-    g_object_notify (G_OBJECT (self), "state");
 }
 
 
-- 
1.5.6.5