diff options
| -rw-r--r-- | common/playlist.c | 13 | ||||
| -rw-r--r-- | common/playlist.h | 6 | ||||
| -rw-r--r-- | player/loadfile.c | 4 |
3 files changed, 1 insertions, 22 deletions
diff --git a/common/playlist.c b/common/playlist.c index 1ba8a58f32..78a7713462 100644 --- a/common/playlist.c +++ b/common/playlist.c @@ -228,19 +228,6 @@ void playlist_add_base_path(struct playlist *pl, bstr base_path) } } -// Add redirected_from as new redirect entry to each item in pl. -void playlist_add_redirect(struct playlist *pl, const char *redirected_from) -{ - for (int n = 0; n < pl->num_entries; n++) { - struct playlist_entry *e = pl->entries[n]; - if (e->num_redirects >= 10) // arbitrary limit for sanity - continue; - char *s = talloc_strdup(e, redirected_from); - if (s) - MP_TARRAY_APPEND(e, e->redirects, e->num_redirects, s); - } -} - void playlist_set_stream_flags(struct playlist *pl, int flags) { for (int n = 0; n < pl->num_entries; n++) diff --git a/common/playlist.h b/common/playlist.h index 64d1cd45f0..f6111604f3 100644 --- a/common/playlist.h +++ b/common/playlist.h @@ -40,11 +40,6 @@ struct playlist_entry { 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; @@ -103,7 +98,6 @@ 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_add_redirect(struct playlist *pl, const char *redirected_from); 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); diff --git a/player/loadfile.c b/player/loadfile.c index d558ad6930..84cef94639 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1086,8 +1086,6 @@ static void transfer_playlist(struct MPContext *mpctx, struct playlist *pl, if (pl->num_entries) { prepare_playlist(mpctx, pl); struct playlist_entry *new = pl->current; - if (mpctx->playlist->current) - playlist_add_redirect(pl, mpctx->playlist->current->filename); *num_new_entries = pl->num_entries; *start_id = playlist_transfer_entries(mpctx->playlist, pl); // current entry is replaced @@ -1649,7 +1647,7 @@ static void play_current_file(struct MPContext *mpctx) handle_force_window(mpctx, false); if (mpctx->playlist->num_entries > 1 || - mpctx->playing->num_redirects) + mpctx->playing->playlist_path) MP_INFO(mpctx, "Playing: %s\n", mpctx->filename); assert(mpctx->demuxer == NULL); |