Various cleanups in PowerSaver

Use nullptr instead of NULL, evaluate pointer as bool where possible.
Declare the timer callback as a friend function so the methods it uses
can stay private.
Initialize screenState to false; was uninitialized which means that
an initially blanked screen might not be unblanked.
Force screen enable in constructor instead of when timeout is set.
Add removeScreenTimer method.
Include C++-ified versions of the C headers.

src/powersaver.cpp

@@ -1,13 +1,14 @@
 #include "powersaver.h"
 #include "debug.h"
 
-#include <errno.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
-PowerSaver *PowerSaver::instance = NULL;
+PowerSaver *PowerSaver::instance = nullptr;
 
 Uint32 screenTimerCallback(Uint32 timeout, void *d) {
 	unsigned int * old_ticks = (unsigned int *) d;
@@ -20,29 +21,32 @@ Uint32 screenTimerCallback(Uint32 timeout, void *d) {
 	}
 
 	DEBUG("Disable Backlight Event\n");
-	PowerSaver::getInstance()->disableScreen();
+	PowerSaver::instance->disableScreen();
 	return 0;
 }
 
 PowerSaver *PowerSaver::getInstance() {
-	if (instance == NULL) {
+	if (!instance) {
 		instance = new PowerSaver();
 	}
 	return instance;
 }
 
 bool PowerSaver::isRunning() {
-	return instance != NULL;
+	return !!instance;
 }
 
-PowerSaver::PowerSaver() {
+PowerSaver::PowerSaver()
-	setScreenTimeout(0);
+	: screenState(false)
-	screenTimer = NULL;
+	, screenTimeout(0)
+	, screenTimer(nullptr)
+{
+	enableScreen();
 }
 
 PowerSaver::~PowerSaver() {
-	SDL_RemoveTimer(screenTimer);
+	removeScreenTimer();
-	instance = NULL;
+	instance = nullptr;
 }
 
 void PowerSaver::setScreenTimeout(unsigned int seconds) {
@@ -51,31 +55,30 @@ void PowerSaver::setScreenTimeout(unsigned int seconds) {
 }
 
 void PowerSaver::resetScreenTimer() {
-	if (screenTimer != NULL) {
+	removeScreenTimer();
-		SDL_RemoveTimer(screenTimer);
+	enableScreen();
-	}
+	if (screenTimeout != 0) {
-
+		addScreenTimer();
-	addScreenTimer();
-	// If display is off, turn on it.
-	if (!screenState) {
-		enableScreen();
 	}
 }
 
 void PowerSaver::addScreenTimer() {
-	// If timeout is zero, don't set timeout.
+	assert(!screenTimer);
-	if (screenTimeout == 0) {
-		screenTimer = NULL;
-		return;
-	}
-
 	timeout_startms = SDL_GetTicks();
-	screenTimer = SDL_AddTimer(screenTimeout * 1000, screenTimerCallback, &timeout_startms);
+	screenTimer = SDL_AddTimer(
-	if (screenTimer == NULL) {
+			screenTimeout * 1000, screenTimerCallback, &timeout_startms);
+	if (!screenTimer) {
 		ERROR("Could not initialize SDLTimer: %s\n", SDL_GetError());
 	}
 }
 
+void PowerSaver::removeScreenTimer() {
+	if (screenTimer) {
+		SDL_RemoveTimer(screenTimer);
+		screenTimer = nullptr;
+	}
+}
+
 #define SCREEN_BLANK_PATH "/sys/class/graphics/fb0/blank"
 void PowerSaver::setScreenBlanking(bool state) {
 	const char *path = SCREEN_BLANK_PATH;

src/powersaver.h

@@ -9,22 +9,23 @@ public:
 	static bool isRunning();
 	~PowerSaver();
 	void resetScreenTimer();
-
-	void enableScreen();
-	void disableScreen();
-
 	void setScreenTimeout(unsigned int seconds);
 
 private:
 	PowerSaver();
 	void addScreenTimer();
+	void removeScreenTimer();
 	void setScreenBlanking(bool state);
+	void enableScreen();
+	void disableScreen();
 
 	static PowerSaver *instance;
 	bool screenState;
 	unsigned int screenTimeout;
 	unsigned int timeout_startms;
 	SDL_TimerID screenTimer;
+
+	friend Uint32 screenTimerCallback(Uint32 timeout, void *d);
 };
 
 #endif