From 598bee55402280ff4ca6dedcbd212017a57e482e Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sat, 17 May 2014 17:44:17 +0200 Subject: rename AFPacket to AFPacketiser --- src/DabMux.cpp | 2 +- src/dabOutput/edi/AFPacket.cpp | 2 +- src/dabOutput/edi/AFPacket.h | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/DabMux.cpp b/src/DabMux.cpp index da49cbb..3859734 100644 --- a/src/DabMux.cpp +++ b/src/DabMux.cpp @@ -673,7 +673,7 @@ int main(int argc, char *argv[]) TagPacket edi_tagpacket; // The TagPacket will then be placed into an AFPacket - AFPacket edi_afPacket(EDI_AFPACKET_PROTOCOLTYPE_TAGITEMS); + AFPacketiser edi_afPacket(EDI_AFPACKET_PROTOCOLTYPE_TAGITEMS); edi_tagDETI.atstf = 0; // TODO add ATST support diff --git a/src/dabOutput/edi/AFPacket.cpp b/src/dabOutput/edi/AFPacket.cpp index 782ae78..0c4b8c3 100644 --- a/src/dabOutput/edi/AFPacket.cpp +++ b/src/dabOutput/edi/AFPacket.cpp @@ -39,7 +39,7 @@ // AF Packet Major (3 bits) and Minor (4 bits) version #define AFHEADER_VERSION 0x8 // MAJ=1, MIN=0 -std::vector AFPacket::Assemble(TagPacket tag_packet) +AFPacket AFPacketiser::Assemble(TagPacket tag_packet) { std::vector payload = tag_packet.Assemble(); diff --git a/src/dabOutput/edi/AFPacket.h b/src/dabOutput/edi/AFPacket.h index 0826a35..1451085 100644 --- a/src/dabOutput/edi/AFPacket.h +++ b/src/dabOutput/edi/AFPacket.h @@ -35,13 +35,15 @@ #define EDI_AFPACKET_PROTOCOLTYPE_TAGITEMS ('T') +typedef std::vector AFPacket; + // ETSI TS 102 821, 6.1 AF packet structure -class AFPacket +class AFPacketiser { public: - AFPacket(char protocolType) : protocol_type(protocolType) {}; + AFPacketiser(char protocolType) : protocol_type(protocolType) {}; - std::vector Assemble(TagPacket tag_packet); + AFPacket Assemble(TagPacket tag_packet); private: static const bool have_crc = true; -- cgit v1.2.3