- Timestamp:
- Mar 1, 2011, 5:10:29 AM (13 years ago)
- Location:
- code/branches/usability
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/usability
- Property svn:mergeinfo changed
/code/branches/sound4 (added) merged: 6435,6476,6504 /code/branches/sound5 (added) merged: 6505-6511,6562,6674,6726,6729-6730,6733,6767,6769,6931,6962,7720
- Property svn:mergeinfo changed
-
code/branches/usability/src/orxonox/sound/SoundStreamer.h
r7163 r8005 29 29 #define _SoundStreamer_H__ 30 30 31 #include " OrxonoxPrereqs.h"31 #include "sound/SoundPrereqs.h" 32 32 33 33 #include <string> 34 #include <vorbis/vorbisfile.h> 34 35 #include <OgreDataStream.h> 35 36 #include "core/CorePrereqs.h" … … 40 41 { 41 42 public: 42 void operator()(ALuint audioSource, DataStreamPtr dataStream );43 void operator()(ALuint audioSource, DataStreamPtr dataStream, OggVorbis_File* vf, int current_section); 43 44 }; 44 45 }
Note: See TracChangeset
for help on using the changeset viewer.