summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-09 00:38:32 +0200
committerwm4 <wm4@nowhere>2014-09-09 01:23:10 +0200
commit9cb1e2c58ca21f12b65167eb8a3640bda8eadfd5 (patch)
tree7aa0769e3b0313b7ea903b6271c5f3f2e4e6cf95
parent76f9eede349b57fdffd2f09cb45f9f58b225711b (diff)
downloadmpv-9cb1e2c58ca21f12b65167eb8a3640bda8eadfd5.tar.bz2
mpv-9cb1e2c58ca21f12b65167eb8a3640bda8eadfd5.tar.xz
player: normalize playlist entries on add
This is not necessarily more correct, but it's less trouble.
-rw-r--r--common/playlist.c3
-rw-r--r--player/loadfile.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/common/playlist.c b/common/playlist.c
index d64db16e98..46ae36d643 100644
--- a/common/playlist.c
+++ b/common/playlist.c
@@ -30,7 +30,8 @@
struct playlist_entry *playlist_entry_new(const char *filename)
{
struct playlist_entry *e = talloc_zero(NULL, struct playlist_entry);
- e->filename = talloc_strdup(e, filename);
+ char *local_filename = mp_file_url_to_filename(e, bstr0(filename));
+ e->filename = local_filename ? local_filename : talloc_strdup(e, filename);
return e;
}
diff --git a/player/loadfile.c b/player/loadfile.c
index 9c6aabdd4e..d81bfa7bc8 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1030,10 +1030,6 @@ static void play_current_file(struct MPContext *mpctx)
if (!mpctx->filename)
goto terminate_playback;
- char *local_filename = mp_file_url_to_filename(tmp, bstr0(mpctx->filename));
- if (local_filename)
- mpctx->filename = local_filename;
-
mpctx->add_osd_seek_info &= OSD_SEEK_INFO_EDITION;
if (opts->reset_options) {