aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-call-window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/empathy-call-window.c')
-rw-r--r--src/empathy-call-window.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index d50012315..2b9c48ce0 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -280,7 +280,7 @@ static void empathy_call_window_restart_call (EmpathyCallWindow *window);
static void empathy_call_window_status_message (EmpathyCallWindow *window,
gchar *message);
-static void empathy_call_window_update_avatars_visibility (EmpathyTpCall *call,
+static void empathy_call_window_update_avatars_visibility (EmpathyTpStreamedMedia *call,
EmpathyCallWindow *window);
static gboolean empathy_call_window_bus_message (GstBus *bus,
@@ -342,7 +342,7 @@ static void
dtmf_button_pressed_cb (GtkButton *button, EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
GQuark button_quark;
TpDTMFEvent event;
@@ -352,7 +352,7 @@ dtmf_button_pressed_cb (GtkButton *button, EmpathyCallWindow *window)
event = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (button),
button_quark));
- empathy_tp_call_start_tone (call, event);
+ empathy_tp_streamed_media_start_tone (call, event);
g_object_unref (call);
}
@@ -361,11 +361,11 @@ static void
dtmf_button_released_cb (GtkButton *button, EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
g_object_get (priv->handler, "tp-call", &call, NULL);
- empathy_tp_call_stop_tone (call);
+ empathy_tp_streamed_media_stop_tone (call);
g_object_unref (call);
}
@@ -1577,7 +1577,7 @@ empathy_call_window_constructed (GObject *object)
{
EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
g_assert (priv->handler != NULL);
@@ -1676,7 +1676,7 @@ empathy_call_window_class_init (
}
static void
-empathy_call_window_video_stream_changed_cb (EmpathyTpCall *call,
+empathy_call_window_video_stream_changed_cb (EmpathyTpStreamedMedia *call,
GParamSpec *property, EmpathyCallWindow *self)
{
DEBUG ("video stream changed");
@@ -1686,7 +1686,7 @@ empathy_call_window_video_stream_changed_cb (EmpathyTpCall *call,
void
empathy_call_window_dispose (GObject *object)
{
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
EmpathyCallWindowPriv *priv = GET_PRIV (self);
@@ -2267,7 +2267,7 @@ empathy_call_window_update_timer (gpointer user_data)
static void
display_error (EmpathyCallWindow *self,
- EmpathyTpCall *call,
+ EmpathyTpStreamedMedia *call,
const gchar *img,
const gchar *title,
const gchar *desc,
@@ -2342,7 +2342,7 @@ display_error (EmpathyCallWindow *self,
static gchar *
media_stream_error_to_txt (EmpathyCallWindow *self,
- EmpathyTpCall *call,
+ EmpathyTpStreamedMedia *call,
gboolean audio,
TpMediaStreamError error)
{
@@ -2384,7 +2384,7 @@ media_stream_error_to_txt (EmpathyCallWindow *self,
"are not installed on your computer"));
case TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR:
- cm = empathy_tp_call_get_connection_manager (call);
+ cm = empathy_tp_streamed_media_get_connection_manager (call);
url = g_strdup_printf ("http://bugs.freedesktop.org/enter_bug.cgi?"
"product=Telepathy&component=%s", cm);
@@ -2411,7 +2411,7 @@ media_stream_error_to_txt (EmpathyCallWindow *self,
static void
empathy_call_window_stream_error (EmpathyCallWindow *self,
- EmpathyTpCall *call,
+ EmpathyTpStreamedMedia *call,
gboolean audio,
guint code,
const gchar *msg,
@@ -2435,7 +2435,7 @@ empathy_call_window_stream_error (EmpathyCallWindow *self,
}
static void
-empathy_call_window_audio_stream_error (EmpathyTpCall *call,
+empathy_call_window_audio_stream_error (EmpathyTpStreamedMedia *call,
guint code,
const gchar *msg,
EmpathyCallWindow *self)
@@ -2445,7 +2445,7 @@ empathy_call_window_audio_stream_error (EmpathyTpCall *call,
}
static void
-empathy_call_window_video_stream_error (EmpathyTpCall *call,
+empathy_call_window_video_stream_error (EmpathyTpStreamedMedia *call,
guint code,
const gchar *msg,
EmpathyCallWindow *self)
@@ -2459,7 +2459,7 @@ empathy_call_window_connected (gpointer user_data)
{
EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
gboolean can_send_video;
empathy_sound_manager_stop (priv->sound_mgr, EMPATHY_SOUND_PHONE_OUTGOING);
@@ -2473,14 +2473,14 @@ empathy_call_window_connected (gpointer user_data)
G_CALLBACK (empathy_call_window_video_stream_changed_cb),
self, 0);
- if (empathy_tp_call_has_dtmf (call))
+ if (empathy_tp_streamed_media_has_dtmf (call))
gtk_widget_set_sensitive (priv->dtmf_panel, TRUE);
if (priv->video_input == NULL)
empathy_call_window_set_send_video (self, CAMERA_STATE_OFF);
priv->sending_video = can_send_video ?
- empathy_tp_call_is_sending_video (call) : FALSE;
+ empathy_tp_streamed_media_is_sending_video (call) : FALSE;
gtk_toggle_tool_button_set_active (
GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on),
@@ -2795,12 +2795,12 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
}
static void
-empathy_call_window_update_avatars_visibility (EmpathyTpCall *call,
+empathy_call_window_update_avatars_visibility (EmpathyTpStreamedMedia *call,
EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- if (empathy_tp_call_is_receiving_video (call))
+ if (empathy_tp_streamed_media_is_receiving_video (call))
{
gtk_widget_hide (priv->remote_user_avatar_widget);
gtk_widget_show (priv->video_output);
@@ -2813,12 +2813,12 @@ empathy_call_window_update_avatars_visibility (EmpathyTpCall *call,
}
static void
-call_handler_notify_tp_call_cb (EmpathyCallHandler *handler,
+call_handler_notify_tp_streamed_media_cb (EmpathyCallHandler *handler,
GParamSpec *spec,
EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
g_object_get (priv->handler, "tp-call", &call, NULL);
if (call == NULL)
@@ -2836,7 +2836,7 @@ static void
empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
g_signal_connect (priv->handler, "conference-added",
G_CALLBACK (empathy_call_window_conference_added_cb), window);
@@ -2868,7 +2868,7 @@ empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
/* tp-call doesn't exist yet, we'll connect signals once it has been
* set */
g_signal_connect (priv->handler, "notify::tp-call",
- G_CALLBACK (call_handler_notify_tp_call_cb), window);
+ G_CALLBACK (call_handler_notify_tp_streamed_media_cb), window);
}
gst_element_set_state (priv->pipeline, GST_STATE_PAUSED);
@@ -3045,7 +3045,7 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window,
CameraState state)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
priv->sending_video = (state == CAMERA_STATE_ON);
@@ -3066,7 +3066,7 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window,
g_object_get (priv->handler, "tp-call", &call, NULL);
DEBUG ("%s sending video", priv->sending_video ? "start": "stop");
- empathy_tp_call_request_video_stream_direction (call, priv->sending_video);
+ empathy_tp_streamed_media_request_video_stream_direction (call, priv->sending_video);
g_object_unref (call);
}