X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fstateful.cc;h=105af75861d4e87ed4b120a78f4df4c0f1174db5;hb=9cbe231b920d92a2e44e08962a3ed6870b962f34;hp=e65eb8d0700c5393140f565abd1a79f5bc119feb;hpb=4e62adfe1a8e7b8158204ee6c0d1fe97c3fdca04;p=ardour.git diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc index e65eb8d070..105af75861 100644 --- a/libs/pbd/stateful.cc +++ b/libs/pbd/stateful.cc @@ -20,12 +20,14 @@ #include +#include +#include + #include "pbd/debug.h" #include "pbd/stateful.h" #include "pbd/property_list.h" #include "pbd/properties.h" #include "pbd/destructible.h" -#include "pbd/filesystem.h" #include "pbd/xml++.h" #include "pbd/error.h" @@ -39,8 +41,8 @@ int Stateful::current_state_version = 0; int Stateful::loading_state_version = 0; Stateful::Stateful () - : _frozen (0) - , _properties (new OwnedPropertyList) + : _properties (new OwnedPropertyList) + , _stateful_frozen (0) { _extra_xml = 0; _instant_xml = 0; @@ -68,28 +70,48 @@ Stateful::add_extra_xml (XMLNode& node) } XMLNode * -Stateful::extra_xml (const string& str) +Stateful::extra_xml (const string& str, bool add_if_missing) { - if (_extra_xml == 0) { - return 0; + XMLNode* node = 0; + + if (_extra_xml) { + node = _extra_xml->child (str.c_str()); } - const XMLNodeList& nlist = _extra_xml->children(); - XMLNodeConstIterator i; + if (!node && add_if_missing) { + node = new XMLNode (str); + add_extra_xml (*node); + } - for (i = nlist.begin(); i != nlist.end(); ++i) { - if ((*i)->name() == str) { - return (*i); - } - } + return node; +} - return 0; +void +Stateful::save_extra_xml (const XMLNode& node) +{ + /* Looks for the child node called "Extra" and makes _extra_xml + point to a copy of it. Will delete any existing node pointed + to by _extra_xml if a new Extra node is found, but not + otherwise. + */ + + const XMLNode* xtra = node.child ("Extra"); + + if (xtra) { + delete _extra_xml; + _extra_xml = new XMLNode (*xtra); + } } void -Stateful::add_instant_xml (XMLNode& node, const sys::path& directory_path) +Stateful::add_instant_xml (XMLNode& node, const std::string& directory_path) { - sys::create_directories (directory_path); // may throw + if (!Glib::file_test (directory_path, Glib::FILE_TEST_IS_DIR)) { + if (g_mkdir_with_parents (directory_path.c_str(), 0755) != 0) { + error << string_compose(_("Error: could not create directory %1"), directory_path) << endmsg; + return; + } + } if (_instant_xml == 0) { _instant_xml = new XMLNode ("instant"); @@ -98,12 +120,10 @@ Stateful::add_instant_xml (XMLNode& node, const sys::path& directory_path) _instant_xml->remove_nodes_and_delete (node.name()); _instant_xml->add_child_copy (node); - sys::path instant_xml_path(directory_path); - - instant_xml_path /= "instant.xml"; + std::string instant_xml_path = Glib::build_filename (directory_path, "instant.xml"); XMLTree tree; - tree.set_filename(instant_xml_path.to_string()); + tree.set_filename(instant_xml_path); /* Important: the destructor for an XMLTree deletes all of its nodes, starting at _root. We therefore @@ -119,24 +139,23 @@ Stateful::add_instant_xml (XMLNode& node, const sys::path& directory_path) tree.set_root (copy); if (!tree.write()) { - error << string_compose(_("Error: could not write %1"), instant_xml_path.to_string()) << endmsg; + error << string_compose(_("Error: could not write %1"), instant_xml_path) << endmsg; } } XMLNode * -Stateful::instant_xml (const string& str, const sys::path& directory_path) +Stateful::instant_xml (const string& str, const std::string& directory_path) { if (_instant_xml == 0) { - sys::path instant_xml_path(directory_path); - instant_xml_path /= "instant.xml"; + std::string instant_xml_path = Glib::build_filename (directory_path, "instant.xml"); - if (exists(instant_xml_path)) { + if (Glib::file_test (instant_xml_path, Glib::FILE_TEST_EXISTS)) { XMLTree tree; - if (tree.read(instant_xml_path.to_string())) { + if (tree.read(instant_xml_path)) { _instant_xml = new XMLNode(*(tree.root())); } else { - warning << string_compose(_("Could not understand XML file %1"), instant_xml_path.to_string()) << endmsg; + warning << string_compose(_("Could not understand XML file %1"), instant_xml_path) << endmsg; return 0; } } else { @@ -178,7 +197,7 @@ Stateful::get_changes_as_properties (Command* cmd) const } /** Set our property values from an XML node. - * Derived types can call this from ::set_state() (or elsewhere) + * Derived types can call this from set_state() (or elsewhere) * to get basic property setting done. * @return IDs of properties that were changed. */ @@ -259,8 +278,8 @@ Stateful::send_change (const PropertyChange& what_changed) } { - Glib::Mutex::Lock lm (_lock); - if (_frozen) { + Glib::Threads::Mutex::Lock lm (_lock); + if (property_changes_suspended ()) { _pending_changed.add (what_changed); return; } @@ -272,7 +291,7 @@ Stateful::send_change (const PropertyChange& what_changed) void Stateful::suspend_property_changes () { - _frozen++; + g_atomic_int_add (&_stateful_frozen, 1); } void @@ -281,9 +300,9 @@ Stateful::resume_property_changes () PropertyChange what_changed; { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); - if (_frozen && --_frozen > 0) { + if (property_changes_suspended() && g_atomic_int_dec_and_test (&_stateful_frozen) == FALSE) { return; } @@ -354,5 +373,29 @@ Stateful::clear_owned_changes () } } +bool +Stateful::set_id (const XMLNode& node) +{ + const XMLProperty* prop; + + if ((prop = node.property ("id")) != 0) { + _id = prop->value (); + return true; + } + + return false; +} + +void +Stateful::reset_id () +{ + _id = ID (); +} + +void +Stateful::set_id (const string& str) +{ + _id = str; +} } // namespace PBD