Merge rework of inputs into 'next'

This breaks the non-blocking fifo inputs, as it seems nobody is
using them.

It restores some UDP functionality, not necessarily in the same way as
before.

1 files changed, 1 insertions, 16 deletions

diff --git a/src/dabInput.h b/src/dabInput.h
index d5444cd..d2c5f49 100644
--- a/src/dabInput.h
+++ b/src/dabInput.h
@@ -29,8 +29,6 @@
 #include "RemoteControl.h"
 #include <string>
 
-extern Logger etiLog;
-
 // TODO replace usage of dabInputOperations by a
 // class hierarchy
 struct dabInputOperations {
@@ -48,19 +46,6 @@ struct dabInputOperations {
     bool operator==(const dabInputOperations&);
 };
 
-/* New input object base */
-class DabInputBase {
-    public:
-        virtual int open(const std::string& name) = 0;
-        virtual int readFrame(void* buffer, int size) = 0;
-        virtual int setBitrate(int bitrate) = 0;
-        virtual int close() = 0;
-
-        virtual ~DabInputBase() {}
-    protected:
-        DabInputBase() {}
-};
-
 /* Wrapper class for old-style dabInputOperations inputs */
 class DabInputCompatible : public DabInputBase {
     public:
@@ -77,7 +62,7 @@ class DabInputCompatible : public DabInputBase {
         virtual int setbuf(int size)
         { return m_ops.setbuf(args, size); }
 
-        virtual int readFrame(void* buffer, int size)
+        virtual int readFrame(uint8_t* buffer, size_t size)
         {
             if (m_ops.lock) {
                 m_ops.lock(args);