diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp index 62e8f5ed..d9e2c402 100644 --- a/src/audio/AL/ALAudio.cpp +++ b/src/audio/AL/ALAudio.cpp @@ -72,7 +72,7 @@ Speaker* ALStream::createSpeaker(bool loop, int channel) { void ALStream::bindSpeaker(speakerid_t speaker) { - auto sp = audio::get(this->speaker); + auto sp = audio::get_speaker(this->speaker); if (sp) { sp->stop(); } @@ -87,7 +87,7 @@ void ALStream::update(double delta) { if (this->speaker == 0) { return; } - Speaker* speaker = audio::get(this->speaker); + auto speaker = audio::get_speaker(this->speaker); if (speaker == nullptr) { speaker = 0; return; diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index 2c9d5c6e..af852f2a 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -312,7 +312,7 @@ speakerid_t audio::play_stream( return play(stream, position, relative, volume, pitch, loop, channel); } -Speaker* audio::get(speakerid_t id) { +Speaker* audio::get_speaker(speakerid_t id) { auto found = speakers.find(id); if (found == speakers.end()) { return nullptr; diff --git a/src/audio/audio.h b/src/audio/audio.h index b5e7f07d..1e1e6c0e 100644 --- a/src/audio/audio.h +++ b/src/audio/audio.h @@ -452,7 +452,7 @@ namespace audio { /// @brief Get speaker by id /// @param id speaker id /// @return speaker or nullptr - extern Speaker* get(speakerid_t id); + extern Speaker* get_speaker(speakerid_t id); /// @brief Create new channel. /// All non-builtin channels will be destroyed on audio::reset() call