stop using RakiaDirection

We were already mixing it with TpMediaStreamDirection, causing enum casting
errors. Both enums were having the same values anyway.

6 files changed, 81 insertions, 88 deletions

diff --git a/rakia/call-channel.c b/rakia/call-channel.c
index 63280b4..2c70ccf 100644
--- a/rakia/call-channel.c
+++ b/rakia/call-channel.c
@@ -226,12 +226,12 @@ rakia_call_channel_constructed (GObject *obj)
       if (tp_base_call_channel_has_initial_audio (bcc, &initial_audio_name))
         rakia_sip_session_add_media (self->priv->session,
             TP_MEDIA_STREAM_TYPE_AUDIO, initial_audio_name,
-            RAKIA_DIRECTION_BIDIRECTIONAL);
+            TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);
 
       if (tp_base_call_channel_has_initial_video (bcc, &initial_video_name))
         rakia_sip_session_add_media (self->priv->session,
             TP_MEDIA_STREAM_TYPE_VIDEO, initial_video_name,
-            RAKIA_DIRECTION_BIDIRECTIONAL);
+            TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);
 
       actor = tp_base_channel_get_self_handle (bc);
       reason = TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED;
@@ -666,7 +666,7 @@ new_content (RakiaCallChannel *self,
    */
   if (disposition == TP_CALL_CONTENT_DISPOSITION_INITIAL)
     rakia_sip_media_set_requested_direction (media,
-        RAKIA_DIRECTION_BIDIRECTIONAL);
+        TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);
 
 
   content = rakia_call_content_new (self, media, object_path,
diff --git a/rakia/call-stream.c b/rakia/call-stream.c
index d4b0612..6ad5945 100644
--- a/rakia/call-stream.c
+++ b/rakia/call-stream.c
@@ -234,7 +234,7 @@ rakia_call_stream_constructed (GObject *object)
 
   /* Put the initial value */
   if (rakia_sip_media_get_requested_direction (priv->media) &
-      RAKIA_DIRECTION_RECEIVE)
+      TP_MEDIA_STREAM_DIRECTION_RECEIVE)
     tp_base_call_stream_update_remote_sending_state (bcs, contact,
         TP_SENDING_STATE_PENDING_SEND, 0,
         TP_CALL_STATE_CHANGE_REASON_PROGRESS_MADE, "", "");
@@ -278,7 +278,7 @@ rakia_call_stream_report_sending_failure (TpBaseMediaCallStream *bmcs,
   RakiaCallStream *self = RAKIA_CALL_STREAM (bmcs);
   TpBaseCallStream *bcs = TP_BASE_CALL_STREAM (self);
   RakiaCallStreamPrivate *priv = self->priv;
-  RakiaDirection current_direction =
+  TpMediaStreamDirection current_direction =
       rakia_sip_media_get_requested_direction (priv->media);
   TpBaseChannel *bchan = TP_BASE_CHANNEL (priv->channel);
   TpHandle self_handle = tp_base_channel_get_self_handle (bchan);
@@ -286,11 +286,11 @@ rakia_call_stream_report_sending_failure (TpBaseMediaCallStream *bmcs,
   tp_base_call_stream_update_local_sending_state (bcs,
       TP_SENDING_STATE_NONE, self_handle, reason, dbus_reason, message);
 
-  if (!(current_direction & RAKIA_DIRECTION_SEND))
+  if (!(current_direction & TP_MEDIA_STREAM_DIRECTION_SEND))
     return;
 
   rakia_sip_media_set_requested_direction (priv->media,
-      current_direction & ~RAKIA_DIRECTION_SEND);
+      current_direction & ~TP_MEDIA_STREAM_DIRECTION_SEND);
 }
 
 static void
