From 3f3ffd0de4943a1ce8e5dd1fbf457bcba989fc2b Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 2 Jul 2013 12:18:04 +0200 Subject: core: update metadata during playback, allow streams to export metadata STREAM_CTRL_GET_METADATA will be used to poll for streamcast metadata. Also add DEMUXER_CTRL_UPDATE_INFO, which could in theory be used by demux_lavf.c. (Unfortunately, libavformat is too crappy to read metadata mid-stream for mp3 or ogg, so we don't implement it.) --- demux/demux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'demux/demux.c') diff --git a/demux/demux.c b/demux/demux.c index b66f5e3e61..a5d3211b0a 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -976,6 +976,7 @@ static struct demuxer *open_given_type(struct MPOpts *opts, } add_stream_chapters(demuxer); demuxer_sort_chapters(demuxer); + demux_info_update(demuxer); return demuxer; } else { // demux_mov can return playlist instead of mov @@ -1227,6 +1228,18 @@ char *demux_info_get(demuxer_t *demuxer, const char *opt) return NULL; } +void demux_info_update(struct demuxer *demuxer) +{ + demux_control(demuxer, DEMUXER_CTRL_UPDATE_INFO, NULL); + // Take care of stream metadata as well + char **meta; + if (stream_control(demuxer->stream, STREAM_CTRL_GET_METADATA, &meta) > 0) { + for (int n = 0; meta[n + 0]; n += 2) + demux_info_add(demuxer, meta[n + 0], meta[n + 1]); + talloc_free(meta); + } +} + int demux_control(demuxer_t *demuxer, int cmd, void *arg) { -- cgit v1.2.3