Remove special handling of session range in export. Fixes things when the session...

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 8e0100ed75b0b4511553a3017cf76b1e4a9cae90..4a2865c33959d4f323e2a48867b88880b073b16e 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -149,15 +149,15 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Width _width;
        void*  _width_owner;
 
-       Gtk::Button         hide_button;
-       Gtk::Button         width_button;
+       ArdourButton         hide_button;
+       ArdourButton         width_button;
        Gtk::HBox           width_hide_box;
        Gtk::VBox           whvbox;
        Gtk::EventBox       top_event_box;
        Gtk::EventBox*      spacer;
 
        void hide_clicked();
-       void width_clicked ();
+       bool width_button_pressed (GdkEventButton *);
 
        Gtk::Frame          global_frame;
        Gtk::VBox           global_vpacker;
@@ -174,22 +174,15 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::Table middle_button_table;
        Gtk::Table bottom_button_table;
 
-       Gtk::Button                  gain_unit_button;
-       Gtk::Label                   gain_unit_label;
-       Gtk::Button                  meter_point_button;
-       Gtk::Label                   meter_point_label;
+       ArdourButton                 meter_point_button;
 
        void meter_changed ();
 
-       Gtk::Button diskstream_button;
-       Gtk::Label  diskstream_label;
+       ArdourButton input_button;
+       ArdourButton output_button;
 
-       Gtk::Button input_button;
-       Gtkmm2ext::StatefulToggleButton* midi_input_enable_button;
+       ArdourButton* midi_input_enable_button;
        Gtk::HBox   input_button_box;
-       Gtk::Label  input_label;
-       Gtk::Button output_button;
-       Gtk::Label  output_label;
 
        std::string longest_label;
 
@@ -200,11 +193,11 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        gint    mark_update_safe ();
        guint32 mode_switch_in_progress;
 
-       Gtk::Button   name_button;
+       ArdourButton   name_button;
 
        ArdourWindow*  comment_window;
        Gtk::TextView* comment_area;
-       Gtk::Button   _comment_button;
+       ArdourButton   _comment_button;
 
        void comment_editor_done_editing ();
        void setup_comment_editor ();
@@ -212,8 +205,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void toggle_comment_editor ();
        void setup_comment_button ();
 
-       Gtk::Button   group_button;
-       Gtk::Label    group_label;
+       ArdourButton   group_button;
        RouteGroupMenu *group_menu;
 
        gint input_press (GdkEventButton *);
@@ -227,8 +219,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        std::list<boost::shared_ptr<ARDOUR::Bundle> > output_menu_bundles;
        void maybe_add_bundle_to_output_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
 
-       void bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle>);
-       void bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle>);
+       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 ();
@@ -273,6 +265,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void route_color_changed ();
        void show_passthru_color ();
 
+       void property_changed (const PBD::PropertyChange&);
+       void name_button_resized (Gtk::Allocation&);
        void name_changed ();
        void update_speed_display ();
        void map_frozen ();
@@ -320,7 +314,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void set_meter_point (ARDOUR::MeterPoint);
        PBD::ScopedConnection _level_meter_connection;
 
-       static std::string meter_point_string (ARDOUR::MeterPoint);
+       std::string meter_point_string (ARDOUR::MeterPoint);
 };
 
 #endif /* __ardour_mixer_strip__ */