Changeset 5961 in orxonox.OLD for branches/avi_play/src

Timestamp:

Dec 7, 2005, 2:53:43 PM (18 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/

Location:

branches/avi_play/src

Files:

• Makefile.am (modified) (2 diffs)
• defs/debug.h (modified) (2 diffs)
• defs/globals.h (modified) (2 diffs)
• lib/Makefile.am (modified) (5 diffs)
• lib/event/key_mapper.cc (modified) (3 diffs)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• lib/gui/gtk_gui/gui_audio.cc (modified) (3 diffs)
• lib/gui/gtk_gui/gui_exec.cc (modified) (6 diffs)
• lib/gui/gtk_gui/gui_keys.cc (modified) (1 diff)
• lib/parser (copied) (copied from trunk/src/lib/parser)
• lib/parser/Makefile.am (copied) (copied from trunk/src/lib/parser/Makefile.am)
• lib/parser/ini_parser (copied) (copied from trunk/src/lib/parser/ini_parser)
• lib/parser/ini_parser/Makefile.am (copied) (copied from trunk/src/lib/parser/ini_parser/Makefile.am)
• lib/parser/ini_parser/ini_parser.cc (copied) (copied from trunk/src/lib/parser/ini_parser/ini_parser.cc)
• lib/parser/ini_parser/ini_parser.h (copied) (copied from trunk/src/lib/parser/ini_parser/ini_parser.h)
• lib/parser/tinyxml (copied) (copied from trunk/src/lib/parser/tinyxml)
• lib/parser/tinyxml/Makefile.am (copied) (copied from trunk/src/lib/parser/tinyxml/Makefile.am)
• lib/parser/tinyxml/tinystr.cc (copied) (copied from trunk/src/lib/parser/tinyxml/tinystr.cc)
• lib/parser/tinyxml/tinystr.h (copied) (copied from trunk/src/lib/parser/tinyxml/tinystr.h)
• lib/parser/tinyxml/tinyxml.cc (copied) (copied from trunk/src/lib/parser/tinyxml/tinyxml.cc)
• lib/parser/tinyxml/tinyxml.h (copied) (copied from trunk/src/lib/parser/tinyxml/tinyxml.h)
• lib/parser/tinyxml/tinyxmlerror.cc (copied) (copied from trunk/src/lib/parser/tinyxml/tinyxmlerror.cc)
• lib/parser/tinyxml/tinyxmlparser.cc (copied) (copied from trunk/src/lib/parser/tinyxml/tinyxmlparser.cc)
• lib/particles/particle_engine.h (modified) (1 diff)
• lib/particles/particle_system.cc (modified) (1 diff)
• lib/physics/physics_engine.cc (modified) (1 diff)
• lib/sound/sound_buffer.cc (modified) (4 diffs)
• lib/sound/sound_engine.cc (modified) (12 diffs)
• lib/sound/sound_engine.h (modified) (3 diffs)
• lib/sound/sound_source.cc (modified) (6 diffs)
• lib/sound/sound_source.h (modified) (1 diff)
• lib/util/executor/executor_specials.h (modified) (1 diff)
• lib/util/ini_parser.cc (deleted)
• lib/util/ini_parser.h (deleted)
• orxonox.cc (modified) (2 diffs)
• subprojects/framework.cc (modified) (1 diff)
• util/loading/factory.h (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (1 diff)
• util/track/track_manager.cc (modified) (1 diff)
• world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• world_entities/weapons/cannon.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (1 diff)

branches/avi_play/src/Makefile.am

@@ -21 +21 @@
                        lib/collision_detection/libORXcd.a \
                        lib/graphics/spatial_separation/libORXquadtree.a \
-                       lib/tinyxml/libtinyxml.a \
+                       lib/parser/tinyxml/libtinyxml.a \
+                       lib/parser/ini_parser/libIniParser.a \
                        lib/gui/gl_gui/libORXglgui.a \
                        lib/shell/libORXshell.a
@@ -36 +37 @@
                 lib/particles/libORXparticles.a \
                 lib/graphics/spatial_separation/libORXquadtree.a \
-                lib/tinyxml/libtinyxml.a \
+                lib/parser/tinyxml/libtinyxml.a \
+                lib/parser/ini_parser/libIniParser.a \
                 lib/gui/gl_gui/libORXglgui.a \
                 lib/shell/libORXshell.a \

branches/avi_play/src/defs/debug.h

@@ -27 +27 @@
 
 #include "confincl.h"
-#include "shell_buffer.h"
+#ifndef NO_SHELL
+ #include "shell_buffer.h"
+#endif /* NO_SHELL */
 
 #include <stdio.h>
@@ -78 +80 @@
   #define DEBUG_MODULE_SPATIAL_SEPARATION    2
   #define DEBUG_MODULE_GUI                   2
+  #define DEBUG_MODULE_SOUND                 2
 
   // MISC

branches/avi_play/src/defs/globals.h

@@ -45 +45 @@
 #define   CONFIG_NAME_DATADIR              "DataDir"
 #define   CONFIG_NAME_AUTO_UPDATE          "Auto-Update"
+
 #define   CONFIG_NAME_FULLSCREEN           "Fullscreen-mode"
 #define   CONFIG_NAME_RESOLUTION           "Resolution"
@@ -57 +58 @@
 #define   CONFIG_NAME_ANTI_ALIASING        "Anti-Aliasing"
 #define   CONFIG_NAME_FILTER_METHOD        "Filtering-Method"
+
 #define   CONFIG_NAME_DISABLE_AUDIO        "Disable-Audio"
+#define   CONFIG_NAME_AUDIO_CHANNELS       "Audio-Channels"
 #define   CONFIG_NAME_MUSIC_VOLUME         "Music-Volume"
 #define   CONFIG_NAME_EFFECTS_VOLUME       "Effects-Volume"
+
 #define   CONFIG_NAME_SAVE_SETTINGS        "Save-Settings"
 #define   CONFIG_NAME_VERBOSE_MODE         "Verbose-Mode"

branches/avi_play/src/lib/Makefile.am

@@ -15 +15 @@
                             network/libORXnet.a \
                             graphics/spatial_separation/libORXquadtree.a \
-                            tinyxml/libtinyxml.a \
+                            parser/tinyxml/libtinyxml.a \
+                            parser/ini_parser/libIniParser.a \
                             shell/libORXshell.a
 
@@ -29 +30 @@
                             network/libORXnet.a \
                             graphics/spatial_separation/libORXquadtree.a \
-                            tinyxml/libtinyxml.a \
                             shell/libORXshell.a \
                             $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
@@ -37 +37 @@
                         lang/base_object.cc \
                         lang/class_list.cc \
-                        util/ini_parser.cc \
                         util/substring.cc \
                         util/color.cc \
@@ -53 +52 @@
                         graphics/render2D/render_2d.h \
                         lang/class_list.h \
-                        util/ini_parser.h \
                         util/substring.h \
                         util/array.h \
@@ -75 +73 @@
           collision_detection \
           network \
-          tinyxml \
+          parser \
           shell \
           gui \

branches/avi_play/src/lib/event/key_mapper.cc

@@ -24 +24 @@
 
 #include "globals.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "key_names.h"
 #include "debug.h"
@@ -132 +132 @@
   int* index;
 
-  iniParser->getFirstVar();
+  iniParser->firstVar();
   while(iniParser->getCurrentName())
   {
@@ -151 +151 @@
   }
 
-  iniParser->getFirstVar();
+  iniParser->firstVar();
   while(iniParser->getCurrentName())
   {

branches/avi_play/src/lib/graphics/graphics_engine.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "substring.h"
 #include "text.h"

branches/avi_play/src/lib/graphics/light.cc

@@ -22 +22 @@
 #include "glincl.h"
 #include "vector.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "load_param.h"
 #include "factory.h"

branches/avi_play/src/lib/graphics/render2D/element_2d.cc

@@ -23 +23 @@
 #include "graphics_engine.h"
 #include "load_param.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "class_list.h"
 

branches/avi_play/src/lib/gui/gtk_gui/gui_audio.cc

@@ -42 +42 @@
     {
       CheckButton* enableSound; //!< A Ckeckbutton for enabling Sound.
+      Slider* audioChannels;    //!< A Slider for the count of audio-channels.
       Slider* musicVolume;      //!< A Slider for music volume.
       Slider* effectsVolume;    //!< A Slider for effects volume.
@@ -51 +52 @@
       enableSound->saveability();
       audioBox->fill(enableSound);
+
+      Label* audioChannelsLabel = new Label(CONFIG_NAME_AUDIO_CHANNELS);
+      audioBox->fill(audioChannelsLabel);
+      audioChannels = new Slider(CONFIG_NAME_AUDIO_CHANNELS, 0, 32);
+      audioChannels->setFlagName("channels", "c", 32);
+      audioChannels->setDescription("Sets the count of channels in the game");
+      audioChannels->saveability();
+      audioBox->fill (audioChannels);
+
+
       Label* musicVolumeLabel = new Label(CONFIG_NAME_MUSIC_VOLUME);
       audioBox->fill(musicVolumeLabel);
@@ -58 +69 @@
       musicVolume->saveability();
       audioBox->fill (musicVolume);
+
       Label* effectsVolumeLabel = new Label (CONFIG_NAME_EFFECTS_VOLUME);
       audioBox->fill (effectsVolumeLabel);

branches/avi_play/src/lib/gui/gtk_gui/gui_exec.cc

@@ -27 +27 @@
 
 #include "resource_manager.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 
 #include <string.h>
@@ -254 +254 @@
 
 /**
- *  Reads in Configuration Data.
+ * @brief Reads in Configuration Data.
  * @param widget from which Widget on should be saved.
 */
@@ -265 +265 @@
     return;
 
-  iniParser.getFirstSection();
+  iniParser.firstSection();
   Widget* groupWidget = widget;
   const char* groupName;
@@ -272 +272 @@
   while (groupName = iniParser.getCurrentSection())
   {
+    printf("GROUP:::%s\n", groupName);
     if((groupWidget = locateGroup(widget, groupName, 1))==NULL)
-    {
-      PRINTF(2)("!!There is no group called %s in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n", groupName);
-      groupWidget = widget;
-      continue;
-    }
+      {
+        PRINTF(2)("!!There is no group called %s in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n", groupName);
+        groupWidget = widget;
+        continue;
+      }
     else
-      PRINT(0)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
-
-    iniParser.getFirstVar();
-    while(iniParser.getCurrentName())
-    {
-      varInfo.variableName = iniParser.getCurrentName();
+      PRINT(4)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
+
+    const char* entryName;
+    iniParser.firstVar();
+    while(entryName = iniParser.getCurrentName())
+    {
+      PRINTF(4)("ENTRY:::%s = %s\n", entryName, iniParser.getCurrentValue());
+      varInfo.variableName = entryName;
       varInfo.variableValue = iniParser.getCurrentValue();
       groupWidget->walkThrough(this->readFileText, &varInfo, 0);
@@ -303 +306 @@
 {
   VarInfo* info =(VarInfo*)varInfo;
+  if (info == NULL || info->variableName == NULL)
+    return;
+
   if(widget->title && !strcmp(widget->title, info->variableName))
     {
       PRINT(5)("Located Option %s.\n", widget->title);
       if(widget->optionType > GUI_NOTHING)
-        static_cast<Option*>(widget)->load(info->variableValue);
+        if (info->variableValue != NULL)
+          static_cast<Option*>(widget)->load(info->variableValue);
     }
 }
@@ -323 +330 @@
 {
   Widget* tmp;
+  if (widget  == NULL || groupName == NULL)
+    return NULL;
 
   if(widget->optionType < GUI_NOTHING)
     {
-      if(static_cast<Packer*>(widget)->getGroupName() &&
+      if(static_cast<Packer*>(widget)->getGroupName() != NULL &&
          !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
-        {
-          return widget;
-        }
+        return widget;
       else
         {
-          if((tmp = locateGroup(static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
+          if((tmp = locateGroup(static_cast<Packer*>(widget)->down,
+                                groupName, depth+1)) != NULL)
             return tmp;
         }

branches/avi_play/src/lib/gui/gtk_gui/gui_keys.cc

@@ -119 +119 @@
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
-        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "MOUSE_LEFT"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "BUTTON_LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));

branches/avi_play/src/lib/particles/particle_engine.h

@@ -12 +12 @@
 #include "particle_emitter.h"
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 
 // FORWARD DECLARATION

branches/avi_play/src/lib/particles/particle_system.cc

@@ -30 +30 @@
 #include "shell_command.h"
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 
 CREATE_FACTORY(ParticleSystem, CL_PARTICLE_SYSTEM);

branches/avi_play/src/lib/physics/physics_engine.cc

@@ -20 +20 @@
 #include "class_list.h"
 #include "list.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "factory.h"
 #include "load_param.h"

branches/avi_play/src/lib/sound/sound_buffer.cc

@@ -20 +20 @@
 #include "sound_engine.h"
 
-
 using namespace std;
-
 
 //////////////////
@@ -36 +34 @@
   this->setName(fileName);
 
-  SoundEngine::getInstance()->addBuffer(this);
-
   ALenum format;
   ALvoid* data;
@@ -47 +43 @@
   alGenBuffers(1, &this->bufferID);
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   // read in the wav data
@@ -59 +55 @@
 #endif
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   // send the loaded wav data to the buffer
   alBufferData(this->bufferID, format, data, this->size, freq);
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   // remove the wav data (redundant)
   alutUnloadWAV(format, data, this->size, freq);
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 }
 

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

@@ -27 +27 @@
 #include "resource_manager.h"
 #include "debug.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "globals.h"
 
@@ -47 +47 @@
   this->bufferList = NULL;
   this->sourceList = NULL;
+
+  this->device = NULL;
+  this->context = NULL;
+
+  this->maxSourceCount = 32;
 }
 
@@ -64 +69 @@
     while (this->sourceList->size() > 0)
       delete dynamic_cast<SoundSource*>(this->sourceList->front());
+  }
+
+  while(!this->ALSources.empty())
+  {
+    alDeleteSources(1, &this->ALSources.top());
+    this->ALSources.pop();
   }
 
@@ -86 +97 @@
 void SoundEngine::loadSettings(IniParser* iniParser)
 {
+  const char* channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
+  this->maxSourceCount = atoi(channels);
   const char* musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "80");
   this->musicVolume = atof(musicVolume)/100.0;
@@ -118 +131 @@
 
 
-/**
- *  adds a SoundBuffer to the bufferList of the SoundEngine
- * @param buffer The buffer to add to the bufferList
-*/
-void SoundEngine::addBuffer(SoundBuffer* buffer)
-{
-  if (unlikely(this->bufferList == NULL))
-    this->bufferList = ClassList::getList(CL_SOUND_BUFFER);
-}
-
-/**
- *  removes a SoundBuffer from the bufferList of the SoundEngine
- * @param buffer The buffer to delete from the SoundEngine
-*/
-void SoundEngine::removeBuffer(SoundBuffer* buffer)
-{
-  // look if there are any sources that have the buffer still loaded
-  if (this->sourceList != NULL)
-  {
-    list<BaseObject*>::const_iterator source;
-    for (source = this->sourceList->begin(); source != this->sourceList->end(); source++)
-    {
-      if (buffer == static_cast<SoundSource*>(*source)->getBuffer())
-        delete (*source);
+void SoundEngine::popALSource(ALuint& source)
+{
+  if (source != 0)
+    return;
+  else
+  {
+
+    /// @TODO try to create more sources if needed
+    if (!this->ALSources.empty())
+    {
+
+      source = this->ALSources.top();
+      printf("test: : %d\n", source);
+      this->ALSources.pop();
     }
   }
 }
 
-/**
- * adds a SoundSource to the sourceList of the SoundEngine
- * @param source The source to add to the sourceList
-*/
-void SoundEngine::addSource(SoundSource* source)
-{
-  this->sourceList = ClassList::getList(CL_SOUND_SOURCE);
-}
 
 /**
@@ -180 +175 @@
 
   // updating all the Sources positions
-  if (likely(this->sourceList != NULL))
+  if (likely(this->sourceList != NULL || (this->sourceList = ClassList::getList(CL_SOUND_SOURCE)) != NULL))
   {
     list<BaseObject*>::const_iterator sourceIT;
@@ -187 +182 @@
     {
       source = static_cast<SoundSource*>(*sourceIT);
-      if (likely(source->getNode() != NULL))
+      if (source->isPlaying())
       {
-        alSource3f(source->getID(), AL_POSITION,
-                   source->getNode()->getAbsCoor().x,
-                   source->getNode()->getAbsCoor().y,
-                   source->getNode()->getAbsCoor().z);
-        alSource3f(source->getID(), AL_VELOCITY,
-                   source->getNode()->getVelocity().x,
-                   source->getNode()->getVelocity().y,
-                   source->getNode()->getVelocity().z);
+        int play;
+        alGetSourcei(source->getID(), AL_SOURCE_STATE, &play);
+        if(play == AL_PLAYING)
+        {
+          if (likely(source->getNode() != NULL))
+          {
+            alSource3f(source->getID(), AL_POSITION,
+                       source->getNode()->getAbsCoor().x,
+                       source->getNode()->getAbsCoor().y,
+                       source->getNode()->getAbsCoor().z);
+            alSource3f(source->getID(), AL_VELOCITY,
+                       source->getNode()->getVelocity().x,
+                       source->getNode()->getVelocity().y,
+                       source->getNode()->getVelocity().z);
+          }
+
+        }
+        else
+        {
+          source->stop();
+        }
       }
     }
@@ -281 +289 @@
 
   // INITIALIZING THE DEVICE:
-#ifndef AL_VERSION_1_1
+#ifdef AL_VERSION_1_1
   ALubyte deviceName[] =
 #else
@@ -300 +308 @@
 
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   this->setDopplerValues(SOUND_DOPPLER_FACTOR, SOUND_DOPPLER_VELOCITY);
@@ -313 +321 @@
 bool SoundEngine::allocateSources(unsigned int count)
 {
-  ALuint* sourceList = new ALuint[count];
   ALenum result;
-
-  alGenSources(count, sourceList);
-  if ((result = alGetError()) != AL_NO_ERROR)
-  {
-    SoundEngine::PrintALErrorString(result);
-    return false;
-  }
-
-  /// @TODO check syntax
-
-
   // Setting default values.
-  for (int i = 0; i < count; i++)
-  {
-    alSourcef (sourceList[i], AL_PITCH,    1.0      );
-    alSourcef (sourceList[i], AL_GAIN,     this->getEffectsVolume() );
-    alSourcei (sourceList[i], AL_LOOPING,  AL_FALSE );
-    this->ALSources.push(sourceList[i]);
+  for (unsigned int i = 0; i < count; i++)
+  {
+    ALuint source;
+
+    alGenSources(1, &source);
+    if ((result = alGetError()) != AL_NO_ERROR)
+      PRINTF(1)("Error Generating Sources: '%s'\n", SoundEngine::getALErrorString(result));
+
+    alSourcef (source, AL_PITCH,    1.0      );
+    alSourcef (source, AL_GAIN,     this->getEffectsVolume() );
+    alSourcei (source, AL_LOOPING,  AL_FALSE );
+    this->ALSources.push(source);
   }
   return true;
@@ -341 +343 @@
  * @param err The error found
 */
-void SoundEngine::PrintALErrorString(ALenum err)
+const char* SoundEngine::getALErrorString(ALenum err)
 {
   switch(err)
     {
     case AL_NO_ERROR:
-      PRINTF(4)("AL_NO_ERROR\n");
-      break;
-
+      return ("AL_NO_ERROR");
     case AL_INVALID_NAME:
-      PRINTF(2)("AL_INVALID_NAME\n");
-      break;
-
+      return ("AL_INVALID_NAME");
     case AL_INVALID_ENUM:
-      PRINTF(2)("AL_INVALID_ENUM\n");
-      break;
-
+      return ("AL_INVALID_ENUM");
     case AL_INVALID_VALUE:
-      PRINTF(2)("AL_INVALID_VALUE\n");
-      break;
-
+      return ("AL_INVALID_VALUE");
     case AL_INVALID_OPERATION:
-      PRINTF(2)("AL_INVALID_OPERATION\n");
-      break;
-
+      return ("AL_INVALID_OPERATION");
     case AL_OUT_OF_MEMORY:
-      PRINTF(2)("AL_OUT_OF_MEMORY\n");
-      break;
+      return ("AL_OUT_OF_MEMORY");
     };
 }
@@ -373 +364 @@
 void SoundEngine::listDevices()
 {
-
   printf("%s\n",(const char*)alcGetString(NULL, ALC_DEVICE_SPECIFIER));
 }

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();
 

branches/avi_play/src/lib/sound/sound_source.cc

@@ -34 +34 @@
 
   // adding the Source to the SourcesList of the SoundEngine
-  SoundEngine::getInstance()->addSource(this);
-
   this->buffer = buffer;
   this->sourceNode = sourceNode;
 
-  alGenSources(1, &this->sourceID);
-  if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
-  if (this->buffer != NULL)
-    alSourcei (this->sourceID, AL_BUFFER,   this->buffer->getID());
-  alSourcef (this->sourceID, AL_PITCH,    1.0      );
-  alSourcef (this->sourceID, AL_GAIN,     SoundEngine::getInstance()->getEffectsVolume() );
-  alSourcei (sourceID, AL_LOOPING,  AL_FALSE     );
+  this->sourceID = 0;
+  this->bPlay = false;
 }
 
@@ -54 +46 @@
 SoundSource::~SoundSource()
 {
-  //SoundEngine::getInstance()->removeSource(this);
-  alDeleteSources(1, &this->sourceID);
+  SoundEngine::getInstance()->pushALSource(this->sourceID);
 }
 
@@ -63 +54 @@
 void SoundSource::play()
 {
+  if (this->sourceID == 0)
+    SoundEngine::getInstance()->popALSource(this->sourceID);
   alSourcePlay(this->sourceID);
+  this->bPlay = true;
 }
 
@@ -72 +66 @@
 void SoundSource::play(const SoundBuffer* buffer)
 {
+  if (unlikely(this->sourceID == 0))
+    SoundEngine::getInstance()->popALSource(this->sourceID);
+
+  printf("%d\n",sourceID);
   alSourceStop(this->sourceID);
   alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
@@ -78 +76 @@
   if (unlikely(this->buffer != NULL))
     alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+  this->bPlay = true;
 }
 
@@ -85 +84 @@
 void SoundSource::stop()
 {
+  this->bPlay = false;
   alSourceStop(this->sourceID);
+  SoundEngine::getInstance()->pushALSource(this->sourceID);
 }
 

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

@@ -31 +31 @@
     /** @returns The ID of this Source */
     inline ALuint getID() const { return this->sourceID; }
+    /** @returns true, if the Source is Playing */
+    inline bool   isPlaying() const { return this->bPlay; };
     /** @returns the SoundBuffer of this Source */
     inline const SoundBuffer* getBuffer() const { return this->buffer; }

branches/avi_play/src/lib/util/executor/executor_specials.h

@@ -10 +10 @@
 
 #include "compiler.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 // FORWARD DECLARATION
 

branches/avi_play/src/orxonox.cc

@@ -33 +33 @@
 
 #include "world.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "game_loader.h"
 
@@ -235 +235 @@
   // SDL_InitSubSystem(SDL_INIT_AUDIO);
   SoundEngine::getInstance()->initAudio();
+  SoundEngine::getInstance()->allocateSources(1);
 
   SoundEngine::getInstance()->loadSettings(this->iniParser);

branches/avi_play/src/subprojects/framework.cc

@@ -24 +24 @@
 #include "resource_manager.h"
 #include "camera.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "globals.h"
 

branches/avi_play/src/util/loading/factory.h

@@ -25 +25 @@
 class BaseObject;
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "base_object.h"
 #include "debug.h"

branches/avi_play/src/util/loading/resource_manager.cc

@@ -33 +33 @@
 #endif /* NO_TEXT */
 #ifndef NO_AUDIO
-#include "sound_engine.h"
+#include "sound_buffer.h"
 #include "ogg_player.h"
 #endif /* NO_AUDIO */

branches/avi_play/src/util/track/track_manager.cc

@@ -28 +28 @@
 
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "substring.h"
 

branches/avi_play/src/world_entities/weapons/aiming_turret.cc

@@ -26 +26 @@
 
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"

branches/avi_play/src/world_entities/weapons/cannon.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"

branches/avi_play/src/world_entities/weapons/test_gun.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"

branches/avi_play/src/world_entities/weapons/turret.cc

@@ -26 +26 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"

branches/avi_play/src/world_entities/weapons/weapon.cc

@@ -28 +28 @@
 #include "load_param.h"
 #include "state.h"
-#include "sound_engine.h"
 #include "animation3d.h"
 #include "vector.h"
+
+#include "sound_source.h"
+#include "sound_buffer.h"
 
 ////////////////////