1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00

Improve MSVC 2015 compatibility of FileSource plugin (fixes #348)

SoapySDR: enhanced log message during scan to show which id parameters are used
Windows build fixes
Perseus server: fixed missing libusb libraries in cmake file
This commit is contained in:
f4exb 2019-05-23 16:25:44 +02:00
parent c99b16f7d7
commit 6c71893143
7 changed files with 25 additions and 9 deletions

View File

@ -27,6 +27,8 @@ LIBS += -L../logging/$${build_subdir} -llogging
CONFIG(ANDROID):CONFIG += mobility
CONFIG(ANDROID):MOBILITY =
RC_ICONS = ../sdrgui/resources/sdrangel_icon.ico
macx {
QMAKE_TARGET_BUNDLE_PREFIX = org.f4exb
QMAKE_BUNDLE = SDRangel

View File

@ -27,7 +27,7 @@
#include "mainwindow.h"
#include "dsp/dsptypes.h"
#ifdef _MSC_VER
#define GIT_COMMIT_HASH_STR "v4.8.0"
#define GIT_COMMIT_HASH_STR "v4.8.1"
#else
#include "sdrangel_version.h"
#endif

View File

@ -73,11 +73,6 @@ void DeviceSoapySDRScan::scan()
m_deviceEnums.back().m_label = QString("%1-%2").arg(m_deviceEnums.back().m_driverName).arg(deviceSeq);
}
qDebug("DeviceSoapySDRScan::scan: %s #%u %s",
m_deviceEnums.back().m_driverName.toStdString().c_str(),
deviceSeq,
m_deviceEnums.back().m_label.toStdString().c_str());
if ((kargIt = kit->find("serial")) != kit->end())
{
m_deviceEnums.back().m_idKey = QString(kargIt->first.c_str());
@ -94,6 +89,13 @@ void DeviceSoapySDRScan::scan()
m_deviceEnums.back().m_idValue = QString(kargIt->second.c_str());
}
qDebug("DeviceSoapySDRScan::scan: %s #%u %s id: %s=%s",
m_deviceEnums.back().m_driverName.toStdString().c_str(),
deviceSeq,
m_deviceEnums.back().m_label.toStdString().c_str(),
m_deviceEnums.back().m_idKey.toStdString().c_str(),
m_deviceEnums.back().m_idValue.toStdString().c_str());
// access the device to get the number of Rx and Tx channels and at the same time probe
// whether it is available for Soapy

View File

@ -181,7 +181,7 @@ bool FileSourceInput::start()
QMutexLocker mutexLocker(&m_mutex);
qDebug() << "FileSourceInput::start";
if (m_ifstream.tellg() != 0) {
if (m_ifstream.tellg() != (std::streampos)0) {
m_ifstream.clear();
m_ifstream.seekg(sizeof(FileRecord::Header), std::ios::beg);
}

View File

@ -22,7 +22,8 @@ include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/devices
${CMAKE_SOURCE_DIR}/devices
${LIBUSB_INCLUDE_DIR}
${LIBPERSEUSSRC}
${LIBPERSEUSSRC}/libperseus/src
)
@ -31,7 +32,8 @@ include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/devices
${CMAKE_SOURCE_DIR}/devices
${LIBUSB_INCLUDE_DIR}
${LIBPERSEUS_INCLUDE_DIR}
)
endif (BUILD_DEBIAN)
@ -48,6 +50,7 @@ add_library(inputperseussrv SHARED
if (BUILD_DEBIAN)
target_link_libraries(inputperseussrv
${QT_LIBRARIES}
${LIBUSB_LIBRARIES}
perseus
sdrbase
swagger
@ -56,6 +59,7 @@ target_link_libraries(inputperseussrv
else (BUILD_DEBIAN)
target_link_libraries(inputperseussrv
${QT_LIBRARIES}
${LIBUSB_LIBRARIES}
${LIBPERSEUS_LIBRARIES}
sdrbase
swagger

View File

@ -82,6 +82,7 @@ SOURCES += audio/audiodevicemanager.cpp\
dsp/decimatorsfi.cpp\
dsp/dspcommands.cpp\
dsp/dspengine.cpp\
dsp/dspdevicemimoengine.cpp\
dsp/dspdevicesourceengine.cpp\
dsp/dspdevicesinkengine.cpp\
dsp/fftengine.cpp\
@ -114,6 +115,7 @@ SOURCES += audio/audiodevicemanager.cpp\
dsp/wfir.cpp\
dsp/devicesamplesource.cpp\
dsp/devicesamplesink.cpp\
dsp/devicesamplemimo.cpp\
settings/preferences.cpp\
settings/preset.cpp\
settings/mainsettings.cpp\
@ -165,6 +167,7 @@ HEADERS += audio/audiodevicemanager.h\
dsp/interpolators.h\
dsp/dspcommands.h\
dsp/dspengine.h\
dsp/dspdevicemimoengine.h\
dsp/dspdevicesourceengine.h\
dsp/dspdevicesinkengine.h\
dsp/dsptypes.h\
@ -212,6 +215,7 @@ HEADERS += audio/audiodevicemanager.h\
dsp/wfir.h\
dsp/devicesamplesource.h\
dsp/devicesamplesink.h\
dsp/devicesamplemimo.h\
plugin/plugininstancegui.h\
plugin/plugininterface.h\
plugin/pluginapi.h\

View File

@ -59,6 +59,7 @@ SOURCES += mainwindow.cpp\
gui/commandoutputdialog.cpp\
gui/crightclickenabler.cpp\
gui/cwkeyergui.cpp\
gui/devicestreamselectiondialog.cpp\
gui/editcommanddialog.cpp\
gui/externalclockbutton.cpp\
gui/externalclockdialog.cpp\
@ -79,6 +80,7 @@ SOURCES += mainwindow.cpp\
gui/rollupwidget.cpp\
gui/samplingdevicecontrol.cpp\
gui/samplingdevicedialog.cpp\
gui/sdrangelsplash.cpp\
gui/mypositiondialog.cpp\
gui/scaleengine.cpp\
gui/transverterbutton.cpp\
@ -119,6 +121,7 @@ HEADERS += mainwindow.h\
gui/commandoutputdialog.h\
gui/crightclickenabler.h\
gui/cwkeyergui.h\
gui/devicestreamselectiondialog.h\
gui/editcommanddialog.h\
gui/externalclockbutton.h\
gui/externalclockdialog.h\
@ -138,6 +141,7 @@ HEADERS += mainwindow.h\
gui/rollupwidget.h\
gui/samplingdevicecontrol.h\
gui/samplingdevicedialog.h\
gui/sdrangelsplash.h\
gui/mypositiondialog.h\
gui/scaleengine.h\
gui/tickedslider.h\