From e07a730c4f9b87d0eda8ffc18466ba4dfc581be9 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 22 Apr 2017 11:33:41 +0200 Subject: [PATCH] LimeSDR output: compilation succesful --- plugins/samplesink/CMakeLists.txt | 6 ++++++ plugins/samplesink/limesdroutput/CMakeLists.txt | 4 ++-- plugins/samplesink/limesdroutput/limesdroutput.cpp | 10 +++++----- .../samplesink/limesdroutput/limesdroutputthread.cpp | 4 ++-- plugins/samplesink/limesdroutput/limesdroutputthread.h | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/plugins/samplesink/CMakeLists.txt b/plugins/samplesink/CMakeLists.txt index 24e9721a3..e8875d6b1 100644 --- a/plugins/samplesink/CMakeLists.txt +++ b/plugins/samplesink/CMakeLists.txt @@ -12,9 +12,15 @@ if(LIBUSB_FOUND AND LIBHACKRF_FOUND) add_subdirectory(hackrfoutput) endif(LIBUSB_FOUND AND LIBHACKRF_FOUND) +find_package(LimeSuite) +if(LIBUSB_FOUND AND LIMESUITE_FOUND) + add_subdirectory(limesdroutput) +endif(LIBUSB_FOUND AND LIMESUITE_FOUND) + if (BUILD_DEBIAN) add_subdirectory(bladerfoutput) add_subdirectory(hackrfoutput) + add_subdirectory(limesdroutput) endif (BUILD_DEBIAN) add_subdirectory(filesink) diff --git a/plugins/samplesink/limesdroutput/CMakeLists.txt b/plugins/samplesink/limesdroutput/CMakeLists.txt index 4fd61a12b..efbb42529 100644 --- a/plugins/samplesink/limesdroutput/CMakeLists.txt +++ b/plugins/samplesink/limesdroutput/CMakeLists.txt @@ -50,6 +50,6 @@ target_link_libraries(outputlimesdr limesdrdevice ) -qt5_use_modules(inputlimesdr Core Widgets) +qt5_use_modules(outputlimesdr Core Widgets) -install(TARGETS inputlimesdr DESTINATION lib/plugins/samplesource) +install(TARGETS outputlimesdr DESTINATION lib/plugins/samplesink) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index b010b0624..4d3fd5ec1 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -23,7 +23,7 @@ #include "device/devicesourceapi.h" #include "device/devicesinkapi.h" #include "dsp/dspcommands.h" -#include "limesdrinputthread.h" +#include "limesdroutputthread.h" #include "limesdr/devicelimesdrparam.h" #include "limesdr/devicelimesdr.h" #include "limesdroutput.h" @@ -229,7 +229,7 @@ void LimeSDROutput::closeDevice() for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { - DeviceSourceAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; + const DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); if (buddyShared->m_thread) { @@ -702,9 +702,9 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo for (; itSource != sourceBuddies.end(); ++itSource) { DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSource)->getBuddySharedPtr(); - if (buddySharedPtr->m_thread) - { - ((LimeSDRInputThread *) buddySharedPtr->m_thread)->startWork(); + + if (buddySharedPtr->m_thread) { + buddySharedPtr->m_thread->startWork(); } } diff --git a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp index 1f123f2b4..d7c64132a 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp @@ -85,7 +85,7 @@ void LimeSDROutputThread::run() { callback(m_buf, 2 * res); - if ((res = LMS_SendStream(m_stream, (void *) m_buf, LIMESDR_BLOCKSIZE, &metadata, 1000)) < 0) + if ((res = LMS_SendStream(m_stream, (void *) m_buf, LIMESDROUTPUT_BLOCKSIZE, &metadata, 1000)) < 0) { qCritical("LimeSDROutputThread::run write error: %s", strerror(errno)); break; @@ -102,7 +102,7 @@ void LimeSDROutputThread::run() } // Interpolate according to specified log2 (ex: log2=4 => decim=16) -void LimeSDROutputThread::callback(const qint16* buf, qint32 len) +void LimeSDROutputThread::callback(qint16* buf, qint32 len) { SampleVector::iterator beginRead; m_sampleFifo->readAdvance(beginRead, len/(1< m_interpolators; void run(); - void callback(const qint16* buf, qint32 len); + void callback(qint16* buf, qint32 len); };