Changeset 6428 for code/trunk/src/libraries/core/input/Button.cc

Timestamp:

Dec 28, 2009, 11:10:37 PM (14 years ago)

Author:

rgrieder

Message:

Changed config value handling in the KeyBinder. Doesn't change the interface though.

File:

• code/trunk/src/libraries/core/input/Button.cc (modified) (4 diffs)

code/trunk/src/libraries/core/input/Button.cc

@@ -42 +42 @@
 #include "core/CommandEvaluation.h"
 #include "core/CommandExecutor.h"
-#include "core/ConfigValueContainer.h"
 
 namespace orxonox
@@ -52 +51 @@
     */
     Button::Button()
-        : configContainer_(0)
-        , bButtonThresholdUser_(false)
+        : bButtonThresholdUser_(false)
         , paramCommandBuffer_(0)
     {
@@ -64 +62 @@
     {
         this->clear();
-
-        if (this->configContainer_)
-            delete this->configContainer_;
     }
 
@@ -83 +78 @@
             }
         }
-    }
-
-    void Button::readConfigValue(ConfigFileType configFile)
-    {
-        // create/get ConfigValueContainer
-        if (!configContainer_)
-        {
-            configContainer_ = new ConfigValueContainer(configFile, 0, groupName_, name_, "", name_);
-            configContainer_->callback(this, &Button::parse);
-        }
-        configContainer_->getValue(&bindingString_, this);
-    }
-
-    void Button::parse()
-    {
+        this->bindingString_.clear();
+    }
+
+    void Button::readBinding(ConfigFileType type)
+    {
+        const std::string& binding = ConfigFileManager::getInstance().getValue(type, groupName_, name_, "", true);
+        this->parse(binding);
+    }
+
+    void Button::setBinding(ConfigFileType type, const std::string& binding, bool bTemporary)
+    {
+        if (!bTemporary)
+            ConfigFileManager::getInstance().setValue(type, groupName_, name_, binding, true);
+        this->parse(binding);
+    }
+
+    void Button::parse(const std::string& binding)
+    {
+        if (binding == this->bindingString_)
+            return;
+
         // delete all commands
         clear();
+        this->bindingString_ = binding;
 
         if (isEmpty(bindingString_))