diff options
| author | Rémi Verschelde | 2017-01-16 19:19:45 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-16 19:19:45 +0100 |
| commit | 7b059965e8df745c5b45b4ec6bfbdfe1a7397642 (patch) | |
| tree | bdba6b41f51fcb4c8aa5178aebd378bdf97b93a8 /drivers/alsa | |
| parent | 6a3dae5be944d9e226cca7bf0bd80fb0036e8324 (diff) | |
| download | godot-7b059965e8df745c5b45b4ec6bfbdfe1a7397642.tar.gz godot-7b059965e8df745c5b45b4ec6bfbdfe1a7397642.tar.zst godot-7b059965e8df745c5b45b4ec6bfbdfe1a7397642.zip | |
Adapt platforms to AudioServer refactoring
Fixes compilation on Windows and likely other platforms (at least
as far as AudioServer changes were concerned), though they were
not tested.
Diffstat (limited to 'drivers/alsa')
| -rw-r--r-- | drivers/alsa/audio_driver_alsa.cpp | 10 | ||||
| -rw-r--r-- | drivers/alsa/audio_driver_alsa.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp index c16341a4a..8984d412a 100644 --- a/drivers/alsa/audio_driver_alsa.cpp +++ b/drivers/alsa/audio_driver_alsa.cpp @@ -30,11 +30,9 @@ #ifdef ALSA_ENABLED -#include <errno.h> #include "globals.h" - - +#include <errno.h> Error AudioDriverALSA::init() { @@ -46,7 +44,7 @@ Error AudioDriverALSA::init() { samples_out = NULL; mix_rate = GLOBAL_DEF("audio/mix_rate",44100); - output_format = SPEAKER_MODE_STEREO; + speaker_mode = SPEAKER_MODE_STEREO; channels = 2; @@ -207,14 +205,16 @@ int AudioDriverALSA::get_mix_rate() const { AudioDriver::SpeakerMode AudioDriverALSA::get_speaker_mode() const { - return output_format; + return speaker_mode; }; + void AudioDriverALSA::lock() { if (!thread || !mutex) return; mutex->lock(); }; + void AudioDriverALSA::unlock() { if (!thread || !mutex) diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h index 96eb86ace..6ab98312b 100644 --- a/drivers/alsa/audio_driver_alsa.h +++ b/drivers/alsa/audio_driver_alsa.h @@ -48,7 +48,7 @@ class AudioDriverALSA : public AudioDriver { static void thread_func(void* p_udata); unsigned int mix_rate; - SpeakerMode output_format; + SpeakerMode speaker_mode; snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; |