diff options
author | wm4 <wm4@nowhere> | 2014-09-01 22:12:39 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-01 22:12:39 +0200 |
commit | 2f537bafa5c047373e13e597d66d8cbcc6ccf1f4 (patch) | |
tree | a848197569bc9126b73aede38d29f772b157e1a3 | |
parent | 0aaf688c2d39a9e7a4753ffd94a6bc7995eeed23 (diff) | |
download | mpv-2f537bafa5c047373e13e597d66d8cbcc6ccf1f4.tar.bz2 mpv-2f537bafa5c047373e13e597d66d8cbcc6ccf1f4.tar.xz |
demux: get rid of old wrapper
demux_info_get() used to be central, but was turned into a wrapper, and
now there was only one caller left. Get rid of it.
-rw-r--r-- | demux/demux.c | 5 | ||||
-rw-r--r-- | demux/demux.h | 2 | ||||
-rw-r--r-- | player/command.c | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/demux/demux.c b/demux/demux.c index b139dbc922..b9ddc56e77 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -965,11 +965,6 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, int flags) return 1; } -char *demux_info_get(demuxer_t *demuxer, const char *opt) -{ - return mp_tags_get_str(demuxer->metadata, opt); -} - struct sh_stream *demuxer_stream_by_demuxer_id(struct demuxer *d, enum stream_type t, int id) { diff --git a/demux/demux.h b/demux/demux.h index b1c1e28128..48711b01a2 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -256,8 +256,6 @@ void demux_set_wakeup_cb(struct demuxer *demuxer, void (*cb)(void *ctx), void *c void demux_flush(struct demuxer *demuxer); int demux_seek(struct demuxer *demuxer, float rel_seek_secs, int flags); -char *demux_info_get(struct demuxer *demuxer, const char *opt); - int demux_control(struct demuxer *demuxer, int cmd, void *arg); void demuxer_switch_track(struct demuxer *demuxer, enum stream_type type, diff --git a/player/command.c b/player/command.c index 0f6dca2f2e..6c163c172b 100644 --- a/player/command.c +++ b/player/command.c @@ -234,7 +234,7 @@ static int mp_property_media_title(void *ctx, struct m_property *prop, if (name && name[0]) return m_property_strdup_ro(action, arg, name); if (mpctx->master_demuxer) { - name = demux_info_get(mpctx->master_demuxer, "title"); + name = mp_tags_get_str(mpctx->master_demuxer->metadata, "title"); if (name && name[0]) return m_property_strdup_ro(action, arg, name); } |