X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=28905ee45f5a71af84a9870d5235b91e5d8ff56f;hb=7f1784252882cd216a9912f57f66533cc06af8a5;hp=d405489319e9abd312c4a36f94f77052dd04e6b5;hpb=93dac756a2ab7ec7b450d9d0ef5004755d3ef23d;p=ardour.git diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index d405489319..28905ee45f 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -21,15 +21,16 @@ #include #include +#include #include "ardour/playlist.h" #include "ardour/region.h" #include "ardour/source.h" -#include "ardour/diskstream.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" @@ -47,15 +48,15 @@ using namespace ARDOUR; using namespace PBD; using namespace Editing; -StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group) +StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_group, ArdourCanvas::Group* canvas_group) : _trackview (tv) - , owns_canvas_group(group == 0) - , _background_group (new ArdourCanvas::Group (*_trackview.canvas_background())) - , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display())) + , owns_background_group (background_group == 0) + , owns_canvas_group (canvas_group == 0) + , _background_group (background_group ? background_group : new ArdourCanvas::Group (*_trackview.canvas_background())) + , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Group(*_trackview.canvas_display())) , _samples_per_unit (_trackview.editor().get_current_zoom ()) , rec_updating(false) , rec_active(false) - , use_rec_regions (tv.editor().show_waveforms_recording ()) , region_color(_trackview.color()) , stream_base_color(0xFFFFFFFF) , _layers (1) @@ -68,23 +69,24 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group) canvas_rect = new ArdourCanvas::SimpleRect (*_background_group); canvas_rect->property_x1() = 0.0; canvas_rect->property_y1() = 0.0; - canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width (); + 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), canvas_rect, &_trackview)); if (_trackview.is_track()) { - _trackview.track()->DiskstreamChanged.connect (*this, boost::bind (&StreamView::diskstream_changed, this), gui_context()); - _trackview.get_diskstream()->RecordEnableChanged.connect (*this, boost::bind (&StreamView::rec_enable_changed, this), gui_context()); + _trackview.track()->DiskstreamChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::diskstream_changed, this), gui_context()); + _trackview.track()->RecordEnableChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::rec_enable_changed, this), gui_context()); - _trackview.session()->TransportStateChange.connect (*this, boost::bind (&StreamView::transport_changed, this), gui_context()); - _trackview.session()->TransportLooped.connect (*this, boost::bind (&StreamView::transport_looped, this), gui_context()); - _trackview.session()->RecordStateChanged.connect (*this, boost::bind (&StreamView::sess_rec_enable_changed, this), gui_context()); + _trackview.session()->TransportStateChange.connect (*this, invalidator (*this), boost::bind (&StreamView::transport_changed, this), gui_context()); + _trackview.session()->TransportLooped.connect (*this, invalidator (*this), boost::bind (&StreamView::transport_looped, this), gui_context()); + _trackview.session()->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::sess_rec_enable_changed, this), gui_context()); } ColorsChanged.connect (sigc::mem_fun (*this, &StreamView::color_handler)); @@ -92,12 +94,16 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group) StreamView::~StreamView () { - undisplay_diskstream (); + undisplay_track (); delete canvas_rect; + if (owns_background_group) { + delete _background_group; + } + if (owns_canvas_group) { - delete canvas_group; + delete _canvas_group; } } @@ -105,15 +111,15 @@ void StreamView::attach () { if (_trackview.is_track()) { - display_diskstream (_trackview.get_diskstream()); + display_track (_trackview.track ()); } } int StreamView::set_position (gdouble x, gdouble y) { - canvas_group->property_x() = x; - canvas_group->property_y() = y; + _canvas_group->property_x() = x; + _canvas_group->property_y() = y; return 0; } @@ -133,8 +139,6 @@ StreamView::set_height (double h) canvas_rect->property_y2() = height; update_contents_height (); - HeightChanged (); - return 0; } @@ -202,10 +206,12 @@ StreamView::remove_region_view (boost::weak_ptr weak_r) break; } } + + RegionViewRemoved (); /* EMIT SIGNAL */ } void -StreamView::undisplay_diskstream () +StreamView::undisplay_track () { for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) { RegionViewList::iterator next = i; @@ -218,11 +224,11 @@ StreamView::undisplay_diskstream () } void -StreamView::display_diskstream (boost::shared_ptr ds) +StreamView::display_track (boost::shared_ptr tr) { playlist_switched_connection.disconnect(); - playlist_switched (ds); - ds->PlaylistChanged.connect (playlist_switched_connection, boost::bind (&StreamView::playlist_switched, this, boost::weak_ptr (ds)), gui_context()); + playlist_switched (tr); + tr->PlaylistChanged.connect (playlist_switched_connection, invalidator (*this), boost::bind (&StreamView::playlist_switched, this, boost::weak_ptr (tr)), gui_context()); } void @@ -283,17 +289,17 @@ StreamView::layer_regions() } void -StreamView::playlist_layered (boost::weak_ptr wds) +StreamView::playlist_layered (boost::weak_ptr wtr) { - boost::shared_ptr ds (wds.lock()); + boost::shared_ptr tr (wtr.lock()); - if (!ds) { + if (!tr) { return; } /* update layers count and the y positions and heights of our regions */ - if (ds->playlist()) { - _layers = ds->playlist()->top_layer() + 1; + if (tr->playlist()) { + _layers = tr->playlist()->top_layer() + 1; } if (_layer_display == Stacked) { @@ -302,40 +308,40 @@ StreamView::playlist_layered (boost::weak_ptr wds) } else { /* layering has probably been modified. reflect this in the canvas. */ layer_regions(); - } + } } void -StreamView::playlist_switched (boost::weak_ptr wds) +StreamView::playlist_switched (boost::weak_ptr wtr) { - boost::shared_ptr ds (wds.lock()); + boost::shared_ptr tr (wtr.lock()); - if (!ds) { + if (!tr) { return; } /* disconnect from old playlist */ playlist_connections.drop_connections (); - undisplay_diskstream (); + undisplay_track (); /* update layers count and the y positions and heights of our regions */ - _layers = ds->playlist()->top_layer() + 1; + _layers = tr->playlist()->top_layer() + 1; update_contents_height (); update_coverage_frames (); - ds->playlist()->set_explicit_relayering (_layer_display == Stacked); + tr->playlist()->set_explicit_relayering (_layer_display == Stacked); /* draw it */ - redisplay_diskstream (); + redisplay_track (); /* catch changes */ - ds->playlist()->LayeringChanged.connect (playlist_connections, boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr(ds)), gui_context()); - ds->playlist()->RegionAdded.connect (playlist_connections, ui_bind (&StreamView::add_region_view, this, _1), gui_context()); - ds->playlist()->RegionRemoved.connect (playlist_connections, ui_bind (&StreamView::remove_region_view, this, _1), gui_context()); - // ds->playlist()->ContentsChanged.connect (playlist_connections, boost::bind (&StreamView::redisplay_diskstream, this), gui_context()); + 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()); } void @@ -344,15 +350,14 @@ StreamView::diskstream_changed () boost::shared_ptr t; if ((t = _trackview.track()) != 0) { - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::display_diskstream, this, t->diskstream())); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t)); } else { - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::undisplay_diskstream, this)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::undisplay_track, this)); } } void -StreamView::apply_color (Gdk::Color& color, ColorTarget target) - +StreamView::apply_color (Gdk::Color color, ColorTarget target) { list::iterator i; @@ -404,7 +409,7 @@ StreamView::transport_looped() { // to force a new rec region rec_active = false; - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&StreamView::setup_rec_box, this)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::setup_rec_box, this)); } void @@ -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.get_diskstream()->current_capture_end(); + framepos_t const at = _trackview.track()->current_capture_end (); double xstart; double xend; @@ -428,7 +433,7 @@ StreamView::update_rec_box () case Destructive: rect.length = 2; - xstart = _trackview.editor().frame_to_pixel (_trackview.get_diskstream()->current_capture_start()); + xstart = _trackview.editor().frame_to_pixel (_trackview.track()->current_capture_start()); xend = _trackview.editor().frame_to_pixel (at); break; } @@ -501,16 +506,38 @@ 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. + * @param top Top y range, in trackview coordinates (ie 0 is the top of the track view) + * @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 (nframes_t start, nframes_t end, double top, double bottom, list& results) +StreamView::get_selectables (framepos_t start, framepos_t end, double top, double bottom, list& results) { layer_t min_layer = 0; layer_t max_layer = 0; 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) { @@ -568,7 +595,16 @@ StreamView::update_contents_height () } for (vector::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) { - i->rectangle->property_y2() = height - 1.0; + 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; + } } } @@ -578,7 +614,7 @@ StreamView::set_layer_display (LayerDisplay d) _layer_display = d; update_contents_height (); update_coverage_frames (); - _trackview.get_diskstream()->playlist()->set_explicit_relayering (_layer_display == Stacked); + _trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked); } void @@ -588,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 (); + } +}