Accommodate newly introduced source(s) in our MSVC project (libardour)

[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 b726de64405c98c6eb03b2015c0f648f06acd81c..1093fd18b4db9a28924ba6db764f7f6094ab0090 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -35,6 +35,7 @@
 #include "time_axis_view.h"
 #include "automation_controller.h"
 #include "ardour_button.h"
+#include "ardour_dropdown.h"
 
 namespace ARDOUR {
        class Session;
@@ -69,9 +70,13 @@ class AutomationTimeAxisView : public TimeAxisView {
 
        ~AutomationTimeAxisView();
 
-       virtual void set_height (uint32_t);
+       virtual void set_height (uint32_t, TrackHeightMode m = OnlySelf);
        void set_samples_per_pixel (double);
        std::string name() const { return _name; }
+       Gdk::Color color () const;
+
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const;
+       ARDOUR::PresentationInfo const & presentation_info () const;
 
         void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
 
@@ -84,7 +89,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        std::list<boost::shared_ptr<AutomationLine> > lines () const;
 
        void set_selected_points (PointSelection&);
-       void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&);
+       void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&, bool within = false);
        void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
        void show_timestretch (framepos_t /*start*/, framepos_t /*end*/, int /*layers*/, int /*layer*/) {}
@@ -93,7 +98,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        /* editing operations */
 
        void cut_copy_clear (Selection&, Editing::CutCopyOp);
-       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&);
+       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&, const int32_t sub_num);
 
        int  set_state (const XMLNode&, int version);
 
@@ -149,8 +154,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        bool    first_call_to_set_height;
 
        ArdourButton       hide_button;
-       ArdourButton       auto_button;
-       Gtk::Menu*         automation_menu;
+       ArdourDropdown     auto_dropdown;
        Gtk::Label*        plugname;
        bool               plugname_packed;
 
@@ -168,7 +172,6 @@ class AutomationTimeAxisView : public TimeAxisView {
 
        void clear_clicked ();
        void hide_clicked ();
-       void auto_clicked ();
 
        virtual bool can_edit_name() const {return false;}