diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-06 01:40:57 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:11 +0200 |
| commit | c1f56d4d7c12290c06392539f05547a7bd89e5b2 (patch) | |
| tree | 1c311aa54411563eb00d3ad347a128ae2ab76fc4 /libs/ardour/ardour | |
| parent | 8427faf1fb7f704c4d3161ab80639e685845508b (diff) | |
meter line-up and fall-off standard values & names
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/types.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/utils.h | 16 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index c41c599f1c..01f8e87c74 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -308,10 +308,12 @@ namespace ARDOUR { MeterFalloffOff = 0, MeterFalloffSlowest = 1, MeterFalloffSlow = 2, - MeterFalloffMedium = 3, - MeterFalloffFast = 4, - MeterFalloffFaster = 5, - MeterFalloffFastest = 6 + MeterFalloffSlowish = 3, + MeterFalloffModerate = 4, + MeterFalloffMedium = 5, + MeterFalloffFast = 6, + MeterFalloffFaster = 7, + MeterFalloffFastest = 8, }; enum MeterHold { diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index 0aa4193394..bf91d4d57e 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -149,13 +149,15 @@ double slider_position_to_gain_with_max (double g, double max_gain = 2.0); * These rates are db/sec. */ -#define METER_FALLOFF_OFF 0.0f -#define METER_FALLOFF_SLOWEST 6.6f // BBC standard -#define METER_FALLOFF_SLOW 8.6f // BBC standard -#define METER_FALLOFF_MEDIUM 20.0f -#define METER_FALLOFF_FAST 32.0f -#define METER_FALLOFF_FASTER 46.0f -#define METER_FALLOFF_FASTEST 70.0f +#define METER_FALLOFF_OFF 0.0f +#define METER_FALLOFF_SLOWEST 6.6f // BBC standard +#define METER_FALLOFF_SLOW 8.6f // BBC standard, EBU 24dB / 2.8sec +#define METER_FALLOFF_SLOWISH 12.0f // DIN 20dB / 1.7 sec +#define METER_FALLOFF_MODERATE 13.3f // EBU-PPM, IRT PPM- 20dB / 1.5 sec +#define METER_FALLOFF_MEDIUM 20.0f +#define METER_FALLOFF_FAST 32.0f +#define METER_FALLOFF_FASTER 46.0f +#define METER_FALLOFF_FASTEST 70.0f float meter_falloff_to_float (ARDOUR::MeterFalloff); ARDOUR::MeterFalloff meter_falloff_from_float (float); |