#include "canvas/xfade_curve.h"
#include "canvas/debug.h"
#include "canvas/utils.h"
+#include "canvas/colors.h"
#include "streamview.h"
#include "audio_region_view.h"
#include "control_point.h"
#include "ghostregion.h"
#include "audio_time_axis.h"
-#include "utils.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
using namespace Editing;
using namespace ArdourCanvas;
-static const int32_t sync_mark_width = 9;
static double const handle_size = 10; /* height of fade handles */
-AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
- Gdk::Color const & basic_color)
+Cairo::RefPtr<Cairo::Pattern> AudioRegionView::pending_peak_pattern;
+
+static Cairo::RefPtr<Cairo::Pattern> 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<Cairo::Pattern> p (new Cairo::Pattern (pat, false));
+ cairo_surface_destroy (is);
+ return p;
+}
+
+AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
+ uint32_t basic_color)
: RegionView (parent, tv, r, spu, basic_color)
, sync_mark(0)
, fade_in_handle(0)
, 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)
, end_xfade_rect (0)
, _end_xfade_visible (false)
, _amplitude_above_axis(1.0)
- , fade_color(0)
, 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::
Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
- Gdk::Color const & basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
+AudioRegionView::AudioRegionView (ArdourCanvas::
Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
+ uint32_t basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
: RegionView (parent, tv, r, spu, basic_color, recording, visibility)
, sync_mark(0)
, fade_in_handle(0)
, 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)
, end_xfade_rect (0)
, _end_xfade_visible (false)
, _amplitude_above_axis(1.0)
- , fade_color(0)
, 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<AudioRegion> other_region)
, 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)
, end_xfade_rect (0)
, _end_xfade_visible (false)
, _amplitude_above_axis (other._amplitude_above_axis)
- , fade_color(0)
, trim_fade_in_drag_active(false)
, trim_fade_out_drag_active(false)
{
- Gdk::Color c;
- int r,g,b,a;
-
- UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
- c.set_rgb_p (r/255.0, g/255.0, b/255.0);
+ init (true);
- init (c, 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
-AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
+AudioRegionView::init (bool wfd)
{
// FIXME: Some redundancy here with RegionView::init. Need to figure out
// where order is important and where it isn't...
- RegionView::init (basic_color, wfd);
+ if (!pending_peak_pattern) {
+ pending_peak_pattern = create_pending_peak_pattern();
+ }
- _amplitude_above_axis = 1.0;
+ // 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_pattern (pending_peak_pattern);
+ pending_peak_data->set_data ("regionview", this);
+ pending_peak_data->hide ();
- compute_colors (basic_color);
+ RegionView::init (wfd);
+
+ _amplitude_above_axis = 1.0;
create_waves ();
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 (RGBA_TO_UINT (0, 0, 0, 255));
- fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_in_handle->set_outline_color (ArdourCanvas::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 (RGBA_TO_UINT (0, 0, 0, 255));
- fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_out_handle->set_outline_color (ArdourCanvas::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 (RGBA_TO_UINT (0, 0, 0, 255));
- fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_in_trim_handle->set_outline_color (ArdourCanvas::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 (RGBA_TO_UINT (0, 0, 0, 255));
- fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_out_trim_handle->set_outline_color (ArdourCanvas::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());
+ /* 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 ();
+ /* reset_width_dependent_items() does this:
if (frame_handle_start) {
frame_handle_start->raise_to_top ();
}
if (frame_handle_end) {
frame_handle_end->raise_to_top ();
}
-
+ */
/* XXX sync mark drag? */
}
for (vector<ScopedConnection*>::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) {
delete *i;
}
+ _data_ready_connections.clear ();
for (list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
delete ((*i).second);
if (audio_region()->fade_in_active()) {
start_xfade_rect->set_fill (false);
} else {
- start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade());
+ start_xfade_rect->set_fill_color (UIConfiguration::instance().color_mod ("inactive crossfade", "inactive crossfade"));
start_xfade_rect->set_fill (true);
}
}
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_canvasvar_InactiveCrossfade());
+ } else {
+ end_xfade_rect->set_fill_color (UIConfiguration::instance().color_mod ("inactive crossfade", "inactive crossfade"));
end_xfade_rect->set_fill (true);
}
}
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 ();
}
}
}
- /* 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 (pixel_width <= 6.0 || _height < 5.0 || !trackview.session()->config.get_show_region_fades()) {
+ 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(); }
if (fade_in_trim_handle) { fade_in_trim_handle->hide(); }
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);
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) {
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) {
width = std::max ((framecnt_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 */
if (fade_in_handle->visible()) {
//see comment for drag_start
- entered(false);
+ entered();
}
if (pwidth < 5) {
hide_start_xfade ();
return;
}
-
+
double effective_height;
if (_height >= NAME_HIGHLIGHT_THRESH) {
/* points *MUST* be in anti-clockwise order */
Points points;
- Points::size_type npoints;
Points::size_type pi;
boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_in());
Evoral::ControlList::const_iterator x;
double length = list->length();
- npoints = list->size();
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 */
width = std::max ((framecnt_t) 64, width);
- double const pwidth = rint(trackview.editor().sample_to_pixel (width));
+
+ 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.
*/
- double const handle_right = rint(trackview.editor().sample_to_pixel (_region->length()) + TimeAxisViewItem::RIGHT_EDGE_SHIFT - pwidth);
- double const trim_handle_right = rint(trackview.editor().sample_to_pixel (_region->length()) + TimeAxisViewItem::RIGHT_EDGE_SHIFT);
+ double const handle_right = rint(trackview.editor().sample_to_pixel (_region->length()) - pwidth);
+ double const trim_handle_right = rint(trackview.editor().sample_to_pixel (_region->length()));
/* Put the fade out handle so that its right side is at the end-of-fade line;
*/
- fade_out_handle->set_x0 (1 + handle_right - handle_size);
- fade_out_handle->set_x1 (1 + handle_right);
+ fade_out_handle->set_x0 (handle_right - handle_size);
+ fade_out_handle->set_x1 (handle_right);
if (fade_out_trim_handle) {
fade_out_trim_handle->set_x0 (1 + trim_handle_right - handle_size);
fade_out_trim_handle->set_x1 (1 + trim_handle_right);
if (fade_out_handle->visible()) {
//see comment for drag_start
- entered(false);
+ entered();
}
/* don't show shape if its too small */
double effective_height;
- if (_height >= NAME_HIGHLIGHT_THRESH) {
- effective_height = _height - NAME_HIGHLIGHT_SIZE;
- } else {
- effective_height = _height;
+ effective_height = _height;
+
+ 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 npoints;
Points::size_type pi;
boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_out());
Evoral::ControlList::const_iterator x;
double length = list->length();
- npoints = list->size();
points.assign (list->size(), Duple());
for (x = list->begin(), pi = 0; x != list->end(); ++x, ++pi) {
- points[pi].x = 1.0 + _pixel_width - pwidth + (pwidth * ((*x)->when/length));
- points[pi].y = effective_height - ((*x)->value * effective_height);
+ points[pi].x = _pixel_width - pwidth + (pwidth * ((*x)->when/length));
+ points[pi].y = effective_height - ((*x)->value * (effective_height - 1.));
}
/* draw the line */
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_canvasvar_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_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->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT));
- start_xfade_rect->set_outline_width (0.5);
start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this));
start_xfade_rect->set_data ("regionview", this);
}
npoints = inverse->size();
ipoints.assign (npoints, Duple());
-
+
Evoral::ControlList::const_iterator x;
Points::size_type pi;
double length = inverse->length();
for (x = inverse->begin(), pi = 0; x != inverse->end(); ++x, ++pi) {
ArdourCanvas::Duple& p (ipoints[pi]);
- p.x = 1.0 + (rect_width * ((*x)->when/length));
- p.y = effective_height - ((*x)->value * effective_height);
+ p.x = (rect_width * ((*x)->when/length));
+ p.y = effective_height - ((*x)->value * (effective_height));
}
}
}
show_end_xfade();
-
+
reset_fade_out_shape_width (ar, ar->fade_out()->back()->when);
}
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_canvasvar_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_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->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT));
- end_xfade_rect->set_outline_width (0.5);
end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this));
end_xfade_rect->set_data ("regionview", this);
}
- end_xfade_rect->set (ArdourCanvas::Rect (rect_edge, 0.0, rect_edge + rect_width + TimeAxisViewItem::RIGHT_EDGE_SHIFT, effective_height));
+ end_xfade_rect->set (ArdourCanvas::Rect (rect_edge, 0.0, rect_edge + rect_width, effective_height));
/* fade in line */
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 = 1.0 + (rect_width * ((*x)->when/length)) + rend;
- p.y = effective_height - ((*x)->value * effective_height);
+ p.x = (rect_width * ((*x)->when/length)) + rend;
+ p.y = effective_height - ((*x)->value * (effective_height));
}
}
{
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);
}
}
}
-void
-AudioRegionView::compute_colors (Gdk::Color const & basic_color)
-{
- RegionView::compute_colors (basic_color);
-
- /* gain color computed in envelope_active_changed() */
-
- fade_color = UINT_RGBA_CHANGE_A (fill_color, 120);
-}
-
void
AudioRegionView::set_colors ()
{
RegionView::set_colors();
if (gain_line) {
- gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_canvasvar_GainLine() :
- ARDOUR_UI::config()->get_canvasvar_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_canvasvar_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_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_canvasvar_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.
return;
}
- if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseGain) {
- 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<ScopedConnection*>::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) {
+ delete *i;
+ }
+ _data_ready_connections.clear ();
+
+ for (vector<WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+ group->remove(*w);
+ }
+ waves.clear();
+ tmp_waves.clear();
+ pending_peak_data->show ();
+}
+
void
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 {
{
//cerr << "AudioRegionView::create_one_wave() called which: " << which << " this: " << this << endl;//DEBUG
RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&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
+ * 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);
wave->set_samples_per_pixel (samples_per_pixel);
wave->set_show_zero_line (true);
-
- switch (Config->get_waveform_shape()) {
+ 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);
break;
default:
wave->set_shape (WaveView::Normal);
}
-
- wave->set_logscaled (Config->get_waveform_scale() == Logarithmic);
- if (!Config->get_show_waveforms ()) {
+ wave->set_logscaled (UIConfiguration::instance().get_waveform_scale() == Logarithmic);
+
+ vector<ArdourCanvas::WaveView*> v;
+ v.push_back (wave);
+ set_some_waveform_colors (v);
+
+ if (!UIConfiguration::instance().get_show_waveforms ()) {
wave->hide();
}
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 */
+ 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 */
+ delete _data_ready_connections[which];
+ _data_ready_connections[which] = 0;
}
void
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)));
+
+ /* don't create points that can't be seen */
- item->canvas_to_item (x, y);
+ 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;
/* 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<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()->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"));
+
+ if (region_memento) {
+ trackview.session()->add_command (region_memento);
+ }
+
+ trackview.session()->add_command (new MementoCommand<AutomationList>(*audio_region()->envelope().get(), &before, &after));
- XMLNode &after = audio_region()->envelope()->get_state();
- trackview.session()->add_command (new MementoCommand<AutomationList>(*audio_region()->envelope().get(), &before, &after));
- trackview.session()->commit_reversible_command ();
+ 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();
}
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) {
+ update_envelope_visibility();
+
+ if ((trackview.editor().current_mouse_mode() == Editing::MouseObject)) {
if (start_xfade_rect) {
start_xfade_rect->set_outline (true);
}
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); }
}
}
trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>());
trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
- 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(); }
AudioRegionView::envelope_active_changed ()
{
if (gain_line) {
- gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_canvasvar_GainLine() :
- ARDOUR_UI::config()->get_canvasvar_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 ();
}
}
void
AudioRegionView::set_waveform_colors ()
{
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
- set_one_waveform_color (*w);
- }
+ set_some_waveform_colors (waves);
}
void
-AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
+AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::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");
+
if (_selected) {
if (_region->muted()) {
/* hide outline with zero alpha */
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), 0);
- fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_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_canvasvar_SelectedWaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
+ outline = UIConfiguration::instance().color ("selected waveform outline");
+ fill = UIConfiguration::instance().color ("selected waveform fill");
}
} else {
if (_recregion) {
- outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_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_canvasvar_WaveForm(), 0);
- fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_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_canvasvar_WaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
+ outline = UIConfiguration::instance().color ("waveform outline");
+ fill = UIConfiguration::instance().color ("waveform fill");
}
}
}
- if (ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-
- /* just use a slightly transparent version of the selected
- * color so that some of the track color bleeds through
- */
-
- double r, g, b, a;
- ArdourCanvas::color_to_rgba (fill, r, g, b, a);
- fill = ArdourCanvas::rgba_to_color (r, g, b, 0.85); /* magic number, not user controllable */
- outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
-
- if (!Config->get_show_name_highlight()) {
- /* recolor name text because it needs to contrast with
- the waveform background, not the name highlight.
- */
- }
+ for (vector<ArdourCanvas::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);
+ (*w)->set_zero_color (zero);
}
-
- wave->set_fill_color (fill);
- wave->set_outline_color (outline);
- wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip());
- wave->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
}
void
return;
}
- if (_region->opaque()) {
- fill_opacity = 130;
- } else {
- fill_opacity = 0;
- }
-
- TimeAxisViewItem::set_frame_color ();
+ RegionView::set_frame_color ();
set_waveform_colors ();
}
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 (); }
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 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<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;
// 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();
}
}
projects / ardour.git / blobdiff