summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Yabchinskiy <arn@bestmx.ru>2014-11-20 03:15:45 +0300
committerAnton Yabchinskiy <arn@bestmx.ru>2014-11-22 13:37:50 +0300
commitc26a1b9d7b9ad82d782c574087054b4c49b28821 (patch)
treebd821f69d4b84fb076e82014286df45b11ae9d34
parent540b95f5b0076570b60ed5e6c7815e472225e1b3 (diff)
Use libao driver on X11 platform
-rw-r--r--platform/x11/detect.py5
-rw-r--r--platform/x11/os_x11.cpp4
-rw-r--r--platform/x11/os_x11.h5
3 files changed, 14 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 1c8d231d4a..d879354f74 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -111,6 +111,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'])
env.Append(CPPFLAGS=["-DALSA_ENABLED"])
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 4c45fcfaaf..b11fd76249 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -1384,6 +1384,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;
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 2ffca0e042..815896bc37 100644
--- a/platform/x11/os_x11.h
+++ b/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