#include "clientmap.h"
#include "sky.h"
#include "sound.h"
+#if USE_AUDIO
+ #include "sound_openal.h"
+#endif
#include <list>
/*
IWritableItemDefManager *itemdef = createItemDefManager();
// Create node definition manager
IWritableNodeDefManager *nodedef = createNodeDefManager();
+
+ // Sound manager
+ ISoundManager *sound = NULL;
+ bool sound_is_dummy = false;
+#if USE_AUDIO
+ infostream<<"Attempting to use OpenAL audio"<<std::endl;
+ sound = createOpenALSoundManager(NULL);
+ if(!sound)
+ infostream<<"Failed to initialize OpenAL audio"<<std::endl;
+#endif
+ if(!sound){
+ infostream<<"Using dummy audio."<<std::endl;
+ sound = &dummySoundManager;
+ sound_is_dummy = true;
+ }
+
+ // Test sounds
+ sound->loadSound("default_grass_walk", porting::path_share + DIR_DELIM
+ + "sounds" + DIR_DELIM + "default_grass_walk3_mono.ogg");
+ //sound->playSound("default_grass_walk", false, 1.0);
+ //sound->playSoundAt("default_grass_walk", true, 1.0, v3f(0,10,0)*BS);
// Add chat log output for errors to be shown in chat
LogOutputBuffer chat_log_error_buf(LMT_ERROR);
MapDrawControl draw_control;
Client client(device, playername.c_str(), password, draw_control,
- tsrc, itemdef, nodedef);
+ tsrc, itemdef, nodedef, sound);
// Client acts as our GameDef
IGameDef *gamedef = &client;
/*
Create the camera node
*/
- Camera camera(smgr, draw_control);
+ Camera camera(smgr, draw_control, gamedef);
if (!camera.successfullyCreated(error_message))
return;
client.getEnv().getClientMap().updateCamera(camera_position,
camera_direction, camera_fov);
}
-
- //timer2.stop();
- //TimeTaker //timer3("//timer3");
+
+ // Update sound listener
+ sound->updateListener(camera.getCameraNode()->getPosition(),
+ v3f(0,0,0), // velocity
+ camera.getCameraNode()->getTarget(),
+ camera.getCameraNode()->getUpVector());
/*
Calculate what block is the crosshair pointing to
ItemStack item;
if(mlist != NULL)
item = mlist->getItem(client.getPlayerItem());
- camera.wield(item, gamedef);
+ camera.wield(item);
}
/*
// Client scope (client is destructed before destructing *def and tsrc)
}while(0);
-
- delete tsrc;
+
+ if(!sound_is_dummy)
+ delete sound;
delete nodedef;
delete itemdef;
+ delete tsrc;
}
class OnDemandSoundFetcher
{
public:
- virtual void getSoundFilenames(const std::string &name,
- std::set<std::string> &dst);
+ virtual void fetchSounds(const std::string &name,
+ std::set<std::string> &dst_paths,
+ std::set<std::vector<char> > &dst_datas) = 0;
};
class ISoundManager
virtual void updateListener(v3f pos, v3f vel, v3f at, v3f up) = 0;
// playSound functions return -1 on failure, otherwise a handle to the
// sound
- virtual int playSound(const std::string &name, int loopcount,
+ virtual int playSound(const std::string &name, bool loop,
float volume) = 0;
- virtual int playSoundAt(const std::string &name, int loopcount,
- v3f pos, float volume) = 0;
+ virtual int playSoundAt(const std::string &name, bool loop,
+ float volume, v3f pos) = 0;
virtual void stopSound(int sound) = 0;
};
virtual bool loadSound(const std::string &name,
const std::vector<char> &filedata) {return true;}
void updateListener(v3f pos, v3f vel, v3f at, v3f up) {}
- int playSound(const std::string &name, int loopcount,
+ int playSound(const std::string &name, bool loop,
float volume) {return 0;}
- int playSoundAt(const std::string &name, int loopcount,
- v3f pos, float volume) {return 0;}
+ int playSoundAt(const std::string &name, bool loop,
+ float volume, v3f pos) {return 0;}
void stopSound(int sound) {}
};
}
}
+static ALenum warn_if_error(ALenum err, const char *desc)
+{
+ if(err == AL_NO_ERROR)
+ return err;
+ errorstream<<"WARNING: "<<desc<<": "<<alErrorString(err)<<std::endl;
+ return err;
+}
+
void f3_set(ALfloat *f3, v3f v)
{
f3[0] = v.X;
struct SoundBuffer
{
- ALenum format;
- ALsizei freq;
- ALuint bufferID;
+ ALenum format;
+ ALsizei freq;
+ ALuint buffer_id;
std::vector<char> buffer;
};
snd->buffer.insert(snd->buffer.end(), array, array + bytes);
} while (bytes > 0);
- alGenBuffers(1, &snd->bufferID);
- alBufferData(snd->bufferID, snd->format,
+ alGenBuffers(1, &snd->buffer_id);
+ alBufferData(snd->buffer_id, snd->format,
&(snd->buffer[0]), snd->buffer.size(),
snd->freq);
struct PlayingSound
{
+ ALuint source_id;
+ bool loop;
};
class OpenALSoundManager: public ISoundManager
{
private:
+ OnDemandSoundFetcher *m_fetcher;
ALCdevice *m_device;
ALCcontext *m_context;
bool m_can_vorbis;
int m_next_id;
std::map<std::string, std::vector<SoundBuffer*> > m_buffers;
std::map<int, PlayingSound*> m_sounds_playing;
+ v3f m_listener_pos;
public:
- OpenALSoundManager():
+ OpenALSoundManager(OnDemandSoundFetcher *fetcher):
+ m_fetcher(fetcher),
m_device(NULL),
m_context(NULL),
m_can_vorbis(false),
}
std::vector<SoundBuffer*> bufs;
bufs.push_back(buf);
+ m_buffers[name] = bufs;
return;
}
return bufs[j];
}
- void updateListener(v3f pos, v3f vel, v3f at, v3f up)
- {
- ALfloat f[6];
- f3_set(f, pos);
- alListenerfv(AL_POSITION, f);
- f3_set(f, vel);
- alListenerfv(AL_VELOCITY, f);
- f3_set(f, at);
- f3_set(f+3, up);
- alListenerfv(AL_ORIENTATION, f);
- }
-
bool loadSound(const std::string &name,
const std::string &filepath)
{
return false;
}
- int playSound(const std::string &name, int loopcount,
+ PlayingSound* createPlayingSound(SoundBuffer *buf, bool loop,
float volume)
{
- return -1;
+ infostream<<"OpenALSoundManager: Creating playing sound"<<std::endl;
+ assert(buf);
+ PlayingSound *sound = new PlayingSound;
+ assert(sound);
+ warn_if_error(alGetError(), "before createPlayingSound");
+ alGenSources(1, &sound->source_id);
+ alSourcei(sound->source_id, AL_BUFFER, buf->buffer_id);
+ alSourcei(sound->source_id, AL_SOURCE_RELATIVE, true);
+ alSource3f(sound->source_id, AL_POSITION, 0, 0, 0);
+ alSource3f(sound->source_id, AL_VELOCITY, 0, 0, 0);
+ alSourcei(sound->source_id, AL_LOOPING, loop ? AL_TRUE : AL_FALSE);
+ volume = MYMAX(0.0, volume);
+ alSourcef(sound->source_id, AL_GAIN, volume);
+ alSourcePlay(sound->source_id);
+ warn_if_error(alGetError(), "createPlayingSound");
+ return sound;
+ }
+
+ PlayingSound* createPlayingSoundAt(SoundBuffer *buf, bool loop,
+ float volume, v3f pos)
+ {
+ infostream<<"OpenALSoundManager: Creating positional playing sound"
+ <<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);
+ alSourcei(sound->source_id, AL_SOURCE_RELATIVE, false);
+ alSource3f(sound->source_id, AL_POSITION, pos.X, pos.Y, pos.Z);
+ alSource3f(sound->source_id, AL_VELOCITY, 0, 0, 0);
+ //alSourcef(sound->source_id, AL_ROLLOFF_FACTOR, 0.7);
+ alSourcef(sound->source_id, AL_REFERENCE_DISTANCE, 30.0);
+ alSourcei(sound->source_id, AL_LOOPING, loop ? AL_TRUE : AL_FALSE);
+ volume = MYMAX(0.0, volume);
+ alSourcef(sound->source_id, AL_GAIN, volume);
+ alSourcePlay(sound->source_id);
+ warn_if_error(alGetError(), "createPlayingSoundAt");
+ return sound;
+ }
+
+ int playSoundRaw(SoundBuffer *buf, bool loop, float volume)
+ {
+ assert(buf);
+ PlayingSound *sound = createPlayingSound(buf, loop, volume);
+ if(!sound)
+ return -1;
+ int id = m_next_id++;
+ m_sounds_playing[id] = sound;
+ return id;
+ }
+
+ int playSoundRawAt(SoundBuffer *buf, bool loop, float volume, v3f pos)
+ {
+ assert(buf);
+ PlayingSound *sound = createPlayingSoundAt(buf, loop, volume, pos);
+ if(!sound)
+ return -1;
+ int id = m_next_id++;
+ m_sounds_playing[id] = sound;
+ return id;
}
- int playSoundAt(const std::string &name, int loopcount,
- v3f pos, float volume)
+
+ void deleteSound(int id)
+ {
+ std::map<int, PlayingSound*>::iterator i =
+ m_sounds_playing.find(id);
+ if(i == m_sounds_playing.end())
+ return;
+ PlayingSound *sound = i->second;
+
+ alDeleteSources(1, &sound->source_id);
+
+ delete sound;
+ m_sounds_playing.erase(id);
+ }
+
+ /* If buffer does not exist, consult the fetcher */
+ SoundBuffer* getFetchBuffer(const std::string name)
{
- return -1;
+ SoundBuffer *buf = getBuffer(name);
+ if(buf)
+ return buf;
+ if(!m_fetcher)
+ return NULL;
+ std::set<std::string> paths;
+ std::set<std::vector<char> > datas;
+ m_fetcher->fetchSounds(name, paths, datas);
+ for(std::set<std::string>::iterator i = paths.begin();
+ i != paths.end(); i++){
+ loadSound(name, *i);
+ }
+ for(std::set<std::vector<char> >::iterator i = datas.begin();
+ i != datas.end(); i++){
+ loadSound(name, *i);
+ }
+ return getBuffer(name);
+ }
+
+ // Remove stopped sounds
+ void maintain()
+ {
+ verbosestream<<"OpenALSoundManager::maintain(): "
+ <<m_sounds_playing.size()<<" playing sounds, "
+ <<m_buffers.size()<<" sound names loaded"<<std::endl;
+ std::set<int> del_list;
+ for(std::map<int, PlayingSound*>::iterator
+ i = m_sounds_playing.begin();
+ i != m_sounds_playing.end(); i++)
+ {
+ int id = i->first;
+ PlayingSound *sound = i->second;
+ // If not playing, remove it
+ {
+ ALint state;
+ alGetSourcei(sound->source_id, AL_SOURCE_STATE, &state);
+ if(state != AL_PLAYING){
+ del_list.insert(id);
+ }
+ }
+ }
+ if(del_list.size() != 0)
+ verbosestream<<"OpenALSoundManager::maintain(): deleting "
+ <<del_list.size()<<" playing sounds"<<std::endl;
+ for(std::set<int>::iterator i = del_list.begin();
+ i != del_list.end(); i++)
+ {
+ deleteSound(*i);
+ }
+ }
+
+ /* Interface */
+
+ void updateListener(v3f pos, v3f vel, v3f at, v3f up)
+ {
+ m_listener_pos = pos;
+ alListener3f(AL_POSITION, pos.X, pos.Y, pos.Z);
+ alListener3f(AL_VELOCITY, vel.X, vel.Y, vel.Z);
+ ALfloat f[6];
+ f3_set(f, at);
+ f3_set(f+3, up);
+ alListenerfv(AL_ORIENTATION, f);
+ warn_if_error(alGetError(), "updateListener");
+ }
+
+ int playSound(const std::string &name, bool loop, float volume)
+ {
+ maintain();
+ SoundBuffer *buf = getFetchBuffer(name);
+ if(!buf){
+ infostream<<"OpenALSoundManager: \""<<name<<"\" not found."
+ <<std::endl;
+ return -1;
+ }
+ return playSoundRaw(buf, loop, volume);
+ }
+ int playSoundAt(const std::string &name, bool loop, float volume, v3f pos)
+ {
+ maintain();
+ SoundBuffer *buf = getFetchBuffer(name);
+ if(!buf){
+ infostream<<"OpenALSoundManager: \""<<name<<"\" not found."
+ <<std::endl;
+ return -1;
+ }
+ return playSoundRawAt(buf, loop, volume, pos);
}
void stopSound(int sound)
{
+ maintain();
+ deleteSound(sound);
}
};
-ISoundManager *createSoundManager()
+ISoundManager *createOpenALSoundManager(OnDemandSoundFetcher *fetcher)
{
- return new OpenALSoundManager();
+ return new OpenALSoundManager(fetcher);
};
projects / oweals / minetest.git / commitdiff