summaryrefslogtreecommitdiff
path: root/gtk2_ardour/level_meter.cc
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2008-03-21 07:08:05 +0000
committerDoug McLain <doug@nostar.net>2008-03-21 07:08:05 +0000
commit525f02ca7553de76c527fae4910569a1ed4a86cf (patch)
tree107646c810354720e364ecd157fa91f478e0b91a /gtk2_ardour/level_meter.cc
parentcaaa0470deae42e128f37c67f388d0e4d694439b (diff)
Undo 3160 for now. The canvas stops updating when the mixer is open (but only on one of 3 machines) so I obviously broke something
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3161 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/level_meter.cc')
-rw-r--r--gtk2_ardour/level_meter.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 166e1877b9..6ef920235d 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -66,7 +66,6 @@ LevelMeter::LevelMeter (boost::shared_ptr<IO> io, Session& s)
Config->ParameterChanged.connect (mem_fun (*this, &LevelMeter::parameter_changed));
UI::instance()->theme_changed.connect (mem_fun(*this, &LevelMeter::on_theme_changed));
ColorsChanged.connect (mem_fun (*this, &LevelMeter::color_handler));
- max_peak = minus_infinity();
}
void
@@ -84,7 +83,7 @@ LevelMeter::~LevelMeter ()
}
}
-float
+void
LevelMeter::update_meters ()
{
vector<MeterInfo>::iterator i;
@@ -96,12 +95,8 @@ LevelMeter::update_meters ()
peak = _io->peak_input_power (n);
(*i).meter->set (log_meter (peak));
mpeak = _io->max_peak_power(n);
- if (mpeak > max_peak) {
- max_peak = mpeak;
- }
}
}
- return max_peak;
}
void
@@ -138,9 +133,8 @@ LevelMeter::hide_all_meters ()
}
void
-LevelMeter::setup_meters (int len, int initial_width)
+LevelMeter::setup_meters (int len)
{
- regular_meter_width = initial_width;
uint32_t nmeters = _io->n_outputs();
guint16 width;