summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-07-23 10:14:01 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-07-23 10:33:31 +0200
commita68733ea915d9d9472b27e718f485b66dd40247c (patch)
tree04aec905411192ce81954e23fc448397f6911f39
parent5b702b894e5f7f8b1db5cbee92252404607328ff (diff)
downloadgstreamer-plugins-bad-a68733ea915d9d9472b27e718f485b66dd40247c.tar.gz
midiparse: Add support for group-id in the stream-start event
-rw-r--r--gst/midi/midiparse.c27
-rw-r--r--gst/midi/midiparse.h3
2 files changed, 28 insertions, 2 deletions
diff --git a/gst/midi/midiparse.c b/gst/midi/midiparse.c
index 609d55fc2..aa98ac4bc 100644
--- a/gst/midi/midiparse.c
+++ b/gst/midi/midiparse.c
@@ -175,6 +175,9 @@ gst_midi_parse_init (GstMidiParse * filter)
gst_segment_init (&filter->segment, GST_FORMAT_TIME);
filter->adapter = gst_adapter_new ();
+
+ filter->have_group_id = FALSE;
+ filter->group_id = G_MAXUINT;
}
static void
@@ -973,6 +976,7 @@ gst_midi_parse_parse_song (GstMidiParse * midiparse)
GstCaps *outcaps;
guint8 *data;
guint size, offset, length;
+ GstEvent *event;
gchar *stream_id;
GST_DEBUG_OBJECT (midiparse, "Parsing song");
@@ -1004,8 +1008,25 @@ gst_midi_parse_parse_song (GstMidiParse * midiparse)
GST_DEBUG_OBJECT (midiparse, "song duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (midiparse->segment.duration));
- stream_id = gst_pad_create_stream_id (midiparse->srcpad, GST_ELEMENT_CAST (midiparse), NULL);
- gst_pad_push_event (midiparse->srcpad, gst_event_new_stream_start (stream_id));
+ stream_id =
+ gst_pad_create_stream_id (midiparse->srcpad, GST_ELEMENT_CAST (midiparse),
+ NULL);
+ event =
+ gst_pad_get_sticky_event (midiparse->sinkpad, GST_EVENT_STREAM_START, 0);
+ if (event) {
+ if (gst_event_parse_group_id (event, &midiparse->group_id))
+ midiparse->have_group_id = TRUE;
+ else
+ midiparse->have_group_id = FALSE;
+ gst_event_unref (event);
+ } else if (!midiparse->have_group_id) {
+ midiparse->have_group_id = TRUE;
+ midiparse->group_id = gst_util_group_id_next ();
+ }
+ event = gst_event_new_stream_start (stream_id);
+ if (midiparse->have_group_id)
+ gst_event_set_group_id (event, midiparse->group_id);
+ gst_pad_push_event (midiparse->srcpad, event);
g_free (stream_id);
outcaps = gst_pad_get_pad_template_caps (midiparse->srcpad);
@@ -1273,6 +1294,8 @@ gst_midi_parse_reset (GstMidiParse * midiparse)
g_list_free (midiparse->tracks);
midiparse->tracks = NULL;
midiparse->track_count = 0;
+ midiparse->have_group_id = FALSE;
+ midiparse->group_id = G_MAXUINT;
}
static GstStateChangeReturn
diff --git a/gst/midi/midiparse.h b/gst/midi/midiparse.h
index ba3a25ea1..5794c376d 100644
--- a/gst/midi/midiparse.h
+++ b/gst/midi/midiparse.h
@@ -55,6 +55,9 @@ struct _GstMidiParse
GstPad *sinkpad, *srcpad;
+ gboolean have_group_id;
+ guint group_id;
+
/* input stream properties */
GstMidiParseState state;