diff options
author | wm4 <wm4@nowhere> | 2015-05-09 15:26:47 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-05-09 15:26:47 +0200 |
commit | 04c02796bd371e65f81a92b853658b8fbadb7ad5 (patch) | |
tree | 75b09115e17eedbf06cb3233eb145a5c19f72b58 /demux | |
parent | 40997b8ae5b4065b3e71d4369eaba14c991e5027 (diff) | |
download | mpv-04c02796bd371e65f81a92b853658b8fbadb7ad5.tar.bz2 mpv-04c02796bd371e65f81a92b853658b8fbadb7ad5.tar.xz |
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().
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux_cue.c | 4 | ||||
-rw-r--r-- | demux/demux_edl.c | 2 | ||||
-rw-r--r-- | demux/demux_mkv_timeline.c | 2 | ||||
-rw-r--r-- | demux/demux_playlist.c | 2 |
4 files changed, 5 insertions, 5 deletions
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; } diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 3bda4f44b2..fc0db2f2fa 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -272,7 +272,7 @@ static void fix_filenames(struct tl_parts *parts, char *source_path) for (int n = 0; n < parts->num_parts; n++) { struct tl_part *part = &parts->parts[n]; char *filename = mp_basename(part->filename); // plain filename only - part->filename = mp_path_join(parts, dirname, bstr0(filename)); + part->filename = mp_path_join_bstr(parts, dirname, bstr0(filename)); } } diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index c7310a66cf..e1491b631d 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -118,7 +118,7 @@ static char **find_files(const char *original_file) if (!strcmp(ep->d_name, basename)) continue; - char *name = mp_path_join(results, directory, bstr0(ep->d_name)); + char *name = mp_path_join_bstr(results, directory, bstr0(ep->d_name)); char *s1 = ep->d_name; char *s2 = basename; int matchlen = 0; diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index 6f73bea5ba..0479694b34 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -245,7 +245,7 @@ static int parse_dir(struct pl_parser *p) qsort(files, num_files, sizeof(files[0]), cmp_filename); for (int n = 0; n < num_files; n++) - playlist_add_file(p->pl, mp_path_join(p, bstr0(path), bstr0(files[n]))); + playlist_add_file(p->pl, mp_path_join(p, path, files[n])); closedir(dp); |