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)
+ uint32_t basic_color)
: RegionView (parent, tv, r, spu, basic_color)
, sync_mark(0)
, fade_in_handle(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)
+ 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)
, 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());
}
, 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 ();
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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
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 ();
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();
if (name_text) {
name_text->raise_to_top();
}
+
+ setup_fade_handle_positions();
}
void
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());
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());
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_fill (false);
- start_xfade_rect->set_outline (true);
+ 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 (0.0, 0.0, rect_width + TimeAxisViewItem::RIGHT_EDGE_SHIFT, effective_height));
+ start_xfade_rect->set (ArdourCanvas::Rect (0.0, 0.0, rect_width, effective_height));
/* fade out line */
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_fill (false);
- end_xfade_rect->set_outline (true);
+ 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);
}
}
-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 ()
{
wave->set_height (ht);
wave->set_samples_per_pixel (samples_per_pixel);
wave->set_show_zero_line (true);
+ wave->set_clip_level (Config->get_waveform_clip_level ());
switch (Config->get_waveform_shape()) {
case Rectified:
}
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 ();
fade_out_handle->raise_to_top ();
}
if (fade_in_trim_handle) {
- fade_in_trim_handle->show ();
- fade_in_trim_handle->raise_to_top ();
+ 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) {
- fade_out_trim_handle->show ();
- fade_out_trim_handle->raise_to_top ();
+ 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 ();
+ }
}
}
}
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
void
AudioRegionView::set_waveform_colors ()
-{
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
- set_one_waveform_color (*w);
- }
-}
-
-void
-AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
-
+ ArdourCanvas::Color clip = ARDOUR_UI::config()->get_canvasvar_WaveFormClip();
+ ArdourCanvas::Color zero = ARDOUR_UI::config()->get_canvasvar_ZeroLine();
+
if (_selected) {
if (_region->muted()) {
/* hide outline with zero alpha */
} else {
outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
+
+ 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
+ */
+ fill = UINT_RGBA_CHANGE_A (fill, 217);
+ }
}
} else {
if (_recregion) {
} else {
outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
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
+ */
+ fill = UINT_RGBA_CHANGE_A (fill, 217);
+ }
}
}
}
- 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.begin(); w != waves.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_handle) { fade_in_handle->show(); }
- if (fade_out_handle) { fade_out_handle->show(); }
- if (fade_in_trim_handle) { fade_in_trim_handle->show(); }
- if (fade_out_trim_handle) { fade_out_trim_handle->show(); }
- } else {
+ 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); }
}
}
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
projects / ardour.git / blobdiff