X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fquicktune.cpp;h=37d4933de5605b0a69b37839250ff6219da1432d;hb=1105a14bccefb48a0e264fe19190c39629259338;hp=e41fb73af3dfdc2683e54e2361198ce08ac67c3f;hpb=2c9bb06516418b99c1eac957cfae9d84c9bef954;p=minetest.git

diff --git a/src/quicktune.cpp b/src/quicktune.cpp
index e41fb73af..37d4933de 100644
--- a/src/quicktune.cpp
+++ b/src/quicktune.cpp
@@ -1,26 +1,25 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "quicktune.h"
-#include <jmutex.h>
-#include <jmutexautolock.h>
-#include "utility.h"
+#include "threading/mutex_auto_lock.h"
+#include "util/string.h"
 
 std::string QuicktuneValue::getString()
 {
@@ -49,13 +48,12 @@ void QuicktuneValue::relativeAdd(float amount)
 
 static std::map<std::string, QuicktuneValue> g_values;
 static std::vector<std::string> g_names;
-JMutex *g_mutex = NULL;
+std::mutex *g_mutex = NULL;
 
 static void makeMutex()
 {
 	if(!g_mutex){
-		g_mutex = new JMutex();
-		g_mutex->Init();
+		g_mutex = new std::mutex();
 	}
 }
 
@@ -67,7 +65,7 @@ std::vector<std::string> getQuicktuneNames()
 QuicktuneValue getQuicktuneValue(const std::string &name)
 {
 	makeMutex();
-	JMutexAutoLock lock(*g_mutex);
+	MutexAutoLock lock(*g_mutex);
 	std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
 	if(i == g_values.end()){
 		QuicktuneValue val;
@@ -80,7 +78,7 @@ QuicktuneValue getQuicktuneValue(const std::string &name)
 void setQuicktuneValue(const std::string &name, const QuicktuneValue &val)
 {
 	makeMutex();
-	JMutexAutoLock lock(*g_mutex);
+	MutexAutoLock lock(*g_mutex);
 	g_values[name] = val;
 	g_values[name].modified = true;
 }
@@ -88,7 +86,7 @@ void setQuicktuneValue(const std::string &name, const QuicktuneValue &val)
 void updateQuicktuneValue(const std::string &name, QuicktuneValue &val)
 {
 	makeMutex();
-	JMutexAutoLock lock(*g_mutex);
+	MutexAutoLock lock(*g_mutex);
 	std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
 	if(i == g_values.end()){
 		g_values[name] = val;