summaryrefslogtreecommitdiff
path: root/servers/audio
diff options
context:
space:
mode:
authorMarcelo Fernandez <marcelofg55@gmail.com>2018-07-27 15:09:03 -0300
committerMarcelo Fernandez <marcelofg55@gmail.com>2018-07-27 15:09:03 -0300
commit597301db349c2c0c70af6b411465a5f578765052 (patch)
treeb0962c874bfd78eef0f688b5f7160414b06cdd00 /servers/audio
parentdd8a0b92e0bbc0e82263061b3947cb93a39f9df1 (diff)
Renamed AudioDriver audio_input_* vars to input_*
Diffstat (limited to 'servers/audio')
-rw-r--r--servers/audio/audio_stream.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index f7622b8a4e..618ebd526d 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -134,18 +134,18 @@ void AudioStreamPlaybackMicrophone::_mix_internal(AudioFrame *p_buffer, int p_fr
AudioDriver::get_singleton()->lock();
- Vector<int32_t> buf = AudioDriver::get_singleton()->get_audio_input_buffer();
- unsigned int audio_input_size = AudioDriver::get_singleton()->get_audio_input_size();
+ Vector<int32_t> buf = AudioDriver::get_singleton()->get_input_buffer();
+ unsigned int input_size = AudioDriver::get_singleton()->get_input_size();
// p_frames is multipled by two since an AudioFrame is stereo
- if ((p_frames * 2) > audio_input_size) {
+ if ((p_frames * 2) > input_size) {
for (int i = 0; i < p_frames; i++) {
p_buffer[i] = AudioFrame(0.0f, 0.0f);
}
input_ofs = 0;
} else {
for (int i = 0; i < p_frames; i++) {
- if (audio_input_size >= input_ofs) {
+ if (input_size >= input_ofs) {
float l = (buf[input_ofs++] >> 16) / 32768.f;
if (input_ofs >= buf.size()) {
input_ofs = 0;