Mercurial > pidgin.yaz

comparison libpurple/media.c @ 26414:89002b47a0df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove purple_media_set_src/sink from the public API.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 21 Mar 2009 07:34:13 +0000
parents 6cafb8e35032
children 775920086761
comparison
equal deleted inserted replaced
26413:6cafb8e35032 26414:89002b47a0df
1112 g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL); 1112 g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
1113 return media->priv->sessions != NULL ? 1113 return media->priv->sessions != NULL ?
1114 g_hash_table_get_keys(media->priv->sessions) : NULL; 1114 g_hash_table_get_keys(media->priv->sessions) : NULL;
1115 } 1115 }
1116 1116
1117 void 1117 static void
1118 purple_media_set_src(PurpleMedia *media, const gchar *sess_id, GstElement *src) 1118 purple_media_set_src(PurpleMedia *media, const gchar *sess_id, GstElement *src)
1119 { 1119 {
1120 PurpleMediaSession *session; 1120 PurpleMediaSession *session;
1121 GstPad *sinkpad; 1121 GstPad *sinkpad;
1122 GstPad *srcpad; 1122 GstPad *srcpad;
1149 gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK 1149 gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK
1150 ? "success" : "failure"); 1150 ? "success" : "failure");
1151 gst_element_set_locked_state(session->src, FALSE); 1151 gst_element_set_locked_state(session->src, FALSE);
1152 } 1152 }
1153 1153
1154 void 1154 #if 0
1155 static void
1155 purple_media_set_sink(PurpleMedia *media, const gchar *sess_id, 1156 purple_media_set_sink(PurpleMedia *media, const gchar *sess_id,
1156 const gchar *participant, GstElement *sink) 1157 const gchar *participant, GstElement *sink)
1157 { 1158 {
1158 PurpleMediaStream *stream; 1159 PurpleMediaStream *stream;
1159 1160
1171 gst_object_unref(stream->sink); 1172 gst_object_unref(stream->sink);
1172 stream->sink = sink; 1173 stream->sink = sink;
1173 gst_bin_add(GST_BIN(stream->session->media->priv->confbin), 1174 gst_bin_add(GST_BIN(stream->session->media->priv->confbin),
1174 stream->sink); 1175 stream->sink);
1175 } 1176 }
1177 #endif
1176 1178
1177 GstElement * 1179 GstElement *
1178 purple_media_get_src(PurpleMedia *media, const gchar *sess_id) 1180 purple_media_get_src(PurpleMedia *media, const gchar *sess_id)
1179 { 1181 {
1180 PurpleMediaSession *session; 1182 PurpleMediaSession *session;