X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.h;h=ef35bf237d9e49d4c2076d95bcd1151037e74372;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=891d3a4d8dbdfe335a4421ab09186d584714a771;hpb=155338d168b362dd135597695aaa1e419831a277;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 891d3a4d8d..ef35bf237d 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include "gtkmm2ext/auto_spin.h" +#include "gtkmm2ext/click_box.h" +#include "gtkmm2ext/bindable_button.h" #include "pbd/stateful.h" @@ -53,10 +53,6 @@ #include "processor_box.h" #include "ardour_dialog.h" -namespace Gtkmm2ext { - class SliderController; -} - namespace ARDOUR { class Route; class Send; @@ -79,8 +75,8 @@ class RouteGroupMenu; class MixerStrip : public RouteUI, public Gtk::EventBox { public: - MixerStrip (Mixer_UI&, ARDOUR::Session&, boost::shared_ptr, bool in_mixer = true); - MixerStrip (Mixer_UI&, ARDOUR::Session&, bool in_mixer = true); + MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr, bool in_mixer = true); + MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true); ~MixerStrip (); void set_width_enum (Width, void* owner); @@ -89,7 +85,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox GainMeter& gain_meter() { return gpm; } PannerUI& panner_ui() { return panners; } - PluginSelector& plugin_selector(); + PluginSelector* plugin_selector(); void fast_update (); void set_embedded (bool); @@ -97,10 +93,29 @@ class MixerStrip : public RouteUI, public Gtk::EventBox ARDOUR::RouteGroup* route_group() const; void set_route (boost::shared_ptr); void set_button_names (); + void show_send (boost::shared_ptr); + void revert_to_default_display (); + + /** @return the delivery that is being edited using our fader; it will be the + * last send passed to ::show_send, or our route's main out delivery. + */ + boost::shared_ptr current_delivery () const { + return _current_delivery; + } + + bool mixer_owned () const { + return _mixer_owned; + } + + void hide_things (); + + sigc::signal WidthChanged; - sigc::signal WidthChanged; + /** The delivery that we are handling the level for with our fader has changed */ + PBD::Signal1 > DeliveryChanged; static sigc::signal > SwitchIO; + static PBD::Signal1 CatchDeletion; protected: friend class Mixer_UI; @@ -143,18 +158,22 @@ class MixerStrip : public RouteUI, public Gtk::EventBox ProcessorBox processor_box; GainMeter gpm; PannerUI panners; - Gtk::ToggleButton _mono_button; Gtk::Table button_table; + Gtk::Table solo_led_table; + Gtk::HBox below_panner_box; Gtk::Table middle_button_table; Gtk::Table bottom_button_table; + Gtk::Label* _iso_label; + Gtk::Label* _safe_label; + Gtk::Button gain_unit_button; Gtk::Label gain_unit_label; Gtk::Button meter_point_button; Gtk::Label meter_point_label; - void meter_changed (void *); + void meter_changed (); Gtk::Button diskstream_button; Gtk::Label diskstream_label; @@ -164,7 +183,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox Gtk::Button output_button; Gtk::Label output_label; - sigc::connection newplug_connection; + std::string longest_label; gint mark_update_safe (); guint32 mode_switch_in_progress; @@ -173,12 +192,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox ArdourDialog* comment_window; Gtk::TextView* comment_area; - Gtk::Button comment_button; - void comment_editor_done_editing(); + void comment_editor_done_editing (); void setup_comment_editor (); - void comment_button_clicked (); - void mono_button_clicked (); + void toggle_comment (); Gtk::Button group_button; Gtk::Label group_label; @@ -187,10 +204,12 @@ class MixerStrip : public RouteUI, public Gtk::EventBox gint input_press (GdkEventButton *); gint output_press (GdkEventButton *); - Gtk::Menu input_menu; + Gtk::Menu input_menu; + std::list > input_menu_bundles; void maybe_add_bundle_to_input_menu (boost::shared_ptr, ARDOUR::BundleList const &); Gtk::Menu output_menu; + std::list > output_menu_bundles; void maybe_add_bundle_to_output_menu (boost::shared_ptr, ARDOUR::BundleList const &); void bundle_input_toggled (boost::shared_ptr); @@ -202,17 +221,15 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void diskstream_changed (); Gtk::Menu *send_action_menu; + Gtk::CheckMenuItem* _comment_menu_item; Gtk::MenuItem* rename_menu_item; void build_send_action_menu (); void new_send (); void show_send_controls (); - void input_changed (ARDOUR::IOChange, void *); - void output_changed (ARDOUR::IOChange, void *); - - sigc::connection panstate_connection; - sigc::connection panstyle_connection; + PBD::ScopedConnection panstate_connection; + PBD::ScopedConnection panstyle_connection; void connect_to_pan (); void update_diskstream_display (); @@ -223,7 +240,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox Gtk::Menu* route_ops_menu; void build_route_ops_menu (); - gint name_button_button_press (GdkEventButton*); + gboolean name_button_button_press (GdkEventButton*); void list_route_operations (); gint comment_key_release_handler (GdkEventKey*); @@ -231,9 +248,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void comment_edited (); bool ignore_comment_edit; - void set_route_group (ARDOUR::RouteGroup *); bool select_route_group (GdkEventButton *); - void route_group_changed (void *); + void route_group_changed (); IOSelectorWindow *input_selector; IOSelectorWindow *output_selector; @@ -244,8 +260,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void show_route_color (); void show_passthru_color (); - void route_active_changed (); - void name_changed (); void update_speed_display (); void map_frozen (); @@ -258,12 +272,21 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void engine_stopped(); void switch_io (boost::shared_ptr); + + void set_current_delivery (boost::shared_ptr); boost::shared_ptr _current_delivery; - void revert_to_default_display (); + + void drop_send (); + PBD::ScopedConnection send_gone_connection; + + void reset_strip_style (); static int scrollbar_height; void update_io_button (boost::shared_ptr route, Width width, bool input_button); + void port_connected_or_disconnected (ARDOUR::Port *, ARDOUR::Port *); + + static std::string meter_point_string (ARDOUR::MeterPoint); }; #endif /* __ardour_mixer_strip__ */