maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix priority in sample players

Browse source
This commit is contained in:
Pedro J. Estébanez 2017-05-15 20:24:38 +02:00
parent 52f91cf139
commit 40e7f1c3d5
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scene/audio/sample_player.cpp
View file

@ -221,18 +221,30 @@ SamplePlayer::VoiceID SamplePlayer::play(const String &p_name, bool unique) {
last_check++;
const int num_voices = voices.size();
bool found = false;
bool free_found = false;
int lowest_priority_voice = -1;
int lowest_priority = 0x7FFFFFFF;
for (int i = 0; i < num_voices; i++) {
const int candidate = (last_id + 1 + i) % num_voices;
if (voices[candidate].priority <= priority) {
found = true;
const Voice &v = voices[candidate];
if (!(v.active && AudioServer::get_singleton()->voice_is_active(v.voice))) {
free_found = true;
last_id = candidate;
break;
}
if (v.priority <= lowest_priority) {
lowest_priority = v.priority;
lowest_priority_voice = candidate;
}
}
if (!found)
return INVALID_VOICE_ID;
if (!free_found) {
if (lowest_priority > priority) {
return INVALID_VOICE_ID;
} else {
last_id = lowest_priority_voice;
}
}
Voice &v = voices[last_id];
v.clear();

4
servers/spatial_sound/spatial_sound_server_sw.cpp
View file

@ -402,7 +402,7 @@ SpatialSoundServer::SourceVoiceID SpatialSoundServerSW::source_play_sample(RID p
if (p_voice == SOURCE_NEXT_VOICE) {
const int num_voices = source->voices.size();
bool free_found = false;
int lowest_priority_voice = 0;
int lowest_priority_voice = -1;
int lowest_priority = 0x7FFFFFFF;
for (int i = 0; i < num_voices; i++) {
const int candidate = (source->last_voice + 1 + i) % num_voices;
@ -418,7 +418,7 @@ SpatialSoundServer::SourceVoiceID SpatialSoundServerSW::source_play_sample(RID p
}
}
if (!free_found)
to_play = (source->last_voice + 1) % num_voices;
to_play = lowest_priority_voice;
} else
to_play = p_voice;

4
servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
View file

@ -399,7 +399,7 @@ SpatialSound2DServer::SourceVoiceID SpatialSound2DServerSW::source_play_sample(R
if (p_voice == SOURCE_NEXT_VOICE) {
const int num_voices = source->voices.size();
bool free_found = false;
int lowest_priority_voice = 0;
int lowest_priority_voice = -1;
int lowest_priority = 0x7FFFFFFF;
for (int i = 0; i < num_voices; i++) {
const int candidate = (source->last_voice + 1 + i) % num_voices;
@ -415,7 +415,7 @@ SpatialSound2DServer::SourceVoiceID SpatialSound2DServerSW::source_play_sample(R
}
}
if (!free_found)
to_play = (source->last_voice + 1) % num_voices;
to_play = lowest_priority_voice;
} else
to_play = p_voice;