From 0c96ac35b3d6758a556959b37ee2316357e0ae0c Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 4 Aug 2017 20:42:09 +0200 Subject: Move MemlessPoly m_coefs to private --- src/DabModulator.cpp | 6 ------ src/MemlessPoly.cpp | 4 +++- src/MemlessPoly.h | 8 ++------ 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index 4e0bc33..5282a2d 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -223,12 +223,6 @@ int DabModulator::process(Buffer* dataOut) shared_ptr cifPoly; if (not myPolyCoefFilename.empty()) { cifPoly = make_shared(myPolyCoefFilename); - etiLog.level(debug) << myPolyCoefFilename << "\n"; - etiLog.level(debug) << cifPoly->m_coefs[0] << " " << - cifPoly->m_coefs[1] << " "<< cifPoly->m_coefs[2] << " "<< - cifPoly->m_coefs[3] << " "<< cifPoly->m_coefs[4] << " "<< - cifPoly->m_coefs[5] << " "<< cifPoly->m_coefs[6] << " "<< - cifPoly->m_coefs[7] << "\n"; rcs.enrol(cifPoly.get()); } diff --git a/src/MemlessPoly.cpp b/src/MemlessPoly.cpp index b0b5ddd..71ceac3 100644 --- a/src/MemlessPoly.cpp +++ b/src/MemlessPoly.cpp @@ -56,7 +56,9 @@ static const std::array default_coefficients({{ MemlessPoly::MemlessPoly(const std::string& coefs_file) : PipelinedModCodec(), RemoteControllable("memlesspoly"), - m_coefs_file(coefs_file) + m_coefs(), + m_coefs_file(coefs_file), + m_coefs_mutex() { PDEBUG("MemlessPoly::MemlessPoly(%s) @ %p\n", coefs_file.c_str(), this); diff --git a/src/MemlessPoly.h b/src/MemlessPoly.h index eb51d50..9fe19d7 100644 --- a/src/MemlessPoly.h +++ b/src/MemlessPoly.h @@ -63,16 +63,12 @@ public: virtual const std::string get_parameter( const std::string& parameter) const; -//TODO to protected - std::vector m_coefs; - - -protected: +private: int internal_process(Buffer* const dataIn, Buffer* dataOut); void load_coefficients(const std::string &coefFile); + std::vector m_coefs; std::string m_coefs_file; - mutable std::mutex m_coefs_mutex; }; -- cgit v1.2.3