X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fconfiguration_variable.h;h=a7fe8def48169c17c508ca714ffc135a1ea9bfb9;hb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;hp=e05952417d4ccbbd15962f997e0f08d9c20aa3bb;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/ardour/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h
index e05952417d..a7fe8def48 100644
--- a/libs/ardour/ardour/configuration_variable.h
+++ b/libs/ardour/ardour/configuration_variable.h
@@ -24,6 +24,7 @@
 #include <sstream>
 
 #include "pbd/xml++.h"
+#include "pbd/convert.h"
 #include "ardour/types.h"
 #include "ardour/utils.h"
 
@@ -88,6 +89,42 @@ class ConfigVariable : public ConfigVariableBase
 	T value;
 };
 
+/** Specialisation of ConfigVariable for std::string to cope with whitespace properly */
+template<>
+class ConfigVariable<std::string> : public ConfigVariableBase
+{
+  public:
+
+	ConfigVariable (std::string str) : ConfigVariableBase (str) {}
+	ConfigVariable (std::string str, std::string val) : ConfigVariableBase (str), value (val) {}
+
+	std::string get() const {
+		return value;
+	}
+
+	std::string get_as_string () const {
+		return value;
+	}
+
+	virtual bool set (std::string val) {
+		if (val == value) {
+			miss ();
+			return false;
+		}
+		value = val;
+		notify ();
+		return true;
+	}
+
+	virtual void set_from_string (std::string const & s) {
+		value = s;
+	}
+
+  protected:
+	virtual std::string get_for_save() { return value; }
+	std::string value;
+};
+
 template<>
 class ConfigVariable<bool> : public ConfigVariableBase
 {
@@ -117,7 +154,7 @@ class ConfigVariable<bool> : public ConfigVariableBase
 	}
 
 	void set_from_string (std::string const & s) {
-		value = string_is_affirmative (s);
+		value = PBD::string_is_affirmative (s);
 	}
 
   protected: