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

ges: timeline-pipeline: Remove playsink send_event hack

Browse source 
This is fixed now in upstream playsink, remove the hack

https://bugzilla.gnome.org/show_bug.cgi?id=673211
This commit is contained in:
Thiago Santos 2012-03-30 19:10:33 -03:00
parent 7282ee2ff4
commit 54aac450da
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,8 +71,6 @@ static OutputChain *get_output_chain_for_track (GESTimelinePipeline * self,
GESTrack * track); GESTrack * track);
static OutputChain *new_output_chain_for_track (GESTimelinePipeline * self, static OutputChain *new_output_chain_for_track (GESTimelinePipeline * self,
GESTrack * track); GESTrack * track);
static gboolean play_sink_multiple_seeks_send_event (GstElement * element,
GstEvent * event);
static void static void
ges_timeline_pipeline_dispose (GObject * object) ges_timeline_pipeline_dispose (GObject * object)
@ -123,8 +121,6 @@ ges_timeline_pipeline_class_init (GESTimelinePipelineClass * klass)
static void static void
ges_timeline_pipeline_init (GESTimelinePipeline * self) ges_timeline_pipeline_init (GESTimelinePipeline * self)
{ {
GstElementClass *playsinkclass;
GST_INFO_OBJECT (self, "Creating new 'playsink'"); GST_INFO_OBJECT (self, "Creating new 'playsink'");
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TIMELINE_PIPELINE, GESTimelinePipelinePrivate); GES_TYPE_TIMELINE_PIPELINE, GESTimelinePipelinePrivate);
@ -144,11 +140,6 @@ ges_timeline_pipeline_init (GESTimelinePipeline * self)
if (G_UNLIKELY (self->priv->encodebin == NULL)) if (G_UNLIKELY (self->priv->encodebin == NULL))
goto no_encodebin; goto no_encodebin;
/* 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); ges_timeline_pipeline_set_mode (self, DEFAULT_TIMELINE_MODE);
return; return;
@ -987,16 +978,3 @@ ges_timeline_pipeline_preview_set_audio_sink (GESTimelinePipeline * self,
{ {
g_object_set (self->priv->playsink, "audio-sink", sink, NULL); 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);
}