X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=cc0e46548e3cf5338c965f8fbe5f8c3a922f1ff8;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=6978524246103ce9f48cc4157314c82679e53657;hpb=1b657585572298d1a69a7b43e611f59b7e185df3;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 6978524246..cc0e46548e 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -20,6 +20,9 @@ #ifndef __ardour_route_time_axis_h__ #define __ardour_route_time_axis_h__ +#include +#include + #include #include #include @@ -27,18 +30,20 @@ #include #include #include +#include #include -#include +#include -#include +#include "ardour/playlist.h" +#include "ardour/types.h" #include "ardour_dialog.h" #include "route_ui.h" #include "enums.h" #include "time_axis_view.h" #include "canvas.h" -#include "level_meter.h" +#include "gain_meter.h" namespace ARDOUR { @@ -72,16 +77,17 @@ public: void show_selection (TimeSelection&); void set_samples_per_unit (double); - void set_height (TimeAxisView::TrackHeight); + void set_height (uint32_t h); void show_timestretch (nframes_t start, nframes_t end); void hide_timestretch (); 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&); - bool show_automation(ARDOUR::Parameter param); + 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; boost::shared_ptr find_next_region (nframes_t pos, ARDOUR::RegionPoint, int32_t dir); nframes64_t find_next_region_boundary (nframes64_t pos, int32_t dir); @@ -93,9 +99,13 @@ public: TimeAxisView::Children get_child_list(); /* The editor calls these when mapping an operation across multiple tracks */ - void use_new_playlist (bool prompt); - void use_copy_playlist (bool prompt); + 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 &, std::vector > const &); + void build_playlist_menu (Gtk::Menu *); @@ -103,24 +113,30 @@ public: void remove_underlay (StreamView*); void build_underlay_menu(Gtk::Menu*); + int set_state (const XMLNode&); + /* This is a bit nasty to expose :/ */ struct RouteAutomationNode { - ARDOUR::Parameter param; - Gtk::CheckMenuItem* menu_item; + Evoral::Parameter param; + Gtk::CheckMenuItem* menu_item; boost::shared_ptr track; - RouteAutomationNode (ARDOUR::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr tr) + RouteAutomationNode (Evoral::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr tr) : param (par), menu_item (mi), track (tr) {} }; - virtual void create_automation_child (ARDOUR::Parameter param, bool show) = 0; + 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 map AutomationTracks; + typedef std::map AutomationTracks; AutomationTracks automation_tracks() { return _automation_tracks; } - boost::shared_ptr automation_child(ARDOUR::Parameter param); + 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; boost::shared_ptr playlist() const; @@ -132,17 +148,20 @@ public: void clear_meter (); void io_changed (ARDOUR::IOChange, void *); void meter_changed (void *); + void effective_gain_display () { gm.effective_gain_display(); } + + static void setup_slider_pix (); protected: friend class StreamView; struct ProcessorAutomationNode { - ARDOUR::Parameter what; - Gtk::CheckMenuItem* menu_item; + Evoral::Parameter what; + Gtk::CheckMenuItem* menu_item; boost::shared_ptr view; - RouteTimeAxisView& parent; + RouteTimeAxisView& parent; - ProcessorAutomationNode (ARDOUR::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) + ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) : what (w), menu_item (mitem), parent (p) {} ~ProcessorAutomationNode (); @@ -152,7 +171,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) {} @@ -168,7 +187,7 @@ protected: void processors_changed (); - void add_processor_to_subplugin_menu (boost::shared_ptr); + void add_processor_to_subplugin_menu (boost::weak_ptr); void remove_processor_automation_node (ProcessorAutomationNode* pan); void processor_menu_item_toggled (RouteTimeAxisView::ProcessorAutomationInfo*, @@ -177,21 +196,21 @@ protected: void processor_automation_track_hidden (ProcessorAutomationNode*, boost::shared_ptr); - void automation_track_hidden (ARDOUR::Parameter param); + void automation_track_hidden (Evoral::Parameter param); - RouteAutomationNode* automation_track(ARDOUR::Parameter param); + RouteAutomationNode* automation_track(Evoral::Parameter param); RouteAutomationNode* automation_track(ARDOUR::AutomationType type); ProcessorAutomationNode* - find_processor_automation_node (boost::shared_ptr i, ARDOUR::Parameter); + find_processor_automation_node (boost::shared_ptr i, Evoral::Parameter); boost::shared_ptr - find_processor_automation_curve (boost::shared_ptr i, ARDOUR::Parameter); + find_processor_automation_curve (boost::shared_ptr i, Evoral::Parameter); - void add_processor_automation_curve (boost::shared_ptr r, ARDOUR::Parameter); - void add_existing_processor_automation_curves (boost::shared_ptr); + void add_processor_automation_curve (boost::shared_ptr r, Evoral::Parameter); + void add_existing_processor_automation_curves (boost::weak_ptr); - void add_automation_child(ARDOUR::Parameter param, boost::shared_ptr track, bool show=true); + void add_automation_child(Evoral::Parameter param, boost::shared_ptr track, bool show=true); void reset_processor_automation_curves (); @@ -226,7 +245,7 @@ protected: void rename_current_playlist (); void automation_click (); - void toggle_automation_track (ARDOUR::Parameter param); + void toggle_automation_track (Evoral::Parameter param); virtual void show_all_automation (); virtual void show_existing_automation (); virtual void hide_all_automation (); @@ -264,29 +283,32 @@ protected: Gtk::RadioMenuItem* align_existing_item; Gtk::RadioMenuItem* align_capture_item; Gtk::RadioMenuItem* normal_track_mode_item; + Gtk::RadioMenuItem* non_layered_track_mode_item; Gtk::RadioMenuItem* destructive_track_mode_item; Gtk::Menu* playlist_menu; Gtk::Menu* playlist_action_menu; Gtk::MenuItem* playlist_item; Gtk::Menu* mode_menu; + Gtk::Menu* color_mode_menu; - virtual Gtk::Menu* build_mode_menu() { return NULL; } + virtual Gtk::Menu* build_mode_menu() { return 0; } + virtual Gtk::Menu* build_color_mode_menu() { return 0; } void use_playlist (boost::weak_ptr); ArdourCanvas::SimpleRect* timestretch_rect; void set_track_mode (ARDOUR::TrackMode); - void _set_track_mode (ARDOUR::Track* track, ARDOUR::TrackMode mode, Gtk::RadioMenuItem* reset_item); + 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 - set _show_automation; + std::set _show_automation; AutomationTracks _automation_tracks; @@ -294,18 +316,16 @@ protected: void post_construct (); - void set_state (const XMLNode&); - - XMLNode* get_automation_child_xml_node (ARDOUR::Parameter param); + GainMeterBase gm; - LevelMeter lm; + static Glib::RefPtr slider; 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; };