From 91181df0cfb2a5e33d16c8458a84978c14a005ba Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 1 Jul 2024 13:32:22 +0200 Subject: Common 649e0cb: Replace edi tagpacket callback by AF packet callback --- lib/edi/ETIDecoder.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/edi/ETIDecoder.cpp') diff --git a/lib/edi/ETIDecoder.cpp b/lib/edi/ETIDecoder.cpp index 0a4da54..1a726cf 100644 --- a/lib/edi/ETIDecoder.cpp +++ b/lib/edi/ETIDecoder.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2020 + Copyright (C) 2024 Matthias P. Braendli, matthias.braendli@mpb.li http://opendigitalradio.org @@ -44,7 +44,7 @@ ETIDecoder::ETIDecoder(ETIDataCollector& data_collector) : std::bind(&ETIDecoder::decode_estn, this, _1, _2)); m_dispatcher.register_tag("*dmy", std::bind(&ETIDecoder::decode_stardmy, this, _1, _2)); - m_dispatcher.register_tagpacket_handler(std::bind(&ETIDecoder::decode_tagpacket, this, _1)); + m_dispatcher.register_afpacket_handler(std::bind(&ETIDecoder::decode_afpacket, this, _1)); } void ETIDecoder::set_verbose(bool verbose) @@ -174,7 +174,7 @@ bool ETIDecoder::decode_deti(const std::vector& value, const tag_name_t fic.begin()); i += fic_length; - m_data_collector.update_fic(move(fic)); + m_data_collector.update_fic(std::move(fic)); } if (rfudf) { @@ -215,7 +215,7 @@ bool ETIDecoder::decode_estn(const std::vector& value, const tag_name_t value.end(), back_inserter(stc.mst)); - m_data_collector.add_subchannel(move(stc)); + m_data_collector.add_subchannel(std::move(stc)); return true; } @@ -225,9 +225,9 @@ bool ETIDecoder::decode_stardmy(const std::vector&, const tag_name_t&) return true; } -bool ETIDecoder::decode_tagpacket(const std::vector& value) +bool ETIDecoder::decode_afpacket(std::vector&& value) { - m_received_tagpacket.tagpacket = value; + m_received_tagpacket.afpacket = std::move(value); return true; } @@ -237,7 +237,7 @@ void ETIDecoder::packet_completed() ReceivedTagPacket tp; swap(tp, m_received_tagpacket); - m_data_collector.assemble(move(tp)); + m_data_collector.assemble(std::move(tp)); } } -- cgit v1.2.3