diff options
-rw-r--r-- | gtk2_ardour/level_meter.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/types.h | 7 | ||||
-rw-r--r-- | libs/ardour/enums.cc | 1 |
4 files changed, 11 insertions, 6 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index d3bb4ad5ab..536b83b3f2 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -104,12 +104,14 @@ static float meter_lineup(float offset) { static float vu_standard() { // note - default meter config is +2dB (france) switch (Config->get_meter_vu_standard()) { - case MeteringVUfrench: // +2dB + case MeteringVUfrench: // 0VU = -2dBu return 0; - case MeteringVUamerican: // 0dB + case MeteringVUamerican: // 0VU = 0dBu return -2; - case MeteringVUstandard: // -4dB + case MeteringVUstandard: // 0VU = +4dBu return -6; + case MeteringVUeight: // 0VU = +8dBu + return -10; } } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 2044282862..4297f61e0b 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1953,6 +1953,7 @@ RCOptionEditor::RCOptionEditor () mvu->add (MeteringVUfrench, _("0VU = -2dBu (France)")); mvu->add (MeteringVUamerican, _("0VU = 0dBu (North America, Australia)")); mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)")); + mvu->add (MeteringVUstandard, _("0VU = +8dBu")); add_option (S_("Preferences|GUI"), mvu); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 11cdb79575..2115149872 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -384,9 +384,10 @@ namespace ARDOUR { }; enum VUMeterStandard { - MeteringVUfrench, // + 2 - MeteringVUamerican, // +-0 - MeteringVUstandard // -4 + MeteringVUfrench, // 0VU = -2dBu + MeteringVUamerican, // 0VU = 0dBu + MeteringVUstandard, // 0VU = +4dBu + MeteringVUeight // 0VU = +8dBu }; enum MeterLineUp { diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index e60977a3e5..ab181d2956 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -226,6 +226,7 @@ setup_enum_writer () REGISTER_ENUM (MeteringVUfrench); REGISTER_ENUM (MeteringVUamerican); REGISTER_ENUM (MeteringVUstandard); + REGISTER_ENUM (MeteringVUeight); REGISTER (_VUMeterStandard); REGISTER_ENUM (MeteringLineUp24); |