mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-22 16:08:39 -05:00
SDRdaemonFEC: renamed all sdrdaemonfec files to sdrdaemonsource
This commit is contained in:
parent
067c5b30d5
commit
3d5efd7dba
@ -1,32 +1,32 @@
|
||||
project(sdrdaemonfec)
|
||||
project(sdrdaemonsource)
|
||||
|
||||
find_package(LibNANOMSG)
|
||||
|
||||
if (HAS_SSSE3)
|
||||
message(STATUS "SDRdaemonFEC: use SSSE3 SIMD" )
|
||||
message(STATUS "SDRdaemonSource: use SSSE3 SIMD" )
|
||||
elseif (HAS_NEON)
|
||||
message(STATUS "SDRdaemonFEC: use Neon SIMD" )
|
||||
message(STATUS "SDRdaemonSource: use Neon SIMD" )
|
||||
else()
|
||||
message(STATUS "SDRdaemonFEC: Unsupported architecture")
|
||||
message(STATUS "SDRdaemonSource: Unsupported architecture")
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(sdrdaemonfec_SOURCES
|
||||
sdrdaemonfecbuffer.cpp
|
||||
sdrdaemonfecgui.cpp
|
||||
sdrdaemonfecinput.cpp
|
||||
sdrdaemonfecsettings.cpp
|
||||
sdrdaemonfecplugin.cpp
|
||||
sdrdaemonfecudphandler.cpp
|
||||
set(sdrdaemonsource_SOURCES
|
||||
sdrdaemonsourcebuffer.cpp
|
||||
sdrdaemonsourcegui.cpp
|
||||
sdrdaemonsourceinput.cpp
|
||||
sdrdaemonsourcesettings.cpp
|
||||
sdrdaemonsourceplugin.cpp
|
||||
sdrdaemonsourceudphandler.cpp
|
||||
)
|
||||
|
||||
set(sdrdaemonfec_HEADERS
|
||||
sdrdaemonfecbuffer.h
|
||||
sdrdaemonfecgui.h
|
||||
sdrdaemonfecinput.h
|
||||
sdrdaemonfecsettings.h
|
||||
sdrdaemonfecplugin.h
|
||||
sdrdaemonfecudphandler.h
|
||||
set(sdrdaemonsource_HEADERS
|
||||
sdrdaemonsourcebuffer.h
|
||||
sdrdaemonsourcegui.h
|
||||
sdrdaemonsourceinput.h
|
||||
sdrdaemonsourcesettings.h
|
||||
sdrdaemonsourceplugin.h
|
||||
sdrdaemonsourceudphandler.h
|
||||
)
|
||||
|
||||
set(sdrdaemonsource_FORMS
|
||||
@ -38,24 +38,24 @@ add_definitions(${QT_DEFINITIONS})
|
||||
add_definitions(-DQT_PLUGIN)
|
||||
add_definitions(-DQT_SHARED)
|
||||
|
||||
#qt4_wrap_cpp(sdrdaemonfec_HEADERS_MOC ${sdrdaemonfec_HEADERS})
|
||||
#qt4_wrap_cpp(sdrdaemonsource_HEADERS_MOC ${sdrdaemonsource_HEADERS})
|
||||
qt5_wrap_ui(sdrdaemonsource_FORMS_HEADERS ${sdrdaemonsource_FORMS})
|
||||
|
||||
add_library(inputsdrdaemonfec SHARED
|
||||
${sdrdaemonfec_SOURCES}
|
||||
${sdrdaemonfec_HEADERS_MOC}
|
||||
add_library(inputsdrdaemonsource SHARED
|
||||
${sdrdaemonsource_SOURCES}
|
||||
${sdrdaemonsource_HEADERS_MOC}
|
||||
${sdrdaemonsource_FORMS_HEADERS}
|
||||
)
|
||||
|
||||
if (BUILD_DEBIAN)
|
||||
target_include_directories(inputsdrdaemonfec PUBLIC
|
||||
target_include_directories(inputsdrdaemonsource PUBLIC
|
||||
.
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${LIBCM256CCSRC}
|
||||
${LIBNANOMSG_INCLUDE_DIR}
|
||||
)
|
||||
else (BUILD_DEBIAN)
|
||||
target_include_directories(inputsdrdaemonfec PUBLIC
|
||||
target_include_directories(inputsdrdaemonsource PUBLIC
|
||||
.
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CM256CC_INCLUDE_DIR}
|
||||
@ -64,14 +64,14 @@ target_include_directories(inputsdrdaemonfec PUBLIC
|
||||
endif (BUILD_DEBIAN)
|
||||
|
||||
if (BUILD_DEBIAN)
|
||||
target_link_libraries(inputsdrdaemonfec
|
||||
target_link_libraries(inputsdrdaemonsource
|
||||
${QT_LIBRARIES}
|
||||
cm256cc
|
||||
${LIBNANOMSG_LIBRARIES}
|
||||
sdrbase
|
||||
)
|
||||
else (BUILD_DEBIAN)
|
||||
target_link_libraries(inputsdrdaemonfec
|
||||
target_link_libraries(inputsdrdaemonsource
|
||||
${QT_LIBRARIES}
|
||||
${CM256CC_LIBRARIES}
|
||||
${LIBNANOMSG_LIBRARIES}
|
||||
@ -79,6 +79,6 @@ target_link_libraries(inputsdrdaemonfec
|
||||
)
|
||||
endif (BUILD_DEBIAN)
|
||||
|
||||
qt5_use_modules(inputsdrdaemonfec Core Widgets)
|
||||
qt5_use_modules(inputsdrdaemonsource Core Widgets)
|
||||
|
||||
install(TARGETS inputsdrdaemonfec DESTINATION lib/plugins/samplesource)
|
||||
install(TARGETS inputsdrdaemonsource DESTINATION lib/plugins/samplesource)
|
||||
|
@ -9,7 +9,7 @@ CONFIG += plugin
|
||||
|
||||
QT += core gui widgets multimedia network opengl
|
||||
|
||||
TARGET = inputsdrdaemonfec
|
||||
TARGET = inputsdrdaemonsource
|
||||
|
||||
CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
CONFIG(MINGW64):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
@ -36,21 +36,21 @@ CONFIG(Debug):build_subdir = debug
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0"
|
||||
|
||||
SOURCES += sdrdaemonfecbuffer.cpp\
|
||||
sdrdaemonfecgui.cpp\
|
||||
sdrdaemonfecinput.cpp\
|
||||
sdrdaemonfecsettings.cpp\
|
||||
sdrdaemonfecplugin.cpp\
|
||||
sdrdaemonfecudphandler.cpp
|
||||
SOURCES += sdrdaemonsourcebuffer.cpp\
|
||||
sdrdaemonsourcegui.cpp\
|
||||
sdrdaemonsourceinput.cpp\
|
||||
sdrdaemonsourcesettings.cpp\
|
||||
sdrdaemonsourceplugin.cpp\
|
||||
sdrdaemonsourceudphandler.cpp
|
||||
|
||||
HEADERS += sdrdaemonfecbuffer.h\
|
||||
sdrdaemonfecgui.h\
|
||||
sdrdaemonfecinput.h\
|
||||
sdrdaemonfecsettings.h\
|
||||
sdrdaemonfecplugin.h\
|
||||
sdrdaemonfecudphandler.h
|
||||
HEADERS += sdrdaemonsourcebuffer.h\
|
||||
sdrdaemonsourcegui.h\
|
||||
sdrdaemonsourceinput.h\
|
||||
sdrdaemonsourcesettings.h\
|
||||
sdrdaemonsourceplugin.h\
|
||||
sdrdaemonsourceudphandler.h
|
||||
|
||||
FORMS += sdrdaemonfecgui.ui
|
||||
FORMS += sdrdaemonsourcegui.ui
|
||||
|
||||
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
|
||||
LIBS += -L../../../lz4/$${build_subdir} -llz4
|
@ -14,8 +14,6 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "sdrdaemonfecbuffer.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
@ -23,6 +21,7 @@
|
||||
#include <lz4.h>
|
||||
#include <boost/crc.hpp>
|
||||
#include <boost/cstdint.hpp>
|
||||
#include "sdrdaemonsourcebuffer.h"
|
||||
|
||||
|
||||
|
@ -14,8 +14,8 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECBUFFER_H_
|
||||
#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECBUFFER_H_
|
||||
#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCEBUFFER_H_
|
||||
#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCEBUFFER_H_
|
||||
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
@ -270,4 +270,4 @@ private:
|
||||
|
||||
|
||||
|
||||
#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECBUFFER_H_ */
|
||||
#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCEBUFFER_H_ */
|
@ -14,8 +14,6 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "sdrdaemonfecgui.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sstream>
|
||||
#include <iostream>
|
||||
@ -41,6 +39,7 @@
|
||||
|
||||
#include <device/devicesourceapi.h>
|
||||
#include <dsp/filerecord.h>
|
||||
#include "sdrdaemonsourcegui.h"
|
||||
|
||||
SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
||||
QWidget(parent),
|
@ -21,7 +21,7 @@
|
||||
#include <sys/time.h>
|
||||
#include "plugin/plugingui.h"
|
||||
|
||||
#include "sdrdaemonfecinput.h"
|
||||
#include "sdrdaemonsourceinput.h"
|
||||
|
||||
class DeviceSourceAPI;
|
||||
class FileRecord;
|
@ -14,8 +14,6 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "sdrdaemonfecinput.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <QDebug>
|
||||
@ -26,8 +24,9 @@
|
||||
#include <device/devicesourceapi.h>
|
||||
#include <dsp/filerecord.h>
|
||||
|
||||
#include "../sdrdaemonsource/sdrdaemonfecgui.h"
|
||||
#include "../sdrdaemonsource/sdrdaemonfecudphandler.h"
|
||||
#include "sdrdaemonsourcegui.h"
|
||||
#include "sdrdaemonsourceinput.h"
|
||||
#include "sdrdaemonsourceudphandler.h"
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonFEC, Message)
|
||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonUDPLink, Message)
|
@ -24,7 +24,7 @@
|
||||
#include <iostream>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "sdrdaemonfecsettings.h"
|
||||
#include "sdrdaemonsourcesettings.h"
|
||||
|
||||
class DeviceSourceAPI;
|
||||
class SDRdaemonFECUDPHandler;
|
@ -14,8 +14,6 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "sdrdaemonfecplugin.h"
|
||||
|
||||
#include <QtPlugin>
|
||||
#include <QAction>
|
||||
#include "plugin/pluginapi.h"
|
||||
@ -23,7 +21,8 @@
|
||||
|
||||
#include <device/devicesourceapi.h>
|
||||
|
||||
#include "sdrdaemonfecgui.h"
|
||||
#include "sdrdaemonsourcegui.h"
|
||||
#include "sdrdaemonsourceplugin.h"
|
||||
|
||||
const PluginDescriptor SDRdaemonFECPlugin::m_pluginDescriptor = {
|
||||
QString("SDRdaemon with FEC input"),
|
@ -14,9 +14,8 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "sdrdaemonfecsettings.h"
|
||||
|
||||
#include "util/simpleserializer.h"
|
||||
#include "sdrdaemonsourcesettings.h"
|
||||
|
||||
SDRdaemonFECSettings::SDRdaemonFECSettings()
|
||||
{
|
@ -14,8 +14,6 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "sdrdaemonfecudphandler.h"
|
||||
|
||||
#include <QUdpSocket>
|
||||
#include <QDebug>
|
||||
#include <QTimer>
|
||||
@ -24,7 +22,9 @@
|
||||
#include "dsp/dspcommands.h"
|
||||
#include "dsp/dspengine.h"
|
||||
#include <device/devicesourceapi.h>
|
||||
#include "../sdrdaemonsource/sdrdaemonfecinput.h"
|
||||
|
||||
#include "sdrdaemonsourceinput.h"
|
||||
#include "sdrdaemonsourceudphandler.h"
|
||||
|
||||
SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *devieAPI) :
|
||||
m_deviceAPI(devieAPI),
|
@ -14,8 +14,8 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECUDPHANDLER_H_
|
||||
#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECUDPHANDLER_H_
|
||||
#ifndef PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCEUDPHANDLER_H_
|
||||
#define PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCEUDPHANDLER_H_
|
||||
|
||||
#include <QObject>
|
||||
#include <QUdpSocket>
|
||||
@ -23,7 +23,7 @@
|
||||
#include <QMutex>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
#include "sdrdaemonfecbuffer.h"
|
||||
#include "sdrdaemonsourcebuffer.h"
|
||||
|
||||
#define SDRDAEMONFEC_THROTTLE_MS 50
|
||||
|
||||
@ -83,4 +83,4 @@ private slots:
|
||||
|
||||
|
||||
|
||||
#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONFECUDPHANDLER_H_ */
|
||||
#endif /* PLUGINS_SAMPLESOURCE_SDRDAEMONSOURCE_SDRDAEMONSOURCEUDPHANDLER_H_ */
|
@ -23,7 +23,7 @@ SUBDIRS += serialdv
|
||||
CONFIG(MINGW64)SUBDIRS += cm256cc
|
||||
SUBDIRS += plugins/samplesource/filesource
|
||||
CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemon
|
||||
CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonfec
|
||||
CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource
|
||||
SUBDIRS += plugins/samplesource/rtlsdr
|
||||
SUBDIRS += plugins/samplesource/hackrfinput
|
||||
SUBDIRS += plugins/samplesource/airspy
|
||||
|
Loading…
Reference in New Issue
Block a user