Merge pull request #482 from cjcliffe/develop

Develop

src/BookmarkMgr.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #include "BookmarkMgr.h"
 #include "CubicSDR.h"
 #include "DataTree.h"

src/BookmarkMgr.h

@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #pragma once
 
 #include <wx/arrstr.h>

src/CubicSDR.h

@@ -13,12 +13,8 @@
 #include "PrimaryGLContext.h"
 
 #include "ThreadQueue.h"
-#ifdef USE_RTL_SDR
-    #include "SDRThread.h"
-#else
-    #include "SoapySDRThread.h"
-    #include "SDREnumerator.h"
-#endif
+#include "SoapySDRThread.h"
+#include "SDREnumerator.h"
 #include "SDRPostThread.h"
 #include "AudioThread.h"
 #include "DemodulatorMgr.h"

src/forms/Bookmark/BookmarkView.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #include <wx/menu.h>
 #include <wx/textdlg.h>
 

src/forms/Bookmark/BookmarkView.h

@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #pragma once
 
 #include "wx/choice.h"

src/sdr/SDRPostThread.h

@@ -3,11 +3,7 @@
 
 #pragma once
 
-#if USE_RTL_SDR
-#include "SDRThread.h"
-#else
 #include "SoapySDRThread.h"
-#endif
 #include <algorithm>
 
 class SDRPostThread : public IOThread {