@@ -304,9 +304,9 @@ rakia_call_stream_report_receiving_failure (TpBaseMediaCallStream *bmcs,
   TpBaseCallStream *bcs = TP_BASE_CALL_STREAM (self);
   RakiaCallStreamPrivate *priv = self->priv;
   gboolean can_request_receiving;
-  RakiaDirection current_requested_direction =
+  TpMediaStreamDirection current_requested_direction =
       rakia_sip_media_get_requested_direction (priv->media);
-  RakiaDirection current_direction =
+  TpMediaStreamDirection current_direction =
       rakia_sip_media_get_direction (priv->media);
   TpBaseChannel *bchan = TP_BASE_CHANNEL (priv->channel);
 
@@ -320,10 +320,10 @@ rakia_call_stream_report_receiving_failure (TpBaseMediaCallStream *bmcs,
       return;
     }
 
-  if (!(current_requested_direction & RAKIA_DIRECTION_RECEIVE))
+  if (!(current_requested_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE))
     return;
 
-  if (current_direction & RAKIA_DIRECTION_RECEIVE)
+  if (current_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE)
     tp_base_call_stream_update_remote_sending_state (bcs,
         tp_base_channel_get_target_handle (bchan),
         TP_SENDING_STATE_PENDING_STOP_SENDING,
@@ -331,7 +331,7 @@ rakia_call_stream_report_receiving_failure (TpBaseMediaCallStream *bmcs,
         reason, dbus_reason, message);
 
   rakia_sip_media_set_requested_direction (priv->media,
-      current_requested_direction & ~RAKIA_DIRECTION_RECEIVE);
+      current_requested_direction & ~TP_MEDIA_STREAM_DIRECTION_RECEIVE);
 }
 
 static GPtrArray *
