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

Add option to prevent system from suspending whilst playing (Linux only).

Browse Source
This commit is contained in:
craig.p.drummond
2013-09-02 18:25:54 +00:00
committed by craig.p.drummond
parent f324727d32
commit b1b0b8a294
16 changed files with 320 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gui/application.cpp
View File

@@ -26,7 +26,6 @@
#ifdef ENABLE_KDE_SUPPORT
#include <KDE/KCmdLineArgs>
#include <KDE/KStartupInfo>
#include <KDE/Solid/PowerManagement>
#include "initialsettingswizard.h"
#else
#include <QIcon>
@@ -49,9 +48,7 @@ Application::Application(Display *display, Qt::HANDLE visual, Qt::HANDLE colorma
: KUniqueApplication(display, visual, colormap)
, w(0)
{
#if KDE_IS_VERSION(4, 7, 0)
connect(Solid::PowerManagement::notifier(), SIGNAL(resumingFromSuspend()), MPDConnection::self(), SLOT(reconnect()));
#endif
connect(PowerManagement::self(), SIGNAL(resuming()), MPDConnection::self(), SLOT(reconnect()));
}
#endif
@@ -59,9 +56,6 @@ Application::Application()
: KUniqueApplication()
, w(0)
{
#if KDE_IS_VERSION(4, 7, 0)
connect(Solid::PowerManagement::notifier(), SIGNAL(resumingFromSuspend()), MPDConnection::self(), SLOT(reconnect()));
#endif
}
Application::~Application() {
@@ -226,7 +220,6 @@ void Application::load(const QStringList &files)
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDir>
#include "upowerinterface.h"
Application::Application(int &argc, char **argv)
: QApplication(argc, argv)
@@ -236,7 +229,6 @@ Application::Application(int &argc, char **argv)
bool Application::start()
{
if (QDBusConnection::sessionBus().registerService(CANTATA_REV_URL)) {
connectPowerSignal();
setupIconTheme();
return true;
}
@@ -284,15 +276,4 @@ void Application::loadFiles()
#endif
}
void Application::connectPowerSignal()
{
if (!QDBusConnection::systemBus().interface()->isServiceRegistered(OrgFreedesktopUPowerInterface::staticInterfaceName())) {
QDBusConnection::systemBus().interface()->startService(OrgFreedesktopUPowerInterface::staticInterfaceName());
}
OrgFreedesktopUPowerInterface *upower=new OrgFreedesktopUPowerInterface(OrgFreedesktopUPowerInterface::staticInterfaceName(),
"/org/freedesktop/UPower", QDBusConnection::systemBus(), this);
connect(upower, SIGNAL(Resuming()), MPDConnection::self(), SLOT(reconnect()));
}
#endif