player: add --merge-files option

3 files changed, 27 insertions, 0 deletions

diff --git a/mpvcore/player/main.c b/mpvcore/player/main.c
index 34383f4264..4119e244c3 100644
--- a/mpvcore/player/main.c
+++ b/mpvcore/player/main.c
@@ -419,6 +419,9 @@ static int mpv_main(int argc, char *argv[])
     if (opts->shuffle)
         playlist_shuffle(mpctx->playlist);
 
+    if (opts->merge_files)
+        merge_playlist_files(mpctx->playlist);
+
     mpctx->playlist->current = mp_resume_playlist(mpctx->playlist, opts);
     if (!mpctx->playlist->current)
         mpctx->playlist->current = mpctx->playlist->first;
diff --git a/mpvcore/player/misc.c b/mpvcore/player/misc.c
index be42d76447..548e2c7967 100644
--- a/mpvcore/player/misc.c
+++ b/mpvcore/player/misc.c
@@ -32,6 +32,7 @@
 #include "mpvcore/mp_common.h"
 #include "mpvcore/resolve.h"
 #include "mpvcore/encode.h"
+#include "mpvcore/playlist.h"
 #include "mpvcore/input/input.h"
 
 #include "audio/out/ao.h"
@@ -184,3 +185,25 @@ void stream_dump(struct MPContext *mpctx)
         }
     }
 }
+
+void merge_playlist_files(struct playlist *pl)
+{
+    if (!pl->first)
+        return;
+    char *edl = talloc_strdup(NULL, "edl://");
+    for (struct playlist_entry *e = pl->first; e; e = e->next) {
+        if (e != pl->first)
+            edl = talloc_strdup_append_buffer(edl, ";");
+        // Escape if needed
+        if (e->filename[strcspn(e->filename, "=%,;\n")] ||
+            bstr_strip(bstr0(e->filename)).len != strlen(e->filename))
+        {
+            // %length%
+            edl = talloc_asprintf_append_buffer(edl, "%%%d%%", strlen(e->filename));
+        }
+        edl = talloc_strdup_append_buffer(edl, e->filename);
+    }
+    playlist_clear(pl);
+    playlist_add_file(pl, edl);
+    talloc_free(edl);
+}
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h
index 4e0dede812..2ea65f54be 100644
--- a/mpvcore/player/mp_core.h
+++ b/mpvcore/player/mp_core.h
@@ -376,6 +376,7 @@ double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t,
                        double fallback_time);
 double get_play_end_pts(struct MPContext *mpctx);
 double get_relative_time(struct MPContext *mpctx);
+void merge_playlist_files(struct playlist *pl);
 int mp_get_cache_percent(struct MPContext *mpctx);
 bool mp_get_cache_idle(struct MPContext *mpctx);
 void update_window_title(struct MPContext *mpctx, bool force);