From 907534bccee046c0499e9f936873c229b247ef95 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 23 Sep 2019 14:44:45 +0200 Subject: Add buffermanagement setting to RC --- src/DabMultiplexer.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/DabMultiplexer.cpp') diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index 549850a..9bd3c3f 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -592,17 +592,9 @@ void DabMultiplexer::mux_frame(std::vector >& outputs edi::TagESTn& tag = edi_subchannelToTag[subchannel.get()]; int sizeSubchannel = subchannel->getSizeByte(); - int result = -1; - switch (subchannel->bufferManagement) { - case BufferManagement::Prebuffering: - result = subchannel->input->readFrame(&etiFrame[index], sizeSubchannel); - break; - case BufferManagement::Timestamped: - // no need to check enableTist because we always increment the timestamp - result = subchannel->input->readFrame(&etiFrame[index], + // no need to check enableTist because we always increment the timestamp + int result = subchannel->readFrame(&etiFrame[index], sizeSubchannel, edi_time + m_tist_offset, tai_utc_offset, timestamp); - break; - } if (result < 0) { etiLog.log(info, -- cgit v1.2.3