Rework EDI input

- Use same main loop for both ETI and EDI inputs
- Test SFN functionality with EDI input
- Add log.show_process_time setting for process time printout

1 files changed, 9 insertions, 2 deletions

diff --git a/src/EtiReader.h b/src/EtiReader.h
index 99ca715..28fb2ac 100644
--- a/src/EtiReader.h
+++ b/src/EtiReader.h
@@ -111,7 +111,6 @@ private:
     std::vector<std::shared_ptr<SubchannelSource> > mySources;
 };
 
-#ifdef HAVE_EDI
 /* The EdiReader extracts the necessary data using the EDI input library in
  * lib/edi
  */
@@ -213,5 +212,13 @@ class EdiTransport {
         Socket::TCPClient m_tcpclient;
         EdiDecoder::ETIDecoder& m_decoder;
 };
-#endif
+
+// EdiInput wraps an EdiReader, an EdiDecoder::ETIDecoder and an EdiTransport
+class EdiInput {
+    public:
+        EdiInput(double& tist_offset_s, float edi_max_delay_ms);
+        EdiReader ediReader;
+        EdiDecoder::ETIDecoder decoder;
+        EdiTransport ediTransport;
+};