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

Timestamp:

Dec 28, 2007, 10:30:29 PM (17 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

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) (2 diffs)
• AudioManager.h (modified) (2 diffs)
• AudioStream.cc (modified) (3 diffs)
• AudioStream.h (modified) (2 diffs)

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

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

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

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

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

@@ -1 +1 @@
 #include <iostream>
-#include <string>
 #include <vector>
 
@@ -11 +10 @@
 #include <vorbis/vorbisfile.h>
 
-#include "../orxonox/core/Error.h"
+#include "orxonox/core/Error.h"
+#include "misc/String.h"

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

@@ -27 +27 @@
 
 #include "AudioManager.h"
-#include "../orxonox/core/Debug.h"
+#include "orxonox/core/Debug.h"
 
 namespace audio
@@ -72 +72 @@
         }
 
-        void AudioManager::ambientAdd(std::string file)
+        void AudioManager::ambientAdd(orxonox::String file)
         {
-    std::string path = ambientPath + "/" + file + ".ogg";
+    orxonox::String path = ambientPath + "/" + file + ".ogg";
                 AudioStream tmp(path);
                 tmp.open();

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

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

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

@@ -28 +28 @@
 
 #include "AudioStream.h"
-#include "../orxonox/core/Debug.h"
+#include "orxonox/core/Debug.h"
 
 namespace audio
 {
-        AudioStream::AudioStream(std::string path)
+        AudioStream::AudioStream(orxonox::String path)
         {
                 this->path = path;
@@ -40 +40 @@
         void AudioStream::open()
         {
-            int result;
-
-
-            if(!(oggFile = fopen(path.c_str(), "rb")))
+            //int result;
+      errno_t result;
+
+
+            if(fopen_s(&oggFile, path.c_str(), "rb"))
                         {
                 orxonox::Error("Could not open Ogg file "+path);
                                 return;
                         }
-
-            if((result = ov_open(oggFile, &oggStream, NULL, 0)) < 0)
+      else
+      {
+        COUT(4) << "Opened Ogg file" << path << std::endl;
+      }
+
+            /*if((result = ov_open(oggFile, &oggStream, NULL, 0)) < 0)
             {
         fclose(oggFile);
               orxonox::Error("Could not open Ogg stream. " + errorString(result));
                                 return;
-            }
+            }*/
 
                         loaded = true;
@@ -254 +259 @@
 
 
-        std::string AudioStream::errorString(int code)
+        orxonox::String AudioStream::errorString(int code)
         {
             switch(code)
             {
                 case OV_EREAD:
-                    return std::string("Read from media.");
+                    return orxonox::String("Read from media.");
                 case OV_ENOTVORBIS:
-                    return std::string("Not Vorbis data.");
+                    return orxonox::String("Not Vorbis data.");
                 case OV_EVERSION:
-                    return std::string("Vorbis version mismatch.");
+                    return orxonox::String("Vorbis version mismatch.");
                 case OV_EBADHEADER:
-                    return std::string("Invalid Vorbis header.");
+                    return orxonox::String("Invalid Vorbis header.");
                 case OV_EFAULT:
-                    return std::string("Internal logic fault (bug or heap/stack corruption.");
+                    return orxonox::String("Internal logic fault (bug or heap/stack corruption.");
                 default:
-                    return std::string("Unknown Ogg error.");
+                    return orxonox::String("Unknown Ogg error.");
             }
         }

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

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