aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/sound.h28
-rw-r--r--src/client/sound_openal.cpp82
2 files changed, 52 insertions, 58 deletions
diff --git a/src/client/sound.h b/src/client/sound.h
index a3bb3ce87..213d20831 100644
--- a/src/client/sound.h
+++ b/src/client/sound.h
@@ -51,10 +51,8 @@ public:
// playSound functions return -1 on failure, otherwise a handle to the
// sound. If name=="", call should be ignored without error.
- virtual int playSound(const std::string &name, bool loop, float volume,
- float fade = 0.0f, float pitch = 1.0f) = 0;
- virtual int playSoundAt(const std::string &name, bool loop, float volume, v3f pos,
- float pitch = 1.0f) = 0;
+ virtual int playSound(const SimpleSoundSpec &spec) = 0;
+ virtual int playSoundAt(const SimpleSoundSpec &spec, const v3f &pos) = 0;
virtual void stopSound(int sound) = 0;
virtual bool soundExists(int sound) = 0;
virtual void updateSoundPosition(int sound, v3f pos) = 0;
@@ -62,15 +60,6 @@ public:
virtual float getSoundGain(int id) = 0;
virtual void step(float dtime) = 0;
virtual void fadeSound(int sound, float step, float gain) = 0;
-
- int playSound(const SimpleSoundSpec &spec)
- {
- return playSound(spec.name, spec.loop, spec.gain, spec.fade, spec.pitch);
- }
- int playSoundAt(const SimpleSoundSpec &spec, const v3f &pos)
- {
- return playSoundAt(spec.name, spec.loop, spec.gain, pos, spec.pitch);
- }
};
class DummySoundManager : public ISoundManager
@@ -88,16 +77,9 @@ public:
{
}
void setListenerGain(float gain) {}
- int playSound(const std::string &name, bool loop, float volume, float fade,
- float pitch)
- {
- return 0;
- }
- int playSoundAt(const std::string &name, bool loop, float volume, v3f pos,
- float pitch)
- {
- return 0;
- }
+
+ int playSound(const SimpleSoundSpec &spec) { return -1; }
+ int playSoundAt(const SimpleSoundSpec &spec, const v3f &pos) { return -1; }
void stopSound(int sound) {}
bool soundExists(int sound) { return false; }
void updateSoundPosition(int sound, v3f pos) {}
diff --git a/src/client/sound_openal.cpp b/src/client/sound_openal.cpp
index 0eda8842b..b015aba25 100644
--- a/src/client/sound_openal.cpp
+++ b/src/client/sound_openal.cpp
@@ -322,7 +322,7 @@ private:
OnDemandSoundFetcher *m_fetcher;
ALCdevice *m_device;
ALCcontext *m_context;
- int m_next_id;
+ u16 m_last_used_id = 0; // only access within getFreeId() !
std::unordered_map<std::string, std::vector<SoundBuffer*>> m_buffers;
std::unordered_map<int, PlayingSound*> m_sounds_playing;
struct FadeState {
@@ -342,8 +342,7 @@ public:
OpenALSoundManager(SoundManagerSingleton *smg, OnDemandSoundFetcher *fetcher):
m_fetcher(fetcher),
m_device(smg->m_device.get()),
- m_context(smg->m_context.get()),
- m_next_id(1)
+ m_context(smg->m_context.get())
{
infostream << "Audio: Initialized: OpenAL " << std::endl;
}
@@ -379,6 +378,22 @@ public:
infostream << "Audio: Deinitialized." << std::endl;
}
+ u16 getFreeId()
+ {
+ u16 startid = m_last_used_id;
+ while (!isFreeId(++m_last_used_id)) {
+ if (m_last_used_id == startid)
+ return 0;
+ }
+
+ return m_last_used_id;
+ }
+
+ inline bool isFreeId(int id) const
+ {
+ return id > 0 && m_sounds_playing.find(id) == m_sounds_playing.end();
+ }
+
void step(float dtime)
{
doFades(dtime);
@@ -437,7 +452,7 @@ public:
<< std::endl;
assert(buf);
PlayingSound *sound = new PlayingSound;
- assert(sound);
+
warn_if_error(alGetError(), "before createPlayingSoundAt");
alGenSources(1, &sound->source_id);
alSourcei(sound->source_id, AL_BUFFER, buf->buffer_id);
@@ -463,28 +478,17 @@ public:
{
assert(buf);
PlayingSound *sound = createPlayingSound(buf, loop, volume, pitch);
- if(!sound)
+ if (!sound)
return -1;
- int id = m_next_id++;
- m_sounds_playing[id] = sound;
- return id;
- }
- int playSoundRawAt(SoundBuffer *buf, bool loop, float volume, const v3f &pos,
- float pitch)
- {
- assert(buf);
- PlayingSound *sound = createPlayingSoundAt(buf, loop, volume, pos, pitch);
- if(!sound)
- return -1;
- int id = m_next_id++;
- m_sounds_playing[id] = sound;
- return id;
+ int handle = getFreeId();
+ m_sounds_playing[handle] = sound;
+ return handle;
}
void deleteSound(int id)
{
- std::unordered_map<int, PlayingSound*>::iterator i = m_sounds_playing.find(id);
+ auto i = m_sounds_playing.find(id);
if(i == m_sounds_playing.end())
return;
PlayingSound *sound = i->second;
@@ -580,39 +584,46 @@ public:
alListenerf(AL_GAIN, gain);
}
- int playSound(const std::string &name, bool loop, float volume, float fade, float pitch)
+ int playSound(const SimpleSoundSpec &spec)
{
maintain();
- if (name.empty())
+ if (spec.name.empty())
return 0;
- SoundBuffer *buf = getFetchBuffer(name);
+ SoundBuffer *buf = getFetchBuffer(spec.name);
if(!buf){
- infostream << "OpenALSoundManager: \"" << name << "\" not found."
+ infostream << "OpenALSoundManager: \"" << spec.name << "\" not found."
<< std::endl;
return -1;
}
+
int handle = -1;
- if (fade > 0) {
- handle = playSoundRaw(buf, loop, 0.0f, pitch);
- fadeSound(handle, fade, volume);
+ if (spec.fade > 0) {
+ handle = playSoundRaw(buf, spec.loop, 0.0f, spec.pitch);
+ fadeSound(handle, spec.fade, spec.gain);
} else {
- handle = playSoundRaw(buf, loop, volume, pitch);
+ handle = playSoundRaw(buf, spec.loop, spec.gain, spec.pitch);
}
return handle;
}
- int playSoundAt(const std::string &name, bool loop, float volume, v3f pos, float pitch)
+ int playSoundAt(const SimpleSoundSpec &spec, const v3f &pos)
{
maintain();
- if (name.empty())
+ if (spec.name.empty())
return 0;
- SoundBuffer *buf = getFetchBuffer(name);
- if(!buf){
- infostream << "OpenALSoundManager: \"" << name << "\" not found."
+ SoundBuffer *buf = getFetchBuffer(spec.name);
+ if (!buf) {
+ infostream << "OpenALSoundManager: \"" << spec.name << "\" not found."
<< std::endl;
return -1;
}
- return playSoundRawAt(buf, loop, volume, pos, pitch);
+
+ PlayingSound *sound = createPlayingSoundAt(buf, spec.loop, spec.gain, pos, spec.pitch);
+ if (!sound)
+ return -1;
+ int handle = getFreeId();
+ m_sounds_playing[handle] = sound;
+ return handle;
}
void stopSound(int sound)
@@ -624,8 +635,9 @@ public:
void fadeSound(int soundid, float step, float gain)
{
// Ignore the command if step isn't valid.
- if (step == 0)
+ if (step == 0 || soundid < 0)
return;
+
float current_gain = getSoundGain(soundid);
step = gain - current_gain > 0 ? abs(step) : -abs(step);
if (m_sounds_fading.find(soundid) != m_sounds_fading.end()) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 04:52:26 +0000