Modified patch from drmoore to fix mantis 2808 (drag rectangle left behind after...

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 6d8bbda6fd3142df090694ab89feb6548ff0fcae..69bfb3ba8af94bd395413ff016fd26ce0e30ae30 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -17,16 +17,17 @@
 
 */
 
-#include <ardour/audioregion.h>
-#include <ardour/playlist.h>
-#include <ardour/location.h>
+#include "ardour/audioregion.h"
+#include "ardour/playlist.h"
+#include "ardour/location.h"
 
-#include <pbd/memento_command.h>
+#include "pbd/memento_command.h"
 
 #include "editor.h"
 #include "region_view.h"
 #include "selection.h"
 #include "keyboard.h"
+#include "editor_drag.h"
 
 #include "i18n.h"
 
@@ -51,9 +52,10 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
        /* any use of "keyboard mouse buttons" invalidates an existing grab
        */
        
-       if (drag_info.item) {
-               drag_info.item->ungrab (GDK_CURRENT_TIME);
-               drag_info.item = 0;
+       if (_drag) {
+               _drag->item()->ungrab (GDK_CURRENT_TIME);
+               delete _drag;
+               _drag = 0;
        }
 
        if (doit) {
@@ -78,7 +80,28 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
 void
 Editor::kbd_mute_unmute_region ()
 {
-       if (entered_regionview) {
+       if (!selection->regions.empty ()) {
+
+               if (selection->regions.size() > 1) {
+                       begin_reversible_command (_("mute regions"));
+               } else {
+                       begin_reversible_command (_("mute region"));
+               }
+
+               for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+
+                       XMLNode &before = (*i)->region()->playlist()->get_state ();
+                       (*i)->region()->set_muted (!(*i)->region()->muted ());
+                       XMLNode &after = (*i)->region()->playlist()->get_state ();
+
+                       session->add_command (new MementoCommand<ARDOUR::Playlist>(*((*i)->region()->playlist()), &before, &after));
+
+               }
+
+               commit_reversible_command ();
+
+       } else if (entered_regionview) {
+               
                begin_reversible_command (_("mute region"));
                XMLNode &before = entered_regionview->region()->playlist()->get_state();
                
@@ -87,6 +110,7 @@ Editor::kbd_mute_unmute_region ()
                XMLNode &after = entered_regionview->region()->playlist()->get_state();
                session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region()->playlist()), &before, &after));
                commit_reversible_command();
+               
        }
 }