using namespace Gtk;
using namespace std;
-//sigc::signal<void> LevelMeter::ResetAllPeakDisplays;
-//sigc::signal<void,RouteGroup*> LevelMeter::ResetGroupPeakDisplays;
-
-
LevelMeter::LevelMeter (Session* s)
: _meter (0)
, meter_length (0)
UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed));
ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler));
max_peak = minus_infinity();
+ meter_type = MeterPeak;
}
void
LevelMeter::set_meter (PeakMeter* meter)
{
_configuration_connection.disconnect();
+ _meter_type_connection.disconnect();
+
_meter = meter;
if (_meter) {
_meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
+ _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeter::meter_type_changed, this, _1), gui_context());
}
}
{
vector<MeterInfo>::iterator i;
uint32_t n;
- float peak, mpeak;
if (!_meter) {
return 0.0f;
}
- int32_t nmidi = _meter->input_streams().n_midi();
+ uint32_t nmidi = _meter->input_streams().n_midi();
for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
if ((*i).packed) {
- peak = _meter->peak_power (n);
- if (n < nmidi) {
- (*i).meter->set (peak);
- } else {
- (*i).meter->set (log_meter (peak));
+ const float mpeak = _meter->meter_level(n, MeterMaxPeak);
+ if (mpeak > (*i).max_peak) {
+ (*i).max_peak = mpeak;
+ (*i).meter->set_highlight(mpeak > Config->get_meter_peak());
}
- mpeak = _meter->max_peak_power(n);
if (mpeak > max_peak) {
max_peak = mpeak;
}
- if (mpeak > max_peak) {
- max_peak = mpeak;
+
+ if (n < nmidi) {
+ (*i).meter->set (_meter->meter_level (n, MeterPeak));
+ } else {
+ const float peak = _meter->meter_level (n, meter_type);
+ if (meter_type == MeterPeak) {
+ (*i).meter->set (log_meter (peak));
+ } else {
+ (*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak)));
+ }
}
}
}
ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p)
if (p == "meter-hold") {
-
vector<MeterInfo>::iterator i;
uint32_t n;
for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-
(*i).meter->set_hold_count ((uint32_t) floor(Config->get_meter_hold()));
}
}
+ else if (p == "meter-line-up-level") {
+ color_changed = true;
+ setup_meters (meter_length, regular_meter_width, thin_meter_width);
+ }
+ else if (p == "meter-peak") {
+ vector<MeterInfo>::iterator i;
+ uint32_t n;
+
+ for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
+ (*i).max_peak = minus_infinity();
+ }
+ }
}
void
setup_meters (meter_length, regular_meter_width, thin_meter_width);
}
+void
+LevelMeter::meter_type_changed (MeterType t)
+{
+ meter_type = t;
+ MeterTypeChanged(t);
+}
+
void
LevelMeter::hide_all_meters ()
{
for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
uint32_t c[10];
- float stp[4] = {55.0, 77.5, 92.5, 100.0};
+ float stp[4];
if (n < nmidi) {
c[0] = ARDOUR_UI::config()->canvasvar_MidiMeterColor0.get();
c[1] = ARDOUR_UI::config()->canvasvar_MidiMeterColor1.get();
stp[2] = 115.0 * 100.0 / 128.0;
stp[3] = 115.0 * 112.0 / 128.0;
} else {
+ switch (Config->get_meter_line_up_level()) {
+ case MeteringLineUp24:
+ stp[0] = 42.0;
+ stp[1] = 77.5;
+ stp[2] = 92.5;
+ stp[3] = 100.0;
+ break;
+ case MeteringLineUp20:
+ stp[0] = 50.0;
+ stp[1] = 77.5;
+ stp[2] = 92.5;
+ stp[3] = 100.0;
+ break;
+ default:
+ case MeteringLineUp18:
+ stp[0] = 55.0;
+ stp[1] = 77.5;
+ stp[2] = 92.5;
+ stp[3] = 100.0;
+ break;
+ case MeteringLineUp15:
+ stp[0] = 62.5;
+ stp[1] = 77.5;
+ stp[2] = 92.5;
+ stp[3] = 100.0;
+ break;
+ }
c[0] = ARDOUR_UI::config()->canvasvar_MeterColor0.get();
c[1] = ARDOUR_UI::config()->canvasvar_MeterColor1.get();
c[2] = ARDOUR_UI::config()->canvasvar_MeterColor2.get();
c[5], c[6], c[7], c[8], c[9],
ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(),
ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get(),
+ 0x991122ff, 0x551111ff,
stp[0], stp[1], stp[2], stp[3]
);
meters[n].width = width;
color_changed = false;
}
+void
+LevelMeter::set_type(MeterType t)
+{
+ meter_type = t;
+ _meter->set_type(t);
+}
+
bool
LevelMeter::meter_button_press (GdkEventButton* ev)
{
LevelMeter::meter_button_release (GdkEventButton* ev)
{
if (ev->button == 1) {
- clear_meters ();
+ clear_meters (false);
}
return true;
}
-void LevelMeter::clear_meters ()
+void LevelMeter::clear_meters (bool reset_highlight)
{
for (vector<MeterInfo>::iterator i = meters.begin(); i < meters.end(); i++) {
(*i).meter->clear();
+ (*i).max_peak = minus_infinity();
+ if (reset_highlight)
+ (*i).meter->set_highlight(false);
}
max_peak = minus_infinity();
}