| 1 |
From: Robert Tari <[email protected]> |
| 2 |
Date: Wed, 27 Nov 2024 10:21:59 +0100 |
| 3 |
Subject: Allow building with embedded MPRIS support |
| 4 |
|
| 5 |
Forwarded: https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/45 |
| 6 |
--- |
| 7 |
CMakeLists.txt | 7 +++ |
| 8 |
src/CMakeLists.txt | 5 ++ |
| 9 |
src/mediaplayer.cpp | 27 ++++++++++ |
| 10 |
src/qml/player/AbstractPlayer.qml | 10 ++++ |
| 11 |
src/qml/player/MprisService.qml | 88 +++++++++++++++++++++++++++++++ |
| 12 |
5 files changed, 137 insertions(+) |
| 13 |
create mode 100644 src/qml/player/MprisService.qml |
| 14 |
|
| 15 |
--- a/CMakeLists.txt |
| 16 |
+++ b/CMakeLists.txt |
| 17 |
@@ -2,6 +2,9 @@ |
| 18 |
project(lomiri-mediaplayer-app VERSION 1.1.1 LANGUAGES CXX) |
| 19 |
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) |
| 20 |
|
| 21 |
+# Options |
| 22 |
+option (ADD_MPRIS "Enable the player's own MPRIS integration" OFF) |
| 23 |
+ |
| 24 |
# Find includes in corresponding build directories |
| 25 |
set(CMAKE_INCLUDE_CURRENT_DIR ON) |
| 26 |
set(DESKTOP_FILE lomiri-mediaplayer-app.desktop) |
| 27 |
@@ -31,6 +34,10 @@ |
| 28 |
endif() |
| 29 |
find_package(Qt5 COMPONENTS Gui Widgets Core Qml Quick Multimedia REQUIRED) |
| 30 |
|
| 31 |
+if (ADD_MPRIS) |
| 32 |
+ find_package (Qt5 COMPONENTS DBus REQUIRED) |
| 33 |
+endif () |
| 34 |
+ |
| 35 |
# Standard install paths |
| 36 |
include(GNUInstallDirs) |
| 37 |
|
| 38 |
--- a/src/CMakeLists.txt |
| 39 |
+++ b/src/CMakeLists.txt |
| 40 |
@@ -22,6 +22,11 @@ |
| 41 |
Qt5::Quick |
| 42 |
) |
| 43 |
|
| 44 |
+if (ADD_MPRIS) |
| 45 |
+ target_link_libraries (${MEDIAPLAYER} Qt5::DBus) |
| 46 |
+ target_compile_definitions (${MEDIAPLAYER} PUBLIC ADD_MPRIS) |
| 47 |
+endif () |
| 48 |
+ |
| 49 |
install(TARGETS ${MEDIAPLAYER} |
| 50 |
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 51 |
) |
| 52 |
--- a/src/mediaplayer.cpp |
| 53 |
+++ b/src/mediaplayer.cpp |
| 54 |
@@ -30,6 +30,11 @@ |
| 55 |
#include <QUrl> |
| 56 |
#include <libintl.h> |
| 57 |
|
| 58 |
+#ifdef ADD_MPRIS |
| 59 |
+ #include <QDBusConnection> |
| 60 |
+ #include <QDBusConnectionInterface> |
| 61 |
+#endif |
| 62 |
+ |
| 63 |
static void printUsage(const QStringList& arguments) |
| 64 |
{ |
| 65 |
qDebug() << "usage:" |
| 66 |
@@ -97,6 +102,28 @@ |
| 67 |
m_view->rootContext()->setContextProperty("screenWidth", m_view->size().width()); |
| 68 |
m_view->rootContext()->setContextProperty("screenHeight", m_view->size().height()); |
| 69 |
|
| 70 |
+ bool bMpris = false; |
| 71 |
+ |
| 72 |
+ #ifdef ADD_MPRIS |
| 73 |
+ QDBusConnection cConnection = QDBusConnection::sessionBus (); |
| 74 |
+ QDBusConnectionInterface *pInterface = cConnection.interface (); |
| 75 |
+ bMpris = !pInterface->isServiceRegistered ("com.lomiri.MediaHub.Service"); |
| 76 |
+ QString sPath = mediaPlayerDirectory (); |
| 77 |
+ bool bInstalled = isRunningInstalled (); |
| 78 |
+ |
| 79 |
+ if (bInstalled == false) |
| 80 |
+ { |
| 81 |
+ QDir pDir (sPath); |
| 82 |
+ sPath = pDir.absoluteFilePath ("../data"); |
| 83 |
+ sPath = pDir.cleanPath (sPath); |
| 84 |
+ } |
| 85 |
+ |
| 86 |
+ sPath += "/lomiri-mediaplayer-app.png"; |
| 87 |
+ this->m_view->rootContext ()->setContextProperty ("APP_ICON", QVariant (sPath)); |
| 88 |
+ #endif |
| 89 |
+ |
| 90 |
+ this->m_view->rootContext ()->setContextProperty ("ADD_MPRIS", QVariant (bMpris)); |
| 91 |
+ |
| 92 |
connect(m_view, SIGNAL(widthChanged(int)), SLOT(onWidthChanged(int))); |
| 93 |
connect(m_view, SIGNAL(heightChanged(int)), SLOT(onHeightChanged(int))); |
| 94 |
connect(m_view->engine(), SIGNAL(quit()), SLOT(quit())); |
| 95 |
--- a/src/qml/player/AbstractPlayer.qml |
| 96 |
+++ b/src/qml/player/AbstractPlayer.qml |
| 97 |
@@ -212,4 +212,14 @@ |
| 98 |
PropertyAction { target: scrubbingTimer; property: "step"; value: -forwardSeekStep } |
| 99 |
} |
| 100 |
] |
| 101 |
+ |
| 102 |
+ Loader { |
| 103 |
+ source: ADD_MPRIS ? "MprisService.qml" : "" |
| 104 |
+ |
| 105 |
+ onStatusChanged: { |
| 106 |
+ if (status == Loader.Ready && item) { |
| 107 |
+ item.player = player; |
| 108 |
+ } |
| 109 |
+ } |
| 110 |
+ } |
| 111 |
} |
| 112 |
--- /dev/null |
| 113 |
+++ b/src/qml/player/MprisService.qml |
| 114 |
@@ -0,0 +1,88 @@ |
| 115 |
+import QtQuick 2.4 |
| 116 |
+import QtMultimedia 5.6 |
| 117 |
+import org.nemomobile.mpris 1.0 |
| 118 |
+ |
| 119 |
+Item |
| 120 |
+{ |
| 121 |
+ property var player: null |
| 122 |
+ |
| 123 |
+ MprisPlayer |
| 124 |
+ { |
| 125 |
+ serviceName: "lomiri-mediaplayer-app" |
| 126 |
+ supportedUriSchemes: ["file"] |
| 127 |
+ canQuit: false |
| 128 |
+ canRaise: false |
| 129 |
+ canSetFullscreen: false |
| 130 |
+ hasTrackList: false |
| 131 |
+ desktopEntry: "lomiri-mediaplayer-app" |
| 132 |
+ identity: "Lomiri Media Player App" |
| 133 |
+ canControl: player && player.video && player.video.source != "" |
| 134 |
+ canPlay: true |
| 135 |
+ canGoNext: false |
| 136 |
+ canGoPrevious: false |
| 137 |
+ canPause: true |
| 138 |
+ canSeek: false |
| 139 |
+ playbackStatus: ((!player || !player.video) ? Mpris.Stopped : player.video.playbackState == MediaPlayer.PlayingState ? Mpris.Playing : player.video.playbackState == MediaPlayer.PausedState ? Mpris.Paused : Mpris.Stopped) |
| 140 |
+ metadata: |
| 141 |
+ { |
| 142 |
+ let pMetadata = {}; |
| 143 |
+ |
| 144 |
+ if (player && player.video && player.video.metaData) |
| 145 |
+ { |
| 146 |
+ if (player.video.metaData.author != null) |
| 147 |
+ { |
| 148 |
+ pMetadata["xesam:artist"] = [player.video.metaData.author]; |
| 149 |
+ } |
| 150 |
+ |
| 151 |
+ if (player.video.metaData.title != null) |
| 152 |
+ { |
| 153 |
+ pMetadata["xesam:title"] = player.video.metaData.title; |
| 154 |
+ } |
| 155 |
+ |
| 156 |
+ if (player.video.metaData.albumTitle != null) |
| 157 |
+ { |
| 158 |
+ pMetadata["xesam:album"] = player.video.metaData.albumTitle; |
| 159 |
+ } |
| 160 |
+ |
| 161 |
+ if (player.video.metaData.coverArtUrlSmall != null) |
| 162 |
+ { |
| 163 |
+ pMetadata["mpris:artUrl"] = player.video.metaData.coverArtUrlSmall; |
| 164 |
+ } |
| 165 |
+ else if (player.video.metaData.coverArtUrlLarge != null) |
| 166 |
+ { |
| 167 |
+ pMetadata["mpris:artUrl"] = player.video.metaData.coverArtUrlLarge; |
| 168 |
+ } |
| 169 |
+ else if (player.video.metaData.posterUrl != null) |
| 170 |
+ { |
| 171 |
+ pMetadata["mpris:artUrl"] = player.video.metaData.posterUrl; |
| 172 |
+ } |
| 173 |
+ else |
| 174 |
+ { |
| 175 |
+ pMetadata["mpris:artUrl"] = APP_ICON; |
| 176 |
+ } |
| 177 |
+ } |
| 178 |
+ |
| 179 |
+ return pMetadata; |
| 180 |
+ } |
| 181 |
+ |
| 182 |
+ onPlayRequested: |
| 183 |
+ { |
| 184 |
+ player.video.play (); |
| 185 |
+ } |
| 186 |
+ |
| 187 |
+ onPauseRequested: |
| 188 |
+ { |
| 189 |
+ player.video.pause (); |
| 190 |
+ } |
| 191 |
+ |
| 192 |
+ onStopRequested: |
| 193 |
+ { |
| 194 |
+ player.video.stop (); |
| 195 |
+ } |
| 196 |
+ |
| 197 |
+ onPlayPauseRequested: |
| 198 |
+ { |
| 199 |
+ player.togglePause (); |
| 200 |
+ } |
| 201 |
+ } |
| 202 |
+} |