summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-06 13:41:20 +0100
committerwm4 <wm4@nowhere>2014-02-06 13:41:20 +0100
commiteb1ec14b67462c6a1420e2fa67b8213cad83b297 (patch)
tree1b31c7c323dfb21da94bf0cf5528e5093f3b5476 /demux/demux.h
parent5693b5ae16217eb62f4fad43ab90a310dfca4f41 (diff)
downloadmpv-eb1ec14b67462c6a1420e2fa67b8213cad83b297.tar.bz2
mpv-eb1ec14b67462c6a1420e2fa67b8213cad83b297.tar.xz
demux: handle tag updates differently
Instead of printing lines like: Demuxer info GENRE changed to Alternative Rock Just output all tags once they change. The assumption is that individual tags rarely change, while all tags change in the common case. This changes tag updates to use polling. This could be fixed later, although the ICY stuff makes it a bit painful, so maybe it will remain this way. Also remove DEMUXER_CTRL_UPDATE_INFO. This was intended to check for tag updates, but now we use a different approach.
Diffstat (limited to 'demux/demux.h')
-rw-r--r--demux/demux.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/demux/demux.h b/demux/demux.h
index a979a357c1..2c8211e246 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -50,8 +50,7 @@ enum demuxer_type {
#define DEMUXER_CTRL_GUESS 2
enum demux_ctrl {
- DEMUXER_CTRL_UPDATE_INFO = 1,
- DEMUXER_CTRL_SWITCHED_TRACKS,
+ DEMUXER_CTRL_SWITCHED_TRACKS = 1,
DEMUXER_CTRL_GET_TIME_LENGTH,
DEMUXER_CTRL_GET_START_TIME,
DEMUXER_CTRL_RESYNC,
@@ -199,6 +198,7 @@ typedef struct demuxer {
struct playlist *playlist;
struct mp_tags *metadata;
+ char *previous_metadata;
void *priv; // demuxer-specific internal data
struct MPOpts *opts;
@@ -247,7 +247,6 @@ int demux_info_add(struct demuxer *demuxer, const char *opt, const char *param);
int demux_info_add_bstr(struct demuxer *demuxer, struct bstr opt,
struct bstr param);
char *demux_info_get(struct demuxer *demuxer, const char *opt);
-int demux_info_print(struct demuxer *demuxer);
void demux_info_update(struct demuxer *demuxer);
int demux_control(struct demuxer *demuxer, int cmd, void *arg);