Add a fallback to let mplayer control the screensaver

Bug: #1056
Signed-off-by: Alexander Golubev <[email protected]>

Author: Fat-Zer

src/core.cpp

@@ -1851,7 +1851,11 @@ void Core::startMplayer( QString file, double seek ) {
 	#ifndef USE_POWERSAVING
 	proc->setOption("stop-xscreensaver", pref->disable_screensaver);
 	#else
-	proc->setOption("stop-xscreensaver", false);
+	if (screensaver->isValid()) {
+	    proc->setOption("stop-xscreensaver", false);
+	} else { // fallback to let mplayer control the screensaver
+	    proc->setOption("stop-xscreensaver", pref->disable_screensaver);
+	}
 	#endif
 #endif
 

src/powersaving.cpp

@@ -37,6 +37,10 @@ PowerSaving::PowerSaving(QObject * parent)
 PowerSaving::~PowerSaving() {
 }
 
+bool PowerSaving::isValid() {
+    return interface->isValid();
+}
+
 void PowerSaving::inhibit() {
 	qDebug("PowerSaving::inhibit");
 	QDBusReply<uint> reply = interface->call("Inhibit", "smplayer", "Playing media");

src/powersaving.h

@@ -32,6 +32,8 @@ class PowerSaving : public QObject
 	PowerSaving(QObject * parent = 0);
 	~PowerSaving();
 
+	bool isValid();
+
 public slots:
 	void inhibit();
 	void uninhibit();

src/powersaving_mac.cpp

@@ -29,6 +29,10 @@ PowerSaving::PowerSaving(QObject * parent)
 PowerSaving::~PowerSaving() {
 }
 
+bool PowerSaving::isValid() {
+	return true;
+}
+
 void PowerSaving::inhibit() {
 	qDebug("PowerSaving::inhibit");
 

src/powersaving_mac.h

@@ -31,6 +31,8 @@ class PowerSaving : public QObject
 	PowerSaving(QObject * parent = 0);
 	~PowerSaving();
 
+	bool isValid();
+
 public slots:
 	void inhibit();
 	void uninhibit();

src/screensaver.cpp

@@ -42,6 +42,14 @@ ScreenSaver::~ScreenSaver() {
 #endif
 }
 
+bool ScreenSaver::isValid() {
+#ifdef Q_OS_WIN
+	return win_screensaver->isValid();
+#else
+	return power_saving->isValid();
+#endif
+}
+
 void ScreenSaver::enable() {
 #ifdef Q_OS_WIN
 	win_screensaver->enable();

src/screensaver.h

@@ -32,6 +32,8 @@ class ScreenSaver : public QObject
 	ScreenSaver(QObject * parent = 0);
 	~ScreenSaver();
 
+	bool isValid();
+
 public slots:
 	void enable();
 	void disable();

src/winscreensaver.cpp

@@ -48,6 +48,14 @@ WinScreenSaver::~WinScreenSaver() {
 #endif
 }
 
+bool WinScreenSaver::isValid() {
+#ifndef Q_OS_OS2
+	return true;
+#else
+	return SSCore_TempDisable && SSCore_TempEnable;
+#endif
+}
+
 void WinScreenSaver::retrieveState() {
 	qDebug("WinScreenSaver::retrieveState");
 

src/winscreensaver.h

@@ -34,6 +34,8 @@ class WinScreenSaver
 	WinScreenSaver();
 	~WinScreenSaver();
 
+	bool isValid();
+
 	void disable();
 	void enable();