smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Initialize some uninitialized vars

Browse source 
This fixes meterbridge type changes, due to uninitialized
_suspend_menu_callbacks.
This commit is contained in:
Robin Gareus 2019-06-10 00:34:31 +02:00
parent 1391f49dbc
commit 53b13d718f
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gtk2_ardour/meter_strip.cc
View file

@ -68,13 +68,14 @@ PBD::Signal0<void> MeterStrip::ConfigurationChanged;
MeterStrip::MeterStrip (int metricmode, MeterType mt) MeterStrip::MeterStrip (int metricmode, MeterType mt)
: RouteUI ((Session*) 0) : 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)); mtr_vbox.set_spacing (PX_SCALE(2, 2));
nfo_vbox.set_spacing (PX_SCALE(2, 2)); nfo_vbox.set_spacing (PX_SCALE(2, 2));
peakbx.set_size_request (-1, PX_SCALE(14, 14)); 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) MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
: SessionHandlePtr (sess) : SessionHandlePtr (sess)
, RouteUI(0) , RouteUI ((Session*) 0)
, _route(rt) , _route (rt)
, peak_display() , 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)); mtr_vbox.set_spacing (PX_SCALE(2, 2));
nfo_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::init ();
RouteUI::set_route (rt); RouteUI::set_route (rt);
_has_midi = false;
_tick_bar = 0;
_metricmode = -1;
metric_type = MeterPeak;
// note: level_meter->setup_meters() does the scaling // note: level_meter->setup_meters() does the scaling
int meter_width = 6; int meter_width = 6;
if (_route->shared_peak_meter()->input_streams().n_total() == 1) { if (_route->shared_peak_meter()->input_streams().n_total() == 1) {