From 3c3c9ca0f906cc64b357ea16508898dd1a7790f1 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Wed, 7 Jan 2026 16:28:36 +0100 Subject: Make FLtmp const --- src/DabMultiplexer.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/DabMultiplexer.cpp') diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index a3fe8db..9a06cfe 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -624,14 +624,12 @@ void DabMultiplexer::mux_frame(std::vector >& outputs * if NST=0, FL=1+FICL words, FICL=24 or 32 depending on the mode. * The FL is given in words (4 octets), see ETS 300 799 5.3.6 for details */ - unsigned short FLtmp = 1 + FICL + (fc->NST); - for (auto subchannel = ensemble->subchannels.begin(); - subchannel != ensemble->subchannels.end(); - ++subchannel) { - // Add STLsbch - FLtmp += (*subchannel)->getSizeWord(); - } + uint16_t subchannel_sizes = 0; + for (const auto& subchannel : ensemble->subchannels) + subchannel_sizes += subchannel->getSizeWord(); + + const uint16_t FLtmp = 1 + FICL + (fc->NST) + subchannel_sizes; fc->setFrameLength(FLtmp); index = 8; -- cgit v1.2.3