Changeset 3196 for code/trunk/src/orxonox/sound/SoundBase.h
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/sound/SoundBase.h
r3078 r3196 26 26 * 27 27 */ 28 #ifndef _SOUNDBASE_H__ 29 #define _SOUNDBASE_H__ 30 31 #include <AL/al.h> 32 #include <string> 28 #ifndef _SoundBase_H__ 29 #define _SoundBase_H__ 33 30 34 31 #include "OrxonoxPrereqs.h" 32 #include <cstring> // define NULL 35 33 36 34 namespace orxonox … … 60 58 61 59 private: 62 ALuint loadOggFile( std::stringfilename);60 ALuint loadOggFile(const std::string& filename); 63 61 ALuint source_; 64 62 ALuint buffer_; … … 66 64 67 65 ALint getSourceState(); 68 69 static SoundManager* soundmanager_s;70 66 }; // class SoundBase 71 67 } // namepsace orxonox 72 68 73 #endif / / _SOUNDBASE_H__69 #endif /* _SoundBase_H__ */
Note: See TracChangeset
for help on using the changeset viewer.