diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-11 15:19:18 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-11 15:19:18 -0500 |
commit | 59631acc5f41153a294c97ab820a4b41a886e24c (patch) | |
tree | 1e1b4fe2b2008eb790d1ffc0dcb5945c4b143c2f /gtk2_ardour/automation_line.cc | |
parent | 943bcc29cc05bc1d75df505cd259659a72dc56b1 (diff) | |
parent | 72d8ca89e2f4b2e194b2bbd99261deb5b2108a40 (diff) |
fix merge with master
Diffstat (limited to 'gtk2_ardour/automation_line.cc')
-rw-r--r-- | gtk2_ardour/automation_line.cc | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 9fe1e0fa19..a4d58cb531 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -70,8 +70,8 @@ using namespace Editing; * This will not be deleted by AutomationLine. */ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent, - boost::shared_ptr<AutomationList> al, - Evoral::TimeConverter<double, framepos_t>* converter) + boost::shared_ptr<AutomationList> al, + Evoral::TimeConverter<double, framepos_t>* converter) : trackview (tv) , _name (name) , alist (al) @@ -192,7 +192,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)) { @@ -270,8 +270,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<AutomationList> (memento_command_binder(), &get_state(), 0) - ); + new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0)); cp.move_to (x, y, ControlPoint::Full); @@ -288,8 +287,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) update_pending = false; trackview.editor().session()->add_command ( - new MementoCommand<AutomationList> (memento_command_binder(), 0, &alist->get_state()) - ); + new MementoCommand<AutomationList> (memento_command_binder(), 0, &alist->get_state())); trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); @@ -453,8 +451,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<AutomationList> (memento_command_binder(), &get_state(), 0) - ); + new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0)); _drag_points.clear (); _drag_points.push_back (cp); @@ -480,8 +477,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<AutomationList> (memento_command_binder (), &get_state(), 0) - ); + new MementoCommand<AutomationList> (memento_command_binder (), &get_state(), 0)); _drag_points.clear (); @@ -501,8 +497,7 @@ AutomationLine::start_drag_multiple (list<ControlPoint*> cp, float fraction, XML { trackview.editor().session()->begin_reversible_command (_("automation range move")); trackview.editor().session()->add_command ( - new MementoCommand<AutomationList> (memento_command_binder(), state, 0) - ); + new MementoCommand<AutomationList> (memento_command_binder(), state, 0)); _drag_points = cp; start_drag_common (0, fraction); @@ -740,8 +735,7 @@ AutomationLine::end_drag (bool with_push, uint32_t final_index) update_pending = false; trackview.editor().session()->add_command ( - new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state()) - ); + new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state())); trackview.editor().session()->set_dirty (); did_push = false; @@ -845,8 +839,7 @@ AutomationLine::remove_point (ControlPoint& cp) alist->erase (cp.model()); trackview.editor().session()->add_command( - new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state()) - ); + new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())); trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); @@ -958,7 +951,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) if (isnan (tx) || isnan (ty)) { warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""), - _name) << endmsg; + _name) << endmsg; continue; } @@ -1064,8 +1057,7 @@ AutomationLine::clear () alist->clear(); trackview.editor().session()->add_command ( - new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state()) - ); + new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())); } void @@ -1161,8 +1153,8 @@ 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 || + alist->parameter().type() == PanWidthAutomation) { y = 1.0 - y; } else if (alist->parameter().type() == PluginAutomation) { y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y(); @@ -1179,8 +1171,8 @@ 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) { + alist->parameter().type() == PanElevationAutomation || + alist->parameter().type() == PanWidthAutomation) { // vertical coordinate axis reversal y = 1.0 - y; } else if (alist->parameter().type() == PluginAutomation) { @@ -1206,7 +1198,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; @@ -1259,8 +1251,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<AutomationList>* |