Changeset 6383 for code/branches/presentation2/src/orxonox/sound/SoundManager.h

Timestamp:

Dec 19, 2009, 10:14:08 PM (14 years ago)

Author:

rgrieder

Message:

Fixed a major sound issue: The state gets reset to 'Stopped' when the sound has finished playing (unless in loop mode of course).

File:

• code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) (2 diffs)

code/branches/presentation2/src/orxonox/sound/SoundManager.h

@@ -102 +102 @@
         void releaseSoundBuffer(const shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer);
 
-        ALuint getSoundSource();
+        ALuint getSoundSource(BaseSound* object);
         void releaseSoundSource(ALuint source);
 
@@ -147 +147 @@
         // Sound source related
         unsigned int maxSources_;
-        std::vector<ALuint> soundSources_;
+        std::vector<ALuint> availableSoundSources_;
+        std::vector<std::pair<ALuint, BaseSound*> > usedSoundSources_;
 
         static SoundManager* singletonPtr_s;