comparison libpurple/mediamanager.c @ 28228:359800ae7d17

merge of '235259eaef44e8bacfe07e83eb5c66ddd4887ace' and '2417ca53bef6c584fa8f1e7d5d205793a7091496'
author maiku@pidgin.im
date Wed, 12 Aug 2009 10:04:54 +0000
parents d865064a3104
children f5580e1ca4b1
comparison
equal deleted inserted replaced
28226:dad4cb8f81df 28228:359800ae7d17
749 manager->priv->pipeline)); 749 manager->priv->pipeline));
750 g_signal_connect(bus, "sync-message::element", 750 g_signal_connect(bus, "sync-message::element",
751 G_CALLBACK(window_id_cb), ow); 751 G_CALLBACK(window_id_cb), ow);
752 gst_object_unref(bus); 752 gst_object_unref(bus);
753 753
754 gst_element_sync_state_with_parent(ow->sink); 754 gst_element_set_state(ow->sink, GST_STATE_PLAYING);
755 gst_element_set_state(queue, GST_STATE_PLAYING);
755 gst_element_link(queue, ow->sink); 756 gst_element_link(queue, ow->sink);
756 gst_element_sync_state_with_parent(queue);
757 gst_element_link(tee, queue); 757 gst_element_link(tee, queue);
758 } 758 }
759 } 759 }
760 return TRUE; 760 return TRUE;
761 #else 761 #else