use ustring more; handle embedding of "paired" files as per mantis #1362

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index b665f8b0a6a5579510aab1dc0134ffb4adda8f1f..cdea9d22720706b33c5f1a710450950a8a8dd058 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -23,7 +23,7 @@
 #include <pbd/memento_command.h>
 
 #include "editor.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 
 #include "i18n.h"
@@ -79,13 +79,13 @@ Editor::kbd_set_edit_cursor ()
 void
 Editor::kbd_do_split (GdkEvent* ev)
 {
-       jack_nframes_t where = event_frame (ev);
+       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);
                }
@@ -103,12 +103,12 @@ Editor::kbd_mute_unmute_region ()
 {
        if (entered_regionview) {
                begin_reversible_command (_("mute region"));
-               XMLNode &before = entered_regionview->region.playlist()->get_state();
+               XMLNode &before = entered_regionview->region()->playlist()->get_state();
                
-           entered_regionview->region.set_muted (!entered_regionview->region.muted());
+               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));
+               XMLNode &after = entered_regionview->region()->playlist()->get_state();
+               session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region()->playlist()), &before, &after));
                commit_reversible_command();
        }
 }
@@ -122,11 +122,11 @@ Editor::kbd_set_sync_position ()
 void
 Editor::kbd_do_set_sync_position (GdkEvent* ev)
 {
-    jack_nframes_t where = event_frame (ev);
+    nframes_t where = event_frame (ev);
        snap_to (where);
 
        if (entered_regionview) {
-         set_a_regions_sync_position (entered_regionview->region, where);
+         set_a_regions_sync_position (entered_regionview->region(), where);
        }
 }