Tempo ramps - code layout, check_solved() is lock-style agnostic, remove uncalled...

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index ba7ef6d9e3b202c31a06644dbf6ed8aa71ea5c76..71d419a45896a12c2b71343b4985a2b206f2aa73 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -47,6 +47,7 @@
 
 #include "pbd/fastlog.h"
 
+#include "ardour_knob.h"
 #include "route_ui.h"
 #include "gain_meter.h"
 #include "panner_ui.h"
@@ -171,7 +172,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        Glib::RefPtr<Gtk::SizeGroup> button_size_group;
 
-       Gtk::Table button_table;
        Gtk::Table rec_mon_table;
        Gtk::Table solo_iso_table;
        Gtk::Table mute_solo_table;
@@ -180,10 +180,16 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        ArdourButton                 meter_point_button;
 
        void meter_changed ();
+       void monitor_changed ();
 
        ArdourButton input_button;
        ArdourButton output_button;
 
+       ArdourButton* monitor_section_button;
+
+       void input_button_resized (Gtk::Allocation&);
+       void output_button_resized (Gtk::Allocation&);
+
        ArdourButton* midi_input_enable_button;
        Gtk::HBox   input_button_box;
 
@@ -200,13 +206,18 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        ArdourButton   _comment_button;
 
+       ArdourKnob     trim_control;
+
        void setup_comment_button ();
 
        ArdourButton   group_button;
        RouteGroupMenu *group_menu;
 
        gint input_press (GdkEventButton *);
+       gint input_release (GdkEventButton *);
+
        gint output_press (GdkEventButton *);
+       gint output_release (GdkEventButton *);
 
        Gtk::Menu input_menu;
        std::list<boost::shared_ptr<ARDOUR::Bundle> > input_menu_bundles;
@@ -226,9 +237,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::MenuItem* rename_menu_item;
        void build_send_action_menu ();
 
-       void new_send ();
-       void show_send_controls ();
-
        PBD::ScopedConnection panstate_connection;
        PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
@@ -243,6 +251,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::Menu* route_ops_menu;
        void build_route_ops_menu ();
        gboolean name_button_button_press (GdkEventButton*);
+       gboolean name_button_button_release (GdkEventButton*);
        gboolean number_button_button_press (GdkEventButton*);
        void list_route_operations ();