ardour/livetrax
13
0
Fork 0
Code

add API to query stateful ID override mode

Browse Source
This commit is contained in:
Robin Gareus 2015-12-17 23:18:22 +01:00
parent 91f5cd008c
commit b48d87b3ea
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/pbd/pbd/stateful.h
View File

@ -131,9 +131,11 @@ class LIBPBD_API Stateful {
*/
virtual void mid_thaw (const PropertyChange&) { }
bool regenerate_xml_or_string_ids () const;
private:
friend struct ForceIDRegeneration;
static Glib::Threads::Private<bool> regenerate_xml_or_string_ids;
static Glib::Threads::Private<bool> _regenerate_xml_or_string_ids;
PBD::ID _id;
gint _stateful_frozen;

19
libs/pbd/stateful.cc
View File

@ -44,7 +44,7 @@ namespace PBD {
int Stateful::current_state_version = 0;
int Stateful::loading_state_version = 0;
Glib::Threads::Private<bool> Stateful::regenerate_xml_or_string_ids;
Glib::Threads::Private<bool> Stateful::_regenerate_xml_or_string_ids;
Stateful::Stateful ()
: _extra_xml (0)
@ -383,7 +383,7 @@ bool
Stateful::set_id (const XMLNode& node)
{
const XMLProperty* prop;
bool* regen = regenerate_xml_or_string_ids.get();
bool* regen = _regenerate_xml_or_string_ids.get();
if (regen && *regen) {
reset_id ();
@ -407,7 +407,7 @@ Stateful::reset_id ()
void
Stateful::set_id (const string& str)
{
bool* regen = regenerate_xml_or_string_ids.get();
bool* regen = _regenerate_xml_or_string_ids.get();
if (regen && *regen) {
reset_id ();
@ -416,11 +416,22 @@ Stateful::set_id (const string& 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);
_regenerate_xml_or_string_ids.set (val);
}
} // namespace PBD