Changeset 5961 in orxonox.OLD for branches/avi_play/src/lib/sound/sound_engine.h

Timestamp:

Dec 7, 2005, 2:53:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the trunk back to the avi_play branche again
merged with command
svn merge -r 5924:HEAD ../trunk/ avi_play/

File:

• branches/avi_play/src/lib/sound/sound_engine.h (modified) (3 diffs)

branches/avi_play/src/lib/sound/sound_engine.h

@@ -26 +26 @@
 //! A class that handles audio via the openAudioLibrary
 class SoundEngine : public BaseObject {
-
   public:
     virtual ~SoundEngine();
@@ -49 +48 @@
 
   // administrative
-    void addBuffer(SoundBuffer* buffer);
-    void removeBuffer(SoundBuffer* buffer);
-    void addSource(SoundSource* source);
+    void popALSource(ALuint& source);
+    void pushALSource(ALuint& source) { if (source != 0) this->ALSources.push(source); };
 
     void flushUnusedBuffers();
@@ -57 +55 @@
     void flushAllSources();
 
+    bool initAudio();
     bool allocateSources(unsigned int count);
-    bool initAudio();
 
   // error handling:
-    static void PrintALErrorString(ALenum err);
-  //  static void PrintALCErrorString(ALenum err);
-
+    static const char* getALErrorString(ALenum err);
 
   private:
     SoundEngine();
+
     void listDevices();