VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LimeSDR output: compilation succesful

This commit is contained in:
f4exb 2017-04-22 11:33:41 +02:00
parent 90b7599a12
commit e07a730c4f
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/samplesink/CMakeLists.txt
View File

@ -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)

4
plugins/samplesink/limesdroutput/CMakeLists.txt
View File

@ -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)

10
plugins/samplesink/limesdroutput/limesdroutput.cpp
View File

@ -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();
}
}

4
plugins/samplesink/limesdroutput/limesdroutputthread.cpp
View File

@ -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_log2Interp));

2
plugins/samplesink/limesdroutput/limesdroutputthread.h
View File

@ -57,7 +57,7 @@ private:
Interpolators<qint16, SDR_SAMP_SZ, 12> m_interpolators;
void run();
void callback(const qint16* buf, qint32 len);
void callback(qint16* buf, qint32 len);
};