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 404b934562b60cf0d53d50db33247b8c24f843b4..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"
@@ -49,12 +50,13 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Editing;
 
-StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* canvas_group)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Container* canvas_group)
        : _trackview (tv)
-       , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Group (_trackview.canvas_display()))
+       , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Container (_trackview.canvas_display()))
        , _samples_per_pixel (_trackview.editor().get_current_zoom ())
        , rec_updating(false)
        , rec_active(false)
@@ -71,8 +73,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* canvas_group
        canvas_rect = new ArdourCanvas::Rectangle (_canvas_group);
        CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle %1", _trackview.name()));
        canvas_rect->set (ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, tv.current_height ()));
-       canvas_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
-       canvas_rect->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
+       canvas_rect->set_outline (false);
        canvas_rect->set_fill (true);
        canvas_rect->Event.connect (sigc::bind (sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
 
@@ -114,6 +115,7 @@ int
 StreamView::set_height (double h)
 {
        /* limit the values to something sane-ish */
+
        if (h < 10.0 || h > 1000.0) {
                return -1;
        }
@@ -343,7 +345,13 @@ StreamView::diskstream_changed ()
 }
 
 void
-StreamView::apply_color (Gdk::Color color, ColorTarget target)
+StreamView::apply_color (Gdk::Color const& c, ColorTarget target)
+{
+       return apply_color (gdk_color_to_rgba (c), target);
+}
+
+void
+StreamView::apply_color (uint32_t color, ColorTarget target)
 {
        list<RegionView *>::iterator i;
 
@@ -356,7 +364,7 @@ StreamView::apply_color (Gdk::Color color, ColorTarget target)
                break;
 
        case StreamBaseColor:
-               stream_base_color = RGBA_TO_UINT (color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255);
+               stream_base_color = color;
                canvas_rect->set_fill_color (stream_base_color);
                break;
        }
@@ -397,6 +405,42 @@ StreamView::transport_looped()
        Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::setup_rec_box, this));
 }
 
+void
+StreamView::create_rec_box(framepos_t frame_pos, double width)
+{
+       const double   xstart     = _trackview.editor().sample_to_pixel(frame_pos);
+       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::Rectangle(_canvas_group);
+       rec_rect->set_x0(xstart);
+       rec_rect->set_y0(0);
+       rec_rect->set_x1(xend);
+       rec_rect->set_y1(child_height ());
+       rec_rect->set_outline_what(ArdourCanvas::Rectangle::What(0));
+       rec_rect->set_outline_color(ARDOUR_UI::config()->color("recording rect"));
+       rec_rect->set_fill_color(fill_color);
+       rec_rect->lower_to_bottom();
+
+       RecBoxInfo recbox;
+       recbox.rectangle = rec_rect;
+       recbox.length    = 0;
+
+       if (rec_rects.empty()) {
+               recbox.start = _trackview.session()->record_location ();
+       } else {
+               recbox.start = _trackview.session()->transport_frame ();
+       }
+
+       rec_rects.push_back (recbox);
+
+       screen_update_connection.disconnect();
+       screen_update_connection = Timers::rapid_connect (sigc::mem_fun(*this, &StreamView::update_rec_box));
+
+       rec_updating = true;
+       rec_active = true;
+}
+
 void
 StreamView::update_rec_box ()
 {
@@ -424,7 +468,7 @@ StreamView::update_rec_box ()
 
                default:
                        fatal << string_compose (_("programming error: %1"), "illegal track mode") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                        return;
                }
 
@@ -496,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.
@@ -504,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;
 
@@ -538,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);
+                       }
                }
+               
        }
 }
 
@@ -568,7 +621,7 @@ StreamView::child_height () const
                return height / (_layers * 2 + 1);
        }
        
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return height;
 }
 
@@ -668,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 ();
-        }
-}