32/64bit compat

[ardour.git] / gtk2_ardour / automation_time_axis.h

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 6db4bd4e64b32914491bdc9a865e08f82b991e35..b726de64405c98c6eb03b2015c0f648f06acd81c 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -93,7 +93,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        /* editing operations */
 
        void cut_copy_clear (Selection&, Editing::CutCopyOp);
-       bool paste (ARDOUR::framepos_t, unsigned paste_count, float times, const Selection&, ItemCounts&);
+       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&);
 
        int  set_state (const XMLNode&, int version);
 
@@ -123,13 +123,17 @@ class AutomationTimeAxisView : public TimeAxisView {
        static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
 
   protected:
+       /* Note that for MIDI controller "automation" (in regions), all of these
+          may be set.  In this case, _automatable is likely _route so the
+          controller will send immediate events out the route's MIDI port. */
+
        /** parent route */
        boost::shared_ptr<ARDOUR::Route> _route;
-       /** control; 0 if we are editing region-based automation */
+       /** control */
        boost::shared_ptr<ARDOUR::AutomationControl> _control;
-       /** control owner; may be _route, or 0 if we are editing region-based automation */
+       /** control owner; may be _route, something else (e.g. a pan control), or NULL */
        boost::shared_ptr<ARDOUR::Automatable> _automatable;
-       /** controller owner; 0 if we are editing region-based automation */
+       /** controller owner */
        boost::shared_ptr<AutomationController> _controller;
        Evoral::Parameter _parameter;
 
@@ -171,7 +175,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        void build_display_menu ();
 
        void cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
-       bool paste_one (ARDOUR::framepos_t, unsigned, float times, const Selection&, ItemCounts& counts);
+       bool paste_one (ARDOUR::framepos_t, unsigned, float times, const Selection&, ItemCounts& counts, bool greedy=false);
        void route_going_away ();
 
        void set_automation_state (ARDOUR::AutoState);