Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

1 files changed, 34 insertions, 0 deletions

diff --git a/libs/pbd/localeguard.cc b/libs/pbd/localeguard.cc
new file mode 100644
index 0000000000..12093beeaa
--- /dev/null
+++ b/libs/pbd/localeguard.cc
@@ -0,0 +1,34 @@
+#include <cstring>
+#include <locale.h>
+#include <stdlib.h>
+
+#include "pbd/localeguard.h"
+
+// JE - added temporarily, to reduce the delay effects when calling
+// setlocale() recursively in a Windows GUI thread (we should think
+// about moving the caller(s) into a dedicated worker thread).
+std::string PBD::LocaleGuard::current;
+
+PBD::LocaleGuard::LocaleGuard (const char* str)
+ : old(0)
+{
+	if (current != str) {
+		old = strdup (setlocale (LC_NUMERIC, NULL));
+		if (strcmp (old, str)) {
+			if (setlocale (LC_NUMERIC, str))
+				current = str; 
+		}
+	}
+}
+
+PBD::LocaleGuard::~LocaleGuard ()
+{
+	if (old) {
+		if (setlocale (LC_NUMERIC, old))
+			current = old;
+
+		free ((char*)old);
+	}
+}
+
+