smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix more broken whitespace.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8318 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2010-12-21 00:41:13 +00:00
parent 384c418ae0
commit 4e62adfe1a
2 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

46
libs/pbd/pbd/properties.h
View file

@ -138,33 +138,33 @@ public:
_old = tmp; _old = tmp;
} }
void get_changes_as_properties (PropertyList& changes, Command *) const { void get_changes_as_properties (PropertyList& changes, Command *) const {
if (this->_have_old) { if (this->_have_old) {
changes.add (clone ()); changes.add (clone ());
} }
} }
protected: protected:
void set (T const& v) { void set (T const& v) {
if (v != _current) { if (v != _current) {
if (!_have_old) { if (!_have_old) {
_old = _current; _old = _current;
_have_old = true; _have_old = true;
} else { } else {
if (v == _old) { if (v == _old) {
/* value has been reset to the value /* value has been reset to the value
at the start of a history transaction, at the start of a history transaction,
before clear_changes() is called. before clear_changes() is called.
thus there is effectively no apparent thus there is effectively no apparent
history for this property. history for this property.
*/ */
_have_old = false; _have_old = false;
} }
} }
_current = v; _current = v;
} }
} }
virtual std::string to_string (T const& v) const = 0; virtual std::string to_string (T const& v) const = 0;
@ -210,7 +210,7 @@ public:
return new Property<T> (this->property_id(), this->_old, this->_current); return new Property<T> (this->property_id(), this->_old, this->_current);
} }
Property<T>* clone_from_xml (const XMLNode& node) const { Property<T>* clone_from_xml (const XMLNode& node) const {
XMLNodeList const & children = node.children (); XMLNodeList const & children = node.children ();
XMLNodeList::const_iterator i = children.begin(); XMLNodeList::const_iterator i = children.begin();
while (i != children.end() && (*i)->name() != this->property_name()) { while (i != children.end() && (*i)->name() != this->property_name()) {
@ -228,7 +228,7 @@ public:
} }
return new Property<T> (this->property_id(), from_string (from->value()), from_string (to->value ())); return new Property<T> (this->property_id(), from_string (from->value()), from_string (to->value ()));
} }
T & operator=(T const& v) { T & operator=(T const& v) {
this->set (v); this->set (v);

64
libs/pbd/stateful.cc
View file

@ -39,8 +39,8 @@ int Stateful::current_state_version = 0;
int Stateful::loading_state_version = 0; int Stateful::loading_state_version = 0;
Stateful::Stateful () Stateful::Stateful ()
: _frozen (0) : _frozen (0)
, _properties (new OwnedPropertyList) , _properties (new OwnedPropertyList)
{ {
_extra_xml = 0; _extra_xml = 0;
_instant_xml = 0; _instant_xml = 0;
@ -48,7 +48,7 @@ Stateful::Stateful ()
Stateful::~Stateful () Stateful::~Stateful ()
{ {
delete _properties; 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. // means it needs to live on indefinately.
@ -186,7 +186,7 @@ PropertyChange
Stateful::set_values (XMLNode const & node) Stateful::set_values (XMLNode const & node)
{ {
PropertyChange c; PropertyChange c;
for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) { for (OwnedPropertyList::iterator i = _properties->begin(); i != _properties->end(); ++i) {
if (i->second->set_value (node)) { if (i->second->set_value (node)) {
c.add (i->first); c.add (i->first);
@ -204,16 +204,16 @@ Stateful::apply_changes (const PropertyList& property_list)
PropertyChange c; PropertyChange c;
PropertyList::const_iterator p; PropertyList::const_iterator p;
DEBUG_TRACE (DEBUG::Stateful, string_compose ("Stateful %1 setting properties from list of %2\n", this, property_list.size())); DEBUG_TRACE (DEBUG::Stateful, string_compose ("Stateful %1 setting properties from list of %2\n", this, property_list.size()));
for (PropertyList::const_iterator pp = property_list.begin(); pp != property_list.end(); ++pp) { 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())); 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) { for (PropertyList::const_iterator i = property_list.begin(); i != property_list.end(); ++i) {
if ((p = _properties->find (i->first)) != _properties->end()) { if ((p = _properties->find (i->first)) != _properties->end()) {
DEBUG_TRACE ( DEBUG_TRACE (
DEBUG::Stateful, DEBUG::Stateful,
string_compose ("actually setting property %1 using %2\n", p->second->property_name(), i->second->property_name()) string_compose ("actually setting property %1 using %2\n", p->second->property_name(), i->second->property_name())
); );
@ -222,9 +222,9 @@ Stateful::apply_changes (const PropertyList& property_list)
c.add (i->first); c.add (i->first);
} }
} else { } else {
DEBUG_TRACE (DEBUG::Stateful, string_compose ("passed in property %1 not found in own property list\n", DEBUG_TRACE (DEBUG::Stateful, string_compose ("passed in property %1 not found in own property list\n",
i->second->property_name())); i->second->property_name()));
} }
} }
post_set (c); post_set (c);
@ -248,7 +248,7 @@ Stateful::add_properties (XMLNode& owner_state)
void void
Stateful::add_property (PropertyBase& s) Stateful::add_property (PropertyBase& s)
{ {
_properties->add (s); _properties->add (s);
} }
void void
@ -272,7 +272,7 @@ Stateful::send_change (const PropertyChange& what_changed)
void void
Stateful::suspend_property_changes () Stateful::suspend_property_changes ()
{ {
_frozen++; _frozen++;
} }
void void
@ -293,21 +293,21 @@ Stateful::resume_property_changes ()
} }
} }
mid_thaw (what_changed); mid_thaw (what_changed);
send_change (what_changed); send_change (what_changed);
} }
bool bool
Stateful::changed() const Stateful::changed() const
{ {
for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) { for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) {
if (i->second->changed()) { if (i->second->changed()) {
return true; return true;
} }
} }
return false; return false;
} }
bool bool
@ -325,17 +325,17 @@ Stateful::apply_changes (const PropertyBase& prop)
PropertyList* PropertyList*
Stateful::property_factory (const XMLNode& history_node) const Stateful::property_factory (const XMLNode& history_node) const
{ {
PropertyList* prop_list = new PropertyList; PropertyList* prop_list = new PropertyList;
for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) { for (OwnedPropertyList::const_iterator i = _properties->begin(); i != _properties->end(); ++i) {
PropertyBase* prop = i->second->clone_from_xml (history_node); PropertyBase* prop = i->second->clone_from_xml (history_node);
if (prop) { if (prop) {
prop_list->add (prop); prop_list->add (prop);
} }
} }
return prop_list; return prop_list;
} }
void void