Changeset 8284 for code/branches/kicklib2/src/orxonox/sound
- Timestamp:
- Apr 21, 2011, 6:58:23 PM (14 years ago)
- Location:
- code/branches/kicklib2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib2
- Property svn:mergeinfo changed
-
code/branches/kicklib2/src/orxonox/sound/AmbientSound.cc
r8079 r8284 42 42 43 43 // Ambient sounds always fade in 44 this->setVolume(0 );44 this->setVolume(0.0f); 45 45 } 46 46 -
code/branches/kicklib2/src/orxonox/sound/SoundBuffer.cc
r6502 r8284 30 30 #include "SoundBuffer.h" 31 31 32 #include < AL/alut.h>32 #include <alut.h> 33 33 #include <vorbis/vorbisfile.h> 34 34 -
code/branches/kicklib2/src/orxonox/sound/SoundManager.cc
r7858 r8284 31 31 #include "SoundManager.h" 32 32 33 #include <AL/alut.h>34 33 #include <utility> 34 #include <alut.h> 35 35 #include <loki/ScopeGuard.h> 36 36 … … 73 73 this->bDestructorCalled_ = false; 74 74 75 // Clear error messages (might be problematic on some systems) 76 alGetError(); 77 alutGetError(); 78 75 79 // See whether we even want to load 76 80 bool bDisableSound_ = false; … … 78 82 if (bDisableSound_) 79 83 ThrowException(InitialisationAborted, "Sound: Not loading at all"); 80 81 84 if (!alutInitWithoutContext(NULL, NULL)) 82 85 ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError())); -
code/branches/kicklib2/src/orxonox/sound/WorldSound.cc
r7284 r8284 30 30 #include "WorldSound.h" 31 31 32 #include <AL/alut.h> 32 #include <alut.h> 33 33 34 #include "util/Math.h" 34 35 #include "core/CoreIncludes.h"
Note: See TracChangeset
for help on using the changeset viewer.