X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=19f6ee65bbd4c266b7bc4ee1fbf0f4ee5f2647fc;hb=18f465393b29c98904a2140132131950963c36b1;hp=85974a039c8a24a071d27fa346094381245ca6bf;hpb=aad157337c5db676fdb39f5faefbb764f500702a;p=ardour.git diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 85974a039c..19f6ee65bb 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -25,11 +25,11 @@ #include "ardour/playlist.h" #include "ardour/region.h" -#include "ardour/source.h" #include "ardour/track.h" #include "ardour/session.h" #include "streamview.h" +#include "global_signals.h" #include "region_view.h" #include "route_time_axis.h" #include "canvas-waveview.h" @@ -56,7 +56,6 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g , _samples_per_unit (_trackview.editor().get_current_zoom ()) , rec_updating(false) , rec_active(false) - , region_color(_trackview.color()) , stream_base_color(0xFFFFFFFF) , _layers (1) , _layer_display (Overlaid) @@ -73,6 +72,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g 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), @@ -99,7 +99,7 @@ StreamView::~StreamView () if (owns_background_group) { delete _background_group; } - + if (owns_canvas_group) { delete _canvas_group; } @@ -180,7 +180,7 @@ StreamView::add_region_view (boost::weak_ptr wr) add_region_view_internal (r, true); - if (_layer_display == Stacked) { + if (_layer_display == Stacked || _layer_display == Expanded) { update_contents_height (); } } @@ -204,6 +204,8 @@ StreamView::remove_region_view (boost::weak_ptr weak_r) break; } } + + RegionViewRemoved (); /* EMIT SIGNAL */ } void @@ -304,7 +306,7 @@ StreamView::playlist_layered (boost::weak_ptr wtr) } else { /* layering has probably been modified. reflect this in the canvas. */ layer_regions(); - } + } } void @@ -321,30 +323,29 @@ StreamView::playlist_switched (boost::weak_ptr wtr) playlist_connections.drop_connections (); undisplay_track (); + /* draw it */ + + redisplay_track (); + /* update layers count and the y positions and heights of our regions */ _layers = tr->playlist()->top_layer() + 1; update_contents_height (); update_coverage_frames (); - tr->playlist()->set_explicit_relayering (_layer_display == Stacked); - - /* draw it */ - - redisplay_track (); - /* catch changes */ tr->playlist()->LayeringChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr (tr)), gui_context()); - tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::add_region_view, this, _1), gui_context()); - tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::remove_region_view, this, _1), gui_context()); - tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::update_coverage_frames, this), gui_context()); + tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::add_region_view, this, _1), gui_context()); + tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::remove_region_view, this, _1), gui_context()); + tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::update_coverage_frames, this), gui_context()); } + 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 { @@ -353,7 +354,7 @@ StreamView::diskstream_changed () } void -StreamView::apply_color (Gdk::Color& color, ColorTarget target) +StreamView::apply_color (Gdk::Color color, ColorTarget target) { list::iterator i; @@ -414,7 +415,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; @@ -519,8 +520,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) { @@ -532,7 +546,7 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl layer_ok = (min_layer <= l && l <= max_layer); } - if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) { + if ((*i)->region()->coverage (start, end) != Evoral::OverlapNone && layer_ok) { results.push_back (*i); } } @@ -552,10 +566,16 @@ StreamView::get_inverted_selectables (Selection& sel, list& results double StreamView::child_height () const { - if (_layer_display == Stacked) { + switch (_layer_display) { + case Overlaid: + return height; + case Stacked: return height / _layers; + case Expanded: + return height / (_layers * 2 + 1); } - + + /* NOTREACHED */ return height; } @@ -572,23 +592,42 @@ StreamView::update_contents_height () case Stacked: (*i)->set_y (height - ((*i)->region()->layer() + 1) * h); break; + case Expanded: + (*i)->set_y (height - ((*i)->region()->layer() + 1) * 2 * h); + break; } (*i)->set_height (h); } 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: + case Expanded: + /* In stacked displays, the recregion is always at the top */ + i->rectangle->property_y1() = 0; + i->rectangle->property_y2() = h; + break; + } } + + ContentsHeightChanged (); /* EMIT SIGNAL */ } void StreamView::set_layer_display (LayerDisplay d) { _layer_display = d; + + if (_layer_display == Overlaid) { + layer_regions (); + } + update_contents_height (); update_coverage_frames (); - _trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked); } void @@ -598,3 +637,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 (); + } +}