r258@gwythaint (orig r798): fugalh | 2006-08-12 15:50:33 -0600

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 29201336347c13ece46fa8ffd1032eef273a2f7b..95289c7f5a52fecfe33e7f31f5db290c37f62c47 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -19,11 +19,15 @@
 */
 
 #include <ardour/audioregion.h>
+#include <ardour/playlist.h>
+#include <pbd/memento_command.h>
 
 #include "editor.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 
+#include "i18n.h"
+
 void
 Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
 {
@@ -78,10 +82,10 @@ Editor::kbd_do_split (GdkEvent* ev)
        jack_nframes_t where = event_frame (ev);
 
        if (entered_regionview) {
-               if (selection->audio_regions.find (entered_regionview) != selection->audio_regions.end()) {
-                       split_regions_at (where, selection->audio_regions);
+               if (selection->regions.find (entered_regionview) != selection->regions.end()) {
+                       split_regions_at (where, selection->regions);
                } else {
-                       AudioRegionSelection s;
+                       RegionSelection s;
                        s.add (entered_regionview);
                        split_regions_at (where, s);
                }
@@ -98,7 +102,14 @@ void
 Editor::kbd_mute_unmute_region ()
 {
        if (entered_regionview) {
-              entered_regionview->region.set_muted (!entered_regionview->region.muted());
+               begin_reversible_command (_("mute region"));
+               XMLNode &before = entered_regionview->region().playlist()->get_state();
+               
+           entered_regionview->region().set_muted (!entered_regionview->region().muted());
+               
+               XMLNode &after = entered_regionview->region().playlist()->get_state();
+               session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region().playlist()), &before, &after));
+               commit_reversible_command();
        }
 }
 
@@ -111,11 +122,11 @@ Editor::kbd_set_sync_position ()
 void
 Editor::kbd_do_set_sync_position (GdkEvent* ev)
 {
-        jack_nframes_t where = event_frame (ev);
+    jack_nframes_t where = event_frame (ev);
        snap_to (where);
 
        if (entered_regionview) {
-               entered_regionview->region.set_sync_position (where);
+         set_a_regions_sync_position (entered_regionview->region(), where);
        }
 }