seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt platforms to AudioServer refactoring

Browse Source 
Fixes compilation on Windows and likely other platforms (at least
as far as AudioServer changes were concerned), though they were
not tested.
This commit is contained in:
Rémi Verschelde
2017-01-16 19:19:45 +01:00
parent 6a3dae5be9
commit 7b059965e8
34 changed files with 123 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/alsa/audio_driver_alsa.cpp
View File

@ -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)

2
drivers/alsa/audio_driver_alsa.h
View File

@ -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;