diff options
| author | Robin Gareus <robin@gareus.org> | 2015-07-05 17:12:30 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-07-05 17:12:30 +0200 |
| commit | 8bd32dc4cec23e8e6e1dfc39050ea82e052bc647 (patch) | |
| tree | 31de3d6956f108e97df9404cb130d2294490f52f | |
| parent | 4f81b17e8504ac39dea9460a2d4a10b147ec2801 (diff) | |
prepare default meter-type config
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 5 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 14 |
3 files changed, 20 insertions, 1 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. diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 24b060ec28..8607b9f01f 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -1047,4 +1047,16 @@ std::ostream& operator<<(std::ostream& o, const AutoReturnTarget& var) return o << s; } - +std::istream& operator>>(std::istream& o, MeterType& var) +{ + std::string s; + o >> s; + var = (MeterType) string_2_enum (s, var); + return o; +} + +std::ostream& operator<<(std::ostream& o, const MeterType& var) +{ + std::string s = enum_2_string (var); + return o << s; +} |