arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-25 07:57:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124 from arcan1s/development

Browse Source 
MPRIS related fixes
This commit is contained in:
Evgenii Alekseev 2017-05-21 23:08:36 +03:00 committed by GitHub
commit 1a5caee4bc
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/fix-mpris-engine.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp
index b8a0ec1..17d90bc 100644
--- a/sources/extsysmonsources/playersource.cpp
+++ b/sources/extsysmonsources/playersource.cpp
@@ -73,8 +73,10 @@ QString PlayerSource::getAutoMpris() const
{
QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
QDBus::BlockWithGui, "ListNames");
- if (listServices.arguments().isEmpty())
+ if (listServices.arguments().isEmpty()) {
+ qCWarning(LOG_ESS) << "Could not find any DBus service";
return "";
+ }
QStringList arguments = listServices.arguments().first().toStringList();
for (auto &arg : arguments) {
@@ -353,7 +355,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
= QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
QDBusMessage request = QDBusMessage::createMethodCall(
QString("org.mpris.MediaPlayer2.%1").arg(_mpris),
- "/org/mpris/MediaPlayer2", "", "Get");
+ "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
request.setArguments(args);
QDBusMessage response
= bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);

4
sources/awesome-widget/package/contents/ui/dataengine.qml
View File

@ -167,8 +167,8 @@ Item {
'name': 'clementine' 'name': 'clementine'
}, },
{ {
'label': 'deadbeef', 'label': 'DeaDBeeF',
'name': 'deadbeef' 'name': 'DeaDBeeF'
}, },
{ {
'label': 'vlc', 'label': 'vlc',

6
sources/extsysmonsources/playersource.cpp
View File

@ -73,8 +73,10 @@ QString PlayerSource::getAutoMpris() const
{ {
QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call( QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
QDBus::BlockWithGui, "ListNames"); QDBus::BlockWithGui, "ListNames");
if (listServices.arguments().isEmpty()) if (listServices.arguments().isEmpty()) {
qCWarning(LOG_ESS) << "Could not find any DBus service";
return ""; return "";
}
QStringList arguments = listServices.arguments().first().toStringList(); QStringList arguments = listServices.arguments().first().toStringList();
for (auto &arg : arguments) { for (auto &arg : arguments) {
@ -353,7 +355,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
= QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"}); = QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
QDBusMessage request = QDBusMessage::createMethodCall( QDBusMessage request = QDBusMessage::createMethodCall(
QString("org.mpris.MediaPlayer2.%1").arg(_mpris), QString("org.mpris.MediaPlayer2.%1").arg(_mpris),
"/org/mpris/MediaPlayer2", "", "Get"); "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
request.setArguments(args); request.setArguments(args);
QDBusMessage response QDBusMessage response
= bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT); = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);