summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour.menus.in
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-05-27 01:04:56 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-05-27 01:04:56 +0000
commitf87baef1e73e21fb4f82558dbd4b5450b237b732 (patch)
tree44d76bf56925f0767bc70a95a01e6e66ded5062b /gtk2_ardour/ardour.menus.in
parente4a92029267dfc2f3e5ceac069f32aed3c133233 (diff)
somewhat illogical and temporary workaround to the problems with consolidate & bounceable. it turns out that region bouncing never replaces the in-place region, so bounceable() doesn't matter; range bouncing only needs to check bounceable() if we're going to replace material in place and the op is with-processing. reword the error dialog too
git-svn-id: svn://localhost/ardour2/branches/3.0@9606 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour.menus.in')
-rw-r--r--gtk2_ardour/ardour.menus.in18
1 files changed, 10 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index af423cbb23..8d21a4afa9 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -227,7 +227,8 @@
<menuitem action='remove-region-sync'/>
<menuitem action='play-selected-regions'/>
<menuitem action='export-region'/>
- <menuitem action='bounce-region'/>
+ <menuitem action='bounce-regions-processed'/>
+ <menuitem action='bounce-regions-unprocessed'/>
<menuitem action='combine-regions'/>
<menuitem action='uncombine-regions'/>
<menuitem action='analyze-region'/>
@@ -577,11 +578,16 @@
<popup name='PopupRegionMenu' action='PopupRegionMenu'>
<menuitem action='rename-region'/>
<menuitem action='show-region-properties'/>
+ <menuitem action='combine-regions'/>
+ <menuitem action='uncombine-regions'/>
+ <menuitem action='split-region'/>
+ <menuitem action='split-multichannel-region'/>
<menuitem action='set-region-sync-position'/>
<menuitem action='remove-region-sync'/>
<menuitem action='play-selected-regions'/>
<menuitem action='export-region'/>
- <menuitem action='bounce-region'/>
+ <menuitem action='bounce-regions-processed'/>
+ <menuitem action='bounce-regions-unprocessed'/>
<menuitem action='analyze-region'/>
<menuitem action='toggle-region-lock'/>
<menuitem action='toggle-region-lock-style'/>
@@ -590,18 +596,14 @@
<menuitem action='pitch-shift-region'/>
<menuitem action='transpose-region'/>
<menuitem action='naturalize-region'/>
- <menuitem action='combine-regions'/>
- <menuitem action='uncombine-regions'/>
- <menuitem action='split-region'/>
- <menuitem action='split-multichannel-region'/>
- <menuitem action='remove-region'/>
+ <menuitem action='reverse-region'/>
<menuitem action='loop-region'/>
<menuitem action='snap-regions-to-grid'/>
<menuitem action='close-region-gaps'/>
<menuitem action='place-transient' />
<menuitem action='show-rhythm-ferret'/>
<menuitem action='strip-region-silence'/>
- <menuitem action='reverse-region'/>
+ <menuitem action='remove-region'/>
<menu action='RegionMenuLayering'>
<menuitem action='raise-region-to-top'/>
<menuitem action='raise-region'/>