Changeset 715 for code/branches/FICN/src/audio

Timestamp:

Dec 28, 2007, 11:33:10 PM (16 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

Location:

code/branches/FICN/src/audio

Files:

• AudioBuffer.cc (modified) (1 diff)
• AudioBuffer.h (modified) (2 diffs)
• AudioIncludes.h (modified) (2 diffs)
• AudioManager.cc (modified) (1 diff)
• AudioManager.h (modified) (2 diffs)
• AudioStream.cc (modified) (2 diffs)
• AudioStream.h (modified) (2 diffs)

code/branches/FICN/src/audio/AudioBuffer.cc

@@ -30 +30 @@
 namespace audio
 {
-        AudioBuffer::AudioBuffer(orxonox::String fileName)
+        AudioBuffer::AudioBuffer(std::string fileName)
         {
                 // Load wav data into buffers.

code/branches/FICN/src/audio/AudioBuffer.h

@@ -9 +9 @@
         {
         public:
-                AudioBuffer(orxonox::String fileName);
+                AudioBuffer(std::string fileName);
                 ~AudioBuffer();
         private:
@@ -15 +15 @@
                 ALuint buffer;
                 // Identifier
-                orxonox::String name;
+                std::string name;
                 // True if AL was able to load data
                 ALboolean loaded;

code/branches/FICN/src/audio/AudioIncludes.h

@@ -1 +1 @@
 #include <iostream>
 #include <vector>
+#include <string>
 
 #include <AL/al.h>
@@ -11 +12 @@
 
 #include "orxonox/core/Error.h"
-#include "misc/String.h"

code/branches/FICN/src/audio/AudioManager.cc

@@ -72 +72 @@
         }
 
-        void AudioManager::ambientAdd(orxonox::String file)
+        void AudioManager::ambientAdd(std::string file)
         {
-    orxonox::String path = ambientPath + "/" + file + ".ogg";
+    std::string path = ambientPath + "/" + file + ".ogg";
                 AudioStream tmp(path);
                 tmp.open();

code/branches/FICN/src/audio/AudioManager.h

@@ -37 +37 @@
                 void update();
 
-                void ambientAdd(orxonox::String file);
+                void ambientAdd(std::string file);
                 void ambientStart();
                 void ambientStop();
@@ -49 +49 @@
 
 
-                orxonox::String ambientPath;
+                std::string ambientPath;
         
                 // Vector containing all audio files

code/branches/FICN/src/audio/AudioStream.cc

@@ -26 +26 @@
  */
 
+#include <string>
 
 #include "AudioStream.h"
-#include "misc/String.h"
 #include "../orxonox/core/Debug.h"
 
 namespace audio
 {
-  AudioStream::AudioStream(orxonox::String path)
+  AudioStream::AudioStream(std::string path)
         {
                 this->path = path;
@@ -255 +255 @@
 
 
-        orxonox::String AudioStream::errorString(int code)
+        std::string AudioStream::errorString(int code)
         {
             switch(code)
             {
                 case OV_EREAD:
-                    return orxonox::String("Read from media.");
+                    return std::string("Read from media.");
                 case OV_ENOTVORBIS:
-                    return orxonox::String("Not Vorbis data.");
+                    return std::string("Not Vorbis data.");
                 case OV_EVERSION:
-                    return orxonox::String("Vorbis version mismatch.");
+                    return std::string("Vorbis version mismatch.");
                 case OV_EBADHEADER:
-                    return orxonox::String("Invalid Vorbis header.");
+                    return std::string("Invalid Vorbis header.");
                 case OV_EFAULT:
-                    return orxonox::String("Internal logic fault (bug or heap/stack corruption.");
+                    return std::string("Internal logic fault (bug or heap/stack corruption.");
                 default:
-                    return orxonox::String("Unknown Ogg error.");
+                    return std::string("Unknown Ogg error.");
             }
         }

code/branches/FICN/src/audio/AudioStream.h

@@ -11 +11 @@
   {
     public:
-      AudioStream(orxonox::String path);
+      AudioStream(std::string path);
       void open();
       void release();
@@ -24 +24 @@
       void empty();
       void check();
-      orxonox::String errorString(int code);
+      std::string errorString(int code);
 
     private:
-      orxonox::String path;
+      std::string path;
 
       FILE*           oggFile;