Merge with upstream r2.

git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2471 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 44 insertions, 43 deletions

diff --git a/src/mdaSpecMeterGUI.h b/src/mdaSpecMeterGUI.h
index 99a71f7..bc0a232 100644
--- a/src/mdaSpecMeterGUI.h
+++ b/src/mdaSpecMeterGUI.h
@@ -1,43 +1,44 @@
-#ifndef _mdaSpecMeterGUI_h_

-#define _mdaSpecMeterGUI_h_

-

-#include "vstgui.h"

-

-

-class CDraw : public CControl

-{

-public:

-	CDraw(CRect& size, float x, CBitmap* background);

-	~CDraw();

-

-	void draw(CDrawContext* pContext);

-	long x2pix(float x);

-	long x22pix(float x);

-

-	float Lpeak, Lrms, Lmin, Rpeak, Rrms, Rmin, Corr;

-	float band[2][16];

-

-protected:

-	CBitmap* bitmap;

-};

-

-

-class mdaSpecMeterGUI : public AEffGUIEditor

-{

-public:

-	mdaSpecMeterGUI(AudioEffect* effect);

-	~mdaSpecMeterGUI();

-

-	long open(void* ptr);

-	void idle();

-	void close();

-

-private:

-	CDraw*   draw;

-	CBitmap* background;

-	long     xtimer;

-};

-

-

-#endif // _mdaSpecMeterGUI_h_

-

+#ifndef _mdaSpecMeterGUI_h_
+#define _mdaSpecMeterGUI_h_
+
+#include "vstgui.h"
+
+
+class CDraw : public CControl
+{
+public:
+	CDraw(CRect& size, float x, CBitmap* background);
+	~CDraw();
+
+	void draw(CDrawContext *pContext);
+	LvzInt32 x2pix(float x);
+	LvzInt32 x22pix(float x);
+
+	float Lpeak, Lrms, Lmin, Rpeak, Rrms, Rmin, Corr;
+	float band[2][16];
+	LvzInt32 temp;
+
+protected:
+	CBitmap* bitmap;
+};
+
+
+class mdaSpecMeterGUI : public AEffGUIEditor
+{
+public:
+	mdaSpecMeterGUI(AudioEffect* effect);
+	~mdaSpecMeterGUI();
+
+	long open(void* ptr);
+	void idle();
+	void close();
+
+private:
+	CDraw*   draw;
+	CBitmap* background;
+	LvzInt32 xtimer;
+};
+
+
+#endif // _mdaSpecMeterGUI_h_
+