Skip to content

Commit

Permalink
SOUND: Don't error out when no working sound device was found
Browse files Browse the repository at this point in the history 
Instead, try to act normal and just don't play anything.

Note: There's currently no way to check if a sound naturally ended
      when in no sound mode. isPlaying() will always return true
      for a valid handle, unless it is forcibly stopped with
      stopChannel() or stopAll(). Code that waits for a sound to
      finish playing will enter an endless loop.
  • Loading branch information
@DrMcCoy
DrMcCoy committed Apr 21, 2012
1 parent 7ff7f7d commit 3102fe7
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 49 deletions.
137 changes: 88 additions & 49 deletions src/sound/sound.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static const int kOpenALBufferSize = 32768;

namespace Sound {

SoundManager::SoundManager() : _ready(false), _hasMultiChannel(false), _format51(0) {
SoundManager::SoundManager() : _ready(false), _hasSound(false), _hasMultiChannel(false), _format51(0) {
}

void SoundManager::init() {
Expand All @@ -72,22 +72,34 @@ void SoundManager::init() {
_curID = 1;

_dev = alcOpenDevice(0);
if (!_dev)
throw Common::Exception("Could not open OpenAL device");

_ctx = alcCreateContext(_dev, 0);
alcMakeContextCurrent(_ctx);
if (!_ctx)
throw Common::Exception("Could not create OpenAL context");
_hasSound = _dev != 0;
if (!_hasSound)
warning("Failed to open OpenAL device. Disabling sound output");

_hasMultiChannel = alIsExtensionPresent("AL_EXT_MCFORMATS");
_format51 = alGetEnumValue("AL_FORMAT_51CHN16");
_ctx = 0;

_hasMultiChannel = false;
_format51 = 0;

if (_hasSound) {
_ctx = alcCreateContext(_dev, 0);
alcMakeContextCurrent(_ctx);
if (!_ctx)
throw Common::Exception("Could not create OpenAL context");

_hasMultiChannel = alIsExtensionPresent("AL_EXT_MCFORMATS");
_format51 = alGetEnumValue("AL_FORMAT_51CHN16");
}

if (!createThread())
throw Common::Exception("Failed to create sound thread: %s", SDL_GetError());

_ready = true;

if (!_hasSound)
return;

setListenerGain(ConfigMan.getDouble("volume", 1.0));

setTypeGain(kSoundTypeMusic, ConfigMan.getDouble("volume_music", 1.0));
Expand All @@ -106,9 +118,11 @@ void SoundManager::deinit() {
for (uint16 i = 1; i < kChannelCount; i++)
freeChannel(i);

alcMakeContextCurrent(0);
alcDestroyContext(_ctx);
alcCloseDevice(_dev);
if (_hasSound) {
alcMakeContextCurrent(0);
alcDestroyContext(_ctx);
alcCloseDevice(_dev);
}

_ready = false;
}
Expand Down Expand Up @@ -149,6 +163,13 @@ bool SoundManager::isPlaying(uint16 channel) const {
if ((channel == 0) || !_channels[channel])
return false;

// TODO: This might pose a problem should we ever need to wait
// for sounds to finish (for syncing, ...). We need to
// add a way for audio streams to tell us how long they are
// and then check if that time has elapsed.
if (!_hasSound)
return true;

ALint val;
alGetSourcei(_channels[channel]->source, AL_SOURCE_STATE, &val);

Expand Down Expand Up @@ -262,35 +283,37 @@ ChannelHandle SoundManager::playAudioStream(AudioStream *audStream, SoundType ty

ALenum error = AL_NO_ERROR;

// Create the source
alGenSources(1, &channel.source);
if ((error = alGetError()) != AL_NO_ERROR)
throw Common::Exception("OpenAL error while generating sources: %X", error);

// Create all needed buffers
for (int i = 0; i < kOpenALBufferCount; i++) {
ALuint buffer;

alGenBuffers(1, &buffer);
if (_hasSound) {
// Create the source
alGenSources(1, &channel.source);
if ((error = alGetError()) != AL_NO_ERROR)
throw Common::Exception("OpenAL error while generating buffers: %X", error);
throw Common::Exception("OpenAL error while generating sources: %X", error);

if (fillBuffer(channel.source, buffer, channel.stream)) {
// If we could fill the buffer with data, queue it
// Create all needed buffers
for (int i = 0; i < kOpenALBufferCount; i++) {
ALuint buffer;

alSourceQueueBuffers(channel.source, 1, &buffer);
alGenBuffers(1, &buffer);
if ((error = alGetError()) != AL_NO_ERROR)
throw Common::Exception("OpenAL error while queueing buffers: %X", error);
throw Common::Exception("OpenAL error while generating buffers: %X", error);

} else
// If not, put it into our free list
channel.freeBuffers.push_back(buffer);
if (fillBuffer(channel.source, buffer, channel.stream)) {
// If we could fill the buffer with data, queue it

channel.buffers.push_back(buffer);
}
alSourceQueueBuffers(channel.source, 1, &buffer);
if ((error = alGetError()) != AL_NO_ERROR)
throw Common::Exception("OpenAL error while queueing buffers: %X", error);

} else
// If not, put it into our free list
channel.freeBuffers.push_back(buffer);

// Set the gain to the current sound type gain
alSourcef(channel.source, AL_GAIN, _types[channel.type].gain);
channel.buffers.push_back(buffer);
}

// Set the gain to the current sound type gain
alSourcef(channel.source, AL_GAIN, _types[channel.type].gain);
}

// Add the channel to the correct type list
_types[channel.type].list.push_back(&channel);
Expand Down Expand Up @@ -383,7 +406,8 @@ void SoundManager::setListenerGain(float gain) {

Common::StackLock lock(_mutex);

alListenerf(AL_GAIN, gain);
if (_hasSound)
alListenerf(AL_GAIN, gain);
}

void SoundManager::setChannelPosition(const ChannelHandle &handle, float x, float y, float z) {
Expand All @@ -396,7 +420,8 @@ void SoundManager::setChannelPosition(const ChannelHandle &handle, float x, floa
if (channel->stream->getChannels() > 1)
throw Common::Exception("Cannot set position of a non-mono sound.");

alSource3f(channel->source, AL_POSITION, x, y, z);
if (_hasSound)
alSource3f(channel->source, AL_POSITION, x, y, z);
}

void SoundManager::getChannelPosition(const ChannelHandle &handle, float &x, float &y, float &z) {
Expand All @@ -409,7 +434,8 @@ void SoundManager::getChannelPosition(const ChannelHandle &handle, float &x, flo
if (channel->stream->getChannels() > 1)
throw Common::Exception("Cannot get position of a non-mono sound.");

alGetSource3f(channel->source, AL_POSITION, &x, &y, &z);
if (_hasSound)
alGetSource3f(channel->source, AL_POSITION, &x, &y, &z);
}

void SoundManager::setChannelGain(const ChannelHandle &handle, float gain) {
Expand All @@ -421,7 +447,8 @@ void SoundManager::setChannelGain(const ChannelHandle &handle, float gain) {

channel->gain = gain;

alSourcef(channel->source, AL_GAIN, _types[channel->type].gain * gain);
if (_hasSound)
alSourcef(channel->source, AL_GAIN, _types[channel->type].gain * gain);
}

void SoundManager::setChannelPitch(const ChannelHandle &handle, float pitch) {
Expand All @@ -431,7 +458,8 @@ void SoundManager::setChannelPitch(const ChannelHandle &handle, float pitch) {
if (!channel || !channel->stream)
throw Common::Exception("Invalid channel");

alSourcef(channel->source, AL_PITCH, pitch);
if (_hasSound)
alSourcef(channel->source, AL_PITCH, pitch);
}

void SoundManager::setTypeGain(SoundType type, float gain) {
Expand All @@ -446,14 +474,18 @@ void SoundManager::setTypeGain(SoundType type, float gain) {
for (TypeList::iterator t = _types[type].list.begin(); t != _types[type].list.end(); ++t) {
assert(*t);

alSourcef((*t)->source, AL_GAIN, (*t)->gain * gain);
if (_hasSound)
alSourcef((*t)->source, AL_GAIN, (*t)->gain * gain);
}
}

bool SoundManager::fillBuffer(ALuint source, ALuint alBuffer, AudioStream *stream) const {
if (!stream)
throw Common::Exception("No stream");

if (!_hasSound)
return true;

if (stream->endOfData())
return false;

Expand Down Expand Up @@ -510,6 +542,9 @@ void SoundManager::bufferData(Channel &channel) {
if (!channel.stream || channel.stream->endOfData())
return;

if (!_hasSound)
return;

// Get the number of buffers that have been processed
ALint buffersProcessed;
alGetSourcei(channel.source, AL_BUFFERS_PROCESSED, &buffersProcessed);
Expand Down Expand Up @@ -590,9 +625,11 @@ void SoundManager::pauseChannel(Channel *channel, bool pause) {

ALenum error = AL_NO_ERROR;
if (pause) {
alSourcePause(channel->source);
if ((error = alGetError()) != AL_NO_ERROR)
warning("OpenAL error while attempting to pause: %X", error);
if (_hasSound) {
alSourcePause(channel->source);
if ((error = alGetError()) != AL_NO_ERROR)
warning("OpenAL error while attempting to pause: %X", error);
}

channel->state = AL_PAUSED;
} else
Expand Down Expand Up @@ -625,13 +662,15 @@ void SoundManager::freeChannel(uint16 channel) {
if (c->disposeAfterUse)
delete c->stream;

// Delete the channel's OpenAL source
if (c->source)
alDeleteSources(1, &c->source);
if (_hasSound) {
// Delete the channel's OpenAL source
if (c->source)
alDeleteSources(1, &c->source);

// Delete the OpenAL buffers
for (std::list<ALuint>::iterator buffer = c->buffers.begin(); buffer != c->buffers.end(); ++buffer)
alDeleteBuffers(1, &*buffer);
// Delete the OpenAL buffers
for (std::list<ALuint>::iterator buffer = c->buffers.begin(); buffer != c->buffers.end(); ++buffer)
alDeleteBuffers(1, &*buffer);
}

// Remove the channel from the type list
if (c->typeIt != _types[c->type].list.end())
Expand Down
2 changes: 2 additions & 0 deletions src/sound/sound.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ class SoundManager : public Common::Singleton<SoundManager>, public Common::Thre

bool _ready; ///< Was the sound subsystem successfully initialized?

bool _hasSound; //< Do we have working sound output?

bool _hasMultiChannel; ///< Do we have the multi-channel extension?
ALenum _format51; ///< The value for the 5.1 multi-channel format.

Expand Down

0 comments on commit 3102fe7

Please sign in to comment.