diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-08 01:06:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:13 +0200 |
| commit | ffbc1c7a8b7f6b0a7ef434bd6e14f8a01e2cbd28 (patch) | |
| tree | fa73f3e62ad2dd6d715814b1796e335555243a51 /gtk2_ardour | |
| parent | 5dae93e5ea4a975afae92bbb51ba3410f6dc3e5f (diff) | |
with RMS meters: use "peak indicator" as DPM
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/level_meter.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 0035785b61..1a5edc8472 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -113,7 +113,11 @@ LevelMeter::update_meters () if (n < nmidi) { (*i).meter->set (peak); } else { - (*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak))); + if (meter_type == MeterPeak) { + (*i).meter->set (log_meter (peak)); + } else { + (*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak))); + } } } } diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 53ece6745a..759bdef16a 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -454,7 +454,7 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev) _suspend_menu_callbacks = true; add_level_meter_item (items, group, _("Peak"), MeterPeak); - add_level_meter_item (items, group, _("RMS"), MeterKrms); + add_level_meter_item (items, group, _("RMS + Peak"), MeterKrms); m->popup (ev->button, ev->time); _suspend_menu_callbacks = false; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 50522564d0..3afa68be79 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2136,7 +2136,7 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) items.push_back (SeparatorElem()); add_level_meter_item_type (items, tgroup, _("Peak"), MeterPeak); - add_level_meter_item_type (items, tgroup, _("RMS"), MeterKrms); + add_level_meter_item_type (items, tgroup, _("RMS + Peak"), MeterKrms); m->popup (ev->button, ev->time); _suspend_menu_callbacks = false; |