Changeset 2967 for code/branches/sound/src/orxonox/sound/SoundBase.cc
- Timestamp:
- May 11, 2009, 3:29:23 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/sound/src/orxonox/sound/SoundBase.cc
r2966 r2967 26 26 * 27 27 */ 28 #include <AL/alut.h> 29 #include <vorbis/vorbisfile.h> 28 30 29 31 #include "orxonox/objects/worldentities/WorldEntity.h" … … 128 130 129 131 bool SoundBase::loadFile(std::string filename) { 132 filename = Core::getMediaPathString() + "/audio/" + filename; 130 133 COUT(3) << "OpenAL ALUT: loading file " << filename << std::endl; 131 134 this->buffer_ = alutCreateBufferFromFile(filename.c_str()); 132 135 if(this->buffer_ == AL_NONE) { 133 136 COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl; 134 return false; 137 if(filename.find("ogg", 0) != string::npos) 138 { 139 this->buffer_ = loadOggFile(filename); 140 } 141 142 if(this->buffer_ == AL_NONE) 143 return false; 135 144 } 136 145 … … 149 158 return state; 150 159 } 160 161 ALuint SoundBase::loadOggFile(std::string filename) 162 { 163 // just a dummy 164 return AL_NONE; 165 } 151 166 } // namespace: orxonox
Note: See TracChangeset
for help on using the changeset viewer.