diff options
author | David Robillard <d@drobilla.net> | 2011-10-19 21:53:09 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-10-19 21:53:09 +0000 |
commit | 0bc8832e208154a0f172d34182ed6b0bc8bba52f (patch) | |
tree | 644c340672ff6ca12cce8f697dcd3b88d7036c04 /gtk2_ardour/automation_region_view.cc | |
parent | 32bf6003c477fc74d1babde31d0a5d0e1cf28c63 (diff) |
Trim include tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@10244 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_region_view.cc')
-rw-r--r-- | gtk2_ardour/automation_region_view.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index fff86025d2..0acd002de7 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -17,21 +17,24 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <utility> + #include "pbd/memento_command.h" + #include "ardour/automation_control.h" #include "ardour/event_type_map.h" -#include "ardour/session.h" -#include "ardour/source.h" #include "ardour/midi_automation_list_binder.h" #include "ardour/midi_region.h" +#include "ardour/session.h" +#include "ardour/source.h" #include "automation_region_view.h" +#include "editing.h" +#include "editor.h" +#include "editor_drag.h" #include "gui_thread.h" -#include "public_editor.h" #include "midi_automation_line.h" -#include "editor_drag.h" -#include "editor.h" -#include "editing.h" +#include "public_editor.h" #include "i18n.h" @@ -116,8 +119,8 @@ AutomationRegionView::canvas_event (GdkEvent* ev) automation_view()->canvas_display()->w2i (x, y); /* clamp y */ - y = max (y, 0.0); - y = min (y, _height - NAME_HIGHLIGHT_SIZE); + y = std::max (y, 0.0); + y = std::min (y, _height - NAME_HIGHLIGHT_SIZE); add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y); } |