X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=8fa9ed8d288298dbd7e6365967c80bd7a8aadec5;hb=061a85191c301ac18f2e8ca59d43127a4499ba96;hp=733e27c4ab98d0606ce06d49b1de01e8ff0b007e;hpb=1ae094813858a2b8cf5b08569edcb9b15d910729;p=ardour.git diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 733e27c4ab..8fa9ed8d28 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001, 2006 Paul Davis + Copyright (C) 2001, 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,11 @@ #include -#include -#include -#include -#include -#include +#include "ardour/playlist.h" +#include "ardour/region.h" +#include "ardour/source.h" +#include "ardour/track.h" +#include "ardour/session.h" #include "streamview.h" #include "region_view.h" @@ -40,62 +40,75 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "utils.h" -#include "color.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; -StreamView::StreamView (RouteTimeAxisView& tv) +StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group) : _trackview (tv) - , canvas_group(new ArdourCanvas::Group(*_trackview.canvas_display)) - , canvas_rect(new ArdourCanvas::SimpleRect (*canvas_group)) - , _samples_per_unit(_trackview.editor.get_current_zoom()) + , owns_canvas_group(group == 0) + , _background_group (new ArdourCanvas::Group (*_trackview.canvas_background())) + , canvas_group(group ? 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) + , _layer_display (Overlaid) + , height(tv.height) + , last_rec_data_frame(0) { /* set_position() will position the group */ - canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group); + canvas_rect = new ArdourCanvas::SimpleRect (*_background_group); canvas_rect->property_x1() = 0.0; canvas_rect->property_y1() = 0.0; - canvas_rect->property_x2() = 1000000.0; - canvas_rect->property_y2() = (double) tv.height; - canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); // outline ends and bottom - // (Fill/Outline colours set in derived classes) + canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width (); + canvas_rect->property_y2() = (double) tv.current_height(); + canvas_rect->raise(1); // raise above tempo lines - canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview)); + canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom + + 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 (mem_fun (*this, &StreamView::diskstream_changed)); - _trackview.session().TransportStateChange.connect (mem_fun (*this, &StreamView::transport_changed)); - _trackview.get_diskstream()->RecordEnableChanged.connect (mem_fun (*this, &StreamView::rec_enable_changed)); - _trackview.session().RecordStateChanged.connect (mem_fun (*this, &StreamView::sess_rec_enable_changed)); - } + _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()); - ColorChanged.connect (mem_fun (*this, &StreamView::color_handler)); + _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)); } StreamView::~StreamView () { - undisplay_diskstream (); - delete canvas_group; + undisplay_track (); + + delete canvas_rect; + + if (owns_canvas_group) { + delete canvas_group; + } } 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; @@ -103,33 +116,27 @@ StreamView::set_position (gdouble x, gdouble y) } int -StreamView::set_height (gdouble h) +StreamView::set_height (double h) { /* limit the values to something sane-ish */ - if (h < 10.0 || h > 1000.0) { return -1; } - canvas_rect->property_y2() = h; - - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - (*i)->set_height (h); + if (canvas_rect->property_y2() == h) { + return 0; } - /*for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - (*i)->set_height (h); - }*/ + height = h; + canvas_rect->property_y2() = height; + update_contents_height (); - for (vector::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) { - RecBoxInfo &recbox = (*i); - recbox.rectangle->property_y2() = h - 1.0; - } + HeightChanged (); return 0; } -int +int StreamView::set_samples_per_unit (gdouble spp) { RegionViewList::iterator i; @@ -146,132 +153,203 @@ StreamView::set_samples_per_unit (gdouble spp) for (vector::iterator xi = rec_rects.begin(); xi != rec_rects.end(); ++xi) { RecBoxInfo &recbox = (*xi); - - gdouble xstart = _trackview.editor.frame_to_pixel ( recbox.start ); - gdouble xend = _trackview.editor.frame_to_pixel ( recbox.start + recbox.length ); + + gdouble xstart = _trackview.editor().frame_to_pixel (recbox.start); + gdouble xend = _trackview.editor().frame_to_pixel (recbox.start + recbox.length); recbox.rectangle->property_x1() = xstart; recbox.rectangle->property_x2() = xend; } + update_coverage_frames (); + return 0; } void -StreamView::add_region_view (Region *r) +StreamView::add_region_view (boost::weak_ptr wr) { + boost::shared_ptr r (wr.lock()); + if (!r) { + return; + } + add_region_view_internal (r, true); + + if (_layer_display == Stacked) { + update_contents_height (); + } } void -StreamView::remove_region_view (Region *r) +StreamView::remove_region_view (boost::weak_ptr weak_r) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_region_view), r)); + ENSURE_GUI_THREAD (*this, &StreamView::remove_region_view, weak_r) + + boost::shared_ptr r (weak_r.lock()); + + if (!r) { + return; + } for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - if (&((*i)->region()) == r) { - delete *i; + if (((*i)->region()) == r) { + RegionView* rv = *i; region_views.erase (i); + delete rv; break; } } } void -StreamView::remove_rec_region (Region *r) +StreamView::undisplay_track () { - ENSURE_GUI_THREAD(bind (mem_fun (*this, &StreamView::remove_rec_region), r)); - - if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) { - fatal << "region deleted from non-GUI thread!" << endmsg; - /*NOTREACHED*/ - } - - for (list::iterator i = rec_regions.begin(); i != rec_regions.end(); ++i) { - if (*i == r) { - rec_regions.erase (i); - break; - } + for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) { + RegionViewList::iterator next = i; + ++next; + delete *i; + i = next; } + + region_views.clear(); } void -StreamView::undisplay_diskstream () +StreamView::display_track (boost::shared_ptr tr) { - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - delete *i; - } - - region_views.clear(); + playlist_switched_connection.disconnect(); + playlist_switched (tr); + tr->PlaylistChanged.connect (playlist_switched_connection, invalidator (*this), boost::bind (&StreamView::playlist_switched, this, boost::weak_ptr (tr)), gui_context()); } void -StreamView::display_diskstream (boost::shared_ptr ds) +StreamView::layer_regions() { - playlist_change_connection.disconnect(); - playlist_changed (ds); - playlist_change_connection = ds->PlaylistChanged.connect (bind (mem_fun (*this, &StreamView::playlist_changed), ds)); + // In one traversal of the region view list: + // - Build a list of region views sorted by layer + // - Remove invalid views from the actual region view list + RegionViewList copy; + list::iterator i, tmp; + for (i = region_views.begin(); i != region_views.end(); ) { + tmp = i; + tmp++; + + if (!(*i)->is_valid()) { + delete *i; + region_views.erase (i); + i = tmp; + continue; + } else { + (*i)->enable_display(true); + } + + if (copy.size() == 0) { + copy.push_front((*i)); + i = tmp; + continue; + } + + RegionViewList::iterator k = copy.begin(); + RegionViewList::iterator l = copy.end(); + l--; + + if ((*i)->region()->layer() <= (*k)->region()->layer()) { + copy.push_front((*i)); + i = tmp; + continue; + } else if ((*i)->region()->layer() >= (*l)->region()->layer()) { + copy.push_back((*i)); + i = tmp; + continue; + } + + for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { + if ((*j)->region()->layer() >= (*i)->region()->layer()) { + copy.insert(j, (*i)); + break; + } + } + + i = tmp; + } + + // Fix canvas layering by raising each to the top in the sorted order. + for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) { + (*i)->get_canvas_group()->raise_to_top (); + } } void -StreamView::playlist_modified () +StreamView::playlist_layered (boost::weak_ptr wtr) { - ENSURE_GUI_THREAD (mem_fun (*this, &StreamView::playlist_modified)); + boost::shared_ptr tr (wtr.lock()); - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - region_layered (*i); + if (!tr) { + return; + } + + /* update layers count and the y positions and heights of our regions */ + if (tr->playlist()) { + _layers = tr->playlist()->top_layer() + 1; } + + if (_layer_display == Stacked) { + update_contents_height (); + update_coverage_frames (); + } else { + /* layering has probably been modified. reflect this in the canvas. */ + layer_regions(); + } } void -StreamView::playlist_changed (boost::shared_ptr ds) +StreamView::playlist_switched (boost::weak_ptr wtr) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_changed), ds)); + boost::shared_ptr tr (wtr.lock()); + + if (!tr) { + return; + } /* disconnect from old playlist */ - for (vector::iterator i = playlist_connections.begin(); i != playlist_connections.end(); ++i) { - (*i).disconnect(); - } - - playlist_connections.clear(); - undisplay_diskstream (); + playlist_connections.drop_connections (); + undisplay_track (); - /* draw it */ + /* update layers count and the y positions and heights of our regions */ + _layers = tr->playlist()->top_layer() + 1; + update_contents_height (); + update_coverage_frames (); - redisplay_diskstream (); + tr->playlist()->set_explicit_relayering (_layer_display == Stacked); - /* catch changes */ + /* draw it */ - playlist_connections.push_back (ds->playlist()->RegionAdded.connect (mem_fun (*this, &StreamView::add_region_view))); - playlist_connections.push_back (ds->playlist()->RegionRemoved.connect (mem_fun (*this, &StreamView::remove_region_view))); - playlist_connections.push_back (ds->playlist()->StateChanged.connect (mem_fun (*this, &StreamView::playlist_state_changed))); - playlist_connections.push_back (ds->playlist()->Modified.connect (mem_fun (*this, &StreamView::playlist_modified))); -} + redisplay_track (); -void -StreamView::playlist_state_changed (Change ignored) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_state_changed), ignored)); + /* catch changes */ - redisplay_diskstream (); + 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()); + // ds->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::redisplay_diskstream, this), gui_context()); } void StreamView::diskstream_changed () { - Track *t; - + boost::shared_ptr t; + if ((t = _trackview.track()) != 0) { - Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*this, &StreamView::display_diskstream), t->diskstream())); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t)); } else { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::undisplay_diskstream)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::undisplay_track, this)); } } void StreamView::apply_color (Gdk::Color& color, ColorTarget target) - { list::iterator i; @@ -282,7 +360,7 @@ StreamView::apply_color (Gdk::Color& color, ColorTarget target) (*i)->set_color (region_color); } break; - + case StreamBaseColor: stream_base_color = RGBA_TO_UINT ( color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255); @@ -294,34 +372,36 @@ StreamView::apply_color (Gdk::Color& color, ColorTarget target) void StreamView::region_layered (RegionView* rv) { - rv->get_canvas_group()->lower_to_bottom(); - /* don't ever leave it at the bottom, since then it doesn't get events - the parent group does instead ... */ - - /* this used to be + 1, but regions to the left ended up below - ..something.. and couldn't receive events. why? good question. - */ - rv->get_canvas_group()->raise (rv->region().layer() + 2); + rv->get_canvas_group()->raise (rv->region()->layer()); } void StreamView::rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box)); + setup_rec_box (); } void StreamView::sess_rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box)); + setup_rec_box (); } void StreamView::transport_changed() { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box)); + setup_rec_box (); +} + +void +StreamView::transport_looped() +{ + // to force a new rec region + rec_active = false; + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::setup_rec_box, this)); } void @@ -330,41 +410,56 @@ StreamView::update_rec_box () if (rec_active && rec_rects.size() > 0) { /* only update the last box */ RecBoxInfo & rect = rec_rects.back(); - jack_nframes_t at = _trackview.get_diskstream()->current_capture_end(); + nframes_t at = _trackview.track()->current_capture_end(); double xstart; double xend; - + switch (_trackview.track()->mode()) { + + case NonLayered: case Normal: rect.length = at - rect.start; - xstart = _trackview.editor.frame_to_pixel (rect.start); - xend = _trackview.editor.frame_to_pixel (at); + xstart = _trackview.editor().frame_to_pixel (rect.start); + xend = _trackview.editor().frame_to_pixel (at); break; - + case Destructive: rect.length = 2; - xstart = _trackview.editor.frame_to_pixel (_trackview.get_diskstream()->current_capture_start()); - xend = _trackview.editor.frame_to_pixel (at); + xstart = _trackview.editor().frame_to_pixel (_trackview.track()->current_capture_start()); + xend = _trackview.editor().frame_to_pixel (at); break; } - + rect.rectangle->property_x1() = xstart; rect.rectangle->property_x2() = xend; } } - + RegionView* -StreamView::find_view (const Region& region) +StreamView::find_view (boost::shared_ptr region) { for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - if (&(*i)->region() == ®ion) { + if ((*i)->region() == region) { return *i; } } return 0; } - + +uint32_t +StreamView::num_selected_regionviews () const +{ + uint32_t cnt = 0; + + for (list::const_iterator i = region_views.begin(); i != region_views.end(); ++i) { + if ((*i)->get_selected()) { + ++cnt; + } + } + return cnt; +} + void StreamView::foreach_regionview (sigc::slot slot) { @@ -373,32 +468,58 @@ StreamView::foreach_regionview (sigc::slot slot) } } +void +StreamView::foreach_selected_regionview (sigc::slot slot) +{ + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + if ((*i)->get_selected()) { + slot (*i); + } + } +} + void StreamView::set_selected_regionviews (RegionSelection& regions) { bool selected; - // cerr << _trackview.name() << " (selected = " << regions.size() << ")" << endl; for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - + selected = false; - + for (RegionSelection::iterator ii = regions.begin(); ii != regions.end(); ++ii) { if (*i == *ii) { selected = true; + break; } } - - // cerr << "\tregion " << (*i)->region().name() << " selected = " << selected << endl; + (*i)->set_selected (selected); } } void -StreamView::get_selectables (jack_nframes_t start, jack_nframes_t end, list& results) +StreamView::get_selectables (nframes_t start, nframes_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); + } + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - if ((*i)->region().coverage(start, end) != OverlapNone) { + + bool layer_ok = true; + + if (_layer_display == Stacked) { + layer_t const l = (*i)->region()->layer (); + layer_ok = (min_layer <= l && l <= max_layer); + } + + if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) { results.push_back (*i); } } @@ -414,3 +535,53 @@ StreamView::get_inverted_selectables (Selection& sel, list& results } } +/** @return height of a child region view, depending on stacked / overlaid mode */ +double +StreamView::child_height () const +{ + if (_layer_display == Stacked) { + return height / _layers; + } + + return height; +} + +void +StreamView::update_contents_height () +{ + const double h = child_height (); + + for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { + switch (_layer_display) { + case Overlaid: + (*i)->set_y (0); + break; + case Stacked: + (*i)->set_y (height - ((*i)->region()->layer() + 1) * h); + break; + } + + (*i)->set_height (h); + } + + for (vector::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) { + i->rectangle->property_y2() = height - 1.0; + } +} + +void +StreamView::set_layer_display (LayerDisplay d) +{ + _layer_display = d; + update_contents_height (); + update_coverage_frames (); + _trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked); +} + +void +StreamView::update_coverage_frames () +{ + for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) { + (*i)->update_coverage_frames (_layer_display); + } +}