mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a second mutex in the Preferences::IO class.

Browse Source
This commit is contained in:
Daniel Önnerby 2008-08-11 10:04:08 +00:00
parent 9be5738463
commit 8845c38038
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Preferences.cpp
View File

@ -61,6 +61,8 @@ Preferences::~Preferences(void){
bool Preferences::GetBool(const char* key,bool defaultValue){
boost::mutex::scoped_lock lock(IO::Instance()->mutex);
IO::SettingMap::iterator setting = this->settings->find(key);
if(setting!=this->settings->end()){
return setting->second.Value(defaultValue);
@ -70,6 +72,7 @@ bool Preferences::GetBool(const char* key,bool defaultValue){
}
int Preferences::GetInt(const char* key,int defaultValue){
boost::mutex::scoped_lock lock(IO::Instance()->mutex);
IO::SettingMap::iterator setting = this->settings->find(key);
if(setting!=this->settings->end()){
return setting->second.Value(defaultValue);
@ -79,6 +82,7 @@ int Preferences::GetInt(const char* key,int defaultValue){
}
utfstring Preferences::GetString(const char* key,const utfchar* defaultValue){
boost::mutex::scoped_lock lock(IO::Instance()->mutex);
IO::SettingMap::iterator setting = this->settings->find(key);
if(setting!=this->settings->end()){
return setting->second.Value(utfstring(defaultValue));
@ -98,6 +102,7 @@ Preferences::IO::Ptr Preferences::IO::Instance(){
}
Preferences::IO::IO(void){
boost::mutex::scoped_lock lock(this->mutex);
utfstring dataDir = GetDataDirectory();
utfstring dbFile = GetDataDirectory() + UTF("settings.db");
this->db.Open(dbFile.c_str(),0,128);
@ -234,6 +239,7 @@ utfstring Preferences::Setting::Value(utfstring defaultValue){
Preferences::IO::SettingMapPtr Preferences::IO::GetNamespace(const char* nameSpace){
boost::mutex::scoped_lock lock(this->mutex);
// First check if it's in the NamespaceMap
NamespaceMap::iterator ns = this->namespaces.find(nameSpace);
if(ns!=this->namespaces.end()){

4
src/core/Preferences.h
View File

@ -41,6 +41,7 @@
#include <core/config.h>
#include <core/db/Connection.h>
#include <boost/thread/mutex.hpp>
//////////////////////////////////////////////////////////////////////////////
@ -101,6 +102,9 @@ class Preferences{
void SaveSetting(const char* nameSpace,const char *key,Setting &setting);
static IO::Ptr Instance();
boost::mutex mutex;
private:
db::Connection db;
NamespaceMap namespaces;