Changeset 1784 for code/trunk/src/audio/AudioManager.cc

Timestamp:

Sep 15, 2008, 10:54:25 AM (16 years ago)

Author:

rgrieder

Message:

• removed obsolete Convert.h includes (possibly from old XML loading)
• replaced tabs in audio library, plus minor code cleanup because removing the tabs screwed layout
• replaced all "#define name number" with "const Type name = number" if possible

File:

• code/trunk/src/audio/AudioManager.cc (modified) (1 diff)

code/trunk/src/audio/AudioManager.cc

@@ -30 +30 @@
 
 #include <cstdlib>
-
 #include <AL/alut.h>
 
+#include "util/Debug.h"
 #include "AudioBuffer.h"
 #include "AudioSource.h"
 #include "AudioStream.h"
-#include "util/Error.h"
-#include "util/Debug.h"
 
 namespace audio
 {
-        AudioManager::AudioManager()
-        {
-    ambientPath = "audio/ambient";
+    AudioManager::AudioManager()
+    {
+        ambientPath = "audio/ambient";
 
-    alutInit(NULL, 0);
+        alutInit(NULL, 0);
+    }
 
+    AudioManager::~AudioManager()
+    {
+        for (unsigned int i=0;i<bgSounds.size();i++)
+        {
+            bgSounds[i]->release();
+        }
+        alutExit();
+    }
 
-        }
+    void AudioManager::ambientStart()
+    {
+//              currentBgSound = 0;
+        if (bgSounds.size() > 0)
+        {
+            currentBgSound = rand() % bgSounds.size();
+            if(!bgSounds[currentBgSound]->playback())
+            {
+                COUT(2) << "AudioManager: Ogg refused to play." << std::endl;
+            }
+            else
+            {
+                COUT(3) << "Info: Started playing background sound" << std::endl;
+            }
+        }
+    }
 
-        AudioManager::~AudioManager()
-        {
-                for (unsigned int i=0;i<bgSounds.size();i++)
-                {
-                        bgSounds[i]->release();
-                }
-                alutExit();
-        }
+    void AudioManager::ambientStop()
+    {
+        COUT(3) << "Info: Stopped playing background sound" << std::endl;
+    }
 
-        void AudioManager::ambientStart()
-        {
-//              currentBgSound = 0;
-                if (bgSounds.size() > 0)
-                {
-      currentBgSound = rand() % bgSounds.size();
-                        if(!bgSounds[currentBgSound]->playback())
-                        {
-                orxonox::Error("Ogg refused to play.");
-                        }
-                        else
-                        {
-                                COUT(3) << "Info: Started playing background sound" << std::endl;
-                        }
-                }
-        }
+    void AudioManager::ambientAdd(std::string file)
+    {
+        std::string path = ambientPath + "/" + file + ".ogg";
+        AudioStream* tmp = new AudioStream(path);
+        tmp->open();
+        if (tmp->isLoaded())
+        {
+            bgSounds.push_back(tmp);
+            COUT(3) << "Info: Added background sound " << file << std::endl;
+        }
+    }
 
-        void AudioManager::ambientStop()
-        {
-                COUT(3) << "Info: Stopped playing background sound" << std::endl;
-        }
+    void AudioManager::tick(float dt)
+    {
+        if (bgSounds.size() > 0)
+        {
+            if (bgSounds[currentBgSound]->isLoaded())
+            {
+                bool playing = bgSounds[currentBgSound]->update();
+                if (!bgSounds[currentBgSound]->playing() && playing)
+                {
+                    if (!bgSounds[currentBgSound]->playback())
+                        COUT(2) << "AudioManager: Ogg abruptly stopped." << std::endl;
+                    else
+                        COUT(2) << "AudioManager: Ogg stream was interrupted." << std::endl;
 
-        void AudioManager::ambientAdd(std::string file)
-        {
-    std::string path = ambientPath + "/" + file + ".ogg";
-                AudioStream* tmp = new AudioStream(path);
-                tmp->open();
-                if (tmp->isLoaded())
-                {
-                        bgSounds.push_back(tmp);
-                        COUT(3) << "Info: Added background sound " << file << std::endl;
-                }
-        }
+                }
+                if (!playing)
+                {
+//                    if (currentBgSound < bgSounds.size()-1)
+//                    {
+//                        currentBgSound++;
+//                    }
+//                    else
+//                    {
+//                        currentBgSound=0;
+//                    }
+                    // switch to next sound in list/array
+                    currentBgSound = ++currentBgSound % bgSounds.size();
 
-        void AudioManager::tick(float dt)
-        {
-                if (bgSounds.size() > 0)
-                {
-                        if (bgSounds[currentBgSound]->isLoaded())
-                        {
-                                bool playing = bgSounds[currentBgSound]->update();
-                    if(!bgSounds[currentBgSound]->playing() && playing)
-                    {
-                        if(!bgSounds[currentBgSound]->playback())
-                            orxonox::Error("Ogg abruptly stopped.");
-                        else
-                            orxonox::Error("Ogg stream was interrupted.");
+                    if (!bgSounds[currentBgSound]->isLoaded())
+                    {
+                        bgSounds[currentBgSound]->release();
+                        bgSounds[currentBgSound]->open();
+                    }
+                    bgSounds[currentBgSound]->playback();
+                    COUT(3) << "Info: Playing next background sound" << std::endl;
+                }
+            }
+        }
+    }
 
-                    }
-                                if (!playing)
-                                {
-//                                      if (currentBgSound < bgSounds.size()-1)
-//                                      {
-//                                              currentBgSound++;
-//                                      }
-//                                      else
-//                                      {
-//                                              currentBgSound=0;
-//                                      }
-          // switch to next sound in list/array
-          currentBgSound = ++currentBgSound % bgSounds.size();
+    void AudioManager::setPos(std::vector<float> newPosition)
+    {
 
-                                        if (!bgSounds[currentBgSound]->isLoaded())
-                                        {
-                                                bgSounds[currentBgSound]->release();
-                                                bgSounds[currentBgSound]->open();
-                                        }
-                                        bgSounds[currentBgSound]->playback();
-                                        COUT(3) << "Info: Playing next background sound" << std::endl;
-                                }
-                        }
-                }
-        }
+    }
 
-        void AudioManager::setPos(std::vector<float> newPosition)
-        {
+    void AudioManager::setSpeed(std::vector<float> newSpeed)
+    {
 
-        }
+    }
 
-        void AudioManager::setSpeed(std::vector<float> newSpeed)
-        {
+    void AudioManager::setOri(std::vector<float> at, std::vector<float> up)
+    {
 
-        }
-
-        void AudioManager::setOri(std::vector<float> at, std::vector<float> up)
-        {
-
-        }
+    }
 }