summaryrefslogtreecommitdiffstats
path: root/common/playlist.h
diff options
context:
space:
mode:
Diffstat (limited to 'common/playlist.h')
-rw-r--r--common/playlist.h39
1 files changed, 24 insertions, 15 deletions
diff --git a/common/playlist.h b/common/playlist.h
index 8b014e864d..853cd311da 100644
--- a/common/playlist.h
+++ b/common/playlist.h
@@ -30,26 +30,25 @@ struct playlist_entry {
struct playlist *pl;
int pl_index;
+ uint64_t id;
+
char *filename;
+ char *playlist_path;
struct playlist_param *params;
int num_params;
char *title;
- // If the user plays a playlist, then the playlist's URL will be appended
- // as redirect to each entry. (Same for directories etc.)
- char **redirects;
- int num_redirects;
-
// 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 this playlist entry was selected while trying to go backwards
+ // in the playlist. If this is true and the playlist entry fails to play later,
+ // then mpv tries to go to the next previous entry. This flag is always cleared
+ // regardless if the attempt was successful or not.
+ bool playlist_prev_attempt : 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.
@@ -71,6 +70,8 @@ struct playlist {
// 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);
@@ -80,7 +81,9 @@ void playlist_entry_add_params(struct playlist_entry *e,
struct playlist_entry *playlist_entry_new(const char *filename);
-void playlist_add(struct playlist *pl, struct playlist_entry *add);
+void playlist_insert_at(struct playlist *pl, struct playlist_entry *entry,
+ struct playlist_entry *at);
+
void playlist_remove(struct playlist *pl, struct playlist_entry *entry);
void playlist_clear(struct playlist *pl);
void playlist_clear_except_current(struct playlist *pl);
@@ -88,7 +91,8 @@ 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_append_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);
@@ -96,11 +100,16 @@ 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);
+struct playlist_entry *playlist_get_first_in_next_playlist(struct playlist *pl,
+ int direction);
+struct playlist_entry *playlist_get_first_in_same_playlist(struct playlist_entry *entry,
+ char *current_playlist_path);
void playlist_add_base_path(struct playlist *pl, bstr base_path);
-void playlist_add_redirect(struct playlist *pl, const char *redirected_from);
void playlist_set_stream_flags(struct playlist *pl, int flags);
-void playlist_transfer_entries(struct playlist *pl, struct playlist *source_pl);
-void playlist_append_entries(struct playlist *pl, struct playlist *source_pl);
+int64_t playlist_transfer_entries_to(struct playlist *pl, int dst_index,
+ struct playlist *source_pl);
+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);