Changeset 7247 in orxonox.OLD for branches/preferences/src/lib/sound

Timestamp:

Mar 24, 2006, 6:24:41 PM (19 years ago)

Author:

rennerc

Message:

removed several iniParser

Location:

branches/preferences/src/lib/sound

Files:

• sound_engine.cc (modified) (2 diffs)
• sound_engine.h (modified) (1 diff)

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

@@ -26 +26 @@
 #include "util/loading/resource_manager.h"
 #include "debug.h"
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "globals.h"
 
@@ -97 +97 @@
  * @param iniParser the IniParser of the inifile
  */
-void SoundEngine::loadSettings(IniParser* iniParser)
-{
-  MultiType channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
+void SoundEngine::loadSettings()
+{
+  MultiType channels = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_AUDIO_CHANNELS, "32");
   this->maxSourceCount = channels.getInt();
 
-  MultiType effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
+  MultiType effectsVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_EFFECTS_VOLUME, "80");
   this->effectsVolume = effectsVolume.getFloat()/100.0;
 
-  MultiType musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");
+  MultiType musicVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_MUSIC_VOLUME, "75");
   this->musicVolume = musicVolume.getFloat()/100.0;
 }

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

@@ -31 +31 @@
     inline static SoundEngine* getInstance() { if (!SoundEngine::singletonRef) SoundEngine::singletonRef = new SoundEngine();  return SoundEngine::singletonRef; };
 
-    void loadSettings(IniParser* iniParser);
+    void loadSettings();
 
     SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);