Changeset 4985 in orxonox.OLD

Timestamp:

Aug 12, 2005, 12:55:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loading some stuff from ths sound-engine

Location:

orxonox/trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (2 diffs)
• lib/sound/ogg_player.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (3 diffs)
• lib/sound/sound_engine.h (modified) (4 diffs)
• orxonox.cc (modified) (1 diff)

orxonox/trunk/src/lib/sound/ogg_player.cc

@@ -20 +20 @@
 
 #include "ogg_player.h"
+
+#include "sound_engine.h"
 
 #include "debug.h"
@@ -75 +77 @@
     alSourcef (source, AL_ROLLOFF_FACTOR,  0.0          );
     alSourcei (source, AL_SOURCE_RELATIVE, AL_TRUE      );
+    alSourcef (source, AL_GAIN,            SoundEngine::getInstance()->getMusicVolume());
 }
 

orxonox/trunk/src/lib/sound/ogg_player.h

@@ -19 +19 @@
 
 
-#define BUFFER_SIZE (16384 * 4)
+#define BUFFER_SIZE (4096 * 4)
 
 

orxonox/trunk/src/lib/sound/sound_engine.cc

@@ -28 +28 @@
 #include "resource_manager.h"
 #include "debug.h"
+#include "ini_parser.h"
 
 using namespace std;
-
 
 //////////////////
@@ -110 +110 @@
     alSourcei (this->sourceID, AL_BUFFER,   this->buffer->getID());
   alSourcef (this->sourceID, AL_PITCH,    1.0      );
-  alSourcef (this->sourceID, AL_GAIN,     1.0      );
+  alSourcef (this->sourceID, AL_GAIN,     SoundEngine::getInstance()->getEffectsVolume() );
   alSourcei (sourceID, AL_LOOPING,  AL_FALSE     );
 }
@@ -239 +239 @@
   alutExit();
 }
+
+/**
+ * loads the settings of the SoundEngine from an ini-file
+ * @param iniParser the IniParser of the inifile
+ */
+void SoundEngine::loadSettings(IniParser* iniParser)
+{
+  const char* musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "80");
+  this->musicVolume = atof(musicVolume)/100.0;
+
+  const char* effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
+  this->effectsVolume = atof(effectsVolume)/100.0;
+}
+
+
 
 /**

orxonox/trunk/src/lib/sound/sound_engine.h

@@ -16 +16 @@
 class PNode;
 template<class T> class tList;
+class IniParser;
 
 
@@ -75 +76 @@
     inline static SoundEngine* getInstance() { if (!singletonRef) singletonRef = new SoundEngine();  return singletonRef; };
 
+    void loadSettings(IniParser* iniParser);
+
     SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL);
 
@@ -81 +84 @@
     void setDopplerValues(ALfloat dopplerFactor, ALfloat dopplerVelocity);
 
+
+    /** @returns the Music Volume in % */
+    inline float getMusicVolume() { return this->musicVolume; };
+    /** @returns the Effects Volume in % */
+    inline float getEffectsVolume() { return this->effectsVolume; };
 
     void update();
@@ -106 +114 @@
     static SoundEngine*      singletonRef;             //!< Reference to this class
 
-
+    float                    musicVolume;              //!< the maximum volume of the music in % (0f,1f]
+    float                    effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
     PNode*                   listener;                 //!< The listener of the Scene
     tList<BaseObject>*       bufferList;               //!< A list of buffers

orxonox/trunk/src/orxonox.cc

@@ -177 +177 @@
   // SDL_Init(SDL_INIT_AUDIO);
   SoundEngine::getInstance()->initAudio();
+
+  SoundEngine::getInstance()->loadSettings(this->iniParser);
   return 0;
 }