FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehofman/sound'

Browse Source
This commit is contained in:
Tim Moore 2010-01-13 07:57:35 +01:00
commit 430c60ed1a
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
simgear/sound/soundmgr_openal.cxx
View File

@ -69,7 +69,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) {
@ -158,10 +160,10 @@ 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 != "OpenAL Community" ||
(_renderer != "Software" && _renderer != "OpenAL Sample Implementation")
)
{
_bad_doppler = true;
@ -220,6 +222,9 @@ void SGSoundMgr::stop() {
alcDestroyContext(_context);
alcCloseDevice(_device);
_context = NULL;
_renderer = "unknown";
_vendor = "unknown";
}
}
@ -549,8 +554,8 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
ALfloat freqf;
data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf );
freq = (ALsizei)freqf;
if (data == NULL) {
int error = alutGetError();
if (data == NULL || error != ALUT_ERROR_NO_ERROR) {
string msg = "Failed to load wav file: ";
msg.append(alutGetErrorString(error));
throw sg_io_exception(msg.c_str(), sg_location(samplepath));
@ -568,7 +573,18 @@ 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;
}

8
simgear/sound/soundmgr_openal.hxx
View File

@ -289,6 +289,12 @@ public:
*/
vector<const char*> get_available_devices();
/**
* Get the current OpenAL vendor or rendering backend.
*/
const string& get_vendor() { return _vendor; }
const string& get_renderer() { return _renderer; }
private:
static int _alut_init;
@ -321,6 +327,8 @@ private:
vector<ALuint> _sources_in_use;
bool _bad_doppler;
string _renderer;
string _vendor;
bool testForALError(string s);
bool testForALCError(string s);