Changeset 430

Timestamp:

Dec 5, 2007, 11:47:05 PM (16 years ago)

Author:

nicolape

Message:

We now have a background sound playlist

Location:

code/branches/FICN

Files:

• bin/audio/ambient/a1.ogg (added)
• bin/audio/ambient/a2.ogg (added)
• bin/audio/ambient/a3.ogg (added)
• src/audio/AudioManager.cc (modified) (2 diffs)
• src/audio/AudioManager.h (modified) (1 diff)
• src/audio/AudioStream.cc (modified) (4 diffs)
• src/audio/AudioStream.h (modified) (2 diffs)
• src/orxonox/orxonox.cc (modified) (1 diff)

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

@@ -1 +1 @@
 #include "AudioManager.h"
+
+
 
 namespace audio
@@ -5 +7 @@
         AudioManager::AudioManager()
         {
+                ambientPath = "audio/ambient";
+
                 alutInit(NULL, 0);
-
-                bgSound.open("ambient1");
+                
+            
 
 
 
-                bgSound.display();
-
-                if(!bgSound.playback())
-                {
-        orxonox::Error("Ogg refused to play.");
-                }
         }
                 
         AudioManager::~AudioManager()
         {
-                bgSound.release();
+                for (unsigned int i=0;i<=bgSounds.size();i++)
+                {
+                        bgSounds[i].release();  
+                }
                 alutExit();
+        }
+
+        void AudioManager::ambientStart()
+        {
+                currentBgSound = 0;
+                if (bgSounds.size() > 0)
+                {
+                        if(!bgSounds[currentBgSound].playback())
+                        {
+                orxonox::Error("Ogg refused to play.");
+                        }
+                        else
+                        {
+                                std::cout << "Started playing background sound"<<std::endl;
+                        }
+                }
+
+        }
+
+        void AudioManager::ambientStop()
+        {
+                std::cout << "Stopped playing background sound"<<std::endl;
+        }       
+
+        void AudioManager::ambientAdd(std::string file)
+        {
+    std::string path = ambientPath + "/" + file + ".ogg"; 
+                AudioStream tmp(path);
+                tmp.open();
+                if (tmp.isLoaded())
+                {
+                        bgSounds.push_back(tmp);        
+                        std::cout << "Added background sound "<<file<<std::endl;
+                }
         }
         
         void AudioManager::update()
         {
-                
-                if (bgSound.isLoaded())
+                if (bgSounds.size() > 0)
                 {
-                        bgSound.update();
-            if(!bgSound.playing())
-            {
-                if(!bgSound.playback())
-                    orxonox::Error("Ogg abruptly stopped.");
-                else
-                    orxonox::Error("Ogg stream was interrupted.");
-            }
+                        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 (!playing)
+                                {
+                                        if (currentBgSound < bgSounds.size()-1)
+                                        {
+                                                currentBgSound++;
+                                        }
+                                        else
+                                        {
+                                                currentBgSound=0;
+                                        }
+                                        if (!bgSounds[currentBgSound].isLoaded())
+                                        {
+                                                bgSounds[currentBgSound].release();
+                                                bgSounds[currentBgSound].open();
+                                        }
+                                        bgSounds[currentBgSound].playback();
+                                        std::cout << "Playing next background sound "<<std::endl;
+                                }
+                        }
                 }
         }

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

@@ -37 +37 @@
                 void update();
 
+                void ambientAdd(std::string file);
+                void ambientStart();
+                void ambientStop();
+
         private:
 
-                // Backgroundsound
-    AudioStream bgSound;
+                // Background sound
+    std::vector<AudioStream> bgSounds;
+                int currentBgSound;
+
+
+
+                std::string ambientPath;
         
                 // Vector containing all audio files

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

@@ -4 +4 @@
 namespace audio
 {
-        void AudioStream::open(std::string path)
+        AudioStream::AudioStream(std::string path)
+        {
+                this->path = path;
+                loaded = false;
+        }       
+
+        void AudioStream::open()
         {
             int result;
-                        loaded = false;
-            
-
-            path = "audio/ambient/" + path + ".ogg"; 
+
             
             if(!(oggFile = fopen(path.c_str(), "rb")))
@@ -53 +56 @@
         void AudioStream::release()
         {
-                if (loaded)
-                {
+
             alSourceStop(source);
             empty();
@@ -64 +66 @@
             ov_clear(&oggStream);
                         loaded = false;
-                }
+                
         }
         
@@ -155 +157 @@
             }
         
+                        if (active==false)
+                        {
+                                loaded = false;
+                        }
             return active;
         }

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

@@ -7 +7 @@
 {
         #define BUFFER_SIZE (4096 * 4)
-        #define STREAM_FILES_DIR "audio/ambient"
         
         class AudioStream
         {
             public:
-        
-                void open(std::string path);
+                                        AudioStream(std::string path);
+                void open();
                 void release();
                 void display();
@@ -30 +29 @@
             private:
         
+                                        std::string path;
+
                 FILE*           oggFile;
                 OggVorbis_File  oggStream;

code/branches/FICN/src/orxonox/orxonox.cc

@@ -287 +287 @@
                                 auMan = new audio::AudioManager();
 
+                                auMan->ambientAdd("a1");
+                                auMan->ambientAdd("a2");
+                                auMan->ambientAdd("a3");
+                                //auMan->ambientAdd("ambient1");
+                                auMan->ambientStart();
 
       string levelFile = "sp_level_moonstation.oxw";