jpt-archive/cpp_photon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenAL 1.0/1.1 issues

Browse Source
This commit is contained in:
James Turk 2005-10-15 04:57:19 +00:00
parent d8751e1d71
commit 39280103f6
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/audio/AudioCore.hpp
View File

@ -5,7 +5,7 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 #ifdef PHOTON_USE_OPENAL
@ -15,6 +15,11 @@
#include "AL/al.h" // This file depends on OpenAL #include "AL/al.h" // This file depends on OpenAL
#include "AL/alc.h" #include "AL/alc.h"
// define ALchar if it isn't available
#ifndef ALchar
#define ALchar ALubyte
#endif
#include "util/VersionInfo.hpp" #include "util/VersionInfo.hpp"
namespace photon namespace photon

18
src/audio/AudioCore.cpp
View File

@ -5,7 +5,7 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // 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 #ifdef PHOTON_USE_OPENAL
@ -99,13 +99,13 @@ util::VersionInfo AudioCore::initOpenAL(const std::string& deviceName)
ALCdevice* device(0); ALCdevice* device(0);
ALCcontext* context(0); ALCcontext* context(0);
std::stringstream ss; // stream for parsing version std::stringstream ss; // stream for parsing version
std::string junks; // junk string for parsing
char junkc; // junk character 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 // obtain default device if no deviceName is set, otherwise use deviceName
device = alcOpenDevice(deviceName.empty() ? 0 : device = alcOpenDevice(deviceName.empty() ? 0 :
reinterpret_cast<const ALubyte*>(deviceName.c_str()) ); reinterpret_cast<const ALchar*>(deviceName.c_str()) );
if(device == 0) if(device == 0)
{ {
@ -131,17 +131,13 @@ util::VersionInfo AudioCore::initOpenAL(const std::string& deviceName)
alListenerfv(AL_VELOCITY, posvel); alListenerfv(AL_VELOCITY, posvel);
alListenerfv(AL_ORIENTATION, ori); alListenerfv(AL_ORIENTATION, ori);
// OpenAL needs a standard version string format badly // format is major.minor extra-info
ss << alGetString(AL_VERSION); ss << alGetString(AL_VERSION);
#if defined(linux) ss >> major >> junkc >> minor >> extra;
ss >> major >> junkc >> minor >> junkc >> patch;
#else
ss >> junks >> major >> junkc >> minor; // format is "OpenAL 1.0"
#endif
throwOpenALError("AudioCore::initOpenAL"); throwOpenALError("AudioCore::initOpenAL");
return util::VersionInfo(major,minor,patch); return util::VersionInfo(major,minor,0,extra);
} }
} }