From 4448b57b6027a552c4b955fb389e558804f79ce5 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 23 Jan 2018 00:07:38 +0100
Subject: [PATCH] SDRDaemon input: differentiate SDRdaemon samples struct from
 internal DSP sample struct

---
 .../samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp  | 2 +-
 .../samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp
index b2d375237..1ab67e08c 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp
@@ -174,7 +174,7 @@ void SDRdaemonSourceBuffer::checkSlotData(int slotIndex)
     if (sampleRate > 0)
     {
         int64_t ts = m_currentMeta.m_tv_sec * 1000000LL + m_currentMeta.m_tv_usec;
-        ts -= (rwDelayBytes * 1000000LL) / (sampleRate * sizeof(Sample));
+        ts -= (rwDelayBytes * 1000000LL) / (sampleRate * sizeof(SDRdaemonSample));
         m_tvOut_sec = ts / 1000000LL;
         m_tvOut_usec = ts - (m_tvOut_sec * 1000000LL);
     }
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h
index dab6d5aa3..5613ecac0 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h
@@ -55,7 +55,7 @@ public:
         }
     };
 
-    struct Sample
+    struct SDRdaemonSample
     {
         int16_t i;
         int16_t q;
@@ -68,12 +68,12 @@ public:
         uint8_t  filler;
     };
 
-    static const int samplesPerBlock = (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header)) / sizeof(Sample);
+    static const int samplesPerBlock = (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header)) / sizeof(SDRdaemonSample);
     static const int framesSize = SDRDAEMONSOURCE_NBDECODERSLOTS * (SDRDAEMONSOURCE_NBORIGINALBLOCKS - 1) * (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header));
 
     struct ProtectedBlock
     {
-        Sample samples[samplesPerBlock];
+        SDRdaemonSample samples[samplesPerBlock];
     };
 
     struct SuperBlock