Changeset 1021 for code/trunk/src/audio

Timestamp:

Apr 10, 2008, 5:03:34 PM (17 years ago)

Author:

bknecht

Message:

merged back that script-branch

Location:

code/trunk/src/audio

Files:

• AudioManager.cc (modified) (2 diffs)
• AudioManager.h (modified) (3 diffs)

code/trunk/src/audio/AudioManager.cc

@@ -42 +42 @@
         AudioManager::~AudioManager()
         {
-                for (unsigned int i=0;i<=bgSounds.size();i++)
+                for (unsigned int i=0;i<bgSounds.size();i++)
                 {
                         bgSounds[i].release();
@@ -84 +84 @@
         }
 
-        void AudioManager::update()
+        void AudioManager::tick(float dt)
         {
                 if (bgSounds.size() > 0)

code/trunk/src/audio/AudioManager.h

@@ -3 +3 @@
 
 #include "AudioIncludes.h"
+
+#include "core/Tickable.h"
 
 #include "AudioPrereqs.h"
@@ -12 +14 @@
 namespace audio
 {
-        class _AudioExport AudioManager
+  class _AudioExport AudioManager : public orxonox::Tickable
         {
         public:
@@ -37 +39 @@
 
                 // Update
-                void update();
+                void tick(float dt);
 
                 void ambientAdd(std::string file);