ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Allow region-based automation axes to report whether they

Browse Source 
have automation data or not.  Should fix #3177.


git-svn-id: svn://localhost/ardour2/branches/3.0@7158 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-05-25 15:51:32 +00:00
parent ef94fbf11c
commit a57b9cdd99
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/automation_streamview.cc
View File

@ -209,3 +209,20 @@ AutomationStreamView::automation_state () const
return line->the_list()->automation_state ();
}
bool
AutomationStreamView::has_automation () const
{
list<RegionView*>::const_iterator i = region_views.begin ();
while (i != region_views.end()) {
AutomationRegionView* rv = static_cast<AutomationRegionView*> (*i);
if (rv->line() && rv->line()->npoints() > 0) {
return true;
}
++i;
}
return false;
}

2
gtk2_ardour/automation_streamview.h
View File

@ -54,6 +54,8 @@ class AutomationStreamView : public StreamView
return (_trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2);
}
bool has_automation () const;
private:
void setup_rec_box ();

7
gtk2_ardour/automation_time_axis.cc
View File

@ -941,3 +941,10 @@ AutomationTimeAxisView::set_visibility (bool yn)
return changed;
}
/** @return true if this view has any automation data to display */
bool
AutomationTimeAxisView::has_automation () const
{
return ( (_line && _line->npoints() > 0) || (_view && _view->has_automation()) );
}

2
gtk2_ardour/automation_time_axis.h
View File

@ -105,6 +105,8 @@ class AutomationTimeAxisView : public TimeAxisView {
return _base_rect;
}
bool has_automation () const;
protected:
boost::shared_ptr<ARDOUR::Route> _route; ///< Parent route
boost::shared_ptr<ARDOUR::AutomationControl> _control; ///< Control

2
gtk2_ardour/route_time_axis.cc
View File

@ -1676,7 +1676,7 @@ RouteTimeAxisView::show_existing_automation ()
/* Show our automation */
for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
if (i->second->line() && i->second->line()->npoints() > 0) {
if (i->second->has_automation()) {
i->second->set_marked_for_display (true);
i->second->canvas_display()->show();
i->second->get_state_node()->add_property ("shown", X_("yes"));