X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=1dd4b8de92cdb61954d1ddf84e91723e6da015b3;hb=69777d600fe2e1e034d24551ac9faec2c2481584;hp=fecd1750813d028ef1eef576aef23a88424ac94d;hpb=4c66e36b91df4e49effef77ad01c905ccedff730;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index fecd175081..1dd4b8de92 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -26,10 +26,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include "pbd/stateful.h" @@ -43,11 +45,14 @@ #include #include "gtkmm2ext/dndtreeview.h" -#include -#include "gtkmm2ext/tabbable.h" #include "gtkmm2ext/treeutils.h" +#include "widgets/pane.h" +#include "widgets/tabbable.h" + +#include "axis_provider.h" #include "enums.h" +#include "monitor_section.h" #include "route_processor_selection.h" namespace ARDOUR { @@ -76,9 +81,9 @@ 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 +class Mixer_UI : public ArdourWidgets::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider { - public: +public: static Mixer_UI* instance(); ~Mixer_UI(); @@ -86,7 +91,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(); @@ -96,8 +100,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p XMLNode& get_state (); int set_state (const XMLNode&, int /* version */); - void show_mixer_list (bool yn); - void show_monitor_section (bool); + void save_plugin_order_file (); void show_strip (MixerStrip *); void hide_strip (MixerStrip *); @@ -105,32 +108,50 @@ 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() { 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 select_next_strip (); + void select_prev_strip (); 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_vca_change; + sigc::signal1 > show_spill_change; RouteProcessorSelection& selection() { return _selection; } + + void show_editor_window () const; + void register_actions (); - void load_bindings (); - Gtkmm2ext::Bindings* bindings; + void load_bindings (); + Gtkmm2ext::Bindings* bindings; - protected: + void toggle_mixer_list (); + void showhide_mixer_list (bool yn); + + void toggle_monitor_section (); + void showhide_monitor_section (bool); + + void toggle_vcas (); + void showhide_vcas (bool on); + +#ifdef MIXBUS + void toggle_mixbuses (); + void showhide_mixbusses (bool on); +#endif + +protected: void set_axis_targets_for_operation (); + ARDOUR::AutomationControlSet selected_gaincontrols (); - private: +private: Mixer_UI (); static Mixer_UI* _instance; Gtk::VBox _content; @@ -142,7 +163,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p Gtk::VBox mixer_scroller_vpacker; Gtk::VBox list_vpacker; Gtk::Label group_display_button_label; - Gtk::Button group_display_button; Gtk::ScrolledWindow track_display_scroller; Gtk::ScrolledWindow group_display_scroller; Gtk::ScrolledWindow favorite_plugins_scroller; @@ -150,9 +170,11 @@ 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; - Gtkmm2ext::VPane rhs_pane1; - Gtkmm2ext::VPane rhs_pane2; - Gtkmm2ext::HPane inner_pane; + Gtk::VBox favorite_plugins_vbox; + Gtk::ComboBoxText favorite_plugins_tag_combo; + ArdourWidgets::VPane rhs_pane1; + ArdourWidgets::VPane rhs_pane2; + ArdourWidgets::HPane inner_pane; Gtk::HBox strip_packer; Gtk::ScrolledWindow vca_scroller; Gtk::HBox vca_hpacker; @@ -161,7 +183,9 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p Gtk::Label vca_label; Gtk::EventBox vca_scroller_base; Gtk::HBox out_packer; - Gtkmm2ext::HPane list_hpane; + ArdourWidgets::HPane list_hpane; + Gtk::Button add_button; // should really be an ArdourButton + Gtk::Button add_vca_button; MixerGroupTabs* _group_tabs; @@ -187,18 +211,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void remove_master (VCAMasterStrip*); MixerStrip* strip_by_route (boost::shared_ptr) const; - AxisView* axis_by_stripable (boost::shared_ptr) const; + MixerStrip* strip_by_stripable (boost::shared_ptr) const; - void hide_all_strips (bool with_select); - void unselect_all_strips(); - void select_all_strips (); - void unselect_all_audiotrack_strips (); - void select_all_audiotrack_strips (); - void unselect_all_audiobus_strips (); - void select_all_audiobus_strips (); - - void strip_select_op (bool audiotrack, bool select); - void select_strip_op (MixerStrip*, bool select); + AxisView* axis_view_by_stripable (boost::shared_ptr) const; + AxisView* axis_view_by_control (boost::shared_ptr) const; gint start_updating (); gint stop_updating (); @@ -238,7 +254,6 @@ 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); @@ -273,8 +288,8 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void track_column_click (gint); void build_track_menu (); - MonitorSection* _monitor_section; - PluginSelector *_plugin_selector; + MonitorSection _monitor_section; + PluginSelector *_plugin_selector; void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr ws); void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &); @@ -333,11 +348,14 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p void group_display_selection_changed (); bool strip_button_release_event (GdkEventButton*, MixerStrip*); + bool vca_button_release_event (GdkEventButton*, VCAMasterStrip*); Width _strip_width; + double _spill_scroll_position; + void presentation_info_changed (PBD::PropertyChange const &); + void sync_treeview_from_presentation_info (PBD::PropertyChange const &); void sync_presentation_info_from_treeview (); - void sync_treeview_from_presentation_info (); bool ignore_reorder; @@ -351,8 +369,8 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p static const int32_t default_height = 765; /** true if we are rebuilding the route group list, or clearing - it during a session teardown. - */ + * it during a session teardown. + */ bool _in_group_rebuild_or_clear; bool _route_deletion_in_progress; @@ -361,17 +379,20 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p friend class MixerGroupTabs; - void follow_editor_selection (); - bool _following_editor_selection; - void monitor_section_going_away (); - void monitor_section_attached (); void monitor_section_detached (); void store_current_favorite_order(); void refiller (ARDOUR::PluginInfoList& result, const ARDOUR::PluginInfoList& plugs); + + void plugin_list_changed (); + void refill_favorite_plugins (); + void refill_tag_combo (); + + void tag_combo_changed (); + void sync_treeview_from_favorite_order (); void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&); void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path); @@ -379,14 +400,12 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p /// true if we are in fullscreen mode bool _maximised; - // true if mixer list is visible - bool _show_mixer_list; + bool _strip_selection_change_without_scroll; - mutable boost::weak_ptr spilled_vca; + mutable boost::weak_ptr spilled_strip; void escape (); - Gtkmm2ext::ActionMap myactions; RouteProcessorSelection _selection; AxisViewSelection _axis_targets;