Changeset 419 for code/branches

Timestamp:

Dec 5, 2007, 7:28:46 PM (17 years ago)

Author:

nicolape

Message:

We now have a nice backgroundsound playing

Location:

code/branches/FICN/src

Files:

• audio/AudioManager.cc (modified) (1 diff)
• audio/AudioManager.h (modified) (2 diffs)
• audio/AudioStream.cc (modified) (5 diffs)
• audio/CMakeLists.txt (modified) (2 diffs)
• orxonox/orxonox.cc (modified) (3 diffs)

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

@@ -5 +5 @@
         AudioManager::AudioManager()
         {
+                alutInit(NULL, 0);
+
+                bgSound.open("ambient3");
+                bgSound.display();
                 
+                if(!bgSound.playback())
+                {
+        std::cout << "Ogg refused to play.";
+                }
         }
                 
         AudioManager::~AudioManager()
         {
-                
+                bgSound.release();
+                alutExit();
+        }
+        
+        void AudioManager::update()
+        {
+                bgSound.update();
+    if(!bgSound.playing())
+    {
+        if(!bgSound.playback())
+            std::cout << "Ogg abruptly stopped.";
+        else
+            std::cout << "Ogg stream was interrupted.\n";
+    }
         }
         

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

@@ -6 +6 @@
 #include "AudioBuffer.h"
 #include "AudioSource.h"
+#include "AudioStream.h"
 
 namespace audio
@@ -12 +13 @@
         {
         public:
+
                 // Init audio 
                 AudioManager();
+
                 // Kill audio and set buffers, sources and memory free
                 ~AudioManager();
+
                 // Set listener position
                 void setPos(std::vector<float> newPosition);
+
                 // Set listener speed
                 void setSpeed(std::vector<float> newSpeed);
+
                 // Set listener orientation (first is direction
                 // the listener looks at, the second is the direction
                 // upwards the listener)
                 void setOri(std::vector<float> at, std::vector<float> up);
+
                 // Parses given xml string
                 void loadParams();
+
+                // Update
+                void update();
+
         private:
 
+                // Backgroundsound
+    AudioStream bgSound;
         
                 // Vector containing all audio files

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

@@ -4 +4 @@
 namespace audio
 {
-        void AudioStream::open(string path)
+        void AudioStream::open(std::string path)
         {
             int result;
@@ -61 +61 @@
         void AudioStream::display()
         {
-            cout
+            std::cout
                 << "version         " << vorbisInfo->version         << "\n"
                 << "channels        " << vorbisInfo->channels        << "\n"
@@ -73 +73 @@
                 
             for(int i = 0; i < vorbisComment->comments; i++)
-                cout << "   " << vorbisComment->user_comments[i] << "\n";
-                
-            cout << endl;
+                std::cout << "   " << vorbisComment->user_comments[i] << "\n";
+                
+            std::cout << std::endl;
         }
         
@@ -212 +212 @@
                     return std::string("Invalid Vorbis header.");
                 case OV_EFAULT:
-                    return string("Internal logic fault (bug or heap/stack corruption.");
+                    return std::string("Internal logic fault (bug or heap/stack corruption.");
                 default:
                     return std::string("Unknown Ogg error.");
@@ -218 +218 @@
         }
 }
+

code/branches/FICN/src/audio/CMakeLists.txt

@@ -6 +6 @@
         AudioBuffer.cc
         AudioSource.cc
-
+        AudioStream.cc
 )
 SET(INC_FILES 
@@ -12 +12 @@
         AudioBuffer.h
         AudioSource.h
+        AudioStream.h
 )
 

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

@@ -56 +56 @@
 SpaceshipSteering* steering;
 
+audio::AudioManager* auMan;
 
 // some tests to see if enet works without includsion
@@ -113 +114 @@
     bool frameStarted(const FrameEvent& evt)
     {
+    
+        auMan->update();
+    
       mKeyboard->capture();
       mMouse->capture();
@@ -281 +285 @@
       void createScene(void)
       {
-                audio::AudioManager* auMan = new audio::AudioManager();
+                                auMan = new audio::AudioManager();