X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=47d0c38ef91a553d56b87b2be0e4a73afb3ab9b2;hb=49a9fa20a56c6f5607e7bcf209985a67972c3f31;hp=b799a1aa5df788876cc4e592f916dec4cda7541a;hpb=93c7aeba048f19df5abee5e4325ef8b0ef62c279;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index b799a1aa5d..47d0c38ef9 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: regionview.cc 691 2006-07-23 12:03:19Z drobilla $ */ #include @@ -25,6 +24,7 @@ #include #include +#include #include #include @@ -44,6 +44,7 @@ #include "utils.h" #include "rgb_macros.h" #include "gui_thread.h" +#include "ardour_ui.h" #include "i18n.h" @@ -61,39 +62,65 @@ 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& 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) - , no_wave_msg(0) + , sync_line(0) , editor(0) , current_visible_sync_position(0.0) , valid(false) , _pixel_width(1.0) - , _height(1.0) , in_destructor(false) , wait_for_data(false) { } +RegionView::RegionView (const RegionView& other) + : TimeAxisViewItem (other) +{ + /* 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; +} + +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; +} + RegionView::RegionView (ArdourCanvas::Group* parent, TimeAxisView& tv, 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) - , no_wave_msg(0) + , sync_line(0) , editor(0) , current_visible_sync_position(0.0) , valid(false) , _pixel_width(1.0) - , _height(1.0) , in_destructor(false) , wait_for_data(false) { @@ -105,48 +132,32 @@ 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; compute_colors (basic_color); - name_highlight->set_data ("regionview", this); - - if (name_text) { - name_text->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)); } - /* an equilateral triangle */ - - 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(); + if (name_pixbuf) { + name_pixbuf->set_data ("regionview", this); + } reset_width_dependent_items ((double) _region->length() / samples_per_unit); - set_height (trackview.height); - - region_muted (); - region_sync_changed (); - region_resized (BoundsChanged); - region_locked (); + 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? */ } @@ -154,8 +165,6 @@ RegionView::~RegionView () { in_destructor = true; - RegionViewGoingAway (this); /* EMIT_SIGNAL */ - for (vector::iterator g = ghosts.begin(); g != ghosts.end(); ++g) { delete *g; } @@ -207,7 +216,8 @@ RegionView::region_changed (Change what_changed) region_sync_changed (); } if (what_changed & Region::LayerChanged) { - region_layered (); + // this is handled by the playlist i believe + //region_layered (); } if (what_changed & Region::LockChanged) { region_locked (); @@ -236,8 +246,6 @@ RegionView::region_resized (Change what_changed) unit_length = _region->length() / samples_per_unit; - reset_width_dependent_items (unit_length); - for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_duration (unit_length); @@ -258,7 +266,7 @@ RegionView::region_layered () { RouteTimeAxisView *rtv = dynamic_cast(&get_time_axis_view()); assert(rtv); - rtv->view()->region_layered (this); + //rtv->view()->region_layered (this); } void @@ -361,6 +369,7 @@ RegionView::set_colors () if (sync_mark) { sync_mark->property_fill_color_rgba() = fill_color; + sync_line->property_fill_color_rgba() = fill_color; } } @@ -368,14 +377,26 @@ void RegionView::set_frame_color () { if (_region->opaque()) { - fill_opacity = 180; + fill_opacity = 130; } else { - fill_opacity = 100; + fill_opacity = 0; } TimeAxisViewItem::set_frame_color (); } +void +RegionView::fake_set_opaque (bool yn) +{ + if (yn) { + fill_opacity = 130; + } else { + fill_opacity = 0; + } + + set_frame_color (); +} + void RegionView::hide_region_editor() { @@ -407,20 +428,38 @@ RegionView::region_renamed () set_item_name (str, this); set_name_text (str); + reset_width_dependent_items (_pixel_width); } 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-> */ @@ -428,8 +467,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 { @@ -438,6 +478,7 @@ RegionView::region_sync_changed () /* no sync mark - its out of the bounds of the region */ sync_mark->hide(); + sync_line->hide (); } else { @@ -453,8 +494,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, _height - NAME_HIGHLIGHT_SIZE)); + + sync_line->property_points().set_value (points); + sync_line->show (); } } } @@ -496,3 +543,18 @@ RegionView::get_fill_color () return fill_color; } +void +RegionView::set_height (double 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); + } +}