diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 18:59:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 20:50:13 +0100 |
| commit | 15ae64d369752fc333e49c7453a2f2467c543ea8 (patch) | |
| tree | a069aa5dfcbbed54b33b2aee9b95c72db6e541b2 /player/timeline/tl_mpv_edl.c | |
| parent | 9825906f73a0b1a50f0b4fb05874d9eb9bf69284 (diff) | |
| download | mpv-15ae64d369752fc333e49c7453a2f2467c543ea8.tar.bz2 mpv-15ae64d369752fc333e49c7453a2f2467c543ea8.tar.xz | |
player/timeline: mp_msg conversions
Diffstat (limited to 'player/timeline/tl_mpv_edl.c')
| -rw-r--r-- | player/timeline/tl_mpv_edl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c index 95bb03e2d8..473502d2c8 100644 --- a/player/timeline/tl_mpv_edl.c +++ b/player/timeline/tl_mpv_edl.c @@ -133,7 +133,7 @@ static struct demuxer *open_file(char *filename, struct MPContext *mpctx) d = demux_open(s, NULL, NULL, opts); } if (!d) { - mp_msg(MSGT_CPLAYER, MSGL_ERR, "EDL: Could not open source file '%s'.\n", + MP_ERR(mpctx, "EDL: Could not open source file '%s'.\n", filename); free_stream(s); } @@ -197,8 +197,7 @@ static void build_timeline(struct MPContext *mpctx, struct tl_parts *parts) double len = source_get_length(source); if (len <= 0) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, - "EDL: source file '%s' has unknown duration.\n", + MP_WARN(mpctx, "EDL: source file '%s' has unknown duration.\n", part->filename); } @@ -210,7 +209,7 @@ static void build_timeline(struct MPContext *mpctx, struct tl_parts *parts) if (len > 0) { double partlen = part->offset + part->length; if (partlen > len) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, "EDL: entry %d uses %f " + MP_WARN(mpctx, "EDL: entry %d uses %f " "seconds, but file has only %f seconds.\n", n, partlen, len); } @@ -263,7 +262,7 @@ void build_mpv_edl_timeline(struct MPContext *mpctx) { struct tl_parts *parts = parse_edl(mpctx->demuxer->file_contents); if (!parts) { - mp_msg(MSGT_CPLAYER, MSGL_ERR, "Error in EDL.\n"); + MP_ERR(mpctx, "Error in EDL.\n"); return; } // Source is .edl and not edl:// => don't allow arbitrary paths |