mirror of
https://github.com/mpv-player/mpv
synced 2024-12-28 01:52:19 +00:00
e1f9444d4d
It turns out that the code to track redirects (playlists and directories) never worked correctly, only the last redirect is remembered and num_redirects is never greater than 1. You can see this by doing quit-watch-later with the old watch later system, beforedbf244fd2f, on a m3u playlist of files and a m3u playlist of directories. Only in the first case a redirect entry for the m3u file is created, because in the second case the m3u redirect is replaced by the directory one. If you did mpv --directory-mode=lazy /foo it did create redirect entries for all subdirectories e.g. /foo/bar, /foo/bar/baz, /foo/bar/baz/qux, this made it seem like it worked correctly, but actually /foo/bar/bar/qux was the only redirect entry and thus it was considered as the first redirect, and mpv created redirect entries for each segment of the first redirect only. In the previous commitdbf244fd2f, rather than figuring out how to fix the code to track redirects, and since creating redirect entries for multiple redirects is overkill, I just used the new playlist-path property which does the same thing but only for the last redirect. By replacing the only other use of the old redirect code with playlist-path, we can remove it.
117 lines
4.3 KiB
C
117 lines
4.3 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MPLAYER_PLAYLIST_H
|
|
#define MPLAYER_PLAYLIST_H
|
|
|
|
#include <stdbool.h>
|
|
#include "misc/bstr.h"
|
|
|
|
struct playlist_param {
|
|
bstr name, value;
|
|
};
|
|
|
|
struct playlist_entry {
|
|
// Invariant: (pl && pl->entries[pl_index] == this) || (!pl && pl_index < 0)
|
|
struct playlist *pl;
|
|
int pl_index;
|
|
|
|
uint64_t id;
|
|
|
|
char *filename;
|
|
char *playlist_path;
|
|
|
|
struct playlist_param *params;
|
|
int num_params;
|
|
|
|
char *title;
|
|
|
|
// Used for unshuffling: the pl_index before it was shuffled. -1 => unknown.
|
|
int original_index;
|
|
|
|
// Set to true if playback didn't seem to work, or if the file could be
|
|
// played only for a very short time. This is used to make playlist
|
|
// navigation just work in case the user has unplayable files in the
|
|
// playlist.
|
|
bool playback_short : 1;
|
|
// Set to true if not at least 1 frame (audio or video) could be played.
|
|
bool init_failed : 1;
|
|
// Entry was removed with playlist_remove (etc.), but not deallocated.
|
|
bool removed : 1;
|
|
// Additional refcount. Normally (reserved==0), the entry is owned by the
|
|
// playlist, and this can be used to keep the entry alive.
|
|
int reserved;
|
|
// Any flags from STREAM_ORIGIN_FLAGS. 0 if unknown.
|
|
// Used to reject loading of unsafe entries from external playlists.
|
|
int stream_flags;
|
|
};
|
|
|
|
struct playlist {
|
|
struct playlist_entry **entries;
|
|
int num_entries;
|
|
|
|
// This provides some sort of stable iterator. If this entry is removed from
|
|
// the playlist, current is set to the next element (or NULL), and
|
|
// current_was_replaced is set to true.
|
|
struct playlist_entry *current;
|
|
bool current_was_replaced;
|
|
|
|
uint64_t id_alloc;
|
|
};
|
|
|
|
void playlist_entry_add_param(struct playlist_entry *e, bstr name, bstr value);
|
|
void playlist_entry_add_params(struct playlist_entry *e,
|
|
struct playlist_param *params,
|
|
int params_count);
|
|
|
|
struct playlist_entry *playlist_entry_new(const char *filename);
|
|
|
|
void playlist_add(struct playlist *pl, struct playlist_entry *add);
|
|
void playlist_remove(struct playlist *pl, struct playlist_entry *entry);
|
|
void playlist_clear(struct playlist *pl);
|
|
void playlist_clear_except_current(struct playlist *pl);
|
|
|
|
void playlist_move(struct playlist *pl, struct playlist_entry *entry,
|
|
struct playlist_entry *at);
|
|
|
|
void playlist_add_file(struct playlist *pl, const char *filename);
|
|
void playlist_populate_playlist_path(struct playlist *pl, const char *path);
|
|
void playlist_shuffle(struct playlist *pl);
|
|
void playlist_unshuffle(struct playlist *pl);
|
|
struct playlist_entry *playlist_get_first(struct playlist *pl);
|
|
struct playlist_entry *playlist_get_last(struct playlist *pl);
|
|
struct playlist_entry *playlist_get_next(struct playlist *pl, int direction);
|
|
struct playlist_entry *playlist_entry_get_rel(struct playlist_entry *e,
|
|
int direction);
|
|
void playlist_add_base_path(struct playlist *pl, bstr base_path);
|
|
void playlist_set_stream_flags(struct playlist *pl, int flags);
|
|
int64_t playlist_transfer_entries(struct playlist *pl, struct playlist *source_pl);
|
|
int64_t playlist_append_entries(struct playlist *pl, struct playlist *source_pl);
|
|
|
|
int playlist_entry_to_index(struct playlist *pl, struct playlist_entry *e);
|
|
int playlist_entry_count(struct playlist *pl);
|
|
struct playlist_entry *playlist_entry_from_index(struct playlist *pl, int index);
|
|
|
|
struct mp_cancel;
|
|
struct mpv_global;
|
|
struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel,
|
|
struct mpv_global *global);
|
|
|
|
void playlist_entry_unref(struct playlist_entry *e);
|
|
|
|
#endif
|