Put both AM/AM and AM/PM coefs to one file

This partly reverts commit 28462b9d8bb08609810ea9a9882c5fa9205b8b80.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/MemlessPoly.h b/src/MemlessPoly.h
index 536b054..4dcd44a 100644
--- a/src/MemlessPoly.h
+++ b/src/MemlessPoly.h
@@ -52,7 +52,7 @@ typedef std::complex<float> complexf;
 class MemlessPoly : public PipelinedModCodec, public RemoteControllable
 {
 public:
-    MemlessPoly(const std::string& coefs_am_file, const std::string& coefs_pm_file, unsigned int num_threads);
+    MemlessPoly(const std::string& coefs_file, unsigned int num_threads);
 
     virtual const char* name() { return "MemlessPoly"; }
 
@@ -65,16 +65,12 @@ public:
 
 private:
     int internal_process(Buffer* const dataIn, Buffer* dataOut);
-    void load_coefficients_am(const std::string &coefFile_am);
-    void load_coefficients_pm(const std::string &coefFile_pm);
+    void load_coefficients(const std::string &coefFile);
 
     unsigned int m_num_threads;
-    std::vector<float> m_coefs_am;
-    std::string m_coefs_am_file;
-    mutable std::mutex m_coefs_am_mutex;
-
-    std::vector<float> m_coefs_pm;
-    std::string m_coefs_pm_file;
-    mutable std::mutex m_coefs_pm_mutex;
+    std::vector<float> m_coefs_am; // AM/AM coefficients
+    std::vector<float> m_coefs_pm; // AM/PM coefficients
+    std::string m_coefs_file;
+    mutable std::mutex m_coefs_mutex;
 };