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

keep a pointer to the OpenAL vendor and renderer for reference

Browse Source
This commit is contained in:
ehofman
2009-12-27 09:24:24 +01:00
committed by Tim Moore
parent c1246e8c4e
commit 4cc17a7f6e
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/soundmgr_openal.cxx
+10 -5
View File
@@ -69,7 +69,9 @@ SGSoundMgr::SGSoundMgr() :
_geod_pos(SGGeod::fromCart(SGVec3d::zeros())), _geod_pos(SGGeod::fromCart(SGVec3d::zeros())),
_velocity(SGVec3d::zeros()), _velocity(SGVec3d::zeros()),
_orientation(SGQuatd::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 defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
if (_alut_init == 0) { if (_alut_init == 0) {
@@ -158,10 +160,10 @@ void SGSoundMgr::init(const char *devname) {
else break; else break;
} }
string vendor = (const char *)alGetString(AL_VENDOR); _vendor = (const char *)alGetString(AL_VENDOR);
string renderer = (const char *)alGetString(AL_RENDERER); _renderer = (const char *)alGetString(AL_RENDERER);
if ( vendor != "OpenAL Community" || if ( _vendor != "OpenAL Community" ||
(renderer != "Software" && renderer != "OpenAL Sample Implementation") (_renderer != "Software" && _renderer != "OpenAL Sample Implementation")
) )
{ {
_bad_doppler = true; _bad_doppler = true;
@@ -220,6 +222,9 @@ void SGSoundMgr::stop() {
alcDestroyContext(_context); alcDestroyContext(_context);
alcCloseDevice(_device); alcCloseDevice(_device);
_context = NULL; _context = NULL;
_renderer = "unknown";
_vendor = "unknown";
} }
} }
simgear/sound/soundmgr_openal.hxx
+8
View File
@@ -289,6 +289,12 @@ public:
*/ */
vector<const char*> get_available_devices(); 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: private:
static int _alut_init; static int _alut_init;
@@ -321,6 +327,8 @@ private:
vector<ALuint> _sources_in_use; vector<ALuint> _sources_in_use;
bool _bad_doppler; bool _bad_doppler;
string _renderer;
string _vendor;
bool testForALError(string s); bool testForALError(string s);
bool testForALCError(string s); bool testForALCError(string s);