add "0VU = +8dBu" VU meter config

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 1c31b8d91143e9c1caccbc6657e16391bd2e7484..95ed249c149a9eae17955f852f731bfba420ea30 100644 (file)
--- 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 c597d16a277067b3387a80fc9513006d14a24d7f..7efa48c39aa1cb8290507926ffa0bc5d04b0dac0 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1945,6 +1945,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 11cdb79575038619cb1e435647a6941d5c5e3c44..2115149872adda905aa9a893a342bf7e1bb70a45 100644 (file)
--- 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 e60977a3e52fa26a25c1f472bc5d07d0458d081f..ab181d2956ffd87ed1d862b6d0b7c15d56d36403 100644 (file)
--- 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);