eyecreate/simplecastengine
Private
Public Access
1
0
Fork 0
Code Activity

Add missing connect statements. Implement workaround for QTBUG-48008.

Browse Source
This commit is contained in:
Kevin Whitaker
2019-04-12 19:48:05 -04:00
parent 10b41d66a3
commit 6fd877939a
2 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/mprisinterface.cpp
View File

@@ -17,6 +17,7 @@
#include "mprisinterface.h" #include "mprisinterface.h"
#include <qcryptographichash.h> #include <qcryptographichash.h>
#include <QtDBus/QDBusMessage>
MPRISInterface::MPRISInterface(QObject* parent) : QDBusAbstractAdaptor(parent) MPRISInterface::MPRISInterface(QObject* parent) : QDBusAbstractAdaptor(parent)
{ {
@@ -57,27 +58,52 @@ QStringList MPRISInterface::SupportedUriSchemes()
MPRISPlayerInterface::MPRISPlayerInterface(MiniMediaPlayer *player,QObject* parent) : QDBusAbstractAdaptor(parent),player(player) MPRISPlayerInterface::MPRISPlayerInterface(MiniMediaPlayer *player,QObject* parent) : QDBusAbstractAdaptor(parent),player(player)
{ {
//Connected Changed values from media player. //Connected Changed values from media player.
connect(player,&MiniMediaPlayer::playStateChanged,this,&MPRISPlayerInterface::mediaStateChanged);
connect(player,&MiniMediaPlayer::playlistChanged,this,&MPRISPlayerInterface::mediaPlaylistChanged);
connect(player,&MiniMediaPlayer::mediaVolumeChanged,this,&MPRISPlayerInterface::mediaVolumeChanged);
connect(player,&MiniMediaPlayer::trackPositionChanged,this,&MPRISPlayerInterface::mediaPositionChanged);
}
void MPRISPlayerInterface::dbusUpdate(QVariantMap changed)
{
//Workaround for qt dbus not sending this signal
QDBusMessage msg = QDBusMessage::createSignal("/org/mpris/MediaPlayer2","org.freedesktop.DBus.Properties","PropertiesChanged");
msg << "org.mpris.MediaPlayer2.Player";
msg << changed;
msg << QStringList();
QDBusConnection::sessionBus().send(msg);
} }
void MPRISPlayerInterface::mediaPositionChanged(qint64 position) void MPRISPlayerInterface::mediaPositionChanged(qint64 position)
{ {
emit positionChanged(Position()); emit positionChanged(Position());
QVariantMap map;
map.insert("Position",Position());
dbusUpdate(map);
} }
void MPRISPlayerInterface::mediaStateChanged(QMediaPlayer::State state) void MPRISPlayerInterface::mediaStateChanged(bool isPlaying)
{ {
emit playbackStatusChanged(PlaybackStatus()); emit playbackStatusChanged(PlaybackStatus());
QVariantMap map;
map.insert("PlaybackStatus",PlaybackStatus());
dbusUpdate(map);
} }
void MPRISPlayerInterface::mediaVolumeChanged(int volume) void MPRISPlayerInterface::mediaVolumeChanged(int volume)
{ {
emit volumeChanged(Volume()); emit volumeChanged(Volume());
QVariantMap map;
map.insert("Volume",Volume());
dbusUpdate(map);
} }
void MPRISPlayerInterface::mediaPlaylistChanged(QStringList playlist) void MPRISPlayerInterface::mediaPlaylistChanged(QStringList playlist)
{ {
emit metadataChanged(Metadata()); emit metadataChanged(Metadata());
QVariantMap map;
map.insert("Metadata",Metadata());
dbusUpdate(map);
} }
bool MPRISPlayerInterface::CanControl() bool MPRISPlayerInterface::CanControl()
@@ -186,12 +212,15 @@ void MPRISPlayerInterface::setVolume(double volume)
player->setVolume(volume*100); //QMediaPlayer uses 0 to 100 player->setVolume(volume*100); //QMediaPlayer uses 0 to 100
} }
QMap<QString, QDBusVariant> MPRISPlayerInterface::Metadata() QVariantMap MPRISPlayerInterface::Metadata()
{ {
QMap<QString,QDBusVariant> map; QVariantMap map;
map.insert("mpris:trackid",QDBusVariant("org.mpris.MediaPlayer2.simplecast.Player."+QString(QCryptographicHash::hash(player->getTrackNames()[0].toUtf8(),QCryptographicHash::Algorithm::Md5)))); if(player->getTrackNames().size() > 0)
map.insert("mpris:length",QDBusVariant(player->getTrackDuration()*1000)); {
map.insert("xesam:title",QDBusVariant(player->getTrackNames()[0])); map.insert("mpris:trackid",QVariant("org.mpris.MediaPlayer2.simplecast.Player."+QString(QCryptographicHash::hash(player->getTrackNames()[0].toUtf8(),QCryptographicHash::Algorithm::Md5))));
map.insert("mpris:length",QVariant(player->getTrackDuration()*1000));
map.insert("xesam:title",QVariant(player->getTrackNames()[0]));
}
return map; return map;
} }

