zynaddsubfx

commit 93791ff182ee154c7b492a207c61de5f42c894cd
parent 4fc3bf81c2edaf0fae0a1d479bcb46e4584828ea
Author: fundamental <[email protected]>
Date:   Tue, 17 Jan 2012 14:57:47 -0500

Master: Minor update to vumeter struct

Diffstat:
M
src/Misc/Master.cpp
 | 
10
++++++++--
M
src/Misc/Master.h
 | 
5
+++--

2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp
@@ -34,11 +34,17 @@
 #include <sys/types.h>
 #include <iostream>
 #include <algorithm>
+#include <cmath>
 
 #include <unistd.h>
 
 using namespace std;
 
+vuData::vuData(void)
+    :outpeakl(0.0f), outpeakr(0.0f), maxoutpeakl(0.0f), maxoutpeakr(0.0f),
+    rmspeakl(0.0f), rmspeakr(0.0f), clipped(0)
+{}
+
 Master::Master()
 {
     swaplr = 0;
@@ -234,8 +240,8 @@ void Master::vuUpdate(const float *outl, const float *outr)
         vu.rmspeakl += outl[i] * outl[i];
         vu.rmspeakr += outr[i] * outr[i];
     }
-    vu.rmspeakl = sqrt(vu.rmspeakl / synth->buffersize);
-    vu.rmspeakr = sqrt(vu.rmspeakr / synth->buffersize);
+    vu.rmspeakl = sqrt(vu.rmspeakl / synth->buffersize_f);
+    vu.rmspeakr = sqrt(vu.rmspeakr / synth->buffersize_f);
 
     //Part Peak computation (for Part vumeters or fake part vumeters)
     for(int npart = 0; npart < NUM_MIDI_PARTS; ++npart) {
diff --git a/src/Misc/Master.h b/src/Misc/Master.h
@@ -39,11 +39,12 @@ typedef enum {
 
 extern Dump dump;
 
-typedef struct vuData_t {
+struct vuData {
+    vuData(void);
     float outpeakl, outpeakr, maxoutpeakl, maxoutpeakr,
           rmspeakl, rmspeakr;
     int clipped;
-} vuData;
+};
 
 
 /** It sends Midi Messages to Parts, receives samples from parts,