Changeset 458 for code/branches/FICN/src/audio/AudioManager.cc

Timestamp:

Dec 11, 2007, 11:29:16 PM (16 years ago)

Author:

nicolasc

Message:

• removed setupCEGUI as it is not used nor does it work
• some minor changes in audio

File:

• code/branches/FICN/src/audio/AudioManager.cc (modified) (4 diffs)

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

@@ -7 +7 @@
         AudioManager::AudioManager()
         {
-                ambientPath = "audio/ambient";
+    ambientPath = "audio/ambient";
 
-                alutInit(NULL, 0);
-                
-            
-
+    alutInit(NULL, 0);
 
 
         }
-                
+
         AudioManager::~AudioManager()
         {
                 for (unsigned int i=0;i<=bgSounds.size();i++)
                 {
-                        bgSounds[i].release();  
+                        bgSounds[i].release();
                 }
                 alutExit();
@@ -46 +43 @@
         {
                 std::cout << "Stopped playing background sound"<<std::endl;
-        }       
+        }
 
         void AudioManager::ambientAdd(std::string file)
         {
-    std::string path = ambientPath + "/" + file + ".ogg"; 
+    std::string path = ambientPath + "/" + file + ".ogg";
                 AudioStream tmp(path);
                 tmp.open();
                 if (tmp.isLoaded())
                 {
-                        bgSounds.push_back(tmp);        
+                        bgSounds.push_back(tmp);
                         std::cout << "Added background sound "<<file<<std::endl;
                 }
         }
-        
+
         void AudioManager::update()
         {
@@ -77 +74 @@
                                 if (!playing)
                                 {
-                                        if (currentBgSound < bgSounds.size()-1)
-                                        {
-                                                currentBgSound++;
-                                        }
-                                        else
-                                        {
-                                                currentBgSound=0;
-                                        }
+//                                      if (currentBgSound < bgSounds.size()-1)
+//                                      {
+//                                              currentBgSound++;
+//                                      }
+//                                      else
+//                                      {
+//                                              currentBgSound=0;
+//                                      }
+          // switch to next sound in list/array
+          currentBgSound = ++currentBgSound % bgSounds.size();
+
                                         if (!bgSounds[currentBgSound].isLoaded())
                                         {
@@ -96 +96 @@
                 }
         }
-        
+
         void AudioManager::setPos(std::vector<float> newPosition)
         {
-                
+
         }
 
         void AudioManager::setSpeed(std::vector<float> newSpeed)
         {
-                
+
         }
 
         void AudioManager::setOri(std::vector<float> at, std::vector<float> up)
         {
-                
+
         }
 }