X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=95cbfa8c76e6760e97bd00ed0563e8fad479dd4e;hb=4b5426eddefd742caa13f9539260ab97bc528a68;hp=9c386bafa3656dd394042015f96cb9aa0eb4b01d;hpb=0d36301907afd612f93a7bfa53724cc9a17724de;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 9c386bafa3..95cbfa8c76 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -45,7 +45,6 @@ #include "canvas.h" #include "gain_meter.h" - namespace ARDOUR { class Session; class Region; @@ -67,6 +66,7 @@ class AutomationTimeAxisView; class AutomationLine; class ProcessorAutomationLine; class TimeSelection; +class RouteGroupMenu; class RouteTimeAxisView : public RouteUI, public TimeAxisView { @@ -75,6 +75,7 @@ public: virtual ~RouteTimeAxisView (); void show_selection (TimeSelection&); + void set_button_names (); void set_samples_per_unit (double); void set_height (uint32_t h); @@ -83,8 +84,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, list&); - void get_inverted_selectables (Selection&, list&); + void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list&); + void get_inverted_selectables (Selection&, std::list&); bool show_automation(Evoral::Parameter param); void set_layer_display (LayerDisplay d); LayerDisplay layer_display () const; @@ -99,12 +100,12 @@ public: TimeAxisView::Children get_child_list(); /* The editor calls these when mapping an operation across multiple tracks */ - void use_new_playlist (bool prompt, vector > const &); - void use_copy_playlist (bool prompt, vector > const &); + void use_new_playlist (bool prompt, std::vector > const &); + void use_copy_playlist (bool prompt, std::vector > const &); void clear_playlist (); /* group playlist name resolving */ - std::string resolve_new_group_playlist_name(std::string &, vector > const &); + std::string resolve_new_group_playlist_name(std::string &, std::vector > const &); void build_playlist_menu (Gtk::Menu *); @@ -118,7 +119,7 @@ public: /* This is a bit nasty to expose :/ */ struct RouteAutomationNode { Evoral::Parameter param; - Gtk::CheckMenuItem* menu_item; + Gtk::CheckMenuItem* menu_item; boost::shared_ptr track; RouteAutomationNode (Evoral::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr tr) @@ -131,14 +132,14 @@ public: XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return RouteUI::get_automation_child_xml_node (param); } - typedef map AutomationTracks; + typedef std::map AutomationTracks; AutomationTracks automation_tracks() { return _automation_tracks; } boost::shared_ptr automation_child(Evoral::Parameter param); - string name() const; + std::string name() const; StreamView* view() const { return _view; } - ARDOUR::RouteGroup* edit_group() const; + ARDOUR::RouteGroup* route_group() const; boost::shared_ptr playlist() const; void fast_update (); @@ -157,9 +158,9 @@ protected: struct ProcessorAutomationNode { Evoral::Parameter what; - Gtk::CheckMenuItem* menu_item; + Gtk::CheckMenuItem* menu_item; boost::shared_ptr view; - RouteTimeAxisView& parent; + RouteTimeAxisView& parent; ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) : what (w), menu_item (mitem), parent (p) {} @@ -171,7 +172,7 @@ protected: boost::shared_ptr processor; bool valid; Gtk::Menu* menu; - vector lines; + std::vector lines; ProcessorAutomationInfo (boost::shared_ptr i) : processor (i), valid (true), menu (0) {} @@ -222,8 +223,7 @@ protected: virtual void label_view (); - void add_edit_group_menu_item (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*); - void set_edit_group_from_menu (ARDOUR::RouteGroup *); + void set_route_group_from_menu (ARDOUR::RouteGroup *); void reset_samples_per_unit (); @@ -236,11 +236,9 @@ protected: void align_style_changed (); void set_align_style (ARDOUR::AlignStyle); - virtual void set_playlist (boost::shared_ptr); void playlist_click (); void show_playlist_selector (); void playlist_changed (); - void playlist_modified (); void rename_current_playlist (); @@ -270,7 +268,7 @@ protected: Gtk::HBox other_button_hbox; Gtk::Table button_table; Gtk::Button processor_button; - Gtk::Button edit_group_button; + Gtk::Button route_group_button; Gtk::Button playlist_button; Gtk::Button size_button; Gtk::Button automation_button; @@ -279,7 +277,7 @@ protected: Gtk::Menu subplugin_menu; Gtk::Menu* automation_action_menu; - Gtk::Menu edit_group_menu; + RouteGroupMenu* route_group_menu; Gtk::RadioMenuItem* align_existing_item; Gtk::RadioMenuItem* align_capture_item; Gtk::RadioMenuItem* normal_track_mode_item; @@ -302,9 +300,9 @@ protected: void _set_track_mode (ARDOUR::Track* track, ARDOUR::TrackMode mode, Gtk::RadioMenuItem* reset_item, Gtk::RadioMenuItem* reset_item_2); void track_mode_changed (); - list processor_automation; + std::list processor_automation; - typedef vector > ProcessorAutomationCurves; + typedef std::vector > ProcessorAutomationCurves; ProcessorAutomationCurves processor_automation_curves; // Set from XML so context menu automation buttons can be correctly initialized @@ -312,8 +310,6 @@ protected: AutomationTracks _automation_tracks; - sigc::connection modified_connection; - void post_construct (); GainMeterBase gm; @@ -323,9 +319,9 @@ protected: XMLNode* underlay_xml_node; bool set_underlay_state(); - typedef list UnderlayList; + typedef std::list UnderlayList; UnderlayList _underlay_streams; - typedef list UnderlayMirrorList; + typedef std::list UnderlayMirrorList; UnderlayMirrorList _underlay_mirrors; };