X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=408c8e654abe7ce19057409d20a030fd089c402c;hb=7022456b4fc49bbef6a0f308f6f6557d659eff52;hp=bfce754b706473b14e0b2b2b8135aeb7610b6ddb;hpb=31d234b48c36bddb4d5228a3abee9c4419403879;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index bfce754b70..408c8e654a 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -42,7 +43,9 @@ #include "canvas/poly_line.h" #include "canvas/line.h" #include "canvas/text.h" +#include "canvas/curve.h" #include "canvas/debug.h" +#include "canvas/utils.h" #include "streamview.h" #include "audio_region_view.h" @@ -61,7 +64,7 @@ #include "i18n.h" -#define MUTED_ALPHA 10 +#define MUTED_ALPHA 48 using namespace std; using namespace ARDOUR; @@ -76,8 +79,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView Gdk::Color const & 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) @@ -98,8 +99,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView Gdk::Color const & 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) @@ -118,8 +117,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr other_region) : RegionView (other, boost::shared_ptr (other_region)) - , fade_in_shape(0) - , fade_out_shape(0) , fade_in_handle(0) , fade_out_handle(0) , start_xfade_in (0) @@ -158,30 +155,20 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) create_waves (); - fade_in_shape = new ArdourCanvas::Polygon (group); - CANVAS_DEBUG_NAME (fade_in_shape, string_compose ("fade in shape for %1", region()->name())); - fade_in_shape->set_fill_color (fade_color); - fade_in_shape->set_data ("regionview", this); - - fade_out_shape = new ArdourCanvas::Polygon (group); - CANVAS_DEBUG_NAME (fade_out_shape, string_compose ("fade out shape for %1", region()->name())); - fade_out_shape->set_fill_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_fill_color (UINT_RGBA_CHANGE_A (fill_color, 0)); - fade_in_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 0)); - + 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_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_fill_color (UINT_RGBA_CHANGE_A (fill_color, 0)); - fade_out_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 0)); - + 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_data ("regionview", this); + fade_out_handle->hide (); } setup_fade_handle_positions (); @@ -217,13 +204,10 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) 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_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)); } @@ -232,10 +216,13 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) setup_waveform_visibility (); setup_waveform_shape (); - setup_waveform_scale (); - frame_handle_start->raise_to_top (); - frame_handle_end->raise_to_top (); + if (frame_handle_start) { + frame_handle_start->raise_to_top (); + } + if (frame_handle_end) { + frame_handle_end->raise_to_top (); + } /* XXX sync mark drag? */ } @@ -309,24 +296,24 @@ AudioRegionView::fade_out_changed () void AudioRegionView::fade_in_active_changed () { - if (audio_region()->fade_in_active()) { - /* XXX: make a themable colour */ - fade_in_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 90)); - } else { - /* XXX: make a themable colour */ - fade_in_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 20)); + if (start_xfade_rect) { + if (audio_region()->fade_in_active()) { + start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade()); + } else { + start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade()); + } } } void AudioRegionView::fade_out_active_changed () { - if (audio_region()->fade_out_active()) { - /* XXX: make a themable colour */ - fade_out_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 90)); - } else { - /* XXX: make a themable colour */ - fade_out_shape->set_fill_color (RGBA_TO_UINT (45, 45, 45, 20)); + if (end_xfade_rect) { + if (audio_region()->fade_out_active()) { + end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade()); + } else { + end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade()); + } } } @@ -406,10 +393,9 @@ AudioRegionView::reset_width_dependent_items (double pixel_width) 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(); + } else { + //fade_in_handle->show(); + //fade_out_handle->show(); } } @@ -445,7 +431,7 @@ void AudioRegionView::setup_fade_handle_positions() { /* position of fade handle offset from the top of the region view */ - double const handle_pos = 2; + double const handle_pos = 0.0; if (fade_in_handle) { fade_in_handle->set_y0 (handle_pos); @@ -500,8 +486,13 @@ AudioRegionView::set_height (gdouble height) float pos_x = trackview.editor().sample_to_pixel((*l).first); - (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0), - ArdourCanvas::Duple (pos_x, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + if (height >= NAME_HIGHLIGHT_THRESH) { + (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0), + ArdourCanvas::Duple (pos_x, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + } else { + (*l).second->set (ArdourCanvas::Duple (pos_x, 2.0), + ArdourCanvas::Duple (pos_x, _height - 1)); + } } if (name_text) { @@ -529,8 +520,6 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f return; } - fade_in_handle->show (); - /* smallest size for a fade is 64 frames */ width = std::max ((framecnt_t) 64, width); @@ -545,71 +534,47 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f 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 - 2; + 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 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 (pi = 0, pc = 0; pc < npoints; ++pc) { - points[pi].x = 1 + (pc * xdelta); - points[pi++].y = 2 + (effective_height - (curve[pc] * effective_height)); + 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); - - /* add 3 more points */ - - points.push_back (Duple()); - points.push_back (Duple()); - points.push_back (Duple()); - - /* fold back */ - - points[pi].x = pwidth; - points[pi].y = 2; - pi++; - - points[pi].x = 1; - points[pi].y = 2; - pi++; - - /* connect the dots ... */ - - points[pi] = points[0]; - - fade_in_shape->set (points); + redraw_start_xfade_to (ar, width, points, effective_height, handle_left); /* ensure trim handle stays on top */ if (frame_handle_start) { frame_handle_start->raise_to_top(); } - } void @@ -625,16 +590,17 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, return; } - fade_out_handle->show (); - /* smallest size for a fade is 64 frames */ 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 = trackview.editor().sample_to_pixel (width); - double const handle_right = (_region->length() / samples_per_pixel) - pwidth; + /* 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; /* Put the fade out handle so that its right side is at the end-of-fade line; */ @@ -645,73 +611,47 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, 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); if (_height >= NAME_HIGHLIGHT_THRESH) { - effective_height = _height - NAME_HIGHLIGHT_SIZE - 2; + effective_height = _height - NAME_HIGHLIGHT_SIZE; } else { - effective_height = _height - 2; + effective_height = _height; } /* 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(); - uint32_t pi, pc; - double xdelta = pwidth/npoints; + points.assign (list->size(), Duple()); - points.assign (npoints, Duple ()); - - for (pi = 0, pc = 0; pc < npoints; ++pc, ++pi) { - points[pi].x = _pixel_width - pwidth + (pc * xdelta); - points[pi].y = 2 + (effective_height - (curve[pc] * effective_height)); + 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); } /* draw the line */ - redraw_end_xfade_to (ar, width, points, effective_height); - - /* fill the polygon*/ - - /* add 3 more points */ - - points.push_back (Duple()); - points.push_back (Duple()); - points.push_back (Duple()); - - /* fold back */ - - points[pi].x = _pixel_width; - points[pi].y = effective_height; - pi++; - - points[pi].x = _pixel_width; - points[pi].y = 2; - pi++; - - /* connect the dots ... */ - - points[pi] = points[0]; - - 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 @@ -741,25 +681,28 @@ AudioRegionView::redraw_start_xfade () } void -AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, framecnt_t /*width*/, Points& points, double effective_height) +AudioRegionView::redraw_start_xfade_to (boost::shared_ptr 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); + 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_out) { - start_xfade_out = new ArdourCanvas::PolyLine (group); + 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) { @@ -772,42 +715,54 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame start_xfade_rect->set_data ("regionview", this); } - start_xfade_rect->set (ArdourCanvas::Rect (points.front().x, 1.0, points.back().x, effective_height)); - start_xfade_rect->show (); + start_xfade_rect->set (ArdourCanvas::Rect (1.0, 0.0, rect_width, effective_height)); start_xfade_in->set (points); - start_xfade_in->show (); /* fade out line */ - boost::shared_ptr inverse = ar->inverse_fade_in(); + boost::shared_ptr inverse = ar->inverse_fade_in (); Points ipoints; - Points::size_type npoints = points.size(); - - ipoints.assign (npoints, Duple()); + Points::size_type npoints; if (!inverse) { + /* 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 = i; + /* leave x-axis alone but invert with respect to y-axis */ p.y = 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 = i; - p.y = 1.0 + 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 = 1.0 + (rect_width * ((*x)->when/length)); + p.y = effective_height - ((*x)->value * effective_height); } } start_xfade_out->set (ipoints); - start_xfade_out->show (); show_start_xfade(); } @@ -827,25 +782,28 @@ AudioRegionView::redraw_end_xfade () } void -AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecnt_t width, Points& points, double effective_height) +AudioRegionView::redraw_end_xfade_to (boost::shared_ptr 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); + 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_outline_width (1.5); + end_xfade_in->set_ignore_events (true); +} if (!end_xfade_out) { - end_xfade_out = new ArdourCanvas::PolyLine (group); + 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_rect) { @@ -858,52 +816,58 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn end_xfade_rect->set_data ("regionview", this); } - end_xfade_rect->set (ArdourCanvas::Rect (points.front().x, 1.0, points.back().x, effective_height)); - end_xfade_rect->show (); + 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); - end_xfade_in->show (); - end_xfade_in->raise_to_top (); /* fade in line */ boost::shared_ptr 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 = rend + i; p.y = effective_height - points[pci].y; } } else { - boost::scoped_array 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 = rend + i; - p.y = 1.0 + 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 = 1.0 + (rect_width * ((*x)->when/length)) + rend; + p.y = 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 show_end_xfade(); } @@ -1179,20 +1143,8 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->set_y_position (yoff); wave->set_height (ht); wave->set_samples_per_pixel (samples_per_pixel); - - if (_recregion) { - wave->set_outline_color (_region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_RecWaveForm(), MUTED_ALPHA) : ARDOUR_UI::config()->get_canvasvar_RecWaveForm()); - wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill()); - } else { - wave->set_outline_color (_region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA) : ARDOUR_UI::config()->get_canvasvar_WaveForm()); - wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_WaveFormFill()); - } - - wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip()); - wave->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine()); - // CAIROCANVAS - // wave->property_zero_line() = true; - + wave->set_show_zero_line (true); + switch (Config->get_waveform_shape()) { case Rectified: wave->set_shape (WaveView::Rectified); @@ -1248,7 +1200,7 @@ AudioRegionView::peaks_ready_handler (uint32_t which) } 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; @@ -1293,7 +1245,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) trackview.session()->add_command (new MementoCommand(*(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(*audio_region()->envelope().get(), &before, &after)); @@ -1301,7 +1253,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) } 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 (item->get_data ("control_point")); audio_region()->envelope()->erase (cp->model()); @@ -1327,11 +1279,14 @@ AudioRegionView::setup_waveform_shape () void AudioRegionView::setup_waveform_scale () { - for (vector::iterator wave = waves.begin(); wave != waves.end() ; ++wave) { - (*wave)->set_logscaled (Config->get_waveform_scale() == Logarithmic); - } + 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) @@ -1375,15 +1330,16 @@ AudioRegionView::entered (bool internal_editing) trackview.editor().set_current_trimmable (_region); trackview.editor().set_current_movable (_region); - if (gain_line && trackview.editor().current_mouse_mode() == Editing::MouseGain) { + 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->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255)); - fade_in_handle->set_fill_color (UINT_RGBA_CHANGE_A (fade_color, 255)); - fade_out_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255)); - fade_out_handle->set_fill_color (UINT_RGBA_CHANGE_A (fade_color, 255)); + fade_in_handle->show (); + fade_out_handle->show (); + fade_out_handle->raise_to_top (); + fade_in_handle->raise_to_top (); } } @@ -1393,15 +1349,13 @@ AudioRegionView::exited () trackview.editor().set_current_trimmable (boost::shared_ptr()); trackview.editor().set_current_movable (boost::shared_ptr()); - if (gain_line && trackview.editor().current_mouse_mode() == Editing::MouseGain) { + if (gain_line) { gain_line->remove_visibility (AutomationLine::ControlPoints); } if (fade_in_handle) { - fade_in_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 0)); - fade_in_handle->set_fill_color (UINT_RGBA_CHANGE_A (fade_color, 0)); - fade_out_handle->set_outline_color (RGBA_TO_UINT (0, 0, 0, 0)); - fade_out_handle->set_fill_color (UINT_RGBA_CHANGE_A (fade_color, 0)); + fade_in_handle->hide (); + fade_out_handle->hide (); } } @@ -1412,6 +1366,7 @@ AudioRegionView::envelope_active_changed () gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->get_canvasvar_GainLine() : ARDOUR_UI::config()->get_canvasvar_GainLineInactive()); + update_envelope_visibility (); } } @@ -1433,42 +1388,58 @@ AudioRegionView::color_handler () void AudioRegionView::set_waveform_colors () { - ArdourCanvas::Color fill, outline, clip, zero; + for (vector::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; if (_selected) { - if (_region->muted()) { - outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), MUTED_ALPHA); - } else { - outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(); - } - fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(); + 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); + } else { + outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(); + fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(); + } } else { if (_recregion) { - if (_region->muted()) { - outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_RecWaveForm(), MUTED_ALPHA); - } else { - outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm(); - } - fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill(); + outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm(); + fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill(); } else { - if (_region->muted()) { - outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA); - } else { - outline = ARDOUR_UI::config()->get_canvasvar_WaveForm(); - } - fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill(); + 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); + } else { + outline = ARDOUR_UI::config()->get_canvasvar_WaveForm(); + fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill(); + } } } - clip = ARDOUR_UI::config()->get_canvasvar_WaveFormClip(); - zero = ARDOUR_UI::config()->get_canvasvar_ZeroLine(); + if (ARDOUR_UI::config()->get_color_regions_using_track_color()) { - for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { - (*w)->set_outline_color (outline); - (*w)->set_fill_color (fill); - (*w)->set_clip_color (clip); - (*w)->set_zero_color (zero); + /* 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(); } + + 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 @@ -1493,12 +1464,6 @@ void 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 (); } @@ -1506,12 +1471,6 @@ AudioRegionView::set_fade_visibility (bool yn) 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 (); } @@ -1556,12 +1515,6 @@ AudioRegionView::transients_changed () canvas_item->set (ArdourCanvas::Duple (-1.0, 2.0), ArdourCanvas::Duple (1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); - canvas_item->property_first_arrowhead() = TRUE; - canvas_item->property_last_arrowhead() = TRUE; - canvas_item->property_arrow_shape_a() = 11.0; - canvas_item->property_arrow_shape_b() = 0.0; - canvas_item->property_arrow_shape_c() = 4.0; - canvas_item->raise_to_top (); canvas_item->show (); @@ -1678,5 +1631,7 @@ AudioRegionView::parameter_changed (string const & p) setup_waveform_scale (); } else if (p == "waveform-shape") { setup_waveform_shape (); + } else if (p == "show-waveform-clipping") { + setup_waveform_clipping (); } }