#include <cmath>
#include <cassert>
#include <algorithm>
+#include <vector>
#include <boost/scoped_array.hpp>
#include "canvas/poly_line.h"
#include "canvas/line.h"
#include "canvas/text.h"
+#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 "i18n.h"
-#define MUTED_ALPHA 10
+#define MUTED_ALPHA 48
using namespace std;
using namespace ARDOUR;
using namespace Editing;
using namespace ArdourCanvas;
-static const int32_t sync_mark_width = 9;
-static double const handle_size = 15; /* height of fade handles */
+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)
+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_shape(0)
- , fade_out_shape(0)
, fade_in_handle(0)
, fade_out_handle(0)
- , start_xfade_in (0)
- , start_xfade_out (0)
+ , fade_in_trim_handle(0)
+ , fade_out_trim_handle(0)
+ , start_xfade_curve (0)
, start_xfade_rect (0)
, _start_xfade_visible (false)
- , end_xfade_in (0)
- , end_xfade_out (0)
+ , end_xfade_curve (0)
, 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());
}
-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_shape(0)
- , fade_out_shape(0)
, fade_in_handle(0)
, fade_out_handle(0)
- , start_xfade_in (0)
- , start_xfade_out (0)
+ , fade_in_trim_handle(0)
+ , fade_out_trim_handle(0)
+ , start_xfade_curve (0)
, start_xfade_rect (0)
, _start_xfade_visible (false)
- , end_xfade_in (0)
- , end_xfade_out (0)
+ , end_xfade_curve (0)
, 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());
}
AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr<AudioRegion> other_region)
: RegionView (other, boost::shared_ptr<Region> (other_region))
- , fade_in_shape(0)
- , fade_out_shape(0)
, fade_in_handle(0)
, fade_out_handle(0)
- , start_xfade_in (0)
- , start_xfade_out (0)
+ , fade_in_trim_handle(0)
+ , fade_out_trim_handle(0)
+ , start_xfade_curve (0)
, start_xfade_rect (0)
, _start_xfade_visible (false)
- , end_xfade_in (0)
- , end_xfade_out (0)
+ , end_xfade_curve (0)
, 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 (c, true);
+ init (true);
Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
}
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);
+ RegionView::init (wfd);
_amplitude_above_axis = 1.0;
- compute_colors (basic_color);
-
create_waves ();
- fade_in_shape = new ArdourCanvas::PolyLine (group);
- CANVAS_DEBUG_NAME (fade_in_shape, string_compose ("fade in shape for %1", region()->name()));
- fade_in_shape->set_outline_color (fade_color);
- fade_in_shape->set_data ("regionview", this);
-
- fade_out_shape = new ArdourCanvas::PolyLine (group);
- CANVAS_DEBUG_NAME (fade_out_shape, string_compose ("fade out shape for %1", region()->name()));
- fade_out_shape->set_outline_color (fade_color);
- fade_out_shape->set_data ("regionview", this);
-
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 (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->color ("inactive fade handle"));
fade_out_handle->set_data ("regionview", this);
fade_out_handle->hide ();
+
+ fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
+ CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name()));
+ fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
+ fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
+ fade_in_trim_handle->set_data ("regionview", this);
+ fade_in_trim_handle->hide ();
+
+ fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
+ CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name()));
+ fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
+ fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
+ fade_out_trim_handle->set_data ("regionview", this);
+ fade_out_trim_handle->hide ();
}
setup_fade_handle_positions ();
reset_width_dependent_items (_pixel_width);
- fade_in_shape->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
if (fade_in_handle) {
- fade_in_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
+ fade_in_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this, false));
}
- fade_out_shape->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this));
-
if (fade_out_handle) {
- fade_out_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
+ fade_out_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this, false));
+ }
+
+ if (fade_in_trim_handle) {
+ fade_in_trim_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_trim_handle, this, true));
+ }
+
+ if (fade_out_trim_handle) {
+ fade_out_trim_handle->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_trim_handle, this, true));
}
set_colors ();
setup_waveform_visibility ();
- setup_waveform_shape ();
if (frame_handle_start) {
frame_handle_start->raise_to_top ();
void
AudioRegionView::fade_in_active_changed ()
{
- if (audio_region()->fade_in_active()) {
- /* XXX: make a themable colour */
- fade_in_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 90));
- } else {
- /* XXX: make a themable colour */
- fade_in_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 20));
+ if (start_xfade_rect) {
+ if (audio_region()->fade_in_active()) {
+ start_xfade_rect->set_fill (false);
+ } else {
+ start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade"));
+ start_xfade_rect->set_fill (true);
+ }
}
}
void
AudioRegionView::fade_out_active_changed ()
{
- if (audio_region()->fade_out_active()) {
- /* XXX: make a themable colour */
- fade_out_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 90));
- } else {
- /* XXX: make a themable colour */
- fade_out_shape->set_outline_color (RGBA_TO_UINT (45, 45, 45, 20));
+ 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()->color_mod ("inactive crossfade", "inactive crossfade"));
+ end_xfade_rect->set_fill (true);
+ }
}
}
RegionView::reset_width_dependent_items(pixel_width);
assert(_pixel_width == pixel_width);
- if (fade_in_handle) {
- if (pixel_width <= 6.0 || _height < 5.0 || !trackview.session()->config.get_show_region_fades()) {
- fade_in_handle->hide();
- fade_out_handle->hide();
- } else {
- //fade_in_handle->show();
- //fade_out_handle->show();
- }
+ 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 (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); }
}
AnalysisFeatureList analysis_features = _region->transients();
AudioRegionView::setup_fade_handle_positions()
{
/* position of fade handle offset from the top of the region view */
- double const handle_pos = 1.0;
+ double const handle_pos = 0.0;
if (fade_in_handle) {
fade_in_handle->set_y0 (handle_pos);
fade_out_handle->set_y0 (handle_pos);
fade_out_handle->set_y1 (handle_pos + handle_size);
}
+
+ if (fade_in_trim_handle) {
+ fade_in_trim_handle->set_y0 (_height - handle_size);
+ fade_in_trim_handle->set_y1 (_height);
+ }
+
+ if (fade_out_trim_handle) {
+ fade_out_trim_handle->set_y0 (_height - handle_size );
+ fade_out_trim_handle->set_y1 (_height);
+ }
}
void
if (name_text) {
name_text->raise_to_top();
}
+
+ setup_fade_handle_positions();
}
void
AudioRegionView::reset_fade_shapes ()
{
- reset_fade_in_shape ();
- reset_fade_out_shape ();
+ if (!trim_fade_in_drag_active) { reset_fade_in_shape (); }
+ if (!trim_fade_out_drag_active) { reset_fade_out_shape (); }
}
void
}
void
-AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width)
+AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width, bool drag_active)
{
+ trim_fade_in_drag_active = drag_active;
if (fade_in_handle == 0) {
return;
}
fade_in_handle->set_x0 (handle_left);
fade_in_handle->set_x1 (handle_left + handle_size);
+ if (fade_in_trim_handle) {
+ fade_in_trim_handle->set_x0 (0);
+ fade_in_trim_handle->set_x1 (handle_size);
+ }
+
+ if (fade_in_handle->visible()) {
+ //see comment for drag_start
+ entered();
+ }
+
if (pwidth < 5) {
hide_start_xfade();
- fade_in_shape->hide();
return;
}
- if (trackview.session()->config.get_show_region_fades()) {
- fade_in_shape->show();
+ if (!trackview.session()->config.get_show_region_fades()) {
+ hide_start_xfade ();
+ return;
}
-
- uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
+
double effective_height;
- float curve[npoints];
-
- audio_region()->fade_in()->curve().get_vector (0, audio_region()->fade_in()->back()->when, curve, npoints);
if (_height >= NAME_HIGHLIGHT_THRESH) {
- effective_height = _height - NAME_HIGHLIGHT_SIZE - 1;
+ effective_height = _height - NAME_HIGHLIGHT_SIZE;
} else {
- effective_height = _height - 2;
+ effective_height = _height;
}
- Points points;
-
- points.assign (npoints, Duple());
-
/* points *MUST* be in anti-clockwise order */
- uint32_t pi, pc;
- double xdelta = pwidth/npoints;
+ Points points;
+ Points::size_type pi;
+ boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_in());
+ Evoral::ControlList::const_iterator x;
+ double length = list->length();
- for (pi = 0, pc = 0; pc < npoints; ++pc) {
- points[pi].x = 1.0 + (pc * xdelta);
- points[pi++].y = effective_height - (curve[pc] * effective_height);
+ 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);
}
/* draw the line */
redraw_start_xfade_to (ar, width, points, effective_height, handle_left);
- // fade_in_shape->set (points);
-
/* ensure trim handle stays on top */
if (frame_handle_start) {
frame_handle_start->raise_to_top();
}
-
}
void
}
void
-AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width)
+AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, framecnt_t width, bool drag_active)
{
+ trim_fade_out_drag_active = drag_active;
if (fade_out_handle == 0) {
return;
}
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 handle_right = (_region->length() / samples_per_pixel) - pwidth;
+ double const pwidth = rint(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()) - 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 (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();
+ }
/* don't show shape if its too small */
if (pwidth < 5) {
hide_end_xfade();
- fade_out_shape->hide();
return;
}
- if (trackview.session()->config.get_show_region_fades()) {
- fade_out_shape->show();
+ if (!trackview.session()->config.get_show_region_fades()) {
+ hide_end_xfade();
+ return;
}
- uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
double effective_height;
- float curve[npoints];
- audio_region()->fade_out()->curve().get_vector (0, audio_region()->fade_out()->back()->when, curve, npoints);
+ effective_height = _height - 1.0;
- if (_height >= NAME_HIGHLIGHT_THRESH) {
- effective_height = _height - (NAME_HIGHLIGHT_SIZE + 1); /* skip the top pixel that shows the frame of this regionview */
- } else {
- effective_height = _height - 2; /* skip the top and bottom pixel that are the frame of this regionview */
+ if (ARDOUR_UI::config()->get_show_name_highlight() && effective_height >= NAME_HIGHLIGHT_THRESH) {
+ effective_height -= NAME_HIGHLIGHT_SIZE;
}
/* points *MUST* be in anti-clockwise order */
Points points;
+ Points::size_type pi;
+ boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_out());
+ Evoral::ControlList::const_iterator x;
+ double length = list->length();
+
+ points.assign (list->size(), Duple());
- uint32_t pi, pc;
- double xdelta = pwidth/npoints;
-
- points.assign (npoints, Duple ());
-
- for (pi = 0, pc = 0; pc < npoints; ++pc, ++pi) {
- points[pi].x = 1.0 + _pixel_width - pwidth + (pc * xdelta);
- points[pi].y = effective_height - (curve[pc] * effective_height);
+ for (x = list->begin(), pi = 0; x != list->end(); ++x, ++pi) {
+ points[pi].x = _pixel_width - pwidth + (pwidth * ((*x)->when/length));
+ points[pi].y = 1.0 + effective_height - ((*x)->value * effective_height);
}
/* draw the line */
- redraw_end_xfade_to (ar, width, points, effective_height, handle_right, pwidth-2);
-
- // fade_out_shape->set (points);
+ redraw_end_xfade_to (ar, width, points, effective_height, handle_right, pwidth);
/* ensure trim handle stays on top */
if (frame_handle_end) {
frame_handle_end->raise_to_top();
}
-
}
framepos_t
AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t /*width*/, Points& points, double effective_height,
double rect_width)
{
- if (points.size() < 3) {
+ if (points.size() < 2) {
return;
}
- if (!start_xfade_in) {
- start_xfade_in = new ArdourCanvas::PolyLine (group);
- CANVAS_DEBUG_NAME (start_xfade_in, string_compose ("xfade start in line for %1", region()->name()));
- start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
- start_xfade_in->set_outline_width (1.5);
- }
-
- if (!start_xfade_out) {
- start_xfade_out = new ArdourCanvas::PolyLine (group);
- CANVAS_DEBUG_NAME (start_xfade_out, string_compose ("xfade start out line for %1", region()->name()));
- uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
- start_xfade_out->set_outline_color (col);
- start_xfade_out->set_outline_width (2.0);
+ 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()->color_mod ("active crossfade", "crossfade alpha"));
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->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_fill (true);
- start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
+ start_xfade_rect->set_fill (false);
start_xfade_rect->set_outline (false);
start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this));
start_xfade_rect->set_data ("regionview", this);
}
- start_xfade_rect->set (ArdourCanvas::Rect (1.0, 0.0, rect_width, effective_height));
- start_xfade_rect->show ();
-
- start_xfade_in->set (points);
- start_xfade_in->show ();
+ start_xfade_rect->set (ArdourCanvas::Rect (0.0, 0.0, rect_width, effective_height));
/* fade out line */
- boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_in();
+ boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_in ();
Points ipoints;
- Points::size_type npoints = points.size();
-
- ipoints.assign (npoints, Duple());
+ Points::size_type npoints;
if (!inverse) {
- /* no inverse curve defined, show the inverse of the normal one */
+ /* there is no explicit inverse fade in curve, so take the
+ * regular fade in curve given to use as "points" (already a
+ * set of coordinates), and convert to the inverse shape.
+ */
+
+ npoints = points.size();
+ ipoints.assign (npoints, Duple());
for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) {
ArdourCanvas::Duple &p (ipoints[pci]);
- p.x = 1.0 + i;
- /* invert with respect to y-axis */
- p.y = effective_height - points[pci].y;
+ /* leave x-axis alone but invert with respect to y-axis */
+ p.y = 1.0 + effective_height - points[pci].y;
}
} else {
- float vec[npoints];
- inverse->curve().get_vector (0, inverse->back()->when, vec, npoints);
+ /* there is an explicit inverse fade in curve. Grab the points
+ and convert them into coordinates for the inverse fade in
+ line.
+ */
+
+ npoints = inverse->size();
+ ipoints.assign (npoints, Duple());
- for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) {
- ArdourCanvas::Duple &p (ipoints[pci]);
- p.x = 1.0 + i;
- p.y = effective_height - (effective_height * vec[i]);
+ 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 = (rect_width * ((*x)->when/length));
+ p.y = 1.0 + effective_height - ((*x)->value * effective_height);
}
}
- start_xfade_out->set (ipoints);
- start_xfade_out->show ();
+ start_xfade_curve->set_inout (points, ipoints);
show_start_xfade();
}
AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecnt_t width, Points& points, double effective_height,
double rect_edge, double rect_width)
{
- if (points.size() < 3) {
+ if (points.size() < 2) {
return;
}
- if (!end_xfade_in) {
- end_xfade_in = new ArdourCanvas::PolyLine (group);
- CANVAS_DEBUG_NAME (end_xfade_in, string_compose ("xfade end in line for %1", region()->name()));
- uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
- end_xfade_in->set_outline_color (col);
- end_xfade_in->set_outline_width (1.5);
- }
-
- if (!end_xfade_out) {
- end_xfade_out = new ArdourCanvas::PolyLine (group);
- CANVAS_DEBUG_NAME (end_xfade_out, string_compose ("xfade end out line for %1", region()->name()));
- end_xfade_out->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
- end_xfade_out->set_outline_width (2.0);
+ 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()->color_mod ("active crossfade", "crossfade alpha"));
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->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_fill (true);
- end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
- end_xfade_rect->set_outline (0);
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
+ end_xfade_rect->set_fill (false);
+ end_xfade_rect->set_outline (false);
end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this));
end_xfade_rect->set_data ("regionview", this);
}
- end_xfade_rect->set (ArdourCanvas::Rect (rect_edge, 1.0, rect_edge + rect_width, effective_height));
- end_xfade_rect->show ();
-
- end_xfade_in->set (points);
- end_xfade_in->show ();
- end_xfade_in->raise_to_top ();
+ end_xfade_rect->set (ArdourCanvas::Rect (rect_edge, 0.0, rect_edge + rect_width, effective_height));
/* fade in line */
boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_out ();
Points ipoints;
- Points::size_type npoints = points.size();
-
- ipoints.assign (npoints, Duple());
+ Points::size_type npoints;
if (!inverse) {
- const double rend = trackview.editor().sample_to_pixel (_region->length() - points.back().y);
+ /* there is no explicit inverse fade out curve, so take the
+ * regular fade out curve given to use as "points" (already a
+ * set of coordinates), and convert to the inverse shape.
+ */
- for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) {
+ npoints = points.size();
+ ipoints.assign (npoints, Duple());
+
+ Points::size_type pci;
+
+ for (pci = 0; pci < npoints; ++pci) {
ArdourCanvas::Duple &p (ipoints[pci]);
- p.x = 1.0 + rend + i;
p.y = effective_height - points[pci].y;
}
} else {
- boost::scoped_array<float> vec (new float[npoints]);
- inverse->curve().get_vector (inverse->front()->when, inverse->back()->when, vec.get(), npoints);
+ /* there is an explicit inverse fade out curve. Grab the points
+ and convert them into coordinates for the inverse fade out
+ line.
+ */
+ npoints = inverse->size();
+ ipoints.assign (npoints, Duple());
+
const double rend = trackview.editor().sample_to_pixel (_region->length() - width);
-
- float* vp = vec.get();
-
- for (Points::size_type i = 0, pci = 0; i < npoints; ++i) {
- ArdourCanvas::Duple& p (ipoints[pci++]);
- p.x = 1.0 + rend + i;
- p.y = effective_height - (effective_height * vp[i]);
+
+ 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) {
+ ArdourCanvas::Duple& p (ipoints[pi]);
+ p.x = (rect_width * ((*x)->when/length)) + rend;
+ p.y = 1.0 + effective_height - ((*x)->value * effective_height);
}
}
- end_xfade_out->set (ipoints);
- end_xfade_out->show ();
- end_xfade_out->raise_to_top ();
-
- end_xfade_rect->raise_to_top (); //this needs to be topmost so the lines don't steal mouse focus
+ end_xfade_curve->set_inout (ipoints, points);
show_end_xfade();
}
void
AudioRegionView::hide_start_xfade ()
{
- if (start_xfade_in) {
- start_xfade_in->hide();
- }
- if (start_xfade_out) {
- start_xfade_out->hide();
+ if (start_xfade_curve) {
+ start_xfade_curve->hide();
}
if (start_xfade_rect) {
start_xfade_rect->hide ();
void
AudioRegionView::hide_end_xfade ()
{
- if (end_xfade_in) {
- end_xfade_in->hide();
- }
- if (end_xfade_out) {
- end_xfade_out->hide();
+ if (end_xfade_curve) {
+ end_xfade_curve->hide();
}
if (end_xfade_rect) {
end_xfade_rect->hide ();
void
AudioRegionView::show_start_xfade ()
{
- if (start_xfade_in) {
- start_xfade_in->show();
- }
- if (start_xfade_out) {
- start_xfade_out->show();
+ if (start_xfade_curve) {
+ start_xfade_curve->show();
}
if (start_xfade_rect) {
start_xfade_rect->show ();
void
AudioRegionView::show_end_xfade ()
{
- if (end_xfade_in) {
- end_xfade_in->show();
- }
- if (end_xfade_out) {
- end_xfade_out->show();
+ if (end_xfade_curve) {
+ end_xfade_curve->show();
}
if (end_xfade_rect) {
end_xfade_rect->show ();
{
RegionView::set_samples_per_pixel (fpp);
- if (Config->get_show_waveforms ()) {
+ if (ARDOUR_UI::config()->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 ()
{
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_canvasvar_GainLine() :
- ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+ ARDOUR_UI::config()->color ("gain line") :
+ ARDOUR_UI::config()->color_mod ("gain line inactive", "gain line inactive"));
}
set_waveform_colors ();
- if (start_xfade_in) {
- start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
- }
- if (start_xfade_out) {
- uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
- start_xfade_out->set_outline_color (col);
- }
- if (end_xfade_in) {
- end_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ if (start_xfade_curve) {
+ start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
- if (end_xfade_out) {
- uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
- end_xfade_out->set_outline_color (col);
+ if (end_xfade_curve) {
+ end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (start_xfade_rect) {
- start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (end_xfade_rect) {
- end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
}
void
AudioRegionView::setup_waveform_visibility ()
{
- if (Config->get_show_waveforms ()) {
+ if (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) {
+ gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::ControlPoints|AutomationLine::Line));
} else {
- gain_line->hide ();
+ gain_line->set_visibility (AutomationLine::VisibleAspects(0));
}
}
wave->set_y_position (yoff);
wave->set_height (ht);
wave->set_samples_per_pixel (samples_per_pixel);
- wave->set_show_zero_line (false);
+ wave->set_show_zero_line (true);
+ wave->set_clip_level (ARDOUR_UI::config()->get_waveform_clip_level ());
- switch (Config->get_waveform_shape()) {
+ wave->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_wave_view_event), wave, this));
+
+ switch (ARDOUR_UI::config()->get_waveform_shape()) {
case Rectified:
wave->set_shape (WaveView::Rectified);
break;
wave->set_shape (WaveView::Normal);
}
- wave->set_logscaled (Config->get_waveform_scale() == Logarithmic);
+ wave->set_logscaled (ARDOUR_UI::config()->get_waveform_scale() == Logarithmic);
+
+ vector<ArdourCanvas::WaveView*> v;
+ v.push_back (wave);
+ set_some_waveform_colors (v);
- if (!Config->get_show_waveforms ()) {
+ if (!ARDOUR_UI::config()->get_show_waveforms ()) {
wave->hide();
}
}
void
-AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
+AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, bool with_guard_points)
{
if (!gain_line) {
return;
can represent automation data with it.
*/
- trackview.session()->begin_reversible_command (_("add gain control point"));
+ trackview.editor().begin_reversible_command (_("add gain control point"));
XMLNode &before = audio_region()->envelope()->get_state();
if (!audio_region()->envelope_active()) {
trackview.session()->add_command (new MementoCommand<AudioRegion>(*(audio_region().get()), ®ion_before, ®ion_after));
}
- audio_region()->envelope()->add (fx, y);
+ audio_region()->envelope()->add (fx, y, with_guard_points);
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 ();
+ trackview.editor().commit_reversible_command ();
}
void
-AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent */*ev*/)
+AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent* /*ev*/)
{
ControlPoint *cp = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"));
audio_region()->envelope()->erase (cp->model());
}
-void
-AudioRegionView::setup_waveform_shape ()
-{
- WaveView::Shape shape;
-
- switch (Config->get_waveform_shape()) {
- case Rectified:
- shape = WaveView::Rectified;
- break;
- default:
- shape = WaveView::Normal;
- }
- for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
- (*wave)->set_shape (shape);
- }
-}
-
-void
-AudioRegionView::setup_waveform_scale ()
-{
- WaveView::set_global_logscaled (Config->get_waveform_scale() == Logarithmic);
-}
-
-void
-AudioRegionView::setup_waveform_clipping ()
-{
- WaveView::set_global_show_waveform_clipping (ARDOUR_UI::config()->get_show_waveform_clipping());
-}
-
GhostRegion*
AudioRegionView::add_ghost (TimeAxisView& tv)
{
}
void
-AudioRegionView::entered (bool internal_editing)
+AudioRegionView::entered ()
{
trackview.editor().set_current_trimmable (_region);
trackview.editor().set_current_movable (_region);
-
- if (gain_line) {
- /* these may or may not be visible depending on mouse mode */
- gain_line->add_visibility (AutomationLine::ControlPoints);
- }
- if (fade_in_handle && !internal_editing) {
- fade_in_handle->show ();
- fade_out_handle->show ();
- fade_out_handle->raise_to_top ();
- fade_in_handle->raise_to_top ();
+ update_envelope_visibility();
+
+ if ((trackview.editor().current_mouse_mode() == Editing::MouseObject)) {
+ if (start_xfade_rect) {
+ start_xfade_rect->set_outline (true);
+ }
+ if (end_xfade_rect) {
+ end_xfade_rect->set_outline (true);
+ }
+ if (fade_in_handle) {
+ fade_in_handle->show ();
+ fade_in_handle->raise_to_top ();
+ }
+ if (fade_out_handle) {
+ fade_out_handle->show ();
+ fade_out_handle->raise_to_top ();
+ }
+ if (fade_in_trim_handle) {
+ boost::shared_ptr<AudioRegion> ar (audio_region());
+ if (!ar->locked() && (ar->fade_in()->back()->when > 64 || (ar->can_trim() & Trimmable::FrontTrimEarlier))) {
+ fade_in_trim_handle->show ();
+ fade_in_trim_handle->raise_to_top ();
+ } else {
+ fade_in_trim_handle->hide ();
+ }
+ }
+ if (fade_out_trim_handle) {
+ boost::shared_ptr<AudioRegion> ar (audio_region());
+ if (!ar->locked() && (ar->fade_out()->back()->when > 64 || (ar->can_trim() & Trimmable::EndTrimLater))) {
+ fade_out_trim_handle->show ();
+ fade_out_trim_handle->raise_to_top ();
+ } else {
+ fade_out_trim_handle->hide ();
+ }
+ }
}
}
gain_line->remove_visibility (AutomationLine::ControlPoints);
}
- if (fade_in_handle) {
- fade_in_handle->hide ();
- fade_out_handle->hide ();
- }
+ 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); }
}
void
{
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_canvasvar_GainLine() :
- ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+ ARDOUR_UI::config()->color ("gain line") :
+ ARDOUR_UI::config()->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 = ARDOUR_UI::config()->color ("clipped waveform");
+ ArdourCanvas::Color zero = ARDOUR_UI::config()->color ("zero line");
+
if (_selected) {
if (_region->muted()) {
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), MUTED_ALPHA);
+ /* hide outline with zero alpha */
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform outline"), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform fill"), MUTED_ALPHA);
} else {
- outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
+ outline = ARDOUR_UI::config()->color ("selected waveform outline");
+ fill = ARDOUR_UI::config()->color ("selected waveform fill");
}
- fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
} else {
if (_recregion) {
- outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
+ outline = ARDOUR_UI::config()->color ("recording waveform outline");
+ fill = ARDOUR_UI::config()->color ("recording waveform fill");
} else {
if (_region->muted()) {
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA);
+ /* hide outline with zero alpha */
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform outline"), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform fill"), MUTED_ALPHA);
} else {
- outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
+ outline = ARDOUR_UI::config()->color ("waveform outline");
+ fill = ARDOUR_UI::config()->color ("waveform fill");
}
- fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
}
}
- 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 */
-
+ 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 ();
}
AudioRegionView::set_fade_visibility (bool yn)
{
if (yn) {
- if (fade_in_shape) {
- fade_in_shape->show();
- }
- if (fade_out_shape) {
- fade_out_shape->show ();
- }
- if (fade_in_handle) {
- fade_in_handle->show ();
- }
- if (fade_out_handle) {
- fade_out_handle->show ();
- }
- } else {
- if (fade_in_shape) {
- fade_in_shape->hide();
- }
- if (fade_out_shape) {
- fade_out_shape->hide ();
- }
- if (fade_in_handle) {
- fade_in_handle->hide ();
- }
- if (fade_out_handle) {
- fade_out_handle->hide ();
- }
+ if (start_xfade_curve) { start_xfade_curve->show (); }
+ if (end_xfade_curve) { end_xfade_curve->show (); }
+ if (start_xfade_rect) { start_xfade_rect->show (); }
+ if (end_xfade_rect) { end_xfade_rect->show (); }
+ } else {
+ if (start_xfade_curve) { start_xfade_curve->hide(); }
+ if (end_xfade_curve) { end_xfade_curve->hide(); }
+ 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->hide (); }
+ if (end_xfade_rect) { end_xfade_rect->hide (); }
+ if (start_xfade_rect) { start_xfade_rect->set_outline (false); }
+ if (end_xfade_rect) { end_xfade_rect->set_outline (false); }
}
}
{
RegionView::update_coverage_frames (d);
- if (fade_in_handle) {
- fade_in_handle->raise_to_top ();
- fade_out_handle->raise_to_top ();
- }
+ 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
AudioRegionView::drag_end ()
{
TimeAxisViewItem::drag_end ();
-
//see comment for drag_start
+
+ if (fade_in_handle && fade_in_handle->visible()) {
+ // lenght of region or fade changed, re-check
+ // 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();
+ }
}
void
{
if (p == "show-waveforms") {
setup_waveform_visibility ();
- } else if (p == "waveform-scale") {
- setup_waveform_scale ();
- } else if (p == "waveform-shape") {
- setup_waveform_shape ();
- } else if (p == "show-waveform-clipping") {
- setup_waveform_clipping ();
}
}
projects / ardour.git / blobdiff