Fix method hiding in Canvas::Text

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 1ee0114c5266b39623e5e55484b0f887530695ae..fa3ed357bc62bb2745a85872e81ae6b5fcefc487 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -41,6 +41,7 @@
 #include "selection.h"
 #include "public_editor.h"
 #include "ardour_ui.h"
+#include "timers.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
@@ -411,7 +412,7 @@ StreamView::create_rec_box(framepos_t frame_pos, double width)
        const double   xend       = xstart + width;
        const uint32_t fill_color = ARDOUR_UI::config()->color_mod("recording rect", "recording_rect");
 
-       ArdourCanvas::Rectangle* rec_rect = new ArdourCanvas::TimeRectangle(_canvas_group);
+       ArdourCanvas::Rectangle* rec_rect = new ArdourCanvas::Rectangle(_canvas_group);
        rec_rect->set_x0(xstart);
        rec_rect->set_y0(0);
        rec_rect->set_x1(xend);
@@ -434,8 +435,7 @@ StreamView::create_rec_box(framepos_t frame_pos, double width)
        rec_rects.push_back (recbox);
 
        screen_update_connection.disconnect();
-       screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect(
-               sigc::mem_fun(*this, &StreamView::update_rec_box));
+       screen_update_connection = Timers::rapid_connect (sigc::mem_fun(*this, &StreamView::update_rec_box));
 
        rec_updating = true;
        rec_active = true;
@@ -540,7 +540,6 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
        }
 }
 
-
 /** Get selectable things within a given range.
  *  @param start Start time in session frames.
  *  @param end End time in session frames.
@@ -548,10 +547,13 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
  *  @param bot Bottom y range, in trackview coordinates (ie 0 is the top of the track view)
  *  @param result Filled in with selectable things.
  */
-
 void
-StreamView::get_selectables (framepos_t start, framepos_t end, double top, double bottom, list<Selectable*>& results)
+StreamView::get_selectables (framepos_t start, framepos_t end, double top, double bottom, list<Selectable*>& results, bool within)
 {
+       if (_trackview.editor().internal_editing()) {
+               return;  // Don't select regions with an internal tool
+       }
+
        layer_t min_layer = 0;
        layer_t max_layer = 0;
 
@@ -582,10 +584,17 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
                        layer_t const l = (*i)->region()->layer ();
                        layer_ok = (min_layer <= l && l <= max_layer);
                }
-
-               if ((*i)->region()->coverage (start, end) != Evoral::OverlapNone && layer_ok) {
-                       results.push_back (*i);
+               
+               if (within) {
+                       if ((*i)->region()->coverage (start, end) == Evoral::OverlapExternal && layer_ok) {
+                               results.push_back (*i);
+                       }
+               } else {
+                       if ((*i)->region()->coverage (start, end) != Evoral::OverlapNone && layer_ok) {
+                               results.push_back (*i);
+                       }
                }
+               
        }
 }
 
@@ -712,19 +721,3 @@ StreamView::setup_new_rec_layer_time (boost::shared_ptr<Region> region)
                _new_rec_layer_time = max_framepos;
        }
 }
-
-void
-StreamView::enter_internal_edit_mode ()
-{
-        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-                (*i)->hide_rect ();
-        }
-}
-
-void
-StreamView::leave_internal_edit_mode ()
-{
-        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-                (*i)->show_rect ();
-        }
-}