X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=54e0a9ef5e86389530df45b13650eeea91b085de;hb=deb2033a346d5a4638b9ee4e8eba66cd1b9a54e4;hp=3923f7e79a8457a9bd777b6da011afcd0eacc2d7;hpb=ef65fd251023378699c3ef3842fc55e93a92d04a;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 3923f7e79a..54e0a9ef5e 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -31,8 +31,10 @@ #include #include +#include "ardour_ui.h" #include "streamview.h" #include "region_view.h" +#include "automation_region_view.h" #include "route_time_axis.h" #include "simplerect.h" #include "simpleline.h" @@ -57,20 +59,23 @@ static const int32_t sync_mark_width = 9; sigc::signal RegionView::RegionViewGoingAway; -RegionView::RegionView (ArdourCanvas::Group* parent, - TimeAxisView& tv, +RegionView::RegionView (ArdourCanvas::Group* parent, + TimeAxisView& tv, boost::shared_ptr r, - double spu, - Gdk::Color& basic_color) - : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), + double spu, + Gdk::Color& basic_color) + : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, + TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText| TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame)) , _region (r) , sync_mark(0) + , sync_line(0) , editor(0) , current_visible_sync_position(0.0) , valid(false) + , _enable_display(false) , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) @@ -83,10 +88,26 @@ RegionView::RegionView (const RegionView& other) /* derived concrete type will call init () */ _region = other._region; - editor = other.editor; current_visible_sync_position = other.current_visible_sync_position; valid = false; _pixel_width = other._pixel_width; + _height = other._height; +} + +RegionView::RegionView (const RegionView& other, boost::shared_ptr other_region) + : TimeAxisViewItem (other) +{ + /* this is a pseudo-copy constructor used when dragging regions + around on the canvas. + */ + + /* derived concrete type will call init () */ + + _region = other_region; + current_visible_sync_position = other.current_visible_sync_position; + valid = false; + _pixel_width = other._pixel_width; + _height = other._height; } RegionView::RegionView (ArdourCanvas::Group* parent, @@ -94,13 +115,16 @@ RegionView::RegionView (ArdourCanvas::Group* parent, boost::shared_ptr r, double spu, Gdk::Color& basic_color, + bool recording, TimeAxisViewItem::Visibility visibility) - : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), visibility) + : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, visibility) , _region (r) , sync_mark(0) + , sync_line(0) , editor(0) , current_visible_sync_position(0.0) , valid(false) + , _enable_display(false) , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) @@ -110,43 +134,39 @@ RegionView::RegionView (ArdourCanvas::Group* parent, void RegionView::init (Gdk::Color& basic_color, bool wfd) { + editor = 0; valid = true; in_destructor = false; + _height = 0; wait_for_data = wfd; + sync_mark = 0; + sync_line = 0; + sync_mark = 0; + sync_line = 0; compute_colors (basic_color); - name_highlight->set_data ("regionview", this); + if (name_highlight) { + name_highlight->set_data ("regionview", this); + name_highlight->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); + } if (name_text) { name_text->set_data ("regionview", this); } - /* an equilateral triangle */ + if (wfd) + _enable_display = true; - ArdourCanvas::Points shape; - shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1)); - shape.push_back (Gnome::Art::Point ((sync_mark_width - 1)/2, 1)); - shape.push_back (Gnome::Art::Point (0, sync_mark_width - 1)); - shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1)); - - sync_mark = new ArdourCanvas::Polygon (*group); - sync_mark->property_points() = shape; - sync_mark->property_fill_color_rgba() = fill_color; - sync_mark->hide(); - - reset_width_dependent_items ((double) _region->length() / samples_per_unit); - - set_y_position_and_height (0, trackview.height); + set_height (trackview.current_height()); _region->StateChanged.connect (mem_fun(*this, &RegionView::region_changed)); group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); - name_highlight->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); set_colors (); - ColorChanged.connect (mem_fun (*this, &RegionView::color_handler)); + ColorsChanged.connect (mem_fun (*this, &RegionView::color_handler)); /* XXX sync mark drag? */ } @@ -159,9 +179,11 @@ RegionView::~RegionView () delete *g; } - if (editor) { - delete editor; + for (std::list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + delete *i; } + + delete editor; } gint @@ -205,9 +227,6 @@ RegionView::region_changed (Change what_changed) if (what_changed & Region::SyncOffsetChanged) { region_sync_changed (); } - if (what_changed & Region::LayerChanged) { - region_layered (); - } if (what_changed & Region::LockChanged) { region_locked (); } @@ -250,14 +269,6 @@ RegionView::reset_width_dependent_items (double pixel_width) _pixel_width = pixel_width; } -void -RegionView::region_layered () -{ - RouteTimeAxisView *rtv = dynamic_cast(&get_time_axis_view()); - assert(rtv); - rtv->view()->region_layered (this); -} - void RegionView::region_muted () { @@ -271,24 +282,12 @@ RegionView::region_opacity () set_frame_color (); } -void -RegionView::raise () -{ - _region->raise (); -} - void RegionView::raise_to_top () { _region->raise_to_top (); } -void -RegionView::lower () -{ - _region->lower (); -} - void RegionView::lower_to_bottom () { @@ -358,6 +357,7 @@ RegionView::set_colors () if (sync_mark) { sync_mark->property_fill_color_rgba() = fill_color; + sync_line->property_fill_color_rgba() = fill_color; } } @@ -381,8 +381,8 @@ RegionView::fake_set_opaque (bool yn) } else { fill_opacity = 60; } - - TimeAxisViewItem::set_frame_color (); + + set_frame_color (); } void @@ -432,15 +432,32 @@ RegionView::region_renamed () void RegionView::region_sync_changed () { - if (sync_mark == 0) { - return; - } - int sync_dir; nframes_t sync_offset; sync_offset = _region->sync_offset (sync_dir); + if (sync_offset == 0) { + /* no need for a sync mark */ + if (sync_mark) { + sync_mark->hide(); + sync_line->hide (); + } + return; + } + + if (!sync_mark) { + + /* points set below */ + + sync_mark = new ArdourCanvas::Polygon (*group); + sync_mark->property_fill_color_rgba() = fill_color; + + sync_line = new ArdourCanvas::Line (*group); + sync_line->property_fill_color_rgba() = fill_color; + sync_line->property_width_pixels() = 1; + } + /* this has to handle both a genuine change of position, a change of samples_per_unit, and a change in the bounds of the _region-> */ @@ -448,8 +465,9 @@ RegionView::region_sync_changed () if (sync_offset == 0) { /* no sync mark - its the start of the region */ - + sync_mark->hide(); + sync_line->hide (); } else { @@ -458,6 +476,7 @@ RegionView::region_sync_changed () /* no sync mark - its out of the bounds of the region */ sync_mark->hide(); + sync_line->hide (); } else { @@ -473,8 +492,14 @@ RegionView::region_sync_changed () points.push_back (Gnome::Art::Point (offset, sync_mark_width - 1)); points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); sync_mark->property_points().set_value (points); - sync_mark->show(); + sync_mark->show (); + points.clear (); + points.push_back (Gnome::Art::Point (offset, 0)); + points.push_back (Gnome::Art::Point (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); + + sync_line->property_points().set_value (points); + sync_line->show (); } } } @@ -495,6 +520,17 @@ RegionView::move (double x_delta, double y_delta) } } +void +RegionView::remove_ghost_in (TimeAxisView& tv) +{ + for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + if (&(*i)->trackview == &tv) { + delete *i; + break; + } + } +} + void RegionView::remove_ghost (GhostRegion* ghost) { @@ -516,3 +552,90 @@ RegionView::get_fill_color () return fill_color; } +void +RegionView::set_height (double h) +{ + TimeAxisViewItem::set_height(h); + + if (sync_line) { + Points points; + int sync_dir; + nframes_t sync_offset; + sync_offset = _region->sync_offset (sync_dir); + double offset = sync_offset / samples_per_unit; + + points.push_back (Gnome::Art::Point (offset, 0)); + points.push_back (Gnome::Art::Point (offset, h - NAME_HIGHLIGHT_SIZE)); + sync_line->property_points().set_value (points); + } +} + +/** Remove old coverage frames and make new ones, if we're in a LayerDisplay mode + * which uses them. */ +void +RegionView::update_coverage_frames (LayerDisplay d) +{ + /* remove old coverage frames */ + for (std::list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + delete *i; + } + + _coverage_frames.clear (); + + if (d != Stacked) { + /* don't do coverage frames unless we're in stacked mode */ + return; + } + + boost::shared_ptr pl (_region->playlist ()); + if (!pl) { + return; + } + + nframes_t const position = _region->first_frame (); + nframes_t t = position; + nframes_t const end = _region->last_frame (); + + ArdourCanvas::SimpleRect* cr = 0; + bool me = false; + + uint32_t const color = frame->property_fill_color_rgba (); + uint32_t const base_alpha = UINT_RGBA_A (color); + + while (t < end) { + + t++; + + /* is this region is on top at time t? */ + bool const new_me = (pl->top_region_at (t) == _region); + + /* finish off any old rect, if required */ + if (cr && me != new_me) { + cr->property_x2() = trackview.editor().frame_to_pixel (t - position); + } + + /* start off any new rect, if required */ + if (cr == 0 || me != new_me) { + cr = new ArdourCanvas::SimpleRect (*group); + _coverage_frames.push_back (cr); + cr->property_x1() = trackview.editor().frame_to_pixel (t - position); + cr->property_y1() = 1; + cr->property_y2() = _height + 1; + cr->property_outline_pixels() = 0; + /* areas that will be played get a lower alpha */ + uint32_t alpha = base_alpha; + if (new_me) { + alpha /= 2; + } + cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (color, alpha); + } + + t = pl->find_next_region_boundary (t, 1); + me = new_me; + } + + if (cr) { + /* finish off the last rectangle */ + cr->property_x2() = trackview.editor().frame_to_pixel (end - position); + } +}