diff options
author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-11-22 17:43:20 +0300 |
---|---|---|
committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-11-22 17:43:20 +0300 |
commit | e696dba522b3f4b9a3d3bc8ec3d6a09123d9ee50 (patch) | |
tree | 5330cf56871f8c5ba593a502739ce1c6cbfc2d94 /platform/x11/os_x11.cpp | |
parent | 7ed9a8a007044bf90cb7e6677598e20fc1abc121 (diff) | |
parent | e58731ee0146be1ccc365ff0e6dadafcdacb0c0e (diff) |
Merge branch 'libao'
Diffstat (limited to 'platform/x11/os_x11.cpp')
-rw-r--r-- | platform/x11/os_x11.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 1e6b7dc90e..278950ba3a 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1385,6 +1385,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; |