X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=28905ee45f5a71af84a9870d5235b91e5d8ff56f;hb=1a35363693eac9a822c43bafc12176f201c15ea8;hp=257584fd319ff9cf2890d5fca23519117dc2826a;hpb=d0220523f86f04006c21cc4851793b4d2d74df9b;p=ardour.git diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 257584fd31..28905ee45f 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -21,6 +21,7 @@ #include #include +#include #include "ardour/playlist.h" #include "ardour/region.h" @@ -29,6 +30,7 @@ #include "ardour/session.h" #include "streamview.h" +#include "global_signals.h" #include "region_view.h" #include "route_time_axis.h" #include "canvas-waveview.h" @@ -67,11 +69,12 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g canvas_rect = new ArdourCanvas::SimpleRect (*_background_group); canvas_rect->property_x1() = 0.0; canvas_rect->property_y1() = 0.0; - canvas_rect->property_x2() = physical_screen_width (_trackview.editor().get_window()); + canvas_rect->property_x2() = Gtkmm2ext::physical_screen_width (_trackview.editor().get_window()); canvas_rect->property_y2() = (double) tv.current_height(); canvas_rect->raise(1); // raise above tempo lines canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom + canvas_rect->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255); canvas_rect->signal_event().connect (sigc::bind ( sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), @@ -98,7 +101,7 @@ StreamView::~StreamView () if (owns_background_group) { delete _background_group; } - + if (owns_canvas_group) { delete _canvas_group; } @@ -203,6 +206,8 @@ StreamView::remove_region_view (boost::weak_ptr weak_r) break; } } + + RegionViewRemoved (); /* EMIT SIGNAL */ } void @@ -303,7 +308,7 @@ StreamView::playlist_layered (boost::weak_ptr wtr) } else { /* layering has probably been modified. reflect this in the canvas. */ layer_regions(); - } + } } void @@ -343,7 +348,7 @@ void StreamView::diskstream_changed () { boost::shared_ptr t; - + if ((t = _trackview.track()) != 0) { Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t)); } else { @@ -352,7 +357,7 @@ StreamView::diskstream_changed () } void -StreamView::apply_color (Gdk::Color& color, ColorTarget target) +StreamView::apply_color (Gdk::Color color, ColorTarget target) { list::iterator i; @@ -413,7 +418,7 @@ StreamView::update_rec_box () if (rec_active && rec_rects.size() > 0) { /* only update the last box */ RecBoxInfo & rect = rec_rects.back(); - nframes_t at = _trackview.track()->current_capture_end(); + framepos_t const at = _trackview.track()->current_capture_end (); double xstart; double xend; @@ -518,8 +523,21 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl if (_layer_display == Stacked) { double const c = child_height (); - min_layer = _layers - ((bottom - _trackview.y_position()) / c); - max_layer = _layers - ((top - _trackview.y_position()) / c); + + int const mi = _layers - ((bottom - _trackview.y_position()) / c); + if (mi < 0) { + min_layer = 0; + } else { + min_layer = mi; + } + + int const ma = _layers - ((top - _trackview.y_position()) / c); + if (ma > (int) _layers) { + max_layer = _layers - 1; + } else { + max_layer = ma; + } + } for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { @@ -577,7 +595,16 @@ StreamView::update_contents_height () } for (vector::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) { - i->rectangle->property_y2() = height; + switch (_layer_display) { + case Overlaid: + i->rectangle->property_y2() = height; + break; + case Stacked: + /* In stacked displays, the recregion is always at the top */ + i->rectangle->property_y1() = 0; + i->rectangle->property_y2() = h; + break; + } } } @@ -597,3 +624,57 @@ StreamView::update_coverage_frames () (*i)->update_coverage_frames (_layer_display); } } + +void +StreamView::check_record_layers (boost::shared_ptr region, framepos_t to) +{ + if (_new_rec_layer_time < to) { + /* The region being recorded has overlapped the start of a top-layered region, so + `fake' a new visual layer for the recording. This is only a visual thing for now, + as the proper layering will get sorted out when the recorded region is added to + its playlist. + */ + + /* Stop this happening again */ + _new_rec_layer_time = max_framepos; + + /* Make space in the view for the new layer */ + ++_layers; + + /* Set the temporary region to the correct layer so that it gets drawn correctly */ + region->set_layer (_layers - 1); + + /* and reset the view */ + update_contents_height (); + } +} + +void +StreamView::setup_new_rec_layer_time (boost::shared_ptr region) +{ + /* If we are in Stacked mode, we may need to (visually) create a new layer to put the + recorded region in. To work out where this needs to happen, find the start of the next + top-layered region after the start of the region we are recording and make a note of it. + */ + if (_layer_display == Stacked) { + _new_rec_layer_time = _trackview.track()->playlist()->find_next_top_layer_position (region->start()); + } else { + _new_rec_layer_time = max_framepos; + } +} + +void +StreamView::enter_internal_edit_mode () +{ + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + (*i)->hide_rect (); + } +} + +void +StreamView::leave_internal_edit_mode () +{ + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + (*i)->show_rect (); + } +}