summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 21:55:41 +0100
committerwm4 <wm4@nowhere>2013-12-21 22:13:05 +0100
commit6aaea76b4d62990419a53c715640dab1836bba7f (patch)
tree3689ca9e28c7d462f2539ebac282797c7002c5e4
parenteef36f03ea76f97c10075ae4b08e1e53e5195479 (diff)
downloadmpv-6aaea76b4d62990419a53c715640dab1836bba7f.tar.bz2
mpv-6aaea76b4d62990419a53c715640dab1836bba7f.tar.xz
demux: don't prefix tag output with demuxer name
Add a separate mp_log instance for this purpose.
-rw-r--r--demux/demux.c19
-rw-r--r--demux/demux.h2
2 files changed, 12 insertions, 9 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 7643b58a38..fe5ac6a3d6 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -519,6 +519,7 @@ static struct demuxer *open_given_type(struct mpv_global *global,
.opts = global->opts,
.global = global,
.log = mp_log_new(demuxer, log, desc->name),
+ .glog = log,
.filename = talloc_strdup(demuxer, stream->url),
.metadata = talloc_zero(demuxer, struct mp_tags),
};
@@ -603,8 +604,11 @@ struct demuxer *demux_open(struct stream *stream, char *force_format,
const struct demuxer_desc *desc = demuxer_list[n];
if (!check_desc || desc == check_desc) {
demuxer = open_given_type(global, log, desc, stream, params, level);
- if (demuxer)
+ if (demuxer) {
+ talloc_steal(demuxer, log);
+ log = NULL;
goto done;
+ }
}
}
}
@@ -736,16 +740,15 @@ int demux_info_print(demuxer_t *demuxer)
if (!info || !info->num_keys)
return 0;
- MP_INFO(demuxer, "Clip info:\n");
+ mp_info(demuxer->glog, "Clip info:\n");
for (n = 0; n < info->num_keys; n++) {
- MP_INFO(demuxer, " %s: %s\n", info->keys[n],
+ mp_info(demuxer->glog, " %s: %s\n", info->keys[n], info->values[n]);
+ mp_msg(demuxer->glog, MSGL_SMODE, "ID_CLIP_INFO_NAME%d=%s\n", n,
+ info->keys[n]);
+ mp_msg(demuxer->glog, MSGL_SMODE, "ID_CLIP_INFO_VALUE%d=%s\n", n,
info->values[n]);
- MP_SMODE(demuxer, "ID_CLIP_INFO_NAME%d=%s\n", n,
- info->keys[n]);
- MP_SMODE(demuxer, "ID_CLIP_INFO_VALUE%d=%s\n", n,
- info->values[n]);
}
- MP_SMODE(demuxer, "ID_CLIP_INFO_N=%d\n", n);
+ mp_msg(demuxer->glog, MSGL_SMODE, "ID_CLIP_INFO_N=%d\n", n);
return 0;
}
diff --git a/demux/demux.h b/demux/demux.h
index 7b25032011..7a663684f9 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -195,7 +195,7 @@ typedef struct demuxer {
void *priv; // demuxer-specific internal data
struct MPOpts *opts;
struct mpv_global *global;
- struct mp_log *log;
+ struct mp_log *log, *glog;
struct demuxer_params *params;
} demuxer_t;