add explicit chmod for good measure

[ardour.git] / gtk2_ardour / meter_strip.h

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index 4c532df5c76555b75054f29dc050b8fc398000e5..825bd6923d38ab3959947514e5e4e9fbc14de08c 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -56,6 +56,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
        static PBD::Signal1<void,MeterStrip*> CatchDeletion;
        static PBD::Signal0<void> MetricChanged;
+       static PBD::Signal0<void> ConfigurationChanged;
 
        void reset_peak_display ();
        void reset_route_peak_display (ARDOUR::Route*);
@@ -64,13 +65,16 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        void set_meter_type_multi (int, ARDOUR::RouteGroup*, ARDOUR::MeterType);
 
        void set_metric_mode (int, ARDOUR::MeterType);
+       int  get_metric_mode() { return _metricmode; }
+       void set_tick_bar (int);
+       int  get_tick_bar() { return _tick_bar; }
        bool has_midi() { return _has_midi; }
        bool is_metric_display() { return _strip_type == 0; }
        ARDOUR::MeterType meter_type();
 
   protected:
        boost::shared_ptr<ARDOUR::Route> _route;
-       PBD::ScopedConnectionList route_connections;
+       PBD::ScopedConnectionList meter_route_connections;
        PBD::ScopedConnectionList level_meter_connection;
        void self_delete ();
 
@@ -84,14 +88,21 @@ 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 ();
 
   private:
+       Gtk::VBox mtr_vbox;
+       Gtk::VBox nfo_vbox;
+       Gtk::EventBox mtr_container;
+       Gtk::HSeparator mtr_hsep;
        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;
@@ -99,6 +110,8 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        Gtk::HBox mutebox;
        Gtk::HBox solobox;
        Gtk::HBox recbox;
+       Gtk::HBox mon_in_box;
+       Gtk::HBox mon_disk_box;
 
        Gtk::Alignment meter_align;
        Gtk::Alignment peak_align;
@@ -111,16 +124,16 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
        float max_peak;
        bool _has_midi;
+       int _tick_bar;
        int _strip_type;
+       int _metricmode;
 
-       LevelMeter   *level_meter;
+       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);
-
-       static int max_pattern_metric_size; // == FastMeter::max_pattern_metric_size
+       void update_background (ARDOUR::MeterType);
 
        bool peak_button_release (GdkEventButton*);
 
@@ -128,12 +141,21 @@ 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_press (GdkEventButton* ev);
        void popup_level_meter_menu (GdkEventButton* ev);
-       void add_level_meter_item (Gtk::Menu_Helpers::MenuList& items, Gtk::RadioMenuItem::Group& group, std::string const & name, ARDOUR::MeterType mode);
+       void add_level_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType);
+
+       bool name_label_button_release (GdkEventButton* ev);
+       void popup_name_label_menu (GdkEventButton* ev);
+       void add_label_height_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, uint32_t);
+
        void set_meter_type (ARDOUR::MeterType mode);
+       void set_label_height (uint32_t);
 };
 
 #endif /* __ardour_mixer_strip__ */