some (unfinished) work on incorporating Ben's rev 6919 changes regarding track select...

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index e24de4126f06f2ca09e98cfab24d5d82c074dc9e..840b18ed143dd4e6d9b81b1027eeca7a43fab221 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -83,9 +83,8 @@ public:
        void selection_click (GdkEventButton*);
        void set_selected_points (PointSelection&);
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (nframes_t start, nframes_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 *>&);
        void get_inverted_selectables (Selection&, std::list<Selectable*>&);
-       bool show_automation(Evoral::Parameter param);
        void set_layer_display (LayerDisplay d);
        LayerDisplay layer_display () const;
 
@@ -93,10 +92,8 @@ public:
        nframes64_t find_next_region_boundary (nframes64_t pos, int32_t dir);
 
        /* Editing operations */
-       bool cut_copy_clear (Selection&, Editing::CutCopyOp);
-       bool paste (nframes_t, float times, Selection&, size_t nth);
-
-       TimeAxisView::Children get_child_list();
+       void cut_copy_clear (Selection&, Editing::CutCopyOp);
+       bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth);
 
        void toggle_automation_track (const Evoral::Parameter& param);
 
@@ -108,8 +105,7 @@ public:
        /* group playlist name resolving */
        std::string resolve_new_group_playlist_name(std::string &, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
 
-
-       void build_playlist_menu (Gtk::Menu *);
+       void build_playlist_menu ();
 
        void add_underlay (StreamView*, bool update_xml = true);
        void remove_underlay (StreamView*);
@@ -117,27 +113,18 @@ public:
        
        int set_state (const XMLNode&, int version);
        
-       /* This is a bit nasty to expose :/ */
-       struct RouteAutomationNode {
-               Evoral::Parameter                         param;
-               Gtk::CheckMenuItem*                       menu_item;
-               boost::shared_ptr<AutomationTimeAxisView> track;
-
-               RouteAutomationNode (Evoral::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr<AutomationTimeAxisView> tr)
-                   : param (par), menu_item (mi), track (tr) {}
-       };
-
        virtual void create_automation_child (const Evoral::Parameter& param, bool show) = 0;
 
        /* make sure we get the right version of this */
 
        XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return RouteUI::get_automation_child_xml_node (param); }
 
-       typedef std::map<Evoral::Parameter, RouteAutomationNode*> AutomationTracks;
+       typedef std::map<Evoral::Parameter, boost::shared_ptr<AutomationTimeAxisView> > AutomationTracks;
        AutomationTracks automation_tracks() { return _automation_tracks; }
 
        boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param);
-
+       virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
+       
        std::string         name() const;
        StreamView*         view() const { return _view; }
        ARDOUR::RouteGroup* route_group() const;
@@ -184,11 +171,11 @@ protected:
 
        void update_diskstream_display ();
 
-       gint edit_click  (GdkEventButton *);
+       gint route_group_click  (GdkEventButton *);
 
        void processors_changed (ARDOUR::RouteProcessorChange);
 
-       void add_processor_to_subplugin_menu (boost::weak_ptr<ARDOUR::Processor>);
+       virtual void add_processor_to_subplugin_menu (boost::weak_ptr<ARDOUR::Processor>);
        void remove_processor_automation_node (ProcessorAutomationNode* pan);
 
        void processor_menu_item_toggled (RouteTimeAxisView::ProcessorAutomationInfo*,
@@ -199,9 +186,6 @@ protected:
 
        void automation_track_hidden (Evoral::Parameter param);
        
-       RouteAutomationNode* automation_track(Evoral::Parameter param);
-       RouteAutomationNode* automation_track(ARDOUR::AutomationType type);
-
        ProcessorAutomationNode*
        find_processor_automation_node (boost::shared_ptr<ARDOUR::Processor> i, Evoral::Parameter);
 
@@ -249,9 +233,6 @@ protected:
 
        void timestretch (nframes_t start, nframes_t end);
 
-       void visual_click ();
-       void hide_click ();
-
        void speed_changed ();
 
        void map_frozen ();
@@ -269,10 +250,7 @@ protected:
        Gtk::Button processor_button;
        Gtk::Button route_group_button;
        Gtk::Button playlist_button;
-       Gtk::Button size_button;
        Gtk::Button automation_button;
-       Gtk::Button hide_button;
-       Gtk::Button visual_button;
 
        Gtk::Menu           subplugin_menu;
        Gtk::Menu*          automation_action_menu;
@@ -304,10 +282,12 @@ protected:
        typedef std::vector<boost::shared_ptr<AutomationLine> > ProcessorAutomationCurves;
        ProcessorAutomationCurves processor_automation_curves;
 
-       // Set from XML so context menu automation buttons can be correctly initialized
-       std::set<Evoral::Parameter> _show_automation;
-
        AutomationTracks _automation_tracks;
+       typedef std::map<Evoral::Parameter, Gtk::CheckMenuItem*> ParameterMenuMap;
+       /** parameter -> menu item map for the main automation menu */
+       ParameterMenuMap _main_automation_menu_map;
+       /** parameter -> menu item map for the plugin automation menu */
+       ParameterMenuMap _subplugin_menu_map;
 
        void post_construct ();