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 239d2b512fb65610cebf2b763b0b33764cf5b864..840b18ed143dd4e6d9b81b1027eeca7a43fab221 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -83,7 +83,7 @@ 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*>&);
        void set_layer_display (LayerDisplay d);
        LayerDisplay layer_display () const;
@@ -92,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);
 
@@ -107,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*);
@@ -126,7 +123,7 @@ public:
        AutomationTracks automation_tracks() { return _automation_tracks; }
 
        boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param);
-       Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
+       virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
        
        std::string         name() const;
        StreamView*         view() const { return _view; }
@@ -174,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*,
@@ -287,7 +284,10 @@ protected:
 
        AutomationTracks _automation_tracks;
        typedef std::map<Evoral::Parameter, Gtk::CheckMenuItem*> ParameterMenuMap;
-       ParameterMenuMap _parameter_menu_map;
+       /** 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 ();