summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-09 15:26:47 +0200
committerwm4 <wm4@nowhere>2015-05-09 15:26:47 +0200
commit04c02796bd371e65f81a92b853658b8fbadb7ad5 (patch)
tree75b09115e17eedbf06cb3233eb145a5c19f72b58 /stream
parent40997b8ae5b4065b3e71d4369eaba14c991e5027 (diff)
downloadmpv-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 'stream')
-rw-r--r--stream/stream_bluray.c4
-rw-r--r--stream/stream_dvdnav.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index adc2e5828b..117b0cc205 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -891,9 +891,9 @@ static int bdmv_dir_stream_open(stream_t *stream)
// directory containing MovieObject.bdmv, or that file itself.
if (!check_bdmv(path)) {
// On UNIX, just assume the filename has always this case.
- char *npath = mp_path_join(priv, bstr0(path), bstr0("MovieObject.bdmv"));
+ char *npath = mp_path_join(priv, path, "MovieObject.bdmv");
if (!check_bdmv(npath)) {
- npath = mp_path_join(priv, bstr0(path), bstr0("BDMV/MovieObject.bdmv"));
+ npath = mp_path_join(priv, path, "BDMV/MovieObject.bdmv");
if (!check_bdmv(npath))
goto unsupported;
}
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 095ba98ddf..e2ea93d200 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -835,9 +835,9 @@ static int ifo_dvdnav_stream_open(stream_t *stream)
// directory containing VIDEO_TS.IFO, or that file itself.
if (!check_ifo(path)) {
// On UNIX, just assume the filename is always uppercase.
- char *npath = mp_path_join(priv, bstr0(path), bstr0("VIDEO_TS.IFO"));
+ char *npath = mp_path_join(priv, path, "VIDEO_TS.IFO");
if (!check_ifo(npath)) {
- npath = mp_path_join(priv, bstr0(path), bstr0("VIDEO_TS/VIDEO_TS.IFO"));
+ npath = mp_path_join(priv, path, "VIDEO_TS/VIDEO_TS.IFO");
if (!check_ifo(npath))
goto unsupported;
}