Changeset 1064 for code/trunk/src/audio

Timestamp:

Apr 14, 2008, 9:39:57 PM (17 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

Location:

code/trunk/src/audio

Files:

• AudioManager.cc (modified) (6 diffs)
• AudioManager.h (modified) (3 diffs)
• AudioPrereqs.h (modified) (1 diff)
• AudioStream.cc (modified) (1 diff)

code/trunk/src/audio/AudioManager.cc

@@ -31 +31 @@
 #include <AL/alut.h>
 
+#include "AudioBuffer.h"
+#include "AudioSource.h"
+#include "AudioStream.h"
 #include "core/Error.h"
 #include "core/Debug.h"
@@ -49 +52 @@
                 for (unsigned int i=0;i<bgSounds.size();i++)
                 {
-                        bgSounds[i].release();
+                        bgSounds[i]->release();
                 }
                 alutExit();
@@ -60 +63 @@
                 if (bgSounds.size() > 0)
                 {
-                        if(!bgSounds[currentBgSound].playback())
+                        if(!bgSounds[currentBgSound]->playback())
                         {
                 orxonox::Error("Ogg refused to play.");
@@ -80 +83 @@
         {
     std::string path = ambientPath + "/" + file + ".ogg";
-                AudioStream tmp(path);
-                tmp.open();
-                if (tmp.isLoaded())
+                AudioStream* tmp = new AudioStream(path);
+                tmp->open();
+                if (tmp->isLoaded())
                 {
                         bgSounds.push_back(tmp);
@@ -93 +96 @@
                 if (bgSounds.size() > 0)
                 {
-                        if (bgSounds[currentBgSound].isLoaded())
+                        if (bgSounds[currentBgSound]->isLoaded())
                         {
-                                bool playing = bgSounds[currentBgSound].update();
-                    if(!bgSounds[currentBgSound].playing() && playing)
+                                bool playing = bgSounds[currentBgSound]->update();
+                    if(!bgSounds[currentBgSound]->playing() && playing)
                     {
-                        if(!bgSounds[currentBgSound].playback())
+                        if(!bgSounds[currentBgSound]->playback())
                             orxonox::Error("Ogg abruptly stopped.");
                         else
@@ -117 +120 @@
           currentBgSound = ++currentBgSound % bgSounds.size();
 
-                                        if (!bgSounds[currentBgSound].isLoaded())
+                                        if (!bgSounds[currentBgSound]->isLoaded())
                                         {
-                                                bgSounds[currentBgSound].release();
-                                                bgSounds[currentBgSound].open();
+                                                bgSounds[currentBgSound]->release();
+                                                bgSounds[currentBgSound]->open();
                                         }
-                                        bgSounds[currentBgSound].playback();
+                                        bgSounds[currentBgSound]->playback();
                                         COUT(3) << "Info: Playing next background sound" << std::endl;
                                 }

code/trunk/src/audio/AudioManager.h

@@ -36 +36 @@
 
 #include "core/Tickable.h"
-#include "AudioBuffer.h"
-#include "AudioSource.h"
-#include "AudioStream.h"
 
 namespace audio
@@ -76 +73 @@
 
                 // Background sound
-    std::vector<AudioStream> bgSounds;
+    std::vector<AudioStream*> bgSounds;
                 int currentBgSound;
 
@@ -84 +81 @@
 
                 // Vector containing all audio files
-                std::vector<AudioBuffer> buffers;
+                std::vector<AudioBuffer*> buffers;
                 // Vector containing all audio sources which referer to one buffer
-                std::vector<AudioSource> sources;
+                std::vector<AudioSource*> sources;
                 // The ambient background sound
-                AudioSource ambient;
+                AudioSource* ambient;
 
                 std::vector<float> listenerPosition;

code/trunk/src/audio/AudioPrereqs.h

@@ -68 +68 @@
 }
 
+//-----------------------------------------------------------------------
+// Warnings
+//-----------------------------------------------------------------------
+// set to 4: conversion from 'ogg_int64_t' to 'long', possible loss of data
+# pragma warning (4 : 4244)
+
+
 #endif /* _AudioPrereqs_H__ */

code/trunk/src/audio/AudioStream.cc

@@ -43 +43 @@
             int result;
 
-
-            if(!(oggFile = fopen(path.c_str(), "rb")))
+      oggFile = fopen(path.c_str(), "rb");
+            if(!oggFile)
                         {
                 orxonox::Error("Could not open Ogg file "+path);