diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 5 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index c9f02109ba..f77e94827b 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -185,9 +185,14 @@ CONFIG_VARIABLE (AutoReturnTarget, auto_return_target_list, "auto-return-target- #ifdef USE_TRACKS_CODE_FEATURES CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 60.0f) +CONFIG_VARIABLE (MeterType, meter_type_master, "meter-type-master", MeterPeak) #else CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 13.3f) +CONFIG_VARIABLE (MeterType, meter_type_master, "meter-type-master", MeterK20) #endif +CONFIG_VARIABLE (MeterType, meter_type_track, "meter-type-track", MeterPeak) +CONFIG_VARIABLE (MeterType, meter_type_bus, "meter-type-bus", MeterPeak) + /* miscellany */ diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index ba521f3b71..17e0b0d7e4 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -670,6 +670,7 @@ std::istream& operator>>(std::istream& o, ARDOUR::FadeShape& sf); std::istream& operator>>(std::istream& o, ARDOUR::RegionSelectionAfterSplit& sf); std::istream& operator>>(std::istream& o, ARDOUR::BufferingPreset& var); std::istream& operator>>(std::istream& o, ARDOUR::AutoReturnTarget& sf); +std::istream& operator>>(std::istream& o, ARDOUR::MeterType& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::SampleFormat& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::HeaderFormat& sf); @@ -693,6 +694,7 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::FadeShape& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::RegionSelectionAfterSplit& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::BufferingPreset& var); std::ostream& operator<<(std::ostream& o, const ARDOUR::AutoReturnTarget& sf); +std::ostream& operator<<(std::ostream& o, const ARDOUR::MeterType& sf); /* because these operators work on types which can be used when making a UI_CONFIG_VARIABLE (in gtk2_ardour) we need them to be exported. |