summaryrefslogtreecommitdiff
path: root/gtk2_ardour/automation_time_axis.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-09-27 18:56:26 +0000
committerCarl Hetherington <carl@carlh.net>2010-09-27 18:56:26 +0000
commit74cc8f6067f9a7e6560e8abca9ec0a205597c028 (patch)
tree1bce480d2134ac33bbe5295841288f1d92444e52 /gtk2_ardour/automation_time_axis.cc
parent8000b39c8cbfdafbf806e04f9db7f82c81f92cae (diff)
Fix multiple creation of identical automation tracks. Fixes #3482.
git-svn-id: svn://localhost/ardour2/branches/3.0@7848 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
-rw-r--r--gtk2_ardour/automation_time_axis.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 63c755139d..ba76f68e18 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -193,9 +193,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
controls_base_unselected_name = X_("AutomationTrackControlsBase");
controls_ebox.set_name (controls_base_unselected_name);
- XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node (
- _control->parameter(), Stateful::loading_state_version
- );
+ XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node (_control->parameter());
if (xml_node) {
set_state (*xml_node, Stateful::loading_state_version);
@@ -404,7 +402,7 @@ AutomationTimeAxisView::set_height (uint32_t h)
TimeAxisView* state_parent = get_parent_with_state ();
assert(state_parent);
- XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter(), Stateful::loading_state_version);
+ XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter());
TimeAxisView::set_height (h);
_base_rect->property_y2() = h;
@@ -995,7 +993,7 @@ AutomationTimeAxisView::get_state_node ()
TimeAxisView* state_parent = get_parent_with_state ();
if (state_parent) {
- return state_parent->get_automation_child_xml_node (_control->parameter(), Stateful::loading_state_version);
+ return state_parent->get_automation_child_xml_node (_control->parameter());
} else {
return 0;
}