#include "canvas/poly_line.h"
#include "canvas/line.h"
#include "canvas/text.h"
-#include "canvas/curve.h"
+#include "canvas/xfade_curve.h"
#include "canvas/debug.h"
#include "canvas/utils.h"
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)
, sync_mark(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());
}
, sync_mark(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());
}
: RegionView (other, boost::shared_ptr<Region> (other_region))
, 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;
fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
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_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_data ("regionview", this);
+ fade_out_trim_handle->hide ();
}
setup_fade_handle_positions ();
reset_width_dependent_items (_pixel_width);
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));
}
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 ();
{
if (start_xfade_rect) {
if (audio_region()->fade_in_active()) {
- start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ start_xfade_rect->set_fill (false);
} else {
start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade());
+ start_xfade_rect->set_fill (true);
}
}
}
{
if (end_xfade_rect) {
if (audio_region()->fade_out_active()) {
- end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
+ end_xfade_rect->set_fill (false);
} else {
end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade());
+ 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 <= 6.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();
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(false);
+ }
+
if (pwidth < 5) {
hide_start_xfade();
return;
/* 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());
}
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);
- double const pwidth = trackview.editor().sample_to_pixel (width);
+ 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 = trackview.editor().sample_to_pixel (_region->length()) + TimeAxisViewItem::RIGHT_EDGE_SHIFT - pwidth;
+ 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);
/* 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);
+ fade_out_handle->set_x0 (1 + handle_right - handle_size);
+ fade_out_handle->set_x1 (1 + 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);
+ }
/* don't show shape if its too small */
if (pwidth < 5) {
/* 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());
return;
}
- if (!start_xfade_in) {
- start_xfade_in = new ArdourCanvas::Curve (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);
- start_xfade_in->set_ignore_events (true);
+ 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_ignore_events (true);
}
-
- if (!start_xfade_out) {
- start_xfade_out = new ArdourCanvas::Curve (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);
- start_xfade_out->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()->get_canvasvar_CrossfadeLine());
+ 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);
}
- start_xfade_rect->set (ArdourCanvas::Rect (1.0, 0.0, rect_width, effective_height));
-
- start_xfade_in->set (points);
+ start_xfade_rect->set (ArdourCanvas::Rect (0.0, 0.0, rect_width, effective_height));
/* fade out line */
}
}
- start_xfade_out->set (ipoints);
+ start_xfade_curve->set_inout (points, ipoints);
show_start_xfade();
}
return;
}
- if (!end_xfade_in) {
- end_xfade_in = new ArdourCanvas::Curve (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);
- end_xfade_in->set_ignore_events (true);
-}
-
- if (!end_xfade_out) {
- end_xfade_out = new ArdourCanvas::Curve (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);
- end_xfade_out->set_ignore_events (true);
+ 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_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()->get_canvasvar_CrossfadeLine());
+ 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_in->set (points);
-
/* fade in line */
boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_out ();
}
}
- end_xfade_out->set (ipoints);
+ 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 ();
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 (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());
}
- if (end_xfade_in) {
- end_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
- }
- 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()->get_canvasvar_ActiveCrossfade());
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
}
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()->get_canvasvar_CrossfadeLine());
}
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()->get_canvasvar_CrossfadeLine());
}
}
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)
{
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 ();
+ if (!internal_editing) {
+ 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
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.
- */
- }
}
wave->set_fill_color (fill);
AudioRegionView::set_fade_visibility (bool yn)
{
if (yn) {
- if (fade_in_handle) {
- fade_in_handle->show ();
- }
- if (fade_out_handle) {
- fade_out_handle->show ();
- }
- } else {
- 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(false);
+ }
}
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