Browse Source

Code re-organization in two libraries sdrbase and sdrgui in view of core / GUI split

chirpmodem-v8.0.0
f4exb 9 years ago
parent
commit
fa77ca3fb6
  1. 5
      CMakeLists.txt
  2. 2
      app/app.pro
  3. 1
      apple/deploy.sh
  4. 1
      plugins/channelrx/chanalyzer/CMakeLists.txt
  5. 4
      plugins/channelrx/chanalyzer/chanalyzer.pro
  6. 2
      plugins/channelrx/chanalyzer/chanalyzergui.ui
  7. 1
      plugins/channelrx/chanalyzerng/CMakeLists.txt
  8. 4
      plugins/channelrx/chanalyzerng/chanalyzerng.pro
  9. 32
      plugins/channelrx/chanalyzerng/chanalyzernggui.ui
  10. 1
      plugins/channelrx/demodam/CMakeLists.txt
  11. 26
      plugins/channelrx/demodam/amdemodgui.ui
  12. 4
      plugins/channelrx/demodam/demodam.pro
  13. 1
      plugins/channelrx/demodatv/CMakeLists.txt
  14. 35
      plugins/channelrx/demodatv/atvdemodgui.ui
  15. 4
      plugins/channelrx/demodatv/demodatv.pro
  16. 1
      plugins/channelrx/demodbfm/CMakeLists.txt
  17. 32
      plugins/channelrx/demodbfm/bfmdemodgui.ui
  18. 4
      plugins/channelrx/demodbfm/demodbfm.pro
  19. 2
      plugins/channelrx/demoddsd/CMakeLists.txt
  20. 4
      plugins/channelrx/demoddsd/demoddsd.pro
  21. 36
      plugins/channelrx/demoddsd/dsddemodgui.ui
  22. 1
      plugins/channelrx/demodlora/CMakeLists.txt
  23. 4
      plugins/channelrx/demodlora/demodlora.pro
  24. 1
      plugins/channelrx/demodnfm/CMakeLists.txt
  25. 4
      plugins/channelrx/demodnfm/demodnfm.pro
  26. 24
      plugins/channelrx/demodnfm/nfmdemodgui.ui
  27. 1
      plugins/channelrx/demodssb/CMakeLists.txt
  28. 4
      plugins/channelrx/demodssb/demodssb.pro
  29. 38
      plugins/channelrx/demodssb/ssbdemodgui.ui
  30. 1
      plugins/channelrx/demodwfm/CMakeLists.txt
  31. 5
      plugins/channelrx/demodwfm/demodwfm.pro
  32. 4
      plugins/channelrx/demodwfm/wfmdemodgui.ui
  33. 1
      plugins/channelrx/tcpsrc/CMakeLists.txt
  34. 4
      plugins/channelrx/tcpsrc/tcpsrc.pro
  35. 1
      plugins/channelrx/udpsrc/CMakeLists.txt
  36. 4
      plugins/channelrx/udpsrc/udpsrc.pro
  37. 6
      plugins/channelrx/udpsrc/udpsrcgui.ui
  38. 1
      plugins/channeltx/modam/CMakeLists.txt
  39. 38
      plugins/channeltx/modam/ammodgui.ui
  40. 4
      plugins/channeltx/modam/modam.pro
  41. 1
      plugins/channeltx/modatv/CMakeLists.txt
  42. 45
      plugins/channeltx/modatv/atvmodgui.ui
  43. 4
      plugins/channeltx/modatv/modatv.pro
  44. 1
      plugins/channeltx/modnfm/CMakeLists.txt
  45. 4
      plugins/channeltx/modnfm/modnfm.pro
  46. 38
      plugins/channeltx/modnfm/nfmmodgui.ui
  47. 1
      plugins/channeltx/modssb/CMakeLists.txt
  48. 4
      plugins/channeltx/modssb/modssb.pro
  49. 42
      plugins/channeltx/modssb/ssbmodgui.ui
  50. 1
      plugins/channeltx/modwfm/CMakeLists.txt
  51. 4
      plugins/channeltx/modwfm/modwfm.pro
  52. 38
      plugins/channeltx/modwfm/wfmmodgui.ui
  53. 1
      plugins/channeltx/udpsink/CMakeLists.txt
  54. 4
      plugins/channeltx/udpsink/udpsink.pro
  55. 6
      plugins/channeltx/udpsink/udpsinkgui.ui
  56. 2
      plugins/samplesink/bladerfoutput/CMakeLists.txt
  57. 4
      plugins/samplesink/bladerfoutput/bladerfoutput.pro
  58. 28
      plugins/samplesink/bladerfoutput/bladerfoutputgui.ui
  59. 1
      plugins/samplesink/filesink/CMakeLists.txt
  60. 4
      plugins/samplesink/filesink/filesink.pro
  61. 36
      plugins/samplesink/filesink/filesinkgui.ui
  62. 2
      plugins/samplesink/hackrfoutput/CMakeLists.txt
  63. 4
      plugins/samplesink/hackrfoutput/hackrfoutput.pro
  64. 28
      plugins/samplesink/hackrfoutput/hackrfoutputgui.ui
  65. 2
      plugins/samplesink/limesdroutput/CMakeLists.txt
  66. 4
      plugins/samplesink/limesdroutput/limesdroutput.pro
  67. 36
      plugins/samplesink/limesdroutput/limesdroutputgui.ui
  68. 2
      plugins/samplesink/plutosdroutput/CMakeLists.txt
  69. 4
      plugins/samplesink/plutosdroutput/plutosdroutput.pro
  70. 101
      plugins/samplesink/plutosdroutput/plutosdroutputgui.ui
  71. 2
      plugins/samplesink/sdrdaemonsink/CMakeLists.txt
  72. 33
      plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
  73. 2
      plugins/samplesource/airspy/CMakeLists.txt
  74. 4
      plugins/samplesource/airspy/airspy.pro
  75. 6
      plugins/samplesource/airspy/airspygui.ui
  76. 2
      plugins/samplesource/airspy/airspythread.cpp
  77. 2
      plugins/samplesource/airspy/airspythread.h
  78. 2
      plugins/samplesource/bladerfinput/CMakeLists.txt
  79. 4
      plugins/samplesource/bladerfinput/bladerfinput.pro
  80. 6
      plugins/samplesource/bladerfinput/bladerfinputgui.ui
  81. 1
      plugins/samplesource/fcdpro/CMakeLists.txt
  82. 6
      plugins/samplesource/fcdpro/fcdprogui.ui
  83. 2
      plugins/samplesource/fcdpro/fcdprothread.cpp
  84. 2
      plugins/samplesource/fcdpro/fcdprothread.h
  85. 1
      plugins/samplesource/fcdproplus/CMakeLists.txt
  86. 2
      plugins/samplesource/fcdproplus/fcdproplus.pro
  87. 6
      plugins/samplesource/fcdproplus/fcdproplusgui.ui
  88. 2
      plugins/samplesource/fcdproplus/fcdproplusreader.cpp
  89. 2
      plugins/samplesource/fcdproplus/fcdproplusreader.h
  90. 2
      plugins/samplesource/fcdproplus/fcdproplusthread.cpp
  91. 2
      plugins/samplesource/fcdproplus/fcdproplusthread.h
  92. 1
      plugins/samplesource/filesource/CMakeLists.txt
  93. 4
      plugins/samplesource/filesource/filesource.pro
  94. 40
      plugins/samplesource/filesource/filesourcegui.ui
  95. 2
      plugins/samplesource/hackrfinput/CMakeLists.txt
  96. 4
      plugins/samplesource/hackrfinput/hackrfinput.pro
  97. 8
      plugins/samplesource/hackrfinput/hackrfinputgui.ui
  98. 2
      plugins/samplesource/limesdrinput/CMakeLists.txt
  99. 4
      plugins/samplesource/limesdrinput/limesdrinput.pro
  100. 10
      plugins/samplesource/limesdrinput/limesdrinputgui.ui
  101. Some files were not shown because too many files have changed in this diff Show More

