Revert new meter types (postponed until after 3.3 release)

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 09b5c150d024362d80a839f22c08799557518ba5..fe10070fbb6397d2be554415b41fd0c02b457ba5 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -219,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 ();
@@ -265,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 ();
@@ -306,13 +308,16 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void add_input_port (ARDOUR::DataType);
        void add_output_port (ARDOUR::DataType);
 
+       bool _suspend_menu_callbacks;
        bool level_meter_button_press (GdkEventButton *);
        void popup_level_meter_menu (GdkEventButton *);
-       void add_level_meter_item (Gtk::Menu_Helpers::MenuList &, Gtk::RadioMenuItem::Group &, std::string const &, ARDOUR::MeterPoint);
+       void add_level_meter_item_point (Gtk::Menu_Helpers::MenuList &, Gtk::RadioMenuItem::Group &, std::string const &, ARDOUR::MeterPoint);
+       void add_level_meter_item_type (Gtk::Menu_Helpers::MenuList &, Gtk::RadioMenuItem::Group &, std::string const &, ARDOUR::MeterType);
        void set_meter_point (ARDOUR::MeterPoint);
+       void set_meter_type (ARDOUR::MeterType);
        PBD::ScopedConnection _level_meter_connection;
 
-       static std::string meter_point_string (ARDOUR::MeterPoint);
+       std::string meter_point_string (ARDOUR::MeterPoint);
 };
 
 #endif /* __ardour_mixer_strip__ */