X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fstateful.cc;h=8b8219f7e2243306f201f95257b035ec20b18cf0;hb=78b82b7ff2e28d53faae176776491404115ce02c;hp=0cea6324f5f78180b5b86387c53a4f5d64de133c;hpb=39f765614a7964e07c55a57ba854f8524807d6cb;p=ardour.git diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc index 0cea6324f5..8b8219f7e2 100644 --- a/libs/pbd/stateful.cc +++ b/libs/pbd/stateful.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2001 Paul Davis + Copyright (C) 2000-2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,18 +18,24 @@ $Id: stateful.cc 629 2006-06-21 23:01:03Z paul $ */ +#ifdef COMPILER_MSVC +#include // Microsoft's nearest equivalent to +#else #include +#endif + +#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" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; @@ -38,19 +44,21 @@ namespace PBD { int Stateful::current_state_version = 0; int Stateful::loading_state_version = 0; +Glib::Threads::Private Stateful::_regenerate_xml_or_string_ids; + Stateful::Stateful () - : _properties (new OwnedPropertyList) + : _extra_xml (0) + , _instant_xml (0) + , _properties (new OwnedPropertyList) , _stateful_frozen (0) { - _extra_xml = 0; - _instant_xml = 0; } Stateful::~Stateful () { delete _properties; - // Do not delete _extra_xml. The use of add_child_nocopy() + // Do not delete _extra_xml. The use of add_child_nocopy() // means it needs to live on indefinately. delete _instant_xml; @@ -63,7 +71,7 @@ Stateful::add_extra_xml (XMLNode& node) _extra_xml = new XMLNode ("Extra"); } - _extra_xml->remove_nodes (node.name()); + _extra_xml->remove_nodes_and_delete (node.name()); _extra_xml->add_child_nocopy (node); } @@ -79,7 +87,7 @@ Stateful::extra_xml (const string& str, bool add_if_missing) if (!node && add_if_missing) { node = new XMLNode (str); add_extra_xml (*node); - } + } return node; } @@ -87,12 +95,12 @@ Stateful::extra_xml (const string& str, bool add_if_missing) void Stateful::save_extra_xml (const XMLNode& node) { - /* Looks for the child node called "Extra" and makes _extra_xml + /* 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) { @@ -102,9 +110,14 @@ Stateful::save_extra_xml (const XMLNode& node) } 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"); @@ -113,20 +126,18 @@ 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); + std::string instant_xml_path = Glib::build_filename (directory_path, "instant.xml"); - instant_xml_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 - cannot simply hand it our persistent _instant_xml + cannot simply hand it our persistent _instant_xml node as its _root, because we will lose it whenever the Tree goes out of scope. - So instead, copy the _instant_xml node (which does + So instead, copy the _instant_xml node (which does a deep copy), and hand that to the tree. */ @@ -134,24 +145,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 { @@ -184,7 +194,7 @@ 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->get_changes_as_properties (*pl, cmd); } @@ -201,7 +211,7 @@ PropertyChange Stateful::set_values (XMLNode const & node) { PropertyChange c; - + for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) { if (i->second->set_value (node)) { c.add (i->first); @@ -224,7 +234,7 @@ Stateful::apply_changes (const PropertyList& property_list) for (PropertyList::const_iterator pp = property_list.begin(); pp != property_list.end(); ++pp) { DEBUG_TRACE (DEBUG::Stateful, string_compose ("in plist: %1\n", pp->second->property_name())); } - + for (PropertyList::const_iterator i = property_list.begin(); i != property_list.end(); ++i) { if ((p = _properties->find (i->first)) != _properties->end()) { @@ -232,7 +242,7 @@ Stateful::apply_changes (const PropertyList& property_list) 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); } @@ -241,7 +251,7 @@ Stateful::apply_changes (const PropertyList& property_list) i->second->property_name())); } } - + post_set (c); send_change (c); @@ -274,7 +284,7 @@ Stateful::send_change (const PropertyChange& what_changed) } { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); if (property_changes_suspended ()) { _pending_changed.add (what_changed); return; @@ -296,7 +306,7 @@ Stateful::resume_property_changes () PropertyChange what_changed; { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); if (property_changes_suspended() && g_atomic_int_dec_and_test (&_stateful_frozen) == FALSE) { return; @@ -314,7 +324,7 @@ Stateful::resume_property_changes () } bool -Stateful::changed() const +Stateful::changed() const { for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) { if (i->second->changed()) { @@ -368,16 +378,22 @@ Stateful::clear_owned_changes () i->second->clear_owned_changes (); } } - + bool -Stateful::set_id (const XMLNode& node) +Stateful::set_id (const XMLNode& node) { const XMLProperty* prop; + bool* regen = _regenerate_xml_or_string_ids.get(); + + if (regen && *regen) { + reset_id (); + return true; + } if ((prop = node.property ("id")) != 0) { _id = prop->value (); return true; - } + } return false; } @@ -391,7 +407,31 @@ Stateful::reset_id () void Stateful::set_id (const string& str) { - _id = str; + bool* regen = _regenerate_xml_or_string_ids.get(); + + if (regen && *regen) { + reset_id (); + } else { + _id = str; + } +} + +bool +Stateful::regenerate_xml_or_string_ids () const +{ + bool* regen = _regenerate_xml_or_string_ids.get(); + if (regen && *regen) { + return true; + } else { + return false; + } +} + +void +Stateful::set_regenerate_xml_and_string_ids_in_this_thread (bool yn) +{ + bool* val = new bool (yn); + _regenerate_xml_or_string_ids.set (val); } } // namespace PBD