From 7e659d0edd2ee2a9e0168053919ad3dc1972aab2 Mon Sep 17 00:00:00 2001
From: APTX <marek321@gmail.com>
Date: Sat, 19 Feb 2022 18:14:27 +0900
Subject: [PATCH] Turn off deprecated MPV features

Also removes use of the deprecated features

qthelper.hpp is no longer part of MPV, so the deprecation
no longer applies.
---
 backendplugins/backend_mpv/CMakeLists.txt |  2 ++
 backendplugins/backend_mpv/backendmpv.cpp | 12 ++++++++----
 backendplugins/backend_mpv/qthelper.hpp   |  6 ------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backendplugins/backend_mpv/CMakeLists.txt b/backendplugins/backend_mpv/CMakeLists.txt
index 31b0736..81d5519 100644
--- a/backendplugins/backend_mpv/CMakeLists.txt
+++ b/backendplugins/backend_mpv/CMakeLists.txt
@@ -41,6 +41,8 @@ target_link_libraries(backend_mpv ${backend_mpv_LIBS})
 
 add_definitions(-DBACKEND_MPV_LIBRARY)
 
+add_definitions(-DMPV_ENABLE_DEPRECATED=0)
+
 install(TARGETS backend_mpv
     LIBRARY DESTINATION ${INSTALL_DESTINATION}
     ARCHIVE DESTINATION ${INSTALL_DESTINATION}
diff --git a/backendplugins/backend_mpv/backendmpv.cpp b/backendplugins/backend_mpv/backendmpv.cpp
index ef9c3d2..75b655b 100644
--- a/backendplugins/backend_mpv/backendmpv.cpp
+++ b/backendplugins/backend_mpv/backendmpv.cpp
@@ -94,6 +94,11 @@ MpvInstance::MpvInstance(PlayerPluginInterface *playerInterface,
         mpv_observe_property(m_handle, 0, "chapter-list", MPV_FORMAT_NODE);
     qCDebug(mpvBackend) << "register chapter-list" << ret;
   }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "idle-active", MPV_FORMAT_NODE);
+    qCDebug(mpvBackend) << "register chapter-list" << ret;
+  }
   {
     const auto ret = mpv_request_log_messages(m_handle, "info");
     qCDebug(mpvBackend) << "request log messages" << ret;
@@ -350,6 +355,9 @@ void MpvInstance::processMpvEvents() {
                                                      map["time"].toDouble()};
         }
         m_player->backendChaptersChanged(chapters);
+      } else if (strcmp(property->name, "idle-active") == 0) {
+        m_player->playStateChanged(PlayerPluginInterface::PlayState::Stopped);
+        m_player->backendReadyToPlay();
       } else {
         qCWarning(mpvBackend)
             << "Change notification for not handled property" << property->name;
@@ -397,10 +405,6 @@ void MpvInstance::processMpvEvents() {
         m_player->playbackEndOfFileReached();
       }
     } break;
-    case MPV_EVENT_IDLE: {
-      m_player->playStateChanged(PlayerPluginInterface::PlayState::Stopped);
-      m_player->backendReadyToPlay();
-    } break;
     case MPV_EVENT_AUDIO_RECONFIG: {
       if (m_volumeToSet >= 0) {
         qCDebug(mpvBackend) << "Audio reconfigured, maybe it's ready now?";
diff --git a/backendplugins/backend_mpv/qthelper.hpp b/backendplugins/backend_mpv/qthelper.hpp
index 3af86e3..0f66490 100644
--- a/backendplugins/backend_mpv/qthelper.hpp
+++ b/backendplugins/backend_mpv/qthelper.hpp
@@ -18,10 +18,6 @@
 
 #include <mpv/client.h>
 
-#if !MPV_ENABLE_DEPRECATED
-#error "This helper is deprecated. Copy it into your project instead."
-#else
-
 /**
  * Note: these helpers are provided for convenience for C++/Qt applications.
  * This is based on the public API in client.h, and it does not encode any
@@ -381,6 +377,4 @@ static inline QVariant command(mpv_handle *ctx, const QVariant &args)
 
 Q_DECLARE_METATYPE(mpv::qt::ErrorReturn)
 
-#endif /* else #if MPV_ENABLE_DEPRECATED */
-
 #endif
-- 
2.52.0