summaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.h
diff options
context:
space:
mode:
Diffstat (limited to 'platform/x11/os_x11.h')
-rw-r--r--platform/x11/os_x11.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 1566062b9e..a4b3d580d1 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 "drivers/pulseaudio/audio_driver_pulseaudio.h"
#include "servers/physics_2d/physics_2d_server_sw.h"
#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
@@ -119,6 +120,7 @@ class OS_X11 : public OS_Unix {
const char *cursor_theme;
int cursor_size;
+ XcursorImage *img[CURSOR_MAX];
Cursor cursors[CURSOR_MAX];
Cursor null_cursor;
CursorShape current_cursor;
@@ -133,6 +135,10 @@ class OS_X11 : public OS_Unix {
AudioDriverALSA driver_alsa;
#endif
+#ifdef AO_ENABLED
+ AudioDriverAO driver_ao;
+#endif
+
#ifdef PULSEAUDIO_ENABLED
AudioDriverPulseAudio driver_pulseaudio;
#endif
@@ -155,12 +161,7 @@ class OS_X11 : public OS_Unix {
};
};
};
-
- Atom net_wm_icon;
-
-
int joystick_count;
-
Joystick joysticks[JOYSTICKS_MAX];
int audio_driver_index;