X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=413c8be72702e45ae921d6eb5285f099a5393b93;hb=3aefd0e74495c327599c76a918caa1df11064b21;hp=544578c091bde9bf454a2c1f19e8ee625259faaa;hpb=57000d7d5acefcae6d91e7d4c3c95d0a0c47c843;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 544578c091..413c8be727 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -42,20 +41,22 @@ #include "ardour/plugin.h" #include "ardour/plugin_manager.h" - +#include #include "gtkmm2ext/dndtreeview.h" -#include "gtkmm2ext/treeutils.h" - +#include #include "gtkmm2ext/tabbable.h" +#include "gtkmm2ext/treeutils.h" #include "enums.h" -#include "mixer_actor.h" +#include "route_processor_selection.h" namespace ARDOUR { class Route; class RouteGroup; + class VCA; }; +class AxisView; class MixerStrip; class PluginSelector; class MixerGroupTabs; @@ -75,7 +76,7 @@ protected: virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const; }; -class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor +class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr { public: static Mixer_UI* instance(); @@ -85,7 +86,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void show_window (); void set_session (ARDOUR::Session *); - void track_editor_selection (); PluginSelector* plugin_selector(); @@ -104,24 +104,31 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void maximise_mixer_space(); void restore_mixer_space(); - MonitorSection* monitor_section() const { return _monitor_section; } + MonitorSection* monitor_section() const { return _monitor_section; } void deselect_all_strip_processors(); void delete_processors(); void select_strip (MixerStrip&, bool add=false); void select_none (); - bool window_not_visible () const; - void do_vca_assign (boost::shared_ptr); void do_vca_unassign (boost::shared_ptr); - void show_vca_slaves (boost::shared_ptr); - bool showing_vca_slaves_for (boost::shared_ptr) const; + void show_spill (boost::shared_ptr); + bool showing_spill_for (boost::shared_ptr) const; + + sigc::signal1 > show_spill_change; - sigc::signal1 > show_vca_change; + RouteProcessorSelection& selection() { return _selection; } + + void show_editor_window () const; + + void register_actions (); + + void load_bindings (); + Gtkmm2ext::Bindings* bindings; protected: - void set_route_targets_for_operation (); + void set_axis_targets_for_operation (); private: Mixer_UI (); @@ -143,22 +150,23 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p Gtk::Frame track_display_frame; Gtk::Frame group_display_frame; Gtk::Frame favorite_plugins_frame; - Gtk::VPaned rhs_pane1; - Gtk::VPaned rhs_pane2; - Gtk::HPaned inner_pane; + Gtkmm2ext::VPane rhs_pane1; + Gtkmm2ext::VPane rhs_pane2; + Gtkmm2ext::HPane inner_pane; Gtk::HBox strip_packer; Gtk::ScrolledWindow vca_scroller; - Gtk::HBox vca_packer; + Gtk::HBox vca_hpacker; + Gtk::VBox vca_vpacker; + Gtk::EventBox vca_label_bar; + Gtk::Label vca_label; Gtk::EventBox vca_scroller_base; Gtk::HBox out_packer; - Gtk::HPaned list_hpane; + Gtkmm2ext::HPane list_hpane; MixerGroupTabs* _group_tabs; bool on_scroll_event (GdkEventScroll*); - void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*); - std::list strips; void scroller_drag_data_received (const Glib::RefPtr&, int, int, const Gtk::SelectionData&, guint, guint); @@ -166,15 +174,21 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p bool masters_scroller_button_release (GdkEventButton*); void scroll_left (); void scroll_right (); - void toggle_midi_input_active (bool flip_others); + void toggle_midi_input_active (bool flip_others); + + void move_stripable_into_view (boost::shared_ptr); - void add_strips (ARDOUR::RouteList&); + void add_stripables (ARDOUR::StripableList&); + + void add_routes (ARDOUR::RouteList&); void remove_strip (MixerStrip *); void add_masters (ARDOUR::VCAList&); void remove_master (VCAMasterStrip*); - MixerStrip* strip_by_route (boost::shared_ptr); + MixerStrip* strip_by_route (boost::shared_ptr) const; + MixerStrip* strip_by_stripable (boost::shared_ptr) const; + AxisView* axis_by_stripable (boost::shared_ptr) const; void hide_all_strips (bool with_select); void unselect_all_strips(); @@ -225,12 +239,11 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p ARDOUR::PluginPresetPtr selected_plugin (); void initial_track_display (); - void show_track_list_menu (); void set_all_strips_visibility (bool yn); void set_all_audio_midi_visibility (int, bool); - void track_visibility_changed (std::string const & path); - void update_track_visibility (); + void track_visibility_changed (std::string const & path); + void update_track_visibility (); void hide_all_routes (); void show_all_routes (); @@ -260,57 +273,53 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void track_column_click (gint); void build_track_menu (); - MonitorSection* _monitor_section; + MonitorSection* _monitor_section; PluginSelector *_plugin_selector; - void strip_property_changed (const PBD::PropertyChange&, MixerStrip *); + void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr ws); void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &); /* various treeviews */ - struct TrackDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - TrackDisplayModelColumns () { + struct StripableDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { + StripableDisplayModelColumns () { add (text); add (visible); - add (route); + add (stripable); add (strip); - add (vca); } Gtk::TreeModelColumn visible; Gtk::TreeModelColumn text; - Gtk::TreeModelColumn > route; - /* if route is non-null, this must be non-null */ - Gtk::TreeModelColumn strip; - /* if route is null, this may be non-null */ - Gtk::TreeModelColumn vca; + Gtk::TreeModelColumn > stripable; + Gtk::TreeModelColumn strip; }; struct GroupDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - GroupDisplayModelColumns() { - add (visible); - add (text); - add (group); - } - Gtk::TreeModelColumn visible; - Gtk::TreeModelColumn text; - Gtk::TreeModelColumn group; + GroupDisplayModelColumns() { + add (visible); + add (text); + add (group); + } + Gtk::TreeModelColumn visible; + Gtk::TreeModelColumn text; + Gtk::TreeModelColumn group; }; struct PluginsDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - PluginsDisplayModelColumns() { - add (name); - add (plugin); - } - Gtk::TreeModelColumn name; - Gtk::TreeModelColumn plugin; + PluginsDisplayModelColumns() { + add (name); + add (plugin); + } + Gtk::TreeModelColumn name; + Gtk::TreeModelColumn plugin; }; ARDOUR::PluginInfoList favorite_order; std::map favorite_ui_state; - TrackDisplayModelColumns track_columns; - GroupDisplayModelColumns group_columns; - PluginsDisplayModelColumns favorite_plugins_columns; + StripableDisplayModelColumns stripable_columns; + GroupDisplayModelColumns group_columns; + PluginsDisplayModelColumns favorite_plugins_columns; Gtk::TreeView track_display; Gtk::TreeView group_display; @@ -327,10 +336,11 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p Width _strip_width; - void sync_presentation_info_from_treeview (); - void sync_treeview_from_presentation_info (); + void presentation_info_changed (PBD::PropertyChange const &); + void sync_treeview_from_presentation_info (PBD::PropertyChange const &); + void sync_presentation_info_from_treeview (); - bool ignore_reorder; + bool ignore_reorder; void parameter_changed (std::string const &); void set_route_group_activation (ARDOUR::RouteGroup *, bool); @@ -345,16 +355,13 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p it during a session teardown. */ bool _in_group_rebuild_or_clear; - bool _route_deletion_in_progress; + bool _route_deletion_in_progress; void update_title (); MixerStrip* strip_by_x (int x); friend class MixerGroupTabs; - void follow_editor_selection (); - bool _following_editor_selection; - void monitor_section_going_away (); void monitor_section_attached (); @@ -373,7 +380,31 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p // true if mixer list is visible bool _show_mixer_list; - mutable boost::weak_ptr spilled_vca; + mutable boost::weak_ptr spilled_strip; + + void escape (); + + Gtkmm2ext::ActionMap myactions; + RouteProcessorSelection _selection; + AxisViewSelection _axis_targets; + + void vca_assign (boost::shared_ptr); + void vca_unassign (boost::shared_ptr); + + template void control_action (boost::shared_ptr (ARDOUR::Stripable::*get_control)() const); + void solo_action (); + void mute_action (); + void rec_enable_action (); + void step_gain_up_action (); + void step_gain_down_action (); + void unity_gain_action (); + + void copy_processors (); + void cut_processors (); + void paste_processors (); + void select_all_processors (); + void toggle_processors (); + void ab_plugins (); }; #endif /* __ardour_mixer_ui_h__ */