X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=d6f2edeba9e9ef8ac645f120bbf98ebd80e956a9;hb=7f3c381a3acd8e605be76f1ba0ec7f1a7e11373f;hp=c94184272e3397cb4ba91766b369694aa137c60a;hpb=9d5d82b4df5b3510177fd31557ac765f46778fe8;p=ardour.git diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index c94184272e..d6f2edeba9 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -29,7 +29,7 @@ #include #include "streamview.h" -#include "regionview.h" +#include "region_view.h" #include "route_time_axis.h" #include "canvas-waveview.h" #include "canvas-simplerect.h" @@ -48,25 +48,28 @@ using namespace Editing; StreamView::StreamView (RouteTimeAxisView& tv) : _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()) + , rec_updating(false) + , rec_active(false) + , use_rec_regions(tv.editor.show_waveforms_recording()) + , region_color(_trackview.color()) + , stream_base_color(0xFFFFFFFF) + , last_rec_data_frame(0) { - region_color = _trackview.color(); - /* set_position() will position the group */ - canvas_group = new ArdourCanvas::Group(*_trackview.canvas_display); - canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group); canvas_rect->property_x1() = 0.0; canvas_rect->property_y1() = 0.0; - canvas_rect->property_x2() = 1000000.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 - canvas_rect->property_fill_color_rgba() = stream_base_color; + // (Fill/Outline colours set in derived classes) canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview)); - _samples_per_unit = _trackview.editor.get_current_zoom(); - if (_trackview.is_track()) { _trackview.track()->DiskstreamChanged.connect (mem_fun (*this, &StreamView::diskstream_changed)); _trackview.session().TransportStateChange.connect (mem_fun (*this, &StreamView::transport_changed)); @@ -74,10 +77,6 @@ StreamView::StreamView (RouteTimeAxisView& tv) _trackview.session().RecordStateChanged.connect (mem_fun (*this, &StreamView::sess_rec_enable_changed)); } - rec_updating = false; - rec_active = false; - use_rec_regions = tv.editor.show_waveforms_recording (); - ColorChanged.connect (mem_fun (*this, &StreamView::color_handler)); } @@ -113,16 +112,16 @@ StreamView::set_height (gdouble h) return -1; } + if (canvas_rect->property_y2() == h) { + return 0; + } + canvas_rect->property_y2() = h; for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { (*i)->set_height (h); } - /*for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - (*i)->set_height (h); - }*/ - for (vector::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) { RecBoxInfo &recbox = (*i); recbox.rectangle->property_y2() = h - 1.0; @@ -160,18 +159,24 @@ StreamView::set_samples_per_unit (gdouble spp) } void -StreamView::add_region_view (Region *r) +StreamView::add_region_view (boost::shared_ptr r) { add_region_view_internal (r, true); } 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 (bind (mem_fun (*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) { + if (((*i)->region()) == r) { delete *i; region_views.erase (i); break; @@ -179,24 +184,6 @@ StreamView::remove_region_view (Region *r) } } -void -StreamView::remove_rec_region (Region *r) -{ - 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; - } - } -} - void StreamView::undisplay_diskstream () { @@ -208,7 +195,7 @@ StreamView::undisplay_diskstream () } void -StreamView::display_diskstream (Diskstream *ds) +StreamView::display_diskstream (boost::shared_ptr ds) { playlist_change_connection.disconnect(); playlist_changed (ds); @@ -220,13 +207,11 @@ StreamView::playlist_modified () { ENSURE_GUI_THREAD (mem_fun (*this, &StreamView::playlist_modified)); - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - region_layered (*i); - } + redisplay_diskstream (); } void -StreamView::playlist_changed (Diskstream *ds) +StreamView::playlist_changed (boost::shared_ptr ds) { ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_changed), ds)); @@ -245,29 +230,16 @@ StreamView::playlist_changed (Diskstream *ds) /* catch changes */ - 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))); } void -StreamView::playlist_state_changed (Change ignored) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_state_changed), ignored)); - - redisplay_diskstream (); -} - -void -StreamView::diskstream_changed (void *src_ignored) +StreamView::diskstream_changed () { Track *t; if ((t = _trackview.track()) != 0) { - Diskstream& ds = t->diskstream(); - /* XXX grrr: when will SigC++ allow me to bind references? */ - Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*this, &StreamView::display_diskstream), &ds)); + 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)); } @@ -285,13 +257,12 @@ StreamView::apply_color (Gdk::Color& color, ColorTarget target) for (i = region_views.begin(); i != region_views.end(); ++i) { (*i)->set_color (region_color); } - // stream_base_color = RGBA_TO_UINT (color.red/256, color.green/256, color.blue/256, 255); - // gnome_canvas_item_set (canvas_rect, "fill_color_rgba", stream_base_color, NULL); break; case StreamBaseColor: - // stream_base_color = RGBA_TO_UINT (color.red/256, color.green/256, color.blue/256, 255); - // gnome_canvas_item_set (canvas_rect, "fill_color_rgba", stream_base_color, NULL); + stream_base_color = RGBA_TO_UINT ( + color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255); + canvas_rect->property_fill_color_rgba() = stream_base_color; break; } } @@ -305,11 +276,14 @@ StreamView::region_layered (RegionView* rv) get events - the parent group does instead ... */ - rv->get_canvas_group()->raise (rv->region().layer() + 1); + /* 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); } void -StreamView::rec_enable_changed (void *src) +StreamView::rec_enable_changed () { Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box)); } @@ -332,7 +306,7 @@ 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.get_diskstream()->current_capture_end(); double xstart; double xend; @@ -356,11 +330,11 @@ StreamView::update_rec_box () } 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; } } @@ -397,10 +371,10 @@ StreamView::set_selected_regionviews (RegionSelection& regions) } void -StreamView::get_selectables (jack_nframes_t start, jack_nframes_t end, list& results) +StreamView::get_selectables (nframes_t start, nframes_t end, list& results) { for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - if ((*i)->region().coverage(start, end) != OverlapNone) { + if ((*i)->region()->coverage(start, end) != OverlapNone) { results.push_back (*i); } }