diff options
| author | Robin Gareus <robin@gareus.org> | 2014-06-26 18:47:06 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-06-26 19:21:16 +0200 |
| commit | e1d327c5ed3a394bfb33d9e1350f85b2dc1a9558 (patch) | |
| tree | f707d2a016239ff0d10be7f4990718bd1b6ae141 /gtk2_ardour/meter_strip.cc | |
| parent | a7c559fd63621a34678f5bca4c8a42e3d7106715 (diff) | |
fix meter-strip session/route-ui events
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 198ca28f05..d1031545bf 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -115,14 +115,15 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) : AxisView(sess) - , RouteUI(sess) + , RouteUI(0) , _route(rt) , peak_display() { mtr_vbox.set_spacing(2); nfo_vbox.set_spacing(2); - RouteUI::set_route (rt); SessionHandlePtr::set_session (sess); + RouteUI::init (); + RouteUI::set_route (rt); _has_midi = false; _tick_bar = 0; @@ -269,7 +270,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) } _route->shared_peak_meter()->ConfigurationChanged.connect ( - route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context() + meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context() ); ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display)); @@ -285,8 +286,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose)); meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose)); - _route->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context()); - _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context()); + _route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context()); + _route->PropertyChanged.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context()); peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false); name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false); |