X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=aeae3acc9a1015179a6572a11cfb650e8fd48721;hb=dab0dacc66dcc190b4408ba75e3807973582cbd6;hp=fff7243f5346ec74efde9dd7e2be8da12521e302;hpb=cb413146428ce5db5e281d70f2b3b7df27c1aaab;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index fff7243f53..aeae3acc9a 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.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 @@ -24,12 +24,13 @@ #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/session.h" #include "ardour_ui.h" #include "streamview.h" @@ -49,7 +50,7 @@ #include "i18n.h" -using namespace sigc; +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -57,67 +58,73 @@ using namespace ArdourCanvas; static const int32_t sync_mark_width = 9; -sigc::signal RegionView::RegionViewGoingAway; +PBD::Signal1 RegionView::RegionViewGoingAway; -RegionView::RegionView (ArdourCanvas::Group* parent, +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(), + 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().tempo_map(), r->position()) { + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other) - : TimeAxisViewItem (other) + : sigc::trackable(other) + , TimeAxisViewItem (other) + , _time_converter(other._time_converter) { /* derived concrete type will call init () */ _region = other._region; - editor = 0; current_visible_sync_position = other.current_visible_sync_position; valid = false; - _enable_display = false; _pixel_width = other._pixel_width; + + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); } 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 + /* this is a pseudo-copy constructor used when dragging regions around on the canvas. */ /* 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; + + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); } -RegionView::RegionView (ArdourCanvas::Group* parent, +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(), visibility) + : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, visibility) , _region (r) , sync_mark(0) , sync_line(0) @@ -128,16 +135,17 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) + , _time_converter(r->session().tempo_map(), r->position()) { } void -RegionView::init (Gdk::Color& basic_color, bool wfd) +RegionView::init (Gdk::Color const & basic_color, bool wfd) { - valid = true; - _enable_display = false; - in_destructor = false; - wait_for_data = wfd; + editor = 0; + valid = true; + in_destructor = false; + wait_for_data = wfd; sync_mark = 0; sync_line = 0; sync_mark = 0; @@ -145,26 +153,39 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) compute_colors (basic_color); - name_highlight->set_data ("regionview", this); + if (name_highlight) { + name_highlight->set_data ("regionview", this); + name_highlight->signal_event().connect (sigc::bind (sigc::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 (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); + + frame_handle_end->set_data ("regionview", this); + frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); - if (name_text) { - name_text->set_data ("regionview", this); + frame_handle_start->raise_to_top(); + frame_handle_end->raise_to_top(); } - if (wfd) - _enable_display = true; + if (name_pixbuf) { + name_pixbuf->set_data ("regionview", this); + name_pixbuf->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_event), name_pixbuf, this)); + } - set_y_position_and_height (0, trackview.height - 2); + if (wfd) { + _enable_display = true; + } - _region->StateChanged.connect (mem_fun(*this, &RegionView::region_changed)); + set_height (trackview.current_height()); - 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)); + _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context()); + + group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); set_colors (); - ColorsChanged.connect (mem_fun (*this, &RegionView::color_handler)); - // set_pango_fontsize(); + ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); + /* XXX sync mark drag? */ } @@ -176,13 +197,15 @@ RegionView::~RegionView () delete *g; } - if (editor) { - delete editor; + for (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: @@ -191,7 +214,7 @@ RegionView::_lock_toggle (ArdourCanvas::Item* item, GdkEvent* ev, void* arg) break; default: break; - } + } return FALSE; } @@ -202,35 +225,27 @@ RegionView::lock_toggle () } void -RegionView::region_changed (Change what_changed) +RegionView::region_changed (const PropertyChange& what_changed) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &RegionView::region_changed), what_changed)); + ENSURE_GUI_THREAD (*this, &RegionView::region_changed, what_changed); - if (what_changed & BoundsChanged) { + if (what_changed.contains (ARDOUR::bounds_change)) { region_resized (what_changed); region_sync_changed (); } - if (what_changed & Region::MuteChanged) { + if (what_changed.contains (ARDOUR::Properties::muted)) { region_muted (); } - if (what_changed & Region::OpacityChanged) { + if (what_changed.contains (ARDOUR::Properties::opaque)) { region_opacity (); } - if (what_changed & ARDOUR::NameChanged) { + if (what_changed.contains (ARDOUR::Properties::name)) { region_renamed (); } - if (what_changed & Region::SyncOffsetChanged) { + if (what_changed.contains (ARDOUR::Properties::sync_position)) { region_sync_changed (); } - /* - this should not be needed now that only playlist can change layering - */ - /* - if (what_changed & Region::LayerChanged) { - region_layered (); - } - */ - if (what_changed & Region::LockChanged) { + if (what_changed.contains (ARDOUR::Properties::locked)) { region_locked (); } } @@ -243,20 +258,25 @@ RegionView::region_locked () } void -RegionView::region_resized (Change what_changed) +RegionView::region_resized (const PropertyChange& what_changed) { double unit_length; - if (what_changed & ARDOUR::PositionChanged) { + if (what_changed.contains (ARDOUR::Properties::position)) { set_position (_region->position(), 0); + _time_converter.set_origin(_region->position()); } - if (what_changed & Change (StartChanged|LengthChanged)) { + PropertyChange s_and_l; + s_and_l.add (ARDOUR::Properties::start); + s_and_l.add (ARDOUR::Properties::length); + + if (what_changed.contains (s_and_l)) { set_duration (_region->length(), 0); unit_length = _region->length() / samples_per_unit; - + for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_duration (unit_length); @@ -270,21 +290,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 () { @@ -311,7 +318,7 @@ RegionView::lower_to_bottom () } bool -RegionView::set_position (nframes_t pos, void* src, double* ignored) +RegionView::set_position (nframes64_t pos, void* /*src*/, double* ignored) { double delta; bool ret; @@ -328,11 +335,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; @@ -352,12 +354,12 @@ RegionView::set_samples_per_unit (gdouble spu) } bool -RegionView::set_duration (nframes_t frames, void *src) +RegionView::set_duration (nframes64_t frames, void *src) { if (!TimeAxisViewItem::set_duration (frames, src)) { return false; } - + for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_duration (_region->length() / samples_per_unit); } @@ -365,17 +367,11 @@ 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 () { TimeAxisViewItem::set_colors (); - + if (sync_mark) { sync_mark->property_fill_color_rgba() = fill_color; sync_line->property_fill_color_rgba() = fill_color; @@ -402,10 +398,21 @@ RegionView::fake_set_opaque (bool yn) } else { fill_opacity = 60; } - + set_frame_color (); } +void +RegionView::show_region_editor () +{ + if (editor == 0) { + editor = new RegionEditor (trackview.session(), region()); + } + + editor->present (); + editor->show_all(); +} + void RegionView::hide_region_editor() { @@ -470,8 +477,8 @@ RegionView::region_sync_changed () if (!sync_mark) { /* points set below */ - - sync_mark = new ArdourCanvas::Polygon (*group); + + sync_mark = new ArdourCanvas::Polygon (*group); sync_mark->property_fill_color_rgba() = fill_color; sync_line = new ArdourCanvas::Line (*group); @@ -486,13 +493,13 @@ RegionView::region_sync_changed () if (sync_offset == 0) { /* no sync mark - its the start of the region */ - + sync_mark->hide(); sync_line->hide (); } else { - if ((sync_dir < 0) || ((sync_dir > 0) && (sync_offset > _region->length()))) { + if ((sync_dir < 0) || ((sync_dir > 0) && (sync_offset > _region->length()))) { /* no sync mark - its out of the bounds of the region */ @@ -504,20 +511,20 @@ RegionView::region_sync_changed () /* lets do it */ Points points; - + //points = sync_mark->property_points().get_value(); - + double offset = sync_offset / samples_per_unit; points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); points.push_back (Gnome::Art::Point (offset + ((sync_mark_width-1)/2), 1)); points.push_back (Gnome::Art::Point (offset, sync_mark_width - 1)); - points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); + points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); sync_mark->property_points().set_value (points); sync_mark->show (); points.clear (); points.push_back (Gnome::Art::Point (offset, 0)); - points.push_back (Gnome::Art::Point (offset, trackview.height - NAME_HIGHLIGHT_SIZE)); + points.push_back (Gnome::Art::Point (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); sync_line->property_points().set_value (points); sync_line->show (); @@ -539,11 +546,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 @@ -581,6 +583,8 @@ RegionView::get_fill_color () void RegionView::set_height (double h) { + TimeAxisViewItem::set_height(h); + if (sync_line) { Points points; int sync_dir; @@ -592,4 +596,81 @@ RegionView::set_height (double h) points.push_back (Gnome::Art::Point (offset, h - NAME_HIGHLIGHT_SIZE)); sync_line->property_points().set_value (points); } + + for (list::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) { + (*i)->property_y2() = h + 1; + } +} + +/** 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 (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_unmuted_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); + } + + frame_handle_start->raise_to_top (); + frame_handle_end->raise_to_top (); }