2 files changed, 3 insertions, 11 deletions
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 44034e815d..300c5cffcc 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -62,12 +62,7 @@ void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p
 
 	//visual_server = memnew( VisualServerRaster(rasterizer) );
 
-	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);
 
 	sample_manager = memnew(SampleManagerMallocSW);
 	audio_server = memnew(AudioServerSW(sample_manager));
@@ -200,7 +195,7 @@ void OS_Server::move_window_to_foreground() {
 void OS_Server::set_cursor_shape(CursorShape p_shape) {
 }
 
-PowerState OS_Server::get_power_state() {
+OS::PowerState OS_Server::get_power_state() {
 	return power_manager->get_power_state();
 }
 
@@ -232,7 +227,6 @@ void OS_Server::run() {
 
 OS_Server::OS_Server() {
 
-	AudioDriverManager::add_driver(&driver_dummy);
 	//adriver here
 	grab = false;
 };
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index f3db053be3..ba12f649be 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -34,7 +34,6 @@
 #include "drivers/rtaudio/audio_driver_rtaudio.h"
 #include "drivers/unix/os_unix.h"
 #include "main/input_default.h"
-#include "servers/audio/audio_driver_dummy.h"
 #include "servers/audio_server.h"
 #include "servers/physics_2d/physics_2d_server_sw.h"
 #include "servers/physics_server.h"
@@ -55,7 +54,6 @@ class OS_Server : public OS_Unix {
 	List<String> args;
 	MainLoop *main_loop;
 
-	AudioDriverDummy driver_dummy;
 	bool grab;
 
 	PhysicsServer *physics_server;
@@ -106,7 +104,7 @@ public:
 
 	void run();
 
-	virtual PowerState get_power_state();
+	virtual OS::PowerState get_power_state();
 	virtual int get_power_seconds_left();
 	virtual int get_power_percent_left();