diff options
| author | Robin Gareus <robin@gareus.org> | 2013-06-28 23:09:39 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:02 +0200 |
| commit | 917e3522d0038055339397f69f5467fb034eb955 (patch) | |
| tree | cd6c7fe3ac1f53193264de229d79f86a930c5f2c /gtk2_ardour/meter_strip.cc | |
| parent | c23a537b6189692b9b8b56de20889cfa596fb0de (diff) | |
meterbridge: add rec-enable btn & prepare metric/tick separation
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index f1bd5bee89..77217bdd57 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -51,12 +51,16 @@ using namespace std; PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion; MeterStrip::MetricPatterns MeterStrip::metric_patterns; +MeterStrip::TickPatterns MeterStrip::tick_patterns; MeterStrip::MeterStrip (Meterbridge& mtr, Session* sess, boost::shared_ptr<ARDOUR::Route> rt) - : _route(rt) + : AxisView(sess) + , RouteUI(sess) + , _route(rt) , style_changed (false) { set_spacing(2); + RouteUI::set_route (rt); int meter_width = 6; if (_route->shared_peak_meter()->input_streams().n_total() == 1) { @@ -91,12 +95,18 @@ MeterStrip::MeterStrip (Meterbridge& mtr, Session* sess, boost::shared_ptr<ARDOU #endif label.set_size_request(12, 36); + Gtk::HBox* btnbox = Gtk::manage (new Gtk::HBox()); + btnbox->pack_start(*rec_enable_button, true, false); + btnbox->set_size_request(-1, 16); + pack_start(*meter_align, true, true); + pack_start (*btnbox, false, false); pack_start (label, false, false); meter_metric_area.show(); level_meter->show(); meter_align->show(); + btnbox->show(); label.show(); _route->shared_peak_meter()->ConfigurationChanged.connect ( @@ -127,6 +137,24 @@ MeterStrip::self_delete () } void +MeterStrip::update_rec_display () +{ + RouteUI::update_rec_display (); +} + +std::string +MeterStrip::state_id() const +{ + return string_compose ("mtrs %1", _route->id().to_s()); +} + +void +MeterStrip::set_button_names() +{ + rec_enable_button->set_text (_("R")); +} + +void MeterStrip::strip_property_changed (const PropertyChange& what_changed) { if (!what_changed.contains (ARDOUR::Properties::name)) { |