aboutsummaryrefslogtreecommitdiff
path: root/src/settings.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings.h')
-rw-r--r--src/settings.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings.h b/src/settings.h
index 89f7589df..47feb1755 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -32,7 +32,7 @@ class Settings;
struct NoiseParams;
/** function type to register a changed callback */
-typedef void (*setting_changed_callback)(const std::string);
+typedef void (*setting_changed_callback)(const std::string, void *userdata);
enum ValueType {
VALUETYPE_STRING,
@@ -204,7 +204,7 @@ public:
void clear();
void updateValue(const Settings &other, const std::string &name);
void update(const Settings &other);
- void registerChangedCallback(std::string name, setting_changed_callback cbf);
+ void registerChangedCallback(std::string name, setting_changed_callback cbf, void *userdata = NULL);
private:
@@ -215,7 +215,7 @@ private:
std::map<std::string, SettingsEntry> m_settings;
std::map<std::string, SettingsEntry> m_defaults;
- std::map<std::string, std::vector<setting_changed_callback> > m_callbacks;
+ std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks;
// All methods that access m_settings/m_defaults directly should lock this.
mutable JMutex m_mutex;
};