From 53be3656783afb89d827fd5ffa16e54096d6619f Mon Sep 17 00:00:00 2001 From: kelciour Date: Fri, 10 Jan 2025 11:16:08 +0300 Subject: [PATCH] Fix mpv loadfile syntax change 2 (#3711) * Revert "Fix mpv loadfile syntax change (#3105)" This reverts commit 111f3bd1386a1c3f42ad395eaee0a43f91e5928c. * Fix mpv loadfile syntax change 2 --- qt/aqt/mpv.py | 1 - qt/aqt/sound.py | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qt/aqt/mpv.py b/qt/aqt/mpv.py index a3156fa79..46d723766 100644 --- a/qt/aqt/mpv.py +++ b/qt/aqt/mpv.py @@ -88,7 +88,6 @@ class MPVBase: "--keep-open=no", "--autoload-files=no", "--gapless-audio=no", - "--reset-on-next-file=pause", ] if is_win: diff --git a/qt/aqt/sound.py b/qt/aqt/sound.py index e377d001e..c9d70e32c 100644 --- a/qt/aqt/sound.py +++ b/qt/aqt/sound.py @@ -427,6 +427,12 @@ class MpvManager(MPV, SoundOrVideoPlayer): if self._on_done: self._on_done() + m = re.search(r"(\d+)\.(\d+)\.(\d+)", self.get_property("mpv-version")) + if m: + self.mpv_version = (int(m[1]), int(m[2]), int(m[3])) + else: + self.mpv_version = None + try: self.command("keybind", "q", "stop") self.command("keybind", "Q", "stop") @@ -442,7 +448,10 @@ class MpvManager(MPV, SoundOrVideoPlayer): filename = hooks.media_file_filter(tag.filename) path = os.path.join(self.media_folder, filename) - self.command("loadfile", path, "replace") + if self.mpv_version is None or self.mpv_version >= (0, 38, 0): + self.command("loadfile", path, "replace", -1, "pause=no") + else: + self.command("loadfile", path, "replace", "pause=no") gui_hooks.av_player_did_begin_playing(self, tag) def stop(self) -> None: