mirrors/theshell
1
0
Fork 0
mirror of https://github.com/vicr123/theshell.git synced 2025-01-23 12:12:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

MPRIS support

Browse source
This commit is contained in:
Victor Tran 2016-06-12 11:28:41 +10:00
parent 034fd57dbb
commit b0cfa41f9c
4 changed files with 119 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
mainwindow.cpp
View file

@ -87,10 +87,6 @@ MainWindow::MainWindow(QWidget *parent) :
ui->brightnessSlider->setVisible(false);
ui->mprisFrame->setVisible(false);
// TODO: Add Mpris support
}
MainWindow::~MainWindow()
@ -98,6 +94,18 @@ MainWindow::~MainWindow()
delete ui;
}
void MainWindow::DBusNewService(QString name) {
if (name.startsWith("org.mpris.MediaPlayer2.")) {
if (!mprisDetectedApps.contains(name)) {
mprisDetectedApps.append(name);
if (mprisCurrentAppName == "") {
mprisCurrentAppName = name;
}
}
}
}
void MainWindow::pullDownGesture() {
if (lockHide) {
on_notifications_clicked();
@ -306,6 +314,79 @@ void MainWindow::reloadWindows() {
ui->date->setText(QDateTime::currentDateTime().toString("ddd dd MMM yyyy"));
ui->time->setText(QDateTime::currentDateTime().toString("hh:mm:ss"));
mprisDetectedApps.clear();
for (QString service : QDBusConnection::sessionBus().interface()->registeredServiceNames().value()) {
DBusNewService(service);
}
if (mprisCurrentAppName != "") {
ui->mprisFrame->setVisible(true);
if (!mprisDetectedApps.contains(mprisCurrentAppName)) { //Service closed.
if (mprisDetectedApps.count() > 0) { //Set to next app
mprisCurrentAppName = mprisDetectedApps.first();
ui->mprisFrame->setVisible(true);
} else { //Set to no app. Make mpris controller invisible.
mprisCurrentAppName = "";
ui->mprisFrame->setVisible(false);
}
}
} else { //Make mpris controller invisible
ui->mprisFrame->setVisible(false);
}
if (ui->mprisFrame->isVisible()) {
//Get Current Song Metadata
QDBusMessage MetadataRequest = QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
MetadataRequest.setArguments(QList<QVariant>() << "org.mpris.MediaPlayer2.Player" << "Metadata");
QDBusReply<QDBusVariant> reply(QDBusConnection::sessionBus().call(MetadataRequest));
QVariantMap replyData;
QDBusArgument arg(reply.value().variant().value<QDBusArgument>());
arg >> replyData;
QString title = "";
QString artist = "";
if (replyData.contains("xesam:title")) {
title = replyData.value("xesam:title").toString();
}
if (replyData.contains("xesam:artist")) {
QStringList artists = replyData.value("xesam:artist").toStringList();
for (QString art : artists) {
artist.append(art + ", ");
}
artist.remove(artist.length() - 2, 2);
}
if (title == "") {
QDBusMessage IdentityRequest = QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
IdentityRequest.setArguments(QList<QVariant>() << "org.mpris.MediaPlayer2" << "Identity");
QDBusReply<QDBusVariant> reply(QDBusConnection::sessionBus().call(IdentityRequest));
ui->mprisSongName->setText(reply.value().variant().toString());
} else {
if (artist == "") {
ui->mprisSongName->setText(title);
} else {
ui->mprisSongName->setText(artist + " - " + title);
}
}
//Get Playback Status
QDBusMessage PlayStatRequest = QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
PlayStatRequest.setArguments(QList<QVariant>() << "org.mpris.MediaPlayer2.Player" << "PlaybackStatus");
QDBusReply<QVariant> PlayStat = QDBusConnection::sessionBus().call(PlayStatRequest);
if (PlayStat.value().toString() == "Playing") {
ui->mprisPause->setIcon(QIcon::fromTheme("media-playback-pause"));
} else {
ui->mprisPause->setIcon(QIcon::fromTheme("media-playback-start"));
}
}
}
void MainWindow::activateWindow(QString windowTitle) {
@ -604,3 +685,23 @@ void MainWindow::on_timer_clicked()
{
infoPane->show(InfoPaneDropdown::Clock);
}
void MainWindow::on_mprisPause_clicked()
{
QDBusConnection::sessionBus().call(QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", "PlayPause"), QDBus::NoBlock);
}
void MainWindow::on_mprisBack_clicked()
{
QDBusConnection::sessionBus().call(QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", "Previous"), QDBus::NoBlock);
}
void MainWindow::on_pushButton_3_clicked()
{
QDBusConnection::sessionBus().call(QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", "Next"), QDBus::NoBlock);
}
void MainWindow::on_mprisSongName_clicked()
{
QDBusConnection::sessionBus().call(QDBusMessage::createMethodCall(mprisCurrentAppName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Raise"), QDBus::NoBlock);
}

13
mainwindow.h
View file

@ -106,6 +106,16 @@ private slots:
void on_timer_clicked();
void DBusNewService(QString name);
void on_mprisPause_clicked();
void on_mprisBack_clicked();
void on_pushButton_3_clicked();
void on_mprisSongName_clicked();
private:
Ui::MainWindow *ui;
QList<WmWindow*> *windowList;
@ -114,6 +124,9 @@ private:
bool hiding = false;
bool lockHide = false;
QString mprisCurrentAppName = "";
QStringList mprisDetectedApps;
void closeEvent(QCloseEvent*);
InfoPaneDropdown *infoPane;

2
mainwindow.ui
View file

@ -361,7 +361,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="mprisSongName">
<widget class="ClickableLabel" name="mprisSongName">
<property name="text">
<string>&amp;mprisSongName</string>
</property>

1
systrayicons.cpp
View file

@ -54,7 +54,6 @@ void SysTrayIcons::SysTrayEvent(long opcode, long data2, long data3, long data4)
QWindow* window = QWindow::fromWinId(data2);
window->resize(16, 16);
QWidget* widget = QWidget::createWindowContainer(window);
widget->setFixedSize(16, 16);
this->layout()->addWidget(widget);