fully implement and deploy explicit x-thread signal connection syntax (testing comes...

[ardour.git] / libs / ardour / ardour / configuration_variable.h

diff --git a/libs/ardour/ardour/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h
index 6282da2c54d4ffbc4d788e5133e574ffb2afea4f..9c9cf4463ebd3165653cbf32e5b4c023e56203bf 100644 (file)
--- a/libs/ardour/ardour/configuration_variable.h
+++ b/libs/ardour/ardour/configuration_variable.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@
 #ifndef __ardour_configuration_variable_h__
 #define __ardour_configuration_variable_h__
 
-#include <sstream>
-#include <ostream>
 #include <iostream>
+#include <sstream>
 
 #include "pbd/xml++.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
 
@@ -37,17 +37,12 @@ class ConfigVariableBase {
        std::string name () const { return _name; }
        void add_to_node (XMLNode&);
        bool set_from_node (XMLNode const &);
-       
+
        virtual std::string get_as_string () const = 0;
        virtual void set_from_string (std::string const &) = 0;
 
-       void show_stored_value (const std::string&);
-       
-       static void set_show_stored_values (bool);
-
   protected:
        std::string _name;
-       static bool show_stores;
 
        void notify ();
        void miss ();
@@ -66,7 +61,7 @@ class ConfigVariable : public ConfigVariableBase
        }
 
        std::string get_as_string () const {
-               std::stringstream ss;
+               std::ostringstream ss;
                ss << value;
                return ss.str ();
        }
@@ -96,14 +91,14 @@ template<class T>
 class ConfigVariableWithMutation : public ConfigVariable<T>
 {
   public:
-       ConfigVariableWithMutation (std::string name, T val, T (*m)(T)) 
+       ConfigVariableWithMutation (std::string name, T val, T (*m)(T))
                : ConfigVariable<T> (name, val), mutator (m) {}
 
        bool set (T val) {
                if (unmutated_value != val) {
                        unmutated_value = val;
                        return ConfigVariable<T>::set (mutator (val));
-               } 
+               }
                return false;
        }