Changeset 7256 in orxonox.OLD for trunk/src/lib/sound
- Timestamp:
- Mar 30, 2006, 11:45:31 AM (19 years ago)
- Location:
- trunk/src/lib/sound
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/sound/sound_engine.cc
r7225 r7256 26 26 #include "util/loading/resource_manager.h" 27 27 #include "debug.h" 28 #include " parser/ini_parser/ini_parser.h"28 #include "util/preferences.h" 29 29 #include "globals.h" 30 30 … … 95 95 /** 96 96 * loads the settings of the SoundEngine from an ini-file 97 * @param iniParser the IniParser of the inifile98 97 */ 99 void SoundEngine::loadSettings( IniParser* iniParser)100 { 101 MultiType channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");98 void SoundEngine::loadSettings() 99 { 100 MultiType channels = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_AUDIO_CHANNELS, "32"); 102 101 this->maxSourceCount = channels.getInt(); 103 102 104 MultiType effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");103 MultiType effectsVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_EFFECTS_VOLUME, "80"); 105 104 this->effectsVolume = effectsVolume.getFloat()/100.0; 106 105 107 MultiType musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");106 MultiType musicVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_MUSIC_VOLUME, "75"); 108 107 this->musicVolume = musicVolume.getFloat()/100.0; 109 108 } -
trunk/src/lib/sound/sound_engine.h
r7225 r7256 31 31 inline static SoundEngine* getInstance() { if (!SoundEngine::singletonRef) SoundEngine::singletonRef = new SoundEngine(); return SoundEngine::singletonRef; }; 32 32 33 void loadSettings( IniParser* iniParser);33 void loadSettings(); 34 34 35 35 SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);
Note: See TracChangeset
for help on using the changeset viewer.