#include <gtkmm.h>
-#include <gtkmm2ext/gtk_ui.h>
-
#include "ardour/playlist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#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"
#include "canvas/text.h"
#include "canvas/xfade_curve.h"
#include "canvas/debug.h"
-#include "canvas/utils.h"
-#include "canvas/colors.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"
#include "gui_thread.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#define MUTED_ALPHA 48
// 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 (ArdourCanvas::rgba_to_color (0, 0, 0, 0.0));
+ 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 ();
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_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_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_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_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 ();
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<GhostRegion*>::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 ();
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? */
}
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);
}
for (uint32_t n = 0; n < waves.size(); ++n) {
waves[n]->gain_changed ();
}
+ region_renamed ();
}
void
str = string ("!") + str;
}
+
+ boost::shared_ptr<AudioRegion> 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);
}
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 ();
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
if ((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) {
- for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
+ for (vector<ArdourWaveView::WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
(*w)->region_resized ();
}
}
}
- /* hide transient lines that extend beyond the region end */
-
+ /* hide transient lines that extend beyond the region */
list<std::pair<framepos_t, ArdourCanvas::Line*> >::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();
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);
if (end_xfade_rect) { end_xfade_rect->set_outline (false); }
}
- AnalysisFeatureList analysis_features = _region->transients();
- AnalysisFeatureList::const_iterator i;
-
- list<std::pair<framepos_t, ArdourCanvas::Line*> >::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<std::pair<framepos_t, ArdourCanvas::Line*> >::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
void
AudioRegionView::set_height (gdouble height)
{
+ if (height == _height) {
+ return;
+ }
+
RegionView::set_height (height);
pending_peak_data->set_y1 (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);
}
reset_fade_shapes ();
- /* Update hights for any active feature lines */
+ /* Update heights for any feature lines */
+ framepos_t position = _region->position();
list<std::pair<framepos_t, ArdourCanvas::Line*> >::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) {
hide_start_xfade ();
return;
}
-
+
double effective_height;
if (_height >= NAME_HIGHLIGHT_THRESH) {
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.
*/
}
/* points *MUST* be in anti-clockwise order */
-
+
Points points;
Points::size_type pi;
boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_out());
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.));
npoints = inverse->size();
ipoints.assign (npoints, Duple());
-
+
Evoral::ControlList::const_iterator x;
Points::size_type pi;
double length = inverse->length();
}
show_end_xfade();
-
+
reset_fade_out_shape_width (ar, ar->fade_out()->back()->when);
}
void
AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t width, Points& points, double effective_height,
- double rect_edge, double rect_width)
+ double rect_edge, double rect_width)
{
if (points.size() < 2) {
return;
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();
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"));
}
}
_data_ready_connections.clear ();
- for (vector<WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+ for (vector<ArdourWaveView::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
group->remove(*w);
}
waves.clear();
}
/* 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 ());
+ 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_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);
+ wave->set_shape (ArdourWaveView::WaveView::Rectified);
break;
default:
- wave->set_shape (WaveView::Normal);
+ wave->set_shape (ArdourWaveView::WaveView::Normal);
}
-
+
wave->set_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic);
- vector<ArdourCanvas::WaveView*> v;
+ vector<ArdourWaveView::WaveView*> v;
v.push_back (wave);
set_some_waveform_colors (v);
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)));
- }
+ LayerDisplay layer_display;
+ if (trackview.get_gui_property ("layer-display", layer_display)) {
+ update_coverage_frames (layer_display);
+ }
}
/* channel wave created, don't hook into peaks ready anymore */
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);
- x = ev->button.x;
- y = ev->button.y;
+ if (!gain_line->control_points_adjacent (frame_within_region, before_p, after_p)) {
+ /* no adjacent points */
+ return;
+ }
- item->canvas_to_item (x, y);
+ /*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);
- framepos_t fx = trackview.editor().pixel_to_sample (x);
+ 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 */
+
+ update_envelope_visibility ();
+ framepos_t rpos = region ()->position ();
+ 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;
/* 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<AudioRegion>* 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<AudioRegion>(*(audio_region().get()), ®ion_before, ®ion_after));
+ region_memento = new MementoCommand<AudioRegion>(*(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<Selectable*> results;
+
+ trackview.editor().begin_reversible_command (_("add gain control point"));
- XMLNode &after = audio_region()->envelope()->get_state();
- trackview.session()->add_command (new MementoCommand<AutomationList>(*audio_region()->envelope().get(), &before, &after));
- trackview.editor().commit_reversible_command ();
+ if (region_memento) {
+ trackview.session()->add_command (region_memento);
+ }
+
+ trackview.session()->add_command (new MementoCommand<AutomationList>(*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
AudioRegionView::add_ghost (TimeAxisView& tv)
{
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&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();
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);
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 ();
}
}
void
-AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& waves_to_color)
+AudioRegionView::set_some_waveform_colors (vector<ArdourWaveView::WaveView*>& waves_to_color)
{
- ArdourCanvas::Color fill;
- ArdourCanvas::Color outline;
- ArdourCanvas::Color clip = UIConfiguration::instance().color ("clipped waveform");
- ArdourCanvas::Color zero = UIConfiguration::instance().color ("zero line");
+ 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()) {
} 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");
}
}
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves_to_color.begin(); w != waves_to_color.end(); ++w) {
+ for (vector<ArdourWaveView::WaveView*>::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);
{
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
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 ();
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();
+ }
}
}
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;
+ framepos_t position = _region->position();
+ framepos_t old_frame = (*l).first;
+ 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<std::pair<framepos_t, ArdourCanvas::Line*> >::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;
}
}
}
projects / ardour.git / blobdiff