diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/DabMod.cpp | 2 | ||||
| -rw-r--r-- | src/TII.cpp | 12 | ||||
| -rw-r--r-- | src/TII.h | 4 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index 4961910..12cfa43 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -179,7 +179,7 @@ static shared_ptr<ModOutput> prepare_output( if (s.fileOutputFormat == "complexf") { output = make_shared<OutputFile>(s.outputName); } - if (s.fileOutputFormat == "complexf_normalised") { + else if (s.fileOutputFormat == "complexf_normalised") { if (s.gainMode == GainMode::GAIN_FIX) s.normalise = 1.0f / normalise_factor_file_fix; else if (s.gainMode == GainMode::GAIN_MAX) diff --git a/src/TII.cpp b/src/TII.cpp index 446d9c6..89cd6d0 100644 --- a/src/TII.cpp +++ b/src/TII.cpp @@ -160,20 +160,14 @@ TII::TII(unsigned int dabmode, const tii_config_t& tii_config, unsigned phase) : prepare_pattern(); } - -TII::~TII() -{ - PDEBUG("TII::~TII() @ %p\n", this); -} - const char* TII::name() { // Calculate name on demand because comb and pattern are // modifiable through RC std::stringstream ss; - ss << "TII(comb:" << m_conf.comb << - ", pattern:" << m_conf.pattern << - ", variant:" << (m_conf.old_variant ? "old" : "new") << ")"; + ss << "TII(c:" << m_conf.comb << + " p:" << m_conf.pattern << + " vrnt:" << (m_conf.old_variant ? "old" : "new") << ")"; m_name = ss.str(); return m_name.c_str(); @@ -84,9 +84,6 @@ class TII : public ModCodec, public RemoteControllable { public: TII(unsigned int dabmode, const tii_config_t& tii_config, unsigned phase); - virtual ~TII(); - TII(const TII&) = delete; - TII& operator=(const TII&) = delete; int process(Buffer* dataIn, Buffer* dataOut); const char* name(); @@ -128,4 +125,3 @@ class TII : public ModCodec, public RemoteControllable std::vector<bool> m_enabled_carriers; }; - |