X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=aeae3acc9a1015179a6572a11cfb650e8fd48721;hb=dab0dacc66dcc190b4408ba75e3807973582cbd6;hp=b8ebc8fe8940e57ce86ab1fc9b9a6078a3e8a575;hpb=33ac710a63e68e36e9bb86798d0facb815652627;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index b8ebc8fe89..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 @@ -30,6 +30,7 @@ #include "ardour/audioregion.h" #include "ardour/audiosource.h" #include "ardour/audio_diskstream.h" +#include "ardour/session.h" #include "ardour_ui.h" #include "streamview.h" @@ -50,7 +51,6 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -58,9 +58,9 @@ 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, @@ -78,8 +78,9 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) - , _time_converter(r->session(), r->position()) + , _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) @@ -93,7 +94,8 @@ RegionView::RegionView (const RegionView& other) 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 (const RegionView& other, boost::shared_ptr other_region) @@ -101,7 +103,7 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr 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. */ @@ -111,10 +113,11 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr other 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, @@ -132,7 +135,7 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) - , _time_converter(r->session(), r->position()) + , _time_converter(r->session().tempo_map(), r->position()) { } @@ -142,7 +145,6 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) editor = 0; valid = true; in_destructor = false; - _height = 0; wait_for_data = wfd; sync_mark = 0; sync_line = 0; @@ -153,13 +155,13 @@ RegionView::init (Gdk::Color const & 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)); - + 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 (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, 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 (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); + frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); frame_handle_start->raise_to_top(); frame_handle_end->raise_to_top(); @@ -167,20 +169,22 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) 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)); } - if (wfd) + if (wfd) { _enable_display = true; + } 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)); + _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)); + ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); /* XXX sync mark drag? */ } @@ -210,7 +214,7 @@ RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg) break; default: break; - } + } return FALSE; } @@ -221,27 +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 (); } - if (what_changed & Region::LockChanged) { + if (what_changed.contains (ARDOUR::Properties::locked)) { region_locked (); } } @@ -254,21 +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); @@ -310,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; @@ -346,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); } @@ -363,7 +371,7 @@ 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; @@ -390,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() { @@ -458,7 +477,7 @@ RegionView::region_sync_changed () if (!sync_mark) { /* points set below */ - + sync_mark = new ArdourCanvas::Polygon (*group); sync_mark->property_fill_color_rgba() = fill_color; @@ -474,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 */ @@ -492,14 +511,14 @@ 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 (); @@ -614,7 +633,7 @@ RegionView::update_coverage_frames (LayerDisplay d) uint32_t const color = frame->property_fill_color_rgba (); uint32_t const base_alpha = UINT_RGBA_A (color); - + while (t < end) { t++;