9
src/mprisinterface.h
View File

@@ -56,7 +56,7 @@ class MPRISPlayerInterface : public QDBusAbstractAdaptor
Q_CLASSINFO("D-Bus Interface","org.mpris.MediaPlayer2.Player") Q_CLASSINFO("D-Bus Interface","org.mpris.MediaPlayer2.Player")
Q_PROPERTY(QString PlaybackStatus READ PlaybackStatus NOTIFY playbackStatusChanged) Q_PROPERTY(QString PlaybackStatus READ PlaybackStatus NOTIFY playbackStatusChanged)
Q_PROPERTY(double Rate READ Rate WRITE setRate) Q_PROPERTY(double Rate READ Rate WRITE setRate)
Q_PROPERTY(QMap<QString,QDBusVariant>Metadata READ Metadata NOTIFY metadataChanged) Q_PROPERTY(QVariantMap Metadata READ Metadata NOTIFY metadataChanged)
Q_PROPERTY(double Volume READ Volume WRITE setVolume NOTIFY volumeChanged) Q_PROPERTY(double Volume READ Volume WRITE setVolume NOTIFY volumeChanged)
Q_PROPERTY(qlonglong Position READ Position NOTIFY positionChanged) Q_PROPERTY(qlonglong Position READ Position NOTIFY positionChanged)
Q_PROPERTY(double MinimumRate READ MinimumRate) Q_PROPERTY(double MinimumRate READ MinimumRate)
@@ -72,7 +72,7 @@ public:
QString PlaybackStatus(); QString PlaybackStatus();
double Rate(); double Rate();
void setRate(double rate) {}; void setRate(double rate) {};
QMap<QString,QDBusVariant> Metadata(); QVariantMap Metadata();
double Volume(); double Volume();
void setVolume(double volume); void setVolume(double volume);
qlonglong Position(); qlonglong Position();
@@ -97,16 +97,17 @@ public slots:
signals: signals:
void Seeked(qlonglong position); //Not used void Seeked(qlonglong position); //Not used
void playbackStatusChanged(QString status); void playbackStatusChanged(QString status);
void metadataChanged(QMap<QString,QDBusVariant> metadata); void metadataChanged(QVariantMap metadata);
void volumeChanged(double volume); void volumeChanged(double volume);
void positionChanged(qlonglong position); void positionChanged(qlonglong position);
private slots: private slots:
void mediaStateChanged(QMediaPlayer::State state); void mediaStateChanged(bool isPlaying);
void mediaPositionChanged(qint64 position); void mediaPositionChanged(qint64 position);
void mediaVolumeChanged(int volume); void mediaVolumeChanged(int volume);
void mediaPlaylistChanged(QStringList playlist); void mediaPlaylistChanged(QStringList playlist);
private: private:
MiniMediaPlayer *player; MiniMediaPlayer *player;
void dbusUpdate(QVariantMap changed);
}; };
#endif // MPRISINTERFACE_H #endif // MPRISINTERFACE_H