fixed typo

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 8fb0e64235969231f965fd0f7f4a49ad54b242fe..e9082445c441b40e1bf69d4d2da2ba82b4cb0635 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -15,31 +15,31 @@
     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>
+#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::Slot1<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
+Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
 {
        gint x, y;
-       double dx, dy;
+       double worldx, worldy;
        GdkEvent ev;
-       GdkModifierType mask;
-       Gdk_Window evw (track_canvas->get_window().get_pointer (x, y, mask));
+       Gdk::ModifierType mask;
+       Glib::RefPtr<Gdk::Window> evw = track_canvas.get_window()->get_pointer (x, y, mask);
        bool doit = false;
 
-       if (use_track_canvas && gdk_window_get_pointer (track_canvas_event_box.get_window(),
-                                                       &x, &y, &mask)) {
+       if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
                doit = true;
-
-       } else if (use_time_canvas && gdk_window_get_pointer (time_canvas_event_box.get_window(),
-                                                             &x, &y, &mask)) {
+       } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
                doit = true;
        }
 
@@ -49,11 +49,13 @@ Editor::kbd_driver (SigC::Slot1<void,GdkEvent*> theslot, bool use_track_canvas,
                        selection->set (entered_regionview);
                }
 
-               gtk_canvas_window_to_world (GTK_CANVAS(track_gtk_canvas), x, y, &dx, &dy);
+               track_canvas.window_to_world (x, y, worldx, worldy);
+               worldx += horizontal_adjustment.get_value();
+               worldy += vertical_adjustment.get_value();
 
                ev.type = GDK_BUTTON_PRESS;
-               ev.button.x = dx;
-               ev.button.y = dy;
+               ev.button.x = worldx;
+               ev.button.y = worldy;
                ev.button.state = 0;  /* XXX correct? */
 
                theslot (&ev);
@@ -63,26 +65,26 @@ Editor::kbd_driver (SigC::Slot1<void,GdkEvent*> theslot, bool use_track_canvas,
 void
 Editor::kbd_set_playhead_cursor ()
 {
-       kbd_driver (slot (*this, &Editor::set_playhead_cursor), true, true, false);
+       kbd_driver (mem_fun(*this, &Editor::set_playhead_cursor), true, true, false);
 }
 
 void
 Editor::kbd_set_edit_cursor ()
 {
-       kbd_driver (slot (*this, &Editor::set_edit_cursor), true, true, false);
+       kbd_driver (mem_fun(*this, &Editor::set_edit_cursor), true, true, false);
 }
 
 
 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.contains (entered_regionview)) {
+                       split_regions_at (where, selection->regions);
                } else {
-                       AudioRegionSelection s;
+                       RegionSelection s;
                        s.add (entered_regionview);
                        split_regions_at (where, s);
                }
@@ -92,7 +94,39 @@ Editor::kbd_do_split (GdkEvent* ev)
 void
 Editor::kbd_split ()
 {
-       kbd_driver (slot (*this, &Editor::kbd_do_split), true, true, false);
+       kbd_driver (mem_fun(*this, &Editor::kbd_do_split), true, true, false);
+}
+
+void
+Editor::kbd_mute_unmute_region ()
+{
+       if (entered_regionview) {
+               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();
+       }
+}
+
+void
+Editor::kbd_set_sync_position ()
+{
+       kbd_driver (mem_fun(*this, &Editor::kbd_do_set_sync_position), true, true, false);
+}
+
+void
+Editor::kbd_do_set_sync_position (GdkEvent* ev)
+{
+    nframes_t where = event_frame (ev);
+       snap_to (where);
+
+       if (entered_regionview) {
+         set_a_regions_sync_position (entered_regionview->region(), where);
+       }
 }
 
 void
@@ -104,7 +138,7 @@ Editor::kbd_do_align (GdkEvent* ev, ARDOUR::RegionPoint what)
 void
 Editor::kbd_align (ARDOUR::RegionPoint what)
 {
-       kbd_driver (bind (slot (*this, &Editor::kbd_do_align), what));
+       kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what));
 }
 
 void
@@ -116,7 +150,7 @@ Editor::kbd_do_align_relative (GdkEvent* ev, ARDOUR::RegionPoint what)
 void
 Editor::kbd_align_relative (ARDOUR::RegionPoint what)
 {
-       kbd_driver (bind (slot (*this, &Editor::kbd_do_align), what), true, true, false);
+       kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what), true, true, false);
 }
 
 void
@@ -128,7 +162,7 @@ Editor::kbd_do_brush (GdkEvent *ev)
 void
 Editor::kbd_brush ()
 {
-       kbd_driver (slot (*this, &Editor::kbd_do_brush), true, true, false);
+       kbd_driver (mem_fun(*this, &Editor::kbd_do_brush), true, true, false);
 }
 
 void
@@ -140,5 +174,5 @@ Editor::kbd_do_audition (GdkEvent *ignored)
 void
 Editor::kbd_audition ()
 {
-       kbd_driver (slot (*this, &Editor::kbd_do_audition), true, false, true);
+       kbd_driver (mem_fun(*this, &Editor::kbd_do_audition), true, false, true);
 }