diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-23 23:44:07 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-23 23:44:07 +0300 |
| commit | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (patch) | |
| tree | b476b0f4aa8df1801361a04390c98cf0e2e3d98b /platform/x11/os_x11.h | |
| parent | ff755f93eb86e3f7f6801918457ca77a3001671b (diff) | |
| parent | 530d717a67cc3acab10270dca700db328aa12891 (diff) | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
drivers/SCsub
platform/x11/detect.py
platform/x11/os_x11.h
Diffstat (limited to 'platform/x11/os_x11.h')
| -rw-r--r-- | platform/x11/os_x11.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 6d1f54cb36..d501f44f24 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -44,6 +44,7 @@ #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/alsa/audio_driver_alsa.h" #include "drivers/ao/audio_driver_ao.h" +#include "drivers/pulseaudio/audio_driver_pulseaudio.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include <X11/keysym.h> @@ -134,6 +135,10 @@ class OS_X11 : public OS_Unix { AudioDriverAO driver_ao; #endif +#ifdef PULSEAUDIO_ENABLED + AudioDriverPulseAudio driver_pulseaudio; +#endif + enum { JOYSTICKS_MAX = 8, MAX_JOY_AXIS = 32768, // I've no idea @@ -165,7 +170,10 @@ protected: virtual int get_video_driver_count() const; virtual const char * get_video_driver_name(int p_driver) const; virtual VideoMode get_default_video_mode() const; - + + virtual int get_audio_driver_count() const; + virtual const char * get_audio_driver_name(int p_driver) const; + virtual void initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver); virtual void finalize(); |