Mercurial > pidgin
changeset 27883:359800ae7d17
merge of '235259eaef44e8bacfe07e83eb5c66ddd4887ace'
and '2417ca53bef6c584fa8f1e7d5d205793a7091496'
| author | maiku@pidgin.im |
|---|---|
| date | Wed, 12 Aug 2009 10:04:54 +0000 |
| parents | dad4cb8f81df (current diff) d865064a3104 (diff) |
| children | f5580e1ca4b1 de7f6fd04298 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/media.c Wed Aug 12 07:36:51 2009 +0000 +++ b/libpurple/media.c Wed Aug 12 10:04:54 2009 +0000 @@ -2463,12 +2463,12 @@ gst_bin_add(GST_BIN(priv->confbin), stream->volume); gst_bin_add(GST_BIN(priv->confbin), stream->level); gst_bin_add(GST_BIN(priv->confbin), sink); + gst_element_set_state(sink, GST_STATE_PLAYING); + gst_element_set_state(stream->level, GST_STATE_PLAYING); + gst_element_set_state(stream->volume, GST_STATE_PLAYING); gst_element_link(stream->level, sink); gst_element_link(stream->volume, stream->level); gst_element_link(queue, stream->volume); - gst_element_sync_state_with_parent(sink); - gst_element_sync_state_with_parent(stream->level); - gst_element_sync_state_with_parent(stream->volume); sink = queue; } else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) { stream->src = gst_element_factory_make( @@ -2481,9 +2481,9 @@ stream->tee = gst_element_factory_make("tee", NULL); gst_bin_add_many(GST_BIN(priv->confbin), stream->src, stream->tee, NULL); - gst_element_sync_state_with_parent(sink); - gst_element_sync_state_with_parent(stream->tee); - gst_element_sync_state_with_parent(stream->src); + gst_element_set_state(sink, GST_STATE_PLAYING); + gst_element_set_state(stream->tee, GST_STATE_PLAYING); + gst_element_set_state(stream->src, GST_STATE_PLAYING); gst_element_link_many(stream->src, stream->tee, sink, NULL); }
--- a/libpurple/mediamanager.c Wed Aug 12 07:36:51 2009 +0000 +++ b/libpurple/mediamanager.c Wed Aug 12 10:04:54 2009 +0000 @@ -751,9 +751,9 @@ G_CALLBACK(window_id_cb), ow); gst_object_unref(bus); - gst_element_sync_state_with_parent(ow->sink); + gst_element_set_state(ow->sink, GST_STATE_PLAYING); + gst_element_set_state(queue, GST_STATE_PLAYING); gst_element_link(queue, ow->sink); - gst_element_sync_state_with_parent(queue); gst_element_link(tee, queue); } }