From a4f7c21ec38e59281b4755b6b96651f0b310cdd2 Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Wed, 7 Jan 2015 15:31:05 -0600
Subject: 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

---
 gtk2_ardour/ardour.menus.in | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'gtk2_ardour/ardour.menus.in')

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'/>
-- 
cgit v1.2.3