Request 6352 (accepted)

Overview

Request 6352 (accepted)

Version 6.9.6

Created by wkazubski 1 day ago
In state accepted

Submit qt-dab

Submit package home:wkazubski:test / qt-dab to package home:wkazubski / qt-dab

qt-dab.changes Changed

@@ -1,4 +1,22 @@
 -------------------------------------------------------------------
+Sat Dec 13 20:46:39 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- Update to release 6.9.6
+   + A (minor) frustration was that on closing the http session the
+     map remained visible and, the other way around, closing the
+     map did not close the http handler. Parts of the http handler
+     had to be rewritten (and -since Qt is heaviliy used - using Qt
+     libraries for the networking part).
+     a. when closing the "map" session by touching the http button
+       (which has text "http on") tries to close the map and finish
+       the http handler off
+     b. when closing the map itself, the software will be noticed
+       (which may take a few seconds) and the http handler will
+       finish
+- Patch qt-dab-6.9.4-use-qwt6-qt6.patch removed, Qwt detection wes
+  improved.
+
+-------------------------------------------------------------------
 Sat Nov 15 12:42:33 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
 
 - Add hicolor icons (extracted from qt-dab-6.9.5.ico file)
@@ -6,7 +24,7 @@
 -------------------------------------------------------------------
 Tue Nov 11 00:08:11 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
 
-_ Update to release 6.9.5
+- Update to release 6.9.5
   + It seems a nasty error in handling rtlsdr devices (especially wrt
     closing the device) is solved. In the rewrite, support for the
     newer V4 and the V3 version was combined: the interface software

qt-dab.spec Changed

@@ -16,15 +16,13 @@
 #
 
 Name:           qt-dab
-Version:        6.9.5
+Version:        6.9.6
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
 Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/Qt-DAB-%{version}.tar.gz#/%{name}-Qt-DAB-%{version}.tar.gz
-Source1:        %{name}-%{version}.ico
-Patch1:         %{name}-6.9.4-use-qwt6-qt6.patch
 BuildRequires:  cmake
 %if 0%{?suse_version} >= 1600
 BuildRequires:  gcc-c++
@@ -57,7 +55,6 @@
 
 %prep
 %setup -q -n %{name}-Qt-DAB-%{version}
-%patch -P 1 -p1
 
 #fix docs permissions
 chmod a-x AUTHORS
@@ -89,7 +86,7 @@
 %suse_update_desktop_file -G Qt-DAB -i %{name}-6.9 AudioVideo Tuner 
 
 # install icon
-convert %{SOURCE1} %{name}.png
+convert qt-dab-6.9.5.ico %{name}.png
 install -Dpm 0644 %{name}-0.png \
 	%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -Dpm 0644 %{name}-1.png \

qt-dab-6.9.4-use-qwt6-qt6.patch Deleted

@@ -1,28 +0,0 @@
-diff -up qt-dab-Qt-DAB-6.9.4/cmake/Modules/FindQwt.cmake.aaaa qt-dab-Qt-DAB-6.9.4/cmake/Modules/FindQwt.cmake
---- qt-dab-Qt-DAB-6.9.4/cmake/Modules/FindQwt.cmake.aaaa	2025-01-03 13:10:35.000000000 +0100
-+++ qt-dab-Qt-DAB-6.9.4/cmake/Modules/FindQwt.cmake	2025-03-11 00:10:22.396884369 +0100
-@@ -16,7 +16,8 @@ find_path(QWT_INCLUDE_DIRS
- 	/usr/include/qwt6
- 	/usr/include/qwt6-qt6
- 	/usr/include/qt6/qwt
--	/opt/local/include/qwt
-+	/usr/include/qt6/qwt6
-+ 	/opt/local/include/qwt
- 	/sw/include/qwt
- 	/usr/local/lib/qwt.framework/Headers
- 	/usr/local/lib/qwt-qt5/lib/framework/Headers
-@@ -49,13 +50,12 @@ if(QWT_INCLUDE_DIRS)
-   set(QWT_VERSION "No Version")
-   string(REGEX MATCH "0-9+.0-9+.0-9+" QWT_VERSION ${QWT_STRING_VERSION})
-   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
--  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
- 
-   message(STATUS "QWT Version: ${QWT_VERSION}")
-   if(NOT QWT_WRONG_VERSION)
-     set(QWT_FOUND TRUE)
-   else(NOT QWT_WRONG_VERSION)
--    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
-+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
-   endif(NOT QWT_WRONG_VERSION)
- 
- endif(QWT_INCLUDE_DIRS)

qt-dab-Qt-DAB-6.9.5.tar.gz/app-files/qt-dab-6.9.ico Deleted

qt-dab-Qt-DAB-6.9.5.tar.gz/qt-dab-6.9.ico Deleted

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/rtlsdr-handler-win/librtlsdr.dll.a Deleted

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/sdrplay-handler-v2/sdrplayselect.cpp Deleted

@@ -1,65 +0,0 @@
-#
-/*
- *    Copyright (C) 2014 .. 2017
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB program
- *
- *    Qt-DAB is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    Qt-DAB is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include	<cstdio>
-#include	<QVBoxLayout>
-#include	"sdrplayselect.h"
-//
-//	Whenever there are two or more sdrplay devices connected
-//	to the computer, the user is asked to make a choice.
-
-	sdrplaySelect::sdrplaySelect	() {
-	toptext		= new QLabel (this);
-	toptext		-> setText ("Select an rsp device");
-	selectorDisplay	= new QListView (this);
-	QVBoxLayout	*layOut = new QVBoxLayout;
-	layOut		-> addWidget (selectorDisplay);
-	layOut		-> addWidget (toptext);
-	setWindowTitle (tr("RSP select"));
-	setLayout (layOut);
-
-	Devices = QStringList();
-	deviceList. setStringList (Devices);
-	selectorDisplay	-> setModel (&deviceList);
-	connect (selectorDisplay, &QListView::clicked,
-	         this, &sdrplaySelect::select_rsp);
-	selectedItem	= -1;
-}
-
-	sdrplaySelect::~sdrplaySelect() {
-}
-
-void	sdrplaySelect::addtoList (const char *v) {
-QString s (v);
-
-	Devices << s;
-	deviceList. setStringList (Devices);
-	selectorDisplay	-> setModel (&deviceList);
-	selectorDisplay	-> adjustSize();
-	adjustSize();
-	fprintf (stderr, "adding %s\n", v);
-}
-
-void	sdrplaySelect::select_rsp (QModelIndex s) {
-	QDialog::done (s. row());
-}
-

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/sdrplay-handler-v2/sdrplayselect.h Deleted

@@ -1,48 +0,0 @@
-#
-/*
- *    Copyright (C) 2014 .. 2025
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB program
- *
- *    Qt-DAB is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    Qt-DAB is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#
-#pragma once
-#
-#include	<QDialog>
-#include	<QLabel>
-#include	<QListView>
-#include	<QStringListModel>
-#include	<QStringList>
-#include	<cstdint>
-
-class	sdrplaySelect: public QDialog {
-Q_OBJECT
-public:
-			sdrplaySelect	();
-			~sdrplaySelect	();
-	void		addtoList	(const char *);
-private:
-	QLabel		*toptext;
-	QListView	*selectorDisplay;
-	QStringListModel deviceList;
-	QStringList	Devices;
-	int16_t		selectedItem;
-private slots:
-void	select_rsp	(QModelIndex);
-};
-

qt-dab-Qt-DAB-6.9.5.tar.gz/README.md -> qt-dab-Qt-DAB-6.9.6.tar.gz/README.md Changed

@@ -4,6 +4,33 @@
 
 !6.9(/res/read_me/qt-dab-logo.png?raw=true)
 
+
+-------------------------------------------------------------------------
+Just for playing around (Not in the precompiled version still)
+--------------------------------------------------------------------------
+
+The SDRplay RSPDuo is obviously an incredible device, depending on the
+mode two separate tuners.
+The regular SDRplay V3 device handling software in Qt-DAB is already
+capable of handling the Duo in single mode, with tuner selection.
+
+As a programming exercise, I added - as a separate device handler -
+a "duo" handler, where two tuners are running on the same channel
+
+!6.9(/res/read_me/rsp-duocontrol.png?raw=true)
+
+The device handler shows left the control for the "A" tuner, to
+the right for the "B" tuner, and in between a selector for selecting
+  * output is from tuner A
+  * output is from tuner B
+  * output is the addition of tuners A and B, i.e. A + B
+  * output is the subtraction of the B output from the A output.
+
+The "A" tuner has - apart from the agc selector, a "AM notch" selector,
+and the "B" tuner has - apart from the "agc selector a "biasT" selector.
+
+
+
 --------------------------------------------------------------------------
 About Qt-DAB
 -------------------------------------------------------------------------
@@ -17,7 +44,7 @@
 
 Of course, as for previous versions, for the current version,
 *Qt-DAB-6.9.5*, predefined executables and installers are available.
-For Windows  **two** 32 bit installers are available, and for Linux there is an x64 AppImage.
+For Windows  a 32 bit installer is available, and for Linux there is an x64 AppImage.
 
 -------------------------------------------------------------------
 What is new/different in Qt-DAB-6.9.5
@@ -28,9 +55,11 @@
 
  * the combobox on the configuration widget with which an input device was selected is gone. Now the main widget shows on the top line a small icon with which a device selection table can be made visible. After selecting a device, the device selection table disappears automatically.
 
- * improved support for the SDRplay RspDuo: tuner selection is possible
+ * improved support for the SDRplay RspDuo: tuner selection is possible,
+
+ * Windows support for both RTLSDR V3 and V4 in a single installer,
 
- * the scanList has a more prominent role. It shows the (channel, service) pairsof all channels visited. Using file input, the scanList will not be visible (seems logical), and the configuration window as a selector indicating that on program termination the list is cleared (obviously normally it is maintained between program invocations)
+ * the scanList has a more prominent role. It shows the (channel, service) pairs of all channels visited. Using file input, the scanList will not be visible (seems logical), and the configuration window as a selector indicating that on program termination the list is cleared (obviously normally it is maintained between program invocations),
 
  * preloaded database. The precompiled versions contain a preloaded database. The configuration widget has a selector to choose between loading - on program startup - this preloaded database or one you loaded into the home directory.
 
@@ -41,7 +70,7 @@
 * Features(#features)
 * Widgets and scopes(#widgets-and-scopes)
 * Devices and device support(#devices-and-device-support)
-* Tuning accurary(#tuning-accurarcy)
+* Tuning accuracy(#tuning-accuracy)
 * Scan control(#scan-control)
 * Displaying TII data(#displaying-TII-data)
 * EPG Handling and time tables(#epg-handling-and-time-tables)
@@ -72,10 +101,10 @@
   * Qt-DAB supports most common SDR devices directly. The device interface is quite simple and in a different document it is explained in detail how to use the interface  to implement control for other devices;
   * Qt-DAB supports a **scanList**, i.e. a list with channel/service pairs encountered. Obviously, selecting a service from this list is possible;
   * Qt-DAB supports so-called *favorites* (i.e. channel, service pairs) for easy switching between services in different ensembles (see below),
-  * Qt-DAB recognizes and interprets **TII** (Transmitter Identification Information) data of - if the received signal is from multiple transmitters - *all* detectable transmitters, can be made visible simultaeously, and displays the transmitters on a map. A separate tool is available to download the required database.
+  * Qt-DAB recognizes and interprets **TII** (Transmitter Identification Information) data of - if the received signal is from multiple transmitters - *all* detectable transmitters, can be made visible simultaneously, and displays the transmitters on a map. A separate tool is available to download the required database.
   * Qt-DAB starts EPG/SPI services automatically as background task and provides means to show resulting time tables;
   * Qt-DAB supports **journaline**, often transmitted as subservice, and auto starts a small journaline window;
-  * Qt-DAB allows running an arbitrary amount of audio services from tne current ensemble as *background service*, with the output sent to a file,
+  * Qt-DAB allows running an arbitrary amount of audio services from the current ensemble as *background service*, with the output sent to a file,
   * Qt-DAB offers options to select other bands, i.e. the L-Band, or channel descriptions from a user provided file and it supports obsolete modes (Mode II and Mode IV),
   * Qt-DAB offers the possibility of generating an **ETI file** from the currently selected channel,
   * Qt-DAB offers different views on the input data, see below,
@@ -91,7 +120,7 @@
 The window shows - left half - a list of services (either from the currently selected channel or from the favourites). Selecting a service is just by clicking on the name.
 The right half of the widget shows the dynamic label, and the slides - if transmitted as part of the service - or a series of default slides.
 
-  * touching the *ensemble name* (NPO (8001) in the picture) makes the *content table*, i.e. an overview of the content of the ensemble, visible with the possibility of storing the data in a file in ".csv" format. If the content table is visible, touching the name agian will hide it;
+  * touching the *ensemble name* (NPO (8001) in the picture) makes the *content table*, i.e. an overview of the content of the ensemble, visible with the possibility of storing the data in a file in ".csv" format. If the content table is visible, touching the name again will hide it;
 
 !6.9(/res/read_me/content-table.png)
 
@@ -125,13 +154,13 @@
  * the button labeled *favourites* controls  whether the list of services
 from the currently selected channel or the list of favourites is shown,
  * the button labeled *scanlist* controls the visibility
-of the scan list, i.e the list of all services seen, showwn below.
+of the scan list, i.e the list of all services seen, shown below.
 
 !6.9(/res/read_me/scanList.png)
 
 (Obviously, the colors of the buttons, as well as the *font*, the *font size* and the *font color* of the service list shown can be set by the user, just click with the right hand mouse button on a button).
 
-As mentioned, Qt-DAB supports **favourites**, i.e. a list of (channel, service pairs),
+As mentioned, Qt-DAB supports **favorites**, i.e. a list of (channel, service pairs),
 the list is maintained between program invocations. 
 The *services list* on the main widget is shown in one of two modes, selectable by the button (in the picture labeled favourites). In *ensemble view* mode, the services in the current ensemble are shown, in the *favourites view* mode, the favourites are shown.
 In both views, selecting a service is just by clicking on the service name.
@@ -157,14 +186,14 @@
 service is or was active. Data from the EPG service is stored, and the
 timetable is an interpretation of that data.
 
-Below the **timeTable** button the static (meta)data of the selected autioservice is shown.
+Below the **timeTable** button the static (meta)data of the selected audioservice is shown.
  
 The three progress bars (quality indicators) for DAB+ give success rates of
 resp. detecting a DAB+ frame, the RS error repair and the AAC decoding.
 (For "old" DAB transmissions only a single quality indicator appears).
 
 Below the progress bars the *rsCorrections/100* indicator shows how the amount of corrections that was made by the Reed-Solomon detector in the last 100 AAC frames (only used for DAB+ services).
-Of course, the parity bits used by the RS decoding may contain bit errors themselves, which mot likely lead to CRC errors, the second indicator shows the amount of CRC errors detected after thecorrection by the RS decoding.
+Of course, the parity bits used by the RS decoding may contain bit errors themselves, which mot likely lead to CRC errors, the second indicator shows the amount of CRC errors detected after the correction by the RS decoding.
 
 The third indicator tells the percentage of the AAC (or MP2) data that was
 found to be OK.
@@ -181,9 +210,9 @@
 and imaginary components. If the selector labeled
 "ncp" is set, the centerpoints of the 4 lobs is shown. 
 
-On the right hand side the widget shows some quality indicators of the DAB signal. The topline specifies the channel and the selected frequency (in KHz).
+On the right hand side the widget shows some quality indicators of the DAB signal. The topline specifies the channel and the selected frequency (in kHz).
 With the current input device, the computed frequency correction is just 4 Hz
-(on 227360 Khz) after which a frequency error of 1.3 Hz seems to remain.
+(on 227360 khz) after which a frequency error of 1.3 Hz seems to remain.
 The SNR is over 15 dB, and time, clock and dc offsets are too small to take in consideration.
 
 At the bottom quality information on the FIC handling is shown, the (here) green bar shows that everything with FIC decoding is fine, the BER tells that (on average) 4 out of each 1000 input bits were wrong and were corrected.
@@ -280,19 +309,19 @@
 Apart from the untested UHD device, support for these 6 devices is commonly
 included in the precompiled versions.
 It was noted by users that when using the support library for the V4 version of the RTLSDR (aka DABsticks)  devices  with V3 devices  the software was rather deaf.
-To accomodate that, there are **two** precompiled Windows versions,
+To accommodate that, there are **two** precompiled Windows versions,
 one with "built-in" support for the V4 versions, and one supporting the V3 versions of the DAB sticks.
 
 In Qt-DAB the approach is to **dynamically** load the functions from the manufacturer's device library as soon as a device is selected (and not sooner).
 This approach allows  distributing versions that are configured with devices not installed on the user's system.
-(For the Windows version(s), the  device libraries for almost all configured devices are provided in the installer. The exception are the SDRplay snd Pluto devices.
+(For the Windows version(s), the  device libraries for almost all configured devices are provided in the installer. The exception are the SDRplay and Pluto devices.
 For SDRplay devices the user has to install the drivers from the SDRplay site,
 for Pluto support one should see the instructions in "https://github.com/analogdevicesinc/plutosdr-m2k-drivers-win".
 For Linux users, Ubuntu provides the required libraries in a repository (i.e. libii0 and libad9361, for e.g. Fedora the support seems to stop at F33.
 
 Qt-DAB also supports input using a network:
   * an rtl_tcp server connected to an RTLSDR device.
-  * a **spyServer** (both 8 bit and a 16 bit version), i.e. from AIRSpy devices and RTLSDR devices. Note that the AIRspyHF cannot deliver samples at the required samplerate. (Be aware that Qt-DAB processes the input with 2048000 Samples/second. Using the 16 bit version - 4 bytes per sample - requires a bandwidth of at least 8 M. I am using it with a wired connection between two laptops using the 8 bit version, using the WiFi is not likely to be successfull).
+  * a **spyServer** (both 8 bit and a 16 bit version), i.e. from AIRSpy devices and RTLSDR devices. Note that the AIRspyHF cannot deliver samples at the required samplerate. (Be aware that Qt-DAB processes the input with 2048000 Samples/second. Using the 16 bit version - 4 bytes per sample - requires a bandwidth of at least 8 M. I am using it with a wired connection between two laptops using the 8 bit version, using the WiFi is not likely to be successful).
 
 !6.9(/res/read_me/spy-server16-control.png?raw=true)
 
@@ -320,31 +349,31 @@
 !6.8(/res/read_me/xml-reader.png?raw=true)
 
 
-Tuning accurarcy
+Tuning accuracy
 =======================================================================
 
 DAB frequencies are in the range of app 175 to 225 MHz. Different devices
 have a different **tuning accurary** in this range. While the different SDRPlay
 and AIRspy devices show a negligible tuning offset (usually 0 to 30 Hz),
-especially the popular DABsticks show - in general - a  offsets in the KHz range.
+especially the popular DABsticks show - in general - a  offsets in the kHz range.
 
 !6.8(/res/read_me/tuning-offset.png?raw=true)
 
-The picture shows that on selecting channel 12C (22730 KHz) the device
+The picture shows that on selecting channel 12C (22730 kHz) the device
 used - a simple dabstick - shows an offset of 8446 Hz, i.e. well over 
-8 KHz.
+8 kHz.
 While Qt-DAB is - as the picture shows - capable of compensating for
 tuner offsets of up to app 35 Khz, the **quality of the signal**
 is better with no or a small tuning offset.
 
 The widgets for (most) of the various device handlers show
 a "ppm" correction setting, where "ppm" stands for "Parts per Million".
-Setting the corrector to 1 at a selected frequency of 22730 KHz,
+Setting the corrector to 1 at a selected frequency of 22730 kHz,
 implies that the oscillator of the device tunes to a frequency
 that is (app) 227 Hz higher.
 
-In this particular care, an offset of app 8.5 KHz on a selected frequency
-of app 227 Mhz means an error of 8500 / 227, which is slight more than 37.
+In this particular care, an offset of app 8.5 kHz on a selected frequency
+of app 227 MHz means an error of 8500 / 227, which is slight more than 37.
 So, setting the **ppm** corrector to 37 in this case causes the device
 to change the frequency such that the frequency the device tuned to
 corresponds almost to the frequency it should be.
@@ -357,12 +386,12 @@
 
 !6.8(/res/read_me/scan-widget.png?raw=true)
 
- * With *single scan* a listing is produced of (the contents of) all ensembled ecountered (see the picture above);
+ * With *single scan* a listing is produced of (the contents of) all ensembled encountered (see the picture above);
  * With *scan to data* scanning starts and continues until a channel is detected
 that carries DAB data (or scanning is stopped by touching the *stop* button).
  * With *scan continuously* a single line is shown for each ensemble
-enountered, and - as the name suggests - scanning goes on until stopped
-ny the user.
+encountered, and - as the name suggests - scanning goes on until stopped
+by the user.
 
 To allow *skipping* given channels when scanning, Qt-DAB supports the notion of a *scantable*, in which channels can be marked for skipping.
 Next to a default scantable - which is stored in the users ".ini" file,
@@ -392,7 +421,7 @@
 
 As was shown in the correlation view in the spectrum widget,
 one usually receives signals from more than one transmitter.
-While the line at the botton on the right half of the Qt-DAB's main
+While the line at the bottom on the right half of the Qt-DAB's main
 widget  always shows the currently selected transmitter,
 Qt-DAB can also show data of all identified transmitters on a small separate window (if selected).
 
@@ -435,7 +464,7 @@
 While not here in the Netherlands, in many other countries an ensemble
 contains an *epg* or *spi* service.
 Such a service contains data for service logo's and for  **time tables**.
-If such a service is detected within a hardful of seconds after the start of the channel, Qt-DAB will attempt to start the service as background task.
+If such a service is detected within a handful of seconds after the start of the channel, Qt-DAB will attempt to start the service as background task.
 If the EPG/SPI service was identified late, the service can be started manually and will also run as background task.
 
 Data decoded by this service will be stored in a separate directory that is itself stored in the user's Qt-DAB-files directory.
@@ -497,11 +526,10 @@
 Documentation
 =================================================================
 
-simplified "using-xx" text, an introductory text, covering the regular use.
-As a supplement a  separate guide is added with some notes on how to
-build an executable.
+Most selectors on the different windows have a **tool-tip**.
 
-!Qt-DAB documentation(/res/read_me/qt-dab-6-manual.png?raw=true)
+An introductory text, covering the regular use
+is available and includes in the latest **release**.
 
 Installation on Windows
 =================================================================
@@ -509,10 +537,8 @@
 For Windows  *installer*s can be found in the releases section of this repository
  * https://github.com/JvanKatwijk/qt-dab/releases.
 The installer will install the executable as well as required libraries,
-although for both SDRplay devices (when used) or for the Adaml Pluto (whens
-used), one has to install libraries from the provoder of the device.
-
-:information_source: The releases section contains 2 Windows installers. The 2 versions  - for 32 bit - differ in their support for RTLSDR type devices (as mentioned above).
+although for both SDRplay devices (when used) or for the Adam Pluto (when
+used), one has to install libraries from the provider of the device.
 
 :information_source: Note that the device libraries for the SDRplay devices and the Adalm Pluto device library are **NOT** included in the installer, they require - if used - a separate installation. See below for details.
 
@@ -663,7 +689,7 @@
 Use *make -j XX* for speeding up the build process, with XX the amount
 of parallel threads used. Of course, qmake will complain if not all
 required libraries can be found.
-If all libraries were found, this steo should result in an executable.
+If all libraries were found, this step should result in an executable.
 
 Step 4
 -----------------------------------------------------------------
@@ -680,7 +706,7 @@
 Some comments
 ================================================================
 
-A user compiled Qt-DAB-6.9, on and for an RPI,  and met the follwoing issues:
+A user compiled Qt-DAB-6.9, on and for an RPI,  and met the following issues:
 
 Once I had downloaded the qt-dab-master from the code page,
 installed all the libraries listed in the Readme on the code page,

qt-dab-Qt-DAB-6.9.6.tar.gz/app-files/qt-dab-6.9.5.ico Added

qt-dab-Qt-DAB-6.9.5.tar.gz/app-files/qt-dab-6.9.desktop -> qt-dab-Qt-DAB-6.9.6.tar.gz/app-files/qt-dab-6.9.desktop Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/cmake/Modules/FindQwt.cmake -> qt-dab-Qt-DAB-6.9.6.tar.gz/cmake/Modules/FindQwt.cmake Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/icon-6.9.5-126x128.png Added

qt-dab-Qt-DAB-6.9.5.tar.gz/qt-dab-6.9-build.txt -> qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9-build.txt Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9.5.ico Added

qt-dab-Qt-DAB-6.9.5.tar.gz/qt-dab-6.9.pro -> qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9.pro Changed

@@ -1,5 +1,6 @@
 ######################################################################
 # Automatically generated by qmake (2.01a) Tue Oct 6 19:48:14 2009
+#	CONFIG		+= sdrplay-v3
 # but modified by me to accomodate for the includes for qwt, hamlib and
 # portaudio
 ######################################################################
@@ -11,14 +12,18 @@
 QMAKE_CXXFLAGS	+= -std=c++20
 
 win32 {
-QMAKE_CFLAGS	+=  -O3 -ffast-math
-QMAKE_CXXFLAGS	+=  -O3 -ffast-math
+QMAKE_CXXFLAGS	+=  -ffast-math -flto 
+QMAKE_CFLAGS	+=  -ffast-math -flto
+QMAKE_LFLAGS	+=  -ffast-math -flto
 }
 
 unix {
 #QMAKE_CFLAGS	+=  -O3 -ffast-math -g
 #QMAKE_CXXFLAGS	+=  -O3 -ffast-math -g
 #QMAKE_LFLAGS	+=  -O3 -ffast-math -g
+#QMAKE_CFLAGS	+=  -O3 -ffast-math -pg
+@QMAKE_CXXFLAGS	+=  -O3 -ffast-math -pg
+#QMAKE_LFLAGS	+=  -O3 -ffast-math -pg
 QMAKE_CXXFLAGS	+=  -ffast-math -flto 
 QMAKE_CFLAGS	+=  -ffast-math -flto
 QMAKE_LFLAGS	+=  -ffast-math -flto
@@ -31,7 +36,7 @@
 #QMAKE_CXXFLAGS	+=  -pg
 #QMAKE_LFLAGS	+=  -pg
 QMAKE_CXXFLAGS += -isystem $$QT_INSTALL_HEADERS
-RC_ICONS	=  qt-dab-6.9.ico
+RC_ICONS	=  qt-dab-6.9.5.ico
 RESOURCES	+= resources.qrc
 
 TRANSLATIONS = ../i18n/de_DE.ts
@@ -40,9 +45,8 @@
 #       defines
 #DEFINES	+= __MSC_THREAD__
 DEFINES		+= __THREADED_BACKEND__
-DEFINES	+= __FFT_CORR__
+#DEFINES        += _UPLOAD_SCAN_RESULT_
 
-#For showing trace output
 #DEFINES	+= __EPG_TRACE__  
 DEPENDPATH += . \
 	      ..sources \
@@ -126,6 +130,7 @@
 	   ./sources/support/dxDisplay.h \
 	   ./sources/support/audiosystem-selector.h \
 	   ./sources/support/dl2-handler.h \
+	   ./sources/support/http-handler.h \
 	   ./sources/eti-handler/eti-generator.h \
 	   ./sources/frontend/ofdm-handler.h \
 	   ./sources/frontend/timesyncer.h \
@@ -282,6 +287,7 @@
 	   ./sources/support/audiosystem-selector.cpp \
 	   ./sources/support/dxDisplay.cpp \
 	   ./sources/support/dl2-handler.cpp \
+	   ./sources/support/http-handler.cpp \
 	   ./sources/eti-handler/eti-generator.cpp \
 	   ./sources/frontend/ofdm-handler.cpp \
 	   ./sources/frontend/timesyncer.cpp \
@@ -395,13 +401,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-	equals (QT_MAJOR_VERSION, 5) {
-	TARGET		= qt-dab-qt5-6.9.5
-	}
-	else {
-	TARGET		= qt-dab-qt6-6.9.5
-	}
-exists ("../.git") {
+exists ("./.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
        message("Current git hash = $$GITHASHSTRING")
@@ -411,7 +411,6 @@
 isEmpty(GITHASHSTRING) {
     DEFINES += GITHASH=\\\"------\\\"
 }
-
 mac {
   DESTDIR      = ./mac-bin
   PKG_CONFIG = /usr/local/bin/pkg-config
@@ -419,10 +418,7 @@
 }
 
 CONFIG		+= link_pkgconfig
-#PKGCONFIG	+= sndfile
-#PKGCONFIG	+= samplerate
 PKGCONFIG	+= libusb-1.0
-CONFIG		+= mapserver
 !mac {
 LIBS      	+= -ldl
 }
@@ -431,7 +427,7 @@
 #PKGCONFIG	+= sndfile
 #PKGCONFIG	+= samplerate
 INCLUDEPATH	+= /usr/local/include
-!mac {
+
 INCLUDEPATH	+= /usr/local/include
 #correct this for the correct path to the qwt6 library on your system
 #LIBS		+= -lqwt
@@ -439,6 +435,11 @@
 	 LIBS		+= -lqwt-qt6
 	}else{  LIBS += -lqwt-qt5
 	}
+equals (QT_MAJOR_VERSION, 5) {
+   TARGET               = qt-dab-qt5-6.9.5
+}
+else {
+   TARGET               = qt-dab-qt6-6.9.5
 }
 
 #mac {
@@ -453,6 +454,7 @@
 # (you obviously have libraries installed for the selected ones)
 CONFIG		+= sdrplay-v2
 CONFIG		+= sdrplay-v3
+CONFIG		+= sdrplay-duo
 CONFIG		+= dabstick-linux
 CONFIG		+= rtl_tcp
 CONFIG		+= airspy-2
@@ -464,12 +466,10 @@
 CONFIG		+= spyServer-16
 CONFIG		+= spyServer-8
 #CONFIG		+= uhd
-#CONFIG		+= colibri
-#CONFIG		+= elad-device
 #CONFIG		+= faad
 CONFIG		+= fdk-aac
 #very experimental, simple server for connecting to a tdc handler
-CONFIG		+= datastreamer
+#CONFIG		+= datastreamer
 #to handle output of embedded an IP data stream, uncomment
 #CONFIG		+= send_datagram
 
@@ -490,7 +490,7 @@
 
 # an attempt to have it run under W32 through cross compilation
 win32 {
-exists ("../.git") {
+exists ("./.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
        message("Current git hash = $$GITHASHSTRING")
@@ -501,82 +501,51 @@
     DEFINES += GITHASH=\\\"------\\\"
 }
 
-##for for 64 bit
-#	TARGET		= qt-dab64-9.5
-#	DEFINES		+= __BITS64__
-#	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
-#	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
-#	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
-#	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
-##	LIBS		+= -liio
-##	#CONFIG		+= extio
-#	CONFIG		+= airspy-2
-#	CONFIG		+= rtl_tcp
-#	CONFIG		+= dabstick
-#	CONFIG		+= sdrplay-v2
-#	CONFIG		+= pluto
-#	CONFIG		+= sdrplay-v3
-##	CONFIG		+= hackrf
-##	CONFIG		+= lime
-#	CONFIG		+= viterbi-scalar
-#	CONFIG		+= spiral-sse
-#	CONFIG		+= spiral-no-sse
-#	DEFINES		+= __THREADED_BACKEND
-#
-#for win32, comment out the lines above
+#for for 64 bit
 	equals (QT_MAJOR_VERSION, 5) {
-	   TARGET		= qt-dab32-qt5-6.9V3.5
-	}
-	else {
-	   TARGET		= qt-dab32-qt6-6.9V3.5
-	}
-	CONFIG		+= dabstick-win-v3
-#	equals (QT_MAJOR_VERSION, 5) {
-#	   TARGET		= qt-dab32-qt5-6.9.5
-#	}
-#	else {
-#	   TARGET		= qt-dab32-qt6-6.9.5
-#	}
-#	CONFIG		+= dabstick-win-v4
-	CONFIG		+= airspy-2
-	CONFIG		+= spyServer-16
-	CONFIG		+= spyServer-8
-	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
-	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
+        TARGET          = qt5-dab64-6.9.5
+        }
+        else {  
+        TARGET          = qt6-dab64-6.9.5
+        }
+##for for 64 bit
+	DEFINES		+= __BITS64__
+	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
+	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
 	equals (QT_MAJOR_VERSION, 6) {
-	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt6/qwt
-	} else {
-	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
-	}
-	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
-	CONFIG		+= double
-	#CONFIG		+= single
-	CONFIG		+= mapserver
-	CONFIG		+= extio
+        INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt6/qwt
+        } else {
+        INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
+        }
+
+	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
+	CONFIG		+= dabstick-win
+	CONFIG		+= airspy-2
+	CONFIG          += spyServer-16
+        CONFIG          += spyServer-8
 	CONFIG		+= rtl_tcp
 	CONFIG		+= sdrplay-v2
 	CONFIG		+= sdrplay-v3
+	CONFIG		+= pluto
 	CONFIG		+= hackrf
 	CONFIG		+= lime
-	CONFIG		+= pluto
-	CONFIG		+= viterbi-scalar
-#	CONFIG		+= viterbi-sse
-#	CONFIG		+= viterbi-avx2
+#	CONFIG		+= viterbi-scalar
 #	CONFIG		+= spiral-sse
 #	CONFIG		+= spiral-no-sse
+	CONFIG		+= viterbi-avx2
+#	CONFIG		+= spiral-sse
+	CONFIG		+= double
+#	CONFIG		+= single
 #
-#	end of 32/64 specifics
-INCLUDEPATH	+= /usr/local/include
-LIBS		+= -lportaudio
-#LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/libsndfile-1.dll
-#LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/libsamplerate-0.dll
-LIBS		+= -lole32
-LIBS		+= -lwinpthread
-LIBS		+= -lwinmm
-LIBS 		+= -lstdc++
-LIBS		+= -lws2_32
-LIBS		+= -lusb-1.0
-LIBS		+= -lz
+	INCLUDEPATH	+= /usr/local/include
+	LIBS		+= -lportaudio
+	LIBS		+= -lole32
+	LIBS		+= -lwinpthread
+	LIBS		+= -lwinmm
+	LIBS 		+= -lstdc++
+	LIBS		+= -lws2_32
+	LIBS		+= -lusb-1.0
+	LIBS		+= -lz
 #correct this for the correct path to the qwt6 library on your system
 #mingw64 wants the first one, cross compiling mingw64-32 the second one
 #LIBS		+= -lqwt
@@ -586,7 +555,8 @@
 	else {
 	        LIBS		+= -lqwt-qt5
 	}
-CONFIG		+= faad
+	CONFIG		+= fdk-aac
+#	CONFIG		+= faad
 #
 #very experimental, simple server for connecting to a tdc handler
 #CONFIG		+= datastreamer
@@ -616,32 +586,18 @@
 	FORMS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui
 }
 
-dabstick-win-v4 {
-	DEFINES		+= HAVE_RTLSDR_V4
-	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ../usr/shared/drivers/rtlsdrWindowsV4
-	INCLUDEPATH	+= ../usr/shared/drivers/rtlsdrWindowsV4/x86
-	HEADERS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ./sources/devices/rtlsdr-handler-common/rtl-dongleselect.h
-	SOURCES		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ./sources/devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ./sources/devices/rtlsdr-handler-common/rtlsdr-widget.ui
-	LIBS		+= /usr/shared/drivers/rtlsdrWindowsV4/x86/rtlsdr.dll
-}
-
-dabstick-win-v3 {
+dabstick-win {
 	DEFINES		+= HAVE_RTLSDR_V3
-	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-win 
+	DEFINES		+= HAVE_RTLSDR_V4
+	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-win
 	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
+#	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
 	HEADERS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ./sources/devices/rtlsdr-handler-common/rtl-dongleselect.h
+	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.h \
+	                   ./sources/devices/rtlsdr-handler-win/rtl-sdr.h
 	SOURCES		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ./sources/devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ./sources/devices/rtlsdr-handler-common/rtlsdr-widget.ui
-#	LIBS		+= /usr/i686-s64-mingw32/sys-root/mingw/bin/librtlsdr.dll
-	LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/librtlsdr.dll
+	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.cpp 
+	FORMS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-widget.ui
 }
 
 #
@@ -653,13 +609,13 @@
 	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v2
 	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
 	HEADERS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h \ 
-	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect.h 
+	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.h 
 	SOURCES		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \ 
-	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect.cpp 
+	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.cpp 
 	FORMS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
 }
 #
-#	the SDRplay
+#	the SDRplay V3
 #
 sdrplay-v3 {
 	DEFINES		+= HAVE_SDRPLAY_V3
@@ -668,6 +624,7 @@
 	                   ./sources/devices/sdrplay-handler-v3/include
         HEADERS         += ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
                            ./sources/devices/sdrplay-handler-v3/sdrplay-commands.h \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.h \ 
 	                   ./sources/devices/sdrplay-handler-v3/Rsp-device.h \
 	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.h \
 	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.h \
@@ -676,6 +633,7 @@
 	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.h
         SOURCES         += ./sources/devices/sdrplay-handler-v3/Rsp-device.cpp \
 	                   ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.cpp \ 
 	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.cpp \
 	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
 	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.cpp \
@@ -685,6 +643,18 @@
 #	LIBS		+= -ldl
 }
 #
+sdrplay-duo {
+	DEFINES		+= HAVE_DUO
+	DEPENDPATH	+= ./sources/devices/sdrplay-handler-duo
+	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-duo \
+	                   ./sources/devices/sdrplay-handler-duo/include
+        HEADERS         += ./sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.h \
+                           ./sources/devices/sdrplay-handler-duo/duo-commands.h 
+        SOURCES         += ./sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.cpp 
+	FORMS		+= ./sources/devices/sdrplay-handler-duo/duo-widget.ui
+#	LIBS		+= -ldl
+}
+#
 #	limeSDR
 #
 lime  {
@@ -976,13 +946,16 @@
         INCLUDEPATH     += ./helpers/specials/fdk-aac
         HEADERS         += ./sources/backend/audio/fdk-aac.h
         SOURCES         += ./sources/backend/audio/fdk-aac.cpp
-        PKGCONFIG       += fdk-aac
+unix {
+	LIBS		+= -lfdk-aac
+}
+win32 {
+	LIBS		+= -lfdk-aac-2
+}
 }
 
 mapserver {
 	DEFINES		+= __HAVE_MAP_SERVER__
-	HEADERS		+= ./sources/support/http-handler.h
-	SOURCES		+= ./sources/support/http-handler.cpp
 }
 
 double	{

qt-dab-Qt-DAB-6.9.5.tar.gz/qt-dab-6.9.pro-32 -> qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9.pro-32 Changed

@@ -8,16 +8,20 @@
 QT		+= widgets xml multimedia
 #CONFIG		+= console
 CONFIG		-= console
-QMAKE_CXXFLAGS	+= -std=c++17
+QMAKE_CXXFLAGS	+= -std=c++20
 
 win32 {
-QMAKE_CFLAGS	+=  -O3 -ffast-math
-QMAKE_CXXFLAGS	+=  -O3 -ffast-math
+QMAKE_CXXFLAGS	+=  -ffast-math -flto 
+QMAKE_CFLAGS	+=  -ffast-math -flto
+QMAKE_LFLAGS	+=  -ffast-math -flto
 }
 
 unix {
+#QMAKE_CFLAGS	+=  -O3 -ffast-math -g
+#QMAKE_CXXFLAGS	+=  -O3 -ffast-math -g
+#QMAKE_LFLAGS	+=  -O3 -ffast-math -g
 #QMAKE_CFLAGS	+=  -O3 -ffast-math -pg
-#QMAKE_CXXFLAGS	+=  -O3 -ffast-math -pg
+@QMAKE_CXXFLAGS	+=  -O3 -ffast-math -pg
 #QMAKE_LFLAGS	+=  -O3 -ffast-math -pg
 QMAKE_CXXFLAGS	+=  -ffast-math -flto 
 QMAKE_CFLAGS	+=  -ffast-math -flto
@@ -31,7 +35,7 @@
 #QMAKE_CXXFLAGS	+=  -pg
 #QMAKE_LFLAGS	+=  -pg
 QMAKE_CXXFLAGS += -isystem $$QT_INSTALL_HEADERS
-RC_ICONS	=  qt-dab-6.9.ico
+RC_ICONS	=  qt-dab-6.9.5.ico
 RESOURCES	+= resources.qrc
 
 TRANSLATIONS = ../i18n/de_DE.ts
@@ -56,22 +60,20 @@
 	      ./sources/eti-handler \
 	      ./sources/main \
 	      ./sources/main/forms-v7 \
-	      ./sources/main/forms-v7/new-display \
-	      ./sources/main/forms-v7/new-display/scopes \
-	      ./sources/main/forms-v7/snr-viewer \
+	      ./sources/main/snr-viewer \
 	      ./sources/frontend \
+	      ./sources/frontend/fic-handling \
 	      ./sources/output \
 	      ./sources/output/portaudio \
 	      ./sources/protection \
-	      ./sources/qt-devices \
-#	      ./sources/scopes-qwt6 \
+	      ./sources/devices \
 	      ./sources/support \
 	      ./sources/support/gui-elements \
-	      ./sources/qt-devices \
-	      ./sources/qt-devices/filereaders/ \
-	      ./sources/qt-devices/filereaders/new-reader \
-	      ./sources/qt-devices/filereaders/rawfiles-new \
-	      ./sources/qt-devices/filereaders/xml-filereader 
+	      ./sources/devices \
+	      ./sources/devices/filereaders/ \
+	      ./sources/devices/filereaders/new-reader \
+	      ./sources/devices/filereaders/rawfiles-new \
+	      ./sources/devices/filereaders/xml-filereader 
 	
 
 INCLUDEPATH += . \
@@ -86,65 +88,67 @@
 	      ./sources/eti-handler \
 	      ./sources/main \
 	      ./sources/main/forms-v7 \
-	      ./sources/main/forms-v7/new-display \
-	      ./sources/main/forms-v7/new-display/scopes \
-	      ./sources/main/forms-v7/snr-viewer \
+	      ./sources/main/scopes \
+	      ./sources/main/snr-viewer \
 	      ./sources/frontend \
+	      ./sources/frontend/fic-handling \
 	      ./sources/output \
 	      ./sources/output/portaudio \
 	      ./sources/protection \
-	      ./sources/qt-devices \
+	      ./sources/devices \
 #	      ./sources/scopes-qwt6 \
 	      ./sources/support \
 	      ./sources/support/gui-elements \
-	      ./sources/qt-devices \
-	      ./sources/qt-devices/filereaders/ \
-	      ./sources/qt-devices/filereaders/new-reader \
-	      ./sources/qt-devices/filereaders/rawfiles-new \
-	      ./sources/qt-devices/filereaders/xml-filereader 
+	      ./sources/devices \
+	      ./sources/devices/filereaders/ \
+	      ./sources/devices/filereaders/new-reader \
+	      ./sources/devices/filereaders/rawfiles-new \
+	      ./sources/devices/filereaders/xml-filereader 
 	
 
 # Input
 HEADERS += ./sources/main/radio.h \
-	   ./sources/main/forms-v7/qwt-2.h \
-	   ./sources/main/forms-v7/new-display/display-widget.h \
-	   ./sources/main/forms-v7/new-display/scopes/spectrum-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/correlation-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/null-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/channel-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/dev-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/waterfall-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/iqdisplay.h \
-	   ./sources/main/forms-v7/new-display/scopes/audio-display.h \
-	   ./sources/main/forms-v7/new-display/scopes/spectrogramdata.h \
-	   ./sources/main/forms-v7/snr-viewer/snr-viewer.h \
+	   ./sources/main/display-widget.h \
+	   ./sources/main/scopes/spectrum-scope.h \
+	   ./sources/main/scopes/correlation-scope.h \
+	   ./sources/main/scopes/null-scope.h \
+	   ./sources/main/scopes/channel-scope.h \
+	   ./sources/main/scopes/dev-scope.h \
+	   ./sources/main/scopes/waterfall-scope.h \
+	   ./sources/main/scopes/iqdisplay.h \
+	   ./sources/main/scopes/audio-display.h \
+	   ./sources/main//scopes/spectrogramdata.h \
+	   ./sources/main/snr-viewer/snr-viewer.h \
 	   ./sources/main/ensemble-handler.h \
 	   ./sources/main/config-handler.h \
 	   ./sources/main/techdata.h \
 	   ./sources/main/aboutdialog.h \
+	   ./sources/support/equalizer.h \
+	   ./sources/support/qwt-2.h \
 	   ./sources/support/scan-handler.h \
 	   ./sources/support/scantable-handler.h \
 	   ./sources/support/dxDisplay.h \
 	   ./sources/support/audiosystem-selector.h \
+	   ./sources/support/dl2-handler.h \
 	   ./sources/eti-handler/eti-generator.h \
 	   ./sources/frontend/ofdm-handler.h \
 	   ./sources/frontend/timesyncer.h \
 	   ./sources/frontend/sample-reader.h \
 	   ./sources/frontend/ofdm-decoder.h \
 	   ./sources/frontend/correlator.h \
+	   ./sources/frontend/estimator.h \
 	   ./sources/frontend/freqsyncer.h \
 	   ./sources/frontend/phasetable.h \
 	   ./sources/frontend/freq-interleaver.h \
 	   ./sources/frontend/tii-detector.h \
 	   ./sources/frontend/tii-detector-1.h \
 	   ./sources/frontend/tii-detector-2.h \
-	   ./sources/frontend/fic-handler.h \
-	   ./sources/frontend/ensemble.h  \
-	   ./sources/frontend/fib-config.h  \
-	   ./sources/frontend/fib-printer.h  \
-	   ./sources/frontend/fib-decoder.h  \
-	   ./sources/frontend/fib-table.h \
-	   ./sources/frontend/estimator.h \
+	   ./sources/frontend/fic-handling/fic-handler.h \
+	   ./sources/frontend/fic-handling/ensemble.h  \
+	   ./sources/frontend/fic-handling/fib-dbtypes.h  \
+	   ./sources/frontend/fic-handling/fib-config.h  \
+	   ./sources/frontend/fic-handling/fib-decoder.h  \
+	   ./sources/frontend/fic-handling/fib-table.h \
 	   ./sources/protection/protTables.h \
 	   ./sources/protection/protection.h \
 	   ./sources/protection/eep-protection.h \
@@ -169,6 +173,7 @@
 	   ./sources/backend/data/mot/mot-handler.h \
 	   ./sources/backend/data/mot/mot-object.h \
 	   ./sources/backend/data/mot/mot-dir.h \
+	   ./sources/backend/data/journaline-controller.h \
 	   ./sources/backend/data/journaline-datahandler.h \
 	   ./sources/backend/data/journaline-screen.h \
 	   ./sources/backend/data/journaline/dabdatagroupdecoder.h \
@@ -190,18 +195,18 @@
 	   ./sources/support/distances.h \
 	   ./sources/support/time-converter.h \
 	   ./sources/support/logger.h \
+	   ./sources/support/errorlog.h \
 	   ./sources/support/settings-handler.h \
 	   ./sources/support/position-handler.h \
-	   ./sources/support/cacheElement.h \
+	   ./sources/support/db-element.h \
 	   ./sources/support/settingNames.h \
 	   ./sources/support/fft-handler.h \
-	   ./sources/support/wavWriter.h \
+	   ./sources/support/riffWriter.h \
 	   ./sources/support/converter_48000.h \
 	   ./sources/support/process-params.h \
 	   ./sources/support/ringbuffer.h \
 	   ./sources/support/dab-params.h \
 	   ./sources/support/dab-tables.h \
-	   ./sources/support/presetcombobox.h \
 	   ./sources/support/scanlist-handler.h \
 	   ./sources/support/scheduler.h \
 	   ./sources/support/schedule-selector.h \
@@ -218,7 +223,9 @@
 	   ./sources/support/fir-filters.h \
 	   ./sources/support/tii-mapper.h \
 	   ./sources/support/tii-reader.h \
-	   ./sources/support//uploader.h \
+	   ./sources/support/uploader.h \
+	   ./sources/support/basic-print.h \
+	   ./sources/support/gui-elements/presetcombobox.h \
 	   ./sources/support/gui-elements/circular-button.h \
 	   ./sources/support/gui-elements/clickable-label.h \
 	   ./sources/support/gui-elements/color-selector.h \
@@ -232,44 +239,44 @@
 	   ./sources/support/gui-elements/smallspinbox.h \
 	   ./sources/support/gui-elements/super-frame.h \
 	   ./sources/support/gui-elements/verysmallpushbutton.h \
-	   ./sources/qt-devices/device-handler.h \
-	   ./sources/qt-devices/device-chooser.h \
-	   ./sources/qt-devices/device-exceptions.h \
-	   ./sources/qt-devices/xml-filewriter.h \
-	   ./sources/qt-devices/filereaders/new-reader/newfiles.h \
-	   ./sources/qt-devices/filereaders/new-reader/new-reader.h \
-	   ./sources/qt-devices/filereaders/new-reader/riff-reader.h \
-	   ./sources/qt-devices/filereaders/rawfiles-new/rawfiles.h \
-	   ./sources/qt-devices/filereaders/rawfiles-new/raw-reader.h \
-	   ./sources/qt-devices/filereaders/xml-filereader/element-reader.h \
-	   ./sources/qt-devices/filereaders/xml-filereader/xml-filereader.h \
-	   ./sources/qt-devices/filereaders/xml-filereader/xml-reader.h \
-	   ./sources/qt-devices/filereaders/xml-filereader/xml-descriptor.h 
+	   ./sources/devices/device-handler.h \
+	   ./sources/devices/device-chooser.h \
+	   ./sources/devices/device-exceptions.h \
+	   ./sources/devices/xml-filewriter.h \
+	   ./sources/devices/filereaders/new-reader/newfiles.h \
+	   ./sources/devices/filereaders/new-reader/new-reader.h \
+	   ./sources/devices/filereaders/new-reader/riff-reader.h \
+	   ./sources/devices/filereaders/rawfiles-new/rawfiles.h \
+	   ./sources/devices/filereaders/rawfiles-new/raw-reader.h \
+	   ./sources/devices/filereaders/xml-filereader/element-reader.h \
+	   ./sources/devices/filereaders/xml-filereader/xml-filereader.h \
+	   ./sources/devices/filereaders/xml-filereader/xml-reader.h \
+	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.h 
 
 FORMS	+= ./sources/main/forms-v7/technical_data.ui
 FORMS	+= ./sources/main/forms-v7/dabradio-6.ui 
 FORMS	+= ./sources/main/forms-v7/config-helper.ui 
-FORMS	+= ./sources/main/forms-v7/audio-description.ui
-FORMS	+= ./sources/main/forms-v7/data-description.ui
-FORMS	+= ./sources/main/forms-v7/new-display/scopewidget.ui
-FORMS	+= ./sources/main/forms-v7/snr-viewer/snr-widget.ui
-FORMS	+= ./sources/main/aboutdialog.ui
-#FORMS	+= ./sources/qt-devices/filereaders/filereader-widget.ui 
-FORMS	+= ./sources/qt-devices/filereaders/xml-filereader/xmlfiles.ui
+#FORMS	+= ./sources/main/forms-v7/audio-description.ui
+#FORMS	+= ./sources/main/forms-v7/data-description.ui
+FORMS	+= ./sources/main/forms-v7/scopewidget.ui
+FORMS	+= ./sources/main/forms-v7/aboutdialog.ui
+FORMS	+= ./sources/main/snr-viewer/snr-widget.ui
+#FORMS	+= ./sources/devices/filereaders/filereader-widget.ui 
+FORMS	+= ./sources/devices/filereaders/xml-filereader/xmlfiles.ui
 
 SOURCES += ./sources/main/main.cpp \
 	   ./sources/main/radio.cpp \
-	   ./sources/main/forms-v7/new-display/display-widget.cpp \
-           ./sources/main/forms-v7/new-display/scopes/correlation-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/spectrum-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/null-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/channel-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/dev-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/waterfall-scope.cpp \
-	   ./sources/main/forms-v7/new-display/scopes/iqdisplay.cpp \
-	   ./sources/main/forms-v7/new-display/scopes/audio-display.cpp \
-	   ./sources/main/forms-v7/new-display/scopes/spectrogramdata.cpp \
-	   ./sources/main/forms-v7/snr-viewer/snr-viewer.cpp \
+	   ./sources/main/display-widget.cpp \
+           ./sources/main/scopes/correlation-scope.cpp \
+           ./sources/main/scopes/spectrum-scope.cpp \
+           ./sources/main/scopes/null-scope.cpp \
+           ./sources/main/scopes/channel-scope.cpp \
+           ./sources/main/scopes/dev-scope.cpp \
+           ./sources/main/scopes/waterfall-scope.cpp \
+	   ./sources/main/scopes/iqdisplay.cpp \
+	   ./sources/main/scopes/audio-display.cpp \
+	   ./sources/main/scopes/spectrogramdata.cpp \
+	   ./sources/main/snr-viewer/snr-viewer.cpp \
 	   ./sources/main/aboutdialog.cpp \
 	   ./sources/main/ensemble-handler.cpp \
 	   ./sources/main/techdata.cpp \
@@ -278,24 +285,24 @@
 	   ./sources/support/scantable-handler.cpp \
 	   ./sources/support/audiosystem-selector.cpp \
 	   ./sources/support/dxDisplay.cpp \
+	   ./sources/support/dl2-handler.cpp \
 	   ./sources/eti-handler/eti-generator.cpp \
 	   ./sources/frontend/ofdm-handler.cpp \
 	   ./sources/frontend/timesyncer.cpp \
 	   ./sources/frontend/sample-reader.cpp \
 	   ./sources/frontend/ofdm-decoder.cpp \
 	   ./sources/frontend/correlator.cpp \
+	   ./sources/frontend/estimator.cpp \
 	   ./sources/frontend/freqsyncer.cpp \
 	   ./sources/frontend/phasetable.cpp \
 	   ./sources/frontend/freq-interleaver.cpp \
 	   ./sources/frontend/tii-detector.cpp \
 	   ./sources/frontend/tii-detector-1.cpp \
 	   ./sources/frontend/tii-detector-2.cpp \
-	   ./sources/frontend/fic-handler.cpp \
-	   ./sources/frontend/ensemble.cpp  \
-	   ./sources/frontend/fib-config.cpp  \
-	   ./sources/frontend/fib-printer.cpp  \
-	   ./sources/frontend/fib-decoder.cpp  \
-	   ./sources/frontend/estimator.cpp \
+	   ./sources/frontend/fic-handling/fic-handler.cpp \
+	   ./sources/frontend/fic-handling/ensemble.cpp  \
+	   ./sources/frontend/fic-handling/fib-config.cpp  \
+	   ./sources/frontend/fic-handling/fib-decoder.cpp  \
 	   ./sources/protection/protTables.cpp \
 	   ./sources/protection/protection.cpp \
 	   ./sources/protection/eep-protection.cpp \
@@ -318,6 +325,7 @@
 	   ./sources/backend/data/mot/mot-handler.cpp \
 	   ./sources/backend/data/mot/mot-object.cpp \
 	   ./sources/backend/data/mot/mot-dir.cpp \
+	   ./sources/backend/data/journaline-controller.cpp \
 	   ./sources/backend/data/journaline-datahandler.cpp \
 	   ./sources/backend/data/journaline-screen.cpp \
 	   ./sources/backend/data/journaline/crc_8_16.c \
@@ -330,19 +338,19 @@
 	   ./sources/backend/data/epg/epg-compiler.cpp \
 	   ./sources/backend/data/epg/xml-extractor.cpp \
 	   ./sources/output/audio-player.cpp \
+	   ./sources/support/crc-handlers.cpp \
 	   ./sources/support/charsets.cpp \
 	   ./sources/support/distances.cpp \
 	   ./sources/support/time-converter.cpp \
 	   ./sources/support/logger.cpp \
+	   ./sources/support/errorlog.cpp \
 	   ./sources/support/settings-handler.cpp \
 	   ./sources/support/position-handler.cpp \
-	   ./sources/support/wavWriter.cpp \
+	   ./sources/support/riffWriter.cpp \
 	   ./sources/support/converter_48000.cpp \
 	   ./sources/support/fft-handler.cpp \
 	   ./sources/support/dab-params.cpp \
 	   ./sources/support/dab-tables.cpp \
-#	   ./sources/support/preset-handler.cpp \
-	   ./sources/support/presetcombobox.cpp \
 	   ./sources/support/scanlist-handler.cpp \
 	   ./sources/support/scheduler.cpp \
 	   ./sources/support/schedule-selector.cpp \
@@ -359,6 +367,8 @@
 	   ./sources/support/tii-mapper.cpp \
 	   ./sources/support/tii-reader.cpp \
 	   ./sources/support/uploader.cpp \
+	   ./sources/support/basic-print.cpp \
+	   ./sources/support/gui-elements/presetcombobox.cpp \
 	   ./sources/support/gui-elements/circular-button.cpp \
 	   ./sources/support/gui-elements/clickable-label.cpp \
 	   ./sources/support/gui-elements/color-selector.cpp \
@@ -372,30 +382,24 @@
 	   ./sources/support/gui-elements/smallspinbox.cpp \
 	   ./sources/support/gui-elements/super-frame.cpp \
 	   ./sources/support/gui-elements/verysmallpushbutton.cpp \
-	   ./sources/qt-devices/device-handler.cpp \
-	   ./sources/qt-devices/device-chooser.cpp \
-	   ./sources/qt-devices/xml-filewriter.cpp \
-	   ./sources/qt-devices/filereaders/rawfiles-new/rawfiles.cpp \
-	   ./sources/qt-devices/filereaders/rawfiles-new/raw-reader.cpp \
-           ./sources/qt-devices/filereaders/new-reader/newfiles.cpp \
-           ./sources/qt-devices/filereaders/new-reader/new-reader.cpp \
-           ./sources/qt-devices/filereaders/new-reader/riff-reader.cpp \
-#	   ./sources/qt-devices/filereaders/wavfiles-new/wavfiles.cpp \
-#	   ./sources/qt-devices/filereaders/wavfiles-new/wav-reader.cpp \
-	   ./sources/qt-devices/filereaders/xml-filereader/xml-filereader.cpp \
-	   ./sources/qt-devices/filereaders/xml-filereader/xml-reader.cpp \
-	   ./sources/qt-devices/filereaders/xml-filereader/xml-descriptor.cpp 
+	   ./sources/devices/device-handler.cpp \
+	   ./sources/devices/device-chooser.cpp \
+	   ./sources/devices/xml-filewriter.cpp \
+	   ./sources/devices/filereaders/rawfiles-new/rawfiles.cpp \
+	   ./sources/devices/filereaders/rawfiles-new/raw-reader.cpp \
+           ./sources/devices/filereaders/new-reader/newfiles.cpp \
+           ./sources/devices/filereaders/new-reader/new-reader.cpp \
+           ./sources/devices/filereaders/new-reader/riff-reader.cpp \
+#	   ./sources/devices/filereaders/wavfiles-new/wavfiles.cpp \
+#	   ./sources/devices/filereaders/wavfiles-new/wav-reader.cpp \
+	   ./sources/devices/filereaders/xml-filereader/xml-filereader.cpp \
+	   ./sources/devices/filereaders/xml-filereader/xml-reader.cpp \
+	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.cpp 
 
 #
 unix {
 DESTDIR		= ./linux-bin
-	equals (QT_MAJOR_VERSION, 5) {
-	TARGET		= qt-dab-qt5-6.9.3
-	}
-	else {
-	TARGET		= qt-dab-qt6-6.9.3
-	}
-exists ("../.git") {
+exists ("./.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
        message("Current git hash = $$GITHASHSTRING")
@@ -406,6 +410,13 @@
     DEFINES += GITHASH=\\\"------\\\"
 }
 
+equals (QT_MAJOR_VERSION, 5) {
+   TARGET		= qt-dab-qt5-6.9.5
+}
+else {
+   TARGET		= qt-dab-qt6-6.9.5
+}
+
 mac {
   DESTDIR      = ./mac-bin
   PKG_CONFIG = /usr/local/bin/pkg-config
@@ -440,8 +451,8 @@
 # qmake -set QMAKEFEATURES /usr/local/Cellar/qwt/6.2.0/features
 CONFIG		+= qwt
 #}
-#CONFIG		+= double
-CONFIG		+= single
+CONFIG		+= double
+#CONFIG		+= single
 #
 # comment or uncomment for the devices you want to have support for
 # (you obviously have libraries installed for the selected ones)
@@ -474,8 +485,8 @@
 
 #CONFIG		+= viterbi-scalar
 #CONFIG		+= viterbi-sse
-#CONFIG		+= viterbi-avx2
-CONFIG		+= spiral-sse
+CONFIG		+= viterbi-avx2
+#CONFIG		+= spiral-sse
 #CONFIG		+= spiral-no-sse
 #DEFINES	+= SHOW_MISSING
 DEFINES		+= __LOGGING__
@@ -484,7 +495,7 @@
 
 # an attempt to have it run under W32 through cross compilation
 win32 {
-exists ("../.git") {
+exists ("./.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
        message("Current git hash = $$GITHASHSTRING")
@@ -496,7 +507,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-9
+#	TARGET		= qt-dab64-9.5
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -519,19 +530,19 @@
 #
 #for win32, comment out the lines above
 #	equals (QT_MAJOR_VERSION, 5) {
-#	   TARGET		= qt-dab32-qt5-6.9V3.3
+#	   TARGET		= qt-dab32-qt5-6.9V3.5
 #	}
 #	else {
-#	   TARGET		= qt-dab32-qt6-6.9V3.3
+#	   TARGET		= qt-dab32-qt6-6.9V3.5
 #	}
 #	CONFIG		+= dabstick-win-v3
 	equals (QT_MAJOR_VERSION, 5) {
-	   TARGET		= qt-dab32-qt5-6.9.3
+	   TARGET		= qt-dab32-qt5-6.9.5
 	}
 	else {
-	   TARGET		= qt-dab32-qt6-6.9.3
+	   TARGET		= qt-dab32-qt6-6.9.5
 	}
-	CONFIG		+= dabstick-win-v4
+	CONFIG		+= dabstick-win
 	CONFIG		+= airspy-2
 	CONFIG		+= spyServer-16
 	CONFIG		+= spyServer-8
@@ -553,9 +564,9 @@
 	CONFIG		+= hackrf
 	CONFIG		+= lime
 	CONFIG		+= pluto
-	CONFIG		+= viterbi-scalar
+#	CONFIG		+= viterbi-scalar
 #	CONFIG		+= viterbi-sse
-#	CONFIG		+= viterbi-avx2
+	CONFIG		+= viterbi-avx2
 #	CONFIG		+= spiral-sse
 #	CONFIG		+= spiral-no-sse
 #
@@ -599,43 +610,29 @@
 #	linux version loads the function from the so
 dabstick-linux {
 	DEFINES		+= HAVE_RTLSDR
-	DEPENDPATH	+= ./sources/qt-devices/rtlsdr-handler-linux 
-	INCLUDEPATH	+= ./sources/qt-devices/rtlsdr-handler-linux 
-	HEADERS		+= ./sources/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.h \
-	                   ./sources/qt-devices/rtlsdr-handler-linux/dll-driver.h \
-	                   ./sources/qt-devices/rtlsdr-handler-linux/rtl-dongleselect.h
-	SOURCES		+= ./sources/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp \
-	                   ./sources/qt-devices/rtlsdr-handler-linux/dll-driver.cpp \
-	                   ./sources/qt-devices/rtlsdr-handler-linux/rtl-dongleselect.cpp
-	FORMS		+= ./sources/qt-devices/rtlsdr-handler-linux/rtlsdr-widget.ui
-}
-
-dabstick-win-v4 {
-	DEFINES		+= HAVE_RTLSDR_V4
-	DEPENDPATH	+= ./sources/qt-devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ./sources/qt-devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ../usr/shared/drivers/rtlsdrWindowsV4
-	INCLUDEPATH	+= ../usr/shared/drivers/rtlsdrWindowsV4/x86
-	HEADERS		+= ./sources/qt-devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ./sources/qt-devices/rtlsdr-handler-common/rtl-dongleselect.h
-	SOURCES		+= ./sources/qt-devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ./sources/qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ./sources/qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
-	LIBS		+= /usr/shared/drivers/rtlsdrWindowsV4/x86/rtlsdr.dll
-}
-
-dabstick-win-v3 {
+	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-linux 
+	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-linux 
+	HEADERS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-handler.h \
+	                   ./sources/devices/rtlsdr-handler-linux/dll-driver.h \
+	                   ./sources/devices/rtlsdr-handler-linux/rtl-dongleselect.h
+	SOURCES		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-handler.cpp \
+	                   ./sources/devices/rtlsdr-handler-linux/dll-driver.cpp \
+	                   ./sources/devices/rtlsdr-handler-linux/rtl-dongleselect.cpp
+	FORMS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui
+}
+
+dabstick-win {
 	DEFINES		+= HAVE_RTLSDR_V3
-	DEPENDPATH	+= ./sources/qt-devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ./sources/qt-devices/rtlsdr-handler-win 
-	INCLUDEPATH	+= ./sources/qt-devices/rtlsdr-handler-common
-	HEADERS		+= ./sources/qt-devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ./sources/qt-devices/rtlsdr-handler-common/rtl-dongleselect.h
-	SOURCES		+= ./sources/qt-devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ./sources/qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ./sources/qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
-#	LIBS		+= /usr/i686-s64-mingw32/sys-root/mingw/bin/librtlsdr.dll
-	LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/librtlsdr.dll
+	DEFINES		+= HAVE_RTLSDR_V4
+	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-win
+	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-win 
+#	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
+	HEADERS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
+	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.h \
+	                   ./sources/devices/rtlsdr-handler-win/rtl-sdr.h
+	SOURCES		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
+	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.cpp 
+	FORMS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-widget.ui
 }
 
 #
@@ -643,39 +640,41 @@
 #
 sdrplay-v2 {
 	DEFINES		+= HAVE_SDRPLAY_V2
-	DEPENDPATH	+= ./sources/qt-devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ./sources/qt-devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ./sources/qt-devices/rtlsdr-handler-common
-	HEADERS		+= ./sources/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h \ 
-	                   ./sources/qt-devices/sdrplay-handler-v2/sdrplayselect.h 
-	SOURCES		+= ./sources/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \ 
-	                   ./sources/qt-devices/sdrplay-handler-v2/sdrplayselect.cpp 
-	FORMS		+= ./sources/qt-devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
+	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v2
+	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v2
+	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
+	HEADERS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h \ 
+	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.h 
+	SOURCES		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \ 
+	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.cpp 
+	FORMS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
 }
 #
 #	the SDRplay
 #
 sdrplay-v3 {
 	DEFINES		+= HAVE_SDRPLAY_V3
-	DEPENDPATH	+= ./sources/qt-devices/sdrplay-handler-v3
-	INCLUDEPATH	+= ./sources/qt-devices/sdrplay-handler-v3 \
-	                   ./sources/qt-devices/sdrplay-handler-v3/include
-        HEADERS         += ./sources/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
-                           ./sources/qt-devices/sdrplay-handler-v3/sdrplay-commands.h \
-	                   ./sources/qt-devices/sdrplay-handler-v3/Rsp-device.h \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspI-handler.h \
-	                   ./sources/qt-devices/sdrplay-handler-v3/Rsp1A-handler.h \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspII-handler.h \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspDuo-handler.h \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspDx-handler.h
-        SOURCES         += ./sources/qt-devices/sdrplay-handler-v3/Rsp-device.cpp \
-	                   ./sources/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspI-handler.cpp \
-	                   ./sources/qt-devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspII-handler.cpp \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspDuo-handler.cpp \
-	                   ./sources/qt-devices/sdrplay-handler-v3/RspDx-handler.cpp 
-	FORMS		+= ./sources/qt-devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
+	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v3
+	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v3 \
+	                   ./sources/devices/sdrplay-handler-v3/include
+        HEADERS         += ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
+                           ./sources/devices/sdrplay-handler-v3/sdrplay-commands.h \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.h \ 
+	                   ./sources/devices/sdrplay-handler-v3/Rsp-device.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.h
+        SOURCES         += ./sources/devices/sdrplay-handler-v3/Rsp-device.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.cpp \ 
+	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.cpp 
+	FORMS		+= ./sources/devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
 #	LIBS		+= -ldl
 }
 #
@@ -683,22 +682,22 @@
 #
 lime  {
 	DEFINES		+= HAVE_LIME
-	INCLUDEPATH	+= ./sources/qt-devices/lime-handler
-	DEPENDPATH	+= ./sources/qt-devices/lime-handler
-        HEADERS         += ./sources/qt-devices/lime-handler/lime-handler.h \	
-	                   ./sources/qt-devices/lime-handler/lime-widget.h
-        SOURCES         += ./sources/qt-devices/lime-handler/lime-handler.cpp 
+	INCLUDEPATH	+= ./sources/devices/lime-handler
+	DEPENDPATH	+= ./sources/devices/lime-handler
+        HEADERS         += ./sources/devices/lime-handler/lime-handler.h \	
+	                   ./sources/devices/lime-handler/lime-widget.h
+        SOURCES         += ./sources/devices/lime-handler/lime-handler.cpp 
 }
 #
 #	the hackrf
 #
 hackrf {
 	DEFINES		+= HAVE_HACKRF
-	DEPENDPATH	+= ./sources/qt-devices/hackrf-handler 
-	INCLUDEPATH	+= ./sources/qt-devices/hackrf-handler 
-	HEADERS		+= ./sources/qt-devices/hackrf-handler/hackrf-handler.h 
-	SOURCES		+= ./sources/qt-devices/hackrf-handler/hackrf-handler.cpp 
-	FORMS		+= ./sources/qt-devices/hackrf-handler/hackrf-widget.ui
+	DEPENDPATH	+= ./sources/devices/hackrf-handler 
+	INCLUDEPATH	+= ./sources/devices/hackrf-handler 
+	HEADERS		+= ./sources/devices/hackrf-handler/hackrf-handler.h 
+	SOURCES		+= ./sources/devices/hackrf-handler/hackrf-handler.cpp 
+	FORMS		+= ./sources/devices/hackrf-handler/hackrf-widget.ui
 }
 #
 #
@@ -706,152 +705,153 @@
 #
 airspy {
 	DEFINES		+= HAVE_AIRSPY
-	DEPENDPATH	+= ./sources/qt-devices/airspy 
-	INCLUDEPATH	+= ./sources/qt-devices/airspy-handler \
-	                   ./sources/qt-devices/airspy-handler/libairspy
-	HEADERS		+= ./sources/qt-devices/airspy-handler/airspy-handler.h \
-	                   ./sources/qt-devices/airspy-handler/airspyselect.h \
-	                   ./sources/qt-devices/airspy-handler/libairspy/airspy.h
-	SOURCES		+= ./sources/qt-devices/airspy-handler/airspy-handler.cpp \
-	                   ./sources/qt-devices/airspy-handler/airspyselect.cpp
-	FORMS		+= ./sources/qt-devices/airspy-handler/airspy-widget.ui
+	DEPENDPATH	+= ./sources/devices/airspy 
+	INCLUDEPATH	+= ./sources/devices/airspy-handler \
+	                   ./sources/devices/airspy-handler/libairspy
+	HEADERS		+= ./sources/devices/airspy-handler/airspy-handler.h \
+	                   ./sources/devices/airspy-handler/airspyselect.h \
+	                   ./sources/devices/airspy-handler/libairspy/airspy.h
+	SOURCES		+= ./sources/devices/airspy-handler/airspy-handler.cpp \
+	                   ./sources/devices/airspy-handler/airspyselect.cpp
+	FORMS		+= ./sources/devices/airspy-handler/airspy-widget.ui
 }
 
 airspy-2 {
 	DEFINES		+= HAVE_AIRSPY_2
-	DEPENDPATH	+= ./sources/qt-devices/airspy-2 
-	INCLUDEPATH	+= ./sources/qt-devices/airspy-2 \
-	                   ./sources/qt-devices/airspy-2/libairspy
-	HEADERS		+= ./sources/qt-devices/airspy-2/airspy-2.h \
-	                   ./sources/qt-devices/airspy-2/airspyselect.h \
-	                   ./sources/qt-devices/airspy-2/libairspy/airspy.h
-	SOURCES		+= ./sources/qt-devices/airspy-2/airspy-2.cpp \
-	                   ./sources/qt-devices/airspy-2/airspyselect.cpp
-	FORMS		+= ./sources/qt-devices/airspy-2/airspy-widget.ui
+	DEPENDPATH	+= ./sources/devices/airspy-2 
+	INCLUDEPATH	+= ./sources/devices/airspy-2 \
+	                   ./sources/devices/airspy-2/libairspy
+	HEADERS		+= ./sources/devices/airspy-2/airspy-2.h \
+	                   ./sources/devices/airspy-2/airspyselect.h \
+	                   ./sources/devices/airspy-2/libairspy/airspy.h
+	SOURCES		+= ./sources/devices/airspy-2/airspy-2.cpp \
+	                   ./sources/devices/airspy-2/airspyselect.cpp
+	FORMS		+= ./sources/devices/airspy-2/airspy-widget.ui
 }
 
 #	extio dependencies, windows only
 #
 extio {
 	DEFINES		+= HAVE_EXTIO
-	INCLUDEPATH	+= ./sources/qt-devices/extio-handler
-	HEADERS		+= ./sources/qt-devices/extio-handler/extio-handler.h \
-	                   ./sources/qt-devices/extio-handler/common-readers.h \
-	                   ./sources/qt-devices/extio-handler/virtual-reader.h
-	SOURCES		+= ./sources/qt-devices/extio-handler/extio-handler.cpp \
-	                   ./sources/qt-devices/extio-handler/common-readers.cpp \
-	                   ./sources/qt-devices/extio-handler/virtual-reader.cpp
+	INCLUDEPATH	+= ./sources/devices/extio-handler
+	HEADERS		+= ./sources/devices/extio-handler/extio-handler.h \
+	                   ./sources/devices/extio-handler/common-readers.h \
+	                   ./sources/devices/extio-handler/virtual-reader.h
+	SOURCES		+= ./sources/devices/extio-handler/extio-handler.cpp \
+	                   ./sources/devices/extio-handler/common-readers.cpp \
+	                   ./sources/devices/extio-handler/virtual-reader.cpp
 }
 
 #
 rtl_tcp {
 	DEFINES		+= HAVE_RTL_TCP
 	QT		+= network
-	INCLUDEPATH	+= ./sources/qt-devices/rtl_tcp
-	HEADERS		+= ./sources/qt-devices/rtl_tcp/rtl_tcp_client.h
-	SOURCES		+= ./sources/qt-devices/rtl_tcp/rtl_tcp_client.cpp
-	FORMS		+= ./sources/qt-devices/rtl_tcp/rtl_tcp-widget.ui
+	INCLUDEPATH	+= ./sources/devices/rtl_tcp
+	HEADERS		+= ./sources/devices/rtl_tcp/rtl_tcp_client.h
+	SOURCES		+= ./sources/devices/rtl_tcp/rtl_tcp_client.cpp
+	FORMS		+= ./sources/devices/rtl_tcp/rtl_tcp-widget.ui
 }
 
 soapy {
 	DEFINES		+= HAVE_SOAPY
-	DEPENDPATH	+= ./sources/qt-devices/soapy
-	INCLUDEPATH     += ./sources/qt-devices/soapy
-        HEADERS         += ./sources/qt-devices/soapy/soapy-handler.h \
-	                   ./sources/qt-devices/soapy/soapy-converter.h
-        SOURCES         += ./sources/qt-devices/soapy/soapy-handler.cpp \
-	                   ./sources/qt-devices/soapy/soapy-converter.cpp
-        FORMS           += ./sources/qt-devices/soapy/soapy-widget.ui
+	DEPENDPATH	+= ./sources/devices/soapy
+	INCLUDEPATH     += ./sources/devices/soapy
+        HEADERS         += ./sources/devices/soapy/soapy-handler.h \
+	                   ./sources/devices/soapy/soapy-converter.h
+        SOURCES         += ./sources/devices/soapy/soapy-handler.cpp \
+	                   ./sources/devices/soapy/soapy-converter.cpp
+        FORMS           += ./sources/devices/soapy/soapy-widget.ui
+	LIBS		+= -lsamplerate
 	LIBS		+= -lSoapySDR -lm
 }
 
 pluto-rxtx	{
 	DEFINES		+= HAVE_PLUTO_RXTX
 	QT		+= network
-	INCLUDEPATH	+= ./sources/qt-devices/pluto-rxtx
-	INCLUDEPATH	+= ./sources/qt-devices/pluto-rxtx/dab-streamer
-	HEADERS		+= ./sources/qt-devices/pluto-rxtx/dabFilter.h
-	HEADERS		+= ./sources/qt-devices/pluto-rxtx/pluto-rxtx-handler.h 
-	HEADERS		+= ./sources/qt-devices/pluto-rxtx/dab-streamer/dab-streamer.h 
-	HEADERS		+= ./sources/qt-devices/pluto-rxtx/dab-streamer/up-filter.h
-	SOURCES		+= ./sources/qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp 
-	SOURCES		+= ./sources/qt-devices/pluto-rxtx/dab-streamer/dab-streamer.cpp
-	SOURCES		+= ./sources/qt-devices/pluto-rxtx/dab-streamer/up-filter.cpp
-	FORMS		+= ./sources/qt-devices/pluto-rxtx/pluto-rxtx-widget.ui
+	INCLUDEPATH	+= ./sources/devices/pluto-rxtx
+	INCLUDEPATH	+= ./sources/devices/pluto-rxtx/dab-streamer
+	HEADERS		+= ./sources/devices/pluto-rxtx/dabFilter.h
+	HEADERS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.h 
+	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.h 
+	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.h
+	SOURCES		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.cpp 
+	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.cpp
+	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.cpp
+	FORMS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-widget.ui
 #	LIBS		+= -liio -lad9361
 }
 
 pluto	{
 	DEFINES		+= HAVE_PLUTO
 	QT		+= network
-	INCLUDEPATH	+= ./sources/qt-devices/pluto-handler
-	HEADERS		+= ./sources/qt-devices/pluto-handler/dabFilter.h
-	HEADERS		+= ./sources/qt-devices/pluto-handler/pluto-handler.h
-	SOURCES		+= ./sources/qt-devices/pluto-handler/pluto-handler.cpp
-	FORMS		+= ./sources/qt-devices/pluto-handler/pluto-widget.ui
+	INCLUDEPATH	+= ./sources/devices/pluto-handler
+	HEADERS		+= ./sources/devices/pluto-handler/dabFilter.h
+	HEADERS		+= ./sources/devices/pluto-handler/pluto-handler.h
+	SOURCES		+= ./sources/devices/pluto-handler/pluto-handler.cpp
+	FORMS		+= ./sources/devices/pluto-handler/pluto-widget.ui
 }
 
 elad-device	{
 	DEFINES		+= HAVE_ELAD
-	DEPENDPATH	+= ./sources/qt-devices/elad-s1-handler
-	INCLUDEPATH	+= ./sources/qt-devices/elad-s1-handler
-	HEADERS		+= ./sources/qt-devices/elad-s1-handler/elad-handler.h
-	HEADERS		+= ./sources/qt-devices/elad-s1-handler/elad-loader.h
-	HEADERS		+= ./sources/qt-devices/elad-s1-handler/elad-worker.h
-	SOURCES		+= ./sources/qt-devices/elad-s1-handler/elad-handler.cpp
-	SOURCES		+= ./sources/qt-devices/elad-s1-handler/elad-loader.cpp
-	SOURCES		+= ./sources/qt-devices/elad-s1-handler/elad-worker.cpp
-	FORMS		+= ./sources/qt-devices/elad-s1-handler/elad-widget.ui
+	DEPENDPATH	+= ./sources/devices/elad-s1-handler
+	INCLUDEPATH	+= ./sources/devices/elad-s1-handler
+	HEADERS		+= ./sources/devices/elad-s1-handler/elad-handler.h
+	HEADERS		+= ./sources/devices/elad-s1-handler/elad-loader.h
+	HEADERS		+= ./sources/devices/elad-s1-handler/elad-worker.h
+	SOURCES		+= ./sources/devices/elad-s1-handler/elad-handler.cpp
+	SOURCES		+= ./sources/devices/elad-s1-handler/elad-loader.cpp
+	SOURCES		+= ./sources/devices/elad-s1-handler/elad-worker.cpp
+	FORMS		+= ./sources/devices/elad-s1-handler/elad-widget.ui
 }
 
 spyServer-8  {
 	DEFINES		+= HAVE_SPYSERVER_8
-	DEPENDPATH	+= ./sources/qt-devices/spy-server-8
-	INCLUDEPATH	+= ./sources/qt-devices/spy-server-8
-	HEADERS		+= ./sources/qt-devices/spy-server-8/spyserver-protocol.h 
-	HEADERS		+= ./sources/qt-devices/spy-server-8/tcp-client-8.h 
-	HEADERS		+= ./sources/qt-devices/spy-server-8/spy-handler-8.h 
-	HEADERS		+= ./sources/qt-devices/spy-server-8/spyserver-client-8.h
-	SOURCES		+= ./sources/qt-devices/spy-server-8/tcp-client-8.cpp 
-	SOURCES		+= ./sources/qt-devices/spy-server-8/spy-handler-8.cpp 
-	SOURCES		+= ./sources/qt-devices/spy-server-8/spyserver-client-8.cpp 
-	FORMS		+= ./sources/qt-devices/spy-server-8/spyserver-widget-8.ui
+	DEPENDPATH	+= ./sources/devices/spy-server-8
+	INCLUDEPATH	+= ./sources/devices/spy-server-8
+	HEADERS		+= ./sources/devices/spy-server-8/spyserver-protocol.h 
+	HEADERS		+= ./sources/devices/spy-server-8/tcp-client-8.h 
+	HEADERS		+= ./sources/devices/spy-server-8/spy-handler-8.h 
+	HEADERS		+= ./sources/devices/spy-server-8/spyserver-client-8.h
+	SOURCES		+= ./sources/devices/spy-server-8/tcp-client-8.cpp 
+	SOURCES		+= ./sources/devices/spy-server-8/spy-handler-8.cpp 
+	SOURCES		+= ./sources/devices/spy-server-8/spyserver-client-8.cpp 
+	FORMS		+= ./sources/devices/spy-server-8/spyserver-widget-8.ui
 }
 	
 spyServer-16  {
 	DEFINES		+= HAVE_SPYSERVER_16
-	DEPENDPATH	+= ./sources/qt-devices/spy-server-16
-	INCLUDEPATH	+= ./sources/qt-devices/spy-server-16
-	HEADERS		+= ./sources/qt-devices/spy-server-16/spyserver-protocol.h 
-	HEADERS		+= ./sources/qt-devices/spy-server-16/tcp-client.h 
-	HEADERS		+= ./sources/qt-devices/spy-server-16/spy-handler.h 
-	HEADERS		+= ./sources/qt-devices/spy-server-16/spyserver-client.h
-	SOURCES		+= ./sources/qt-devices/spy-server-16/tcp-client.cpp 
-	SOURCES		+= ./sources/qt-devices/spy-server-16/spy-handler.cpp 
-	SOURCES		+= ./sources/qt-devices/spy-server-16/spyserver-client.cpp 
-	FORMS		+= ./sources/qt-devices/spy-server-16/spyserver-widget.ui
+	DEPENDPATH	+= ./sources/devices/spy-server-16
+	INCLUDEPATH	+= ./sources/devices/spy-server-16
+	HEADERS		+= ./sources/devices/spy-server-16/spyserver-protocol.h 
+	HEADERS		+= ./sources/devices/spy-server-16/tcp-client.h 
+	HEADERS		+= ./sources/devices/spy-server-16/spy-handler.h 
+	HEADERS		+= ./sources/devices/spy-server-16/spyserver-client.h
+	SOURCES		+= ./sources/devices/spy-server-16/tcp-client.cpp 
+	SOURCES		+= ./sources/devices/spy-server-16/spy-handler.cpp 
+	SOURCES		+= ./sources/devices/spy-server-16/spyserver-client.cpp 
+	FORMS		+= ./sources/devices/spy-server-16/spyserver-widget.ui
 }
 	
 uhd	{
 	DEFINES		+= HAVE_UHD
-	DEPENDPATH	+= ./sources/qt-devices/uhd
-	INCLUDEPATH	+= ./sources/qt-devices/uhd
-	HEADERS		+= ./sources/qt-devices/uhd/uhd-handler.h
-	SOURCES		+= ./sources/qt-devices/uhd/uhd-handler.cpp
-	FORMS		+= ./sources/qt-devices/uhd/uhd-widget.ui
+	DEPENDPATH	+= ./sources/devices/uhd
+	INCLUDEPATH	+= ./sources/devices/uhd
+	HEADERS		+= ./sources/devices/uhd/uhd-handler.h
+	SOURCES		+= ./sources/devices/uhd/uhd-handler.cpp
+	FORMS		+= ./sources/devices/uhd/uhd-widget.ui
 	LIBS		+= -luhd
 }
 
 colibri	{
 	DEFINES		+= HAVE_COLIBRI
-	DEPENDPATH	+= ./sources/qt-devices/colibri-handler
-	INCLUDEPATH	+= ./sources/qt-devices/colibri-handler
-	HEADERS		+= ./sources/qt-devices/colibri-handler/common.h
-	HEADERS		+= ./sources/qt-devices/colibri-handler/LibLoader.h
-	HEADERS		+= ./sources/qt-devices/colibri-handler/colibri-handler.h
-	SOURCES		+= ./sources/qt-devices/colibri-handler/LibLoader.cpp
-	SOURCES		+= ./sources/qt-devices/colibri-handler/colibri-handler.cpp
-	FORMS		+= ./sources/qt-devices/colibri-handler/colibri-widget.ui
+	DEPENDPATH	+= ./sources/devices/colibri-handler
+	INCLUDEPATH	+= ./sources/devices/colibri-handler
+	HEADERS		+= ./sources/devices/colibri-handler/common.h
+	HEADERS		+= ./sources/devices/colibri-handler/LibLoader.h
+	HEADERS		+= ./sources/devices/colibri-handler/colibri-handler.h
+	SOURCES		+= ./sources/devices/colibri-handler/LibLoader.cpp
+	SOURCES		+= ./sources/devices/colibri-handler/colibri-handler.cpp
+	FORMS		+= ./sources/devices/colibri-handler/colibri-widget.ui
 }
 	
 send_datagram {

qt-dab-Qt-DAB-6.9.5.tar.gz/res/read_me/Qt_DAB-6.9.5.png -> qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/Qt_DAB-6.9.5.png Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/res/read_me/qt-dab-front-picture.png -> qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/qt-dab-front-picture.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/rsp-duocontrol.png Added

qt-dab-Qt-DAB-6.9.5.tar.gz/res/read_me/rtlsdr-control.png -> qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/rtlsdr-control.png Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/resources.qrc -> qt-dab-Qt-DAB-6.9.6.tar.gz/resources.qrc Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/data-processor.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/data-processor.cpp Changed

@@ -98,6 +98,7 @@
 	   
 	}
 	assembling	= false;
+	last_cntIdx	= 0;
 }
 
 	dataProcessor::~dataProcessor() {
@@ -136,7 +137,6 @@
 }
 
 void	dataProcessor::handlePacket (const uint8_t *vec) {
-static int expected_cntidx = 0;
 	uint8_t Length	= (getBits (vec, 0, 2) + 1) * 24;
 	if (!check_CRC_bits (vec, Length * 8)) {
 //	   fprintf (stderr, "crc fails %d\n", Length);
@@ -153,18 +153,28 @@
 //	Useful data length
 	const uint8_t udlen	= getBits (vec, 17,7); 
 //	fprintf (stderr, "udlen = %d\n", udlen);
-	if (udlen == 0)
+
+	if (paddr != packetAddress) 	// wrong address
 	   return;
 
-	if (paddr != packetAddress)
+	if (cntIdx == last_cntIdx)	// just wait for the next one
 	   return;
-	if (cntIdx != expected_cntidx) {
+
+	if (cntIdx != (last_cntIdx + 1) % 4) {
 //	   fprintf (stderr, "packet cntIdx %d expected %d address %d\n",
-//	                                cntIdx, expected_cntidx, paddr);
-	   expected_cntidx = 0;
-	   return;
+//	                                cntIdx, last_cntIdx, paddr);
+//	packet is OK, so try to process it
+//	which obviously  only makes sense if flflg == 2,
+	   assembling = false;
+	}
+
+	last_cntIdx = cntIdx;
+
+	if (udlen > Length - 5) {
+	   fprintf (stderr, "packet udlen %d is larger than max payload %d\n",
+	               udlen, Length - 5);
+	   assembling = false;
 	}
-	expected_cntidx = (cntIdx + 1) % 4;
 
 	switch (flflg) {
 	   case 2:  // First data group packet
@@ -177,7 +187,7 @@
 	   case 0:    // Intermediate data group packet
 	      if (assembling) {
 	         int currentLength = series. size ();
-	         if (currentLength + udlen * 8 > 4 * 8192) {
+	         if (currentLength + udlen * 8 > 8 * 8192) {
 	            assembling = false;
 //	            fprintf (stderr, "too large???\n");
 	            return;
@@ -191,7 +201,7 @@
 	   case 1:  // Last data group packet
 	      if (assembling) {
 	         int currentLength = series. size ();
-	         if (currentLength + udlen * 8 > 4 * 8192) {
+	         if (currentLength + udlen * 8 > 8 * 8192) {
 	            assembling = false;
 //	            fprintf (stderr, "too large???\n");
 	            return;
@@ -199,12 +209,13 @@
 	         series. resize (currentLength + udlen * 8);
 	         for (int i = 0; i < udlen * 8; i ++)
 	            series currentLength + i = vec 3 * 8 + i;
-	         assembling = false;
 //
 //	Note, we are sending the UNPROCESSED mscdatagroup to the
 //	appropriate handler
-	         my_dataHandler	-> add_mscDatagroup (series);
+	         if (series. size () > 0)
+	            my_dataHandler	-> add_mscDatagroup (series);
 	         series. resize (0);
+	         assembling = false;
 	      }
 	      return;
 
@@ -213,10 +224,12 @@
 	            series. resize (udlen * 8);
 	            for (uint8_t i = 0; i < udlen * 8; i ++)
 	               series i = vec 3 * 8 + i;
-	            my_dataHandler -> add_mscDatagroup (series);
+	            if (series. size () > 0)
+	               my_dataHandler -> add_mscDatagroup (series);
 	         }
 	         series. resize (0);
               }
+	      assembling = false;
 	      return;
 
 	      default:	// cannot happen

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/data-processor.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/data-processor.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/journaline-datahandler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/journaline-datahandler.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/journaline-screen.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/journaline-screen.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/journaline-screen.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/journaline-screen.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/journaline/NML.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/journaline/NML.cpp Changed

@@ -105,9 +105,6 @@
 {"illegal", "menu", "plain", "title", "list"};
 
 
-
-
-
 NMLFactory *NMLFactory::_instance = 0;
 
 NMLFactory::NMLFactory()
@@ -158,7 +155,6 @@
 }
 
 
-
 /// generate an invalid NML error object
 /// The title of the error message will be title, and the
 /// body will consist of a hex dump of the erroneous NML object.
@@ -429,10 +425,23 @@
         memcpy( uncompressed.nml, rno.nml, rno.nml_len );
     }
 
-    // check for title section
-    if( *p != 0x01 )
-    {
-        sprintf( error, "Error: expected NML Code 0x01, got 0x%02x", *p );
+	// we take the length of the datasection and add it
+	// to the current position in order to ignore it
+	while ((*p == 0x1a) || (*p == 0x1b)) {
+	   int dslen = p 1 + 1;
+	   len = len - dslen - 2;
+	   p += dslen + 2;
+	   if (len < 2) {
+	      sprintf (error, "Error: Datasection too long" );
+	      n -> SetErrorDump (n -> _news.object_id, uncompressed, error);
+	      return n;
+	   }
+	}
+
+
+//	check for title section
+	if (*p != 0x01 ) {
+	   sprintf( error, "Error: expected NML Code 0x01, got 0x%02x", *p );
         n->SetErrorDump( n->_news.object_id, uncompressed, error );
         return n;
     }

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/data/virtual-datahandler.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/virtual-datahandler.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/backend/msc-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/msc-handler.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/device-chooser.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/device-chooser.cpp Changed

@@ -31,9 +31,6 @@
 #ifdef	HAVE_RTLSDR_V3
 #include	"rtlsdr-handler-win.h"
 #define	RTLSDR_DEVICE_V3	0200
-#endif
-#ifdef	HAVE_RTLSDR_V4
-#include	"rtlsdr-handler-win.h"
 #define	RTLSDR_DEVICE_V4	0201
 #endif
 #ifdef	HAVE_RTLSDR
@@ -93,13 +90,17 @@
 #include	"spyserver-client-8.h"
 #define	SPYSERVER_DEVICE_8	0215
 #endif
+#ifdef		HAVE_DUO
+#include	"sdrplay-handler-duo.h"
+#define	DUO_DEVICE		0216
+#endif
 //#ifdef	HAVE_COLIBRI
 //#include	"colibri-handler.h"
-//#define	COLIBRI_DEVICE		0216
+//#define	COLIBRI_DEVICE		0217
 //#endif
 //#ifdef	HAVE_ELAD
 //#include	"elad-handler.h"
-//#define	ELAD_S1_DEVICE		0217
+//#define	ELAD_S1_DEVICE		0220
 //#endif
 
 #include	"xml-filereader.h"
@@ -151,7 +152,6 @@
 #ifdef	HAVE_RTLSDR_V3
 	deviceList. push_back (deviceItem ("dabstick-v3", RTLSDR_DEVICE_V3));
 	addtoList ("dabstick-v3");
-#elif	HAVE_RTLSDR_V4
 	deviceList. push_back (deviceItem ("dabstick-v4", RTLSDR_DEVICE_V4));
 	addtoList ("dabstick-v4");
 #endif
@@ -199,6 +199,10 @@
 	deviceList. push_back (deviceItem ("spyServer-8", SPYSERVER_DEVICE_8));
 	addtoList ("spyServer-8");
 #endif
+#ifdef	HAVE_DUO
+	deviceList. push_back (deviceItem ("duo", DUO_DEVICE));
+	addtoList ("duo");
+#endif
 }
 
 		deviceChooser::~deviceChooser	() {
@@ -251,16 +255,23 @@
 	                                                     theErrorLogger);
 	      break;
 #endif
-#ifdef	HAVE_RTLSDR_V3
-	   case RTLSDR_DEVICE_V3:
-	      return new rtlsdrHandler_win (dabSettings, version, 
+#ifdef	HAVE_DUO
+	   case DUO_DEVICE:
+	      return new sdrplayHandler_duo (dabSettings, version,
 	                                                     theErrorLogger);
 	      break;
 #endif
-#ifdef	HAVE_RTLSDR_V4
+#ifdef	HAVE_RTLSDR_V3
+	   case RTLSDR_DEVICE_V3:
+	      return new rtlsdrHandler_win (dabSettings,
+	                                   "librtlsdr-V3.dll",
+	                                    version, theErrorLogger);
+	      break;
+
 	   case RTLSDR_DEVICE_V4:
-	      return new rtlsdrHandler_win (dabSettings, version,
-	                                                     theErrorLogger);
+	      return new rtlsdrHandler_win (dabSettings,	
+	                                   "librtlsdr-V4.dll",
+	                                   version, theErrorLogger);
 	      break;
 #endif
 #ifdef	HAVE_RTLSDR

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-handler.cpp Changed

@@ -36,13 +36,6 @@
 #include	"errorlog.h"
 #include	"settings-handler.h"
 
-//#define	CORRF	0.005
-//#ifdef	__MINGW32__
-//#define	GETPROCADDRESS	GetProcAddress
-//#else
-//#define	GETPROCADDRESS	dlsym
-//#endif
-
 //
 //	Our wrapper is a simple classs
 	rtlsdrHandler::rtlsdrHandler (QSettings *s,
@@ -121,6 +114,20 @@
 	QString tunerType	= get_tunerType (rtlsdr_get_tuner_type (theDevice));
 	product_display	-> setText (tunerType);
 
+	if (rtlsdr_get_version != nullptr) {
+	   uint32_t V = rtlsdr_get_version ();
+	   uint16_t major	= V >> 24;
+	   uint16_t minor	= (V & 0XFF0000) >> 16;
+	   uint8_t micro	= (V & 0xFF00) >> 8;
+	   uint8_t nano		= (V & 0XFF);
+	   libVersion	-> setText ("Library " + QString::number (major) + 
+	                            ":" + QString::number (minor) +
+	                            "-" + QString::number (micro) +
+	                            ":" + QString::number (nano));;
+	}
+	else
+	   libVersion	-> setText ("No lib version known");
+
 	r = rtlsdr_set_sample_rate (theDevice, SAMPLERATE);
 	if (r < 0) {
 	   delete phandle;
@@ -139,17 +146,12 @@
 	}
 
 	if (rtlsdr_set_tuner_bandwidth != nullptr) {
-	   r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (1575));
+	   r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (1750));
 	   if (r != 0) {
-	      QString t = QString ("cannot set frequency to  1575 KHz");
+	      QString t = QString ("cannot set frequency to  1750 KHz");
 	      theErrorLogger -> add ("RTLSDR", t);
 	   }
 	}
-	r = rtlsdr_set_tuner_gain_mode (theDevice, 1);
-	if (r != 0) {
-	   QString t = QString ("cannot set gainmode to 1");
-	   theErrorLogger -> add ("RTLSDR", t);
-	}
 //
 //	See what the saved values are and restore the GUI settings
 	temp =  value_s (rtlsdrSettings, "rtlsdrSettings",
@@ -157,10 +159,10 @@
 	k	= gainControl -> findText (temp);
 	gainControl	-> setCurrentIndex (k != -1 ? k : gainsCount / 2);
 
-	temp		= value_s (rtlsdrSettings, "rtlsdrSettings",
-	                                        "autogain", "autogain_on");
-	agcControl	-> setChecked (temp == "autogain_on");
-	
+	int agc	= value_i (rtlsdrSettings, "rtlsdrSettings",
+	                             "agcMode", 1);
+	init_autogain (agc);
+
 	ppm_correction	->  
 	     setValue (value_i (rtlsdrSettings, "rtlsdrSettings",
 	                                 "ppm_correction", 0));
@@ -181,10 +183,6 @@
 
 //	all sliders/values are set to previous values, now do the settings
 //	based on these slider values
-	if (agcControl -> isChecked ())
-	   rtlsdr_set_agc_mode (theDevice, 1);
-	else
-	   rtlsdr_set_agc_mode (theDevice, 0);
 
 	res = rtlsdr_set_tuner_gain	(theDevice, 
 	                         gainControl -> currentText (). toInt ());
@@ -193,7 +191,7 @@
 	                                         gainControl -> currentText ();
 	   theErrorLogger -> add ("RTLSDR", t);
 	}
-	set_ppmCorrection	(ppm_correction -> value());
+	set_ppmCorrection	(ppm_correction -> value ());
 
 	for (int i = 0; i < 256; i ++)
 	   convTable i = (i - 127.38) / 128.0;
@@ -206,14 +204,15 @@
 	         qOverload<const QString &>(&QComboBox::activated),
 #endif
 	         this, &rtlsdrHandler::set_ExternalGain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (agcControl, &QCheckBox::checkStateChanged,
-#else
-	connect (agcControl, &QCheckBox::stateChanged,
-#endif
-	         this, &rtlsdrHandler::set_autogain);
-	connect (ppm_correction, qOverload<int>(&QSpinBox::valueChanged),
+	
+	connect (ppm_correction, qOverload<double>(&QDoubleSpinBox::valueChanged),
 	         this, &rtlsdrHandler::set_ppmCorrection);
+	connect (agc_hw, &QRadioButton::toggled,
+	         this, &rtlsdrHandler::set_hw_agc);
+	connect (agc_sw, &QRadioButton::toggled,
+	         this, &rtlsdrHandler::set_sw_agc);
+	connect (agc_off, &QRadioButton::toggled,
+	         this, &rtlsdrHandler::set_off_agc);
 	connect (xml_dumpButton, &QPushButton::clicked,
 	         this, &rtlsdrHandler::set_xmlDump);
 	connect (iq_dumpButton, &QPushButton::clicked,
@@ -234,11 +233,11 @@
 //	and for saving/restoring the gain setting:
 	connect (this, &rtlsdrHandler::new_gainIndex,
 	         gainControl, &QComboBox::setCurrentIndex);
-	connect (this, &rtlsdrHandler::new_agcSetting,
-	         agcControl, &QCheckBox::setChecked);
 	iqDumper	= nullptr;
 	iq_dumping. store (false);
 	xml_dumping. store (false);
+	xmlWriter. reset ();
+	workerHandle. reset ();
 }
 
 	rtlsdrHandler::~rtlsdrHandler () {
@@ -252,12 +251,14 @@
 	}
 	storeWidgetPosition (rtlsdrSettings, &myFrame, "rtlsdrSettings");
 	QString gainText	= gainControl -> currentText ();
-	store (rtlsdrSettings, "er;sdrSettings",
-	                       "externalGain", gainText);
 	store (rtlsdrSettings, "rtlsdrSettings",
-	                   "autogain", agcControl -> isChecked () ? 1 : 0);
+	                       "externalGain", gainText);
+	int     agc     = agc_off -> isChecked () ? 1 :
+                                  agc_sw  -> isChecked () ? 2 : 0;
+	store (rtlsdrSettings, "rtlsdrSettings", "agcMode", agc);
+
 	store (rtlsdrSettings, "rtlsdrSettings",
-	                    "ppm_correction", ppm_correction -> value());
+	                       "ppm_correction", ppm_correction -> value());
 	store (rtlsdrSettings, "rtlsdrSettings",
 	                    "filterDepth", filterDepth -> value ());
 	rtlsdrSettings	-> sync ();
@@ -288,7 +289,7 @@
 
 	lastFrequency	= freq;
 	this -> toSkip = skipped;
-	set_autogain (agcControl -> isChecked ());
+	tunedFrequency -> setText (QString::number (freq / 1000) + "kHz");
 	set_ExternalGain (gainControl -> currentText ());
 	if (workerHandle. isNull ()) {
 //	reset endpoint
@@ -312,8 +313,6 @@
             _I_Buffer.FlushRingBuffer ();
             workerHandle. reset ();
         }
-        close_xmlDump();
-
 	close_xmlDump ();
 	if (save_gainSettings)
 	   record_gainSettings	((int32_t)(this -> rtlsdr_get_center_freq (theDevice)) / MHz (1));
@@ -329,23 +328,40 @@
 	}
 }
 //
-void	rtlsdrHandler::set_autogain	(int dummy) {
-	(void)dummy;
-	int res = rtlsdr_set_agc_mode (theDevice,
-	                              agcControl -> isChecked () ? 1 : 0);
-	if (res != 0) {
-	   QString t = QString ("Cannot set agc mode to ") +
-	                            (agcControl -> isChecked () ? "1" : "0");
-	   theErrorLogger -> add ("RTLSDR", t);
-	   return;
-	}
-	res = rtlsdr_set_tuner_gain (theDevice, 
-	                       gainControl -> currentText (). toInt ());
-	if (res != 0) {
-	   QString t = QString ("Cannot set tuner gain to ") +
-	                           gainControl -> currentText ();
-	   theErrorLogger -> add ("RTLSDR", t);
+void	rtlsdrHandler::init_autogain	(int level) {
+	if (level == 1)
+	   agc_off	-> setChecked (true);
+	else
+	if (level == 2)
+	   agc_sw	-> setChecked (true);
+	else	// level == 0
+	   agc_hw	-> setChecked (true);
+
+	set_autogain (level);
+}
+
+
+void	rtlsdrHandler::set_hw_agc	() {
+	set_autogain (0);
+}
+
+void	rtlsdrHandler::set_sw_agc	() {
+	set_autogain (2);
+}
+
+void	rtlsdrHandler::set_off_agc	() {
+	set_autogain (1);
+}
+
+void	rtlsdrHandler::set_autogain (int level) {
+	rtlsdr_set_agc_mode (theDevice, level == 0);
+	rtlsdr_set_tuner_gain_mode (theDevice, level);
+	if (level == 1) {
+	   gainControl -> setEnabled (true);
+	   set_ExternalGain (gainControl -> currentText ());
 	}
+	else
+	   gainControl -> setEnabled (false);
 }
 //
 void	rtlsdrHandler::set_biasControl	(int dummy) {
@@ -361,8 +377,12 @@
 	}
 }
 //	correction is in Hz
-void	rtlsdrHandler::set_ppmCorrection	(int32_t ppm) {
-	int res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
+void	rtlsdrHandler::set_ppmCorrection	(double ppm) {
+int res;
+	if (rtlsdr_set_freq_correction_ppb != nullptr) 
+	   res = this -> rtlsdr_set_freq_correction_ppb (theDevice, ppm * 1000);
+	else
+	   res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
 	if (res != 0) {
 	   QString t = QString ("Cannot set ppm to ") +
 	                                    QString::number (ppm);
@@ -382,7 +402,6 @@
 	return _I_Buffer. GetRingBufferReadAvailable ();
 }
 //
-
 bool	rtlsdrHandler::load_rtlFunctions() {
 //
 //	link the required procedures
@@ -533,7 +552,7 @@
 	   fprintf (stderr, "Could not find rtlsdr_set_freq_correction\n");
 	   return false;
 	}
-	
+
 	rtlsdr_get_device_name =
 	           (pfnrtlsdr_get_device_name)
 	               phandle -> resolve ("rtlsdr_get_device_name");
@@ -557,6 +576,16 @@
 	   fprintf (stderr, "biasControl will not work\n");
 //	nullpointer - if function is not available - is handled
 //
+//	Optional function, null pointer is handled
+	rtlsdr_set_freq_correction_ppb =
+	           (pfnrtlsdr_set_freq_correction_ppb)
+	               phandle -> resolve ("rtlsdr_set_freq_correction_ppb");
+
+//	Optional function, null pointer is handled
+	rtlsdr_get_version =
+	           (pfnrtlsdr_get_version)
+	               phandle -> resolve ("rtlsdr_get_version");
+
 	fprintf (stderr, "OK, functions seem to be loaded\n");
 	return true;
 }
@@ -680,8 +709,9 @@
 //
 void    rtlsdrHandler::record_gainSettings (int freq) {
 QString	gain	= gainControl	-> currentText ();
-int	agc	= agcControl	-> isChecked () ? 1 : 0;
-QString theValue        = gain + ":" + QString::number (agc);
+int	agc	= agc_off -> isChecked () ? 1 :
+	          agc_sw  -> isChecked () ? 2 : 0;
+QString theValue	= gain + ":" + QString::number (agc);
 QString freqVal		= QString::number (freq);
 	store (rtlsdrSettings, "rtlsdrSettings", freqVal, theValue);
 }
@@ -705,19 +735,28 @@
 
 	int k	= gainControl -> findText (temp);
 	if (k != -1) {
-	   gainControl	-> blockSignals (true);
+	   gainControl	-> setEnabled (false);
 	   new_gainIndex (k);
 	   while (gainControl -> currentText () != temp)
 	      usleep (1000);
-	   gainControl	-> blockSignals (false);
 	}
-
-	agcControl	-> blockSignals (true);
-	new_agcSetting (agc == 1);
-	while (agcControl -> isChecked () != (agc == 1))
-	   usleep (1000);
-	set_autogain (agcControl -> isChecked ());
-	agcControl	-> blockSignals (false);
+	if (agc == 1) {
+	   gainControl -> setEnabled (true);
+	   agc_off	-> setEnabled (false);
+	   agc_off	-> setChecked (true);
+	   agc_off	-> setEnabled (true);
+	}
+	else
+	if (agc == 0) {
+	   agc_hw	-> setEnabled (false);
+	   agc_hw	-> setChecked (true);
+	   agc_hw	-> setEnabled (true);
+	}
+	else {	// agc == 2
+	   agc_sw	-> setEnabled (false);
+	   agc_sw	-> setChecked (true);
+	   agc_sw	-> setEnabled (true);
+	}
 }
 
 #define	IQ_BUFSIZE	4096

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-handler.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-handler.h Changed

@@ -74,7 +74,9 @@
 typedef int (*  pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
 typedef uint32_t (*  pfnrtlsdr_get_device_count)();
 typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_freq_correction_ppb)(rtlsdr_dev_t *, int);
 typedef	char *(* pfnrtlsdr_get_device_name)(int);
+typedef	int (* pfnrtlsdr_get_version)();
 }
 //	This class is a simple wrapper around the
 //	rtlsdr library, the relevant functions of it
@@ -134,6 +136,10 @@
 	LowPassFIR	theFilter;
 	int		currentDepth;
 
+	void		set_off_agc	();
+	void		set_hw_agc	();
+	void		set_sw_agc	();
+	void		init_autogain	(int);
 	float		convTable	256;
 	void		reportOverflow		(bool);
 	float		m_dcI;
@@ -161,7 +167,9 @@
 	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
 	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
 	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_set_freq_correction_ppb rtlsdr_set_freq_correction_ppb;
 	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+	pfnrtlsdr_get_version rtlsdr_get_version;
 	
 signals:
 	void		new_gainIndex		(int);
@@ -169,7 +177,7 @@
 private slots:
 	void		set_ExternalGain	(const QString &);
 	void		set_autogain		(int);
-	void		set_ppmCorrection	(int);
+	void		set_ppmCorrection	(double);
 	void		set_xmlDump		();
 	void		set_iqDump		();
 	void		set_filter		(int);

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>242</width>
-    <height>345</height>
+    <width>240</width>
+    <height>445</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,29 +15,25 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <widget class="QLabel" name="tunedFrequency">
+     <property name="frameShape">
+      <enum>QFrame::Shape::Panel</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="label_4">
+      <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>ppm</string>
+        <string>gain</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QSpinBox" name="ppm_correction">
-       <property name="minimum">
-        <number>-500</number>
-       </property>
-       <property name="maximum">
-        <number>500</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
       <widget class="QComboBox" name="gainControl">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
@@ -53,35 +49,39 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>gain</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
-      <widget class="QCheckBox" name="agcControl">
+      <widget class="QLabel" name="label">
        <property name="text">
-        <string>autogain</string>
+        <string>AGC</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="filterSelector">
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DABsticks do not have much filtering. A software filter - 1560KHz wide - can be selected&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <widget class="QRadioButton" name="agc_hw">
+       <property name="text">
+        <string>HW</string>
        </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="agc_sw">
        <property name="text">
-        <string>filter</string>
+        <string>SW</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="agc_off">
+       <property name="text">
+        <string>Off</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
       <widget class="QCheckBox" name="biasControl">
        <property name="text">
@@ -90,38 +90,77 @@
       </widget>
      </item>
      <item>
-      <widget class="QSpinBox" name="filterDepth">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="QCheckBox" name="filterSelector">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DABsticks do not have much filtering. A software filter - 1560KHz wide - can be selected&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>filter</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="filterDepth">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;select the depth of the software 1560 KHz filter. Be aware that for a filter depth N N* 2048000 extra additions and complex multiplications are done&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="minimum">
+          <number>5</number>
+         </property>
+         <property name="maximum">
+          <number>25</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>ppm</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDoubleSpinBox" name="ppm_correction"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Dump </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="xml_dumpButton">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;select the depth of the software 1560 KHz filter. Be aware that for a filter depth N N* 2048000 extra additions and complex multiplications are done&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
-       <property name="minimum">
-        <number>5</number>
+       <property name="text">
+        <string>xml</string>
        </property>
-       <property name="maximum">
-        <number>25</number>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="iq_dumpButton">
+       <property name="text">
+        <string>raw </string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QPushButton" name="xml_dumpButton">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>dump to xml file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="iq_dumpButton">
-     <property name="text">
-      <string>dump to raw file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <widget class="QLabel" name="overflowLabel">
      <property name="text">
       <string/>
@@ -131,7 +170,7 @@
    <item>
     <widget class="QLabel" name="product_display">
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::Shape::Box</enum>
      </property>
      <property name="text">
       <string/>
@@ -144,7 +183,17 @@
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::Shape::Box</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="libVersion">
+     <property name="frameShape">
+      <enum>QFrame::Shape::Box</enum>
      </property>
      <property name="text">
       <string/>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtl-dongleselect.cpp Added

@@ -0,0 +1,64 @@
+#
+/*
+ *    Copyright (C) 2013 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	"rtl-dongleselect.h"
+#include	<cstdio>
+#include	<QVBoxLayout>
+//
+//	Whenever there are two or more RT2832 based sticks connected
+//	to the computer, the user is asked to make a choice.
+
+	rtl_dongleSelect::rtl_dongleSelect() {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select a dongle");
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("dongle select"));
+	setLayout (layOut);
+
+	dongleList. setStringList (Dongles);
+	Dongles = QStringList();
+	dongleList. setStringList (Dongles);
+	selectorDisplay	-> setModel (&dongleList);
+	connect (selectorDisplay, &QListView::clicked,
+	         this, &rtl_dongleSelect::selectDongle);
+	selectedItem	= -1;
+}
+
+	rtl_dongleSelect::~rtl_dongleSelect() {
+}
+
+void	rtl_dongleSelect::addtoDongleList (const char *v) {
+QString s (v);
+
+	Dongles << s;
+	dongleList. setStringList (Dongles);
+	selectorDisplay	-> setModel (&dongleList);
+	selectorDisplay	-> adjustSize();
+	adjustSize();
+}
+
+void	rtl_dongleSelect::selectDongle (QModelIndex s) {
+	QDialog::done (s. row());
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtl-dongleselect.h Added

@@ -0,0 +1,51 @@
+#
+/*
+ *    Copyright (C) 2013 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#
+#ifndef	__DONGLE_SELECT__
+#define	__DONGLE_SELECT__
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<cstdint>
+
+class	rtl_dongleSelect: public QDialog {
+Q_OBJECT
+public:
+			rtl_dongleSelect();
+			~rtl_dongleSelect();
+	void		addtoDongleList		(const char *);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel	dongleList;
+	QStringList	Dongles;
+	int16_t		selectedItem;
+private slots:
+	void		selectDongle	(QModelIndex);
+};
+
+#endif
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtl-sdr_export.h Added

@@ -0,0 +1,47 @@
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012 by Hoernchen <la@tfc-server.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RTLSDR_EXPORT_H
+#define RTLSDR_EXPORT_H
+
+#if defined __GNUC__
+#  if __GNUC__ >= 4
+#    define __SDR_EXPORT   __attribute__((visibility("default")))
+#    define __SDR_IMPORT   __attribute__((visibility("default")))
+#  else
+#    define __SDR_EXPORT
+#    define __SDR_IMPORT
+#  endif
+#elif _MSC_VER
+#  define __SDR_EXPORT     __declspec(dllexport)
+#  define __SDR_IMPORT     __declspec(dllimport)
+#else
+#  define __SDR_EXPORT
+#  define __SDR_IMPORT
+#endif
+
+#ifndef rtlsdr_STATIC
+#	ifdef rtlsdr_EXPORTS
+#	define RTLSDR_API __SDR_EXPORT
+#	else
+#	define RTLSDR_API __SDR_IMPORT
+#	endif
+#else
+#define RTLSDR_API
+#endif
+#endif /* RTLSDR_EXPORT_H */

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C) 201 .. 2024
+ *    Copyright (C) 2014 .. 2025
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -17,22 +17,28 @@
  *    GNU General Public License for more details.
  *
  *    You should have received a copy of the GNU General Public License
- *    along with Qt-DAB; if not, write to the Free Software
+ *    along with Qt-SDR; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * 	This particular driver is a very simple wrapper around the
+ * 	librtlsdr.  In order to keep things simple, we dynamically
+ * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
+ * 	are greatly acknowledged
  */
 
 #include	<QThread>
+#include	"dab-constants.h"
 #include	"rtlsdr-handler-win.h"
-#include	"rtl-dongleselect.h"
 #include	"position-handler.h"
+#include	"rtl-dongleselect.h"
 #include	"rtl-sdr.h"
-#include	"xml-filewriter.h"
 #include	"device-exceptions.h"
 #include	"errorlog.h"
 #include	"settings-handler.h"
 
-#define	CORRF		0.005
 #define	READLEN_DEFAULT	(4 * 8192)
+
+static clock_t time1	= 0;
 //
 //	For the callback, we do need some environment which
 //	is passed through the ctx parameter
@@ -56,69 +62,77 @@
 //	for handling the events in libusb, we need a controlthread
 //	whose sole purpose is to process the rtlsdr_read_async function
 //	from the lib.
-class	dll_driver_win : public QThread {
+class	dll_driver: public QThread {
 private:
 	rtlsdrHandler_win	*theStick;
 public:
 
-	dll_driver_win (rtlsdrHandler_win *d) {
+	dll_driver (rtlsdrHandler_win *d) {
 	theStick	= d;
 	start		();
 }
 
-	~dll_driver_win	() {
+	~dll_driver	() {
 }
 
 private:
 void	run () {
-	rtlsdr_read_async (theStick -> theDevice,
+	theStick -> rtlsdr_read_async (theStick -> theDevice,
 	                   (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
 	                   (void *)theStick,
 	                   0,
 	                   READLEN_DEFAULT);
-	fprintf (stderr, "dll_task terminates\n");
+//	fprintf (stderr, "dll_task terminates\n");
 	}
 };
-//
+
 //	Our wrapper is a simple classs
-//
-//	The Windows implementation differs from the Linux one. It
-//	turns out that windows has some (well, a lot) problems with
-//	enthousiastic killing and restarting the usb-interfacing thread
-//	So, here we have the solution that the support thread remains
-//	active during stop/restart sequences
 	rtlsdrHandler_win::rtlsdrHandler_win (QSettings *s,
-	                                      const QString &recorderVersion,
-	                                      errorLogger *theLogger):
+	                                    const QString libraryString,
+	                                    const QString &recorderVersion,
+	                                    errorLogger	*theLogger):
 	                                 _I_Buffer (8 * 1024 * 1024),
-	                                 theFilter (5, 1560000 / 2, 2048000) {
+	                                 theFilter (5, 1560000 / 2, SAMPLERATE) {
 int16_t	deviceCount;
 int32_t	r;
 int16_t	deviceIndex;
 QString	temp;
 int	k;
 char	manufac 256, product 256, serial 256;
+
+	this	-> libraryString	= libraryString;
 	rtlsdrSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
 	this	-> theErrorLogger	= theLogger;
-        setupUi (&myFrame);
+	(void)theLogger;
+	setupUi (&myFrame);
 //	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
-	myFrame. show();
+	myFrame. show ();
 	filtering			= false;
 
 	currentDepth	=  value_i (rtlsdrSettings, "rtlsdrSettings",
-	                                                 "filterDepth", 5);
+	                                               "filterDepth", 5);
 	filterDepth	-> setValue (currentDepth);
 	theFilter. resize (currentDepth);
 
-	inputRate		= 2048000;
-	workerHandle		= nullptr;
 	isActive. store (false);
+	phandle = new QLibrary (libraryString);
+	phandle -> load ();
+
+	if (!phandle -> isLoaded ()) {
+	   throw (device_exception (std::string ("failed to open ") + libraryString. toStdString ()));
+	}
+
+	if (!load_rtlFunctions ()) {
+	   delete (phandle);
+	   throw (device_exception ("could not load one or more library functions"));
+	}
 
 //	Ok, from here we have the library functions accessible
-	deviceCount 		= rtlsdr_get_device_count ();
+	deviceCount 		= this -> rtlsdr_get_device_count ();
 	if (deviceCount == 0) {
-	   throw (device_exception ("No device found\n"));
+	   delete (phandle);
+	   throw (device_exception ("No rtlsdr device found"));
 	}
 
 	deviceIndex = 0;	// default
@@ -132,19 +146,33 @@
 	}
 //
 //	OK, now open the hardware
-	r		=  rtlsdr_open (&theDevice, deviceIndex);
+	r		= this -> rtlsdr_open (&theDevice, deviceIndex);
 	if (r < 0) {
+	   delete phandle;
 	   throw (device_exception ("Opening rtlsdr device failed"));
 	}
 
-	deviceModel	= rtlsdr_get_device_name (deviceIndex);
-	deviceVersion	-> setText (deviceModel);
-	QString	tunerType	= get_tunerType (rtlsdr_get_tuner_type (theDevice));
-	product_display	-> setText (tunerType);
 
-	r		= rtlsdr_set_sample_rate (theDevice, inputRate);
+	if (rtlsdr_get_version != nullptr) {
+           uint32_t V = rtlsdr_get_version ();
+           uint16_t major       = V >> 24;
+           uint16_t minor       = (V & 0XFF0000) >> 16;
+           uint8_t micro        = (V & 0xFF00) >> 8;
+           uint8_t nano         = (V & 0XFF);
+	   libVersion   -> setText (QString ("Library ") +
+	                            QString::number (major) +
+                                    ":" + QString::number (minor) +
+                                    "-" + QString::number (micro) +
+                                    ":" + QString::number (nano) +
+	                            ":" + libraryString);
+        }
+        else
+	   libVersion	-> setText (libraryString);
+
+	r = rtlsdr_set_sample_rate (theDevice, SAMPLERATE);
 	if (r < 0) {
-	   throw (device_exception ("Setting samplerate failed\n"));
+	   delete phandle;
+	   throw (device_exception ("Setting samplerate for rtlsdr failed"));
 	}
 
 	gainsCount = rtlsdr_get_tuner_gains (theDevice, nullptr);
@@ -158,26 +186,42 @@
 	   fprintf (stderr, "\n");
 	}
 
-	rtlsdr_set_center_freq (theDevice, 220000000);
-	rtlsdr_set_tuner_bandwidth (theDevice, KHz (1575));
-	rtlsdr_set_tuner_gain_mode (theDevice, 1);
+	QString tunerType	= get_tunerType (rtlsdr_get_tuner_type (theDevice));
+	deviceModel	= rtlsdr_get_device_name (deviceIndex);
+	deviceVersion	-> setText (deviceModel);
+	product_display	-> setText (tunerType);
+
+	if (rtlsdr_set_tuner_bandwidth != nullptr) {
+	   r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (17500));
+	   if (r != 0) {
+	      QString t = QString ("cannot set frequency to 17500 KHz");
+	      theErrorLogger -> add ("RTLSDR", t);
+	   }
+	}
 //
 //	See what the saved values are and restore the GUI settings
-	temp	= value_s (rtlsdrSettings, "rtlsdrSettings",
-	                                   "externalGain", "10");
+	temp =  value_s (rtlsdrSettings, "rtlsdrSettings",
+	                              "externalGain", "10");
 	k	= gainControl -> findText (temp);
 	gainControl	-> setCurrentIndex (k != -1 ? k : gainsCount / 2);
 
-	temp		= value_s (rtlsdrSettings, "rtlsdrSettings",
-	                                      "autogain", "autogain_on");
-	agcControl	-> setChecked (temp == "autogain_on");
+	int agc = value_i (rtlsdrSettings, "rtlsdrSettings",
+                                     "agcMode", 1);
+        init_autogain (agc);
 	
-	ppm_correction	->
+	ppm_correction	->  
 	     setValue (value_i (rtlsdrSettings, "rtlsdrSettings",
-	                                               "ppm_correction", 0));
+	                                 "ppm_correction", 0));
 	save_gainSettings	=
 	     value_i (rtlsdrSettings, "rtlsdrSettings",
-	                               "save_gainSettings", 1) != 0;
+	                             "save_gainSettings", 1) != 0;
+
+	int res = this -> rtlsdr_set_center_freq (theDevice, 220000000);
+	if (res != 0) {
+	   QString t = QString ("cannot set frequency to ") +
+	                                   QString::number (220000000);
+	   theErrorLogger -> add ("RTLSDR", t);
+	}
 
 	rtlsdr_get_usb_strings (theDevice, manufac, product, serial);
 	fprintf (stderr, "%s %s %s\n",
@@ -185,33 +229,35 @@
 
 //	all sliders/values are set to previous values, now do the settings
 //	based on these slider values
-	if (agcControl -> isChecked ())
-	   rtlsdr_set_agc_mode (theDevice, 1);
-	else
-	   rtlsdr_set_agc_mode (theDevice, 0);
-	rtlsdr_set_tuner_gain	(theDevice, 
+
+	res = rtlsdr_set_tuner_gain	(theDevice, 
 	                         gainControl -> currentText (). toInt ());
+	if (res != 0) {
+	   QString t = QString ("cannot set tuner gain to ") +
+	                                         gainControl -> currentText ();
+	   theErrorLogger -> add ("RTLSDR", t);
+	}
 	set_ppmCorrection	(ppm_correction -> value());
 
 	for (int i = 0; i < 256; i ++)
-	   convTable i = ((float)i - 127.38) / 128.0;
+	   convTable i = (i - 127.38) / 128.0;
 
 //	and attach the buttons/sliders to the actions
 	connect (gainControl,
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
 	         qOverload<const QString &>(&QComboBox::textActivated),
 #else
 	         qOverload<const QString &>(&QComboBox::activated),
 #endif
 	         this, &rtlsdrHandler_win::set_ExternalGain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (agcControl, &QCheckBox::checkStateChanged,
-#else
-	connect (agcControl, &QCheckBox::stateChanged,
-#endif
-	         this, &rtlsdrHandler_win::set_autogain);
-	connect (ppm_correction, qOverload<int>(&QSpinBox::valueChanged),
+	connect (ppm_correction, qOverload<double>(&QDoubleSpinBox::valueChanged),
 	         this, &rtlsdrHandler_win::set_ppmCorrection);
+	connect (agc_hw, &QRadioButton::toggled,
+                 this, &rtlsdrHandler_win::set_hw_agc);
+        connect (agc_sw, &QRadioButton::toggled,
+                 this, &rtlsdrHandler_win::set_sw_agc);
+        connect (agc_off, &QRadioButton::toggled,
+                 this, &rtlsdrHandler_win::set_off_agc);
 	connect (xml_dumpButton, &QPushButton::clicked,
 	         this, &rtlsdrHandler_win::set_xmlDump);
 	connect (iq_dumpButton, &QPushButton::clicked,
@@ -232,40 +278,48 @@
 //	and for saving/restoring the gain setting:
 	connect (this, &rtlsdrHandler_win::new_gainIndex,
 	         gainControl, &QComboBox::setCurrentIndex);
-	connect (this, &rtlsdrHandler_win::new_agcSetting,
-	         agcControl, &QCheckBox::setChecked);
 	iqDumper	= nullptr;
 	xmlWriter	= nullptr;
 	iq_dumping. store (false);
 	xml_dumping. store (false);
+	workerHandle	= nullptr;
 }
 
-	rtlsdrHandler_win::~rtlsdrHandler_win	() {
+	rtlsdrHandler_win::~rtlsdrHandler_win () {
 	stopReader	();
+
 	if (workerHandle != nullptr) {
 	   rtlsdr_cancel_async (theDevice);
-	   while (!workerHandle -> isFinished()) 
+	   while (!workerHandle -> isFinished ())
 	      usleep (200);
-	   _I_Buffer. FlushRingBuffer();
-	   delete	workerHandle;
-	   workerHandle	= nullptr;
-//	   rtlsdr_close (theDevice);	// will crash if activated
-	}
+	    _I_Buffer. FlushRingBuffer();
+           delete       workerHandle;
+           workerHandle = nullptr;
+//         rtlsdr_close (theDevice);    // will crash if activated
+        }
 
-	QString gainText	= gainControl -> currentText ();
 	storeWidgetPosition (rtlsdrSettings, &myFrame, "rtlsdrSettings");
+	QString gainText	= gainControl -> currentText ();
 	store (rtlsdrSettings, "rtlsdrSettings",
-	                "externalGain", gainText);
+	                       "externalGain", gainText);
+	int     agc     = agc_off -> isChecked () ? 1 :
+                                  agc_sw  -> isChecked () ? 2 : 0;
+        store (rtlsdrSettings, "rtlsdrSettings", "agcMode", agc);
 	store (rtlsdrSettings, "rtlsdrSettings",
-	                "autogain", agcControl -> isChecked () ? 1 : 0);
+	                    "ppm_correction", ppm_correction -> value());
 	store (rtlsdrSettings, "rtlsdrSettings",
-	                "ppm_correction", ppm_correction -> value());
-	store (rtlsdrSettings, "rtlsdrSettings", 
-	                "filterDepth", filterDepth -> value ());
+	                    "filterDepth", filterDepth -> value ());
 	rtlsdrSettings	-> sync ();
-	usleep (1000);
+	if (xmlWriter != nullptr) {
+	   delete xmlWriter;
+	   xmlWriter = nullptr;
+	}
 	myFrame. hide ();
+	usleep (1000);
+	rtlsdr_close (theDevice);
+	delete phandle;
 }
+
 //
 void	rtlsdrHandler_win::set_filter	(int c) {
 	(void)c;
@@ -273,75 +327,107 @@
 }
 
 bool	rtlsdrHandler_win::restartReader	(int32_t freq, int skipped) {
-	_I_Buffer. FlushRingBuffer();
+	int res =  this -> rtlsdr_set_center_freq (theDevice, freq);
+	if (res != 0) {
+           QString t = QString ("Cannot set frequency to ") +
+                                            QString::number (freq);
+           theErrorLogger -> add ("RTLSDR", t);
+           return false;
+        }
 
-	(void)(rtlsdr_set_center_freq (theDevice, freq));
 	if (save_gainSettings)
 	   update_gainSettings (freq / MHz (1));
 
 	lastFrequency	= freq;
-	this	-> toSkip	= skipped;
-	set_autogain (agcControl -> isChecked ());
+	this -> toSkip = skipped;
 	set_ExternalGain (gainControl -> currentText ());
-	if (workerHandle == nullptr) {
-	   (void)rtlsdr_reset_buffer (theDevice);
-	   workerHandle	= new dll_driver_win (this);
+	tunedFrequency	-> setText (QString::number(freq / KHz (1)) + " kHz");
+	if (workerHandle == nullptr) {	// usualy it will be non zero
+//	reset endpoint
+	   (void)this -> rtlsdr_reset_buffer (theDevice);
+	   workerHandle	= new dll_driver (this);
 	}
+	_I_Buffer. FlushRingBuffer ();
 	isActive. store (true);
 	return true;
 }
 
 void	rtlsdrHandler_win::stopReader () {
 	isActive. store (false);
-	_I_Buffer. FlushRingBuffer();
-	close_xmlDump ();
+         _I_Buffer.FlushRingBuffer ();
+        close_xmlDump();
 	if (save_gainSettings)
-	   record_gainSettings	((int32_t)(rtlsdr_get_center_freq (theDevice)) / MHz (1));
+	   record_gainSettings	((int32_t)(this -> rtlsdr_get_center_freq (theDevice)) / MHz (1));
 }
 //
 //	when selecting  the gain from a table, use the table value
 void	rtlsdrHandler_win::set_ExternalGain	(const QString &gain) {
 	int res = rtlsdr_set_tuner_gain (theDevice, gain. toInt());
-	if (res != 0) { 
-	   QString t = QString ("cannot set gain to ") + gain;
-	   theErrorLogger -> add ("RTLSDR", t);	
-	}
-}
-//
-void	rtlsdrHandler_win::set_autogain	(int dummy) {
-	(void)dummy;
-	int res = rtlsdr_set_agc_mode (theDevice,
-	                               agcControl -> isChecked () ? 1 : 0);
 	if (res != 0) {
-	   QString t = "Problem with agcControl to " +
-	                 QString::number (agcControl -> isChecked () ? 1 : 0);
+	   QString t = QString ("Cannot set gain to ") +
+	                                    QString::number (gain. toInt ());
 	   theErrorLogger -> add ("RTLSDR", t);
 	}
-	res = rtlsdr_set_tuner_gain (theDevice, 
-	                       gainControl -> currentText (). toInt ());
-	if (res != 0) {
-	   QString t = "Problem with gaincontrol to " +
-	                 QString::number (agcControl -> isChecked () ? 1 : 0);
-	   theErrorLogger -> add ("RTLSDR", t);
+}
+//
+void	rtlsdrHandler_win::init_autogain	(int level) {
+	if (level == 1)
+           agc_off      -> setChecked (true);
+        else
+        if (level == 2)
+           agc_sw       -> setChecked (true);
+        else    // level == 0
+           agc_hw       -> setChecked (true);
+
+        set_autogain (level);
+}
+
+void	rtlsdrHandler_win::set_hw_agc	() {
+	set_autogain (0);
+}
+
+void	rtlsdrHandler_win::set_sw_agc	() {
+	set_autogain (2);
+}
+
+void	rtlsdrHandler_win::set_off_agc	() {
+	set_autogain (1);
+}
+
+void	rtlsdrHandler_win::set_autogain (int level) {
+	rtlsdr_set_agc_mode (theDevice, level == 0);
+	rtlsdr_set_tuner_gain_mode (theDevice, level);
+	if (level == 1) {
+	   gainControl -> setEnabled (true);
+	   set_ExternalGain (gainControl -> currentText ());
 	}
+	else
+	   gainControl -> setEnabled (false);
 }
 //
 void	rtlsdrHandler_win::set_biasControl	(int dummy) {
 	(void)dummy;
-	int res = rtlsdr_set_bias_tee (theDevice,
-	                 biasControl -> isChecked () ? 1 : 0);
-	if (res != 0) {
-	   QString t = "Problem with biascontrol to " +
-	                 QString::number (biasControl -> isChecked () ? 1 : 0);
-	   theErrorLogger -> add ("RTLSDR", t);
+	if (rtlsdr_set_bias_tee != nullptr) {
+	   int res =  rtlsdr_set_bias_tee (theDevice,
+	                             biasControl -> isChecked () ? 1 : 0);
+	   if (res != 0) {
+	      QString t = QString ("Cannot set bias tee to ") +
+	                             (biasControl -> isChecked () ? "1" : "0");
+	      theErrorLogger -> add ("RTLSDR", t);
+	   }
 	}
 }
 //	correction is in Hz
-void	rtlsdrHandler_win::set_ppmCorrection	(int32_t ppm) {
-	int res = rtlsdr_set_freq_correction (theDevice, ppm);
+void	rtlsdrHandler_win::set_ppmCorrection	(double ppm) {
+int res;
+        if (rtlsdr_set_freq_correction_ppb != nullptr)
+           res = this -> rtlsdr_set_freq_correction_ppb (theDevice, ppm * 1000);
+        else
+           res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
+
 	if (res != 0) {
-	   QString t = "Problem with ppm correction to " +
-	                 QString::number (ppm);
+	   QString t = QString ("Cannot set ppm to ") +
+	                                    QString::number (ppm);
 	   theErrorLogger -> add ("RTLSDR", t);
 	}
 }
@@ -357,6 +443,194 @@
 	   return 0;
 	return _I_Buffer. GetRingBufferReadAvailable ();
 }
+//
+//
+bool	rtlsdrHandler_win::load_rtlFunctions() {
+//
+//	link the required procedures
+	rtlsdr_open	= (pfnrtlsdr_open) phandle -> resolve ("rtlsdr_open");
+	if (rtlsdr_open == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_open\n");
+	   return false;
+	}
+
+	rtlsdr_close	= (pfnrtlsdr_close) phandle -> resolve ("rtlsdr_close");
+	if (rtlsdr_close == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_close\n");
+	   return false;
+	}
+
+	rtlsdr_get_usb_strings =
+	               (pfnrtlsdr_get_usb_strings)
+	                   phandle -> resolve ("rtlsdr_get_usb_strings");
+	if (rtlsdr_get_usb_strings == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_usb_strings\n");
+	   return false;
+	}
+
+	rtlsdr_set_sample_rate =
+	              (pfnrtlsdr_set_sample_rate)
+	                  phandle -> resolve ("rtlsdr_set_sample_rate");
+	if (rtlsdr_set_sample_rate == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_set_sample_rate\n");
+	   return false;
+	}
+
+	rtlsdr_get_sample_rate	=
+	             (pfnrtlsdr_get_sample_rate)
+	                  phandle -> resolve ("rtlsdr_get_sample_rate");
+	if (rtlsdr_get_sample_rate == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_sample_rate\n");
+	   return false;
+	}
+
+	rtlsdr_get_tuner_gains	=
+	             (pfnrtlsdr_get_tuner_gains)
+	                 phandle -> resolve ("rtlsdr_get_tuner_gains");
+	if (rtlsdr_get_tuner_gains == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_tuner_gains\n");
+	   return false;
+	}
+
+	rtlsdr_get_tuner_type	=
+	             (pfnrtlsdr_get_tuner_type)
+	                 phandle -> resolve ("rtlsdr_get_tuner_type");
+	if (rtlsdr_get_tuner_type == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_tuner_type\n");
+	   return false;
+	}
+
+	rtlsdr_set_tuner_gain_mode	=
+	             (pfnrtlsdr_set_tuner_gain_mode)
+	                 phandle -> resolve ("rtlsdr_set_tuner_gain_mode");
+	if (rtlsdr_set_tuner_gain_mode == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_set_tuner_gain_mode\n");
+	   return false;
+	}
+
+	rtlsdr_set_agc_mode	=
+	             (pfnrtlsdr_set_agc_mode)
+	                 phandle -> resolve ("rtlsdr_set_agc_mode");
+	if (rtlsdr_set_agc_mode == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_set_agc_mode\n");
+	   return false;
+	}
+
+	rtlsdr_set_tuner_gain	=
+	            (pfnrtlsdr_set_tuner_gain)
+	                phandle -> resolve ("rtlsdr_set_tuner_gain");
+	if (rtlsdr_set_tuner_gain == nullptr) {
+	   fprintf (stderr, "Cound not find rtlsdr_set_tuner_gain\n");
+	   return false;
+	}
+
+	rtlsdr_get_tuner_gain	=
+	            (pfnrtlsdr_get_tuner_gain)
+	                 phandle -> resolve ("rtlsdr_get_tuner_gain");
+	if (rtlsdr_get_tuner_gain == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_tuner_gain\n");
+	   return false;
+	}
+
+	rtlsdr_set_center_freq	=
+	            (pfnrtlsdr_set_center_freq)
+	                phandle -> resolve ("rtlsdr_set_center_freq");
+	if (rtlsdr_set_center_freq == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_set_center_freq\n");
+	   return false;
+	}
+
+	rtlsdr_get_center_freq	=
+	            (pfnrtlsdr_get_center_freq)
+	                phandle -> resolve ("rtlsdr_get_center_freq");
+	if (rtlsdr_get_center_freq == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_center_freq\n");
+	   return false;
+	}
+
+	rtlsdr_reset_buffer	=
+	            (pfnrtlsdr_reset_buffer)
+	                phandle -> resolve ("rtlsdr_reset_buffer");
+	if (rtlsdr_reset_buffer == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_reset_buffer\n");
+	   return false;
+	}
+
+	rtlsdr_read_async	=
+	            (pfnrtlsdr_read_async)
+	                phandle -> resolve ("rtlsdr_read_async");
+	if (rtlsdr_read_async == nullptr) {
+	   fprintf (stderr, "Cound not find rtlsdr_read_async\n");
+	   return false;
+	}
+
+	rtlsdr_get_device_count	=
+	           (pfnrtlsdr_get_device_count)
+	               phandle -> resolve ("rtlsdr_get_device_count");
+	if (rtlsdr_get_device_count == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_device_count\n");
+	   return false;
+	}
+
+	rtlsdr_cancel_async	=
+	           (pfnrtlsdr_cancel_async)
+	               phandle -> resolve ("rtlsdr_cancel_async");
+	if (rtlsdr_cancel_async == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_cancel_async\n");
+	   return false;
+	}
+
+	rtlsdr_set_direct_sampling =
+	           (pfnrtlsdr_set_direct_sampling)
+	               phandle -> resolve ("rtlsdr_set_direct_sampling");
+	if (rtlsdr_set_direct_sampling == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_set_direct_sampling\n");
+	   return false;
+	}
+
+	rtlsdr_set_freq_correction =
+	           (pfnrtlsdr_set_freq_correction)
+	               phandle -> resolve ("rtlsdr_set_freq_correction");
+//	if (rtlsdr_set_freq_correction == nullptr) {
+//	   fprintf (stderr, "Could not find rtlsdr_set_freq_correction\n");
+//	   return false;
+//	}
+	
+	rtlsdr_get_device_name =
+	           (pfnrtlsdr_get_device_name)
+	               phandle -> resolve ("rtlsdr_get_device_name");
+	if (rtlsdr_get_device_name == nullptr) {
+	   fprintf (stderr, "Could not find rtlsdr_get_device_name\n");
+	   return false;
+	}
+
+	rtlsdr_set_tuner_bandwidth	=
+	            (pfnrtlsdr_set_center_freq)
+	                phandle -> resolve ("rtlsdr_set_tuner_bandwidth");
+	if (rtlsdr_set_tuner_bandwidth == nullptr) {
+	   fprintf (stderr, "no support for tuner bandwidth\n");
+//	   nullpointer - if function is not available - is handled
+	}
+
+	rtlsdr_set_bias_tee =
+	           (pfnrtlsdr_set_bias_tee)
+	               phandle -> resolve ("rtlsdr_set_bias_tee");
+	if (rtlsdr_set_bias_tee == nullptr)
+	   fprintf (stderr, "biasControl will not work\n");
+//	nullpointer - if function is not available - is handled
+//
+//	Optional function, null pointer is handled
+	rtlsdr_set_freq_correction_ppb =
+	           (pfnrtlsdr_set_freq_correction_ppb)
+	               phandle -> resolve ("rtlsdr_set_freq_correction_ppb");
+
+//	Optional function, null pointer is handled
+	rtlsdr_get_version =
+	           (pfnrtlsdr_get_version)
+	               phandle -> resolve ("rtlsdr_get_version");
+	fprintf (stderr, "OK, functions seem to be loaded\n");
+	return true;
+}
 
 void	rtlsdrHandler_win::resetBuffer() {
 	_I_Buffer. FlushRingBuffer();
@@ -375,6 +649,8 @@
 }
 
 void	rtlsdrHandler_win::set_iqDump	() {
+	if (xmlWriter != nullptr)
+	   return;
 	if (iqDumper == nullptr) {
 	   if (setup_iqDump ()) {
 	      xml_dumpButton	-> hide ();
@@ -390,9 +666,8 @@
 	QString fileName = QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
 	                                         QDir::homePath(),
-	                                         tr ("raw (*.raw)"));
-	fileName        = QDir::toNativeSeparators (fileName);
-	iqDumper	= fopen (fileName. toUtf8 (). data (), "w");
+	fileName        = QDir::toNativeSeparators (fileName));
+	iqDumper	= fopen (fileName. toUtf8 (). data (), "wb");
 	if (iqDumper == nullptr)
 	   return false;
 	iq_dumpButton	-> setText ("writing raw file");
@@ -410,8 +685,10 @@
 }
 	   
 void	rtlsdrHandler_win::set_xmlDump () {
+	if (iqDumper != nullptr)
+	   return;
 	if (!xml_dumping. load ()) {
-	   if (setup_xmlDump ()) 
+	   if (setup_xmlDump (false)) 
 	      iq_dumpButton	-> hide	();
 	}
 	else {
@@ -420,26 +697,43 @@
 	}
 }
 
-bool	rtlsdrHandler_win::setup_xmlDump () {
-QString channel		= rtlsdrSettings -> value ("channel", "xx").
-	                                                      toString ();
-	xmlWriter	= nullptr;
+void	rtlsdrHandler_win::startDump	() {
+	setup_xmlDump (true);
+	iq_dumpButton	-> hide ();
+}
+
+void	rtlsdrHandler_win::stopDump		() {
+	close_xmlDump	();
+	iq_dumpButton	-> show ();
+}
+
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
+bool	rtlsdrHandler_win::setup_xmlDump (bool direct) {
+QString channel		= rtlsdrSettings -> value ("channel", "xx"). toString ();
+
+	if (xmlWriter != nullptr)
+	   return false;
 	try {
 	   xmlWriter	= new xml_fileWriter (rtlsdrSettings,
 	                                      channel,
 	                                      8,
 	                                      "uint8",
-	                                      2048000,
+	                                      SAMPLERATE,
 	                                      lastFrequency,
 	                                      rtlsdr_get_tuner_gain (theDevice),
 	                                      "RTLSDR",
 	                                      deviceModel,
-	                                      recorderVersion);
+	                                      recorderVersion,
+	                                      direct);
 	} catch (...) {
 	   return false;
 	}
-	xml_dumping. store (true);
 	xml_dumpButton	-> setText ("writing xml file");
+	xml_dumping. store (true);
 	return true;
 }
 	
@@ -450,8 +744,8 @@
 	xmlWriter	-> computeHeader ();
 	delete xmlWriter;
 	xmlWriter	= nullptr;
-	xml_dumping. store (false);
 	xml_dumpButton	-> setText ("Dump to xml");
+	xml_dumping. store (false);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -460,18 +754,20 @@
 //
 void    rtlsdrHandler_win::record_gainSettings (int freq) {
 QString	gain	= gainControl	-> currentText ();
-int	agc	= agcControl	-> isChecked () ? 1 : 0;
+int     agc     = agc_off -> isChecked () ? 1 :
+                  agc_sw  -> isChecked () ? 2 : 0;
 QString theValue        = gain + ":" + QString::number (agc);
-QString key		= QString::number (freq);
-	store (rtlsdrSettings, "rtlsdrSettings", key, theValue);
+QString freqVal		= QString::number (freq);
+	store (rtlsdrSettings, "rtlsdrSettings", freqVal, theValue);
 }
 
 void	rtlsdrHandler_win::update_gainSettings (int freq) {
 int	agc;
 QString	theValue	= "";
-QString freqS		= QString::number (freq);
-	theValue	=  value_s (rtlsdrSettings, "rtlsdrSettings",
-	                                              freqS, theValue);
+QString freqVal		= QString::number (freq);
+	theValue	= value_s (rtlsdrSettings, "rtlsdrSettings",
+	                                             freqVal, theValue);
+
 	if (theValue == QString (""))
 	   return;		// or set some defaults here
 
@@ -484,46 +780,51 @@
 
 	int k	= gainControl -> findText (temp);
 	if (k != -1) {
-	   gainControl	-> blockSignals (true);
+	   gainControl	-> setEnabled (false);
 	   new_gainIndex (k);
 	   while (gainControl -> currentText () != temp)
 	      usleep (1000);
-	   gainControl	-> blockSignals (false);
 	}
-
-	agcControl	-> blockSignals (true);
-	new_agcSetting (agc == 1);
-	while (agcControl -> isChecked () != (agc == 1))
-	   usleep (1000);
-	set_autogain (agcControl -> isChecked ());
-	agcControl	-> blockSignals (false);
+	if (agc == 1) {
+	   gainControl -> setEnabled (true);
+	   agc_off	-> setEnabled (false);
+	   agc_off	-> setChecked (true);
+	   agc_off	-> setEnabled (true);
+	}
+	else
+	if (agc == 0) {
+	   agc_hw	-> setEnabled (false);
+	   agc_hw	-> setChecked (true);
+	   agc_hw	-> setEnabled (true);
+	}
+	else {	// agc == 2
+	   agc_sw	-> setEnabled (false);
+	   agc_sw	-> setChecked (true);
+	   agc_sw	-> setEnabled (true);
+	}
 }
 
 #define	IQ_BUFSIZE	4096
 void	rtlsdrHandler_win::processBuffer (uint8_t *buf, uint32_t len) {
 float	sumI	= 0;
 float	sumQ	= 0;
-static
-float	m_dcI	= 0;
-static
-float	m_dcQ	= 0;
-uint32_t	nrSamples = len / 2;
-auto	*tempBuf	= dynVec (std::complex<float>, nrSamples);
+int	nrSamples	= len / 2;
+auto	*tempBuf 	= dynVec (std::complex<float>, nrSamples);
 static uint8_t dumpBuffer 2 * IQ_BUFSIZE;
 static int iqTeller	= 0;
-
+static int teller	= 0;
 	if (!isActive. load ()) 
 	   return;
 
 	if (toSkip > 0) {
-	   toSkip -= nrSamples;
+	   toSkip -= len / 2;
 	   return;
 	}
 	if (xml_dumping. load ())
 	   xmlWriter -> add ((std::complex<uint8_t> *)buf, nrSamples);
 
 	if (iq_dumping. load ()) {
-	   for (uint32_t i = 0; i < nrSamples; i ++) {
+	   for (int32_t i = 0; i < nrSamples; i ++) {
 	      dumpBuffer 2 * iqTeller	= buf 2 * i;
 	      dumpBuffer 2 * iqTeller + 1 = buf 2 * i + 1;
 	      iqTeller ++;
@@ -533,14 +834,13 @@
 	      }
 	   }
 	}
-
 	if ((filtering) && (filterDepth -> value () != currentDepth)) {
 	   currentDepth = filterDepth -> value ();
 	   theFilter. resize (currentDepth);
 	}
-	float dcI	= m_dcI;
-	float dcQ	= m_dcQ;
-	for (uint32_t i = 0; i < nrSamples; i ++) {
+
+	for (int32_t i = 0; i < nrSamples; i ++) {
+	   teller ++;
 	   float tempI	= convTable buf 2 * i;
 	   float tempQ	= convTable buf 2 * i + 1;
 	   sumI		+= tempI;
@@ -550,14 +850,17 @@
 	      tempBuf i = theFilter. Pass (tempBuf i);
 	}
 // calculate correction values for next input buffer
-	m_dcI = sumI / nrSamples * CORRF + (1 - CORRF) * dcI;
-	m_dcQ = sumQ / nrSamples * CORRF + (1 - CORRF) * dcQ;
 	int ovf	= _I_Buffer. GetRingBufferWriteAvailable () - nrSamples;
 	if (ovf < 0)
 	   (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples + ovf);
 	else
-	   (void)_I_Buffer. putDataIntoBuffer (tempBuf, len / 2);
+	   (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples);
 	reportOverflow (ovf < 0);
+	if (++teller > 4 * 2048000) {
+//	   fprintf (stderr, "%f %f (%f)\n", sumI / teller, sumQ / teller,
+//	                                    sumI / sumQ);
+	   teller = 0;
+	}
 }
 
 QString	rtlsdrHandler_win::get_tunerType	(int tunerType) {
@@ -584,13 +887,13 @@
 static bool theOvf	= true;
 	if (ovf && !theOvf){
 	   overflowLabel -> setText ("Overload");
-           overflowLabel -> setStyleSheet("QLabel {background-color : red;\
+           overflowLabel -> setStyleSheet ("QLabel {background-color : red; \
                                                    color: white}");
 	   theOvf	= true;
 	}
 	else
 	if (!ovf && theOvf) {		// space in the buffer is sufficient
-	   overflowLabel -> setStyleSheet("QLabel {background-color : green;\
+	   overflowLabel -> setStyleSheet("QLabel {background-color : green; \
                                                    color: white}");
 	   theOvf	= false;
 	}

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h Changed

@@ -1,11 +1,15 @@
 #
 /*
- *    Copyright (C) 2014 .. 2024
+ *    Copyright (C) 2014 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
  *    This file is part of the Qt-DAB
  *
+ *    Many of the ideas as implemented in Qt-DAB are derived from
+ *    other work, made available through the GNU general Public License. 
+ *    All copyrights of the original authors are recognized.
+ *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
@@ -28,54 +32,97 @@
 #include	<QString>
 #include	<cstdio>
 #include	<atomic>
-#include	"rtl-sdr.h"
 #include	"dab-constants.h"
 #include	"fir-filters.h"
 #include	"device-handler.h"
 #include	"ringbuffer.h"
 #include	"ui_rtlsdr-widget.h"
-class	dll_driver_win;
-class	xml_fileWriter;
+#include	<QLibrary>
+#include	<QScopedPointer>
+#include        "xml-filewriter.h"
+
 class	errorLogger;
+class	dll_driver;
 //
+//	create typedefs for the library functions
+typedef	struct rtlsdr_dev rtlsdr_dev_t;
+extern "C"  {
+typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
+typedef int (*  pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
+typedef	int (*  pfnrtlsdr_close) (rtlsdr_dev_t *);
+typedef int (*  pfnrtlsdr_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
+typedef	int (*  pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
+typedef	int (*  pfnrtlsdr_set_tuner_bandwidth) (rtlsdr_dev_t *, uint32_t);
+typedef uint32_t (*  pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
+typedef	int (*  pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
+typedef	int (*  pfnrtlsdr_get_tuner_type) (rtlsdr_dev_t *);
+typedef	int (*  pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
+typedef	int (*  pfnrtlsdr_set_agc_mode)        (rtlsdr_dev_t *, int);
+typedef	int (*  pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
+typedef	int (*  pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
+typedef	int (*  pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
+typedef	int (*  pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
+typedef int (*  pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
+typedef	int (*  pfnrtlsdr_read_async) (rtlsdr_dev_t *,
+	                               rtlsdr_read_async_cb_t,
+	                               void *,
+	                               uint32_t,
+	                               uint32_t);
+typedef	int (*	pfnrtlsdr_set_bias_tee) (rtlsdr_dev_t *, int);
+typedef int (*  pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
+typedef int (*  pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
+typedef uint32_t (*  pfnrtlsdr_get_device_count)();
+typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_freq_correction_ppb)(rtlsdr_dev_t *, int);
+typedef	char *(* pfnrtlsdr_get_device_name)(int);
+typedef	int (* pfnrtlsdr_get_version)();
+}
 //	This class is a simple wrapper around the
-//	rtlsdr library that is read in  as dll (or .so file in linux)
-//	It does not do any processing
-class	rtlsdrHandler_win final:
-	                public deviceHandler, public  Ui_dabstickWidget {
+//	rtlsdr library, the relevant functions of it
+//	are read in  from the dll (or .so file in linux)
+
+class	rtlsdrHandler_win: 
+	               public deviceHandler, public  Ui_dabstickWidget {
 Q_OBJECT
 public:
 			rtlsdrHandler_win	(QSettings *,
-	                                         const QString &,
-	                                         errorLogger *);
+	                                         const QString,
+	                                 	 const QString &,
+	                                 	 errorLogger *);
 			~rtlsdrHandler_win	();
-	bool		restartReader		(int32_t, int skipped = 0);
-	void		stopReader		();
-	int32_t		getSamples		(std::complex<float> *,
-	                                                        int32_t);
-	int32_t		Samples			();
-	void		resetBuffer		();
-	int16_t		maxGain			();
-	int16_t		bitDepth		();
-	QString		deviceName		();
+	bool		restartReader	(int32_t, int skipped = 0);
+	void		stopReader	();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples		();
+	void		resetBuffer	();
+	int16_t		maxGain		();
+	int16_t		bitDepth	();
+	QString		deviceName	();
+
+	void		startDump	();
+	void		stopDump	();
 
 //	These need to be visible for the separate usb handling thread
+	pfnrtlsdr_read_async	rtlsdr_read_async;
 	struct rtlsdr_dev	*theDevice;
 	std::atomic<bool>	isActive;
-	void		processBuffer (uint8_t *, uint32_t);
+
+	void		processBuffer	(uint8_t *, uint32_t);
 private:
 	RingBuffer<std::complex<float>> _I_Buffer;
 	QSettings	*rtlsdrSettings;
 	errorLogger	*theErrorLogger;
 	int32_t		inputRate;
+	QString		libraryString;
 	int32_t		deviceCount;
-	dll_driver_win	*workerHandle;
+	QLibrary*	phandle;
+	dll_driver	*workerHandle;
 	int32_t		lastFrequency;
 	int16_t		gainsCount;
 	QString		deviceModel;
 	QString		recorderVersion;
-        xml_fileWriter  *xmlWriter;
-        bool            setup_xmlDump		();
+        xml_fileWriter	*xmlWriter;
+        bool            setup_xmlDump		(bool);
         void            close_xmlDump		();
         std::atomic<bool> xml_dumping;
 	FILE		*iqDumper;
@@ -90,21 +137,54 @@
 	bool		filtering;
 	LowPassFIR	theFilter;
 	int		currentDepth;
+
+	void		set_off_agc		();
+	void		set_hw_agc		();
+	void		set_sw_agc		();
+	void		init_autogain		(int);
+
+	float		convTable	256;
 	void		reportOverflow		(bool);
-	float		convTable		256;
-//	double		m_dcI;
-//	double		m_dcQ;
+	float		m_dcI;
+	float		m_dcQ;
+//	here we need to load functions from the dll
+	bool		load_rtlFunctions	();
+	pfnrtlsdr_open	rtlsdr_open;
+	pfnrtlsdr_close	rtlsdr_close;
+	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
 
+	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
+	pfnrtlsdr_set_tuner_bandwidth rtlsdr_set_tuner_bandwidth;
+	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
+	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
+	pfnrtlsdr_get_tuner_type rtlsdr_get_tuner_type;
+	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
+	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
+	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
+	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
+	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
+	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
+	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
+	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
+	pfnrtlsdr_set_bias_tee rtlsdr_set_bias_tee;
+	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
+	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
+	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_set_freq_correction_ppb rtlsdr_set_freq_correction_ppb;
+	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+	pfnrtlsdr_get_version rtlsdr_get_version;
+	
 signals:
 	void		new_gainIndex		(int);
 	void		new_agcSetting		(bool);
 private slots:
 	void		set_ExternalGain	(const QString &);
 	void		set_autogain		(int);
-	void		set_ppmCorrection	(int);
+	void		set_ppmCorrection	(double);
 	void		set_xmlDump		();
 	void		set_iqDump		();
 	void		set_filter		(int);
 	void		set_biasControl		(int);
 };
 
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-widget.ui Added

@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabstickWidget</class>
+ <widget class="QWidget" name="dabstickWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>240</width>
+    <height>445</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>RT2832 dabstick</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="tunedFrequency">
+     <property name="frameShape">
+      <enum>QFrame::Shape::Panel</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>gain</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="gainControl">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>AGC</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="agc_hw">
+       <property name="text">
+        <string>HW</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="agc_sw">
+       <property name="text">
+        <string>SW</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="agc_off">
+       <property name="text">
+        <string>Off</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QCheckBox" name="biasControl">
+       <property name="text">
+        <string>biasT</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="QCheckBox" name="filterSelector">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DABsticks do not have much filtering. A software filter - 1560KHz wide - can be selected&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>filter</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="filterDepth">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;select the depth of the software 1560 KHz filter. Be aware that for a filter depth N N* 2048000 extra additions and complex multiplications are done&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="minimum">
+          <number>5</number>
+         </property>
+         <property name="maximum">
+          <number>25</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>ppm</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDoubleSpinBox" name="ppm_correction"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Dump </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="xml_dumpButton">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>xml</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="iq_dumpButton">
+       <property name="text">
+        <string>raw </string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="overflowLabel">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="product_display">
+     <property name="frameShape">
+      <enum>QFrame::Shape::Box</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="deviceVersion">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Shape::Box</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="libVersion">
+     <property name="frameShape">
+      <enum>QFrame::Shape::Box</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo Added

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/README.md Added

@@ -0,0 +1,22 @@
+
+A brief note on the sdrplay V3 driver software
+
+The support for the RSp's is through a service, and the API - implementing
+that ervice - is not thread safe.
+The V3 driver therefore is using its own thread and - using a simple
+message passing implementation - sends messages to the API when some
+modifications or settings in the API have to change.
+
+Since there are different Rsp's that may use the API, a simple approach
+was chosen, i.e. to define a class for each of the sifferent models.
+The common operations are shared and implementing in a class from which the
+model related classed dervice from.
+
+One option of Qt-DAB is to use your own channels rather than the channels
+in Band III.
+The frequencies of these "user-defined" channels is unknown to me, the
+lists of valid settings for the lna are related to these frequencies.
+While the settings for receiving Band III are known, a choice was
+made for the implementation as mentioned, the selection of the lna tables
+for are made dependent on the frequency.
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/duo-commands.h Added

@@ -0,0 +1,181 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of Qt-DAB
+ *
+ *    Qt-Dab is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation version 2 of the License.
+ *
+ *    Qt-Dab is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-Dab if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+//
+//	This file will be included in the sdrplay-controller.cpp file
+//
+//	The file contains the definitions of the interface data between
+//	the calling and the callee thread
+#pragma once
+
+#define DUO_RESTART	        0100
+#define DUO_STOP		0101
+#define DUO_SETFREQUENCY	0102
+#define DUO_SETAGC_A		0103
+#define DUO_SETAGC_B		1103
+#define DUO_SETGRDB_A		0104
+#define DUO_SETGRDB_B		1104
+#define DUO_SETPPM_A		0105
+#define DUO_SETPPM_B		1105
+#define DUO_SETLNA_A		0106
+#define DUO_SETLNA_B		1106
+#define	DUO_SETNOTCH		0110
+#define	DUO_SETBIAS_T		0111
+
+#include	<QSemaphore>
+#include	<stdio.h>
+
+class duoCommand {
+public:
+	int	cmd;
+	bool	result;
+	QSemaphore waiter;
+	duoCommand (int command):
+	                waiter (0){
+	   this -> cmd = command;
+	}
+	duoCommand () {}
+};
+
+class	duo_restart: public duoCommand {
+public:
+	int	freq;
+	duo_restart (int newFrequency):
+	   duoCommand (DUO_RESTART) {
+	   this	-> freq = newFrequency;
+	}
+
+	~duo_restart	() {}
+};
+
+class	duo_stop: public duoCommand {
+public:
+	duo_stop ():
+	   duoCommand (DUO_STOP) {
+	}
+
+	~duo_stop	() {}
+};
+
+class duo_Agc_A: public duoCommand {
+public:
+	int	setPoint;
+	bool	agcMode;
+	duo_Agc_A (bool onoff, int setPoint) :
+	                duoCommand (DUO_SETAGC_A) {
+	   this	-> setPoint	= setPoint;
+	   this	-> agcMode	= onoff;
+	}
+	~duo_Agc_A	() {}
+};
+
+class duo_Agc_B: public duoCommand {
+public:
+	int	setPoint;
+	bool	agcMode;
+	duo_Agc_B (bool onoff, int setPoint) :
+	                duoCommand (DUO_SETAGC_B) {
+	   this	-> setPoint	= setPoint;
+	   this	-> agcMode	= onoff;
+	}
+	~duo_Agc_B	() {}
+};
+
+class	duo_GRdB_A: public duoCommand {
+public:
+	int	GRdBValue;
+	duo_GRdB_A (int GRdBValue):
+	               duoCommand (DUO_SETGRDB_A) {
+	   this	-> GRdBValue	= GRdBValue;
+	}
+	~duo_GRdB_A	() {}
+};
+
+class	duo_GRdB_B: public duoCommand {
+public:
+	int	GRdBValue;
+	duo_GRdB_B (int GRdBValue):
+	               duoCommand (DUO_SETGRDB_B) {
+	   this	-> GRdBValue	= GRdBValue;
+	}
+	~duo_GRdB_B	() {}
+};
+
+class	duo_lna_A: public duoCommand {
+public:
+	int	lnaState;
+	duo_lna_A (int lnaState):
+	           duoCommand (DUO_SETLNA_A) {
+	   this	-> lnaState	= lnaState;
+	}
+	~duo_lna_A	() {}
+};
+
+class	duo_lna_B: public duoCommand {
+public:
+	int	lnaState;
+	duo_lna_B (int lnaState):
+	           duoCommand (DUO_SETLNA_B) {
+	   this	-> lnaState	= lnaState;
+	}
+	~duo_lna_B	() {}
+};
+
+class	duo_ppm_A: public duoCommand {
+public:
+	int	ppmValue;
+	duo_ppm_A (int ppmValue):
+	           duoCommand (DUO_SETPPM_A) {
+	   this	-> ppmValue	= ppmValue;
+	}
+	~duo_ppm_A	() {}
+};
+
+class	duo_ppm_B: public duoCommand {
+public:
+	int	ppmValue;
+	duo_ppm_B (int ppmValue):
+	           duoCommand (DUO_SETPPM_B) {
+	   this	-> ppmValue	= ppmValue;
+	}
+	~duo_ppm_B	() {}
+};
+
+class	duo_notch: public duoCommand {
+public:
+	bool	checked;
+	duo_notch (bool notch_value):
+	            duoCommand (DUO_SETNOTCH) {
+	   this -> checked = notch_value;
+	}
+	~duo_notch	() {}
+};
+
+class	duo_biasT: public duoCommand {
+public:
+	bool	checked;
+	duo_biasT (bool biasT_value):
+	            duoCommand (DUO_SETBIAS_T) {
+	   this -> checked = biasT_value;
+	}
+	~duo_biasT	() {}
+};

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/duo-widget.ui Added

@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>duoWidget_v3</class>
+ <widget class="QWidget" name="duoWidget_v3">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>385</width>
+    <height>326</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>SDRplay-duo</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QLCDNumber" name="api_version">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version of the SDRplay library detected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+         <property name="segmentStyle">
+          <enum>QLCDNumber::SegmentStyle::Flat</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="debugControl">
+       <property name="text">
+        <string>debug</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <item>
+        <widget class="QLabel" name="serialNumber">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="deviceLabel">
+         <property name="text">
+          <string>mirics-SDRplay</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="stateLabel">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="overloadLabel_A">
+         <property name="frameShape">
+          <enum>QFrame::Shape::Box</enum>
+         </property>
+         <property name="lineWidth">
+          <number>1</number>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="ppmControl_A">
+         <property name="minimum">
+          <double>-2000.000000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>20000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="ppmLabel_A">
+         <property name="font">
+          <font>
+           <family>Droid Sans</family>
+           <italic>true</italic>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>ppm control</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="GRdBSelector_A">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimum">
+          <number>20</number>
+         </property>
+         <property name="maximum">
+          <number>59</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="gainsliderLabel_A">
+         <property name="font">
+          <font>
+           <family>Droid Sans</family>
+           <italic>true</italic>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>if gain reduction</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QSpinBox" name="lnaGainSetting_A">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Setting the lna state, determining the gain reduction applied in the lna.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLCDNumber" name="lnaGRdBDisplay_A">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The display shows the gain reduction in the lna of the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="digitCount">
+            <number>3</number>
+           </property>
+           <property name="segmentStyle">
+            <enum>QLCDNumber::SegmentStyle::Flat</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="font">
+          <font>
+           <family>Droid Sans</family>
+           <italic>true</italic>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>lna state selector</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>overall gain</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="gainDisplay_A">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The number gere displays the currently applied attenuation on the incoming signal&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>0 dB</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QCheckBox" name="agcControl_A">
+           <property name="font">
+            <font>
+             <family>Droid Sans</family>
+             <italic>true</italic>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touch to switch on automatic gain control - based on the setting of the lnastate and the ifgain.&lt;/p&gt;&lt;p&gt;If switched on, the lnastate switch and the ifgain slider are switched off&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>agc</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="notch_selector">
+           <property name="font">
+            <font>
+             <family>Droid Sans</family>
+             <italic>true</italic>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The notch filter. The sdplay Rsp has a notch filter that - for the DAB band - blocks signals from the MW and FM band.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>notch</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QComboBox" name="tunerSelect">
+       <item>
+        <property name="text">
+         <string>Tuner A</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Tuner B</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>A + B</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>A - B</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="overloadLabel_B">
+         <property name="frameShape">
+          <enum>QFrame::Shape::Box</enum>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="ppmControl_B"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="ppmLabel_B">
+         <property name="font">
+          <font>
+           <family>Droid Sans</family>
+           <italic>true</italic>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>ppm Control</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="GRdBSelector_B">
+         <property name="minimum">
+          <number>20</number>
+         </property>
+         <property name="maximum">
+          <number>59</number>
+         </property>
+         <property name="value">
+          <number>20</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="gainSliderLabel_B">
+         <property name="font">
+          <font>
+           <family>Droid Sans</family>
+           <italic>true</italic>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>if gain reduction</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QSpinBox" name="lnaGainSetting_B"/>
+         </item>
+         <item>
+          <widget class="QLCDNumber" name="lnaGRdBDisplay_B"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="font">
+          <font>
+           <family>Droid Sans</family>
+           <italic>true</italic>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>lna state selector</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <item>
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>overall gain</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="gainDisplay_B">
+           <property name="text">
+            <string>0 dB</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QCheckBox" name="agcControl_B">
+           <property name="font">
+            <font>
+             <family>Droid Sans</family>
+             <italic>true</italic>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>agc</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="biasT_selector">
+           <property name="font">
+            <font>
+             <family>Droid Sans</family>
+             <italic>true</italic>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>biasT</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include Added

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api.h Added

@@ -0,0 +1,227 @@
+#ifndef SDRPLAY_API_H
+#define SDRPLAY_API_H
+
+#include "sdrplay_api_dev.h"
+#include "sdrplay_api_rx_channel.h"
+#include "sdrplay_api_callback.h"
+
+#if defined(_M_X64) || defined(_M_IX86)
+#include "windows.h"
+#elif defined (__GNUC__)
+typedef void *HANDLE;
+#endif
+
+#ifndef _SDRPLAY_DLL_QUALIFIER
+#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86)) 
+#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
+#elif defined(STATIC_LIB) || defined(__GNUC__) 
+#define _SDRPLAY_DLL_QUALIFIER
+#endif
+#endif  // _SDRPLAY_DLL_QUALIFIER
+
+// Application code should check that it is compiled against the same API version
+// sdrplay_api_ApiVersion() returns the API version 
+#define SDRPLAY_API_VERSION            (float)(3.06)
+
+// API Constants
+#define SDRPLAY_MAX_DEVICES                   (16)
+#define SDRPLAY_MAX_TUNERS_PER_DEVICE         (2)
+
+#define SDRPLAY_MAX_SER_NO_LEN                (64)
+#define SDRPLAY_MAX_ROOT_NM_LEN               (128)
+
+#define SDRPLAY_RSP1_ID                       (1)
+#define SDRPLAY_RSP1A_ID                      (255)
+#define SDRPLAY_RSP2_ID                       (2)
+#define SDRPLAY_RSPduo_ID                     (3)
+#define SDRPLAY_RSPdx_ID                      (4)
+
+// Enum types
+typedef enum
+{
+    sdrplay_api_Success               = 0,
+    sdrplay_api_Fail                  = 1,
+    sdrplay_api_InvalidParam          = 2,
+    sdrplay_api_OutOfRange            = 3,
+    sdrplay_api_GainUpdateError       = 4,
+    sdrplay_api_RfUpdateError         = 5,
+    sdrplay_api_FsUpdateError         = 6,
+    sdrplay_api_HwError               = 7,
+    sdrplay_api_AliasingError         = 8,
+    sdrplay_api_AlreadyInitialised    = 9,
+    sdrplay_api_NotInitialised        = 10,
+    sdrplay_api_NotEnabled            = 11,
+    sdrplay_api_HwVerError            = 12,
+    sdrplay_api_OutOfMemError         = 13,
+    sdrplay_api_ServiceNotResponding  = 14,
+    sdrplay_api_StartPending          = 15,
+    sdrplay_api_StopPending           = 16,
+    sdrplay_api_InvalidMode           = 17,
+    sdrplay_api_FailedVerification1   = 18,
+    sdrplay_api_FailedVerification2   = 19,
+    sdrplay_api_FailedVerification3   = 20,
+    sdrplay_api_FailedVerification4   = 21,
+    sdrplay_api_FailedVerification5   = 22,
+    sdrplay_api_FailedVerification6   = 23,
+    sdrplay_api_InvalidServiceVersion = 24
+} sdrplay_api_ErrT;
+
+typedef enum
+{
+    sdrplay_api_Update_None                        = 0x00000000,
+
+    // Reasons for master only mode 
+    sdrplay_api_Update_Dev_Fs                      = 0x00000001,
+    sdrplay_api_Update_Dev_Ppm                     = 0x00000002,
+    sdrplay_api_Update_Dev_SyncUpdate              = 0x00000004,
+    sdrplay_api_Update_Dev_ResetFlags              = 0x00000008,
+
+    sdrplay_api_Update_Rsp1a_BiasTControl          = 0x00000010,
+    sdrplay_api_Update_Rsp1a_RfNotchControl        = 0x00000020,
+    sdrplay_api_Update_Rsp1a_RfDabNotchControl     = 0x00000040,
+
+    sdrplay_api_Update_Rsp2_BiasTControl           = 0x00000080,
+    sdrplay_api_Update_Rsp2_AmPortSelect           = 0x00000100,
+    sdrplay_api_Update_Rsp2_AntennaControl         = 0x00000200,
+    sdrplay_api_Update_Rsp2_RfNotchControl         = 0x00000400,
+    sdrplay_api_Update_Rsp2_ExtRefControl          = 0x00000800,
+
+    sdrplay_api_Update_RspDuo_ExtRefControl        = 0x00001000,
+
+    sdrplay_api_Update_Master_Spare_1              = 0x00002000,
+    sdrplay_api_Update_Master_Spare_2              = 0x00004000,
+
+    // Reasons for master and slave mode
+    // Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
+    sdrplay_api_Update_Tuner_Gr                    = 0x00008000,
+    sdrplay_api_Update_Tuner_GrLimits              = 0x00010000,
+    sdrplay_api_Update_Tuner_Frf                   = 0x00020000,
+    sdrplay_api_Update_Tuner_BwType                = 0x00040000,
+    sdrplay_api_Update_Tuner_IfType                = 0x00080000,
+    sdrplay_api_Update_Tuner_DcOffset              = 0x00100000,
+    sdrplay_api_Update_Tuner_LoMode                = 0x00200000,
+
+    sdrplay_api_Update_Ctrl_DCoffsetIQimbalance    = 0x00400000,
+    sdrplay_api_Update_Ctrl_Decimation             = 0x00800000,
+    sdrplay_api_Update_Ctrl_Agc                    = 0x01000000,
+    sdrplay_api_Update_Ctrl_AdsbMode               = 0x02000000,
+    sdrplay_api_Update_Ctrl_OverloadMsgAck         = 0x04000000,
+
+    sdrplay_api_Update_RspDuo_BiasTControl         = 0x08000000,
+    sdrplay_api_Update_RspDuo_AmPortSelect         = 0x10000000,
+    sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
+    sdrplay_api_Update_RspDuo_RfNotchControl       = 0x40000000,
+    sdrplay_api_Update_RspDuo_RfDabNotchControl    = 0x80000000,
+} sdrplay_api_ReasonForUpdateT;
+
+typedef enum
+{
+    sdrplay_api_Update_Ext1_None                   = 0x00000000,
+
+    // Reasons for master only mode 
+    sdrplay_api_Update_RspDx_HdrEnable             = 0x00000001,
+    sdrplay_api_Update_RspDx_BiasTControl          = 0x00000002,
+    sdrplay_api_Update_RspDx_AntennaControl        = 0x00000004,
+    sdrplay_api_Update_RspDx_RfNotchControl        = 0x00000008,
+    sdrplay_api_Update_RspDx_RfDabNotchControl     = 0x00000010,
+    sdrplay_api_Update_RspDx_HdrBw                 = 0x00000020,
+
+    // Reasons for master and slave mode
+} sdrplay_api_ReasonForUpdateExtension1T;
+
+typedef enum
+{
+    sdrplay_api_DbgLvl_Disable       = 0,
+    sdrplay_api_DbgLvl_Verbose       = 1,
+    sdrplay_api_DbgLvl_Warning       = 2,
+    sdrplay_api_DbgLvl_Error         = 3,
+    sdrplay_api_DbgLvl_Message       = 4,
+} sdrplay_api_DbgLvl_t;
+
+// Device structure 
+typedef struct 
+{
+    char SerNoSDRPLAY_MAX_SER_NO_LEN;
+    unsigned char hwVer;
+    sdrplay_api_TunerSelectT tuner;
+    sdrplay_api_RspDuoModeT rspDuoMode;
+    double rspDuoSampleFreq;
+    HANDLE dev;
+} sdrplay_api_DeviceT;
+
+// Device parameter structure
+typedef struct 
+{
+    sdrplay_api_DevParamsT       *devParams;
+    sdrplay_api_RxChannelParamsT *rxChannelA;
+    sdrplay_api_RxChannelParamsT *rxChannelB;
+} sdrplay_api_DeviceParamsT;
+
+// Extended error message structure
+typedef struct 
+{
+    char file256;
+    char function256;
+    int  line;
+    char message1024;
+} sdrplay_api_ErrorInfoT;
+
+// Comman API function types
+typedef sdrplay_api_ErrT        (*sdrplay_api_Open_t)(void);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_Close_t)(void);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_ApiVersion_t)(float *apiVer);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_LockDeviceApi_t)(void);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_UnlockDeviceApi_t)(void);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);    
+typedef sdrplay_api_ErrT        (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);    
+typedef const char*             (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
+typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
+
+// Device API function types
+typedef sdrplay_api_ErrT        (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl); 
+typedef sdrplay_api_ErrT        (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams); 
+typedef sdrplay_api_ErrT        (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext); 
+typedef sdrplay_api_ErrT        (*sdrplay_api_Uninit_t)(HANDLE dev);
+typedef sdrplay_api_ErrT        (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
+typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
+typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate);
+typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
+                                                         sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
+                                                         sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
+
+// API function definitions
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    // Comman API function definitions
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Open(void);    
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Close(void);    
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ApiVersion(float *apiVer);    
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_LockDeviceApi(void);    
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_UnlockDeviceApi(void);    
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);   
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);   
+    _SDRPLAY_DLL_QUALIFIER const char*             sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
+
+    // Device API function definitions
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable); 
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams); 
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext); 
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Uninit(HANDLE dev);
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate);
+    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
+                                                                       sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
+                                                                       sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //SDRPLAY_API_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_callback.h Added

@@ -0,0 +1,78 @@
+#ifndef SDRPLAY_API_CALLBACK_H
+#define SDRPLAY_API_CALLBACK_H
+
+// Event callback enums
+typedef enum
+{
+    sdrplay_api_Overload_Detected     = 0,
+    sdrplay_api_Overload_Corrected    = 1,
+} sdrplay_api_PowerOverloadCbEventIdT;
+
+typedef enum
+{
+    sdrplay_api_MasterInitialised      = 0,
+    sdrplay_api_SlaveAttached          = 1,
+    sdrplay_api_SlaveDetached          = 2,
+    sdrplay_api_SlaveInitialised       = 3,
+    sdrplay_api_SlaveUninitialised     = 4,
+    sdrplay_api_MasterDllDisappeared   = 5,
+    sdrplay_api_SlaveDllDisappeared    = 6,
+} sdrplay_api_RspDuoModeCbEventIdT;
+
+typedef enum
+{
+    sdrplay_api_GainChange            = 0,
+    sdrplay_api_PowerOverloadChange   = 1,
+    sdrplay_api_DeviceRemoved         = 2,
+    sdrplay_api_RspDuoModeChange      = 3,
+} sdrplay_api_EventT;
+
+// Event callback parameter structs
+typedef struct 
+{
+    unsigned int gRdB;
+    unsigned int lnaGRdB;
+    double currGain;
+} sdrplay_api_GainCbParamT;
+
+typedef struct 
+{
+    sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
+} sdrplay_api_PowerOverloadCbParamT;
+
+typedef struct 
+{
+    sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
+} sdrplay_api_RspDuoModeCbParamT;
+
+// Event parameters overlay
+typedef union
+{
+    sdrplay_api_GainCbParamT          gainParams;
+    sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
+    sdrplay_api_RspDuoModeCbParamT    rspDuoModeParams;
+} sdrplay_api_EventParamsT;
+
+// Stream callback parameter structs
+typedef struct 
+{
+    unsigned int firstSampleNum;
+    int grChanged;
+    int rfChanged;
+    int fsChanged;
+    unsigned int numSamples;
+} sdrplay_api_StreamCbParamsT;
+
+// Callback function prototypes
+typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext); 
+typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext); 
+
+// Callback function struct
+typedef struct 
+{
+    sdrplay_api_StreamCallback_t StreamACbFn;
+    sdrplay_api_StreamCallback_t StreamBCbFn;
+    sdrplay_api_EventCallback_t  EventCbFn;
+} sdrplay_api_CallbackFnsT;
+
+#endif //SDRPLAY_API_CALLBACK_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_control.h Added

@@ -0,0 +1,55 @@
+#ifndef SDRPLAY_API_CONTROL_H
+#define SDRPLAY_API_CONTROL_H
+
+// Control parameter enums
+typedef enum
+{
+    sdrplay_api_AGC_DISABLE  = 0,
+    sdrplay_api_AGC_100HZ    = 1,
+    sdrplay_api_AGC_50HZ     = 2,
+    sdrplay_api_AGC_5HZ      = 3,
+    sdrplay_api_AGC_CTRL_EN  = 4
+} sdrplay_api_AgcControlT;
+
+typedef enum
+{
+    sdrplay_api_ADSB_DECIMATION                  = 0,
+    sdrplay_api_ADSB_NO_DECIMATION_LOWPASS       = 1,
+    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
+    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
+} sdrplay_api_AdsbModeT;
+
+// Control parameter structs
+typedef struct 
+{
+    unsigned char DCenable;          // default: 1
+    unsigned char IQenable;          // default: 1
+} sdrplay_api_DcOffsetT;
+
+typedef struct 
+{
+    unsigned char enable;            // default: 0
+    unsigned char decimationFactor;  // default: 1
+    unsigned char wideBandSignal;    // default: 0
+} sdrplay_api_DecimationT;
+
+typedef struct 
+{
+    sdrplay_api_AgcControlT enable;    // default: sdrplay_api_AGC_50HZ
+    int setPoint_dBfs;                 // default: -60
+    unsigned short attack_ms;          // default: 0
+    unsigned short decay_ms;           // default: 0
+    unsigned short decay_delay_ms;     // default: 0
+    unsigned short decay_threshold_dB; // default: 0
+    int syncUpdate;                    // default: 0
+} sdrplay_api_AgcT;
+
+typedef struct 
+{
+    sdrplay_api_DcOffsetT dcOffset;
+    sdrplay_api_DecimationT decimation;
+    sdrplay_api_AgcT agc;
+    sdrplay_api_AdsbModeT adsbMode;  //default: sdrplay_api_ADSB_DECIMATION
+} sdrplay_api_ControlParamsT;
+
+#endif //SDRPLAY_API_CONTROL_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_dev.h Added

@@ -0,0 +1,51 @@
+#ifndef SDRPLAY_API_DEV_H
+#define SDRPLAY_API_DEV_H
+
+#include "sdrplay_api_rsp1a.h"
+#include "sdrplay_api_rsp2.h"
+#include "sdrplay_api_rspDuo.h"
+#include "sdrplay_api_rspDx.h"
+
+// Dev parameter enums
+typedef enum
+{
+    sdrplay_api_ISOCH = 0,
+    sdrplay_api_BULK  = 1
+} sdrplay_api_TransferModeT;
+
+// Dev parameter structs
+typedef struct 
+{
+    double fsHz;                        // default: 2000000.0
+    unsigned char syncUpdate;           // default: 0
+    unsigned char reCal;                // default: 0
+} sdrplay_api_FsFreqT;
+
+typedef struct 
+{
+    unsigned int sampleNum;             // default: 0
+    unsigned int period;                // default: 0
+} sdrplay_api_SyncUpdateT;
+
+typedef struct 
+{
+    unsigned char resetGainUpdate;      // default: 0
+    unsigned char resetRfUpdate;        // default: 0
+    unsigned char resetFsUpdate;        // default: 0
+} sdrplay_api_ResetFlagsT;   
+
+typedef struct 
+{
+    double ppm;                         // default: 0.0
+    sdrplay_api_FsFreqT fsFreq;
+    sdrplay_api_SyncUpdateT syncUpdate; 
+    sdrplay_api_ResetFlagsT resetFlags; 
+    sdrplay_api_TransferModeT mode;     // default: sdrplay_api_ISOCH
+    unsigned int samplesPerPkt;         // default: 0 (output param)
+    sdrplay_api_Rsp1aParamsT rsp1aParams;
+    sdrplay_api_Rsp2ParamsT rsp2Params;
+    sdrplay_api_RspDuoParamsT rspDuoParams;
+    sdrplay_api_RspDxParamsT rspDxParams;
+} sdrplay_api_DevParamsT;
+
+#endif //SDRPLAY_API_DEV_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_rsp1a.h Added

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_rsp2.h Added

@@ -0,0 +1,35 @@
+#ifndef SDRPLAY_API_RSP2_H
+#define SDRPLAY_API_RSP2_H
+
+#define RSPII_NUM_LNA_STATES         9
+#define RSPII_NUM_LNA_STATES_AMPORT  5
+#define RSPII_NUM_LNA_STATES_420MHZ  6
+
+// RSP2 parameter enums
+typedef enum
+{
+    sdrplay_api_Rsp2_ANTENNA_A = 5,
+    sdrplay_api_Rsp2_ANTENNA_B = 6,
+} sdrplay_api_Rsp2_AntennaSelectT;
+
+typedef enum
+{
+    sdrplay_api_Rsp2_AMPORT_1 = 1,
+    sdrplay_api_Rsp2_AMPORT_2 = 0,
+} sdrplay_api_Rsp2_AmPortSelectT;
+
+// RSP2 parameter structs
+typedef struct 
+{
+    unsigned char extRefOutputEn;                // default: 0
+} sdrplay_api_Rsp2ParamsT;
+
+typedef struct 
+{
+    unsigned char biasTEnable;                   // default: 0
+    sdrplay_api_Rsp2_AmPortSelectT amPortSel;    // default: sdrplay_api_Rsp2_AMPORT_2
+    sdrplay_api_Rsp2_AntennaSelectT antennaSel;  // default: sdrplay_api_Rsp2_ANTENNA_A
+    unsigned char rfNotchEnable;                 // default: 0
+} sdrplay_api_Rsp2TunerParamsT;
+
+#endif //SDRPLAY_API_RSP2_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_rspDuo.h Added

@@ -0,0 +1,40 @@
+#ifndef SDRPLAY_API_RSPduo_H
+#define SDRPLAY_API_RSPduo_H
+
+#define RSPDUO_NUM_LNA_STATES         10
+#define RSPDUO_NUM_LNA_STATES_AMPORT  5
+#define RSPDUO_NUM_LNA_STATES_AM      7
+#define RSPDUO_NUM_LNA_STATES_LBAND   9
+
+// RSPduo parameter enums
+typedef enum
+{
+    sdrplay_api_RspDuoMode_Unknown      = 0,
+    sdrplay_api_RspDuoMode_Single_Tuner = 1,
+    sdrplay_api_RspDuoMode_Dual_Tuner   = 2,
+    sdrplay_api_RspDuoMode_Master       = 4,
+    sdrplay_api_RspDuoMode_Slave        = 8,
+} sdrplay_api_RspDuoModeT;
+
+typedef enum
+{
+    sdrplay_api_RspDuo_AMPORT_1 = 1,
+    sdrplay_api_RspDuo_AMPORT_2 = 0,
+} sdrplay_api_RspDuo_AmPortSelectT;
+
+// RSPduo parameter structs
+typedef struct 
+{
+    int extRefOutputEn;                             // default: 0
+} sdrplay_api_RspDuoParamsT;
+
+typedef struct 
+{
+    unsigned char biasTEnable;                      // default: 0
+    sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
+    unsigned char tuner1AmNotchEnable;              // default: 0
+    unsigned char rfNotchEnable;                    // default: 0
+    unsigned char rfDabNotchEnable;                 // default: 0
+} sdrplay_api_RspDuoTunerParamsT;
+
+#endif //SDRPLAY_API_RSPduo_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_rspDx.h Added

@@ -0,0 +1,45 @@
+#ifndef SDRPLAY_API_RSPDX_H
+#define SDRPLAY_API_RSPDX_H
+
+#include "sdrplay_api_tuner.h"
+
+#define RSPDX_NUM_LNA_STATES               28   // Number of LNA states in all bands (except where defined differently below)
+#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12  19   // Number of LNA states when using AM Port 2 between 0 and 12MHz
+#define RSPDX_NUM_LNA_STATES_AMPORT2_12_60 20   // Number of LNA states when using AM Port 2 between 12 and 60MHz
+#define RSPDX_NUM_LNA_STATES_VHF_BAND3     27   // Number of LNA states in VHF and Band3
+#define RSPDX_NUM_LNA_STATES_420MHZ        21   // Number of LNA states in 420MHz band
+#define RSPDX_NUM_LNA_STATES_LBAND         19   // Number of LNA states in L-band
+#define RSPDX_NUM_LNA_STATES_DX            26   // Number of LNA states in DX path
+
+// RSPdx parameter enums
+typedef enum
+{
+    sdrplay_api_RspDx_ANTENNA_A = 0,
+    sdrplay_api_RspDx_ANTENNA_B = 1,
+    sdrplay_api_RspDx_ANTENNA_C = 2,
+} sdrplay_api_RspDx_AntennaSelectT;
+
+typedef enum
+{
+    sdrplay_api_RspDx_HDRMODE_BW_0_200  = 0,
+    sdrplay_api_RspDx_HDRMODE_BW_0_500  = 1,
+    sdrplay_api_RspDx_HDRMODE_BW_1_200  = 2,
+    sdrplay_api_RspDx_HDRMODE_BW_1_700  = 3,
+} sdrplay_api_RspDx_HdrModeBwT;
+
+// RSPdx parameter structs
+typedef struct 
+{
+    unsigned char hdrEnable;                            // default: 0
+    unsigned char biasTEnable;                          // default: 0
+    sdrplay_api_RspDx_AntennaSelectT antennaSel;        // default: sdrplay_api_RspDx_ANTENNA_A
+    unsigned char rfNotchEnable;                        // default: 0
+    unsigned char rfDabNotchEnable;                     // default: 0
+} sdrplay_api_RspDxParamsT;
+
+typedef struct 
+{
+    sdrplay_api_RspDx_HdrModeBwT hdrBw;                 // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
+} sdrplay_api_RspDxTunerParamsT;
+
+#endif //SDRPLAY_API_RSPDX_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_rx_channel.h Added

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/include/sdrplay_api_tuner.h Added

@@ -0,0 +1,93 @@
+#ifndef SDRPLAY_API_TUNER_H
+#define SDRPLAY_API_TUNER_H
+
+#define MAX_BB_GR                         (59)
+
+// Tuner parameter enums
+typedef enum
+{
+    sdrplay_api_BW_Undefined = 0,
+    sdrplay_api_BW_0_200     = 200,
+    sdrplay_api_BW_0_300     = 300,
+    sdrplay_api_BW_0_600     = 600,
+    sdrplay_api_BW_1_536     = 1536,
+    sdrplay_api_BW_5_000     = 5000,
+    sdrplay_api_BW_6_000     = 6000,
+    sdrplay_api_BW_7_000     = 7000,
+    sdrplay_api_BW_8_000     = 8000
+} sdrplay_api_Bw_MHzT;
+
+typedef enum
+{
+    sdrplay_api_IF_Undefined = -1,
+    sdrplay_api_IF_Zero      = 0,
+    sdrplay_api_IF_0_450     = 450,
+    sdrplay_api_IF_1_620     = 1620,
+    sdrplay_api_IF_2_048     = 2048
+} sdrplay_api_If_kHzT;
+
+typedef enum
+{
+    sdrplay_api_LO_Undefined = 0,
+    sdrplay_api_LO_Auto      = 1,
+    sdrplay_api_LO_120MHz    = 2,
+    sdrplay_api_LO_144MHz    = 3,
+    sdrplay_api_LO_168MHz    = 4
+} sdrplay_api_LoModeT;
+
+typedef enum
+{
+    sdrplay_api_EXTENDED_MIN_GR = 0,
+    sdrplay_api_NORMAL_MIN_GR   = 20
+} sdrplay_api_MinGainReductionT;
+
+typedef enum
+{
+    sdrplay_api_Tuner_Neither  = 0,
+    sdrplay_api_Tuner_A        = 1,
+    sdrplay_api_Tuner_B        = 2,
+    sdrplay_api_Tuner_Both     = 3,
+} sdrplay_api_TunerSelectT;
+
+// Tuner parameter structs
+typedef struct
+{
+    float curr;
+    float max;
+    float min;
+} sdrplay_api_GainValuesT;
+
+typedef struct 
+{
+    int gRdB;                            // default: 50
+    unsigned char LNAstate;              // default: 0
+    unsigned char syncUpdate;            // default: 0
+    sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
+    sdrplay_api_GainValuesT gainVals;    // output parameter
+} sdrplay_api_GainT;
+
+typedef struct 
+{
+    double rfHz;                         // default: 200000000.0
+    unsigned char syncUpdate;            // default: 0
+} sdrplay_api_RfFreqT;
+
+typedef struct 
+{
+    unsigned char dcCal;                 // default: 3 (Periodic mode)
+    unsigned char speedUp;               // default: 0 (No speedup)
+    int trackTime;                       // default: 1    (=> time in uSec = (72 * 3 * trackTime) / 24e6       = 9uSec)
+    int refreshRateTime;                 // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
+} sdrplay_api_DcOffsetTunerT;
+
+typedef struct 
+{
+    sdrplay_api_Bw_MHzT bwType;          // default: sdrplay_api_BW_0_200
+    sdrplay_api_If_kHzT ifType;          // default: sdrplay_api_IF_Zero
+    sdrplay_api_LoModeT loMode;          // default: sdrplay_api_LO_Auto
+    sdrplay_api_GainT gain;
+    sdrplay_api_RfFreqT rfFreq;
+    sdrplay_api_DcOffsetTunerT dcOffsetTuner;
+} sdrplay_api_TunerParamsT;
+
+#endif //SDRPLAY_API_TUNER_H

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.cpp Added

@@ -0,0 +1,1412 @@
+#
+/*
+ *    Copyright (C) 2025
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of Qt-DAB
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation version 2 of the License.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QLabel>
+#include	<QPoint>
+#include	"dab-constants.h"
+#include	"sdrplay-handler-duo.h"
+#include	"position-handler.h"
+#include	"duo-commands.h"
+
+#include	"errorlog.h"
+#include	"settingNames.h"
+#include	"settings-handler.h"
+#include	"device-exceptions.h"
+
+#include	<QMessageBox>
+
+#define SDRPLAY_RSPduo_ 3
+
+#define SDRPLAY_SETTINGS        "SDRPLAY_SETTINGS_DUO"
+#define SDRPLAY_AGCMODE_A	"sdrplay_agcMode_A"
+#define SDRPLAY_AGCMODE_B	"sdrplay_agcMode_B"
+#define SDRPLAY_IFGRDB_A	"sdrplay-ifgrdb_A"
+#define SDRPLAY_IFGRDB_B	"sdrplay-ifgrdb_B"
+#define SDRPLAY_LNASTATE_A	"sdrplay-lnastate_A"
+#define SDRPLAY_LNASTATE_B	"sdrplay-lnastate_B"
+#define SDRPLAY_PPM_A		"sdrplay-ppm_A"
+#define SDRPLAY_PPM_B		"sdrplay-ppm_B"
+#define SDRPLAY_BIAS_T		"biasT_selector"
+#define SDRPLAY_NOTCH           "notch_selector" 
+
+static int lnaStates  = {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
+//
+
+#define	INRATE	8192000
+static
+std::string errorMessage (int errorCode) {
+	switch (errorCode) {
+	   case 1:
+	      return std::string ("Could not fetch library");
+	   case 2:
+	      return std::string ("error in fetching functions from library");
+	   case 3:
+	      return std::string ("sdrplay_api_Open failed");
+	   case 4:
+	      return std::string ("could not open sdrplay_api_ApiVersion");
+	   case 5:
+	      return std::string ("API versions do not match");
+	   case 6:
+	      return std::string ("sdrplay_api_GetDevices failed");
+	   case 7:
+	      return std::string ("no valid SDRplay device found");
+	   case 8:
+	      return std::string ("sdrplay_api_SelectDevice failed");
+	   case 9:
+	      return std::string ("sdrplay_api_GetDeviceParams failed");
+	   case 10:
+	      return std::string ("sdrplay_api+GetDeviceParams returns null");
+	   default:
+	      return std::string ("unidentified error with sdrplay device");
+	}
+	return "";
+}
+
+	sdrplayHandler_duo::
+	           sdrplayHandler_duo  (QSettings *s,
+	                                const QString &recorderVersion,
+	                                errorLogger *theLogger):
+	                                          _I_Buffer (4 * 1024 * 1024) {
+	sdrplaySettings			= s;
+	this	-> recorderVersion	= recorderVersion;
+	theErrorLogger			= theLogger;
+        setupUi (&myFrame);
+	setPositionAndSize (s, &myFrame, SDRPLAY_SETTINGS);
+	myFrame. show	();
+
+	overloadLabel_A -> setStyleSheet ("QLabel {background-color : green}");
+	overloadLabel_B -> setStyleSheet ("QLabel {background-color : green}");
+	nrBits			= 14;	// default
+	denominator		= 2048.0f;	// default
+
+//	See if there are settings from previous incarnations
+//	and config stuff
+
+	GRdBSelector_A 		-> setValue (
+	            value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                          SDRPLAY_IFGRDB_A, 20));
+	GRdBSelector_B 		-> setValue (
+	            value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                          SDRPLAY_IFGRDB_B, 20));
+	lnaGainSetting_A		-> setValue (
+	            value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                          SDRPLAY_LNASTATE_A, 3));
+	lnaGainSetting_A		-> setMaximum (9);
+	int lnaState_A			= lnaGainSetting_A -> value ();
+	lnaGRdBDisplay_A		-> display (lnaStates lnaState_A);
+
+	lnaGainSetting_B		-> setValue (
+	            value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                          SDRPLAY_LNASTATE_B, 3));
+	lnaGainSetting_B		-> setMaximum (9);
+	int lnaState_B			= lnaGainSetting_B -> value ();
+	lnaGRdBDisplay_B		-> display (lnaStates lnaState_B);
+
+	ppmControl_A		-> setValue (
+	            value_f (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                          SDRPLAY_PPM_A, 0.0));
+	ppmControl_B		-> setValue (
+	            value_f (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                          SDRPLAY_PPM_B, 0.0));
+
+	int agcMode_A	= value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                      SDRPLAY_AGCMODE_A, 0) != 0;
+
+	if (agcMode_A) {
+	   agcControl_A -> setChecked (true);
+	   GRdBSelector_A         -> hide ();
+	   gainsliderLabel_A      -> hide ();
+	}
+
+	int agcMode_B	= value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                      SDRPLAY_AGCMODE_B, 0) != 0;
+
+	if (agcMode_B) {
+	   agcControl_B -> setChecked (true);
+	   GRdBSelector_B         -> hide ();
+	   gainSliderLabel_B      -> hide ();
+	}
+
+	int biasT           =
+               value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                      SDRPLAY_BIAS_T, 0) != 0;
+        if (biasT)
+           biasT_selector -> setChecked (true);
+
+	bool notch	=
+               value_i (sdrplaySettings, SDRPLAY_SETTINGS,
+	                                      SDRPLAY_NOTCH, 0) != 0;
+	if (notch)
+	   notch_selector -> setChecked (true);
+//
+//	and be prepared for future changes in the settings
+	connect (GRdBSelector_A, qOverload<int>(&QSpinBox::valueChanged),
+	         this, &sdrplayHandler_duo::setIfGainReduction_A);
+	connect (GRdBSelector_B, qOverload<int>(&QSpinBox::valueChanged),
+	         this, &sdrplayHandler_duo::setIfGainReduction_B);
+	connect (lnaGainSetting_A, qOverload<int>(&QSpinBox::valueChanged),
+	         this, &sdrplayHandler_duo::setLnaGainReduction_A);
+	connect (lnaGainSetting_B, qOverload<int>(&QSpinBox::valueChanged),
+	         this, &sdrplayHandler_duo::setLnaGainReduction_B);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	connect (agcControl_A, &QCheckBox::checkStateChanged,
+#else
+	connect (agcControl_A, &QCheckBox::stateChanged,
+#endif
+	         this, &sdrplayHandler_duo::setAgcControl_A);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	connect (agcControl_B, &QCheckBox::checkStateChanged,
+#else
+	connect (agcControl_B, &QCheckBox::stateChanged,
+#endif
+	         this, &sdrplayHandler_duo::setAgcControl_B);
+
+	connect (ppmControl_A, qOverload<double>(&QDoubleSpinBox::valueChanged),
+	         this, &sdrplayHandler_duo::setPpmControl_A);
+	connect (ppmControl_B, qOverload<double>(&QDoubleSpinBox::valueChanged),
+	         this, &sdrplayHandler_duo::setPpmControl_B);
+
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	connect (notch_selector, &QCheckBox::checkStateChanged,	
+#else
+	connect (notch_selector, &QCheckBox::stateChanged,	
+#endif
+	         this, &sdrplayHandler_duo::setNotch);
+
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	connect (biasT_selector, &QCheckBox::checkStateChanged,	
+#else
+	connect (biasT_selector, &QCheckBox::stateChanged,	
+#endif
+	         this, &sdrplayHandler_duo::setBiasT);
+
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	connect (this, &sdrplayHandler_duo::overloadStateChanged_A,
+#else
+	connect (this, &sdrplayHandler_duo::overloadStateChanged_A,
+#endif
+	         this, &sdrplayHandler_duo::reportOverloadState_A);
+
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	connect (this, &sdrplayHandler_duo::overloadStateChanged_B,
+#else
+	connect (this, &sdrplayHandler_duo::overloadStateChanged_B,
+#endif
+	         this, &sdrplayHandler_duo::reportOverloadState_B);
+
+	connect (tunerSelect,
+#if QT_VERSION >= QT_VERSION_CHECK (5, 15, 2)
+                    qOverload<const QString &> (&QComboBox::textActivated),
+#else
+                    qOverload<const QString &> (&QComboBox::activated),
+#endif
+	         this, &sdrplayHandler_duo::handle_TunerSelect);
+
+	currentTuner. store ('A');
+	A_Buffer_filled. store (false);
+	B_Buffer_filled. store (false);
+	lastFrequency	= MHz (220);
+	theGain		= -1;
+	debugControl	-> hide ();
+	failFlag. store (false);
+	successFlag. store (false);
+	errorCode	= 0;
+
+	Handle                  = fetchLibrary ();
+        if (Handle == nullptr) {
+           failFlag. store (true);
+           errorCode    = 1;
+           return;
+        }
+
+//      load the functions
+        bool success    = loadFunctions ();
+        if (!success) {
+           failFlag. store (true);
+           releaseLibrary ();
+           errorCode    = 2;
+           return;
+        }
+        fprintf (stderr, "functions loaded\n");
+
+//	run the "handler" task
+	start ();
+	while (!failFlag. load () && !successFlag. load () && isRunning ())
+	   usleep (1000);
+	if (failFlag. load ()) {
+	   while (isRunning ())
+	      usleep (1000);
+	   throw device_exception (errorMessage (errorCode));
+	}
+	
+	fprintf (stderr, "setup sdrplay duo seems successfull\n");
+}
+
+	sdrplayHandler_duo::~sdrplayHandler_duo () {
+	threadRuns. store (false);
+	while (isRunning ())
+	   usleep (1000);
+//	thread should be stopped by now
+	myFrame. hide ();
+	storeWidgetPosition (sdrplaySettings, &myFrame, SDRPLAY_SETTINGS);
+	sdrplaySettings	-> sync();
+}
+
+/////////////////////////////////////////////////////////////////////////
+//	Implementing the interface
+/////////////////////////////////////////////////////////////////////////
+
+bool	sdrplayHandler_duo::restartReader (int32_t newFreq, int skipped) {
+duo_restart r (newFreq);
+
+        if (receiverRuns. load ())
+           return true;
+        lastFrequency    = newFreq;
+	this ->  toSkip	= skipped;
+	_I_Buffer. FlushRingBuffer();
+	return messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::stopReader	() {
+duo_stop r;
+        if (!receiverRuns. load ())
+           return;
+        messageHandler (&r);	// synchronous call
+	_I_Buffer. FlushRingBuffer();
+}
+
+int32_t	sdrplayHandler_duo::getSamples (std::complex<float> *V, int32_t size) { 
+	if (!receiverRuns. load ())
+	   return 0;
+	int amount      = _I_Buffer. getDataFromBuffer (V, size);
+        return amount;
+}
+
+int32_t	sdrplayHandler_duo::Samples	() {
+	if (!receiverRuns. load ())
+	   return 0;
+	return _I_Buffer. GetRingBufferReadAvailable ();
+}
+
+void	sdrplayHandler_duo::resetBuffer	() {
+	_I_Buffer. FlushRingBuffer();
+}
+
+int16_t	sdrplayHandler_duo::bitDepth	() {
+	return nrBits;
+}
+
+QString	sdrplayHandler_duo::deviceName	() {
+	return deviceModel + ":" + serial;
+}
+
+void	sdrplayHandler_duo::
+	         updatePowerOverload_A (sdrplay_api_EventParamsT *params) {
+	sdrplay_api_Update (chosenDevice -> dev,
+	                    sdrplay_api_Tuner_A,
+	                    sdrplay_api_Update_Ctrl_OverloadMsgAck,
+	                    sdrplay_api_Update_Ext1_None);
+	emit overloadStateChanged_A (
+	        params -> powerOverloadParams.powerOverloadChangeType ==
+	                                   sdrplay_api_Overload_Detected);
+}
+
+void	sdrplayHandler_duo::
+	         updatePowerOverload_B (sdrplay_api_EventParamsT *params) {
+	sdrplay_api_Update (chosenDevice -> dev,
+	                    sdrplay_api_Tuner_B,
+	                    sdrplay_api_Update_Ctrl_OverloadMsgAck,
+	                    sdrplay_api_Update_Ext1_None);
+	emit overloadStateChanged_B (
+	        params -> powerOverloadParams.powerOverloadChangeType ==
+	                                   sdrplay_api_Overload_Detected);
+}
+
+//	private slots
+void	sdrplayHandler_duo::setAgcControl_A (int dummy) {
+bool    agcMode = agcControl_A -> isChecked ();
+duo_Agc_A r (agcMode, 30);
+	(void)dummy;
+        messageHandler (&r);
+	if (agcMode) {
+           GRdBSelector_A         -> hide ();
+           gainsliderLabel_A      -> hide ();
+	}
+	else {
+	   duo_GRdB_A r2 (GRdBSelector_A -> value ());
+	   GRdBSelector_A		-> show ();
+	   gainsliderLabel_A	-> show ();
+	   messageHandler  (&r2);
+	}
+}
+
+void	sdrplayHandler_duo::setAgcControl_B (int dummy) {
+bool    agcMode = agcControl_B -> isChecked ();
+duo_Agc_B r (agcMode, 30);
+	(void)dummy;
+        messageHandler (&r);
+	if (agcMode) {
+           GRdBSelector_B         -> hide ();
+           gainSliderLabel_B      -> hide ();
+	}
+	else {
+	   duo_GRdB_B r2 (GRdBSelector_B -> value ());
+	   GRdBSelector_B	-> show ();
+	   gainSliderLabel_B	-> show ();
+	   messageHandler  (&r2);
+	}
+}
+
+void	sdrplayHandler_duo::setIfGainReduction_A (int GRdB) {
+duo_GRdB_A r (GRdB);
+	
+	if (!receiverRuns. load ())
+           return;
+        messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::setIfGainReduction_B (int GRdB) {
+duo_GRdB_B r (GRdB);
+	
+	if (!receiverRuns. load ())
+           return;
+        messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::setLnaGainReduction_A (int lnaState) {
+duo_lna_A r (lnaState);
+
+	if (!receiverRuns. load ())
+           return;
+        messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::setLnaGainReduction_B (int lnaState) {
+duo_lna_B r (lnaState);
+
+	if (!receiverRuns. load ())
+           return;
+        messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::setPpmControl_A (int ppm) {
+duo_ppm_A r (ppm);
+        messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::setPpmControl_B (int ppm) {
+duo_ppm_B r (ppm);
+        messageHandler (&r);
+}
+
+void	sdrplayHandler_duo::setNotch (int v) {
+duo_notch r (notch_selector -> isChecked () ? 1 : 0);
+	(void)v;
+	messageHandler (&r);
+	store (sdrplaySettings, SDRPLAY_SETTINGS,
+	                           SDRPLAY_NOTCH,
+	                              notch_selector -> isChecked () ? 1 : 0);
+}
+
+void	sdrplayHandler_duo::setBiasT (int v) {
+duo_biasT r (biasT_selector -> isChecked () ? 1 : 0);
+
+	(void)v;
+	messageHandler (&r);
+	store (sdrplaySettings, SDRPLAY_SETTINGS,
+	                          SDRPLAY_BIAS_T,
+	                              biasT_selector -> isChecked () ? 1 : 0);
+}
+
+	
+//
+///////////////////////////////////////////////////////////////////////////
+//	Handling the GUI
+//////////////////////////////////////////////////////////////////////
+//
+//	Since the daemon is not threadproof, we have to package the
+//	actual interface into its own thread.
+//	Communication with that thread is synchronous!
+//
+
+void	sdrplayHandler_duo::setLnaBounds (int low, int high) {
+	lnaGainSetting_A	-> setRange (low, high - 1);
+	lnaGainSetting_B	-> setRange (low, high - 1);
+}
+
+void	sdrplayHandler_duo::setSerial	(const QString& s) {
+	serialNumber	-> setText (s);
+}
+
+void	sdrplayHandler_duo::setApiVersion (float version) {
+QString v = QString::number (version, 'r', 2);
+	api_version	-> display (v);
+}
+
+void    sdrplayHandler_duo::showLnaGain (int g) {
+        lnaGRdBDisplay_A  -> display (g);
+}
+///////////////////////////////////////////////////////////////////////
+//	the real controller starts here
+///////////////////////////////////////////////////////////////////////
+
+bool    sdrplayHandler_duo::messageHandler (duoCommand *r) {
+        serverQueue. push (r);
+	serverJobs. release (1);
+	while (!r -> waiter. tryAcquire (1, 1000))
+	   if (!threadRuns. load ())
+	      return false;
+	return true;
+}
+
+static
+void    StreamACallback (short *xi, short *xq,
+                         sdrplay_api_StreamCbParamsT *params,
+                         unsigned int numSamples,
+	                 unsigned int reset,
+                         void *cbContext) {
+sdrplayHandler_duo *p	=
+	           static_cast<sdrplayHandler_duo *> (cbContext);
+
+std::complex<float> localBuf numSamples;
+	(void)params;
+	if (reset)
+	   return;
+	if (!p -> receiverRuns. load ())
+	   return;
+
+	for (int i = 0; i <  (int)numSamples; i ++) {
+	   std::complex<float> symb =
+	            std::complex<float> (xi i / 2048.0, xq i / 2048.0);
+	   localBuf i = symb;
+	}
+	p -> processInput ('A', localBuf,
+	                     numSamples, params -> firstSampleNum);
+}
+
+static
+void	StreamBCallback (short *xi, short *xq,
+                         sdrplay_api_StreamCbParamsT *params,
+                         unsigned int numSamples, unsigned int reset,
+                         void *cbContext) {
+sdrplayHandler_duo *p	= static_cast<sdrplayHandler_duo *> (cbContext);
+std::complex<float> localBuf numSamples;
+	(void)params;
+	if (reset)
+	   return;
+	if (!p -> receiverRuns. load ())
+	   return;
+
+	for (int i = 0; i <  (int)numSamples; i ++) {
+	   std::complex<float> symb =
+	            std::complex<float> (xi i / 2048.0, xq i / 2048.0);
+	   localBuf i = symb;
+	}
+	p -> processInput ('B', localBuf,
+	                     numSamples, params -> firstSampleNum);
+}
+
+static
+void	EventCallback (sdrplay_api_EventT eventId,
+                       sdrplay_api_TunerSelectT tuner,
+                       sdrplay_api_EventParamsT *params,
+                       void *cbContext) {
+sdrplayHandler_duo *p	= static_cast<sdrplayHandler_duo *> (cbContext);
+	switch (eventId) {
+	   case sdrplay_api_GainChange:
+	      if (tuner == sdrplay_api_Tuner_A)
+	         p -> showTunerGain_A (params -> gainParams. currGain);
+	      if (tuner == sdrplay_api_Tuner_B)
+	         p -> showTunerGain_B (params -> gainParams. currGain);
+	      break;
+
+	   case sdrplay_api_PowerOverloadChange:
+	      if (tuner == sdrplay_api_Tuner_A)
+	         p -> updatePowerOverload_A (params);
+	      if (tuner == sdrplay_api_Tuner_B)
+	         p -> updatePowerOverload_B (params);
+	      break;
+
+	case sdrplay_api_RspDuoModeChange:
+	fprintf (stderr, 
+	          "sdrplay_api_EventCb: %s, tuner=%s modeChangeType=%s\n",
+	                 "sdrplay_api_RspDuoModeChange",
+	                 (tuner == sdrplay_api_Tuner_A)?
+	                      "sdrplay_api_Tuner_A": "sdrplay_api_Tuner_B",
+                         (params -> rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_MasterInitialised)?
+	                      "sdrplay_api_MasterInitialised":
+	                 (params -> rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_SlaveAttached)?
+	                      "sdrplay_api_SlaveAttached":
+	                 (params -> rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_SlaveDetached)?
+	                       "sdrplay_api_SlaveDetached":
+	                 (params -> rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_SlaveInitialised)?
+	                       "sdrplay_api_SlaveInitialised":
+	                 (params -> rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_SlaveUninitialised)?
+	                       "sdrplay_api_SlaveUninitialised":
+	                 (params -> rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_MasterDllDisappeared)?
+	                       "sdrplay_api_MasterDllDisappeared":
+	                 (params->rspDuoModeParams.modeChangeType ==
+	                              sdrplay_api_SlaveDllDisappeared)?
+	                             "sdrplay_api_SlaveDllDisappeared":
+	                                                   "unknown type");
+
+	break;
+
+	   default:
+	      fprintf (stderr, "event %d\n", eventId);
+	      break;
+	}
+}
+
+void	sdrplayHandler_duo::run		() {
+sdrplay_api_ErrT        err;
+sdrplay_api_DeviceT     devs 6;
+uint32_t                ndev;
+int	deviceIndex	= 0;
+        threadRuns. store (false);
+	receiverRuns. store (false);
+
+	showState ("");
+	chosenDevice		= nullptr;
+
+	connect (this, &sdrplayHandler_duo::setSerialSignal,
+	         this, &sdrplayHandler_duo::setSerial);
+	connect (this, &sdrplayHandler_duo::setApiVersionSignal,
+	         this, &sdrplayHandler_duo::setApiVersion);
+
+	denominator		= 2048.0f;		// default
+	nrBits			= 12;		// default
+
+
+//	try to open the API
+	err	= sdrplay_api_Open ();
+	if (err != sdrplay_api_Success) {
+	   theErrorLogger -> add (recorderVersion,
+	                          sdrplay_api_GetErrorString (err));
+	   failFlag. store (true);
+	   releaseLibrary	();
+	   errorCode	= 3;
+	   return;
+	}
+
+//	Check API versions match
+        err = sdrplay_api_ApiVersion (&apiVersion);
+        if (err  != sdrplay_api_Success) {
+	   theErrorLogger -> add (recorderVersion,
+                                     sdrplay_api_GetErrorString (err));
+	   errorCode	= 4;
+	   goto closeAPI;
+        }
+
+	if (apiVersion < 3.07) {
+           fprintf (stderr, "API versions don't match (local=%.2f dll=%.2f)\n",
+                                              SDRPLAY_API_VERSION, apiVersion);
+	   errorCode	= 5;
+	   goto closeAPI;
+	}
+	
+	fprintf (stderr, "api version %f detected\n", apiVersion);
+//
+//	lock API while device selection is performed
+	sdrplay_api_LockDeviceApi ();
+
+	{  int s	= sizeof (devs) / sizeof (sdrplay_api_DeviceT);
+	   err	= sdrplay_api_GetDevices (devs, &ndev, s);
+	   if (err != sdrplay_api_Success) {
+	      theErrorLogger -> add (recorderVersion,
+	                           sdrplay_api_GetErrorString (err));
+	      errorCode		= 6;
+	      fprintf (stderr, "Fout 6\n");
+	      goto unlockDevice_closeAPI;
+	   }
+	}
+
+	fprintf (stderr, "MaxDevs=%d NumDevs=%d\n",
+                   (int)(sizeof(devs) / sizeof(sdrplay_api_DeviceT)), ndev);
+
+	if (ndev == 0) {
+	   theErrorLogger -> add (recorderVersion, "no valid device found\n");
+	   errorCode	= 7;
+	   goto unlockDevice_closeAPI;
+	}
+
+	for (int i = 0; i < (int)ndev; i++) 
+           if (devs i. hwVer == SDRPLAY_RSPduo_ID)
+              fprintf (stderr,
+	               "Dev%d: SerNo=%s hwVer=%d tuner=0x%.2x rspDuoMode=0x%.2x\n",
+                          i,
+                          devs i. SerNo,
+                          devs i. hwVer,
+                          devs i. tuner, devsi.rspDuoMode);
+
+	deviceIndex	= 0;
+	hwVersion	= devs deviceIndex. hwVer;
+	if (hwVersion != SDRPLAY_RSPduo_)
+	   throw device_exception ("This handler is solely for the RspDuo\n");
+
+	chosenDevice	= &devs deviceIndex;
+
+	serial		= devs deviceIndex. SerNo;
+	chosenDevice	-> tuner  = sdrplay_api_Tuner_Both;
+	chosenDevice	-> rspDuoMode = sdrplay_api_RspDuoMode_Dual_Tuner;
+	chosenDevice	-> rspDuoSampleFreq	= INRATE;
+
+	fprintf (stderr,
+	        "Dev%d: SerNo=%s hwVer=%d tuner=0x%.2x rspDuoMode=0x%.2x\n",
+	                  deviceIndex,
+                          devs deviceIndex. SerNo,
+                          devs deviceIndex. hwVer,
+                          devs deviceIndex. tuner,
+	                  devs deviceIndex.rspDuoMode);
+//	select chosen device
+	err	= sdrplay_api_SelectDevice (chosenDevice);
+	if (err != sdrplay_api_Success) {
+	   theErrorLogger -> add (recorderVersion,
+	                         sdrplay_api_GetErrorString (err));
+	   errorCode	= 8;
+	   fprintf (stderr, "fout 8\n");
+	   goto unlockDevice_closeAPI;
+	}
+
+	fprintf (stderr, "selected samplerate %f\n",
+	                chosenDevice -> rspDuoSampleFreq);
+//	Unlock API now that device is selected
+	sdrplay_api_UnlockDeviceApi ();
+
+	err		= sdrplay_api_GetDeviceParams (chosenDevice -> dev,
+	                                                &deviceParams);
+	fprintf (stderr, "device parameters\n");
+	if (err != sdrplay_api_Success) {
+	   fprintf (stderr, "sdrplay_api_GetDeviceParams failed %s\n",
+	                         sdrplay_api_GetErrorString (err));
+	   throw (21);
+	}
+
+	if (deviceParams == nullptr) {
+	   fprintf (stderr, "sdrplay_api_GetDeviceParams return null as par\n");
+	   throw (22);
+	}
+
+
+	deviceParams	-> devParams -> fsFreq. fsHz	= INRATE;
+//	Configure tuner parameters (depends on selected Tuner
+//	which parameters to use)
+	chParams_A	= deviceParams -> rxChannelA;
+	chParams_B	= deviceParams -> rxChannelB;
+	if ((chParams_A == nullptr) || (chParams_B == nullptr)) {
+	   fprintf (stderr, "ChannelParams = NULL\n");
+	   throw (25);
+	}
+
+	chParams_A	-> tunerParams. rfFreq. rfHz    = (float)220000000;
+	chParams_A	-> tunerParams. bwType = sdrplay_api_BW_1_536;
+	chParams_A	-> tunerParams. ifType = sdrplay_api_IF_2_048;
+	chParams_A	-> tunerParams. gain.gRdB = 40;
+	chParams_A	-> tunerParams. gain.LNAstate = 3;
+
+        chParams_A	-> ctrlParams. agc. setPoint_dBfs = -30;
+        chParams_A	-> ctrlParams. agc. attack_ms = 500;
+        chParams_A	-> ctrlParams. agc. decay_ms = 500;
+        chParams_A	-> ctrlParams. agc. decay_delay_ms = 200;
+        chParams_A	-> ctrlParams. agc. decay_threshold_dB = 3;
+
+	chParams_B	-> tunerParams. rfFreq. rfHz    = (float)220000000;
+	chParams_B	-> tunerParams. bwType = sdrplay_api_BW_1_536;
+	chParams_B	-> tunerParams. ifType = sdrplay_api_IF_2_048;
+	chParams_B	-> tunerParams. gain.gRdB = 40;
+	chParams_B	-> tunerParams. gain.LNAstate = 3;
+
+        chParams_B	-> ctrlParams. agc. setPoint_dBfs = -30;
+        chParams_B	-> ctrlParams. agc. attack_ms = 500;
+        chParams_B	-> ctrlParams. agc. decay_ms = 500;
+        chParams_B	-> ctrlParams. agc. decay_delay_ms = 200;
+        chParams_B	-> ctrlParams. agc. decay_threshold_dB = 3;
+
+//	assign callback functions
+	cbFns. StreamACbFn	= StreamACallback;
+	cbFns. StreamBCbFn	= StreamBCallback;
+	cbFns. EventCbFn	= EventCallback;
+
+	err	= sdrplay_api_Init (chosenDevice -> dev, &cbFns, this);
+	fprintf (stderr, "%s\n", sdrplay_api_GetErrorString (err));
+
+        if (agcControl_A -> isChecked ()) { 
+           chParams_A	-> ctrlParams. agc. enable = sdrplay_api_AGC_CTRL_EN;
+	}
+	else {
+	   chParams_A   -> ctrlParams. agc. enable =
+                                                  sdrplay_api_AGC_DISABLE;
+	}
+        if (agcControl_B -> isChecked ()) { 
+           chParams_B	-> ctrlParams. agc. enable = sdrplay_api_AGC_CTRL_EN;
+	}
+	else {
+	   chParams_B   -> ctrlParams. agc. enable =
+                                                  sdrplay_api_AGC_DISABLE;
+	}
+	deviceLabel	-> setText (deviceModel);
+	setSerialSignal       (serial);
+        setApiVersionSignal   (apiVersion);
+
+	threadRuns. store (true);       // it seems we can do some work
+	successFlag. store (true);
+
+	while (threadRuns. load ()) {
+	   while (!serverJobs. tryAcquire (1, 1000))
+	   if (!threadRuns. load ())
+	      goto normal_exit;
+
+//	here we could assert that the serverQueue is not empty
+//	Note that we emulate synchronous calling, so
+//	we signal the caller when we are done
+	   switch (serverQueue. front () -> cmd) {
+	      case DUO_RESTART: {
+	         duo_restart *p = (duo_restart *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_restart (p -> freq);
+	         receiverRuns. store (true);
+	         p -> waiter. release (1);
+	         fprintf (stderr, "we zijn gestart %d\n", p -> freq);
+	         break;
+	      }
+	       
+	      case DUO_STOP: {
+	         duo_stop *p = (duo_stop *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         receiverRuns. store (false);
+	         p -> waiter. release (1);
+	         fprintf (stderr, "en weer gestopt\n");
+	         break;
+	      }
+	       
+	      case DUO_SETAGC_A: {
+	         duo_Agc_A *p = 
+	                    (duo_Agc_A *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setAgc ('A', -p -> setPoint, p -> agcMode);
+	         p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETAGC_B: {
+	         duo_Agc_B *p = 
+	                    (duo_Agc_B *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setAgc ('B', -p -> setPoint, p -> agcMode);
+	         p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETLNA_A: {
+	         duo_lna_A *p =
+	                    (duo_lna_A *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setLna ('A', p -> lnaState);
+                 p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETLNA_B: {
+	         duo_lna_B *p =
+	                    (duo_lna_B *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setLna ('B', p -> lnaState);
+                 p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETGRDB_A: {
+	         duo_GRdB_A *p =
+	                     (duo_GRdB_A *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setGRdB ('A', p -> GRdBValue);
+                 p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETGRDB_B: {
+	         duo_GRdB_B *p =
+	                     (duo_GRdB_B *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setGRdB ('B', p -> GRdBValue);
+                 p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETPPM_A: {
+	         duo_ppm_A *p =
+	                    (duo_ppm_A *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setPpm ('A', p -> ppmValue);
+	         p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETPPM_B: {
+	         duo_ppm_B *p =
+	                    (duo_ppm_B *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setPpm ('B', p -> ppmValue);
+	         p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETNOTCH: {
+	         duo_notch *p =
+	                       (duo_notch *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setNotch (p -> checked);
+                 p -> waiter. release (1);
+	         break;
+	      }
+
+	      case DUO_SETBIAS_T: {
+	         duo_biasT *p =
+	                    (duo_biasT *)(serverQueue. front ());
+	         serverQueue. pop ();
+	         p -> result = do_setBiasT (p -> checked);
+                 p -> waiter. release (1);
+	         break;
+	      }
+
+	      default:		// cannot happen
+	         fprintf (stderr, "Helemaal fout\n");
+	         break;
+	   }
+	}
+
+normal_exit:
+	err = sdrplay_api_Uninit	(chosenDevice -> dev);
+	if (err != sdrplay_api_Success) 
+	   theErrorLogger -> add (recorderVersion,
+	                          sdrplay_api_GetErrorString (err));
+	      
+	err = sdrplay_api_ReleaseDevice	(chosenDevice);
+	if (err != sdrplay_api_Success) 
+	   theErrorLogger -> add (recorderVersion,
+	                          sdrplay_api_GetErrorString (err));
+
+//	sdrplay_api_UnlockDeviceApi	(); ??
+//closeApi:
+        sdrplay_api_Close               ();
+	if (err != sdrplay_api_Success) 
+	   theErrorLogger -> add (recorderVersion,
+	                          sdrplay_api_GetErrorString (err));
+
+	releaseLibrary	();
+	fprintf (stderr, "library released, ready to stop thread\n");
+	msleep (200);
+	return;
+
+unlockDevice_closeAPI:
+	sdrplay_api_UnlockDeviceApi	();
+closeAPI:	
+	failFlag. store (true);
+	sdrplay_api_ReleaseDevice       (chosenDevice);
+        sdrplay_api_Close               ();
+	releaseLibrary			();
+	fprintf (stderr, "De taak is gestopt\n");
+}
+
+bool	sdrplayHandler_duo::do_restart (int freq) {
+sdrplay_api_ErrT        err;
+
+	chParams_A -> tunerParams. rfFreq. rfHz = (float)freq;
+	err =  sdrplay_api_Update (chosenDevice -> dev,
+	                           sdrplay_api_Tuner_Both,
+                                   sdrplay_api_Update_Tuner_Frf,
+                                   sdrplay_api_Update_Ext1_None);
+	if (err != sdrplay_api_Success) {
+	   QString errorString =  sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	   return false;
+	}
+
+	this -> freq	= freq;
+	showState (QString ("Restart at ") + QString::number (freq / 1000) + "Khz");
+	return true;
+}
+
+bool	sdrplayHandler_duo::do_setPpm	(char tuner, double ppmValue) {
+sdrplay_api_ErrT err;
+
+	deviceParams -> devParams -> ppm = ppmValue;
+	err = sdrplay_api_Update (chosenDevice -> dev,
+	                          tuner == 'A' ? sdrplay_api_Tuner_A :
+	                                         sdrplay_api_Tuner_B,
+	                          sdrplay_api_Update_Dev_Ppm,
+	                          sdrplay_api_Update_Ext1_None);
+	return err == sdrplay_api_Success;
+}
+
+//	setting agc is common to all models
+bool	sdrplayHandler_duo::do_setAgc (char tuner, int setPoint, bool on) {
+sdrplay_api_ErrT err;
+
+	if (on) {
+	   chParams_A -> ctrlParams. agc. setPoint_dBfs = setPoint;
+	   chParams_A -> ctrlParams. agc. enable = sdrplay_api_AGC_CTRL_EN;
+	}
+	else {
+	   chParams_A -> ctrlParams.agc.enable = sdrplay_api_AGC_DISABLE;
+	}
+
+	err = sdrplay_api_Update (chosenDevice -> dev,
+	                          tuner == 'A' ? sdrplay_api_Tuner_A:
+	                                        sdrplay_api_Tuner_B,
+	                          sdrplay_api_Update_Ctrl_Agc,
+	                          sdrplay_api_Update_Ext1_None);
+	if (err != sdrplay_api_Success) {
+	   QString errorString = sdrplay_api_GetErrorString (err);
+	   fprintf (stderr, "error %s in setAgc\n",
+	                            errorString. toLatin1 (). data ());
+	}
+	store (sdrplaySettings, SDRPLAY_SETTINGS,
+	                             (tuner == 'A') ?  SDRPLAY_AGCMODE_A:
+	                                               SDRPLAY_AGCMODE_B, on);
+
+	return err == sdrplay_api_Success;
+}
+
+bool	sdrplayHandler_duo::do_setLna	(char tuner, int lnaState) {
+sdrplay_api_ErrT        err;
+
+	chParams_A -> tunerParams. gain. LNAstate = lnaState;
+	err = sdrplay_api_Update (chosenDevice -> dev,
+	                          tuner == 'A' ? sdrplay_api_Tuner_A:
+	                                         sdrplay_api_Tuner_B,
+	                          sdrplay_api_Update_Tuner_Gr,
+	                          sdrplay_api_Update_Ext1_None);
+	if (err != sdrplay_api_Success) {
+	   QString errorString = sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	   return false;
+	}
+	if (tuner == 'A')
+           lnaGRdBDisplay_A  -> display (lnaStates lnaState);
+	else
+           lnaGRdBDisplay_B  -> display (lnaStates lnaState);
+	store (sdrplaySettings, SDRPLAY_SETTINGS,
+	                       (tuner == 'A') ?  SDRPLAY_LNASTATE_A:
+	                                         SDRPLAY_LNASTATE_B,  lnaState);
+
+	return true;
+}
+
+bool	sdrplayHandler_duo::do_setGRdB	(char tuner, int GRdBValue) {
+sdrplay_api_ErrT err;
+
+	chParams_A -> tunerParams. gain.gRdB = GRdBValue;
+	err =  sdrplay_api_Update (chosenDevice -> dev,
+	                           tuner == 'A' ? sdrplay_api_Tuner_A:
+	                                          sdrplay_api_Tuner_B,
+	                           sdrplay_api_Update_Tuner_Gr,
+	                           sdrplay_api_Update_Ext1_None);
+	if (err != sdrplay_api_Success) 
+	   return false;
+	store  (sdrplaySettings, SDRPLAY_SETTINGS,
+	                         (tuner == 'A') ?  SDRPLAY_IFGRDB_A:
+	                                           SDRPLAY_IFGRDB_B, GRdBValue);
+
+	return true;
+}
+
+bool	sdrplayHandler_duo::do_setNotch (bool on) {
+sdrplay_api_ErrT err;
+sdrplay_api_RspDuoTunerParamsT * rspDuoTunerParams;
+
+        rspDuoTunerParams = &(chParams_A -> rspDuoTunerParams);
+        rspDuoTunerParams -> rfNotchEnable = on;   
+        rspDuoTunerParams -> tuner1AmNotchEnable = on;
+
+        err = sdrplay_api_Update (chosenDevice -> dev,
+	                          sdrplay_api_Tuner_A,
+                                  (sdrplay_api_ReasonForUpdateT)(sdrplay_api_Update_RspDuo_RfNotchControl | sdrplay_api_Update_RspDuo_Tuner1AmNotchControl),
+	                          sdrplay_api_Update_Ext1_None);
+        if (err != sdrplay_api_Success) {
+           QString errorString = sdrplay_api_GetErrorString (err);
+           showState (errorString);
+           theErrorLogger -> add (deviceModel, errorString);
+        }
+        return err == sdrplay_api_Success;
+}
+
+bool	sdrplayHandler_duo::do_setBiasT	(bool biasT_value) {
+sdrplay_api_RspDuoTunerParamsT *rspDuoTunerParams;
+sdrplay_api_ErrT        err;
+
+	rspDuoTunerParams	= &(chParams_B -> rspDuoTunerParams);
+	rspDuoTunerParams	-> biasTEnable = biasT_value;
+	err = sdrplay_api_Update (chosenDevice -> dev,
+	                          sdrplay_api_Tuner_B,
+	                          sdrplay_api_Update_RspDuo_BiasTControl,
+		                  sdrplay_api_Update_Ext1_None);
+	                                                  
+	if (err != sdrplay_api_Success) {
+	   QString errorString = sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	}
+	return err == sdrplay_api_Success;
+}
+
+//
+
+/////////////////////////////////////////////////////////////////////////////
+//	handling the library
+/////////////////////////////////////////////////////////////////////////////
+
+HINSTANCE	sdrplayHandler_duo::fetchLibrary () {
+HINSTANCE	Handle	= nullptr;
+#ifdef	__MINGW32__
+HKEY APIkey;
+wchar_t APIkeyValue 256;
+ULONG APIkeyValue_length = 255;
+
+	wchar_t *libname = (wchar_t *)L"sdrplay_api.dll";
+	Handle	= LoadLibrary (libname);
+	if (Handle == nullptr) {
+	   if (RegOpenKey (HKEY_LOCAL_MACHINE,
+//	                   TEXT ("Software\\MiricsSDR\\API"),
+	                   TEXT ("Software\\SDRplay\\Service\\API"),
+	                   &APIkey) != ERROR_SUCCESS) {
+              fprintf (stderr,
+	           "failed to locate API registry entry, error = %d\n",
+	           (int)GetLastError());
+	      theErrorLogger -> add (recorderVersion, 
+	                         errorMessage ((int)GetLastError ()). c_str ());
+	   }
+	   else {
+	      RegQueryValueEx (APIkey,
+	                       (wchar_t *)L"Install_Dir",
+	                       nullptr,
+	                       nullptr,
+	                       (LPBYTE)&APIkeyValue,
+	                       (LPDWORD)&APIkeyValue_length);
+//	Ok, make explicit it is in the 32/64 bits section
+	      wchar_t *x =
+#ifndef __BITS64__
+	        wcscat (APIkeyValue, (wchar_t *)L"\\x86\\sdrplay_api.dll");
+#else
+	        wcscat (APIkeyValue, (wchar_t *)L"\\x64\\sdrplay_api.dll");
+#endif
+	      RegCloseKey (APIkey);
+
+	      Handle	= LoadLibrary (x);
+	   }
+	   if (Handle == nullptr) {
+	      fprintf (stderr, "Failed to open sdrplay_api.dll\n");
+	      return nullptr;
+	   }
+	}
+#else
+	Handle		= dlopen ("libusb-1.0.so", RTLD_NOW | RTLD_GLOBAL);
+	Handle		= dlopen ("libsdrplay_api.so", RTLD_NOW);
+	if (Handle == nullptr) {
+	   theErrorLogger -> add (recorderVersion, dlerror ());
+	   return nullptr;
+	}
+#endif
+	return Handle;
+}
+
+void	sdrplayHandler_duo::releaseLibrary () {
+#ifdef __MINGW32__
+        FreeLibrary (Handle);
+#else
+	dlclose (Handle);
+#endif
+}
+
+bool	sdrplayHandler_duo::loadFunctions () {
+	sdrplay_api_Open	= (sdrplay_api_Open_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_Open");
+	if ((void *)sdrplay_api_Open == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_Open\n");
+	   return false;
+	}
+
+	sdrplay_api_Close	= (sdrplay_api_Close_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_Close");
+	if (sdrplay_api_Close == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_Close\n");
+	   return false;
+	}
+
+	sdrplay_api_ApiVersion	= (sdrplay_api_ApiVersion_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_ApiVersion");
+	if (sdrplay_api_ApiVersion == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_ApiVersion\n");
+	   return false;
+	}
+
+	sdrplay_api_LockDeviceApi	= (sdrplay_api_LockDeviceApi_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_LockDeviceApi");
+	if (sdrplay_api_LockDeviceApi == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_LockdeviceApi\n");
+	   return false;
+	}
+
+	sdrplay_api_UnlockDeviceApi	= (sdrplay_api_UnlockDeviceApi_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_UnlockDeviceApi");
+	if (sdrplay_api_UnlockDeviceApi == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_UnlockdeviceApi\n");
+	   return false;
+	}
+
+	sdrplay_api_GetDevices		= (sdrplay_api_GetDevices_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_GetDevices");
+	if (sdrplay_api_GetDevices == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_GetDevices\n");
+	   return false;
+	}
+
+	sdrplay_api_SelectDevice	= (sdrplay_api_SelectDevice_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_SelectDevice");
+	if (sdrplay_api_SelectDevice == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_SelectDevice\n");
+	   return false;
+	}
+
+	sdrplay_api_ReleaseDevice	= (sdrplay_api_ReleaseDevice_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_ReleaseDevice");
+	if (sdrplay_api_ReleaseDevice == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_ReleaseDevice\n");
+	   return false;
+	}
+
+	sdrplay_api_GetErrorString	= (sdrplay_api_GetErrorString_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_GetErrorString");
+	if (sdrplay_api_GetErrorString == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_GetErrorString\n");
+	   return false;
+	}
+
+	sdrplay_api_GetLastError	= (sdrplay_api_GetLastError_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_GetLastError");
+	if (sdrplay_api_GetLastError == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_GetLastError\n");
+	   return false;
+	}
+
+	sdrplay_api_DebugEnable		= (sdrplay_api_DebugEnable_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_DebugEnable");
+	if (sdrplay_api_DebugEnable == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_DebugEnable\n");
+	   return false;
+	}
+
+	sdrplay_api_GetDeviceParams	= (sdrplay_api_GetDeviceParams_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_GetDeviceParams");
+	if (sdrplay_api_GetDeviceParams == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_GetDeviceParams\n");
+	   return false;
+	}
+
+	sdrplay_api_Init		= (sdrplay_api_Init_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_Init");
+	if (sdrplay_api_Init == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_Init\n");
+	   return false;
+	}
+
+	sdrplay_api_Uninit		= (sdrplay_api_Uninit_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_Uninit");
+	if (sdrplay_api_Uninit == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_Uninit\n");
+	   return false;
+	}
+
+	sdrplay_api_Update		= (sdrplay_api_Update_t)
+	                 GETPROCADDRESS (Handle, "sdrplay_api_Update");
+	if (sdrplay_api_Update == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                     "Could not find sdrplay_api_Update\n");
+	   return false;
+	}
+
+	sdrplay_api_SwapRspDuoActiveTuner =
+	                          (sdrplay_api_SwapRspDuoActiveTuner_t)
+	                 GETPROCADDRESS (Handle, 
+	                       "sdrplay_api_SwapRspDuoActiveTuner");
+	if (sdrplay_api_SwapRspDuoActiveTuner == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                    "Could not load sdrplay_api_SwapRspDuoActiveTuner");
+	   return false;
+	}
+
+	sdrplay_api_SwapRspDuoDualTunerModeSampleRate =
+	                 (sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)
+	                 GETPROCADDRESS (Handle, 
+	                 "sdrplay_api_SwapRspDuoDualTunerModeSampleRate");
+	if (sdrplay_api_SwapRspDuoDualTunerModeSampleRate == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                 "could not load sdrplay_api_SwapRspDuoDualTunerModeSampleRate");
+	   return false;
+	}
+
+	sdrplay_api_SwapRspDuoMode =
+	                (sdrplay_api_SwapRspDuoMode_t)
+	                 GETPROCADDRESS (Handle, 
+	                              "sdrplay_api_SwapRspDuoMode");
+	if (sdrplay_api_SwapRspDuoMode == nullptr) {
+	   theErrorLogger -> add (recorderVersion,
+	                         "could not load sdrplay_api_SwapRspDuoMode");
+	   return false;
+	}
+	
+	return true;
+}
+
+void	sdrplayHandler_duo::reportOverloadState_A (bool b) {
+	if (b)
+	   overloadLabel_A -> setStyleSheet ("QLabel {background-color : red}");
+	else
+	   overloadLabel_A -> setStyleSheet ("QLabel {background-color : green}");
+}
+
+void	sdrplayHandler_duo::reportOverloadState_B (bool b) {
+	if (b)
+	   overloadLabel_B -> setStyleSheet ("QLabel {background-color : red}");
+	else
+	   overloadLabel_B -> setStyleSheet ("QLabel {background-color : green}");
+}
+
+void	sdrplayHandler_duo::showTunerGain_A	(double gain) {
+	gainDisplay_A -> setText (QString::number (gain, 'f', 0) + "dB");
+}
+
+void	sdrplayHandler_duo::showTunerGain_B	(double gain) {
+	gainDisplay_B -> setText (QString::number (gain, 'f', 0) + "dB");
+}
+
+void	sdrplayHandler_duo::showState	(const QString &s) {
+	stateLabel	-> setAlignment (Qt::AlignCenter);
+	stateLabel	-> setText (s);
+}
+
+void	sdrplayHandler_duo::enableBiasT (bool b) {
+	if (b)
+	  biasT_selector -> show ();
+	else
+	  biasT_selector -> hide ();
+}
+
+void	sdrplayHandler_duo::handle_TunerSelect (const QString &s) {
+	if (s == "Tuner A")
+	   currentTuner. store ('A');
+	else
+	if (s == "Tuner B")
+	   currentTuner. store ('B');
+	else
+	if (s == "A + B")
+	   currentTuner. store ('A' + 'B');
+	else
+	   currentTuner. store ('A' - 'B');
+	A_Buffer_filled. store (false);
+	B_Buffer_filled. store (false);
+}
+
+void	sdrplayHandler_duo::processInput (uint8_t tuner,
+	                                  std::complex<float> *b,
+	                                  int amount,
+	                                  int firstSampleNum) {
+	if (currentTuner. load () == tuner)
+	      _I_Buffer. putDataIntoBuffer (b,  amount);
+	else
+	if (tuner == 'A')
+	   process_A (b, amount, firstSampleNum);
+	else
+	if (tuner == 'B')
+	   process_B (b, amount, firstSampleNum);
+}
+
+void	sdrplayHandler_duo::process_A (std::complex<float> *b,
+	                               int amount,
+	                               int firstSampleNum) {
+	A_Buffer. resize (amount);
+
+	bufferLocker. lock ();
+	if (B_Buffer_filled. load ()) {
+	   for (int i = 0; i < amount; i ++)
+	      if (currentTuner. load () == 'A' + 'B')
+	         b i += B_Buffer i;
+	      else
+	         b i -= B_Buffer i;
+	   _I_Buffer. putDataIntoBuffer (b, amount);
+	   B_Buffer_filled. store (false);
+	   bufferLocker. unlock ();
+	   return;
+	}
+	for (int i = 0; i < amount; i ++)
+	   A_Buffer i = b i;
+	A_Buffer_filled. store (true);
+	bufferLocker. unlock ();
+}
+	 
+void	sdrplayHandler_duo::process_B (std::complex<float> *b,
+	                               int amount,
+	                               int firstSampleNum) {
+	B_Buffer. resize (amount);
+
+	bufferLocker. lock ();
+	if (A_Buffer_filled. load ()) {
+	   for (int i = 0; i < amount; i ++)
+	      if (currentTuner. load () == 'A' + 'B')
+	         b i += A_Buffer i;
+	      else
+	         b i = A_Buffer i - b i;
+	   _I_Buffer. putDataIntoBuffer (b, amount);
+	   A_Buffer_filled. store (false);
+	   bufferLocker. unlock ();
+	   return;
+	}
+	for (int i = 0; i < amount; i ++)
+	   B_Buffer i = b i;
+	B_Buffer_filled. store (true);
+	bufferLocker. unlock ();
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.h Added

@@ -0,0 +1,187 @@
+#
+/*
+ *    Copyright (C) 2025
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#pragma once
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QSemaphore>
+#include	<atomic>
+#include	<stdio.h>
+#include	<mutex>
+#include	<queue>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"ui_duo-widget.h"
+#include	<sdrplay_api.h>
+
+class	duoCommand;
+class	errorLogger;
+
+#ifdef __MINGW32__
+//#include      "dlfcn.h"
+#define GETPROCADDRESS  GetProcAddress
+#else
+#define GETPROCADDRESS  dlsym
+#endif
+
+class	sdrplayHandler_duo final:
+	           public deviceHandler, public Ui_duoWidget_v3 {
+Q_OBJECT
+public:
+			sdrplayHandler_duo	(QSettings *,
+	                                         const QString &,
+	                                         errorLogger *);
+			~sdrplayHandler_duo	();
+
+	bool		restartReader		(int32_t, int skipped = 0);
+	void		stopReader		();
+	int32_t		getSamples		(std::complex<float> *,
+	                                                          int32_t);
+	int32_t		Samples			();
+	void		resetBuffer		();
+	int16_t		bitDepth		();
+	QString		deviceName		();
+
+	void            updatePowerOverload_A (
+	                                 sdrplay_api_EventParamsT *params);
+	void            updatePowerOverload_B (
+	                                 sdrplay_api_EventParamsT *params);
+	RingBuffer<std::complex<float>>	_I_Buffer;
+	std::atomic<bool>	receiverRuns;
+	int		theGain;
+	sdrplay_api_CallbackFnsT	cbFns;
+	void		processInput		(uint8_t,
+	                                         std::complex<float> *,
+	                                         int, int);
+	void		showTunerGain_A		(double);
+	void		showTunerGain_B		(double);
+
+private:
+public:
+	sdrplay_api_Open_t              sdrplay_api_Open;
+	sdrplay_api_Close_t             sdrplay_api_Close;
+	sdrplay_api_ApiVersion_t        sdrplay_api_ApiVersion;
+	sdrplay_api_LockDeviceApi_t     sdrplay_api_LockDeviceApi;
+	sdrplay_api_UnlockDeviceApi_t   sdrplay_api_UnlockDeviceApi;
+	sdrplay_api_GetDevices_t        sdrplay_api_GetDevices;
+	sdrplay_api_SelectDevice_t      sdrplay_api_SelectDevice;
+	sdrplay_api_ReleaseDevice_t     sdrplay_api_ReleaseDevice;
+	sdrplay_api_GetErrorString_t    sdrplay_api_GetErrorString;
+	sdrplay_api_GetLastError_t      sdrplay_api_GetLastError;
+	sdrplay_api_DebugEnable_t       sdrplay_api_DebugEnable;
+	sdrplay_api_GetDeviceParams_t   sdrplay_api_GetDeviceParams;
+	sdrplay_api_Init_t              sdrplay_api_Init;
+	sdrplay_api_Uninit_t            sdrplay_api_Uninit;
+	sdrplay_api_Update_t            sdrplay_api_Update;
+	sdrplay_api_SwapRspDuoActiveTuner_t sdrplay_api_SwapRspDuoActiveTuner;
+	sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t
+		               sdrplay_api_SwapRspDuoDualTunerModeSampleRate;
+	sdrplay_api_SwapRspDuoMode_t	sdrplay_api_SwapRspDuoMode;
+	sdrplay_api_DeviceT             *chosenDevice;
+	sdrplay_api_RxChannelParamsT	*chParams_A;
+	sdrplay_api_RxChannelParamsT	*chParams_B;
+	sdrplay_api_DeviceParamsT	*deviceParams;
+
+	errorLogger		*theErrorLogger;
+	std::atomic<bool>	failFlag;
+	std::atomic<bool>	successFlag;
+	float			denominator;
+	std::atomic<bool>       threadRuns;
+	void			run			();
+	bool			messageHandler		(duoCommand *);
+
+	QString			recorderVersion;
+	
+	int16_t			hwVersion;
+	QSettings		*sdrplaySettings;
+	int16_t			nrBits;
+	float			apiVersion;
+	QString			serial;
+	QString			deviceModel;
+	int			freq;
+	HINSTANCE		Handle;
+	double			ppmValue;
+	bool			biasT;
+	std::queue<duoCommand *>	serverQueue;
+	QSemaphore		serverJobs;
+	HINSTANCE               fetchLibrary            ();
+	void                    releaseLibrary          ();
+	bool			loadFunctions		();
+	int			errorCode;
+	void			process_A	(std::complex<float> *,
+	                                         int, int);
+	void			process_B	(std::complex<float> *,
+	                                         int, int);
+	std::atomic<uint8_t>	currentTuner;
+	std::mutex		bufferLocker;
+	std::atomic<bool>	A_Buffer_filled;
+	std::atomic<bool>	B_Buffer_filled;
+	std::vector<std::complex<float>> A_Buffer;
+	std::vector<std::complex<float>> B_Buffer;
+signals:
+	void			newGRdBValue		(int);
+	void			newLnaValue		(int);
+	void			newAgcSetting		(bool);
+private slots:
+	void			setIfGainReduction_A	(int);
+	void			setIfGainReduction_B	(int);
+	void			setLnaGainReduction_A	(int);
+	void			setLnaGainReduction_B	(int);
+	void			setAgcControl_A		(int);
+	void			setAgcControl_B		(int);
+	void			setPpmControl_A		(int);
+	void			setPpmControl_B		(int);
+	void			setNotch		(int);
+	void			setBiasT		(int);
+	void			reportOverloadState_A	(bool);
+	void			reportOverloadState_B	(bool);
+	void			handle_TunerSelect	(const QString &);
+
+public slots:
+	void			setLnaBounds		(int, int);
+	void			setSerial		(const QString &);
+	void			setApiVersion		(float);
+	void			showLnaGain		(int);
+	void			showState		(const QString &);
+	void			enableBiasT		(bool);
+signals:
+	void			setLnaBoundsSignal	(int, int);
+	void			setDeviceNameSignal	(const QString &);
+	void			setSerialSignal		(const QString &);
+	void			setApiVersionSignal	(float);
+	void			overloadStateChanged_A	(bool);
+	void			overloadStateChanged_B	(bool);
+private:
+//	workers for the duo, 
+	bool			do_restart		(int);
+	bool			do_setAgc		(char, int, bool);
+	bool			do_setGRdB		(char, int);
+	bool			do_setPpm		(char, double);
+	bool			do_setLna		(char, int);
+	bool			do_setNotch		(bool);
+	bool			do_setBiasT		(bool);
+
+};
+

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-v2/sdrplayselect-v2.cpp Added

@@ -0,0 +1,65 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	<cstdio>
+#include	<QVBoxLayout>
+#include	"sdrplayselect-v2.h"
+//
+//	Whenever there are two or more sdrplay devices connected
+//	to the computer, the user is asked to make a choice.
+
+	sdrplaySelect_v2::sdrplaySelect_v2	() {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select an rsp device");
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("RSP select"));
+	setLayout (layOut);
+
+	Devices = QStringList();
+	deviceList. setStringList (Devices);
+	selectorDisplay	-> setModel (&deviceList);
+	connect (selectorDisplay, &QListView::clicked,
+	         this, &sdrplaySelect_v2::select_rsp);
+	selectedItem	= -1;
+}
+
+	sdrplaySelect_v2::~sdrplaySelect_v2 () {
+}
+
+void	sdrplaySelect_v2::addtoList (const char *v) {
+QString s (v);
+
+	Devices << s;
+	deviceList. setStringList (Devices);
+	selectorDisplay	-> setModel (&deviceList);
+	selectorDisplay	-> adjustSize();
+	adjustSize();
+	fprintf (stderr, "adding %s\n", v);
+}
+
+void	sdrplaySelect_v2::select_rsp (QModelIndex s) {
+	QDialog::done (s. row());
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-v2/sdrplayselect-v2.h Added

@@ -0,0 +1,48 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2025
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#
+#pragma once
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<cstdint>
+
+class	sdrplaySelect_v2: public QDialog {
+Q_OBJECT
+public:
+			sdrplaySelect_v2	();
+			~sdrplaySelect_v2	();
+	void		addtoList	(const char *);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel deviceList;
+	QStringList	Devices;
+	int16_t		selectedItem;
+private slots:
+void	select_rsp	(QModelIndex);
+};
+

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

@@ -30,6 +30,7 @@
 #include	"sdrplay-commands.h"
 #include	"xml-filewriter.h"
 
+#include	"sdrplayselect-v3.h"
 #include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
@@ -635,8 +636,6 @@
 	   return;
 	}
 
-	fprintf (stderr, "api opened\n");
-
 //	Check API versions match
         err = sdrplay_api_ApiVersion (&apiVersion);
         if (err  != sdrplay_api_Success) {
@@ -674,9 +673,20 @@
 	}
 
 	deviceIndex	= 0;
+	if (ndev > 1) {
+	   sdrplaySelect_v3 sdrplaySelector;
+	   for (deviceIndex = 0; deviceIndex < (int)ndev; deviceIndex ++) {
+	      sdrplaySelector. addtoList (devs deviceIndex. SerNo);
+	   }
+	   deviceIndex = sdrplaySelector. QDialog::exec ();
+	}
+
 	chosenDevice	= &devs deviceIndex;
-	chosenDevice	-> rspDuoMode = sdrplay_api_RspDuoMode_Single_Tuner;
+	fprintf (stderr, "We get from the API: tuner %d, Mode %d\n",
+	                       (int)(chosenDevice -> tuner),
+	                       (int)(chosenDevice -> rspDuoMode));
 	chosenDevice	-> tuner  = sdrplay_api_Tuner_A;
+	chosenDevice	-> rspDuoMode = sdrplay_api_RspDuoMode_Single_Tuner;
 	err	= sdrplay_api_SelectDevice (chosenDevice);
 	if (err != sdrplay_api_Success) {
 	   theErrorLogger -> add (recorderVersion,

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-v3/sdrplayselect-v3.cpp Added

@@ -0,0 +1,65 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	<cstdio>
+#include	<QVBoxLayout>
+#include	"sdrplayselect-v3.h"
+//
+//	Whenever there are two or more sdrplay devices connected
+//	to the computer, the user is asked to make a choice.
+
+	sdrplaySelect_v3::sdrplaySelect_v3	() {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select an rsp device");
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("RSP select"));
+	setLayout (layOut);
+
+	Devices = QStringList();
+	deviceList. setStringList (Devices);
+	selectorDisplay	-> setModel (&deviceList);
+	connect (selectorDisplay, &QListView::clicked,
+	         this, &sdrplaySelect_v3::select_rsp);
+	selectedItem	= -1;
+}
+
+	sdrplaySelect_v3::~sdrplaySelect_v3 () {
+}
+
+void	sdrplaySelect_v3::addtoList (const char *v) {
+QString s (v);
+
+	Devices << s;
+	deviceList. setStringList (Devices);
+	selectorDisplay	-> setModel (&deviceList);
+	selectorDisplay	-> adjustSize();
+	adjustSize();
+	fprintf (stderr, "adding %s\n", v);
+}
+
+void	sdrplaySelect_v3::select_rsp (QModelIndex s) {
+	QDialog::done (s. row());
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-v3/sdrplayselect-v3.h Added

@@ -0,0 +1,48 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2025
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#
+#pragma once
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<cstdint>
+
+class	sdrplaySelect_v3: public QDialog {
+Q_OBJECT
+public:
+			sdrplaySelect_v3	();
+			~sdrplaySelect_v3	();
+	void		addtoList	(const char *);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel deviceList;
+	QStringList	Devices;
+	int16_t		selectedItem;
+private slots:
+void	select_rsp	(QModelIndex);
+};
+

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/eti-handler/eti-generator.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/eti-handler/eti-generator.cpp Changed

@@ -48,14 +48,14 @@
 int16_t cif_In    55296;
 int16_t	cifVector 1655296;
 uint8_t	fibVector 1696;
-bool	fibValid  16;
+bool	fibValid  16 * 2;
 
 #define	CUSize	(4 * 16)
 //
 //	For each subchannel we create a
 //	deconvoluter and a descramble table up front
-protection *protTable 64	= {nullptr};
-uint8_t	*descrambler 64	= {nullptr};
+std::vector<protection *>protTable;
+std::vector<uint8_t *>descrambler;
 
 int16_t	temp 55296;
 const int16_t interleaveMap = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
@@ -86,7 +86,7 @@
 	CIFCount_hi		= -1;
 	CIFCount_lo		= -1;
 	etiFile			= nullptr;
-	Minor			= 0;
+	Minor			= -1;
 }
 
 		etiGenerator::~etiGenerator	() {
@@ -98,22 +98,18 @@
 //	we probably need "reset" when handling a change in configuration
 //
 void	etiGenerator::reset	() {
-	for (int i = 0; i < 64; i ++) {
-           if (descrambler i != nullptr)
-              delete descrambler i;
-           if (protTable i != nullptr)
-              delete protTable i;
+	for (int i = 0; i < descrambler. size (); i ++)
+           delete  descrambler i;
+        descrambler. resize (0);
+        for (int i = 0; i < protTable. size (); i ++)
+           delete  protTable i;
+        protTable. resize (0);
 
-           protTable i        = nullptr;
-           descrambler i      = nullptr;
-        }
 	index_Out		= 0;
-	BitsperBlock		= 2 * params. get_carriers ();
-	numberofblocksperCIF	= 18;	// mode I
 	amount			= 0;
 	CIFCount_hi		= -1;
 	CIFCount_lo		= -1;
-	Minor			= 0;
+	Minor			= -1;
 	running			= false;
 }
 
@@ -125,7 +121,7 @@
 //	block 1
 void	etiGenerator::processBlock	(std::vector <int16_t> &ibits,
 	                                                      int blkno) {
-
+	
 	if (!running && (etiFile != nullptr) && (blkno == 1))
 	   running = true;
 
@@ -135,6 +131,7 @@
 	if (blkno < 4)
 	   return;
 
+	etiLocker. lock ();
 	if (blkno == 4) {	// import fibBits
 	   bool ficValid 4;
 	   my_ficHandler -> getFIBBits (fibBits, ficValid);
@@ -170,14 +167,22 @@
 	      index_Out	= (index_Out + 1) & 017;
 //	Minor is introduced to inform the init_eti function
 //	anout the CIF number in the dab frame, it runs from 0 .. 3
-	      Minor		= 0;
+	      Minor = -1;
+	      etiLocker. unlock ();
 	      return;		// wait until next time
 	   }
 //
 //	Otherwise, it becomes serious
-	   if ((CIFCount_hi < 0) || (CIFCount_lo < 0))
+	   if ((CIFCount_hi < 0) || (CIFCount_lo < 0)) {
+	      Minor = -1;
+	      etiLocker. unlock ();
 	      return;
-//
+	   }
+
+	   if (Minor < 0) {
+	      etiLocker. unlock ();
+	      return;
+	   }
 //	3 steps, init the vector, add the fib and add the CIF content
 	   int offset	= init_eti (theVector, CIFCount_hi,
 	                                               CIFCount_lo, Minor);
@@ -213,6 +218,7 @@
 	   index_Out	= (index_Out + 1) & 017;
 	   Minor ++;
 	}
+	etiLocker. unlock ();
 }
 
 //	Copied  from dabtools:
@@ -238,6 +244,8 @@
 //	else
 //	   eti fillPointer ++ = 0x0F;		// error level 2, fib errors
 //	FSYNC
+
+
 	if (CIFCount_lo & 1) {
 	   eti fillPointer ++ = 0xf8;
 	   eti fillPointer ++ = 0xc5;
@@ -255,10 +263,8 @@
 	int FL		= 0;			// Frame Length
 	for (int j = 0; j < my_ficHandler -> nrChannels ();  j++) {
 	   my_ficHandler -> getChannelInfo (&data, j);
-	   if (data. in_use) {
-	      NST++;
-	      FL += (data. bitrate * 3) / 4;		// words remember
-	   }
+	   NST++;
+	   FL += (data. bitrate * 3) / 4;		// words remember
  	}
 //
 	FL	+= NST + 1 + 24; // STC + EOH + MST (FIC data, Mode 1!)
@@ -315,6 +321,7 @@
 public:
 	int16_t	*input;
 	bool	uepFlag;
+	uint8_t	subChId;
 	int	bitRate;
 	int	protLevel;
 	int	start_cu;
@@ -326,46 +333,65 @@
 	                           uint8_t *output, int32_t offset) {
 uint8_t	shiftRegister 9;
 std::vector<parameter *> theParameters;
+int	index	= -1;
 
 	for (int i = 0; i < my_ficHandler -> nrChannels (); i ++) {
 	   channel_data data;
 	   my_ficHandler -> getChannelInfo (&data, i);
-	   if (data. in_use) {
-	      parameter *t	= new parameter;
-	      t -> input	= input;
-	      t -> uepFlag	= data. uepFlag;
-	      t -> bitRate	= data. bitrate;
-	      t -> protLevel	= data. protlev;
-	      t -> start_cu	= data. start_cu;
-	      t -> size		= data. size;
-	      t -> output	= &output offset;
-	      offset 		+= data. bitrate * 24 / 8;
-
-	      if (protTable i == nullptr) {
-	         if (t -> uepFlag)
-	            protTable i = new uep_protection (t -> bitRate,
-	                                                t -> protLevel,
-	                                                cpuSupport);
-	         else
-	            protTable i = new eep_protection (t -> bitRate,
-	                                                t -> protLevel,
-	                                                cpuSupport);
-	         
-	         memset (shiftRegister, 1, 9);
-	         descrambler i = new uint8_t 24 * t -> bitRate;
+	   parameter *t	= new parameter;
+	   t -> input	= input;
+	   t -> subChId	= data. id;
+	   t -> uepFlag	= data. uepFlag;
+	   t -> bitRate	= data. bitrate;
+	   t -> protLevel	= data. protlev;
+	   t -> start_cu	= data. start_cu;
+	   t -> size		= data. size;
+	   t -> output	= &output offset;
+	   offset 		+= data. bitrate * 24 / 8;
+//
+//	We try to "reuse" the deconvolvers, i.e. if one
+//	already exists, we use it, otherwise we add a new one
+//	For the NPO with 8 services, we need 3 deconvolvers
+	   index	= -1;
+	   int key	= 0;
+	   for (; key < protTable. size (); key ++) {
+	      int16_t bitRate, protLevel; bool uepFlag;
+	      protTable key -> getParameters (bitRate, protLevel, uepFlag);
+	      if ((bitRate == t -> bitRate) &&
+	          (protLevel == t -> protLevel) &&
+	          (uepFlag == t -> uepFlag)) {
+	         index = key;
+	         break;
+	      }
+	   }
+//	if Index < 0, we have to create an additional deconvolver
+//	and descrambler for the given parameters
+	   if (index < 0) {
+	      index = key;
+	      protection *p;
+	      if (t -> uepFlag)
+	         p = new uep_protection (t -> bitRate,
+	                                      t -> protLevel,
+	                                      cpuSupport);
+	      else
+	         p = new eep_protection (t -> bitRate,
+	                                      t -> protLevel,
+	                                      cpuSupport);
+	      protTable. push_back (p);
+	      memset (shiftRegister, 1, 9);
+	      descrambler. push_back (new uint8_t 24 * t -> bitRate);
 
-	         for (int j = 0; j < 24 * t -> bitRate; j ++) {
-	            uint8_t b = shiftRegister 8 ^ shiftRegister 4;
-	            for (int k = 8; k > 0; k--)
-	               shiftRegister k = shiftRegister k - 1;
-	            shiftRegister 0 = b;
-	            descrambler i j = b;
-	         }
-              }
+	      for (int j = 0; j < 24 * t -> bitRate; j ++) {
+	         uint8_t b = shiftRegister 8 ^ shiftRegister 4;
+	         for (int k = 8; k > 0; k--)
+	            shiftRegister k = shiftRegister k - 1;
+	         shiftRegister 0 = b;
+	         descrambler index j = b;
+	      }
+           }
 //	we need to save a reference to the parameters
 //	since we have to delete the instance later on
-	      process_subCh (i, t, protTable i, descrambler i);
-	   }
+	   process_subCh (i, t, protTable index, descrambler index);
 	}
 	return offset;
 }
@@ -412,10 +438,18 @@
 }
 
 void	etiGenerator::stop_etiGenerator		() {
+	etiLocker. lock ();
 	if (etiFile != nullptr) {
 	   fclose (etiFile);
 	}
+	for (int i = 0; i < descrambler. size (); i ++)
+           delete  descrambler i;
+        descrambler. resize (0);
+        for (int i = 0; i < protTable. size (); i ++)
+           delete protTable i;
+        protTable. resize (0);
 	etiFile	= nullptr;
 	running	= false;
+	etiLocker. unlock ();
 }

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/eti-handler/eti-generator.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/eti-handler/eti-generator.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/correlator.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/correlator.cpp Changed

@@ -139,36 +139,6 @@
 	for (uint16_t i = 0; i < workList. size (); i ++)
 	   indices. push_back (workList i. index);
 
-//	while (workList. size () > 0) {
-//	   float Max = 0;
-//	   int bestIndex = -1;
-//	   for (int i = 0; i < workList. size (); i ++) {
-//	      if (workList i. Value > Max) {
-//	         bestIndex = i;
-//	         Max = workList i. Value;
-//	      }
-//	   }
-//	   if (bestIndex >= 0) {
-//	      indices. push_back (workList bestIndex. index);
-//	      workList. erase (workList. begin () + bestIndex);
-//	   }
-//	}
-
-//	for (int i = 0; i < indices. size (); i ++) {
-//	   if (T_g - 15 <= indices. at (i) &&
-//	                    indices. at (i) <= T_g + 15) {
-//	      std::vector<int> temp;
-//	      temp. push_back (indices. at (i));
-//	      for (int j = 0; j < i; j ++)
-//	         temp. push_back (indices. at (j));
-//	      for (int j = i + 1; j < indices. size (); j ++)
-//	         temp. push_back (indices. at (j));
-//	      indices. resize (0);
-//	      for (int i = 0; i < (int)(temp. size ()); i ++)
-//	         indices. push_back (temp. at (i));
-//	      break;
-//	   }
-//	}
 	if (response != nullptr) {
 	   if (++displayCounter > framesperSecond / 2) {
 	      response	-> putDataIntoBuffer (lbuf, T_u / 2);
@@ -176,6 +146,7 @@
 	      displayCounter	= 0;
 	   }
 	}
+
 	if (firstFound)
 	   return indices 0;
 	return maxIndex;

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/fic-handling/fib-config.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/fib-config.cpp Changed

@@ -124,10 +124,10 @@
 	   return false;
 	if (SC_C_table index. TMid != 3)
 	   return false;
-	if (DSCTy (index) != 60)
-	   return false;
 	index = findIndexApptype_table (SId, 0);
-	return AppType_table index. Apptype;
+	if (index < 0)		// should not happen!!!
+	   return false;
+	return AppType_table index. Apptype == 7;
 }
 
 uint8_t	fibConfig::serviceType (const int index) {
@@ -172,7 +172,6 @@
 
 int	fibConfig::getServiceComp_SCIds	(const uint32_t SId,
 	                                             const int SCIds) {
-//	fprintf (stderr, "Looking for serviceComp %X %d\n", SId, SCIds);
 	for (auto &SId_element : SId_table) {
 	   if (SId_element. SId != SId)
 	      continue;
@@ -368,9 +367,10 @@
 	      uint16_t flags = (ac. asuFlags & AswFlags);
 	      for (auto &serv : SId_table) {
 	         if ((serv. SId == ac. SId) &&
-	                      (serv. announcing != flags))
+	                      (serv. announcing != flags)) {
 	            emit announcement (ac. SId, flags);
-	         serv. announcing = flags;
+	            serv. announcing = flags;
+	         }
 	      }
 	   }
 	}

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/fic-handling/fib-decoder.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/fib-decoder.cpp Changed

@@ -66,6 +66,8 @@
 	         myRadioInterface, &RadioInterface::lto_ecc);
 	connect (this, &fibDecoder::setFreqList,
 	         myRadioInterface, &RadioInterface::setFreqList);
+	connect (this, &fibDecoder::tell_programType,
+	         myRadioInterface, &RadioInterface::tell_programType);
 //
 //	Note that they may change "roles", 
 	currentConfig	= new fibConfig	(&theEnsemble, myRadioInterface);
@@ -398,6 +400,7 @@
 	   bitOffset += numberofComponents * 16 + 8;
 	   return bitOffset / 8;
 	}
+
 	SId_element. announcing = 0;
 	SId_element. SId = SId;
 	bitOffset	+= 8;
@@ -516,7 +519,6 @@
 	      return bitOffset / 8;
 
 	   localBase -> add_to_language_table (comp);
-//	   localBase -> language_table. push_back (comp);
 	   return bitOffset / 8;
 	}
 	else {
@@ -607,6 +609,7 @@
 
 	if (localBase -> SC_G_element_exists (comp.SId, comp. SCIds))
 	   return bitOffset / 8;
+
 	localBase -> add_to_SC_G_table (comp);
 	return bitOffset / 8;
 }
@@ -850,6 +853,8 @@
 	   uint8_t typeCode	= getBits_5 (d, offset + 27);
 	   for (uint16_t i = 0; i < theEnsemble. primaries. size (); i ++) {
 	      if (theEnsemble. primaries i. SId == SId) {
+	         if (theEnsemble. primaries i. programType == 0)
+	            tell_programType (SId, typeCode);
 	         theEnsemble. primaries i. programType = typeCode;
 	         break;
 	      }
@@ -919,8 +924,10 @@
 	   uint8_t Rfa		= getBits (d, bitOffset, 1);
 	   (void)Rfa;
 	   bitOffset		+= 1;
-//	   uint8_t subChId	= getBits (d, bitOffset, 6);
+	   uint8_t subChId	= getBits (d, bitOffset, 6);
 	   bitOffset		+= 6;
+//	   fprintf (stderr, "%d %d %d -> %d\n",
+//	                 clusterId, AswFlags, newFlag, subChId);
 	   currentConfig -> check_announcements (clusterId, AswFlags, newFlag);
 	}
 }
@@ -1128,15 +1135,17 @@
 	      return;
 	}
 //
-//	if no subchannel is found for the service, we do not recrod it yet
+//	if no subchannel is found for the service, we do not record it yet
 	int subChId	= currentConfig -> subChId_for_SId (0, SId);
 	if (subChId < 0)
 	   return;
+
 	for (int i = 0; i < 16; i ++) 
 	   label i = getBits_8 (d, offset + 8 * i);
 	QString dataName = toQStringUsingCharset (
 	                                  (const char *) label,
 	                                  (CharacterSet) charSet);
+
 	QString shortName;		
 	for (int i = 0; i < 16; i ++) 
 	   if (getBits_1 (d, offset + 16 * 8 + i) != 0)
@@ -1187,6 +1196,10 @@
 	int subChId	= currentConfig -> subChId_for_SId (SCIds, SId);
 	if (subChId < 0)
 	   return;
+
+	if (currentConfig -> findIndexApptype_table (SId, 0) < 0)
+	   return;	// we want the apptype to be available
+
 	label 16      = 0x00;
 	(void)Rfu;
 	(void)extension;
@@ -1239,6 +1252,10 @@
 	int subChId	= currentConfig -> subChId_for_SId (0, SId);
 	if (subChId < 0)
 	   return;
+	if (currentConfig -> findIndexApptype_table (SId, 0) < 0)
+	   return;	// we want the apptype to be available
+//
+//	It seems the service is (more or less) complete
 	for (int i = 0; i < 16; i ++) {
 	   label i = getBits_8 (d, bitOffset + 8 * i);
 	}

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/fic-handling/fib-decoder.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/fib-decoder.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/ofdm-decoder.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/ofdm-decoder.cpp Changed

@@ -256,7 +256,7 @@
 	                                   abs (imag (fftBin)));
 
 	   DABFLOAT angle	= arg (fftBin_at_1) - angleVector index;
-	angleVector index	=
+	   angleVector index	=
 	                 compute_avg (angleVector index, angle, ALPHA);
 	   stdDevVector index	= 
 	                 compute_avg (stdDevVector index,
@@ -273,15 +273,13 @@
 	   sigmaSQ_Vector index =
 	             compute_avg (sigmaSQ_Vector index, sigmaSQ, ALPHA);
 //
-//	Ran over quite a number of examples, I found DECODER_1
-//	working best
 	   if (this -> decoder == DECODER_1) {
 	      DABFLOAT corrector	=
 	          1.5 *  meanLevelVector index / sigmaSQ_Vector index;
 	      corrector			/= (1 / snr + 2);
 	      Complex R1	= corrector * normalize (fftBin) * 
-	                           (DABFLOAT)(sqrt (binAbsLevel *
-	                                       jan_abs (phaseReference index)));
+	                           (DABFLOAT)(sqrt (binAbsLevel * 
+	                                              jan_abs (prevS)));
 	      DABFLOAT scaler		=  140.0 / meanValue;
 	      DABFLOAT leftBit		= - real (R1) * scaler;
 	      limit_symmetrically (leftBit, MAX_VITERBI);
@@ -300,7 +298,7 @@
 	      corrector		/= (1 / snr + 3);
 	      Complex R1	= corrector * normalize (fftBin) * 
 	                           (DABFLOAT)(sqrt (binAbsLevel *
-	                                      jan_abs (phaseReference index)));
+	                                      jan_abs (prevS)));
 	      DABFLOAT scaler		=  100.0 / meanValue;
 	      DABFLOAT leftBit		= - real (R1) * scaler;
 	      limit_symmetrically (leftBit, MAX_VITERBI);
@@ -324,14 +322,17 @@
 	      DABFLOAT rightBit = - imag (R1) * scaler;
 	      limit_symmetrically (rightBit, MAX_VITERBI);
 	      softbits i + carriers   = (int16_t)rightBit;
+
 	      sum += jan_abs (R1);
 	   }
 	   else 	// experimental optimum 3
 	   if (this -> decoder == DECODER_4) {	// decoder 4
-	      DABFLOAT P1 =  makeA (1, current, prevS) / sigmaSQ_Vector index;
-	      DABFLOAT P7 =  makeA (7, current, prevS) / sigmaSQ_Vector index;
-	      DABFLOAT P3 =  makeA (3, current, prevS) / sigmaSQ_Vector index;
-	      DABFLOAT P5 =  makeA (5, current, prevS) / sigmaSQ_Vector index;
+//	      DABFLOAT A = meanLevelVector index /
+	      DABFLOAT A =       1.0 / sigmaSQ_Vector index;
+	      DABFLOAT P1 =  makeA (1, current, prevS) * A;
+	      DABFLOAT P7 =  makeA (7, current, prevS) * A;
+	      DABFLOAT P3 =  makeA (3, current, prevS) * A;
+	      DABFLOAT P5 =  makeA (5, current, prevS) * A;
 
 	      DABFLOAT IO_P1 = IO (P1);
 	      DABFLOAT IO_P7 = IO (P7);

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/ofdm-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/ofdm-handler.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/frontend/sample-reader.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/sample-reader.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/aboutdialog.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/aboutdialog.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/config-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/config-handler.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/config-handler.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/config-handler.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/display-widget.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/display-widget.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/display-widget.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/display-widget.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/ensemble-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/ensemble-handler.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/forms-v7/config-helper.ui -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/config-helper.ui Changed

@@ -188,7 +188,7 @@
          <item>
           <widget class="QLabel" name="label_3">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The CPU load is an indication of the load when executing the program. The load tells the total load on the CPU, i.e. inclusing the load of other programs that might be running.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The CPU load is an indication of the load when executing the program. The load tells the total load on the CPU, i.e. including the load of other programs that might be running.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string>CPU load</string>
@@ -624,10 +624,10 @@
      </item>
      <item>
       <widget class="smallComboBox" name="streamoutSelector">
-       <property name="maximumSize">
+       <property name="minimumSize">
         <size>
-         <width>162</width>
-         <height>16777215</height>
+         <width>191</width>
+         <height>0</height>
         </size>
        </property>
        <property name="toolTip">
@@ -658,15 +658,15 @@
    <header>smallcombobox.h</header>
   </customwidget>
   <customwidget>
+   <class>clickablelabel</class>
+   <extends>QLabel</extends>
+   <header>clickable-label.h</header>
+  </customwidget>
+  <customwidget>
    <class>smallSpinBox</class>
    <extends>QSpinBox</extends>
    <header location="global">smallspinbox.h</header>
   </customwidget>
-  <customwidget>
-   <class>clickablelabel</class>
-   <extends>QLabel</extends>
-   <header location="global">clickable-label.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/forms-v7/dabradio-6.ui -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/dabradio-6.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>621</width>
-    <height>328</height>
+    <width>618</width>
+    <height>337</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,10 +16,16 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="maximumSize">
+   <size>
+    <width>618</width>
+    <height>16777215</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Qt-DAB-6.8</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_4">
+  <layout class="QHBoxLayout" name="horizontalLayout_12">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
@@ -54,7 +60,7 @@
           <x>0</x>
           <y>0</y>
           <width>239</width>
-          <height>174</height>
+          <height>183</height>
          </rect>
         </property>
        </widget>
@@ -121,7 +127,7 @@
        <item>
         <widget class="newPushButton" name="presetButton">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Swutch between the &lt;span style=&quot; font-style:italic;&quot;&gt;ensemble view&lt;/span&gt; and the &lt;span style=&quot; font-style:italic;&quot;&gt;favorites view.&lt;/span&gt; The ensemble view shows the list of services in the currently active ensemble. The favories view shows the list of services selected as favorite. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch between the &lt;span style=&quot; font-style:italic;&quot;&gt;ensemble view&lt;/span&gt; and the &lt;span style=&quot; font-style:italic;&quot;&gt;favorites view.&lt;/span&gt; The ensemble view shows the list of services in the currently active ensemble. The favorites view shows the list of services selected as favorite. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
           <string>favorites</string>
@@ -155,7 +161,7 @@
        <item>
         <widget class="clickablelabel" name="folder_shower">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching this icon insrtructs the software to start a shell and run the explorer (or the Linux equivalent)  showing the folder/directory where Qt-DAB stores its files&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching this icon instructs the software to start a shell and run the explorer (or the Linux equivalent) showing the folder/directory where Qt-DAB stores its files&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
           <string>files</string>
@@ -315,7 +321,7 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_11">
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
        <item>
         <widget class="QLabel" name="pictureLabel">
          <property name="text">
@@ -333,30 +339,116 @@
          </property>
         </widget>
        </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_12">
        <item>
-        <widget class="QLabel" name="dynamicLabel">
-         <property name="font">
-          <font>
-           <pointsize>14</pointsize>
-           <italic>false</italic>
-           <bold>false</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QwtThermo" name="leftAudio">
+           <property name="maximumSize">
+            <size>
+             <width>15</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="layoutDirection">
+            <enum>Qt::LayoutDirection::RightToLeft</enum>
+           </property>
+           <property name="lowerBound">
+            <double>-20.000000000000000</double>
+           </property>
+           <property name="upperBound">
+            <double>0.000000000000000</double>
+           </property>
+           <property name="scaleMaxMajor">
+            <number>9</number>
+           </property>
+           <property name="scaleMaxMinor">
+            <number>2</number>
+           </property>
+           <property name="scaleStepSize">
+            <double>3.000000000000000</double>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Orientation::Vertical</enum>
+           </property>
+           <property name="scalePosition">
+            <enum>QwtThermo::ScalePosition::TrailingScale</enum>
+           </property>
+           <property name="originMode">
+            <enum>QwtThermo::OriginMode::OriginMinimum</enum>
+           </property>
+           <property name="spacing">
+            <number>2</number>
+           </property>
+           <property name="pipeWidth">
+            <number>6</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QwtThermo" name="rightAudio">
+           <property name="maximumSize">
+            <size>
+             <width>15</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="layoutDirection">
+            <enum>Qt::LayoutDirection::LeftToRight</enum>
+           </property>
+           <property name="lowerBound">
+            <double>-20.000000000000000</double>
+           </property>
+           <property name="upperBound">
+            <double>0.000000000000000</double>
+           </property>
+           <property name="scaleMaxMajor">
+            <number>9</number>
+           </property>
+           <property name="scaleMaxMinor">
+            <number>4</number>
+           </property>
+           <property name="scaleStepSize">
+            <double>3.000000000000000</double>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Orientation::Vertical</enum>
+           </property>
+           <property name="scalePosition">
+            <enum>QwtThermo::ScalePosition::TrailingScale</enum>
+           </property>
+           <property name="spacing">
+            <number>3</number>
+           </property>
+           <property name="borderWidth">
+            <number>1</number>
+           </property>
+           <property name="pipeWidth">
+            <number>6</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </item>
      <item>
+      <widget class="QLabel" name="dynamicLabel">
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
       <layout class="QHBoxLayout" name="horizontalLayout_10">
        <item>
         <widget class="smallPushButton" name="configButton">
@@ -401,82 +493,7 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <item>
-        <widget class="QwtThermo" name="leftAudio">
-         <property name="layoutDirection">
-          <enum>Qt::LayoutDirection::RightToLeft</enum>
-         </property>
-         <property name="lowerBound">
-          <double>-20.000000000000000</double>
-         </property>
-         <property name="upperBound">
-          <double>0.000000000000000</double>
-         </property>
-         <property name="scaleMaxMajor">
-          <number>9</number>
-         </property>
-         <property name="scaleMaxMinor">
-          <number>2</number>
-         </property>
-         <property name="scaleStepSize">
-          <double>3.000000000000000</double>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="scalePosition">
-          <enum>QwtThermo::ScalePosition::TrailingScale</enum>
-         </property>
-         <property name="originMode">
-          <enum>QwtThermo::OriginMode::OriginMinimum</enum>
-         </property>
-         <property name="spacing">
-          <number>2</number>
-         </property>
-         <property name="pipeWidth">
-          <number>6</number>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QwtThermo" name="rightAudio">
-         <property name="lowerBound">
-          <double>-20.000000000000000</double>
-         </property>
-         <property name="upperBound">
-          <double>0.000000000000000</double>
-         </property>
-         <property name="scaleMaxMajor">
-          <number>9</number>
-         </property>
-         <property name="scaleMaxMinor">
-          <number>4</number>
-         </property>
-         <property name="scaleStepSize">
-          <double>3.000000000000000</double>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-         <property name="scalePosition">
-          <enum>QwtThermo::ScalePosition::TrailingScale</enum>
-         </property>
-         <property name="spacing">
-          <number>3</number>
-         </property>
-         <property name="borderWidth">
-          <number>1</number>
-         </property>
-         <property name="pipeWidth">
-          <number>6</number>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_13">
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
        <item>
         <widget class="QLabel" name="cpuLabel">
          <property name="text">

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/forms-v7/new-config-helper.ui -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/new-config-helper.ui Changed

@@ -151,7 +151,7 @@
          <item>
           <widget class="smallPushButton" name="pathButton">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The files containing slides - if being saved - will be saved in a folder/directory Qt-DAB-files in the home folder/directory. The tii files as well as the log file (both of caourse when enabled) are also stored in that folder/directory. The path can be altered by entering an EXISTING folder/directory in the menu that appears when the button is touched. That path will be effective the next program invocation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The files containing slides - if being saved - will be saved in a folder/directory Qt-DAB-files in the home folder/directory. The tii files as well as the log file (both of course when enabled) are also stored in that folder/directory. The path can be altered by entering an EXISTING folder/directory in the menu that appears when the button is touched. That path will be effective the next program invocation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string>path</string>
@@ -280,7 +280,7 @@
         </font>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;touching this button allws you to select a port for communication with a webbrowser when showing a map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;touching this button allows you to select a port for communication with a webbrowser when showing a map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>port</string>

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/forms-v7/scopewidget.ui -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/scopewidget.ui Changed

@@ -36,7 +36,7 @@
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tabwidget here contains the tabs for the different scopes, supported by this Qt-DAB implementation&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="currentIndex">
-          <number>3</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="spectr">
           <attribute name="title">
@@ -106,7 +106,7 @@
              <item>
               <widget class="QLabel" name="correlationsVector">
                <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The result of matching is shown here. The best match is usually with a sample on or around&lt;/p&gt;&lt;p&gt;sample number 504. The other matches - if any - are shown as two numbers, the offset in the input and the additional distance - compared to the distance of the best match - in km.&lt;/p&gt;&lt;p&gt;Note that it is NOT the distance between transmitter and rfeceiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The result of matching is shown here. The best match is usually with a sample on or around sample number 504. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="text">
                 <string>TextLabel</string>
@@ -262,7 +262,7 @@
             </size>
            </property>
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The waterfall display djows the progress of the data of the selected scope in time&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The waterfall display shows the progress of the data of the selected scope in time&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>
@@ -503,7 +503,7 @@
      <item>
       <widget class="QLabel" name="syncLabel">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indicator for the time synchronization, if green, it looks like time syncing is OK, i.e. the software is able to identigy the start of the DAB frames in the incoming sample stream.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indicator for the time synchronization, if green, it looks like time syncing is OK, i.e. the software is able to identify the start of the DAB frames in the incoming sample stream.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>synced</string>

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/forms-v7/technical_data.ui -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/technical_data.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>309</width>
-    <height>724</height>
+    <width>313</width>
+    <height>733</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -85,14 +85,14 @@
         <string>0</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The data in the body of the DAB frame is organized in usits of 64 bytes. The start address indicates the start address in the appropriate buffer in units.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The data in the body of the DAB frame is organized in units of 64 bytes. The start address indicates the start address in the appropriate buffer in units.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Start Address of CU</string>
@@ -105,7 +105,7 @@
         <string>0</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -125,7 +125,7 @@
         <string>0</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -142,7 +142,7 @@
         <string>0</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -175,13 +175,13 @@
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows Protection Level and Type (A or B)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
         <string>uepField</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -198,7 +198,7 @@
         <string>TextLabel</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -212,13 +212,13 @@
      <item row="2" column="1">
       <widget class="QLabel" name="ASCTy">
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
         <string>ASCTy</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -235,13 +235,13 @@
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Language (defined by provider)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
         <string>language</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -349,7 +349,7 @@
         </size>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality of the DAB+ frames. &lt;/p&gt;&lt;p&gt;Indicator for the amount of times meaning the frames contain more errors than the Reed Solomon correction can correct. &lt;/p&gt;&lt;p&gt;100 is good.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality of the DAB+ frames. &lt;/p&gt;&lt;p&gt;Indicator for the amount of times the frames contain more errors than the Reed Solomon correction could correct. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="styleSheet">
         <string notr="true">QProgressBar::chunk { background: #e6e600; }</string>
@@ -373,7 +373,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="label_4">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The average number of corrections by the Reed Solomon procedure. The RS procesure is able to fix up to 5 erroneous bytes in a segment of 110 bytes.&lt;/p&gt;&lt;p&gt;The number tells how many errors were fiixed per 100 frames&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The average number of corrections by the Reed Solomon procedure. The RS procedure is able to fix up to 5 erroneous bytes in a segment of 110 bytes.&lt;/p&gt;&lt;p&gt;The number tells how many errors were fiixed per 100 frames&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>rs corrections/100</string>
@@ -386,17 +386,17 @@
         <string>The number of corrections made by the reed-solomon algorithm over 10 DAB+ frames (so the number does not relate to the classic DAB/MP2 frames)</string>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="segmentStyle">
-        <enum>QLCDNumber::SegmentStyle::Flat</enum>
+        <enum>QLCDNumber::Flat</enum>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_11">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The RS procedure will try to fix errors. However, if the parity bits are erroneous then there might be a problem. That is why - after the RS procedure a CRC check is performed on the data. The number of remaining errors is sjpwn here&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The RS procedure will try to fix errors. However, if the parity bits are erroneous then there might be a problem. That is why - after the RS procedure a CRC check is performed on the data. The number of remaining errors is shown here&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>ec errors </string>
@@ -409,17 +409,17 @@
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RS decoding/recovery uses parity bits. If, however, a parity bit is faulty, recovery of errors may lead to introducing errors. The crc check following the recovery should reveal that.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="segmentStyle">
-        <enum>QLCDNumber::SegmentStyle::Flat</enum>
+        <enum>QLCDNumber::Flat</enum>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="missedLabel">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The output hanfler expects 48000 two channel samples per second. If - for whatever reason - the amount actually delivered is less, the missing samples will be compensated for by NULL samples, and the percentage will be lower than 100&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The output handler expects 48000 two-channel samples per second. If - for whatever reason - the amount actually delivered is less, the missing samples will be compensated for by NULL samples, and the percentage will be lower than 100&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>audio % OK</string>
@@ -429,13 +429,13 @@
      <item row="2" column="1">
       <widget class="QLCDNumber" name="missedSamples">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The audiohandler runs with its own clock. If less than the requested number of&lt;/p&gt;&lt;p&gt;audiosamples is passed on, the percentage = shown here - will drop accordingly.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The audiohandler runs with its own clock. If less than the requested number of audiosamples is passed on, the percentage - shown here - will drop accordingly.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="segmentStyle">
-        <enum>QLCDNumber::SegmentStyle::Flat</enum>
+        <enum>QLCDNumber::Flat</enum>
        </property>
       </widget>
      </item>
@@ -474,13 +474,13 @@
      <item>
       <widget class="QLCDNumber" name="audioRate">
        <property name="frameShape">
-        <enum>QFrame::Shape::NoFrame</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="frameShadow">
-        <enum>QFrame::Shadow::Plain</enum>
+        <enum>QFrame::Plain</enum>
        </property>
        <property name="segmentStyle">
-        <enum>QLCDNumber::SegmentStyle::Flat</enum>
+        <enum>QLCDNumber::Flat</enum>
        </property>
       </widget>
      </item>

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/main.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/main.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/radio.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/radio.cpp Changed

@@ -281,7 +281,7 @@
 //	put the widgets in the right place and create the workers
 	setPositionAndSize	(dabSettings_p, this, S_MAIN_WIDGET);
 
-	configHandler_p. reset (new configHandler (this, dabSettings_p));
+	configHandler_p		= new configHandler (this, dabSettings_p);
 	theEnsembleHandler. reset (new ensembleHandler (this, dabSettings_p,
 	                                                       presetFile));
 //	we have the configuration handler and the ensemble handler,
@@ -289,20 +289,20 @@
 	configHandler_p		-> set_activeServices (0);
 	configHandler_p		-> set_connections ();
 
-	connect (configHandler_p. data (), &configHandler::frameClosed,
+	connect (configHandler_p, &configHandler::frameClosed,
 	         this, &RadioInterface::handle_configFrame_closed);
-	connect (configHandler_p. data (), &configHandler::handle_fontSelect,
+	connect (configHandler_p, &configHandler::handle_fontSelect,
 	         theEnsembleHandler. data (),
 	                               &ensembleHandler::handleFontSelect);
-	connect (configHandler_p. data (),
+	connect (configHandler_p,
 	                         &configHandler::handle_fontSizeSelect,
 	         theEnsembleHandler. data (),
 	                         &ensembleHandler::handleFontSizeSelect);
-	connect (configHandler_p. data (),
+	connect (configHandler_p,
 	                        &configHandler::handle_fontColorSelect,
 	         theEnsembleHandler. data (),
 	                        &ensembleHandler::handleFontColorSelect);
-	connect (configHandler_p. data (), &configHandler::set_serviceOrder,
+	connect (configHandler_p, &configHandler::set_serviceOrder,
 	         theEnsembleHandler. data (),
 	                               &ensembleHandler::setServiceOrder);
 	connect (&theNewDisplay, &displayWidget::frameClosed,
@@ -320,13 +320,13 @@
 	else
 	   httpButton	-> setEnabled (false);
 
-#ifdef HAVE_RTLSDR_V3
-	SystemVersion	= QString ("9.5") + " with RTLSDR-V3";
-#elif HAVE_RTLSDR_V4
-	SystemVersion	= QString ("9.5") + " with RTLSDR-V4";
-#else
+//#ifdef HAVE_RTLSDR_V3
+//	SystemVersion	= QString ("9.5") + " with RTLSDR-V3";
+//#elif HAVE_RTLSDR_V4
+//	SystemVersion	= QString ("9.5") + " with RTLSDR-V4";
+//#else
 	SystemVersion	= QString ("9.5");
-#endif
+//#endif
 #if QT_VERSION > QT_VERSION_CHECK (6, 0, 0)
 	version		= "Qt6-DAB-6." + SystemVersion ;
 #else
@@ -341,9 +341,9 @@
 	               &ensembleHandler::start_background_task,
 	         this, &RadioInterface::handle_backgroundTask);
 	   
-	techWindow_p. reset (new techData (this, dabSettings_p, &theTechData));
+	techWindow_p	= new techData (this, dabSettings_p, &theTechData);
 	
-	connect (techWindow_p. data (), &techData::frameClosed,
+	connect (techWindow_p, &techData::frameClosed,
 	         this, &RadioInterface::handle_techFrame_closed);
 
 	if (value_i (dabSettings_p, DAB_GENERAL, NEW_DISPLAY_VISIBLE, 0) != 0)
@@ -351,6 +351,7 @@
 	else
 	   theNewDisplay. hide ();
 
+	journalineHandler = nullptr;
 	peakLeftDamped	= 0;
 	peakRightDamped = 0;
 	audioTeller	= 0;	// counting audio frames
@@ -363,6 +364,7 @@
 	serviceLabel	-> setStyleSheet (labelStyle);
 	serviceLabel	-> setFont (font);
 	serviceLabel	-> setToolTip ("<font color=\"black\">the label displays the selected service. If a logo can be found, it will be displayed, otherwise the shortname is displayed");
+
 	motLabel	-> setStyleSheet ("QLabel {color : red}");
 	motLabel	-> setToolTip ("<font color=\"black\">the label colors green when MOT data, for the currently selected service, can be decoded");
 
@@ -426,7 +428,8 @@
 	      soundOut_p = nullptr;
 	   }
 	}
-//
+
+	inputDevice_p	= nullptr;
 //	we end up here if selection was PORT_AUDIO or using Qt_Audio failed
 //	as it does on U20
 	if (soundOut_p == nullptr) {
@@ -466,10 +469,6 @@
 	if (path_for_files != "")
 	   path_for_files		= checkDir (path_for_files);
 
-//	timer for autostart epg service
-	epgTimer. setSingleShot (true);
-	connect (&epgTimer, &QTimer::timeout,
-	         this, &RadioInterface::epgTimer_timeOut);
 	pauzeTimer. setSingleShot (true);
 	connect (&pauzeTimer, &QTimer::timeout,
 	         this, &RadioInterface::show_pauzeSlide);
@@ -518,7 +517,7 @@
 	         this, &RadioInterface::color_spectrumButton);
 //
 //	
-	connect (techWindow_p. data (), &techData::handleTimeTable,
+	connect (techWindow_p, &techData::handleTimeTable,
 	         this, &RadioInterface::handle_timeTable);
 	connect (&theNewDisplay, &displayWidget::mouseClick,
 	         this, &RadioInterface::handle_iqSelector);
@@ -580,21 +579,27 @@
 	                                      SELECTED_DEVICE, "no device");
 
 	if (theDeviceChoser. getDeviceIndex (h) >= 0)
-	   inputDevice_p. reset (createDevice (h, &theLogger));
+	   inputDevice_p	= createDevice (h, &theLogger);
 //
 	peakLeftDamped          = -100;
 	peakRightDamped         = -100;
- 
-	leftAudio	-> setFillBrush	(QColor ("white"));
-	rightAudio	-> setFillBrush (QColor ("white"));
+	
 	leftAudio	-> setBorderWidth	(0);
+	leftAudio	-> setScalePosition	(QwtThermo::NoScale);
 	rightAudio	-> setBorderWidth	(0);
-	leftAudio	-> setValue (-30);
-	rightAudio	-> setValue (-30);
-	leftAudio	-> setAlarmBrush (Qt::red);
-	rightAudio	-> setAlarmBrush (Qt::red);
-	leftAudio	-> setAlarmEnabled (true);  
-	rightAudio	-> setAlarmEnabled(true);
+	rightAudio	-> setScalePosition	(QwtThermo::NoScale);
+	leftAudio	-> setValue (-35);
+	rightAudio	-> setValue (-35);
+	QwtLinearColorMap * mapLeft = new QwtLinearColorMap ();
+	mapLeft	-> setColorInterval (QColor (0, 50, 200), QColor(255, 0, 0));
+	mapLeft -> addColorStop (0.75, QColor (100, 50, 0)); 
+	mapLeft -> addColorStop (0.4, QColor (0, 200, 50)); 
+	leftAudio -> setColorMap (mapLeft);
+	QwtLinearColorMap * mapRight = new QwtLinearColorMap ();
+	mapRight -> setColorInterval (QColor(0, 50, 200), QColor(255, 0, 0));
+	mapRight -> addColorStop (0.75, QColor (100, 50, 0)); 
+	mapRight -> addColorStop (0.4, QColor (0, 200, 50)); 
+	rightAudio -> setColorMap (mapRight);
 
 	journalineKey		= -1;
 //	do we show controls?
@@ -643,7 +648,7 @@
 	                               tr ("The ini file is new and no home location is known yet"));
 	}
 
-	if (!inputDevice_p .isNull ()) {
+	if (inputDevice_p != nullptr) {
 	   connect (&theDeviceChoser, &deviceChooser::deviceSelected,
 	            this, &RadioInterface::newDevice);
 	   if (inputDevice_p -> isFileInput ())
@@ -665,9 +670,12 @@
 //	was registered to be used, and the user presses the
 //	selectDevice comboBox
 void	RadioInterface::doStart (const QString &dev) {
-	inputDevice_p. reset (createDevice	(dev, &theLogger));
+	if (inputDevice_p != nullptr)
+	   delete inputDevice_p;
+//	inputDevice_p	= nullptr;
+	inputDevice_p	= createDevice	(dev, &theLogger);
 //	Some buttons should not be touched before we have a device
-	if (inputDevice_p. isNull ()) {
+	if (inputDevice_p == nullptr) {
 	   return;
 	}
 	disconnect (&theDeviceChoser, &deviceChooser::deviceSelected,
@@ -708,13 +716,14 @@
 #else
 	cpuLabel -> setText ("");
 #endif
-	theLogger. log (logger::LOG_RADIO_STARTS, inputDevice_p -> deviceName (),
+	theLogger. log (logger::LOG_RADIO_STARTS,
+	                                 inputDevice_p -> deviceName (),
 	                                 channelSelector -> currentText ());
-	theOFDMHandler. reset (new ofdmHandler  (this,
-	                                    inputDevice_p. data (),
+	theOFDMHandler	= new ofdmHandler  (this,
+	                                    inputDevice_p,
 	                                    &globals, dabSettings_p,
-	                                    &theLogger, this -> cpuSupport));
-	if (theOFDMHandler. isNull ()) {
+	                                    &theLogger, this -> cpuSupport);
+	if (theOFDMHandler == nullptr) {
 	   QMessageBox::warning (this, tr ("Warning"),
                                        tr ("Fatal error, call expert 11"));
 	   abort ();
@@ -764,21 +773,6 @@
 	channel_timeOut ();
 }
 
-///////////////////////////////////////////////////////////////////////////
-//
-//static
-//bool	seems_epg (const QString &name) {
-//	return  name. contains ("-EPG ", Qt::CaseInsensitive) ||
-//                name. contains (" EPG   ", Qt::CaseInsensitive) ||
-//                name. contains ("Spored", Qt::CaseInsensitive) ||
-//                name. contains ("NivaaEPG", Qt::CaseInsensitive) ||
-//                name. contains ("SPI", Qt::CaseSensitive) ||
-//                name. contains ("BBC Guide", Qt::CaseInsensitive) ||
-//                name. contains ("BBC  Guide", Qt::CaseInsensitive) ||
-//                name. contains ("EPG_", Qt::CaseInsensitive) ||
-//                name. contains ("EPG-", Qt::CaseInsensitive) ||
-//                name. startsWith ("EPG ", Qt::CaseInsensitive);
-//}
 //
 //	a slot, called by the fic/fib handlers
 void	RadioInterface::addToEnsemble (const QString &serviceName,
@@ -798,28 +792,30 @@
 	if (((SId & 0xFFFF0000) == 0) && !inputDevice_p -> isFileInput ())
 	   theScanlistHandler. addElement (channel. channelName, serviceName);
 
-	if (((SId & 0xFFFF0000) != 0) &&
-	     (configHandler_p -> get_audioServices_only ())) {
-	      if (!theOFDMHandler -> is_SPI (SId))
-	         return;
-	      else {
-	         SPI_service ss;
-	         ss. serviceName = serviceName;
-	         ss. SId = SId;
-	         channel. SPI_services. push_back (ss);
-	      }
-//	      if (!seems_epg (serviceName))
-//	         return;
+	if (!theSCANHandler. active () && theOFDMHandler -> is_SPI (SId)) {
+	   packetdata pd;
+	   int index = theOFDMHandler -> getServiceComp (serviceName);
+	   if (index < 0)	// cannot happen
+	      return;
+	   theOFDMHandler -> packetData (index, pd);
+	   if (!pd. defined)	// cannot happen
+	      return;
+	   start_epgService (pd);
+//	   channel. SPI_services. push_back (ss);
 	}
-
-	bool added	= theEnsembleHandler -> addToEnsemble (ed);
-	if (added) {
-	   channel. nrServices ++;
-	   if (theSCANHandler. active ())
-	      theSCANHandler. addService (channel. channelName);
+//
+//	adding the service to the list (or not)
+	if (((SId & 0xFFFF0000) == 0) ||
+	    (!configHandler_p -> get_audioServices_only ()) ||
+	      ((SId & 0xFFFF0000) && theOFDMHandler -> is_SPI (SId))) {
+	   if (theEnsembleHandler -> addToEnsemble (ed)) {
+	      if (theSCANHandler. active ())
+	         theSCANHandler. addService (channel. channelName);
+	   }
 	}
 
-	if ((channel. serviceCount == channel. nrServices)&& 
+	channel. nrServices ++;
+	if ((channel. serviceCount == channel. nrServices) && 
 	                     !theSCANHandler. active ()) {
 	   setPresetService ();
 	}
@@ -1327,54 +1323,84 @@
   *	\brief TerminateProcess
   *	Pretty critical, since there are many threads involved
   *	A clean termination is what is needed, regardless of the GUI
+  *	the attempt is first to stop various activities and then
+  *	delete the different objects
   */
 void	RadioInterface::TerminateProcess () {
 	running. store	(false);
-	storeWidgetPosition (dabSettings_p, this, S_MAIN_WIDGET);
+	stopChannel	();
+
+//	stop timers apart from scanner
+	displayTimer.	stop	();
+	presetTimer.	stop	();
+	pauzeTimer.	stop	();
+	muteTimer.	stop	();
+//	stop activity using a timer
 	stopScanning ();
 	while (theSCANHandler. active ())
 	   usleep (1000);
-	if (configHandler_p -> get_clearScanList ())
-	   theScanlistHandler. clearScanList ();
-	theScanlistHandler. dump ();
-	theScanlistHandler. hide ();
 	theSCANHandler. hide ();
-	myTimeTable. hide ();
+	channelTimer.	stop	();
+//
+//	finish all dumping activities
+	stopFrameDumping	();
+	stopSourceDumping	();
+	stopAudioDumping	();
+	if (channel. etiActive)
+	   stop_etiHandler      ();     // probably done by stopChannel
+//
+//	after a scan is topped, the scanTable is of no further use
 	if (scanTable_p != nullptr) {
 	   scanTable_p	-> clearTable ();
 	   scanTable_p	-> hide ();
 	   delete scanTable_p;
 	}
-	hideButtons	();
-
-//	stop the timers
-	displayTimer.	stop	();
-	channelTimer.	stop	();
-	presetTimer.	stop	();
-	epgTimer.	stop	();
-	pauzeTimer.	stop	();
-	muteTimer.	stop	();
 //
-//	hide the windows
-	theNewDisplay.		hide ();
-	theDXDisplay.		hide ();
-	theDeviceChoser.	hide ();
-	theEnsembleHandler	-> hide ();
+//	handling the aboutLabel
 	if (the_aboutLabel != nullptr) {
 	   the_aboutLabel -> hide ();
 	   delete the_aboutLabel;
 	}
-	if (contentTable_p != nullptr) {
-	   contentTable_p -> clearTable ();
-	   contentTable_p -> hide ();
-	   delete contentTable_p;
+//
+	if (mapHandler != nullptr) {
+	   mapHandler ->  stop ();
+	   delete mapHandler;
 	}
-	configHandler_p. reset ();
-	techWindow_p. reset ();
-	theSNRViewer.	hide ();
-	theScheduler.	hide	();
+
+//	handling the scanlist
+	if (configHandler_p -> get_clearScanList ())
+	   theScanlistHandler. clearScanList ();
+	theScanlistHandler. dump ();
 	theScanlistHandler. hide ();
 //
+//	hiding the ensemblehandler is needed since it is
+//	using a protected pointer
+	theEnsembleHandler	-> hide ();
+
+//	stopChannel will handle the contentTable and timetable
+//	if (contentTable_p != nullptr) {
+//	   contentTable_p -> clearTable ();
+//	   contentTable_p -> hide ();
+//	   delete contentTable_p;
+//	}
+//	myTimeTable.	hide ();
+
+//	should be hidden  to ensure the parent can be killed
+	theSNRViewer.	hide ();	
+	theScheduler.	hide ();
+//
+//	store positions of the relevant windows
+	storeWidgetPosition	(dabSettings_p, this, S_MAIN_WIDGET);
+	theNewDisplay.		storePosition ();
+	theNewDisplay. hide ();
+	theDXDisplay.		storePosition ();
+	theDXDisplay. hide ();
+	configHandler_p ->	storePosition ();
+	configHandler_p	->	hide ();
+	techWindow_p	->	storePosition ();	
+	techWindow_p 	->	 hide ();
+	hideButtons	();
+//
 #ifdef	DATA_STREAMER
 	fprintf (stderr, "going to close the dataStreamer\n");
 	delete		dataStreamer_p;
@@ -1389,24 +1415,26 @@
 	if (streamerOut_p != nullptr)
 	   streamerOut_p	-> stop ();
 #endif
-	if (mapHandler != nullptr)
-	   mapHandler ->  stop ();
-//	just save a few checkbox settings that are not
-
-	stopFrameDumping	();
-	stopSourceDumping	();
-	stopAudioDumping	();
-	if (!theOFDMHandler. isNull ())
+	if (theOFDMHandler != nullptr)	// hould always happen
 	   theOFDMHandler		-> stop ();
+	if (inputDevice_p != nullptr)
+	   delete inputDevice_p;
 	if (soundOut_p != nullptr)
 	   delete soundOut_p;
+//	journaline could have been stopped by stopChannel,
+	if (journalineHandler != nullptr) {
+	   delete journalineHandler;
+	   journalineHandler = nullptr;
+	}
 	theLogger. log (logger::LOG_RADIO_STOPS);
-	usleep (1000);		// pending signals
-//	everything should be halted by now
 	dabSettings_p	-> sync ();
-	theOFDMHandler. reset ();
-	inputDevice_p. reset ();
-	close();
+	usleep (1000);		// pending signals
+//	everything should be halted by now, start deleting
+	delete		techWindow_p;
+	delete		configHandler_p;
+	delete		theOFDMHandler;
+	hide ();
+	close ();
 	fprintf (stderr, ".. end the radio silences\n");
 }
 //
@@ -1468,8 +1496,6 @@
 	QString ss = s;
 	store (dabSettings_p, DAB_GENERAL, SELECTED_DEVICE, ss);
 	inputDevice -> setVisibility (true);
-//	if (value_i (dabSettings_p, DAB_GENERAL, DEVICE_WIDGET_VISIBLE, 1) == 0)
-//	   inputDevice -> setVisibility (false);
 	theNewDisplay. setBitDepth (inputDevice -> bitDepth ());
 	return inputDevice;
 }
@@ -1481,16 +1507,25 @@
 	running. store (false);
 	stopScanning	();
 	stopChannel	();
+	soundOut_p	-> stop ();
+//	soundOut_p	-> suspend ();
 	fprintf (stderr, "disconnecting\n");
+	if (inputDevice_p != nullptr) {
+	   inputDevice_p	-> stopReader	();
+	   inputDevice_p	-> stopDump	();
+	   delete inputDevice_p;
+	   inputDevice_p = nullptr;
+	}
 
 	theLogger. log (logger::LOG_NEWDEVICE, deviceName, 
 	                                channelSelector -> currentText ());
-	inputDevice_p. reset (createDevice (deviceName, &theLogger));
-	if (inputDevice_p. isNull ()) {
-	   inputDevice_p. reset (new deviceHandler ());
+	inputDevice_p =  createDevice (deviceName, &theLogger);
+	if (inputDevice_p == nullptr) {
+	   inputDevice_p = new deviceHandler ();
 	   return;		// nothing will happen
 	}
 	theDeviceChoser. hide ();
+	soundOut_p	-> restart ();
 	startDirect ();		// will set running
 }
 
@@ -2021,7 +2056,7 @@
 	   if (flags != 0)
 	      announcement_start (SId, flags);
 	   else
-	      announcement_stop ();
+	      announcement_stop (SId);
 	}
 }
 
@@ -2038,7 +2073,8 @@
 
 //	do not mess with the order
 void	RadioInterface::announcement_start (uint16_t SId,  uint16_t flags) {
-	(void)SId;
+	if (channel. currentService. SId != SId)
+	   return;
 	serviceLabel	-> setStyleSheet ("QLabel {color : red}");
 	int pictureId	= bits (flags);
 	QPixmap p = fetchAnnouncement (pictureId);
@@ -2046,7 +2082,10 @@
 	channel. announcing = true;
 }
 
-void	RadioInterface::announcement_stop () {
+void	RadioInterface::announcement_stop (uint16_t SId) {
+	if (channel. currentService. SId != SId)
+	   return;
+	
 	serviceLabel	-> setStyleSheet (labelStyle);
 	channel. announcing = false;
 	show_pauzeSlide ();
@@ -2162,7 +2201,7 @@
 	setSoundLabel (false);
 	channel. audioActive	= false;
 
-	announcement_stop ();
+	announcement_stop (s. SId);
 	if (s. isAudio) {
 	   soundOut_p -> suspend ();
 	   stopAudioDumping ();
@@ -2301,7 +2340,7 @@
 	if (flags != 0)
 	   announcement_start (ad. SId, flags);
 	else	
-	   announcement_stop ();
+	   announcement_stop (ad. SId);
 	dabService s;
 	s. channel	= ad. channel;
 	s. serviceName	= ad. serviceName;
@@ -2428,6 +2467,9 @@
 	   return;
 	presetTimer. stop ();
 
+	if (inputDevice_p -> isFileInput ())
+	   return;
+
 	if (nextService. channel != channel. channelName)
 	   return;
 	
@@ -2435,6 +2477,7 @@
 	   dynamicLabel -> setText ("ensemblename not yet found\n");
 	   return;
 	}
+
 	QString presetName	= nextService. serviceName;
 	for (int i = presetName. length (); i < 16; i ++)
 	   presetName. push_back (' ');
@@ -2533,10 +2576,6 @@
 	      presetTimer. start	(switchDelay);
 	   }
 	}
-
-	if (!theSCANHandler. active ())
-	   epgTimer. start (switchDelay);
-//
 //	all set, go for it
 	theOFDMHandler		-> start ();
 }
@@ -2544,7 +2583,6 @@
 //	apart from stopping the reader, a lot of administration
 //	is to be done.
 void	RadioInterface::stopChannel	() {
-	epgTimer. stop		();		// if running
 	epgLabel	-> hide ();
 	presetTimer. stop 	();		// if running
 	channelTimer. stop	();		// if running
@@ -2583,6 +2621,7 @@
 	   delete contentTable_p;
 	   contentTable_p = nullptr;
 	}
+
 //	note framedumping - if any - was already stopped
 //	ficDumping - if on - is stopped here
 	theOFDMHandler -> stopFicDump ();	// just in case ...
@@ -2669,8 +2708,7 @@
         store (dabSettings_p, DAB_GENERAL, TECHDATA_VISIBLE, false);
 	presetTimer. stop ();
 	channelTimer. stop ();
-	epgTimer. stop ();
-	connect (theOFDMHandler. data (), &ofdmHandler::noSignalFound,
+	connect (theOFDMHandler, &ofdmHandler::noSignalFound,
 	         this, &RadioInterface::no_signal_found);
 
 	if (theSCANHandler. scan_to_data ())
@@ -2764,8 +2802,6 @@
 	             configHandler_p -> switchDelayValue ();
 	channelTimer. start (2 * switchDelay);
 	startChannel    (channelSelector -> currentText ());
-//	fprintf (stderr, "de scan start met  %s\n",
-//	              channelSelector -> currentText (). toLatin1 (). data ());
 }
 //
 //	stopScanning is called
@@ -2777,7 +2813,7 @@
 	if (!theSCANHandler. active ())
 	   return;
 //	fprintf (stderr, "De scan wordt gestopt\n");
-	disconnect (theOFDMHandler. data (), &ofdmHandler::noSignalFound,
+	disconnect (theOFDMHandler, &ofdmHandler::noSignalFound,
 	            this, &RadioInterface::no_signal_found);
 	presetButton	-> setText ("favorites");
 	presetButton	-> setEnabled (true);
@@ -2858,7 +2894,6 @@
 //	Also called as a result of time out on channelTimer
 
 void	RadioInterface::channel_timeOut () {
-// fprintf (stderr, "Channel timeout\n");
 	channelTimer. stop ();
 	if (!theSCANHandler. active ())
 	   return;
@@ -2928,7 +2963,6 @@
 	stopChannel ();
 
 	QString cs	= theSCANHandler. getNextChannel ();
-//	fprintf (stderr, "Going for channel %s\n", cs. toLatin1 (). data ());
 	int cc	= channelSelector -> findText (cs);
 	newChannelIndex (cc);
 	int switchDelay	= 
@@ -3397,34 +3431,6 @@
 	theOFDMHandler -> startFicDump (ficDumpFileName);
 }
 
-//------------------------------------------------------------------------
-//
-//	if configured, the interpreation of the EPG data starts automatically,
-//	the servicenames of an SPI/EPG service may differ from one country
-//	to another
-void	RadioInterface::epgTimer_timeOut	() {
-	epgTimer. stop ();
-	
-	if (theSCANHandler. active ())
-	   return;
-	if (value_i (dabSettings_p, CONFIG_HANDLER, "epgFlag", 0) != 1)
-	   return;
-	for (auto &serv : channel. SPI_services) {
-	   int index	= theOFDMHandler -> getServiceComp (serv. SId, 0);
-	   packetdata pd;
-	   theOFDMHandler -> packetData (index, pd);
-	   if ((!pd. defined) ||
-	            (pd.  DSCTy == 0) || (pd. bitRate == 0)) 
-	      continue;
-	   if (pd. DSCTy == 60) {
-//	LOG hidden service starts
-//	      fprintf (stderr, "Starting hidden service %s\n",
-//	                                serv. toUtf8 (). data ());
-	      start_epgService (pd);
-	   }
-	}
-}
-
 void	RadioInterface::handle_timeTable	() {
 	if (myTimeTable. isVisible ()) {
 	   myTimeTable. clear ();
@@ -3474,7 +3480,7 @@
 }
 
 void	RadioInterface::handle_devicewidgetButton	() {
-	if (inputDevice_p. isNull ())
+	if (inputDevice_p == nullptr)
 	   return;
 	int currentVisibility = inputDevice_p -> getVisibility ();
 	inputDevice_p	-> setVisibility (!currentVisibility);
@@ -3600,10 +3606,7 @@
 }
 
 void	RadioInterface::selectDecoder (int decoder) {
-//	if (decoder == DECODER_4)
-//	   QMessageBox::information (this, tr ("Warning"),
-//	                         tr ("Decoder is experimental"));
-	if (!theOFDMHandler. isNull ())
+	if (theOFDMHandler != nullptr)
 	   theOFDMHandler	-> handleDecoderSelector (decoder);
 }
 
@@ -3628,18 +3631,11 @@
 	   return false;
 	if (mapHandler != nullptr)  
 	   return false;
-	QString browserAddress	=
-	            value_s (dabSettings_p, MAP_HANDLING, BROWSER_ADDRESS,
-	                                    "http://localhost");
-	QString mapPort		=
-	            value_s (dabSettings_p, MAP_HANDLING, MAP_PORT_SETTING,
-	                                             "8080");
+
 	mapHandler = new httpHandler (this,
-	                              mapPort,
-	                              browserAddress,
 	                              localPos,
 	                              "",
-	                              configHandler_p -> localBrowserSelector_active (), dabSettings_p);
+	                              configHandler_p -> localBrowserSelector_active (),	                      dabSettings_p);
 	return mapHandler != nullptr;
 }
 
@@ -3652,19 +3648,11 @@
 	}
 
 	if (mapHandler == nullptr)  {
-	   QString browserAddress	=
-	            value_s (dabSettings_p, MAP_HANDLING, BROWSER_ADDRESS,
-	                                    "http://localhost");
-	   QString mapPort		=
-	            value_s (dabSettings_p, MAP_HANDLING, MAP_PORT_SETTING,
-	                                             "8080");
-
 	   mapHandler = new httpHandler (this,
-	                                 mapPort,
-	                                 browserAddress,
 	                                 localPos,
 	                                 QString (""),
-	                                 configHandler_p -> localBrowserSelector_active (), dabSettings_p);
+	                                 configHandler_p -> localBrowserSelector_active (),
+	                                 dabSettings_p);
 	   if (mapHandler != nullptr)
 	      httpButton -> setText ("http-on");
 	}
@@ -4608,17 +4596,6 @@
 	return pictures. elements. size ();
 }
 //
-static
-int	mcmp (const void *a, const void *b) {
-multimediaElement *aa = (multimediaElement *)a;
-multimediaElement *bb = (multimediaElement *)b;
-	if (aa -> width < bb -> width)
-	   return 1;
-	if (aa -> width > bb -> width)
-	   return -1;
-	return 0;
-}
-//
 //	We prefer square pictures, if no one found,
 //	then the largest
 //	All pictures are stored in groups  (SId is key) in
@@ -4734,25 +4711,26 @@
 //	handling journaline					//
 
 void	RadioInterface::startJournaline		(int currentKey) {
-	if (!journalineHandler. isNull ())
+	if (journalineHandler != nullptr)
 	   return;
-	journalineHandler. reset (new journaline_dataHandler ());
+	journalineHandler	= new journaline_dataHandler ();
 	journalineKey		= currentKey;
 }
 
 void	RadioInterface::stopJournaline		(int currentKey) {
-	if (journalineHandler. isNull ())
+	if (journalineHandler == nullptr)
 	   return;	
 	if (journalineKey != currentKey)
 	   fprintf (stderr, "What is happenng here %d %d\n",
 	                                   journalineKey, currentKey);
-	journalineHandler. reset ();
+	delete 	journalineHandler;
+	journalineHandler	= nullptr;
 	journalineKey	= -1;
 }
 
 void	RadioInterface::journalineData		(QByteArray data,
 	                                                 int currentKey) {
-	if (journalineHandler. isNull ())
+	if (journalineHandler == nullptr)
 	   return;
 	if (currentKey != journalineKey)
 	   return;
@@ -4762,7 +4740,6 @@
 	journalineHandler	-> add_mscDatagroup (theMscdata);
 }
 
-
 void	RadioInterface::focusInEvent (QFocusEvent *evt) {
 	(void)evt;
 }
@@ -4808,3 +4785,8 @@
 	   theDeviceChoser. show ();
 }
 
+void	RadioInterface::tell_programType	(int SId, int programType) {
+	if (channel. currentService. SId == SId)
+	   programTypeLabel	-> setText (getProgramType (programType));
+}
+

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/radio.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/radio.h Changed

@@ -147,11 +147,6 @@
 	~dabService	() {}
 };
 
-typedef  struct {
-	QString serviceName;
-	uint32_t SId;
-} SPI_service;
-
 struct	theTime {
 	int	year;
 	int	month;
@@ -186,7 +181,6 @@
 	int		nrServices;	// measured
 	int		serviceCount;	// from FIC or nothing
 	dabService	currentService;
-	std::vector<SPI_service> SPI_services;
 	std::vector<dabService> runningTasks;
 	bool		hasEcc;
 	uint8_t		eccByte;
@@ -209,7 +203,6 @@
 	void	cleanChannel () {
 	   transmitters. resize (0);
 	   servicePictures. resize (0);
-	   SPI_services. resize (0);
 	   runningTasks. resize (0);
 	   realChannel		= true;
 	   serviceCount		= -1;
@@ -289,14 +282,18 @@
 	epgCompiler		epgVertaler;
 //	end of variables that are initalized
 
-	QScopedPointer<configHandler>	configHandler_p;
 	QScopedPointer<ensembleHandler> theEnsembleHandler;
-	QScopedPointer<ofdmHandler>	theOFDMHandler;
-	QScopedPointer<deviceHandler>	inputDevice_p;
-	bool			autoStart_http		();
-	bool			dxMode;
-	QScopedPointer<journaline_dataHandler>	journalineHandler;
-	int			journalineKey;
+//	QScopedPointer<configHandler>	configHandler_p;
+//	QScopedPointer<ofdmHandler>	theOFDMHandler;
+//	QScopedPointer<techData>	techWindow_p;
+	configHandler			*configHandler_p;
+	techData			*techWindow_p;
+	ofdmHandler			*theOFDMHandler;
+	deviceHandler			*inputDevice_p;
+	bool				autoStart_http		();
+	bool				dxMode;
+	journaline_dataHandler		*journalineHandler;
+	int				journalineKey;
 //
 //	Since the local position does not depend on the channel selected
 //	the local position is not stored in the channel data
@@ -313,7 +310,6 @@
 	channelDescriptor	channel;
 	QDialog			*the_aboutLabel;
 	bool			error_report;
-	QScopedPointer<techData> techWindow_p;
 	QSettings		*dabSettings_p;
 	int16_t			tii_delay;
 	int32_t			dataPort;
@@ -331,7 +327,6 @@
 #ifdef	CLOCK_STREAMER
 	tcpServer		*clockStreamer_p;
 #endif
-	QTimer			epgTimer;
 	QTimer			pauzeTimer;
 	QTimer			stressTimer;
 	QString			path_for_files;
@@ -464,7 +459,7 @@
 //
 //	announcements
 	void			announcement_start	(uint16_t, uint16_t);	
-	void			announcement_stop	();
+	void			announcement_stop	(uint16_t);
 //
 //	key events for setting focus to windows
 	bool			handle_keyEvent		(int);
@@ -521,7 +516,6 @@
 	void			announcement		(int, int);
 	void			newFrame		(int);
 
-	void			epgTimer_timeOut	();
 	void			handle_presetSelect	(const QString &,
 	                                                 const QString &);
 	void			handle_contentSelector	(const QString &);
@@ -646,5 +640,7 @@
 	                                                         const QString &);
 	void			nrActiveServices		(int);
 	void			handle_activeServices		();
-
+//
+//	and from the fib handler
+	void			tell_programType		(int, int);
 };

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/scopes/correlation-scope.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/scopes/correlation-scope.cpp Changed

@@ -104,18 +104,21 @@
 auto *X_axis	= dynVec (floatQwt, amount);
 auto *Y_value	= dynVec (floatQwt, amount);
 floatQwt Max	= -200;
+floatQwt Min	= 1000;
 int	teller	= 0;
 int	input	= v. size ();
 
 	(void)T_g;
 	if ((int)(v. size ()) < amount)
 	   amount = v. size ();
-	for (int i = input / 2 - amount / 2;
-	     i < input / 2 + amount / 2; i ++) {
+	for (int i = T_g - 104; i < T_g - 104 + amount; i ++) {
 	   X_axis teller = i;
+	   int index = i - (T_g - 100);
 	   Y_value teller = get_db (v i);
 	   if (Y_value teller > Max)
 	      Max = Y_value teller;
+	   if (Y_value teller < Min)
+	      Min = Y_value teller;
 	   teller ++;
 	}
 
@@ -129,7 +132,8 @@
 	   up_to_4 ++;
 	   if (up_to_4 > 4)
 	      break;
-	   int x_coord = (int)(x. phase / 360 * 2048 + 400);
+	   int x_coord = (int)(x. phase / 360 * 2048 + T_g - 104);
+static int teller = 0;
 	   if ((x_coord < X_axis 0) || (x_coord >= X_axis 0 + amount))
 	      continue;
 
@@ -156,13 +160,15 @@
 				         (floatQwt)X_axis 0,
 				         X_axis amount - 1);
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
+
+	float baseLine		= Min;
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
-				         get_db (0) + 30,
-	                                 get_db (0) + 30 + sliderValue);
+				         baseLine,
+	                                 baseLine + 30 + sliderValue);
 
-	spectrumCurve. setBaseline (get_db (0) + 30);
-	Y_value 0		= get_db (0) + 30;
-	Y_value amount - 1	= get_db (0) + 30;
+	spectrumCurve. setBaseline (baseLine);
+	Y_value 0		= baseLine;
+	Y_value amount - 1	= baseLine;
 
 	spectrumCurve. setSamples (X_axis, Y_value, amount);
 	plotgrid	-> replot ();

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/techdata.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/techdata.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/main/techdata.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/techdata.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/output/Qt6/Qt-audio.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/output/Qt6/Qt-audio.cpp Changed

@@ -35,14 +35,13 @@
 //
 //	The format is known, everything mapped onto 2 channel 48000
 	Qt_Audio::Qt_Audio (RadioInterface *mr,
-	                    QSettings *settings) :
-//	                                  audioPlayer (mr),
-	                                  tempBuffer (16 * 32768),
-	                                  theIODevice (mr, &tempBuffer) {
+	                    QSettings *settings) {
 	this	-> mr		= mr;
 	this	-> audioSettings	= settings;
 	newDeviceIndex		= 0;
-	
+
+	m_audioSink. reset ();
+	theIODevice		= nullptr;
         m_settings. setSampleRate (48000);
         m_settings. setSampleFormat (QAudioFormat::Float);
         m_settings. setChannelCount (2);
@@ -65,10 +64,12 @@
 }
 
 	Qt_Audio::~Qt_Audio	() {
-	if (m_audioSink != nullptr) {
+	if (!m_audioSink. isNull ()) {
 	   m_audioSink -> stop ();
 	}
-	theIODevice. stop ();
+	if (theIODevice != nullptr) {
+	   delete theIODevice;
+	}
 	if (deviceList != nullptr)
 	   delete deviceList;
 }
@@ -83,13 +84,30 @@
            nameList << listEl. description ();
         return nameList; 
 }
+//
+void	Qt_Audio::stop	() {
+	if (m_audioSink. isNull () || (theIODevice == nullptr)) 
+	   return;
+	m_audioSink	-> stop ();
+	if (theIODevice != nullptr)
+	   delete theIODevice;
+	theIODevice	= nullptr;
+	m_audioSink. reset ();
+	disconnect (m_audioSink. get (), &QAudioSink::stateChanged,
+                    this, &Qt_Audio::state_changed);
+}
 
+//	restart
 void	Qt_Audio::restart	() {
 	if (newDeviceIndex < 0)
 	   return;
-	theIODevice. stop ();
+
+	stop ();	// just to be sure
+//	select the device
 	currentDevice = outputDevices. at (newDeviceIndex);
 	m_audioSink. reset (new QAudioSink (currentDevice, m_settings));
+	QtAudio::Error err = m_audioSink -> error ();
+//	fprintf (stderr, "Errorcode for new audiosink %d\n", (int)(err));
 	connect (m_audioSink. get (), &QAudioSink::stateChanged,
                  this, &Qt_Audio::state_changed);
 	int currentVolume = value_i (audioSettings, SOUND_HANDLING, 
@@ -99,41 +117,38 @@
                                               QAudio::LogarithmicVolumeScale,
                                               QAudio::LinearVolumeScale);
 //	and run off
-	theIODevice. start ();
 	m_audioSink	-> setVolume	(linearVolume);
-	m_audioSink	-> start (&theIODevice);
-//	QtAudio::Error err = m_audioSink -> error ();
-//	fprintf (stderr, "Errorcode %d\n", (int)(err));
-}
-
-void	Qt_Audio::stop	() {
-	m_audioSink	-> stop ();
-	theIODevice. stop ();
+	theIODevice	= new Qt_AudioDevice (mr); // will start as well
+	m_audioSink	-> start (theIODevice);
+	err = m_audioSink -> error ();
+//	fprintf (stderr, "Errorcode for new audiosink start %d\n", (int)(err));
 }
 
 void	Qt_Audio::suspend	() {
 	if (m_audioSink == nullptr)
 	   return;
-	if (m_audioSink -> state () == QAudio::ActiveState) 
+	if (m_audioSink -> state () == QAudio::ActiveState) {
            m_audioSink -> suspend ();
-	tempBuffer. FlushRingBuffer ();
+	   theIODevice	-> suspend ();
+	}
 }
 
 void	Qt_Audio::resume	() {
 	if (m_audioSink == nullptr)
 	   return;
-	tempBuffer. FlushRingBuffer ();
 	if ((m_audioSink -> state () == QAudio::SuspendedState) ||
-            (m_audioSink -> state () == QAudio::StoppedState)) 
+            (m_audioSink -> state () == QAudio::StoppedState))  {
            m_audioSink -> resume ();
+	   theIODevice -> resume ();
+	}
 }
 //      Note that - by convention - all audio samples here
 //      are in a rate 48000
 void    Qt_Audio::audioOutput (float *fragment, int32_t size) {
-//	if (m_audioSink == 0)
-//	   return;
-	tempBuffer. putDataIntoBuffer ((char *)fragment,
-	                                       sizeof (float) * size);
+	if (m_audioSink. isNull ())
+	   return;
+	if (theIODevice != nullptr)
+	   theIODevice -> putData (fragment, size);
 }
 
 void	Qt_Audio::state_changed (const QAudio::State newState) {
@@ -143,8 +158,8 @@
 	      break;
 	   case QAudio::IdleState:
 //	      fprintf (stderr, "State: Idle\n");
-//	      if (m_audioSink -> error () != QAudio::NoError)
-//	         fprintf (stderr, "we found %d \n", (int)(m_audioSink -> error ()));
+	      if (m_audioSink -> error () != QAudio::NoError)
+	         fprintf (stderr, "we found %d \n", (int)(m_audioSink -> error ()));
 	      break;
 	   case QAudio::StoppedState:
 //	      fprintf (stderr, "State: Stopped\n");
@@ -157,11 +172,8 @@
 
 bool	Qt_Audio::selectDevice (int16_t index, const QString &deviceName) {
 	(void)deviceName;
-	if (m_audioSink != nullptr) {
-	   theIODevice. stop ();
-           m_audioSink -> stop ();
-           m_audioSink -> disconnect (this);
-	}
+	if (!m_audioSink. isNull ())
+	   stop ();
 	newDeviceIndex = index;
 	for (int i = 0; i < outputDevices. size (); i ++) {
 	   if (outputDevices. at (i). description () == deviceName) {
@@ -207,7 +219,8 @@
 }
 
 void	Qt_Audio::samplesMissed	(int &total, int & missed) {
-	theIODevice. samplesMissed (total, missed);
+	if (theIODevice != nullptr)
+	   theIODevice -> samplesMissed (total, missed);
 }
 
 void	Qt_Audio::updateDeviceList () {

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/output/Qt6/Qt-audio.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/output/Qt6/Qt-audio.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/output/Qt6/Qt-audiodevice.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/output/Qt6/Qt-audiodevice.cpp Changed

@@ -31,10 +31,9 @@
 //
 //	Create a "device"
 Qt_AudioDevice::Qt_AudioDevice (RadioInterface *mr,
-	                        RingBuffer<char>* Buffer_i,
 	                        QObject* parent):
 	                                 QIODevice (parent),
-	                                 Buffer (Buffer_i) {
+	                                 Buffer (32 * 32768) {
 
 	(void)mr;
 	totalBytes_l	= 0;
@@ -47,15 +46,42 @@
 	         this, &Qt_AudioDevice::print_channelReadyRead);
 	connect (this, &QIODevice::aboutToClose,
 	         this, &Qt_AudioDevice::print_aboutToClose);
-//	start ();
+	running	= false;
+	start ();
 }
 
 Qt_AudioDevice::~Qt_AudioDevice () {
-	close ();
+//	fprintf (stderr, "Closing QIODevice\n");
+	if (running)
+	   close ();
 }
 
 void	Qt_AudioDevice::start () {
+//	fprintf (stderr, "restarting QIODevice with buffer %d\n",
+//	                               Buffer. GetRingBufferReadAvailable ());
 	(void)open (QIODevice::ReadOnly);
+	running	= true;
+}
+
+void	Qt_AudioDevice::stop () {
+	fprintf (stderr, "Closing QIODevice\n");
+	Buffer. FlushRingBuffer();
+	close ();
+	running = false;
+}
+
+void	Qt_AudioDevice::suspend	() {
+	Buffer. FlushRingBuffer ();
+}
+
+void	Qt_AudioDevice::resume	() {
+	Buffer. FlushRingBuffer ();
+}
+
+void	Qt_AudioDevice::putData	(float *fragment, int32_t size) {
+	if (running)
+	   Buffer. putDataIntoBuffer ((char *)fragment,
+                                               sizeof (float) * size);
 }
 
 //	we always return "maxSize" bytes
@@ -63,7 +89,7 @@
 qint64	amount = 0;
 //	"maxSize" is the requested size in bytes
 //	"amount" is in uint8_t's
-	amount = Buffer -> getDataFromBuffer (buffer, maxSize);
+	amount = Buffer. getDataFromBuffer (buffer, maxSize);
 	if (amount < maxSize) {
 	   for (int i = amount; i < maxSize; i ++)
 	      buffer i = (char)(0); 
@@ -74,9 +100,9 @@
 	return maxSize;
 }
 
-void	Qt_AudioDevice::stop () {
-	Buffer -> FlushRingBuffer();
-	close ();
+
+bool	Qt_AudioDevice::isRunning () {
+	return running;
 }
 
 void	Qt_AudioDevice::samplesMissed (int &total, int &too_short) {

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/output/Qt6/Qt-audiodevice.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/output/Qt6/Qt-audiodevice.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/protection/eep-protection.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/eep-protection.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/protection/eep-protection.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/eep-protection.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/protection/protection.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/protection.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/protection/protection.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/protection.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/protection/uep-protection.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/uep-protection.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/protection/uep-protection.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/uep-protection.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/support/dxDisplay.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/dxDisplay.cpp Changed

@@ -45,7 +45,7 @@
 	myWidget	-> resize (220, 400);
 	myWidget	-> setWidgetResizable (true);
 
-	tableWidget 	= new QTableWidget (0, 12);
+	tableWidget 	= new QTableWidget (0, 13);
 	tableWidget	-> setColumnWidth (0, 30);	// mark
 	tableWidget	-> setColumnWidth (1, 45);	// pattern
 	tableWidget	-> setColumnWidth (2, 50);	// tii value
@@ -57,7 +57,8 @@
 	tableWidget	-> setColumnWidth (8, 60);	// height
 	tableWidget	-> setColumnWidth (9, 60);	// direction
 	tableWidget	-> setColumnWidth (10, 80);	// distamce
-	tableWidget	-> setColumnWidth (11, 250);	// transmitter
+	tableWidget	-> setColumnWidth (11, 80);	// delay
+	tableWidget	-> setColumnWidth (12, 250);	// transmitter
 
 	QHeaderView *headerView = tableWidget -> horizontalHeader ();
 	headerView	-> setSectionResizeMode (1, QHeaderView::Stretch);
@@ -67,7 +68,7 @@
 	                tr ("tii") << tr ("phase") << tr ("strength") <<
 	                tr ("azimuth")  << tr ("power") <<
 	                tr ("alt") << tr ("height") << tr ("dir") <<
-	                tr ("dist") << tr ("transmitter")); 
+	                tr ("dist") << tr ("delay") << tr ("transmitter")); 
 
 	theDial		= new QwtCompass ();
 	theDial		-> setLineWidth (8);
@@ -91,11 +92,12 @@
 	myWidget	-> setWindowTitle ("dx display");
 	setPositionAndSize (s, myWidget, "DX_DISPLAY");
 	theChannel	= "";
+
+	connect (this, &superFrame::frameClosed,
+	         this, &dxDisplay::handle_frameClosed);
 }
 
 	dxDisplay::~dxDisplay () {
-	if (!myWidget -> isHidden ())
-	   storeWidgetPosition (dxSettings, myWidget, "DX_DISPLAY");
 	int16_t	rows	= tableWidget -> rowCount ();
 	for (int row = rows; row > 0; row --)
 	   tableWidget -> removeRow (row);
@@ -103,6 +105,13 @@
 	delete	myWidget;
 }
 
+void	dxDisplay::storePosition () {
+	return;
+	if (!myWidget -> isHidden ())
+	   storeWidgetPosition (dxSettings, myWidget, "DX_DISPLAY");
+	myWidget	-> hide ();
+}
+
 void	dxDisplay::setChannel (const QString &channel,
 	                       const QString &ensemble) {
 	myWidget -> setWindowTitle ("TII data: channel  " +channel + " ensemble: " + ensemble);
@@ -129,6 +138,10 @@
 	myWidget	-> hide ();
 }
 
+bool	dxDisplay::isHidden () {
+	return myWidget	-> isHidden ();
+}
+
 void	dxDisplay::addRow (transmitter &theTransmitter, bool isStrongest) {
 int16_t	row	= tableWidget -> rowCount ();
 
@@ -140,6 +153,7 @@
 	float	phase		= theTransmitter. phase;
 	float	strength	= 10 * log10 (theTransmitter. strength + 0.01);
 	float distance		= theTransmitter. distance;
+	float delay		= (distance * 1000) / 299792458.0 * 2048000;
 	float azimuth		= theTransmitter. azimuth;
 	float power		= theTransmitter. power;
 	int   altitude		= theTransmitter. altitude;
@@ -192,10 +206,13 @@
 	item10		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	tableWidget	-> setItem (row, 10, item10);
 
-	QTableWidgetItem *item11 = new QTableWidgetItem;	// transmitter
-	item11		-> setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+	QTableWidgetItem *item11 = new QTableWidgetItem;	// delayr
+	item11		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	tableWidget	-> setItem (row, 11, item11);
 
+	QTableWidgetItem *item12 = new QTableWidgetItem;	// transmitter
+	item12		-> setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 12, item12);
 
 	tableWidget	-> setCurrentItem (item0);
 	QString aa	= QString ("0x") + QString::number (pattern, 16);
@@ -215,7 +232,8 @@
 	tableWidget	-> item (row, 8) -> setText (QString::number (height) +  " m");
 	tableWidget	-> item (row, 9) -> setText (dir);
 	tableWidget	-> item (row, 10) -> setText (QString::number (distance, 'f', 1) + " km");
-	tableWidget	-> item (row, 11) -> setText (transmitterName);
+	tableWidget	-> item (row, 11) -> setText (QString::number (delay, 'f', 1) + " samples");
+	tableWidget	-> item (row, 12) -> setText (transmitterName);
 	tableWidget	-> item (row, 0) -> setText (b ? "***" : "");
 	if (b)
 	   theDial -> setValue (azimuth);
@@ -279,3 +297,7 @@
 	tableWidget	-> item (row, 0) -> setText ( "");
 }
 
+void	dxDisplay::handle_frameClosed	() {
+	hide ();
+}
+

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/support/dxDisplay.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/dxDisplay.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/support/http-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/http-handler.cpp Changed

@@ -44,19 +44,25 @@
 //#include	<err.h>
 #include	<cstring>
 
+#include	"settings-handler.h"
+#include	"settingNames.h"
 #include	"http-handler.h"
 #include	"radio.h"
 
 	httpHandler::httpHandler (RadioInterface *parent,
-	                          const QString & mapPort,
-	                          const QString &browserAddress,
 	                          position	 homeAddress,
 	                          const QString &saveName,
 	                          bool autoBrowser_off,
 	                          QSettings	*settings) {
 	this	-> parent	= parent;
-	this	-> mapPort	= mapPort;
-	QString temp		= browserAddress + ":" + mapPort;
+	this	-> mapPort			=
+	            value_s (settings, MAP_HANDLING, MAP_PORT_SETTING,
+                                                                  "8080");
+	QString address		= 
+	            value_s (settings, MAP_HANDLING, BROWSER_ADDRESS,
+	                                                "http://localhost");
+
+	QString temp		= address + ":" + mapPort;
 	this	-> homeAddress	= homeAddress;
 	this	-> autoBrowser_off	= autoBrowser_off;
 #ifdef	__MINGW32__

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/support/http-handler.h -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/http-handler.h Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/support/scanlist-handler.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/scanlist-handler.cpp Changed

qt-dab-Qt-DAB-6.9.5.tar.gz/sources/support/tii-reader.cpp -> qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/tii-reader.cpp Changed

Build Results
RPM Lint

Refresh

Comments for request 6352 0

Request History

wkazubski created request 1 day ago

Version 6.9.6

wkazubski accepted request 1 day ago