Changeset 715 for code/branches/FICN/src/audio
- Timestamp:
- Dec 28, 2007, 11:33:10 PM (17 years ago)
- Location:
- code/branches/FICN/src/audio
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/audio/AudioBuffer.cc
r708 r715 30 30 namespace audio 31 31 { 32 AudioBuffer::AudioBuffer( orxonox::String fileName)32 AudioBuffer::AudioBuffer(std::string fileName) 33 33 { 34 34 // Load wav data into buffers. -
code/branches/FICN/src/audio/AudioBuffer.h
r708 r715 9 9 { 10 10 public: 11 AudioBuffer( orxonox::String fileName);11 AudioBuffer(std::string fileName); 12 12 ~AudioBuffer(); 13 13 private: … … 15 15 ALuint buffer; 16 16 // Identifier 17 orxonox::String name;17 std::string name; 18 18 // True if AL was able to load data 19 19 ALboolean loaded; -
code/branches/FICN/src/audio/AudioIncludes.h
r708 r715 1 1 #include <iostream> 2 2 #include <vector> 3 #include <string> 3 4 4 5 #include <AL/al.h> … … 11 12 12 13 #include "orxonox/core/Error.h" 13 #include "misc/String.h" -
code/branches/FICN/src/audio/AudioManager.cc
r708 r715 72 72 } 73 73 74 void AudioManager::ambientAdd( orxonox::String file)74 void AudioManager::ambientAdd(std::string file) 75 75 { 76 orxonox::String path = ambientPath + "/" + file + ".ogg";76 std::string path = ambientPath + "/" + file + ".ogg"; 77 77 AudioStream tmp(path); 78 78 tmp.open(); -
code/branches/FICN/src/audio/AudioManager.h
r708 r715 37 37 void update(); 38 38 39 void ambientAdd( orxonox::String file);39 void ambientAdd(std::string file); 40 40 void ambientStart(); 41 41 void ambientStop(); … … 49 49 50 50 51 orxonox::String ambientPath;51 std::string ambientPath; 52 52 53 53 // Vector containing all audio files -
code/branches/FICN/src/audio/AudioStream.cc
r712 r715 26 26 */ 27 27 28 #include <string> 28 29 29 30 #include "AudioStream.h" 30 #include "misc/String.h"31 31 #include "../orxonox/core/Debug.h" 32 32 33 33 namespace audio 34 34 { 35 AudioStream::AudioStream( orxonox::String path)35 AudioStream::AudioStream(std::string path) 36 36 { 37 37 this->path = path; … … 255 255 256 256 257 orxonox::String AudioStream::errorString(int code)257 std::string AudioStream::errorString(int code) 258 258 { 259 259 switch(code) 260 260 { 261 261 case OV_EREAD: 262 return orxonox::String("Read from media.");262 return std::string("Read from media."); 263 263 case OV_ENOTVORBIS: 264 return orxonox::String("Not Vorbis data.");264 return std::string("Not Vorbis data."); 265 265 case OV_EVERSION: 266 return orxonox::String("Vorbis version mismatch.");266 return std::string("Vorbis version mismatch."); 267 267 case OV_EBADHEADER: 268 return orxonox::String("Invalid Vorbis header.");268 return std::string("Invalid Vorbis header."); 269 269 case OV_EFAULT: 270 return orxonox::String("Internal logic fault (bug or heap/stack corruption.");270 return std::string("Internal logic fault (bug or heap/stack corruption."); 271 271 default: 272 return orxonox::String("Unknown Ogg error.");272 return std::string("Unknown Ogg error."); 273 273 } 274 274 } -
code/branches/FICN/src/audio/AudioStream.h
r708 r715 11 11 { 12 12 public: 13 AudioStream( orxonox::String path);13 AudioStream(std::string path); 14 14 void open(); 15 15 void release(); … … 24 24 void empty(); 25 25 void check(); 26 orxonox::String errorString(int code);26 std::string errorString(int code); 27 27 28 28 private: 29 orxonox::String path;29 std::string path; 30 30 31 31 FILE* oggFile;
Note: See TracChangeset
for help on using the changeset viewer.