Browse Source

Modified OSX11 to try alternative audio drivers if pulseaudio does not work or user dislikes lennart potering , fixes #1511

Juan Linietsky 10 years ago
parent
commit
87c51b6fc0
1 changed files with 14 additions and 1 deletions
  1. 14 1
      platform/x11/os_x11.cpp

+ 14 - 1
platform/x11/os_x11.cpp

@@ -260,7 +260,20 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 
 	if (AudioDriverManagerSW::get_driver(p_audio_driver)->init()!=OK) {
 
-		ERR_PRINT("Initializing audio failed.");
+		bool success=false;
+		for(int i=0;i<AudioDriverManagerSW::get_driver_count();i++) {
+			if (i==p_audio_driver)
+				continue;
+			if (AudioDriverManagerSW::get_driver(i)->init()==OK) {
+				success=true;
+				print_line("Using alternate audio driver: "+String(AudioDriverManagerSW::get_driver(i)->get_name()));
+				break;
+			}
+		}
+		if (!success) {
+			ERR_PRINT("Initializing audio failed.");
+		}
+
 	}
 
 	sample_manager = memnew( SampleManagerMallocSW );