From: APTX <marek321@gmail.com>
Date: Sun, 26 Nov 2017 05:07:25 +0000 (+0900)
Subject: Fix logs in mpv backend
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=c907240d8fac97128d51f1fed9617f0c35f9f1e2;p=aniplayer.git

Fix logs in mpv backend

Operations should not be performed in log statements
---

diff --git a/backendplugins/backend_mpv/backendmpv.cpp b/backendplugins/backend_mpv/backendmpv.cpp
index ce5d4ff..3dadba5 100644
--- a/backendplugins/backend_mpv/backendmpv.cpp
+++ b/backendplugins/backend_mpv/backendmpv.cpp
@@ -11,8 +11,8 @@
 
 #include <QLoggingCategory>
 
-Q_LOGGING_CATEGORY(mpvBackend, "MPV")
-Q_LOGGING_CATEGORY(mpvLog, "MPV Log")
+Q_LOGGING_CATEGORY(mpvBackend, "mpv")
+Q_LOGGING_CATEGORY(mpvLog, "mpv.log")
 
 static constexpr const char VOLUME[] = "volume";
 
@@ -42,40 +42,62 @@ MpvInstance::MpvInstance(PlayerPluginInterface *playerInterface,
 
   int error = mpv_initialize(m_handle);
   if (error) {
-    qCDebug(mpvBackend) << "Error initializing mpv" << mpv_error_string(error);
+    qCCritical(mpvBackend) << "Error initializing mpv"
+                           << mpv_error_string(error);
     return;
   }
 
   mpv_set_wakeup_callback(m_handle, mpvWakeupCb, this);
-  qCDebug(mpvBackend) << "register pause"
-                      << mpv_observe_property(m_handle, 0, "pause",
-                                              MPV_FORMAT_FLAG);
-  qCDebug(mpvBackend) << "register duration"
-                      << mpv_observe_property(m_handle, 0, "duration",
-                                              MPV_FORMAT_DOUBLE);
-  qCDebug(mpvBackend) << "register playback-time"
-                      << mpv_observe_property(m_handle, 0, "playback-time",
-                                              MPV_FORMAT_DOUBLE);
-  qCDebug(mpvBackend) << "register" << VOLUME
-                      << mpv_observe_property(m_handle, 0, VOLUME,
-                                              MPV_FORMAT_DOUBLE);
-  qCDebug(mpvBackend) << "register track-list"
-                      << mpv_observe_property(m_handle, 0, "track-list",
-                                              MPV_FORMAT_NODE);
-  qCDebug(mpvBackend) << "register vid"
-                      << mpv_observe_property(m_handle, 0, "vid",
-                                              MPV_FORMAT_STRING);
-  qCDebug(mpvBackend) << "register aid"
-                      << mpv_observe_property(m_handle, 0, "aid",
-                                              MPV_FORMAT_STRING);
-  qCDebug(mpvBackend) << "register sid"
-                      << mpv_observe_property(m_handle, 0, "sid",
-                                              MPV_FORMAT_STRING);
-  qCDebug(mpvBackend) << "register chapter-list"
-                      << mpv_observe_property(m_handle, 0, "chapter-list",
-                                              MPV_FORMAT_NODE);
-  qCDebug(mpvBackend) << "request log messages"
-                      << mpv_request_log_messages(m_handle, "info");
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "pause", MPV_FORMAT_FLAG);
+    qCDebug(mpvBackend) << "register pause" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "duration", MPV_FORMAT_DOUBLE);
+    qCDebug(mpvBackend) << "register duration" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "playback-time", MPV_FORMAT_DOUBLE);
+    qCDebug(mpvBackend) << "register playback-time" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, VOLUME, MPV_FORMAT_DOUBLE);
+    qCDebug(mpvBackend) << "register" << VOLUME << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "track-list", MPV_FORMAT_NODE);
+    qCDebug(mpvBackend) << "register track-list" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "vid", MPV_FORMAT_STRING);
+
+    qCDebug(mpvBackend) << "register vid" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "aid", MPV_FORMAT_STRING);
+    qCDebug(mpvBackend) << "register aid" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "sid", MPV_FORMAT_STRING);
+    qCDebug(mpvBackend) << "register sid" << ret;
+  }
+  {
+    const auto ret =
+        mpv_observe_property(m_handle, 0, "chapter-list", 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;
+  }
   {
     double maxVolume = 130.0;
     mpv_set_property(m_handle, "max-volume", MPV_FORMAT_DOUBLE, &maxVolume);