diff options
| author | Robin Gareus <robin@gareus.org> | 2019-06-10 00:34:31 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-06-10 00:34:31 +0200 |
| commit | 53b13d718f06bfab1e9eddf869c698618ee31079 (patch) | |
| tree | 981d9992bb83a461cf55468be06729008748804e /gtk2_ardour/meter_strip.cc | |
| parent | 1391f49dbc83d928ca4152a1ae142640fb3af99f (diff) | |
Initialize some uninitialized vars
This fixes meterbridge type changes, due to uninitialized
_suspend_menu_callbacks.
Diffstat (limited to 'gtk2_ardour/meter_strip.cc')
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 1537bd077b..3bd77aabb4 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -68,13 +68,14 @@ PBD::Signal0<void> MeterStrip::ConfigurationChanged; MeterStrip::MeterStrip (int metricmode, MeterType mt) : RouteUI ((Session*) 0) + , metric_type (MeterPeak) + , _has_midi (false) + , _tick_bar (0) + , _strip_type (0) + , _metricmode (-1) + , level_meter (0) + , _suspend_menu_callbacks (false) { - level_meter = 0; - _strip_type = 0; - _tick_bar = 0; - _metricmode = -1; - metric_type = MeterPeak; - mtr_vbox.set_spacing (PX_SCALE(2, 2)); nfo_vbox.set_spacing (PX_SCALE(2, 2)); peakbx.set_size_request (-1, PX_SCALE(14, 14)); @@ -122,9 +123,15 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) : SessionHandlePtr (sess) - , RouteUI(0) - , _route(rt) - , peak_display() + , RouteUI ((Session*) 0) + , _route (rt) + , metric_type (MeterPeak) + , _has_midi (false) + , _tick_bar (0) + , _strip_type (0) + , _metricmode (-1) + , level_meter (0) + , _suspend_menu_callbacks (false) { mtr_vbox.set_spacing (PX_SCALE(2, 2)); nfo_vbox.set_spacing (PX_SCALE(2, 2)); @@ -132,11 +139,6 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt) RouteUI::init (); RouteUI::set_route (rt); - _has_midi = false; - _tick_bar = 0; - _metricmode = -1; - metric_type = MeterPeak; - // note: level_meter->setup_meters() does the scaling int meter_width = 6; if (_route->shared_peak_meter()->input_streams().n_total() == 1) { |