X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fsoundmgr_openal.cxx;h=97a1f05c4ff6e9c42606b9911f1a424b7721e0aa;hb=40fc2907a153093f830994519fc6ada40e21ae49;hp=05651b75964f706b1e2ce6bab031f4cdbd0dc54c;hpb=dca07c5634604c18213d08b688e894de354ea335;p=simgear.git diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx index 05651b75..97a1f05c 100644 --- a/simgear/sound/soundmgr_openal.cxx +++ b/simgear/sound/soundmgr_openal.cxx @@ -30,13 +30,14 @@ #endif #if defined( __APPLE__ ) -# include +# include #else # include #endif #include #include +#include #include "soundmgr_openal.hxx" @@ -45,10 +46,18 @@ #include #include +using std::string; +using std::vector; + extern bool isNaN(float *v); #define MAX_SOURCES 128 + +#ifndef ALC_ALL_DEVICES_SPECIFIER +# define ALC_ALL_DEVICES_SPECIFIER 0x1013 +#endif + // // Sound Manager // @@ -69,7 +78,9 @@ SGSoundMgr::SGSoundMgr() : _geod_pos(SGGeod::fromCart(SGVec3d::zeros())), _velocity(SGVec3d::zeros()), _orientation(SGQuatd::zeros()), - _bad_doppler(false) + _bad_doppler(false), + _renderer("unknown"), + _vendor("unknown") { #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1 if (_alut_init == 0) { @@ -79,6 +90,8 @@ SGSoundMgr::SGSoundMgr() : } } _alut_init++; +#else + //#error ALUT 1.1 required, ALUT 1.0 is no longer supported, please upgrade #endif } @@ -108,7 +121,9 @@ void SGSoundMgr::init(const char *devname) { } } + _device = device; ALCcontext *context = alcCreateContext(device, NULL); + testForALCError("context creation."); if ( testForError(context, "Unable to create a valid context.") ) { alcCloseDevice (device); return; @@ -158,12 +173,13 @@ void SGSoundMgr::init(const char *devname) { else break; } - string vendor = (const char *)alGetString(AL_VENDOR); - string renderer = (const char *)alGetString(AL_RENDERER); - if ( vendor != "OpenAL Community" || - (renderer != "Software" && renderer != "OpenAL Sample Implementation") - ) - { + _vendor = (const char *)alGetString(AL_VENDOR); + _renderer = (const char *)alGetString(AL_RENDERER); + + if (_vendor == "Creative Labs Inc.") { + _bad_doppler = true; + + } else if (_vendor == "OpenAL Community" && _renderer == "OpenAL Soft") { _bad_doppler = true; } @@ -220,6 +236,9 @@ void SGSoundMgr::stop() { alcDestroyContext(_context); alcCloseDevice(_device); _context = NULL; + + _renderer = "unknown"; + _vendor = "unknown"; } } @@ -420,11 +439,12 @@ void SGSoundMgr::release_source( unsigned int source ) ALint result; alGetSourcei( source, AL_SOURCE_STATE, &result ); - if ( result == AL_PLAYING ) + if ( result == AL_PLAYING ) { alSourceStop( source ); - testForALError("release source"); + } - alSourcei( source, AL_BUFFER, 0 ); + alSourcei( source, AL_BUFFER, 0 ); // detach the associated buffer + testForALError("release_source"); _free_sources.push_back( source ); _sources_in_use.erase( it ); } @@ -452,17 +472,23 @@ unsigned int SGSoundMgr::request_buffer(SGSoundSample *sample) if ( sample->is_file() ) { int freq, format; size_t size; - bool res; - - res = load(sample_name, &sample_data, &format, &size, &freq); - if (res == false) return buffer; + try { + bool res = load(sample_name, &sample_data, &format, &size, &freq); + if (res == false) return NO_BUFFER; + } catch (sg_exception& e) { + SG_LOG(SG_GENERAL, SG_ALERT, + "failed to load sound buffer:" << e.getFormattedMessage()); + return NO_BUFFER; + } + sample->set_frequency( freq ); sample->set_format( format ); sample->set_size( size ); - } - else + + } else { sample_data = sample->get_data(); + } // create an OpenAL buffer handle alGenBuffers(1, &buffer); @@ -474,37 +500,40 @@ unsigned int SGSoundMgr::request_buffer(SGSoundSample *sample) ALsizei freq = sample->get_frequency(); alBufferData( buffer, format, sample_data, size, freq ); - if ( sample->is_file() ) free(sample_data); - if ( !testForALError("buffer add data") ) { sample->set_buffer(buffer); _buffers[sample_name] = refUint(buffer); } } + + if ( sample->is_file() ) free(sample_data); } else { buffer = sample->get_buffer(); -} + } return buffer; } void SGSoundMgr::release_buffer(SGSoundSample *sample) { - string sample_name = sample->get_sample_name(); - buffer_map_iterator buffer_it = _buffers.find( sample_name ); - if ( buffer_it == _buffers.end() ) { - // buffer was not found - return; - } + if ( !sample->is_queue() ) + { + string sample_name = sample->get_sample_name(); + buffer_map_iterator buffer_it = _buffers.find( sample_name ); + if ( buffer_it == _buffers.end() ) { + // buffer was not found + return; + } - sample->no_valid_buffer(); - buffer_it->second.refctr--; - if (buffer_it->second.refctr == 0) { - ALuint buffer = buffer_it->second.id; - alDeleteBuffers(1, &buffer); - _buffers.erase( buffer_it ); - testForALError("release buffer"); + sample->no_valid_buffer(); + buffer_it->second.refctr--; + if (buffer_it->second.refctr == 0) { + ALuint buffer = buffer_it->second.id; + alDeleteBuffers(1, &buffer); + _buffers.erase( buffer_it ); + testForALError("release buffer"); + } } } @@ -529,10 +558,7 @@ void SGSoundMgr::update_pos_and_orientation() { _at_up_vec[4] = sgv_up[1]; _at_up_vec[5] = sgv_up[2]; - // static const SGQuatd q(-0.5, -0.5, 0.5, 0.5); - // SGQuatd hlOr = SGQuatd::fromLonLat(SGGeod::fromCart(_base_pos)); - // SGQuatd ec2body = hlOr*_orientation; - _absolute_pos = _base_pos; // + ec2body.backTransform( _offset_pos ); + _absolute_pos = _base_pos; } bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt, @@ -547,12 +573,15 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt, #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1 ALfloat freqf; + // ignore previous errors to prevent the system from halting on silly errors + alGetError(); + alcGetError(_device); data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf ); freq = (ALsizei)freqf; - if (data == NULL) { - int error = alutGetError(); + int error = alutGetError(); + if (data == NULL || error != ALUT_ERROR_NO_ERROR) { string msg = "Failed to load wav file: "; - msg.append(alutGetErrorString(error)); + msg.append(alutGetErrorString(error)); throw sg_io_exception(msg.c_str(), sg_location(samplepath)); return false; } @@ -568,12 +597,27 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt, ALenum error = alGetError(); if ( error != AL_NO_ERROR ) { string msg = "Failed to load wav file: "; - msg.append(alGetString(error)); + const ALchar *errorString = alGetString(error); + if (errorString) { + msg.append(errorString); + } else { + // alGetString returns NULL when an unexpected or OS specific error + // occurs: e.g. -43 on Mac when file is not found. + // In this case, alGetString() sets 'Invalid Enum' error, so + // showing with the original error number is helpful. + stringstream ss; + ss << alGetString(alGetError()) << "(" << error << ")"; + msg.append(ss.str()); + } throw sg_io_exception(msg.c_str(), sg_location(samplepath)); return false; } #endif + if (format == AL_FORMAT_STEREO8 || format == AL_FORMAT_STEREO16) { + throw sg_io_exception("Warning: STEREO files are not supported for 3D audio effects: " + samplepath); + } + *dbuf = (void *)data; *fmt = (int)format; *sz = (size_t)size;