Changeset 712 for code/branches

Timestamp:

Dec 28, 2007, 11:09:24 PM (17 years ago)

Author:

rgrieder

Message:

• blubb

File:

• code/branches/FICN/src/audio/AudioStream.cc (modified) (2 diffs)

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

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