diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
| commit | 580520b12f90251e38d94a1a5d6a199b76142b0b (patch) | |
| tree | a20b79ac88794d4d92b88569e643ff67b515d6c3 /libs/ardour/ardour/rc_configuration_vars.h | |
| parent | 0947791a800aa20ee0ea6a0334c789ab7a34fa90 (diff) | |
| parent | b649f0a21b711c68cba5e26945650fd36f657268 (diff) | |
fix conflicts caused by meterbridge merge
Diffstat (limited to 'libs/ardour/ardour/rc_configuration_vars.h')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 989592b359..2091750c15 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -149,6 +149,8 @@ CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", fal CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f) CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 32.0f) +CONFIG_VARIABLE (MeterLineUp, meter_line_up_level, "meter-line-up-level", MeteringLineUp18) +CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f) /* miscellany */ |