X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=ed5665ddb103104866e432a272f90333132e6638;hb=987c1cb94ac7a558a03ae308ff33528b7337d592;hp=d3a82dba12b684d7cfca2b5afa98629f6d62129c;hpb=b074ff0dd511ab1a7bf6ff385bc445e7e326fce6;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index d3a82dba12..ed5665ddb1 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()); // XXX not correct for Layered mode, but set_height() will fix later. + /* 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? */ } @@ -389,6 +378,7 @@ AudioRegionView::region_scale_amplitude_changed () for (uint32_t n = 0; n < waves.size(); ++n) { waves[n]->gain_changed (); } + region_renamed (); } void @@ -404,6 +394,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); } @@ -434,12 +432,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 +450,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 +468,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 +535,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); @@ -560,20 +576,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) { @@ -1309,20 +1324,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 (); + 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 rpos = region ()->position (); - framepos_t fx = trackview.editor().pixel_to_sample (x) + rpos; - trackview.editor ().snap_to_with_modifier (fx, ev); - fx -= rpos; + MusicFrame snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0); + trackview.editor ().snap_to_with_modifier (snap_pos, ev); + framepos_t fx = snap_pos.frame - rpos; if (fx > _region->length()) { return; @@ -1330,11 +1358,11 @@ 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. @@ -1381,7 +1409,10 @@ 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 (*this, tv, trackview, unit_position); @@ -1594,10 +1625,12 @@ AudioRegionView::update_coverage_frames (LayerDisplay d) { RegionView::update_coverage_frames (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 @@ -1614,15 +1647,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 (); @@ -1645,15 +1689,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(); + } } } @@ -1670,28 +1720,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;