diff --git a/include/audio/AudioCore.hpp b/include/audio/AudioCore.hpp index e66181f..97f75d3 100644 --- a/include/audio/AudioCore.hpp +++ b/include/audio/AudioCore.hpp @@ -5,7 +5,7 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: AudioCore.hpp,v 1.13 2005/08/08 19:19:25 cozman Exp $ +// $Id: AudioCore.hpp,v 1.14 2005/10/15 04:57:19 cozman Exp $ #ifdef PHOTON_USE_OPENAL @@ -15,6 +15,11 @@ #include "AL/al.h" // This file depends on OpenAL #include "AL/alc.h" +// define ALchar if it isn't available +#ifndef ALchar +#define ALchar ALubyte +#endif + #include "util/VersionInfo.hpp" namespace photon diff --git a/src/audio/AudioCore.cpp b/src/audio/AudioCore.cpp index d1b470e..88ff413 100644 --- a/src/audio/AudioCore.cpp +++ b/src/audio/AudioCore.cpp @@ -5,7 +5,7 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: AudioCore.cpp,v 1.13 2005/08/08 21:39:41 cozman Exp $ +// $Id: AudioCore.cpp,v 1.14 2005/10/15 04:57:19 cozman Exp $ #ifdef PHOTON_USE_OPENAL @@ -99,13 +99,13 @@ util::VersionInfo AudioCore::initOpenAL(const std::string& deviceName) ALCdevice* device(0); ALCcontext* context(0); std::stringstream ss; // stream for parsing version - std::string junks; // junk string for parsing char junkc; // junk character for parsing - uint major,minor,patch; // version numbers + uint major,minor; // version numbers + std::string extra; // extra string for OpenAL extra info // obtain default device if no deviceName is set, otherwise use deviceName device = alcOpenDevice(deviceName.empty() ? 0 : - reinterpret_cast(deviceName.c_str()) ); + reinterpret_cast(deviceName.c_str()) ); if(device == 0) { @@ -131,17 +131,13 @@ util::VersionInfo AudioCore::initOpenAL(const std::string& deviceName) alListenerfv(AL_VELOCITY, posvel); alListenerfv(AL_ORIENTATION, ori); - // OpenAL needs a standard version string format badly + // format is major.minor extra-info ss << alGetString(AL_VERSION); -#if defined(linux) - ss >> major >> junkc >> minor >> junkc >> patch; -#else - ss >> junks >> major >> junkc >> minor; // format is "OpenAL 1.0" -#endif + ss >> major >> junkc >> minor >> extra; throwOpenALError("AudioCore::initOpenAL"); - return util::VersionInfo(major,minor,patch); + return util::VersionInfo(major,minor,0,extra); } }