RemotePlayer/LocalPlayer Player base class proper separation (code cleanup) (patch...

[dragonfireclient.git] / src / quicktune.cpp

diff --git a/src/quicktune.cpp b/src/quicktune.cpp
index 32a834e5fa7e19cda3edb4f0e7a41f10a4d5ae6f..b0e2dc6d5bbd731889f488ce1960ba761dc42b04 100644 (file)
--- a/src/quicktune.cpp
+++ b/src/quicktune.cpp
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -18,9 +18,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "quicktune.h"
-#include <jmutex.h>
-#include <jmutexautolock.h>
-#include "utility.h"
+#include "threading/mutex.h"
+#include "threading/mutex_auto_lock.h"
+#include "util/string.h"
 
 std::string QuicktuneValue::getString()
 {
@@ -49,13 +49,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;
+Mutex *g_mutex = NULL;
 
 static void makeMutex()
 {
        if(!g_mutex){
-               g_mutex = new JMutex();
-               g_mutex->Init();
+               g_mutex = new Mutex();
        }
 }
 
@@ -67,7 +66,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 +79,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 +87,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;