Request 5843 (accepted)

Overview

Request 5843 (accepted)

Update to qt-dab-4.7

Created by wkazubski over 1 year ago
In state accepted

Submit qt-dab

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

qt-dab.changes Changed

qt-dab4.changes Added

@@ -0,0 +1,184 @@
+-------------------------------------------------------------------
+Sat Sep 30 21:46:13 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.7
+
+-------------------------------------------------------------------
+Wed Apr 26 21:46:23 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.6
+
+-------------------------------------------------------------------
+Tue Jun 28 21:16:53 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.4.2
+  * The map functions have been rewritten.
+
+-------------------------------------------------------------------
+Wed Jun 22 19:26:36 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.4.1
+  * A number of mods was made to map handling.
+    + Selecting a transmitter on the map will show some details on
+      the right side of the map window.
+    + The configuration widget allow to choose between automatically
+      starting a browser of touching http select, or manually, and
+      it allows to choose between viewing only the transmitters on
+      the map of the current channels of also those encountered
+      when visiting other channels.
+
+-------------------------------------------------------------------
+Wed Jun 15 16:16:56 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.4
+  * Qt-DAB 4.4 adds showing the locations of the transmitters being
+    received on a map
+
+-------------------------------------------------------------------
+Thu Apr  7 22:22:46 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.3.5.1 (aka 4.351)
+  * Just an update to handle some problems in epg handling.
+
+-------------------------------------------------------------------
+Sat Mar 12 14:47:14 UTC 2022 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.3.5 (aka 4.35)
+- specfile clanup (removed Fedora stuff)
+
+-------------------------------------------------------------------
+Wed Nov  3 23:39:27 UTC 2021 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.1.1 (aka 4.11)
+
+-------------------------------------------------------------------
+Wed Sep  1 19:13:04 UTC 2021 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.1
+
+-------------------------------------------------------------------
+Mon Jul 26 19:49:26 UTC 2021 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 4.0
+
+-------------------------------------------------------------------
+Wed May 12 20:36:35 UTC 2021 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.7.2 (aka 3.72)
+
+-------------------------------------------------------------------
+Wed Apr  7 22:06:31 UTC 2021 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.7.1 (aka 3.71)
+
+-------------------------------------------------------------------
+Thu Dec 10 20:18:37 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.7
+
+-------------------------------------------------------------------
+Wed Oct 21 18:28:12 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.6
+
+-------------------------------------------------------------------
+Mon Sep  7 19:10:37 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.5.3
+
+-------------------------------------------------------------------
+Fri Aug  7 21:47:27 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.5.2
+
+-------------------------------------------------------------------
+Sat Jul 25 17:37:13 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.5
+
+-------------------------------------------------------------------
+Mon Apr 27 20:05:50 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.4.1
+
+-------------------------------------------------------------------
+Sat Apr 18 14:54:47 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.4
+
+-------------------------------------------------------------------
+Tue Mar 17 23:59:24 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.3
+
+-------------------------------------------------------------------
+Sun Feb 16 21:36:26 UTC 2020 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 3.21
+
+-------------------------------------------------------------------
+Fri Nov  1 19:35:09 UTC 2019 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- updated to release 2.7.4
+- added patch qt-dab-no-return.patch for Leap 15.0/15.1
+
+-------------------------------------------------------------------
+Mon Jul 29 18:00:00 UTC 2019 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- updated to release 2.7.1
+- patch qt-dab-2.5-fix-missing-return.patch removed (applied
+  upstream)
+
+-------------------------------------------------------------------
+Sat Apr 13 22:09:00 UTC 2019 - wk@ire.pw.edu.pl
+
+- updated to release 2.5
+- patch qt-dab-2.5-fix-missing-return.patch added
+- patch qt-dab-2.02-missing-q_object.patch removed (fixed upstream)
+
+-------------------------------------------------------------------
+Wed Jan  2 21:04:49 UTC 2019 - wk@ire.pw.edu.pl
+
+- updated to release 2.02
+
+-------------------------------------------------------------------
+Fri Dec 28 18:15:55 UTC 2018 - wk@ire.pw.edu.pl
+
+- updated to release 2.01
+
+-------------------------------------------------------------------
+Wed Dec 19 21:54:39 UTC 2018 - wk@ire.pw.edu.pl
+
+- updated to git 20181215
+
+-------------------------------------------------------------------
+Fri Nov 30 20:12:07 UTC 2018 - wk@ire.pw.edu.pl
+
+- updated to git 20181129
+
+-------------------------------------------------------------------
+Thu Nov  1 22:53:30 UTC 2018 - wk@ire.pw.edu.pl
+
+- updated to git 20181030
+- patch qt-dab-qt-dab-2.0-fix-no-return.patch removed (fixed 
+  upstream)
+
+-------------------------------------------------------------------
+Thu Oct 11 00:13:21 UTC 2018 - wk@ire.pw.edu.pl
+
+- updated to git 20181009
+- works with SDRplay library version 2.13
+
+-------------------------------------------------------------
+Sat Jul 21 18:40:02 UTC 2018 - wk@ire.pw.edu.pl
+
+- patch qt-dab-qt-dab-2.0-use-qwt6-qt5.patch tu find qt5 version of
+  Qwt6 package
+
+-------------------------------------------------------------------
+Fri Jul 20 21:51:48 UTC 2018 - wk@ire.pw.edu.pl
+
+- initial specfile
+- version 2.0
+- added patch to qt-dab-qt-dab-2.0-fix-no-return.patch to fix a
+  nonvoid function without return

qt-dab5.changes Changed

qt-dab.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package qt-dab
 #
-# Copyright (c) 2014-2022 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2023 Wojciech Kazubski <wk@ire.pw.edu.pl>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,8 @@
 
 %define bname qt-dab
 %define branch qt-dab-s4
-%define version4 4.6
-%define version5 5.3
+%define version4 4.7
+%define version5 5.4
 
 Name:           %{bname}
 Version:        %{version4}
@@ -29,6 +29,7 @@
 Group:          Productivity/Multimedia/Other
 Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version4}-%{version5}.tar.gz#/%{name}-%{name}-%{version4}-%{version5}.tar.gz
 Patch1:         %{bname}-45-use-qwt6-qt5.patch
+Patch2:         %{bname}-fix-build-with-gcc13.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
@@ -57,6 +58,9 @@
 %prep
 %setup -q -n %{name}-%{name}-%{version4}-%{version5}
 %patch1 -p 1
+%if 0%{?suse_version} > 1500
+%patch2 -p 1
+%endif
 
 
 %build

qt-dab4.spec Added

@@ -0,0 +1,103 @@
+#
+# spec file for package qt-dab
+#
+# Copyright (c) 2014-2023 Wojciech Kazubski <wk@ire.pw.edu.pl>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
+#
+
+%define bname qt-dab
+%define branch qt-dab-s4
+%define version4 4.7
+%define version5 5.4
+
+Name:           %{bname}
+Version:        %{version4}
+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/%{name}-%{version4}-%{version5}.tar.gz#/%{name}-%{name}-%{version4}-%{version5}.tar.gz
+Patch1:         %{bname}-45-use-qwt6-qt5.patch
+Patch2:         %{bname}-fix-build-with-gcc13.patch
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  qwt6-qt5-devel >= 6.1
+BuildRequires:  pkgconfig(fftw3)
+BuildRequires:  hackrf-devel
+BuildRequires:  pkgconfig(libairspy)
+BuildRequires:  pkgconfig(librtlsdr)
+BuildRequires:  sdrplay-devel
+BuildRequires:  pkgconfig(portaudio-2.0)
+BuildRequires:  pkgconfig(samplerate)
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  ImageMagick
+BuildRequires:  libusb-1_0-devel
+BuildRequires:  libfaad-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  hicolor-icon-theme
+
+%description
+This is the implementation of a -relatively simple DAB/DAB+ receiver.
+The receiver supports terrestrial DAB reception with as input either
+the stream from a dabstick or a (prerecorded) file, and it will
+output through the default soundcard.
+
+
+%prep
+%setup -q -n %{name}-%{name}-%{version4}-%{version5}
+%patch1 -p 1
+%if 0%{?suse_version} > 1500
+%patch2 -p 1
+%endif
+
+
+%build
+cd %{branch}
+%cmake \
+    -DAIRSPY=ON \
+    -DHACKRF=ON \
+    -DRTLSDR=ON \
+    -DRTLTCP=ON \
+    -DSDRPLAY=ON
+%cmake_build
+
+
+%install
+cd %{branch}
+%cmake_install
+mkdir -p %{buildroot}%{_bindir}
+mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}-4
+
+#install desktop file
+%suse_update_desktop_file -G Qt-DAB -i %{name}-4 AudioVideo Tuner 
+
+#create and install icons
+convert %{bname}-4.ico %{name}.png
+install -Dpm 0644 %{name}.png \
+	%{buildroot}%{_datadir}/pixmaps/%{name}.png
+
+#fix docs permissions
+chmod a-x ../README.md
+
+
+%files
+%doc AUTHORS README.md
+%license COPYING
+%{_bindir}/*
+%{_datadir}/applications/%{name}-4.desktop
+%{_datadir}/pixmaps/%{name}*.png
+
+
+%changelog

qt-dab5.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package qt-dab
 #
-# Copyright (c) 2014-2022 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2023 Wojciech Kazubski <wk@ire.pw.edu.pl>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,8 @@
 
 %define bname qt-dab
 %define branch qt-dab-s5
-%define version4 4.6
-%define version5 5.3
+%define version4 4.7
+%define version5 5.4
 
 Name:           %{bname}5
 Version:        %{version5}
@@ -29,6 +29,7 @@
 Group:          Productivity/Multimedia/Other
 Source0:        https://github.com/JvanKatwijk/%{bname}/archive/refs/tags/%{bname}-%{version4}-%{version5}.tar.gz#/%{bname}-%{bname}-%{version4}-%{version5}.tar.gz
 Patch1:         %{bname}-45-use-qwt6-qt5.patch
+Patch2:         %{bname}-fix-build-with-gcc13.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
@@ -57,6 +58,9 @@
 %prep
 %setup -q -n %{bname}-%{bname}-%{version4}-%{version5}
 %patch1 -p 1
+%if 0%{?suse_version} > 1500
+%patch2 -p 1
+%endif
 
 
 %build

qt-dab-fix-build-with-gcc13.patch Added

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/support/fft-handler.h Deleted

@@ -1,71 +0,0 @@
-#
-/*
- *
- *    Copyright (C) 2009 .. 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
- */
-
-#ifndef _COMMON_FFT
-#define _COMMON_FFT
-
-//  Simple wrapper around fftwf
-#include	"dab-constants.h"
-#include	"dab-params.h"
-
-#define FFTW_MALLOC		fftwf_malloc
-#define FFTW_PLAN_DFT_1D	fftwf_plan_dft_1d
-#define FFTW_DESTROY_PLAN	fftwf_destroy_plan
-#define FFTW_FREE		fftwf_free
-#define FFTW_PLAN		fftwf_plan
-#define FFTW_EXECUTE		fftwf_execute
-#include    <fftw3.h>
-
-/*
- *  a simple wrapper
- */
-
-class   fftHandler {
-public:
-		fftHandler	(uint8_t);
-        	~fftHandler();
-        std::complex<float>  *getVector();
-        void		do_FFT();
-        void		do_IFFT();
-    private:
-	dabParams	p;
-        int32_t		fftSize;
-        std::complex<float>  *vector;
-        FFTW_PLAN   plan;
-};
-
-class   common_ifft {
-public:
-		common_ifft (int32_t);
-        	~common_ifft();
-        std::complex<float>  *getVector();
-        void	do_IFFT();
-    private:
-        int32_t	fft_size;
-        std::complex<float>  *vector;
-        FFTW_PLAN   plan;
-        void        Scale(std::complex<float> *);
-};
-#endif
-

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/support/history-handler.h Deleted

@@ -1,55 +0,0 @@
-#
-/*
- *    Copyright (C) 2019
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
- *
- *    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
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef	__HISTORY_HANDLER__
-#define	__HISTORY_HANDLER__
-
-#include	"radio.h"
-#include	<QListView>
-#include	<QStringList>
-#include	<QStringListModel>
-#include	<QModelIndex>
-
-class	RadioInterface;
-class	descriptorType;
-
-class	historyHandler:public QListView {
-Q_OBJECT
-public:
-		historyHandler	(RadioInterface *radio,
-	                                 QString fileName);
-		~historyHandler	();
-	void	addElement	(const QString &, const QString &);
-	void	clearHistory	();
-public slots:
-	void	selectElement	(QModelIndex);
-signals:
-	void	handle_historySelect (const QString &);
-private:
-	QStringList	historyList;
-	QStringListModel	displayList;
-	RadioInterface	*radio;
-	QString		fileName;
-};
-
-#endif
-

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/fft-handler.cpp Deleted

@@ -1,93 +0,0 @@
-#
-/*
- *    Copyright (C) 2008, 2009, 2010
- *    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	"fft-handler.h"
-#include	<cstring>
-//
-//	The basic idea was to have a single instance of the
-//	fftHandler, for all DFT's. Makes sense, since they are all
-//	of size T_u.
-//	However, in the concurrent version this does not work,
-//	it seems some locking there is inevitable
-//
-	fftHandler::fftHandler (uint8_t mode): p (mode) {
-	this	-> fftSize = p. get_T_u();
-	vector	= (std::complex<float> *)
-	          FFTW_MALLOC (sizeof (std::complex<float>) * fftSize);
-	plan	= FFTW_PLAN_DFT_1D (fftSize,
-	                            reinterpret_cast <fftwf_complex *>(vector),
-	                            reinterpret_cast <fftwf_complex *>(vector),
-	                            FFTW_FORWARD, FFTW_ESTIMATE);
-}
-
-	fftHandler::~fftHandler() {
-	   FFTW_DESTROY_PLAN (plan);
-	   FFTW_FREE (vector);
-}
-
-std::complex<float>	*fftHandler::getVector() {
-	return vector;
-}
-
-void	fftHandler::do_FFT() {
-	FFTW_EXECUTE (plan);
-}
-//
-//	Note that we do not scale here, not needed
-//	for the purpose we are using it for
-void	fftHandler::do_IFFT() {
-int16_t i;
-
-	for (i = 0; i < fftSize; i ++)
-	   vector i = conj (vector i);
-	FFTW_EXECUTE (plan);
-	for (i = 0; i < fftSize; i ++)
-	   vector i = conj (vector i);
-}
-
-//	Obsolete
-	common_ifft::common_ifft (int32_t fft_size) {
-int32_t	i;
-
-	this	-> fft_size = fft_size;
-	vector	= (std::complex<float> *)FFTW_MALLOC (sizeof (std::complex<float>) * fft_size);
-	for (i = 0; i < fft_size; i ++)
-	   vector i = 0;
-	plan	= FFTW_PLAN_DFT_1D (fft_size,
-	                            reinterpret_cast <fftwf_complex *>(vector),
-	                            reinterpret_cast <fftwf_complex *>(vector),
-	                            FFTW_BACKWARD, FFTW_ESTIMATE);
-}
-
-	common_ifft::~common_ifft() {
-	   FFTW_DESTROY_PLAN (plan);
-	   FFTW_FREE (vector);
-}
-
-std::complex<float>	*common_ifft::getVector() {
-	return vector;
-}
-
-void	common_ifft::do_IFFT() {
-	FFTW_EXECUTE	(plan);
-}
-

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/history-handler.cpp Deleted

@@ -1,126 +0,0 @@
-#
-/*
- *    Copyright (C) 2019
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
- *
- *    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
- */
-//
-//
-//	The qt-dab software will save some data of all services,
-//	ever seen.
-//	The list can be deleted by a simple mouseclick (right button)
-//
-#include	"history-handler.h"
-#include	"radio.h"
-#include	<QDomDocument>
-#include	<QFile>
-
-	historyHandler::historyHandler	(RadioInterface *radio,
-	                                 QString fileName):QListView (nullptr) {
-	this	-> radio	= radio;
-	this	-> fileName	= fileName;
-	QDomDocument xmlBOM;
-	this	-> fileName = fileName;
-//
-//	start with an empty list, waiting ...
-	historyList. clear ();
-	displayList. setStringList (historyList);
-	this	-> setModel (&displayList);
-	connect (this, SIGNAL (clicked (QModelIndex)),
-	         this, SLOT (selectElement (QModelIndex)));
-
-	QFile f (fileName);
-	if (!f. open (QIODevice::ReadOnly)) 
-	   return;
-
-	xmlBOM. setContent (&f);
-	f. close ();
-	QDomElement root	= xmlBOM. documentElement ();
-	QDomElement component	= root. firstChild (). toElement ();
-	while (!component. isNull ()) {
-	   if (component. tagName () == "HISTORY_ELEMENT") {
-	      presetData pd;
-	      pd. serviceName = component. attribute ("SERVICE_NAME", "???");
-	      pd. channel     = component. attribute ("CHANNEL", "5A");
-	      historyList. append (pd. channel + ":" + pd. serviceName);
-	   }
-	   component = component. nextSibling (). toElement ();
-	}
-	displayList. setStringList (historyList);
-	this	-> setModel (&displayList);
-}
-
-
-	historyHandler::~historyHandler   () {
-QDomDocument the_history;
-QDomElement root = the_history. createElement ("history_db");
-
-	the_history. appendChild (root);
-
-	for (int i = 1; i < historyList. size (); i ++) {
-	   QStringList list = historyList. at (i).
-	                        split (":", QString::SkipEmptyParts);
-           if (list. length () != 2)
-	      continue;
-           QString channel = list. at (0);
-           QString serviceName = list. at (1);
-	   QDomElement historyService = the_history.
-	                            createElement ("HISTORY_ELEMENT");
-	   historyService. setAttribute ("SERVICE_NAME", serviceName);
-	   historyService. setAttribute ("CHANNEL", channel);
-	   root. appendChild (historyService);
-	}
-
-	QFile file (this -> fileName);
-	if (!file. open (QIODevice::WriteOnly | QIODevice::Text))
-	   return;
-
-	QTextStream stream (&file);
-	stream << the_history. toString ();
-	file. close ();
-}
-
-void	historyHandler::addElement (const QString &channel,
-	                            const QString &serviceName) {
-const QString listElement = channel + ":" + serviceName;
-
-	for (int i = 0; i < historyList. size (); i ++)
-	   if (historyList. at (i) == listElement)
-	      return;
-//	fprintf (stderr, "adding %s %s\n", channel. toUtf8 (). data (),
-//	                                   serviceName. toUtf8 (). data ());
-	historyList. append (listElement);
-	displayList. setStringList (historyList);
-	this	-> setModel (&displayList);
-}
-
-void	historyHandler::clearHistory () {
-	historyList. clear ();
-	displayList. setStringList (historyList);
-	this	-> setModel (&displayList);
-}
-//
-//	selecting a historical service is not different from
-//	selecting a preset
-//
-void	historyHandler::selectElement (QModelIndex ind) {
-QString currentProgram = displayList. data (ind, Qt::DisplayRole). toString ();
-	emit handle_historySelect (currentProgram);
-}
-

qt-dab-qt-dab-4.6-5.3.tar.gz/README.md -> qt-dab-qt-dab-4.7-5.4.tar.gz/README.md Changed

@@ -2,6 +2,23 @@
 
 **Qt-DAB-4** and **Qt-DAB-5** is software for Linux, Windows, MacOS and Raspberry Pi for listening to terrestrial **Digital Audio Broadcasting (DAB and DAB+)**.
 
+-------------------------------------------------------------------
+New in 4.7 and 5.4
+-------------------------------------------------------------------
+
+Apart from fixing a few minor errors and restructuring some parts
+of the software, the main change in these versions - compared to previous
+ones - is handling the "history".
+
+In previous versions, each service (name) encountered was added
+to a history list, in this version the history list is replaced
+by a "scan list". The scan list is filled when scanning (single scan).
+The configuration widget has a selector for choosing that on a
+new scan the list is cleared (the default).
+
+New - compared to the history list - is that a mouse click right
+on an element in the scan list, the service name is added to the
+presets. Of course, a mouse click left will select the service.
 
 Table of Contents
 =================================================================
@@ -106,10 +123,10 @@
 !4.5(/qt-dab-4-config-widget.png?raw=true)
 !5.2(/qt-dab-5-config-widget.png?raw=true)
 
-The functionality of the versions is (almost) the same, version 5.1 has
-(most users will not use it though) the possibility of generating "eti" files.
-If there is serious interest for adding the feature to the Qt-DAB-4 interface,
-then let me know.
+The functionality of the versions is (almost) the same, version 5.X has
+(most users will not use it though) the possibility of
+generating "eti" files.  If there is serious interest for
+adding the feature to the Qt-DAB-4 interface, then let me know.
 
 The Qt-DAB-5.2 version has a slightly modified "technical window", 
 it now contains a small spectrum display of the audio output.
@@ -125,7 +142,14 @@
 and - in the time domain - the border between the NULL period and
 the first data block.
 
-!5.3(/5.3-spectrum-widget.png?raw=true)
+!5.3(/ideal-signal.png?raw=true)
+!5.3(/real-signal.png?raw=true)
+
+The right hand side numbers give some information on the (quality) of
+the signal. In the "ideal" signal, the constellation diagram shows 4
+dots, one in each quadrant, in general, the signal will be less ideal.
+The "std deviation" indicator tells the standard deviation of the
+dots in the conestallation diagram. Lower is better.
 
 ----------------------------------------------------------------------
 A note on showing a map
@@ -202,18 +226,10 @@
 
 Qt-DAB always shows a main widget; a number of **optional** widgets is visible under user control.
 
-Controls, in V4 on the main widget, were in V5 moved to the configuration and control widget.
-
-Some data on the selected service - if any - can be found on a separate widget, the "Technical Data" widget (*Detail* button).
-
-!Qt-DAB main widget(/qt-dab-technical-widget.png?raw=true)
-
-Other widgets are
+Apart from the widgets, already shown, there are
 
   * a configuration widget (V4) or a configuration and control widget (V5)
   * a widget with controls for the attached device,
-  * a widget for additional configuration settings,
-  * a widget showing the spectrum of the received radio signal, the constellation of the decoded signal and some quality parameters,,
   * a widget showing the spectrum of the NULL period between successive DAB frames from which the TII is derived,
   * a widget showing the correlations response(s) from different transmitters in the SFN,
   * a widget showing the development - over time - of the SNR,

qt-dab-qt-dab-4.6-5.3.tar.gz/dab-processor.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/dab-processor.cpp Changed

@@ -196,7 +196,7 @@
 	      case NO_END_OF_DIP_FOUND:
 	         goto notSynced;
 	   }
-	   myReader. getSamples (ofdmBuffer. data(),
+	   myReader. getSamples (ofdmBuffer, 0,
 	                        T_u, coarseOffset + fineOffset);
 /**
   *	Looking for the first sample of the T_u part of the sync block.
@@ -225,15 +225,17 @@
 	      frameCount = 0;
 	      null_shower = true;
 	   }
+
 	   if (null_shower) {
 	      for (int i = 0; i < T_u / 4; i ++)
 	         tester i = ofdmBuffer T_null - T_u / 4 + i;
 	   }
-	   myReader. getSamples (ofdmBuffer. data(),
+
+	   myReader. getSamples (ofdmBuffer, 0,
 	                         T_u, coarseOffset + fineOffset);
 	   if (null_shower) {
 	      for (int i = 0; i < T_u / 4; i ++)
-	         tester 1 * T_u / 4 + i = ofdmBuffer i;
+	         tester T_u / 4 + i = ofdmBuffer i;
 	      nullBuffer -> putDataIntoBuffer (tester. data (), T_u / 2);
 	      show_null (T_u / 2);
 	   }
@@ -276,9 +278,10 @@
   *	We read the missing samples in the ofdm buffer
   */
 	   setSynced (true);
-	   myReader. getSamples (&((ofdmBuffer. data()) ofdmBufferIndex),
-	                           T_u - ofdmBufferIndex,
-	                           coarseOffset + fineOffset);
+	   myReader. getSamples (ofdmBuffer,
+	                         ofdmBufferIndex,
+	                         T_u - ofdmBufferIndex,
+	                         coarseOffset + fineOffset);
 
 #ifdef	__WITH_JAN__
 	   static int abc = 0;
@@ -322,8 +325,8 @@
 	   FreqCorr	= std::complex<float> (0, 0);
 	   for (int ofdmSymbolCount = 1;
 	        ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
-	      myReader. getSamples (ofdmBuffer. data(),
-	                              T_s, coarseOffset + fineOffset);
+	      myReader. getSamples (ofdmBuffer, 0,
+	                            T_s, coarseOffset + fineOffset);
 	      sampleCount += T_s;
 	      for (i = (int)T_u; i < (int)T_s; i ++) {
 	         FreqCorr += ofdmBuffer i * conj (ofdmBuffer i - T_u);
@@ -348,7 +351,7 @@
   *	OK,  here we are at the end of the frame
   *	Assume everything went well and skip T_null samples
   */
-	   myReader. getSamples (ofdmBuffer. data(),
+	   myReader. getSamples (ofdmBuffer, 0,
 	                         T_null, coarseOffset + fineOffset);
 	   sampleCount += T_null;
 	   float sum	= 0;

qt-dab-qt-dab-4.6-5.3.tar.gz/dab-processor.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/dab-processor.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/eti-handler/eti-generator.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/eti-handler/eti-generator.cpp Changed

@@ -380,36 +380,6 @@
 	return offset;
 }
 
-static void	process_subCh (int nr, parameter *p,
-	                       protection *prot,
-	                       uint8_t *desc) {
-	std::unique_ptr<uint8_t> outVector{ new uint8_t24 * p->bitRate };
-	if (!outVector) {
-	   std::cerr << "process_subCh - alloc fail";
-	   return;
-	}
-int	j, k;
-
-	memset (outVector.get(), 0, sizeof(uint8_t) * 24 * p -> bitRate);
-
-	prot -> deconvolve (&p -> input p -> start_cu * CUSize,
-	                                 p -> size * CUSize,
-	                                 outVector.get());
-//
-	for (j = 0; j < 24 * p -> bitRate; j ++) {
-	   outVector j ^= desc j;
-        }
-//
-//	and the storage:
-	for (j = 0; j < 24 * p -> bitRate / 8; j ++) {
-	   int temp = 0;
-	   for (k = 0; k < 8; k ++)
-	      temp = (temp << 1) | (outVector j * 8 + k & 01);
-	   p -> output j = temp;
-	}
-
-}
-
 void	etiGenerator::process_subCh (int nr, parameter *p,
 	                             protection *prot,
 	                             uint8_t *desc) {

qt-dab-qt-dab-4.7-5.4.tar.gz/fft Added

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/_kiss_fft_guts.h Added

@@ -0,0 +1,158 @@
+/*
+ *  Copyright (c) 2003-2010, Mark Borgerding. All rights reserved.
+ *  This file is part of KISS FFT - https://github.com/mborgerding/kissfft
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ *  See COPYING file for more information.
+ */
+
+/* kiss_fft.h
+   defines kiss_fft_scalar as either short or a float type
+   and defines
+   typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
+#include "kiss_fft.h"
+#include <limits.h>
+
+#define MAXFACTORS 32
+/* e.g. an fft of length 128 has 4 factors 
+ as far as kissfft is concerned
+ 4*4*4*2
+ */
+
+struct kiss_fft_state{
+    int nfft;
+    int inverse;
+    int factors2*MAXFACTORS;
+    kiss_fft_cpx twiddles1;
+};
+
+/*
+  Explanation of macros dealing with complex math:
+
+   C_MUL(m,a,b)         : m = a*b
+   C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
+   C_SUB( res, a,b)     : res = a - b
+   C_SUBFROM( res , a)  : res -= a
+   C_ADDTO( res , a)    : res += a
+ * */
+#ifdef FIXED_POINT
+#if (FIXED_POINT==32)
+# define FRACBITS 31
+# define SAMPPROD int64_t
+#define SAMP_MAX 2147483647
+#else
+# define FRACBITS 15
+# define SAMPPROD int32_t 
+#define SAMP_MAX 32767
+#endif
+
+#define SAMP_MIN -SAMP_MAX
+
+#if defined(CHECK_OVERFLOW)
+#  define CHECK_OVERFLOW_OP(a,op,b)  \
+	if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \
+		fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) );  }
+#endif
+
+
+#   define smul(a,b) ( (SAMPPROD)(a)*(b) )
+#   define sround( x )  (kiss_fft_scalar)( ( (x) + (1<<(FRACBITS-1)) ) >> FRACBITS )
+
+#   define S_MUL(a,b) sround( smul(a,b) )
+
+#   define C_MUL(m,a,b) \
+      do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \
+          (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0)
+
+#   define DIVSCALAR(x,k) \
+	(x) = sround( smul(  x, SAMP_MAX/k ) )
+
+#   define C_FIXDIV(c,div) \
+	do {    DIVSCALAR( (c).r , div);  \
+		DIVSCALAR( (c).i  , div); }while (0)
+
+#   define C_MULBYSCALAR( c, s ) \
+    do{ (c).r =  sround( smul( (c).r , s ) ) ;\
+        (c).i =  sround( smul( (c).i , s ) ) ; }while(0)
+
+#else  /* not FIXED_POINT*/
+
+#   define S_MUL(a,b) ( (a)*(b) )
+#define C_MUL(m,a,b) \
+    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
+        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
+#   define C_FIXDIV(c,div) /* NOOP */
+#   define C_MULBYSCALAR( c, s ) \
+    do{ (c).r *= (s);\
+        (c).i *= (s); }while(0)
+#endif
+
+#ifndef CHECK_OVERFLOW_OP
+#  define CHECK_OVERFLOW_OP(a,op,b) /* noop */
+#endif
+
+#define  C_ADD( res, a,b)\
+    do { \
+	    CHECK_OVERFLOW_OP((a).r,+,(b).r)\
+	    CHECK_OVERFLOW_OP((a).i,+,(b).i)\
+	    (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i; \
+    }while(0)
+#define  C_SUB( res, a,b)\
+    do { \
+	    CHECK_OVERFLOW_OP((a).r,-,(b).r)\
+	    CHECK_OVERFLOW_OP((a).i,-,(b).i)\
+	    (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i; \
+    }while(0)
+#define C_ADDTO( res , a)\
+    do { \
+	    CHECK_OVERFLOW_OP((res).r,+,(a).r)\
+	    CHECK_OVERFLOW_OP((res).i,+,(a).i)\
+	    (res).r += (a).r;  (res).i += (a).i;\
+    }while(0)
+
+#define C_SUBFROM( res , a)\
+    do {\
+	    CHECK_OVERFLOW_OP((res).r,-,(a).r)\
+	    CHECK_OVERFLOW_OP((res).i,-,(a).i)\
+	    (res).r -= (a).r;  (res).i -= (a).i; \
+    }while(0)
+
+
+#ifdef FIXED_POINT
+#  define KISS_FFT_COS(phase)  floor(.5+SAMP_MAX * cos (phase))
+#  define KISS_FFT_SIN(phase)  floor(.5+SAMP_MAX * sin (phase))
+#  define HALF_OF(x) ((x)>>1)
+#elif defined(USE_SIMD)
+#  define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )
+#  define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
+#  define HALF_OF(x) ((x)*_mm_set1_ps(.5))
+#else
+#  define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
+#  define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
+#  define HALF_OF(x) ((x)*.5)
+#endif
+
+#define  kf_cexp(x,phase) \
+	do{ \
+		(x)->r = KISS_FFT_COS(phase);\
+		(x)->i = KISS_FFT_SIN(phase);\
+	}while(0)
+
+
+/* a debugging function */
+#define pcpx(c)\
+    fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) )
+
+
+#ifdef KISS_FFT_USE_ALLOCA
+// define this to allow use of alloca instead of malloc for temporary buffers
+// Temporary buffers are used in two case: 
+// 1. FFT sizes that have "bad" factors. i.e. not 2,3 and 5
+// 2. "in-place" FFTs.  Notice the quotes, since kissfft does not really do an in-place transform.
+#include <alloca.h>
+#define  KISS_FFT_TMP_ALLOC(nbytes) alloca(nbytes)
+#define  KISS_FFT_TMP_FREE(ptr) 
+#else
+#define  KISS_FFT_TMP_ALLOC(nbytes) KISS_FFT_MALLOC(nbytes)
+#define  KISS_FFT_TMP_FREE(ptr) KISS_FFT_FREE(ptr)
+#endif

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/fft-complex.cpp Added

@@ -0,0 +1,214 @@
+/* 
+ * Free FFT and convolution (C)
+ * 
+ * Copyright (c) 2020 Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/free-small-fft-in-multiple-languages
+ * 
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software
+ * is furnished to do so, * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise,
+ *   arising from, out of or in connection with the Software
+ *   or the use or other dealings in the Software.
+ */
+
+#include "fft-complex.h"
+#define _USE_MATH_DEFINES
+#include	<math.h>
+#include	<string.h>
+
+
+#ifndef M_PI
+# define M_PI           3.14159265358979323846  /* pi */
+#endif
+
+// Private function prototypes
+static size_t reverse_bits (size_t val, int width);
+static void *memdup (const void *src, size_t n);
+
+
+bool	Fft_transform (std::complex<float> vec, size_t n, bool inverse) {
+	if (n == 0)
+	   return true;
+	else
+	if ((n & (n - 1)) == 0)  // Is power of 2
+	   return Fft_transformRadix2 (vec, n, inverse);
+	else  // More complicated algorithm for arbitrary sizes
+	   return Fft_transformBluestein (vec, n, inverse);
+}
+
+bool	Fft_transformRadix2 (std::complex<float> vec,
+	                                   size_t n, bool inverse) {
+// Length variables
+int levels = 0;  // Compute levels = floor(log2(n))
+
+	for (size_t temp = n; temp > 1U; temp >>= 1)
+	   levels++;
+
+	if ((size_t)1U << levels != n)
+	   return false;  // n is not a power of 2
+	
+	// Trigonometric tables
+	if (SIZE_MAX / sizeof(std::complex<float>) < n / 2)
+	   return false;
+
+	std::complex<float> *exptable =
+	 (std::complex<float> *)malloc ((n / 2) * sizeof (std::complex<float>));
+	if (exptable == NULL)
+	   return false;
+	for (size_t i = 0; i < n / 2; i++)
+	   exptable i = std::exp (
+	         std::complex<float> (0, (inverse ? 2 : -2) * M_PI * i / n));
+	
+// Bit-reversed addressing permutation
+	for (size_t i = 0; i < n; i++) {
+	   size_t j = reverse_bits(i, levels);
+	   if (j > i) {
+	      std::complex<float> temp = veci;
+	      vec i = vec j;
+	      vec j = temp;
+	   }
+	}
+	
+// Cooley-Tukey decimation-in-time radix-2 FFT
+	for (size_t size = 2; size <= n; size *= 2) {
+	   size_t halfsize = size / 2;
+	   size_t tablestep = n / size;
+	   for (size_t i = 0; i < n; i += size) {
+	      for (size_t j = i, k = 0; j < i + halfsize; j++, k += tablestep) {
+	         size_t l = j + halfsize;
+	         std::complex<float> temp = vec l * exptable k;
+	         vec l = vec j - temp;
+	         vec j += temp;
+	      }
+	   }
+
+	   if (size == n)  // Prevent overflow in 'size *= 2'
+	      break;
+	}
+	
+	free (exptable);
+	return true;
+}
+
+
+bool	Fft_transformBluestein (std::complex<float> vec,
+	                                   size_t n, bool inverse) {
+bool status = false;
+	
+	// Find a power-of-2 convolution length m such that m >= n * 2 + 1
+size_t m = 1;
+	while (m / 2 <= n) {
+	   if (m > SIZE_MAX / 2)
+	      return false;
+	   m *= 2;
+	}
+	
+// Allocate memory
+	if ((SIZE_MAX / sizeof (std::complex<float>) < n) ||
+	               (SIZE_MAX / sizeof (std::complex<float>) < m))
+	   return false;
+	std::complex<float> *exptable =
+	        (std::complex<float> *)malloc(n * sizeof (std::complex<float>));
+	std::complex<float> *avec =
+	     (std::complex<float> *)calloc (m, sizeof (std::complex<float>));
+	std::complex<float> *bvec =
+	     (std::complex<float> *)calloc (m, sizeof (std::complex<float>));
+	std::complex<float> *cvec =
+	     (std::complex<float> *) malloc (m * sizeof (std::complex<float>));
+	if (exptable == NULL || avec == NULL || bvec == NULL || cvec == NULL)
+		goto cleanup;
+	
+	// Trigonometric tables
+	for (size_t i = 0; i < n; i++) {
+	   uintmax_t temp = ((uintmax_t)i * i) % ((uintmax_t)n * 2);
+	   double angle = (inverse ? M_PI : -M_PI) * temp / n;
+	   exptable i = std::exp (std::complex<float> (0, angle));
+	}
+	
+	// Temporary vectors and preprocessing
+	for (size_t i = 0; i < n; i++)
+	   avec i = vec i * exptable i;
+	bvec 0 = exptable 0;
+	for (size_t i = 1; i < n; i++)
+	   bvec i = bvec m - i = conj(exptablei);
+	
+	// Convolution
+	if (!Fft_convolve (avec, bvec, cvec, m))
+	   goto cleanup;
+	
+	// Postprocessing
+	for (size_t i = 0; i < n; i++)
+	   veci = cveci * exptablei;
+	status = true;
+	
+// Deallocation
+cleanup:
+	free (exptable);
+	free (avec);
+	free (bvec);
+	free (cvec);
+	return status;
+}
+
+bool Fft_convolve (const std::complex<float> xvec,
+	           const std::complex<float> yvec,
+	           std::complex<float> outvec , size_t n) {
+	
+bool status = false;
+
+	if (SIZE_MAX / sizeof (std::complex<float>) < n)
+	   return false;
+	std::complex<float> *xv =
+	     (std::complex<float> *) memdup (xvec,
+	                                     n * sizeof (std::complex<float>));
+	std::complex<float> *yv =
+	     (std::complex<float> *) memdup (yvec,
+	                                     n * sizeof (std::complex<float>));
+	if (xv == NULL || yv == NULL)
+	   goto cleanup;
+	
+	if (!Fft_transform(xv, n, false))
+	   goto cleanup;
+	if (!Fft_transform(yv, n, false))
+	   goto cleanup;
+	for (size_t i = 0; i < n; i++)
+	   xvi *= yvi;
+	if (!Fft_transform(xv, n, true))
+	   goto cleanup;
+// Scaling (because this FFT implementation omits it)
+	for (size_t i = 0; i < n; i++)
+	   outveci =  std::complex<float> (real (xvi) / n, imag (xv i) / n);
+	status = true;
+	
+cleanup:
+	free(xv);
+	free(yv);
+	return status;
+}
+
+static size_t reverse_bits(size_t val, int width) {
+size_t result = 0;
+	for (int i = 0; i < width; i++, val >>= 1)
+	   result = (result << 1) | (val & 1U);
+	return result;
+}
+
+static void *memdup (const void *src, size_t n) {
+void *dest = malloc (n);
+	if (n > 0 && dest != NULL)
+	   memcpy (dest, src, n);
+	return dest;
+}
+

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/fft-complex.h Added

@@ -0,0 +1,80 @@
+
+/* 
+ * Free FFT and convolution (C)
+ * 
+ * Copyright (c) 2020 Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/free-small-fft-in-multiple-languages
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#ifndef	__FFT_COMPLEX__
+#define	__FFT_COMPLEX__
+
+#include <complex>
+//#include	"basics.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* 
+ * Computes the discrete Fourier transform (DFT) of the given complex vector, storing the result back into the vector.
+ * The vector can have any length. This is a wrapper function. The inverse transform does not perform scaling,
+ * so it is not a true inverse. Returns true if successful, false otherwise (out of memory).
+ */
+bool Fft_transform (std::complex<float> vec, size_t n, bool inverse);
+
+
+/* 
+ * Computes the discrete Fourier transform (DFT) of the given complex vector,
+ * storing the result back into the vector.
+ * The vector's length must be a power of 2.
+ * Uses the Cooley-Tukey decimation-in-time radix-2 algorithm.
+ * Returns true if successful, false otherwise
+ * (n is not a power of 2, or out of memory).
+ */
+bool Fft_transformRadix2 (std::complex<float> vec, size_t n, bool inverse);
+
+
+/* 
+ * Computes the discrete Fourier transform (DFT) of the given complex vector,
+ * storing the result back into the vector.
+ * The vector can have any length. This requires the convolution function,
+ * which in turn requires the radix-2 FFT function.
+ * Uses Bluestein's chirp z-transform algorithm.
+ * Returns true if successful, false otherwise (out of memory).
+ */
+bool Fft_transformBluestein (std::complex<float> vec, size_t n, bool inverse);
+
+
+/* 
+ * Computes the circular convolution of the given complex vectors.
+ * Each vector's length must be the same.
+ * Returns true if successful, false otherwise (out of memory).
+ */
+bool	Fft_convolve (const std::complex<float> xvec ,
+	              const std::complex<float> yvec ,
+	              std::complex<float> outvec, size_t n);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/fft-handler.cpp Added

@@ -0,0 +1,108 @@
+#
+/*
+ *    Copyright (C) 2015 .. 2020
+ *    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
+ */
+#
+//
+//	a simple wrapper for using kiss-fft, fftw3 or fft-complex
+//
+#include	"fft-handler.h"
+#include	"fft-complex.h"
+
+	fftHandler::fftHandler	(int size, bool dir) {
+	this	-> size		= size;
+	this	-> dir		= dir;
+#ifdef	__KISS_FFT__
+	fftVector_in            = new kiss_fft_cpx size;
+        fftVector_out           = new kiss_fft_cpx size;
+        plan			= kiss_fft_alloc (size, dir, nullptr, nullptr);
+#elif	__FFTW3__
+	fftVector		= (std::complex<float> *)
+	                          fftwf_malloc (sizeof (std::complex<float>)* size);
+	plan			= fftwf_plan_dft_1d (size,
+	                           reinterpret_cast <fftwf_complex *>(fftVector),
+                                   reinterpret_cast <fftwf_complex *>(fftVector),
+                                   FFTW_FORWARD, FFTW_ESTIMATE);
+#endif
+}
+
+	fftHandler::~fftHandler	() {
+#ifdef	__KISS_FFT__
+	delete fftVector_in;
+	delete fftVector_out;
+#elif	__FFTW3__
+	fftwf_destroy_plan (plan);
+	fftwf_free (fftVector);
+#endif
+}
+
+void	fftHandler::fft		(std::vector<std::complex<float>> &v) {
+#ifdef	__KISS_FFT__
+	for (int i = 0; i < size; i ++) {
+	   fftVector_in i. r = real (v i);
+	   fftVector_in i. i = imag (v i);
+	}
+	kiss_fft (plan, fftVector_in, fftVector_out);
+	for (int i = 0; i < size; i ++) {
+	   v i = std::complex<float> (fftVector_out i. r,
+	                                fftVector_out i. i);
+	}
+#elif __FFTW3__
+	if (dir)
+	   for (int i = 0; i < size; i ++)
+	      fftVector i = conj (v i);
+	else
+	   for (int i = 0; i < size; i ++)
+	      fftVector i = v i;
+	fftwf_execute (plan);
+	if (dir)
+	   for (int i = 0;  i < size; i ++)
+	      v i = conj (fftVector i);
+	else
+	   for (int i = 0; i < size; i ++)
+	      v i = fftVector i;
+#else
+	Fft_transform (v. data (), size, dir);
+#endif
+}
+
+void	fftHandler::fft		(std::complex<float>  *v) {
+#ifdef	__KISS_FFT__
+	for (int i = 0; i < size; i ++) {
+	   fftVector_in i. r = real (v i);
+	   fftVector_in i. i = imag (v i);
+	}
+	kiss_fft (plan, fftVector_in, fftVector_out);
+	for (int i = 0; i < size; i ++) {
+	   v i = std::complex<float> (fftVector_out i. r,
+	                                fftVector_out i. i);
+	}
+#elif	__FFTW3__
+	for (int i = 0; i < size; i ++)
+	   fftVector i = v i;
+	fftwf_execute (plan);
+	for (int i = 0;  i < size; i ++)
+	   v i = fftVector i;
+#else
+	Fft_transform (v, size, dir);
+#endif
+}
+

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/fft-handler.h Added

@@ -0,0 +1,52 @@
+#
+/*
+ *    Copyright (C) 2015 .. 2020
+ *    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	__FFT_HANDLER__
+#define	__FFT_HANDLER__
+
+#include	<complex>
+#include	<vector>
+#include	"kiss_fft.h"
+#ifdef	__FFTW3__
+#include	<fftw3.h>
+#endif
+
+class	fftHandler {
+public:
+			fftHandler	(int size, bool);
+			~fftHandler	();
+	void		fft 		(std::vector<std::complex<float>> &);
+	void		fft 		(std::complex<float> *);
+private:
+	int		size;
+	bool		dir;
+#ifdef	__KISS_FFT__
+	kiss_fft_cfg	plan;
+	kiss_fft_cpx	*fftVector_in;
+	kiss_fft_cpx	*fftVector_out;
+#elif	__FFTW3__
+	fftwf_plan	plan;
+	std::complex<float> *fftVector;
+#endif
+};
+#endif

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/kiss_fft.c Added

@@ -0,0 +1,403 @@
+/*
+ *  Copyright (c) 2003-2010, Mark Borgerding. All rights reserved.
+ *  This file is part of KISS FFT - https://github.com/mborgerding/kissfft
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ *  See COPYING file for more information.
+ */
+
+
+#include "_kiss_fft_guts.h"
+/* The guts header contains all the multiplication and
+ * addition macros that are defined for
+ * fixed or floating point complex numbers.
+ * It also delares the kf_ internal functions.
+ */
+
+static
+void	kf_bfly2 (kiss_fft_cpx * Fout, const size_t fstride,
+	          const kiss_fft_cfg st, int m) {
+
+kiss_fft_cpx *Fout2;
+kiss_fft_cpx *tw1 = st -> twiddles;
+kiss_fft_cpx t;
+
+	Fout2 = Fout + m;
+	do {
+	   C_FIXDIV (*Fout, 2); 
+	   C_FIXDIV (*Fout2, 2);
+
+	   C_MUL (t,  *Fout2 , *tw1);
+	   tw1 += fstride;
+	   C_SUB (*Fout2,  *Fout ,t);
+	   C_ADDTO (*Fout,  t);
+	   Fout2 ++;
+	   Fout ++;
+	} while (--m);
+}
+
+static void kf_bfly4(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        const size_t m
+        )
+{
+    kiss_fft_cpx *tw1,*tw2,*tw3;
+    kiss_fft_cpx scratch6;
+    size_t k=m;
+    const size_t m2=2*m;
+    const size_t m3=3*m;
+
+
+    tw3 = tw2 = tw1 = st->twiddles;
+
+    do {
+        C_FIXDIV(*Fout,4); C_FIXDIV(Foutm,4); C_FIXDIV(Foutm2,4); C_FIXDIV(Foutm3,4);
+
+        C_MUL(scratch0,Foutm , *tw1 );
+        C_MUL(scratch1,Foutm2 , *tw2 );
+        C_MUL(scratch2,Foutm3 , *tw3 );
+
+        C_SUB( scratch5 , *Fout, scratch1 );
+        C_ADDTO(*Fout, scratch1);
+        C_ADD( scratch3 , scratch0 , scratch2 );
+        C_SUB( scratch4 , scratch0 , scratch2 );
+        C_SUB( Foutm2, *Fout, scratch3 );
+        tw1 += fstride;
+        tw2 += fstride*2;
+        tw3 += fstride*3;
+        C_ADDTO( *Fout , scratch3 );
+
+        if(st->inverse) {
+            Foutm.r = scratch5.r - scratch4.i;
+            Foutm.i = scratch5.i + scratch4.r;
+            Foutm3.r = scratch5.r + scratch4.i;
+            Foutm3.i = scratch5.i - scratch4.r;
+        }else{
+            Foutm.r = scratch5.r + scratch4.i;
+            Foutm.i = scratch5.i - scratch4.r;
+            Foutm3.r = scratch5.r - scratch4.i;
+            Foutm3.i = scratch5.i + scratch4.r;
+        }
+        ++Fout;
+    }while(--k);
+}
+
+static void kf_bfly3(
+         kiss_fft_cpx * Fout,
+         const size_t fstride,
+         const kiss_fft_cfg st,
+         size_t m
+         )
+{
+     size_t k=m;
+     const size_t m2 = 2*m;
+     kiss_fft_cpx *tw1,*tw2;
+     kiss_fft_cpx scratch5;
+     kiss_fft_cpx epi3;
+     epi3 = st->twiddlesfstride*m;
+
+     tw1=tw2=st->twiddles;
+
+     do{
+         C_FIXDIV(*Fout,3); C_FIXDIV(Foutm,3); C_FIXDIV(Foutm2,3);
+
+         C_MUL(scratch1,Foutm , *tw1);
+         C_MUL(scratch2,Foutm2 , *tw2);
+
+         C_ADD(scratch3,scratch1,scratch2);
+         C_SUB(scratch0,scratch1,scratch2);
+         tw1 += fstride;
+         tw2 += fstride*2;
+
+         Foutm.r = Fout->r - HALF_OF(scratch3.r);
+         Foutm.i = Fout->i - HALF_OF(scratch3.i);
+
+         C_MULBYSCALAR( scratch0 , epi3.i );
+
+         C_ADDTO(*Fout,scratch3);
+
+         Foutm2.r = Foutm.r + scratch0.i;
+         Foutm2.i = Foutm.i - scratch0.r;
+
+         Foutm.r -= scratch0.i;
+         Foutm.i += scratch0.r;
+
+         ++Fout;
+     }while(--k);
+}
+
+static void kf_bfly5(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        int m
+        )
+{
+    kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
+    int u;
+    kiss_fft_cpx scratch13;
+    kiss_fft_cpx * twiddles = st->twiddles;
+    kiss_fft_cpx *tw;
+    kiss_fft_cpx ya,yb;
+    ya = twiddlesfstride*m;
+    yb = twiddlesfstride*2*m;
+
+    Fout0=Fout;
+    Fout1=Fout0+m;
+    Fout2=Fout0+2*m;
+    Fout3=Fout0+3*m;
+    Fout4=Fout0+4*m;
+
+    tw=st->twiddles;
+    for ( u=0; u<m; ++u ) {
+        C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5);
+        scratch0 = *Fout0;
+
+        C_MUL(scratch1 ,*Fout1, twu*fstride);
+        C_MUL(scratch2 ,*Fout2, tw2*u*fstride);
+        C_MUL(scratch3 ,*Fout3, tw3*u*fstride);
+        C_MUL(scratch4 ,*Fout4, tw4*u*fstride);
+
+        C_ADD( scratch7,scratch1,scratch4);
+        C_SUB( scratch10,scratch1,scratch4);
+        C_ADD( scratch8,scratch2,scratch3);
+        C_SUB( scratch9,scratch2,scratch3);
+
+        Fout0->r += scratch7.r + scratch8.r;
+        Fout0->i += scratch7.i + scratch8.i;
+
+        scratch5.r = scratch0.r + S_MUL(scratch7.r,ya.r) + S_MUL(scratch8.r,yb.r);
+        scratch5.i = scratch0.i + S_MUL(scratch7.i,ya.r) + S_MUL(scratch8.i,yb.r);
+
+        scratch6.r =  S_MUL(scratch10.i,ya.i) + S_MUL(scratch9.i,yb.i);
+        scratch6.i = -S_MUL(scratch10.r,ya.i) - S_MUL(scratch9.r,yb.i);
+
+        C_SUB(*Fout1,scratch5,scratch6);
+        C_ADD(*Fout4,scratch5,scratch6);
+
+        scratch11.r = scratch0.r + S_MUL(scratch7.r,yb.r) + S_MUL(scratch8.r,ya.r);
+        scratch11.i = scratch0.i + S_MUL(scratch7.i,yb.r) + S_MUL(scratch8.i,ya.r);
+        scratch12.r = - S_MUL(scratch10.i,yb.i) + S_MUL(scratch9.i,ya.i);
+        scratch12.i = S_MUL(scratch10.r,yb.i) - S_MUL(scratch9.r,ya.i);
+
+        C_ADD(*Fout2,scratch11,scratch12);
+        C_SUB(*Fout3,scratch11,scratch12);
+
+        ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
+    }
+}
+
+/* perform the butterfly for one stage of a mixed radix FFT */
+static void kf_bfly_generic(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        int m,
+        int p
+        )
+{
+    int u,k,q1,q;
+    kiss_fft_cpx * twiddles = st->twiddles;
+    kiss_fft_cpx t;
+    int Norig = st->nfft;
+
+    kiss_fft_cpx * scratch = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC(sizeof(kiss_fft_cpx)*p);
+
+    for ( u=0; u<m; ++u ) {
+        k=u;
+        for ( q1=0 ; q1<p ; ++q1 ) {
+            scratchq1 = Fout k  ;
+            C_FIXDIV(scratchq1,p);
+            k += m;
+        }
+
+        k=u;
+        for ( q1=0 ; q1<p ; ++q1 ) {
+            int twidx=0;
+            Fout k  = scratch0;
+            for (q=1;q<p;++q ) {
+                twidx += fstride * k;
+                if (twidx>=Norig) twidx-=Norig;
+                C_MUL(t,scratchq , twiddlestwidx );
+                C_ADDTO( Fout k  ,t);
+            }
+            k += m;
+        }
+    }
+    KISS_FFT_TMP_FREE(scratch);
+}
+
+static
+void kf_work(
+        kiss_fft_cpx * Fout,
+        const kiss_fft_cpx * f,
+        const size_t fstride,
+        int in_stride,
+        int * factors,
+        const kiss_fft_cfg st
+        )
+{
+    kiss_fft_cpx * Fout_beg=Fout;
+    const int p=*factors++; /* the radix  */
+    const int m=*factors++; /* stage's fft length/p */
+    const kiss_fft_cpx * Fout_end = Fout + p*m;
+
+#ifdef _OPENMP
+    // use openmp extensions at the 
+    // top-level (not recursive)
+    if (fstride==1 && p<=5)
+    {
+        int k;
+
+        // execute the p different work units in different threads
+#       pragma omp parallel for
+        for (k=0;k<p;++k) 
+            kf_work( Fout +k*m, f+ fstride*in_stride*k,fstride*p,in_stride,factors,st);
+        // all threads have joined by this point
+
+        switch (p) {
+            case 2: kf_bfly2(Fout,fstride,st,m); break;
+            case 3: kf_bfly3(Fout,fstride,st,m); break; 
+            case 4: kf_bfly4(Fout,fstride,st,m); break;
+            case 5: kf_bfly5(Fout,fstride,st,m); break; 
+            default: kf_bfly_generic(Fout,fstride,st,m,p); break;
+        }
+        return;
+    }
+#endif
+
+    if (m==1) {
+        do{
+            *Fout = *f;
+            f += fstride*in_stride;
+        }while(++Fout != Fout_end );
+    }else{
+        do{
+            // recursive call:
+            // DFT of size m*p performed by doing
+            // p instances of smaller DFTs of size m, 
+            // each one takes a decimated version of the input
+            kf_work( Fout , f, fstride*p, in_stride, factors,st);
+            f += fstride*in_stride;
+        }while( (Fout += m) != Fout_end );
+    }
+
+    Fout=Fout_beg;
+
+    // recombine the p smaller DFTs 
+    switch (p) {
+        case 2: kf_bfly2(Fout,fstride,st,m); break;
+        case 3: kf_bfly3(Fout,fstride,st,m); break; 
+        case 4: kf_bfly4(Fout,fstride,st,m); break;
+        case 5: kf_bfly5(Fout,fstride,st,m); break; 
+        default: kf_bfly_generic(Fout,fstride,st,m,p); break;
+    }
+}
+
+/*  facbuf is populated by p1,m1,p2,m2, ...
+    where 
+    pi * mi = mi-1
+    m0 = n                  */
+static 
+void kf_factor(int n,int * facbuf)
+{
+    int p=4;
+    double floor_sqrt;
+    floor_sqrt = floor( sqrt((double)n) );
+
+    /*factor out powers of 4, powers of 2, then any remaining primes */
+    do {
+        while (n % p) {
+            switch (p) {
+                case 4: p = 2; break;
+                case 2: p = 3; break;
+                default: p += 2; break;
+            }
+            if (p > floor_sqrt)
+                p = n;          /* no more factors, skip to end */
+        }
+        n /= p;
+        *facbuf++ = p;
+        *facbuf++ = n;
+    } while (n > 1);
+}
+
+/*
+ *
+ * User-callable function to allocate all necessary storage space for the fft.
+ *
+ * The return value is a contiguous block of memory, allocated with malloc.  As such,
+ * It can be freed with free(), rather than a kiss_fft-specific function.
+ * */
+kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
+{
+    kiss_fft_cfg st=NULL;
+    size_t memneeded = sizeof(struct kiss_fft_state)
+        + sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/
+
+    if ( lenmem==NULL ) {
+        st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded );
+    }else{
+        if (mem != NULL && *lenmem >= memneeded)
+            st = (kiss_fft_cfg)mem;
+        *lenmem = memneeded;
+    }
+    if (st) {
+        int i;
+        st->nfft=nfft;
+        st->inverse = inverse_fft;
+
+        for (i=0;i<nfft;++i) {
+            const double pi=3.141592653589793238462643383279502884197169399375105820974944;
+            double phase = -2*pi*i / nfft;
+            if (st->inverse)
+                phase *= -1;
+            kf_cexp(st->twiddles+i, phase );
+        }
+
+        kf_factor(nfft,st->factors);
+    }
+    return st;
+}
+
+
+void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride)
+{
+    if (fin == fout) {
+        //NOTE: this is not really an in-place FFT algorithm.
+        //It just performs an out-of-place FFT into a temp buffer
+        kiss_fft_cpx * tmpbuf = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC( sizeof(kiss_fft_cpx)*st->nfft);
+        kf_work(tmpbuf,fin,1,in_stride, st->factors,st);
+        memcpy(fout,tmpbuf,sizeof(kiss_fft_cpx)*st->nfft);
+        KISS_FFT_TMP_FREE(tmpbuf);
+    }else{
+        kf_work( fout, fin, 1,in_stride, st->factors,st );
+    }
+}
+
+void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+{
+    kiss_fft_stride(cfg,fin,fout,1);
+}
+
+
+void kiss_fft_cleanup(void)
+{
+    // nothing needed any more
+}
+
+int kiss_fft_next_fast_size(int n)
+{
+    while(1) {
+        int m=n;
+        while ( (m%2) == 0 ) m/=2;
+        while ( (m%3) == 0 ) m/=3;
+        while ( (m%5) == 0 ) m/=5;
+        if (m<=1)
+            break; /* n is completely factorable by twos, threes, and fives */
+        n++;
+    }
+    return n;
+}

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/kiss_fft.h Added

@@ -0,0 +1,131 @@
+/*
+ *  Copyright (c) 2003-2010, Mark Borgerding. All rights reserved.
+ *  This file is part of KISS FFT - https://github.com/mborgerding/kissfft
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ *  See COPYING file for more information.
+ */
+
+#ifndef KISS_FFT_H
+#define KISS_FFT_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ ATTENTION!
+ If you would like a :
+ -- a utility that will handle the caching of fft objects
+ -- real-only (no imaginary time component ) FFT
+ -- a multi-dimensional FFT
+ -- a command-line utility to perform ffts
+ -- a command-line utility to perform fast-convolution filtering
+
+ Then see kfc.h kiss_fftr.h kiss_fftnd.h fftutil.c kiss_fastfir.c
+  in the tools/ directory.
+*/
+
+#ifdef USE_SIMD
+# include <xmmintrin.h>
+# define kiss_fft_scalar __m128
+#define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16)
+#define KISS_FFT_FREE _mm_free
+#else	
+#define KISS_FFT_MALLOC malloc
+#define KISS_FFT_FREE free
+#endif	
+
+
+#ifdef FIXED_POINT
+#include <sys/types.h>	
+# if (FIXED_POINT == 32)
+#  define kiss_fft_scalar int32_t
+# else	
+#  define kiss_fft_scalar int16_t
+# endif
+#else
+# ifndef kiss_fft_scalar
+/*  default is float */
+#   define kiss_fft_scalar float
+# endif
+#endif
+
+typedef struct {
+    kiss_fft_scalar r;
+    kiss_fft_scalar i;
+}kiss_fft_cpx;
+
+typedef struct kiss_fft_state* kiss_fft_cfg;
+
+/* 
+ *  kiss_fft_alloc
+ *  
+ *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
+ *
+ *  typical usage:      kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
+ *
+ *  The return value from fft_alloc is a cfg buffer used internally
+ *  by the fft routine or NULL.
+ *
+ *  If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
+ *  The returned value should be free()d when done to avoid memory leaks.
+ *  
+ *  The state can be placed in a user supplied buffer 'mem':
+ *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
+ *      then the function places the cfg in mem and the size used in *lenmem
+ *      and returns mem.
+ *  
+ *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
+ *      then the function returns NULL and places the minimum cfg 
+ *      buffer size in *lenmem.
+ * */
+
+kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); 
+
+/*
+ * kiss_fft(cfg,in_out_buf)
+ *
+ * Perform an FFT on a complex input buffer.
+ * for a forward FFT,
+ * fin should be  f0 , f1 , ... ,fnfft-1
+ * fout will be   F0 , F1 , ... ,Fnfft-1
+ * Note that each element is complex and can be accessed like
+    fk.r and fk.i
+ * */
+void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+
+/*
+ A more generic version of the above function. It reads its input from every Nth sample.
+ * */
+void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
+
+/* If kiss_fft_alloc allocated a buffer, it is one contiguous 
+   buffer and can be simply free()d when no longer needed*/
+#define kiss_fft_free KISS_FFT_FREE
+
+/*
+ Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up 
+ your compiler output to call this before you exit.
+*/
+void kiss_fft_cleanup(void);
+
+/*
+ * Returns the smallest integer k, such that k>=n and k has only "fast" factors (2,3,5)
+ */
+int kiss_fft_next_fast_size(int n);
+
+/* for real ffts, we need an even size */
+#define kiss_fftr_next_fast_size_real(n) \
+        (kiss_fft_next_fast_size( ((n)+1)>>1)<<1)
+
+#ifdef __cplusplus
+} 
+#endif
+
+#endif

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/kiss_fftr.c Added

@@ -0,0 +1,153 @@
+/*
+ *  Copyright (c) 2003-2004, Mark Borgerding. All rights reserved.
+ *  This file is part of KISS FFT - https://github.com/mborgerding/kissfft
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ *  See COPYING file for more information.
+ */
+
+#include "kiss_fftr.h"
+#include "_kiss_fft_guts.h"
+
+struct kiss_fftr_state{
+    kiss_fft_cfg substate;
+    kiss_fft_cpx * tmpbuf;
+    kiss_fft_cpx * super_twiddles;
+#ifdef USE_SIMD
+    void * pad;
+#endif
+};
+
+kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem)
+{
+    int i;
+    kiss_fftr_cfg st = NULL;
+    size_t subsize = 0, memneeded;
+
+    if (nfft & 1) {
+        fprintf(stderr,"Real FFT optimization must be even.\n");
+        return NULL;
+    }
+    nfft >>= 1;
+
+    kiss_fft_alloc (nfft, inverse_fft, NULL, &subsize);
+    memneeded = sizeof(struct kiss_fftr_state) + subsize + sizeof(kiss_fft_cpx) * ( nfft * 3 / 2);
+
+    if (lenmem == NULL) {
+        st = (kiss_fftr_cfg) KISS_FFT_MALLOC (memneeded);
+    } else {
+        if (*lenmem >= memneeded)
+            st = (kiss_fftr_cfg) mem;
+        *lenmem = memneeded;
+    }
+    if (!st)
+        return NULL;
+
+    st->substate = (kiss_fft_cfg) (st + 1); /*just beyond kiss_fftr_state struct */
+    st->tmpbuf = (kiss_fft_cpx *) (((char *) st->substate) + subsize);
+    st->super_twiddles = st->tmpbuf + nfft;
+    kiss_fft_alloc(nfft, inverse_fft, st->substate, &subsize);
+
+    for (i = 0; i < nfft/2; ++i) {
+        double phase =
+            -3.14159265358979323846264338327 * ((double) (i+1) / nfft + .5);
+        if (inverse_fft)
+            phase *= -1;
+        kf_cexp (st->super_twiddles+i,phase);
+    }
+    return st;
+}
+
+void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata)
+{
+    /* input buffer timedata is stored row-wise */
+    int k,ncfft;
+    kiss_fft_cpx fpnk,fpk,f1k,f2k,tw,tdc;
+
+    if ( st->substate->inverse) {
+        fprintf(stderr,"kiss fft usage error: improper alloc\n");
+        exit(1);
+    }
+
+    ncfft = st->substate->nfft;
+
+    /*perform the parallel fft of two real signals packed in real,imag*/
+    kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf );
+    /* The real part of the DC element of the frequency spectrum in st->tmpbuf
+     * contains the sum of the even-numbered elements of the input time sequence
+     * The imag part is the sum of the odd-numbered elements
+     *
+     * The sum of tdc.r and tdc.i is the sum of the input time sequence. 
+     *      yielding DC of input time sequence
+     * The difference of tdc.r - tdc.i is the sum of the input (dot product) 1,-1,1,-1... 
+     *      yielding Nyquist bin of input time sequence
+     */
+ 
+    tdc.r = st->tmpbuf0.r;
+    tdc.i = st->tmpbuf0.i;
+    C_FIXDIV(tdc,2);
+    CHECK_OVERFLOW_OP(tdc.r ,+, tdc.i);
+    CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i);
+    freqdata0.r = tdc.r + tdc.i;
+    freqdatancfft.r = tdc.r - tdc.i;
+#ifdef USE_SIMD    
+    freqdatancfft.i = freqdata0.i = _mm_set1_ps(0);
+#else
+    freqdatancfft.i = freqdata0.i = 0;
+#endif
+
+    for ( k=1;k <= ncfft/2 ; ++k ) {
+        fpk    = st->tmpbufk; 
+        fpnk.r =   st->tmpbufncfft-k.r;
+        fpnk.i = - st->tmpbufncfft-k.i;
+        C_FIXDIV(fpk,2);
+        C_FIXDIV(fpnk,2);
+
+        C_ADD( f1k, fpk , fpnk );
+        C_SUB( f2k, fpk , fpnk );
+        C_MUL( tw , f2k , st->super_twiddlesk-1);
+
+        freqdatak.r = HALF_OF(f1k.r + tw.r);
+        freqdatak.i = HALF_OF(f1k.i + tw.i);
+        freqdatancfft-k.r = HALF_OF(f1k.r - tw.r);
+        freqdatancfft-k.i = HALF_OF(tw.i - f1k.i);
+    }
+}
+
+void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata)
+{
+    /* input buffer timedata is stored row-wise */
+    int k, ncfft;
+
+    if (st->substate->inverse == 0) {
+        fprintf (stderr, "kiss fft usage error: improper alloc\n");
+        exit (1);
+    }
+
+    ncfft = st->substate->nfft;
+
+    st->tmpbuf0.r = freqdata0.r + freqdatancfft.r;
+    st->tmpbuf0.i = freqdata0.r - freqdatancfft.r;
+    C_FIXDIV(st->tmpbuf0,2);
+
+    for (k = 1; k <= ncfft / 2; ++k) {
+        kiss_fft_cpx fk, fnkc, fek, fok, tmp;
+        fk = freqdatak;
+        fnkc.r = freqdatancfft - k.r;
+        fnkc.i = -freqdatancfft - k.i;
+        C_FIXDIV( fk , 2 );
+        C_FIXDIV( fnkc , 2 );
+
+        C_ADD (fek, fk, fnkc);
+        C_SUB (tmp, fk, fnkc);
+        C_MUL (fok, tmp, st->super_twiddlesk-1);
+        C_ADD (st->tmpbufk,     fek, fok);
+        C_SUB (st->tmpbufncfft - k, fek, fok);
+#ifdef USE_SIMD        
+        st->tmpbufncfft - k.i *= _mm_set1_ps(-1.0);
+#else
+        st->tmpbufncfft - k.i *= -1;
+#endif
+    }
+    kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata);
+}

qt-dab-qt-dab-4.7-5.4.tar.gz/fft/kiss_fftr.h Added

@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2003-2004, Mark Borgerding. All rights reserved.
+ *  This file is part of KISS FFT - https://github.com/mborgerding/kissfft
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ *  See COPYING file for more information.
+ */
+
+#ifndef KISS_FTR_H
+#define KISS_FTR_H
+
+#include "kiss_fft.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    
+/* 
+ 
+ Real optimized version can save about 45% cpu time vs. complex fft of a real seq.
+
+ 
+ 
+ */
+
+typedef struct kiss_fftr_state *kiss_fftr_cfg;
+
+
+kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem);
+/*
+ nfft must be even
+
+ If you don't care to allocate space, use mem = lenmem = NULL 
+*/
+
+
+void kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata);
+/*
+ input timedata has nfft scalar points
+ output freqdata has nfft/2+1 complex points
+*/
+
+void kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata);
+/*
+ input freqdata has  nfft/2+1 complex points
+ output timedata has nfft scalar points
+*/
+
+#define kiss_fftr_free KISS_FFT_FREE
+
+#ifdef __cplusplus
+}
+#endif
+#endif

qt-dab-qt-dab-4.7-5.4.tar.gz/ideal-signal.png Added

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/backend/audio/mp4processor.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/backend/audio/mp4processor.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/backend/data/pad-handler.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/backend/data/pad-handler.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/backend/frame-processor.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/backend/frame-processor.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/backend/msc-handler.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/backend/msc-handler.h Changed

@@ -37,11 +37,11 @@
 #include	<vector>
 #include	"dab-constants.h"
 #include	"dab-params.h"
-#include        "fft-handler.h"
 #include        "ringbuffer.h"
 #include        "phasetable.h"
 #include        "freq-interleaver.h"
 
+#include	"fft-handler.h"
 class	RadioInterface;
 class	Backend;
 
@@ -58,9 +58,9 @@
 	void		processBlock_0		(std::complex<float> *);
 	void		process_Msc		(std::complex<float> *, int);
 	bool		set_Channel		(descriptorType *,
-	                                           RingBuffer<int16_t> *,
-	                                           RingBuffer<uint8_t> *,
-	                                           FILE *, int);
+	                                         RingBuffer<int16_t> *,
+	                                         RingBuffer<uint8_t> *,
+	                                         FILE *, int);
 //
 //	
 	void		reset_Channel		();
@@ -68,18 +68,18 @@
 	void		stop_service		(int, int);
 	void		reset_Buffers		();
 private:
-	void		process_mscBlock	(std::vector<int16_t>, int16_t);
+	void		process_mscBlock	(std::vector<int16_t> &,
+	                                                  int16_t);
 	RadioInterface	*myRadioInterface;
 	RingBuffer<uint8_t>	*dataBuffer;
 	RingBuffer<uint8_t>	*frameBuffer;
 	dabParams	params;
-	fftHandler      my_fftHandler;
-	std::complex<float>     *fft_buffer;
 	std::vector<complex<float>>     phaseReference;
 
         interLeaver     myMapper;
 	QMutex		locker;
 	bool		audioService;
+	fftHandler	fft;
 	std::vector<Backend *>theBackends;
 	std::vector<int16_t> cifVector;
 	int16_t		cifCount;

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/ofdm/fib-decoder.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/ofdm/fib-decoder.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/ofdm/ofdm-decoder.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/ofdm/ofdm-decoder.h Changed

@@ -27,11 +27,11 @@
 #include	<QObject>
 #include	<vector>
 #include	<cstdint>
-#include	"fft-handler.h"
 #include	"ringbuffer.h"
 #include	"phasetable.h"
 #include	"freq-interleaver.h"
 #include	"dab-params.h"
+#include	"fft-handler.h"
 
 class	RadioInterface;
 
@@ -42,18 +42,17 @@
 	                                 uint8_t,
 	                                 int16_t,
 	                                 RingBuffer<std::complex<float>> * iqBuffer = nullptr);
-		~ofdmDecoder();
+		~ofdmDecoder		();
 	void	processBlock_0		(std::vector<std::complex<float> >);
-	void	decode			(std::vector<std::complex<float> >,
+	void	decode			(std::vector<std::complex<float>> &,
 	                                 int32_t n, std::vector<int16_t> &);
 	void	stop			();
 	void	reset			();
 private:
 	RadioInterface	*myRadioInterface;
 	dabParams	params;
-	fftHandler	my_fftHandler;
 	interLeaver     myMapper;
-
+	fftHandler	fft;
 	RingBuffer<std::complex<float>> *iqBuffer;
 	float		computeQuality	(std::complex<float> *);
         float		compute_timeOffset      (std::complex<float> *,
@@ -70,7 +69,6 @@
 	int16_t		getMiddle();
 	std::vector<complex<float>>	phaseReference;
 	std::vector<int16_t>		ibits;
-	std::complex<float>	*fft_buffer;
 	phaseTable	*phasetable;
 
 signals:

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/ofdm/phasereference.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/ofdm/phasereference.h Changed

@@ -37,26 +37,24 @@
 #ifdef	__WITH_JAN__
 class	channel;
 #endif
+#include	"fft-handler.h"
 
 class phaseReference : public QObject, public phaseTable {
 Q_OBJECT
 public:
 			phaseReference 		(RadioInterface *,
 	                                         processParams *);
-			~phaseReference();
+			~phaseReference		();
 	int32_t		findIndex		(std::vector<std::complex<float>>, int);
 	int16_t		estimate_CarrierOffset	(std::vector<std::complex<float>>);
-	float		estimate_FrequencyOffset (std::vector<std::complex<float>>);
-//
-	float		phase			(std::vector<std::complex<float>>, int);
+	float		phase			(std::vector<std::complex<float>>&, int);
 #ifdef	__WITH_JAN__
-	void		estimate		(std::vector<std::complex<float>>&);
+	void		estimate		(std::vector<std::complex<float>>);
 #endif
 //	This one is used in the ofdm decoder
 	std::vector<std::complex<float>> refTable;
 private:
 	dabParams	params;
-	fftHandler	my_fftHandler;
 #ifdef	__WITH_JAN__
 	channel		*theEstimator;
 #endif
@@ -68,10 +66,13 @@
 	int32_t		T_g;
 	int16_t		carriers;
 
-	std::complex<float>	*fft_buffer;
 	int32_t		fft_counter;
 	int32_t		framesperSecond;	
 	int32_t		displayCounter;
+
+	fftHandler	fft_forward;
+	fftHandler	fft_backwards;
+
 signals:
 	void		showCorrelation	(int, int, QVector<int>);
 };

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/ofdm/sample-reader.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/ofdm/sample-reader.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/ofdm/tii-detector.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/ofdm/tii-detector.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/output/fir-filters.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/output/fir-filters.h Changed

@@ -2,25 +2,22 @@
 /*
  *    Copyright (C) 2010, 2011, 2012
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
- *    This file is part of the SDR-J.
- *    Many of the ideas as implemented in SDR-J are derived from
- *    other work, made available through the GNU general Public License. 
- *    All copyrights of the original authors are recognized.
+ *    This file is part of Qt-DAB
  *
- *    SDR-J is free software; you can redistribute it and/or modify
+ *    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.
  *
- *    SDR-J is distributed in the hope that it will be useful,
+ *    Q@t-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 SDR-J; if not, write to the Free Software
+ *    along with Qt-DAB; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
@@ -45,7 +42,7 @@
 private:
 	int16_t		filterSize;
 	int16_t		ip;
-	std::vector<std::complex<float>>	filterKernel;
+	std::vector<float>	filterKernel;
 	std::vector<std::complex<float>>	Buffer;
 	float		frequency;
 };

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/protection/eep-protection.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/protection/eep-protection.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/protection/uep-protection.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/protection/uep-protection.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/scopes-qwt6/audio-display.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/scopes-qwt6/audio-display.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons Added

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/newpushbutton.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/normalpushbutton.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/smallcombobox.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/smallpushbutton.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/smallqlistview.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/smallspinbox.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/buttons/verysmallpushbutton.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/includes/support/content-table.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/content-table.h Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/scanlist-handler.h Added

@@ -0,0 +1,55 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    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
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef	__SCANLIST_HANDLER__
+#define	__SCANLIST_HANDLER__
+
+#include	"radio.h"
+#include	<QListView>
+#include	<QStringList>
+#include	<QStringListModel>
+#include	<QModelIndex>
+
+class	RadioInterface;
+class	descriptorType;
+
+class	scanListHandler:public QListView {
+Q_OBJECT
+public:
+		scanListHandler	(RadioInterface *radio,
+	                                 QString fileName);
+		~scanListHandler	();
+	void	addElement	(const QString &, const QString &);
+	void	clear_scanList	();
+public slots:
+	void	selectElement	(QModelIndex);
+signals:
+	void	handle_scanListSelect (const QString &);
+private:
+	QStringList	scanList;
+	QStringListModel	displayList;
+	RadioInterface	*radio;
+	QString		fileName;
+};
+
+#endif
+

qt-dab-qt-dab-4.7-5.4.tar.gz/includes/support/upload.h Added

@@ -0,0 +1,49 @@
+#
+/*
+ *    Copyright (C) 2014.. 2023
+ *    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
+ */
+#ifndef	__UPLOAD_HANDLER_H
+#define	__UPLOAD_HANDLER_H
+#include	<QDialog>
+#include	<QLabel>
+#include	<QPushButton>
+#include	<QLineEdit>
+
+class	QSettings;
+
+class	uploadHandler: public QDialog {
+Q_OBJECT
+	public:
+		uploadHandler	(QSettings *);
+		~uploadHandler	();
+	private:
+	QSettings	*dabSettings;
+	QLabel		*uploadText;
+	QPushButton	*yesButton;
+	QPushButton	*noButton;
+private slots:
+	void		handle_yesButton 	();
+	void		handle_noButton 	();
+};
+
+#endif
+
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-4-config-widget.png -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-4-config-widget.png Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-4-main-widget.png -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-4-main-widget.png Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-5-config-widget.png -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-5-config-widget.png Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-5-main-widget.png -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-5-main-widget.png Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s4/CMakeLists.txt -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s4/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-4.6)
+set (objectName qt-dab-4.7)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -19,7 +19,9 @@
 #   add_definitions (-DSSE_AVAILABLE)
 endif()
 
-IF(EXISTS (".git") AND IS_DIRECTORY (".git"))
+add_definitions (-D__FFTW3__)
+
+IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.git" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.git")
    execute_process (
       COMMAND git rev-parse --short HEAD
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -148,7 +150,8 @@
         if (NOT FFTW3F_FOUND)
             message(FATAL_ERROR "please install FFTW3")
         endif ()
-
+        include_directories ( ${FFTW_INCLUDE_DIRS})
+        list(APPEND extraLibs ${FFTW3F_LIBRARIES})
 
         find_package(zlib)
 	if (NOT ZLIB_FOUND)
@@ -186,6 +189,7 @@
 	           ${QT_QTGUI_INCLUDE_DIR}
 	           .
 	           ..
+	           ../fft
 	           ../includes
 	           ../includes/ofdm
 	           ../includes/protection
@@ -198,6 +202,7 @@
 	           ../includes/backend/data/epg
 	           ../includes/support
 	           ../src/support/tii-library
+	           ../includes/support/buttons
 	           ../includes/support/viterbi-jan
 	           ../includes/support/viterbi-spiral
 	           ../includes/output
@@ -218,6 +223,8 @@
 	set (${objectName}_HDRS
 	     ./radio.h
 	     ../dab-processor.h
+	     ../fft/fft-handler.h 
+	     ../fft/fft-complex.h
 	     ../eti-handler/eti-generator.h
 	     ../includes/dab-constants.h
 	     ../includes/mot-content-types.h 
@@ -270,7 +277,6 @@
 	     ../includes/output/fir-filters.h
 	     ../includes/output/audio-base.h
 	     ../includes/output/newconverter.h
-	     ../includes/support/fft-handler.h
 	     ../includes/support/ringbuffer.h
 	     ../includes/support/Xtan2.h
 	     ../includes/support/dab-params.h
@@ -281,13 +287,7 @@
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
-	     ../includes/support/normalpushbutton.h
-	     ../includes/support/newpushbutton.h
-	     ../includes/support/smallpushbutton.h
-	     ../includes/support/smallspinbox.h
-	     ../includes/support/verysmallpushbutton.h
-	     ../includes/support/smallcombobox.h
-	     ../includes/support/history-handler.h
+	     ../includes/support/scanlist-handler.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
@@ -302,6 +302,13 @@
 	     ,,.includes/support/http-handler.h
 	     ,,.includes/support/converted_map.h
 	     ../src/support/tii-library/tii-codes.h
+	     ../includes/support/buttons/smallcombobox.h
+             ../includes/support/buttons/newpushbutton.h
+             ../includes/support/buttons/normalpushbutton.h
+             ../includes/support/buttons/smallpushbutton.h
+             ../includes/support/buttons/verysmallpushbutton.h
+             ../includes/support/buttons/smallqlistview.h
+             ../includes/support/buttons/smallspinbox.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../includes/scopes-qwt6/audio-display.h
 	     ../viewers/spectrum-viewer/spectrum-viewer.h 
@@ -312,6 +319,7 @@
 	     ../viewers/tii-viewer/tii-viewer.h
 	     ../viewers/snr-viewer/snr-viewer.h
 	     ../qt-devices/device-handler.h
+	     ../qt-devices/device-exceptions.h
 	     ../qt-devices/xml-filewriter.h
 	     ../qt-devices/rawfiles-new/rawfiles.h
 	     ../qt-devices/rawfiles-new/raw-reader.h
@@ -328,6 +336,8 @@
 	     ./main.cpp
 	     ./radio.cpp
 	     ../dab-processor.cpp
+	     ../fft/fft-handler.cpp 
+	     ../fft/fft-complex.cpp
 	     ../eti-handler/eti-generator.cpp
              ../src/ofdm/sample-reader.cpp
 	     ../src/ofdm/ofdm-decoder.cpp
@@ -374,21 +384,20 @@
 	     ../src/output/audio-base.cpp
 	     ../src/output/newconverter.cpp
 	     ../src/output/fir-filters.cpp
-	     ../src/support/fft-handler.cpp
 	     ../src/support/Xtan2.cpp
 	     ../src/support/dab-params.cpp
 	     ../src/support/band-handler.cpp
 	     ../src/support/dab-tables.cpp
 	     ../src/support/preset-handler.cpp
 	     ../src/support/presetcombobox.cpp
-	     ../src/support/smallqlistview.cpp
-	     ../src/support/smallspinbox.cpp
-	     ../src/support/normalpushbutton.cpp
-	     ../src/support/newpushbutton.cpp
-	     ../src/support/smallpushbutton.cpp
-	     ../src/support/verysmallpushbutton.cpp
-	     ../src/support/smallcombobox.cpp
-	     ../src/support/history-handler.cpp
+	     ../src/support/buttons/smallcombobox.cpp 
+             ../src/support/buttons/newpushbutton.cpp 
+             ../src/support/buttons/normalpushbutton.cpp 
+             ../src/support/buttons/smallpushbutton.cpp
+             ../src/support/buttons/verysmallpushbutton.cpp
+             ../src/support/buttons/smallqlistview.cpp
+             ../src/support/buttons/smallspinbox.cpp 
+	     ../src/support/scanlist-handler.cpp
 	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
 	     ../src/support/color-selector.cpp
@@ -451,14 +460,14 @@
 	     ../includes/support/band-handler.h
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
-	     ../includes/support/smallqlistview.h
-	     ../includes/support/smallspinbox.h
-	     ../includes/support/normalpushbutton.h
-	     ../includes/support/newpushbutton.h
-	     ../includes/support/smallpushbutton.h
-	     ../includes/support/verysmallpushbutton.h
-	     ../includes/support/smallcombobox.h
-	     ../includes/support/history-handler.h
+	     ../includes/support/buttons/smallcombobox.h
+             ../includes/support/buttons/newpushbutton.h
+             ../includes/support/buttons/normalpushbutton.h
+             ../includes/support/buttons/smallpushbutton.h 
+             ../includes/support/buttons/verysmallpushbutton.h
+             ../includes/support/buttons/smallqlistview.h
+             ../includes/support/buttons/smallspinbox.h
+	     ../includes/support/scanlist-handler.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
@@ -967,7 +976,6 @@
 	          ${QT5Widgets_INCLUDES}
 	          ${QT_QTCORE_INCLUDE_DIR}
 	          ${QT_QTGUI_INCLUDE_DIR}
-	          ${FFTW_INCLUDE_DIRS}
 	          ${PORTAUDIO_INCLUDE_DIRS}
 	          ${FAAD_INCLUDE_DIRS}
 	          ${SNDFILES_INCLUDE_DIRS}
@@ -989,7 +997,6 @@
 	                       Qt5::Network
 	                       Qt5::Xml
 	                       ${RTLTCP_lib}
-	                       ${FFTW3F_LIBRARIES}
 	                       ${extraLibs}
 	                       ${FAAD_LIBRARIES}
 	                       ${CMAKE_DL_LIBS}

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s4/forms-v4/config-helper.ui -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s4/forms-v4/config-helper.ui Changed

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>343</width>
-    <height>737</height>
+    <height>768</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -195,7 +195,7 @@
    <item>
     <widget class="QCheckBox" name="transmitterTags">
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that - rather than showing all ttransmitters on a map - only the transmitters that are seen for the currrent channel are made visible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that - rather than showing all transmitters on a map - only the transmitters that are seen for the currrent channel are made visible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>show transmitters of current channel</string>
@@ -223,6 +223,16 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="clearScan_Selector">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If set, the scanlist will be clear when starting a scan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>clear scanlist on scan</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QPushButton" name="loadTableButton">

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s4/forms-v4/dabradio-4.ui -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s4/forms-v4/dabradio-4.ui Changed

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>624</width>
+    <width>629</width>
     <height>464</height>
    </rect>
   </property>
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Qt-DAB-4.6</string>
+   <string>Qt-DAB-4.7</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_11">
    <item>
@@ -247,7 +247,7 @@
                <enum>QFrame::Sunken</enum>
               </property>
               <property name="digitCount">
-               <number>6</number>
+               <number>7</number>
               </property>
               <property name="segmentStyle">
                <enum>QLCDNumber::Flat</enum>
@@ -741,17 +741,17 @@
             </widget>
            </item>
            <item row="3" column="0">
-            <widget class="smallPushButton" name="historyButton">
+            <widget class="smallPushButton" name="scanListButton">
              <property name="font">
               <font>
                <pointsize>10</pointsize>
               </font>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;history feature. The software maintains a list of all services encountered. Touching this button will show (hide) the list. By clicking with the left mouse button the software will try to select the service pointed to, by clicking with the ruight mouse button the lit will be deleted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The scanlist shows the services, found in a scan. Click left will select the element, click right will add the element to the presets&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
-              <string>list</string>
+              <string>scan list</string>
              </property>
             </widget>
            </item>

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s4/qt-dab-4.pro -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s4/qt-dab-4.pro Changed

@@ -25,6 +25,12 @@
 RC_ICONS	=  qt-dab-4.ico
 RESOURCES	+= resources.qrc
 
+#
+#	choose one of the FFT handlers, if none is selected
+#	a default function is used
+CONFIG		+= fftw_fft
+#CONFIG		+= kiss_fft
+
 TRANSLATIONS = ../i18n/de_DE.ts
 
 #
@@ -38,6 +44,7 @@
 
 DEPENDPATH += . \
 	      ../src \
+	      ../fft \
 	      ../eti-handler \
 	      ../includes \
 	      ../src/ofdm \
@@ -51,6 +58,7 @@
 	      ../includes/backend/data/epg-2 \
 	      ../src/output \
 	      ../src/support \
+	      ../src/support/buttons \
 	      ../src/support/viterbi-jan \
 	      ../src/support/viterbi-spiral \
 	      ../includes/ofdm \
@@ -62,6 +70,7 @@
 	      ../includes/backend/data/journaline \
 	      ../includes/output \
 	      ../includes/support \
+	      ../includes/support/buttons \
 	      ../includes/scopes-qwt6 \
 	      ../viewers \
               ../viewers/spectrum-viewer \
@@ -75,6 +84,7 @@
 
 INCLUDEPATH += . \
 	      ../ \
+	      ../fft \
 	      ../eti-handler \
 	      ../src \
 	      ../includes \
@@ -89,6 +99,7 @@
 	      ../includes/backend/data/epg-2 \
 	      ../includes/output \
 	      ../includes/support \
+	      ../includes/support/buttons \
 	      ../includes/support/viterbi-jan \
 	      ../includes/support/viterbi-spiral \
 	      ../includes/scopes-qwt6 \
@@ -105,6 +116,8 @@
 # Input
 HEADERS += ./radio.h \
 	   ../dab-processor.h \
+           ../fft/fft-handler.h \
+	   ../fft/fft-complex.h \
 	   ../eti-handler/eti-generator.h \
 	   ../includes/dab-constants.h \
 	   ../includes/mot-content-types.h \
@@ -161,22 +174,13 @@
 	   ../includes/support/process-params.h \
 	   ../includes/support/viterbi-jan/viterbi-handler.h \
 	   ../includes/support/viterbi-spiral/viterbi-spiral.h \
-           ../includes/support/fft-handler.h \
 	   ../includes/support/ringbuffer.h \
 	   ../includes/support/dab-params.h \
 	   ../includes/support/band-handler.h \
-	   ../includes/support/bandpass-filter.h \
 	   ../includes/support/dab-tables.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/presetcombobox.h \
-	   ../includes/support/smallcombobox.h \
-	   ../includes/support/newpushbutton.h \
-	   ../includes/support/normalpushbutton.h \
-	   ../includes/support/smallpushbutton.h \
-	   ../includes/support/verysmallpushbutton.h \
-	   ../includes/support/smallqlistview.h \
-	   ../includes/support/smallspinbox.h \
-	   ../includes/support/history-handler.h \
+	   ../includes/support/scanlist-handler.h \
 	   ../includes/support/color-selector.h \
 	   ../includes/support/scheduler.h \
 	   ../includes/support/schedule-selector.h \
@@ -188,6 +192,14 @@
 	   ../includes/support/ITU_Region_1.h \
 	   ../includes/support/coordinates.h \
 	   ../includes/support/mapport.h \
+	   ../includes/support/bandpass-filter.h \
+	   ../includes/support/buttons/smallcombobox.h \
+           ../includes/support/buttons/newpushbutton.h \
+           ../includes/support/buttons/normalpushbutton.h \
+           ../includes/support/buttons/smallpushbutton.h \
+           ../includes/support/buttons/verysmallpushbutton.h \
+           ../includes/support/buttons/smallqlistview.h \
+           ../includes/support/buttons/smallspinbox.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../includes/scopes-qwt6/audio-display.h \
@@ -199,6 +211,7 @@
 	   ../viewers/tii-viewer/tii-viewer.h \
 	   ../viewers/snr-viewer/snr-viewer.h \
 	   ../qt-devices/device-handler.h \
+	   ../qt-devices/device-exceptions.h \
 	   ../qt-devices/xml-filewriter.h \
 	   ../qt-devices/rawfiles-new/rawfiles.h \
 	   ../qt-devices/rawfiles-new/raw-reader.h \
@@ -224,6 +237,8 @@
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
 	   ../dab-processor.cpp \
+           ../fft/fft-handler.cpp \
+	   ../fft/fft-complex.cpp \
 	   ../eti-handler/eti-generator.cpp \
 	   ../src/ofdm/timesyncer.cpp \
 	   ../src/ofdm/sample-reader.cpp \
@@ -272,21 +287,12 @@
 	   ../src/output/audiosink.cpp \
 	   ../src/support/viterbi-jan/viterbi-handler.cpp \
 	   ../src/support/viterbi-spiral/viterbi-spiral.cpp \
-           ../src/support/fft-handler.cpp \
 	   ../src/support/dab-params.cpp \
 	   ../src/support/band-handler.cpp \
-	   ../src/support/bandpass-filter.cpp \
 	   ../src/support/dab-tables.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
-	   ../src/support/smallcombobox.cpp \
-	   ../src/support/newpushbutton.cpp \
-	   ../src/support/normalpushbutton.cpp \
-	   ../src/support/smallpushbutton.cpp \
-	   ../src/support/verysmallpushbutton.cpp \
-	   ../src/support/smallqlistview.cpp \
-	   ../src/support/smallspinbox.cpp \
-	   ../src/support/history-handler.cpp \
+	   ../src/support/scanlist-handler.cpp \
 	   ../src/support/color-selector.cpp \
 	   ../src/support/scheduler.cpp \
 	   ../src/support/schedule-selector.cpp \
@@ -297,6 +303,14 @@
 	   ../src/support/ITU_Region_1.cpp \
 	   ../src/support/coordinates.cpp \
 	   ../src/support/mapport.cpp \
+	   ../src/support/bandpass-filter.cpp \
+	   ../src/support/buttons/smallcombobox.cpp \ 
+           ../src/support/buttons/newpushbutton.cpp \
+           ../src/support/buttons/normalpushbutton.cpp \
+           ../src/support/buttons/smallpushbutton.cpp \
+           ../src/support/buttons/verysmallpushbutton.cpp \
+           ../src/support/buttons/smallqlistview.cpp \ 
+           ../src/support/buttons/smallspinbox.cpp \
 	   ../src/scopes-qwt6/iqdisplay.cpp \
 	   ../src/scopes-qwt6/audio-display.cpp \
 	   ../viewers/spectrum-viewer/spectrum-viewer.cpp \
@@ -319,7 +333,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-4.6
+TARGET		= qt-dab-4.7
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -338,8 +352,8 @@
 }
 
 CONFIG		+= link_pkgconfig
-PKGCONFIG	+= fftw3f 
 PKGCONFIG	+= sndfile
+PKGCONFIG	+= fftw3
 PKGCONFIG	+= samplerate
 PKGCONFIG	+= libusb-1.0
 CONFIG		+= mapserver
@@ -384,7 +398,6 @@
 CONFIG		+= lime
 CONFIG		+= soapy
 CONFIG		+= pluto-rxtx
-#CONFIG		+= pluto
 #CONFIG		+= pluto-2
 #CONFIG		+= elad-device
 CONFIG		+= faad
@@ -426,7 +439,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-4.6
+#	TARGET		= qt-dab64-4.7
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -446,7 +459,7 @@
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-4.6
+	TARGET		= qt-dab32-4.7
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
@@ -471,7 +484,6 @@
 #
 #	end of 32/64 specifics
 INCLUDEPATH	+= /usr/local/include
-LIBS		+= -lfftw3f -lfftw3
 LIBS		+= -lportaudio
 LIBS		+= -lsndfile
 LIBS		+= -lsamplerate
@@ -812,5 +824,17 @@
 
 }
 
+kiss_fft {
+        DEFINES         += __KISS_FFT__
+        HEADERS         += ../fft/kiss_fft.h \
+                           ../fft/kiss_fftr.h \
+                           ../fft/_kiss_fft_guts.h
+        SOURCES         += ../fft/kiss_fft.c \
+                           ../fft/kiss_fftr.c \
+}
 
-	
+fftw_fft {
+        DEFINES         += __FFTW3__
+        PKGCONFIG       += fftw3
+        LIBS            += -lfftw3f
+}

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s4/radio.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s4/radio.cpp Changed

@@ -104,7 +104,7 @@
 #include	"spectrum-viewer.h"
 #include	"correlation-viewer.h"
 #include	"tii-viewer.h"
-#include	"history-handler.h"
+#include	"scanlist-handler.h"
 #include	"time-table.h"
 
 #ifdef	__MINGW32__
@@ -175,7 +175,7 @@
 #define	SPECTRUM_BUTTON		QString ("spectrumButton")
 #define	SNR_BUTTON		QString ("snrButton")
 #define	DEVICEWIDGET_BUTTON	QString ("devicewidgetButton")
-#define	HISTORY_BUTTON		QString ("historyButton")
+#define	SCANLIST_BUTTON		QString ("scanListButton")
 #define	DUMP_BUTTON		QString ("dumpButton")
 #define	MUTE_BUTTON		QString ("muteButton")
 #define PREVCHANNEL_BUTTON	QString ("prevChannelButton")
@@ -311,8 +311,25 @@
 
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
+	int x   = dabSettings -> value ("mainWidget-x", 100). toInt (); 
+        int y   = dabSettings -> value ("mainWidget-y", 100). toInt ();
+	int wi  = dabSettings -> value ("main-widget-w", 300). toInt ();
+	int he  = dabSettings -> value ("main-widget-h", 200). toInt ();
+        this    -> resize (QSize (wi, he));
+        this    -> move (QPoint (x, y));
+
+
 //	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (&dataDisplay);
+	dabSettings	-> beginGroup ("techDataSettings");
+	x	= dabSettings	-> value ("position-x", 300). toInt ();
+	y	= dabSettings	-> value ("position-y", 300). toInt ();
+	wi	= dabSettings	-> value ("techData-4-w", 300). toInt ();
+	he	= dabSettings	-> value ("techData-4-h", 200). toInt ();
+	dabSettings	-> endGroup ();
+        dataDisplay. resize (QSize (wi, he));
+	dataDisplay. move (QPoint (x, y));
+
 	techData. timeTable_button -> hide ();
 
 	the_audioDisplay	= new audioDisplay (this,
@@ -321,6 +338,12 @@
 	epgLabel	-> hide ();
 	epgLabel	-> setStyleSheet ("QLabel {background-color : yellow}");
 	configWidget. setupUi (&configDisplay);
+	x       = dabSettings	-> value ("configWidget-x", 200). toInt ();
+        y       = dabSettings	-> value ("configWidget-y", 200). toInt ();
+	wi	= dabSettings	-> value ("config-4-w", 300). toInt ();
+	he	= dabSettings	-> value ("config-4-h", 200). toInt ();
+        configDisplay. resize (QSize (wi, he));
+        configDisplay. move (QPoint (x, y));
 //
 //	Now we can set the checkbox as saved in the settings
 	if (dabSettings -> value ("onTop", 0). toInt () == 1) 
@@ -332,7 +355,10 @@
 	if (dabSettings -> value ("epgFlag", 0). toInt () == 1)
 	   configWidget. epgSelector -> setChecked (true);
 
-	int x = dabSettings -> value ("muteTime", 2). toInt ();
+	if (dabSettings -> value ("clearScanResult", 1). toInt () == 1)
+           configWidget. clearScan_Selector -> setChecked (true);
+
+	x = dabSettings -> value ("muteTime", 2). toInt ();
 	configWidget. muteTimeSetting -> setValue (x);
 
 	x = dabSettings -> value ("switchDelay", 8). toInt ();
@@ -384,6 +410,10 @@
 	connect (configWidget. saveSlides, SIGNAL (stateChanged (int)),
 	         this, SLOT (handle_saveSlides (int)));
 
+	connect (configWidget. clearScan_Selector,
+                                     SIGNAL (stateChanged (int)),
+                 this, SLOT (handle_clearScan_Selecctor (int)));
+
 	logFile		= nullptr;
 	int scanMode	=
 	           dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
@@ -500,16 +530,16 @@
 	connect (&epgTimer, SIGNAL (timeout ()),
 	         this, SLOT (epgTimer_timeOut ()));
 
-	QString historyFile     = QDir::homePath () + "/.qt-history.xml";
-	historyFile             =
-	             dabSettings -> value ("history", historyFile). toString ();
-	historyFile             = QDir::toNativeSeparators (historyFile);
-	my_history              = new historyHandler (this, historyFile);
+	QString scanListFile     = QDir::homePath () + "/.qt-scanList.xml";
+	scanListFile             =
+	             dabSettings -> value ("scanList", scanListFile). toString ();
+	scanListFile		= QDir::toNativeSeparators (scanListFile);
+	my_scanList		= new scanListHandler (this, scanListFile);
 	my_timeTable		= new timeTableHandler (this);
-	my_timeTable	-> hide ();
+	my_timeTable		-> hide ();
 
-	connect (my_history, SIGNAL (handle_historySelect (const QString &)),
-	         this, SLOT (handle_historySelect (const QString &)));
+	connect (my_scanList, SIGNAL (handle_scanListSelect (const QString &)),
+	         this, SLOT (handle_scanListSelect (const QString &)));
 	connect (this, SIGNAL (set_newChannel (int)),
 	         channelSelector, SLOT (setCurrentIndex (int)));
 	connect (this, SIGNAL (set_newPresetIndex (int)),
@@ -583,8 +613,8 @@
 	         this, SLOT (color_snrButton ()));
 	connect (devicewidgetButton, SIGNAL (rightClicked ()),
 	         this, SLOT (color_devicewidgetButton ()));
-	connect (historyButton, SIGNAL (rightClicked ()),
-	         this, SLOT (color_historyButton ()));
+	connect (scanListButton, SIGNAL (rightClicked ()),
+	         this, SLOT (color_scanListButton ()));
 	connect (dumpButton, SIGNAL (rightClicked (void)),
 	         this, SLOT (color_sourcedumpButton (void)));
 	connect (configButton, SIGNAL (rightClicked (void)),
@@ -752,6 +782,11 @@
 	   my_correlationViewer. show ();
 	if (dabSettings -> value ("snrVisible", 0). toInt () == 1)
 	   my_snrViewer. show ();
+	if (dabSettings -> value  ("techDataVisible", 0). toInt () == 1)
+	   dataDisplay. show ();
+	if (dabSettings -> value ("configVisible", 0). toInt () != 0) {
+	   configDisplay. show ();
+	}
 
 //	if a device was selected, we just start, otherwise
 //	we wait until one is selected
@@ -880,16 +915,6 @@
 	s	-> setValue ("soundchannel",
 	                               streamoutSelector -> currentText());
 	if (inputDevice != nullptr)
-	   s    -> setValue ("deviceVisible",
-	                          inputDevice -> isHidden () ? 0 : 1);
-	s	-> setValue ("spectrumVisible",
-	                          my_spectrumViewer. isHidden () ? 0 : 1);
-	s	-> setValue ("tiiVisible",
-	                          my_tiiViewer. isHidden () ? 0 : 1);
-	s	-> setValue ("correlationVisible",
-	                          my_correlationViewer. isHidden () ? 0 : 1);
-	s	-> setValue ("snrVisible",
-	                          my_snrViewer. isHidden () ? 0 : 1);
 	s	-> setValue ("utcSelector",
 	                          configWidget. utcSelector -> isChecked () ? 1 : 0);
 	s	-> setValue ("epg2xml",
@@ -937,7 +962,8 @@
 	    dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
 
 	serviceList = insert (serviceList, ed, serviceOrder);
-	my_history -> addElement (channel. channelName, serviceName);
+	if (scanning. load ())
+	   my_scanList -> addElement (channel. channelName, serviceName);
 	model. clear ();
 	for (auto serv : serviceList) {
 	   model. appendRow (new QStandardItem (serv. name));
@@ -1334,7 +1360,7 @@
 	if (s. valid) {
 	   QString ss = my_dabProcessor -> findService (s. SId, s. SCIds);
 	   if (ss != "") {
-	      startService (&s);
+	      startService (s);
 	      return;
 	   }
 //
@@ -1343,7 +1369,7 @@
 	   s. serviceName =
 	               my_dabProcessor -> findService (s. SId, s. SCIds);
 	   if (s. serviceName != "")
-	      startService (&s);
+	      startService (s);
 	}
 //
 //	we also have to restart all background services,
@@ -1423,8 +1449,33 @@
 	if (scanning. load ())
 	   stopScanning (false);
 	running. store	(false);
+
+        dabSettings     -> setValue ("mainWidget-x", this -> pos (). x ());
+        dabSettings     -> setValue ("mainWidget-y", this -> pos (). y ());
+	QSize size      = this -> size ();
+        dabSettings     -> setValue ("mainwidget-w", size. width ());
+        dabSettings     -> setValue ("mainwidget-h", size. height ());
+
+        dabSettings     -> setValue ("configWidget-x",
+	                                      configDisplay. pos (). x ());
+        dabSettings     -> setValue ("configWidget-y",
+	                                      configDisplay. pos (). y ());
+	dabSettings	-> setValue ("config-4-w",
+	                                      configDisplay. width ());
+	dabSettings	-> setValue ("config-4-h",
+	                                      configDisplay. height ());
+
+	dabSettings	-> endGroup ();
+	dabSettings	-> beginGroup ("techDataSettings");
+        dabSettings     -> setValue ("position-x", dataDisplay. pos (). x ());
+        dabSettings     -> setValue ("position-y", dataDisplay. pos (). y ());
+	dabSettings	-> setValue ("techData-4-w", dataDisplay. width ());
+	dabSettings	-> setValue ("techData-4-h", dataDisplay. height ());
+	dabSettings	-> endGroup ();
+	
 	dumpControlState (dabSettings);
 	hideButtons	();
+
 #ifdef	DATA_STREAMER
 	fprintf (stderr, "going to close the dataStreamer\n");
 	delete		dataStreamer;
@@ -1491,7 +1542,7 @@
 	delete		soundOut;
 	if (motSlides != nullptr)
 	   delete	motSlides;
-	delete	my_history;
+	delete	my_scanList;
 	delete	my_timeTable;
 //	close();
 	fprintf (stderr, ".. end the radio silences\n");
@@ -1570,9 +1621,10 @@
 	      inputDevice	= new sdrplayHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
-	                               tr ("SDRplay: no library or device\n"));
+	   catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("sdrplay v2 fails"));
+
 	      return nullptr;
 	   }
 	}
@@ -1584,9 +1636,9 @@
 	      inputDevice	= new sdrplayHandler_v3 (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
-	                               tr ("SDRplay: no library or device\n"));
+	   catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("sdrplay device v3 fails"));
 	      return nullptr;
 	   }
 	}
@@ -1598,10 +1650,9 @@
 	      inputDevice	= new rtlsdrHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
-	                           tr ("DAB stick not found! Please use one with RTL2832U or similar chipset!\n"));
-	      fprintf (stderr, "error = %d\n", e);
+	   catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("rtlsdr device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1613,9 +1664,9 @@
 	      inputDevice	= new airspyHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
-	                           tr ("Airspy or Airspy mini not found\n"));
+	   catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("airspy device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1627,9 +1678,9 @@
 	      inputDevice	= new hackrfHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                           tr ("hackrf not found\n"));
+                                       tr ("hackrf device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1641,39 +1692,24 @@
 	      inputDevice = new limeHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("no lime device found\n"));
+           catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("lime device fails"));
 	      return nullptr;
 	   }
 	}
 	else
 #endif
-#ifdef	HAVE_PLUTO
+#ifdef	HAVE_PLUTO_2
 	if (s == "pluto") {
 	   try {
 	      inputDevice = new plutoHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      switch (e) {
-	         case 22:
-	            QMessageBox::warning (this, tr ("warning"),
-	                                  tr ("failed to open libiio.dll\n"));
-	            return nullptr;
-	         case 23:
-	            QMessageBox::warning (this, tr ("warning"),
-	                                 tr ("error in loading functions\n"));
-	            return nullptr;
-	         case 24:
-	            QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("no pluto device found\n"));
-	            return nullptr;
-	         default:
-	            QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("some else with pluto\n"));
-	            return nullptr;
-	      }
+	   catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("pluto device fails"));
+	      return nullptr;
 	   }
 	}
 	else
@@ -1689,9 +1725,9 @@
 	      ((plutoHandler *)inputDevice)	-> startTransmitter (
 	                                               fmFrequency);
 	   }
-	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("no pluto device found\n"));
+           catch (...) {
+              QMessageBox::warning (this, tr ("Warning"),
+                                       tr ("pluto device fails"));
 	      return nullptr;
 	   }
 	}
@@ -2316,10 +2352,11 @@
 
 //
 //	called from the MP4 decoder
-void	RadioInterface::show_rsCorrections	(int c) {
+void	RadioInterface::show_rsCorrections	(int c, int ec) {
 	if (!running)
 	   return;
 
+	(void)ec;
 	techData. rsCorrections	-> display (c);
 }
 //
@@ -2365,6 +2402,8 @@
 	switchVisibility (&dataDisplay);
 	if (dataDisplay. isHidden ())
 	   my_timeTable -> hide ();
+	dabSettings	-> setValue ("techDataVisible",
+                                  dataDisplay. isHidden () ? 0 : 1);
 }
 //
 //	Whenever the input device is a file, some functions,
@@ -2567,6 +2606,7 @@
 	   my_tiiViewer. show();
 	else
 	   my_tiiViewer. hide();
+	dabSettings -> setValue ("tiiVisible", my_tiiViewer. isHidden () ? 0 : 1);
 }
 
 void	RadioInterface::handle_correlationButton	() {
@@ -2577,6 +2617,8 @@
 	   my_correlationViewer. show();
 	else
 	   my_correlationViewer. hide();
+	dabSettings -> setValue ("correlationVisible",
+	                          my_correlationViewer. isHidden () ? 0 : 1);
 }
 
 void	RadioInterface::handle_spectrumButton	() {
@@ -2587,6 +2629,8 @@
 	   my_spectrumViewer. show ();
 	else
 	   my_spectrumViewer. hide ();
+	dabSettings -> setValue ("spectrumVisible",
+	                          my_spectrumViewer. isHidden () ? 0 : 1);
 }
 
 void	RadioInterface::handle_snrButton	() {
@@ -2597,16 +2641,18 @@
 	   my_snrViewer. show ();
 	else
 	   my_snrViewer. hide ();
+	dabSettings -> setValue ("snrVisible",
+	                          my_snrViewer. isHidden () ? 0 : 1);
 }
 
-void    RadioInterface::handle_historyButton    () {
+void    RadioInterface::handle_scanListButton    () {
 	if (!running. load ())
 	   return;
 
-	if (my_history  -> isHidden ())
-	   my_history   -> show ();
+	if (my_scanList  -> isHidden ())
+	   my_scanList   -> show ();
 	else
-	   my_history   -> hide ();
+	   my_scanList   -> hide ();
 }
 //
 //	When changing (or setting) a device, we do not want anybody
@@ -2632,8 +2678,8 @@
 	         this, SLOT (handle_snrButton (void)));
 	connect (devicewidgetButton, SIGNAL (clicked ()),
 	         this, SLOT (handle_devicewidgetButton ()));
-	connect (historyButton, SIGNAL (clicked ()),
-	         this, SLOT (handle_historyButton ()));
+	connect (scanListButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_scanListButton ()));
 	connect (dumpButton, SIGNAL (clicked (void)),
 	         this, SLOT (handle_sourcedumpButton (void)));
 
@@ -2703,8 +2749,8 @@
 	         this, SLOT (handle_snrButton (void)));
 	disconnect (devicewidgetButton, SIGNAL (clicked ()),
 	         this, SLOT (handle_devicewidgetButton ()));
-	disconnect (historyButton, SIGNAL (clicked ()),
-	         this, SLOT (handle_historyButton ()));
+	disconnect (scanListButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_scanListButton ()));
 	disconnect (dumpButton, SIGNAL (clicked (void)),
 	         this, SLOT (handle_sourcedumpButton (void)));
 	disconnect (nextChannelButton, SIGNAL (clicked (void)),
@@ -2806,11 +2852,18 @@
 	   }
 	}
 	else
-	if ((obj == this -> my_history -> viewport ()) &&
+	if ((obj == this -> my_scanList -> viewport ()) &&
 	    (event -> type () == QEvent::MouseButtonPress)) {
 	   QMouseEvent *ev = static_cast<QMouseEvent *>(event);
 	   if (ev -> buttons () & Qt::RightButton) {
-	      my_history -> clearHistory ();
+	      QString service =
+	         this -> my_scanList -> indexAt (ev -> pos()). data ().toString();    
+              bool alreadyIn = false;
+	      for (int i = 0; i < presetSelector -> count (); i ++)
+	         if (presetSelector -> itemText (i) == service)
+	            alreadyIn = true;
+	         if (!alreadyIn)
+	            presetSelector -> addItem (service);
 	   }
 	}
 	else
@@ -2920,10 +2973,10 @@
 
 ////////////////////////////////////////////////////////////////////////
 //
-//	preset selection, either from presets or from history
+//	preset selection, either from presets or from scan list
 ////////////////////////////////////////////////////////////////////////
 
-void    RadioInterface::handle_historySelect (const QString &s) {
+void    RadioInterface::handle_scanListSelect (const QString &s) {
 	if (!running. load ())
 	   return;
 
@@ -3006,7 +3059,7 @@
 	      return;
 	   }
 	   s. serviceName = service;
-	   startService (&s);
+	   startService (s);
 	   return;
 	}
 //
@@ -3127,19 +3180,21 @@
 	dabService s;
 	s. serviceName = currentProgram;
 	my_dabProcessor -> getParameters (currentProgram, &s. SId, &s. SCIds);
+	fprintf (stderr, "selecting %s with %X\n",
+	                      currentProgram. toUtf8 (). data (), s. SId);
 	if (s. SId == 0) {
 	   QMessageBox::warning (this, tr ("Warning"),
  	                         tr ("insufficient data for this program\n"));	
 	   return;
 	}
 
-	startService (&s);
+	startService (s);
 }
 //
-void	RadioInterface::startService (dabService *s) {
-QString serviceName	= s -> serviceName;
+void	RadioInterface::startService (dabService &s) {
+QString serviceName	= s. serviceName;
 
-	currentService		= *s;
+	currentService		= s;
 	currentService. valid	= false;
 	LOG ("start service ", serviceName. toUtf8 (). data ());
 	LOG ("service has SNR ", QString::number (currentSNR));
@@ -3414,7 +3469,7 @@
 	            break;
 	         }
 	         s. serviceName = serviceList. at (i). name;
-	         startService (&s);
+	         startService (s);
 	         break;
 	      }
 	   }
@@ -3457,7 +3512,7 @@
 	      }
 
 	      s. serviceName = presetName;
-	      startService (&s);
+	      startService (s);
 	      return;
 	   }
 	}
@@ -3479,6 +3534,7 @@
 	LOG ("channel starts ", theChannel);
 	serviceCount		= -1;
 	frequencyDisplay	-> display (tunedFrequency / 1000000.0);
+	my_spectrumViewer. showFrequency (tunedFrequency / 1000000.0);
 	dabSettings		-> setValue ("channel", theChannel);
 	inputDevice		-> resetBuffer ();
 	serviceList. clear ();
@@ -3677,6 +3733,10 @@
 	}
 	LOG ("scanning starts with ", QString::number (cc));
 	scanning. store (true);
+	  if (scanMode == SINGLE_SCAN)
+           if (dabSettings -> value ("clearScanResult", 0). toInt () == 1)
+              my_scanList -> clear_scanList ();
+
 	if ((scanMode == SINGLE_SCAN) || (scanMode == SCAN_CONTINUOUSLY)) {
 	   if (my_scanTable == nullptr) 
 	      my_scanTable = new contentTable (this, dabSettings,
@@ -3688,8 +3748,8 @@
 	                        "channelName" + ";" +
 	                        "frequency (KHz)" + ";" +
 	                        "Eid" + ";" +
-	                        "time" + ";" +
 	                        "tii" + ";" +
+	                        "time" + ";" +
 	                        "SNR" + ";" +
 	                        "nr services" + ";";
 	   my_scanTable -> addLine (topLine);
@@ -3771,6 +3831,8 @@
 	   fprintf (stderr, "going to channel %d\n", cc);
 	   if ((cc >= channelSelector -> count ()) &&
 	                               (scanMode == SINGLE_SCAN)) {
+	      connect (&channelTimer, SIGNAL (timeout ()),
+                       this, SLOT (channel_timeOut ()));
 	      stopScanning (true);
 	   }
 	   else {  // we just continue
@@ -3795,8 +3857,13 @@
 	   }
 	}
 	else
-	if (scanning. load ()) 
+	if (scanning. load ()) {
+//	  channeltimer should not be disconneted, so
+	  connect (&channelTimer, SIGNAL (timeout ()),
+                   this, SLOT (channel_timeOut ()));
+
 	   stopScanning (false);
+	}
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -3846,7 +3913,7 @@
 	                      QString::number (serviceList. size ()) + ";" +
 	                      distanceLabel -> text ();
 
-	   my_scanTable -> addLine ("\n");
+//	   my_scanTable -> addLine ("\n");
 	   my_scanTable -> addLine (headLine);
 	   my_scanTable	-> show ();
 	}
@@ -4060,11 +4127,11 @@
 	   dabSettings -> value (DEVICEWIDGET_BUTTON + "_font",
 	                                              "black"). toString ();
 
-QString historyButton_color =
-	   dabSettings -> value (HISTORY_BUTTON + "_color",
+QString scanListButton_color =
+	   dabSettings -> value (SCANLIST_BUTTON + "_color",
 	                                              "white"). toString ();
-QString historyButton_font =
-	   dabSettings -> value (HISTORY_BUTTON + "_font",
+QString scanListButton_font =
+	   dabSettings -> value (SCANLIST_BUTTON + "_font",
 	                                              "black"). toString ();
 QString dumpButton_color =
 	   dabSettings -> value (DUMP_BUTTON + "_color",
@@ -4167,8 +4234,8 @@
 	devicewidgetButton -> setStyleSheet (temp. arg (devicewidgetButton_color,
 	                                                devicewidgetButton_font));
 
-	historyButton	-> setStyleSheet (temp. arg (historyButton_color,
-	                                             historyButton_font));
+	scanListButton	-> setStyleSheet (temp. arg (scanListButton_color,
+	                                             scanListButton_font));
 	dumpButton	-> setStyleSheet (temp. arg (dumpButton_color,
 	                                             dumpButton_font));
 	configButton	-> setStyleSheet (temp. arg (configButton_color,
@@ -4236,8 +4303,8 @@
 	set_buttonColors (devicewidgetButton, DEVICEWIDGET_BUTTON);
 }
 
-void	RadioInterface::color_historyButton	()	{
-	set_buttonColors (historyButton, HISTORY_BUTTON);
+void	RadioInterface::color_scanListButton	()	{
+	set_buttonColors (scanListButton, SCANLIST_BUTTON);
 }
 
 void	RadioInterface::color_sourcedumpButton	()	{
@@ -4328,6 +4395,8 @@
 	   theBand. hide ();
 	   configDisplay. hide ();
 	}
+	dabSettings	-> setValue ("configVisible", 
+	                          configDisplay. isHidden () ? 0 : 1);
 }
 
 void	RadioInterface::handle_muteTimeSetting	(int newV) {
@@ -4809,3 +4878,10 @@
 	                         configWidget. saveSlides -> isChecked () ? 1 : 0);
 }
 
+       
+void    RadioInterface::handle_clearScan_Selector (int c) {
+        (void)c;   
+        dabSettings -> setValue ("clearScanResult",
+                       configWidget. clearScan_Selector -> isChecked () ? 1 : 0);       
+}       
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s4/radio.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s4/radio.h Changed

@@ -70,7 +70,7 @@
 class	deviceHandler;
 class	audioBase;
 class	common_fft;
-class	historyHandler;
+class	scanListHandler;
 class	timeTableHandler;
 class	audioDisplay;
 #ifdef	HAVE_PLUTO_RXTX
@@ -248,8 +248,8 @@
 	void			hideButtons		();
 	void			showButtons		();
 	deviceHandler		*setDevice		(const QString &);
-	historyHandler		*my_history;
-	historyHandler		*my_presets;
+	scanListHandler		*my_scanList;
+	scanListHandler		*my_presets;
 	timeTableHandler	*my_timeTable;
 //
 	QString			checkDir		(const QString);
@@ -273,7 +273,7 @@
 	void			startChannel		(const QString &);
 	void			stopChannel		();
 	void			stopService		(dabService &);
-	void			startService		(dabService *);
+	void			startService		(dabService &);
 	void			colorService		(QModelIndex ind,
 	                                                 QColor c, int pt,
 	                                                 bool italic = false);
@@ -364,7 +364,7 @@
 	void			showSpectrum		(int);
 	void			showIQ			(int);
 	void			showQuality		(float, float, float);
-	void			show_rsCorrections	(int);
+	void			show_rsCorrections	(int, int);
 	void			show_tii		(int, int);
 	void			show_tii_spectrum	();
 	void			closeEvent		(QCloseEvent *event);
@@ -403,11 +403,13 @@
 	void			handle_correlationButton	();
 	void			handle_spectrumButton	();
 	void			handle_devicewidgetButton	();
+	void			handle_clearScan_Selector	(int);
+
 
 	void			doStart			(const QString &);
 	void			newDevice		(const QString &);
 
-	void			handle_historyButton	();
+	void			handle_scanListButton	();
         void			handle_sourcedumpButton	();
         void			handle_framedumpButton	();
 	void			handle_audiodumpButton 	();
@@ -418,7 +420,7 @@
 	void			handle_nextChannelButton();
 	void			handle_prevChannelButton();
 
-	void			handle_historySelect	(const QString &);
+	void			handle_scanListSelect	(const QString &);
 	void			TerminateProcess	();
 	void			updateTimeDisplay	();
 	void			channel_timeOut		();
@@ -450,7 +452,7 @@
 	void			color_spectrumButton	();
 	void			color_snrButton		();
 	void			color_devicewidgetButton	();
-	void			color_historyButton	();
+	void			color_scanListButton	();
 	void			color_sourcedumpButton	();
 	void			color_muteButton	();
 	void			color_prevChannelButton	();

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/CMakeLists.txt -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-5.3)
+set (objectName qt-dab-5.4)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -20,7 +20,9 @@
 #	add_definitions (-DSSE_AVAILABLE)
 endif()
 
-IF(EXISTS (".git") AND IS_DIRECTORY (".git"))
+add_definitions (-D__FFTW3__)
+
+IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.git" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.git")
    execute_process (
       COMMAND git rev-parse --short HEAD
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -145,10 +147,12 @@
 	include_directories ( ${QWT_INCLUDE_DIRS})
 	list(APPEND extraLibs ${QWT_LIBRARIES})
 
-        find_package(FFTW3f)
+	find_package(FFTW3f)
         if (NOT FFTW3F_FOUND)
             message(FATAL_ERROR "please install FFTW3")
         endif ()
+	include_directories ( ${FFTW_INCLUDE_DIRS})
+        list(APPEND extraLibs ${FFTW3F_LIBRARIES})
 
 
         find_package(zlib)
@@ -188,6 +192,7 @@
 	           ./pauzeslide
 	           ./support
 	           ..
+	           ../fft
 	           ../includes
 	           ../includes/ofdm
 	           ../includes/protection
@@ -200,6 +205,7 @@
 	           ../includes/backend/data/epg
 	           ../includes/support
 	           ../src/support/tii-library
+	           ../includes/support/buttons
 	           ../includes/support/viterbi-jan
 	           ../includes/support/viterbi-spiral
 	           ../includes/output
@@ -221,6 +227,8 @@
 	     ./radio.h
 	     ./pauzeslide/pauzeslide.h
 	     ../dab-processor.h
+	     ../fft/fft-handler.h 
+	     ../fft/fft-complex.h
 	     ../eti-handler/eti-generator.h
 	     ../includes/dab-constants.h
 	     ../includes/mot-content-types.h 
@@ -273,7 +281,6 @@
 	     ../includes/output/fir-filters.h
 	     ../includes/output/audio-base.h
 	     ../includes/output/newconverter.h
-	     ../includes/support/fft-handler.h
 	     ../includes/support/ringbuffer.h
 	     ../includes/support/Xtan2.h
 	     ../includes/support/dab-params.h
@@ -283,14 +290,7 @@
 	     ../includes/support/viterbi-spiral/viterbi-spiral.h
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
-	     ../includes/support/smallqlistview.h
-	     ../includes/support/normalpushbutton.h
-	     ../includes/support/newpushbutton.h
-	     ../includes/support/smallpushbutton.h
-	     ../includes/support/smallspinbox.h
-	     ../includes/support/verysmallpushbutton.h
-	     ../includes/support/smallcombobox.h
-	     ../includes/support/history-handler.h
+	     ../includes/support/scanlist-handler.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
@@ -305,6 +305,13 @@
 	     ,,.includes/support/http-handler.h
 	     ,,.includes/support/converted_map.h
 	     ../src/support/tii-library/tii-codes.h
+	     ../includes/support/buttons/smallcombobox.h 
+             ../includes/support/buttons/newpushbutton.h 
+             ../includes/support/buttons/normalpushbutton.h 
+             ../includes/support/buttons/smallpushbutton.h 
+             ../includes/support/buttons/verysmallpushbutton.h 
+             ../includes/support/buttons/smallqlistview.h 
+             ../includes/support/buttons/smallspinbox.h 
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../includes/scopes-qwt6/audio-display.h
 	     ../viewers/spectrum-viewer/spectrum-viewer.h 
@@ -315,6 +322,7 @@
 	     ../viewers/tii-viewer/tii-viewer.h
 	     ../viewers/snr-viewer/snr-viewer.h
 	     ../qt-devices/device-handler.h
+	     ../qt-devices/device-exceptions.h
 	     ../qt-devices/xml-filewriter.h
 	     ../qt-devices/rawfiles-new/rawfiles.h
 	     ../qt-devices/rawfiles-new/raw-reader.h
@@ -332,6 +340,8 @@
 	     ./radio.cpp
 	     ./support/techdata.cpp
 	     ../dab-processor.cpp
+	     ../fft/fft-handler.cpp 
+	     ../fft/fft-complex.cpp
 	     ../eti-handler/eti-generator.cpp
              ../src/ofdm/sample-reader.cpp
 	     ../src/ofdm/ofdm-decoder.cpp
@@ -378,21 +388,20 @@
 	     ../src/output/audio-base.cpp
 	     ../src/output/newconverter.cpp
 	     ../src/output/fir-filters.cpp
-	     ../src/support/fft-handler.cpp
 	     ../src/support/Xtan2.cpp
 	     ../src/support/dab-params.cpp
 	     ../src/support/band-handler.cpp
 	     ../src/support/dab-tables.cpp
 	     ../src/support/preset-handler.cpp
 	     ../src/support/presetcombobox.cpp
-	     ../src/support/smallqlistview.cpp
-	     ../src/support/smallspinbox.cpp
-	     ../src/support/normalpushbutton.cpp
-	     ../src/support/newpushbutton.cpp
-	     ../src/support/smallpushbutton.cpp
-	     ../src/support/verysmallpushbutton.cpp
-	     ../src/support/smallcombobox.cpp
-	     ../src/support/history-handler.cpp
+	     ../src/support/buttons/smallcombobox.cpp 
+             ../src/support/buttons/newpushbutton.cpp 
+             ../src/support/buttons/normalpushbutton.cpp 
+             ../src/support/buttons/smallpushbutton.cpp 
+             ../src/support/buttons/verysmallpushbutton.cpp 
+             ../src/support/buttons/smallqlistview.cpp 
+             ../src/support/buttons/smallspinbox.cpp 
+	     ../src/support/scanlist-handler.cpp
 	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
 	     ../src/support/color-selector.cpp
@@ -456,14 +465,14 @@
 	     ../includes/support/band-handler.h
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
-	     ../includes/support/smallqlistview.h
-	     ../includes/support/smallspinbox.h
-	     ../includes/support/normalpushbutton.h
-	     ../includes/support/newpushbutton.h
-	     ../includes/support/smallpushbutton.h
-	     ../includes/support/verysmallpushbutton.h
-	     ../includes/support/smallcombobox.h
-	     ../includes/support/history-handler.h
+	     ../includes/support/buttons/smallcombobox.h 
+	     ../includes/support/buttons/newpushbutton.h 
+	     ../includes/support/buttons/normalpushbutton.h 
+	     ../includes/support/buttons/smallpushbutton.h 
+	     ../includes/support/buttons/verysmallpushbutton.h 
+	     ../includes/support/buttons/smallqlistview.h 
+	     ../includes/support/buttons/smallspinbox.h 
+	     ../includes/support/scanlist-handler.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
@@ -973,7 +982,6 @@
 	          ${QT5Widgets_INCLUDES}
 	          ${QT_QTCORE_INCLUDE_DIR}
 	          ${QT_QTGUI_INCLUDE_DIR}
-	          ${FFTW_INCLUDE_DIRS}
 	          ${PORTAUDIO_INCLUDE_DIRS}
 	          ${FAAD_INCLUDE_DIRS}
 	          ${SNDFILES_INCLUDE_DIRS}
@@ -995,7 +1003,6 @@
 	                       Qt5::Network
 	                       Qt5::Xml
 	                       ${RTLTCP_lib}
-	                       ${FFTW3F_LIBRARIES}
 	                       ${extraLibs}
 	                       ${FAAD_LIBRARIES}
 	                       ${CMAKE_DL_LIBS}

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/forms-v5/config-helper.ui -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/forms-v5/config-helper.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>582</width>
-    <height>528</height>
+    <width>634</width>
+    <height>559</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -224,7 +224,7 @@
        <item>
         <widget class="QCheckBox" name="epg2xmlSelector">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The EPG detector has two components, one collecting data to present as &amp;quot;time table&amp;quot; for today,&lt;/p&gt;&lt;p&gt;the other one - using a library written by Julian Cable from the BBC - to generate textual xml.&lt;/p&gt;&lt;p&gt;If selected, the xml will be generated. Note howevet that we encountered at least one example&lt;/p&gt;&lt;p&gt;here the library generating the textual xml causes a crash.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The EPG detector has two components, one collecting data to present as &amp;quot;time table&amp;quot; for today,&lt;/p&gt;&lt;p&gt;the other one - using a library written by Julian Cable from the BBC - to generate textual xml.&lt;/p&gt;&lt;p&gt;If selected, the xml will be generated. Note howevet that we encountered at least one example&lt;/p&gt;&lt;p&gt;where the library generating the textual xml causes a crash.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
           <string> epg to xml</string>
@@ -254,7 +254,7 @@
        <item>
         <widget class="QCheckBox" name="transmitterTags">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that - rather than showing all ttransmitters on a map - only the transmitters that are seen for the currrent channel are made visible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that - rather than showing all transmitters on a map - only the transmitters that are seen for the currrent channel are made visible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
           <string>current channel transmitters</string>
@@ -262,6 +262,13 @@
         </widget>
        </item>
        <item>
+        <widget class="QCheckBox" name="autoUpload_Selector">
+         <property name="text">
+          <string>auto upload</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QCheckBox" name="eti_activeSelector">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;eti files can be generated by Qt-DAB-5.x. Since generating an eti file from an ensemble seems incompatible with scanning, the scan button is replaced by an &amp;quot;eti&amp;quot; button when eti is activated.&lt;/p&gt;&lt;p&gt;Note that building up an eti file requires quite some resources.&lt;/p&gt;&lt;p&gt;If eti is activated, the scanButton is replaced by the etiButton. Touching that button shows a fileselection menu, after selecting a file the content of the ensemble is sent in eti format to the file. The eti session stops when (a) the eti button is touched again, (b) switching to another channel or (c) disabling eti by unchecking the checkbox.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -590,6 +597,13 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
+      <widget class="QCheckBox" name="clearScan_Selector">
+       <property name="text">
+        <string>clear scan</string>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="QCheckBox" name="saveSlides">
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If set, slides (pictures) appearing during transmissions are being saved&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -633,15 +647,15 @@
    <header>smallpushbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>smallSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">smallspinbox.h</header>
-  </customwidget>
-  <customwidget>
    <class>smallComboBox</class>
    <extends>QComboBox</extends>
    <header>smallcombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>smallSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header location="global">smallspinbox.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/forms-v5/dabradio-5.ui -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/forms-v5/dabradio-5.ui Changed

@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Qt-DAB-5.3</string>
+   <string>Qt-DAB-5.4</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_5">
    <item>
@@ -137,12 +137,12 @@
       </widget>
      </item>
      <item>
-      <widget class="newPushButton" name="historyButton">
+      <widget class="newPushButton" name="scanListButton">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The (name:channel) of each service found is stored in the history list. Selecting a service from this list is possible (but only makes sense if the (name:channel) is in reach of the decoder).&lt;/p&gt;&lt;p&gt;Clearing the list is by touching the right hand mouse click&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Result of a (single) scan is stored in the list. Left mouse click on an element will select the service, named by the element. Right mouse click causes the service name to be added to the preset list.&lt;/p&gt;&lt;p&gt;If clearScan is selected (the default), the list is cleared when scanning.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
-        <string>history</string>
+        <string>scanlist</string>
        </property>
       </widget>
      </item>

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/forms-v5/technical_data.ui -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/forms-v5/technical_data.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>267</width>
-    <height>743</height>
+    <width>303</width>
+    <height>772</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -164,15 +164,18 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="l6">
        <property name="text">
         <string>Bitrate in kBit/s</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="6" column="1">
       <widget class="QLCDNumber" name="bitrateDisplay">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The birtae of the encoding of the AAC datastream is shown here&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
@@ -181,29 +184,35 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <widget class="QLabel" name="label_10">
        <property name="text">
         <string>audiorate</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="7" column="1">
       <widget class="QLCDNumber" name="audioRate">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The audible audio runs at 48000 Ss. Some services deliver lower samplerates, these samplerates - shown here - are transformed into 48000 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="segmentStyle">
         <enum>QLCDNumber::Flat</enum>
        </property>
       </widget>
      </item>
-     <item row="7" column="0">
+     <item row="8" column="0">
       <widget class="QLabel" name="missedLabel">
        <property name="text">
         <string>audio % OK</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="8" 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>
+       </property>
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
@@ -212,6 +221,26 @@
        </property>
       </widget>
      </item>
+     <item row="5" column="1">
+      <widget class="QLCDNumber" name="ecCorrections">
+       <property name="toolTip">
+        <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::NoFrame</enum>
+       </property>
+       <property name="segmentStyle">
+        <enum>QLCDNumber::Flat</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_11">
+       <property name="text">
+        <string>ec errors </string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/history-handler.o Added

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/qt-dab-5.pro -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/qt-dab-5.pro Changed

@@ -9,15 +9,19 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++14
+win32 {
 QMAKE_CFLAGS	+=  -O4 -ffast-math
 QMAKE_CXXFLAGS	+=  -O4 -ffast-math
-#QMAKE_CXXFLAGS	+=  -ffast-math -flto
-#QMAKE_CFLAGS	+=  -ffast-math -flto
-#QMAKE_LFLAGS	+=  -ffast-math -flto
+}
+unix {
+QMAKE_CXXFLAGS	+=  -ffast-math -flto
+QMAKE_CFLAGS	+=  -ffast-math -flto
+QMAKE_LFLAGS	+=  -ffast-math -flto
+}
 
-#QMAKE_CFLAGS	+=  -g
-#QMAKE_CXXFLAGS	+=  -g
-#QMAKE_LFLAGS	+=  -g
+#QMAKE_CFLAGS	+=  -pg
+#QMAKE_CXXFLAGS	+=  -pg
+#QMAKE_LFLAGS	+=  -pg
 #QMAKE_CFLAGS	+=  -g -fsanitize=address
 #QMAKE_CXXFLAGS	+=  -g -fsanitize=address
 #QMAKE_LFLAGS	+=  -g -fsanitize=address
@@ -25,13 +29,20 @@
 RC_ICONS	=  qt-dab-5.ico
 RESOURCES	+= resources.qrc
 
+#
+#	choose one of the FFT handler. If none is selected
+#	a default function is used.
+CONFIG		+= fftw_fft
+#CONFIG		+= kiss_fft
 TRANSLATIONS = ../i18n/de_DE.ts
 
 #
 #       For more parallel processing, uncomment the following
 #       defines
-#DEFINES        += __MSC_THREAD__
-#DEFINES        +=  __THREADED_BACKEND
+DEFINES        += __MSC_THREAD__
+DEFINES        +=  __THREADED_BACKEND
+
+#DEFINES	+= _UPLOAD_SCAN_RESULT_
 
 #For showing trace output
 #DEFINES	+= __EPG_TRACE__  
@@ -39,6 +50,7 @@
 DEPENDPATH += . \
 	      ./pauzeslide \
 	      ./support \
+	      ../fft \
 	      ../eti-handler \
 	      ../src \
 	      ../includes \
@@ -51,6 +63,7 @@
 	      ../src/backend/data/journaline \
 	      ../src/output \
 	      ../src/support \
+	      ../src/support/buttons \
 	      ../src/support/viterbi-jan \
 	      ../src/support/viterbi-spiral \
 	      ../includes/ofdm \
@@ -64,6 +77,7 @@
 	      ../includes/backend/data/epg-2 \
 	      ../includes/output \
 	      ../includes/support \
+	      ../includes/support/buttons \
 	      ../includes/scopes-qwt6 \
 	      ../viewers \
               ../viewers/spectrum-viewer \
@@ -80,6 +94,7 @@
 	       ./pauzeslide/ \
 	       ./support \
 	      ../ \
+	      ../fft \
 	      ../eti-handler \
 	      ../src \
 	      ../includes \
@@ -94,6 +109,7 @@
 	      ../includes/backend/data/epg-2 \
 	      ../includes/output \
 	      ../includes/support \
+	      ../includes/support/buttons \
 	      ../includes/support/viterbi-jan \
 	      ../includes/support/viterbi-spiral \
 	      ../includes/scopes-qwt6 \
@@ -112,6 +128,8 @@
 	   ./pauzeslide/pauzeslide.h \
 	   ./support/techdata.h \
 	   ../dab-processor.h \
+	   ../fft/fft-handler.h \
+	   ../fft/fft-complex.h \
 	   ../eti-handler/eti-generator.h \
 	   ../includes/dab-constants.h \
 	   ../includes/mot-content-types.h \
@@ -168,21 +186,14 @@
 	   ../includes/support/process-params.h \
 	   ../includes/support/viterbi-jan/viterbi-handler.h \
 	   ../includes/support/viterbi-spiral/viterbi-spiral.h \
-           ../includes/support/fft-handler.h \
+#           ../includes/support/fft-handler.h \
 	   ../includes/support/ringbuffer.h \
 	   ../includes/support/dab-params.h \
 	   ../includes/support/band-handler.h \
 	   ../includes/support/dab-tables.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/presetcombobox.h \
-	   ../includes/support/smallcombobox.h \
-	   ../includes/support/normalpushbutton.h \
-	   ../includes/support/newpushbutton.h \
-	   ../includes/support/smallpushbutton.h \
-	   ../includes/support/verysmallpushbutton.h \
-	   ../includes/support/smallqlistview.h \
-	   ../includes/support/smallspinbox.h \
-	   ../includes/support/history-handler.h \
+	   ../includes/support/scanlist-handler.h \
 	   ../includes/support/color-selector.h \
 	   ../includes/support/scheduler.h \
 	   ../includes/support/schedule-selector.h \
@@ -194,7 +205,15 @@
 	   ../includes/support/ITU_Region_1.h \
 	   ../includes/support/coordinates.h \
 	   ../includes/support/mapport.h \
+	   ../includes/support/upload.h \
 	   ../includes/support/bandpass-filter.h \
+	   ../includes/support/buttons/smallcombobox.h \
+	   ../includes/support/buttons/newpushbutton.h \
+	   ../includes/support/buttons/normalpushbutton.h \
+	   ../includes/support/buttons/smallpushbutton.h \
+	   ../includes/support/buttons/verysmallpushbutton.h \
+	   ../includes/support/buttons/smallqlistview.h \
+	   ../includes/support/buttons/smallspinbox.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../includes/scopes-qwt6/audio-display.h \
@@ -206,6 +225,7 @@
 	   ../viewers/tii-viewer/tii-viewer.h \
 	   ../viewers/snr-viewer/snr-viewer.h \
 	   ../qt-devices/device-handler.h \
+	   ../qt-devices/device-exceptions.h \
 	   ../qt-devices/xml-filewriter.h \
 	   ../qt-devices/rawfiles-new/rawfiles.h \
 	   ../qt-devices/rawfiles-new/raw-reader.h \
@@ -231,6 +251,8 @@
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
 	   ./support/techdata.cpp \
+	   ../fft/fft-handler.cpp \
+	   ../fft/fft-complex.cpp \
 	   ../dab-processor.cpp \
 	   ../eti-handler/eti-generator.cpp \
 	   ../src/ofdm/timesyncer.cpp \
@@ -280,20 +302,13 @@
 	   ../src/output/audiosink.cpp \
 	   ../src/support/viterbi-jan/viterbi-handler.cpp \
 	   ../src/support/viterbi-spiral/viterbi-spiral.cpp \
-           ../src/support/fft-handler.cpp \
+#           ../src/support/fft-handler.cpp \
 	   ../src/support/dab-params.cpp \
 	   ../src/support/band-handler.cpp \
 	   ../src/support/dab-tables.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
-	   ../src/support/smallcombobox.cpp \
-	   ../src/support/normalpushbutton.cpp \
-	   ../src/support/newpushbutton.cpp \
-	   ../src/support/smallpushbutton.cpp \
-	   ../src/support/verysmallpushbutton.cpp \
-	   ../src/support/smallqlistview.cpp \
-	   ../src/support/smallspinbox.cpp \
-	   ../src/support/history-handler.cpp \
+	   ../src/support/scanlist-handler.cpp \
 	   ../src/support/color-selector.cpp \
 	   ../src/support/scheduler.cpp \
 	   ../src/support/schedule-selector.cpp \
@@ -304,7 +319,15 @@
 	   ../src/support/ITU_Region_1.cpp \
 	   ../src/support/coordinates.cpp \
 	   ../src/support/mapport.cpp \
+	   ../src/support/upload.cpp \
 	   ../src/support/bandpass-filter.cpp \
+	   ../src/support/buttons/smallcombobox.cpp \
+	   ../src/support/buttons/newpushbutton.cpp \
+	   ../src/support/buttons/normalpushbutton.cpp \
+	   ../src/support/buttons/smallpushbutton.cpp \
+	   ../src/support/buttons/verysmallpushbutton.cpp \
+	   ../src/support/buttons/smallqlistview.cpp \
+	   ../src/support/buttons/smallspinbox.cpp \
 	   ../src/scopes-qwt6/iqdisplay.cpp \
 	   ../src/scopes-qwt6/audio-display.cpp \
 	   ../viewers/spectrum-viewer/spectrum-viewer.cpp \
@@ -327,8 +350,8 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-5.3
-exists  {
+TARGET		= qt-dab-5.4
+exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
        message("Current git hash = $$GITHASHSTRING")
@@ -346,7 +369,6 @@
 }
 
 CONFIG		+= link_pkgconfig
-PKGCONFIG	+= fftw3f 
 PKGCONFIG	+= sndfile
 PKGCONFIG	+= samplerate
 PKGCONFIG	+= libusb-1.0
@@ -427,7 +449,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-5.3
+#	TARGET		= qt-dab64-5.4
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -447,7 +469,7 @@
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-5.3
+	TARGET		= qt-dab32-5.4
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
@@ -472,11 +494,11 @@
 #
 #	end of 32/64 specifics
 INCLUDEPATH	+= /usr/local/include
-LIBS		+= -lfftw3f -lfftw3
 LIBS		+= -lportaudio
 LIBS		+= -lsndfile
 LIBS		+= -lsamplerate
 LIBS		+= -lole32
+LIBS		+= -lfftw3f
 LIBS		+= -lwinpthread
 LIBS		+= -lwinmm
 LIBS 		+= -lstdc++
@@ -806,4 +828,18 @@
 }
 
 
-	
+kiss_fft {
+	DEFINES		+= __KISS_FFT__
+	HEADERS		+= ../fft/kiss_fft.h \
+	                   ../fft/kiss_fftr.h \
+	                   ../fft/_kiss_fft_guts.h 
+	SOURCES		+= ../fft/kiss_fft.c \
+	                   ../fft/kiss_fftr.c \
+}
+
+fftw_fft {
+	DEFINES		+= __FFTW3__
+	PKGCONFIG	+= fftw3
+	LIBS		+= -lfftw3f
+}
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/radio.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/radio.cpp Changed

@@ -50,6 +50,7 @@
 #include	"ITU_Region_1.h"
 #include	"coordinates.h"
 #include	"mapport.h"
+#include	"upload.h"
 #include	"techdata.h"
 #ifdef	TCP_STREAMER
 #include	"tcp-streamer.h"
@@ -99,9 +100,10 @@
 #include	"spectrum-viewer.h"
 #include	"correlation-viewer.h"
 #include	"tii-viewer.h"
-#include	"history-handler.h"
+#include	"scanlist-handler.h"
 #include	"time-table.h"
 
+#include	"device-exceptions.h"
 #include	"pauzeslide.h"
 #ifdef	__MINGW32__
 #include <windows.h>
@@ -171,7 +173,7 @@
 #define	SPECTRUM_BUTTON		QString ("spectrumButton")
 #define	SNR_BUTTON		QString ("snrButton")
 #define	DEVICEWIDGET_BUTTON	QString ("devicewidgetButton")
-#define	HISTORY_BUTTON		QString ("historyButton")
+#define	SCANLIST_BUTTON		QString ("scanListButton")
 #define	DUMP_BUTTON		QString ("dumpButton")
 #define	MUTE_BUTTON		QString ("muteButton")
 #define PREVCHANNEL_BUTTON	QString ("prevChannelButton")
@@ -299,7 +301,21 @@
 
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
+	int x	= dabSettings -> value ("mainWidget-x", 100). toInt ();
+	int y	= dabSettings -> value ("mainWidget-y", 100). toInt ();
+	int wi	= dabSettings -> value ("main-widget-w", 300). toInt ();
+	int he	= dabSettings -> value ("main-widget-h", 200). toInt ();
+	this	-> resize (QSize (wi, he));
+	this	-> move (QPoint (x, y));
+
 	configWidget. setupUi (&configDisplay);
+	x	= dabSettings -> value ("configWidget-x", 200). toInt ();
+	y	= dabSettings -> value ("configWidget-y", 200). toInt ();
+	wi	= dabSettings -> value ("configWidget-w", 200). toInt ();
+	he	= dabSettings -> value ("configWidget-h", 150). toInt ();
+	configDisplay. resize (QSize (wi, he));
+	configDisplay. move (QPoint (x, y));
+
 	theTechWindow	= new techData (this, dabSettings, &theTechData);
 //
 //	Now we can set the checkbox as saved in the settings
@@ -312,12 +328,15 @@
 	if (dabSettings -> value ("epgFlag", 0). toInt () == 1)
 	   configWidget. epgSelector -> setChecked (true);
 
+	if (dabSettings -> value ("clearScanResult", 1). toInt () == 1)
+	   configWidget. clearScan_Selector -> setChecked (true);
+
 	if (dabSettings -> value ("saveSlides", 0). toInt () == 1)
 	   configWidget. saveSlides -> setChecked (true);
 
 	configWidget. EPGLabel	-> hide ();
 	configWidget. EPGLabel	-> setStyleSheet ("QLabel {background-color : yellow}");
-	int x = dabSettings -> value ("muteTime", 2). toInt ();
+	x = dabSettings -> value ("muteTime", 2). toInt ();
 	configWidget. muteTimeSetting -> setValue (x);
 
 	x = dabSettings -> value ("switchDelay", 8). toInt ();
@@ -347,6 +366,7 @@
 	      channel. nextService. valid	= true;
 	   }
 	}
+
 	channel. targetPos	= std::complex<float> (0, 0);
 	float local_lat		=
 	             dabSettings -> value ("latitude", 0). toFloat ();
@@ -368,6 +388,14 @@
 	connect (configWidget. saveSlides, SIGNAL (stateChanged (int)),
 	         this, SLOT (handle_saveSlides (int)));
 
+#ifndef	_UPLOAD_SCAN_RESULT_
+	configWidget. autoUpload_Selector -> hide ();
+#endif
+
+	connect (configWidget. clearScan_Selector,
+	                             SIGNAL (stateChanged (int)),
+	         this, SLOT (handle_clearScan_Selecctor (int)));
+
 	logFile		= nullptr;
 	int scanMode	=
 	           dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
@@ -401,7 +429,7 @@
 	         this, SLOT (handle_transmitterTags  (int)));
 
 	transmitterTags_local	= configWidget. transmitterTags -> isChecked ();
-	theTechWindow 		-> hide ();
+	theTechWindow 		-> hide ();	// until shown otherwise
 	stillMuting		-> hide ();
 	serviceList. clear ();
 	model . clear ();
@@ -423,10 +451,10 @@
 	configWidget. streamoutSelector	-> hide();
 #ifdef	TCP_STREAMER
 	soundOut		= new tcpStreamer	(20040);
-	theTechWindow		-> hideMisssed		();
+	theTechWindow		-> hide		();
 #elif	QT_AUDIO
 	soundOut		= new Qt_Audio();
-	theTechWindow		-> hideMisssed		();
+	theTechWindow		-> hide		();
 #else
 //	just sound out
 	soundOut		= new audioSink		(latency);
@@ -477,16 +505,16 @@
 	connect (&epgTimer, SIGNAL (timeout ()),
 	         this, SLOT (epgTimer_timeOut ()));
 
-	QString historyFile     = QDir::homePath () + "/.qt-history.xml";
-	historyFile             =
-	             dabSettings -> value ("history", historyFile). toString ();
-	historyFile             = QDir::toNativeSeparators (historyFile);
-	my_history              = new historyHandler (this, historyFile);
+	QString scanListFile     = QDir::homePath () + "/.qt-scanList.xml";
+	scanListFile             =
+	             dabSettings -> value ("scanList", scanListFile). toString ();
+	scanListFile		= QDir::toNativeSeparators (scanListFile);
+	my_scanList		= new scanListHandler (this, scanListFile);
 	my_timeTable		= new timeTableHandler (this);
 	my_timeTable	-> hide ();
 
-	connect (my_history, SIGNAL (handle_historySelect (const QString &)),
-	         this, SLOT (handle_historySelect (const QString &)));
+	connect (my_scanList, SIGNAL (handle_scanListSelect (const QString &)),
+	         this, SLOT (handle_scanListSelect (const QString &)));
 	connect (this, SIGNAL (set_newChannel (int)),
 	         channelSelector, SLOT (setCurrentIndex (int)));
 	connect (this, SIGNAL (set_newPresetIndex (int)),
@@ -542,8 +570,8 @@
 	         this, SLOT (color_snrButton ()));
 	connect (configWidget. devicewidgetButton, SIGNAL (rightClicked ()),
 	         this, SLOT (color_devicewidgetButton ()));
-	connect (historyButton, SIGNAL (rightClicked ()),
-	         this, SLOT (color_historyButton ()));
+	connect (scanListButton, SIGNAL (rightClicked ()),
+	         this, SLOT (color_scanListButton ()));
 	connect (configWidget. dumpButton, SIGNAL (rightClicked ()),
 	         this, SLOT (color_sourcedumpButton ()));
 	connect (configWidget. dlTextButton, SIGNAL (rightClicked ()),
@@ -591,8 +619,8 @@
 
 	connect (configWidget. eti_activeSelector, SIGNAL (stateChanged (int)),
 	         this, SLOT (handle_eti_activeSelector (int)));
-
 	channel. etiActive	= false;
+
 	show_pauzeSlide ();
 
 //	and start the timer(s)
@@ -656,9 +684,6 @@
 #ifdef	HAVE_HACKRF
 	configWidget. deviceSelector	-> addItem ("hackrf");
 #endif
-#ifdef	HAVE_SOAPY
-	configWidget. deviceSelector	-> addItem ("soapy");
-#endif
 #ifdef	HAVE_LIME
 	configWidget. deviceSelector	-> addItem ("limeSDR");
 #endif
@@ -668,12 +693,15 @@
 #elif	HAVE_PLUTO_2
 	configWidget. deviceSelector	-> addItem ("pluto");
 #endif
-#ifdef  HAVE_EXTIO
-	configWidget. deviceSelector	-> addItem ("extio");
-#endif
 #ifdef	HAVE_RTL_TCP
 	configWidget. deviceSelector	-> addItem ("rtl_tcp");
 #endif
+#ifdef	HAVE_SOAPY
+	configWidget. deviceSelector	-> addItem ("soapy");
+#endif
+#ifdef  HAVE_EXTIO
+	configWidget. deviceSelector	-> addItem ("extio");
+#endif
 #ifdef	HAVE_ELAD
 	configWidget. deviceSelector	-> addItem ("elad-s1");
 #endif
@@ -719,6 +747,8 @@
 	   my_correlationViewer. show ();
 	if (dabSettings -> value ("snrVisible", 0). toInt () == 1)
 	   my_snrViewer. show ();
+	if (dabSettings -> value ("techDataVisible", 0). toInt () == 1)
+	   theTechWindow -> show ();
 
 //	if a device was selected, we just start, otherwise
 //	we wait until one is selected
@@ -753,7 +783,7 @@
 	QString versionText = "Qt-DAB-version: " + QString(CURRENT_VERSION) + "\n";
 	versionText += "Built on " + QString(__TIMESTAMP__) + QString (", Commit ") + QString (GITHASH) + "\n";
 	versionText += "Copyright Jan van Katwijk, mailto:J.vanKatwijk@gmail.com\n";
-	versionText += "Rights of Qt, fftw, portaudio, libfaad, libsamplerate and libsndfile gratefully acknowledged\n";
+	versionText += "Rights of Qt, portaudio, libfaad, libsamplerate and libsndfile gratefully acknowledged\n";
 	versionText += "Rights of developers of RTLSDR library, SDRplay libraries, AIRspy library and others gratefully acknowledged\n";
 	versionText += "Copyright of DevSec Studio for the skin, made available under an MIT license, is gratefully acknowledged";
 	versionText += "Rights of other contributors gratefully acknowledged";
@@ -786,14 +816,14 @@
 	my_dabProcessor	= new dabProcessor  (this, inputDevice, &globals);
 	channel. cleanChannel ();
 
-//	Some hidden buttons can be makde visible now
+//	Some hidden buttons can be made visible now
 	connectGUI ();
 
 	if (dabSettings -> value ("showDeviceWidget", 0).  toInt () != 0)
 	   inputDevice -> show ();
 
-//	we avoided up till now connecting the channel selector
-//	to the slot since that function does a lot more that we
+//	we avoided till now connecting the channel selector
+//	to the slot since that function does a lot more, things we
 //	do not want here
 	connect (presetSelector, SIGNAL (activated (const QString &)),
 	         this, SLOT (handle_presetSelector (const QString &)));
@@ -876,7 +906,8 @@
 	    dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
 
 	serviceList = insert (serviceList, ed, serviceOrder);
-	my_history -> addElement (channel. channelName, serviceName);
+	if (scanning. load ())
+	   my_scanList -> addElement (channel. channelName, serviceName);
 	model. clear ();
 	for (auto serv : serviceList) {
 	   model. appendRow (new QStandardItem (serv. name));
@@ -970,6 +1001,10 @@
 	for (int i = 0; i < s. size (); i ++) 
 	   my_contentTable	-> addLine (s. at (i));
 	my_contentTable -> show ();
+#ifdef  _UPLOAD_SCAN_RESULT_
+	if (configWidget. autoUpload_Selector -> isChecked ())
+	   my_contentTable -> upload ();
+#endif
 }
 
 QString	RadioInterface::checkDir (const QString s) {
@@ -1254,7 +1289,7 @@
 	if (s. valid) {
 	   QString ss = my_dabProcessor -> findService (s. SId, s. SCIds);
 	   if (ss != "") {
-	      startService (&s);
+	      startService (s);
 	      return;
 	   }
 //
@@ -1263,7 +1298,7 @@
 	   s. serviceName =
 	               my_dabProcessor -> findService (s. SId, s. SCIds);
 	   if (s. serviceName != "")
-	      startService (&s);
+	      startService (s);
 	}
 //
 //	we also have to restart all background services,
@@ -1348,6 +1383,18 @@
 	   stopScanning (false);
 	running. store	(false);
 	hideButtons	();
+
+	dabSettings	-> setValue ("mainWidget-x", this -> pos (). x ());
+	dabSettings	-> setValue ("mainWidget-y", this -> pos (). y ());
+	QSize size	= this -> size ();
+	dabSettings	-> setValue ("mainwidget-w", size. width ());
+	dabSettings	-> setValue ("mainwidget-h", size. height ());
+	dabSettings	-> setValue ("configWidget-x", configDisplay. pos (). x ());
+	dabSettings	-> setValue ("configWidget-y", configDisplay. pos (). y ());
+	size		= configDisplay. size ();
+	dabSettings	-> setValue ("configWidget-w", size. width ());
+	dabSettings	-> setValue ("configWidget-h", size. height ());
+	
 //
 #ifdef	DATA_STREAMER
 	fprintf (stderr, "going to close the dataStreamer\n");
@@ -1418,7 +1465,7 @@
 	if (inputDevice != nullptr)
 	   delete	inputDevice;
 	delete		soundOut;
-	delete	my_history;
+	delete	my_scanList;
 	delete	my_timeTable;
 //	close();
 	fprintf (stderr, ".. end the radio silences\n");
@@ -1494,36 +1541,20 @@
 #ifdef	__MINGW32__
 	   QMessageBox::warning (this, tr ("Warning"),
 	                            tr ("If SDRuno is installed with drivers 3.10,\nV2.13 drivers will not work anymore, choose \"sdrplay\" instead\n"));
+	   return nullptr;
 #endif
 	   try {
 	      inputDevice	= new sdrplayHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      std::string s;
-	      switch (e) {
-	         case 23:
-	            s = "could not fetch library";
-	            break;
-	         case 24:
-	            s = "one or more library functions could not be loaded";
-	            break;
-	         case 25:
-	         case 26:
-	            s = "Error in API version";
-	            break;
-	         case 27:
-	            s = "Could not detect a device\n";
-	            break;
-	         case 28:
-	            s = "Could not set the device";
-	            break;
-	         default:
-	            s = "Unidentified error";
-	      }
-	      s = "SDRplay: " + s + "\n";
+	   catch (const std::exception &e) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                               tr (s. c_str ()));
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                               tr ("sdrplay-v2 fails"));
 	      return nullptr;
 	   }
 	}
@@ -1535,46 +1566,14 @@
 	      inputDevice	= new sdrplayHandler_v3 (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int errorCode) {
-	      std::string errorString;
-	      switch (errorCode) {
-	         case 1:
-	            errorString = "Could not fetch library";
-	            break;
-	         case 2:
-	            errorString = "error in fetching functions from library";
-	            break;
-	         case 3:
-	            errorString = "sdrplay_api_Open failed";
-	            break;
-	         case 4:
-	            errorString = "could not open sdrplay_api_ApiVersion";
-	            break;
-	         case 5:
-	            errorString = "API versions do not match";
-	            break;
-	         case 6:
-	            errorString = "sdrplay_api_GetDevices failed";
-	            break;
-	         case 7:
-	            errorString = "no valid device found";
-	            break;
-	         case 8:
-	            errorString = "sdrplay_api_SelectDevice failed";
-	            break;
-	         case 9:
-	            errorString = "sdrplay_api_GetDeviceParams failed";
-	            break;
-	         case 10:
-	            errorString = "sdrplay_api+GetDeviceParams returns null";
-	            break;
-	         default:
-	            errorString = "unidentified error with sdrplay device";
-	            break;
-	      }
-	      
+	   catch (const std::exception &e) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (... ) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                               tr (errorString. c_str ()));
+	                               tr ("sdrplay v3 fails"));
 	      return nullptr;
 	   }
 	}
@@ -1586,10 +1585,14 @@
 	      inputDevice	= new rtlsdrHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (const std::exception &ex) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                           tr ("DAB stick not found! Please use one with RTL2832U or similar chipset!\n"));
-	      fprintf (stderr, "error = %d\n", e);
+	                               tr (ex. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                               tr ("rtlsdr device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1601,9 +1604,14 @@
 	      inputDevice	= new airspyHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (const std::exception &e) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                           tr ("Airspy or Airspy mini not found\n"));
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                           tr ("airspy device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1615,9 +1623,14 @@
 	      inputDevice	= new hackrfHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (const std::exception &e) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                           tr ("hackrf not found\n"));
+	                           tr ("hackrf device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1629,9 +1642,14 @@
 	      inputDevice = new limeHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (const std::exception &e) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("no lime device found\n"));
+	                           tr ("lime device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1643,25 +1661,15 @@
 	      inputDevice = new plutoHandler (dabSettings, version);
 	      showButtons();
 	   }
-	   catch (int e) {
-	      switch (e) {
-	         case 22:
-	            QMessageBox::warning (this, tr ("warning"),
-	                                  tr ("failed to open libiio.dll\n"));
-	            return nullptr;
-	         case 23:
-	            QMessageBox::warning (this, tr ("warning"),
-	                                 tr ("error in loading functions\n"));
-	            return nullptr;
-	         case 24:
-	            QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("no pluto device found\n"));
-	            return nullptr;
-	         default:
-	            QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("some else with pluto\n"));
-	            return nullptr;
-	      }
+	   catch (const std::exception &e) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                           tr ("pluto device fails"));
+	      return nullptr;
 	   }
 	}
 	else
@@ -1677,9 +1685,14 @@
 	      ((plutoHandler *)inputDevice)	-> startTransmitter (
 	                                               fmFrequency);
 	   }
-	   catch (int e) {
+	   catch (const std::exception &e) {
 	      QMessageBox::warning (this, tr ("Warning"),
-	                                  tr ("no pluto device found\n"));
+	                               tr (e. what ()));
+	      return nullptr;
+	   }
+	   catch (...) {
+	      QMessageBox::warning (this, tr ("Warning"),
+	                           tr ("pluto device fails"));
 	      return nullptr;
 	   }
 	}
@@ -1692,7 +1705,7 @@
 	      inputDevice = new rtl_tcp_client (dabSettings);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                           tr ("rtl_tcp: no luck\n") );
 	      return nullptr;
@@ -1706,7 +1719,7 @@
 	      inputDevice = new eladHandler (dabSettings);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                                  tr ("no elad device found\n"));
 	      return nullptr;
@@ -1720,7 +1733,7 @@
 	      inputDevice	= new soapyHandler (dabSettings);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                                  tr ("no soapy device found\n"));
 	      return nullptr;
@@ -1736,7 +1749,7 @@
 	      inputDevice = new extioHandler (dabSettings);
 	      showButtons();
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                            tr ("extio: no luck\n") );
 	      return nullptr;
@@ -1757,7 +1770,7 @@
 	      channel. realChannel	= false;
 	      hideButtons();
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                               tr ("file not found"));
 	      return nullptr;
@@ -1784,7 +1797,7 @@
 	      hideButtons();
 	      channel. realChannel	= false;
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                               tr ("file not found"));
 	      return nullptr;
@@ -1805,7 +1818,7 @@
 	      channel. realChannel	= false;
 	      hideButtons ();	
 	   }
-	   catch (int e) {
+	   catch (...) {
 	      QMessageBox::warning (this, tr ("Warning"),
 	                               tr ("file not found"));
 	      return nullptr;
@@ -1815,10 +1828,12 @@
 	   fprintf (stderr, "unknown device, failing\n");
 	   return nullptr;
 	}
+	
 //
 //	It took some code, but it seems we have a device
 	my_spectrumViewer. setBitDepth (inputDevice -> bitDepth());
-//
+
+	dabSettings	-> setValue ("device", s);
 //	do we want to see the widget for device control?
 	if (dabSettings -> value ("deviceVisible", 0). toInt ()) {
 	   inputDevice  -> show ();
@@ -2027,9 +2042,9 @@
 //
 //	called from the PAD handler
 
-void	RadioInterface::showLabel	(QString s) {
+void	RadioInterface::showLabel	(const QString &s) {
 #ifdef	HAVE_PLUTO_RXTX
-	if (streamerOut != nullptr)
+	if ((streamerOut != nullptr) && (s != ""))
 	   streamerOut -> addRds (std::string (s. toUtf8 (). data ()));
 #endif
 	if (running. load()) {
@@ -2037,7 +2052,7 @@
 	   dynamicLabel	-> setText (s);
 	}
 //	if we dtText is ON, some work is still to be done
-	if ((dlTextFile == nullptr) || (the_dlCache. addifNew (s)))
+	if ((s == "") || (dlTextFile == nullptr) || (the_dlCache. addifNew (s)))
 	   return;
 
 	QString currentChannel = channel. channelName;
@@ -2071,6 +2086,8 @@
 std::complex<float> B amount;
 QVector<float> V (amount);
 	nullBuffer. getDataFromBuffer (B, amount);
+	if (my_spectrumViewer. isHidden ())
+	   return;
 	for (int i = 0; i < amount; i ++)
 	   V i = abs (B i);
 	my_spectrumViewer. show_nullPeriod (V. data (), amount);
@@ -2253,23 +2270,24 @@
 	if (!running. load())
 	   return;
 
-	my_spectrumViewer. showQuality (q, sco, freqOffset);
+	if (!my_spectrumViewer. isHidden ())
+	   my_spectrumViewer. showQuality (q, sco, freqOffset);
 }
 //
 //	called from the MP4 decoder
-void	RadioInterface::show_rsCorrections	(int c) {
+void	RadioInterface::show_rsCorrections	(int c, int ec) {
 	if (!running)
 	   return;
 	if (!theTechWindow -> isHidden ())
-	   theTechWindow -> show_rsCorrections (c);
+	   theTechWindow -> show_rsCorrections (c, ec);
 }
 //
 //	called from the DAB processor
 void	RadioInterface::show_clockError	(int e) {
 	if (!running. load ())
 	   return;
-
-	my_spectrumViewer. show_clockErr (e);
+	if (!my_spectrumViewer. isHidden ())
+	   my_spectrumViewer. show_clockErr (e);
 }
 //
 //	called from the phasesynchronizer
@@ -2310,6 +2328,8 @@
 	   theTechWindow -> show ();
 	else
 	   theTechWindow -> hide ();
+	dabSettings -> setValue ("techDataVisible",
+	                     theTechWindow -> isHidden () ? 0 : 1);
 }
 //
 //	Whenever the input device is a file, some functions,
@@ -2563,14 +2583,14 @@
 	                          my_snrViewer. isHidden () ? 0 : 1);
 }
 
-void    RadioInterface::handle_historyButton    () {
+void    RadioInterface::handle_scanListButton    () {
 	if (!running. load ())
 	   return;
 
-	if (my_history  -> isHidden ())
-	   my_history   -> show ();
+	if (my_scanList  -> isHidden ())
+	   my_scanList   -> show ();
 	else
-	   my_history   -> hide ();
+	   my_scanList   -> hide ();
 }
 //
 //	When changing (or setting) a device, we do not want anybody
@@ -2596,8 +2616,8 @@
 	         this, SLOT (handle_snrButton ()));
 	connect (configWidget. devicewidgetButton, SIGNAL (clicked ()),
 	         this, SLOT (handle_devicewidgetButton ()));
-	connect (historyButton, SIGNAL (clicked ()),
-	         this, SLOT (handle_historyButton ()));
+	connect (scanListButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_scanListButton ()));
 	connect (configWidget. dumpButton, SIGNAL (clicked ()),
 	         this, SLOT (handle_sourcedumpButton ()));
 
@@ -2663,8 +2683,8 @@
 	         this, SLOT (handle_snrButton ()));
 	disconnect (configWidget. devicewidgetButton, SIGNAL (clicked ()),
 	         this, SLOT (handle_devicewidgetButton ()));
-	disconnect (historyButton, SIGNAL (clicked ()),
-	         this, SLOT (handle_historyButton ()));
+	disconnect (scanListButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_scanListButton ()));
 	disconnect (configWidget. dumpButton, SIGNAL (clicked ()),
 	         this, SLOT (handle_sourcedumpButton ()));
 	disconnect (nextChannelButton, SIGNAL (clicked ()),
@@ -2762,11 +2782,20 @@
 	   }
 	}
 	else
-	if ((obj == this -> my_history -> viewport ()) &&
+	if ((obj == this -> my_scanList -> viewport ()) &&
 	    (event -> type () == QEvent::MouseButtonPress)) {
 	   QMouseEvent *ev = static_cast<QMouseEvent *>(event);
 	   if (ev -> buttons () & Qt::RightButton) {
-	      my_history -> clearHistory ();
+	      QString service =
+	           this -> my_scanList -> indexAt (ev -> pos()). data ().toString();
+	           fprintf (stderr, "Gevonden: %s\n",
+	                                service. toUtf8 (). data ());
+	      bool alreadyIn = false;
+	      for (int i = 0; i < presetSelector -> count (); i ++)
+	         if (presetSelector -> itemText (i) == service)
+	            alreadyIn = true;
+	      if (!alreadyIn)
+	         presetSelector -> addItem (service);
 	   }
 	}
 	else
@@ -2872,7 +2901,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 //
-//	selection, either direct, from presets,  from history or schedule
+//	selection, either direct, from presets,  from scanlist or schedule
 ////////////////////////////////////////////////////////////////////////
 
 //
@@ -2889,9 +2918,9 @@
 	localSelect (s);
 }
 //
-//	selecting from the history list, which is essential
+//	selecting from the scan list, which is essential
 //	the same as handling form the preset list
-void    RadioInterface::handle_historySelect (const QString &s) {
+void    RadioInterface::handle_scanListSelect (const QString &s) {
 	localSelect (s);
 }
 //
@@ -2941,7 +2970,7 @@
 	      return;
 	   }
 	   s. serviceName = service;
-	   startService (&s);
+	   startService (s);
 	   return;
 	}
 //
@@ -3046,17 +3075,16 @@
 }
 //
 //
-void	RadioInterface::startService (dabService *s) {
-QString serviceName	= s -> serviceName;
+void	RadioInterface::startService (dabService &s) {
+QString serviceName	= s. serviceName;
 
-	channel. currentService		= *s;
+	channel. currentService		= s;
 	channel. currentService. frameDumper	= nullptr;
 	channel. currentService. valid	= false;
 	LOG ("start service ", serviceName. toUtf8 (). data ());
 	LOG ("service has SNR ", QString::number (channel. snr));
 //
 //	mark the selected service in the service list
-	int rowCount	= model. rowCount ();
 	colorServiceName (serviceName, Qt::red, 16, true);
 //
 //	and display the servicename on the serviceLabel
@@ -3065,6 +3093,7 @@
 	font. setBold (true);
 	serviceLabel	-> setFont (font);
 	serviceLabel	-> setText (serviceName);
+	dynamicLabel	-> setText ("");
 	audiodata ad;
 	     
 	my_dabProcessor -> dataforAudioService (serviceName, &ad);
@@ -3255,7 +3284,7 @@
 	            break;
 	         }
 	         s. serviceName = serviceList. at (i). name;
-	         startService (&s);
+	         startService (s);
 	         break;
 	      }
 	   }
@@ -3303,7 +3332,7 @@
 	}
 
 	channel. nextService. valid = false;
-	startService (&s);
+	startService (s);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -3317,6 +3346,7 @@
 	         theBand. Frequency (theChannel);
 	LOG ("channel starts ", theChannel);
 	configWidget. frequencyDisplay	-> display (tunedFrequency / 1000000.0);
+	my_spectrumViewer. showFrequency (tunedFrequency / 1000000.0);
 	dabSettings		-> setValue ("channel", theChannel);
 	inputDevice		-> resetBuffer ();
 	serviceList. clear ();
@@ -3324,6 +3354,7 @@
 	ensembleDisplay		-> setModel (&model);
 	inputDevice		-> restartReader (tunedFrequency);
 	channel. cleanChannel ();
+	distanceLabel		-> setText ("");
 	channel. channelName	= theChannel;
 	dabSettings		-> setValue ("channel", theChannel);
 	channel. frequency	= tunedFrequency / 1000;
@@ -3360,6 +3391,7 @@
 	}
 	channel. backgroundServices. clear ();
 
+	distanceLabel	-> setText ("");
 	stopSourcedumping	();
 	soundOut	-> stop ();
 //
@@ -3498,20 +3530,24 @@
 	}
 
 	LOG ("scanning starts with ", QString::number (cc));
+	if (scanMode == SINGLE_SCAN)
+	   if (dabSettings -> value ("clearScanResult", 0). toInt () == 1)
+	      my_scanList -> clear_scanList ();
+	   
 	scanning. store (true);
 	if ((scanMode == SINGLE_SCAN) || (scanMode == SCAN_CONTINUOUSLY)) {
 	   if (my_scanTable == nullptr) 
 	      my_scanTable = new contentTable (this, dabSettings,
 	                                                   "scan", 
 	                                       my_dabProcessor -> scanWidth ());
-	   else
+	   else					// should not happen
 	      my_scanTable -> clearTable ();
 	   QString topLine = QString ("ensemble") + ";"  +
 	                        "channelName" + ";" +
 	                        "frequency (KHz)" + ";" +
 	                        "Eid" + ";" +
-	                        "time" + ";" +
 	                        "tii" + ";" +
+	                        "time" + ";" +
 	                        "SNR" + ";" +
 	                        "nr services" + ";";
 	   my_scanTable -> addLine (topLine);
@@ -3537,7 +3573,6 @@
 	switchDelay		=
 	                  dabSettings -> value ("switchDelay", 8). toInt ();
 	channelTimer. start (switchDelay * 1000);
-
 	startChannel    (channelSelector -> currentText ());
 }
 //
@@ -3550,19 +3585,28 @@
 	disconnect (my_dabProcessor, SIGNAL (No_Signal_Found ()),
 	            this, SLOT (No_Signal_Found ()));
 	(void)dump;
+	if (my_scanTable == nullptr)
+	   return;		// should not happen
 	if (scanning. load ()) {
 	   scanButton      -> setText ("scan");
 	   LOG ("scanning stops ", "");
 	   my_dabProcessor	-> set_scanMode (false);
-	   dynamicLabel	-> setText ("Scan ended");
 	   channelTimer. stop ();
 	   scanning. store (false);
 	   if (scanDumpFile != nullptr) {
-	      if (my_scanTable != nullptr) 
-	         my_scanTable -> dump (scanDumpFile);
+	      my_scanTable -> dump (scanDumpFile);
 	      fclose (scanDumpFile);
 	      scanDumpFile = nullptr;
 	   }
+#ifdef	_UPLOAD_SCAN_RESULT_
+	   int scanMode	= configWidget. scanmodeSelector -> currentIndex ();
+	   if ((scanMode == SINGLE_SCAN) &&
+	       (configWidget. autoUpload_Selector -> isChecked ())
+	      my_scanTable -> upload ();
+#endif
+	   delete my_scanTable;
+	   my_scanTable	= nullptr;
+	   dynamicLabel	-> setText ("Scan ended");
 	}
 }
 
@@ -3583,41 +3627,50 @@
 	disconnect (&channelTimer, SIGNAL (timeout ()),
 	            this, SLOT (channel_timeOut ()));
 
-	if (running. load () && scanning. load ()) {
-	   int	cc	= channelSelector -> currentIndex ();
-	   if ((scanMode != SCAN_TO_DATA) && (serviceList. size () > 0))
-	      showServices ();
-	   stopChannel ();
-	   cc = theBand. nextChannel (cc);
-	   fprintf (stderr, "going to channel %d\n", cc);
-	   if ((cc >= channelSelector -> count ()) &&
+	if (!scanning. load ())
+	   return;
+//
+//	from here we know that we are dealing with scanning
+	if (!running. load ()) {
+//	   channeltimer should not have been disconnected
+	   connect (&channelTimer, SIGNAL (timeout ()),
+	            this, SLOT (channel_timeOut ()));
+	   stopScanning (false);
+	   return;
+	}
+
+	int	cc	= channelSelector -> currentIndex ();
+	if ((scanMode != SCAN_TO_DATA) && (serviceList. size () > 0))
+	   showServices ();
+	stopChannel ();
+	cc = theBand. nextChannel (cc);
+	fprintf (stderr, "going to channel %d\n", cc);
+	if ((cc >= channelSelector -> count ()) &&
 	                               (scanMode == SINGLE_SCAN)) {
-	      stopScanning (true);
-	   }
-	   else {  // we just continue
-	      if (cc >= channelSelector -> count ())
-	         cc = theBand. firstChannel ();
+	   connect (&channelTimer, SIGNAL (timeout ()),
+	            this, SLOT (channel_timeOut ()));
+	   stopScanning (true);
+	}
+	else {  // we just continue
+	   if (cc >= channelSelector -> count ())
+	       cc = theBand. firstChannel ();
 //	To avoid reaction of the system on setting a different value:
-	      new_channelIndex (cc);
+	   new_channelIndex (cc);
 
-	      connect (my_dabProcessor, SIGNAL (No_Signal_Found ()),
-	               this, SLOT (No_Signal_Found ()));
-	      connect (&channelTimer, SIGNAL (timeout ()),
-	               this, SLOT (channel_timeOut ()));
-
-	      dynamicLabel -> setText ("scan mode \"" +
-	                               scanmodeText (scanMode) +
-	                               "\" scanning channel " +
-	                               channelSelector -> currentText ());
-	      switchDelay	= 
-	                  dabSettings -> value ("switchDelay", 8). toInt ();
-	      channelTimer. start (switchDelay * 1000);
-	      startChannel (channelSelector -> currentText ());
-	   }
+	   connect (my_dabProcessor, SIGNAL (No_Signal_Found ()),
+	            this, SLOT (No_Signal_Found ()));
+	   connect (&channelTimer, SIGNAL (timeout ()),
+	            this, SLOT (channel_timeOut ()));
+
+	   dynamicLabel -> setText ("scan mode \"" +
+	                             scanmodeText (scanMode) +
+	                             "\" scanning channel " +
+	                             channelSelector -> currentText ());
+	   switchDelay	= 
+	               dabSettings -> value ("switchDelay", 8). toInt ();
+	   channelTimer. start (switchDelay * 1000);
+	   startChannel (channelSelector -> currentText ());
 	}
-	else
-	if (scanning. load ()) 
-	   stopScanning (false);
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -3667,7 +3720,7 @@
 	                      QString::number (serviceList. size ()) + ";" +
 	                      distanceLabel -> text ();
 
-	   my_scanTable -> addLine ("\n");
+//	   my_scanTable -> addLine ("\n");
 	   my_scanTable -> addLine (headLine);
 	   my_scanTable	-> show ();
 	}
@@ -3675,7 +3728,7 @@
 
 /////////////////////////////////////////////////////////////////////
 //
-bool	RadioInterface::isMember (std::vector<serviceId> a,
+bool	RadioInterface::isMember (const std::vector<serviceId> &a,
 	                                     serviceId b) {
 	for (auto serv : a)
 	   if (serv. name == b. name)
@@ -3684,7 +3737,7 @@
 }
 
 std::vector<serviceId>
-	RadioInterface::insert (std::vector<serviceId> l,
+	RadioInterface::insert (std::vector<serviceId> &l,
 	                        serviceId n, int order) {
 std::vector<serviceId> k;
 
@@ -3878,11 +3931,11 @@
 	   dabSettings -> value (DEVICEWIDGET_BUTTON + "_font",
 	                                              "black"). toString ();
 
-QString historyButton_color =
-	   dabSettings -> value (HISTORY_BUTTON + "_color",
+QString scanListButton_color =
+	   dabSettings -> value (SCANLIST_BUTTON + "_color",
 	                                              "white"). toString ();
-QString historyButton_font =
-	   dabSettings -> value (HISTORY_BUTTON + "_font",
+QString scanListButton_font =
+	   dabSettings -> value (SCANLIST_BUTTON + "_font",
 	                                              "black"). toString ();
 QString dumpButton_color =
 	   dabSettings -> value (DUMP_BUTTON + "_color",
@@ -4014,9 +4067,9 @@
 	              setStyleSheet (temp. arg (muteButton_color,
 	                                        muteButton_font));
 
-	historyButton	->
-	              setStyleSheet (temp. arg (historyButton_color,
-	                                        historyButton_font));
+	scanListButton	->
+	              setStyleSheet (temp. arg (scanListButton_color,
+	                                        scanListButton_font));
 
 	scanButton	->
 	              setStyleSheet (temp. arg (scanButton_color,
@@ -4089,8 +4142,8 @@
 	set_buttonColors (configWidget. devicewidgetButton, DEVICEWIDGET_BUTTON);
 }
 
-void	RadioInterface::color_historyButton	()	{
-	set_buttonColors (historyButton, HISTORY_BUTTON);
+void	RadioInterface::color_scanListButton	()	{
+	set_buttonColors (scanListButton, SCANLIST_BUTTON);
 }
 
 void	RadioInterface::color_sourcedumpButton	()	{
@@ -4392,7 +4445,7 @@
 //------------------------------------------------------------------------
 
 uint32_t RadioInterface::extract_epg (QString name,
-	                              std::vector<serviceId> serviceList,
+	                              std::vector<serviceId>  &serviceList,
 	                              uint32_t ensembleId) {
 	(void)ensembleId;
 	for (auto serv : serviceList) {
@@ -4637,7 +4690,7 @@
 QByteArray theSlide;
 	
 	theSlide. resize (sizeof (pauzeSlide));
-	for (int i = 0; i < sizeof (pauzeSlide); i ++)
+	for (int i = 0; i < (int)(sizeof (pauzeSlide)); i ++)
 	   theSlide i = pauzeSlide i;
 	p. loadFromData (theSlide, "png");
 	int w   = 400;
@@ -4741,3 +4794,9 @@
 	   scanButton -> hide ();
 }
 
+void	RadioInterface::handle_clearScan_Selector (int c) {
+	(void)c;
+	dabSettings -> setValue ("clearScanResult",
+	               configWidget. clearScan_Selector -> isChecked () ? 1 : 0);
+}
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/radio.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/radio.h Changed

@@ -70,7 +70,7 @@
 class	deviceHandler;
 class	audioBase;
 class	common_fft;
-class	historyHandler;
+class	scanListHandler;
 class	timeTableHandler;
 class	audioDisplay;
 #ifdef	HAVE_PLUTO_RXTX
@@ -183,7 +183,7 @@
 	RingBuffer<uint8_t>	frameBuffer;
 	RingBuffer<uint8_t>	dataBuffer;
 	RingBuffer<int16_t>	audioBuffer;
-        spectrumViewer		my_spectrumViewer;
+	spectrumViewer		my_spectrumViewer;
 	correlationViewer	my_correlationViewer;
 	tiiViewer		my_tiiViewer;
 	snrViewer		my_snrViewer;
@@ -235,7 +235,7 @@
 	QString			epgPath;
 	QTimer			epgTimer;
 	uint32_t		extract_epg (QString,
-                                             std::vector<serviceId> serviceList,
+	                                     std::vector<serviceId> &serviceList,
 	                                     uint32_t);
 	bool			saveSlides;
 	QString			picturesPath;
@@ -246,16 +246,16 @@
 	int32_t			port;
 #endif
 	SNDFILE                 *rawDumper;
-        SNDFILE                 *audioDumper;
+	SNDFILE                 *audioDumper;
 	FILE			*scanDumpFile;
 	void			set_Colors		();
 	void			set_channelButton	(int);
 	QStandardItemModel	model;
 	std::vector<serviceId>	serviceList;
-	bool			isMember (std::vector<serviceId>,
+	bool			isMember (const std::vector<serviceId> &, 
 	                                       serviceId);
 	std::vector<serviceId>
-	  	                insert   (std::vector<serviceId>,
+	  	                insert   (std::vector<serviceId> &,
 	                                  serviceId, int);
 
 	void			show_pauzeSlide	();
@@ -284,8 +284,8 @@
 	void			hideButtons		();
 	void			showButtons		();
 	deviceHandler		*setDevice		(const QString &);
-	historyHandler		*my_history;
-	historyHandler		*my_presets;
+	scanListHandler		*my_scanList;
+	scanListHandler		*my_presets;
 	timeTableHandler	*my_timeTable;
 
 	void			start_etiHandler	();
@@ -296,22 +296,22 @@
 	void			startPacketservice	(const QString &);
 	void			startScanning		();
 	void			stopScanning		(bool);
-        void			startAudiodumping      ();
-        void			stopAudiodumping       ();
-        void			scheduled_audioDumping	();
+	void			startAudiodumping	();
+	void			stopAudiodumping	();
+	void			scheduled_audioDumping	();
 	void			scheduled_dlTextDumping ();
 	void			scheduled_ficDumping ();
 	FILE			*ficDumpPointer;
 
-        void			startSourcedumping     ();
-        void			stopSourcedumping      ();
-        void			startFramedumping      ();
-        void			stopFramedumping       ();
+	void			startSourcedumping     ();
+	void			stopSourcedumping      ();
+	void			startFramedumping      ();
+	void			stopFramedumping       ();
 	void			scheduled_frameDumping	(const QString &);
 	void			startChannel		(const QString &);
 	void			stopChannel		();
 	void			stopService		(dabService &);
-	void			startService		(dabService *);
+	void			startService		(dabService &);
 	void			colorService		(QModelIndex ind,
 	                                                 QColor c, int pt,
 	                                                 bool italic = false);
@@ -326,9 +326,9 @@
 	                                                          QString);
 
 	void			save_MOTtext		(QByteArray &, int,
-                                                                 QString);
+	                                                         QString);
 	void			show_MOTlabel		(QByteArray &, int,
-                                                                  QString, int);
+	                                                          QString, int);
 	void			stop_muting		();
 
 
@@ -339,17 +339,17 @@
 	void			show_for_safety		();
 //
 //	short hands
-        void                    new_presetIndex         (int);
-        void                    new_channelIndex        (int);
+	void                    new_presetIndex         (int);
+	void                    new_channelIndex        (int);
 
 	std::mutex		locker;
 	bool			transmitterTags_local;
 	void			colorServiceName (const QString &s,
-                                                  QColor color, int fS, bool);
+	                                          QColor color, int fS, bool);
 
 signals:
 	void                    set_newChannel		(int);
-        void                    set_newPresetIndex      (int);
+	void                    set_newPresetIndex      (int);
 
 public slots:
 	void			set_CorrectorDisplay	(int);
@@ -361,7 +361,7 @@
 	void			show_ficSuccess		(bool);
 	void			show_snr		(int);
 	void			setSynced		(bool);
-	void			showLabel		(QString);
+	void			showLabel		(const QString &);
 	void			handle_motObject	(QByteArray, QString,
 	                                                      int, bool);
 	void			sendDatagram		(int);
@@ -380,7 +380,7 @@
 	void			showIQ			(int);
 	void			showQuality		(float, float, float);
 
-	void			show_rsCorrections	(int);
+	void			show_rsCorrections	(int, int);
 	void			show_tii		(int, int);
 	void			show_tii_spectrum	();
 	void			closeEvent		(QCloseEvent *event);
@@ -420,22 +420,23 @@
 	void			handle_correlationButton	();
 	void			handle_spectrumButton	();
 	void			handle_devicewidgetButton	();
+	void			handle_clearScan_Selector	(int);
 
 	void			doStart			(const QString &);
 	void			newDevice		(const QString &);
 
-	void			handle_historyButton	();
-        void			handle_sourcedumpButton	();
-        void			handle_framedumpButton	();
+	void			handle_scanListButton	();
+	void			handle_sourcedumpButton	();
+	void			handle_framedumpButton	();
 	void			handle_audiodumpButton 	();
 
 	void			handle_prevServiceButton	();
-        void			handle_nextServiceButton	();
+	void			handle_nextServiceButton	();
 	void			handle_channelSelector		(const QString &);
 	void			handle_nextChannelButton();
 	void			handle_prevChannelButton();
 
-	void			handle_historySelect	(const QString &);
+	void			handle_scanListSelect	(const QString &);
 	void			TerminateProcess	();
 	void			updateTimeDisplay	();
 	void			channel_timeOut		();
@@ -452,7 +453,7 @@
 	void			handle_httpButton	();
 	void			handle_onTop		(int);
 	void			handle_autoBrowser	(int);
-        void			handle_transmitterTags	(int);
+	void			handle_transmitterTags	(int);
 
 //
 //	color handlers
@@ -465,7 +466,7 @@
 	void			color_spectrumButton	();
 	void			color_snrButton		();
 	void			color_devicewidgetButton	();
-	void			color_historyButton	();
+	void			color_scanListButton	();
 	void			color_sourcedumpButton	();
 	void			color_muteButton	();
 	void			color_prevChannelButton	();

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/support/techdata.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/support/techdata.cpp Changed

@@ -40,7 +40,16 @@
 	dabSettings		= s;
 	this	-> audioData	= audioData;
 
-	setupUi (&myFrame);
+        setupUi (&myFrame);
+	dabSettings -> beginGroup ("techDataSettings");
+        int x   = dabSettings -> value ("position-x", 100). toInt ();
+        int y   = dabSettings -> value ("position-y", 100). toInt ();
+	int wi	= dabSettings -> value ("width", 100). toInt ();
+	int he	= dabSettings -> value ("height", 100). toInt ();
+        dabSettings -> endGroup ();
+        myFrame. move (QPoint (x, y));
+	myFrame. resize (QSize (wi, he));
+
 	formLayout -> setLabelAlignment (Qt::AlignLeft);
 	myFrame. hide ();
 	timeTable_button	-> hide ();
@@ -86,6 +95,12 @@
 }
 
 		techData::~techData	() {
+	dabSettings	-> beginGroup ("techDataSettings");
+        dabSettings	-> setValue ("position-x", myFrame. pos (). x ());
+        dabSettings	-> setValue ("position-y", myFrame. pos (). y ());
+	dabSettings	-> setValue ("width", myFrame. width ());
+	dabSettings	-> setValue ("height", myFrame. height ());
+	dabSettings	-> endGroup ();
 	myFrame. hide ();
 	delete the_audioDisplay;
 }
@@ -168,8 +183,9 @@
 	rsError_display	-> setValue (100 - 4 * e);
 }
 
-void	techData::show_rsCorrections	(int c) {
+void	techData::show_rsCorrections	(int c, int ec) {
 	rsCorrections -> display (c);
+	ecCorrections -> display (ec);
 }
 
 void	techData::show_motHandling	(bool b) {

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-dab-s5/support/techdata.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-dab-s5/support/techdata.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/airspy-handler/airspy-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/airspy-handler/airspy-handler.cpp Changed

@@ -21,12 +21,14 @@
 #define	GETPROCADDRESS	dlsym
 #endif
 
+#include	<QPoint>
 #include	<QFileDialog>
 #include	<QTime>
 #include	<QDate>
 #include	"airspy-handler.h"
 #include	"airspyselect.h"
 #include	"xml-filewriter.h"
+#include	"device-exceptions.h"
 
 static
 const	int	EXTIO_NS	=  8192;
@@ -44,40 +46,22 @@
 
 	this	-> airspySettings	= s;
 	this	-> recorderVersion	= recorderVersion;
+
+	airspySettings	-> beginGroup ("airspySettings");
+	int	x	= airspySettings -> value ("position-x", 100). toInt ();
+	int	y	= airspySettings -> value ("position-y", 100). toInt ();
+	airspySettings	-> endGroup ();
 	setupUi (&myFrame);
+	myFrame. move (QPoint (x, y));
 	myFrame. show		();
-
+//
+//	Since we have different tabs, with different sliders for
+//	gain setting, restoring the settings is a tedious task
 	airspySettings		-> beginGroup ("airspySettings");
-	int16_t temp 		= airspySettings -> value ("linearity", 10).
-	                                                             toInt();
-	linearitySlider		-> setValue (temp);
-	linearityDisplay	-> display  (temp);
-	temp			= airspySettings -> value ("sensitivity", 10).
-	                                                             toInt();
-	sensitivitySlider	-> setValue (temp);
-	sensitivityDisplay	-> display (temp);
-
-	vgaGain			=
-	           airspySettings -> value ("vga", 5).toInt();
-	vgaSlider		-> setValue (vgaGain);
-	vgaDisplay		-> display (vgaGain);
-	mixerGain		=
-	           airspySettings -> value ("mixer", 10). toInt();
-	mixerSlider		-> setValue (mixerGain);
-	mixerDisplay		-> display (mixerGain);
-	mixer_agc		= false;
-	lnaGain			=
-	           airspySettings -> value ("lna", 5). toInt();
-	lnaSlider		-> setValue (lnaGain);
-	lnaDisplay		-> display  (lnaGain);
-	mixer_agc		= false;
-	lna_agc			= false;
-	rf_bias			= false;
-	coarseOffset		=
-	           airspySettings -> value ("airspyOffset", 0). toInt();
-	save_gainSettings	=
-	          airspySettings -> value ("save_gainSettings", 1). toInt () != 0;
-	airspySettings	-> endGroup();
+	int tab	= airspySettings -> value ("tabSettings", 2). toInt ();
+	airspySettings	-> endGroup ();
+        tabWidget -> setCurrentIndex (tab);
+	restore_gainSliders  (200, tab);
 
 	theFilter		= nullptr;
 	device			= nullptr;
@@ -94,25 +78,22 @@
 #endif
 
 	if (Handle == nullptr) {
-	   fprintf (stderr, "failed to open %s\n", libraryString);
-#ifndef	__MINGW32__
-	   fprintf (stderr, "Error = %s\n", dlerror());
-#endif
-	   throw (20);
+	   throw (airspy_exception ("failed to open " +
+	                               std::string (libraryString)));
 	}
 
 	if (!load_airspyFunctions()) {
 	   fprintf (stderr, "problem in loading functions\n");
 	   releaseLibrary ();
+	   throw (airspy_exception ("one or more library functions could not be loaded"));
 	}
 //
 	strcpy (serial,"");
 	result = this -> my_airspy_init ();
 	if (result != AIRSPY_SUCCESS) {
-	   printf ("my_airspy_init() failed: %s (%d)\n",
-	             my_airspy_error_name((airspy_error)result), result);
 	   releaseLibrary ();
-	   throw (21);
+	   throw (airspy_exception (
+	             my_airspy_error_name ((airspy_error)result)));
 	}
 
 	uint64_t deviceList 4;
@@ -122,8 +103,9 @@
 	if (numofDevs == 0) {
 	   fprintf (stderr, "No devices found\n");
 	   releaseLibrary ();
-	   throw (22);
+	   throw (airspy_exception ("No airspy device was detected"));
 	}
+
 	if (numofDevs > 1) {
            airspySelect deviceSelector;
            for (deviceIndex = 0; deviceIndex < (int)numofDevs; deviceIndex ++) {
@@ -137,10 +119,9 @@
 	
 	result = my_airspy_open (&device, deviceList deviceIndex);
 	if (result != AIRSPY_SUCCESS) {
-	   printf ("my_airpsy_open() failed: %s (%d)\n",
-	             my_airspy_error_name ((airspy_error)result), result);
 	   releaseLibrary ();
-	   throw (22);
+	   throw (airspy_exception (
+	                      my_airspy_error_name ((airspy_error)result)));
 	}
 
 	(void) my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
@@ -160,28 +141,26 @@
 	}
 
 	if (selectedRate == 0) {
-	   fprintf (stderr, "Sorry. cannot help you\n");
 	   releaseLibrary ();
-	   throw (23);
+	   throw (airspy_exception ("Cannot handle the samplerates"));
 	}
 	else
 	   fprintf (stderr, "selected samplerate = %d\n", selectedRate);
+
 	airspySettings    -> beginGroup ("airspySettings");
         currentDepth    = airspySettings  -> value ("filterDepth", 5). toInt ();
         airspySettings    -> endGroup ();
+
         filterDepth     -> setValue (currentDepth);
 	theFilter	= new LowPassFIR (currentDepth, 1560000 / 2, selectedRate);
 	filtering	= false;
 	result = my_airspy_set_samplerate (device, selectedRate);
 	if (result != AIRSPY_SUCCESS) {
-           printf("airspy_set_samplerate() failed: %s (%d)\n",
-	             my_airspy_error_name ((enum airspy_error)result), result);
 	   releaseLibrary ();
-	   throw (24);
+           throw (airspy_exception (
+	             my_airspy_error_name ((enum airspy_error)result)));
 	}
 
-//	airspySettings	-> beginGroup ("airspySettings");
-//	airspySettings	-> endGroup();
 
 //	The sizes of the mapTables follow from the input and output rate
 //	(selectedRate / 1000) vs (2048000 / 1000)
@@ -195,10 +174,7 @@
 	convIndex	= 0;
 	convBuffer. resize (convBufferSize + 1);
 //
-	tabWidget	-> setCurrentIndex (0);
-	set_vga_gain	(vgaSlider	-> value ());
-	set_lna_gain	(lnaSlider	-> value ());
-	set_mixer_gain	(mixerSlider	-> value ());
+	restore_gainSettings (tab);
 	connect (linearitySlider, SIGNAL (valueChanged (int)),
 	         this, SLOT (set_linearity (int)));
 	connect (sensitivitySlider, SIGNAL (valueChanged (int)),
@@ -216,40 +192,18 @@
 	connect (biasButton, SIGNAL (stateChanged (int)),
 	         this, SLOT (set_rf_bias (int)));
 	connect (tabWidget, SIGNAL (currentChanged (int)),
-	         this, SLOT (show_tab (int)));
+	         this, SLOT (switch_tab (int)));
 	connect (dumpButton, SIGNAL (clicked ()),
 	         this, SLOT (set_xmlDump ()));
 	connect (filterSelector, SIGNAL (stateChanged (int)),
 	         this, SLOT (set_filter (int)));
-//
-//	and to restore settings, we need
-	connect (this, SIGNAL (new_lnaGainValue (int)),
-	         lnaSlider, SLOT (setValue (int)));
-	connect (this, SIGNAL (new_vgaGainValue (int)),
-	         vgaSlider, SLOT (setValue (int)));
-	connect (this, SIGNAL (new_mixerValue (int)),
-	         mixerSlider, SLOT (setValue (int)));
-	connect (this, SIGNAL (new_linearityValue (int)),
-	         linearitySlider, SLOT (setValue (int)));
-	connect (this, SIGNAL (new_sensitivityValue (int)),
-	         sensitivitySlider, SLOT (setValue (int)));
 	connect (this, SIGNAL (new_tabSetting (int)),
 	         tabWidget, SLOT (setCurrentIndex (int)));
-	connect (this, SIGNAL (new_lnaDisplay (int)),
-	         lnaDisplay, SLOT (display (int)));
-	connect (this, SIGNAL (new_vgaDisplay (int)),
-	         vgaDisplay, SLOT (display (int)));
-	connect (this, SIGNAL (new_mixerDisplay (int)),
-	         mixerDisplay, SLOT (display (int)));
-	connect (this, SIGNAL (new_sensitivityDisplay (int)),
-	         sensitivityDisplay, SLOT (display (int)));
-	connect (this, SIGNAL (new_linearityDisplay (int)),
-	         linearityDisplay, SLOT (display (int)));
+//
 	displaySerial	-> setText (getSerial());
 	running. store (false);
 	my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
 
-	show_tab (0);			// will set currentTab
 	dumping. store (false);
 	xmlDumper	= nullptr;
 }
@@ -259,14 +213,12 @@
 	myFrame. hide ();
 	filtering	= false;
 	airspySettings	-> beginGroup ("airspySettings");
-	airspySettings -> setValue ("linearity", linearitySlider -> value());
-	airspySettings -> setValue ("sensitivity", sensitivitySlider -> value());
-	airspySettings -> setValue ("vga", vgaGain);
-	airspySettings -> setValue ("mixer", mixerGain);
-	airspySettings -> setValue ("lna", lnaGain);
-	airspySettings	-> setValue ("airspyOffset", coarseOffset);
-	airspySettings	-> setValue ("filterDepth", filterDepth -> value ());
-	airspySettings	-> endGroup();
+        airspySettings -> setValue ("position-x", myFrame. pos (). x ());
+        airspySettings -> setValue ("position-y", myFrame. pos (). y ());
+
+	airspySettings	-> setValue ("tabSettings",
+	                                   tabWidget -> currentIndex ());
+	airspySettings	-> endGroup ();
 	if (device != nullptr) {
 	   int result = my_airspy_stop_rx (device);
 	   if (result != AIRSPY_SUCCESS) {
@@ -308,7 +260,7 @@
 void	airspyHandler::set_filter	(int c) {
 	(void)c;
 	filtering	= filterSelector -> isChecked ();
-	fprintf (stderr, "filter set %s\n", filtering ? "on" : "off");
+//	fprintf (stderr, "filter set %s\n", filtering ? "on" : "off");
 }
 
 bool	airspyHandler::restartReader	(int32_t freq) {
@@ -319,8 +271,15 @@
 	   return true;
 
 	vfoFrequency	= freq;
-	if (save_gainSettings) 
-	   update_gainSettings (freq / MHz (1));
+	airspySettings	-> beginGroup ("airspySettings");
+	QString key = "tabSettings-" + QString::number (freq / MHz (1));
+	int tab	= airspySettings -> value (key, 0). toInt ();
+	airspySettings	-> endGroup ();
+	tabWidget       -> blockSignals (true);
+        new_tabSetting  (tab);
+        while (tabWidget -> currentIndex () != tab) 
+           usleep (1000);
+        tabWidget       -> blockSignals (false);
 //
 //	sliders are now set,
 	result = my_airspy_set_freq (device, freq);
@@ -345,21 +304,11 @@
 	         my_airspy_error_name((airspy_error)result), result);
 	   return false;
 	}
-	fprintf (stderr, "currentTab %d\n", currentTab);
-	my_airspy_set_lna_agc	(device, lna_agc ? 1 : 0);
-	my_airspy_set_mixer_agc	(device, mixer_agc ? 1 : 0);
-	my_airspy_set_rf_bias	(device, rf_bias ? 1 : 0);
-	if (currentTab == 0)
-	   set_sensitivity	(sensitivitySlider -> value());
-	else 
-	if (currentTab	== 1)
-	   set_linearity	(linearitySlider -> value());
-	else {
-	   set_vga_gain		(vgaGain);
-	   set_mixer_gain	(mixerGain);
-	   set_lna_gain		(lnaGain);
-	}
-	
+
+//
+//	Hier moeten we de tab en gain weer zetten
+	restore_gainSliders (freq / MHz (1), tab);
+	restore_gainSettings (tab);
 //
 	running. store (true);
 	return true;
@@ -372,8 +321,13 @@
 	   return;
 
 	close_xmlDump ();
-	if (save_gainSettings)
-	   record_gainSettings (vfoFrequency / MHz (1));
+	airspySettings	-> beginGroup ("airspySettings");
+	QString key = "tabSettings-" +
+	            QString::number (getVFOFrequency () / MHz (1));
+	airspySettings	-> setValue (key, tabWidget -> currentIndex ());
+	airspySettings	-> endGroup ();
+	record_gainSettings (getVFOFrequency () / MHz (1), 
+	                           tabWidget -> currentIndex ());
 	result = my_airspy_stop_rx (device);
 
 	if (result != AIRSPY_SUCCESS ) 
@@ -412,6 +366,10 @@
 	   xmlWriter -> add ((std::complex<int16_t> *)sbuf, nSamples);
 	if (filtering) {
 	   if (filterDepth -> value () != currentDepth) {
+	      airspySettings -> beginGroup ("airspySettings");
+	      airspySettings -> setValue ("filterDepth",
+	                                      filterDepth -> value ());
+	      airspySettings	-> endGroup();
 	      currentDepth = filterDepth -> value ();
 	      theFilter -> resize (currentDepth);
 	   }
@@ -511,135 +469,6 @@
 	return _I_Buffer. GetRingBufferReadAvailable();
 }
 //
-#define GAIN_COUNT (22)
-
-uint8_t airspy_linearity_vga_gainsGAIN_COUNT = { 13, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 8, 7, 6, 5, 4 };
-uint8_t airspy_linearity_mixer_gainsGAIN_COUNT = { 12, 12, 11, 9, 8, 7, 6, 6, 5, 0, 0, 1, 0, 0, 2, 2, 1, 1, 1, 1, 0, 0 };
-uint8_t airspy_linearity_lna_gainsGAIN_COUNT = { 14, 14, 14, 13, 12, 10, 9, 9, 8, 9, 8, 6, 5, 3, 1, 0, 0, 0, 0, 0, 0, 0 };
-uint8_t airspy_sensitivity_vga_gainsGAIN_COUNT = { 13, 12, 11, 10, 9, 8, 7, 6, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4 };
-uint8_t airspy_sensitivity_mixer_gainsGAIN_COUNT = { 12, 12, 12, 12, 11, 10, 10, 9, 9, 8, 7, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0 };
-uint8_t airspy_sensitivity_lna_gainsGAIN_COUNT = { 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 12, 9, 9, 8, 7, 6, 5, 3, 2, 1, 0 };
-
-void	airspyHandler::set_linearity (int value) {
-int	result = my_airspy_set_linearity_gain (device, value);
-int	temp;
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_lna_gain() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	   return;
-	}
-	linearityDisplay	-> display (value);
-	temp	= airspy_linearity_lna_gains GAIN_COUNT - 1 - value;
-	linearity_lnaDisplay	-> display (temp);
-	temp	= airspy_linearity_mixer_gains GAIN_COUNT - 1 - value;
-	linearity_mixerDisplay	-> display (temp);
-	temp	= airspy_linearity_vga_gains GAIN_COUNT - 1 - value;
-	linearity_vgaDisplay	-> display (temp);
-}
-
-void	airspyHandler::set_sensitivity (int value) {
-int	result = my_airspy_set_sensitivity_gain (device, value);
-int	temp;
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	   return;
-	}
-	sensitivityDisplay	-> display (value);
-	temp	= airspy_sensitivity_lna_gains GAIN_COUNT - 1 - value;
-	sensitivity_lnaDisplay	-> display (temp);
-	temp	= airspy_sensitivity_mixer_gains GAIN_COUNT - 1 - value;
-	sensitivity_mixerDisplay	-> display (temp);
-	temp	= airspy_sensitivity_vga_gains GAIN_COUNT - 1 - value;
-	sensitivity_vgaDisplay	-> display (temp);
-}
-
-//
-
-//	Original functions from the airspy extio dll
-/* Parameter value shall be between 0 and 15 */
-void	airspyHandler::set_lna_gain (int value) {
-int result = my_airspy_set_lna_gain (device, lnaGain = value);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_lna_gain() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	}
-	else
-	   lnaDisplay	-> display (value);
-}
-
-/* Parameter value shall be between 0 and 15 */
-void	airspyHandler::set_mixer_gain (int value) {
-int result = my_airspy_set_mixer_gain (device, mixerGain = value);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	}
-	else
-	   mixerDisplay	-> display (value);
-}
-
-/* Parameter value shall be between 0 and 15 */
-void	airspyHandler::set_vga_gain (int value) {
-int result = my_airspy_set_vga_gain (device, vgaGain = value);
-
-	fprintf (stderr, "vgaGain %d, result %d\n",
-	                             vgaGain, result);
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_vga_gain() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	}
-	else
-	   vgaDisplay	-> display (value);
-}
-//
-//	agc's
-/* Parameter value:
-	0=Disable LNA Automatic Gain Control
-	1=Enable LNA Automatic Gain Control
-*/
-void	airspyHandler::set_lna_agc	(int dummy) {
-	(void)dummy;
-	lna_agc	= lnaButton	-> isChecked ();
-	int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_lna_agc() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	}
-}
-
-/* Parameter value:
-	0=Disable MIXER Automatic Gain Control
-	1=Enable MIXER Automatic Gain Control
-*/
-void	airspyHandler::set_mixer_agc	(int dummy) {
-	(void)dummy;
-	mixer_agc	= mixerButton -> isChecked ();
-
-int result = my_airspy_set_mixer_agc (device, mixer_agc ? 1 : 0);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_set_mixer_agc() failed: %s (%d)\n",
-	            my_airspy_error_name ((airspy_error)result), result);
-	}
-}
-
-
-/* Parameter value shall be 0=Disable BiasT or 1=Enable BiasT */
-void	airspyHandler::set_rf_bias (int dummy) {
-	(void)dummy;
-	rf_bias	= biasButton -> isChecked ();
-int result = my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf("airspy_set_rf_bias() failed: %s (%d)\n",
-	           my_airspy_error_name ((airspy_error)result), result);
-	}
-}
-
 const char* airspyHandler::board_id_name() {
 uint8_t bid;
 
@@ -827,19 +656,6 @@
 	return true;
 }
 
-void	airspyHandler::show_tab (int t) {
-	if (t == 0)		// sensitivity
-	   set_sensitivity	(sensitivitySlider -> value());
-	else
-	if (t == 1)		// linearity
-	   set_linearity	(linearitySlider -> value());
-	else {			// classic view
-	   set_vga_gain		(vgaGain);
-	   set_mixer_gain	(mixerGain);
-	   set_lna_gain		(lnaGain);
-	}
-	currentTab	= t;
-}
 
 int	airspyHandler::getBufferSpace	() {
 	return _I_Buffer. GetRingBufferWriteAvailable ();
@@ -930,124 +746,282 @@
 bool	airspyHandler::isHidden	() {
 	return myFrame. isHidden ();
 }
-
-void	airspyHandler::record_gainSettings	(int key) {
-int	linearity	= linearitySlider	-> value ();
-int	sensitivity	= sensitivitySlider	-> value ();
-int	lnaGainValue	= lnaSlider		-> value ();
-int	mixerValue	= mixerSlider		-> value ();
-int	vgaGainValue	= vgaSlider		-> value ();
-int	currentTab	= tabWidget		-> currentIndex ();
-QString theValue	= QString::number (linearity) + ":";
-
-	theValue	+= QString::number (sensitivity) + ":";
-	theValue	+= QString::number (lnaGainValue) + ":";
-	theValue	+= QString::number (mixerValue) + ":";
-	theValue	+= QString::number (vgaGainValue) + ":";
-	theValue	+= QString::number (lna_agc) + ":";
-	theValue	+= QString::number (mixer_agc) + ":";
-	theValue	+= QString::number (rf_bias) + ":";
-	theValue	+= QString::number (currentTab);
+//
+//	gain settings are maintained on a per-channel and per tab base,
+//	Values are recorded on both switching tabs and changing channels
+void	airspyHandler::record_gainSettings	(int freq, int tab) {
+QString	res;
+QString key;
 
         airspySettings	-> beginGroup ("airspySettings");
-        airspySettings	-> setValue (QString::number (key), theValue);
-        airspySettings	-> endGroup ();
-}
+	key = QString::number (freq) + "-" + QString::number (tab);
+	switch (tab) {
+	   case 0:	// sensitity screen is on
+	      res = QString::number (sensitivitySlider -> value ());
+	      break;
+	   case 1:	// linearity screen is on
+	      res = QString::number (linearitySlider -> value ());
+	      break;
+	   case 3:	// classic screen
+	   default:
+	      res = QString::number (vgaSlider -> value ());
+	      res = res + ":" + QString::number (mixerSlider -> value ());
+	      res = res + ":" + QString::number (lnaSlider -> value ());
+	      break;
+	}
 
-void	airspyHandler::update_gainSettings	(int key) {
-int     linearity;
-int     sensitivity;
-int     lnaGainValue;
-int     mixerGainValue;
-int     vgaGainValue;
-//int	lna_agc_setting;
-//int	mixer_agc_setting;
-//int	rf_bias_setting;
-int	tab_setting;
-QString theValue;
+	res	= res + ":" + QString::number (lnaButton -> isChecked ());
+	res	= res + ":" + QString::number (mixerButton -> isChecked ());
+	res	= res + ":" + QString::number (biasButton -> isChecked ());
 
-        airspySettings	-> beginGroup ("airspySettings");
-        theValue = airspySettings -> value (QString::number (key), ""). toString ();
+	airspySettings	-> setValue (key, res);
         airspySettings	-> endGroup ();
+}
+//
+//	When starting a channel, the gain sliders from the previous
+//	time that channel was the current channel, are restored
+//	Note that the device settings are NOT yet updated
+void	airspyHandler::restore_gainSliders	(int freq, int tab) {
+int	lna	= 0;
+int	mixer	= 0;
+int	bias	= 0;
+int	newTab	= 0;
+QString key	= QString::number (freq) + "-" + QString::number (tab);
+
+	airspySettings -> beginGroup ("airspySettings");
+	QString gainValues =
+	       airspySettings -> value (key, ""). toString ();
+	airspySettings -> endGroup ();
+	if (gainValues == "") // we create default values
+	   if ((tab == 0) || (tab == 1)) 
+	      gainValues = "10:0:0:0";
+	   else
+	      gainValues = "10:10:10:0:0:0";	
+	QStringList list = gainValues. split (":");
+	switch (tab) {
+	   case 0:
+	      disconnect (sensitivitySlider, SIGNAL (valueChanged (int)),
+	                  this, SLOT (set_sensitivity (int)));
+	      sensitivitySlider -> setValue (list. at (0). toInt ());
+	      connect (sensitivitySlider, SIGNAL (valueChanged (int)),
+	               this, SLOT (set_sensitivity (int)));
+	      lna	= list. at (1). toInt ();
+	      mixer	= list. at (2). toInt ();
+	      bias	= list. at (3). toInt ();
+	      break;
+	   case 1:
+	      disconnect (linearitySlider, SIGNAL (valueChanged (int)),
+	                  this, SLOT (set_linearity (int)));
+	      linearitySlider -> setValue (list. at (0). toInt ());
+	      connect (linearitySlider, SIGNAL (valueChanged (int)),
+	               this, SLOT (set_linearity (int)));
+	      lna	= list. at (1). toInt ();
+	      mixer	= list. at (2). toInt ();
+	      bias	= list. at (3). toInt ();
+	      break;
+
+	   default:	// classic view
+	      disconnect (vgaSlider, SIGNAL (valueChanged (int)),
+	                  this, SLOT (set_vga_gain (int)));
+	      disconnect (mixerSlider, SIGNAL (valueChanged (int)),
+	                  this, SLOT (set_mixer_gain (int)));
+	      disconnect (lnaSlider, SIGNAL (valueChanged (int)),
+	                  this, SLOT (set_lna_gain (int)));
+	      vgaSlider		-> setValue (list. at (0). toInt ());
+	      mixerSlider	-> setValue (list. at (1). toInt ());
+	      lnaSlider		-> setValue (list. at (2). toInt ());
+	      connect (vgaSlider, SIGNAL (valueChanged (int)),
+	               this, SLOT (set_vga_gain (int)));
+	      connect (mixerSlider, SIGNAL (valueChanged (int)),
+	               this, SLOT (set_mixer_gain (int)));
+	      connect (lnaSlider, SIGNAL (valueChanged (int)),
+	               this, SLOT (set_lna_gain (int)));
+	      lna	= list. at (3). toInt ();
+	      mixer	= list. at (4). toInt ();
+	      bias	= list. at (5). toInt ();
+	}
+//
+//	Now the agc settings
+	disconnect (lnaButton, SIGNAL (stateChanged (int)),
+	            this, SLOT (set_lna_agc (int)));
+	disconnect (mixerButton, SIGNAL (stateChanged (int)),
+	            this, SLOT (set_mixer_agc (int)));
+	disconnect (biasButton, SIGNAL (stateChanged (int)),
+	            this, SLOT (set_rf_bias (int)));
+	if (lna != 0)
+	   lnaButton	-> setChecked (true);
+	if (mixer != 0)
+	   mixerButton	-> setChecked (true);
+	if (bias != 0)
+	   biasButton	-> setChecked (true);
+	connect (lnaButton, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_lna_agc (int)));
+	connect (mixerButton, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_mixer_agc (int)));
+	connect (biasButton, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_rf_bias (int)));
+}
 
-	if (theValue == QString (""))
-           return;              // or set some defaults here
-
-        QStringList result      = theValue. split (":");
-        if (result. size () != 9)        // should not happen
-           return;
-
-	lna_agc			= result. at (5). toInt ();
-	mixer_agc		= result. at (6). toInt ();
-	rf_bias			= result. at (7). toInt ();
-	tab_setting		= result. at (8). toInt ();
-	switch (tab_setting) {
-	   case 0:	// sensitivity
-              sensitivity		= result. at (1). toInt ();
-	      sensitivitySlider -> blockSignals (true);
-	      new_sensitivityValue	(sensitivity);
-	      new_sensitivityDisplay	(sensitivity);
-	      while (sensitivitySlider -> value () != sensitivity)
-	         usleep (1000);
-	      sensitivitySlider -> blockSignals (false);
+void	airspyHandler::restore_gainSettings	(int tab) {
+	switch (tab) {
+	   case 0:	//sensitivity
+	      set_sensitivity (sensitivitySlider -> value ());
 	      break;
 	   case 1:	// linearity
-              linearity		= result. at (0). toInt ();
-	      linearitySlider	-> blockSignals (true);
-	      new_linearityValue	(linearity);
-	      new_linearityDisplay	(linearity);
-	      while (linearitySlider -> value () != linearity)
-	         usleep (1000);
-	      linearitySlider	-> blockSignals (false);
+	      set_linearity (linearitySlider -> value ());
 	      break;
+	   case 2:	// classic view
 	   default:
+	      set_lna_gain	(lnaSlider	-> value ());
+	      set_mixer_gain	(mixerSlider	-> value ());
+	      set_vga_gain	(vgaSlider	-> value ());
 	      break;
 	}
-	lnaGainValue		= result. at (2). toInt ();
-	mixerGainValue		= result. at (3). toInt ();
-	vgaGainValue		= result. at (4). toInt ();
+	if (lnaButton -> isChecked ()) 
+	   set_lna_agc (1);
+	if (mixerButton -> isChecked ())
+	   set_mixer_agc (1);
+	if (biasButton -> isChecked ())
+	   set_rf_bias (1);
+}
+
+void	airspyHandler::switch_tab (int t) {
+	record_gainSettings (getVFOFrequency () / MHz (1),
+	                           tabWidget -> currentIndex ());
+	tabWidget       -> blockSignals (true);
+	new_tabSetting	(t);
+        while (tabWidget -> currentIndex () != t)
+           usleep (1000);
+        tabWidget       -> blockSignals (false);
+	airspySettings	-> beginGroup ("airspySettings");
+	airspySettings	-> setValue ("tabSettings", t);
+	airspySettings	-> endGroup ();
+	restore_gainSliders (getVFOFrequency () / MHz (1), t);
+	restore_gainSettings (t);
+}
+
+#define GAIN_COUNT (22)
+
+uint8_t airspy_linearity_vga_gainsGAIN_COUNT = { 13, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 8, 7, 6, 5, 4 };
+uint8_t airspy_linearity_mixer_gainsGAIN_COUNT = { 12, 12, 11, 9, 8, 7, 6, 6, 5, 0, 0, 1, 0, 0, 2, 2, 1, 1, 1, 1, 0, 0 };
+uint8_t airspy_linearity_lna_gainsGAIN_COUNT = { 14, 14, 14, 13, 12, 10, 9, 9, 8, 9, 8, 6, 5, 3, 1, 0, 0, 0, 0, 0, 0, 0 };
+uint8_t airspy_sensitivity_vga_gainsGAIN_COUNT = { 13, 12, 11, 10, 9, 8, 7, 6, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4 };
+uint8_t airspy_sensitivity_mixer_gainsGAIN_COUNT = { 12, 12, 12, 12, 11, 10, 10, 9, 9, 8, 7, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0 };
+uint8_t airspy_sensitivity_lna_gainsGAIN_COUNT = { 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 12, 9, 9, 8, 7, 6, 5, 3, 2, 1, 0 };
+
+void	airspyHandler::set_linearity (int value) {
+int	result = my_airspy_set_linearity_gain (device, value);
+int	temp;
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_lna_gain() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	   return;
+	}
+	linearityDisplay	-> display (value);
+	temp	= airspy_linearity_lna_gains GAIN_COUNT - 1 - value;
+	linearity_lnaDisplay	-> display (temp);
+	temp	= airspy_linearity_mixer_gains GAIN_COUNT - 1 - value;
+	linearity_mixerDisplay	-> display (temp);
+	temp	= airspy_linearity_vga_gains GAIN_COUNT - 1 - value;
+	linearity_vgaDisplay	-> display (temp);
+}
+
+void	airspyHandler::set_sensitivity (int value) {
+int	result = my_airspy_set_sensitivity_gain (device, value);
+int	temp;
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	   return;
+	}
+	sensitivityDisplay	-> display (value);
+	temp	= airspy_sensitivity_lna_gains GAIN_COUNT - 1 - value;
+	sensitivity_lnaDisplay	-> display (temp);
+	temp	= airspy_sensitivity_mixer_gains GAIN_COUNT - 1 - value;
+	sensitivity_mixerDisplay	-> display (temp);
+	temp	= airspy_sensitivity_vga_gains GAIN_COUNT - 1 - value;
+	sensitivity_vgaDisplay	-> display (temp);
+}
+
+//	Original functions from the airspy extio dll
+/* Parameter value shall be between 0 and 15 */
+void	airspyHandler::set_lna_gain (int value) {
+int result = my_airspy_set_lna_gain (device, lnaGain = value);
+
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_lna_gain() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	}
+	else
+	   lnaDisplay	-> display (value);
+}
+
+/* Parameter value shall be between 0 and 15 */
+void	airspyHandler::set_mixer_gain (int value) {
+int result = my_airspy_set_mixer_gain (device, mixerGain = value);
+
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	}
+	else
+	   mixerDisplay	-> display (value);
+}
+
+/* Parameter value shall be between 0 and 15 */
+void	airspyHandler::set_vga_gain (int value) {
+int result = my_airspy_set_vga_gain (device, vgaGain = value);
+
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_vga_gain() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	}
+	else
+	   vgaDisplay	-> display (value);
+}
 //
-//	setting sliders should not lead to signals
-	lnaSlider		-> blockSignals (true);
-	new_lnaGainValue	(lnaGainValue);
-	new_lnaDisplay		(lnaGainValue);
-	while (lnaSlider -> value () != lnaGainValue)
-	   usleep (1000);
-	lnaSlider		-> blockSignals (false);
-
-
-	mixerSlider	-> blockSignals (true);
-	new_mixerValue	(mixerGainValue);
-	new_mixerDisplay	(mixerGainValue);
-	while (mixerSlider -> value () != mixerGainValue)
-	   usleep (1000);
-	mixerSlider	-> blockSignals (false);
-
-	lnaButton	-> blockSignals (true);
-	lnaButton	-> setChecked (lna_agc);
-	usleep (1000);
-	lnaButton	-> blockSignals (false);
+//	agc's
+/* Parameter value:
+	0=Disable LNA Automatic Gain Control
+	1=Enable LNA Automatic Gain Control
+*/
+void	airspyHandler::set_lna_agc	(int dummy) {
+	(void)dummy;
+	lna_agc	= lnaButton	-> isChecked ();
+	int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
 
-	mixerButton	-> blockSignals (true);
-	mixerButton	-> setChecked (mixer_agc);
-	usleep	(1000);
-	mixerButton	-> blockSignals (false);
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_lna_agc() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	}
+}
 
-	biasButton	-> blockSignals (true);
-	biasButton	-> setChecked (rf_bias);
-	usleep (1000);
-	biasButton	-> blockSignals (false);
-
-	vgaSlider	-> blockSignals (true);
-	new_vgaGainValue	(vgaGainValue);
-	new_vgaDisplay		(vgaGainValue);
-	while (vgaSlider -> value () != vgaGainValue)
-	   usleep (1000);
-	vgaSlider	-> blockSignals (false);
-
-	tabWidget	-> blockSignals (true);
-	new_tabSetting (tab_setting);
-	while (tabWidget -> currentIndex () != tab_setting)
-	   usleep (1000);
-	tabWidget	-> blockSignals (false);
+/* Parameter value:
+	0=Disable MIXER Automatic Gain Control
+	1=Enable MIXER Automatic Gain Control
+*/
+void	airspyHandler::set_mixer_agc	(int dummy) {
+	(void)dummy;
+	mixer_agc	= mixerButton -> isChecked ();
+
+int result = my_airspy_set_mixer_agc (device, mixer_agc ? 1 : 0);
+
+	if (result != AIRSPY_SUCCESS) {
+	   printf ("airspy_set_mixer_agc() failed: %s (%d)\n",
+	            my_airspy_error_name ((airspy_error)result), result);
+	}
+}
+
+
+/* Parameter value shall be 0=Disable BiasT or 1=Enable BiasT */
+void	airspyHandler::set_rf_bias (int dummy) {
+	(void)dummy;
+	rf_bias	= biasButton -> isChecked ();
+int result = my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
+
+	if (result != AIRSPY_SUCCESS) {
+	   printf("airspy_set_rf_bias() failed: %s (%d)\n",
+	           my_airspy_error_name ((airspy_error)result), result);
+	}
 }
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/airspy-handler/airspy-handler.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/airspy-handler/airspy-handler.h Changed

@@ -118,29 +118,12 @@
         void            close_xmlDump           ();
         std::atomic<bool> dumping;
 	int		vfoFrequency;
-	void		record_gainSettings	(int);
-	void		update_gainSettings	(int);
-	bool		save_gainSettings;
+	void		record_gainSettings	(int, int);
+	void		restore_gainSliders	(int, int);
+	void		restore_gainSettings	(int);
 	LowPassFIR	*theFilter;
 	bool		filtering;
 	int		currentDepth;
-signals:
-	void		new_lnaGainValue	(int);
-	void		new_vgaGainValue	(int);
-	void		new_mixerValue		(int);
-	void		new_linearityValue	(int);
-	void		new_sensitivityValue	(int);
-	void		new_tabSetting		(int);
-
-	void		new_lnaButtonText	(const QString &);
-	void		new_mixerButtonText	(const QString &);
-
-	void		new_lnaDisplay		(int);
-	void		new_vgaDisplay		(int);
-	void		new_mixerDisplay	(int);
-	void		new_sensitivityDisplay	(int);
-	void		new_linearityDisplay	(int);
-	
 private slots:
 	void		set_linearity		(int value);
 	void		set_sensitivity		(int value);
@@ -150,9 +133,11 @@
 	void		set_lna_agc		(int);
 	void		set_mixer_agc		(int);
 	void		set_rf_bias		(int);
-	void		show_tab		(int);
+	void		switch_tab		(int);
 	void		set_xmlDump		();
 	void		set_filter		(int);
+signals:
+	void		new_tabSetting		(int);
 private:
 	bool		load_airspyFunctions	();
 //	The functions to be extracted from the dll/.so file

qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/device-exceptions.h Added

@@ -0,0 +1,99 @@
+
+#include	<stdio.h>
+#include <stdexcept>
+
+#define MAX_MESSAGE_SIZE 256
+
+// Exceptions with input
+//
+class	sdrplay_2_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	sdrplay_2_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+
+class	sdrplay_3_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	sdrplay_3_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+
+class	hackrf_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	hackrf_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+
+class	airspy_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	airspy_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+
+class	rtlsdr_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	rtlsdr_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+
+class	lime_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	lime_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+
+class	pluto_exception : public std::exception {
+private:
+	char text MAX_MESSAGE_SIZE;
+public:
+	pluto_exception (const std::string &s) {
+	   sprintf (text, "%s ", s. c_str ());
+	}
+
+	const char *what  () const noexcept override {
+	   return text;
+	}
+};
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/device-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/device-handler.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/device-handler.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/device-handler.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/hackrf-handler/hackrf-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/hackrf-handler/hackrf-handler.cpp Changed

@@ -32,6 +32,7 @@
 #include	<QFileDialog>
 #include	"hackrf-handler.h"
 #include	"xml-filewriter.h"
+#include	"device-exceptions.h"
 
 #define	DEFAULT_GAIN	30
 
@@ -42,7 +43,13 @@
 int	res;
 	hackrfSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
-	setupUi (&myFrame);
+	hackrfSettings -> beginGroup ("hackrfSettings");
+        int x   = hackrfSettings -> value ("position-x", 100). toInt ();
+        int y   = hackrfSettings -> value ("position-y", 100). toInt ();
+        hackrfSettings -> endGroup ();
+        setupUi (&myFrame);
+        myFrame. move (QPoint (x, y));
+
 	myFrame. show	();
 	this	-> inputRate		= Khz (2048);
 
@@ -57,13 +64,13 @@
 	phandle->load();
 
 	if (!phandle -> isLoaded ()) {
-	   fprintf (stderr, "failed to open %s\n", libraryString);
-	   throw (20);
+	   throw (hackrf_exception ("failed to open " +
+	                                std::string (libraryString)));
 	}
 
 	if (!load_hackrfFunctions ()) {
 	   delete phandle;
-	   throw (21);
+	   throw (hackrf_exception ("could not find one or more library functions"));
 	}
 //
 //	From here we have a library available
@@ -94,77 +101,50 @@
 //
 	res	= this -> hackrf_init ();
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_init:");
-	   fprintf (stderr, "%s \n",
-	                 this -> hackrf_error_name (hackrf_error (res)));
-	   throw (21);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
+
 	}
 
 	res	= this	-> hackrf_open (&theDevice);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_open:");
-	   fprintf (stderr, "%s \n",
-	                 this -> hackrf_error_name (hackrf_error (res)));
-	   throw (22);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	res	= this -> hackrf_set_sample_rate (theDevice, 2048000.0);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_set_samplerate:");
-	   fprintf (stderr, "%s \n",
-	                 this -> hackrf_error_name (hackrf_error (res)));
-	   throw (23);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	res	= this -> hackrf_set_baseband_filter_bandwidth (theDevice,
 	                                                        1750000);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_set_bw:");
-	   fprintf (stderr, "%s \n",
-	                 this -> hackrf_error_name (hackrf_error (res)));
-	   throw (24);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	res	= this -> hackrf_set_freq (theDevice, 220000000);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_set_freq: ");
-	   fprintf (stderr, "%s \n",
-	                 this -> hackrf_error_name (hackrf_error (res)));
-	   throw (25);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
-
 	res = this -> hackrf_set_antenna_enable (theDevice, 1);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_set_antenna_enable: ");
-	   fprintf (stderr, "%s \n",
-	                this -> hackrf_error_name (hackrf_error (res)));
-	   throw (26);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	res = this -> hackrf_set_amp_enable (theDevice, 1);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_set_antenna_enable: ");
-	   fprintf (stderr, "%s \n",
-	                this -> hackrf_error_name (hackrf_error (res)));
-	   throw (27);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	uint16_t regValue;
 	res = this -> hackrf_si5351c_read (theDevice, 162, &regValue);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_si5351c_read: ");
-	   fprintf (stderr, "%s \n",
-	             this -> hackrf_error_name (hackrf_error (res)));
-	   throw (28);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	res = this -> hackrf_si5351c_write (theDevice, 162, regValue);
 	if (res != HACKRF_SUCCESS) {
-	   fprintf (stderr, "Problem with hackrf_si5351c_write: ");
-	   fprintf (stderr, "%s \n",
-	              this -> hackrf_error_name (hackrf_error (res)));
-	   throw (29);
+	   throw (hackrf_exception (this -> hackrf_error_name (hackrf_error (res))));
 	}
 
 	setLNAGain	(lnaGainSlider		-> value());
@@ -217,6 +197,9 @@
 	stopReader();
 	myFrame. hide ();
 	hackrfSettings	-> beginGroup ("hackrfSettings");
+        hackrfSettings -> setValue ("position-x", myFrame. pos (). x ());
+        hackrfSettings -> setValue ("position-y", myFrame. pos (). y ());
+
 	hackrfSettings	-> setValue ("hack_lnaGain",
 	                                 lnaGainSlider -> value());
 	hackrfSettings -> setValue ("hack_vgaGain",

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/lime-handler/lime-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/lime-handler/lime-handler.cpp Changed

@@ -25,6 +25,7 @@
 #include	<QTime>
 #include	"lime-handler.h"
 #include	"xml-filewriter.h"
+#include	"device-exceptions.h"
 
 #define	FIFO_SIZE	32768
 static
@@ -60,8 +61,8 @@
 #endif
 
         if (Handle == nullptr) {
-           fprintf (stderr, "failed to open %s\n", libraryString);
-           throw (20);
+           throw (lime_exception ("failed to open " +
+	                             std::string (libraryString)));
         }
 
         libraryLoaded   = true;
@@ -71,13 +72,13 @@
 #else
            dlclose (Handle);
 #endif
-           throw (21);
+           throw (lime_exception ("could not load all required lib functions"));
         }
 //
 //      From here we have a library available
 	int ndevs	= LMS_GetDeviceList (limedevices);
 	if (ndevs == 0) {	// no devices found
-	   throw (21);
+	   throw (lime_exception ("No lime device found"));
 	}
 
 	for (int i = 0; i < ndevs; i ++)
@@ -85,19 +86,19 @@
 
 	int res		= LMS_Open (&theDevice, nullptr, nullptr);
 	if (res < 0) {	// some error
-	   throw (22);
+	   throw (lime_exception ("failed to open device"));
 	}
 
 	res		= LMS_Init (theDevice);
 	if (res < 0) {	// some error
 	   LMS_Close (&theDevice);
-	   throw (23);
+	   throw (lime_exception ("failed to initialize device"));
 	}
 
 	res		= LMS_GetNumChannels (theDevice, LMS_CH_RX);
 	if (res < 0) {	// some error
 	   LMS_Close (&theDevice);
-	   throw (24);
+	   throw (lime_exception ("could not set number of channels"));
 	}
 
 	fprintf (stderr, "device %s supports %d channels\n",
@@ -105,13 +106,13 @@
 	res		= LMS_EnableChannel (theDevice, LMS_CH_RX, 0, true);
 	if (res < 0) {	// some error
 	   LMS_Close (theDevice);
-	   throw (24);
+	   throw (lime_exception ("could not enable channels"));
 	}
 
 	res	= LMS_SetSampleRate (theDevice, 2048000.0, 0);
 	if (res < 0) {
 	   LMS_Close (theDevice);
-	   throw (25);
+	   throw (lime_exception ("could not set samplerate"));
 	}
 
 	float_type host_Hz, rf_Hz;
@@ -146,14 +147,14 @@
 	                                                 0, 220000000.0);
 	if (res < 0) {
 	   LMS_Close (theDevice);
-	   throw (26);
+	   throw (lime_exception ("could not set LO frequency"));
 	}
 
 	res		= LMS_SetLPFBW (theDevice, LMS_CH_RX,
 	                                               0, 1536000.0);
 	if (res < 0) {
 	   LMS_Close (theDevice);
-	   throw (27);
+	   throw (lime_exception ("could not set bandwidth"));
 	}
 
 	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, 50);

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/pluto-handler-2/pluto-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/pluto-handler-2/pluto-handler.cpp Changed

@@ -30,7 +30,8 @@
 #include	<QFileDialog>
 #include	"pluto-handler.h"
 #include	"xml-filewriter.h"
-//
+#include	"device-exceptions.h"
+
 //	Description for the fir-filter is here:
 #include	"dabFilter.h"
 
@@ -205,20 +206,18 @@
 
 	pHandle		= new QLibrary (libName);
 	if (pHandle == nullptr) {
-	   fprintf (stderr, " could not load %s\n", libName);
-	   throw (21);
+	   throw pluto_exception ("could not load " + std::string (libName));
 	}
 
 	pHandle -> load ();
 	if (!pHandle -> isLoaded ()) {
-	   fprintf (stderr, "Failed to open %s\n", libName);
-	   throw (22);
+	   throw pluto_exception ("Failed to open " + std::string (libName));
 	}
 
 	bool success			= loadFunctions ();
 	if (!success) {
 	   delete pHandle;
-	   throw (21);
+	   throw pluto_exception ("could not load all required lib functions");
 	}
 
 	this	-> ctx			= nullptr;
@@ -268,20 +267,17 @@
 
 	if (ctx == nullptr) {
 	   fprintf (stderr, "No pluto found, fatal\n");
-	   throw (24);
+	   throw (pluto_exception ("No pluto device detected"));
 	}
 //
 	
 	if (iio_context_get_devices_count (ctx) <= 0) {
-	   fprintf (stderr, "no devices, fatal");
-	   throw (25);
+	   throw (pluto_exception ("no pluto device detected"));
 	}
-
 //	
 	fprintf (stderr, "* Acquiring AD9361 streaming devices\n");
 	if (!get_ad9361_stream_dev (ctx, RX, &rx)) {
-	   fprintf (stderr, "No RX device found\n");
-	   throw (27);
+	   throw (pluto_exception ("No RX device found"));
 	}
 
 	struct iio_channel *chn;
@@ -291,8 +287,7 @@
 
 	fprintf (stderr, "* Configuring AD9361 for streaming\n");
 	if (!cfg_ad9361_streaming_ch (ctx, &rx_cfg, RX, 0)) {
-	   fprintf (stderr, "RX port 0 not found\n");
-	   throw (28);
+	   throw (pluto_exception ("RX port 0 not found"));
 	}
 
 	if (get_phy_chan (ctx, RX, 0, &chn)) {
@@ -311,18 +306,16 @@
 	   }
 
 	   if (ret < 0)
-	      fprintf (stderr, "setting agc/gain did not work\n");
+	      throw (pluto_exception ("setting agc/gain did not work"));
 	}
 
 	fprintf (stderr, "* Initializing AD9361 IIO streaming channels\n");
 	if (!get_ad9361_stream_ch (ctx, RX, rx, 0, &rx0_i)) {
-	   fprintf (stderr, "RX chan i not found");
-	   throw (30);
+	   throw (pluto_exception ("RX I channel not found"));
 	}
 	
 	if (!get_ad9361_stream_ch (ctx, RX, rx, 1, &rx0_q)) {
-	   fprintf (stderr,"RX chan q not found");
-	   throw (31);
+	   throw (pluto_exception ("RX  Q channel not found"));
 	}
 	
         iio_channel_enable (rx0_i);
@@ -330,9 +323,8 @@
 
         rxbuf = iio_device_create_buffer (rx, 256*1024, false);
 	if (rxbuf == nullptr) {
-	   fprintf (stderr, "could not create RX buffer, fatal");
 	   iio_context_destroy (ctx);
-	   throw (35);
+	   throw (pluto_exception ("could not create RX buffer"));
 	}
 
 	iio_buffer_set_blocking_mode (rxbuf, true);

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp Changed

@@ -29,7 +29,10 @@
 #include	<QFileDialog>
 #include	"pluto-rxtx-handler.h"
 #include	"xml-filewriter.h"
-//
+#include	"device-exceptions.h"
+
+#include	"fft-complex.h"
+
 //	Description for the fir-filter is here:
 //#include	"ad9361.h"
 
@@ -43,7 +46,6 @@
 	return tmpstr;
 }
 
-
 int	plutoHandler::
 	ad9361_set_trx_fir_enable (struct iio_device *dev, int enable) {
 int ret = iio_device_attr_write_bool (dev,
@@ -213,21 +215,24 @@
 	if (fmFrequency == 0)
 	   fmFrequency = 110000;
 	this	-> fmFrequency		= fmFrequency * KHz (1);
-	setupUi (&myFrame);
-	myFrame. show	();
+	plutoSettings -> beginGroup ("plutoSettings");
+        int x   = plutoSettings -> value ("position-x", 100). toInt ();
+        int y   = plutoSettings -> value ("position-y", 100). toInt ();
+        plutoSettings -> endGroup ();
+        setupUi (&myFrame);
+        myFrame. move (QPoint (x, y));
+        myFrame. show ();
 
 #ifdef	__MINGW32__
 	wchar_t *libname = (wchar_t *)L"libiio.dll";
         Handle  = LoadLibrary (libname);
 	if (Handle == NULL) {
-	  fprintf (stderr, "Failed to libiio.dll\n");
-	  throw (22);
+	  throw (pluto_exception ("Failed to libiio.dll"));
 	}
 #else
 	Handle		= dlopen ("libiio.so", RTLD_NOW);
 	if (Handle == NULL) {
-	   fprintf (stderr,  "%s", "we could not load libiio.so");
-	   throw (23);
+	   throw (pluto_exception ("we could not load libiio.so"));
 	}
 #endif
 
@@ -238,7 +243,7 @@
 #else
            dlclose (Handle);
 #endif
-           throw (23);
+	   throw (pluto_exception ("could load all required lib functions"));
         }
 
 	this	-> ctx			= nullptr;
@@ -296,31 +301,26 @@
 	}
 
 	if (ctx == nullptr) {
-	   fprintf (stderr, "No pluto found, fatal\n");
-	   throw (24);
+	   throw (pluto_exception ("No pluto device detected"));
 	}
 //
 
 	if (iio_context_get_devices_count (ctx) <= 0) {
-	   fprintf (stderr, "no devices, fatal");
-	   throw (25);
+	   throw (pluto_exception ("no pluto devices detected"));
 	}
 
 	if (!get_ad9361_stream_dev (ctx, TX, &tx)) {
-           fprintf (stderr, "No TX device found\n");
-           throw (26);
+           throw (pluto_exception ("No TX device found"));
         }
 
 	fprintf (stderr, "* Acquiring AD9361 streaming devices\n");
 	if (!get_ad9361_stream_dev (ctx, RX, &rx)) {
-	   fprintf (stderr, "No RX device found\n");
-	   throw (27);
+	   throw (pluto_exception ("No RX device found"));
 	}
 
 	fprintf (stderr, "* Configuring AD9361 for streaming\n");
 	if (!cfg_ad9361_streaming_ch (ctx, &rx_cfg, RX, 0)) {
-	   fprintf (stderr, "RX port 0 not found\n");
-	   throw (28);
+	   throw (pluto_exception ("RX port 0 not found"));
 	}
 
 	struct iio_channel *chn;
@@ -354,28 +354,24 @@
 
         if (!cfg_ad9361_streaming_ch (ctx, &tx_cfg, TX, 0)) {
            fprintf (stderr, "TX port 0 not found");
-           throw (29);
+	   throw (pluto_exception ("TX port 0 not found"));
         }
 
 	fprintf (stderr, "* Initializing AD9361 IIO streaming channels\n");
 	if (!get_ad9361_stream_ch (ctx, RX, rx, 0, &rx0_i)) {
-	   fprintf (stderr, "RX chan i not found");
-	   throw (30);
+	   throw (pluto_exception ("RX  I channel not found"));
 	}
 	
 	if (!get_ad9361_stream_ch (ctx, RX, rx, 1, &rx0_q)) {
-	   fprintf (stderr,"RX chan q not found");
-	   throw (31);
+	   throw (pluto_exception ("RX Q  channel not found"));
 	}
 
 	if (!get_ad9361_stream_ch (ctx, TX, tx, 0, &tx0_i)) {
-           fprintf (stderr, "TX chan i not found");
-           throw (32);
+           throw (pluto_exception ("TX chan i not found"));
         }
 
         if (!get_ad9361_stream_ch(ctx, TX, tx, 1, &tx0_q)) {
-           fprintf (stderr, "TX chan q not found");
-           throw (33);
+           throw (pluto_exception ("TX chan q not found"));
         }
 
 	iio_channel_enable (rx0_i);
@@ -386,16 +382,14 @@
 
 	rxbuf = iio_device_create_buffer (rx, 256*1024, false);
 	if (rxbuf == nullptr) {
-	   fprintf (stderr, "could not create RX buffer, fatal");
 	   iio_context_destroy (ctx);
-	   throw (35);
+	   throw (pluto_exception ("could not create RX buffer"));
 	}
 
 	txbuf = iio_device_create_buffer (tx, 1024*1024, false);
 	if (txbuf == nullptr) {
-	   fprintf (stderr, "could not create RX buffer, fatal");
 	   iio_context_destroy (ctx);
-	   throw (35);
+	   throw (pluto_exception ("could not create TX buffer"));
 	}
 
 	iio_buffer_set_blocking_mode (rxbuf, true);
@@ -447,12 +441,7 @@
 	connected	= true;
 	state -> setText ("ready to go");
 //	set up for the display
-	fftBuffer	= (std::complex<float> *)fftwf_malloc (8192 * sizeof (fftwf_complex));
-	plan    = fftwf_plan_dft_1d (8192,
-                                    reinterpret_cast <fftwf_complex *>(fftBuffer),
-                                    reinterpret_cast <fftwf_complex *>(fftBuffer),
-                                    FFTW_FORWARD, FFTW_ESTIMATE);
-
+	fftBuffer	= new std::complex<float> 8192;
         plotgrid        = transmittedSignal;
         plotgrid        -> setCanvasBackground (QColor("black"));
 	gridColor	= QColor ("white");
@@ -486,6 +475,9 @@
 	plutoHandler::~plutoHandler() {
 	myFrame. hide ();
 	plutoSettings	-> beginGroup ("plutoSettings");
+        plutoSettings -> setValue ("position-x", myFrame. pos (). x ());
+        plutoSettings -> setValue ("position-y", myFrame. pos (). y ());
+
 	plutoSettings	-> setValue ("pluto-agcMode",
 	                              agcControl -> isChecked () ? 1 : 0);
 	plutoSettings	-> setValue ("pluto-gain", 
@@ -1180,7 +1172,7 @@
 	for (int i = 0; i < 8192; i ++)
 	   fftBuffer i = std::complex<float> (b i * window i, 0);
 
-	fftwf_execute (plan);
+	Fft_transform (fftBuffer, 8192, false);
 	
 	for (int i = 0; i < 2048; i ++)
 	   X_axis i = i * 96 / 2048;

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/pluto-rxtx/pluto-rxtx-handler.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/pluto-rxtx/pluto-rxtx-handler.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/rtl_tcp/rtl_tcp_client.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/rtl_tcp/rtl_tcp_client.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp Changed

@@ -35,6 +35,7 @@
 #include	"rtl-dongleselect.h"
 #include	"rtl-sdr.h"
 #include	"xml-filewriter.h"
+#include	"device-exceptions.h"
 
 #ifdef	__MINGW32__
 #define	GETPROCADDRESS	GetProcAddress
@@ -128,7 +129,13 @@
 
 	rtlsdrSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
-	setupUi (&myFrame);
+	rtlsdrSettings		-> beginGroup ("rtlsdrSettings");
+	int x   = rtlsdrSettings -> value ("position-x", 100). toInt ();
+        int y   = rtlsdrSettings -> value ("position-y", 100). toInt ();
+        rtlsdrSettings -> endGroup ();
+        setupUi (&myFrame);
+        myFrame. move (QPoint (x, y));
+
 	myFrame. show();
 	filtering			= false;
 
@@ -152,21 +159,19 @@
 	phandle -> load ();
 
 	if (!phandle -> isLoaded ()) {
-	   fprintf (stderr, "failed to open %s\n", libraryString);
-	   throw (20);
+	   throw (rtlsdr_exception (std::string ("failed to open ") + std::string (libraryString)));
 	}
 
 	if (!load_rtlFunctions ()) {
 	   delete (phandle);
-	   throw (21);
+	   throw (rtlsdr_exception ("could not load one or more library functions"));
 	}
 
 //	Ok, from here we have the library functions accessible
 	deviceCount 		= this -> rtlsdr_get_device_count ();
 	if (deviceCount == 0) {
-	   fprintf (stderr, "No devices found\n");
 	   delete (phandle);
-	   throw (22);
+	   throw (rtlsdr_exception ("No rtlsdr device found"));
 	}
 
 	deviceIndex = 0;	// default
@@ -182,18 +187,16 @@
 //	OK, now open the hardware
 	r		= this -> rtlsdr_open (&theDevice, deviceIndex);
 	if (r < 0) {
-	   fprintf (stderr, "Opening rtlsdr device failed\n");
 	   delete phandle;
-	   throw (23);
+	   throw (rtlsdr_exception ("Opening rtlsdr device failed"));
 	}
 
 	deviceModel	= rtlsdr_get_device_name (deviceIndex);
 	deviceVersion	-> setText (deviceModel);
 	r		= this -> rtlsdr_set_sample_rate (theDevice, inputRate);
 	if (r < 0) {
-	   fprintf (stderr, "Setting samplerate failed\n");
 	   delete phandle;
-	   throw (24);
+	   throw (rtlsdr_exception ("Setting samplerate for rtlsdr failed"));
 	}
 
 	gainsCount = rtlsdr_get_tuner_gains (theDevice, nullptr);
@@ -273,6 +276,9 @@
 	               (int32_t)(this -> rtlsdr_get_center_freq (theDevice)));
 	stopReader	();
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
+        rtlsdrSettings -> setValue ("position-x", myFrame. pos (). x ());
+        rtlsdrSettings -> setValue ("position-y", myFrame. pos (). y ());
+
 	rtlsdrSettings	-> setValue ("externalGain",
 	                              gainControl -> currentText());
 	rtlsdrSettings	-> setValue ("autogain",

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/rtlsdr-handler-win/rtlsdr-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/rtlsdr-handler-win/rtlsdr-handler.cpp Changed

@@ -35,7 +35,7 @@
 #include	"rtl-dongleselect.h"
 #include	"rtl-sdr.h"
 #include	"xml-filewriter.h"
-
+#include	"device-exceptions.h"
 //#define	__X_VERSION_ 1
 
 #define	READLEN_DEFAULT	(4 * 8192)
@@ -125,7 +125,12 @@
 
 	rtlsdrSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
-	setupUi (&myFrame);
+	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
+	int x   = rtlsdrSettings -> value ("position-x", 100). toInt ();
+        int y   = rtlsdrSettings -> value ("position-y", 100). toInt ();
+        rtlsdrSettings -> endGroup ();
+        setupUi (&myFrame);
+        myFrame. move (QPoint (x, y));
 	myFrame. show();
 	filtering			= false;
 
@@ -142,8 +147,7 @@
 //	Ok, from here we have the library functions accessible
 	deviceCount 		= rtlsdr_get_device_count ();
 	if (deviceCount == 0) {
-	   fprintf (stderr, "No devices found\n");
-	   throw (22);
+	   throw (rtlsdr_exception ("No device found\n"));
 	}
 
 	deviceIndex = 0;	// default
@@ -159,16 +163,14 @@
 //	OK, now open the hardware
 	r		=  rtlsdr_open (&theDevice, deviceIndex);
 	if (r < 0) {
-	   fprintf (stderr, "Opening rtlsdr device failed\n");
-	   throw (23);
+	   throw (rtlsdr_exception ("Opening rtlsdr device failed"));
 	}
 
 	deviceModel	= rtlsdr_get_device_name (deviceIndex);
 	deviceVersion	-> setText (deviceModel);
 	r		= rtlsdr_set_sample_rate (theDevice, inputRate);
 	if (r < 0) {
-	   fprintf (stderr, "Setting samplerate failed\n");
-	   throw (24);
+	   throw (rtlsdr_exception ("Setting samplerate failed\n"));
 	}
 
 	gainsCount = rtlsdr_get_tuner_gains (theDevice, nullptr);
@@ -254,6 +256,9 @@
 //	   rtlsdr_clode (theDevice);
 	}
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
+        rtlsdrSettings	-> setValue ("position-x", myFrame. pos (). x ());
+        rtlsdrSettings	-> setValue ("position-y", myFrame. pos (). y ());
+
 	rtlsdrSettings	-> setValue ("externalGain",
 	                              gainControl -> currentText());
 	rtlsdrSettings	-> setValue ("autogain",

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

@@ -29,6 +29,7 @@
 #include	"sdrplay-handler-v2.h"
 #include	"sdrplayselect.h"
 #include	"xml-filewriter.h"
+#include	"device-exceptions.h"
 static
 int     RSP1_Table  = {0, 24, 19, 43};
 
@@ -68,31 +69,29 @@
 
 	sdrplaySettings			= s;
 	this	-> recorderVersion	= recorderVersion;
+	sdrplaySettings	-> beginGroup ("sdrplaySettings");
+	int x	= sdrplaySettings -> value ("position-x", 100). toInt ();
+	int y	= sdrplaySettings -> value ("position-y", 100). toInt ();
+	sdrplaySettings	-> endGroup ();
 	setupUi (&myFrame);
-	myFrame. show();
+	myFrame. move (QPoint (x, y));
+	myFrame. show ();
 	antennaSelector		-> hide();
 	tunerSelector		-> hide();
 	this	-> inputRate	= Khz (2048);
 
 	bool success	= fetchLibrary ();
 	if (!success) 
-	   throw (23);
+	   throw (sdrplay_2_exception ("mir_sdr_api could not be found"));
 	success = loadFunctions();
 	if (!success) {
 	   releaseLibrary ();
-	   throw (24);
+	   throw (sdrplay_2_exception ("function in mir_sdr_api not found"));
 	}
 
 	err		= my_mir_sdr_ApiVersion (&ver);
-	if (err != mir_sdr_Success) {
-	   fprintf (stderr, "error at ApiVersion %s\n",
-	                 errorCodes (err). toLatin1(). data());
-	   throw (25);
-	}
-	
 	if (ver < 2.13) {
-	   fprintf (stderr, "sorry, library too old\n");
-	   throw (26);
+	   throw (sdrplay_2_exception ("Library version too old"));
 	}
 
 	api_version	-> display (ver);
@@ -135,13 +134,12 @@
 	   fprintf (stderr, "error at GetDevices %s \n",
 	                   errorCodes (err). toLatin1(). data());
 
-	   throw (27);
+	   throw (sdrplay_2_exception (errorCodes (err). toStdString ()));
 	}
 
 	if (numofDevs == 0) {
 	   releaseLibrary ();
-	   fprintf (stderr, "Sorry, no device found\n");
-	   throw (27);
+	   throw (sdrplay_2_exception ("No devices found"));
 	}
 
 	if (numofDevs > 1) {
@@ -171,7 +169,7 @@
 	                   errorCodes (err). toLatin1(). data());
 //	   my_mir_sdr_ReleaseDeviceIdx (deviceIndex);
 	   releaseLibrary ();
-	   throw (28);
+	   throw (sdrplay_2_exception ("error in setting device parameters"));
 	}
 //
 //	we know we are only in the frequency range 175 .. 230 Mhz,
@@ -258,6 +256,8 @@
 	stopReader();
 	myFrame. hide ();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings");
+	sdrplaySettings	-> setValue ("position-x", myFrame. pos (). x ());
+	sdrplaySettings	-> setValue ("position-y", myFrame. pos (). y ());
 	sdrplaySettings -> setValue ("sdrplay-ppm", ppmControl -> value());
 	sdrplaySettings -> setValue ("sdrplay-ifgrdb",
 	                                    GRdBSelector -> value());
@@ -332,6 +332,8 @@
 sdrplayHandler	*p	= static_cast<sdrplayHandler *> (cbContext);
 std::complex<int16_t> localBuf numSamples;
 
+	if (hwRemoved)
+	   fprintf (stderr, "Hardware removed\n");
 	if (reset || hwRemoved)
 	   return;
 	for (i = 0; i <  (int)numSamples; i ++)
@@ -820,7 +822,7 @@
               fprintf (stderr,
 	               "failed to locate API registry entry, error = %d\n",
 	               (int)GetLastError ());
-	      throw (20);
+	      return false;
 	   }
 
 	   RegQueryValueEx (APIkey,
@@ -840,7 +842,7 @@
 
 	   Handle	= LoadLibrary (x);
 	   if (Handle == NULL) {
-	      throw (21);
+	      return false;
 	   }
 	}
 #else
@@ -852,7 +854,7 @@
 
 	if (Handle == NULL) {
 	   fprintf (stderr, "error report %s\n", dlerror ());
-	   throw (22);
+	   return false;
 	}
 #endif
 	libraryLoaded	= true;
@@ -1071,4 +1073,11 @@
 	}
 }
 
-	
+QPoint	sdrplayHandler::get_coords	() {
+	return myFrame. mapToGlobal (QPoint (0, 0));
+}
+
+void	sdrplayHandler::moveTo		(QPoint p) {
+	myFrame. move (p);
+}
+

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/sdrplay-handler-v2/sdrplayselect.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/sdrplay-handler-v2/sdrplayselect.h Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

@@ -43,15 +43,51 @@
 #define SDRPLAY_RSPduo_ 3
 #define SDRPLAY_RSPdx_  4
 
+#include	"device-exceptions.h"
+
+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_v3::sdrplayHandler_v3  (QSettings *s,
 	                                       QString &recorderVersion):
 	                                          _I_Buffer (4 * 1024 * 1024),
 	                                          myFrame (nullptr) {
 	sdrplaySettings			= s;
-	this	-> recorderVersion	= recorderVersion;
 	inputRate			= 2048000;
-	setupUi (&myFrame);
+	this	-> recorderVersion	= recorderVersion;
+	sdrplaySettings -> beginGroup ("sdrplaySettings_v3");
+        int x   = sdrplaySettings -> value ("position-x", 100). toInt ();
+        int y   = sdrplaySettings -> value ("position-y", 100). toInt ();
+        sdrplaySettings -> endGroup ();
+        setupUi (&myFrame);
+        myFrame. move (QPoint (x, y));
 	myFrame. show	();
+
 	antennaSelector		-> hide	();
 	tunerSelector		-> hide	();
 	nrBits			= 12;	// default
@@ -119,7 +155,7 @@
 	if (failFlag. load ()) {
 	   while (isRunning ())
 	      usleep (1000);
-	   throw (errorCode);
+	   throw sdrplay_3_exception (errorMessage (errorCode));
 	}
 	
 	fprintf (stderr, "setup sdrplay v3 seems successfull\n");
@@ -132,6 +168,9 @@
 //	thread should be stopped by now
 	myFrame. hide ();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings_v3");
+        sdrplaySettings -> setValue ("position-x", myFrame. pos (). x ());
+        sdrplaySettings -> setValue ("position-y", myFrame. pos (). y ());
+
 	sdrplaySettings -> setValue ("sdrplay-ppm",
 	                                           ppmControl -> value ());
 	sdrplaySettings -> setValue ("sdrplay-ifgrdb",
@@ -787,7 +826,7 @@
 #else
 	        wcscat (APIkeyValue, (wchar_t *)L"\\x64\\sdrplay_api.dll");
 #endif
-	   RegCloseKey(APIkey);
+	   RegCloseKey (APIkey);
 
 	   Handle	= LoadLibrary (x);
 	   if (Handle == nullptr) {

qt-dab-qt-dab-4.6-5.3.tar.gz/qt-devices/wavfiles-new/wav-reader.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/qt-devices/wavfiles-new/wav-reader.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/real-signal.png Added

qt-dab-qt-dab-4.6-5.3.tar.gz/src/backend/audio/mp4processor.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/backend/audio/mp4processor.cpp Changed

@@ -64,8 +64,10 @@
 	         mr, SLOT (setStereo (bool)));
 	connect (this, SIGNAL (newFrame (int)),
 	         mr, SLOT (newFrame (int)));
-	connect (this, SIGNAL (show_rsCorrections (int)),
-	         mr, SLOT (show_rsCorrections (int)));
+	connect (this, SIGNAL (show_rsCorrections (int, int)),
+	         mr, SLOT (show_rsCorrections (int, int)));
+	connect (this, SIGNAL (show_emptyLabel (const QString &)),
+	         mr, SLOT (showLabel (const QString &)));
 #ifdef	__WITH_FDK_AAC__
 	aacDecoder		= new fdkAAC (mr, b);
 #else
@@ -77,14 +79,15 @@
 	RSDims			= bitRate / 8;
 	frameBytes. resize (RSDims * 120);	// input
 	outVector . resize (RSDims * 110);
-	blockFillIndex	= 0;
-	blocksInBuffer	= 0;
-	frameCount	= 0;
-	frameErrors	= 0;
-	aacErrors	= 0;
-	aacFrames	= 0;
-	successFrames	= 0;
-	rsErrors	= 0;
+	blockFillIndex		= 0;
+	blocksInBuffer		= 0;
+	frameCount		= 0;
+	frameErrors		= 0;
+	aacErrors		= 0;
+	crcErrors		= 0;
+	aacFrames		= 0;
+	successFrames		= 0;
+	rsErrors		= 0;
 	totalCorrections	= 0;
 	goodFrames		= 0;
 }
@@ -128,7 +131,6 @@
 	      show_frameErrors (frameErrors);
 	      frameErrors = 0;
 	   }
-
 /**
   *	starting for real: check the fire code
   *	if the firecode is OK, we handle the frame
@@ -189,7 +191,7 @@
 	   totalCorrections += ler;
 	   goodFrames ++;
 	   if (goodFrames >= 100) {
-	      show_rsCorrections (totalCorrections);
+	      show_rsCorrections (totalCorrections, crcErrors);
 	      totalCorrections = 0;
 	      goodFrames = 0;
 	   }
@@ -309,6 +311,8 @@
 	            uint8_t L1	= buffer count - 2;
 	            my_padhandler. processPAD (buffer, count - 3, L1, L0);
 	         }
+	         else  {// no PAD data, so no synamic labe;
+	         }
 //
 //	then handle the audio
 #ifdef	__WITH_FDK_AAC__
@@ -339,8 +343,7 @@
 	      }
 	   }
 	   else {
-	      fprintf (stderr, "CRC failure with dab+ frame %d (%d)\n",
-	                                          i, num_aus);
+	      crcErrors ++;
 	   }
 //
 //	what would happen if the errors were in the 10 parity bytes

qt-dab-qt-dab-4.6-5.3.tar.gz/src/backend/backend-driver.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/backend/backend-driver.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/backend/data/data-processor.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/backend/data/data-processor.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/backend/data/epg-2/epg-decoder.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/backend/data/epg-2/epg-decoder.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/backend/data/pad-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/backend/data/pad-handler.cpp Changed

@@ -31,8 +31,8 @@
   */
 	padHandler::padHandler	(RadioInterface *mr) {
 	myRadioInterface	= mr;
-	connect (this, SIGNAL (showLabel (QString)),
-	         mr, SLOT (showLabel (QString)));
+	connect (this, SIGNAL (showLabel (const QString &)),
+	         mr, SLOT (showLabel (const QString &)));
 	connect (this, SIGNAL (show_motHandling (bool)),
 	         mr, SLOT (show_motHandling (bool)));
 	currentSlide	= nullptr;
@@ -278,7 +278,7 @@
 //	A dynamic label is created from a sequence of (dynamic) xpad
 //	fields, starting with CI = 2, continuing with CI = 3
 void	padHandler::dynamicLabel (uint8_t *data, int16_t length, uint8_t CI) {
-static int16_t segmentno	   = 0;
+//static int16_t segmentno	   = 0;
 static int16_t remainDataLength    = 0;
 static bool    isLastSegment       = false;
 static bool    moreXPad            = false;
@@ -293,12 +293,12 @@
 	   dataLength	   = length - 2; // The length with header removed
 
 	   if (first) { 
-	      segmentno = 1;
+//	      segmentno = 1;
 	      charSet = (prefix >> 4) & 017;
 	      dynamicLabelText. clear();
 	   }
-	   else 
-	      segmentno = ((prefix >> 4) & 07) + 1;
+//	   else 
+//	      segmentno = ((prefix >> 4) & 07) + 1;
 
 	   if (Cflag) {		// special dynamic label command
 	      // the only specified command is to clear the display

qt-dab-qt-dab-4.6-5.3.tar.gz/src/backend/msc-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/backend/msc-handler.cpp Changed

@@ -40,8 +40,8 @@
 	                                 uint8_t	dabMode,
 	                                 RingBuffer<uint8_t> *frameBuffer) :
 	                                       params (dabMode),
-	                                       my_fftHandler (dabMode),
-	                                       myMapper (dabMode)
+	                                       myMapper (dabMode),
+	                                       fft (params. get_T_u (), false)
 #ifdef	__MSC_THREAD__
 	                                       ,bufferSpace (params. get_L())
 #endif		                            
@@ -53,7 +53,6 @@
 	ibits. resize (BitsperBlock);
 	nrBlocks		= params. get_L();
 
-	fft_buffer		= my_fftHandler. getVector();
 	phaseReference	.resize (params. get_T_u());
 
 	numberofblocksperCIF = cifTable (dabMode - 1) & 03;
@@ -113,6 +112,8 @@
 void    mscHandler::run () {
 int	currentBlock	= 0;
 
+std::complex<float> fft_buffer params. get_T_u();
+
 	if (running. load ()) {
 	   fprintf (stderr, "already running\n");
 	   return;
@@ -129,7 +130,7 @@
 //
 //	block 3 and up are needed as basis for demodulation the "mext" block
 //	"our" msc blocks start with blkno 4
-	      my_fftHandler. do_FFT();
+	      fft. fft (fft_buffer);
               if (currentBlock >= 4) {
                  for (int i = 0; i < params. get_carriers(); i ++) {
                     int16_t      index   = myMapper. mapIn (i);
@@ -160,14 +161,16 @@
 }
 #else
 void	mscHandler::process_Msc	(std::complex<float> *b, int blkno) {
+std::complex<float> fft_buffer params. get_T_u ();;
 	if (blkno < 3)
 	   return;
+	
 	memcpy (fft_buffer, b,
-	                 params. get_T_u() * sizeof (std::complex<float>));
+	                 params. get_T_u () * sizeof (std::complex<float>));
 //
 //	block 3 and up are needed as basis for demodulation the "mext" block
 //	"our" msc blocks start with blkno 4
-	my_fftHandler. do_FFT();
+	fft. fft (fft_buffer);
 	if (blkno >= 4) {
 	   for (int i = 0; i < params. get_carriers(); i ++) {
 	      int16_t      index   = myMapper. mapIn (i);
@@ -235,7 +238,7 @@
 
 void	mscHandler::stop_service	(int subchId, int flag) {
 	locker. lock ();
-	for (int i = 0; i < theBackends. size (); i ++) {
+	for (int i = 0; i < (int)(theBackends. size ()); i ++) {
 	   Backend *b = theBackends. at (i);
 	   if ((b -> subChId == subchId) && (b -> borf == flag)) {
 	      fprintf (stderr, "stopping subchannel %d\n", subchId);
@@ -271,7 +274,7 @@
 	                                     dump,
 	                                     flag));
 	fprintf (stderr, "we have now %d backends running\n",
-	                        theBackends. size ());
+	                        (int)(theBackends. size ()));
 	return true;
 }
 
@@ -283,7 +286,7 @@
 //	gui thread, so some locking is added
 //
 
-void	mscHandler::process_mscBlock	(std::vector<int16_t> fbits,
+void	mscHandler::process_mscBlock	(std::vector<int16_t> &fbits,
 	                                 int16_t blkno) { 
 int16_t	currentblk;

qt-dab-qt-dab-4.6-5.3.tar.gz/src/ofdm/fib-decoder.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/ofdm/fib-decoder.cpp Changed

@@ -569,7 +569,7 @@
 
 	(void)Length;
 	(void)CN_bit; (void)OE_bit; (void)PD_bit;
-	fprintf (stderr, "services : %d\n", serviceCount);
+//	fprintf (stderr, "services : %d\n", serviceCount);
 	if (CN_bit == 0)	// only current configuration for now
 	   nrServices (serviceCount);
 	(void)counter;
@@ -982,6 +982,8 @@
 	QString dataName = toQStringUsingCharset (
 	                                  (const char *) label,
 	                                  (CharacterSet) charSet);
+	for (int i = dataName. length (); i < 16; i ++)
+	   dataName. append (' ');
 	serviceIndex	= findService (dataName);
 	if (serviceIndex == -1) {
 	   createService (dataName, SId, 0);
@@ -1112,7 +1114,6 @@
 	                               int16_t	ASCTy) {
 int16_t	i;
 int16_t	firstFree	= -1;
-bool	showFlag	= true;
 int	serviceIndex	= findService (SId);
 
 	if (serviceIndex == -1)
@@ -1137,8 +1138,8 @@
 
 	
 	QString dataName = ensemble -> services serviceIndex. serviceLabel;
-	if (ensemble -> services serviceIndex. is_shown)
-	   showFlag = false;
+//	if (ensemble -> services serviceIndex. is_shown)
+//	   showFlag = false;
 
 	bool	useFlag	 = base -> serviceComps firstFree. inUse;
 	if (!useFlag) {
@@ -1560,7 +1561,7 @@
 }
 
 std::vector<serviceId>
-	fibDecoder::insert (std::vector<serviceId> l,
+	fibDecoder::insert (std::vector<serviceId> &l,
 	                        serviceId n, int order) {
 std::vector<serviceId> k;
 	if (l . size () == 0) {
@@ -1927,7 +1928,7 @@
 	      if (subChannelOf (i) == "")
 	         continue;
 	      if (!hasContents) {
-	         out << "\n\n";
+	         out << "\n";
 	         out << packetHeader ();
 	      }
 	      hasContents = true;

qt-dab-qt-dab-4.6-5.3.tar.gz/src/ofdm/fic-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/ofdm/fic-handler.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/ofdm/ofdm-decoder.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/ofdm/ofdm-decoder.cpp Changed

@@ -33,7 +33,6 @@
 #include	"msc-handler.h"
 #include	"freq-interleaver.h"
 #include	"dab-params.h"
-
 /**
   *	\brief ofdmDecoder
   *	The class ofdmDecoder is
@@ -46,8 +45,8 @@
 	                                 int16_t	bitDepth,
 	                                 RingBuffer<std::complex<float>> *iqBuffer) :
 	                                    params (dabMode),
-	                                    my_fftHandler (dabMode),
-	                                    myMapper (dabMode) {
+	                                    myMapper (dabMode),
+	                                    fft (params. get_T_u (), false) {
 	this	-> myRadioInterface	= mr;
 	this	-> iqBuffer		= iqBuffer;
 	connect (this, SIGNAL (showIQ (int)),
@@ -55,13 +54,12 @@
 	connect (this, SIGNAL (showQuality (float, float, float)),
 	         myRadioInterface, SLOT (showQuality (float, float, float)));
 //
-	this	-> T_s			= params. get_T_s();
-	this	-> T_u			= params. get_T_u();
-	this	-> nrBlocks		= params. get_L();
-	this	-> carriers		= params. get_carriers();
+	this	-> T_s			= params. get_T_s	();
+	this	-> T_u			= params. get_T_u	();
+	this	-> nrBlocks		= params. get_L		();
+	this	-> carriers		= params. get_carriers	();
 
 	this	-> T_g			= T_s - T_u;
-	fft_buffer			= my_fftHandler. getVector();
 	phaseReference			.resize (T_u);
 }
 
@@ -78,15 +76,12 @@
   */
 void	ofdmDecoder::processBlock_0 (
 	                std::vector <std::complex<float> > buffer) {
-	memcpy (fft_buffer, buffer. data(),
-	                             T_u * sizeof (std::complex<float>));
-
-	my_fftHandler. do_FFT();
+	fft. fft (buffer);
 /**
   *	we are now in the frequency domain, and we keep the carriers
   *	as coming from the FFT as phase reference.
   */
-	memcpy (phaseReference. data (), fft_buffer,
+	memcpy (phaseReference. data (), buffer. data (),
 	                   T_u * sizeof (std::complex<float>));
 }
 //
@@ -100,30 +95,32 @@
 }
 
 float	ofdmDecoder::computeQuality (std::complex<float> *v) {
-int16_t i;
-std::complex<float>	avgPoint	= std::complex<float> (0, 0);
-float		absVal			= 0;
-std::complex<float>	x T_u;
+std::complex<float> XX  carriers;
 float	nominator	= 0;
-float	denominator	= 0;
-	float aa	= 0;
+//float	aa	= 0;
+
 //
 //	since we do not equalize, we have a kind of "fake"
-//	reference point. We know that the ideal point 
-//	is (x, x, where x = abs (I, Q) / sqrt (2);
-
-	for (i = 0; i < carriers; i ++) {
-	   aa	+= abs (v i);
+//	reference point.
+//
+//	The key parameter here is the phase offset, so we compute the
+//	std deviation of the phases rather than the computation
+//	from the Modulation Error Ratio as specified in Tr 101 290
+//
+	std::complex<float> middle = std::complex<float> (0, 0);
+	for (int i = 0; i < carriers; i ++) {
+	   std::complex<float> ss = v T_u / 2 - carriers / 2 + i;
+	   XX i = std::complex<float> (abs (real (ss)),
+	                                         abs (imag (ss)));
+	   middle += XX i;
 	}
-	absVal		= aa / carriers / sqrt (2);
-
-	for (i = 0; i < carriers; i ++) {
-	   nominator	+= square (absVal) + square (absVal);
-	   denominator	+= square (abs (absVal - abs (real (v i)))) +
-	                   square (abs (absVal - abs (imag (v i))));
+	middle	= conj (middle);
+	for (int i = 0; i < carriers; i ++) {
+	   float x1 = arg (XX i * middle);
+	   nominator += x1 * x1;
 	}
-
-	return 10 * log10 (0.0010 + nominator / denominator);
+//	fprintf (stderr, "%f \n", arg (middle * std::complex<float> (0, 1))  / (2 * M_PI) * 360);
+	return sqrt (nominator / carriers) / (M_PI / 2) * 10;
 }
 /**
   *	for the other blocks of data, the first step is to go from
@@ -133,11 +130,11 @@
   */
 
 static	int	cnt	= 0;
-void	ofdmDecoder::decode (std::vector <std::complex<float>> buffer,
+void	ofdmDecoder::decode (std::vector <std::complex<float>> &buffer,
 	                     int32_t blkno, std::vector<int16_t> &ibits) {
 int16_t	i;
 std::complex<float> conjVector T_u;
-
+std::complex<float> fft_buffer T_u;
 	memcpy (fft_buffer, &((buffer. data()) T_g),
 	                               T_u * sizeof (std::complex<float>));
 
@@ -145,7 +142,7 @@
 /**
   *	first step: do the FFT
   */
-	my_fftHandler. do_FFT();
+	fft. fft (fft_buffer);
 /**
   *	a little optimization: we do not interchange the
   *	positive/negative frequencies to their right positions.

qt-dab-qt-dab-4.6-5.3.tar.gz/src/ofdm/phasereference.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/ofdm/phasereference.cpp Changed

@@ -43,7 +43,8 @@
 	                                processParams	*p):
 	                                     phaseTable (p -> dabMode),
 	                                     params (p -> dabMode),
-	                                     my_fftHandler (p -> dabMode) {
+	                                     fft_forward (params. get_T_u (), false),
+	                                     fft_backwards (params. get_T_u (), true) {
 int32_t	i;
 float	Phi_k;
 
@@ -57,7 +58,6 @@
 	
 	refTable.		resize (T_u);
 	phaseDifferences.       resize (diff_length);
-	fft_buffer		= my_fftHandler. getVector();
 
 	framesperSecond		= 2048000 / params. get_T_F();
 	displayCounter		= 0;
@@ -88,7 +88,7 @@
 #endif
 }
 
-	phaseReference::~phaseReference() {
+	phaseReference::~phaseReference () {
 #ifdef	__WITH_JAN__
 	delete theEstimator;
 #endif
@@ -112,19 +112,19 @@
 float	Max		= -1000;
 float	lbuf T_u / 2;
 
-	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
-	my_fftHandler. do_FFT();
+	fft_forward. fft (v);
 //
 //	into the frequency domain, now correlate
 	for (i = 0; i < T_u; i ++) 
-	   fft_buffer i *= conj (refTable i);
+	   v i = v i * conj (refTable i);
+
 //	and, again, back into the time domain
-	my_fftHandler. do_IFFT();
+	fft_backwards. fft (v);
 /**
   *	We compute the average and the max signal values
   */
 	for (i = 0; i < T_u / 2; i ++) {
-	   lbuf i = jan_abs (fft_buffer i);
+	   lbuf i = jan_abs (vi);
 	   sum	+= lbuf i;
 	}
 
@@ -170,27 +170,28 @@
 //	an approach that works fine is to correlate the phasedifferences
 //	between subsequent carriers
 #define	SEARCH_RANGE	(2 * 35)
-int16_t	phaseReference::estimate_CarrierOffset (std::vector<std::complex<float>> v) {
-int16_t	i, j, index_1 = 100, index_2 = 100;
+int16_t	phaseReference::
+	     estimate_CarrierOffset (std::vector<std::complex<float>> v) {
+int16_t index_1 = 100, index_2 = 100;
 float	computedDiffs SEARCH_RANGE + diff_length + 1;
 
-	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
-	my_fftHandler. do_FFT();
+	fft_forward. fft (v);
 
-	for (i = T_u - SEARCH_RANGE / 2;
+	for (int i = T_u - SEARCH_RANGE / 2;
 	     i < T_u + SEARCH_RANGE / 2 + diff_length; i ++) {
 	   computedDiffs i - (T_u - SEARCH_RANGE / 2) =
-	      abs (arg (fft_buffer i % T_u * conj (fft_buffer (i + 1) % T_u)));
+	      abs (arg (v i % T_u *
+	                      conj (v (i + 1) % T_u)));
 	}
 
 	float	Mmin	= 1000;
 	float	Mmax	= 0;
-	for (i = T_u - SEARCH_RANGE / 2;
+	for (int i = T_u - SEARCH_RANGE / 2;
 	     i < T_u + SEARCH_RANGE / 2; i ++) {
 	   float sum	= 0;
 	   float sum2	= 0;
 
-	   for (j = 1; j < diff_length; j ++) {
+	   for (int j = 1; j < diff_length; j ++) {
 	      if (phaseDifferences j - 1 < 0.1) {
 	         sum += computedDiffs i - (T_u - SEARCH_RANGE / 2) + j;
 	      }
@@ -212,26 +213,8 @@
 	   return 100;
 	return index_1 - T_u; 
 }
-//	An alternative way to compute the small frequency offset
-//	is to look at the phase offset of subsequent carriers
-//	in block 0, compared to the values as computed from the
-//	reference block.
-//	The values are reasonably close to the values computed
-//	on the fly
-#define	LLENGTH	100
-float	phaseReference::estimate_FrequencyOffset (std::vector <std::complex<float>> v) {
-int16_t	i;
-float pd	= 0;
-
-	for (i = - LLENGTH / 2 ; i < LLENGTH / 2; i ++) {
-	   std::complex<float> a1 = refTable (T_u + i) % T_u * conj (refTable (T_u + i + 1) % T_u);
-	   std::complex<float> a2 = fft_buffer (T_u + i) % T_u * conj (fft_buffer (T_u + i + 1) % T_u);
-	   pd += arg (a2) - arg (a1);
-	}
-	return pd / LLENGTH;
-}
 
-float	phaseReference::phase (std::vector<complex<float>> v, int Ts) {
+float	phaseReference::phase (std::vector<complex<float>> &v, int Ts) {
 std::complex<float> sum = std::complex<float> (0, 0);
 
 	for (int i = 0; i < Ts; i ++)
@@ -241,35 +224,10 @@
 }
 
 #ifdef	__WITH_JAN__
-void	phaseReference::estimate	(std::vector<std::complex<float>>& v) {
+void	phaseReference::estimate	(std::vector<std::complex<float>> v) {
 std::complex<float> h_td TAPS;
 
-	for (int i = 0; i < T_u; i ++)
-	   fft_buffer i = v i;
-	
-	my_fftHandler. do_FFT();
-	theEstimator -> estimate (fft_buffer, h_td);
-
-//	float	Tau		= 0;
-//	float	teller		= 0;
-//	float	noemer		= 0;
-//	for (int i = - TAPS / 2; i < TAPS / 2; i ++) {
-//	   float h_ts = abs (h_td TAPS / 2 + i) * abs (h_td TAPS / 2 + i);
-//	   teller += i * h_ts;
-//	   noemer += h_ts;
-//	}
-//	Tau	= teller / noemer;
-//	teller	= 0;
-//	noemer	= 0;
-//
-//	for (int i = -TAPS / 2; i < TAPS / 2; i ++) {
-//	   float h_ts = abs (h_td TAPS / 2 + i) * abs (h_td TAPS / 2 + i);
-//	   teller += (i - Tau) * (i - Tau) * h_ts;
-//	   noemer += h_ts;
-//	}
-//	
-//	fprintf (stderr, "Tau = %f, rms delay spread %f\n", Tau,
-//	                                                teller / noemer);
+	fft_forward. fft (v);
+	theEstimator -> estimate (v, h_td);
 }
-
 #endif

qt-dab-qt-dab-4.6-5.3.tar.gz/src/ofdm/sample-reader.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/ofdm/sample-reader.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/ofdm/tii-detector.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/ofdm/tii-detector.cpp Changed

@@ -24,8 +24,15 @@
 #include	"tii-detector.h"
 #include	<cstdio>
 #include	<cinttypes>
+#include	<cstring>
+#include	"fft-complex.h"
 //
 
+
+#ifndef M_PI
+# define M_PI           3.14159265358979323846  /* pi */
+#endif
+
 static
 uint8_t table  = {
 	0017,		// 0 0 0 0 1 1 1 1		0
@@ -108,15 +115,13 @@
 
 
 		TII_Detector::TII_Detector (uint8_t dabMode, int16_t depth):
-	                                    params (dabMode),
-	                                    my_fftHandler (dabMode) {
+	                                    params (dabMode) {
 int16_t	i;
 
 	this	-> depth	= depth;
 	this	-> T_u		= params. get_T_u();
 	carriers		= params. get_carriers();
 	theBuffer. resize	(T_u);
-	fft_buffer		= my_fftHandler. getVector();	
 	window. resize 		(T_u);
 	for (i = 0; i < T_u; i ++)
 	   window i = 0.54 - 0.46 * cos (2 * M_PI * (float)i / T_u);
@@ -128,7 +133,7 @@
 	detectMode_new	= false;
 }
 
-		TII_Detector::~TII_Detector() {
+		TII_Detector::~TII_Detector () {
 }
 
 void	TII_Detector::setMode	(bool b) {
@@ -136,7 +141,7 @@
 }
 
 
-void	TII_Detector::reset() {
+void	TII_Detector::reset	() {
 	for (int i = 0; i < T_u; i ++)
 	   theBuffer i = std::complex<float> (0, 0);
 }
@@ -147,14 +152,14 @@
 int	i;
 
 	for (i = 0; i < T_u; i ++)
-	   fft_buffer i = cmul (v i, window i);
-	my_fftHandler. do_FFT();
+	   v i = v i * window i;
+	Fft_transform (v. data (), T_u, false);
 
 	for (i = 0; i < T_u; i ++)
-	   theBuffer i += fft_buffer i;
+	   theBuffer i += v i;
 }
 //
-//	Note that the input is fft output, not yet reodered
+//	Note that the input is fft output, not yet reordered
 void	TII_Detector::collapse (std::complex<float> *inVec, float *outVec) {
 int	i;
 	for (i = 0; i < carriers / 8; i ++) {	
@@ -267,7 +272,7 @@
 	int finInd = -1;
 	if (detectMode_new) {
 	   float mm = 0;
-	   for (int k = 0; k < sizeof (table); k ++) {
+	   for (int k = 0; k < (int)(sizeof (table)); k ++) {
 	      float val = 0;
 	      for (int l = 0; l < NUM_GROUPS; l ++)
 	         if ((table k & bits l) != 0)

qt-dab-qt-dab-4.6-5.3.tar.gz/src/output/audiosink.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/output/audiosink.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/output/fir-filters.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/output/fir-filters.cpp Changed

@@ -22,16 +22,13 @@
  */
 
 #include	"fir-filters.h"
-#ifndef	__MINGW32__
-#include	"alloca.h"
-#endif
 
-//FIR LowPass
+//	FIR LowPass
 
 	LowPassFIR::LowPassFIR (int16_t firsize,
 	                        int32_t Fc, int32_t fs){
 float	sum	= 0.0;
-float	*temp 	= (float *)alloca (firsize * sizeof (float));
+float	temp firsize;
 
 	this -> frequency	= (float)Fc / fs;
 	this -> filterSize	= firsize;
@@ -41,7 +38,7 @@
 
 	for (int i = 0; i < filterSize; i ++) {
 	   filterKernel i	= 0;
-	   Buffer i		= 0;
+	   Buffer i		= std::complex<float> (0, 0);
 	}
 
 	for (int i = 0; i < filterSize; i ++) {
@@ -60,9 +57,7 @@
 	}
 
 	for (int i = 0; i < filterSize; i ++)
-	   filterKernel i = std::complex<float> (temp i / sum, 0);
-	fprintf (stderr, "Buffersize = %d, filterSize %d\n",
-	                    Buffer. size (), filterSize);
+	   filterKernel i = temp i / sum;
 }
 
 	LowPassFIR::~LowPassFIR () {
@@ -101,9 +96,9 @@
 	}
 
 	for (int i = 0; i < filterSize; i ++)
-	   filterKernel i = std::complex<float> (temp i / sum, 0);
+	   filterKernel i = temp i / sum;
 }
-//
+
 //	we process the samples backwards rather than reversing
 //	the kernel
 std::complex<float>	LowPassFIR::Pass (std::complex<float> z) {
@@ -122,20 +117,8 @@
 	return tmp;
 }
 
-float LowPassFIR::Pass (float v) {
-int16_t		i;
-float	tmp	= 0;
-
-	Buffer ip = std::complex<float> (v, 0);
-	for (i = 0; i < filterSize; i ++) {
-	   int16_t index = ip - i;
-	   if (index < 0)
-	      index += filterSize;
-	   tmp += real (Buffer index) * real (filterKernel i);
-	}
-
-	ip = (ip + 1) % filterSize;
-	return tmp;
+float	LowPassFIR::Pass (float v) {
+	return real (Pass (std::complex<float> (v, 0)));
 }

qt-dab-qt-dab-4.6-5.3.tar.gz/src/protection/eep-protection.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/protection/eep-protection.cpp Changed

@@ -5,6 +5,7 @@
  *    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
@@ -34,7 +35,6 @@
 	eep_protection::eep_protection (int16_t bitRate,
 	                                int16_t protLevel):
 	                                     protection (bitRate, protLevel) {
-int16_t	i, j;
 int16_t	viterbiCounter	= 0;
 int16_t	L1 = 0,
         L2 = 0;
@@ -119,16 +119,16 @@
 //	with a pair of tuples
 //	(L1, PI1), (L2, PI2)
 //
-	for (i = 0; i < L1; i ++) {
-	   for (j = 0; j < 128; j ++) {
+	for (int i = 0; i < L1; i ++) {
+	   for (int j = 0; j < 128; j ++) {
 	      if (PI1 j % 32 != 0) 
 	         indexTable viterbiCounter = true;
 	      viterbiCounter ++;	
 	   }
 	}
 
-	for (i = 0; i < L2; i ++) {
-	   for (j = 0; j < 128; j ++) {
+	for (int i = 0; i < L2; i ++) {
+	   for (int j = 0; j < 128; j ++) {
 	      if (PI2 j % 32 != 0) 
 	         indexTable viterbiCounter = true;
 	      viterbiCounter ++;	
@@ -136,31 +136,13 @@
 	}
 //	we had a final block of 24 bits  with puncturing according to PI_X
 //	This block constitues the 6 * 4 bits of the register itself.
-	for (i = 0; i < 24; i ++) {
+	for (int i = 0; i < 24; i ++) {
 	   if (PI_X i != 0) 
 	      indexTable viterbiCounter = true;
 	   viterbiCounter ++;
 	}
 }
 
-	eep_protection::~eep_protection() {
-}
-
-bool	eep_protection::deconvolve (int16_t *v,
-	                            int32_t size,
-	                            uint8_t *outBuffer) {
-
-int16_t	i;
-int16_t	inputCounter	= 0;
-	(void)size;			// size was known already
-
-	memset (viterbiBlock. data(), 0,
-	                 (outSize * 4 + 24) * sizeof (int16_t)); 
-	for (i = 0; i < outSize * 4 + 24; i ++) 
-	   if (indexTable i)
-	      viterbiBlock i = v inputCounter ++;
-	
-	viterbiSpiral::deconvolve (viterbiBlock. data(), outBuffer);
-	return true;
+	eep_protection::~eep_protection	() {
 }

qt-dab-qt-dab-4.6-5.3.tar.gz/src/protection/protection.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/protection/protection.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/protection/uep-protection.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/protection/uep-protection.cpp Changed

@@ -123,9 +123,8 @@
 
 static
 int16_t	findIndex (int16_t bitRate, int16_t protLevel) {
-int16_t	i;
 
-	for (i = 0; profileTable i.bitRate != 0; i ++)
+	for (int i = 0; profileTable i.bitRate != 0; i ++)
 	   if ((profileTable i. bitRate == bitRate) &&
 	       (profileTable i. protLevel == protLevel))
 	      return i;
@@ -144,8 +143,8 @@
      uep_protection::uep_protection (int16_t bitRate,
                                         int16_t protLevel):
                                             protection (bitRate, protLevel) {
-int16_t index, i, j;
-int16_t	viterbiCounter	= 0;
+int16_t		index;
+int16_t		viterbiCounter	= 0;
 int16_t         L1;
 int16_t         L2;
 int16_t         L3;
@@ -181,24 +180,24 @@
 //
 //	We prepare a mapping table with the given punctures
 	memset (indexTable. data(), 0, (4 * outSize + 24) * sizeof (uint8_t));
-	for (i = 0; i < L1; i ++) {
-	   for (j = 0; j < 128; j ++) {
+	for (int i = 0; i < L1; i ++) {
+	   for (int j = 0; j < 128; j ++) {
 	      if (PI1 j % 32 != 0) 
 	         indexTable viterbiCounter = true;
 	      viterbiCounter ++;
 	   }
 	}
 
-	for (i = 0; i < L2; i ++) {
-	   for (j = 0; j < 128; j ++) {
+	for (int i = 0; i < L2; i ++) {
+	   for (int j = 0; j < 128; j ++) {
 	      if (PI2 j % 32 != 0) 
 	         indexTable viterbiCounter = true;
 	      viterbiCounter ++;
 	   }
 	}
 
-	for (i = 0; i < L3; i ++) {
-	   for (j = 0; j < 128; j ++) {
+	for (int i = 0; i < L3; i ++) {
+	   for (int j = 0; j < 128; j ++) {
 	      if (PI3 j % 32 != 0) 
 	         indexTable viterbiCounter = true;
 	      viterbiCounter ++;	
@@ -206,8 +205,8 @@
 	}
 
 	if (PI4 != nullptr)
-	   for (i = 0; i < L4; i ++) {
-	      for (j = 0; j < 128; j ++) {
+	   for (int i = 0; i < L4; i ++) {
+	      for (int j = 0; j < 128; j ++) {
 	         if (PI4 j % 32 != 0) 
 	            indexTable viterbiCounter = true;
 	         viterbiCounter ++;	
@@ -218,30 +217,13 @@
   *	we have a final block of 24 bits  with puncturing according to PI_X
   *	This block constitues the 6 * 4 bits of the register itself.
   */
-	for (i = 0; i < 24; i ++) {
+	for (int i = 0; i < 24; i ++) {
 	   if (PI_X i != 0)  
 	      indexTable viterbiCounter = true;
 	   viterbiCounter ++;
 	}
 }
 
-	uep_protection::~uep_protection() {
+	uep_protection::~uep_protection () {
 }
 
-bool	uep_protection::deconvolve (int16_t *v,
-	                            int32_t size,
-	                            uint8_t *outBuffer) {
-int16_t	i;
-int16_t	inputCounter	= 0;
-//	clear the bits in the viterbiBlock,
-//	only the non-punctured ones are set
-	memset (viterbiBlock. data(), 0,
-	                        (outSize * 4 + 24) * sizeof (int16_t)); 
-///	The actual deconvolution is done by the viterbi decoder
-
-	for (i = 0; i < outSize * 4 + 24; i ++)
-	   if (indexTable i)
-	      viterbiBlock i = v inputCounter ++;
-	viterbiSpiral::deconvolve (viterbiBlock. data(), outBuffer);
-	return true;
-}

qt-dab-qt-dab-4.6-5.3.tar.gz/src/scopes-qwt6/audio-display.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/scopes-qwt6/audio-display.cpp Changed

@@ -29,7 +29,8 @@
 	audioDisplay::audioDisplay  (RadioInterface	*mr,
 	                             QwtPlot		*plotGrid,
 	                             QSettings		*dabSettings):
-	                              spectrumCurve ("") {
+	                              spectrumCurve (""),
+	                              fft (2048, false) {
 int16_t	i;
 QString	colorString;
 
@@ -43,12 +44,7 @@
 
 	for (int i = 0; i < displaySize; i ++)
 	   displayBuffer i = 0;
-	spectrumBuffer	= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
-        plan    = fftwf_plan_dft_1d (spectrumSize,
-                                    reinterpret_cast <fftwf_complex *>(spectrumBuffer),
-                                    reinterpret_cast <fftwf_complex *>(spectrumBuffer),
-                                    FFTW_FORWARD, FFTW_ESTIMATE);
-	
+	spectrumBuffer		= new std::complex<float> spectrumSize;
 	dabSettings	-> beginGroup ("audioDisplay");
 	colorString	= dabSettings -> value ("displayColor",
 	                                                 "black"). toString();
@@ -106,8 +102,7 @@
 }
 
 	audioDisplay::~audioDisplay () {
-	fftwf_destroy_plan (plan);
-	fftwf_free	(spectrumBuffer);
+	delete	spectrumBuffer;
 }
 
 
@@ -131,7 +126,7 @@
 	for (i = 0; i < spectrumSize; i ++)
 	   spectrumBuffer i = cmul (spectrumBuffer i, Window i);
 
-	fftwf_execute (plan);
+	fft. fft (spectrumBuffer);
 //
 //	first X axis labels
 	for (i = 0; i < displaySize; i ++)

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/band-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/band-handler.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons Added

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/newpushbutton.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/normalpushbutton.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/smallcombobox.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/smallpushbutton.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/smallqlistview.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/smallspinbox.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/buttons/verysmallpushbutton.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/content-table.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/content-table.cpp Changed

@@ -42,9 +42,17 @@
 	this	-> dabSettings	= s;
 	this	-> channel	= channel;
 	this	-> columns	= cols;
+	dabSettings	-> beginGroup ("contentTable");
+	int x		= dabSettings -> value ("position-x", 200). toInt ();
+	int y		= dabSettings -> value ("position-y", 200). toInt ();
+	int wi		= dabSettings -> value ("table-width", 200). toInt ();
+	int hi		= dabSettings -> value ("table-height", 200). toInt ();
 	myWidget        = new QScrollArea (nullptr);
-        myWidget        -> resize (200, 200);
+        myWidget        -> resize (wi, hi);
         myWidget        -> setWidgetResizable(true);
+	myWidget	-> move (x, y);
+	dabSettings	-> endGroup ();
+	
         contentWidget	= new QTableWidget (0, cols);
 	contentWidget	-> setColumnWidth (0, 150);
 	contentWidget	-> setColumnWidth (4, 150);
@@ -63,6 +71,12 @@
 }
 
 	contentTable::~contentTable () {
+	dabSettings	-> beginGroup ("contentTable");
+	dabSettings	-> setValue ("position-x", myWidget -> pos (). x ());
+	dabSettings	-> setValue ("position-y", myWidget -> pos (). y ());
+	dabSettings	-> setValue ("table-width", myWidget ->  width ());
+	dabSettings	-> setValue ("table-height", myWidget -> height ());
+	dabSettings	-> endGroup ();
 	clearTable ();
         delete  contentWidget;
         delete  myWidget;
@@ -127,6 +141,19 @@
 	}
 }
 
+void	contentTable::upload	() {
+QString result;
+	for (int i = 0; i < contentWidget -> rowCount (); i ++) {
+	   for (int j = 0; j < contentWidget -> columnCount (); j ++) {
+	      QString t = contentWidget -> item (i, j) -> text ();
+	      result = result + t + ";";
+	   }
+	   result = result + "\n";
+	}
+
+	fprintf (stderr, " %s \n", result. toUtf8 (). data ());
+}
+
 int16_t	contentTable::addRow () {
 int16_t row	= contentWidget -> rowCount ();

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/dab-params.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/dab-params.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/http-handler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/http-handler.cpp Changed

@@ -53,7 +53,7 @@
 	this	-> parent	= parent;
 	this	-> mapPort	= mapPort;
 	QString temp		= browserAddress + ":" + mapPort;
-		this	-> homeAddress	= homeAddress;
+	this	-> homeAddress	= homeAddress;
 	this	-> autoBrowser_off	= autoBrowser_off;
 #ifdef	__MINGW32__
 	this	-> browserAddress	= temp. toStdWString ();
@@ -61,6 +61,7 @@
 	this	-> browserAddress	= temp. toStdString ();
 #endif
 	this	-> running. store (false);
+
 	connect (this, SIGNAL (terminating ()),
 	     parent, SLOT (http_terminate ()));
 	saveFile	= fopen (saveName. toUtf8 (). data (), "w");
@@ -212,7 +213,7 @@
 //	and send the reply
 	      if (write (ClientSocket, hdr, hdrlen) != hdrlen ||
 	          write (ClientSocket, content. c_str (),
-	                      content. size ()) != content. size ())  {
+	                      content. size ()) != (int)(content. size ()))  {
 //	         fprintf (stderr, "WRITE PROBLEM\n");
 //	         break;
 	      }
@@ -443,7 +444,7 @@
 std::string dotNumber (float f) {
 char temp 256;
 std::string s = std::to_string (f);
-	for (int i = 0; i < s. size (); i ++)
+	for (int i = 0; i < (int)(s. size ()); i ++)
 	   if (s. c_str () i == ',')
 	      temp i = '.';
 	   else
@@ -454,7 +455,7 @@
 //
 std::string httpHandler::coordinatesToJson (std::vector<httpData> &t) {
 std::complex<float> home;
-std::complex<float> target = std::complex<float> (0, 0);
+//std::complex<float> target = std::complex<float> (0, 0);
 char buf 512;
 QString Jsontxt;
 
@@ -527,7 +528,7 @@
 	transmitterList. push_back (t);
 	locker. unlock ();
 
-	for (int i = 0; i < transmitterVector. size (); i ++) {
+	for (int i = 0; i < (int)(transmitterVector. size ()); i ++) {
 	   if ((transmitterVector. at (i). transmitterName == transmitterName) &&
 	       (transmitterVector. at (i). channelName == channelName))
 	      return;

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/scanlist-handler.cpp Added

@@ -0,0 +1,124 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    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
+ */
+//
+//
+//	The qt-dab software will save some data of all services,
+//	ever seen.
+//
+#include	"scanlist-handler.h"
+#include	"radio.h"
+#include	<QDomDocument>
+#include	<QFile>
+
+	scanListHandler::scanListHandler	(RadioInterface *radio,
+	                                         QString fileName):
+	                                             QListView (nullptr) {
+	this	-> radio	= radio;
+	this	-> fileName	= fileName;
+	QDomDocument xmlBOM;
+	this	-> fileName = fileName;
+//
+//	start with an empty list, waiting ...
+	scanList. clear ();
+	displayList. setStringList (scanList);
+	this	-> setModel (&displayList);
+	connect (this, SIGNAL (clicked (QModelIndex)),
+	         this, SLOT (selectElement (QModelIndex)));
+
+	QFile f (fileName);
+	if (!f. open (QIODevice::ReadOnly)) 
+	   return;
+
+	xmlBOM. setContent (&f);
+	f. close ();
+	QDomElement root	= xmlBOM. documentElement ();
+	QDomElement component	= root. firstChild (). toElement ();
+	while (!component. isNull ()) {
+	   if (component. tagName () == "HISTORY_ELEMENT") {
+	      presetData pd;
+	      pd. serviceName = component. attribute ("SERVICE_NAME", "???");
+	      pd. channel     = component. attribute ("CHANNEL", "5A");
+	      scanList. append (pd. channel + ":" + pd. serviceName);
+	   }
+	   component = component. nextSibling (). toElement ();
+	}
+	displayList. setStringList (scanList);
+	this	-> setModel (&displayList);
+}
+
+
+	scanListHandler::~scanListHandler   () {
+QDomDocument the_scanList;
+QDomElement root = the_scanList. createElement ("history_db");
+
+	the_scanList. appendChild (root);
+
+	for (int i = 1; i < scanList. size (); i ++) {
+	   QStringList list = scanList. at (i).
+	                        split (":", QString::SkipEmptyParts);
+           if (list. length () != 2)
+	      continue;
+           QString channel = list. at (0);
+           QString serviceName = list. at (1);
+	   QDomElement scanListService = the_scanList.
+	                            createElement ("HISTORY_ELEMENT");
+	   scanListService. setAttribute ("SERVICE_NAME", serviceName);
+	   scanListService. setAttribute ("CHANNEL", channel);
+	   root. appendChild (scanListService);
+	}
+
+	QFile file (this -> fileName);
+	if (!file. open (QIODevice::WriteOnly | QIODevice::Text))
+	   return;
+
+	QTextStream stream (&file);
+	stream << the_scanList. toString ();
+	file. close ();
+}
+
+void	scanListHandler::addElement (const QString &channel,
+	                            const QString &serviceName) {
+const QString scanListElement = channel + ":" + serviceName;
+
+	for (int i = 0; i < scanList. size (); i ++)
+	   if (scanList. at (i) == scanListElement)
+	      return;
+	scanList. append (scanListElement);
+	displayList. setStringList (scanList);
+	this	-> setModel (&displayList);
+}
+
+void	scanListHandler::clear_scanList () {
+	scanList. clear ();
+	displayList. setStringList (scanList);
+	this	-> setModel (&displayList);
+}
+//
+//	selecting a scanList service is not different from
+//	selecting a preset
+//
+void	scanListHandler::selectElement (QModelIndex ind) {
+QString currentProgram = displayList. data (ind, Qt::DisplayRole). toString ();
+	emit handle_scanListSelect (currentProgram);
+}
+

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/scheduler.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/scheduler.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/tii-library/tii-codes.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/tii-library/tii-codes.cpp Changed

@@ -135,7 +135,7 @@
 double	R	= 6371;
 double	Phi1	= latitude1 * M_PI / 180;
 double	Phi2	= latitude2 * M_PI / 180;
-double	dPhi	= (latitude2 - latitude1) * M_PI / 180;
+//double	dPhi	= (latitude2 - latitude1) * M_PI / 180;
 double	dDelta	= (longitude2 - longitude1) * M_PI / 180;
 
 	if ((latitude2 == 0) || (longitude2 == 0))
@@ -180,7 +180,7 @@
 	else
 	   dx = distance (latitude2, longitude1,
 	                  latitude2, longitude2);
-float azimuth = atan2 (dy, dx);
+	float azimuth = atan2 (dy, dx);
 	   
 	if (dx_sign && dy_sign)		// eerste kwadrant
 	   return (int)((M_PI / 2 - azimuth) / M_PI * 180);
@@ -193,7 +193,7 @@
 
 bool	tiiHandler::is_black		(uint16_t Eid,
 	                                 uint8_t mainId, uint8_t subId) {
-	for (int i = 0; i < blackList. size (); i ++)
+	for (int i = 0; i < (int)(blackList. size ()); i ++)
 	   if ((blackList i. Eid == Eid) &&
 	       (blackList i. mainId == mainId) &&
 	       (blackList i. subId == subId))
@@ -245,6 +245,7 @@
 	   res = 0;
 	return res % 100;
 }
+
 void	tiiHandler::readFile (FILE *f) {
 int	count = 0; 
 char	buffer 1024;
@@ -269,7 +270,7 @@
 	   ed. latitude		= convert (columnVector LATITUDE);
 	   ed. longitude	= convert (columnVector LONGITUDE);
 	   ed. power		= convert (columnVector POWER);
-	   if (count >= cache. size ())
+	   if (count >= (int)(cache. size ()))
 	      cache. resize (cache. size () + 500);
 	   cache. at (count) = ed;
 	   count ++;

qt-dab-qt-dab-4.6-5.3.tar.gz/src/support/time-table.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/time-table.cpp Changed

qt-dab-qt-dab-4.7-5.4.tar.gz/src/support/upload.cpp Added

@@ -0,0 +1,62 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2023
+ *    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	"upload.h"
+#include	<QVBoxLayout>
+#include	<QHBoxLayout>
+#include	<QSettings>
+
+	uploadHandler::uploadHandler	(QSettings *dabSettings) {
+	this	-> dabSettings = dabSettings;
+	uploadText	= new QLabel (this);
+	uploadText	-> setText ("upload the scanresult?");
+	yesButton	= new QPushButton ("yes");
+	noButton	= new QPushButton ("no");
+	QHBoxLayout	*layout = new QHBoxLayout;
+	layout		-> addWidget (yesButton);
+	layout		-> addWidget (noButton);
+	QVBoxLayout	*l2	= new QVBoxLayout;
+	l2		-> addWidget (uploadText);
+	l2		-> addItem (layout);
+	setLayout (l2);
+	connect (yesButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_yesButton ()));
+	connect (noButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_noButton ()));
+	show ();
+}
+
+	uploadHandler::~uploadHandler	() {
+	hide ();
+	delete	uploadText;
+	delete	yesButton;
+	delete	noButton;
+}
+
+void	uploadHandler::handle_yesButton () {
+	QDialog::done (true);
+}
+
+void	uploadHandler::handle_noButton	() {
+	QDialog::done (false);
+}
+

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/correlation-viewer/correlation-viewer.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/correlation-viewer/correlation-viewer.cpp Changed

@@ -51,9 +51,17 @@
 	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
 	int lengthSetting	= dabSettings -> value ("plotLength", 3).
 		                                              toInt ();
+
+        int x   = dabSettings -> value ("position-x", 100). toInt ();
+        int y   = dabSettings -> value ("position-y", 100). toInt ();
+        int w   = dabSettings -> value ("width", 50). toInt ();
+        int h   = dabSettings -> value ("height", 30). toInt ();
 	dabSettings	-> endGroup ();
 	setupUi (&myFrame);
 
+	myFrame. resize (QSize (w, h));
+	myFrame. move (QPoint (x, y));
+
 	plotgrid			= impulseGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
@@ -97,6 +105,13 @@
 }
 
 	correlationViewer::~correlationViewer() {
+	dabSettings	-> beginGroup ("correlationViewer");
+        dabSettings	-> setValue ("position-x", myFrame. pos (). x ());
+        dabSettings	-> setValue ("position-y", myFrame. pos (). y ());
+	QSize size	= myFrame. size ();
+	dabSettings	-> setValue ("width", size. width ());
+	dabSettings	-> setValue ("height", size. height ());
+	dabSettings	-> endGroup ();
 	myFrame. hide();
 }

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/spectrum-viewer/null-scope.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/spectrum-viewer/null-scope.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/spectrum-viewer/scopewidget.ui -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/spectrum-viewer/scopewidget.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>912</width>
-    <height>665</height>
+    <width>685</width>
+    <height>445</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,9 +15,9 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
@@ -41,7 +41,7 @@
            <property name="maximumSize">
             <size>
              <width>16777215</width>
-             <height>100</height>
+             <height>90</height>
             </size>
            </property>
            <property name="toolTip">
@@ -53,10 +53,16 @@
        </item>
        <item>
         <widget class="QwtPlot" name="nullDisplay">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
-           <height>91</height>
+           <height>90</height>
           </size>
          </property>
          <property name="toolTip">
@@ -67,9 +73,15 @@
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QwtPlot" name="iqDisplay">
+         <property name="maximumSize">
+          <size>
+           <width>291</width>
+           <height>181</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IQ constallation of the decoded signal. Ideally one sees 4 dots, one in each quadrant&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
@@ -88,6 +100,37 @@
          </property>
         </widget>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLCDNumber" name="frequencyDisplay">
+           <property name="font">
+            <font>
+             <pointsize>15</pointsize>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="digitCount">
+            <number>7</number>
+           </property>
+           <property name="segmentStyle">
+            <enum>QLCDNumber::Flat</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>MHz</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
       </layout>
      </item>
     </layout>
@@ -240,7 +283,7 @@
        <item row="5" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
-          <string>Modulation error</string>
+          <string>std deviation</string>
          </property>
         </widget>
        </item>
@@ -253,8 +296,7 @@
           </font>
          </property>
          <property name="toolTip">
-          <string>Quality indicator: the &quot;quality&quot; of the decoded signal is measured as Modulation Error Rate, using  the formula from section 6.9.2 of TR 101 290 Measurement guidelines for DVB.
-An &quot;ideal&quot; (i.e. synthetic) signal reaches a value of over 20. Poor signals give values around 0</string>
+          <string>Quality indicator: rather than the Modulation Error as specified in Tr 101 290, we merely look at the std deviation of the phases of the DAB signal, since the information is encoded in phases (phase differences) </string>
          </property>
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/spectrum-viewer/scopewidget.ui-old -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/spectrum-viewer/scopewidget.ui-old Changed

@@ -6,69 +6,72 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>710</width>
-    <height>432</height>
+    <width>912</width>
+    <height>665</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>spectrumscope</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
-      <widget class="QSlider" name="scopeAmplification">
-       <property name="value">
-        <number>50</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QwtPlot" name="dabScope">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>202</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrumview. &lt;/p&gt;&lt;p&gt;The spectrum of the incoming signal is shown here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QwtPlot" name="iqDisplay">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>191</width>
-           <height>0</height>
-          </size>
-         </property>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QSlider" name="scopeAmplification">
+           <property name="value">
+            <number>50</number>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QwtPlot" name="dabScope">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>100</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrumview. &lt;/p&gt;&lt;p&gt;The spectrum of the incoming signal is shown here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QwtPlot" name="nullDisplay">
          <property name="maximumSize">
           <size>
            <width>16777215</width>
-           <height>169</height>
+           <height>91</height>
           </size>
          </property>
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram.&lt;/p&gt;&lt;/p&gt;The decoded symbols consist of a complex value, i.e. a value in a two dimensional space. Ideally, the diagram shows 4 dots, one in each quadrant. The number below the diagram (at left) shows - in dB - the deviation of the ideal position.&lt;/p&gt;&lt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The end of the null period and the beginning of the data. Ideally the border is around sample 504&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QwtPlot" name="iqDisplay">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IQ constallation of the decoded signal. Ideally one sees 4 dots, one in each quadrant&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@@ -109,6 +112,9 @@
          <height>179</height>
         </size>
        </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The waterfall of the spectrum of the incoming signal&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
       </widget>
      </item>
      <item>

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/spectrum-viewer/spectrum-scope.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/spectrum-viewer/spectrum-scope.cpp Changed

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/spectrum-viewer/spectrum-viewer.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/spectrum-viewer/spectrum-viewer.cpp Changed

@@ -28,11 +28,13 @@
 #include	<QPen>
 #include	"color-selector.h"
 
+
 	spectrumViewer::spectrumViewer	(RadioInterface	*mr,
 	                                 QSettings	*dabSettings,
 	                                 RingBuffer<std::complex<float>> *sbuffer,
 	                                 RingBuffer<std::complex<float>>* ibuffer):
-	                                 myFrame (nullptr) {
+	                                 myFrame (nullptr),
+	                                 fft (SP_SPECTRUMSIZE, false) {
 int16_t	i;
 
 	this	-> myRadioInterface	= mr;
@@ -40,33 +42,43 @@
 	this	-> spectrumBuffer	= sbuffer;
 	this	-> iqBuffer		= ibuffer;
 
-	setupUi (&myFrame);
-	myFrame. hide();
-	displayBuffer. resize (256);
-	displaySize	= 256;
-	spectrumSize	= 4 * displaySize;
-	spectrum		= (std::complex<float> *)
-	               fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
-        plan    = fftwf_plan_dft_1d (spectrumSize,
-                                  reinterpret_cast <fftwf_complex *>(spectrum),
-                                  reinterpret_cast <fftwf_complex *>(spectrum),
-                                  FFTW_FORWARD, FFTW_ESTIMATE);
+	dabSettings	-> beginGroup ("spectrumViewer");
+	int x   = dabSettings -> value ("position-x", 100). toInt ();
+        int y   = dabSettings -> value ("position-y", 100). toInt ();
+	int w	= dabSettings -> value ("width", 150). toInt ();
+	int h	= dabSettings -> value ("height", 120). toInt ();
+        dabSettings -> endGroup ();
+        setupUi (&myFrame);
+	myFrame. resize (QSize (w, h));
+        myFrame. move (QPoint (x, y));
 	
-	Window. resize (spectrumSize);
-	for (i = 0; i < spectrumSize; i ++) 
+	QPoint  pos     = myFrame. mapToGlobal (QPoint (0, 0));
+	fprintf (stderr, "spectrumViewer gezet op %d %d, staat op %d %d\n",
+	                                x, y, pos. x (), pos. y ());
+	myFrame. hide();
+	for (i = 0; i < SP_SPECTRUMSIZE; i ++) 
 	   Window i =
-	        0.42 - 0.5 * cos ((2.0 * M_PI * i) / (spectrumSize - 1)) +
-	              0.08 * cos ((4.0 * M_PI * i) / (spectrumSize - 1));
-	mySpectrumScope	= new spectrumScope (dabScope, 256, dabSettings);
-	myWaterfallScope	= new waterfallScope (dabWaterfall, 256, 50);
+	        0.42 - 0.5 * cos ((2.0 * M_PI * i) / (SP_SPECTRUMSIZE - 1)) +
+	              0.08 * cos ((4.0 * M_PI * i) / (SP_SPECTRUMSIZE - 1));
+
+	mySpectrumScope	= new spectrumScope (dabScope,
+	                                     SP_DISPLAYSIZE, dabSettings);
+	myWaterfallScope	= new waterfallScope (dabWaterfall,
+	                                     SP_DISPLAYSIZE, 50);
 	myIQDisplay	= new IQDisplay (iqDisplay, 512);
 	myNullScope	= new nullScope	(nullDisplay, 256, dabSettings);
 	setBitDepth	(12);
 }
 
 	spectrumViewer::~spectrumViewer () {
-	fftwf_destroy_plan (plan);
-	fftwf_free	(spectrum);
+	dabSettings	-> beginGroup ("spectrumViewer");
+        dabSettings	-> setValue ("position-x", myFrame. pos (). x ());
+        dabSettings	-> setValue ("position-y", myFrame. pos (). y ());
+
+	QSize size	= myFrame. size ();
+	dabSettings	-> setValue ("width", size. width ());
+	dabSettings	-> setValue ("height", size. height ());
+	dabSettings	-> endGroup ();
 	myFrame. hide();
 	delete		myIQDisplay;
 	delete		mySpectrumScope;
@@ -75,18 +87,17 @@
 }
 
 void	spectrumViewer::showSpectrum	(int32_t amount, int32_t vfoFrequency) {
-double	X_axis displaySize;
-double	Y_values displaySize;
-double	Y2_values displaySize;
-int16_t	i, j;
-double	temp	= (double)INPUT_RATE / 2 / displaySize;
+double	X_axis SP_DISPLAYSIZE;
+double	Y_values SP_DISPLAYSIZE;
+double	Y2_values SP_DISPLAYSIZE;
+double	temp	= (double)INPUT_RATE / 2 / SP_DISPLAYSIZE;
 int16_t	averageCount	= 5;
 	   
 	(void)amount;
-	if (spectrumBuffer -> GetRingBufferReadAvailable() < spectrumSize)
+	if (spectrumBuffer -> GetRingBufferReadAvailable() < SP_SPECTRUMSIZE)
 	   return;
 
-	spectrumBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
+	spectrumBuffer	-> getDataFromBuffer (spectrum, SP_SPECTRUMSIZE);
 	spectrumBuffer	-> FlushRingBuffer();
 	if (myFrame. isHidden()) {
 	   spectrumBuffer	-> FlushRingBuffer();
@@ -94,39 +105,39 @@
 	}
 
 //	first X axis labels
-	for (i = 0; i < displaySize; i ++)
+	for (int i = 0; i < SP_DISPLAYSIZE; i ++)
 	   X_axis i = 
 	         ((double)vfoFrequency - (double)(INPUT_RATE / 2) +
 	          (double)((i) * (double) 2 * temp)) / ((double)1000);
 //
 //	and window it
 //	get the buffer data
-	for (i = 0; i < spectrumSize; i ++)
+	for (int i = 0; i < SP_SPECTRUMSIZE; i ++)
 	   if (std::isnan (abs (spectrum i)) ||
 	                 std::isinf (abs (spectrum i)))
 	      spectrum i = std::complex<float> (0, 0);
 	   else
 	      spectrum i = cmul (spectrum i, Window i);
 
-	fftwf_execute (plan);
+	fft. fft (spectrum);
 //
-//	and map the spectrumSize values onto displaySize elements
-	for (i = 0; i < displaySize / 2; i ++) {
+//	and map the SP_SPECTRUMSIZE values onto SP_DISPLAYSIZE elements
+	for (int i = 0; i < SP_DISPLAYSIZE / 2; i ++) {
 	   double f	= 0;
-	   for (j = 0; j < spectrumSize / displaySize; j ++)
-	      f += abs (spectrum spectrumSize / displaySize * i + j);
+	   for (int j = 0; j < SP_SPECTRUMSIZE / SP_DISPLAYSIZE; j ++)
+	      f += abs (spectrum SP_SPECTRUMSIZE / SP_DISPLAYSIZE * i + j);
 
-	   Y_values displaySize / 2 + i = 
-                                 f / (spectrumSize / displaySize);
+	   Y_values SP_DISPLAYSIZE / 2 + i = 
+                                 f / (SP_SPECTRUMSIZE / SP_DISPLAYSIZE);
 	   f = 0;
-	   for (j = 0; j < spectrumSize / displaySize; j ++)
-	      f += abs (spectrum spectrumSize / 2 +
-	                             spectrumSize / displaySize * i + j);
-	   Y_values i = f / (spectrumSize / displaySize);
+	   for (int j = 0; j < SP_SPECTRUMSIZE / SP_DISPLAYSIZE; j ++)
+	      f += abs (spectrum SP_SPECTRUMSIZE / 2 +
+	                             SP_SPECTRUMSIZE / SP_DISPLAYSIZE * i + j);
+	   Y_values i = f / (SP_SPECTRUMSIZE / SP_DISPLAYSIZE);
 	}
 //
 //	average the image a little.
-	for (i = 0; i < displaySize; i ++) {
+	for (int i = 0; i < SP_DISPLAYSIZE; i ++) {
 	   if (std::isnan (Y_values i) || std::isinf (Y_values i))
 	      continue;
 
@@ -136,9 +147,9 @@
 	}
 
 	memcpy (Y_values,
-	        displayBuffer. data (), displaySize * sizeof (double));
+	        displayBuffer, SP_DISPLAYSIZE * sizeof (double));
 	memcpy (Y2_values,
-	        displayBuffer. data (), displaySize * sizeof (double));
+	        displayBuffer, SP_DISPLAYSIZE * sizeof (double));
 	mySpectrumScope	-> showSpectrum (X_axis, Y_values,
 	              scopeAmplification -> value (),
 	              vfoFrequency / 1000);
@@ -279,3 +290,7 @@
 	plotgrid	-> setCanvasBackground (this -> displayColor);
 }
 
+void	spectrumViewer::showFrequency (float f) {
+	frequencyDisplay	-> display (f);
+}
+

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/spectrum-viewer/spectrum-viewer.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/spectrum-viewer/spectrum-viewer.h Changed

@@ -32,7 +32,6 @@
 #include        "dab-constants.h"
 #include	<QFrame>
 #include	<QObject>
-#include	<fftw3.h>
 #include	"ui_scopewidget.h"
 #include	"ringbuffer.h"
 #include	<qwt.h>
@@ -54,6 +53,10 @@
 #include	"waterfall-scope.h"
 #include	"null-scope.h"
 
+#define	SP_DISPLAYSIZE	512
+#define	SP_SPECTRUMSIZE	2048
+
+#include	"fft-handler.h"
 class	RadioInterface;
 class	QSettings;
 class	IQDisplay;
@@ -66,6 +69,7 @@
 	                                 RingBuffer<std::complex<float>> *);
 			~spectrumViewer();
 	void		showSpectrum	(int32_t, int32_t);
+	void		showFrequency	(float);
 	void		showIQ		(int32_t);
 	void		show_nullPeriod	(float *, int);
 	void		showQuality	(float, float, float);
@@ -87,12 +91,10 @@
 	QColor		gridColor;
 	QColor		curveColor;
 
-	int16_t		displaySize;
-	int16_t		spectrumSize;
-	std::complex<float>	*spectrum;
-	std::vector<double>	displayBuffer;
-	std::vector<float>	Window;
-	fftwf_plan	plan;
+	fftHandler	fft;
+	std::complex<float>	spectrum SP_SPECTRUMSIZE;
+	double			displayBuffer SP_DISPLAYSIZE;
+	float		Window SP_SPECTRUMSIZE;;
 	QwtPlotMarker	*Marker;
 	QwtPlot		*plotgrid;
 	QwtPlotGrid	*grid;

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/tii-viewer/tii-viewer.cpp -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/tii-viewer/tii-viewer.cpp Changed

@@ -26,12 +26,14 @@
 #include	<QColor>
 #include	<QPen>
 #include	"color-selector.h"
+#include	"fft-complex.h"
 
 	tiiViewer::tiiViewer	(RadioInterface	*mr,
 	                         QSettings	*dabSettings,
 	                         RingBuffer<std::complex<float>> *sbuffer):
 	                              myFrame (nullptr),
-	                              spectrumCurve ("") {
+	                              spectrumCurve (""),
+	                              fft (TII_SPECTRUMSIZE, false) {
 int16_t	i;
 QString	colorString	= "black";
 bool	brush;
@@ -52,24 +54,18 @@
 	curveColor	= QColor (colorString);
 
 	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
-	displaySize	= dabSettings -> value ("displaySize",
-	                                                   512).toInt();
-	dabSettings	-> endGroup ();
-	if ((displaySize & (displaySize - 1)) != 0)
-	   displaySize = 1024;
 
-	setupUi (&myFrame);
+	int x   = dabSettings -> value ("position-x", 100). toInt ();
+        int y   = dabSettings -> value ("position-y", 100). toInt ();
+	int w	= dabSettings -> value ("width", 150). toInt ();
+	int h	= dabSettings -> value ("height", 120). toInt ();
+        dabSettings -> endGroup ();
+        setupUi (&myFrame);
+	myFrame. resize (QSize (w, h));
+        myFrame. move (QPoint (x, y));
 
 	myFrame. hide();
-	displayBuffer. resize (displaySize);
-	memset (displayBuffer. data (), 0, displaySize * sizeof (double));
-	this	-> spectrumSize	= 2 * displaySize;
-	spectrum		= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
-        plan    = fftwf_plan_dft_1d (spectrumSize,
-                                    reinterpret_cast <fftwf_complex *>(spectrum),
-                                    reinterpret_cast <fftwf_complex *>(spectrum),
-                                    FFTW_FORWARD, FFTW_ESTIMATE);
-	
+	memset (displayBuffer, 0, TII_DISPLAYSIZE * sizeof (double));
 	plotgrid	= tiiGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
 //	grid		= new QwtPlotGrid;
@@ -116,24 +112,27 @@
 	Marker		-> attach (plotgrid);
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
 
-	Window. resize (spectrumSize);
-	for (i = 0; i < spectrumSize; i ++) 
+	for (i = 0; i < TII_SPECTRUMSIZE; i ++) 
 	   Window i =
-	        0.42 - 0.5 * cos ((2.0 * M_PI * i) / (spectrumSize - 1)) +
-	              0.08 * cos ((4.0 * M_PI * i) / (spectrumSize - 1));
+	        0.42 - 0.5 * cos ((2.0 * M_PI * i) / (TII_SPECTRUMSIZE - 1)) +
+	              0.08 * cos ((4.0 * M_PI * i) / (TII_SPECTRUMSIZE - 1));
 	setBitDepth	(12);
 }
 
-    tiiViewer::~tiiViewer() {
-	fftwf_destroy_plan (plan);
-	fftwf_free	(spectrum);
+	tiiViewer::~tiiViewer() {
+	dabSettings	-> beginGroup ("tiiViewer");
+        dabSettings	-> setValue ("position-x", myFrame. pos (). x ());
+        dabSettings	-> setValue ("position-y", myFrame. pos (). y ());
+	QSize size	= myFrame. size ();
+	dabSettings	-> setValue ("width", size. width ());
+	dabSettings	-> setValue ("height", size. height ());
+	dabSettings	-> endGroup ();
 	myFrame. hide();
 	delete		Marker;
 //	delete		ourBrush;
 }
 
 void	tiiViewer::clear() {
-	transmitterDisplay	-> setText (" ");
 }
 
 static
@@ -163,51 +162,51 @@
 }
 
 void	tiiViewer::showSpectrum	(int32_t amount) {
-double	X_axis displaySize;
-double	Y_values displaySize;
+double	X_axis TII_DISPLAYSIZE;
+double	Y_values TII_DISPLAYSIZE;
 int16_t	i, j;
-double	temp	= (double)INPUT_RATE / 2 / displaySize;
+double	temp	= (double)INPUT_RATE / 2 / TII_DISPLAYSIZE;
 int16_t	averageCount	= 3;
 
 	(void)amount;
-	if (tiiBuffer -> GetRingBufferReadAvailable() < spectrumSize) {
+	if (tiiBuffer -> GetRingBufferReadAvailable() < TII_SPECTRUMSIZE) {
 	   return;
 	}
 
-	tiiBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
+	tiiBuffer	-> getDataFromBuffer (spectrumBuffer, TII_SPECTRUMSIZE);
 	tiiBuffer	-> FlushRingBuffer ();
 	if (myFrame. isHidden ())
 	   return;
 //	and window it
 //	first X axis labels
-	for (i = 0; i < displaySize; i ++)
+	for (i = 0; i < TII_DISPLAYSIZE; i ++)
 	   X_axis i = 
 	         ((double)0 - (double)(INPUT_RATE / 2) +
 	          (double)((i) * (double) 2 * temp)) / ((double)1000);
 //
 //	get the buffer data
-	for (i = 0; i < spectrumSize; i ++)
-	   spectrum i = cmul (spectrum i, Window i);
+	for (i = 0; i < TII_SPECTRUMSIZE; i ++)
+	   spectrumBuffer i = cmul (spectrumBuffer i, Window i);
 
-	fftwf_execute (plan);
+	fft. fft (spectrumBuffer);
 //
-//	and map the spectrumSize values onto displaySize elements
-	for (i = 0; i < displaySize / 2; i ++) {
+//	and map the TII_SPECTRUMSIZE values onto TII_DISPLAYSIZE elements
+	for (i = 0; i < TII_DISPLAYSIZE / 2; i ++) {
 	   double f	= 0;
-	   for (j = 0; j < spectrumSize / displaySize; j ++)
-	      f += abs (spectrum spectrumSize / displaySize * i + j);
+	   for (j = 0; j < TII_SPECTRUMSIZE / TII_DISPLAYSIZE; j ++)
+	      f += abs (spectrumBuffer TII_SPECTRUMSIZE / TII_DISPLAYSIZE * i + j);
 
-	   Y_values displaySize / 2 + i = 
-                                 f / (spectrumSize / displaySize);
+	   Y_values TII_DISPLAYSIZE / 2 + i = 
+                                 f / (TII_SPECTRUMSIZE / TII_DISPLAYSIZE);
 	   f = 0;
-	   for (j = 0; j < spectrumSize / displaySize; j ++)
-	      f += abs (spectrum spectrumSize / 2 +
-	                             spectrumSize / displaySize * i + j);
-	   Y_values i = f / (spectrumSize / displaySize);
+	   for (j = 0; j < TII_SPECTRUMSIZE / TII_DISPLAYSIZE; j ++)
+	      f += abs (spectrumBuffer TII_SPECTRUMSIZE / 2 +
+	                             TII_SPECTRUMSIZE / TII_DISPLAYSIZE * i + j);
+	   Y_values i = f / (TII_SPECTRUMSIZE / TII_DISPLAYSIZE);
 	}
 //
 //	average the image a little.
-	for (i = 0; i < displaySize; i ++) {
+	for (i = 0; i < TII_DISPLAYSIZE; i ++) {
 	   if (std::isnan (Y_values i) || std::isinf (Y_values i))
 	      continue;
 	   displayBuffer i = 
@@ -215,8 +214,7 @@
 	           1.0f / averageCount * Y_values i;
 	}
 
-	memcpy (Y_values,
-	        displayBuffer. data(), displaySize * sizeof (double));
+	memcpy (Y_values, displayBuffer, TII_DISPLAYSIZE * sizeof (double));
 	ViewSpectrum (X_axis, Y_values,
 	              AmplificationSlider -> value(),
 	              0 / 1000);
@@ -232,21 +230,21 @@
 	amp		= amp / 50.0 * (-get_db (0));
 	plotgrid	-> setAxisScale (QwtPlot::xBottom,
 				         (double)X_axis 0,
-				         X_axis displaySize - 1);
+				         X_axis TII_DISPLAYSIZE - 1);
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
 				         get_db (0), get_db (0) + amp1 * 40);
 //				         get_db (0), get_db (0) + amp);
 //				         get_db (0), 0);
 
-	for (i = 0; i < displaySize; i ++) 
+	for (i = 0; i < TII_DISPLAYSIZE; i ++) 
 	   Y1_value i = get_db (amp1 * Y1_value i); 
 
 	spectrumCurve. setBaseline (get_db (0));
 	Y1_value 0		= get_db (0);
-	Y1_value displaySize - 1 = get_db (0);
+	Y1_value TII_DISPLAYSIZE - 1 = get_db (0);
 
-	spectrumCurve. setSamples (X_axis, Y1_value, displaySize);
+	spectrumCurve. setSamples (X_axis, Y1_value, TII_DISPLAYSIZE);
 	Marker		-> setXValue (marker);
 	plotgrid	-> replot(); 
 }
@@ -327,38 +325,38 @@
 static
 double	Y_values 2000 = {0};
 void	tiiViewer::show_nullPeriod (const QVector<float> &v, double  amp2) {
-double	X_axis displaySize;
-double	amp	= AmplificationSlider -> value();
+double	X_axis TII_DISPLAYSIZE;
+//double	amp	= AmplificationSlider -> value();
 
 
-	for (int i = 0; i < displaySize; i ++) {
-	   X_axis i = i * v. size () / displaySize;;
+	for (int i = 0; i < TII_DISPLAYSIZE; i ++) {
+	   X_axis i = i * v. size () / TII_DISPLAYSIZE;;
 	   double x = 0;
-	   for (int j = 0; j < v. size () / displaySize; j ++)
-	      x = abs (v i * v. size () / displaySize + j);
+	   for (int j = 0; j < v. size () / TII_DISPLAYSIZE; j ++)
+	      x = abs (v i * v. size () / TII_DISPLAYSIZE + j);
 	   Y_values i = x;
 	}
 
 	float Max	= 0;
-	for (int i = 0; i < displaySize; i ++)
+	for (int i = 0; i < TII_DISPLAYSIZE; i ++)
 	   if (Y_values i > Max)
 	      Max = Y_values i;
 
 	plotgrid        -> setAxisScale (QwtPlot::xBottom,
                                          (double)X_axis 0,
-                                         X_axis displaySize - 1);
+                                         X_axis TII_DISPLAYSIZE - 1);
         plotgrid        -> enableAxis (QwtPlot::xBottom);
         plotgrid        -> setAxisScale (QwtPlot::yLeft,
                                          0, Max * 2);
 //                                       get_db (0), 0);
-//	for (int i = 0; i < displaySize; i ++) 
+//	for (int i = 0; i < TII_DISPLAYSIZE; i ++) 
 //	   Y_values i = get_db (amp * Y_values i); 
 
 	spectrumCurve. setBaseline (0);
 	Y_values 0		= 0;
-	Y_values displaySize - 1 = 0;
+	Y_values TII_DISPLAYSIZE - 1 = 0;
 
-	spectrumCurve. setSamples (X_axis, Y_values, displaySize);
+	spectrumCurve. setSamples (X_axis, Y_values, TII_DISPLAYSIZE);
 	plotgrid	-> replot(); 
 }

qt-dab-qt-dab-4.6-5.3.tar.gz/viewers/tii-viewer/tii-viewer.h -> qt-dab-qt-dab-4.7-5.4.tar.gz/viewers/tii-viewer/tii-viewer.h Changed

@@ -25,13 +25,15 @@
 #ifndef		__TII_VIEWER__
 #define		__TII_VIEWER__
 
+#define		TII_DISPLAYSIZE		512
+#define		TII_SPECTRUMSIZE	1024
+
 #include	<QSettings>
 #include        "dab-constants.h"
 #include	<QFrame>
 #include	<QObject>
 #include	<QByteArray>
 
-#include	<fftw3.h>
 #include	"ui_tii-widget.h"
 #include	"ringbuffer.h"
 #include	<qwt.h>
@@ -49,6 +51,8 @@
 #include        <qwt_scale_widget.h>
 #include        <QBrush>
 
+#include	"fft-handler.h"
+
 class	RadioInterface;
 
 class	tiiViewer: public QObject, Ui_tiiWidget {
@@ -73,17 +77,15 @@
 	QwtPlotCurve	spectrumCurve;
 	QwtPlotGrid	grid;
 	RingBuffer<std::complex<float>>	*tiiBuffer;
-	int16_t		displaySize;
-	int16_t		spectrumSize;
-	std::complex<float>	*spectrum;
-	std::vector<double>	displayBuffer;
-	std::vector<float>	Window;
 	QwtPlotPicker	*lm_picker;
 	QColor		displayColor;
 	QColor		gridColor;
 	QColor		curveColor;
 
-	fftwf_plan	plan;
+	fftHandler	fft;
+	double		displayBuffer TII_DISPLAYSIZE;
+	std::complex<float> spectrumBuffer TII_SPECTRUMSIZE;
+	float		Window TII_SPECTRUMSIZE;
 	QwtPlotMarker	*Marker;
 	QwtPlot		*plotgrid;
 //	QBrush		*ourBrush;

Build Results
RPM Lint

Refresh

Comments for request 5843 0

Request History

wkazubski created request over 1 year ago

Update to qt-dab-4.7

wkazubski accepted request over 1 year ago