4 files changed, 15 insertions, 20 deletions

diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 530072db6e..461caf479c 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1081,12 +1081,7 @@ void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
 
 	power_manager = memnew(PowerWindows);
 
-	AudioDriverManager::get_driver(p_audio_driver)->set_singleton();
-
-	if (AudioDriverManager::get_driver(p_audio_driver)->init() != OK) {
-
-		ERR_PRINT("Initializing audio failed.");
-	}
+	AudioDriverManager::initialize(p_audio_driver);
 
 	TRACKMOUSEEVENT tme;
 	tme.cbSize = sizeof(TRACKMOUSEEVENT);
@@ -2353,7 +2348,7 @@ bool OS_Windows::is_vsync_enabled() const {
 	return true;
 }
 
-PowerState OS_Windows::get_power_state() {
+OS::PowerState OS_Windows::get_power_state() {
 	return power_manager->get_power_state();
 }
 
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 474b0fea5c..1a01ac950d 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -281,7 +281,7 @@ public:
 	virtual void set_use_vsync(bool p_enable);
 	virtual bool is_vsync_enabled() const;
 
-	virtual PowerState get_power_state();
+	virtual OS::PowerState get_power_state();
 	virtual int get_power_seconds_left();
 	virtual int get_power_percent_left();
 
diff --git a/platform/windows/power_windows.cpp b/platform/windows/power_windows.cpp
index b37e189a3a..8d86f160f1 100644
--- a/platform/windows/power_windows.cpp
+++ b/platform/windows/power_windows.cpp
@@ -64,19 +64,19 @@ bool PowerWindows::GetPowerInfo_Windows() {
 	/* This API should exist back to Win95. */
 	if (!GetSystemPowerStatus(&status)) {
 		/* !!! FIXME: push GetLastError() into GetError() */
-		power_state = POWERSTATE_UNKNOWN;
+		power_state = OS::POWERSTATE_UNKNOWN;
 	} else if (status.BatteryFlag == 0xFF) { /* unknown state */
-		power_state = POWERSTATE_UNKNOWN;
+		power_state = OS::POWERSTATE_UNKNOWN;
 	} else if (status.BatteryFlag & (1 << 7)) { /* no battery */
-		power_state = POWERSTATE_NO_BATTERY;
+		power_state = OS::POWERSTATE_NO_BATTERY;
 	} else if (status.BatteryFlag & (1 << 3)) { /* charging */
-		power_state = POWERSTATE_CHARGING;
+		power_state = OS::POWERSTATE_CHARGING;
 		need_details = TRUE;
 	} else if (status.ACLineStatus == 1) {
-		power_state = POWERSTATE_CHARGED; /* on AC, not charging. */
+		power_state = OS::POWERSTATE_CHARGED; /* on AC, not charging. */
 		need_details = TRUE;
 	} else {
-		power_state = POWERSTATE_ON_BATTERY; /* not on AC. */
+		power_state = OS::POWERSTATE_ON_BATTERY; /* not on AC. */
 		need_details = TRUE;
 	}
 
@@ -97,11 +97,11 @@ bool PowerWindows::GetPowerInfo_Windows() {
 	return TRUE; /* always the definitive answer on Windows. */
 }
 
-PowerState PowerWindows::get_power_state() {
+OS::PowerState PowerWindows::get_power_state() {
 	if (GetPowerInfo_Windows()) {
 		return power_state;
 	} else {
-		return POWERSTATE_UNKNOWN;
+		return OS::POWERSTATE_UNKNOWN;
 	}
 }
 
@@ -122,7 +122,7 @@ int PowerWindows::get_power_percent_left() {
 }
 
 PowerWindows::PowerWindows()
-	: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
+	: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
 }
 
 PowerWindows::~PowerWindows() {
diff --git a/platform/windows/power_windows.h b/platform/windows/power_windows.h
index 9da9841f48..0745615195 100644
--- a/platform/windows/power_windows.h
+++ b/platform/windows/power_windows.h
@@ -33,7 +33,7 @@
 
 #include "os/dir_access.h"
 #include "os/file_access.h"
-#include "os/power.h"
+#include "os/os.h"
 
 #include <windows.h>
 
@@ -42,7 +42,7 @@ class PowerWindows {
 private:
 	int nsecs_left;
 	int percent_left;
-	PowerState power_state;
+	OS::PowerState power_state;
 
 	bool GetPowerInfo_Windows();
 
@@ -50,7 +50,7 @@ public:
 	PowerWindows();
 	virtual ~PowerWindows();
 
-	PowerState get_power_state();
+	OS::PowerState get_power_state();
 	int get_power_seconds_left();
 	int get_power_percent_left();
 };