Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 4a2865c33959d4f323e2a48867b88880b073b16e..fe10070fbb6397d2be554415b41fd0c02b457ba5 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -308,10 +308,13 @@ 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;
 
        std::string meter_point_string (ARDOUR::MeterPoint);