HackRF Tx support: rename more Rx files and cmake items

plugins/samplesource/CMakeLists.txt

@@ -39,7 +39,7 @@ endif(LIBUSB_FOUND AND LIBAIRSPY_FOUND)
 
 find_package(LibHACKRF)
 if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-    add_subdirectory(hackrf)
+    add_subdirectory(hackrfinput)
 endif(LIBUSB_FOUND AND LIBHACKRF_FOUND)
 
 find_package(LibMiriSDR)
@@ -66,7 +66,7 @@ if (BUILD_DEBIAN)
         add_subdirectory(sdrdaemonfec)
     endif (LIBNANOMSG_FOUND)
     add_subdirectory(airspy)
-    add_subdirectory(hackrf)
+    add_subdirectory(hackrfinput)
     add_subdirectory(rtlsdr)
     add_subdirectory(bladerfinput)
     add_subdirectory(sdrplay)

plugins/samplesource/hackrfinput/CMakeLists.txt

@@ -1,6 +1,6 @@
-project(hackrf)
+project(hackrfinput)
 
-set(hackrf_SOURCES
+set(hackrfinput_SOURCES
     hackrfinputgui.cpp
     hackrfinput.cpp
     hackrfinputplugin.cpp
@@ -8,7 +8,7 @@ set(hackrf_SOURCES
     hackrfinputthread.cpp
 )
 
-set(hackrf_HEADERS
+set(hackrfinput_HEADERS
     hackrfinputgui.h
     hackrfinput.h
     hackrfinputplugin.h
@@ -16,7 +16,7 @@ set(hackrf_HEADERS
     hackrfinputthread.h
 )
 
-set(hackrf_FORMS
+set(hackrfinput_FORMS
     hackrfinputgui.ui
 )
 
@@ -41,13 +41,13 @@ add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 
-#qt4_wrap_cpp(hackrf_HEADERS_MOC ${hackrf_HEADERS})
+#qt4_wrap_cpp(hackrfinput_HEADERS_MOC ${hackrfinput_HEADERS})
-qt5_wrap_ui(hackrf_FORMS_HEADERS ${hackrf_FORMS})
+qt5_wrap_ui(hackrfinput_FORMS_HEADERS ${hackrfinput_FORMS})
 
 add_library(inputhackrf SHARED
-    ${hackrf_SOURCES}
+    ${hackrfinput_SOURCES}
-    ${hackrf_HEADERS_MOC}
+    ${hackrfinput_HEADERS_MOC}
-    ${hackrf_FORMS_HEADERS}
+    ${hackrfinput_FORMS_HEADERS}
 )
 
 if (BUILD_DEBIAN)

plugins/samplesource/hackrfinput/hackrfinput.cpp

@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../hackrfinput/hackrfinput.h"
+
 #include <string.h>
 #include <errno.h>
 #include <QDebug>
@@ -21,12 +23,10 @@
 #include "util/simpleserializer.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
-#include "hackrfinput.h"
-
 #include <device/devicesourceapi.h>
 
-#include "hackrfinputgui.h"
+#include "../hackrfinput/hackrfinputgui.h"
-#include "hackrfinputthread.h"
+#include "../hackrfinput/hackrfinputthread.h"
 
 MESSAGE_CLASS_DEFINITION(HackRFInput::MsgConfigureHackRF, Message)
 MESSAGE_CLASS_DEFINITION(HackRFInput::MsgReportHackRF, Message)

plugins/samplesource/hackrfinput/hackrfinput.h

@@ -20,7 +20,8 @@
 #include <dsp/devicesamplesource.h>
 #include "libhackrf/hackrf.h"
 #include <QString>
-#include "hackrfinputsettings.h"
+
+#include "../hackrfinput/hackrfinputsettings.h"
 
 class DeviceSourceAPI;
 class HackRFInputThread;

plugins/samplesource/hackrfinput/hackrfinputgui.cpp

@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../hackrfinput/hackrfinputgui.h"
+
 #include <QDebug>
 #include <QMessageBox>
 
@@ -26,7 +28,6 @@
 #include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
 
-#include "hackrfinputgui.h"
 #include "ui_hackrfinputgui.h"
 
 HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :

plugins/samplesource/hackrfinput/hackrfinputgui.h

@@ -19,8 +19,8 @@
 
 #include <QTimer>
 
-#include "hackrfinput.h"
 #include "plugin/plugingui.h"
+#include "../hackrfinput/hackrfinput.h"
 
 #define HACKRF_MAX_DEVICE (32)
 

plugins/samplesource/hackrfinput/hackrfinputplugin.cpp

@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../hackrfinput/hackrfinputplugin.h"
+
 #include <QtPlugin>
 #include <QAction>
 #include "libhackrf/hackrf.h"
@@ -22,8 +24,8 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "hackrfinputplugin.h"
+
-#include "hackrfinputgui.h"
+#include "../hackrfinput/hackrfinputgui.h"
 
 const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
 	QString("HackRF Input"),

plugins/samplesource/hackrfinput/hackrfinputsettings.cpp

@@ -14,10 +14,11 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../hackrfinput/hackrfinputsettings.h"
+
 #include <QtGlobal>
 #include "util/simpleserializer.h"
 
-#include "hackrfinputsettings.h"
 
 HackRFInputSettings::HackRFInputSettings()
 {

plugins/samplesource/hackrfinput/hackrfinputsettings.h

@@ -17,6 +17,8 @@
 #ifndef _HACKRF_HACKRFINPUTSETTINGS_H_
 #define _HACKRF_HACKRFINPUTSETTINGS_H_
 
+#include <QtGlobal>
+
 struct HackRFInputSettings {
 	typedef enum {
 		FC_POS_INFRA = 0,

plugins/samplesource/hackrfinput/hackrfinputthread.cpp

@@ -14,11 +14,12 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../hackrfinput/hackrfinputthread.h"
+
 #include <stdio.h>
 #include <errno.h>
 
 #include "../../../sdrbase/dsp/samplesinkfifo.h"
-#include "hackrfinputthread.h"
 
 HackRFInputThread *HackRFInputThread::m_this = 0;