VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-18 13:48:37 -04:00
Code Issues Projects Releases Wiki Activity

MSVC compatibility

Browse Source
This commit is contained in:
f4exb
2020-03-15 11:58:19 +01:00
parent f77f61a8a5
commit 298a5aadc5
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplemimo/bladerf2mimo/bladerf2mimo.h
+1 -1
View File
@@ -176,7 +176,7 @@ public:
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response);
bool isRecording(unsigned int istream) const;
bool isRecording(unsigned int istream) const { (void) istream; return false; }
void getRxFrequencyRange(uint64_t& min, uint64_t& max, int& step);
void getRxSampleRateRange(int& min, int& max, int& step);
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp
-1
View File
@@ -94,7 +94,6 @@ BladeRF2MIMOGui::BladeRF2MIMOGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_sampleMIMO->setMessageQueueToGUI(&m_inputMessageQueue);
CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStopRx);
connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));
sendSettings();
}
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h
-1
View File
@@ -98,7 +98,6 @@ private slots:
void handleInputMessages();
void updateHardware();
void updateStatus();
void openDeviceSettingsDialog(const QPoint& p);
void on_streamSide_currentIndexChanged(int index);
void on_streamIndex_currentIndexChanged(int index);
void on_spectrumSide_currentIndexChanged(int index);
plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp
+3 -1
View File
@@ -15,6 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <algorithm>
#include "bladerf2/devicebladerf2shared.h"
#include "dsp/samplemififo.h"
@@ -144,7 +146,7 @@ void BladeRF2MIThread::callback(const qint16* buf, qint32 samplesPerChannel)
else
{
qWarning("BladeRF2MIThread::callback: unequal channel lengths: [0]=%d [1]=%d", lengths[0], lengths[1]);
m_sampleFifo->writeSync(vbegin, std::min(lengths[0], lengths[1]));
m_sampleFifo->writeSync(vbegin, (std::min)(lengths[0], lengths[1]));
}
}