Mercurial > pidgin

comparison libpurple/media/media.c @ 29186:7e9d8840e97f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove FsStream from PurpleMedia stream.
author maiku@pidgin.im
date Tue, 27 Oct 2009 18:42:01 +0000
parents f65689100cfe
children f351e87b7af0
comparison
equal deleted inserted replaced
29185:f65689100cfe 29186:7e9d8840e97f
83 83
84 struct _PurpleMediaStream 84 struct _PurpleMediaStream
85 { 85 {
86 PurpleMediaSession *session; 86 PurpleMediaSession *session;
87 gchar *participant; 87 gchar *participant;
88 FsStream *stream;
89 GstElement *src; 88 GstElement *src;
90 GstElement *tee; 89 GstElement *tee;
91 GstElement *volume; 90 GstElement *volume;
92 GstElement *level; 91 GstElement *level;
93 92
616 return g_hash_table_remove(media->priv->sessions, session->id); 615 return g_hash_table_remove(media->priv->sessions, session->id);
617 } 616 }
618 #endif 617 #endif
619 618
620 static PurpleMediaStream * 619 static PurpleMediaStream *
621 purple_media_insert_stream(PurpleMediaSession *session, const gchar *name, FsStream *stream) 620 purple_media_insert_stream(PurpleMediaSession *session,
621 const gchar *name, gboolean initiator)
622 { 622 {
623 PurpleMediaStream *media_stream; 623 PurpleMediaStream *media_stream;
624 624
625 g_return_val_if_fail(session != NULL, NULL); 625 g_return_val_if_fail(session != NULL, NULL);
626 626
627 media_stream = g_new0(PurpleMediaStream, 1); 627 media_stream = g_new0(PurpleMediaStream, 1);
628 media_stream->stream = stream;
629 media_stream->participant = g_strdup(name); 628 media_stream->participant = g_strdup(name);
630 media_stream->session = session; 629 media_stream->session = session;
630 media_stream->initiator = initiator;
631 631
632 session->media->priv->streams = 632 session->media->priv->streams =
633 g_list_append(session->media->priv->streams, media_stream); 633 g_list_append(session->media->priv->streams, media_stream);
634 634
635 return media_stream; 635 return media_stream;
1235 1235
1236 fsstream = purple_media_backend_fs2_get_stream( 1236 fsstream = purple_media_backend_fs2_get_stream(
1237 PURPLE_MEDIA_BACKEND_FS2( 1237 PURPLE_MEDIA_BACKEND_FS2(
1238 media->priv->backend), sess_id, who); 1238 media->priv->backend), sess_id, who);
1239 1239
1240 stream = purple_media_insert_stream(session, who, fsstream); 1240 stream = purple_media_insert_stream(session, who, initiator);
1241 stream->initiator = initiator;
1242 1241
1243 /* callback for source pad added (new stream source ready) */ 1242 /* callback for source pad added (new stream source ready) */
1244 g_signal_connect(G_OBJECT(fsstream), 1243 g_signal_connect(G_OBJECT(fsstream),
1245 "src-pad-added", G_CALLBACK(purple_media_src_pad_added_cb), stream); 1244 "src-pad-added", G_CALLBACK(purple_media_src_pad_added_cb), stream);
1246 1245