From 8a6ef95903b61c727fbd89a44cbe41d6403e87a1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 5 Feb 2018 02:01:46 +0100 Subject: [PATCH] LimeSDR: removed sampleRate from MsgGetStreamInfo as it has been removed from lms_stream_status_t and is not used actually --- plugins/samplesink/limesdroutput/limesdroutput.cpp | 2 -- plugins/samplesink/limesdroutput/limesdroutput.h | 6 ------ plugins/samplesource/limesdrinput/limesdrinput.cpp | 2 -- plugins/samplesource/limesdrinput/limesdrinput.h | 6 ------ 4 files changed, 16 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 0226cbe7d..45536df30 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -629,7 +629,6 @@ bool LimeSDROutput::handleMessage(const Message& message) status.underrun, status.overrun, status.droppedPackets, - status.sampleRate, status.linkRate, status.timestamp); m_deviceAPI->getSampleSinkGUIMessageQueue()->push(report); @@ -647,7 +646,6 @@ bool LimeSDROutput::handleMessage(const Message& message) 0, // status.underrun, 0, // status.overrun, 0, // status.droppedPackets, - 0, // status.sampleRate, 0, // status.linkRate, 0); // status.timestamp); m_deviceAPI->getSampleSinkGUIMessageQueue()->push(report); diff --git a/plugins/samplesink/limesdroutput/limesdroutput.h b/plugins/samplesink/limesdroutput/limesdroutput.h index 35d8e14fe..7c064b924 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -114,7 +114,6 @@ public: uint32_t getUnderrun() const { return m_underrun; } uint32_t getOverrun() const { return m_overrun; } uint32_t getDroppedPackets() const { return m_droppedPackets; } - float getSampleRate() const { return m_sampleRate; } float getLinkRate() const { return m_linkRate; } uint64_t getTimestamp() const { return m_timestamp; } @@ -126,7 +125,6 @@ public: uint32_t underrun, uint32_t overrun, uint32_t droppedPackets, - float sampleRate, float linkRate, uint64_t timestamp ) @@ -139,7 +137,6 @@ public: underrun, overrun, droppedPackets, - sampleRate, linkRate, timestamp ); @@ -154,7 +151,6 @@ public: uint32_t m_underrun; //!< FIFO underrun count uint32_t m_overrun; //!< FIFO overrun count uint32_t m_droppedPackets; //!< Number of dropped packets by HW - float m_sampleRate; //!< Sampling rate of the stream float m_linkRate; //!< Combined data rate of all stream of the same direction (TX or RX) uint64_t m_timestamp; //!< Current HW timestamp @@ -166,7 +162,6 @@ public: uint32_t underrun, uint32_t overrun, uint32_t droppedPackets, - float sampleRate, float linkRate, uint64_t timestamp ) : @@ -178,7 +173,6 @@ public: m_underrun(underrun), m_overrun(overrun), m_droppedPackets(droppedPackets), - m_sampleRate(sampleRate), m_linkRate(linkRate), m_timestamp(timestamp) { } diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 1abfa88dc..d2acb00cf 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -628,7 +628,6 @@ bool LimeSDRInput::handleMessage(const Message& message) status.underrun, status.overrun, status.droppedPackets, - status.sampleRate, status.linkRate, status.timestamp); m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); @@ -646,7 +645,6 @@ bool LimeSDRInput::handleMessage(const Message& message) 0, // status.underrun, 0, // status.overrun, 0, // status.droppedPackets, - 0, // status.sampleRate, 0, // status.linkRate, 0); // status.timestamp); m_deviceAPI->getSampleSourceGUIMessageQueue()->push(report); diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h index 7edd0203a..398e8496f 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -97,7 +97,6 @@ public: uint32_t getUnderrun() const { return m_underrun; } uint32_t getOverrun() const { return m_overrun; } uint32_t getDroppedPackets() const { return m_droppedPackets; } - float getSampleRate() const { return m_sampleRate; } float getLinkRate() const { return m_linkRate; } uint64_t getTimestamp() const { return m_timestamp; } @@ -109,7 +108,6 @@ public: uint32_t underrun, uint32_t overrun, uint32_t droppedPackets, - float sampleRate, float linkRate, uint64_t timestamp ) @@ -122,7 +120,6 @@ public: underrun, overrun, droppedPackets, - sampleRate, linkRate, timestamp ); @@ -137,7 +134,6 @@ public: uint32_t m_underrun; //!< FIFO underrun count uint32_t m_overrun; //!< FIFO overrun count uint32_t m_droppedPackets; //!< Number of dropped packets by HW - float m_sampleRate; //!< Sampling rate of the stream float m_linkRate; //!< Combined data rate of all stream of the same direction (TX or RX) uint64_t m_timestamp; //!< Current HW timestamp @@ -149,7 +145,6 @@ public: uint32_t underrun, uint32_t overrun, uint32_t droppedPackets, - float sampleRate, float linkRate, uint64_t timestamp ) : @@ -161,7 +156,6 @@ public: m_underrun(underrun), m_overrun(overrun), m_droppedPackets(droppedPackets), - m_sampleRate(sampleRate), m_linkRate(linkRate), m_timestamp(timestamp) { }