summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/iec1ppmdsp.h51
-rw-r--r--libs/ardour/ardour/iec2ppmdsp.h51
-rw-r--r--libs/ardour/ardour/kmeterdsp.h46
-rw-r--r--libs/ardour/ardour/meter.h10
-rw-r--r--libs/ardour/ardour/types.h5
-rw-r--r--libs/ardour/ardour/vumeterdsp.h49
6 files changed, 210 insertions, 2 deletions
diff --git a/libs/ardour/ardour/iec1ppmdsp.h b/libs/ardour/ardour/iec1ppmdsp.h
new file mode 100644
index 0000000000..58dea97555
--- /dev/null
+++ b/libs/ardour/ardour/iec1ppmdsp.h
@@ -0,0 +1,51 @@
+/*
+ Copyright (C) 2012 Fons Adriaensen <fons@linuxaudio.org>
+ Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __IEC1PPMDSP_H
+#define __IEC1PPMDSP_H
+
+
+class Iec1ppmdsp
+{
+public:
+
+ Iec1ppmdsp (void);
+ ~Iec1ppmdsp (void);
+
+ void process (float *p, int n);
+ float read (void);
+ void reset ();
+
+ static void init (float fsamp);
+
+private:
+
+ float _z1; // filter state
+ float _z2; // filter state
+ float _m; // max value since last read()
+ bool _res; // flag to reset m
+
+ static float _w1; // attack filter coefficient
+ static float _w2; // attack filter coefficient
+ static float _w3; // release filter coefficient
+ static float _g; // gain factor
+};
+
+
+#endif
diff --git a/libs/ardour/ardour/iec2ppmdsp.h b/libs/ardour/ardour/iec2ppmdsp.h
new file mode 100644
index 0000000000..3574a8bd3f
--- /dev/null
+++ b/libs/ardour/ardour/iec2ppmdsp.h
@@ -0,0 +1,51 @@
+/*
+ Copyright (C) 2012 Fons Adriaensen <fons@linuxaudio.org>
+ Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __IEC2PPMDSP_H
+#define __IEC2PPMDSP_H
+
+
+class Iec2ppmdsp
+{
+public:
+
+ Iec2ppmdsp (void);
+ ~Iec2ppmdsp (void);
+
+ void process (float *p, int n);
+ float read (void);
+ void reset ();
+
+ static void init (float fsamp);
+
+private:
+
+ float _z1; // filter state
+ float _z2; // filter state
+ float _m; // max value since last read()
+ bool _res; // flag to reset m
+
+ static float _w1; // attack filter coefficient
+ static float _w2; // attack filter coefficient
+ static float _w3; // release filter coefficient
+ static float _g; // gain factor
+};
+
+
+#endif
diff --git a/libs/ardour/ardour/kmeterdsp.h b/libs/ardour/ardour/kmeterdsp.h
new file mode 100644
index 0000000000..eca3c76695
--- /dev/null
+++ b/libs/ardour/ardour/kmeterdsp.h
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2008-2011 Fons Adriaensen <fons@linuxaudio.org>
+ Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __KMETERDSP_H
+#define __KMETERDSP_H
+
+class Kmeterdsp
+{
+public:
+
+ Kmeterdsp (void);
+ ~Kmeterdsp (void);
+
+ void process (float *p, int n);
+ float read ();
+ void reset ();
+
+ static void init (int fsamp);
+
+private:
+
+ float _z1; // filter state
+ float _z2; // filter state
+ float _rms; // max rms value since last read()
+ bool _flag; // flag set by read(), resets _rms
+
+ static float _omega; // ballistics filter constant.
+};
+
+#endif
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;
};
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 05d6d0b27d..df7209b581 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -181,7 +181,10 @@ namespace ARDOUR {
MeterMaxSignal = 0x01,
MeterMaxPeak = 0x02,
MeterPeak = 0x04,
- MeterKrms = 0x08
+ MeterKrms = 0x08,
+ MeterIEC1 = 0x10,
+ MeterIEC2 = 0x20,
+ MeterVU = 0x40
};
enum TrackMode {
diff --git a/libs/ardour/ardour/vumeterdsp.h b/libs/ardour/ardour/vumeterdsp.h
new file mode 100644
index 0000000000..86487e8e8e
--- /dev/null
+++ b/libs/ardour/ardour/vumeterdsp.h
@@ -0,0 +1,49 @@
+/*
+ Copyright (C) 2012 Fons Adriaensen <fons@linuxaudio.org>
+ Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __VUMETERDSP_H
+#define __VUMETERDSP_H
+
+
+class Vumeterdsp
+{
+public:
+
+ Vumeterdsp (void);
+ ~Vumeterdsp (void);
+
+ void process (float *p, int n);
+ float read (void);
+ void reset ();
+
+ static void init (float fsamp);
+
+private:
+
+ float _z1; // filter state
+ float _z2; // filter state
+ float _m; // max value since last read()
+ bool _res; // flag to reset m
+
+ static float _w; // lowpass filter coefficient
+ static float _g; // gain factor
+};
+
+
+#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 11:21:05 +0000