X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=08e5a565bf1bea2667a2413c73e865b1445e7e8c;hb=ae32f44dc95801372b1a2a4549e0997550d16eef;hp=9af2cb044dd3146924cf49374baf605b042834a0;hpb=6b019a495359909a3d1a778ca10cd7df7cc302cc;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 9af2cb044d..08e5a565bf 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -62,7 +62,7 @@ #include "gui_thread.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" #define MUTED_ALPHA 48 @@ -232,25 +232,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 (); @@ -277,15 +275,6 @@ AudioRegionView::init (bool wfd) setup_waveform_visibility (); - pending_peak_data->raise_to_top (); - - if (frame_handle_start) { - frame_handle_start->raise_to_top (); - } - if (frame_handle_end) { - frame_handle_end->raise_to_top (); - } - /* XXX sync mark drag? */ } @@ -375,7 +364,7 @@ AudioRegionView::fade_out_active_changed () if (end_xfade_rect) { if (audio_region()->fade_out_active()) { end_xfade_rect->set_fill (false); - } else { + } else { end_xfade_rect->set_fill_color (UIConfiguration::instance().color_mod ("inactive crossfade", "inactive crossfade")); end_xfade_rect->set_fill (true); } @@ -420,7 +409,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 (); } @@ -434,12 +423,13 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) } } - /* hide transient lines that extend beyond the region end */ - + /* hide transient lines that extend beyond the region */ list >::iterator l; + framepos_t first = _region->first_frame(); + framepos_t last = _region->last_frame(); 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(); @@ -451,6 +441,10 @@ 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); @@ -465,25 +459,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)); + framepos_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 @@ -523,6 +526,10 @@ 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); @@ -531,17 +538,17 @@ AudioRegionView::set_height (gdouble height) if (wcnt > 0) { gdouble ht; - + if (!UIConfiguration::instance().get_show_name_highlight() || (height < NAME_HIGHLIGHT_THRESH)) { ht = height / (double) wcnt; } else { ht = (height - NAME_HIGHLIGHT_SIZE) / (double) wcnt; } - + for (uint32_t n = 0; n < wcnt; ++n) { - + gdouble yoff = floor (ht * n); - + waves[n]->set_height (ht); waves[n]->set_y_position (yoff); } @@ -560,20 +567,19 @@ AudioRegionView::set_height (gdouble height) reset_fade_shapes (); - /* Update hights for any active feature lines */ + /* Update heights for any feature lines */ + framepos_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) { @@ -635,7 +641,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f hide_start_xfade (); return; } - + double effective_height; if (_height >= NAME_HIGHLIGHT_THRESH) { @@ -689,7 +695,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, double const pwidth = floor(trackview.editor().sample_to_pixel (width)); - + /* the right edge should be right on the region frame is the pixel * width is zero. Hence the additional + 1.0 at the end. */ @@ -731,7 +737,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, } /* points *MUST* be in anti-clockwise order */ - + Points points; Points::size_type pi; boost::shared_ptr list (audio_region()->fade_out()); @@ -739,7 +745,7 @@ 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 = effective_height - ((*x)->value * (effective_height - 1.)); @@ -839,7 +845,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(); @@ -866,7 +872,7 @@ AudioRegionView::redraw_end_xfade () } show_end_xfade(); - + reset_fade_out_shape_width (ar, ar->fade_out()->back()->when); } @@ -930,9 +936,9 @@ 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 pi; double length = inverse->length(); @@ -1040,8 +1046,8 @@ AudioRegionView::set_colors () RegionView::set_colors(); if (gain_line) { - gain_line->set_line_color (audio_region()->envelope_active() ? - UIConfiguration::instance().color ("gain line") : + gain_line->set_line_color (audio_region()->envelope_active() ? + UIConfiguration::instance().color ("gain line") : UIConfiguration::instance().color_mod ("gain line inactive", "gain line inactive")); } @@ -1206,23 +1212,24 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); gdouble ht; - /* reduce waveview height by 2.0 to account for our frame */ - - if (trackview.current_height() < NAME_HIGHLIGHT_THRESH) { - ht = ((trackview.current_height() - 2.0) / (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 - 2.0) / (double) nchans); + ht = (_height - NAME_HIGHLIGHT_SIZE) / (double) nchans; } /* first waveview starts at 1.0, not 0.0 since that will overlap the - * frame + * frame */ - + gdouble yoff = which * ht; WaveView *wave = new 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); @@ -1230,9 +1237,9 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->set_show_zero_line (true); 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 (UIConfiguration::instance().get_waveform_shape()) { case Rectified: wave->set_shape (WaveView::Rectified); @@ -1240,7 +1247,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) default: wave->set_shape (WaveView::Normal); } - + wave->set_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic); vector v; @@ -1280,6 +1287,13 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) /* indicate peak-completed */ pending_peak_data->hide (); + + /* Restore stacked coverage */ + std::string str = trackview.gui_property ("layer-display"); + if (!str.empty()) { + LayerDisplay layer_display; + update_coverage_frames (LayerDisplay (string_2_enum (str, layer_display))); + } } /* channel wave created, don't hook into peaks ready anymore */ @@ -1301,18 +1315,34 @@ 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 (); + framecnt_t const frame_within_region = (framecnt_t) floor (mx * samples_per_pixel); + + if (!gain_line->control_points_adjacent (frame_within_region, before_p, after_p)) { + /* no adjacent points */ + return; + } + + /*y is in item frame */ + 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); - x = ev->button.x; - y = ev->button.y; + double y = ((gain_line->nth (before_p)->get_y() * click_ratio) + (gain_line->nth (after_p)->get_y() * (1 - click_ratio))); - item->canvas_to_item (x, y); + /* don't create points that can't be seen */ + + update_envelope_visibility (); - framepos_t fx = trackview.editor().pixel_to_sample (x); + framepos_t rpos = region ()->position (); + framepos_t fx = trackview.editor().pixel_to_sample (mx) + rpos; + trackview.editor ().snap_to_with_modifier (fx, ev); + fx -= rpos; if (fx > _region->length()) { return; @@ -1320,31 +1350,44 @@ 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.editor().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()->editor_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); + } - XMLNode &after = audio_region()->envelope()->get_state(); - trackview.session()->add_command (new MementoCommand(*audio_region()->envelope().get(), &before, &after)); - trackview.editor().commit_reversible_command (); + 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); + + trackview.editor ().commit_reversible_command (); + trackview.session ()->set_dirty (); + } } void @@ -1358,10 +1401,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(); @@ -1463,8 +1509,8 @@ void AudioRegionView::envelope_active_changed () { if (gain_line) { - gain_line->set_line_color (audio_region()->envelope_active() ? - UIConfiguration::instance().color ("gain line") : + 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 (); } @@ -1515,7 +1561,7 @@ AudioRegionView::set_some_waveform_colors (vector& wave } else { if (_region->muted()) { /* hide outline with zero alpha */ - outline = UINT_RGBA_CHANGE_A(UIConfiguration::instance().color ("waveform outline"), 0); + 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 = UIConfiguration::instance().color ("waveform outline"); @@ -1569,6 +1615,11 @@ AudioRegionView::set_fade_visibility (bool yn) void AudioRegionView::update_coverage_frames (LayerDisplay d) { + if (d != Stacked) { + /* don't do coverage frames unless we're in stacked mode */ + return; + } + RegionView::update_coverage_frames (d); if (fade_in_handle) { fade_in_handle->raise_to_top (); } @@ -1591,15 +1642,26 @@ AudioRegionView::show_region_editor () void AudioRegionView::transients_changed () { - AnalysisFeatureList analysis_features = _region->transients(); + AnalysisFeatureList analysis_features; + _region->transients (analysis_features); + framepos_t position = _region->position(); + framepos_t first = _region->first_frame(); + framepos_t last = _region->last_frame(); - 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 (); @@ -1622,15 +1684,21 @@ AudioRegionView::transients_changed () 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(); + } } } @@ -1647,28 +1715,27 @@ 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 position = _region->position(); framepos_t old_frame = (*l).first; - framepos_t new_frame = trackview.editor().pixel_to_sample (new_pos); - + framepos_t new_frame = trackview.editor().pixel_to_sample (new_pos) + position; _region->update_transient (old_frame, new_frame); - break; } } } void -AudioRegionView::remove_transient(float pos) +AudioRegionView::remove_transient (float pos) { - /* Find frame at old pos, calulate new frame then update region transients*/ + /* this is called from Editor::remove_transient () with pos == get_data ("position") + * which is the item's x-coordinate inside the ARV. + * + * Find frame at old pos, calulate new frame 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;