Changeset 6197

Timestamp:

Dec 2, 2009, 2:58:20 PM (15 years ago)

Author:

dafrick

Message:

Small adjustments, better code re-use, added getConfig() function to get values of config values.

Location:

code/branches/presentation2/src

Files:

• libraries/core/ConfigFileManager.cc (modified) (1 diff)
• libraries/core/ConfigFileManager.h (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (1 diff)

code/branches/presentation2/src/libraries/core/ConfigFileManager.cc

@@ -56 +56 @@
         }
         return false;
+    }
+    
+    std::string getConfig(const std::string& classname, const std::string& varname)
+    {
+        return ConfigFileManager::getInstance().getValue(ConfigFileType::Settings, classname, varname, "", true);
     }
 

code/branches/presentation2/src/libraries/core/ConfigFileManager.h

@@ -57 +57 @@
 
     _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value); // tolua_export
+    _CoreExport std::string getConfig(const std::string& classname, const std::string& varname); // tolua_export
     _CoreExport bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
     _CoreExport void reloadConfig();

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -163 +163 @@
     void SoundManager::checkSoundVolumeValidity()
     {
-        if(this->soundVolume_ < 0.0 || this->soundVolume_ > 1.0)
-        {
-            COUT(2) << "Sound warning: Sound volume out of range, ignoring change." << std::endl;
+        if(!checkVolumeValidity(SoundType::none))
+        {
             ResetConfigValue(soundVolume_);
         }
-        
-        this->updateVolume(SoundType::none);
-        COUT(3) << "SoundManager: volume set to " << this->soundVolume_ << std::endl;
-            
     }
     
     void SoundManager::checkAmbientVolumeValidity()
     {
-        if(this->ambientVolume_ < 0.0 || this->ambientVolume_ > 1.0)
-        {
-            COUT(2) << "Sound warning: Sound volume out of range, ignoring change." << std::endl;
+        if(!checkVolumeValidity(SoundType::ambient))
+        {
             ResetConfigValue(ambientVolume_);
         }
-        
-        this->updateVolume(SoundType::ambient);
-        COUT(3) << "SoundManager: volume set to " << this->ambientVolume_ << std::endl;
     }
     
     void SoundManager::checkEffectsVolumeValidity()
     {
-        if(this->effectsVolume_ < 0.0 || this->effectsVolume_ > 1.0)
-        {
-            COUT(2) << "Sound warning: Sound volume out of range, ignoring change." << std::endl;
+        if(!checkVolumeValidity(SoundType::effects))
+        {
             ResetConfigValue(effectsVolume_);
         }
-        
-        this->updateVolume(SoundType::effects);
-        COUT(3) << "SoundManager: volume set to " << this->effectsVolume_ << std::endl;
-    }
-    
-//     void SoundManager::checkSoundVolumeValidity()
-//     {
-//         if(!checkVolumeValidity(SoundType::none))
-//             ResetConfigValue(soundVolume_)
-//     }
-//     
-//     void SoundManager::checkAmbientVolumeValidity()
-//     {
-//         if(!checkVolumeValidity(SoundType::ambient))
-//             ResetConfigValue(ambientVolume_);
-//     }
-//     
-//     void SoundManager::checkEffectsVolumeValidity()
-//     {
-//         if(!checkVolumeValidity(SoundType::effects))
-//             ResetConfigValue(effectsVolume_);
-//     }
+    }
 
     void SoundManager::setListenerPosition(const Vector3& position)