diff options
| -rw-r--r-- | examples/call-handler.c | 18 | ||||
| -rw-r--r-- | telepathy-farstream/call-content.c | 84 | ||||
| -rw-r--r-- | telepathy-farstream/call-stream.c | 54 | ||||
| -rw-r--r-- | telepathy-farstream/channel.c | 4 |
4 files changed, 80 insertions, 80 deletions
diff --git a/examples/call-handler.c b/examples/call-handler.c index dd4e8d5..0050b5c 100644 --- a/examples/call-handler.c +++ b/examples/call-handler.c @@ -578,7 +578,7 @@ new_call_channel_cb (TpSimpleHandler *handler, tp_handle_channels_context_accept (handler_context); - tp_cli_channel_type_call_call_accept (proxy, -1, + tp_cli_channel_type_call1_call_accept (proxy, -1, NULL, NULL, NULL, NULL); context->proxy = g_object_ref (proxy); @@ -612,28 +612,28 @@ main (int argc, char **argv) tp_base_client_take_handler_filter (client, tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_CALL, + TP_IFACE_CHANNEL_TYPE_CALL1, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE, NULL)); tp_base_client_take_handler_filter (client, tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_CALL, + TP_IFACE_CHANNEL_TYPE_CALL1, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE, NULL)); tp_base_client_add_handler_capabilities_varargs (client, - TP_IFACE_CHANNEL_TYPE_CALL "/video/h264", - TP_IFACE_CHANNEL_TYPE_CALL "/shm", - TP_IFACE_CHANNEL_TYPE_CALL "/ice", - TP_IFACE_CHANNEL_TYPE_CALL "/gtalk-p2p", + TP_IFACE_CHANNEL_TYPE_CALL1 "/video/h264", + TP_IFACE_CHANNEL_TYPE_CALL1 "/shm", + TP_IFACE_CHANNEL_TYPE_CALL1 "/ice", + TP_IFACE_CHANNEL_TYPE_CALL1 "/gtalk-p2p", NULL); tp_base_client_register (client, NULL); diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c index 751b606..530383e 100644 --- a/telepathy-farstream/call-content.c +++ b/telepathy-farstream/call-content.c @@ -485,7 +485,7 @@ tf_call_content_set_property (GObject *object, break; self->reported_input_volume = g_value_get_int (value); - tp_cli_call_content_interface_audio_control_call_report_input_volume ( + tp_cli_call1_content_interface_audio_control1_call_report_input_volume ( self->proxy, -1, self->reported_input_volume, NULL, NULL, NULL, NULL); @@ -496,7 +496,7 @@ tf_call_content_set_property (GObject *object, break; self->reported_output_volume = g_value_get_int (value); - tp_cli_call_content_interface_audio_control_call_report_output_volume ( + tp_cli_call1_content_interface_audio_control1_call_report_output_volume ( self->proxy, -1, self->reported_output_volume, NULL, NULL, NULL, NULL); break; @@ -684,7 +684,7 @@ on_content_dtmf_change_requested (TpCallContent *proxy, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, TP_ERROR_STR_MEDIA_STREAMING_ERROR, "Could not stop DTMF event %d", arg_Event); - tp_cli_call_content_interface_media_call_acknowledge_dtmf_change ( + tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change ( self->proxy, -1, arg_Event, TP_SENDING_STATE_SENDING, NULL, NULL, NULL, NULL); } @@ -712,7 +712,7 @@ on_content_dtmf_change_requested (TpCallContent *proxy, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, TP_ERROR_STR_MEDIA_STREAMING_ERROR, "Could not start DTMF event %d", arg_Event); - tp_cli_call_content_interface_media_call_acknowledge_dtmf_change ( + tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change ( self->proxy, -1, arg_Event, TP_SENDING_STATE_NONE, NULL, NULL, NULL, NULL); } @@ -782,7 +782,7 @@ process_media_description_try_codecs (TfCallContent *self, FsStream *fsstream, G_TYPE_INVALID); g_debug ("Rejecting Media Description"); - tp_cli_call_content_media_description_call_reject (media_description, + tp_cli_call1_content_media_description_call_reject (media_description, -1, reason, NULL, NULL, NULL, NULL); g_value_array_free (reason); g_object_unref (media_description); @@ -823,7 +823,7 @@ process_media_description (TfCallContent *self, } contact_handle = tp_asv_get_uint32 (properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, &valid); + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, &valid); if (!valid) { tf_call_content_error_literal (self, @@ -834,7 +834,7 @@ process_media_description (TfCallContent *self, } codecs = tp_asv_get_boxed (properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS, TP_ARRAY_TYPE_CODEC_LIST); + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS, TP_ARRAY_TYPE_CODEC_LIST); if (!codecs) { @@ -852,10 +852,10 @@ process_media_description (TfCallContent *self, "object-path", media_description_objpath, NULL); tp_proxy_add_interface_by_id (TP_PROXY (proxy), - TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION); + TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION); interfaces = tp_asv_get_strv (properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES); + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACES); self->current_has_rtcp_fb = FALSE; @@ -863,25 +863,25 @@ process_media_description (TfCallContent *self, for (i = 0; interfaces[i]; i++) { if (!strcmp (interfaces[i], - TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK)) + TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1)) { gboolean valid; self->current_has_rtcp_fb = TRUE; rtcp_fb = tp_asv_get_boxed (properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_FEEDBACK_MESSAGES, + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_FEEDBACK_MESSAGES, TP_HASH_TYPE_RTCP_FEEDBACK_MESSAGE_MAP); does_avpf = tp_asv_get_boolean (properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_DOES_AVPF, &valid); + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_DOES_AVPF, &valid); if (!valid) does_avpf = FALSE; } else if (!strcmp (interfaces[i], - TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS)) + TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1)) { self->current_has_rtp_hdrext = TRUE; rtp_hdrext = tp_asv_get_boxed (properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS_HEADER_EXTENSIONS, + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1_HEADER_EXTENSIONS, TP_ARRAY_TYPE_RTP_HEADER_EXTENSIONS_LIST); } } @@ -1271,13 +1271,13 @@ setup_content_media_properties (TfCallContent *self, GSimpleAsyncResult *res) GError *error = NULL; - if (tp_cli_call_content_interface_media_connect_to_dtmf_change_requested ( + if (tp_cli_call1_content_interface_media_connect_to_dtmf_change_requested ( self->proxy, on_content_dtmf_change_requested, NULL, NULL, G_OBJECT (self), &error) == NULL) goto connect_failed; tp_cli_dbus_properties_call_get_all (TP_PROXY (self->proxy), -1, - TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA, + TP_IFACE_CALL1_CONTENT_INTERFACE_MEDIA, got_content_media_properties, res, NULL, G_OBJECT (self)); return; @@ -1325,7 +1325,7 @@ on_content_audio_control_properties_changed (TpProxy *proxy, TfCallContent *self = TF_CALL_CONTENT (weak_object); if (tp_strdiff (interface_name, - TP_IFACE_CALL_CONTENT_INTERFACE_AUDIO_CONTROL)) + TP_IFACE_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1)) return; /* Guard against early disposal */ @@ -1397,7 +1397,7 @@ setup_content_audio_control (TfCallContent *self, goto connect_failed; tp_cli_dbus_properties_call_get_all (self->proxy, -1, - TP_IFACE_CALL_CONTENT_INTERFACE_AUDIO_CONTROL, + TP_IFACE_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1, got_content_audio_control_properties, res, NULL, G_OBJECT (self)); return; @@ -1530,33 +1530,33 @@ setup_content_video_control (TfCallContent *self, GSimpleAsyncResult *res) { GError *error = NULL; - if (tp_cli_call_content_interface_video_control_connect_to_key_frame_requested ( + if (tp_cli_call1_content_interface_video_control1_connect_to_key_frame_requested ( self->proxy, on_content_video_keyframe_requested, NULL, NULL, G_OBJECT (self), &error) == NULL) goto connect_failed; - if (tp_cli_call_content_interface_video_control_connect_to_video_resolution_changed ( + if (tp_cli_call1_content_interface_video_control1_connect_to_video_resolution_changed ( self->proxy, on_content_video_resolution_changed, NULL, NULL, G_OBJECT (self), &error) == NULL) goto connect_failed; - if (tp_cli_call_content_interface_video_control_connect_to_bitrate_changed ( + if (tp_cli_call1_content_interface_video_control1_connect_to_bitrate_changed ( self->proxy, on_content_video_bitrate_changed, NULL, NULL, G_OBJECT (self), NULL) == NULL) goto connect_failed; - if (tp_cli_call_content_interface_video_control_connect_to_framerate_changed ( + if (tp_cli_call1_content_interface_video_control1_connect_to_framerate_changed ( self->proxy, on_content_video_framerate_changed, NULL, NULL, G_OBJECT (self), NULL) == NULL) goto connect_failed; - if (tp_cli_call_content_interface_video_control_connect_to_mtu_changed ( + if (tp_cli_call1_content_interface_video_control1_connect_to_mtu_changed ( self->proxy, on_content_video_mtu_changed, NULL, NULL, G_OBJECT (self), NULL) == NULL) goto connect_failed; tp_cli_dbus_properties_call_get_all (TP_PROXY (self->proxy), -1, - TP_IFACE_CALL_CONTENT_INTERFACE_VIDEO_CONTROL, + TP_IFACE_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1, got_content_video_control_properties, res, NULL, G_OBJECT (self)); return; @@ -1645,7 +1645,7 @@ content_prepared (GObject *src, GAsyncResult *prepare_res, } if (!tp_proxy_has_interface_by_id (proxy, - TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_MEDIA)) + TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_MEDIA)) { tf_call_content_error_literal (self, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, @@ -1662,7 +1662,7 @@ content_prepared (GObject *src, GAsyncResult *prepare_res, self->streams = g_ptr_array_new_with_free_func (free_stream); - tp_cli_call_content_interface_media_connect_to_new_media_description_offer ( + tp_cli_call1_content_interface_media_connect_to_new_media_description_offer ( self->proxy, new_media_description_offer, NULL, NULL, G_OBJECT (self), &error); @@ -1681,10 +1681,10 @@ content_prepared (GObject *src, GAsyncResult *prepare_res, } if (tp_proxy_has_interface_by_id (proxy, - TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_AUDIO_CONTROL)) + TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1)) setup_content_audio_control (self, res); else if (tp_proxy_has_interface_by_id (proxy, - TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_VIDEO_CONTROL)) + TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1)) setup_content_video_control (self, res); else setup_content_media_properties (self, res); @@ -1903,9 +1903,9 @@ fscodecs_to_media_descriptions (TfCallContent *self, GList *codecs) } retval = tp_asv_new ( - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS, + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS, TP_ARRAY_TYPE_CODEC_LIST, tpcodecs, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED, + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED, G_TYPE_BOOLEAN, !!resend_codecs, NULL); @@ -1913,24 +1913,24 @@ fscodecs_to_media_descriptions (TfCallContent *self, GList *codecs) if (rtp_hdrext) { - tp_asv_take_boxed (retval, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS_HEADER_EXTENSIONS, + tp_asv_take_boxed (retval, TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1_HEADER_EXTENSIONS, TP_ARRAY_TYPE_RTP_HEADER_EXTENSIONS_LIST, rtp_hdrext); g_ptr_array_add (interfaces, - g_strdup (TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS)); + g_strdup (TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1)); } if (rtcp_fb) { - tp_asv_set_boolean (retval, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_DOES_AVPF, g_hash_table_size (rtcp_fb)); - tp_asv_take_boxed (retval, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_FEEDBACK_MESSAGES, + tp_asv_set_boolean (retval, TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_DOES_AVPF, g_hash_table_size (rtcp_fb)); + tp_asv_take_boxed (retval, TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_FEEDBACK_MESSAGES, TP_HASH_TYPE_RTCP_FEEDBACK_MESSAGE_MAP, rtcp_fb); g_ptr_array_add (interfaces, - g_strdup (TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS)); + g_strdup (TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1)); } g_ptr_array_add (interfaces, NULL); - tp_asv_take_boxed (retval, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES, + tp_asv_take_boxed (retval, TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACES, G_TYPE_STRV, interfaces->pdata); g_ptr_array_free (interfaces, FALSE); @@ -1991,7 +1991,7 @@ tf_call_content_try_sending_codecs (TfCallContent *self) struct CallFsStream *cfs = g_ptr_array_index (self->fsstreams, i); tp_asv_set_uint32 (media_description, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, cfs->contact_handle); if (self->current_media_description && @@ -2000,7 +2000,7 @@ tf_call_content_try_sending_codecs (TfCallContent *self) g_debug ("Accepting Media Description for contact: %u", cfs->contact_handle); - tp_cli_call_content_media_description_call_accept ( + tp_cli_call1_content_media_description_call_accept ( self->current_media_description, -1, media_description, NULL, NULL, NULL, NULL); @@ -2012,7 +2012,7 @@ tf_call_content_try_sending_codecs (TfCallContent *self) g_debug ("Updating local Media Description for contact %u", cfs->contact_handle); - tp_cli_call_content_interface_media_call_update_local_media_description ( + tp_cli_call1_content_interface_media_call_update_local_media_description ( self->proxy, -1, media_description, media_description_updated_cb, NULL, NULL, NULL); } @@ -2064,7 +2064,7 @@ tf_call_content_dtmf_started (TfCallContent *self, FsDTMFMethod method, return; } - tp_cli_call_content_interface_media_call_acknowledge_dtmf_change ( + tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change ( self->proxy, -1, event, TP_SENDING_STATE_SENDING, NULL, NULL, NULL, NULL); self->dtmf_sending_state = TP_SENDING_STATE_SENDING; @@ -2083,7 +2083,7 @@ tf_call_content_dtmf_stopped (TfCallContent *self, FsDTMFMethod method) return; } - tp_cli_call_content_interface_media_call_acknowledge_dtmf_change ( + tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change ( self->proxy, -1, self->current_dtmf_event, TP_SENDING_STATE_NONE, NULL, NULL, NULL, NULL); self->dtmf_sending_state = TP_SENDING_STATE_NONE; @@ -2211,7 +2211,7 @@ tf_call_content_error_literal (TfCallContent *self, const gchar *message) { g_debug ("Content error: %s", message); - tp_cli_call_content_interface_media_call_fail ( + tp_cli_call1_content_interface_media_call_fail ( self->proxy, -1, tp_value_array_build (4, G_TYPE_UINT, 0, diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c index 9713dec..53dbe77 100644 --- a/telepathy-farstream/call-stream.c +++ b/telepathy-farstream/call-stream.c @@ -206,14 +206,14 @@ sending_state_changed (TpCallStream *proxy, { self->has_send_resource = TRUE; - tp_cli_call_stream_interface_media_call_complete_sending_state_change ( + tp_cli_call1_stream_interface_media_call_complete_sending_state_change ( proxy, -1, TP_STREAM_FLOW_STATE_STARTED, NULL, NULL, NULL, NULL); tf_call_stream_update_sending_state (self); } else { - tp_cli_call_stream_interface_media_call_report_sending_failure ( + tp_cli_call1_stream_interface_media_call_report_sending_failure ( proxy, -1, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, TP_ERROR_STR_MEDIA_STREAMING_ERROR, "Could not start sending", NULL, NULL, NULL, NULL); @@ -228,7 +228,7 @@ sending_state_changed (TpCallStream *proxy, self->has_send_resource = FALSE; } - tp_cli_call_stream_interface_media_call_complete_sending_state_change ( + tp_cli_call1_stream_interface_media_call_complete_sending_state_change ( proxy, -1, TP_STREAM_FLOW_STATE_STOPPED, NULL, NULL, NULL, NULL); break; default: @@ -247,14 +247,14 @@ tf_call_stream_start_receiving (TfCallStream *self, FsStreamDirection dir) if (self->fsstream) g_object_set (self->fsstream, "direction", dir | FS_DIRECTION_RECV, NULL); - tp_cli_call_stream_interface_media_call_complete_receiving_state_change ( + tp_cli_call1_stream_interface_media_call_complete_receiving_state_change ( self->proxy, -1, TP_STREAM_FLOW_STATE_STARTED, NULL, NULL, NULL, NULL); return TRUE; } else { - tp_cli_call_stream_interface_media_call_report_receiving_failure ( + tp_cli_call1_stream_interface_media_call_report_receiving_failure ( self->proxy, -1, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, TP_ERROR_STR_MEDIA_STREAMING_ERROR, "Could not start receiving", NULL, NULL, NULL, NULL); @@ -292,7 +292,7 @@ receiving_state_changed (TpCallStream *proxy, self->has_receive_resource = FALSE; } - tp_cli_call_stream_interface_media_call_complete_receiving_state_change ( + tp_cli_call1_stream_interface_media_call_complete_receiving_state_change ( proxy, -1, TP_STREAM_FLOW_STATE_STOPPED, NULL, NULL, NULL, NULL); break; default: @@ -917,9 +917,9 @@ tf_call_stream_add_endpoint (TfCallStream *self, const gchar *obj_path) "object-path", self->endpoint_objpath, NULL); tp_proxy_add_interface_by_id (TP_PROXY (self->endpoint), - TP_IFACE_QUARK_CALL_STREAM_ENDPOINT); + TP_IFACE_QUARK_CALL1_STREAM_ENDPOINT); - tp_cli_call_stream_endpoint_connect_to_remote_credentials_set ( + tp_cli_call1_stream_endpoint_connect_to_remote_credentials_set ( TP_PROXY (self->endpoint), remote_credentials_set, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -933,7 +933,7 @@ tf_call_stream_add_endpoint (TfCallStream *self, const gchar *obj_path) return; } - tp_cli_call_stream_endpoint_connect_to_remote_candidates_added ( + tp_cli_call1_stream_endpoint_connect_to_remote_candidates_added ( TP_PROXY (self->endpoint), remote_candidates_added, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -948,7 +948,7 @@ tf_call_stream_add_endpoint (TfCallStream *self, const gchar *obj_path) } tp_cli_dbus_properties_call_get_all (self->endpoint, -1, - TP_IFACE_CALL_STREAM_ENDPOINT, + TP_IFACE_CALL1_STREAM_ENDPOINT, got_endpoint_properties, NULL, NULL, G_OBJECT (self)); } @@ -1233,7 +1233,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) } if (!tp_proxy_has_interface_by_id (proxy, - TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA)) + TP_IFACE_QUARK_CALL1_STREAM_INTERFACE_MEDIA)) { tf_call_stream_fail_literal (self, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, @@ -1262,7 +1262,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) self->contact_handle = tp_contact_get_handle (key); } - tp_cli_call_stream_interface_media_connect_to_sending_state_changed ( + tp_cli_call1_stream_interface_media_connect_to_sending_state_changed ( TP_CALL_STREAM (proxy), sending_state_changed, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1276,7 +1276,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) } - tp_cli_call_stream_interface_media_connect_to_receiving_state_changed ( + tp_cli_call1_stream_interface_media_connect_to_receiving_state_changed ( TP_CALL_STREAM (proxy), receiving_state_changed, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1289,7 +1289,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) return; } - tp_cli_call_stream_interface_media_connect_to_server_info_retrieved ( + tp_cli_call1_stream_interface_media_connect_to_server_info_retrieved ( TP_CALL_STREAM (proxy), server_info_retrieved, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1302,7 +1302,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) return; } - tp_cli_call_stream_interface_media_connect_to_stun_servers_changed ( + tp_cli_call1_stream_interface_media_connect_to_stun_servers_changed ( TP_CALL_STREAM (proxy), stun_servers_changed, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1316,7 +1316,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) } - tp_cli_call_stream_interface_media_connect_to_relay_info_changed ( + tp_cli_call1_stream_interface_media_connect_to_relay_info_changed ( TP_CALL_STREAM (proxy), relay_info_changed, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1330,7 +1330,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) } - tp_cli_call_stream_interface_media_connect_to_endpoints_changed ( + tp_cli_call1_stream_interface_media_connect_to_endpoints_changed ( TP_CALL_STREAM (proxy), endpoints_changed, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1344,7 +1344,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) } - tp_cli_call_stream_interface_media_connect_to_ice_restart_requested ( + tp_cli_call1_stream_interface_media_connect_to_ice_restart_requested ( TP_CALL_STREAM (proxy), ice_restart_requested, NULL, NULL, G_OBJECT (self), &error); if (error) @@ -1358,7 +1358,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data) } tp_cli_dbus_properties_call_get_all (TP_PROXY (self->proxy), -1, - TP_IFACE_CALL_STREAM_INTERFACE_MEDIA, + TP_IFACE_CALL1_STREAM_INTERFACE_MEDIA, got_stream_media_properties, NULL, NULL, G_OBJECT (self)); return; @@ -1493,7 +1493,7 @@ cb_fs_new_local_candidate (TfCallStream *stream, FsCandidate *candidate) stream->last_local_password = g_strdup (""); /* Add a callback to kill Call on errors */ - tp_cli_call_stream_interface_media_call_set_credentials ( + tp_cli_call1_stream_interface_media_call_set_credentials ( stream->proxy, -1, stream->last_local_username, stream->last_local_password, NULL, NULL, NULL, NULL); @@ -1512,7 +1512,7 @@ cb_fs_new_local_candidate (TfCallStream *stream, FsCandidate *candidate) fscandidate_to_tpcandidate (stream, candidate)); /* Should also check for errors */ - tp_cli_call_stream_interface_media_call_add_candidates (stream->proxy, + tp_cli_call1_stream_interface_media_call_add_candidates (stream->proxy, -1, candidate_list, NULL, NULL, NULL, NULL); @@ -1524,7 +1524,7 @@ cb_fs_local_candidates_prepared (TfCallStream *stream) { g_debug ("Local candidates prepared"); - tp_cli_call_stream_interface_media_call_finish_initial_candidates ( + tp_cli_call1_stream_interface_media_call_finish_initial_candidates ( stream->proxy, -1, NULL, NULL, NULL, NULL); } @@ -1560,7 +1560,7 @@ cb_fs_component_state_changed (TfCallStream *stream, guint component, g_debug ("Endpoint state for component %u changed to %d (fs: %d)", component, state, fsstate); - tp_cli_call_stream_endpoint_call_set_endpoint_state (stream->endpoint, + tp_cli_call1_stream_endpoint_call_set_endpoint_state (stream->endpoint, -1, component, state, NULL, NULL, NULL, NULL); } @@ -1582,7 +1582,7 @@ cb_fs_new_active_candidate_pair (TfCallStream *stream, local_tp_candidate = fscandidate_to_tpcandidate (stream, local_candidate); remote_tp_candidate = fscandidate_to_tpcandidate (stream, remote_candidate); - tp_cli_call_stream_endpoint_call_set_selected_candidate_pair ( + tp_cli_call1_stream_endpoint_call_set_selected_candidate_pair ( stream->endpoint, -1, local_tp_candidate, remote_tp_candidate, NULL, NULL, NULL, NULL); @@ -1659,7 +1659,7 @@ tf_call_stream_fail_literal (TfCallStream *self, if (self->proxy == NULL) return; - tp_cli_call_stream_interface_media_call_fail ( + tp_cli_call1_stream_interface_media_call_fail ( self->proxy, -1, tp_value_array_build (4, G_TYPE_UINT, 0, @@ -1697,7 +1697,7 @@ tf_call_stream_sending_failed (TfCallStream *self, const gchar *message) if (self->proxy == NULL) return; - tp_cli_call_stream_interface_media_call_report_sending_failure ( + tp_cli_call1_stream_interface_media_call_report_sending_failure ( self->proxy, -1, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, TP_ERROR_STR_MEDIA_STREAMING_ERROR, message, NULL, NULL, NULL, NULL); @@ -1725,7 +1725,7 @@ tf_call_stream_receiving_failed (TfCallStream *self, g_warning ("Reporting receiving failure: %s", message); - tp_cli_call_stream_interface_media_call_report_receiving_failure ( + tp_cli_call1_stream_interface_media_call_report_receiving_failure ( self->proxy, -1, TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR, TP_ERROR_STR_MEDIA_STREAMING_ERROR, message, NULL, NULL, NULL, NULL); diff --git a/telepathy-farstream/channel.c b/telepathy-farstream/channel.c index e8ba1ac..10107c0 100644 --- a/telepathy-farstream/channel.c +++ b/telepathy-farstream/channel.c @@ -240,7 +240,7 @@ channel_prepared (GObject *obj, } if (tp_proxy_has_interface_by_id (as_proxy, - TP_IFACE_QUARK_CHANNEL_TYPE_CALL)) + TP_IFACE_QUARK_CHANNEL_TYPE_CALL1)) { if (!TP_IS_CALL_CHANNEL (channel_proxy)) { @@ -262,7 +262,7 @@ channel_prepared (GObject *obj, else { g_simple_async_result_set_error (res, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, - "Channel does not implement " TP_IFACE_CHANNEL_TYPE_CALL); + "Channel does not implement " TP_IFACE_CHANNEL_TYPE_CALL1); goto error; } |