Fix deadlock.

[ardour.git] / libs / pbd / stateful.cc

diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc
index f2d9f9ee123493657c34ba48b604e235b875ef2d..c33418ce39fdcf82b3551aa3669e9a349e8e61d4 100644 (file)
--- a/libs/pbd/stateful.cc
+++ b/libs/pbd/stateful.cc
@@ -39,7 +39,8 @@ int Stateful::current_state_version = 0;
 int Stateful::loading_state_version = 0;
 
 Stateful::Stateful ()
-        : _properties (new OwnedPropertyList)
+        : _frozen (0)
+        , _properties (new OwnedPropertyList)
 {
        _extra_xml = 0;
        _instant_xml = 0;
@@ -155,34 +156,39 @@ Stateful::instant_xml (const string& str, const sys::path& directory_path)
        return 0;
 }
 
-/** Forget about any old state for this object */      
+/** Forget about any changes to this object's properties */
 void
-Stateful::clear_history ()
+Stateful::clear_changes ()
 {
        for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) {
-               i->second->clear_history ();
+               i->second->clear_changes ();
        }
 }
 
-void
-Stateful::diff (PropertyList& before, PropertyList& after) const
+PropertyList *
+Stateful::get_changes_as_properties (Command* cmd) const
 {
+       PropertyList* pl = new PropertyList;
+       
        for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) {
-               i->second->diff (before, after);
+               i->second->get_changes_as_properties (*pl, cmd);
        }
+
+       return pl;
 }
 
-/** Set state of some/all _properties from an XML node.
- *  @param node Node.
- *  @return PropertyChanges made.
+/** Set our property values from an XML node.
+ *  Derived types can call this from ::set_state() (or elsewhere)
+ *  to get basic property setting done.
+ *  @return IDs of properties that were changed.
  */
 PropertyChange
-Stateful::set_properties (XMLNode const & owner_state)
+Stateful::set_values (XMLNode const & node)
 {
        PropertyChange c;
         
        for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) {
-               if (i->second->set_state_from_owner_state (owner_state)) {
+               if (i->second->set_value (node)) {
                        c.add (i->first);
                }
        }
@@ -193,7 +199,7 @@ Stateful::set_properties (XMLNode const & owner_state)
 }
 
 PropertyChange
-Stateful::set_properties (const PropertyList& property_list)
+Stateful::apply_changes (const PropertyList& property_list)
 {
        PropertyChange c;
        PropertyList::const_iterator p;
@@ -206,8 +212,13 @@ Stateful::set_properties (const PropertyList& property_list)
         
         for (PropertyList::const_iterator i = property_list.begin(); i != property_list.end(); ++i) {
                 if ((p = _properties->find (i->first)) != _properties->end()) {
-                        DEBUG_TRACE (DEBUG::Stateful, string_compose ("actually setting property %1\n", p->second->property_name()));
-                       if (set_property (*i->second)) {
+
+                        DEBUG_TRACE (
+                               DEBUG::Stateful,
+                               string_compose ("actually setting property %1 using %2\n", p->second->property_name(), i->second->property_name())
+                               );
+                       
+                       if (apply_changes (*i->second)) {
                                c.add (i->first);
                        }
                } else {
@@ -218,17 +229,19 @@ Stateful::set_properties (const PropertyList& property_list)
        
        post_set ();
 
+       send_change (c);
+
        return c;
 }
 
 /** Add property states to an XML node.
- *  @param node Node.
+ *  @param owner_state Node.
  */
 void
 Stateful::add_properties (XMLNode& owner_state)
 {
        for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) {
-               i->second->add_state_to_owner_state (owner_state);
+               i->second->get_value (owner_state);
        }
 }
 
@@ -238,4 +251,108 @@ Stateful::add_property (PropertyBase& s)
         _properties->add (s);
 }
 
+void
+Stateful::send_change (const PropertyChange& what_changed)
+{
+       if (what_changed.empty()) {
+               return;
+       }
+
+       {
+               Glib::Mutex::Lock lm (_lock);
+               if (_frozen) {
+                       _pending_changed.add (what_changed);
+                       return;
+               }
+       }
+
+       PropertyChanged (what_changed);
+}
+
+void
+Stateful::suspend_property_changes ()
+{
+        _frozen++;
+}
+
+void
+Stateful::resume_property_changes ()
+{
+       PropertyChange what_changed;
+
+       {
+               Glib::Mutex::Lock lm (_lock);
+
+               if (_frozen && --_frozen > 0) {
+                       return;
+               }
+
+               if (!_pending_changed.empty()) {
+                       what_changed = _pending_changed;
+                       _pending_changed.clear ();
+               }
+       }
+
+        mid_thaw (what_changed);
+
+        send_change (what_changed);
+}
+
+bool
+Stateful::changed() const  
+{
+       for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) {
+                if (i->second->changed()) {
+                        return true;
+                }
+        }
+
+        return false;
+}
+
+bool
+Stateful::apply_changes (const PropertyBase& prop)
+{
+       OwnedPropertyList::iterator i = _properties->find (prop.property_id());
+       if (i == _properties->end()) {
+               return false;
+       }
+
+       i->second->apply_changes (&prop);
+       return true;
+}
+
+PropertyList*
+Stateful::property_factory (const XMLNode& history_node) const
+{
+        PropertyList* prop_list = new PropertyList;
+
+        for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) {
+                PropertyBase* prop = i->second->clone_from_xml (history_node);
+
+                if (prop) {
+                        prop_list->add (prop);
+                }
+        }
+
+        return prop_list;
+}
+
+void
+Stateful::rdiff (vector<Command*>& cmds) const
+{
+       for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) {
+               i->second->rdiff (cmds);
+       }
+}
+
+void
+Stateful::clear_owned_changes ()
+{
+       for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) {
+               i->second->clear_owned_changes ();
+       }
+}
+  
+
 } // namespace PBD