iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve MPRISv2 interface.

Browse Source
This commit is contained in:
craig.p.drummond
2012-09-25 20:18:57 +00:00
committed by craig.p.drummond
parent 8c1c49ba9d
commit 8ab381fe8b
5 changed files with 215 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
dbus/mpris.cpp
View File

@@ -34,6 +34,8 @@ Mpris::Mpris(MainWindow *p)
: QObject(p)
, mw(p)
{
QDBusConnection::sessionBus().registerService("org.mpris.MediaPlayer2.cantata");
// Comes from playeradaptor.h which is auto-generated
// in the top-level CMakeLists.txt with qt4_add_dbus_adaptor.
new PlayerAdaptor(this);
@@ -42,8 +44,7 @@ Mpris::Mpris(MainWindow *p)
// in the top-level CMakeLists.txt with qt4_add_dbus_adaptor.
new MediaPlayer2Adaptor(this);
QDBusConnection::sessionBus().registerService("org.mpris.MediaPlayer2.cantata");
QDBusConnection::sessionBus().registerObject("/org/mpris/MediaPlayer2", this);
QDBusConnection::sessionBus().registerObject("/org/mpris/MediaPlayer2", this, QDBusConnection::ExportAdaptors);
connect(this, SIGNAL(goToNext()), MPDConnection::self(), SLOT(goToNext()));
connect(this, SIGNAL(setPause(bool)), MPDConnection::self(), SLOT(setPause(bool)));
connect(this, SIGNAL(startPlayingSong(quint32)), MPDConnection::self(), SLOT(startPlayingSong(quint32)));
@@ -56,17 +57,115 @@ Mpris::Mpris(MainWindow *p)
connect(this, SIGNAL(stopPlaying()), MPDConnection::self(), SLOT(stopPlaying()));
connect(MPDConnection::self(), SIGNAL(currentSongUpdated(const Song &)), this, SLOT(updateCurrentSong(const Song &)));
connect(MPDStatus::self(), SIGNAL(updated()), this, SLOT(updateStatus()));
}
qlonglong Mpris::Position() const
{
// Cant use MPDStatus, as we dont poll for track position, but use a timer instead!
//return MPDStatus::self()->timeElapsed();
return mw->currentTrackPosition();
}
void Mpris::updateStatus()
{
QVariantMap map;
if (MPDStatus::self()->repeat()!=status.repeat) {
status.repeat=MPDStatus::self()->repeat();
map.insert("LoopStatus", LoopStatus());
}
if (MPDStatus::self()->random()!=status.random) {
status.random=MPDStatus::self()->random();
map.insert("Shuffle", Shuffle());
}
if (MPDStatus::self()->volume()!=status.volume) {
status.volume=MPDStatus::self()->volume();
map.insert("Volume", Volume());
}
if (MPDStatus::self()->state()!=status.state) {
status.state=MPDStatus::self()->state();
map.insert("PlaybackStatus", PlaybackStatus());
}
signalUpdate(map);
}
void Mpris::updateCurrentCover(const QString &fileName)
{
if (fileName!=currentCover) {
currentCover=fileName;
signalUpdate("Metadata", Metadata());
}
}
void Mpris::updateCurrentSong(const Song &song)
{
currentSong = song;
if (song.albumArtist()!=currentSong.albumArtist() || song.album!=currentSong.album) {
currentCover = QString();
}
if (song.albumArtist()!=currentSong.albumArtist() || song.album!=currentSong.album || song.track!=currentSong.track ||
song.disc!=currentSong.disc) {
currentSong = song;
signalUpdate("Metadata", Metadata());
}
}
QVariantMap Mpris::Metadata() const {
QVariantMap metadataMap;
if (!currentSong.title.isEmpty() && !currentSong.artist.isEmpty() && !currentSong.album.isEmpty()) {
metadataMap.insert("mpris:trackid", currentSong.id);
metadataMap.insert("mpris:length", currentSong.time / 1000 / 1000);
metadataMap.insert("xesam:album", currentSong.album);
metadataMap.insert("xesam:artist", currentSong.artist);
metadataMap.insert("xesam:title", currentSong.title);
if (currentSong.track>0) {
metadataMap.insert("'xesam:trackNumber", currentSong.track);
}
if (currentSong.disc>0) {
metadataMap.insert("'xesam:discNumber", currentSong.disc);
}
if (MPDConnection::self()->getDetails().dirReadable) {
QString mpdDir=MPDConnection::self()->getDetails().dir;
if (!mpdDir.isEmpty()) {
metadataMap.insert("xesam:url", mpdDir+currentSong.file);
}
}
if (!currentCover.isEmpty()) {
metadataMap.insert("xesam:artUrl", currentCover);
}
}
return metadataMap;
}
void Mpris::Raise()
{
#ifdef ENABLE_KDE_SUPPORT
mw->show();
KWindowSystem::forceActiveWindow(mw->winId());
KWindowSystem::forceActiveWindow(mw->effectiveWinId());
#else
mw->restoreWindow();
#endif
}
void Mpris::signalUpdate(const QString &property, const QVariant &value)
{
QVariantMap map;
map.insert(property, value);
signalUpdate(map);
}
void Mpris::signalUpdate(const QVariantMap &map)
{
if (map.isEmpty()) {
return;
}
QDBusMessage signal = QDBusMessage::createSignal("/org/mpris/MediaPlayer2",
"org.freedesktop.DBus.Properties",
"PropertiesChanged");
signal << "org.mpris.MediaPlayer2.Player";
signal << map;
QDBusConnection::sessionBus().send(signal);
}