Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / ardour / mtdm.h

diff --git a/libs/ardour/ardour/mtdm.h b/libs/ardour/ardour/mtdm.h
index 59b504b821b7fb180a108b92c7545f3c6130b2e8..b57df7254a4c5e1a3d27ad2c3cdd104f72f6f4f8 100644 (file)
--- a/libs/ardour/ardour/mtdm.h
+++ b/libs/ardour/ardour/mtdm.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003-2008 Fons Adriaensen <fons@kokkinizita.net>
+    Copyright (C) 2003-2012 Fons Adriaensen <fons@kokkinizita.net>
 
     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
@@ -21,35 +21,39 @@
 
 #include <stddef.h>
 
-class MTDM {
-public:
+#include "ardour/libardour_visibility.h"
 
-       MTDM ();
+class LIBARDOUR_API MTDM
+{
+public:
 
-       int process (size_t len, float *inp, float *out);
-       int resolve ();
-       void invert () { _inv ^= 1; }
-       int    inv () { return _inv; }
-       double del () { return _del; }
-       double err () { return _err; }
+    MTDM (int fsamp);
+    int process (size_t len, float *inp, float *out);
+    int resolve (void);
+    void invert (void) { _inv ^= 1; }
+    int    inv (void) { return _inv; }
+    double del (void) { return _del; }
+    double err (void) { return _err; }
 
 private:
-       class Freq {
-               public:
-                       int   p;
-                       int   f;
-                       float a;
-                       float xa;
-                       float ya;
-                       float xf;
-                       float yf;
-       };
-
-       double  _del;
-       double  _err;
-       int     _cnt;
-       int     _inv;
-       Freq    _freq [5];
+    class Freq {
+      public:
+       int   p;
+       int   f;
+       float xa;
+       float ya;
+       float x1;
+       float y1;
+       float x2;
+       float y2;
+    };
+
+    double  _del;
+    double  _err;
+    float   _wlp;
+    int     _cnt;
+    int     _inv;
+    Freq    _freq [13];
 };
 
 #endif /* __libardour_mtdm_h__ */