diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-08-04 20:42:09 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-08-04 20:42:09 +0200 |
| commit | 0c96ac35b3d6758a556959b37ee2316357e0ae0c (patch) | |
| tree | 30265af24517fe331caf7a47fe76d343981c6e18 | |
| parent | 0c31bc95ca1ca4ee420a6e2d82bad6b1e50177c6 (diff) | |
| download | dabmod-0c96ac35b3d6758a556959b37ee2316357e0ae0c.tar.gz dabmod-0c96ac35b3d6758a556959b37ee2316357e0ae0c.tar.bz2 dabmod-0c96ac35b3d6758a556959b37ee2316357e0ae0c.zip | |
Move MemlessPoly m_coefs to private
| -rw-r--r-- | src/DabModulator.cpp | 6 | ||||
| -rw-r--r-- | src/MemlessPoly.cpp | 4 | ||||
| -rw-r--r-- | src/MemlessPoly.h | 8 |
3 files changed, 5 insertions, 13 deletions
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<MemlessPoly> cifPoly; if (not myPolyCoefFilename.empty()) { cifPoly = make_shared<MemlessPoly>(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<complexf, 8> 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<complexf> m_coefs; - - -protected: +private: int internal_process(Buffer* const dataIn, Buffer* dataOut); void load_coefficients(const std::string &coefFile); + std::vector<complexf> m_coefs; std::string m_coefs_file; - mutable std::mutex m_coefs_mutex; }; |