Remove what I'm pretty sure was a hack to work around the bug we used to have with...

git-svn-id: svn://localhost/ardour2/branches/3.0@7699 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index b153967cd38470c5177c4a4705eeba7813028f47..47743773f7d045030a850315058df9f4eb5f44ef 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -352,7 +352,6 @@ Editor::Editor ()
        show_gain_after_trim = false;
        verbose_cursor_on = true;
        last_item_entered = 0;
-       last_item_entered_n = 0;
 
        have_pending_keyboard_selection = false;
        _follow_playhead = true;

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 3f9dc6d8806c21e0964d81af58dbd33c035e0405..65395920f1a89e941dadbd8827ac35679292fca0 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1359,14 +1359,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
        bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
        bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*);
-
-
-       // These variables are used to detect a feedback loop and break it to avoid a gui hang
-private:
-       ArdourCanvas::Item *last_item_entered;
-       int last_item_entered_n;
-
-public:
        bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
@@ -1401,6 +1393,8 @@ public:
         friend class EditorRouteGroups;
         friend class EditorRegions;
 
+       ArdourCanvas::Item *last_item_entered;
+
        /* non-public event handlers */
 
        bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 0346ca11ef93693e57c543e73bfcbf2014bff4db..45bd2903d8c00a4c8a78a515b3243d4e9df5d501 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1471,10 +1471,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
        double fraction;
         bool ret = true;
 
-       if (last_item_entered != item) {
-               last_item_entered = item;
-               last_item_entered_n = 0;
-       }
+       last_item_entered = item;
 
        switch (item_type) {
        case ControlPointItem:
@@ -1495,11 +1492,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                                track_canvas->get_window()->set_cursor (*fader_cursor);
                        }
 
-                       last_item_entered_n++;
                        set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y);
-                       if (last_item_entered_n < 10) {
-                               show_verbose_canvas_cursor ();
-                       }
+                       show_verbose_canvas_cursor ();
                }
                break;