diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2015-01-07 15:31:05 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-01-07 15:31:30 -0600 |
| commit | a4f7c21ec38e59281b4755b6b96651f0b310cdd2 (patch) | |
| tree | 4049d0617956090d9acfbbf70d282f080b7ce314 /gtk2_ardour/ardour.menus.in | |
| parent | 915a840119132b7994e25796859d3bcdd6f9a775 (diff) | |
now that regions and range selections are exclusive, the separate actions to set ranges or zoom to selections are redundant. save some menu entries and keybindings by consolidating them. also consolidate some code with new function get_selection_extents(). as a side-effect, this checkin fixes the assert failure in play_with_preroll
Diffstat (limited to 'gtk2_ardour/ardour.menus.in')
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index c609724957..2bfbac6451 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -51,8 +51,6 @@ <menu name='Transport' action='Transport'> <menuitem action='ToggleRoll'/> <menu action="PlayMenu"> - <menuitem action='main-menu-play-selected-regions'/> - <menuitem action='play-edit-range'/> <menuitem action='PlaySelection'/> <menuitem action='PlayPreroll'/> <menuitem action='play-from-edit-point-and-return'/> @@ -65,14 +63,8 @@ #if 0 <menuitem action='toggle-skip-playback'/> #endif - <menu action="SetLoopMenu"> - <menuitem action='set-loop-from-edit-range'/> - <menuitem action='set-loop-from-region'/> - </menu> - <menu action="SetPunchMenu"> - <menuitem action='set-punch-from-edit-range'/> - <menuitem action='set-punch-from-region'/> - </menu> + <menuitem action='set-loop-from-edit-range'/> + <menuitem action='set-punch-from-edit-range'/> <separator/> <menuitem action='Forward'/> |