Merge branch 'dexter' into next

1 files changed, 0 insertions, 61 deletions

diff --git a/src/InputReader.h b/src/InputReader.h
index ab45d4f..2484948 100644
--- a/src/InputReader.h
+++ b/src/InputReader.h
@@ -38,11 +38,6 @@
 #include <memory>
 #include <thread>
 #include <unistd.h>
-#if defined(HAVE_ZEROMQ)
-#  include "zmq.hpp"
-#  include "ThreadsafeQueue.h"
-#  include "RemoteControl.h"
-#endif
 #include "Log.h"
 #include "Socket.h"
 #define INVALID_SOCKET   -1
@@ -148,60 +143,4 @@ class InputTcpReader : public InputReader
         std::string m_uri;
 };
 
-struct zmq_input_overflow : public std::exception
-{
-    const char* what () const throw ()
-    {
-        return "InputZMQ buffer overflow";
-    }
-};
-
-#if defined(HAVE_ZEROMQ)
-/* A ZeroMQ input. See www.zeromq.org for more info */
-
-class InputZeroMQReader : public InputReader, public RemoteControllable
-{
-    public:
-        InputZeroMQReader();
-        InputZeroMQReader(const InputZeroMQReader& other) = delete;
-        InputZeroMQReader& operator=(const InputZeroMQReader& other) = delete;
-        ~InputZeroMQReader();
-
-        int Open(const std::string& uri, size_t max_queued_frames);
-        virtual int GetNextFrame(void* buffer) override;
-        virtual std::string GetPrintableInfo() const override;
-
-        /* Base function to set parameters. */
-        virtual void set_parameter(
-                const std::string& parameter,
-                const std::string& value) override;
-
-        /* Getting a parameter always returns a string. */
-        virtual const std::string get_parameter(
-                const std::string& parameter) const override;
-
-    private:
-        std::atomic<bool> m_running = ATOMIC_VAR_INIT(false);
-        std::string m_uri;
-        size_t m_max_queued_frames = 0;
-
-        // Either must contain a full ETI frame, or one flag must be set
-        struct message_t {
-            std::vector<uint8_t> eti_frame;
-            bool overflow = false;
-            bool timeout = false;
-            bool fault = false;
-        };
-        ThreadsafeQueue<message_t> m_in_messages;
-
-        mutable std::mutex m_last_in_messages_size_mutex;
-        size_t m_last_in_messages_size = 0;
-
-        void RecvProcess(void);
-
-        zmq::context_t m_zmqcontext; // is thread-safe
-        std::thread m_recv_thread;
-};
-
-#endif