VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-06 16:05:13 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
f4exb
2017-10-22 19:12:43 +02:00
parent 561a4c6858
commit fa77ca3fb6
300 changed files with 2525 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/CMakeLists.txt
+2
View File
@@ -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)
plugins/samplesource/airspy/airspy.pro
+3 -1
View File
@@ -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\
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
plugins/samplesource/airspy/airspygui.ui
+3 -3
View File
@@ -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 @@
<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 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/airspy/airspythread.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "airspythread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
AirspyThread *AirspyThread::m_this = 0;
plugins/samplesource/airspy/airspythread.h
+1 -1
View File
@@ -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)
plugins/samplesource/bladerfinput/CMakeLists.txt
+2
View File
@@ -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
${QT_LIBRARIES}
${LIBBLADERF_LIBRARIES}
sdrbase
sdrgui
bladerfdevice
)
endif (BUILD_DEBIAN)
plugins/samplesource/bladerfinput/bladerfinput.pro
+3 -1
View File
@@ -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\
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
plugins/samplesource/bladerfinput/bladerfinputgui.ui
+3 -3
View File
@@ -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 @@
<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 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/fcdpro/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ target_link_libraries(inputfcdpro
fcdhid
fcdlib
sdrbase
sdrgui
)
qt5_use_modules(inputfcdpro Core Widgets)
plugins/samplesource/fcdpro/fcdprogui.ui
+3 -3
View File
@@ -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 @@
<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 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/fcdpro/fcdprothread.cpp
+1 -1
View File
@@ -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) :
plugins/samplesource/fcdpro/fcdprothread.h
+1 -1
View File
@@ -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
plugins/samplesource/fcdproplus/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ target_link_libraries(inputfcdproplus
fcdhid
fcdlib
sdrbase
sdrgui
)
qt5_use_modules(inputfcdproplus Core Widgets)
plugins/samplesource/fcdproplus/fcdproplus.pro
+2
View File
@@ -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
LIBS += -L../../../fcdlib/$${build_subdir} -lfcdlib
LIBS += -L../../../fcdhid/$${build_subdir} -lfcdhid
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
plugins/samplesource/fcdproplus/fcdproplusgui.ui
+3 -3
View File
@@ -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 @@
<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 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/fcdproplus/fcdproplusreader.cpp
+1 -1
View File
@@ -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) :
plugins/samplesource/fcdproplus/fcdproplusreader.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QWaitCondition>
#include <QByteArray>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/inthalfbandfilter.h"
class QAudioInput;
plugins/samplesource/fcdproplus/fcdproplusthread.cpp
+1 -1
View File
@@ -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) :
plugins/samplesource/fcdproplus/fcdproplusthread.h
+1 -1
View File
@@ -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
plugins/samplesource/filesource/CMakeLists.txt
+1
View File
@@ -40,6 +40,7 @@ add_library(inputfilesource SHARED
target_link_libraries(inputfilesource
${QT_LIBRARIES}
sdrbase
sdrgui
)
qt5_use_modules(inputfilesource Core Widgets)
plugins/samplesource/filesource/filesource.pro
+3 -1
View File
@@ -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\
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
plugins/samplesource/filesource/filesourcegui.ui
+5 -35
View File
@@ -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 @@
<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 @@
<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 @@
<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 @@
</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>
plugins/samplesource/hackrfinput/CMakeLists.txt
+2
View File
@@ -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
${QT_LIBRARIES}
${LIBHACKRF_LIBRARIES}
sdrbase
sdrgui
hackrfdevice
)
endif (BUILD_DEBIAN)
plugins/samplesource/hackrfinput/hackrfinput.pro
+3 -1
View File
@@ -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\
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
plugins/samplesource/hackrfinput/hackrfinputgui.ui
+4 -4
View File
@@ -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 @@
<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 @@
<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 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/limesdrinput/CMakeLists.txt
+2
View File
@@ -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
${QT_LIBRARIES}
${LIMESUITE_LIBRARY}
sdrbase
sdrgui
limesdrdevice
)
endif (BUILD_DEBIAN)
plugins/samplesource/limesdrinput/limesdrinput.pro
+3 -1
View File
@@ -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\
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
plugins/samplesource/limesdrinput/limesdrinputgui.ui
+5 -5
View File
@@ -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 @@
<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 @@
<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 @@
<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>
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/plutosdrinput/CMakeLists.txt
+2
View File
@@ -55,6 +55,7 @@ target_link_libraries(inputplutosdr
${QT_LIBRARIES}
iio
sdrbase
sdrgui
plutosdrdevice
)
else (BUILD_DEBIAN)
@@ -62,6 +63,7 @@ target_link_libraries(inputplutosdr
${QT_LIBRARIES}
${LIBIIO_LIBRARIES}
sdrbase
sdrgui
plutosdrdevice
)
endif (BUILD_DEBIAN)
plugins/samplesource/plutosdrinput/plutosdrinput.pro
+3 -1
View File
@@ -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 += plutosdrinputgui.h\
FORMS += plutosdrinputgui.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
plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
+4 -4
View File
@@ -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 @@
<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>
@@ -417,7 +417,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>
@@ -979,7 +979,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/rtlsdr/CMakeLists.txt
+2
View File
@@ -54,12 +54,14 @@ target_link_libraries(inputrtlsdr
${QT_LIBRARIES}
rtlsdr
sdrbase
sdrgui
)
else (BUILD_DEBIAN)
target_link_libraries(inputrtlsdr
${QT_LIBRARIES}
${LIBRTLSDR_LIBRARIES}
sdrbase
sdrgui
)
endif (BUILD_DEBIAN)
plugins/samplesource/rtlsdr/rtlsdr.pro
+3 -1
View File
@@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr"
CONFIG(MINGW64):LIBRTLSDRSRC = "D:\softs\librtlsdr"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
!macx:INCLUDEPATH += $$LIBRTLSDRSRC/include
macx:INCLUDEPATH += /opt/local/include
@@ -42,7 +43,8 @@ HEADERS += rtlsdrgui.h\
FORMS += rtlsdrgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
!macx:LIBS += -L../../../librtlsdr/$${build_subdir} -llibrtlsdr
macx:LIBS += -L/opt/local/lib -lrtlsdr
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc
plugins/samplesource/rtlsdr/rtlsdrgui.ui
+3 -3
View File
@@ -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 @@
<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>
@@ -607,7 +607,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrbase/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/sdrdaemonsource/CMakeLists.txt
+2
View File
@@ -67,6 +67,7 @@ target_link_libraries(inputsdrdaemonsource
cm256cc
${LIBNANOMSG_LIBRARIES}
sdrbase
sdrgui
)
else (BUILD_DEBIAN)
target_link_libraries(inputsdrdaemonsource
@@ -74,6 +75,7 @@ target_link_libraries(inputsdrdaemonsource
${CM256CC_LIBRARIES}
${LIBNANOMSG_LIBRARIES}
sdrbase
sdrgui
)
endif (BUILD_DEBIAN)
plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
+3 -1
View File
@@ -19,6 +19,7 @@ CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc"
INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += $$LIBNANOMSGSRC/src
INCLUDEPATH += $$LIBCM256CCSRC
@@ -53,9 +54,10 @@ sdrdaemonsourceudphandler.h
FORMS += sdrdaemonsourcegui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../nanomsg/$${build_subdir} -lnanomsg
LIBS += -L../../../cm256cc/$${build_subdir} -lcm256cc
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc
CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.ui
+4 -21
View File
@@ -59,7 +59,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>
@@ -74,7 +74,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>
@@ -439,7 +439,7 @@
<string>...</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>
@@ -1074,24 +1074,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="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections/>
</ui>
plugins/samplesource/sdrplay/CMakeLists.txt
+2
View File
@@ -51,12 +51,14 @@ target_link_libraries(inputsdrplay
${QT_LIBRARIES}
mirisdr
sdrbase
sdrgui
)
else (BUILD_DEBIAN)
target_link_libraries(inputsdrplay
${QT_LIBRARIES}
${LIBMIRISDR_LIBRARIES}
sdrbase
sdrgui
)
endif (BUILD_DEBIAN)
plugins/samplesource/sdrplay/sdrplaygui.ui
+3 -23
View File
@@ -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 @@
<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>
@@ -704,27 +704,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>