mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "Revert "ges: timeline-pipeline: Remove playsink send_event hack""

Browse source 
This reverts commit 094669391d.

Conflicts:
	ges/ges-timeline-pipeline.c
This commit is contained in:
Thibault Saunier 2012-12-20 10:17:24 -03:00
parent 5a56aef7c0
commit 228c2fd569
1 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ges/ges-timeline-pipeline.c
View file

@ -84,8 +84,6 @@ static OutputChain *get_output_chain_for_track (GESTimelinePipeline * self,
GESTrack * track);
static OutputChain *new_output_chain_for_track (GESTimelinePipeline * self,
GESTrack * track);
static gboolean play_sink_multiple_seeks_send_event (GstElement * element,
GstEvent * event);
static void
ges_timeline_pipeline_get_property (GObject * object, guint property_id,
@ -240,8 +238,6 @@ ges_timeline_pipeline_class_init (GESTimelinePipelineClass * klass)
static void
ges_timeline_pipeline_init (GESTimelinePipeline * self)
{
GstElementClass *playsinkclass;
GST_INFO_OBJECT (self, "Creating new 'playsink'");
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_PIPELINE, GESTimelinePipelinePrivate);
@ -261,12 +257,6 @@ ges_timeline_pipeline_init (GESTimelinePipeline * self)
if (G_UNLIKELY (self->priv->encodebin == NULL))
goto no_encodebin;
/* TODO : Remove this hack once we depend on gst-p-base 0.10.37 */
/* HACK : Intercept events going through playsink */
playsinkclass = GST_ELEMENT_GET_CLASS (self->priv->playsink);
/* Replace playsink's GstBin::send_event with our own */
playsinkclass->send_event = play_sink_multiple_seeks_send_event;
ges_timeline_pipeline_set_mode (self, DEFAULT_TIMELINE_MODE);
return;
@ -1128,16 +1118,3 @@ ges_timeline_pipeline_preview_set_audio_sink (GESTimelinePipeline * self,
{
g_object_set (self->priv->playsink, "audio-sink", sink, NULL);
};
static gboolean
play_sink_multiple_seeks_send_event (GstElement * element, GstEvent * event)
{
GstElementClass *klass = GST_ELEMENT_GET_CLASS (element);
GST_DEBUG ("%s", GST_EVENT_TYPE_NAME (event));
return
GST_ELEMENT_CLASS (g_type_class_peek_parent (klass))->send_event (element,
event);
}