X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSound.cc;h=f9bdfd7a99622c22bb231405a768e2343c1ab690;hp=a0302fba003aaa6052e7e447f85a97d142ecd781;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc diff --git a/src/Moof/Sound.cc b/src/Moof/Sound.cc index a0302fb..f9bdfd7 100644 --- a/src/Moof/Sound.cc +++ b/src/Moof/Sound.cc @@ -26,246 +26,549 @@ *******************************************************************************/ +#include +#include +#include #include -#include -#include #include +#include +#include +#include "Engine.hh" +#include "Library.hh" #include "Log.hh" -#include "Mippleton.hh" #include "Sound.hh" +#include "Timer.hh" -#define BUFFER_SIZE (8 * 4096) +#define BUFFER_SIZE (64 * 1024) +//#define BUFFER_SIZE (5*2048) namespace Mf { -struct Sound::Impl +class Sound::Impl { +public: - static ALenum getAudioFormat(const Sound_AudioInfo& audioInfo) + static ALenum getAudioFormat(const vorbis_info* audioInfo) { - if (audioInfo.format == AUDIO_U8 || audioInfo.format == AUDIO_S8) - { - if (audioInfo.channels == 1) return AL_FORMAT_MONO8; - else return AL_FORMAT_STEREO8; - } - else - { - if (audioInfo.channels == 1) return AL_FORMAT_MONO16; - else return AL_FORMAT_STEREO16; - } + if (audioInfo->channels == 1) return AL_FORMAT_MONO16; + else return AL_FORMAT_STEREO16; } - struct Buffer : public Mippleton + + class Buffer; + typedef boost::shared_ptr BufferP; + + class Buffer : public Library { + public: + Buffer(const std::string& name) : - Mippleton(name) + Library(name), + mBuffer(-1) { - sound = 0; - objects[0] = 0; - objects[1] = 0; + mOggStream.datasource = 0; + openFile(); } ~Buffer() { - alDeleteBuffers(2, objects); - - if (sound) Sound_FreeSample(sound); + if (mOggStream.datasource) + { + ov_clear(&mOggStream); + } + if (int(mBuffer) != -1) alDeleteBuffers(1, &mBuffer); } - void loadFromFile(const std::string& filePath, bool stream) + void openFile() { - if (objects[0] != 0) return; + if (mOggStream.datasource) + { + ov_clear(&mOggStream); + mOggStream.datasource = 0; + } - sound = Sound_NewSampleFromFile(filePath.c_str(), - NULL, BUFFER_SIZE); + std::string filePath = Sound::getPath(getName()); + int result = ov_fopen((char*)filePath.c_str(), &mOggStream); - if (!sound) + if (result < 0) { - logWarning("error while loading sound %s: %s", getName().c_str(), Sound_GetError()); - throw Exception(Exception::FILE_NOT_FOUND); + logWarning << "error while loading sound " + << getName() << std::endl; + throw Error(Error::UNKNOWN_AUDIO_FORMAT, getName()); } - if (!stream) + vorbis_info* vorbisInfo = ov_info(&mOggStream, -1); + mFormat = getAudioFormat(vorbisInfo); + mFreq = vorbisInfo->rate; + } + + + void loadAll(ALuint source) + { + if (!mOggStream.datasource) openFile(); + if (!mOggStream.datasource) return; + + char data[BUFFER_SIZE]; + int size = 0; + + for (;;) { - unsigned decoded = Sound_DecodeAll(sound); - if (decoded == 0) + int section; + int result = ov_read(&mOggStream, data + size, + BUFFER_SIZE - size, 0, 2, 1, §ion); + + if (result > 0) + { + size += result; + } + else + { + if (result < 0) logWarning("vorbis playback error"); + break; + } + } + if (size == 0) { - logWarning("decoded no bytes from %s", getName().c_str()); - //throw Exception(Exception::FILE_NOT_FOUND); + logWarning << "decoded no bytes from " + << getName() << std::endl; return; } - alGenBuffers(2, objects); - alBufferData(objects[0], getAudioFormat(sound->actual), sound->buffer, - sound->buffer_size, sound->actual.rate); - logDebug("buffer size: %d", sound->buffer_size); - logDebug(" channels: %d", sound->actual.channels); - logDebug(" format: %d", sound->actual.format); - logDebug(" frequency: %d", sound->actual.rate); + alGenBuffers(1, &mBuffer); - Sound_FreeSample(sound); - sound = 0; - } - else - { - logDebug("buffer size: %d", sound->buffer_size); - logDebug(" channels: %d", sound->actual.channels); - logDebug(" format: %d", sound->actual.format); - logDebug(" frequency: %d", sound->actual.rate); - alGenBuffers(2, objects); - } + alBufferData(mBuffer, mFormat, data, size, mFreq); + alSourcei(source, AL_BUFFER, mBuffer); + + // don't need to keep this loaded + ov_clear(&mOggStream); + mOggStream.datasource = 0; } bool stream(ALuint buffer) { - int bytes = Sound_Decode(sound); + char data[BUFFER_SIZE]; + int size = 0; + + while (size < BUFFER_SIZE) + { + int section; + int result = ov_read(&mOggStream, data + size, + BUFFER_SIZE - size, 0, 2, 1, §ion); + + if (result > 0) + { + size += result; + } + else + { + if (result < 0) logWarning("vorbis playback error"); + break; + } + } + + if (size == 0) return false; - if (bytes < BUFFER_SIZE) return false; + alBufferData(buffer, mFormat, data, size, mFreq); - alBufferData(buffer, getAudioFormat(sound->actual), sound->buffer, - sound->buffer_size, sound->actual.rate); - return false; + return true; } - Sound_Sample* sound; - ALuint objects[2]; + void rewind() + { + if (!mOggStream.datasource) openFile(); + else ov_raw_seek(&mOggStream, 0); + } - //ALfloat location[] = {0.0f, 0.0f, 0.0f}; - //ALfloat location2[] = {0.0f, 0.0f, 0.0f}; - //ALfloat orient[] = {0.0f, 0.0f, -1.0f, 0.0, 1.0, 0.0}; + private: - //alListenerfv(AL_POSITION, location); - //alListenerfv(AL_VELOCITY, location); - //alListenerfv(AL_VELOCITY, orient); + OggVorbis_File mOggStream; + ALenum mFormat; + ALsizei mFreq; + ALuint mBuffer; }; - Impl(const std::string& name, bool stream = false) : - buffer_(Buffer::getInstance(name)) + + Impl() { - if (!stream) buffer_->loadFromFile(Sound::getPath(name), stream); - else buffer_->loadFromFile(SoundStream::getPath(name), stream); + init(); + } + + Impl(const std::string& name) + { + init(); + enqueue(name); + } + + void init() + { + mIsLoaded = false; + mIsPlaying = false; + mIsLooping = false; + + alGenSources(1, &mSource); + + ALfloat zero[] = {0.0f, 0.0f, 0.0f}; + alSourcef(mSource, AL_PITCH, 1.0f); + alSourcef(mSource, AL_GAIN, 1.0f); + alSourcefv(mSource, AL_POSITION, zero); + alSourcefv(mSource, AL_VELOCITY, zero); + + alSourcei(mSource, AL_LOOPING, mIsLooping); + } - ALfloat location[] = {0.0f, 0.0f, 0.0f}; - - alGenSources(1, &source_); + ~Impl() + { + stop(); - alSourcef(source_, AL_PITCH, 1.0f); - alSourcef(source_, AL_GAIN, 1.0f); - alSourcefv(source_, AL_POSITION, location); - alSourcefv(source_, AL_VELOCITY, location); - alSourcei(source_, AL_LOOPING, AL_FALSE); + alDeleteSources(1, &mSource); - if (!stream) + while (!mBuffers.empty()) { - alSourcei(source_, AL_BUFFER, buffer_->objects[0]); + alDeleteBuffers(1, &mBuffers.back()); + mBuffers.pop_back(); } - else + } + + + void play() + { + if (mQueue.empty()) return; + + if (!mIsLoaded) mQueue.front()->loadAll(mSource); + + alSourcePlay(mSource); + mIsLoaded = true; + } + + + void playStream() + { + if (mQueue.empty()) return; + + if (!mIsPlaying) { - buffer_->stream(buffer_->objects[0]); - buffer_->stream(buffer_->objects[1]); + alSourcei(mSource, AL_LOOPING, false); + bufferStream(); + } - alSourceQueueBuffers(source_, 2, buffer_->objects); + if (!mStreamTimer.isValid()) + { + mStreamTimer.init(boost::bind(&Impl::streamUpdate, this, _1, _2), + 1.0, Timer::REPEAT); } + + alSourcePlay(mSource); + mIsPlaying = true; } - ~Impl() + void bufferStream() { - alDeleteSources(1, &source_); + ALuint buffer; + for (int i = mBuffers.size(); i <= 8; ++i) + { + alGenBuffers(1, &buffer); + + if (mQueue.front()->stream(buffer)) + { + alSourceQueueBuffers(mSource, 1, &buffer); + mBuffers.push_back(buffer); + } + else + { + alDeleteBuffers(1, &buffer); + break; + } + } } void update() { - int finished = 0; + ALint finished = 0; - alGetSourcei(source_, AL_BUFFERS_PROCESSED, &finished); + alGetSourcei(mSource, AL_BUFFERS_PROCESSED, &finished); while (finished-- > 0) { - ALuint buffer; + ALuint bufferObj; + alSourceUnqueueBuffers(mSource, 1, &bufferObj); + + BufferP buffer = mQueue.front(); + bool streamed = buffer->stream(bufferObj); + + if (streamed) + { + alSourceQueueBuffers(mSource, 1, &bufferObj); + } + else + { + // the buffer couldn't be streamed, so get rid of it + mQueue.pop_front(); + + if (!mQueue.empty()) + { + // begin the next buffer in the queue + mQueue.front()->rewind(); + mQueue.front()->stream(bufferObj); + alSourceQueueBuffers(mSource, 1, &bufferObj); + logInfo("loading new buffer"); + + // queue up any unused buffers + bufferStream(); + } + else if (mIsLooping) + { + // reload the same buffer + mQueue.push_back(buffer); + buffer->rewind(); + buffer->stream(bufferObj); + alSourceQueueBuffers(mSource, 1, &bufferObj); + logInfo("looping same buffer"); + } + else + { + // nothing more to play, stopping... + mIsPlaying = false; + std::remove(mBuffers.begin(), mBuffers.end(), bufferObj); + } + } + } + + ALenum state; + alGetSourcei(mSource, AL_SOURCE_STATE, &state); + + // restart playing if we're stopped but supposed to be playing... this + // means we didn't queue enough and the audio skipped :-( + if (mIsPlaying && state != AL_PLAYING) + { + alSourcePlay(mSource); + } + } + + + void stop() + { + alSourceStop(mSource); + mIsPlaying = false; + + mStreamTimer.invalidate(); + } + + void pause() + { + alSourcePause(mSource); + mIsPlaying = false; + + mStreamTimer.invalidate(); + } + + + void setSample(const std::string& name) + { + stop(); + alSourcei(mSource, AL_BUFFER, AL_NONE); + + mQueue.clear(); + mIsLoaded = false; + + enqueue(name); + + while (!mBuffers.empty()) + { + alDeleteBuffers(1, &mBuffers.back()); + mBuffers.pop_back(); + } + } + + void enqueue(const std::string& name) + { + BufferP buffer = Buffer::getInstance(name); + mQueue.push_back(buffer); + } + + + bool isPlaying() const + { + if (mIsPlaying) return true; - alSourceUnqueueBuffers(source_, 1, &buffer); - buffer_->stream(buffer); - alSourceQueueBuffers(source_, 1, &buffer); + ALenum state; + alGetSourcei(mSource, AL_SOURCE_STATE, &state); + + return state == AL_PLAYING; + } + + + void setLooping(bool looping) + { + mIsLooping = looping; + + ALenum type; + alGetSourcei(mSource, AL_SOURCE_TYPE, &type); + + if (type != AL_STREAMING) + { + alSourcei(mSource, AL_LOOPING, mIsLooping); } } - boost::shared_ptr buffer_; - ALuint source_; - bool playing; + void streamUpdate(Timer& timer, Scalar t) + { + // don't let the music die! + update(); + // TODO - might be nice to also allow using threads for streaming rather + // than a timer, probably as a compile-time option + } + + + ALuint mSource; + std::list mBuffers; + + bool mIsLoaded; + bool mIsPlaying; + bool mIsLooping; + + std::deque mQueue; + + Timer mStreamTimer; }; +Sound::Sound() : + // pass through + mImpl(new Sound::Impl) {} + Sound::Sound(const std::string& name) : // pass through - impl_(new Sound::Impl(name)) {} + mImpl(new Sound::Impl(name)) {} + + +void Sound::setSample(const std::string& name) +{ + // pass through + mImpl->setSample(name); +} void Sound::play() { - if (!impl_->buffer_->sound) return; + // pass through + mImpl->play(); +} - //alSourceRewind(impl_->source_); - alSourcePlay(impl_->source_); - impl_->playing = true; +void Sound::stop() +{ + // pass through + mImpl->stop(); } void Sound::pause() { - alSourcePause(impl_->source_); - impl_->playing = false; + // pass through + mImpl->pause(); } -void Sound::togglePlayPause() + +void Sound::toggle() { - if (impl_->playing) pause(); + if (isPlaying()) pause(); else play(); } -void Sound::setGain(Scalar gain) +bool Sound::isPlaying() const { - alSourcef(impl_->source_, AL_GAIN, gain); + // pass through + return mImpl->isPlaying(); } -std::string Sound::getPath(const std::string& name) +void Sound::setPosition(const Vector3& position) { - std::string path = Resource::getPath("sounds/" + name + ".ogg"); - return path; + float vec[3] = {position[0], position[1], position[2]}; + alSourcefv(mImpl->mSource, AL_POSITION, vec); } +void Sound::setVelocity(const Vector3& velocity) +{ + float vec[3] = {velocity[0], velocity[1], velocity[2]}; + alSourcefv(mImpl->mSource, AL_VELOCITY, vec); +} -//############################################################################## +void Sound::setGain(Scalar gain) +{ + alSourcef(mImpl->mSource, AL_GAIN, float(gain)); +} +void Sound::setPitch(Scalar pitch) +{ + alSourcef(mImpl->mSource, AL_PITCH, float(pitch)); +} -SoundStream::SoundStream(const std::string& name) +void Sound::setLooping(bool looping) +{ // pass through - //impl_(name, true) {} + mImpl->setLooping(looping); +} + + +void Sound::setListenerPosition(const Vector3& position) { - impl_ = boost::shared_ptr(new Sound::Impl(name, true)); + //alListener3f(AL_POSITION, float(position[0]), float(position[1]), + //float(position[2])); + float vec[] = {position[0], position[1], position[2]}; + alListenerfv(AL_POSITION, vec); } +void Sound::setListenerVelocity(const Vector3& velocity) +{ + //alListener3f(AL_VELOCITY, float(velocity[0]), float(velocity[1]), + //float(velocity[2])); + float vec[] = {velocity[0], velocity[1], velocity[2]}; + alListenerfv(AL_VELOCITY, vec); +} -void SoundStream::update(Scalar t, Scalar dt) +void Sound::setListenerOrientation(const Vector3& forward, const Vector3& up) { - // pass through - impl_->update(); + float vec[6]; + vec[0] = float(forward[0]); + vec[1] = float(forward[1]); + vec[2] = float(forward[2]); + vec[3] = float(up[0]); + vec[4] = float(up[1]); + vec[5] = float(up[2]); + alListenerfv(AL_ORIENTATION, vec); } -std::string SoundStream::getPath(const std::string& name) +std::string Sound::getPath(const std::string& name) { - std::string path = Resource::getPath("sounds/" + name + ".xm"); + std::string path = Resource::getPath("sounds/" + name + ".ogg"); return path; } +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +void SoundStream::enqueue(const std::string& name) +{ + // pass through + mImpl->enqueue(name); +} + + +void SoundStream::play() +{ + // pass through + mImpl->playStream(); +} + + } // namespace Mf /** vim: set ts=4 sw=4 tw=80: *************************************************/