fixed typo

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index f48d860d15d54eb1bd01d50902cbd99e734310c8..e9082445c441b40e1bf69d4d2da2ba82b4cb0635 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <ardour/audioregion.h>
@@ -79,10 +78,10 @@ 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->regions.find (entered_regionview) != selection->regions.end()) {
+               if (selection->regions.contains (entered_regionview)) {
                        split_regions_at (where, selection->regions);
                } else {
                        RegionSelection s;
@@ -103,12 +102,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,7 +121,7 @@ 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) {