diff options
author | Robin Gareus <robin@gareus.org> | 2013-07-22 18:42:01 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-07-22 18:42:01 +0200 |
commit | 72aa1cd86cf04964f08e7ca0557f73afd1c96e83 (patch) | |
tree | c9f59e03d54bd2ca4f15fe6bc94a06e918df4e6e /libs/ardour/ardour/meter.h | |
parent | e294e78fefe77897a9a014d7b84d436a9aff6f9b (diff) |
Revert "Revert new meter types (postponed until after 3.3 release)"
This reverts commit d80f672e8487f459d76ab291958bffcded08f0fd.
Diffstat (limited to 'libs/ardour/ardour/meter.h')
-rw-r--r-- | libs/ardour/ardour/meter.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 31ebc76179..4ac140fd04 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -23,7 +23,11 @@ #include "ardour/types.h" #include "ardour/processor.h" #include "pbd/fastlog.h" -#include "kmeterdsp.h" + +#include "ardour/kmeterdsp.h" +#include "ardour/iec1ppmdsp.h" +#include "ardour/iec2ppmdsp.h" +#include "ardour/vumeterdsp.h" namespace ARDOUR { @@ -104,7 +108,11 @@ private: std::vector<float> _visible_peak_power; std::vector<float> _max_peak_signal; std::vector<float> _max_peak_power; + std::vector<Kmeterdsp *> _kmeter; + std::vector<Iec1ppmdsp *> _iec1meter; + std::vector<Iec2ppmdsp *> _iec2meter; + std::vector<Vumeterdsp *> _vumeter; MeterType _meter_type; }; |