X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=79081eb284ce27a9299af0ce0cd19ee5c5f66c4f;hb=6877ac820b149fab1cae75633a5efd6dab5adb47;hp=acf117950e772650bdcac0e78b8b07d295b7e6f4;hpb=1e8645bb8e16b6dbb0aeb578aae46d4c9c1246f3;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index acf117950e..79081eb284 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -25,8 +25,6 @@ #include -#include - #include "ardour/playlist.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" @@ -38,6 +36,10 @@ #include "evoral/Curve.hpp" +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/colors.h" + #include "canvas/rectangle.h" #include "canvas/polygon.h" #include "canvas/poly_line.h" @@ -45,11 +47,13 @@ #include "canvas/text.h" #include "canvas/xfade_curve.h" #include "canvas/debug.h" -#include "canvas/utils.h" + +#include "waveview/debug.h" #include "streamview.h" #include "audio_region_view.h" #include "audio_time_axis.h" +#include "enums_convert.h" #include "public_editor.h" #include "audio_region_editor.h" #include "audio_streamview.h" @@ -59,9 +63,9 @@ #include "audio_time_axis.h" #include "rgb_macros.h" #include "gui_thread.h" -#include "ardour_ui.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" #define MUTED_ALPHA 48 @@ -71,9 +75,38 @@ using namespace PBD; using namespace Editing; using namespace ArdourCanvas; -static const int32_t sync_mark_width = 9; static double const handle_size = 10; /* height of fade handles */ +Cairo::RefPtr AudioRegionView::pending_peak_pattern; + +static Cairo::RefPtr create_pending_peak_pattern() { + cairo_surface_t * is = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 8, 8); + + // create checker pattern + unsigned char *img = cairo_image_surface_get_data (is); + cairo_surface_flush (is); + const int stride = cairo_image_surface_get_stride (is); + + for (int y = 0; y < 8; ++y) { + for (int x = 0; x < 8; ++x) { + const int off = (y * stride + x * 4); + uint32_t *pixel = (uint32_t*) &img[off]; + if ((x < 4) ^ (y < 4)) { + *pixel = 0xa0000000; + } else { + *pixel = 0x40000000; + } + } + } + cairo_surface_mark_dirty (is); + + cairo_pattern_t* pat = cairo_pattern_create_for_surface (is); + cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT); + Cairo::RefPtr p (new Cairo::Pattern (pat, false)); + cairo_surface_destroy (is); + return p; +} + AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, uint32_t basic_color) : RegionView (parent, tv, r, spu, basic_color) @@ -82,6 +115,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxis , fade_out_handle(0) , fade_in_trim_handle(0) , fade_out_trim_handle(0) + , pending_peak_data(0) , start_xfade_curve (0) , start_xfade_rect (0) , _start_xfade_visible (false) @@ -92,7 +126,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxis , trim_fade_in_drag_active(false) , trim_fade_out_drag_active(false) { - Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context()); + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &AudioRegionView::parameter_changed)); } AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, @@ -103,6 +137,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxis , fade_out_handle(0) , fade_in_trim_handle(0) , fade_out_trim_handle(0) + , pending_peak_data(0) , start_xfade_curve (0) , start_xfade_rect (0) , _start_xfade_visible (false) @@ -113,7 +148,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxis , trim_fade_in_drag_active(false) , trim_fade_out_drag_active(false) { - Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context()); + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &AudioRegionView::parameter_changed)); } AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr other_region) @@ -122,6 +157,7 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt , fade_out_handle(0) , fade_in_trim_handle(0) , fade_out_trim_handle(0) + , pending_peak_data(0) , start_xfade_curve (0) , start_xfade_rect (0) , _start_xfade_visible (false) @@ -134,7 +170,7 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt { init (true); - Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context()); + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &AudioRegionView::parameter_changed)); } void @@ -143,6 +179,18 @@ AudioRegionView::init (bool wfd) // FIXME: Some redundancy here with RegionView::init. Need to figure out // where order is important and where it isn't... + if (!pending_peak_pattern) { + pending_peak_pattern = create_pending_peak_pattern(); + } + + // needs to be created first, RegionView::init() calls set_height() + pending_peak_data = new ArdourCanvas::Rectangle (group); + CANVAS_DEBUG_NAME (pending_peak_data, string_compose ("pending peak rectangle for %1", region()->name())); + pending_peak_data->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 0.0)); + pending_peak_data->set_pattern (pending_peak_pattern); + pending_peak_data->set_data ("regionview", this); + pending_peak_data->hide (); + RegionView::init (wfd); _amplitude_above_axis = 1.0; @@ -152,29 +200,29 @@ AudioRegionView::init (bool wfd) if (!_recregion) { fade_in_handle = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in handle for %1", region()->name())); - fade_in_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0)); - fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle()); + fade_in_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0)); + fade_in_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle")); fade_in_handle->set_data ("regionview", this); fade_in_handle->hide (); fade_out_handle = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name())); - fade_out_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0)); - fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle()); + fade_out_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0)); + fade_out_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle")); fade_out_handle->set_data ("regionview", this); fade_out_handle->hide (); fade_in_trim_handle = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name())); - fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0)); - fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle()); + fade_in_trim_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0)); + fade_in_trim_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle")); fade_in_trim_handle->set_data ("regionview", this); fade_in_trim_handle->hide (); fade_out_trim_handle = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name())); - fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0)); - fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle()); + fade_out_trim_handle->set_outline_color (Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0)); + fade_out_trim_handle->set_fill_color (UIConfiguration::instance().color ("inactive fade handle")); fade_out_trim_handle->set_data ("regionview", this); fade_out_trim_handle->hide (); } @@ -187,25 +235,23 @@ AudioRegionView::init (bool wfd) const string line_name = _region->name() + ":gain"; - if (!Profile->get_sae()) { - gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope())); - } - + gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope())); + update_envelope_visibility (); gain_line->reset (); - set_height (trackview.current_height()); + /* streamview will call set_height() */ + //set_height (trackview.current_height()); // XXX not correct for Layered mode, but set_height() will fix later. region_muted (); region_sync_changed (); region_resized (ARDOUR::bounds_change); + /* region_resized sets ghost region duration */ - for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_duration (_region->length() / samples_per_pixel); - } + /* region_locked is a synonym for region_renamed () which is called in region_muted() above */ + //region_locked (); - region_locked (); envelope_active_changed (); fade_in_active_changed (); fade_out_active_changed (); @@ -232,13 +278,6 @@ AudioRegionView::init (bool wfd) setup_waveform_visibility (); - if (frame_handle_start) { - frame_handle_start->raise_to_top (); - } - if (frame_handle_end) { - frame_handle_end->raise_to_top (); - } - /* XXX sync mark drag? */ } @@ -251,8 +290,9 @@ AudioRegionView::~AudioRegionView () for (vector::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) { delete *i; } + _data_ready_connections.clear (); - for (list >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { + for (list >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { delete ((*i).second); } @@ -315,7 +355,7 @@ AudioRegionView::fade_in_active_changed () if (audio_region()->fade_in_active()) { start_xfade_rect->set_fill (false); } else { - start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade()); + start_xfade_rect->set_fill_color (UIConfiguration::instance().color_mod ("inactive crossfade", "inactive crossfade")); start_xfade_rect->set_fill (true); } } @@ -327,8 +367,8 @@ AudioRegionView::fade_out_active_changed () if (end_xfade_rect) { if (audio_region()->fade_out_active()) { end_xfade_rect->set_fill (false); - } else { - end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade()); + } else { + end_xfade_rect->set_fill_color (UIConfiguration::instance().color_mod ("inactive crossfade", "inactive crossfade")); end_xfade_rect->set_fill (true); } } @@ -341,6 +381,7 @@ AudioRegionView::region_scale_amplitude_changed () for (uint32_t n = 0; n < waves.size(); ++n) { waves[n]->gain_changed (); } + region_renamed (); } void @@ -348,7 +389,7 @@ AudioRegionView::region_renamed () { std::string str = RegionView::make_name (); - if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) { + if (audio_region()->speed_mismatch (trackview.session()->sample_rate())) { str = string ("*") + str; } @@ -356,6 +397,14 @@ AudioRegionView::region_renamed () str = string ("!") + str; } + + boost::shared_ptr ar (audio_region()); + if (ar->scale_amplitude() != 1.0) { + char tmp[32]; + snprintf (tmp, 32, " (%.1fdB)", accurate_coefficient_to_dB (ar->scale_amplitude())); + str += tmp; + } + set_item_name (str, this); set_name_text (str); } @@ -372,7 +421,7 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) interesting_stuff.add (ARDOUR::Properties::length); if (what_changed.contains (interesting_stuff)) { - + for (uint32_t n = 0; n < waves.size(); ++n) { waves[n]->region_resized (); } @@ -380,18 +429,19 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { if ((agr = dynamic_cast(*i)) != 0) { - for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { + for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { (*w)->region_resized (); } } } - /* hide transient lines that extend beyond the region end */ - - list >::iterator l; + /* hide transient lines that extend beyond the region */ + list >::iterator l; + samplepos_t first = _region->first_sample(); + samplepos_t last = _region->last_sample(); for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { - if (l->first > _region->length() - 1) { + if (l->first < first || l->first >= last) { l->second->hide(); } else { l->second->show(); @@ -403,9 +453,15 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) void AudioRegionView::reset_width_dependent_items (double pixel_width) { + if (pixel_width == _width) { + return; + } + RegionView::reset_width_dependent_items(pixel_width); assert(_pixel_width == pixel_width); + pending_peak_data->set_x1(pixel_width); + if (pixel_width <= 20.0 || _height < 5.0 || !trackview.session()->config.get_show_region_fades()) { if (fade_in_handle) { fade_in_handle->hide(); } if (fade_out_handle) { fade_out_handle->hide(); } @@ -415,25 +471,34 @@ AudioRegionView::reset_width_dependent_items (double pixel_width) if (end_xfade_rect) { end_xfade_rect->set_outline (false); } } - AnalysisFeatureList analysis_features = _region->transients(); - AnalysisFeatureList::const_iterator i; - - list >::iterator l; + reset_fade_shapes (); - for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { + /* Update feature lines */ + AnalysisFeatureList analysis_features; + _region->transients (analysis_features); - float x_pos = trackview.editor().sample_to_pixel (*i); + if (feature_lines.size () != analysis_features.size ()) { + cerr << "postponed freature line update.\n"; // XXX + // AudioRegionView::transients_changed () will pick up on this + return; + } - (*l).second->set (ArdourCanvas::Duple (x_pos, 2.0), - ArdourCanvas::Duple (x_pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + samplepos_t position = _region->position(); + AnalysisFeatureList::const_iterator i; + list >::iterator l; + double y1; + if (_height >= NAME_HIGHLIGHT_THRESH) { + y1 = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + } else { + y1 = _height - 1; + } + for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { + float x_pos = trackview.editor().sample_to_pixel ((*i) - position); (*l).first = *i; - (*l).second->set (ArdourCanvas::Duple (x_pos, 2.0), - ArdourCanvas::Duple (x_pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + ArdourCanvas::Duple (x_pos, y1)); } - - reset_fade_shapes (); } void @@ -473,23 +538,32 @@ AudioRegionView::setup_fade_handle_positions() void AudioRegionView::set_height (gdouble height) { + if (height == _height) { + return; + } + RegionView::set_height (height); + pending_peak_data->set_y1 (height); uint32_t wcnt = waves.size(); - for (uint32_t n = 0; n < wcnt; ++n) { + if (wcnt > 0) { + gdouble ht; - if (height < NAME_HIGHLIGHT_THRESH) { - ht = ((height - 2 * wcnt) / (double) wcnt); + if (!UIConfiguration::instance().get_show_name_highlight() || (height < NAME_HIGHLIGHT_THRESH)) { + ht = height / (double) wcnt; } else { - ht = (((height - 2 * wcnt) - NAME_HIGHLIGHT_SIZE) / (double) wcnt); + ht = (height - NAME_HIGHLIGHT_SIZE) / (double) wcnt; } - gdouble yoff = n * (ht + 1); + for (uint32_t n = 0; n < wcnt; ++n) { + + gdouble yoff = floor (ht * n); - waves[n]->set_height (ht); - waves[n]->set_y_position (yoff + 2); + waves[n]->set_height (ht); + waves[n]->set_y_position (yoff); + } } if (gain_line) { @@ -505,20 +579,19 @@ AudioRegionView::set_height (gdouble height) reset_fade_shapes (); - /* Update hights for any active feature lines */ - list >::iterator l; - + /* Update heights for any feature lines */ + samplepos_t position = _region->position(); + list >::iterator l; + double y1; + if (_height >= NAME_HIGHLIGHT_THRESH) { + y1 = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + } else { + y1 = _height - 1; + } for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { - - float pos_x = trackview.editor().sample_to_pixel((*l).first); - - if (height >= NAME_HIGHLIGHT_THRESH) { - (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0), - ArdourCanvas::Duple (pos_x, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); - } else { - (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0), - ArdourCanvas::Duple (pos_x, _height - 1)); - } + float pos_x = trackview.editor().sample_to_pixel((*l).first - position); + (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0), + ArdourCanvas::Duple (pos_x, y1)); } if (name_text) { @@ -538,23 +611,23 @@ AudioRegionView::reset_fade_shapes () void AudioRegionView::reset_fade_in_shape () { - reset_fade_in_shape_width (audio_region(), (framecnt_t) audio_region()->fade_in()->back()->when); + reset_fade_in_shape_width (audio_region(), (samplecnt_t) audio_region()->fade_in()->back()->when); } void -AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, framecnt_t width, bool drag_active) +AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, samplecnt_t width, bool drag_active) { trim_fade_in_drag_active = drag_active; if (fade_in_handle == 0) { return; } - /* smallest size for a fade is 64 frames */ + /* smallest size for a fade is 64 samples */ - width = std::max ((framecnt_t) 64, width); + width = std::max ((samplecnt_t) 64, width); /* round here to prevent little visual glitches with sub-pixel placement */ - double const pwidth = rint (width / samples_per_pixel); + double const pwidth = floor (width / samples_per_pixel); double const handle_left = pwidth; /* Put the fade in handle so that its left side is at the end-of-fade line */ @@ -568,7 +641,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f if (fade_in_handle->visible()) { //see comment for drag_start - entered(false); + entered(); } if (pwidth < 5) { @@ -580,7 +653,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f hide_start_xfade (); return; } - + double effective_height; if (_height >= NAME_HIGHLIGHT_THRESH) { @@ -600,8 +673,8 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f points.assign (list->size(), Duple()); for (x = list->begin(), pi = 0; x != list->end(); ++x, ++pi) { - points[pi].x = 1.0 + (pwidth * ((*x)->when/length)); - points[pi].y = effective_height - ((*x)->value * effective_height); + points[pi].x = (pwidth * ((*x)->when/length)); + points[pi].y = effective_height - ((*x)->value * (effective_height - 1.)); } /* draw the line */ @@ -609,33 +682,33 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f redraw_start_xfade_to (ar, width, points, effective_height, handle_left); /* ensure trim handle stays on top */ - if (frame_handle_start) { - frame_handle_start->raise_to_top(); + if (sample_handle_start) { + sample_handle_start->raise_to_top(); } } void AudioRegionView::reset_fade_out_shape () { - reset_fade_out_shape_width (audio_region(), (framecnt_t) audio_region()->fade_out()->back()->when); + reset_fade_out_shape_width (audio_region(), (samplecnt_t) audio_region()->fade_out()->back()->when); } void -AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, framecnt_t width, bool drag_active) +AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, samplecnt_t width, bool drag_active) { trim_fade_out_drag_active = drag_active; if (fade_out_handle == 0) { return; } - /* smallest size for a fade is 64 frames */ + /* smallest size for a fade is 64 samples */ + + width = std::max ((samplecnt_t) 64, width); - width = std::max ((framecnt_t) 64, width); + double const pwidth = floor(trackview.editor().sample_to_pixel (width)); - double const pwidth = rint(trackview.editor().sample_to_pixel (width)); - - /* the right edge should be right on the region frame is the pixel + /* the right edge should be right on the region sample is the pixel * width is zero. Hence the additional + 1.0 at the end. */ @@ -653,7 +726,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, if (fade_out_handle->visible()) { //see comment for drag_start - entered(false); + entered(); } /* don't show shape if its too small */ @@ -669,14 +742,14 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, double effective_height; - effective_height = _height - 1.0; + effective_height = _height; - if (Config->get_show_name_highlight() && effective_height >= NAME_HIGHLIGHT_THRESH) { + if (UIConfiguration::instance().get_show_name_highlight() && effective_height >= NAME_HIGHLIGHT_THRESH) { effective_height -= NAME_HIGHLIGHT_SIZE; } /* points *MUST* be in anti-clockwise order */ - + Points points; Points::size_type pi; boost::shared_ptr list (audio_region()->fade_out()); @@ -684,10 +757,10 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, double length = list->length(); points.assign (list->size(), Duple()); - + for (x = list->begin(), pi = 0; x != list->end(); ++x, ++pi) { points[pi].x = _pixel_width - pwidth + (pwidth * ((*x)->when/length)); - points[pi].y = 1.0 + effective_height - ((*x)->value * effective_height); + points[pi].y = effective_height - ((*x)->value * (effective_height - 1.)); } /* draw the line */ @@ -695,18 +768,18 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, redraw_end_xfade_to (ar, width, points, effective_height, handle_right, pwidth); /* ensure trim handle stays on top */ - if (frame_handle_end) { - frame_handle_end->raise_to_top(); + if (sample_handle_end) { + sample_handle_end->raise_to_top(); } } -framepos_t +samplepos_t AudioRegionView::get_fade_in_shape_width () { return audio_region()->fade_in()->back()->when; } -framepos_t +samplepos_t AudioRegionView::get_fade_out_shape_width () { return audio_region()->fade_out()->back()->when; @@ -727,7 +800,7 @@ AudioRegionView::redraw_start_xfade () } void -AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, framecnt_t /*width*/, Points& points, double effective_height, +AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, samplecnt_t /*width*/, Points& points, double effective_height, double rect_width) { if (points.size() < 2) { @@ -737,14 +810,14 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame if (!start_xfade_curve) { start_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::Start); CANVAS_DEBUG_NAME (start_xfade_curve, string_compose ("xfade start out line for %1", region()->name())); - start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade()); - start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + start_xfade_curve->set_fill_color (UIConfiguration::instance().color_mod ("active crossfade", "crossfade alpha")); + start_xfade_curve->set_outline_color (UIConfiguration::instance().color ("crossfade line")); start_xfade_curve->set_ignore_events (true); } if (!start_xfade_rect) { start_xfade_rect = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (start_xfade_rect, string_compose ("xfade start rect for %1", region()->name())); - start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + start_xfade_rect->set_outline_color (UIConfiguration::instance().color ("crossfade line")); start_xfade_rect->set_fill (false); start_xfade_rect->set_outline (false); start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this)); @@ -772,7 +845,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) { ArdourCanvas::Duple &p (ipoints[pci]); /* leave x-axis alone but invert with respect to y-axis */ - p.y = 1.0 + effective_height - points[pci].y; + p.y = effective_height - points[pci].y; } } else { @@ -784,7 +857,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame npoints = inverse->size(); ipoints.assign (npoints, Duple()); - + Evoral::ControlList::const_iterator x; Points::size_type pi; double length = inverse->length(); @@ -792,7 +865,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame for (x = inverse->begin(), pi = 0; x != inverse->end(); ++x, ++pi) { ArdourCanvas::Duple& p (ipoints[pi]); p.x = (rect_width * ((*x)->when/length)); - p.y = 1.0 + effective_height - ((*x)->value * effective_height); + p.y = effective_height - ((*x)->value * (effective_height)); } } @@ -811,13 +884,13 @@ AudioRegionView::redraw_end_xfade () } show_end_xfade(); - + reset_fade_out_shape_width (ar, ar->fade_out()->back()->when); } void -AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecnt_t width, Points& points, double effective_height, - double rect_edge, double rect_width) +AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, samplecnt_t width, Points& points, double effective_height, + double rect_edge, double rect_width) { if (points.size() < 2) { return; @@ -826,15 +899,15 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn if (!end_xfade_curve) { end_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::End); CANVAS_DEBUG_NAME (end_xfade_curve, string_compose ("xfade end out line for %1", region()->name())); - end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade()); - end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + end_xfade_curve->set_fill_color (UIConfiguration::instance().color_mod ("active crossfade", "crossfade alpha")); + end_xfade_curve->set_outline_color (UIConfiguration::instance().color ("crossfade line")); end_xfade_curve->set_ignore_events (true); } if (!end_xfade_rect) { end_xfade_rect = new ArdourCanvas::Rectangle (group); CANVAS_DEBUG_NAME (end_xfade_rect, string_compose ("xfade end rect for %1", region()->name())); - end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + end_xfade_rect->set_outline_color (UIConfiguration::instance().color ("crossfade line")); end_xfade_rect->set_fill (false); end_xfade_rect->set_outline (false); end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this)); @@ -875,18 +948,17 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn npoints = inverse->size(); ipoints.assign (npoints, Duple()); - + const double rend = trackview.editor().sample_to_pixel (_region->length() - width); - + Evoral::ControlList::const_iterator x; - Points::size_type i; Points::size_type pi; double length = inverse->length(); - for (x = inverse->begin(), i = 0, pi = 0; x != inverse->end(); ++x, ++pi, ++i) { + for (x = inverse->begin(), pi = 0; x != inverse->end(); ++x, ++pi) { ArdourCanvas::Duple& p (ipoints[pi]); p.x = (rect_width * ((*x)->when/length)) + rend; - p.y = 1.0 + effective_height - ((*x)->value * effective_height); + p.y = effective_height - ((*x)->value * (effective_height)); } } @@ -959,7 +1031,7 @@ AudioRegionView::set_samples_per_pixel (gdouble fpp) { RegionView::set_samples_per_pixel (fpp); - if (Config->get_show_waveforms ()) { + if (UIConfiguration::instance().get_show_waveforms ()) { for (uint32_t n = 0; n < waves.size(); ++n) { waves[n]->set_samples_per_pixel (fpp); } @@ -986,34 +1058,34 @@ AudioRegionView::set_colors () RegionView::set_colors(); if (gain_line) { - gain_line->set_line_color (audio_region()->envelope_active() ? - ARDOUR_UI::config()->get_GainLine() : - ARDOUR_UI::config()->get_GainLineInactive()); + gain_line->set_line_color (audio_region()->envelope_active() ? + UIConfiguration::instance().color ("gain line") : + UIConfiguration::instance().color_mod ("gain line inactive", "gain line inactive")); } set_waveform_colors (); if (start_xfade_curve) { - start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade()); - start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + start_xfade_curve->set_fill_color (UIConfiguration::instance().color_mod ("active crossfade", "crossfade alpha")); + start_xfade_curve->set_outline_color (UIConfiguration::instance().color ("crossfade line")); } if (end_xfade_curve) { - end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade()); - end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + end_xfade_curve->set_fill_color (UIConfiguration::instance().color_mod ("active crossfade", "crossfade alpha")); + end_xfade_curve->set_outline_color (UIConfiguration::instance().color ("crossfade line")); } if (start_xfade_rect) { - start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + start_xfade_rect->set_outline_color (UIConfiguration::instance().color ("crossfade line")); } if (end_xfade_rect) { - end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine()); + end_xfade_rect->set_outline_color (UIConfiguration::instance().color ("crossfade line")); } } void AudioRegionView::setup_waveform_visibility () { - if (Config->get_show_waveforms ()) { + if (UIConfiguration::instance().get_show_waveforms ()) { for (uint32_t n = 0; n < waves.size(); ++n) { /* make sure the zoom level is correct, since we don't update this when waveforms are hidden. @@ -1050,11 +1122,31 @@ AudioRegionView::update_envelope_visibility () return; } - if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseGain || trackview.editor().current_mouse_mode() == Editing::MouseRange ) { - gain_line->add_visibility (AutomationLine::Line); + if (trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseContent ) { + gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::ControlPoints|AutomationLine::Line)); + gain_line->canvas_group().raise_to_top (); + } else if (UIConfiguration::instance().get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseRange ) { + gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::Line)); + gain_line->canvas_group().raise_to_top (); } else { - gain_line->hide (); + gain_line->set_visibility (AutomationLine::VisibleAspects(0)); + } +} + +void +AudioRegionView::delete_waves () +{ + for (vector::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) { + delete *i; } + _data_ready_connections.clear (); + + for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { + group->remove(*w); + } + waves.clear(); + tmp_waves.clear(); + pending_peak_data->show (); } void @@ -1103,6 +1195,7 @@ AudioRegionView::create_waves () // cerr << "\tdata is not ready\n"; // we'll get a PeaksReady signal from the source in the future // and will call create_one_wave(n) then. + pending_peak_data->show (); } } else { @@ -1118,46 +1211,62 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) { //cerr << "AudioRegionView::create_one_wave() called which: " << which << " this: " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick + if (!trackview.session() || trackview.session()->deletion_in_progress () || !atv.track()) { + /* peaks_ready_handler() may be called from peak_thread_work() while + * session deletion is in progress. + * Since session-unload happens in the GUI thread, we need to test + * in this context. + */ + return; + } uint32_t nchans = atv.track()->n_channels().n_audio(); uint32_t n; uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); gdouble ht; - if (trackview.current_height() < NAME_HIGHLIGHT_THRESH) { - ht = ((trackview.current_height()) / (double) nchans); + /* compare to set_height(), use _height as set by streamview (child_height), + * not trackview.current_height() to take stacked layering into acconnt + */ + if (!UIConfiguration::instance().get_show_name_highlight() || (_height < NAME_HIGHLIGHT_THRESH)) { + ht = _height / (double) nchans; } else { - ht = ((trackview.current_height() - NAME_HIGHLIGHT_SIZE) / (double) nchans); + ht = (_height - NAME_HIGHLIGHT_SIZE) / (double) nchans; } + /* first waveview starts at 1.0, not 0.0 since that will overlap the + * sample + */ + gdouble yoff = which * ht; - WaveView *wave = new WaveView (group, audio_region ()); + ArdourWaveView::WaveView *wave = new ArdourWaveView::WaveView (group, audio_region ()); CANVAS_DEBUG_NAME (wave, string_compose ("wave view for chn %1 of %2", which, get_item_name())); - + wave->set_channel (which); wave->set_y_position (yoff); wave->set_height (ht); wave->set_samples_per_pixel (samples_per_pixel); wave->set_show_zero_line (true); - wave->set_clip_level (Config->get_waveform_clip_level ()); + wave->set_clip_level (UIConfiguration::instance().get_waveform_clip_level ()); + wave->set_start_shift (1.0); wave->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_wave_view_event), wave, this)); - - switch (Config->get_waveform_shape()) { + + switch (UIConfiguration::instance().get_waveform_shape()) { case Rectified: - wave->set_shape (WaveView::Rectified); + wave->set_shape (ArdourWaveView::WaveView::Rectified); break; default: - wave->set_shape (WaveView::Normal); + wave->set_shape (ArdourWaveView::WaveView::Normal); } - - wave->set_logscaled (Config->get_waveform_scale() == Logarithmic); - vector v; + wave->set_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); + + vector v; v.push_back (wave); set_some_waveform_colors (v); - if (!Config->get_show_waveforms ()) { + if (!UIConfiguration::instance().get_show_waveforms ()) { wave->hide(); } @@ -1188,10 +1297,19 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) waves = tmp_waves; tmp_waves.clear (); - /* all waves created, don't hook into peaks ready anymore */ - delete _data_ready_connections[which]; - _data_ready_connections[which] = 0; + /* indicate peak-completed */ + pending_peak_data->hide (); + + /* Restore stacked coverage */ + LayerDisplay layer_display; + if (trackview.get_gui_property ("layer-display", layer_display)) { + update_coverage_samples (layer_display); + } } + + /* channel wave created, don't hook into peaks ready anymore */ + delete _data_ready_connections[which]; + _data_ready_connections[which] = 0; } void @@ -1208,18 +1326,33 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b return; } - double x, y; + uint32_t before_p, after_p; + double mx = ev->button.x; + double my = ev->button.y; - /* don't create points that can't be seen */ + item->canvas_to_item (mx, my); - update_envelope_visibility (); + samplecnt_t const sample_within_region = (samplecnt_t) floor (mx * samples_per_pixel); - x = ev->button.x; - y = ev->button.y; + if (!gain_line->control_points_adjacent (sample_within_region, before_p, after_p)) { + /* no adjacent points */ + return; + } + + /*y is in item sample */ + double const bx = gain_line->nth (before_p)->get_x(); + double const ax = gain_line->nth (after_p)->get_x(); + double const click_ratio = (ax - mx) / (ax - bx); - item->canvas_to_item (x, y); + double y = ((gain_line->nth (before_p)->get_y() * click_ratio) + (gain_line->nth (after_p)->get_y() * (1 - click_ratio))); + + /* don't create points that can't be seen */ - framepos_t fx = trackview.editor().pixel_to_sample (x); + update_envelope_visibility (); + samplepos_t rpos = region ()->position (); + MusicSample snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0); + trackview.editor ().snap_to_with_modifier (snap_pos, ev); + samplepos_t fx = snap_pos.sample - rpos; if (fx > _region->length()) { return; @@ -1227,31 +1360,46 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b /* compute vertical fractional position */ - y = 1.0 - (y / (_height - NAME_HIGHLIGHT_SIZE)); + y = 1.0 - (y / (gain_line->height())); /* map using gain line */ - gain_line->view_to_model_coord (x, y); + gain_line->view_to_model_coord (mx, y); /* XXX STATEFUL: can't convert to stateful diff until we can represent automation data with it. */ - trackview.session()->begin_reversible_command (_("add gain control point")); XMLNode &before = audio_region()->envelope()->get_state(); + MementoCommand* region_memento = 0; if (!audio_region()->envelope_active()) { XMLNode ®ion_before = audio_region()->get_state(); audio_region()->set_envelope_active(true); XMLNode ®ion_after = audio_region()->get_state(); - trackview.session()->add_command (new MementoCommand(*(audio_region().get()), ®ion_before, ®ion_after)); + region_memento = new MementoCommand(*(audio_region().get()), ®ion_before, ®ion_after); } - audio_region()->envelope()->add (fx, y, with_guard_points); + if (audio_region()->envelope()->editor_add (fx, y, with_guard_points)) { + XMLNode &after = audio_region()->envelope()->get_state(); + std::list results; + + trackview.editor().begin_reversible_command (_("add gain control point")); + + if (region_memento) { + trackview.session()->add_command (region_memento); + } + + trackview.session()->add_command (new MementoCommand(*audio_region()->envelope().get(), &before, &after)); + + gain_line->get_selectables (fx + region ()->position (), fx + region ()->position (), 0.0, 1.0, results); + trackview.editor ().get_selection ().set (results); - XMLNode &after = audio_region()->envelope()->get_state(); - trackview.session()->add_command (new MementoCommand(*audio_region()->envelope().get(), &before, &after)); - trackview.session()->commit_reversible_command (); + trackview.editor ().commit_reversible_command (); + trackview.session ()->set_dirty (); + } else { + delete region_memento; + } } void @@ -1265,10 +1413,13 @@ GhostRegion* AudioRegionView::add_ghost (TimeAxisView& tv) { RouteTimeAxisView* rtv = dynamic_cast(&trackview); - assert(rtv); + + if (!rtv) { + return 0; + } double unit_position = _region->position () / samples_per_pixel; - AudioGhostRegion* ghost = new AudioGhostRegion (tv, trackview, unit_position); + AudioGhostRegion* ghost = new AudioGhostRegion (*this, tv, trackview, unit_position); uint32_t nchans; nchans = rtv->track()->n_channels().n_audio(); @@ -1279,7 +1430,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv) break; } - WaveView *wave = new WaveView (ghost->group, audio_region()); + ArdourWaveView::WaveView *wave = new ArdourWaveView::WaveView (ghost->group, audio_region()); CANVAS_DEBUG_NAME (wave, string_compose ("ghost wave for %1", get_item_name())); wave->set_channel (n); @@ -1298,17 +1449,14 @@ AudioRegionView::add_ghost (TimeAxisView& tv) } void -AudioRegionView::entered (bool internal_editing) +AudioRegionView::entered () { trackview.editor().set_current_trimmable (_region); trackview.editor().set_current_movable (_region); - - if (gain_line) { - /* these may or may not be visible depending on mouse mode */ - gain_line->add_visibility (AutomationLine::ControlPoints); - } - if (!internal_editing && ( trackview.editor().current_mouse_mode() == Editing::MouseObject ) ) { + update_envelope_visibility(); + + if ((trackview.editor().current_mouse_mode() == Editing::MouseObject)) { if (start_xfade_rect) { start_xfade_rect->set_outline (true); } @@ -1341,6 +1489,13 @@ AudioRegionView::entered (bool internal_editing) fade_out_trim_handle->hide (); } } + } else { //this happens when we switch tools; if we switch away from Grab mode, hide all the fade handles + if (fade_in_handle) { fade_in_handle->hide(); } + if (fade_out_handle) { fade_out_handle->hide(); } + if (fade_in_trim_handle) { fade_in_trim_handle->hide(); } + if (fade_out_trim_handle) { fade_out_trim_handle->hide(); } + if (start_xfade_rect) { start_xfade_rect->set_outline (false); } + if (end_xfade_rect) { end_xfade_rect->set_outline (false); } } } @@ -1350,9 +1505,9 @@ AudioRegionView::exited () trackview.editor().set_current_trimmable (boost::shared_ptr()); trackview.editor().set_current_movable (boost::shared_ptr()); - if (gain_line) { - gain_line->remove_visibility (AutomationLine::ControlPoints); - } +// if (gain_line) { +// gain_line->remove_visibility (AutomationLine::ControlPoints); +// } if (fade_in_handle) { fade_in_handle->hide(); } if (fade_out_handle) { fade_out_handle->hide(); } @@ -1366,9 +1521,9 @@ void AudioRegionView::envelope_active_changed () { if (gain_line) { - gain_line->set_line_color (audio_region()->envelope_active() ? - ARDOUR_UI::config()->get_GainLine() : - ARDOUR_UI::config()->get_GainLineInactive()); + gain_line->set_line_color (audio_region()->envelope_active() ? + UIConfiguration::instance().color ("gain line") : + UIConfiguration::instance().color_mod ("gain line inactive", "gain line inactive")); update_envelope_visibility (); } } @@ -1395,39 +1550,39 @@ AudioRegionView::set_waveform_colors () } void -AudioRegionView::set_some_waveform_colors (vector& waves_to_color) +AudioRegionView::set_some_waveform_colors (vector& waves_to_color) { - ArdourCanvas::Color fill; - ArdourCanvas::Color outline; - ArdourCanvas::Color clip = ARDOUR_UI::config()->get_WaveFormClip(); - ArdourCanvas::Color zero = ARDOUR_UI::config()->get_ZeroLine(); + Gtkmm2ext::Color fill; + Gtkmm2ext::Color outline; + Gtkmm2ext::Color clip = UIConfiguration::instance().color ("clipped waveform"); + Gtkmm2ext::Color zero = UIConfiguration::instance().color ("zero line"); if (_selected) { if (_region->muted()) { /* hide outline with zero alpha */ - outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveForm(), 0); - fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveFormFill(), MUTED_ALPHA); + outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform outline"), 0); + fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("selected waveform fill"), MUTED_ALPHA); } else { - outline = ARDOUR_UI::config()->get_SelectedWaveForm(); - fill = ARDOUR_UI::config()->get_SelectedWaveFormFill(); + outline = UIConfiguration::instance().color ("selected waveform outline"); + fill = UIConfiguration::instance().color ("selected waveform fill"); } } else { if (_recregion) { - outline = ARDOUR_UI::config()->get_RecWaveForm(); - fill = ARDOUR_UI::config()->get_RecWaveFormFill(); + outline = UIConfiguration::instance().color ("recording waveform outline"); + fill = UIConfiguration::instance().color ("recording waveform fill"); } else { if (_region->muted()) { /* hide outline with zero alpha */ - outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveForm(), 0); - fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveFormFill(), MUTED_ALPHA); + outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 0); + fill = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform fill"), MUTED_ALPHA); } else { - outline = ARDOUR_UI::config()->get_WaveForm(); - fill = ARDOUR_UI::config()->get_WaveFormFill(); + outline = UIConfiguration::instance().color ("waveform outline"); + fill = UIConfiguration::instance().color ("waveform fill"); } } } - for (vector::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) { + for (vector::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) { (*w)->set_fill_color (fill); (*w)->set_outline_color (outline); (*w)->set_clip_color (clip); @@ -1436,13 +1591,13 @@ AudioRegionView::set_some_waveform_colors (vector& wave } void -AudioRegionView::set_frame_color () +AudioRegionView::set_sample_color () { - if (!frame) { + if (!sample) { return; } - RegionView::set_frame_color (); + RegionView::set_sample_color (); set_waveform_colors (); } @@ -1470,14 +1625,16 @@ AudioRegionView::set_fade_visibility (bool yn) } void -AudioRegionView::update_coverage_frames (LayerDisplay d) +AudioRegionView::update_coverage_samples (LayerDisplay d) { - RegionView::update_coverage_frames (d); + RegionView::update_coverage_samples (d); - if (fade_in_handle) { fade_in_handle->raise_to_top (); } - if (fade_out_handle) { fade_out_handle->raise_to_top (); } - if (fade_in_trim_handle) { fade_in_trim_handle->raise_to_top (); } - if (fade_out_trim_handle) { fade_out_trim_handle->raise_to_top (); } + if (d == Stacked) { + if (fade_in_handle) { fade_in_handle->raise_to_top (); } + if (fade_out_handle) { fade_out_handle->raise_to_top (); } + if (fade_in_trim_handle) { fade_in_trim_handle->raise_to_top (); } + if (fade_out_trim_handle) { fade_out_trim_handle->raise_to_top (); } + } } void @@ -1494,15 +1651,26 @@ AudioRegionView::show_region_editor () void AudioRegionView::transients_changed () { - AnalysisFeatureList analysis_features = _region->transients(); + AnalysisFeatureList analysis_features; + _region->transients (analysis_features); + samplepos_t position = _region->position(); + samplepos_t first = _region->first_sample(); + samplepos_t last = _region->last_sample(); - while (feature_lines.size() < analysis_features.size()) { + double y1; + if (_height >= NAME_HIGHLIGHT_THRESH) { + y1 = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + } else { + y1 = _height - 1; + } + while (feature_lines.size() < analysis_features.size()) { ArdourCanvas::Line* canvas_item = new ArdourCanvas::Line(group); CANVAS_DEBUG_NAME (canvas_item, string_compose ("transient group for %1", region()->name())); + canvas_item->set_outline_color (UIConfiguration::instance().color ("zero line")); // also in Editor::leave_handler() canvas_item->set (ArdourCanvas::Duple (-1.0, 2.0), - ArdourCanvas::Duple (1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + ArdourCanvas::Duple (1.0, y1)); canvas_item->raise_to_top (); canvas_item->show (); @@ -1520,28 +1688,34 @@ AudioRegionView::transients_changed () } AnalysisFeatureList::const_iterator i; - list >::iterator l; + list >::iterator l; for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { float *pos = new float; - *pos = trackview.editor().sample_to_pixel (*i); + *pos = trackview.editor().sample_to_pixel (*i - position); (*l).second->set ( ArdourCanvas::Duple (*pos, 2.0), - ArdourCanvas::Duple (*pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1) + ArdourCanvas::Duple (*pos, y1) ); - (*l).second->set_data ("position", pos); + (*l).second->set_data ("position", pos); // is this *modified* (drag?), if not use *i (*l).first = *i; + + if (l->first < first || l->first >= last) { + l->second->hide(); + } else { + l->second->show(); + } } } void AudioRegionView::update_transient(float /*old_pos*/, float new_pos) { - /* Find frame at old pos, calulate new frame then update region transients*/ - list >::iterator l; + /* Find sample at old pos, calulate new sample then update region transients*/ + list >::iterator l; for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { @@ -1550,31 +1724,30 @@ AudioRegionView::update_transient(float /*old_pos*/, float new_pos) float* pos = (float*) (*l).second->get_data ("position"); if (rint(new_pos) == rint(*pos)) { - - framepos_t old_frame = (*l).first; - framepos_t new_frame = trackview.editor().pixel_to_sample (new_pos); - - _region->update_transient (old_frame, new_frame); - - break; + samplepos_t position = _region->position(); + samplepos_t old_sample = (*l).first; + samplepos_t new_sample = trackview.editor().pixel_to_sample (new_pos) + position; + _region->update_transient (old_sample, new_sample); + break; } } } void -AudioRegionView::remove_transient(float pos) +AudioRegionView::remove_transient (float pos) { - /* Find frame at old pos, calulate new frame then update region transients*/ - list >::iterator l; + /* this is called from Editor::remove_transient () with pos == get_data ("position") + * which is the item's x-coordinate inside the ARV. + * + * Find sample at old pos, calulate new sample then update region transients + */ + list >::iterator l; for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { - - /* Line has been updated in drag so we compare to new_pos */ float *line_pos = (float*) (*l).second->get_data ("position"); - if (rint(pos) == rint(*line_pos)) { - _region->remove_transient ((*l).first); - break; + _region->remove_transient ((*l).first); + break; } } } @@ -1614,7 +1787,7 @@ AudioRegionView::drag_end () // if fade_in_trim_handle or fade_out_trim_handle should // be visible. -- If the fade_in_handle is visible // we have focus and are not in internal edit mode. - entered(false); + entered(); } }