Revert new meter types (postponed until after 3.3 release)

[ardour.git] / libs / ardour / ardour / meter.h

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 4ac140fd04d75661b66032811888283b5f8d4d78..31ebc76179800e925656f6548ee0b0b0dfc48038 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -23,11 +23,7 @@
 #include "ardour/types.h"
 #include "ardour/processor.h"
 #include "pbd/fastlog.h"
-
-#include "ardour/kmeterdsp.h"
-#include "ardour/iec1ppmdsp.h"
-#include "ardour/iec2ppmdsp.h"
-#include "ardour/vumeterdsp.h"
+#include "kmeterdsp.h"
 
 namespace ARDOUR {
 
@@ -108,11 +104,7 @@ 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;
 };