diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 20:16:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 20:16:57 +0000 |
| commit | 99aa8c6338e47b41143f799fdcb35d1699548076 (patch) | |
| tree | a61140fd331b49a408894f00dcb8976cbb6543b8 /gtk2_ardour/editor_selection.cc | |
| parent | 4b848856ebc2856bf7ab10a000cc88bdd3bc4a4a (diff) | |
rename join regions op as combine regions; save and restore nested playlists, sources, regions; add undo/redo for combine; fixup peakfile use/discovery
git-svn-id: svn://localhost/ardour2/branches/3.0@9528 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 7998a4bfa6..3ec11ea410 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -957,7 +957,6 @@ Editor::sensitize_the_right_region_actions () if (!selection->time.empty()) { _region_actions->get_action("split-region")->set_sensitive (true); } - return; } else if (mouse_mode != MouseObject) { @@ -1063,9 +1062,11 @@ Editor::sensitize_the_right_region_actions () _region_actions->get_action("show-region-list-editor")->set_sensitive (false); _region_actions->get_action("show-region-properties")->set_sensitive (false); _region_actions->get_action("rename-region")->set_sensitive (false); + _region_actions->get_action("combine-regions")->set_sensitive (true); } else if (rs.size() == 1) { _region_actions->get_action("add-range-markers-from-region")->set_sensitive (false); _region_actions->get_action("close-region-gaps")->set_sensitive (false); + _region_actions->get_action("combine-regions")->set_sensitive (false); } if (!have_midi) { |