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 46f5abd82f3e18929d633bfa88c44b24077df6af..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"
@@ -179,10 +180,13 @@ 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&);
 
@@ -202,6 +206,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        ArdourButton   _comment_button;
 
+       ArdourKnob     trim_control;
+
        void setup_comment_button ();
 
        ArdourButton   group_button;
@@ -231,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 ();