ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

prepare default meter-type config

This commit is contained in:
Robin Gareus 2015-07-05 17:12:30 +02:00
parent 4f81b17e85
commit 8bd32dc4ce
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -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 */

2
libs/ardour/ardour/types.h
View File

@ -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.

14
libs/ardour/enums.cc
View File

@ -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;
}