1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00

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

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
@@ -47,6 +47,7 @@ target_link_libraries(inputfcdproplus
fcdhid
fcdlib
sdrbase
sdrgui
)
qt5_use_modules(inputfcdproplus Core Widgets)
@@ -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
@@ -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>
@@ -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) :
@@ -22,7 +22,7 @@
#include <QWaitCondition>
#include <QByteArray>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/inthalfbandfilter.h"
class QAudioInput;
@@ -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) :
@@ -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