summaryrefslogtreecommitdiff
path: root/gtk2_ardour/automation_time_axis.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-09-19 17:24:52 +0000
committerDavid Robillard <d@drobilla.net>2008-09-19 17:24:52 +0000
commit7aea02083a207402405cc4869b892dd63da191b6 (patch)
tree96a5bc45a89314cee0c0c52a5feb8e4e95492610 /gtk2_ardour/automation_time_axis.cc
parent68f04adec110a991e2b2c1657e67a7dc791decc1 (diff)
Restore visible CC/etc automation tracks on session load.
Fix CC/channel mismatch when creating a new CC track. Always display CC with 1-based numbering (like channel). git-svn-id: svn://localhost/ardour2/branches/3.0@3763 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
-rw-r--r--gtk2_ardour/automation_time_axis.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 07a47f274e..7ef763c235 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -868,7 +868,7 @@ AutomationTimeAxisView::color_handler ()
int
AutomationTimeAxisView::set_state (const XMLNode& node)
{
- return TimeAxisView::set_state (node);
+ TimeAxisView::set_state (node);
XMLNodeList kids;
XMLNodeConstIterator iter;
@@ -894,6 +894,8 @@ AutomationTimeAxisView::set_state (const XMLNode& node)
if (!_marked_for_display)
hide();
+
+ return 0;
}
XMLNode*