NSM preparation for OSX and windows

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 517cab08583959c25b98cdd2149b12793d8501e5..9133d2981fdec157d38b359cde11894135af6ee8 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"
@@ -69,7 +70,6 @@ namespace Gtk {
 }
 
 class Mixer_UI;
-class IOSelectorWindow;
 class MotionController;
 class RouteGroupMenu;
 class ArdourWindow;
@@ -172,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;
@@ -185,6 +184,9 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        ArdourButton input_button;
        ArdourButton output_button;
 
+       void input_button_resized (Gtk::Allocation&);
+       void output_button_resized (Gtk::Allocation&);
+
        ArdourButton* midi_input_enable_button;
        Gtk::HBox   input_button_box;
 
@@ -201,13 +203,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;
@@ -220,9 +227,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle>);
        void bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle>);
 
-       void edit_input_configuration ();
-       void edit_output_configuration ();
-
        void diskstream_changed ();
        void io_changed_proxy ();
 
@@ -247,15 +251,13 @@ 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 ();
 
        bool select_route_group (GdkEventButton *);
        void route_group_changed ();
 
-       IOSelectorWindow *input_selector;
-       IOSelectorWindow *output_selector;
-
        Gtk::Style *passthru_style;
 
        void route_color_changed ();
@@ -279,7 +281,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        virtual void bus_send_display_changed (boost::shared_ptr<ARDOUR::Route>);
 
        void set_current_delivery (boost::shared_ptr<ARDOUR::Delivery>);
-       boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
 
        void drop_send ();
        PBD::ScopedConnection send_gone_connection;