port cairo ARGB/BGRA -> pixbuf RGBA patch from recent 2.X commit (restores text on...

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index bb047a1440df99d1f5c693669afeab73592ae85c..42cfdc9f5cc605874f25e5b88512fd1555f7a912 100644 (file)
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -66,7 +66,7 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
                }
 
                track_canvas->window_to_world (x, y, worldx, worldy);
-               worldx += _horizontal_position;
+               worldx += horizontal_position();
                worldy += vertical_adjustment.get_value();
 
                ev.type = GDK_BUTTON_PRESS;
@@ -91,7 +91,7 @@ Editor::kbd_mute_unmute_region ()
 
                for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
 
-                       (*i)->region()->playlist()->clear_history ();
+                       (*i)->region()->playlist()->clear_changes ();
                        (*i)->region()->set_muted (!(*i)->region()->muted ());
                        _session->add_command (new StatefulDiffCommand ((*i)->region()->playlist()));
 
@@ -102,7 +102,7 @@ Editor::kbd_mute_unmute_region ()
        } else if (entered_regionview) {
 
                begin_reversible_command (_("mute region"));
-                entered_regionview->region()->playlist()->clear_history ();
+                entered_regionview->region()->playlist()->clear_changes ();
                entered_regionview->region()->set_muted (!entered_regionview->region()->muted());
                _session->add_command (new StatefulDiffCommand (entered_regionview->region()->playlist()));
                commit_reversible_command();