X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=6ff4ff80dcf3fc383afda24bdea9be34b588d842;hb=7e1baa70e4c00d1ba797463eba3b011dff9d9262;hp=0067f21774e76b734674868064f61ce0124e2698;hpb=12d498906758dc9c5007a6e58e63b38281ad074a;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 0067f21774..6ff4ff80dc 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -46,6 +46,7 @@ #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" @@ -57,7 +58,6 @@ #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" @@ -72,17 +72,19 @@ using namespace PBD; 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 r, double spu, - Gdk::Color const & basic_color) +Cairo::RefPtr AudioRegionView::pending_peak_pattern; + +AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr 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) @@ -90,19 +92,21 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView , 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()); + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &AudioRegionView::parameter_changed)); } -AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, - Gdk::Color const & basic_color, bool recording, TimeAxisViewItem::Visibility visibility) +AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr 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) @@ -110,9 +114,10 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView , 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()); + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &AudioRegionView::parameter_changed)); } AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr other_region) @@ -121,6 +126,7 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt , 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) @@ -128,59 +134,69 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt , 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()); + ARDOUR_UI::config()->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) { + cairo_pattern_t* pat = cairo_pattern_create_radial (4.0, 4.0, 1.0, 4.0, 4.0, 4.0); + cairo_pattern_add_color_stop_rgba (pat, 0.0, 0, 0, 0, 1.0); + cairo_pattern_add_color_stop_rgba (pat, 0.6, 0, 0, 0, 0.0); + cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT); + Cairo::RefPtr p (new Cairo::Pattern (pat, false)); + pending_peak_pattern = p; + } - _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 (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 (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 (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 (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 (ARDOUR_UI::config()->color ("inactive fade handle")); fade_out_trim_handle->set_data ("regionview", this); fade_out_trim_handle->hide (); } @@ -238,6 +254,8 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) setup_waveform_visibility (); + pending_peak_data->raise_to_top (); + if (frame_handle_start) { frame_handle_start->raise_to_top (); } @@ -257,6 +275,7 @@ AudioRegionView::~AudioRegionView () for (vector::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) { delete *i; } + _data_ready_connections.clear (); for (list >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { delete ((*i).second); @@ -321,7 +340,7 @@ AudioRegionView::fade_in_active_changed () 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 (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade")); start_xfade_rect->set_fill (true); } } @@ -334,7 +353,7 @@ AudioRegionView::fade_out_active_changed () 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()); + end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade")); end_xfade_rect->set_fill (true); } } @@ -412,7 +431,9 @@ AudioRegionView::reset_width_dependent_items (double pixel_width) 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(); } @@ -480,22 +501,27 @@ void AudioRegionView::set_height (gdouble height) { RegionView::set_height (height); + pending_peak_data->set_y1 (height); uint32_t wcnt = waves.size(); - for (uint32_t n = 0; n < wcnt; ++n) { - gdouble ht; + if (wcnt > 0) { - if (height < NAME_HIGHLIGHT_THRESH) { - ht = ((height - 2 * wcnt) / (double) wcnt); + gdouble ht; + + if (!ARDOUR_UI::config()->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; + } + + for (uint32_t n = 0; n < wcnt; ++n) { + + gdouble yoff = floor (ht * n); + + waves[n]->set_height (ht); + waves[n]->set_y_position (yoff); } - - gdouble yoff = n * (ht + 1); - - waves[n]->set_height (ht); - waves[n]->set_y_position (yoff + 2); } if (gain_line) { @@ -560,7 +586,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f 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 */ @@ -574,7 +600,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f if (fade_in_handle->visible()) { //see comment for drag_start - entered(false); + entered(); } if (pwidth < 5) { @@ -598,18 +624,16 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f /* points *MUST* be in anti-clockwise order */ Points points; - Points::size_type npoints; Points::size_type pi; boost::shared_ptr 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 */ @@ -640,19 +664,20 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, 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); @@ -660,7 +685,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, if (fade_out_handle->visible()) { //see comment for drag_start - entered(false); + entered(); } /* don't show shape if its too small */ @@ -676,27 +701,25 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, double effective_height; - if (_height >= NAME_HIGHLIGHT_THRESH) { - effective_height = _height - NAME_HIGHLIGHT_SIZE; - } else { - effective_height = _height; + effective_height = _height; + + 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 npoints; Points::size_type pi; boost::shared_ptr 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 */ @@ -746,18 +769,16 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame 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 (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_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + 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->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); } @@ -802,8 +823,8 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame 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)); } } @@ -837,24 +858,22 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn 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 (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_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + 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->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 */ @@ -892,14 +911,13 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn 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)); } } @@ -972,7 +990,7 @@ AudioRegionView::set_samples_per_pixel (gdouble fpp) { 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); } @@ -993,16 +1011,6 @@ AudioRegionView::set_amplitude_above_axis (gdouble a) } } -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 () { @@ -1010,33 +1018,33 @@ 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_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 (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha")); + start_xfade_curve->set_outline_color (ARDOUR_UI::config()->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 (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_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + start_xfade_rect->set_outline_color (ARDOUR_UI::config()->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 (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. @@ -1073,10 +1081,14 @@ AudioRegionView::update_envelope_visibility () 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 (ARDOUR_UI::config()->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)); } } @@ -1126,6 +1138,7 @@ 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 { @@ -1141,17 +1154,31 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) { //cerr << "AudioRegionView::create_one_wave() called which: " << which << " this: " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast(&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; + /* reduce waveview height by 2.0 to account for our frame */ + if (trackview.current_height() < NAME_HIGHLIGHT_THRESH) { - ht = ((trackview.current_height()) / (double) nchans); + ht = ((trackview.current_height() - 2.0) / (double) nchans); } else { - ht = ((trackview.current_height() - NAME_HIGHLIGHT_SIZE) / (double) nchans); + ht = ((trackview.current_height() - NAME_HIGHLIGHT_SIZE - 2.0) / (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 ()); @@ -1162,8 +1189,12 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->set_height (ht); wave->set_samples_per_pixel (samples_per_pixel); wave->set_show_zero_line (true); + wave->set_clip_level (ARDOUR_UI::config()->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 (Config->get_waveform_shape()) { + switch (ARDOUR_UI::config()->get_waveform_shape()) { case Rectified: wave->set_shape (WaveView::Rectified); break; @@ -1171,9 +1202,13 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->set_shape (WaveView::Normal); } - wave->set_logscaled (Config->get_waveform_scale() == Logarithmic); + wave->set_logscaled (ARDOUR_UI::config()->get_waveform_scale() == Logarithmic); - if (!Config->get_show_waveforms ()) { + vector v; + v.push_back (wave); + set_some_waveform_colors (v); + + if (!ARDOUR_UI::config()->get_show_waveforms ()) { wave->hide(); } @@ -1204,10 +1239,13 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) 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 (); } + + /* channel wave created, don't hook into peaks ready anymore */ + delete _data_ready_connections[which]; + _data_ready_connections[which] = 0; } void @@ -1253,7 +1291,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b 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()) { @@ -1263,11 +1301,11 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b trackview.session()->add_command (new MementoCommand(*(audio_region().get()), ®ion_before, ®ion_after)); } - audio_region()->envelope()->add (fx, y, with_guard_points); + audio_region()->envelope()->editor_add (fx, y, with_guard_points); XMLNode &after = audio_region()->envelope()->get_state(); trackview.session()->add_command (new MementoCommand(*audio_region()->envelope().get(), &before, &after)); - trackview.session()->commit_reversible_command (); + trackview.editor().commit_reversible_command (); } void @@ -1314,17 +1352,14 @@ 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 (!internal_editing) { + update_envelope_visibility(); + + if ((trackview.editor().current_mouse_mode() == Editing::MouseObject)) { if (start_xfade_rect) { start_xfade_rect->set_outline (true); } @@ -1357,6 +1392,13 @@ AudioRegionView::entered (bool internal_editing) 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); } } } @@ -1366,9 +1408,9 @@ AudioRegionView::exited () trackview.editor().set_current_trimmable (boost::shared_ptr()); trackview.editor().set_current_movable (boost::shared_ptr()); - 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(); } @@ -1383,8 +1425,8 @@ 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()); + ARDOUR_UI::config()->color ("gain line") : + ARDOUR_UI::config()->color_mod ("gain line inactive", "gain line inactive")); update_envelope_visibility (); } } @@ -1407,64 +1449,48 @@ AudioRegionView::color_handler () void AudioRegionView::set_waveform_colors () { - for (vector::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& 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()) { /* 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(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(); - fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(); + outline = ARDOUR_UI::config()->color ("selected waveform outline"); + fill = ARDOUR_UI::config()->color ("selected waveform fill"); } } 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()) { /* 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(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(); - fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill(); + outline = ARDOUR_UI::config()->color ("waveform outline"); + fill = ARDOUR_UI::config()->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::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 @@ -1474,13 +1500,7 @@ AudioRegionView::set_frame_color () return; } - if (_region->opaque()) { - fill_opacity = 130; - } else { - fill_opacity = 0; - } - - TimeAxisViewItem::set_frame_color (); + RegionView::set_frame_color (); set_waveform_colors (); } @@ -1652,7 +1672,7 @@ AudioRegionView::drag_end () // 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(); } }