From f2843209a5439eb6bf8a6382e8c8ef378175c111 Mon Sep 17 00:00:00 2001 From: Alexander Stillich Date: Fri, 19 Dec 2014 13:44:34 +0100 Subject: Implemented PulseAudio backend and fixed audio driver selection on X11 --- platform/x11/os_x11.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'platform/x11/os_x11.cpp') diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 0466984359..804809a87d 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -74,6 +74,18 @@ OS::VideoMode OS_X11::get_default_video_mode() const { return OS::VideoMode(800,600,false); } +int OS_X11::get_audio_driver_count() const { + + return AudioDriverManagerSW::get_driver_count(); +} + +const char *OS_X11::get_audio_driver_name(int p_driver) const { + + AudioDriverSW* driver = AudioDriverManagerSW::get_driver(p_driver); + ERR_FAIL_COND_V( !driver, "" ); + return AudioDriverManagerSW::get_driver(p_driver)->get_name(); +} + void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver) { last_button_state=0; @@ -1450,6 +1462,10 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_alsa); #endif +#ifdef PULSEAUDIO_ENABLED + AudioDriverManagerSW::add_driver(&driver_pulseaudio); +#endif + minimized = false; xim_style=NULL; mouse_mode=MOUSE_MODE_VISIBLE; -- cgit v1.2.3 From f7f197c40941ffaf03fcddeb20536dec8074ca00 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 21 Dec 2014 11:42:44 -0300 Subject: -ability to set default textures in shader (needed for visual shader editing) -work in progress new graph system (will replace current one) -crash fix in s3m loader (out of bounds acess) -fixed vbox overriding of separation (fixes empty line between section tabs) --- platform/x11/os_x11.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'platform/x11/os_x11.cpp') diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 804809a87d..aa9e4c63c9 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1458,14 +1458,14 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_rtaudio); #endif -#ifdef ALSA_ENABLED - AudioDriverManagerSW::add_driver(&driver_alsa); -#endif - #ifdef PULSEAUDIO_ENABLED AudioDriverManagerSW::add_driver(&driver_pulseaudio); #endif +#ifdef ALSA_ENABLED + AudioDriverManagerSW::add_driver(&driver_alsa); +#endif + minimized = false; xim_style=NULL; mouse_mode=MOUSE_MODE_VISIBLE; -- cgit v1.2.3