Merge pull request #989 from andrewrabert/mpris

MPRIS

Author: andrewrabert

native/find-webclient.js

@@ -140,6 +140,8 @@ document.addEventListener('keydown', (e) => {
 (async () => {
     console.log('Auto-connect: starting');
 
+    await window.apiPromise;
+
     const savedServer = window.jmpInfo.settings.main.userWebClient;
     console.log('Auto-connect: savedServer =', savedServer);
 

native/jmpInputPlugin.js

@@ -262,6 +262,10 @@ class mpvAudioPlayer {
     setPlaybackRate(value) {
         this._playRate = value;
         window.api.player.setPlaybackRate(value * 1000);
+
+        if (window.api && window.api.player) {
+            window.api.player.notifyRateChange(value);
+        }
     }
 
     getPlaybackRate() {
@@ -348,4 +352,4 @@ function getSupportedFeatures() {
 }
 
 window._mpvAudioPlayer = mpvAudioPlayer;
-})();
+})();

native/mpvAudioPlayer.js

@@ -612,6 +612,20 @@
         return this._supportedFeatures.includes(feature);
     }
 
+    isFullscreen() {
+        // Check native window fullscreen state
+        if (window.jmpInfo && window.jmpInfo.settings && window.jmpInfo.settings.main) {
+            return window.jmpInfo.settings.main.fullscreen === true;
+        }
+        return false;
+    }
+
+    toggleFullscreen() {
+        if (window.api && window.api.input) {
+            window.api.input.executeActions(['host:fullscreen']);
+        }
+    }
+
     // Save this for when playback stops, because querying the time at that point might return 0
     currentTime(val) {
         if (val != null) {
@@ -690,6 +704,10 @@
         let playSpeed = +value; //this comes as a string from player force int for now
         this._playRate = playSpeed;
         window.api.player.setPlaybackRate(playSpeed * 1000);
+
+        if (window.api && window.api.player) {
+            window.api.player.notifyRateChange(playSpeed);
+        }
     }
 
     getPlaybackRate() {
@@ -879,22 +897,7 @@
     setAspectRatio(value) {
         window.jmpInfo.settings.video.aspect = value;
     }
-
-    isFullscreen() {
-        // Check native window fullscreen state from settings (universal source of truth)
-        if (window.jmpInfo && window.jmpInfo.settings && window.jmpInfo.settings.main) {
-            return window.jmpInfo.settings.main.fullscreen === true;
-        }
-        return false;
-    }
-
-    toggleFullscreen() {
-        // Toggle native window fullscreen via host command
-        if (window.api && window.api.input) {
-            window.api.input.executeActions(['host:fullscreen']);
-        }
-    }
-    }
+}
 /* eslint-enable indent */
 
 window._mpvVideoPlayer = mpvVideoPlayer;

native/mpvVideoPlayer.js

@@ -554,3 +554,23 @@ async function showSettingsModal() {
     });
     closeContainer.appendChild(close);
 }
+
+let lastFullscreenState = window.jmpInfo.settings.main.fullscreen;
+
+window.jmpInfo.settingsUpdate.push(function(section) {
+    if (section === 'main') {
+        const currentFullscreenState = window.jmpInfo.settings.main.fullscreen;
+        if (currentFullscreenState !== lastFullscreenState) {
+            lastFullscreenState = currentFullscreenState;
+
+            if (window.api && window.api.player) {
+                window.api.player.notifyFullscreenChange(currentFullscreenState);
+                console.log('Player fullscreen notified');
+            }
+
+            if (window.Events && window.playbackManager && window.playbackManager._currentPlayer) {
+                window.Events.trigger(window.playbackManager._currentPlayer, 'fullscreenchange');
+            }
+        }
+    }
+});

native/nativeshell.js

@@ -22,6 +22,7 @@ add_subdirectory(system)
 add_subdirectory(settings)
 add_subdirectory(power)
 add_subdirectory(taskbar)
+add_subdirectory(mpris)
 
 get_property(ALL_SRCS GLOBAL PROPERTY SRCS_LIST)
 set(MAIN_SRCS main.cpp)

src/CMakeLists.txt

@@ -13,6 +13,7 @@
 #include "settings/SettingsComponent.h"
 #include "taskbar/TaskbarComponent.h"
 #include "ui/WindowManager.h"
+#include "mpris/MprisComponent.h"
 
 #if KONVERGO_OPENELEC
 #include "system/openelec/OESystemComponent.h"
@@ -60,6 +61,7 @@ void ComponentManager::initialize()
   registerComponent(&PowerComponent::Get());
   registerComponent(&TaskbarComponent::Get());
   registerComponent(&WindowManager::Get());
+  registerComponent(&MprisComponent::Get());
 
 #if KONVERGO_OPENELEC
   registerComponent(&OESystemComponent::Get());

src/core/ComponentManager.cpp

@@ -258,6 +258,27 @@ void InputComponent::sendAction(const QString action)
   emit hostInput(actionsToSend);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+void InputComponent::setVolume(int volume)
+{
+  qDebug() << "InputComponent: setVolume" << volume;
+  emit volumeChanged(volume);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void InputComponent::seekTo(qint64 position)
+{
+  qDebug() << "InputComponent: seekTo" << position << "ms";
+  emit positionSeek(position);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void InputComponent::setRate(double rate)
+{
+  qDebug() << "InputComponent: setRate" << rate;
+  emit rateChanged(rate);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 void InputComponent::registerHostCommand(const QString& command, QObject* receiver, const char* slot)
 {

src/input/InputComponent.cpp

@@ -108,6 +108,11 @@ class InputComponent : public ComponentBase
   void cancelAutoRepeat();
   void sendAction(const QString action);
 
+  // Volume, seek, and rate control
+  Q_INVOKABLE void setVolume(int volume);
+  Q_INVOKABLE void seekTo(qint64 position);
+  Q_INVOKABLE void setRate(double rate);
+
 signals:
   // Always emitted when any input arrives
   void receivedInput();
@@ -116,6 +121,15 @@ class InputComponent : public ComponentBase
   // in the keymap, such as "host:fullscreen".
   void hostInput(const QStringList& actions);
 
+  // Emitted when volume should be changed (0-100)
+  void volumeChanged(int volume);
+
+  // Emitted when position should be changed (milliseconds)
+  void positionSeek(qint64 position);
+
+  // Emitted when playback rate should be changed (1.0 = normal speed)
+  void rateChanged(double rate);
+
 private Q_SLOTS:
   void remapInput(const QString& source, const QString& keycode, InputBase::InputkeyState keyState);
 

src/input/InputComponent.h

@@ -92,7 +92,8 @@ void ShowLicenseInfo()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 QStringList g_qtFlags = {
-  "--enable-gpu-rasterization"
+  "--enable-gpu-rasterization",
+  "--disable-features=MediaSessionService"
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -238,6 +239,11 @@ int main(int argc, char *argv[])
       webEngineDataDir = d.absolutePath() + "/QtWebEngine";
     }
 
+#ifdef Q_OS_LINUX
+    // Disable QtWebEngine's automatic MPRIS registration - we handle it ourselves
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=MediaSessionService,HardwareMediaKeyHandling");
+#endif
+
     QtWebEngineQuick::initialize();
     QApplication app(newArgc, newArgv);