Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

demux_playlist: add --directory-filter-types

Browse Source
This commit is contained in:
Kacper Michajłow
2024-07-17 00:58:59 +02:00
parent c54ad6933b
commit 4f1e9e34c3
7 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
player/loadfile.c
View File

@@ -1042,10 +1042,16 @@ void prepare_playlist(struct MPContext *mpctx, struct playlist *pl)
if (opts->playlist_pos >= 0)
pl->current = playlist_entry_from_index(pl, opts->playlist_pos);
for (int i = 0; i < pl->num_entries && pl->autocreated; ++i) {
for (int i = 0; i < pl->num_entries && pl->playlist_dir; ++i) {
if (!pl->entries[i]->playlist_path)
continue;
if (!strcmp(pl->entries[i]->filename, pl->entries[i]->playlist_path)) {
char *path = pl->entries[i]->playlist_path;
if (path[0] != '.')
path = mp_path_join(NULL, pl->playlist_dir, pl->entries[i]->playlist_path);
bool same = !strcmp(pl->entries[i]->filename, path);
if (path != pl->entries[i]->playlist_path)
talloc_free(path);
if (same) {
pl->current = pl->entries[i];
break;
}
@@ -1079,7 +1085,7 @@ static void transfer_playlist(struct MPContext *mpctx, struct playlist *pl,
playlist_remove(mpctx->playlist, mpctx->playlist->current);
if (new)
mpctx->playlist->current = new;
mpctx->playlist->autocreated = pl->autocreated;
mpctx->playlist->playlist_dir = talloc_steal(mpctx->playlist, pl->playlist_dir);
} else {
MP_WARN(mpctx, "Empty playlist!\n");
}
@@ -1156,7 +1162,7 @@ static MP_THREAD_VOID open_demux_thread(void *ctx)
.stream_record = true,
.is_top_level = true,
.allow_playlist_create = mpctx->playlist->num_entries <= 1 &&
!mpctx->playlist->autocreated,
!mpctx->playlist->playlist_dir,
};
struct demuxer *demux =
demux_open_url(mpctx->open_url, &p, mpctx->open_cancel, mpctx->global);