Merge pull request #2840 from godotengine/revert-903-libao
Revert "libao audio driver"
This commit is contained in:
commit
b519e32e66
@ -119,7 +119,6 @@ opts.Add('etc1','etc1 Texture compression support (yes/no)','yes')
|
|||||||
opts.Add('builtin_zlib','Use built-in zlib (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('openssl','Use OpenSSL (yes/no/builtin)','no')
|
||||||
opts.Add('musepack','Musepack Audio (yes/no)','yes')
|
opts.Add('musepack','Musepack Audio (yes/no)','yes')
|
||||||
opts.Add('ao', 'Enable libao audio driver (yes/no)', 'no')
|
|
||||||
opts.Add("CXX", "Compiler");
|
opts.Add("CXX", "Compiler");
|
||||||
opts.Add("CCFLAGS", "Custom flags for the C++ compiler");
|
opts.Add("CCFLAGS", "Custom flags for the C++ compiler");
|
||||||
opts.Add("CFLAGS", "Custom flags for the C compiler");
|
opts.Add("CFLAGS", "Custom flags for the C compiler");
|
||||||
|
@ -7,7 +7,6 @@ Export('env')
|
|||||||
|
|
||||||
SConscript('unix/SCsub');
|
SConscript('unix/SCsub');
|
||||||
SConscript('alsa/SCsub');
|
SConscript('alsa/SCsub');
|
||||||
SConscript('ao/SCsub');
|
|
||||||
SConscript('pulseaudio/SCsub');
|
SConscript('pulseaudio/SCsub');
|
||||||
SConscript('windows/SCsub');
|
SConscript('windows/SCsub');
|
||||||
SConscript('gles2/SCsub');
|
SConscript('gles2/SCsub');
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
Import('env')
|
|
||||||
|
|
||||||
env.add_source_files(env.drivers_sources,"*.cpp")
|
|
||||||
|
|
||||||
Export('env')
|
|
@ -1,161 +0,0 @@
|
|||||||
/*************************************************************************/
|
|
||||||
/* audio_driver_ao.cpp */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* http://www.godotengine.org */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* Copyright (c) 2014 Anton Yabchinskiy. */
|
|
||||||
/* */
|
|
||||||
/* 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"
|
|
||||||
|
|
||||||
#ifdef AO_ENABLED
|
|
||||||
|
|
||||||
#include "globals.h"
|
|
||||||
#include "os/os.h"
|
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
// Overwrite samples on conversion
|
|
||||||
int16_t* samples_out = reinterpret_cast<int16_t*>(ad->samples_in);
|
|
||||||
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();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,79 +0,0 @@
|
|||||||
/*************************************************************************/
|
|
||||||
/* audio_driver_ao.h */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* http://www.godotengine.org */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* Copyright (c) 2014 Anton Yabchinskiy. */
|
|
||||||
/* */
|
|
||||||
/* 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
|
|
@ -1,7 +1,6 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import platform
|
|
||||||
|
|
||||||
|
|
||||||
def is_active():
|
def is_active():
|
||||||
@ -146,12 +145,8 @@ def configure(env):
|
|||||||
|
|
||||||
|
|
||||||
env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
|
env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
|
||||||
if platform.platform() == 'Linux':
|
|
||||||
env.Append(CPPFLAGS=["-DALSA_ENABLED"])
|
env.Append(CPPFLAGS=["-DALSA_ENABLED"])
|
||||||
env.Append(LIBS=['asound'])
|
|
||||||
if env['ao'] == 'yes':
|
|
||||||
env.ParseConfig('pkg-config ao --cflags --libs')
|
|
||||||
env.Append(CPPFLAGS=['-DAO_ENABLED'])
|
|
||||||
if (env["pulseaudio"]=="yes"):
|
if (env["pulseaudio"]=="yes"):
|
||||||
if not os.system("pkg-config --exists libpulse-simple"):
|
if not os.system("pkg-config --exists libpulse-simple"):
|
||||||
print("Enabling PulseAudio")
|
print("Enabling PulseAudio")
|
||||||
@ -161,7 +156,7 @@ def configure(env):
|
|||||||
print("PulseAudio development libraries not found, disabling driver")
|
print("PulseAudio development libraries not found, disabling driver")
|
||||||
|
|
||||||
env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
|
env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
|
||||||
env.Append(LIBS=['GL', 'GLU', 'pthread', 'z'])
|
env.Append(LIBS=['GL', 'GLU', 'pthread','asound','z']) #TODO detect linux/BSD!
|
||||||
#env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
|
#env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
|
||||||
|
|
||||||
#host compiler is default..
|
#host compiler is default..
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
#include "key_mapping_x11.h"
|
#include "key_mapping_x11.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
|
||||||
#include "print_string.h"
|
#include "print_string.h"
|
||||||
#include "servers/physics/physics_server_sw.h"
|
#include "servers/physics/physics_server_sw.h"
|
||||||
|
|
||||||
@ -1673,7 +1672,7 @@ void OS_X11::close_joystick(int p_id) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void OS_X11::probe_joystick(int p_id) {
|
void OS_X11::probe_joystick(int p_id) {
|
||||||
#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
#ifndef __FreeBSD__
|
||||||
|
|
||||||
if (p_id == -1) {
|
if (p_id == -1) {
|
||||||
|
|
||||||
@ -1728,7 +1727,7 @@ void OS_X11::move_window_to_foreground() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void OS_X11::process_joysticks() {
|
void OS_X11::process_joysticks() {
|
||||||
#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
#ifndef __FreeBSD__
|
||||||
int bytes;
|
int bytes;
|
||||||
js_event events[32];
|
js_event events[32];
|
||||||
InputEvent ievent;
|
InputEvent ievent;
|
||||||
@ -1961,10 +1960,6 @@ OS_X11::OS_X11() {
|
|||||||
AudioDriverManagerSW::add_driver(&driver_alsa);
|
AudioDriverManagerSW::add_driver(&driver_alsa);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef AO_ENABLED
|
|
||||||
AudioDriverManagerSW::add_driver(&driver_ao);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
minimized = false;
|
minimized = false;
|
||||||
xim_style=0L;
|
xim_style=0L;
|
||||||
mouse_mode=MOUSE_MODE_VISIBLE;
|
mouse_mode=MOUSE_MODE_VISIBLE;
|
||||||
|
@ -43,7 +43,6 @@
|
|||||||
#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
|
#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
|
||||||
#include "drivers/rtaudio/audio_driver_rtaudio.h"
|
#include "drivers/rtaudio/audio_driver_rtaudio.h"
|
||||||
#include "drivers/alsa/audio_driver_alsa.h"
|
#include "drivers/alsa/audio_driver_alsa.h"
|
||||||
#include "drivers/ao/audio_driver_ao.h"
|
|
||||||
#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
|
#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
|
||||||
#include "servers/physics_2d/physics_2d_server_sw.h"
|
#include "servers/physics_2d/physics_2d_server_sw.h"
|
||||||
#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
|
#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
|
||||||
@ -135,10 +134,6 @@ class OS_X11 : public OS_Unix {
|
|||||||
AudioDriverALSA driver_alsa;
|
AudioDriverALSA driver_alsa;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef AO_ENABLED
|
|
||||||
AudioDriverAO driver_ao;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PULSEAUDIO_ENABLED
|
#ifdef PULSEAUDIO_ENABLED
|
||||||
AudioDriverPulseAudio driver_pulseaudio;
|
AudioDriverPulseAudio driver_pulseaudio;
|
||||||
#endif
|
#endif
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <alloca.h>
|
#include <alloca.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(__FreeBSD__) || defined(__OpenBSD__)
|
#ifdef __FreeBSD__
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user