X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=028a3c3b48f8e684708aed5a4d18446f0f85bd32;hb=75b933eadbe8f90a73a29bb207ff26eebcd4121a;hp=593e2cbf0a915436075f99a77b3edf9a6f14a13c;hpb=ec102f94e1105a6c9f445a0cde6c2dd1b6ea4b8b;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 593e2cbf0a..028a3c3b48 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,6 +43,8 @@ #include "canvas/poly_line.h" #include "canvas/line.h" #include "canvas/text.h" +#include "canvas/debug.h" +#include "canvas/utils.h" #include "streamview.h" #include "audio_region_view.h" @@ -69,7 +72,7 @@ using namespace Editing; using namespace ArdourCanvas; static const int32_t sync_mark_width = 9; -static double const handle_size = 6; /* height of fade handles */ +static double const handle_size = 15; /* height of fade handles */ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, Gdk::Color const & basic_color) @@ -158,21 +161,25 @@ 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_data ("regionview", this); 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)); @@ -227,7 +234,13 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) setup_waveform_visibility (); setup_waveform_shape (); - setup_waveform_scale (); + + if (frame_handle_start) { + frame_handle_start->raise_to_top (); + } + if (frame_handle_end) { + frame_handle_end->raise_to_top (); + } /* XXX sync mark drag? */ } @@ -360,10 +373,9 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) interesting_stuff.add (ARDOUR::Properties::length); if (what_changed.contains (interesting_stuff)) { - + for (uint32_t n = 0; n < waves.size(); ++n) { waves[n]->region_resized (); - waves[n]->set_region_start (region()->start ()); } for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { @@ -371,7 +383,6 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { (*w)->region_resized (); - (*w)->set_region_start (region()->start ()); } } } @@ -432,14 +443,7 @@ void AudioRegionView::region_muted () { RegionView::region_muted(); - - for (uint32_t n=0; n < waves.size(); ++n) { - if (_region->muted()) { - waves[n]->set_outline_color (UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA)); - } else { - waves[n]->set_outline_color (ARDOUR_UI::config()->get_canvasvar_WaveForm()); - } - } + set_waveform_colors (); } void @@ -536,18 +540,13 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f width = std::max ((framecnt_t) 64, width); - Points* points; - /* round here to prevent little visual glitches with sub-pixel placement */ double const pwidth = rint (width / samples_per_pixel); - uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); - double h; - - double const handle_center = pwidth; + double const handle_left = pwidth; /* Put the fade in handle so that its left side is at the end-of-fade line */ - fade_in_handle->set_x0 (handle_center); - fade_in_handle->set_x1 (handle_center + handle_size); + fade_in_handle->set_x0 (handle_left); + fade_in_handle->set_x1 (handle_left + handle_size); if (pwidth < 5) { hide_start_xfade(); @@ -559,43 +558,57 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, f fade_in_shape->show(); } - float curve[npoints]; - audio_region()->fade_in()->curve().get_vector (0, audio_region()->fade_in()->back()->when, curve, npoints); + uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); + double effective_height; + std::vector curve(npoints); - points = get_canvas_points ("fade in shape", npoints + 3); + audio_region()->fade_in()->curve().get_vector (0, audio_region()->fade_in()->back()->when, &curve[0], npoints); if (_height >= NAME_HIGHLIGHT_THRESH) { - h = _height - NAME_HIGHLIGHT_SIZE - 2; + effective_height = _height - NAME_HIGHLIGHT_SIZE - 2; } else { - h = _height - 2; + effective_height = _height - 2; } + Points points; + + points.assign (npoints, Duple()); + /* points *MUST* be in anti-clockwise order */ uint32_t pi, pc; double xdelta = pwidth/npoints; for (pi = 0, pc = 0; pc < npoints; ++pc) { - (*points)[pi].x = 1 + (pc * xdelta); - (*points)[pi++].y = 2 + (h - (curve[pc] * h)); + points[pi].x = 1 + (pc * xdelta); + points[pi++].y = 2 + (effective_height - (curve[pc] * 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; + points[pi].x = pwidth; + points[pi].y = 2; + pi++; - (*points)[pi].x = 1; - (*points)[pi++].y = 2; + points[pi].x = 1; + points[pi].y = 2; + pi++; /* connect the dots ... */ - (*points)[pi] = (*points)[0]; + points[pi] = points[0]; - fade_in_shape->set (*points); - delete points; - - redraw_start_xfade_to ( ar, width); + fade_in_shape->set (points); /* ensure trim handle stays on top */ if (frame_handle_start) { @@ -623,20 +636,15 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, width = std::max ((framecnt_t) 64, width); - Points* points; - /* round here to prevent little visual glitches with sub-pixel placement */ double const pwidth = rint (width / samples_per_pixel); - uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); - double h; - double const handle_center = (_region->length() - width) / samples_per_pixel; + double const handle_right = (_region->length() / samples_per_pixel) - pwidth; /* Put the fade out handle so that its right side is at the end-of-fade line; - * it's `one out' for precise pixel accuracy. */ - fade_out_handle->set_x0 (handle_center - 5); - fade_out_handle->set_x1 (handle_center + 1); + fade_out_handle->set_x0 (handle_right - handle_size); + fade_out_handle->set_x1 (handle_right); /* don't show shape if its too small */ @@ -650,43 +658,59 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, fade_out_shape->show(); } - float curve[npoints]; - audio_region()->fade_out()->curve().get_vector (0, audio_region()->fade_out()->back()->when, curve, npoints); + uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); + double effective_height; + std::vector curve(npoints); + + audio_region()->fade_out()->curve().get_vector (0, audio_region()->fade_out()->back()->when, &curve[0], npoints); if (_height >= NAME_HIGHLIGHT_THRESH) { - h = _height - NAME_HIGHLIGHT_SIZE - 2; + effective_height = _height - NAME_HIGHLIGHT_SIZE - 2; } else { - h = _height - 2; + effective_height = _height - 2; } /* points *MUST* be in anti-clockwise order */ - points = get_canvas_points ("fade out shape", npoints + 3); + Points points; uint32_t pi, pc; double xdelta = pwidth/npoints; - for (pi = 0, pc = 0; pc < npoints; ++pc) { - (*points)[pi].x = _pixel_width - pwidth + (pc * xdelta); - (*points)[pi++].y = 2 + (h - (curve[pc] * h)); + 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)); } + /* 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 = h; + points[pi].x = _pixel_width; + points[pi].y = effective_height; + pi++; - (*points)[pi].x = _pixel_width; - (*points)[pi++].y = 2; + points[pi].x = _pixel_width; + points[pi].y = 2; + pi++; /* connect the dots ... */ - (*points)[pi] = (*points)[0]; - - fade_out_shape->set (*points); - delete points; + points[pi] = points[0]; - redraw_end_xfade_to (ar, width); + fade_out_shape->set (points); /* ensure trim handle stays on top */ if (frame_handle_end) { @@ -709,219 +733,472 @@ AudioRegionView::get_fade_out_shape_width () void -AudioRegionView::set_samples_per_pixel (gdouble fpp) +AudioRegionView::redraw_start_xfade () { - RegionView::set_samples_per_pixel (fpp); - - if (Config->get_show_waveforms ()) { - for (uint32_t n = 0; n < waves.size(); ++n) { - waves[n]->set_samples_per_pixel (fpp); - } - } + boost::shared_ptr ar (audio_region()); - if (gain_line) { - gain_line->reset (); + if (!ar->fade_in() || ar->fade_in()->empty()) { + return; } - reset_fade_shapes (); + show_start_xfade(); + reset_fade_in_shape_width (ar, ar->fade_in()->back()->when); } void -AudioRegionView::set_amplitude_above_axis (gdouble a) +AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, framecnt_t /*width*/, Points& points, double effective_height) { - for (uint32_t n=0; n < waves.size(); ++n) { - waves[n]->set_amplitude_above_axis (a); + if (points.size() < 3) { + return; } -} -void -AudioRegionView::compute_colors (Gdk::Color const & basic_color) -{ - RegionView::compute_colors (basic_color); + if (!start_xfade_in) { + start_xfade_in = new ArdourCanvas::PolyLine (group); + CANVAS_DEBUG_NAME (start_xfade_in, string_compose ("xfade start in line for %1", region()->name())); + start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + start_xfade_in->set_outline_width (1.5); + } - /* gain color computed in envelope_active_changed() */ + if (!start_xfade_out) { + start_xfade_out = new ArdourCanvas::PolyLine (group); + CANVAS_DEBUG_NAME (start_xfade_out, string_compose ("xfade start out line for %1", region()->name())); + uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128); + start_xfade_out->set_outline_color (col); + start_xfade_out->set_outline_width (2.0); + } - fade_color = UINT_RGBA_CHANGE_A (fill_color, 120); -} + 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 (false); + start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this)); + start_xfade_rect->set_data ("regionview", this); + } -void -AudioRegionView::set_colors () -{ - RegionView::set_colors(); + start_xfade_rect->set (ArdourCanvas::Rect (points.front().x, 1.0, points.back().x, effective_height)); + start_xfade_rect->show (); - if (gain_line) { - gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->get_canvasvar_GainLine() : ARDOUR_UI::config()->get_canvasvar_GainLineInactive()); - } + start_xfade_in->set (points); + start_xfade_in->show (); - for (uint32_t n=0; n < waves.size(); ++n) { - if (_region->muted()) { - waves[n]->set_outline_color (UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA)); - } else { - waves[n]->set_outline_color (ARDOUR_UI::config()->get_canvasvar_WaveForm()); - } + /* fade out line */ - waves[n]->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip()); - waves[n]->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine()); - } -} + boost::shared_ptr inverse = ar->inverse_fade_in(); + Points ipoints; + Points::size_type npoints = points.size(); -void -AudioRegionView::setup_waveform_visibility () -{ - if (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. - */ - // CAIROCANVAS - // waves[n]->set_samples_per_pixel (_samples_per_pixel); - waves[n]->show(); + ipoints.assign (npoints, Duple()); + + if (!inverse) { + + for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) { + ArdourCanvas::Duple &p (ipoints[pci]); + p.x = i; + p.y = effective_height - points[pci].y; } + } else { - for (uint32_t n = 0; n < waves.size(); ++n) { - waves[n]->hide(); + + std::vector vec(npoints); + inverse->curve().get_vector (0, inverse->back()->when, &vec[0], npoints); + + 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]); } } -} -void -AudioRegionView::temporarily_hide_envelope () -{ - if (gain_line) { - gain_line->hide (); - } -} + start_xfade_out->set (ipoints); + start_xfade_out->show (); -void -AudioRegionView::unhide_envelope () -{ - update_envelope_visibility (); + show_start_xfade(); } void -AudioRegionView::update_envelope_visibility () +AudioRegionView::redraw_end_xfade () { - if (!gain_line) { + boost::shared_ptr ar (audio_region()); + + if (!ar->fade_out() || ar->fade_out()->empty()) { return; } - if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseGain) { - gain_line->add_visibility (AutomationLine::Line); - } else { - gain_line->hide (); - } + show_end_xfade(); + + reset_fade_out_shape_width (ar, ar->fade_out()->back()->when); } void -AudioRegionView::create_waves () +AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecnt_t width, Points& points, double effective_height) { - // cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG - RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick - - if (!atv.track()) { + if (points.size() < 3) { return; } - ChanCount nchans = atv.track()->n_channels(); - - // cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data - // << " and channels = " << nchans.n_audio() << endl; - - /* in tmp_waves, set up null pointers for each channel so the vector is allocated */ - for (uint32_t n = 0; n < nchans.n_audio(); ++n) { - tmp_waves.push_back (0); + if (!end_xfade_in) { + end_xfade_in = new ArdourCanvas::PolyLine (group); + CANVAS_DEBUG_NAME (end_xfade_in, string_compose ("xfade end in line for %1", region()->name())); + uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128); + end_xfade_in->set_outline_color (col); + end_xfade_in->set_outline_width (1.5); } - for (vector::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) { - delete *i; + if (!end_xfade_out) { + end_xfade_out = new ArdourCanvas::PolyLine (group); + CANVAS_DEBUG_NAME (end_xfade_out, string_compose ("xfade end out line for %1", region()->name())); + end_xfade_out->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + end_xfade_out->set_outline_width (2.0); } - _data_ready_connections.clear (); - - for (uint32_t i = 0; i < nchans.n_audio(); ++i) { - _data_ready_connections.push_back (0); + 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->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); } - for (uint32_t n = 0; n < nchans.n_audio(); ++n) { + end_xfade_rect->set (ArdourCanvas::Rect (points.front().x, 1.0, points.back().x, effective_height)); + end_xfade_rect->show (); - if (n >= audio_region()->n_channels()) { - break; - } + end_xfade_in->set (points); + end_xfade_in->show (); + end_xfade_in->raise_to_top (); - // cerr << "\tchannel " << n << endl; + /* fade in line */ - if (wait_for_data) { - if (audio_region()->audio_source(n)->peaks_ready (boost::bind (&AudioRegionView::peaks_ready_handler, this, n), &_data_ready_connections[n], gui_context())) { - // cerr << "\tData is ready\n"; - create_one_wave (n, true); - } else { - // 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. - } + boost::shared_ptr inverse = ar->inverse_fade_out (); + Points ipoints; + Points::size_type npoints = points.size(); - } else { - // cerr << "\tdon't delay, display today!\n"; - create_one_wave (n, true); - } + ipoints.assign (npoints, Duple()); - } -} + if (!inverse) { -void -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 - uint32_t nchans = atv.track()->n_channels().n_audio(); - uint32_t n; - uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); - gdouble ht; + const double rend = trackview.editor().sample_to_pixel (_region->length() - points.back().y); + + for (Points::size_type i = 0, pci = 0; i < npoints; ++i, ++pci) { + ArdourCanvas::Duple &p (ipoints[pci]); + p.x = rend + i; + p.y = effective_height - points[pci].y; + } - if (trackview.current_height() < NAME_HIGHLIGHT_THRESH) { - ht = ((trackview.current_height()) / (double) nchans); } else { - ht = ((trackview.current_height() - NAME_HIGHLIGHT_SIZE) / (double) nchans); - } - gdouble yoff = which * ht; + boost::scoped_array vec (new float[npoints]); + inverse->curve().get_vector (inverse->front()->when, inverse->back()->when, vec.get(), npoints); - WaveView *wave = new WaveView (group, audio_region ()); + const double rend = trackview.editor().sample_to_pixel (_region->length() - width); - wave->set_channel (which); - wave->set_x_position (0); - wave->set_y_position (yoff); - wave->set_height (ht); - wave->set_samples_per_pixel (samples_per_pixel); + float* vp = vec.get(); - 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()); + 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]); + } } - 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; + end_xfade_out->set (ipoints); + end_xfade_out->show (); + end_xfade_out->raise_to_top (); - wave->set_region_start (_region->start()); + end_xfade_rect->raise_to_top (); //this needs to be topmost so the lines don't steal mouse focus - switch (Config->get_waveform_shape()) { - case Rectified: - wave->set_shape (WaveView::Rectified); - break; - default: - wave->set_shape (WaveView::Normal); - } - - wave->set_logscaled (Config->get_waveform_scale() == Logarithmic); + show_end_xfade(); +} - if (!Config->get_show_waveforms ()) { - wave->hide(); - } +void +AudioRegionView::hide_xfades () +{ + hide_start_xfade (); + hide_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_rect) { + start_xfade_rect->hide (); + } + + _start_xfade_visible = false; +} + +void +AudioRegionView::hide_end_xfade () +{ + if (end_xfade_in) { + end_xfade_in->hide(); + } + if (end_xfade_out) { + end_xfade_out->hide(); + } + if (end_xfade_rect) { + end_xfade_rect->hide (); + } + + _end_xfade_visible = false; +} + +void +AudioRegionView::show_start_xfade () +{ + if (start_xfade_in) { + start_xfade_in->show(); + } + if (start_xfade_out) { + start_xfade_out->show(); + } + if (start_xfade_rect) { + start_xfade_rect->show (); + } + + _start_xfade_visible = true; +} + +void +AudioRegionView::show_end_xfade () +{ + if (end_xfade_in) { + end_xfade_in->show(); + } + if (end_xfade_out) { + end_xfade_out->show(); + } + if (end_xfade_rect) { + end_xfade_rect->show (); + } + + _end_xfade_visible = true; +} + +void +AudioRegionView::set_samples_per_pixel (gdouble fpp) +{ + RegionView::set_samples_per_pixel (fpp); + + if (Config->get_show_waveforms ()) { + for (uint32_t n = 0; n < waves.size(); ++n) { + waves[n]->set_samples_per_pixel (fpp); + } + } + + if (gain_line) { + gain_line->reset (); + } + + reset_fade_shapes (); +} + +void +AudioRegionView::set_amplitude_above_axis (gdouble a) +{ + for (uint32_t n=0; n < waves.size(); ++n) { + waves[n]->set_amplitude_above_axis (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 () +{ + RegionView::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()); + } + + set_waveform_colors (); + + if (start_xfade_in) { + start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + } + if (start_xfade_out) { + uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128); + start_xfade_out->set_outline_color (col); + } + if (end_xfade_in) { + end_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine()); + } + if (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 (start_xfade_rect) { + start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade()); + } + if (end_xfade_rect) { + end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade()); + } +} + +void +AudioRegionView::setup_waveform_visibility () +{ + if (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. + */ + // CAIROCANVAS + // waves[n]->set_samples_per_pixel (_samples_per_pixel); + waves[n]->show(); + } + } else { + for (uint32_t n = 0; n < waves.size(); ++n) { + waves[n]->hide(); + } + } +} + +void +AudioRegionView::temporarily_hide_envelope () +{ + if (gain_line) { + gain_line->hide (); + } +} + +void +AudioRegionView::unhide_envelope () +{ + update_envelope_visibility (); +} + +void +AudioRegionView::update_envelope_visibility () +{ + if (!gain_line) { + return; + } + + if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseGain) { + gain_line->add_visibility (AutomationLine::Line); + } else { + gain_line->hide (); + } +} + +void +AudioRegionView::create_waves () +{ + // cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG + RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick + + if (!atv.track()) { + return; + } + + ChanCount nchans = atv.track()->n_channels(); + + // cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data + // << " and channels = " << nchans.n_audio() << endl; + + /* in tmp_waves, set up null pointers for each channel so the vector is allocated */ + for (uint32_t n = 0; n < nchans.n_audio(); ++n) { + tmp_waves.push_back (0); + } + + for (vector::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) { + delete *i; + } + + _data_ready_connections.clear (); + + for (uint32_t i = 0; i < nchans.n_audio(); ++i) { + _data_ready_connections.push_back (0); + } + + for (uint32_t n = 0; n < nchans.n_audio(); ++n) { + + if (n >= audio_region()->n_channels()) { + break; + } + + // cerr << "\tchannel " << n << endl; + + if (wait_for_data) { + if (audio_region()->audio_source(n)->peaks_ready (boost::bind (&AudioRegionView::peaks_ready_handler, this, n), &_data_ready_connections[n], gui_context())) { + // cerr << "\tData is ready\n"; + create_one_wave (n, true); + } else { + // 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. + } + + } else { + // cerr << "\tdon't delay, display today!\n"; + create_one_wave (n, true); + } + + } +} + +void +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 + uint32_t nchans = atv.track()->n_channels().n_audio(); + uint32_t n; + uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); + gdouble ht; + + if (trackview.current_height() < NAME_HIGHLIGHT_THRESH) { + ht = ((trackview.current_height()) / (double) nchans); + } else { + ht = ((trackview.current_height() - NAME_HIGHLIGHT_SIZE) / (double) nchans); + } + + gdouble yoff = which * ht; + + WaveView *wave = new WaveView (group, audio_region ()); + CANVAS_DEBUG_NAME (wave, string_compose ("wave view for chn %1 of %2", which, get_item_name())); + + wave->set_channel (which); + wave->set_y_position (yoff); + wave->set_height (ht); + wave->set_samples_per_pixel (samples_per_pixel); + wave->set_show_zero_line (true); + + switch (Config->get_waveform_shape()) { + case Rectified: + wave->set_shape (WaveView::Rectified); + break; + default: + wave->set_shape (WaveView::Normal); + } + + wave->set_logscaled (Config->get_waveform_scale() == Logarithmic); + + if (!Config->get_show_waveforms ()) { + wave->hide(); + } /* note: calling this function is serialized by the lock held in the peak building thread that signals that @@ -1017,7 +1294,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()); @@ -1043,11 +1320,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) @@ -1068,12 +1348,11 @@ AudioRegionView::add_ghost (TimeAxisView& tv) } WaveView *wave = new WaveView (ghost->group, audio_region()); + CANVAS_DEBUG_NAME (wave, string_compose ("ghost wave for %1", get_item_name())); wave->set_channel (n); - wave->set_x_position (0); wave->set_samples_per_pixel (samples_per_pixel); wave->set_amplitude_above_axis (_amplitude_above_axis); - wave->set_region_start (_region->start()); ghost->waves.push_back(wave); } @@ -1126,23 +1405,78 @@ void 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()); + gain_line->set_line_color (audio_region()->envelope_active() ? + ARDOUR_UI::config()->get_canvasvar_GainLine() : + ARDOUR_UI::config()->get_canvasvar_GainLineInactive()); + } +} + +void +AudioRegionView::color_handler () +{ + //case cMutedWaveForm: + //case cWaveForm: + //case cWaveFormClip: + //case cZeroLine: + set_colors (); + + //case cGainLineInactive: + //case cGainLine: + envelope_active_changed(); + +} + +void +AudioRegionView::set_waveform_colors () +{ + 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(); + } else { + if (_recregion) { + 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(); + } } -} -void -AudioRegionView::color_handler () -{ - //case cMutedWaveForm: - //case cWaveForm: - //case cWaveFormClip: - //case cZeroLine: - set_colors (); + if (ARDOUR_UI::config()->get_color_regions_using_track_color()) { - //case cGainLineInactive: - //case cGainLine: - envelope_active_changed(); + /* 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 */ + + } + + 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 @@ -1160,40 +1494,7 @@ AudioRegionView::set_frame_color () TimeAxisViewItem::set_frame_color (); - uint32_t wc; - uint32_t fc; - - if (_selected) { - if (_region->muted()) { - wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), MUTED_ALPHA); - } else { - wc = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(); - } - fc = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(); - } else { - if (_recregion) { - if (_region->muted()) { - wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_RecWaveForm(), MUTED_ALPHA); - } else { - wc = ARDOUR_UI::config()->get_canvasvar_RecWaveForm(); - } - fc = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill(); - } else { - if (_region->muted()) { - wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA); - } else { - wc = ARDOUR_UI::config()->get_canvasvar_WaveForm(); - } - fc = ARDOUR_UI::config()->get_canvasvar_WaveFormFill(); - } - } - - for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { - (*w)->set_outline_color (wc); - if (!_region->muted()) { - (*w)->set_fill_color (fc); - } - } + set_waveform_colors (); } void @@ -1247,7 +1548,6 @@ AudioRegionView::show_region_editor () } editor->present (); - editor->set_position (Gtk::WIN_POS_MOUSE); editor->show_all(); } @@ -1259,6 +1559,7 @@ AudioRegionView::transients_changed () while (feature_lines.size() < analysis_features.size()) { ArdourCanvas::Line* canvas_item = new ArdourCanvas::Line(group); + CANVAS_DEBUG_NAME (canvas_item, string_compose ("transient group for %1", region()->name())); canvas_item->set (ArdourCanvas::Duple (-1.0, 2.0), ArdourCanvas::Duple (1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); @@ -1352,294 +1653,6 @@ AudioRegionView::thaw_after_trim () drag_end (); } -void -AudioRegionView::redraw_start_xfade () -{ - boost::shared_ptr ar (audio_region()); - - if (!ar->fade_in() || ar->fade_in()->empty()) { - return; - } - - show_start_xfade(); - - redraw_start_xfade_to (ar, ar->fade_in()->back()->when); -} - -void -AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, framecnt_t len) -{ - int32_t const npoints = trackview.editor().sample_to_pixel (len); - - if (npoints < 3) { - return; - } - - if (!start_xfade_in) { - start_xfade_in = new ArdourCanvas::PolyLine (group); - // CAIROCANVAS - // start_xfade_in->set_width_pixels (1); - start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GainLine()); - } - - if (!start_xfade_out) { - start_xfade_out = new ArdourCanvas::PolyLine (group); - // CAIROCANVAS - // start_xfade_out->set_width_pixels (1); - uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_GainLine(), 128); - start_xfade_out->set_outline_color (col); - } - - if (!start_xfade_rect) { - start_xfade_rect = new ArdourCanvas::Rectangle (group); - // CAIROCANVAS - // start_xfade_rect->property_draw() = true; - start_xfade_rect->set_fill (true); - start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade()); - start_xfade_rect->set_outline (false); - start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this)); - start_xfade_rect->set_data ("regionview", this); - } - - ArdourCanvas::Points* points = get_canvas_points ("xfade edit redraw", npoints); - boost::scoped_array vec (new float[npoints]); - - double effective_height; - if (_height >= NAME_HIGHLIGHT_THRESH) { - effective_height = _height - NAME_HIGHLIGHT_SIZE - 2; - } else { - effective_height = _height - 2; - } - - ar->fade_in()->curve().get_vector (0, ar->fade_in()->back()->when, vec.get(), npoints); - - for (int i = 0, pci = 0; i < npoints; ++i) { - ArdourCanvas::Duple &p ((*points)[pci++]); - p.x = i; - p.y = 1.0 + effective_height - (effective_height * vec.get()[i]); - } - - start_xfade_rect->set (ArdourCanvas::Rect (((*points)[0]).x, 1.0, ((*points)[npoints-1]).x, effective_height)); - start_xfade_rect->show (); - - start_xfade_in->set (*points); - start_xfade_in->show (); - start_xfade_in->raise_to_top (); - - /* fade out line */ - - boost::shared_ptr inverse = ar->inverse_fade_in(); - - if (!inverse) { - - for (int i = 0, pci = 0; i < npoints; ++i) { - ArdourCanvas::Duple &p ((*points)[pci++]); - p.x = i; - p.y = 1.0 + effective_height - (effective_height * (1.0 - vec.get()[i])); - } - - } else { - - inverse->curve().get_vector (0, inverse->back()->when, vec.get(), npoints); - - for (int i = 0, pci = 0; i < npoints; ++i) { - ArdourCanvas::Duple &p ((*points)[pci++]); - p.x = i; - p.y = 1.0 + effective_height - (effective_height * vec.get()[i]); - } - } - - start_xfade_out->set (*points); - start_xfade_out->show (); - start_xfade_out->raise_to_top (); - - start_xfade_rect->raise_to_top (); //this needs to be topmost so the lines don't steal mouse focus - - show_start_xfade(); - - delete points; -} - -void -AudioRegionView::redraw_end_xfade () -{ - boost::shared_ptr ar (audio_region()); - - if (!ar->fade_out() || ar->fade_out()->empty()) { - return; - } - - show_end_xfade(); - - redraw_end_xfade_to (ar, ar->fade_out()->back()->when); -} - -void -AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecnt_t len) -{ - int32_t const npoints = trackview.editor().sample_to_pixel (len); - - if (npoints < 3) { - return; - } - - if (!end_xfade_in) { - end_xfade_in = new ArdourCanvas::PolyLine (group); - // CAIROCANVAS - // end_xfade_in->property_width_pixels() = 1; - end_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GainLine()); - } - - if (!end_xfade_out) { - end_xfade_out = new ArdourCanvas::PolyLine (group); - // CAIROCANVAS - // end_xfade_out->property_width_pixels() = 1; - uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_GainLine(), 128); - end_xfade_out->set_outline_color (col); - } - - if (!end_xfade_rect) { - end_xfade_rect = new ArdourCanvas::Rectangle (group); - // CAIROCANVAS - // end_xfade_rect->property_draw() = true; - 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->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); - } - - Points* points = get_canvas_points ("xfade edit redraw", npoints); - boost::scoped_array vec (new float[npoints]); - - ar->fade_out()->curve().get_vector (0, ar->fade_out()->back()->when, vec.get(), npoints); - - double rend = trackview.editor().sample_to_pixel (_region->length() - len); - - double effective_height; - if (_height >= NAME_HIGHLIGHT_THRESH) { - effective_height = _height - NAME_HIGHLIGHT_SIZE - 2; - } else { - effective_height = _height - 2; - } - - for (int i = 0, pci = 0; i < npoints; ++i) { - ArdourCanvas::Duple &p ((*points)[pci++]); - p.x = rend + i; - p.y = 1.0 + effective_height - (effective_height * vec.get()[i]); - } - - end_xfade_rect->set (ArdourCanvas::Rect (((*points)[0]).x, 1.0, ((*points)[npoints-1]).x, effective_height)); - end_xfade_rect->show (); - - 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 (); - - if (!inverse) { - - for (int i = 0, pci = 0; i < npoints; ++i) { - ArdourCanvas::Duple &p ((*points)[pci++]); - p.x = rend + i; - p.y = 1.0 + effective_height - (effective_height * (1.0 - vec.get()[i])); - } - - } else { - - inverse->curve().get_vector (inverse->front()->when, inverse->back()->when, vec.get(), npoints); - - for (int i = 0, pci = 0; i < npoints; ++i) { - ArdourCanvas::Duple &p ((*points)[pci++]); - p.x = rend + i; - p.y = 1.0 + effective_height - (effective_height * vec.get()[i]); - } - } - - end_xfade_out->set (*points); - 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(); - - delete points; -} - -void -AudioRegionView::hide_xfades () -{ - hide_start_xfade (); - hide_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_rect) { - start_xfade_rect->hide (); - } - - _start_xfade_visible = false; -} - -void -AudioRegionView::hide_end_xfade () -{ - if (end_xfade_in) { - end_xfade_in->hide(); - } - if (end_xfade_out) { - end_xfade_out->hide(); - } - if (end_xfade_rect) { - end_xfade_rect->hide (); - } - - _end_xfade_visible = false; -} - -void -AudioRegionView::show_start_xfade () -{ - if (start_xfade_in) { - start_xfade_in->show(); - } - if (start_xfade_out) { - start_xfade_out->show(); - } - if (start_xfade_rect) { - start_xfade_rect->show (); - } - - _start_xfade_visible = true; -} - -void -AudioRegionView::show_end_xfade () -{ - if (end_xfade_in) { - end_xfade_in->show(); - } - if (end_xfade_out) { - end_xfade_out->show(); - } - if (end_xfade_rect) { - end_xfade_rect->show (); - } - - _end_xfade_visible = true; -} void AudioRegionView::show_xfades () @@ -1673,5 +1686,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 (); } }