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, 0 insertions, 31 deletions

diff --git a/src/dabInputMpegFile.cpp b/src/dabInputMpegFile.cpp
index 804ea29..6f24f32 100644
--- a/src/dabInputMpegFile.cpp
+++ b/src/dabInputMpegFile.cpp
@@ -47,37 +47,6 @@ struct dabInputOperations dabInputMpegFileOperations = {
 };
 
 
-#define MPEG_FREQUENCY      -2
-#define MPEG_PADDING        -3
-#define MPEG_COPYRIGHT      -4
-#define MPEG_ORIGINAL       -5
-#define MPEG_EMPHASIS       -6
-int checkDabMpegFrame(void* data) {
-    mpegHeader* header = (mpegHeader*)data;
-    unsigned long* headerData = (unsigned long*)data;
-    if ((*headerData & 0x0f0ffcff) == 0x0004fcff) return 0;
-    if ((*headerData & 0x0f0ffcff) == 0x0004f4ff) return 0;
-    if (getMpegFrequency(header) != 48000) {
-        if (getMpegFrequency(header) != 24000) {
-            return MPEG_FREQUENCY;
-        }
-    }
-    if (header->padding != 0) {
-        return MPEG_PADDING;
-    }
-    if (header->copyright != 0) {
-        return MPEG_COPYRIGHT;
-    }
-    if (header->original != 0) {
-        return MPEG_ORIGINAL;
-    }
-    if (header->emphasis != 0) {
-        return MPEG_EMPHASIS;
-    }
-    return -1;
-}
-
-
 int dabInputMpegFileRead(dabInputOperations* ops, void* args, void* buffer, int size)
 {
     dabInputFileData* data = (dabInputFileData*)args;