Changeset 711

Timestamp:

Dec 28, 2007, 11:06:47 PM (16 years ago)

Author:

rgrieder

Message:

• removed attempt to fix audio on windows

File:

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

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