0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup - sound sources

Browse source
This commit is contained in:
Patrick Parker 2007-03-19 22:54:52 +00:00
parent 83e4fcbfcb
commit 948be22738
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sound.cpp
View file

@ -585,19 +585,17 @@ void write_music_play_list(config& snapshot)
void reposition_sound(int id, unsigned int distance)
{
threading::lock l(channel_mutex);
std::vector<int>::iterator it = std::find(channel_ids.begin(), channel_ids.end(), id);
while(it != channel_ids.end()) {
const int ch = it - channel_ids.begin();
if(distance >= 255) {
Mix_FadeOutChannel(ch, 100);
channel_ids[ch] = -1;
for(int ch = 0; ch < channel_ids.size(); ++ch) {
int& ch_id = channel_ids[ch];
if(ch_id == id) {
if(distance >= DISTANCE_SILENT) {
Mix_FadeOutChannel(ch, 100);
ch_id = -1;
}
else {
Mix_SetDistance(ch, distance);
}
}
else
Mix_SetDistance(ch, distance);
it = std::find(++it, channel_ids.end(), id);
}
}
@ -609,10 +607,7 @@ bool is_sound_playing(int id)
void stop_sound(int id)
{
threading::lock l(channel_mutex);
std::vector<int>::iterator i = std::find(channel_ids.begin(), channel_ids.end(), id);
if(i != channel_ids.end())
Mix_FadeOutChannel(i - channel_ids.begin(), 100);
reposition_sound(id, DISTANCE_SILENT);
}
void play_sound_positioned(const std::string &files, int id, unsigned int distance)
@ -622,7 +617,7 @@ void play_sound_positioned(const std::string &files, int id, unsigned int distan
bool play_sound_internal(const std::string& files, channel_group group, bool sound_on, unsigned int distance, int id)
{
if(files.empty() || distance >= 255 || !sound_on || !mix_ok) {
if(files.empty() || distance >= DISTANCE_SILENT || !sound_on || !mix_ok) {
return false;
}
std::string file = pick_one(files);

1
src/sound.hpp
View file

@ -52,6 +52,7 @@ void play_music();
// Change parameters of a playing sound, given its id
void reposition_sound(int id, unsigned int distance);
#define DISTANCE_SILENT 255
// Check if there's a sound associated with given id playing
bool is_sound_playing(int id);