From 04c02796bd371e65f81a92b853658b8fbadb7ad5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 May 2015 15:26:47 +0200 Subject: path: make mp_path_join accept normal C strings Instead of bstr. Most callers of this function do not need bstr. The bstr version of this function is now mp_path_join_bstr(). --- demux/demux_cue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/demux_cue.c') diff --git a/demux/demux_cue.c b/demux/demux_cue.c index 93518c9336..c493647e09 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -226,7 +226,7 @@ static bool open_source(struct timeline *tl, struct bstr filename) if (!base_filename.len) { MP_WARN(tl, "CUE: Invalid audio filename in .cue file!\n"); } else { - char *fullname = mp_path_join(ctx, dirname, base_filename); + char *fullname = mp_path_join_bstr(ctx, dirname, base_filename); if (try_open(tl, fullname)) { res = true; goto out; @@ -252,7 +252,7 @@ static bool open_source(struct timeline *tl, struct bstr filename) MP_WARN(tl, "CUE: No useful audio filename " "in .cue file found, trying with '%s' instead!\n", dename0); - if (try_open(tl, mp_path_join(ctx, dirname, dename))) { + if (try_open(tl, mp_path_join_bstr(ctx, dirname, dename))) { res = true; break; } -- cgit v1.2.3