diff options
Diffstat (limited to 'gtk2_ardour/meter_strip.h')
| -rw-r--r-- | gtk2_ardour/meter_strip.h | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h index 60e77eb2ef..e817f7d5c6 100644 --- a/gtk2_ardour/meter_strip.h +++ b/gtk2_ardour/meter_strip.h @@ -47,7 +47,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI { public: MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>); - MeterStrip (int); + MeterStrip (int, ARDOUR::MeterType); ~MeterStrip (); void set_session (ARDOUR::Session* s); @@ -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*); @@ -63,9 +64,13 @@ class MeterStrip : public Gtk::VBox, public RouteUI void set_meter_type_multi (int, ARDOUR::RouteGroup*, ARDOUR::MeterType); - void set_metric_mode (int); - void set_pos(int); + 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; @@ -88,7 +93,12 @@ class MeterStrip : public Gtk::VBox, public RouteUI 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; ArdourButton name_label; Gtk::DrawingArea meter_metric_area; @@ -106,19 +116,21 @@ class MeterStrip : public Gtk::VBox, public RouteUI ArdourButton peak_display; std::vector<ARDOUR::DataType> _types; + ARDOUR::MeterType metric_type; 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,10 +140,16 @@ class MeterStrip : public Gtk::VBox, public RouteUI void update_name_box (); bool _suspend_menu_callbacks; - bool level_meter_button_press (GdkEventButton* ev); + bool level_meter_button_release (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__ */ |