diff options
| author | wm4 <wm4@nowhere> | 2019-12-28 21:12:02 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-12-28 21:32:15 +0100 |
| commit | 582f3f7cc01f81345df5c20a012b1f47587e6a97 (patch) | |
| tree | 03ddce6c9cc0e5aa48135b5af45a57ec37150355 /player/misc.c | |
| parent | 4564a22d13b693efed847ba77361ea4e2448a7bf (diff) | |
| download | mpv-582f3f7cc01f81345df5c20a012b1f47587e6a97.tar.bz2 mpv-582f3f7cc01f81345df5c20a012b1f47587e6a97.tar.xz | |
playlist: change from linked list to an array
Although a linked list was ideal at first, there are cases where it
sucks, and became increasingly awkward (with the mpv command API
preferring integer indexes to access the list). In future, we probably
want to add more playlist-related functionality, so better change it to
an array now.
An array isn't always ideal either. Since playlist entries are still
separate objects (because in some cases you need a stable "iterator" to
it), but you still need to efficiently get the next/previous playlist
entry, there's a pl_index field, that needs to be maintained. E.g.
adding an entry at the start of the playlist => update the pl_index
field for all other entries. Well, it's not really worth to do something
more complicated to avoid these things.
This commit is probably buggy as shit. It's not like I bothered to test
everything. That's _your_ role.
Diffstat (limited to 'player/misc.c')
| -rw-r--r-- | player/misc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/player/misc.c b/player/misc.c index 5a96d6cc25..c3765e5055 100644 --- a/player/misc.c +++ b/player/misc.c @@ -278,11 +278,12 @@ int stream_dump(struct MPContext *mpctx, const char *source_filename) void merge_playlist_files(struct playlist *pl) { - if (!pl->first) + if (!pl->num_entries) return; char *edl = talloc_strdup(NULL, "edl://"); - for (struct playlist_entry *e = pl->first; e; e = e->next) { - if (e != pl->first) + for (int n = 0; n < pl->num_entries; n++) { + struct playlist_entry *e = pl->entries[n]; + if (n) edl = talloc_strdup_append_buffer(edl, ";"); // Escape if needed if (e->filename[strcspn(e->filename, "=%,;\n")] || |