summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/meter.h
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-15 16:07:37 +0200
committerRobin Gareus <robin@gareus.org>2013-07-15 16:07:37 +0200
commitd80f672e8487f459d76ab291958bffcded08f0fd (patch)
treec5b2e432fbc2205e14891cc1eef85bfd4c4067b6 /libs/ardour/ardour/meter.h
parentce621d1c8a600853be0020942a9664ccee0ab165 (diff)
Revert new meter types (postponed until after 3.3 release)
This reverts commit ce621d1c8a600853be0020942a9664ccee0ab165. This reverts commit 80aa2574819e947668092c660d767e25a661c6f1.
Diffstat (limited to 'libs/ardour/ardour/meter.h')
-rw-r--r--libs/ardour/ardour/meter.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 4ac140fd04..31ebc76179 100644
--- 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;
};