Merge pull request #46 from ua0lnj/master

sync
vdr-projects · Jan 14, 2025 · c1f063a · c1f063a
2 parents 292d029 + 678df06
commit c1f063a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/control.c b/control.c
@@ -35,7 +35,7 @@ cMpvControl::cMpvControl(string Filename, bool Shuffle)
       Player->SetWindowSize(w, h, x, y);
       xcb_flush(connect);
       connect = NULL;
-    }
+    } else Player->SetWindowSize(0, 0, 0, 0);
   }
   cStatus::MsgReplaying(this, Filename.c_str(), Filename.c_str(), true);
 }

diff --git a/player.c b/player.c
@@ -625,7 +625,11 @@ void cMpvPlayer::PlayerStart()
   check_error(mpv_set_option_string(hMpv, "alang", MpvPluginConfig->Languages.c_str()));
   check_error(mpv_set_option_string(hMpv, "cache", "no")); // video stutters if enabled
   check_error(mpv_set_option_string(hMpv, "sub-visibility", MpvPluginConfig->ShowSubtitles ? "yes" : "no"));
+#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,2)
   check_error(mpv_set_option_string(hMpv, "sub-forced-only", "yes"));
+#else
+  check_error(mpv_set_option_string(hMpv, "sub-forced-events-only", "yes"));
+#endif
   check_error(mpv_set_option_string(hMpv, "sub-auto", "all"));
   check_error(mpv_set_option_string(hMpv, "hr-seek", "yes"));
   check_error(mpv_set_option_string(hMpv, "write-filename-in-watch-later-config", "yes"));
@@ -642,7 +646,6 @@ void cMpvPlayer::PlayerStart()
 #ifdef DEBUG
   check_error(mpv_set_option_string(hMpv, "log-file", "/var/log/mpv"));
 #endif
-
   if (MpvPluginConfig->UsePassthrough)
   {
     check_error(mpv_set_option_string(hMpv, "audio-spdif", "ac3,dts"));