Mackie protocol: set-session-from-edit-range moved to shift+marker

[ardour.git] / gtk2_ardour / meter_strip.h

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index e1bae713265059c78bdb16df7a75c9dab76b52e7..dfeb406976232548f1aa1fe988a3d20f04cf2cf3 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -74,7 +74,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
   protected:
        boost::shared_ptr<ARDOUR::Route> _route;
-       PBD::ScopedConnectionList route_connections;
+       PBD::ScopedConnectionList meter_route_connections;
        PBD::ScopedConnectionList level_meter_connection;
        void self_delete ();
 
@@ -88,7 +88,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        void on_size_request (Gtk::Requisition*);
 
        /* route UI */
-       void update_rec_display ();
+       void blink_rec_display (bool onoff);
        std::string state_id() const;
        void set_button_names ();
 
@@ -100,7 +100,9 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        Gtk::HBox meterbox;
        Gtk::HBox spacer;
        Gtk::HBox namebx;
+       Gtk::VBox namenumberbx;
        ArdourButton name_label;
+       ArdourButton number_label;
        Gtk::DrawingArea meter_metric_area;
        Gtk::DrawingArea meter_ticks1_area;
        Gtk::DrawingArea meter_ticks2_area;
@@ -128,7 +130,6 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
        LevelMeterHBox *level_meter;
 
-       PBD::ScopedConnection _config_connection;
        void strip_property_changed (const PBD::PropertyChange&);
        void meter_configuration_changed (ARDOUR::ChanCount);
        void meter_type_changed (ARDOUR::MeterType);
@@ -140,9 +141,12 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        void redraw_metrics ();
        void update_button_box ();
        void update_name_box ();
+       void name_changed ();
+
+       void route_color_changed ();
 
        bool _suspend_menu_callbacks;
-       bool level_meter_button_release (GdkEventButton* ev);
+       bool level_meter_button_press (GdkEventButton* ev);
        void popup_level_meter_menu (GdkEventButton* ev);
        void add_level_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType);