diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-30 11:57:12 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-30 11:57:12 +0000 |
| commit | c937a67f6ee7e9f280a097683528201489ae6930 (patch) | |
| tree | 76a01b4fa68cbd18f5aa3fc9a0d3fec44b6d88cf /gtk2_ardour/route_time_axis.cc | |
| parent | 0a9f5423f5b3faede68fe7c384c5fe32db2e23bf (diff) | |
do not offer combine operation for MIDI (see comment in libs/ardour/midi_playlist_source.cc for an explanation)
git-svn-id: svn://localhost/ardour2/branches/3.0@9630 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 86832de764..1c9b02ba95 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -2488,7 +2488,12 @@ void add_region_to_list (RegionView* rv, Playlist::RegionList* l) RegionView* RouteTimeAxisView::combine_regions () { - assert (is_track()); + /* as of may 2011, we do not offer uncombine for MIDI tracks + */ + + if (!is_audio_track()) { + return 0; + } if (!_view) { return 0; @@ -2515,7 +2520,11 @@ RouteTimeAxisView::combine_regions () void RouteTimeAxisView::uncombine_regions () { - assert (is_track()); + /* as of may 2011, we do not offer uncombine for MIDI tracks + */ + if (!is_audio_track()) { + return; + } if (!_view) { return; |