X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=c6e42c0a4bd280a1da4a7ad14349363f6669fe8e;hb=da1e8701eb90f7e11c74e0104a5f97bf227aa2bd;hp=165af740377705c20a28b5d36c28d73c21e26368;hpb=8d828faa6491daad94b196e4785564ee7209cce9;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 165af74037..c6e42c0a4b 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include @@ -66,6 +66,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 */ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, Gdk::Color const & basic_color) @@ -75,17 +76,18 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView , fade_out_shape(0) , fade_in_handle(0) , fade_out_handle(0) - , fade_position_line(0) , start_xfade_in (0) , start_xfade_out (0) , start_xfade_rect (0) + , _start_xfade_visible (false) , end_xfade_in (0) , end_xfade_out (0) , end_xfade_rect (0) + , _end_xfade_visible (false) , _amplitude_above_axis(1.0) - , _flags(0) , fade_color(0) { + Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context()); } AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, @@ -96,17 +98,18 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView , fade_out_shape(0) , fade_in_handle(0) , fade_out_handle(0) - , fade_position_line(0) , start_xfade_in (0) , start_xfade_out (0) , start_xfade_rect (0) + , _start_xfade_visible (false) , end_xfade_in (0) , end_xfade_out (0) , end_xfade_rect (0) + , _end_xfade_visible (false) , _amplitude_above_axis(1.0) - , _flags(0) , fade_color(0) { + Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context()); } AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr other_region) @@ -115,15 +118,15 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt , fade_out_shape(0) , fade_in_handle(0) , fade_out_handle(0) - , fade_position_line(0) , start_xfade_in (0) , start_xfade_out (0) , start_xfade_rect (0) + , _start_xfade_visible (false) , end_xfade_in (0) , end_xfade_out (0) , end_xfade_rect (0) + , _end_xfade_visible (false) , _amplitude_above_axis (other._amplitude_above_axis) - , _flags (other._flags) , fade_color(0) { Gdk::Color c; @@ -133,6 +136,8 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt c.set_rgb_p (r/255.0, g/255.0, b/255.0); init (c, true); + + Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context()); } void @@ -143,17 +148,7 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) RegionView::init (basic_color, wfd); - XMLNode *node; - _amplitude_above_axis = 1.0; - _flags = 0; - - if ((node = _region->extra_xml ("GUI")) != 0) { - set_flags (node); - } else { - _flags = WaveformVisible; - store_flags (); - } compute_colors (basic_color); @@ -170,22 +165,15 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) if (!_recregion) { fade_in_handle = new ArdourCanvas::SimpleRect (*group); fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, 0); - fade_in_handle->property_outline_pixels() = 0; + fade_in_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0); fade_in_handle->set_data ("regionview", this); fade_out_handle = new ArdourCanvas::SimpleRect (*group); fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, 0); - fade_out_handle->property_outline_pixels() = 0; + fade_out_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0); fade_out_handle->set_data ("regionview", this); - - fade_position_line = new ArdourCanvas::SimpleLine (*group); - fade_position_line->property_color_rgba() = 0xBBBBBBAA; - fade_position_line->property_y1() = 7; - fade_position_line->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; - - fade_position_line->hide(); } setup_fade_handle_positions (); @@ -199,13 +187,8 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) if (!Profile->get_sae()) { gain_line.reset (new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope())); } - - if (Config->get_show_region_gain()) { - gain_line->show (); - } else { - gain_line->hide (); - } - + + update_envelope_visibility (); gain_line->reset (); set_height (trackview.current_height()); @@ -235,6 +218,10 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) set_colors (); + setup_waveform_visibility (); + setup_waveform_shape (); + setup_waveform_scale (); + /* XXX sync mark drag? */ } @@ -270,7 +257,6 @@ void AudioRegionView::region_changed (const PropertyChange& what_changed) { ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed); - // cerr << "AudioRegionView::region_changed() called" << endl; RegionView::region_changed (what_changed); @@ -458,17 +444,15 @@ AudioRegionView::setup_fade_handle_positions() { /* position of fade handle offset from the top of the region view */ double const handle_pos = 2; - /* height of fade handles */ - double const handle_height = 5; if (fade_in_handle) { fade_in_handle->property_y1() = handle_pos; - fade_in_handle->property_y2() = handle_pos + handle_height; + fade_in_handle->property_y2() = handle_pos + handle_size; } if (fade_out_handle) { fade_out_handle->property_y1() = handle_pos; - fade_out_handle->property_y2() = handle_pos + handle_height; + fade_out_handle->property_y2() = handle_pos + handle_size; } } @@ -499,9 +483,7 @@ AudioRegionView::set_height (gdouble height) if ((height/wcnt) < NAME_HIGHLIGHT_THRESH) { gain_line->hide (); } else { - if (Config->get_show_region_gain ()) { - gain_line->show (); - } + update_envelope_visibility (); } gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE) - 2); @@ -524,16 +506,6 @@ AudioRegionView::set_height (gdouble height) (*l).second->property_points() = points; } - if (fade_position_line) { - - if (height < NAME_HIGHLIGHT_THRESH) { - fade_position_line->property_y2() = _height - 1; - } - else { - fade_position_line->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; - } - } - if (name_pixbuf) { name_pixbuf->raise_to_top(); } @@ -549,31 +521,12 @@ AudioRegionView::reset_fade_shapes () void AudioRegionView::reset_fade_in_shape () { - reset_fade_in_shape_width ((framecnt_t) audio_region()->fade_in()->back()->when); + reset_fade_in_shape_width (audio_region(), (framecnt_t) audio_region()->fade_in()->back()->when); } void -AudioRegionView::reset_fade_in_shape_width (framecnt_t width) +AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr ar, framecnt_t width) { - if (dragging()) { - return; - } - - if (audio_region()->fade_in_is_xfade()) { - if (fade_in_handle) { - fade_in_handle->hide (); - fade_in_shape->hide (); - } - redraw_start_xfade (); - return; - } else { - if (start_xfade_in) { - start_xfade_in->hide (); - start_xfade_out->hide (); - start_xfade_rect->hide (); - } - } - if (fade_in_handle == 0) { return; } @@ -591,19 +544,14 @@ AudioRegionView::reset_fade_in_shape_width (framecnt_t width) uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); double h; - if (_height < 5) { - fade_in_shape->hide(); - fade_in_handle->hide(); - return; - } - double const handle_center = pwidth; /* Put the fade in handle so that its left side is at the end-of-fade line */ fade_in_handle->property_x1() = handle_center; - fade_in_handle->property_x2() = handle_center + 6; + fade_in_handle->property_x2() = handle_center + handle_size; if (pwidth < 5) { + hide_start_xfade(); fade_in_shape->hide(); return; } @@ -620,7 +568,7 @@ AudioRegionView::reset_fade_in_shape_width (framecnt_t width) if (_height >= NAME_HIGHLIGHT_THRESH) { h = _height - NAME_HIGHLIGHT_SIZE - 2; } else { - h = _height; + h = _height - 2; } /* points *MUST* be in anti-clockwise order */ @@ -648,40 +596,24 @@ AudioRegionView::reset_fade_in_shape_width (framecnt_t width) fade_in_shape->property_points() = *points; delete points; + redraw_start_xfade_to ( ar, width); + /* ensure trim handle stays on top */ if (frame_handle_start) { frame_handle_start->raise_to_top(); } + } void AudioRegionView::reset_fade_out_shape () { - reset_fade_out_shape_width ((framecnt_t) audio_region()->fade_out()->back()->when); + reset_fade_out_shape_width (audio_region(), (framecnt_t) audio_region()->fade_out()->back()->when); } void -AudioRegionView::reset_fade_out_shape_width (framecnt_t width) +AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, framecnt_t width) { - if (dragging()) { - return; - } - - if (audio_region()->fade_out_is_xfade()) { - if (fade_out_handle) { - fade_out_handle->hide (); - fade_out_shape->hide (); - } - redraw_end_xfade (); - return; - } else { - if (end_xfade_in) { - end_xfade_in->hide (); - end_xfade_out->hide (); - end_xfade_rect->hide (); - } - } - if (fade_out_handle == 0) { return; } @@ -699,12 +631,6 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width) uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); double h; - if (_height < 5) { - fade_out_shape->hide(); - fade_out_handle->hide(); - return; - } - double const handle_center = (_region->length() - width) / samples_per_unit; /* Put the fade out handle so that its right side is at the end-of-fade line; @@ -716,6 +642,7 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width) /* don't show shape if its too small */ if (pwidth < 5) { + hide_end_xfade(); fade_out_shape->hide(); return; } @@ -730,7 +657,7 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width) if (_height >= NAME_HIGHLIGHT_THRESH) { h = _height - NAME_HIGHLIGHT_SIZE - 2; } else { - h = _height; + h = _height - 2; } /* points *MUST* be in anti-clockwise order */ @@ -760,19 +687,35 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width) fade_out_shape->property_points() = *points; delete points; + redraw_end_xfade_to (ar, width); + /* ensure trim handle stays on top */ if (frame_handle_end) { frame_handle_end->raise_to_top(); } + +} + +framepos_t +AudioRegionView::get_fade_in_shape_width () +{ + return audio_region()->fade_in()->back()->when; } +framepos_t +AudioRegionView::get_fade_out_shape_width () +{ + return audio_region()->fade_out()->back()->when; +} + + void AudioRegionView::set_samples_per_unit (gdouble spu) { RegionView::set_samples_per_unit (spu); - if (_flags & WaveformVisible) { - for (uint32_t n=0; n < waves.size(); ++n) { + if (Config->get_show_waveforms ()) { + for (uint32_t n = 0; n < waves.size(); ++n) { waves[n]->property_samples_per_unit() = spu; } } @@ -824,25 +767,20 @@ AudioRegionView::set_colors () } void -AudioRegionView::set_waveform_visible (bool yn) -{ - if (((_flags & WaveformVisible) != yn)) { - if (yn) { - 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. - */ - waves[n]->property_samples_per_unit() = samples_per_unit; - waves[n]->show(); - } - _flags |= WaveformVisible; - } else { - for (uint32_t n=0; n < waves.size(); ++n) { - waves[n]->hide(); - } - _flags &= ~WaveformVisible; +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. + */ + waves[n]->property_samples_per_unit() = samples_per_unit; + waves[n]->show(); + } + } else { + for (uint32_t n = 0; n < waves.size(); ++n) { + waves[n]->hide(); } - store_flags (); } } @@ -857,20 +795,20 @@ AudioRegionView::temporarily_hide_envelope () void AudioRegionView::unhide_envelope () { - if (gain_line) { - gain_line->show (); - } + update_envelope_visibility (); } void -AudioRegionView::set_envelope_visible (bool yn) +AudioRegionView::update_envelope_visibility () { - if (gain_line) { - if (yn) { - gain_line->show (); - } else { - gain_line->hide (); - } + 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 (); } } @@ -977,10 +915,10 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get(); wave->property_zero_line() = true; wave->property_region_start() = _region->start(); - wave->property_rectified() = (bool) (_flags & WaveformRectified); - wave->property_logscaled() = (bool) (_flags & WaveformLogScaled); + wave->property_rectified() = Config->get_waveform_shape() == Rectified; + wave->property_logscaled() = Config->get_waveform_scale() == Logarithmic; - if (!(_flags & WaveformVisible)) { + if (!Config->get_show_waveforms ()) { wave->hide(); } @@ -1035,7 +973,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) /* don't create points that can't be seen */ - set_envelope_visible (true); + update_envelope_visibility (); x = ev->button.x; y = ev->button.y; @@ -1085,90 +1023,18 @@ AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent */* } void -AudioRegionView::store_flags() -{ - XMLNode *node = new XMLNode ("GUI"); - - node->add_property ("waveform-visible", (_flags & WaveformVisible) ? "yes" : "no"); - node->add_property ("waveform-rectified", (_flags & WaveformRectified) ? "yes" : "no"); - node->add_property ("waveform-logscaled", (_flags & WaveformLogScaled) ? "yes" : "no"); - - _region->add_extra_xml (*node); -} - -void -AudioRegionView::set_flags (XMLNode* node) -{ - XMLProperty *prop; - - if ((prop = node->property ("waveform-visible")) != 0) { - if (string_is_affirmative (prop->value())) { - _flags |= WaveformVisible; - } - } - - if ((prop = node->property ("waveform-rectified")) != 0) { - if (string_is_affirmative (prop->value())) { - _flags |= WaveformRectified; - } - } - - if ((prop = node->property ("waveform-logscaled")) != 0) { - if (string_is_affirmative (prop->value())) { - _flags |= WaveformLogScaled; - } - } -} - -void -AudioRegionView::set_waveform_shape (WaveformShape shape) +AudioRegionView::setup_waveform_shape () { - bool yn; - - /* this slightly odd approach is to leave the door open to - other "shapes" such as spectral displays, etc. - */ - - switch (shape) { - case Rectified: - yn = true; - break; - - default: - yn = false; - break; - } - - if (yn != (bool) (_flags & WaveformRectified)) { - for (vector::iterator wave = waves.begin(); wave != waves.end() ; ++wave) { - (*wave)->property_rectified() = yn; - } - - if (yn) { - _flags |= WaveformRectified; - } else { - _flags &= ~WaveformRectified; - } - store_flags (); + for (vector::iterator wave = waves.begin(); wave != waves.end() ; ++wave) { + (*wave)->property_rectified() = Config->get_waveform_shape() == Rectified; } } void -AudioRegionView::set_waveform_scale (WaveformScale scale) +AudioRegionView::setup_waveform_scale () { - bool yn = (scale == Logarithmic); - - if (yn != (bool) (_flags & WaveformLogScaled)) { - for (vector::iterator wave = waves.begin(); wave != waves.end() ; ++wave) { - (*wave)->property_logscaled() = yn; - } - - if (yn) { - _flags |= WaveformLogScaled; - } else { - _flags &= ~WaveformLogScaled; - } - store_flags (); + for (vector::iterator wave = waves.begin(); wave != waves.end() ; ++wave) { + (*wave)->property_logscaled() = Config->get_waveform_scale() == Logarithmic; } } @@ -1222,13 +1088,15 @@ AudioRegionView::entered (bool internal_editing) { trackview.editor().set_current_trimmable (_region); trackview.editor().set_current_movable (_region); - - if (gain_line && Config->get_show_region_gain ()) { - gain_line->show_all_control_points (); + + if (gain_line && trackview.editor().current_mouse_mode() == Editing::MouseGain) { + gain_line->add_visibility (AutomationLine::ControlPoints); } if (fade_in_handle && !internal_editing) { + fade_in_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255); fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255); + fade_out_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255); fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255); } } @@ -1239,12 +1107,14 @@ AudioRegionView::exited () trackview.editor().set_current_trimmable (boost::shared_ptr()); trackview.editor().set_current_movable (boost::shared_ptr()); - if (gain_line) { - gain_line->hide_all_but_selected_control_points (); + if (gain_line && trackview.editor().current_mouse_mode() == Editing::MouseGain) { + gain_line->remove_visibility (AutomationLine::ControlPoints); } if (fade_in_handle) { + fade_in_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0); fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0); + fade_out_handle->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 0); fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0); } } @@ -1400,27 +1270,9 @@ AudioRegionView::show_region_editor () } editor->present (); - editor->set_position (Gtk::WIN_POS_MOUSE); editor->show_all(); } - -void -AudioRegionView::show_fade_line (framepos_t pos) -{ - fade_position_line->property_x1() = trackview.editor().frame_to_pixel (pos); - fade_position_line->property_x2() = trackview.editor().frame_to_pixel (pos); - fade_position_line->show (); - fade_position_line->raise_to_top (); -} - -void -AudioRegionView::hide_fade_line () -{ - fade_position_line->hide (); -} - - void AudioRegionView::transients_changed () { @@ -1538,14 +1390,7 @@ AudioRegionView::redraw_start_xfade () return; } - if (!ar->fade_in_is_xfade()) { - if (start_xfade_in) { - start_xfade_in->hide (); - start_xfade_out->hide (); - start_xfade_rect->hide (); - } - return; - } + show_start_xfade(); redraw_start_xfade_to (ar, ar->fade_in()->back()->when); } @@ -1568,7 +1413,8 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame if (!start_xfade_out) { start_xfade_out = new ArdourCanvas::Line (*group); start_xfade_out->property_width_pixels() = 1; - start_xfade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_GainLine.get(); + uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 128); + start_xfade_out->property_fill_color_rgba() = col; } if (!start_xfade_rect) { @@ -1582,8 +1428,14 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame } Points* points = get_canvas_points ("xfade edit redraw", npoints); - boost::scoped_ptr vec (new float[npoints]); - double effective_height = _height - NAME_HIGHLIGHT_SIZE - 1.0; + 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); @@ -1598,7 +1450,6 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame start_xfade_rect->property_x2() = ((*points)[npoints-1]).get_x(); start_xfade_rect->property_y2() = effective_height; start_xfade_rect->show (); - start_xfade_rect->raise_to_top (); start_xfade_in->property_points() = *points; start_xfade_in->show (); @@ -1631,6 +1482,10 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, frame 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; } @@ -1643,14 +1498,7 @@ AudioRegionView::redraw_end_xfade () return; } - if (!ar->fade_out_is_xfade()) { - if (end_xfade_in) { - end_xfade_in->hide (); - end_xfade_out->hide (); - end_xfade_rect->hide (); - } - return; - } + show_end_xfade(); redraw_end_xfade_to (ar, ar->fade_out()->back()->when); } @@ -1673,7 +1521,8 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn if (!end_xfade_out) { end_xfade_out = new ArdourCanvas::Line (*group); end_xfade_out->property_width_pixels() = 1; - end_xfade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_GainLine.get(); + uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_GainLine.get(), 128); + end_xfade_out->property_fill_color_rgba() = col; } if (!end_xfade_rect) { @@ -1687,12 +1536,18 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn } Points* points = get_canvas_points ("xfade edit redraw", npoints); - boost::scoped_ptr vec (new float[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().frame_to_pixel (_region->length() - len); - double effective_height = _height - NAME_HIGHLIGHT_SIZE - 1; + + 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) { Gnome::Art::Point &p ((*points)[pci++]); @@ -1705,7 +1560,6 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn end_xfade_rect->property_x2() = ((*points)[npoints-1]).get_x(); end_xfade_rect->property_y2() = effective_height; end_xfade_rect->show (); - end_xfade_rect->raise_to_top (); end_xfade_in->property_points() = *points; end_xfade_in->show (); @@ -1738,12 +1592,22 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr ar, framecn 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(); @@ -1754,6 +1618,13 @@ AudioRegionView::hide_xfades () 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(); } @@ -1763,10 +1634,12 @@ AudioRegionView::hide_xfades () if (end_xfade_rect) { end_xfade_rect->hide (); } + + _end_xfade_visible = false; } void -AudioRegionView::show_xfades () +AudioRegionView::show_start_xfade () { if (start_xfade_in) { start_xfade_in->show(); @@ -1777,6 +1650,13 @@ AudioRegionView::show_xfades () 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(); } @@ -1786,27 +1666,41 @@ AudioRegionView::show_xfades () if (end_xfade_rect) { end_xfade_rect->show (); } + + _end_xfade_visible = true; +} + +void +AudioRegionView::show_xfades () +{ + show_start_xfade (); + show_end_xfade (); } void AudioRegionView::drag_start () { TimeAxisViewItem::drag_start (); - AudioTimeAxisView* atav = dynamic_cast (&trackview); - if (atav) { - AudioStreamView* av = atav->audio_view(); - if (av) { - /* this will hide our xfades too */ - av->hide_xfades_with (audio_region()); - } - } + //we used to hide xfades here. I don't see the point with the new model, but we can re-implement if needed } void AudioRegionView::drag_end () { TimeAxisViewItem::drag_end (); - /* fades will be redrawn if they changed */ + + //see comment for drag_start } +void +AudioRegionView::parameter_changed (string const & p) +{ + if (p == "show-waveforms") { + setup_waveform_visibility (); + } else if (p == "waveform-scale") { + setup_waveform_scale (); + } else if (p == "waveform-shape") { + setup_waveform_shape (); + } +}