X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=7fa453faf72734daf5a6d63f4fc9179b6fdca10d;hb=7f9aea14e926a58f86ffdc788e4873dcf41a6d2c;hp=419ee9b606ccf2bed016f18cae64e42cb3c65cde;hpb=4e1f451520975868659f4c00d00883f5f1cd5805;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 419ee9b606..7fa453faf7 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -24,12 +24,12 @@ #include #include -#include +#include "pbd/stacktrace.h" -#include -#include -#include -#include +#include "ardour/playlist.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/audio_diskstream.h" #include "ardour_ui.h" #include "streamview.h" @@ -49,6 +49,7 @@ #include "i18n.h" +using namespace std; using namespace sigc; using namespace ARDOUR; using namespace PBD; @@ -63,27 +64,28 @@ RegionView::RegionView (ArdourCanvas::Group* parent, TimeAxisView& tv, boost::shared_ptr r, double spu, - Gdk::Color& basic_color) + Gdk::Color const & 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) + 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) + , _time_converter(r->session(), r->position()) { } RegionView::RegionView (const RegionView& other) - : TimeAxisViewItem (other) + : sigc::trackable(other) + , TimeAxisViewItem (other) + , _time_converter(other._time_converter) { /* derived concrete type will call init () */ @@ -95,7 +97,9 @@ RegionView::RegionView (const RegionView& other) } RegionView::RegionView (const RegionView& other, boost::shared_ptr other_region) - : TimeAxisViewItem (other) + : sigc::trackable(other) + , TimeAxisViewItem (other) + , _time_converter(other._time_converter) { /* this is a pseudo-copy constructor used when dragging regions around on the canvas. @@ -114,7 +118,7 @@ RegionView::RegionView (ArdourCanvas::Group* parent, TimeAxisView& tv, boost::shared_ptr r, double spu, - Gdk::Color& basic_color, + Gdk::Color const & basic_color, bool recording, TimeAxisViewItem::Visibility visibility) : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, visibility) @@ -128,11 +132,12 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) + , _time_converter(r->session(), r->position()) { } void -RegionView::init (Gdk::Color& basic_color, bool wfd) +RegionView::init (Gdk::Color const & basic_color, bool wfd) { editor = 0; valid = true; @@ -149,10 +154,19 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) 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)); + + frame_handle_start->set_data ("regionview", this); + frame_handle_start->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), frame_handle_start, this)); + + frame_handle_end->set_data ("regionview", this); + frame_handle_end->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), frame_handle_end, this)); + + frame_handle_start->raise_to_top(); + frame_handle_end->raise_to_top(); } - if (name_text) { - name_text->set_data ("regionview", this); + if (name_pixbuf) { + name_pixbuf->set_data ("regionview", this); } if (wfd) @@ -179,11 +193,15 @@ RegionView::~RegionView () delete *g; } + for (std::list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + delete *i; + } + delete editor; } gint -RegionView::_lock_toggle (ArdourCanvas::Item* item, GdkEvent* ev, void* arg) +RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg) { switch (ev->type) { case GDK_BUTTON_RELEASE: @@ -223,15 +241,6 @@ RegionView::region_changed (Change what_changed) if (what_changed & Region::SyncOffsetChanged) { region_sync_changed (); } - /* - this should not be needed now that only playlist can change layering - */ - /* - if (what_changed & Region::LayerChanged) { - // this is handled by the playlist i believe - //region_layered (); - } - */ if (what_changed & Region::LockChanged) { region_locked (); } @@ -251,6 +260,7 @@ RegionView::region_resized (Change what_changed) if (what_changed & ARDOUR::PositionChanged) { set_position (_region->position(), 0); + _time_converter.set_origin(_region->position()); } if (what_changed & Change (StartChanged|LengthChanged)) { @@ -272,21 +282,8 @@ RegionView::reset_width_dependent_items (double pixel_width) { TimeAxisViewItem::reset_width_dependent_items (pixel_width); _pixel_width = pixel_width; - - /*for (AutomationChildren::iterator i = _automation_children.begin(); - i != _automation_children.end(); ++i) { - i->second->reset_width_dependent_items(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 () { @@ -313,7 +310,7 @@ RegionView::lower_to_bottom () } bool -RegionView::set_position (nframes_t pos, void* src, double* ignored) +RegionView::set_position (nframes_t pos, void* /*src*/, double* ignored) { double delta; bool ret; @@ -330,11 +327,6 @@ RegionView::set_position (nframes_t pos, void* src, double* ignored) for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->group->move (delta, 0.0); } - - for (AutomationChildren::iterator i = _automation_children.begin(); - i != _automation_children.end(); ++i) { - i->second->get_canvas_group()->move(delta, 0.0); - } } return ret; @@ -367,12 +359,6 @@ RegionView::set_duration (nframes_t frames, void *src) return true; } -void -RegionView::compute_colors (Gdk::Color& basic_color) -{ - TimeAxisViewItem::compute_colors (basic_color); -} - void RegionView::set_colors () { @@ -541,11 +527,6 @@ RegionView::move (double x_delta, double y_delta) for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->group->move (x_delta, 0.0); } - - for (AutomationChildren::iterator i = _automation_children.begin(); - i != _automation_children.end(); ++i) { - i->second->get_canvas_group()->move(x_delta, 0.0); - } } void @@ -598,3 +579,72 @@ RegionView::set_height (double h) } } +/** 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); + } +}