projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into windows
[ardour.git]
/
libs
/
pbd
/
pbd
/
stateful.h
diff --git
a/libs/pbd/pbd/stateful.h
b/libs/pbd/pbd/stateful.h
index 36c6fe28c7184cac9633cf7c9efb564716816834..4808bc2911f816b3e6e5634342dab488a5bd0433 100644
(file)
--- a/
libs/pbd/pbd/stateful.h
+++ b/
libs/pbd/pbd/stateful.h
@@
-91,7
+91,7
@@
class Stateful {
virtual void suspend_property_changes ();
virtual void resume_property_changes ();
virtual void suspend_property_changes ();
virtual void resume_property_changes ();
- bool property_changes_suspended() const { return g_atomic_int_get (
&_stateful_frozen
) > 0; }
+ bool property_changes_suspended() const { return g_atomic_int_get (
const_cast<gint*>(&_stateful_frozen)
) > 0; }
protected:
protected:
@@
-110,7
+110,7
@@
class Stateful {
XMLNode *_extra_xml;
XMLNode *_instant_xml;
PBD::PropertyChange _pending_changed;
XMLNode *_extra_xml;
XMLNode *_instant_xml;
PBD::PropertyChange _pending_changed;
- Glib::Mutex _lock;
+ Glib::
Threads::
Mutex _lock;
std::string _xml_node_name; ///< name of node to use for this object in XML
OwnedPropertyList* _properties;
std::string _xml_node_name; ///< name of node to use for this object in XML
OwnedPropertyList* _properties;
@@
-123,7
+123,7
@@
class Stateful {
private:
PBD::ID _id;
private:
PBD::ID _id;
-
int32_t
_stateful_frozen;
+
gint
_stateful_frozen;
};
} // namespace PBD
};
} // namespace PBD