ardour/livetrax
13
0
Fork 0
Code

NO-OP: whitespace

Browse Source
This commit is contained in:
Robin Gareus 2020-04-07 04:02:52 +02:00
parent b5ca7d352a
commit e95d33502f
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 154 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/ardour/meter.h
View File

@ -23,14 +23,16 @@
#define __ardour_meter_h__
#include <vector>
#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/processor.h"
#include "pbd/fastlog.h"
#include "ardour/kmeterdsp.h"
#include "ardour/libardour_visibility.h"
#include "ardour/processor.h"
#include "ardour/types.h"
#include "ardour/iec1ppmdsp.h"
#include "ardour/iec2ppmdsp.h"
#include "ardour/kmeterdsp.h"
#include "ardour/vumeterdsp.h"
namespace ARDOUR {
@ -41,7 +43,8 @@ class Session;
/** Meters peaks on the input and stores them for access.
*/
class LIBARDOUR_API PeakMeter : public Processor {
class LIBARDOUR_API PeakMeter : public Processor
{
public:
PeakMeter (Session& s, const std::string& name);
~PeakMeter ();
@ -82,7 +85,6 @@ public:
void set_meter_type (MeterType t);
MeterType meter_type () const { return _meter_type; }
PBD::Signal1<void, MeterType> MeterTypeChanged;
protected:

28
libs/ardour/meter.cc
View File

@ -31,9 +31,9 @@
#include "ardour/dB.h"
#include "ardour/meter.h"
#include "ardour/midi_buffer.h"
#include "ardour/session.h"
#include "ardour/rc_configuration.h"
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
#include "pbd/i18n.h"
@ -48,6 +48,7 @@ PeakMeter::PeakMeter (Session& s, const std::string& name)
Iec1ppmdsp::init (s.nominal_sample_rate ());
Iec2ppmdsp::init (s.nominal_sample_rate ());
Vumeterdsp::init (s.nominal_sample_rate ());
_pending_active = true;
_meter_type = MeterPeak;
_reset_dpm = 1;
@ -59,10 +60,10 @@ PeakMeter::PeakMeter (Session& s, const std::string& name)
PeakMeter::~PeakMeter ()
{
while (_kmeter.size () > 0) {
delete (_kmeter.back());
delete (_iec1meter.back());
delete (_iec2meter.back());
delete (_vumeter.back());
delete _kmeter.back ();
delete _iec1meter.back ();
delete _iec2meter.back ();
delete _vumeter.back ();
_kmeter.pop_back ();
_iec1meter.pop_back ();
_iec2meter.pop_back ();
@ -106,8 +107,9 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
uint32_t n = 0;
const float falloff_dB = Config->get_meter_falloff() * nframes / _session.nominal_sample_rate();
const uint32_t zoh = _session.nominal_sample_rate () * .021;
const float falloff_dB = Config->get_meter_falloff () * nframes / _session.nominal_sample_rate ();
_bufcnt += nframes;
/* Meter MIDI */
@ -287,7 +289,8 @@ PeakMeter::reflect_inputs (const ChanCount& in)
}
void
PeakMeter::emit_configuration_changed () {
PeakMeter::emit_configuration_changed ()
{
ConfigurationChanged (current_meters, current_meters); /* EMIT SIGNAL */
}
@ -319,10 +322,10 @@ PeakMeter::set_max_channels (const ChanCount& chn)
/* alloc/free other audio-only meter types. */
while (_kmeter.size () > n_audio) {
delete (_kmeter.back());
delete (_iec1meter.back());
delete (_iec2meter.back());
delete (_vumeter.back());
delete _kmeter.back ();
delete _iec1meter.back ();
delete _iec2meter.back ();
delete _vumeter.back ();
_kmeter.pop_back ();
_iec1meter.pop_back ();
_iec2meter.pop_back ();
@ -351,7 +354,8 @@ PeakMeter::set_max_channels (const ChanCount& chn)
#define CHECKSIZE(MTR) (n < MTR.size () + n_midi && n >= n_midi)
float
PeakMeter::meter_level(uint32_t n, MeterType type) {
PeakMeter::meter_level (uint32_t n, MeterType type)
{
float mcptmp;
switch (type) {
case MeterKrms: