summaryrefslogtreecommitdiff
path: root/libs/ardour/automation_list.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-03-02 18:05:26 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-03-02 18:05:26 +0000
commit17088ee3ea5af1e6174b098bb5bcfdaec6ebf9b0 (patch)
treecbf9fe8fb94212f9a50c6b760ebaac3b4a1bcec6 /libs/ardour/automation_list.cc
parenta5ab2e99e19d5f5d4c1f91f38cd774fefdf257dc (diff)
(1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state from Region into Stateful, renamed "suspend property changes" (3) successive changes to a Property (scalar) after clear_history() do not keep resetting the old value (fixes region trim)
git-svn-id: svn://localhost/ardour2/branches/3.0@6720 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/automation_list.cc')
-rw-r--r--libs/ardour/automation_list.cc18
1 files changed, 6 insertions, 12 deletions
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 479674aee6..92a3d167da 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -170,7 +170,7 @@ AutomationList::maybe_signal_changed ()
{
ControlList::maybe_signal_changed ();
- if (!_frozen) {
+ if (!ControlList::frozen()) {
StateChanged (); /* EMIT SIGNAL */
}
}
@@ -208,12 +208,6 @@ AutomationList::stop_touch ()
}
void
-AutomationList::freeze ()
-{
- _frozen++;
-}
-
-void
AutomationList::thaw ()
{
ControlList::thaw();
@@ -313,7 +307,7 @@ AutomationList::deserialize_events (const XMLNode& node)
return -1;
}
- freeze ();
+ ControlList::freeze ();
clear ();
stringstream str (content_node->content());
@@ -344,8 +338,8 @@ AutomationList::deserialize_events (const XMLNode& node)
maybe_signal_changed ();
}
- thaw ();
-
+ ControlList::thaw ();
+
return 0;
}
@@ -377,7 +371,7 @@ AutomationList::set_state (const XMLNode& node, int version)
nframes_t x;
double y;
- freeze ();
+ ControlList::freeze ();
clear ();
for (i = elist.begin(); i != elist.end(); ++i) {
@@ -397,7 +391,7 @@ AutomationList::set_state (const XMLNode& node, int version)
fast_simple_add (x, y);
}
- thaw ();
+ ControlList::thaw ();
return 0;
}