Add legatize and remove overlap MIDI operations.

We're going to need the ability to apply MIDI edit operations to a note/control
selection soon...

7 files changed, 44 insertions, 0 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 6ff7e18f48..d7bd5eac7b 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -252,6 +252,8 @@
         <menuitem action='transpose-region'/>
         <menuitem action='insert-patch-change'/>
         <menuitem action='quantize-region'/>
+        <menuitem action='legatize-region'/>
+        <menuitem action='remove-overlap'/>
         <menuitem action='fork-region'/>
         <menuitem action='show-region-list-editor'/>
       </menu>
@@ -632,6 +634,8 @@
       <menuitem action='transpose-region'/>
       <menuitem action='insert-patch-change-context'/>
       <menuitem action='quantize-region'/>
+      <menuitem action='legatize-region'/>
+      <menuitem action='remove-overlap'/>
       <menuitem action='fork-region'/>
       <menuitem action='show-region-list-editor'/>
     </menu>
diff --git a/gtk2_ardour/editor.bindings b/gtk2_ardour/editor.bindings
index afef5d8da6..7c23fb2cdc 100644
--- a/gtk2_ardour/editor.bindings
+++ b/gtk2_ardour/editor.bindings
@@ -33,6 +33,8 @@
   <Binding action="Region/cut-region-gain" key="ampersand"/>
   <Binding action="Common/Quit" key="Primary-q"/>
   <Binding action="Region/quantize-region" key="q"/>
+  <Binding action="Region/legatize-region" key="Primary-apostrophe"/>
+  <Binding action="Region/remove-overlap" key="Secondary-apostrophe"/>
   <Binding action="MouseMode/toggle-internal-edit" key="e"/>
   <Binding action="Editor/select-all-before-edit-cursor" key="Primary-e"/>
   <Binding action="Region/export-region" key="Primary-Level4-e"/>
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 09b81c4e64..5bb44a1abc 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1190,6 +1190,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void reset_region_scale_amplitude ();
 	void adjust_region_gain (bool up);
 	void quantize_region ();
+	void legatize_region (bool shrink_only);
 	void insert_patch_change (bool from_context);
 	void fork_region ();
 
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index e8125ef593..244b0b00e1 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1953,6 +1953,8 @@ Editor::register_region_actions ()
 		);
 
 	reg_sens (_region_actions, "quantize-region", _("Quantize..."), sigc::mem_fun (*this, &Editor::quantize_region));
+	reg_sens (_region_actions, "legatize-region", _("Legatize"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), false));
+	reg_sens (_region_actions, "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true));
 	reg_sens (_region_actions, "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false));
 	reg_sens (_region_actions, "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true));
 	reg_sens (_region_actions, "fork-region", _("Unlink from other copies"), sigc::mem_fun (*this, &Editor::fork_region));
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 4d4176d421..b5ee683999 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -50,6 +50,7 @@
 #include "ardour/playlist_factory.h"
 #include "ardour/profile.h"
 #include "ardour/quantize.h"
+#include "ardour/legatize.h"
 #include "ardour/region_factory.h"
 #include "ardour/reverse.h"
 #include "ardour/session.h"
@@ -4988,6 +4989,36 @@ Editor::quantize_region ()
 }
 
 void
+Editor::legatize_region (bool shrink_only)
+{
+	int selected_midi_region_cnt = 0;
+
+	if (!_session) {
+		return;
+	}
+
+	RegionSelection rs = get_regions_from_selection_and_entered ();
+
+	if (rs.empty()) {
+		return;
+	}
+
+	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
+		MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
+		if (mrv) {
+			selected_midi_region_cnt++;
+		}
+	}
+
+	if (selected_midi_region_cnt == 0) {
+		return;
+	}
+
+	Legatize legatize(shrink_only);
+	apply_midi_note_edit_op (legatize);
+}
+
+void
 Editor::insert_patch_change (bool from_context)
 {
 	RegionSelection rs = get_regions_from_selection_and_entered ();
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 26643bddd5..2699ba72f3 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1181,6 +1181,8 @@ Editor::sensitize_the_right_region_actions ()
 		editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (false);
 		_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
 		_region_actions->get_action("quantize-region")->set_sensitive (false);
+		_region_actions->get_action("legatize-region")->set_sensitive (false);
+		_region_actions->get_action("remove-overlap")->set_sensitive (false);
 		_region_actions->get_action("fork-region")->set_sensitive (false);
 		_region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
 		_region_actions->get_action("insert-patch-change")->set_sensitive (false);
diff --git a/gtk2_ardour/trx.menus.in b/gtk2_ardour/trx.menus.in
index 07efb78789..a428368b48 100644
--- a/gtk2_ardour/trx.menus.in
+++ b/gtk2_ardour/trx.menus.in
@@ -253,6 +253,8 @@
       <menuitem action='transpose-region'/>
       <menuitem action='insert-patch-change-context'/>
       <menuitem action='quantize-region'/>
+      <menuitem action='legatize-region'/>
+      <menuitem action='remove-overlap'/>
       <menuitem action='fork-region'/>
       <menuitem action='show-region-list-editor'/>
     </menu>