X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=1cfd7eeb48d4a7c657d27d0142d7b35bb9a53bf6;hb=c028d223dff472bcadce3cbe9d000f20053de763;hp=0b894d16474ad84eb6019878be23b80c10d205fe;hpb=9727a2311100d87bba1ceac62e5a9e42e9420cd8;p=ardour.git diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 0b894d1647..1cfd7eeb48 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -17,6 +17,13 @@ */ +#ifdef COMPILER_MSVC +#include +/* isinf() & isnan() are C99 standards, which older MSVC doesn't provide */ +#define isinf(val) !((bool)_finite((double)val)) +#define isnan(val) (bool)_isnan((double)val) +#endif + #include #include #include @@ -32,16 +39,18 @@ #include "ardour/automation_list.h" #include "ardour/dB.h" #include "ardour/debug.h" +#include "ardour/tempo.h" #include "evoral/Curve.hpp" +#include "canvas/debug.h" + #include "automation_line.h" #include "control_point.h" #include "gui_thread.h" #include "rgb_macros.h" #include "ardour_ui.h" #include "public_editor.h" -#include "utils.h" #include "selection.h" #include "time_axis_view.h" #include "point_selection.h" @@ -60,9 +69,9 @@ using namespace Editing; /** @param converter A TimeConverter whose origin_b is the start time of the AutomationList in session frames. * This will not be deleted by AutomationLine. */ -AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent, - boost::shared_ptr al, - Evoral::TimeConverter* converter) +AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Item& parent, + boost::shared_ptr al, + Evoral::TimeConverter* converter) : trackview (tv) , _name (name) , alist (al) @@ -89,10 +98,14 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv terminal_points_can_slide = true; _height = 0; - group = new ArdourCanvas::Group (&parent); + group = new ArdourCanvas::Container (&parent); + CANVAS_DEBUG_NAME (group, "region gain envelope group"); - line = new ArdourCanvas::Curve (group); + line = new ArdourCanvas::PolyLine (group); + CANVAS_DEBUG_NAME (line, "region gain envelope line"); line->set_data ("line", this); + line->set_outline_width (2.0); + line->set_covers_threshold (4.0); line->Event.connect (sigc::mem_fun (*this, &AutomationLine::event_handler)); @@ -125,7 +138,7 @@ AutomationLine::event_handler (GdkEvent* event) } void -AutomationLine::show () +AutomationLine::update_visibility () { if (_visible & Line) { /* Only show the line there are some points, otherwise we may show an out-of-date line @@ -137,30 +150,42 @@ AutomationLine::show () } else { line->hide (); } - } else { - line->hide(); - } - if (_visible & ControlPoints) { - for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_visible (true); - (*i)->show (); - } - } else if (_visible & SelectedControlPoints) { - for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_visible ((*i)->get_selected()); + if (_visible & ControlPoints) { + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + (*i)->show (); + } + } else if (_visible & SelectedControlPoints) { + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + if ((*i)->get_selected()) { + (*i)->show (); + } else { + (*i)->hide (); + } + } + } else { + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + (*i)->hide (); + } } + } else { + line->hide (); for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_visible (false); + (*i)->hide (); } } + } void AutomationLine::hide () { - set_visibility (VisibleAspects (0)); + /* leave control points setting unchanged, we are just hiding the + overall line + */ + + set_visibility (AutomationLine::VisibleAspects (_visible & ~Line)); } double @@ -168,7 +193,7 @@ AutomationLine::control_point_box_size () { if (alist->interpolation() == AutomationList::Discrete) { return max((_height*4.0) / (double)(alist->parameter().max() - alist->parameter().min()), - 4.0); + 4.0); } if (_height > TimeAxisView::preset_height (HeightLarger)) { @@ -246,8 +271,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) trackview.editor().session()->begin_reversible_command (_("automation event move")); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), &get_state(), 0) - ); + new MementoCommand (memento_command_binder(), &get_state(), 0)); cp.move_to (x, y, ControlPoint::Full); @@ -264,8 +288,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) update_pending = false; trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), 0, &alist->get_state()) - ); + new MementoCommand (memento_command_binder(), 0, &alist->get_state())); trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); @@ -429,8 +452,7 @@ AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction) { trackview.editor().session()->begin_reversible_command (_("automation event move")); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), &get_state(), 0) - ); + new MementoCommand (memento_command_binder(), &get_state(), 0)); _drag_points.clear (); _drag_points.push_back (cp); @@ -456,8 +478,7 @@ AutomationLine::start_drag_line (uint32_t i1, uint32_t i2, float fraction) { trackview.editor().session()->begin_reversible_command (_("automation range move")); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder (), &get_state(), 0) - ); + new MementoCommand (memento_command_binder (), &get_state(), 0)); _drag_points.clear (); @@ -477,8 +498,7 @@ AutomationLine::start_drag_multiple (list cp, float fraction, XML { trackview.editor().session()->begin_reversible_command (_("automation range move")); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), state, 0) - ); + new MementoCommand (memento_command_binder(), state, 0)); _drag_points = cp; start_drag_common (0, fraction); @@ -500,11 +520,12 @@ AutomationLine::ContiguousControlPoints::ContiguousControlPoints (AutomationLine } void -AutomationLine::ContiguousControlPoints::compute_x_bounds () +AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e) { uint32_t sz = size(); if (sz > 0 && sz < line.npoints()) { + const TempoMap& map (e.session()->tempo_map()); /* determine the limits on x-axis motion for this contiguous range of control points @@ -512,14 +533,30 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds () if (front()->view_index() > 0) { before_x = line.nth (front()->view_index() - 1)->get_x(); + + const framepos_t pos = e.pixel_to_sample(before_x); + const Meter& meter = map.meter_at (pos); + const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) + / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()) ); + const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len); + + before_x += one_tick_in_pixels; } /* if our last point has a point after it in the line, we have an "after" bound */ - if (back()->view_index() < (line.npoints() - 2)) { + if (back()->view_index() < (line.npoints() - 1)) { after_x = line.nth (back()->view_index() + 1)->get_x(); + + const framepos_t pos = e.pixel_to_sample(after_x); + const Meter& meter = map.meter_at (pos); + const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) + / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar())); + const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len); + + after_x -= one_tick_in_pixels; } } } @@ -623,7 +660,7 @@ AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool } for (vector::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) { - (*ccp)->compute_x_bounds (); + (*ccp)->compute_x_bounds (trackview.editor()); } } @@ -716,8 +753,7 @@ AutomationLine::end_drag (bool with_push, uint32_t final_index) update_pending = false; trackview.editor().session()->add_command ( - new MementoCommand(memento_command_binder (), 0, &alist->get_state()) - ); + new MementoCommand(memento_command_binder (), 0, &alist->get_state())); trackview.editor().session()->set_dirty (); did_push = false; @@ -821,8 +857,7 @@ AutomationLine::remove_point (ControlPoint& cp) alist->erase (cp.model()); trackview.editor().session()->add_command( - new MementoCommand (memento_command_binder (), &before, &alist->get_state()) - ); + new MementoCommand (memento_command_binder (), &before, &alist->get_state())); trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); @@ -932,9 +967,9 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) model_to_view_coord (tx, ty); - if (std::isnan (tx) || std::isnan (ty)) { + if (isnan (tx) || isnan (ty)) { warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""), - _name) << endmsg; + _name) << endmsg; continue; } @@ -989,9 +1024,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) line->set (line_points); - if (_visible && alist->interpolation() != AutomationList::Discrete) { - line->show(); - } + update_visibility (); } set_selected_points (trackview.editor().get_selection().points); @@ -1040,8 +1073,7 @@ AutomationLine::clear () alist->clear(); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder (), &before, &alist->get_state()) - ); + new MementoCommand (memento_command_binder (), &before, &alist->get_state())); } void @@ -1060,22 +1092,34 @@ AutomationLine::set_list (boost::shared_ptr list) void AutomationLine::add_visibility (VisibleAspects va) { + VisibleAspects old = _visible; + _visible = VisibleAspects (_visible | va); - show (); + + if (old != _visible) { + update_visibility (); + } } void AutomationLine::set_visibility (VisibleAspects va) { - _visible = va; - show (); + if (_visible != va) { + _visible = va; + update_visibility (); + } } void AutomationLine::remove_visibility (VisibleAspects va) { + VisibleAspects old = _visible; + _visible = VisibleAspects (_visible & ~va); - show (); + + if (old != _visible) { + update_visibility (); + } } void @@ -1125,9 +1169,10 @@ AutomationLine::view_to_model_coord_y (double& y) const y = max (0.0, y); y = min (2.0, y); } else if (alist->parameter().type() == PanAzimuthAutomation || - alist->parameter().type() == PanElevationAutomation || - alist->parameter().type() == PanWidthAutomation) { + alist->parameter().type() == PanElevationAutomation) { y = 1.0 - y; + } else if (alist->parameter().type() == PanWidthAutomation) { + y = 2.0 * y - 1.0; } else if (alist->parameter().type() == PluginAutomation) { y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y(); } else { @@ -1143,10 +1188,10 @@ AutomationLine::model_to_view_coord (double& x, double& y) const alist->parameter().type() == EnvelopeAutomation) { y = gain_to_slider_position_with_max (y, Config->get_max_gain()); } else if (alist->parameter().type() == PanAzimuthAutomation || - alist->parameter().type() == PanElevationAutomation || - alist->parameter().type() == PanWidthAutomation) { - // vertical coordinate axis reversal + alist->parameter().type() == PanElevationAutomation) { y = 1.0 - y; + } else if (alist->parameter().type() == PanWidthAutomation) { + y = .5 + y * .5; } else if (alist->parameter().type() == PluginAutomation) { y = (y - alist->get_min_y()) / (double)(alist->get_max_y()- alist->get_min_y()); } else { @@ -1170,7 +1215,7 @@ AutomationLine::interpolation_changed (AutomationList::InterpolationStyle style) void AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, double tx, double ty, - AutomationList::iterator model, uint32_t npoints) + AutomationList::iterator model, uint32_t npoints) { ControlPoint::ShapeType shape; @@ -1210,9 +1255,8 @@ AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, dou if (_visible & ControlPoints) { control_points[view_index]->show (); - control_points[view_index]->set_visible (true); } else { - control_points[view_index]->set_visible (false); + control_points[view_index]->hide (); } } @@ -1224,8 +1268,7 @@ AutomationLine::connect_to_list () alist->StateChanged.connect (_list_connections, invalidator (*this), boost::bind (&AutomationLine::list_changed, this), gui_context()); alist->InterpolationChanged.connect ( - _list_connections, invalidator (*this), boost::bind (&AutomationLine::interpolation_changed, this, _1), gui_context() - ); + _list_connections, invalidator (*this), boost::bind (&AutomationLine::interpolation_changed, this, _1), gui_context()); } MementoCommandBinder*