5
CMakeLists.txt

@ -185,12 +185,14 @@ endif() @@ -185,12 +185,14 @@ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fmax-errors=10 -ffast-math -ftree-vectorize ${EXTRA_FLAGS}")
##############################################################################
# SDRbase library
# base libraries
add_subdirectory(sdrbase)
add_subdirectory(sdrgui)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/sdrbase
${CMAKE_SOURCE_DIR}/sdrgui
${OPENGL_INCLUDE_DIR}
)
@ -208,6 +210,7 @@ add_executable(sdrangel @@ -208,6 +210,7 @@ add_executable(sdrangel
target_link_libraries(sdrangel
sdrbase
sdrgui
${QT_LIBRARIES}
${OPENGL_LIBRARIES}
)

2
app/app.pro

@ -11,12 +11,14 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -11,12 +11,14 @@ QMAKE_CXXFLAGS += -std=c++11
TEMPLATE = app
TARGET = sdrangel
INCLUDEPATH += $$PWD/../sdrbase
INCLUDEPATH += $$PWD/../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
SOURCES += main.cpp
LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../sdrgui/$${build_subdir} -lsdrgui
CONFIG(ANDROID):CONFIG += mobility
CONFIG(ANDROID):MOBILITY =

1
apple/deploy.sh

@ -15,6 +15,7 @@ cp -v fcdhid/libfcdhid.dylib $APP_LIB @@ -15,6 +15,7 @@ cp -v fcdhid/libfcdhid.dylib $APP_LIB
cp -v fcdlib/libfcdlib.dylib $APP_LIB
cp -v mbelib/libmbelib.dylib $APP_LIB
cp -v sdrbase/libsdrbase.dylib $APP_LIB
cp -v sdrbase/libsdrgui.dylib $APP_LIB
cp -v devices/libdevices.dylib $APP_LIB
cp -v dsdcc/libdsdcc.dylib $APP_LIB

1
plugins/channelrx/chanalyzer/CMakeLists.txt

@ -38,6 +38,7 @@ add_library(chanalyzer SHARED @@ -38,6 +38,7 @@ add_library(chanalyzer SHARED
target_link_libraries(chanalyzer
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(chanalyzer Core Widgets )

4
plugins/channelrx/chanalyzer/chanalyzer.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
@ -39,5 +40,6 @@ chanalyzerplugin.h @@ -39,5 +40,6 @@ chanalyzerplugin.h
FORMS += chanalyzergui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

2
plugins/channelrx/chanalyzer/chanalyzergui.ui

@ -507,7 +507,7 @@ @@ -507,7 +507,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channelrx/chanalyzerng/CMakeLists.txt

@ -38,6 +38,7 @@ add_library(chanalyzerng SHARED @@ -38,6 +38,7 @@ add_library(chanalyzerng SHARED
target_link_libraries(chanalyzerng
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(chanalyzerng Core Widgets )

4
plugins/channelrx/chanalyzerng/chanalyzerng.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
@ -39,5 +40,6 @@ chanalyzerngplugin.h @@ -39,5 +40,6 @@ chanalyzerngplugin.h
FORMS += chanalyzernggui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

32
plugins/channelrx/chanalyzerng/chanalyzernggui.ui

@ -188,7 +188,7 @@ @@ -188,7 +188,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/arrow_down.png</normaloff>:/arrow_down.png</iconset>
</property>
</widget>
@ -614,35 +614,7 @@ @@ -614,35 +614,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channelrx/demodam/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(demodam SHARED @@ -40,6 +40,7 @@ add_library(demodam SHARED
target_link_libraries(demodam
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodam Core Widgets)

26
plugins/channelrx/demodam/amdemodgui.ui

@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_on.png</normaloff>
<normalon>:/sound_off.png</normalon>:/sound_on.png</iconset>
</property>
@ -252,7 +252,7 @@ @@ -252,7 +252,7 @@
<string>Toggle boxcar bandpass filter with 300 Hz low cuttof</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/filter_bandpass.png</normaloff>
<normalon>:/filter_bandpass.png</normalon>:/filter_bandpass.png</iconset>
</property>
@ -425,27 +425,7 @@ @@ -425,27 +425,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

4
plugins/channelrx/demodam/demodam.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += amdemod.h\ @@ -36,5 +37,6 @@ HEADERS += amdemod.h\
FORMS += amdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

1
plugins/channelrx/demodatv/CMakeLists.txt

@ -42,6 +42,7 @@ add_library(demodatv SHARED @@ -42,6 +42,7 @@ add_library(demodatv SHARED
target_link_libraries(demodatv
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodatv Core Widgets)

35
plugins/channelrx/demodatv/atvdemodgui.ui

@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/arrow_down.png</normaloff>:/arrow_down.png</iconset>
</property>
<property name="checkable">
@ -188,7 +188,7 @@ @@ -188,7 +188,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/carrier.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/carrier.png</pixmap>
</property>
</widget>
</item>
@ -383,7 +383,7 @@ @@ -383,7 +383,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/filter_bandpass.png</normaloff>:/filter_bandpass.png</iconset>
</property>
<property name="checkable">
@ -1142,34 +1142,7 @@ @@ -1142,34 +1142,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

4
plugins/channelrx/demodatv/demodatv.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -42,5 +43,6 @@ HEADERS += atvdemod.h\ @@ -42,5 +43,6 @@ HEADERS += atvdemod.h\
FORMS += atvdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

1
plugins/channelrx/demodbfm/CMakeLists.txt

@ -47,6 +47,7 @@ add_library(demodbfm SHARED @@ -47,6 +47,7 @@ add_library(demodbfm SHARED
target_link_libraries(demodbfm
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodbfm Core Widgets)

32
plugins/channelrx/demodbfm/bfmdemodgui.ui

@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/lsb.png</normaloff>:/lsb.png</iconset>
</property>
<property name="checkable">
@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/carrier.png</normaloff>:/carrier.png</iconset>
</property>
<property name="checkable">
@ -262,7 +262,7 @@ @@ -262,7 +262,7 @@
<string>.</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/rds.png</normaloff>:/rds.png</iconset>
</property>
</widget>
@ -801,7 +801,7 @@ @@ -801,7 +801,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
</property>
</widget>
@ -1889,27 +1889,7 @@ @@ -1889,27 +1889,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

4
plugins/channelrx/demodbfm/demodbfm.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0
CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
@ -49,5 +50,6 @@ HEADERS += bfmdemod.h\ @@ -49,5 +50,6 @@ HEADERS += bfmdemod.h\
FORMS += bfmdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

2
plugins/channelrx/demoddsd/CMakeLists.txt

@ -55,6 +55,7 @@ if (BUILD_DEBIAN) @@ -55,6 +55,7 @@ if (BUILD_DEBIAN)
target_link_libraries(demoddsd
${QT_LIBRARIES}
sdrbase
sdrgui
dsdcc
mbelib
)
@ -62,6 +63,7 @@ else (BUILD_DEBIAN) @@ -62,6 +63,7 @@ else (BUILD_DEBIAN)
target_link_libraries(demoddsd
${QT_LIBRARIES}
sdrbase
sdrgui
${LIBDSDCC_LIBRARIES}
${LIBMBE_LIBRARY}
)

4
plugins/channelrx/demoddsd/demoddsd.pro

@ -31,6 +31,7 @@ CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" @@ -31,6 +31,7 @@ CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += $$LIBDSDCCSRC
INCLUDEPATH += $$LIBMBELIBSRC
@ -54,6 +55,7 @@ dsddemodsettings.h @@ -54,6 +55,7 @@ dsddemodsettings.h
FORMS = dsddemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../dsdcc/$${build_subdir} -ldsdcc
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

36
plugins/channelrx/demoddsd/dsddemodgui.ui

@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/unlocked.png</normaloff>
<normalon>:/locked.png</normalon>:/unlocked.png</iconset>
</property>
@ -296,7 +296,7 @@ @@ -296,7 +296,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/dsb.png</normaloff>:/dsb.png</iconset>
</property>
</widget>
@ -310,7 +310,7 @@ @@ -310,7 +310,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/constellation.png</normaloff>
<normalon>:/slopep_icon.png</normalon>:/constellation.png</iconset>
</property>
@ -673,7 +673,7 @@ @@ -673,7 +673,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/slot1_off.png</normaloff>
<normalon>:/slot1_on.png</normalon>:/slot1_off.png</iconset>
</property>
@ -691,7 +691,7 @@ @@ -691,7 +691,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/slot2_off.png</normaloff>
<normalon>:/slot2_on.png</normalon>:/slot2_off.png</iconset>
</property>
@ -709,7 +709,7 @@ @@ -709,7 +709,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
@ -834,7 +834,7 @@ @@ -834,7 +834,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_on.png</normaloff>
<normalon>:/sound_off.png</normalon>:/sound_on.png</iconset>
</property>
@ -1002,27 +1002,7 @@ @@ -1002,27 +1002,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channelrx/demodlora/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(demodlora SHARED @@ -40,6 +40,7 @@ add_library(demodlora SHARED
target_link_libraries(demodlora
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodlora Core Widgets)

4
plugins/channelrx/demodlora/demodlora.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += lorademod.h\ @@ -36,5 +37,6 @@ HEADERS += lorademod.h\
FORMS += lorademodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

1
plugins/channelrx/demodnfm/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(demodnfm SHARED @@ -40,6 +40,7 @@ add_library(demodnfm SHARED
target_link_libraries(demodnfm
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodnfm Core Widgets)

4
plugins/channelrx/demodnfm/demodnfm.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += nfmdemod.h\ @@ -36,5 +37,6 @@ HEADERS += nfmdemod.h\
FORMS += nfmdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

24
plugins/channelrx/demodnfm/nfmdemodgui.ui

@ -589,7 +589,7 @@ @@ -589,7 +589,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_on.png</normaloff>
<normalon>:/sound_off.png</normalon>:/sound_on.png</iconset>
</property>
@ -642,27 +642,7 @@ @@ -642,27 +642,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channelrx/demodssb/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(demodssb SHARED @@ -40,6 +40,7 @@ add_library(demodssb SHARED
target_link_libraries(demodssb
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodssb Core Widgets)

4
plugins/channelrx/demodssb/demodssb.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += ssbdemod.h\ @@ -36,5 +37,6 @@ HEADERS += ssbdemod.h\
FORMS += ssbdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

38
plugins/channelrx/demodssb/ssbdemodgui.ui

@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/flip_lr.png</normaloff>
<normalon>:/flip_rl.png</normalon>:/flip_lr.png</iconset>
</property>
@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/usb.png</normaloff>
<normalon>:/dsb.png</normalon>:/usb.png</iconset>
</property>
@ -638,7 +638,7 @@ @@ -638,7 +638,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_on.png</normaloff>
<normalon>:/sound_off.png</normalon>:/sound_on.png</iconset>
</property>
@ -739,35 +739,7 @@ @@ -739,35 +739,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channelrx/demodwfm/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(demodwfm SHARED @@ -40,6 +40,7 @@ add_library(demodwfm SHARED
target_link_libraries(demodwfm
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodwfm Core Widgets)

5
plugins/channelrx/demodwfm/demodwfm.pro

@ -18,7 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1 @@ -18,7 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1
QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +36,6 @@ HEADERS += wfmdemod.h\ @@ -36,5 +36,6 @@ HEADERS += wfmdemod.h\
FORMS += wfmdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

4
plugins/channelrx/demodwfm/wfmdemodgui.ui

@ -380,7 +380,7 @@ @@ -380,7 +380,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_on.png</normaloff>
<normalon>:/sound_off.png</normalon>:/sound_on.png</iconset>
</property>
@ -415,7 +415,7 @@ @@ -415,7 +415,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channelrx/tcpsrc/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(demodtcpsrc SHARED @@ -40,6 +40,7 @@ add_library(demodtcpsrc SHARED
target_link_libraries(demodtcpsrc
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodtcpsrc Core Widgets Network)

4
plugins/channelrx/tcpsrc/tcpsrc.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += tcpsrc.h\ @@ -36,5 +37,6 @@ HEADERS += tcpsrc.h\
FORMS += tcpsrcgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

1
plugins/channelrx/udpsrc/CMakeLists.txt

@ -39,6 +39,7 @@ add_library(demodudpsrc SHARED @@ -39,6 +39,7 @@ add_library(demodudpsrc SHARED
target_link_libraries(demodudpsrc
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(demodudpsrc Core Widgets Network)

4
plugins/channelrx/udpsrc/udpsrc.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += udpsrc.h\ @@ -36,5 +37,6 @@ HEADERS += udpsrc.h\
FORMS += udpsrcgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

6
plugins/channelrx/udpsrc/udpsrcgui.ui

@ -479,7 +479,7 @@ @@ -479,7 +479,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_off.png</normaloff>
<normalon>:/sound_on.png</normalon>:/sound_off.png</iconset>
</property>
@ -497,7 +497,7 @@ @@ -497,7 +497,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
@ -776,7 +776,7 @@ @@ -776,7 +776,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channeltx/modam/CMakeLists.txt

@ -38,6 +38,7 @@ add_library(modam SHARED @@ -38,6 +38,7 @@ add_library(modam SHARED
target_link_libraries(modam
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(modam Core Widgets)

38
plugins/channeltx/modam/ammodgui.ui

@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/txon.png</normaloff>
<normalon>:/txoff.png</normalon>:/txon.png</iconset>
</property>
@ -376,7 +376,7 @@ @@ -376,7 +376,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/carrier.png</normaloff>:/carrier.png</iconset>
</property>
</widget>
@ -390,7 +390,7 @@ @@ -390,7 +390,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/morsekey.png</normaloff>:/morsekey.png</iconset>
</property>
</widget>
@ -455,7 +455,7 @@ @@ -455,7 +455,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/microphone.png</normaloff>:/microphone.png</iconset>
</property>
<property name="checkable">
@ -526,7 +526,7 @@ @@ -526,7 +526,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
@ -540,7 +540,7 @@ @@ -540,7 +540,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/playloop.png</normaloff>:/playloop.png</iconset>
</property>
</widget>
@ -554,7 +554,7 @@ @@ -554,7 +554,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/play.png</disabledoff>
@ -690,29 +690,7 @@ @@ -690,29 +690,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

4
plugins/channeltx/modam/modam.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += ammod.h\ @@ -36,5 +37,6 @@ HEADERS += ammod.h\
FORMS += ammodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

1
plugins/channeltx/modatv/CMakeLists.txt

@ -42,6 +42,7 @@ target_link_libraries(modatv @@ -42,6 +42,7 @@ target_link_libraries(modatv
${OpenCV_LIBS}
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(modatv Core Widgets)

45
plugins/channeltx/modatv/atvmodgui.ui

@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/arrow_down.png</normaloff>:/arrow_down.png</iconset>
</property>
</widget>
@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/txon.png</normaloff>
<normalon>:/txoff.png</normalon>:/txon.png</iconset>
</property>
@ -936,7 +936,7 @@ @@ -936,7 +936,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/picture.png</normaloff>:/picture.png</iconset>
</property>
</widget>
@ -980,7 +980,7 @@ @@ -980,7 +980,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/film_reel.png</normaloff>:/film_reel.png</iconset>
</property>
</widget>
@ -1005,7 +1005,7 @@ @@ -1005,7 +1005,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/playloop.png</normaloff>:/playloop.png</iconset>
</property>
</widget>
@ -1019,7 +1019,7 @@ @@ -1019,7 +1019,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/play.png</disabledoff>
@ -1141,7 +1141,7 @@ @@ -1141,7 +1141,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/camera.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/camera.png</pixmap>
</property>
</widget>
</item>
@ -1157,7 +1157,7 @@ @@ -1157,7 +1157,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/play.png</disabledoff>
@ -1324,34 +1324,7 @@ @@ -1324,34 +1324,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

4
plugins/channeltx/modatv/modatv.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -40,9 +41,10 @@ HEADERS += atvmod.h\ @@ -40,9 +41,10 @@ HEADERS += atvmod.h\
FORMS += atvmodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
CONFIG(MINGW32):LIBS += -LD:\softs\opencv\build\mw32\install\x86\mingw\bin -llibopencv_core2413 -llibopencv_highgui2413 -llibopencv_imgproc2413
CONFIG(MINGW64):LIBS += -LD:\softs\opencv\build\mw64\install\x64\mingw\bin -llibopencv_core2413 -llibopencv_highgui2413 -llibopencv_imgproc2413
CONFIG(macx):LIBS += -L/opt/local/lib -lopencv_core -lopencv_highgui -lopencv_imgcodecs -lopencv_imgproc -lopencv_video -lopencv_videoio
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

1
plugins/channeltx/modnfm/CMakeLists.txt

@ -38,6 +38,7 @@ add_library(modnfm SHARED @@ -38,6 +38,7 @@ add_library(modnfm SHARED
target_link_libraries(modnfm
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(modnfm Core Widgets)

4
plugins/channeltx/modnfm/modnfm.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += nfmmod.h\ @@ -36,5 +37,6 @@ HEADERS += nfmmod.h\
FORMS += nfmmodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

38
plugins/channeltx/modnfm/nfmmodgui.ui

@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/txon.png</normaloff>
<normalon>:/txoff.png</normalon>:/txon.png</iconset>
</property>
@ -416,7 +416,7 @@ @@ -416,7 +416,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/carrier.png</normaloff>:/carrier.png</iconset>
</property>
</widget>
@ -430,7 +430,7 @@ @@ -430,7 +430,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/morsekey.png</normaloff>:/morsekey.png</iconset>
</property>
</widget>
@ -495,7 +495,7 @@ @@ -495,7 +495,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/microphone.png</normaloff>:/microphone.png</iconset>
</property>
<property name="checkable">
@ -603,7 +603,7 @@ @@ -603,7 +603,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
@ -617,7 +617,7 @@ @@ -617,7 +617,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/playloop.png</normaloff>:/playloop.png</iconset>
</property>
</widget>
@ -631,7 +631,7 @@ @@ -631,7 +631,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/play.png</disabledoff>
@ -767,29 +767,7 @@ @@ -767,29 +767,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channeltx/modssb/CMakeLists.txt

@ -38,6 +38,7 @@ add_library(modssb SHARED @@ -38,6 +38,7 @@ add_library(modssb SHARED
target_link_libraries(modssb
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(modssb Core Widgets)

4
plugins/channeltx/modssb/modssb.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += ssbmod.h\ @@ -36,5 +37,6 @@ HEADERS += ssbmod.h\
FORMS += ssbmodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

42
plugins/channeltx/modssb/ssbmodgui.ui

@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/flip_lr.png</normaloff>
<normalon>:/flip_rl.png</normalon>:/flip_lr.png</iconset>
</property>
@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/usb.png</normaloff>
<normalon>:/dsb.png</normalon>:/usb.png</iconset>
</property>
@ -417,7 +417,7 @@ @@ -417,7 +417,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/sound_on.png</normaloff>
<normalon>:/sound_off.png</normalon>:/sound_on.png</iconset>
</property>
@ -707,7 +707,7 @@ @@ -707,7 +707,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/carrier.png</normaloff>:/carrier.png</iconset>
</property>
</widget>
@ -721,7 +721,7 @@ @@ -721,7 +721,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/morsekey.png</normaloff>:/morsekey.png</iconset>
</property>
</widget>
@ -786,7 +786,7 @@ @@ -786,7 +786,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/microphone.png</normaloff>:/microphone.png</iconset>
</property>
<property name="checkable">
@ -850,7 +850,7 @@ @@ -850,7 +850,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
@ -864,7 +864,7 @@ @@ -864,7 +864,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/playloop.png</normaloff>:/playloop.png</iconset>
</property>
<property name="checkable">
@ -881,7 +881,7 @@ @@ -881,7 +881,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/play.png</disabledoff>
@ -1078,27 +1078,7 @@ @@ -1078,27 +1078,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channeltx/modwfm/CMakeLists.txt

@ -38,6 +38,7 @@ add_library(modwfm SHARED @@ -38,6 +38,7 @@ add_library(modwfm SHARED
target_link_libraries(modwfm
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(modwfm Core Widgets)

4
plugins/channeltx/modwfm/modwfm.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += wfmmod.h\ @@ -36,5 +37,6 @@ HEADERS += wfmmod.h\
FORMS += wfmmodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

38
plugins/channeltx/modwfm/wfmmodgui.ui

@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/txon.png</normaloff>
<normalon>:/txoff.png</normalon>:/txon.png</iconset>
</property>
@ -416,7 +416,7 @@ @@ -416,7 +416,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/carrier.png</normaloff>:/carrier.png</iconset>
</property>
</widget>
@ -430,7 +430,7 @@ @@ -430,7 +430,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/morsekey.png</normaloff>:/morsekey.png</iconset>
</property>
</widget>
@ -495,7 +495,7 @@ @@ -495,7 +495,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/microphone.png</normaloff>:/microphone.png</iconset>
</property>
<property name="checkable">
@ -566,7 +566,7 @@ @@ -566,7 +566,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
@ -580,7 +580,7 @@ @@ -580,7 +580,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/playloop.png</normaloff>:/playloop.png</iconset>
</property>
</widget>
@ -594,7 +594,7 @@ @@ -594,7 +594,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/play.png</disabledoff>
@ -730,29 +730,7 @@ @@ -730,29 +730,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/channeltx/udpsink/CMakeLists.txt

@ -43,6 +43,7 @@ add_library(modudpsink SHARED @@ -43,6 +43,7 @@ add_library(modudpsink SHARED
target_link_libraries(modudpsink
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(modudpsink Core Widgets Network)

4
plugins/channeltx/udpsink/udpsink.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -40,5 +41,6 @@ HEADERS += udpsink.h\ @@ -40,5 +41,6 @@ HEADERS += udpsink.h\
FORMS += udpsinkgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

6
plugins/channeltx/udpsink/udpsinkgui.ui

@ -625,7 +625,7 @@ @@ -625,7 +625,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/txon.png</normaloff>
<normalon>:/txoff.png</normalon>:/txon.png</iconset>
</property>
@ -868,7 +868,7 @@ @@ -868,7 +868,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/mono.png</normaloff>
<normalon>:/stereo.png</normalon>:/mono.png</iconset>
</property>
@ -963,7 +963,7 @@ @@ -963,7 +963,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesink/bladerfoutput/CMakeLists.txt

@ -56,6 +56,7 @@ target_link_libraries(outputbladerf @@ -56,6 +56,7 @@ target_link_libraries(outputbladerf
${QT_LIBRARIES}
bladerf
sdrbase
sdrgui
bladerfdevice
)
else (BUILD_DEBIAN)
@ -63,6 +64,7 @@ target_link_libraries(outputbladerf @@ -63,6 +64,7 @@ target_link_libraries(outputbladerf
${QT_LIBRARIES}
${LIBBLADERF_LIBRARIES}
sdrbase
sdrgui
bladerfdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesink/bladerfoutput/bladerfoutput.pro

@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl @@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl
CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += $$LIBBLADERFSRC
@ -42,7 +43,8 @@ HEADERS += bladerfoutputgui.h\ @@ -42,7 +43,8 @@ HEADERS += bladerfoutputgui.h\
FORMS += bladerfoutputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../libbladerf/$${build_subdir} -llibbladerf
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

28
plugins/samplesink/bladerfoutput/bladerfoutputgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -573,31 +573,7 @@ @@ -573,31 +573,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/samplesink/filesink/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(outputfilesink SHARED @@ -40,6 +40,7 @@ add_library(outputfilesink SHARED
target_link_libraries(outputfilesink
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(outputfilesink Core Widgets)

4
plugins/samplesink/filesink/filesink.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -38,5 +39,6 @@ HEADERS += filesinkgui.h\ @@ -38,5 +39,6 @@ HEADERS += filesinkgui.h\
FORMS += filesinkgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

36
plugins/samplesink/filesink/filesinkgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -197,7 +197,7 @@ @@ -197,7 +197,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
@ -397,37 +397,7 @@ @@ -397,37 +397,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesink/hackrfoutput/CMakeLists.txt

@ -57,6 +57,7 @@ target_link_libraries(outputhackrf @@ -57,6 +57,7 @@ target_link_libraries(outputhackrf
${QT_LIBRARIES}
hackrf
sdrbase
sdrgui
hackrfdevice
)
else (BUILD_DEBIAN)
@ -64,6 +65,7 @@ target_link_libraries(outputhackrf @@ -64,6 +65,7 @@ target_link_libraries(outputhackrf
${QT_LIBRARIES}
${LIBHACKRF_LIBRARIES}
sdrbase
sdrgui
hackrfdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesink/hackrfoutput/hackrfoutput.pro

@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" @@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host"
CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
!macx:INCLUDEPATH += $$LIBHACKRFSRC
macx:INCLUDEPATH += /opt/local/include
@ -43,8 +44,9 @@ HEADERS += hackrfoutputgui.h\ @@ -43,8 +44,9 @@ HEADERS += hackrfoutputgui.h\
FORMS += hackrfoutputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
!macx:LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
macx:LIBS += -L/opt/local/lib -lhackrf
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

28
plugins/samplesink/hackrfoutput/hackrfoutputgui.ui

@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -499,31 +499,7 @@ @@ -499,31 +499,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesink/limesdroutput/CMakeLists.txt

@ -65,6 +65,7 @@ target_link_libraries(outputlimesdr @@ -65,6 +65,7 @@ target_link_libraries(outputlimesdr
${QT_LIBRARIES}
limesuite
sdrbase
sdrgui
limesdrdevice
)
else (BUILD_DEBIAN)
@ -72,6 +73,7 @@ target_link_libraries(outputlimesdr @@ -72,6 +73,7 @@ target_link_libraries(outputlimesdr
${QT_LIBRARIES}
${LIMESUITE_LIBRARY}
sdrbase
sdrgui
limesdrdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesink/limesdroutput/limesdroutput.pro

@ -22,6 +22,7 @@ CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" @@ -22,6 +22,7 @@ CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
@ -53,7 +54,8 @@ HEADERS += limesdroutputgui.h\ @@ -53,7 +54,8 @@ HEADERS += limesdroutputgui.h\
FORMS += limesdroutputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

36
plugins/samplesink/limesdroutput/limesdroutputgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -653,7 +653,7 @@ @@ -653,7 +653,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/antenna.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/antenna.png</pixmap>
</property>
</widget>
</item>
@ -729,7 +729,7 @@ @@ -729,7 +729,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/stream.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/stream.png</pixmap>
</property>
</widget>
</item>
@ -921,35 +921,7 @@ QToolTip{background-color: white; color: black;}</string> @@ -921,35 +921,7 @@ QToolTip{background-color: white; color: black;}</string>
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesink/plutosdroutput/CMakeLists.txt

@ -55,6 +55,7 @@ target_link_libraries(outputplutosdr @@ -55,6 +55,7 @@ target_link_libraries(outputplutosdr
${QT_LIBRARIES}
iio
sdrbase
sdrgui
plutosdrdevice
)
else (BUILD_DEBIAN)
@ -62,6 +63,7 @@ target_link_libraries(outputplutosdr @@ -62,6 +63,7 @@ target_link_libraries(outputplutosdr
${QT_LIBRARIES}
${LIBIIO_LIBRARIES}
sdrbase
sdrgui
plutosdrdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesink/plutosdroutput/plutosdroutput.pro

@ -22,6 +22,7 @@ CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio" @@ -22,6 +22,7 @@ CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../libiio/includemw
INCLUDEPATH += $$LIBIIOSRC
@ -44,7 +45,8 @@ HEADERS += plutosdroutputgui.h\ @@ -44,7 +45,8 @@ HEADERS += plutosdroutputgui.h\
FORMS += plutosdroutputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../libiio/$${build_subdir} -llibiio
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

101
plugins/samplesink/plutosdroutput/plutosdroutputgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -342,7 +342,7 @@ @@ -342,7 +342,7 @@
<item>
<widget class="QLabel" name="antennaLabel">
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/antenna.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/antenna.png</pixmap>
</property>
</widget>
</item>
@ -789,102 +789,7 @@ @@ -789,102 +789,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesink/sdrdaemonsink/CMakeLists.txt

@ -66,6 +66,7 @@ if (BUILD_DEBIAN) @@ -66,6 +66,7 @@ if (BUILD_DEBIAN)
target_link_libraries(outputsdrdaemonsink
${QT_LIBRARIES}
sdrbase
sdrgui
cm256cc
${LIBNANOMSG_LIBRARIES}
)
@ -73,6 +74,7 @@ else (BUILD_DEBIAN) @@ -73,6 +74,7 @@ else (BUILD_DEBIAN)
target_link_libraries(outputsdrdaemonsink
${QT_LIBRARIES}
sdrbase
sdrgui
${CM256CC_LIBRARIES}
${LIBNANOMSG_LIBRARIES}
)

33
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -439,7 +439,7 @@ @@ -439,7 +439,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/locked.png</normaloff>:/locked.png</iconset>
</property>
</widget>
@ -682,34 +682,7 @@ @@ -682,34 +682,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesource/airspy/CMakeLists.txt

@ -55,12 +55,14 @@ target_link_libraries(inputairspy @@ -55,12 +55,14 @@ target_link_libraries(inputairspy
${QT_LIBRARIES}
airspy
sdrbase
sdrgui
)
else (BUILD_DEBIAN)
target_link_libraries(inputairspy
${QT_LIBRARIES}
${LIBAIRSPY_LIBRARIES}
sdrbase
sdrgui
)
endif (BUILD_DEBIAN)

4
plugins/samplesource/airspy/airspy.pro

@ -15,6 +15,7 @@ CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy" @@ -15,6 +15,7 @@ CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy"
CONFIG(MINGW64):LIBAIRSPYSRC = "D:\softs\libairspy"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += $$LIBAIRSPYSRC
DEFINES += LIBAIRSPY_DYN_RATES
@ -42,6 +43,7 @@ HEADERS += airspygui.h\ @@ -42,6 +43,7 @@ HEADERS += airspygui.h\
FORMS += airspygui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../libairspy/$${build_subdir} -llibairspy
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

6
plugins/samplesource/airspy/airspygui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/record_off.png</normaloff>:/record_off.png</iconset>
</property>
</widget>
@ -668,7 +668,7 @@ @@ -668,7 +668,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesource/airspy/airspythread.cpp

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
#include "airspythread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
AirspyThread *AirspyThread::m_this = 0;

2
plugins/samplesource/airspy/airspythread.h

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
#include <QWaitCondition>
#include <libairspy/airspy.h>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/decimators.h"
#define AIRSPY_BLOCKSIZE (1<<17)

2
plugins/samplesource/bladerfinput/CMakeLists.txt

@ -56,6 +56,7 @@ target_link_libraries(inputbladerf @@ -56,6 +56,7 @@ target_link_libraries(inputbladerf
${QT_LIBRARIES}
bladerf
sdrbase
sdrgui
bladerfdevice
)
else (BUILD_DEBIAN)
@ -63,6 +64,7 @@ target_link_libraries(inputbladerf @@ -63,6 +64,7 @@ target_link_libraries(inputbladerf
${QT_LIBRARIES}
${LIBBLADERF_LIBRARIES}
sdrbase
sdrgui
bladerfdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesource/bladerfinput/bladerfinput.pro

@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl @@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl
CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += $$LIBBLADERFSRC
@ -42,7 +43,8 @@ HEADERS += bladerfinputgui.h\ @@ -42,7 +43,8 @@ HEADERS += bladerfinputgui.h\
FORMS += bladerfinputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../libbladerf/$${build_subdir} -llibbladerf
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

6
plugins/samplesource/bladerfinput/bladerfinputgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/record_off.png</normaloff>
<normalon>:/record_on.png</normalon>:/record_off.png</iconset>
</property>
@ -716,7 +716,7 @@ @@ -716,7 +716,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

1
plugins/samplesource/fcdpro/CMakeLists.txt

@ -47,6 +47,7 @@ target_link_libraries(inputfcdpro @@ -47,6 +47,7 @@ target_link_libraries(inputfcdpro
fcdhid
fcdlib
sdrbase
sdrgui
)
qt5_use_modules(inputfcdpro Core Widgets)

6
plugins/samplesource/fcdpro/fcdprogui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/record_off.png</normaloff>:/record_off.png</iconset>
</property>
</widget>
@ -507,7 +507,7 @@ @@ -507,7 +507,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesource/fcdpro/fcdprothread.cpp

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
#include <errno.h>
#include "fcdprothread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProThread::FCDProThread(SampleSinkFifo* sampleFifo, QObject* parent) :

2
plugins/samplesource/fcdpro/fcdprothread.h

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
#include <QWaitCondition>
#include "dsp/inthalfbandfilter.h"
#include <alsa/asoundlib.h>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
class FCDProThread : public QThread {
Q_OBJECT

1
plugins/samplesource/fcdproplus/CMakeLists.txt

@ -47,6 +47,7 @@ target_link_libraries(inputfcdproplus @@ -47,6 +47,7 @@ target_link_libraries(inputfcdproplus
fcdhid
fcdlib
sdrbase
sdrgui
)
qt5_use_modules(inputfcdproplus Core Widgets)

2
plugins/samplesource/fcdproplus/fcdproplus.pro

@ -18,6 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1 @@ -18,6 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../fcdhid
INCLUDEPATH += ../../../fcdlib
@ -41,3 +42,4 @@ FORMS += fcdproplusgui.ui @@ -41,3 +42,4 @@ FORMS += fcdproplusgui.ui
LIBS += -L../../../fcdlib/$${build_subdir} -lfcdlib
LIBS += -L../../../fcdhid/$${build_subdir} -lfcdhid
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui

6
plugins/samplesource/fcdproplus/fcdproplusgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/record_off.png</normaloff>:/record_off.png</iconset>
</property>
</widget>
@ -414,7 +414,7 @@ @@ -414,7 +414,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesource/fcdproplus/fcdproplusreader.cpp

@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
#include <errno.h>
#include "fcdproplusreader.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProPlusReader::FCDProPlusReader(SampleSinkFifo* sampleFifo, QObject* parent) :

2
plugins/samplesource/fcdproplus/fcdproplusreader.h

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
#include <QWaitCondition>
#include <QByteArray>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/inthalfbandfilter.h"
class QAudioInput;

2
plugins/samplesource/fcdproplus/fcdproplusthread.cpp

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
#include <errno.h>
#include "fcdproplusthread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProPlusThread::FCDProPlusThread(SampleSinkFifo* sampleFifo, QObject* parent) :

2
plugins/samplesource/fcdproplus/fcdproplusthread.h

@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
#include <QWaitCondition>
#include "dsp/inthalfbandfilter.h"
#include <alsa/asoundlib.h>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
class FCDProPlusThread : public QThread {
Q_OBJECT

1
plugins/samplesource/filesource/CMakeLists.txt

@ -40,6 +40,7 @@ add_library(inputfilesource SHARED @@ -40,6 +40,7 @@ add_library(inputfilesource SHARED
target_link_libraries(inputfilesource
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(inputfilesource Core Widgets)

4
plugins/samplesource/filesource/filesource.pro

@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -36,5 +37,6 @@ HEADERS += filesourcegui.h\ @@ -36,5 +37,6 @@ HEADERS += filesourcegui.h\
FORMS += filesourcegui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

40
plugins/samplesource/filesource/filesourcegui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -197,7 +197,7 @@ @@ -197,7 +197,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
@ -306,7 +306,7 @@ @@ -306,7 +306,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/playloop.png</normaloff>:/playloop.png</iconset>
</property>
<property name="iconSize">
@ -329,7 +329,7 @@ @@ -329,7 +329,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/pause.png</normalon>
<disabledoff>:/stop.png</disabledoff>
@ -493,37 +493,7 @@ @@ -493,37 +493,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesource/hackrfinput/CMakeLists.txt

@ -57,6 +57,7 @@ target_link_libraries(inputhackrf @@ -57,6 +57,7 @@ target_link_libraries(inputhackrf
${QT_LIBRARIES}
hackrf
sdrbase
sdrgui
hackrfdevice
)
else (BUILD_DEBIAN)
@ -64,6 +65,7 @@ target_link_libraries(inputhackrf @@ -64,6 +65,7 @@ target_link_libraries(inputhackrf
${QT_LIBRARIES}
${LIBHACKRF_LIBRARIES}
sdrbase
sdrgui
hackrfdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesource/hackrfinput/hackrfinput.pro

@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" @@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host"
CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
!macx:INCLUDEPATH += $$LIBHACKRFSRC
macx:INCLUDEPATH += /opt/local/include
@ -43,8 +44,9 @@ HEADERS += hackrfinputgui.h\ @@ -43,8 +44,9 @@ HEADERS += hackrfinputgui.h\
FORMS += hackrfinputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
!macx:LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
macx:LIBS += -L/opt/local/lib -lhackrf
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

8
plugins/samplesource/hackrfinput/hackrfinputgui.ui

@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/record_off.png</normaloff>:/record_off.png</iconset>
</property>
</widget>
@ -301,7 +301,7 @@ @@ -301,7 +301,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/link.png</normaloff>:/link.png</iconset>
</property>
</widget>
@ -684,7 +684,7 @@ @@ -684,7 +684,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

2
plugins/samplesource/limesdrinput/CMakeLists.txt

@ -65,6 +65,7 @@ target_link_libraries(inputlimesdr @@ -65,6 +65,7 @@ target_link_libraries(inputlimesdr
${QT_LIBRARIES}
limesuite
sdrbase
sdrgui
limesdrdevice
)
else (BUILD_DEBIAN)
@ -72,6 +73,7 @@ target_link_libraries(inputlimesdr @@ -72,6 +73,7 @@ target_link_libraries(inputlimesdr
${QT_LIBRARIES}
${LIMESUITE_LIBRARY}
sdrbase
sdrgui
limesdrdevice
)
endif (BUILD_DEBIAN)

4
plugins/samplesource/limesdrinput/limesdrinput.pro

@ -24,6 +24,7 @@ CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" @@ -24,6 +24,7 @@ CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../liblimesuite/srcmw
INCLUDEPATH += $$LIBLIMESUITESRC/src
@ -55,7 +56,8 @@ HEADERS += limesdrinputgui.h\ @@ -55,7 +56,8 @@ HEADERS += limesdrinputgui.h\
FORMS += limesdrinputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite
LIBS += -L../../../devices/$${build_subdir} -ldevices
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

10
plugins/samplesource/limesdrinput/limesdrinputgui.ui

@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>
<normalon>:/stop.png</normalon>:/play.png</iconset>
</property>
@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrbase/resources/res.qrc">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/record_off.png</normaloff>
<normalon>:/record_on.png</normalon>:/record_off.png</iconset>
</property>
@ -863,7 +863,7 @@ @@ -863,7 +863,7 @@
<item>
<widget class="QLabel" name="antennaLabel">
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/antenna.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/antenna.png</pixmap>
</property>
</widget>
</item>
@ -954,7 +954,7 @@ @@ -954,7 +954,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../sdrbase/resources/res.qrc">:/stream.png</pixmap>
<pixmap resource="../../../sdrgui/resources/res.qrc">:/stream.png</pixmap>
</property>
</widget>
</item>
@ -1149,7 +1149,7 @@ QToolTip{background-color: white; color: black;}</string> @@ -1149,7 +1149,7 @@ QToolTip{background-color: white; color: black;}</string>
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save