X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=c211804fc492d2e90e1e25cf17f0a4171d0dd598;hb=deb2033a346d5a4638b9ee4e8eba66cd1b9a54e4;hp=34c1e4a1c959db18da484e4a312cb23411d71703;hpb=d7db3f757fde92126ef9886370ce604992b7e974;p=ardour.git diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 34c1e4a1c9..c211804fc4 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -45,39 +45,48 @@ 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()) + , use_rec_regions (tv.editor().show_waveforms_recording ()) , region_color(_trackview.color()) , stream_base_color(0xFFFFFFFF) - , layers(1) + , _layers (1) + , _layer_display (Overlaid) , height(tv.height) - , layer_display(Overlaid) , 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() = _trackview.editor.frame_to_pixel (max_frames); - 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 (bind ( + 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.session().TransportLooped.connect (mem_fun (*this, &StreamView::transport_looped)); - _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 ( + mem_fun (*this, &StreamView::diskstream_changed)); + _trackview.session().TransportStateChange.connect ( + mem_fun (*this, &StreamView::transport_changed)); + _trackview.session().TransportLooped.connect ( + mem_fun (*this, &StreamView::transport_looped)); + _trackview.get_diskstream()->RecordEnableChanged.connect ( + mem_fun (*this, &StreamView::rec_enable_changed)); + _trackview.session().RecordStateChanged.connect ( + mem_fun (*this, &StreamView::sess_rec_enable_changed)); } ColorsChanged.connect (mem_fun (*this, &StreamView::color_handler)); @@ -86,7 +95,12 @@ StreamView::StreamView (RouteTimeAxisView& tv) StreamView::~StreamView () { undisplay_diskstream (); - delete canvas_group; + + delete canvas_rect; + + if (owns_canvas_group) { + delete canvas_group; + } } void @@ -118,7 +132,7 @@ StreamView::set_height (double h) } height = h; - update_contents_y_position_and_height (); + update_contents_height (); return 0; } @@ -140,20 +154,25 @@ 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 (boost::shared_ptr r) { - add_region_view_internal (r, false); + // ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r)); + + add_region_view_internal (r, true); + update_contents_height (); } void @@ -169,8 +188,9 @@ StreamView::remove_region_view (boost::weak_ptr weak_r) for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { if (((*i)->region()) == r) { - delete *i; + RegionView* rv = *i; region_views.erase (i); + delete rv; break; } } @@ -179,8 +199,11 @@ StreamView::remove_region_view (boost::weak_ptr weak_r) void StreamView::undisplay_diskstream () { - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { + for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) { + RegionViewList::iterator next = i; + ++next; delete *i; + i = next; } region_views.clear(); @@ -191,18 +214,75 @@ StreamView::display_diskstream (boost::shared_ptr ds) { playlist_change_connection.disconnect(); playlist_changed (ds); - playlist_change_connection = ds->PlaylistChanged.connect (bind (mem_fun (*this, &StreamView::playlist_changed), ds)); + playlist_change_connection = ds->PlaylistChanged.connect (bind ( + mem_fun (*this, &StreamView::playlist_changed_weak), + boost::weak_ptr (ds))); +} + +void +StreamView::layer_regions() +{ + // 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 in the sorted list order + for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) { + region_layered (*i); + } } void StreamView::playlist_modified_weak (boost::weak_ptr ds) { boost::shared_ptr sp (ds.lock()); - if (!sp) { - return; + if (sp) { + playlist_modified (sp); } - - playlist_modified (sp); } void @@ -212,38 +292,54 @@ StreamView::playlist_modified (boost::shared_ptr ds) ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds)); /* update layers count and the y positions and heights of our regions */ - layers = ds->playlist()->top_layer() + 1; - update_contents_y_position_and_height (); + if (ds->playlist()) { + _layers = ds->playlist()->top_layer() + 1; + update_contents_height (); + update_coverage_frames (); + redisplay_diskstream (); + } +} - redisplay_diskstream (); +void +StreamView::playlist_changed_weak (boost::weak_ptr ds) +{ + boost::shared_ptr sp (ds.lock()); + if (sp) { + playlist_changed (sp); + } } void StreamView::playlist_changed (boost::shared_ptr ds) { - /* XXX: binding to a shared_ptr, is this ok? */ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_changed), ds)); + ENSURE_GUI_THREAD (bind ( + mem_fun (*this, &StreamView::playlist_changed_weak), + boost::weak_ptr (ds))); /* disconnect from old playlist */ - for (vector::iterator i = playlist_connections.begin(); i != playlist_connections.end(); ++i) { + for (vector::iterator i = playlist_connections.begin(); + i != playlist_connections.end(); ++i) { (*i).disconnect(); } playlist_connections.clear(); undisplay_diskstream (); - /* draw it */ + /* update layers count and the y positions and heights of our regions */ + _layers = ds->playlist()->top_layer() + 1; + update_contents_height (); + update_coverage_frames (); + + /* draw it */ redisplay_diskstream (); /* catch changes */ - playlist_connections.push_back (ds->playlist()->Modified.connect (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds))); - - /* update layers count and the y positions and heights of our regions */ - layers = ds->playlist()->top_layer() + 1; - update_contents_y_position_and_height (); + playlist_connections.push_back (ds->playlist()->Modified.connect (bind ( + mem_fun (*this, &StreamView::playlist_modified_weak), + ds))); } void @@ -252,7 +348,9 @@ StreamView::diskstream_changed () 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 (bind ( + mem_fun (*this, &StreamView::display_diskstream), + t->diskstream())); } else { Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::undisplay_diskstream)); } @@ -283,16 +381,10 @@ 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 @@ -334,14 +426,14 @@ StreamView::update_rec_box () switch (_trackview.track()->mode()) { 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.get_diskstream()->current_capture_start()); + xend = _trackview.editor().frame_to_pixel (at); break; } @@ -375,7 +467,6 @@ 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; @@ -383,10 +474,10 @@ StreamView::set_selected_regionviews (RegionSelection& regions) 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); } } @@ -411,23 +502,35 @@ 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_y_position_and_height () +StreamView::update_contents_height () { canvas_rect->property_y2() = height; - const double lh = height / layers; + const double h = child_height (); for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - switch (layer_display) { + switch (_layer_display) { case Overlaid: - (*i)->set_y_position_and_height (0, height); + (*i)->set_y (0); break; case Stacked: - double const y = (*i)->region()->layer() * lh; - (*i)->set_y_position_and_height (y, lh); + (*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) { @@ -438,6 +541,15 @@ StreamView::update_contents_y_position_and_height () void StreamView::set_layer_display (LayerDisplay d) { - layer_display = d; - update_contents_y_position_and_height (); + _layer_display = d; + update_contents_height (); + update_coverage_frames (); +} + +void +StreamView::update_coverage_frames () +{ + for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) { + (*i)->update_coverage_frames (_layer_display); + } }