@@ -437,21 +437,21 @@ static void rakia_call_stream_request_receiving (
   RakiaCallStream *self = RAKIA_CALL_STREAM (stream);
   TpBaseCallStream *bcs = TP_BASE_CALL_STREAM (stream);
   RakiaCallStreamPrivate *priv = self->priv;
-  RakiaDirection current_requested_direction =
+  TpMediaStreamDirection current_requested_direction =
       rakia_sip_media_get_requested_direction (priv->media);
-  RakiaDirection current_direction =
+  TpMediaStreamDirection current_direction =
       rakia_sip_media_get_direction (priv->media);
   TpBaseChannel *bchan = TP_BASE_CHANNEL (priv->channel);
 
-  if ((!!(current_requested_direction & RAKIA_DIRECTION_RECEIVE)) == receive)
+  if ((!!(current_requested_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE)) == receive)
     return;
 
   if (receive)
     {
       rakia_sip_media_set_requested_direction (priv->media,
-          current_requested_direction | RAKIA_DIRECTION_RECEIVE);
+          current_requested_direction | TP_MEDIA_STREAM_DIRECTION_RECEIVE);
 
-      if (current_direction & RAKIA_DIRECTION_RECEIVE)
+      if (current_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE)
            tp_base_call_stream_update_remote_sending_state (bcs,
                tp_base_channel_get_target_handle (bchan),
                TP_SENDING_STATE_SENDING,
@@ -462,9 +462,9 @@ static void rakia_call_stream_request_receiving (
   else
     {
       rakia_sip_media_set_requested_direction (priv->media,
-          current_requested_direction & ~RAKIA_DIRECTION_RECEIVE);
+          current_requested_direction & ~TP_MEDIA_STREAM_DIRECTION_RECEIVE);
 
-      if (!(current_direction & RAKIA_DIRECTION_RECEIVE))
+      if (!(current_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE))
         tp_base_call_stream_update_remote_sending_state (bcs,
             tp_base_channel_get_target_handle (bchan),
             TP_SENDING_STATE_NONE,
@@ -481,11 +481,11 @@ rakia_call_stream_set_sending (TpBaseMediaCallStream *stream,
 {
   RakiaCallStream *self = RAKIA_CALL_STREAM (stream);
   RakiaCallStreamPrivate *priv = self->priv;
-  RakiaDirection current_direction =
+  TpMediaStreamDirection current_direction =
       rakia_sip_media_get_requested_direction (priv->media);
   gboolean mutable_contents;
 
-  if (!!(current_direction & RAKIA_DIRECTION_SEND) == sending)
+  if (!!(current_direction & TP_MEDIA_STREAM_DIRECTION_SEND) == sending)
     return TRUE;
 
   /* Can't change the actual direction of a stream if we disable modifying
@@ -505,10 +505,10 @@ rakia_call_stream_set_sending (TpBaseMediaCallStream *stream,
 
   if (sending)
     rakia_sip_media_set_requested_direction (priv->media,
-        current_direction | RAKIA_DIRECTION_SEND);
+        current_direction | TP_MEDIA_STREAM_DIRECTION_SEND);
   else
     rakia_sip_media_set_requested_direction (priv->media,
-        current_direction & ~RAKIA_DIRECTION_SEND);
+        current_direction & ~TP_MEDIA_STREAM_DIRECTION_SEND);
 
   return TRUE;
 }
@@ -583,10 +583,10 @@ rakia_call_stream_update_direction (RakiaCallStream *self)
   TpBaseChannel *bchan = TP_BASE_CHANNEL (priv->channel);
   TpHandle contact = tp_base_channel_get_target_handle (bchan);
   TpHandle self_handle = tp_base_channel_get_self_handle (bchan);
-  RakiaDirection direction = rakia_sip_media_get_direction (priv->media);
-  RakiaDirection remote_direction =
+  TpMediaStreamDirection direction = rakia_sip_media_get_direction (priv->media);
+  TpMediaStreamDirection remote_direction =
       rakia_sip_media_get_remote_direction (priv->media);
-  RakiaDirection requested_direction =
+  TpMediaStreamDirection requested_direction =
       rakia_sip_media_get_requested_direction (priv->media);
   TpLocalHoldState hold_state =
       tp_base_media_call_channel_get_local_hold_state (
@@ -598,10 +598,10 @@ rakia_call_stream_update_direction (RakiaCallStream *self)
       rakia_direction_to_string (remote_direction),
       hold_state != TP_LOCAL_HOLD_STATE_UNHELD);
 
-  if ((direction & RAKIA_DIRECTION_SEND ||
+  if ((direction & TP_MEDIA_STREAM_DIRECTION_SEND ||
           !rakia_sip_media_has_remote_media (priv->media) ||
           hold_state != TP_LOCAL_HOLD_STATE_UNHELD) &&
-      requested_direction & RAKIA_DIRECTION_SEND)
+      requested_direction & TP_MEDIA_STREAM_DIRECTION_SEND)
     {
       tp_base_call_stream_update_local_sending_state (bcs,
           TP_SENDING_STATE_SENDING, self_handle,
@@ -609,7 +609,7 @@ rakia_call_stream_update_direction (RakiaCallStream *self)
       if (rakia_sip_media_has_remote_media (priv->media))
         tp_base_media_call_stream_set_local_sending (bmcs, TRUE);
     }
-  else if (remote_direction & RAKIA_DIRECTION_SEND)
+  else if (remote_direction & TP_MEDIA_STREAM_DIRECTION_SEND)
     {
       if (tp_base_call_stream_get_local_sending_state (bcs) !=
           TP_SENDING_STATE_SENDING)
@@ -626,13 +626,13 @@ rakia_call_stream_update_direction (RakiaCallStream *self)
     }
 
 
-  if ((direction & RAKIA_DIRECTION_RECEIVE) &&
-      (requested_direction & RAKIA_DIRECTION_RECEIVE))
+  if ((direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE) &&
+      (requested_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE))
     tp_base_call_stream_update_remote_sending_state (bcs, contact,
         TP_SENDING_STATE_SENDING, 0,
         TP_CALL_STATE_CHANGE_REASON_PROGRESS_MADE, "", "");
-  else if (!(direction & RAKIA_DIRECTION_RECEIVE) &&
-      !(requested_direction & RAKIA_DIRECTION_RECEIVE))
+  else if (!(direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE) &&
+      !(requested_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE))
     tp_base_call_stream_update_remote_sending_state (bcs, contact,
         TP_SENDING_STATE_NONE, 0,
         TP_CALL_STATE_CHANGE_REASON_PROGRESS_MADE, "", "");
diff --git a/rakia/sip-media.c b/rakia/sip-media.c
index 3e5e7b3..6eb15e8 100644
--- a/rakia/sip-media.c
+++ b/rakia/sip-media.c
@@ -97,8 +97,8 @@ struct _RakiaSipMediaPrivate
   GPtrArray *local_candidates;
   gboolean local_candidates_prepared;
 
-  RakiaDirection direction;
-  RakiaDirection requested_direction;
+  TpMediaStreamDirection direction;
+  TpMediaStreamDirection requested_direction;
 
   gboolean hold_requested;
   gboolean created_locally;
@@ -357,7 +357,7 @@ priv_get_preferred_local_candidates (RakiaSipMedia *media,
 
 static void
 rakia_sip_media_set_direction (RakiaSipMedia *media,
-    RakiaDirection direction)
+    TpMediaStreamDirection direction)
 {
   RakiaSipMediaPrivate *priv = RAKIA_SIP_MEDIA_GET_PRIVATE (media);
 
@@ -367,11 +367,11 @@ rakia_sip_media_set_direction (RakiaSipMedia *media,
 }
 
 
-static RakiaDirection
+static TpMediaStreamDirection
 priv_get_sdp_direction (RakiaSipMedia *media, gboolean authoritative)
 {
   RakiaSipMediaPrivate *priv = RAKIA_SIP_MEDIA_GET_PRIVATE (media);
-  RakiaDirection direction = priv->requested_direction;
+  TpMediaStreamDirection direction = priv->requested_direction;
 
   DEBUG ("req: %s auth: %d remote: %p %s hold: %d",
       rakia_direction_to_string (direction),
@@ -385,7 +385,7 @@ priv_get_sdp_direction (RakiaSipMedia *media, gboolean authoritative)
 
   /* Don't allow send, only receive if a hold is requested */
   if (priv->hold_requested)
-    direction &= RAKIA_DIRECTION_SEND;
+    direction &= TP_MEDIA_STREAM_DIRECTION_SEND;
 
   if (!authoritative)
     rakia_sip_media_set_direction (media, direction);
@@ -421,16 +421,16 @@ rakia_sip_media_generate_sdp (RakiaSipMedia *media, GString *out,
 
   switch (priv_get_sdp_direction (media, authoritative))
     {
-    case RAKIA_DIRECTION_BIDIRECTIONAL:
+    case TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL:
       dirline = "";
       break;
-    case RAKIA_DIRECTION_SEND:
+    case TP_MEDIA_STREAM_DIRECTION_SEND:
       dirline = "a=sendonly\r\n";
       break;
-    case RAKIA_DIRECTION_RECEIVE:
+    case TP_MEDIA_STREAM_DIRECTION_RECEIVE:
       dirline = "a=recvonly\r\n";
       break;
-    case RAKIA_DIRECTION_NONE:
+    case TP_MEDIA_STREAM_DIRECTION_NONE:
       dirline = "a=inactive\r\n";
       break;
     default:
@@ -548,12 +548,12 @@ rakia_sip_candidate_free (RakiaSipCandidate *candidate)
 
 
 
-RakiaDirection
+TpMediaStreamDirection
 rakia_direction_from_remote_media (const sdp_media_t *media)
 {
   sdp_mode_t mode = media->m_mode;
-  return ((mode & sdp_recvonly)? RAKIA_DIRECTION_SEND : 0)
-       | ((mode & sdp_sendonly)? RAKIA_DIRECTION_RECEIVE : 0);
+  return ((mode & sdp_recvonly)? TP_MEDIA_STREAM_DIRECTION_SEND : 0)
+       | ((mode & sdp_sendonly)? TP_MEDIA_STREAM_DIRECTION_RECEIVE : 0);
 }
 
 
@@ -584,29 +584,29 @@ rakia_sdp_get_string_attribute (const sdp_attribute_t *attrs, const char *name)
 }
 
 
-RakiaDirection
+TpMediaStreamDirection
 rakia_sip_media_get_remote_direction (RakiaSipMedia *media)
 {
   RakiaSipMediaPrivate *priv = RAKIA_SIP_MEDIA_GET_PRIVATE (media);
 
   if (priv->remote_media == NULL)
-    return RAKIA_DIRECTION_NONE;
+    return TP_MEDIA_STREAM_DIRECTION_NONE;
 
   return rakia_direction_from_remote_media (priv->remote_media);
 }
 
 
 static void
-priv_update_sending (RakiaSipMedia *media, RakiaDirection send_direction)
+priv_update_sending (RakiaSipMedia *media, TpMediaStreamDirection send_direction)
 {
   RakiaSipMediaPrivate *priv = RAKIA_SIP_MEDIA_GET_PRIVATE (media);
-  RakiaDirection recv_direction;
+  TpMediaStreamDirection recv_direction;
 
   /* Only keep the receiving bit from the current direction */
-  recv_direction = priv->direction & RAKIA_DIRECTION_RECEIVE;
+  recv_direction = priv->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE;
 
   /* And only the sending bit from the new direction */
-  send_direction &= RAKIA_DIRECTION_SEND;
+  send_direction &= TP_MEDIA_STREAM_DIRECTION_SEND;
 
   rakia_sip_media_set_direction (media, send_direction | recv_direction);
 }
@@ -614,7 +614,7 @@ priv_update_sending (RakiaSipMedia *media, RakiaDirection send_direction)
 
 void
 rakia_sip_media_set_requested_direction (RakiaSipMedia *media,
-    RakiaDirection direction)
+    TpMediaStreamDirection direction)
 {
   RakiaSipMediaPrivate *priv = RAKIA_SIP_MEDIA_GET_PRIVATE (media);
 
@@ -822,7 +822,7 @@ rakia_sip_media_set_remote_media (RakiaSipMedia *media,
   gboolean transport_changed = TRUE;
   gboolean codecs_changed = TRUE;
   guint new_direction;
-  RakiaDirection direction_up_mask;
+  TpMediaStreamDirection direction_up_mask;
 
   DEBUG ("enter");
 
@@ -874,7 +874,7 @@ rakia_sip_media_set_remote_media (RakiaSipMedia *media,
    */
   if (authoritative)
     direction_up_mask = priv->hold_requested ?
-        RAKIA_DIRECTION_SEND : RAKIA_DIRECTION_BIDIRECTIONAL;
+        TP_MEDIA_STREAM_DIRECTION_SEND : TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
   else
     direction_up_mask = 0;
 
@@ -901,7 +901,7 @@ rakia_sip_media_set_remote_media (RakiaSipMedia *media,
 
       /* Disable sending at this point if it will be disabled
        * accordingly to the new direction */
-      priv_update_sending (media, new_direction & RAKIA_DIRECTION_SEND);
+      priv_update_sending (media, new_direction & TP_MEDIA_STREAM_DIRECTION_SEND);
     }
 
   /* First add the new candidate, then update the codec set.
@@ -951,7 +951,7 @@ rakia_sip_media_set_remote_media (RakiaSipMedia *media,
   return TRUE;
 }
 
-RakiaDirection
+TpMediaStreamDirection
 rakia_sip_media_get_requested_direction (RakiaSipMedia *self)
 {
   return self->priv->requested_direction;
@@ -973,13 +973,13 @@ rakia_sip_media_is_ready (RakiaSipMedia *self)
 
   MEDIA_DEBUG (self, "is_ready, requested_recv: %d can_recv: %d "
       "local_cand_prep: %d local_codecs: %p local_inter_pending: %d",
-      priv->requested_direction & RAKIA_DIRECTION_RECEIVE,
+      priv->requested_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE,
       priv->can_receive,
       self->priv->local_candidates_prepared,
       self->priv->local_codecs,
       priv->codec_intersect_pending);
 
-  if (priv->requested_direction & RAKIA_DIRECTION_RECEIVE &&
+  if (priv->requested_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE &&
       !priv->can_receive &&
       !priv->hold_requested)
     return FALSE;
@@ -1105,7 +1105,7 @@ RakiaSipMedia *
 rakia_sip_media_new (RakiaSipSession *session,
     TpMediaStreamType media_type,
     const gchar *name,
-    RakiaDirection requested_direction,
+    TpMediaStreamDirection requested_direction,
     gboolean created_locally,
     gboolean hold_requested)
 {
@@ -1113,7 +1113,7 @@ rakia_sip_media_new (RakiaSipSession *session,
 
   g_return_val_if_fail (media_type == TP_MEDIA_STREAM_TYPE_VIDEO ||
       media_type == TP_MEDIA_STREAM_TYPE_AUDIO, NULL);
-  g_return_val_if_fail (requested_direction <= RAKIA_DIRECTION_BIDIRECTIONAL,
+  g_return_val_if_fail (requested_direction <= TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL,
       NULL);
 
   self = g_object_new (RAKIA_TYPE_SIP_MEDIA, NULL);
@@ -1159,7 +1159,7 @@ rakia_sip_media_codecs_rejected (RakiaSipMedia *media)
     }
 }
 
-RakiaDirection
+TpMediaStreamDirection
 rakia_sip_media_get_direction (RakiaSipMedia *media)
 {
   return media->priv->direction;
@@ -1186,7 +1186,7 @@ rakia_sip_media_get_hold_requested (RakiaSipMedia *media)
 gboolean
 rakia_sip_media_is_held (RakiaSipMedia *media)
 {
-  return !(media->priv->direction & RAKIA_DIRECTION_SEND);
+  return !(media->priv->direction & TP_MEDIA_STREAM_DIRECTION_SEND);
 }
 
 void
@@ -1217,17 +1217,17 @@ rakia_sip_media_has_remote_media (RakiaSipMedia *media)
 }
 
 const gchar *
-rakia_direction_to_string (RakiaDirection direction)
+rakia_direction_to_string (TpMediaStreamDirection direction)
 {
   switch (direction)
     {
-    case RAKIA_DIRECTION_NONE:
+    case TP_MEDIA_STREAM_DIRECTION_NONE:
       return "none";
-    case RAKIA_DIRECTION_SEND:
+    case TP_MEDIA_STREAM_DIRECTION_SEND:
       return "send";
-    case RAKIA_DIRECTION_RECEIVE:
+    case TP_MEDIA_STREAM_DIRECTION_RECEIVE:
       return "recv";
-    case RAKIA_DIRECTION_BIDIRECTIONAL:
+    case TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL:
       return "bidi";
     default:
       g_warning ("Invalid direction %d", direction);
diff --git a/rakia/sip-media.h b/rakia/sip-media.h
index 73598aa..12a6a2e 100644
--- a/rakia/sip-media.h
+++ b/rakia/sip-media.h
@@ -45,13 +45,6 @@ struct _RakiaSipMedia {
     RakiaSipMediaPrivate *priv;
 };
 
-typedef enum {
-    RAKIA_DIRECTION_NONE = 0,
-    RAKIA_DIRECTION_SEND = 1,
-    RAKIA_DIRECTION_RECEIVE = 2,
-    RAKIA_DIRECTION_BIDIRECTIONAL = 3,
-} RakiaDirection;
-
 typedef struct _RakiaSipCodecParam {
   gchar *name;
   gchar *value;
@@ -105,7 +98,7 @@ gboolean rakia_sip_media_is_ready (RakiaSipMedia *self);
 
 gboolean rakia_sip_media_is_codec_intersect_pending (RakiaSipMedia *self);
 
-RakiaDirection rakia_direction_from_remote_media (const sdp_media_t *media);
+TpMediaStreamDirection rakia_direction_from_remote_media (const sdp_media_t *media);
 
 void rakia_sip_media_local_updated (RakiaSipMedia *self); /* ?? */
 
@@ -116,7 +109,7 @@ gboolean rakia_sip_media_is_held (RakiaSipMedia *media);
 RakiaSipMedia *rakia_sip_media_new (RakiaSipSession *session,
     TpMediaStreamType media_type,
     const gchar *name,
-    RakiaDirection requested_direction,
+    TpMediaStreamDirection requested_direction,
     gboolean created_locally,
     gboolean hold_requested);
 
@@ -159,13 +152,13 @@ void rakia_sip_media_codecs_rejected (RakiaSipMedia *media);
 gboolean rakia_sip_media_is_created_locally (RakiaSipMedia *self);
 
 void rakia_sip_media_set_requested_direction (RakiaSipMedia *media,
-    RakiaDirection direction);
+    TpMediaStreamDirection direction);
 
-RakiaDirection rakia_sip_media_get_direction (RakiaSipMedia *media);
+TpMediaStreamDirection rakia_sip_media_get_direction (RakiaSipMedia *media);
 
-RakiaDirection rakia_sip_media_get_remote_direction (RakiaSipMedia *media);
+TpMediaStreamDirection rakia_sip_media_get_remote_direction (RakiaSipMedia *media);
 
-RakiaDirection rakia_sip_media_get_requested_direction (
+TpMediaStreamDirection rakia_sip_media_get_requested_direction (
     RakiaSipMedia *self);
 
 gboolean rakia_sip_media_get_hold_requested (RakiaSipMedia *media);
@@ -175,7 +168,7 @@ void rakia_sip_media_set_can_receive (RakiaSipMedia *media,
 
 gboolean rakia_sip_media_has_remote_media (RakiaSipMedia *media);
 
-const gchar *rakia_direction_to_string (RakiaDirection direction);
+const gchar *rakia_direction_to_string (TpMediaStreamDirection direction);
 
 G_END_DECLS
 
diff --git a/rakia/sip-session.c b/rakia/sip-session.c
index 94ee826..7a9f57b 100644
--- a/rakia/sip-session.c
+++ b/rakia/sip-session.c
@@ -876,7 +876,7 @@ static RakiaSipMedia *
 rakia_sip_session_add_media_internal (RakiaSipSession *self,
     TpMediaStreamType media_type,
     const gchar *name,
-    RakiaDirection direction,
+    TpMediaStreamDirection direction,
     const sdp_media_t *sdp_media,
     gboolean authoritative,
     gint slot)
@@ -939,7 +939,7 @@ RakiaSipMedia *
 rakia_sip_session_add_media (RakiaSipSession *self,
     TpMediaStreamType media_type,
     const gchar *name,
-    RakiaDirection direction)
+    TpMediaStreamDirection direction)
 {
   return rakia_sip_session_add_media_internal (self, media_type, name,
       direction, NULL, TRUE, -1);
@@ -961,9 +961,9 @@ priv_update_remote_hold (RakiaSipSession *self)
       media = g_ptr_array_index(priv->medias, i);
       if (media != NULL)
         {
-          if (rakia_sip_media_get_direction (media) & RAKIA_DIRECTION_SEND ||
+          if (rakia_sip_media_get_direction (media) & TP_MEDIA_STREAM_DIRECTION_SEND ||
               !(rakia_sip_media_get_requested_direction (media) &
-                  RAKIA_DIRECTION_SEND))
+                  TP_MEDIA_STREAM_DIRECTION_SEND))
             remote_held = FALSE;
 
           has_medias = TRUE;
@@ -1040,7 +1040,7 @@ priv_update_remote_media (RakiaSipSession *self, gboolean authoritative)
               NULL,
               /* Don't start sending unless requested by the user */
               rakia_direction_from_remote_media (sdp_media) &
-              RAKIA_DIRECTION_RECEIVE,
+              TP_MEDIA_STREAM_DIRECTION_RECEIVE,
               sdp_media, authoritative, i);
 
           if (media != NULL)
diff --git a/rakia/sip-session.h b/rakia/sip-session.h
index 51b72c0..5f2b421 100644
--- a/rakia/sip-session.h
+++ b/rakia/sip-session.h
@@ -97,7 +97,7 @@ RakiaSipSessionState rakia_sip_session_get_state (RakiaSipSession *session);
 RakiaSipMedia* rakia_sip_session_add_media (RakiaSipSession *self,
     TpMediaStreamType media_type,
     const gchar *name,
-    RakiaDirection direction);
+    TpMediaStreamDirection direction);
 
 gboolean rakia_sip_session_remove_media (RakiaSipSession *self,
     RakiaSipMedia *media,