add melvin herr to authors list

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 3e264502a401ad9d5f940329403ae6222b25ae8a..f6d5f0cec009e70354dc7b05f41cf1de684facee 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -34,9 +34,9 @@
 #include <gtkmm/textview.h>
 #include <gtkmm/adjustment.h>
 
-#include <gtkmm2ext/auto_spin.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/slider_controller.h>
+#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;
@@ -98,8 +94,23 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void set_route (boost::shared_ptr<ARDOUR::Route>);
        void set_button_names ();
        void show_send (boost::shared_ptr<ARDOUR::Send>);
+       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<ARDOUR::Delivery> current_delivery () const {
+               return _current_delivery;
+       }
+
+       bool mixer_owned () const {
+               return _mixer_owned;
+       }
 
-       sigc::signal<void>      WidthChanged;
+       sigc::signal<void> WidthChanged;
+
+       /** The delivery that we are handling the level for with our fader has changed */
+       PBD::Signal1<void, boost::weak_ptr<ARDOUR::Delivery> > DeliveryChanged;
 
        static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
        static PBD::Signal1<void,MixerStrip*> CatchDeletion;
@@ -145,9 +156,10 @@ 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  solo_led_box;
        Gtk::Table middle_button_table;
        Gtk::Table bottom_button_table;
 
@@ -175,12 +187,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;
@@ -206,15 +216,13 @@ 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 *);
-
        PBD::ScopedConnection panstate_connection;
        PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
@@ -227,7 +235,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*);
@@ -262,9 +270,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void engine_stopped();
 
        void switch_io (boost::shared_ptr<ARDOUR::Route>);
+       
+       void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
        boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
-       void revert_to_default_display ();
-
+       
        void drop_send ();
        PBD::ScopedConnection send_gone_connection;
 
@@ -273,6 +282,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        static int scrollbar_height;
 
        void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
+       void port_connected_or_disconnected (ARDOUR::Port *, ARDOUR::Port *);
 };
 
 #endif /* __ardour_mixer_strip__ */