PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into lua_audio

Browse Source
This commit is contained in:
MihailRis 2024-03-05 14:31:45 +03:00
commit 7057ea554d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AL/ALAudio.cpp
View File

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

2
src/audio/audio.cpp
View File

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

2
src/audio/audio.h
View File

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