X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=48af0f82b25c42ef376ec9b5309329bcaf5674fb;hb=e42699600b92db69a428979dc0412c96f7494141;hp=2130977dbc6a414cabb8598e6dc3821f7f7a12d0;hpb=8ba7e8f4ef6231c04d7833206690a7a291798c61;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 2130977dbc..48af0f82b2 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -32,17 +32,15 @@ #include #include -#include -#include +#include "widgets/ardour_button.h" #include "ardour/playlist.h" #include "ardour/types.h" -#include "ardour_button.h" #include "ardour_dialog.h" #include "route_ui.h" #include "enums.h" -#include "time_axis_view.h" +#include "stripable_time_axis.h" #include "gain_meter.h" namespace ARDOUR { @@ -72,7 +70,7 @@ class TimeSelection; class RouteGroupMenu; class ItemCounts; -class RouteTimeAxisView : public RouteUI, public TimeAxisView +class RouteTimeAxisView : public RouteUI, public StripableTimeAxisView { public: RouteTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); @@ -92,22 +90,22 @@ public: void set_samples_per_pixel (double); void set_height (uint32_t h, TrackHeightMode m = OnlySelf); - void show_timestretch (framepos_t start, framepos_t end, int layers, int layer); + void show_timestretch (samplepos_t start, samplepos_t end, int layers, int layer); void hide_timestretch (); void selection_click (GdkEventButton*); void set_selected_points (PointSelection&); void set_selected_regionviews (RegionSelection&); - void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list&, bool within = false); + void get_selectables (ARDOUR::samplepos_t start, ARDOUR::samplepos_t end, double top, double bot, std::list&, bool within = false); void get_inverted_selectables (Selection&, std::list&); void set_layer_display (LayerDisplay d, bool apply_to_selection = false); LayerDisplay layer_display () const; - boost::shared_ptr find_next_region (framepos_t pos, ARDOUR::RegionPoint, int32_t dir); - framepos_t find_next_region_boundary (framepos_t pos, int32_t dir); + boost::shared_ptr find_next_region (samplepos_t pos, ARDOUR::RegionPoint, int32_t dir); + samplepos_t find_next_region_boundary (samplepos_t pos, int32_t dir); /* Editing operations */ void cut_copy_clear (Selection&, Editing::CutCopyOp); - bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num); + bool paste (ARDOUR::samplepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num); RegionView* combine_regions (); void uncombine_regions (); void uncombine_region (RegionView*); @@ -129,12 +127,6 @@ public: int set_state (const XMLNode&, int version); - virtual void create_automation_child (const Evoral::Parameter& param, bool show) = 0; - - typedef std::map > AutomationTracks; - const AutomationTracks& automation_tracks() const { return _automation_tracks; } - - boost::shared_ptr automation_child(Evoral::Parameter param); virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter); StreamView* view() const { return _view; } @@ -161,22 +153,22 @@ protected: boost::shared_ptr view; RouteTimeAxisView& parent; - ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) + ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) : what (w), menu_item (mitem), parent (p) {} - ~ProcessorAutomationNode (); + ~ProcessorAutomationNode (); }; struct ProcessorAutomationInfo { - boost::shared_ptr processor; - bool valid; - Gtk::Menu* menu; - std::vector lines; + boost::shared_ptr processor; + bool valid; + Gtk::Menu* menu; + std::vector lines; - ProcessorAutomationInfo (boost::shared_ptr i) + ProcessorAutomationInfo (boost::shared_ptr i) : processor (i), valid (true), menu (0) {} - ~ProcessorAutomationInfo (); + ~ProcessorAutomationInfo (); }; @@ -184,7 +176,7 @@ protected: bool route_group_click (GdkEventButton *); - void processors_changed (ARDOUR::RouteProcessorChange); + virtual void processors_changed (ARDOUR::RouteProcessorChange); virtual void add_processor_to_subplugin_menu (boost::weak_ptr); void remove_processor_automation_node (ProcessorAutomationNode* pan); @@ -195,7 +187,6 @@ protected: void processor_automation_track_hidden (ProcessorAutomationNode*, boost::shared_ptr); - void automation_track_hidden (Evoral::Parameter param); ProcessorAutomationNode* find_processor_automation_node (boost::shared_ptr i, Evoral::Parameter); @@ -206,7 +197,6 @@ protected: void add_processor_automation_curve (boost::shared_ptr r, Evoral::Parameter); void add_existing_processor_automation_curves (boost::weak_ptr); - void add_automation_child(Evoral::Parameter param, boost::shared_ptr track, bool show=true); void reset_processor_automation_curves (); @@ -214,12 +204,12 @@ protected: void route_property_changed (const PBD::PropertyChange&); bool name_entry_changed (std::string const&); + virtual void toggle_channel_selector () {} + void blink_rec_display (bool onoff); virtual void label_view (); - void reset_samples_per_pixel (); - virtual void build_automation_action_menu (bool); virtual void append_extra_display_menu_items () {} void build_display_menu (); @@ -238,7 +228,7 @@ protected: virtual void show_existing_automation (bool apply_to_selection = false); virtual void hide_all_automation (bool apply_to_selection = false); - void timestretch (framepos_t start, framepos_t end); + void timestretch (samplepos_t start, samplepos_t end); void speed_changed (); void map_frozen (); void color_handler (); @@ -248,22 +238,16 @@ protected: void create_mute_automation_child (const Evoral::Parameter &, bool); void setup_processor_menu_and_curves (); void route_color_changed (); - bool can_edit_name() const; - - boost::shared_ptr gain_track; - boost::shared_ptr trim_track; - boost::shared_ptr mute_track; + bool can_edit_name() const; StreamView* _view; - ArdourCanvas::Canvas& parent_canvas; - bool no_redraw; Gtk::HBox other_button_hbox; Gtk::Table button_table; - ArdourButton route_group_button; - ArdourButton playlist_button; - ArdourButton automation_button; - ArdourButton number_label; + ArdourWidgets::ArdourButton route_group_button; + ArdourWidgets::ArdourButton playlist_button; + ArdourWidgets::ArdourButton automation_button; + ArdourWidgets::ArdourButton number_label; Gtk::Menu subplugin_menu; Gtk::Menu* automation_action_menu; @@ -280,10 +264,6 @@ protected: ArdourCanvas::Rectangle* timestretch_rect; -#ifdef XXX_OLD_DESTRUCTIVE_API_XXX - void set_track_mode (ARDOUR::TrackMode, bool apply_to_selection = false); -#endif - /** Information about all automatable processor parameters that apply to * this route. The Amp processor is not included in this list. */ @@ -291,11 +271,6 @@ protected: typedef std::vector > ProcessorAutomationCurves; ProcessorAutomationCurves processor_automation_curves; - - AutomationTracks _automation_tracks; - typedef std::map 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; @@ -314,9 +289,6 @@ protected: bool _ignore_set_layer_display; protected: - void update_gain_track_visibility (); - void update_trim_track_visibility (); - void update_mute_track_visibility (); void update_pan_track_visibility (); /** Ensure that we have the appropriate automation lanes for panners. @@ -325,9 +297,6 @@ protected: */ void ensure_pan_views (bool show = true); - Gtk::CheckMenuItem* gain_automation_item; - Gtk::CheckMenuItem* trim_automation_item; - Gtk::CheckMenuItem* mute_automation_item; std::list > pan_tracks; Gtk::CheckMenuItem* pan_automation_item; @@ -337,6 +306,10 @@ private: void update_playlist_tip (); void parameter_changed (std::string const & p); void update_track_number_visibility(); + + void drop_instrument_ref (); + void reread_midnam (); + PBD::ScopedConnectionList midnam_connection; }; #endif /* __ardour_route_time_axis_h__ */