diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-08-22 20:42:34 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-08-22 20:42:34 +0200 |
| commit | 289f61e5023758f1ca805d19be5f2c19757090e3 (patch) | |
| tree | 49577f82f450d56f2962ecbfbd0237034774a2c2 /src/DabMultiplexer.cpp | |
| parent | 1f4a861853f37fccbd0aa25a9f1b6457117ee85c (diff) | |
| download | dabmux-289f61e5023758f1ca805d19be5f2c19757090e3.tar.gz dabmux-289f61e5023758f1ca805d19be5f2c19757090e3.tar.bz2 dabmux-289f61e5023758f1ca805d19be5f2c19757090e3.zip | |
Switch FIG0/10 to long form
The latest draft specification deprecates the short form, and most
muxes today used the long form.
Diffstat (limited to 'src/DabMultiplexer.cpp')
| -rw-r--r-- | src/DabMultiplexer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index 3ac6623..1707a50 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -374,7 +374,6 @@ void DabMultiplexer::prepare_data_inputs() /* Each call creates one ETI frame */ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs) { - time_t date; unsigned char etiFrame[6144]; unsigned short index = 0; @@ -393,7 +392,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs // The above Tag Items will be assembled into a TAG Packet TagPacket edi_tagpacket(edi_conf.tagpacket_alignment); - date = getDabTime(); + update_dab_time(); // Initialise the ETI frame memset(etiFrame, 0, 6144); @@ -571,7 +570,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs edi_tagDETI.fic_length = FICL * 4; // Insert all FIBs - fig_carousel.update(currentFrame, date); + fig_carousel.update(currentFrame); const bool fib3_present = ensemble->mode == 3; index += fig_carousel.write_fibs(&etiFrame[index], currentFrame % 4, fib3_present); |