Merge branch 'libao'

SConstruct

@@ -111,6 +111,7 @@ opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes')
 opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes')
 opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no')
 opts.Add('musepack','Musepack Audio (yes/no)','yes')
+opts.Add('ao', 'Enable libao audio driver (yes/no)', 'no')
 opts.Add("CXX", "Compiler");
 opts.Add("CCFLAGS", "Custom flags for the C++ compiler");
 opts.Add("CFLAGS", "Custom flags for the C compiler");

drivers/SCsub

@@ -7,6 +7,7 @@ Export('env')
 
 SConscript('unix/SCsub');
 SConscript('alsa/SCsub');
+SConscript('ao/SCsub');
 SConscript('windows/SCsub');
 SConscript('gles2/SCsub');
 SConscript('gles1/SCsub');

drivers/ao/SCsub

@@ -0,0 +1,5 @@
+Import('env')
+
+env.add_source_files(env.drivers_sources,"*.cpp")
+
+Export('env')

drivers/ao/audio_driver_ao.cpp

@@ -0,0 +1,153 @@
+/*************************************************************************/
+/*  audio_driver_ao.cpp                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "audio_driver_ao.h"
+
+#include "globals.h"
+#include "os/os.h"
+
+Error AudioDriverAO::init() {
+
+	active = false;
+	thread_exited = false;
+	exit_thread = false;
+	pcm_open = false;
+	samples_in = NULL;
+
+	mix_rate = 44100;
+	output_format = OUTPUT_STEREO;
+	channels = 2;
+
+	ao_sample_format format;
+
+	format.bits = 16;
+	format.rate = mix_rate;
+	format.channels = channels;
+	format.byte_format = AO_FMT_LITTLE;
+	format.matrix = "L,R";
+
+	device = ao_open_live(ao_default_driver_id(), &format, NULL);
+	ERR_FAIL_COND_V(device == NULL, ERR_CANT_OPEN);
+
+	int latency = GLOBAL_DEF("audio/output_latency", 25);
+	buffer_size = nearest_power_of_2( latency * mix_rate / 1000 );
+
+	samples_in = memnew_arr(int32_t, buffer_size * channels);
+
+	mutex = Mutex::create();
+	thread = Thread::create(AudioDriverAO::thread_func, this);
+
+	return OK;
+};
+
+void AudioDriverAO::thread_func(void* p_udata) {
+	AudioDriverAO* ad = (AudioDriverAO*)p_udata;
+
+	int16_t* samples_out = samples_in; // Overwrite samples on conversion
+	unsigned int n_samples = ad->buffer_size * ad->channels;
+	unsigned int n_bytes = n_samples * sizeof(int16_t);
+
+	while (!ad->exit_thread) {
+		if (ad->active) {
+			ad->lock();
+			ad->audio_server_process(ad->buffer_size, ad->samples_in);
+			ad->unlock();
+
+			for (unsigned int i = 0; i < n_samples; i++) {
+				samples_out[i] = ad->samples_in[i] >> 16;
+			}
+		} else {
+			memset(samples_out, 0, n_bytes);
+		}
+
+		if (ad->exit_thread)
+			break;
+
+		if (!ao_play(ad->device, reinterpret_cast<char*>(samples_out), n_bytes) {
+			ERR_PRINT("ao_play() failed");
+		}
+	};
+
+	ad->thread_exited = true;
+};
+
+void AudioDriverAO::start() {
+	active = true;
+};
+
+int AudioDriverAO::get_mix_rate() const {
+	return mix_rate;
+};
+
+AudioDriverSW::OutputFormat AudioDriverAO::get_output_format() const {
+	return output_format;
+};
+
+void AudioDriverAO::lock() {
+	if (!thread || !mutex)
+		return;
+	mutex->lock();
+};
+
+void AudioDriverAO::unlock() {
+	if (!thread || !mutex)
+		return;
+	mutex->unlock();
+};
+
+void AudioDriverAO::finish() {
+	if (!thread)
+		return;
+
+	exit_thread = true;
+	Thread::wait_to_finish(thread);
+
+	if (samples_in) {
+		memdelete_arr(samples_in);
+	};
+
+	memdelete(thread);
+	if (mutex)
+		memdelete(mutex);
+
+	if (device)
+		ao_close(device);
+
+	thread = NULL;
+};
+
+AudioDriverAO::AudioDriverAO() {
+	mutex = NULL;
+	thread = NULL;
+
+	ao_initialize();
+};
+
+AudioDriverAO::~AudioDriverAO() {
+	ao_shutdown();
+};

drivers/ao/audio_driver_ao.h

@@ -0,0 +1,78 @@
+/*************************************************************************/
+/*  audio_driver_ao.h                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "servers/audio/audio_server_sw.h"
+
+#ifdef AO_ENABLED
+
+#include "core/os/thread.h"
+#include "core/os/mutex.h"
+
+#include <ao/ao.h>
+
+class AudioDriverAO : public AudioDriverSW {
+
+	Thread* thread;
+	Mutex* mutex;
+
+	ao_device* device;
+
+	int32_t* samples_in;
+
+	static void thread_func(void* p_udata);
+	int buffer_size;
+
+	unsigned int mix_rate;
+	OutputFormat output_format;
+
+	int channels;
+
+	bool active;
+	bool thread_exited;
+	mutable bool exit_thread;
+	bool pcm_open;
+
+public:
+
+	const char* get_name() const {
+		return "libao";
+	};
+
+	virtual Error init();
+	virtual void start();
+	virtual int get_mix_rate() const;
+	virtual OutputFormat get_output_format() const;
+	virtual void lock();
+	virtual void unlock();
+	virtual void finish();
+
+	AudioDriverAO();
+	~AudioDriverAO();
+};
+
+#endif

platform/x11/detect.py

@@ -112,6 +112,11 @@ def configure(env):
 	env.ParseConfig('pkg-config freetype2 --cflags --libs')
 	env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
 
+
+	if env['ao'] == 'yes':
+		env.ParseConfig('pkg-config ao --cflags --libs')
+		env.Append(CPPFLAGS=['-DAO_ENABLED'])
+
 	
 	env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
 	if platform.platform() == 'Linux':

platform/x11/os_x11.cpp

@@ -1385,6 +1385,10 @@ OS_X11::OS_X11() {
 	AudioDriverManagerSW::add_driver(&driver_alsa);
 #endif
 
+#ifdef AO_ENABLED
+	AudioDriverManagerSW::add_driver(&driver_ao);
+#endif
+
 	minimized = false;
 	xim_style=NULL;
 	mouse_mode=MOUSE_MODE_VISIBLE;

platform/x11/os_x11.h

@@ -43,6 +43,7 @@
 #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
 #include "drivers/rtaudio/audio_driver_rtaudio.h"
 #include "drivers/alsa/audio_driver_alsa.h"
+#include "drivers/ao/audio_driver_ao.h"
 #include "servers/physics_2d/physics_2d_server_sw.h"
 
 #include <X11/keysym.h>
@@ -129,6 +130,10 @@ class OS_X11 : public OS_Unix {
 	AudioDriverALSA driver_alsa;
 #endif
 
+#ifdef AO_ENABLED
+	AudioDriverAO driver_ao;
+#endif
+
 	enum {
 		JOYSTICKS_MAX = 8,
 		MAX_JOY_AXIS = 32768, // I've no idea