diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-12-25 21:34:03 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-12-25 21:34:03 +0100 |
| commit | 2bba7d602744ccd6dab26940661f0fdfbf231af8 (patch) | |
| tree | 590a5808497da3b621e29239cd56db6c89c2d6a9 /src/DabModulator.cpp | |
| parent | b5fd4a6ab6ac92af2141233f802e71c861cd89f4 (diff) | |
| download | dabmod-2bba7d602744ccd6dab26940661f0fdfbf231af8.tar.gz dabmod-2bba7d602744ccd6dab26940661f0fdfbf231af8.tar.bz2 dabmod-2bba7d602744ccd6dab26940661f0fdfbf231af8.zip | |
Refactor flowgraph and puncturing rules
Diffstat (limited to 'src/DabModulator.cpp')
| -rw-r--r-- | src/DabModulator.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp index c96a763..f63ecd7 100644 --- a/src/DabModulator.cpp +++ b/src/DabModulator.cpp @@ -74,8 +74,8 @@ DabModulator::DabModulator( myFilterTapsFilename(filterTapsFilename), myTiiConfig(tiiConfig) { - PDEBUG("DabModulator::DabModulator(%u, %u, %u, %u) @ %p\n", - outputRate, clockRate, dabMode, gainMode, this); + PDEBUG("DabModulator::DabModulator(%u, %u, %u, %zu) @ %p\n", + outputRate, clockRate, dabMode, (size_t)gainMode, this); if (myDabMode == 0) { setMode(2); @@ -252,11 +252,11 @@ int DabModulator::process(Buffer* const dataIn, Buffer* dataOut) // Configuring puncturing encoder auto ficPunc = make_shared<PuncturingEncoder>(); - for (const auto *rule : fic->get_rules()) { + for (const auto &rule : fic->get_rules()) { PDEBUG(" Adding rule:\n"); - PDEBUG(" Length: %zu\n", rule->length()); - PDEBUG(" Pattern: 0x%x\n", rule->pattern()); - ficPunc->append_rule(*rule); + PDEBUG(" Length: %zu\n", rule.length()); + PDEBUG(" Pattern: 0x%x\n", rule.pattern()); + ficPunc->append_rule(rule); } PDEBUG(" Adding tail\n"); ficPunc->append_tail_rule(PuncturingRule(3, 0xcccccc)); @@ -312,9 +312,9 @@ int DabModulator::process(Buffer* const dataIn, Buffer* dataOut) for (const auto& rule : subchannel->get_rules()) { PDEBUG(" Adding rule:\n"); - PDEBUG(" Length: %zu\n", rule->length()); - PDEBUG(" Pattern: 0x%x\n", rule->pattern()); - subchPunc->append_rule(*rule); + PDEBUG(" Length: %zu\n", rule.length()); + PDEBUG(" Pattern: 0x%x\n", rule.pattern()); + subchPunc->append_rule(rule); } PDEBUG(" Adding tail\n"); subchPunc->append_tail_rule(PuncturingRule(3, 0xcccccc)); |