Packman Build Service PMBS

qt-dab.spec Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/app-files/qt-dab-6.9-256x256.png Deleted

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/front-picture.png Deleted

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/xml-filereader/xmlfiles.ui-xxx Deleted

@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>xmlfile_widget</class>
- <widget class="QWidget" name="xmlfile_widget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>285</width>
- <height>305</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>xmlfiles</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="filenameLabel">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Path and filename to xml-file&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QProgressBar" name="fileProgress">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;File progress&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="value">
- <number>24</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLCDNumber" name="currentTime">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Current time in the file&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLCDNumber" name="totalTime">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Total recorded time of the file&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="recorderName">
- <property name="text">
- <string>recorder</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="recorderVersion">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording software and version.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="deviceName">
- <property name="text">
- <string>deviceName</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="deviceModel">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording device&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>recorded at </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="recordingTime">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording time (it's not the current time)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QLabel" name="modulationtypeLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="iqOrderLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="containerLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="byteOrderLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="typeofUnitLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>nrBits</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>nrElements</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>samplerate</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>frequency</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/ofdm-decoder.cpp-old Deleted

@@ -1,371 +0,0 @@
-#
-/*
- * Copyright (C) 2013 .. 2023
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; 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
- *
- *	Once the bits are "in", interpretation and manipulation
- *	should reconstruct the data blocks.
- *	Ofdm_decoder is called for Block_0 and the FIC blocks,
- *	its invocation results in 2 * Tu bits
- */
-#include	<vector>
-#include	"ofdm-decoder.h"
-#include	"radio.h"
-#include	"fic-handler.h"
-#include	"msc-handler.h"
-#include	"freq-interleaver.h"
-#include	"dab-params.h"
-#include	"dab-constants.h"
-/**
- *	\brief ofdmDecoder
- *	The class ofdmDecoder is
- *	taking the data from the ofdmProcessor class in, and
- *	will extract the Tu samples, do an FFT and extract the
- *	carriers and map them on (soft) bits
- */
-
-#define	Alpha	0.05f
-static inline
-Complex	normalize (const Complex &V) {
-float Length	= jan_abs (V);
-	return Length == 0.0f ? Complex (0.0, 0.0) : V / (DABFLOAT)Length;
-}
-
-	ofdmDecoder::ofdmDecoder	(RadioInterface *mr,
-	 uint8_t	dabMode,
-	 int16_t	bitDepth,
-	 RingBuffer<float> *devBuffer_i,
-	 RingBuffer<Complex> *iqBuffer_i) :
-	 myRadioInterface (mr),
-	 params (dabMode),
-	 theTable (dabMode),
-	 myMapper (dabMode),
-	 fft (params. get_T_u (), false),
-	 devBuffer (devBuffer_i),
-	 iqBuffer (iqBuffer_i),
-	 conjVector (params. get_T_u ()),
-	 fft_buffer (params. get_T_u ()) {
-	(void)bitDepth;
-	connect (this, &ofdmDecoder::showIQ,
-	 myRadioInterface, &RadioInterface::showIQ);
-	connect (this, &ofdmDecoder::show_quality,
-	 myRadioInterface, &RadioInterface::show_quality);
-	connect (this, &ofdmDecoder::show_stdDev,
-	 myRadioInterface, &RadioInterface::show_stdDev);
-//
-	this	-> T_s			= params. get_T_s	();
-	this	-> T_u			= params. get_T_u	();
-	this	-> nrBlocks		= params. get_L		();
-	this	-> carriers		= params. get_carriers	();
-
-	repetitionCounter	= 10;
-	this	-> T_g		= T_s - T_u;
-	phaseReference		.resize (T_u);
-	offsetVector.		resize (T_u);
-	carrierCenters.		resize (T_u);
-
-	for (int32_t i = 0; i < T_u; i ++) {
-	 offsetVector		i = 0;
-	 carrierCenters	i = Complex (1, 1);
-	}
-
-	meanValue		= 1.0f;
-	iqSelector		= SHOW_DECODED;
-	decoder			= DECODER_1;
-}
-
-	ofdmDecoder::~ofdmDecoder	() {
-}
-//
-void	ofdmDecoder::stop ()	{
-}
-
-void	ofdmDecoder::reset ()	{
-	for (int i = 0; i < T_u; i ++) {
-	 offsetVector		i = 0;
-	 carrierCenters	i = Complex (1, 1);
-	}
-}
-//
-float	ofdmDecoder::processBlock_0 (
-	 std::vector <Complex> buffer, bool withTII) {
-	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 (), buffer. data (),
-	 T_u * sizeof (Complex));
-
-	Complex temp	= Complex (0, 0);;
-	if (withTII) {
-	 return arg (temp);
-	}
-	
-	for (int i = 0; i < carriers; i ++) {
-	 int16_t	index	= myMapper. mapIn (i);
-	 if (index < 0) 
-	 index += T_u;
-	}
-	return arg (temp);
-}
-//
-//	Just interested. In the ideal case the constellation of the
-//	decoded symbols is precisely in the four points 
-//	k * (1, 1), k * (1, -1), k * (-1, -1), k * (-1, 1)
-//	To ease computation, we map all incoming values onto quadrant 1
-//
-//	For the computation of the MER we use the definition
-//	from ETSI TR 101 290 (appendix C1)
-float	ofdmDecoder::computeQuality (Complex *v) {
-static float f_n = 1;
-static float f_d = 1;
-	for (int i = 0; i < carriers; i ++) {
-	 Complex ss	= v T_u / 2 - carriers / 2 + i;
-	 float ab	= jan_abs (ss) / sqrt (2);
-	 f_n		= 0.99 * f_n + 0.01 * (jan_abs (ss) * jan_abs (ss));
-	 float R	= abs (abs (real (ss)) - ab);
-	 float I	= abs (abs (imag (ss)) - ab);
-	 f_d		= 0.99 * f_d + 0.01 * (R * R + I * I);
-	}
-	return 10 * log10 (f_n / f_d + 0.1);
-}
-/**
- *	for the other blocks of data, the first step is to go from
- *	time to frequency domain, to get the carriers.
- *	we distinguish between FIC blocks and other blocks,
- *	only to spare a test. The mapping code is the same
- */
-
-static	int	cnt	= 0;
-
-//
-//	DAB (and DAB+) bits are encoded is DPSK, 2 bits per carrier,
-//	depending on the quadrant the carrier is in. There are
-//	of course two different approaches in decoding the bits
-//	One is looking at the X and Y components, and 
-//	their length, relative to each other,
-//	Ideally, the X and Y are of equal size, in practice they are not.
-
-int	sign (DABFLOAT x) {
-	return x < 0 ? -1 : x > 0 ? 1 : 0;
-}
-
-void	ofdmDecoder::decode (std::vector <Complex> &buffer,
-	 int32_t blkno,
-	 std::vector<int16_t> &ibits) {
-float sum = 0;
-
-	memcpy (fft_buffer. data (), &((buffer. data ()) T_g),
-	 T_u * sizeof (Complex));
-//	first step: do the FFT
-	fft. fft (fft_buffer. data ());
-
-//	a little optimization: we do not interchange the
-//	positive/negative frequencies to their right positions.
-//	The de-interleaving understands this
-//	DABFLOAT max	= 0;
-
-	for (int i = 0; i < carriers; i ++) {
-	 int16_t	index	= myMapper. mapIn (i);
-	 if (index < 0) 
-	 index += T_u;
-/**
- *	decoding is computing the phase difference between
- *	carriers with the same index in subsequent blocks.
- *	The carrier of a block is the reference for the carrier
- *	on the same position in the next block
- */
-	 Complex	r1 = fft_buffer index *
-	 normalize (conj (phaseReference index));
-	 conjVector	index = r1;
-

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/forms-v7/new-display Deleted

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/forms-v7/new-display/display-widget.cpp Deleted

@@ -1,617 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2023
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; 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	<QSettings>
-#include	<QDir>
-#include	"display-widget.h"
-#include	"spectrum-scope.h"
-#include	"null-scope.h"
-#include	"correlation-scope.h"
-#include	"channel-scope.h"
-#include	"dev-scope.h"
-#include	"waterfall-scope.h"
-#include	"iqdisplay.h"
-
-#include	"dab-constants.h"
-#include	"position-handler.h"
-#include	"settingNames.h"
-#include	"settings-handler.h"
-
-#define	DISPLAY_WIDGET_SETTINGS	"displayWidget"
-
-	displayWidget::displayWidget	(RadioInterface	*mr,
-	 QSettings	*dabSettings):
-	 myFrame (nullptr),
-	 theFFT (4 * 512, false),
-	 dabSettings_p (dabSettings) {
-	(void)mr;
-	QString settingsHeader	= DISPLAY_WIDGET_SETTINGS;
-	setupUi (&myFrame);
-	setPositionAndSize (dabSettings_p, &myFrame, 
-	 DISPLAY_WIDGET_SETTINGS);
-	connect (&myFrame, &superFrame::frameClosed,
-	 this, &displayWidget::frameClosed); 
-	connect (&myFrame, &superFrame::makePicture, 
- this, &displayWidget::handle_mouseClicked);
-//
-	myFrame. hide ();
-
-	dcOffset_display	-> show ();
-	dcOffset_label		-> show ();
-//	the "workers"
-	spectrumScope_p		= new spectrumScope	(spectrumDisplay,
-	 512, dabSettings_p);
-	nullScope_p		= new nullScope		(nullDisplay,
-	 512, dabSettings_p);
-	correlationScope_p	= new correlationScope (correlationDisplay,
-	 256, dabSettings_p);
-	TII_Scope_p		= new spectrumScope	(tiiDisplay,
-	 192, dabSettings_p,
-	 true);
-	channelScope_p		= new channelScope	(channelPlot,
-	 NR_TAPS,
-	 dabSettings_p);
-	devScope_p		= new devScope		(devPlot,
-	 512, dabSettings_p);
-	IQDisplay_p		= new IQDisplay		(iqDisplay);
-	waterfallScope_p	= new waterfallScope	(waterfallDisplay,
-	 512, 50);
-//
-//	and the settings for the sliders:
-	int sliderValue		= value_i (dabSettings_p,
-	 DISPLAY_WIDGET_SETTINGS,
-	 "spectrumSlider", 30);
-	spectrumSlider		-> setValue (sliderValue);
- currentTab		= value_i (dabSettings_p,
-		 DISPLAY_WIDGET_SETTINGS,
-	 "tabSettings", 0);
- tabWidget		-> setCurrentIndex (currentTab);
-	sliderValue		= value_i (dabSettings_p,
-	 DISPLAY_WIDGET_SETTINGS,
-	 "correlationSlider", 50);
-	correlationSlider	-> setValue (sliderValue);
-	correlationLength -> setValue (500);
-	correlationsVector 	-> 
-	 setStyleSheet (
-	 "QLabel {background-color : green; color: white}");
-
-	sliderValue		=
-	 value_i (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "iqSliderValue", 50);
-	scopeSlider		-> setValue (sliderValue);
-	ncpScope		= 
-	 value_i (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "ncpScope", 0) != 0;
-	if (ncpScope != 0)
-	 ncpScope_checkBox -> setChecked (true);
-	sliderValue		= value_i (dabSettings_p, 
-	 DISPLAY_WIDGET_SETTINGS,
-	 "tiiSlider", 00);
-	tiiSlider		-> setValue (sliderValue);
-	sliderValue		= value_i (dabSettings_p,
-	 DISPLAY_WIDGET_SETTINGS,
-	 "deviationSlider", 0);
-	deviationSlider		-> setValue (sliderValue);
-	sliderValue		= value_i (dabSettings_p,
-	 DISPLAY_WIDGET_SETTINGS,
-		 "channelSlider", 20);
-	channelSlider		-> setValue (sliderValue);
-
-	setMarkers		= value_i (dabSettings_p,
-	 DISPLAY_WIDGET_SETTINGS,
-	 "setMarkers", 0) != 0;
-	show_marksButton	-> 
-	 setStyleSheet (
-	 "background-color : green; color: white");
-	if (setMarkers)
-	 show_marksButton	-> setText ("no markers");
-	else
-	 show_marksButton	-> setText ("set markers");
-//
-	connect (tabWidget, &QTabWidget::currentChanged,
- this, &displayWidget::switch_tab);
-	connect (IQDisplay_p, qOverload<>(&IQDisplay::rightMouseClick),
-	 this, &displayWidget::rightMouseClick);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
-	connect (ncpScope_checkBox, &QCheckBox::checkStateChanged,
-#else
-	connect (ncpScope_checkBox, &QCheckBox::stateChanged,
-#endif
-	 this, &displayWidget::handleNcpScope_checkBox);
-	connect (show_marksButton, &QPushButton::clicked,
-	 this, &displayWidget::handleMarksButton);
-//
-	for (int i = 0; i < 2048; i ++)
-	 workingBuffer i = 0; 
-}
-
-	displayWidget::~displayWidget () {
-	if (!myFrame. isHidden ()) {
-	 storeWidgetPosition (dabSettings_p, &myFrame,
-	 DISPLAY_WIDGET_SETTINGS);
-	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "iqSliderValue", scopeSlider -> value ());
-	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "spectrumSlider", spectrumSlider -> value ());
-	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "correlationSlider", correlationSlider -> value ());
-	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "tiiSlider", tiiSlider -> value ());
-	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "deviationSlider", deviationSlider -> value ());
-	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
-	 "channelSlider", channelSlider -> value ());
-	 myFrame. hide	();
-	}
-	delete		spectrumScope_p;
-	delete		waterfallScope_p;
-	delete		nullScope_p;
-	delete		correlationScope_p;
-	delete		TII_Scope_p;
-	delete		channelScope_p;
-	delete		devScope_p;
-	delete		IQDisplay_p;
-}
-
-void	displayWidget::switch_tab	(int t) {
-	currentTab	= t;
-	store (dabSettings_p, DISPLAY_WIDGET_SETTINGS, "tabSettings", t);
-	waterfallScope_p	-> cleanUp ();
-	for (int i = 0; i < 2048; i ++)
-	 workingBuffer i = 0;
-}
-
-int	displayWidget::getTab		() {
-	return currentTab == 0 ? SHOW_SPECTRUM :
-	 currentTab == 1 ? SHOW_CORRELATION :
-	 currentTab == 2 ? SHOW_NULL : 
-	 currentTab == 3 ? SHOW_TII :
-	 currentTab == 4 ? SHOW_CHANNEL : SHOW_STDDEV;
-}
-
-///////////////////////////////////////////////////////////////////////
-//	entries
-///////////////////////////////////////////////////////////////////////
-//
-//	for "spectrum" we get a segment of 2048 timedomain samples
-//	we take the fft and average a little
-void	displayWidget::showSpectrum	(std::vector<Complex> &v, int freq) {
-int	l	= v. size ();

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/forms-v7/new-display/display-widget.h Deleted

@@ -1,122 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2024
- * 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
- */
-#pragma once
-
-#include "dab-constants.h"
-#include	<QObject>
-#include	"qwt-2.h"
-#include	<qwt_plot.h>
-#include	<QVector>
-#include	<QByteArray>
-#include	"fft-handler.h"
-#include	"super-frame.h"
-#include	"cacheElement.h"
-#include	"ui_scopewidget.h"
-
-#define	SHOW_SPECTRUM		0
-#define	SHOW_CORRELATION	1
-#define	SHOW_NULL		2
-#define	SHOW_TII		3
-#define	SHOW_CHANNEL		4
-#define	SHOW_STDDEV		5
-
-class	RadioInterface;
-class	QSettings;
-
-class	spectrumScope;
-class	waterfallScope;
-class	nullScope;
-class	correlationScope;
-class	devScope;
-class	channelScope;
-class	IQDisplay;
-
-class	displayWidget: public QObject, public Ui_scopeWidget {
-Q_OBJECT
-public:
-		displayWidget	(RadioInterface *,
-	 QSettings *);
-		~displayWidget	();
-	int	getTab		();
-	void	setBitDepth	(int);
-
-	void	setSilent	();
-	void	showSpectrum	(std::vector<Complex> &, int);
-	void	showNULL	(Complex *, int, int);
-	void	showCorrelation	(const std::vector<float> &,
-	 QVector<int> &, int,
-	 std::vector<transmitterDesc> &);
-	void	showTII		(std::vector<Complex>, int, int);
-	void	showChannel	(const std::vector<Complex>);
-	void	showStdDev	(const std::vector<float>);
-
-	void	showIQ		(const std::vector<Complex>);
-
-	void	showFICBER	(float);
-	void	showQuality	(float, float, float);
-	void	showCorrector	(int, float);
-	void	showSNR		(float);
-	void	showCorrection	(int);
-	void	showClock_err	(int);
-	void	showFrequency	(const QString &, int);
-
-	void	cleanTII	();
-	void	showCPULoad	(float);
-	void	showTransmitters	(std::vector<transmitterDesc> &);
-
-	void	showDCOffset	(float);
-	void	setDCRemoval	(bool);
-	void	setSyncLabel	(bool);
-	void	show		();
-	void	hide		();
-	bool	isHidden	();
-
-private:
-	superFrame		myFrame;
-	fftHandler		theFFT;
-	QSettings		*dabSettings_p;
-	spectrumScope		*spectrumScope_p;
-	waterfallScope		*waterfallScope_p;
-	nullScope		*nullScope_p;
-	correlationScope	*correlationScope_p;
-	spectrumScope		*TII_Scope_p;
-	devScope		*devScope_p;
-	channelScope		*channelScope_p;
-	IQDisplay		*IQDisplay_p;
-
-	DABFLOAT		workingBuffer 2048;
-	int			currentTab;
-	int			ncpScope;
-	bool			setMarkers;
-private slots:
-	void		switch_tab		(int);
-	void		rightMouseClick		();
-	void		handleNcpScope_checkBox (int);
-	void		handleMarksButton	();
-	void		handle_mouseClicked	();
-signals:
-	void		mouseClick	();
-	void		frameClosed	();
-};
-
-

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/forms-v7/new-display/scopes Deleted

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/forms-v7/new-display/scopewidget.ui Deleted

@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>scopeWidget</class>
- <widget class="QWidget" name="scopeWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>780</width>
- <height>607</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>spectrumscope</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_12">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>301</height>
- </size>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tabwidget here contains the tabs for the different scopes, supported by this Qt-DAB implementation&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="currentIndex">
- <number>3</number>
- </property>
- <widget class="QWidget" name="spectr">
- <attribute name="title">
- <string>Spectrum</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QSlider" name="spectrumSlider">
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QwtPlot" name="spectrumDisplay">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>175</height>
- </size>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spectrum of the incoming signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="correlation">
- <attribute name="title">
- <string>Corr</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <item>
- <widget class="QSlider" name="correlationSlider">
- <property name="value">
- <number>50</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QwtPlot" name="correlationDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fine time synchronization is by correlation. Ideally the match is on or around the 504-th sample.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="show_marksButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The encoding of the TII data (if any) can be used to get an estimate of the delay of the signal. This estimate (not always very accurate) then can be used to label the peaks in the correlation scope (these peaks can also be used to compute a delay in the arrival of the signal of a particular transmitter) label the peaks in the correlation scope with the TII numbers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>show marks</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="correlationsVector">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The result of matching is shown here. The best match is usually with a sample on or around&lt;/p&gt;&lt;p&gt;sample number 504. The other matches - if any - are shown as two numbers, the offset in the input and the additional distance - compared to the distance of the best match - in km.&lt;/p&gt;&lt;p&gt;Note that it is NOT the distance between transmitter and rfeceiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="correlationLength">
- <property name="minimum">
- <number>400</number>
- </property>
- <property name="maximum">
- <number>8005</number>
- </property>
- <property name="singleStep">
- <number>50</number>
- </property>
- <property name="value">
- <number>600</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="null period">
- <attribute name="title">
- <string>NULL</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="QwtPlot" name="nullDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The samples from the end of the NULL period and the start of the first data block of the DAB frame&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tii scope">
- <attribute name="title">
- <string>TII</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
- <widget class="QSlider" name="tiiSlider">
- <property name="value">
- <number>50</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QwtPlot" name="tiiDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The TII is encoded in the NULL period of a DAB frame. The NULL part is transformed into 1536 carriers, where the data is repeated 4 times, each time in a segment of 384 carriers. The data elements of the TII value are build up in 4 rods, each consisting on two subsequent carriers.&lt;/p&gt;&lt;p&gt;The scope shows the 192 elements of the collapsed data. The TII values are (in some cases) recognizable as 4 rods. The 4 rods are forming a 4 out of 8 code.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="tiiLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="channel">
- <attribute name="title">
- <string>channel</string>
- </attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QSlider" name="channelSlider">
- <property name="maximum">
- <number>50</number>
- </property>
- <property name="value">
- <number>20</number>
- </property>
- <property name="sliderPosition">
- <number>20</number>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/forms-v7/snr-viewer Deleted

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/cacheElement.h Deleted

@@ -1,100 +0,0 @@
-#
-/*
- * Copyright (C) 2015 .. 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
- */
-#pragma once
-
-//
-//	In case there is access to a database, the elements of
-//	that database are read in and per line converted to am accessible
-//	struct
-//
-//	we use the "key's" for fast detecting the database index (if any)
-#include	<string>
-#include	<QString>
-#include	"distances.h"
-class cacheElement {
-public:
-	uint32_t	key_1;	// Eid + mainId + subId
-	uint16_t	key_2;	// channel in Hex format
-	bool		valid;
-	QString		ensemble;
-	QString		country;
-	QString		channel;
-	QString		transmitterName;
-	QString		location;
-	uint16_t 	Eid;
-	uint8_t		mainId;
-	uint16_t	pattern;
-	uint8_t		subId;
-	float		latitude;
-	float		longitude;
-	float		power;
-	float		altitude;
-	float		height;
-	QString		polarization;
-	float		frequency;
-	QString		direction;
-//
-//	There are values differing per instance of the 
-//	same transmitter
-	float		strength;
-	float		distance;
-	float		azimuth;
-	float		phase;
-	bool		norm;
-	bool		collision;
-	
-	cacheElement	() {
-	 key_1		= 0;
-	 key_2		= 0;
-	 valid		= false;
-	 ensemble		= "";
-	 country		= "not known";
-	 channel		= "";
-	 ensemble		= "";
-	 Eid			= 0;
-	 mainId		= 255;
-	 subId		= 255;
-	 transmitterName	= "not in database";
-	 latitude		= 0;
-	 longitude		= 0;
-	 power		= 0;
-	 height		= 0;
-	 power		= 0;
-	 polarization		= "";
-	 frequency		= 0;
-	 direction		= "";
-	 phase		= 0;
-	 norm			= false;
-	 collision		= false;
-	}
-	~cacheElement	()	{}
-};
-
-
-struct transmitterDesc {
-	bool	isValid;
-	bool	isStrongest;
-	bool	isFurthest;
-	cacheElement theTransmitter;
-};
-

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/wavWriter.cpp Deleted

@@ -1,192 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2024
- * 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
- */
-//
-//	The RIFF writer writes the input samples into a "wav" file
-//	with the samplerate of SAMPLERATE (2048000), as 16 bit int's, and a "chunk"
-//	(chunk Id "freq") is added that contains the frequency
-#include	"wavWriter.h"
-
-static
-const char	* riff	= "RIFF";
-static
-const char	* junk	= "JUNK";
-static
-const char	* bw64	= "BW64";
-static
-const char	* ds64	= "ds64";
-static
-const char	* wave	= "WAVE";
-static
-const char	* fmt	= "fmt ";
-static
-const char	* aux1	= "freq";
-static
-const char	* aux2	= "bits";
-static
-const char	* data	= "data";
-
-	wavWriter::wavWriter	() {
-	isValid = false;
-}
-
-	wavWriter::~wavWriter	() {}
-
-bool	wavWriter::init	(const QString &fileName, const int sampleRate, 
-	 const int frequency, const int bitDepth) {
-	isValid			= false;
-	filePointer		= fopen (fileName. toUtf8 (). data (), "wb");
-	if (filePointer == nullptr)
-	 return false;
-
-	fwrite (riff, 1, 4, filePointer);
-
-//	the ultimate filesize is written at location 4
-	fseek (filePointer, 4, SEEK_CUR);
-
-//	The default header:
-	locationCounter		= 8;
-	fwrite (wave, 1, 4, filePointer);
-	locationCounter		+= 4;
-//
-//	junk block
-	fwrite (junk, 1, 4, filePointer);
-	locationCounter		+= 4;
-	uint32_t junkSize	= 32;
-	fwrite (&junkSize, 1, 4, filePointer);
-	locationCounter		+= 4;
-	char junkNix 32	= {0};
-	fwrite (&junkNix, 1, 32, filePointer);
-	locationCounter		+= 32;
-
-	fwrite (fmt, 1, 4, filePointer);
-	locationCounter		+= 4;
-	uint32_t fmtSize	= 16;
-	fwrite (&fmtSize, 1, 4, filePointer);
-	locationCounter		+= 4;
-	uint16_t	formatTag	= 01;
-	fwrite (&formatTag, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-	uint16_t	nrChannels	= 2;
-	fwrite (&nrChannels, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-	uint32_t	samplingRate	= sampleRate;
-	fwrite (&samplingRate, 1, sizeof (uint32_t), filePointer);
-	locationCounter		+= 4;
-	uint32_t	bytesperSecond	= 4 * samplingRate;
-	fwrite (&bytesperSecond, 1, sizeof (uint32_t), filePointer);
-	locationCounter		+= 4;
-	uint16_t	bytesperBlock	= 4;
-	fwrite (&bytesperBlock, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-	uint16_t bitsperSample		= 16;
-	fwrite (&bitsperSample, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-//
-//	the "freq" chunk
-	if (frequency > 0) {
-	 fwrite (aux1, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 int freqLen	= sizeof (int32_t);
-	 fwrite (&freqLen, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 fwrite (&frequency, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	}
-//
-//	the "bitdepth" chunk
-	if (bitDepth > 0) {
-	 fwrite (aux2, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 int bitDepthLen	= 4;
-	 fwrite (&bitDepthLen, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 fwrite (&bitDepth, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	}
-//
-//	start of the "data" chunk
-	fwrite (data, 1, 4, filePointer);
-	locationCounter		+= 4;
-
-	nrElements	= 0;
-	isValid		= true;
-	return true;
-}
-
-void	wavWriter::close	() {
-	if (!isValid)
-	 return;
-	isValid		= false;
-	uint64_t nrBytes	= nrElements * 2 * sizeof (int16_t);
-
-//	reset the fp to the location where the nr bytes in the
-//	data chunk should be written
-	fseek (filePointer, 0, SEEK_SET);
-	if (nrBytes < (uint64_t)0xFFFFFFFF) {
-//	 fwrite (bw64, 1, 4, filePointer);
-	 fseek (filePointer, locationCounter, SEEK_SET);
-	 fwrite (&nrBytes, 1, 4, filePointer);
-//
-//	compute the number if of to be recorded in the RIFF count
-	 fseek (filePointer, 0, SEEK_END);
-	 int riffSize	= ftell (filePointer) - 8;
-//
-//	and record the value at loc 4
-	 fseek (filePointer, 4, SEEK_SET);
-	 fwrite (&riffSize, 1, 4, filePointer);
-	 fseek (filePointer, 0, SEEK_END);
-	 fclose (filePointer);
-	 return;
-	}
-//	a large file, make it BW64
-//
-	uint32_t minusOne = 0xFFFFFFFF;
-	fwrite (bw64, 1, 4, filePointer);
-	fwrite (&minusOne, 1, 4, filePointer);
-	fseek (filePointer, locationCounter, SEEK_SET);
-	fwrite (&minusOne, 1, 4, filePointer);
-//	compute the number if of to be recorded in the RIFF count
-	fseek (filePointer, 0, SEEK_END);
-	int riffSize	= ftell (filePointer) - 8;
-//	just fill the ds64 struct
-	fseek (filePointer, 12, SEEK_SET);
-	fwrite (ds64, 1, 4, filePointer);
-	fseek (filePointer, 20, SEEK_SET);
-	uint64_t theSize	= riffSize;
-	fwrite (&theSize, 1, 8, filePointer);
-	fwrite (&nrBytes, 1, 8, filePointer);
-	fseek (filePointer, 0, SEEK_END);
-	fclose (filePointer);
-}
-
-void	wavWriter::write (int16_t *buff, uint64_t samples) {
-	if (!isValid)
-	 return;
-	fwrite (buff, 2 * sizeof (int16_t), (size_t)samples, filePointer);
-	nrElements	+= samples;
-}
-
-bool	wavWriter::isActive	() {
-	return isValid;
-}
-

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/wavWriter.h Deleted

@@ -1,46 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2025
- * 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
- */
-
-#pragma once
-
-#include	<QString>
-#include	<stdio.h>
-#include	<stdint.h>
-
-class wavWriter {
-public:
-		wavWriter	();
-		~wavWriter	();
-	bool	init		(const QString &, int,
-	 int bitDepth = 0, int frequency = 0);
-	void	write		(int16_t *buff, uint64_t samples);
-	void	close		();
-	bool	isActive	();
-private:
-	FILE		*filePointer;
-	uint64_t	nrElements;
-	std::fpos_t	dataPos;
-	bool		isValid;
-	uint64_t	locationCounter;
-};
-

qt-dab-Qt-DAB-6.9.3.tar.gz/.gitignore -> qt-dab-Qt-DAB-6.9.4.tar.gz/.gitignore Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/CMakeLists.txt -> qt-dab-Qt-DAB-6.9.4.tar.gz/CMakeLists.txt Changed

@@ -148,9 +148,8 @@
 	           ${QT_QTGUI_INCLUDE_DIR}
 	           ./sources/main
 	           ./sources/main/forms-v7
-	           ./sources/main/forms-v7/new-display
-	           ./sources/main/forms-v7/new-display/scopes
-	           ./sources/main/forms-v7/snr-viewer
+	           ./sources/main/scopes
+	           ./sources/main/snr-viewer
 	           ./sources/eti-handler
 	           ./sources/support
 	           ./sources/support/gui-elements
@@ -180,21 +179,22 @@
 	     ./sources/main/config-handler.h
 	     ./sources/main/ensemble-handler.h
 	     ./sources/main/techdata.h
-	     ./sources/main/forms-v7/new-display/display-widget.h 
-             ./sources/main/forms-v7/new-display/scopes/correlation-scope.h 
-             ./sources/main/forms-v7/new-display/scopes/spectrum-scope.h 
-             ./sources/main/forms-v7/new-display/scopes/null-scope.h 
-             ./sources/main/forms-v7/new-display/scopes/channel-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/dev-scope.h
-             ./sources/main/forms-v7/new-display/scopes/waterfall-scope.h 
-             ./sources/main/forms-v7/new-display/scopes/iqdisplay.h 
-	     ./sources/main/forms-v7/new-display/scopes/audio-display.h
-	     ./sources/main/forms-v7/new-display/scopes/spectrogramdata.h
-	     ./sources/main/forms-v7/snr-viewer/snr-viewer.h
+	     ./sources/main/display-widget.h 
+             ./sources/main/scopes/spectrum-scope.h 
+             ./sources/main/scopes/correlation-scope.h 
+             ./sources/main/scopes/null-scope.h 
+             ./sources/main/scopes/channel-scope.h 
+	     ./sources/main/scopes/dev-scope.h
+             ./sources/main/scopes/waterfall-scope.h 
+             ./sources/main/scopes/iqdisplay.h 
+	     ./sources/main/scopes/audio-display.h
+	     ./sources/main/scopes/spectrogramdata.h
+	     ./sources/main/snr-viewer/snr-viewer.h
 	     ./sources/eti-handler/eti-generator.h
 	     ./sources/frontend/ofdm-handler.h
              ./sources/frontend/sample-reader.h
 	     ./sources/frontend/correlator.h
+	     ./sources/frontend/estimator.h
 	     ./sources/frontend/freqsyncer.h
 	     ./sources/frontend/ofdm-decoder.h
 	     ./sources/frontend/phasetable.h
@@ -208,15 +208,17 @@
 	     ./sources/frontend/tii-detector-1.h
 	     ./sources/frontend/tii-detector-2.h
 	     ./sources/frontend/timesyncer.h
-	     ./sources/frontend/estimator.h
 	     ./sources/protection/protTables.h
 	     ./sources/protection/protection.h
 	     ./sources/protection/uep-protection.h
 	     ./sources/protection/eep-protection.h
+	     ./sources/support/equalizer.h
+	     ./sources/support/qwt-2.h
 	     ./sources/support/audiosystem-selector.h
 	     ./sources/support/bandpass-filter.h
 	     ./sources/support/bit-extractor.h
-	     ./sources/support/cacheElement.h
+	     ./sources/support/db-element.h
+	     ./sources/support/basic-print.h
 	     ./sources/support/charsets.h
 	     ./sources/support/content-table.h
 	     ./sources/support/converter_48000.h
@@ -236,6 +238,7 @@
 	     ./sources/support/http-handler.h
 	     ./sources/support/ITU_Region_1.h
 	     ./sources/support/logger.h
+	     ./sources/support/errorlog.h
 	     ./sources/support/mapport.h
 	     ./sources/support/mot-content-types.h
 	     ./sources/support/position-handler.h
@@ -256,7 +259,7 @@
 	     ./sources/support/time-converter.h
 	     ./sources/support/time-table.h
 	     ./sources/support/uploader.h
-	     ./sources/support/wavWriter.h
+	     ./sources/support/riffWriter.h
 	     ./sources/support/gui-elements/circular-button.h
 	     ./sources/support/gui-elements/clickable-label.h
 	     ./sources/support/gui-elements/color-selector.h
@@ -285,6 +288,7 @@
 	     ./sources/backend/data/adv-datahandler.h
 	     ./sources/backend/data/data-processor.h
 	     ./sources/backend/data/ip-datahandler.h
+	     ./sources/backend/data/journaline-controller.h
 	     ./sources/backend/data/journaline-datahandler.h
 	     ./sources/backend/data/journaline-screen.h
 	     ./sources/backend/data/pad-handler.h
@@ -318,21 +322,22 @@
 	     ./sources/main/config-handler.cpp
 	     ./sources/main/ensemble-handler.cpp
 	     ./sources/main/techdata.cpp
-	     ./sources/main/forms-v7/new-display/display-widget.cpp 
-             ./sources/main/forms-v7/new-display/scopes/correlation-scope.cpp 
-             ./sources/main/forms-v7/new-display/scopes/spectrum-scope.cpp 
-             ./sources/main/forms-v7/new-display/scopes/null-scope.cpp 
-             ./sources/main/forms-v7/new-display/scopes/channel-scope.cpp 
-	     ./sources/main/forms-v7/new-display/scopes/dev-scope.cpp
-             ./sources/main/forms-v7/new-display/scopes/waterfall-scope.cpp 
-             ./sources/main/forms-v7/new-display/scopes/iqdisplay.cpp 
-	     ./sources/main/forms-v7/new-display/scopes/audio-display.cpp
-	     ./sources/main/forms-v7/new-display/scopes/spectrogramdata.cpp
-	     ./sources/main/forms-v7/snr-viewer/snr-viewer.cpp
+	     ./sources/main/display-widget.cpp 
+             ./sources/main/scopes/correlation-scope.cpp 
+             ./sources/main/scopes/spectrum-scope.cpp 
+             ./sources/main/scopes/null-scope.cpp 
+             ./sources/main/scopes/channel-scope.cpp 
+	     ./sources/main/scopes/dev-scope.cpp
+             ./sources/main/scopes/waterfall-scope.cpp 
+             ./sources/main/scopes/iqdisplay.cpp 
+	     ./sources/main/scopes/audio-display.cpp
+	     ./sources/main/scopes/spectrogramdata.cpp
+	     ./sources/main/snr-viewer/snr-viewer.cpp
 	     ./sources/eti-handler/eti-generator.cpp
 	     ./sources/frontend/ofdm-handler.cpp
              ./sources/frontend/sample-reader.cpp
 	     ./sources/frontend/correlator.cpp
+	     ./sources/frontend/estimator.cpp
 	     ./sources/frontend/freqsyncer.cpp
 	     ./sources/frontend/ofdm-decoder.cpp
 	     ./sources/frontend/phasetable.cpp
@@ -345,17 +350,18 @@
 	     ./sources/frontend/tii-detector-1.cpp
 	     ./sources/frontend/tii-detector-2.cpp
 	     ./sources/frontend/timesyncer.cpp
-	     ./sources/frontend/estimator.cpp
 	     ./sources/protection/protTables.cpp
 	     ./sources/protection/protection.cpp
 	     ./sources/protection/uep-protection.cpp
 	     ./sources/protection/eep-protection.cpp
 	     ./sources/support/audiosystem-selector.cpp
+	     ./sources/support/basic-print.cpp
 	     ./sources/support/charsets.cpp
 	     ./sources/support/bandpass-filter.cpp
 	     ./sources/support/content-table.cpp
 	     ./sources/support/converter_48000.cpp
 	     ./sources/support/coordinates.cpp
+	     ./sources/support/crc-handlers.cpp
 	     ./sources/support/dab-params.cpp
 	     ./sources/support/dab-tables.cpp
 	     ./sources/support/distances.cpp
@@ -367,6 +373,7 @@
 	     ./sources/support/http-handler.cpp
 	     ./sources/support/ITU_Region_1.cpp
 	     ./sources/support/logger.cpp
+	     ./sources/support/errorlog.cpp
 	     ./sources/support/mapport.cpp
 	     ./sources/support/position-handler.cpp
 	     ./sources/support/presetcombobox.cpp
@@ -383,7 +390,7 @@
 	     ./sources/support/time-converter.cpp
 	     ./sources/support/time-table.cpp
 	     ./sources/support/uploader.cpp
-	     ./sources/support/wavWriter.cpp
+	     ./sources/support/riffWriter.cpp
 	     ./sources/support/gui-elements/circular-button.cpp
 	     ./sources/support/gui-elements/clickable-label.cpp
 	     ./sources/support/gui-elements/color-selector.cpp
@@ -411,6 +418,7 @@
 	     ./sources/backend/data/adv-datahandler.cpp
 	     ./sources/backend/data/data-processor.cpp
 	     ./sources/backend/data/ip-datahandler.cpp
+	     ./sources/backend/data/journaline-controller.cpp
 	     ./sources/backend/data/journaline-datahandler.cpp
 	     ./sources/backend/data/journaline-screen.cpp
 	     ./sources/backend/data/pad-handler.cpp
@@ -438,16 +446,16 @@
 	     ./sources/main/config-handler.h 
 	     ./sources/main/techdata.h
 	     ./sources/main/aboutdialog.h 
-	     ./sources/main/forms-v7/new-display/display-widget.h 
-	     ./sources/main/forms-v7/new-display/scopes/correlation-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/spectrum-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/null-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/channel-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/dev-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/waterfall-scope.h 
-	     ./sources/main/forms-v7/new-display/scopes/iqdisplay.h 
-	     ./sources/main/forms-v7/new-display/scopes/audio-display.h
- 	     ./sources/main/forms-v7/snr-viewer/snr-viewer.h
+	     ./sources/main/display-widget.h 
+	     ./sources/main/scopes/correlation-scope.h 
+	     ./sources/main/scopes/spectrum-scope.h 
+	     ./sources/main/scopes/null-scope.h 
+	     ./sources/main/scopes/channel-scope.h 
+	     ./sources/main/scopes/dev-scope.h 
+	     ./sources/main/scopes/waterfall-scope.h 
+	     ./sources/main/scopes/iqdisplay.h 
+	     ./sources/main/scopes/audio-display.h
+ 	     ./sources/main/snr-viewer/snr-viewer.h
 	     ./sources/frontend/ofdm-handler.h
 	     ./sources/frontend/sample-reader.h
 	     ./sources/frontend/ofdm-decoder.h
@@ -508,12 +516,12 @@
 
 	set (${objectName}_UIS

qt-dab-Qt-DAB-6.9.3.tar.gz/README.md -> qt-dab-Qt-DAB-6.9.4.tar.gz/README.md Changed

@@ -2,7 +2,7 @@
 
 -------------------------------------------------------------------
 
-!6.9(/res/read_me/front-picture.png?raw=true)
+!6.9(/res/read_me/qt-dab-logo.png?raw=true)
 
 --------------------------------------------------------------------------
 About Qt-DAB
@@ -10,77 +10,65 @@
 
 *Qt-DAB* is software for Linux, Windows, MacOS and Raspberry Pi for listening to terrestrial **Digital Audio Broadcasting (DAB and DAB+)**.
 
-The GUI of Qt-DAB has a single *main* widget that
-contains essentially all that is needed when just selecting a service and listening.  Other widgets, visible under user control, if made visible show a myriad of controls, and a tremendous amount of data in the DAB signal and the resulting audio, 
+Qt-DAB is GUI based, for a command line version, see **dab-cmdline**.
+Qt-DAB  has a single *main* widget that contains essentially all that is needed for selecting channels and services and listening to a service. Other widgets, visible under user control, show a myriad of controls, and a tremendous amount of data in the DAB signal and the resulting audio, 
+
+!6.9(/res/read_me/qt-dab-front-picture.png?raw=true)
 
 Of course, as for previous versions, for the current version,
-*Qt-DAB-6.9*, predefined executables and installers are available.
+*Qt-DAB-6.9.4*, predefined executables and installers are available.
 For Windows  **two** 32 bit installers are available, and for Linux there is an x64 AppImage.
 
-!6.9(/res/read_me/Qt_DAB-6.9.1.png?raw=true)
-!6.9(/res/read_me/Qt_DAB-6.9.2.png?raw=true)
-
 Table of Contents
 =================================================================
 
 * Introduction(#introduction)
 * Features(#features)
 * Widgets and scopes(#widgets-and-scopes)
-* A note on using an RTLSDR device(#a-note-on-using-an-RTLSDR-device)
+* Devices and device support(#devices-and-device-support)
+* Tuning accurary(#tuning-accurarcy)
 * Scan control(#scan-control)
 * Displaying TII data(#displaying-TII-data)
 * EPG Handling and time tables(#epg-handling-and-time-tables)
+* Journaline data(#journaline-data)
+* Logging errors(#logging-errors)
 * Documentation(#documentation)
 * Installation on Windows(#installation-on-Windows)
 * Installation on Linux(#installation-on-Linux)
 * Notes on building an executable(#building-an-executable-for-qt-dab-a-few-notes)
 * Using user specified bands(#using-user-specified-bands)
-* xml-files and support(#xml-files-and-support)
 * Copyright(#copyright)
 
 Introduction
 =================================================================
 
-*Qt-DAB* is designed to be used  with different SDR devices.
-Qt-DAB  supports a DABsticks, all models of the SDRplay,
-Airspy, HackRF, LimeSDR, Adalm Pluto etc.
+*Qt-DAB* is designed to be used with a variety of SDR devices.
 Precompiled versions for Windows and Linux (x64) are available
-that support most of these devices (see below).
+that support most of these devices for which Qt-DAB provides support (see below).
 Thanks to Richard Huber, *Qt-DAB* can be compiled on the Mac as well.
 
-*Qt-DAB* is GUI driven, the full GUI shows 4+ widgets, one of them, the
-*main widget* - one with sufficient controls to select channels and service(s) -
-is always visible. This main widget contains selectors
+*Qt-DAB* is GUI driven, the full GUI shows 4+ widgets, one of them is the
+*main widget* - one with sufficient controls to select channels and service(s)  which is always visible. This main widget contains selectors
 for controlling the visibility of (the) other widgets.
 
-There is - on the surface - not much difference between the 6.9.3 and
-6.9.2 version. An error that sometimes caused problems with a data service
-(insufficent data) to run was corrected. Furthermore, the sourcetree
-was changed completely, but that does not affect the executables.
+There is - on the surface - not much difference between the 6.9. and
+previous versions.
+Most changes  are internal, a visible one is the addition of  a "save titles"
+selector on the configuration widget.
 
 Features
 =================================================================
-
-  * Qt-DAB supports input device:
-   	- SDR DAB sticks (RTL2838U or similar), with separate libraries for the V3 and V4 versions of the stick, 
-  	- All SDRplay SDR models (RSP I,  RSP 1A and 1B, RSP II, RSP Duo, RSP Dx and RSPDxR2), with separate entries for the v2 and v3 library,
-	- HACKRF One, 
-  	- Airspy, including Airspy mini,
-	- LimeSDR, 
-	- Adalm Pluto,
-	- **untested** UHD (anyone wants to help testing?)
-	- Soapy (Linux only, not included in the AppImage), a renewed Soapy interface driver is even able to handle other samplerates than the required 2048000 (limited to the range 2000000 .. 4000000),
-	- ExtIO (experimental, Windows only),
-	- input from an rtl_tcp server connected to an RTLSDR device.
-	- input from a **spyServer** (both 8 bit and a 16 bit version), i.e. from AIRSpy devices and RTLSDR devices. Note that the AIRspyHF cannot handle the required samplerate.
-  * Always supported for files:
-  	* the possibility of generating ".sdr" type files from the input.
-   	- reading prerecorded dump (`.raw`, `.iq`, '.sdr`, and '.uff' (xml)) files,
-	- NEW is the ability of Qt-DAB to generate "sdr" type files with a size larger than 4 Gb, and (obviously) the ability of the ".sdr" reader to read such files.
+  
+  * Qt-DAB supports most common SDR devices directly. The device interface is quite simple and in a different document it is explained in detail how to use the interface  to implement control for other devices;
   * Qt-DAB supports so-called *favorites* (i.e. channel, service pairs) for easy switching between services in different ensembles (see below),
-  * Qt-DAB recognizes and interprets *TII* (Transmitter Identification Information) data of - if the received signal is from multiple transmitters - *all* detectable transmitters, can be made visible simultaeously, and displays the transmitters on a map. A separare tool is available to download the required database.
-  * Qt-DAB allows running an arbitrary amount of audio services from tne current ensemble as *background service*. with the output sent to a file,
+  * Qt-DAB recognizes and interprets **TII** (Transmitter Identification Information) data of - if the received signal is from multiple transmitters - *all* detectable transmitters, can be made visible simultaeously, and displays the transmitters on a map. A separate tool is available to download the required database.
+  * Qt-DAB starts EPG/SPI services automatically as background task and provides means to show resulting time tables;
+  * Qt-DAB supports **journaline**, often transmitted as subservice, and auto starts a small journaline window;
+  * Qt-DAB allows running an arbitrary amount of audio services from tne current ensemble as *background service*, with the output sent to a file,
   * Qt-DAB offers options to select other bands, i.e. the L-Band, or channel descriptions from a user provided file and it supports obsolete modes (Mode II and Mode IV),
+  * Qt-DAB offers the possibility of generating an **ETI file** from the currently selected channel,
+  * Qt-DAB offers different views on the input data, see below,
+  * Qt-DAB offers the possibility of scanning through all - or a selected subset - channels of the band,
   * and much more ...
 
 Widgets and scopes
@@ -88,23 +76,26 @@
 
 !6.9(/res/read_me/Qt_DAB-6.9.1.png)
 
-The *main widget* (see picture) of Qt-DAB (always visible), contains settings for controlling the visibility of other widgets.
-It shows - left half - a list of services (either from the currently selected channel or from the favourites), seleting a service is just by clicking on the name.
-On the right half of the widget it shows the dynamic label, and the slides - if transmitted as part of the service - or a series of default slides.
+The *main widget* (see picture) of Qt-DAB (always visible), contains  the settings for controlling the visibility of other widgets.
+The window shows - left half - a list of services (either from the currently selected channel or from the favourites). Selecting a service is just by clicking on the name.
+The right half of the widget shows the dynamic label, and the slides - if transmitted as part of the service - or a series of default slides.
+
+  * touching the *ensemble name* (NPO (8001) in the picture) makes the *content table*, i.e. an overview of the content of the ensemble, visible with the possibility of storing the data in a file in ".csv" format. If the content table is visible, touching the name agian will hide it;
+
+!6.9(/res/read_me/content-table.png)
 
-* touching the *ensemble name* (5B Z-H/ZEELAND (805B) in the picture) makes the
-*content table*, i.e. an overview of the content of the ensemble, visible with the possibility of storing the data in a file in ".csv" format. If the content table is visible, touching the name agian will hide it;
- * touching the small icon left on the top of the right half
- will show (or hide) the *technical widget*,
-a widget showing all technical details as well as strength indicators and 
+ * touching the small icon left on the top of the right half will show (or hide) the *technical widget*, a widget showing all technical details as well as strength indicators and 
 a spectrum of the audio of the selected service;
  * touching the small icon to the right next, the folder/directory in which the slides, the tii log and the log file are written is shown;
  * touching the icon showing a *speaker* controls **muting** the signal and shows
 whether or not a signal should be audible.
  * touching the *copyright symbol* shows (or, if visible, hides) a small widget with acknowledgements for using external libraries;
- * touching with the *right hand mouse button* the text on the dynamic label (JE HOORT ANDRE HAZES - N VRIEND) a small menu shows to put the text on the clipboard;
+
+ * touching with the *right hand mouse button* the text on the dynamic label 
+Toto - Rosanna) a small menu shows to put the text on the clipboard (see also below the configuration widget).
+
  * the button labeled *scan* controls the visibility of a the scan handler widget;
- * the button labeled *http* controls the http handler with which a map )with the transmitters) will be shown;
+ * the button labeled *http* controls the http handler with which a map (with the transmitters) will be shown;
  * the button labeled *spectrum* controls the visibility of the spectrum widget, a widget that contains views on and information of the DAB signal itself;
  * the button labeled *controls* controls the visibility of the so-called *configuration and control widget*, a widget that contains numerous settings for this software;
  * the button labeled *favourites* controls  whether the list of services
@@ -122,7 +113,7 @@
 Of course, when selecting a service in the list of favourites, it might take some time before the software has switched over to the appropriate channel, and has
 received sufficient information on the new ensemble carried in that channel before being able to select the service in that channel.
 
-*Adding* a service to the favourites is by clicking on the field in the right hand column, shown in the services list.
+**Adding** a service to the favourites is by clicking on the field in the right hand column, shown in the services list.
 If - in *ensemble mode* view - a service is also part of the favourites, the
 field in the right hand column is marked. Clicking on such a mark *removes* the
 service from the list, as does clicking on the field in the *favourites view*.
@@ -135,12 +126,14 @@
 is shown as well.
 
 The buttons at the top of the widget control *dumping* the audio
-(".wav" file) resp. the AAC frames into a file. AAC encoded files can be processed
-by e.g. VLC.
+(".wav" file) resp. the AAC or MP2 frames into a file. AAC amd MP2 encoded files can be processed by e.g. VLC.
+
 The **timeTable** button has only effect if on this channel (ensemble) an EPG 
-service is of was active. Data from the EPG service is stored, and the
+service is or was active. Data from the EPG service is stored, and the
 timetable is an interpretation of that data.
 
+Below the **timeTable** button the static (meta)data of the selected autioservice is shown.
+ 
 The three progress bars (quality indicators) for DAB+ give success rates of
 resp. detecting a DAB+ frame, the RS error repair and the AAC decoding.
 (For "old" DAB transmissions only a single quality indicator appears).
@@ -149,22 +142,26 @@
 Of course, the parity bits used by the RS decoding may contain bit errors themselves, which mot likely lead to CRC errors, the second indicator shows the amount of CRC errors detected after thecorrection by the RS decoding.
 
 The third indicator tells the percentage of the AAC (or MP2) data that was
-found to be OK. If - for
-whatever reason - the audio frames in the selected audio service could not
-be translated into PCM data, NULL values are inserted to ensure that the
-demands of the outputrate are met.
+found to be OK.
+
+The "scope" at the bottom shows the spectrum of the audio.
 
 !6.8(/res/read_me/spectrum-scope.png)
 
 The widget for the *spectrum scope* is equipped with a tab for selecting
 one of 6 views on the input signal.
 In the view shown in the picture above, the spectrum of the incoming DAB signal is shown. To the right of this spectrum, one
-sees the *signal constellation*,
+sees the **signal constellation**,
 i.e. the mapping from the complex signals onto their real
 and imaginary components. If the selector labeled
 "ncp" is set, the centerpoints of the 4 lobs is shown.

qt-dab-Qt-DAB-6.9.3.tar.gz/app-files/appimage/AppRun -> qt-dab-Qt-DAB-6.9.4.tar.gz/app-files/appimage/AppRun Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/app-files/qt-dab-6.9 -256x256.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/app-files/qt-dab-6.9.desktop -> qt-dab-Qt-DAB-6.9.4.tar.gz/app-files/qt-dab-6.9.desktop Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/app-files/qt-dab-6.9.ico -> qt-dab-Qt-DAB-6.9.4.tar.gz/app-files/qt-dab-6.9.ico Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/app-files/qt-dab-6.9.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/app-files/qt-dab-6.9.png Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/qt-dab-6.9-build.txt -> qt-dab-Qt-DAB-6.9.4.tar.gz/qt-dab-6.9-build.txt Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/qt-dab-6.9.pro -> qt-dab-Qt-DAB-6.9.4.tar.gz/qt-dab-6.9.pro Changed

@@ -56,15 +56,12 @@
 	      ./sources/eti-handler \
 	      ./sources/main \
 	      ./sources/main/forms-v7 \
-	      ./sources/main/forms-v7/new-display \
-	      ./sources/main/forms-v7/new-display/scopes \
-	      ./sources/main/forms-v7/snr-viewer \
+	      ./sources/main/snr-viewer \
 	      ./sources/frontend \
 	      ./sources/output \
 	      ./sources/output/portaudio \
 	      ./sources/protection \
 	      ./sources/devices \
-#	      ./sources/scopes-qwt6 \
 	      ./sources/support \
 	      ./sources/support/gui-elements \
 	      ./sources/devices \
@@ -86,9 +83,8 @@
 	      ./sources/eti-handler \
 	      ./sources/main \
 	      ./sources/main/forms-v7 \
-	      ./sources/main/forms-v7/new-display \
-	      ./sources/main/forms-v7/new-display/scopes \
-	      ./sources/main/forms-v7/snr-viewer \
+	      ./sources/main/scopes \
+	      ./sources/main/snr-viewer \
 	      ./sources/frontend \
 	      ./sources/output \
 	      ./sources/output/portaudio \
@@ -106,22 +102,23 @@
 
 # Input
 HEADERS += ./sources/main/radio.h \
-	   ./sources/main/forms-v7/qwt-2.h \
-	   ./sources/main/forms-v7/new-display/display-widget.h \
-	   ./sources/main/forms-v7/new-display/scopes/spectrum-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/correlation-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/null-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/channel-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/dev-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/waterfall-scope.h \
-	   ./sources/main/forms-v7/new-display/scopes/iqdisplay.h \
-	   ./sources/main/forms-v7/new-display/scopes/audio-display.h \
-	   ./sources/main/forms-v7/new-display/scopes/spectrogramdata.h \
-	   ./sources/main/forms-v7/snr-viewer/snr-viewer.h \
+	   ./sources/main/display-widget.h \
+	   ./sources/main/scopes/spectrum-scope.h \
+	   ./sources/main/scopes/correlation-scope.h \
+	   ./sources/main/scopes/null-scope.h \
+	   ./sources/main/scopes/channel-scope.h \
+	   ./sources/main/scopes/dev-scope.h \
+	   ./sources/main/scopes/waterfall-scope.h \
+	   ./sources/main/scopes/iqdisplay.h \
+	   ./sources/main/scopes/audio-display.h \
+	   ./sources/main//scopes/spectrogramdata.h \
+	   ./sources/main/snr-viewer/snr-viewer.h \
 	   ./sources/main/ensemble-handler.h \
 	   ./sources/main/config-handler.h \
 	   ./sources/main/techdata.h \
 	   ./sources/main/aboutdialog.h \
+	   ./sources/support/equalizer.h \
+	   ./sources/support/qwt-2.h \
 	   ./sources/support/scan-handler.h \
 	   ./sources/support/scantable-handler.h \
 	   ./sources/support/dxDisplay.h \
@@ -132,6 +129,7 @@
 	   ./sources/frontend/sample-reader.h \
 	   ./sources/frontend/ofdm-decoder.h \
 	   ./sources/frontend/correlator.h \
+	   ./sources/frontend/estimator.h \
 	   ./sources/frontend/freqsyncer.h \
 	   ./sources/frontend/phasetable.h \
 	   ./sources/frontend/freq-interleaver.h \
@@ -143,7 +141,6 @@
 	   ./sources/frontend/fib-config.h  \
 	   ./sources/frontend/fib-decoder.h  \
 	   ./sources/frontend/fib-table.h \
-	   ./sources/frontend/estimator.h \
 	   ./sources/protection/protTables.h \
 	   ./sources/protection/protection.h \
 	   ./sources/protection/eep-protection.h \
@@ -168,6 +165,7 @@
 	   ./sources/backend/data/mot/mot-handler.h \
 	   ./sources/backend/data/mot/mot-object.h \
 	   ./sources/backend/data/mot/mot-dir.h \
+	   ./sources/backend/data/journaline-controller.h \
 	   ./sources/backend/data/journaline-datahandler.h \
 	   ./sources/backend/data/journaline-screen.h \
 	   ./sources/backend/data/journaline/dabdatagroupdecoder.h \
@@ -189,12 +187,13 @@
 	   ./sources/support/distances.h \
 	   ./sources/support/time-converter.h \
 	   ./sources/support/logger.h \
+	   ./sources/support/errorlog.h \
 	   ./sources/support/settings-handler.h \
 	   ./sources/support/position-handler.h \
-	   ./sources/support/cacheElement.h \
+	   ./sources/support/db-element.h \
 	   ./sources/support/settingNames.h \
 	   ./sources/support/fft-handler.h \
-	   ./sources/support/wavWriter.h \
+	   ./sources/support/riffWriter.h \
 	   ./sources/support/converter_48000.h \
 	   ./sources/support/process-params.h \
 	   ./sources/support/ringbuffer.h \
@@ -217,7 +216,8 @@
 	   ./sources/support/fir-filters.h \
 	   ./sources/support/tii-mapper.h \
 	   ./sources/support/tii-reader.h \
-	   ./sources/support//uploader.h \
+	   ./sources/support/uploader.h \
+	   ./sources/support/basic-print.h \
 	   ./sources/support/gui-elements/circular-button.h \
 	   ./sources/support/gui-elements/clickable-label.h \
 	   ./sources/support/gui-elements/color-selector.h \
@@ -248,27 +248,27 @@
 FORMS	+= ./sources/main/forms-v7/technical_data.ui
 FORMS	+= ./sources/main/forms-v7/dabradio-6.ui 
 FORMS	+= ./sources/main/forms-v7/config-helper.ui 
-FORMS	+= ./sources/main/forms-v7/audio-description.ui
-FORMS	+= ./sources/main/forms-v7/data-description.ui
-FORMS	+= ./sources/main/forms-v7/new-display/scopewidget.ui
-FORMS	+= ./sources/main/forms-v7/snr-viewer/snr-widget.ui
-FORMS	+= ./sources/main/aboutdialog.ui
+#FORMS	+= ./sources/main/forms-v7/audio-description.ui
+#FORMS	+= ./sources/main/forms-v7/data-description.ui
+FORMS	+= ./sources/main/forms-v7/scopewidget.ui
+FORMS	+= ./sources/main/forms-v7/aboutdialog.ui
+FORMS	+= ./sources/main/snr-viewer/snr-widget.ui
 #FORMS	+= ./sources/devices/filereaders/filereader-widget.ui 
 FORMS	+= ./sources/devices/filereaders/xml-filereader/xmlfiles.ui
 
 SOURCES += ./sources/main/main.cpp \
 	   ./sources/main/radio.cpp \
-	   ./sources/main/forms-v7/new-display/display-widget.cpp \
-           ./sources/main/forms-v7/new-display/scopes/correlation-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/spectrum-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/null-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/channel-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/dev-scope.cpp \
-           ./sources/main/forms-v7/new-display/scopes/waterfall-scope.cpp \
-	   ./sources/main/forms-v7/new-display/scopes/iqdisplay.cpp \
-	   ./sources/main/forms-v7/new-display/scopes/audio-display.cpp \
-	   ./sources/main/forms-v7/new-display/scopes/spectrogramdata.cpp \
-	   ./sources/main/forms-v7/snr-viewer/snr-viewer.cpp \
+	   ./sources/main/display-widget.cpp \
+           ./sources/main/scopes/correlation-scope.cpp \
+           ./sources/main/scopes/spectrum-scope.cpp \
+           ./sources/main/scopes/null-scope.cpp \
+           ./sources/main/scopes/channel-scope.cpp \
+           ./sources/main/scopes/dev-scope.cpp \
+           ./sources/main/scopes/waterfall-scope.cpp \
+	   ./sources/main/scopes/iqdisplay.cpp \
+	   ./sources/main/scopes/audio-display.cpp \
+	   ./sources/main/scopes/spectrogramdata.cpp \
+	   ./sources/main/snr-viewer/snr-viewer.cpp \
 	   ./sources/main/aboutdialog.cpp \
 	   ./sources/main/ensemble-handler.cpp \
 	   ./sources/main/techdata.cpp \
@@ -283,6 +283,7 @@
 	   ./sources/frontend/sample-reader.cpp \
 	   ./sources/frontend/ofdm-decoder.cpp \
 	   ./sources/frontend/correlator.cpp \
+	   ./sources/frontend/estimator.cpp \
 	   ./sources/frontend/freqsyncer.cpp \
 	   ./sources/frontend/phasetable.cpp \
 	   ./sources/frontend/freq-interleaver.cpp \
@@ -293,7 +294,6 @@
 	   ./sources/frontend/ensemble.cpp  \
 	   ./sources/frontend/fib-config.cpp  \
 	   ./sources/frontend/fib-decoder.cpp  \
-	   ./sources/frontend/estimator.cpp \
 	   ./sources/protection/protTables.cpp \
 	   ./sources/protection/protection.cpp \
 	   ./sources/protection/eep-protection.cpp \
@@ -316,6 +316,7 @@
 	   ./sources/backend/data/mot/mot-handler.cpp \
 	   ./sources/backend/data/mot/mot-object.cpp \
 	   ./sources/backend/data/mot/mot-dir.cpp \
+	   ./sources/backend/data/journaline-controller.cpp \
 	   ./sources/backend/data/journaline-datahandler.cpp \
 	   ./sources/backend/data/journaline-screen.cpp \
 	   ./sources/backend/data/journaline/crc_8_16.c \
@@ -328,13 +329,15 @@
 	   ./sources/backend/data/epg/epg-compiler.cpp \
 	   ./sources/backend/data/epg/xml-extractor.cpp \
 	   ./sources/output/audio-player.cpp \
+	   ./sources/support/crc-handlers.cpp \
 	   ./sources/support/charsets.cpp \
 	   ./sources/support/distances.cpp \
 	   ./sources/support/time-converter.cpp \
 	   ./sources/support/logger.cpp \
+	   ./sources/support/errorlog.cpp \
 	   ./sources/support/settings-handler.cpp \
 	   ./sources/support/position-handler.cpp \
-	   ./sources/support/wavWriter.cpp \
+	   ./sources/support/riffWriter.cpp \
 	   ./sources/support/converter_48000.cpp \
 	   ./sources/support/fft-handler.cpp \
 	   ./sources/support/dab-params.cpp \

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/Qt_DAB-6.9.1.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/Qt_DAB-6.9.1.png Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/Qt_DAB-6.9.2.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/Qt_DAB-6.9.2.png Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/airspy-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/bbc-3.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/configuration-and-control.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/configuration-and-control.png Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/content-table.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/hackrf-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/journaline-1.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/journaline-2.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/journaline-3.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/limeSDR-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/linesdr-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/pluto-control.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/qt-dab-channel.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/qt-dab-channel.png Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/qt-dab-correlation.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/qt-dab-correlation.png Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/qt-dab-front-picture.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/qt-dab-logo.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/qt-dab-logo.png Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/qt-dab-null-period.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/qt-dab-null-period.png Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/qt-dab-tii-data.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/qt-dab-tii-data.png Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/riff-reader-large.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/riff-reader-small.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/rtl_tcp-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/rtlsdr-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/sdrplay-v2-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/sdrplay-v3-control.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/service-and-titles.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/soapy-control.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/spectrum-scope.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/spectrum-scope.png Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/spy-server16-control.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/res/read_me/technical-widget.png -> qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/technical-widget.png Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/timeTable-notfound.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/tuning-offset.png Added

qt-dab-Qt-DAB-6.9.4.tar.gz/res/read_me/xml-reader.png Added

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/README.md -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/README.md Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/fdk-aac.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/fdk-aac.cpp Changed

@@ -55,7 +55,6 @@
 	 uint8_t packet ,
 	 int16_t packetLength) {
 uint32_t	packet_size;
-uint32_t	valid;
 AAC_DECODER_ERROR err;
 uint8_t		*ptr	= packet;
 INT_PCM 	decode_buf 8 * sizeof (INT_PCM) * 2048;
@@ -68,13 +67,12 @@
 	if ((packet 0 != 0x56) || ((packet 1 >> 5) != 7)) 
 	 return -1;
 
-
 	packet_size = (((packet 1 & 0x1F) << 8) | packet 2) + 3;
 	if (packet_size != (uint32_t)packetLength)
 	 return -1;
 
-	valid = packet_size;
-	err = aacDecoder_Fill (handle, &ptr, &packet_size, &valid);
+	uint32_t	valid_size = packet_size;
+	err = aacDecoder_Fill (handle, &ptr, &packet_size, &valid_size);
 	if (err != AAC_DEC_OK) 
 	 return -1;
 
@@ -91,7 +89,7 @@
 	if (!info || info -> sampleRate <= 0) 
 	 return -1;
 
-	if (info -> numChannels == 2) {
+	if (info -> numChannels == 2) {		// default for DAB+
 	 for (int i = 0; i < info -> frameSize; i ++) {
 	 complex16 s = complex16 (bufp 2 * i, bufp 2 * i + 1);
 	 audioBuffer -> putDataIntoBuffer (&s, 1);
@@ -112,7 +110,6 @@
 
 	 audioBuffer -> putDataIntoBuffer ((complex16 *)buffer,
 	 info -> frameSize);
-//	 audioBuffer -> putDataIntoBuffer (buffer, info -> frameSize * 2);
 	 if (audioBuffer -> GetRingBufferReadAvailable() >
 	 (int)info -> sampleRate / 8)
 	 newAudio (info -> frameSize, info -> sampleRate,

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/firecode-checker.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/firecode-checker.cpp Changed

@@ -1,6 +1,4 @@
 #
-#
-/* -*- c++ -*- */
 /*
 * Copyright 2004,2010 Free Software Foundation, Inc.
 *
@@ -23,68 +21,147 @@
 */
 //
 //	This is a (partial) rewrite of the GNU radio code, for use
-//	within the DAB/DAB+ sdr-j receiver software
-//	all rights are acknowledged.
+//	within the DAB/DAB+ software
 //
 #include "firecode-checker.h"
 #include <cstring>
 
-//	g(x)=(x^11+1)(x^5+x^3+x^2+x+1)=1+x+x^2+x^3+x^5+x^11+x^12+x^13+x^14+x^16
-const uint8_t firecode_checker::g16={1,1,1,1,0,1,0,0,0,0,0,1,1,1,1,0};
+#include	<stdio.h>
 
-	firecode_checker::firecode_checker() {
-// prepare the table
-uint8_t regs 16;
-uint16_t itab 8;
+const uint8_t pattern 124 = {
+// 45 * 4 bit shift
+	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 31, 34,
+	36, 38, 40, 42, 44, 46, 50, 52, 54, 56, 60, 62, 68, 72, 76,
+	84, 88, 92,100,104,108,120,124,136,152,168,184,200,216,248,
+// 15 * 2 bit shift
+	33, 35, 37, 39, 41, 43, 45, 49, 51, 53, 55, 57, 59, 61, 63,
+// 15 * 2 and 6 bit shift
+	66, 70, 74, 78, 82, 86, 90, 98,102,106,110,114,118,122,126,
+// 15 * 6 bit shift
+	132,140,148,156,164,172,180,196,204,212,220,228,236,244,252,
+// 34 * 0 bit shift
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+	16, 29, 32, 48, 58, 64, 80, 96,112,116,128,144,160,176,192,
+	208,224,232,240
+};
+//	g (x) = (x^11 + 1) (x^5+x^3+x^2+x+1)
+//	 = 1+x+x^2+x^3+x^5+x^11+x^12+x^13+x^14+x^16
+//const uint8_t firecodeChecker::g 16 = { 
+//	 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0};
+//	0xF81D
 
-	for (int16_t i = 0; i < 8; i++) {
-	 memset (regs, 0, 16);
-	 regs 8 + i = 1;
-	 itab i = run8 (regs);
-	}
-	for (int16_t i = 0; i < 256; i++) {
-	 tab i = 0;
-	 for (int16_t j = 0; j < 8; j++) {
-	 if (i & (1 << j))
-	 tab i = tab i ^ itab j;
+	firecodeChecker::firecodeChecker () {
+//	prepare the table
+	for (int i = 0; i < 256; i++) {
+	 uint16_t crc = i << 8;
+	 for (int j = 0; j < 8; j++) {
+	 if (crc & 0x8000) {
+	 crc <<= 1;
+	 crc ^= polynom;
+	 }
+	 else
+	 crc <<= 1;
 	 }
+	 crcTablei = crc;
 	}
+	fillSyndromeTable ();
 }
 
-	firecode_checker::~firecode_checker() {
-}
+	firecodeChecker::~firecodeChecker () {}
 
-uint16_t firecode_checker::run8 (uint8_t regs) {
-uint16_t v = 0;
+void	firecodeChecker::fillSyndromeTable () {
+uint8_t	 error 11;
+int bit;
 
-	for (int16_t i = 0; i < 8; i++) {
-	 const uint16_t z = regs 15;
-	 for (int16_t j = 15; j > 0; j--)
-	 regs j = regs j-1 ^ (z & g j);
-	 regs 0 = z;
+	memset (error, 0, 11);
+	memset (syndromeTable, 0, 65536 * sizeof (syndromeTable 0));
+//	0 bit shifted
+	for (int16_t i = 0; i < 11; i++) {
+	 for (int16_t j = 0; j < 124; j++) {
+	 bit = i * 8;
+	 error i = pattern j;
+	 uint16_t syndrome = crc16 (error);
+	 if (syndromeTable syndrome == 0)
+	 syndromeTablesyndrome = (bit << 8) + pattern j;
+	 error i = 0;
+	 }
+	}
+//	4 bits shifted
+	for (int16_t i = 0; i < 10; i++) {
+	 for (int16_t j = 0; j < 45; j++) {
+	 bit = i * 8 + 4;
+	 error i = pattern j >> 4;
+	 error i + 1 = pattern j << 4;
+	 uint16_t syndrome = crc16 (error);
+	 if (syndromeTable syndrome == 0)
+	 syndromeTable syndrome = (bit << 8) + pattern j;
+	 error i = 0;
+	 error i + 1 = 0;
+	 }
+	}
+//	2 bits shifted
+	for (int16_t i = 0; i < 10; i++) {
+	 for (int16_t j = 45; j < 75; j++) {
+	 bit = i * 8 + 2;
+	 error i	= pattern j >> 2;
+	 error i + 1 = pattern j << 6;
+	 uint16_t syndrome = crc16 (error);
+	 if (syndromeTablesyndrome == 0)
+	 syndromeTable syndrome = (bit << 8) + pattern j;
+	 error i		= 0;
+	 error i + 1	= 0;
+	 }
+	}
+//	6 bits shifted
+	for (int16_t i = 0; i < 10; i++) {
+	 for (int16_t j = 60; j < 90; j++) {
+	 int bit = i * 8 + 6;
+	 error i = pattern j >> 6;
+	 error i + 1 = patternj << 2;
+	 uint16_t syndrome = crc16 (error);
+	 if (syndromeTable syndrome == 0)
+	 syndromeTablesyndrome = (bit << 8) + pattern j;
+	 error i		= 0;
+	 error i + 1	= 0;
+	 }
 	}
-
-	for (int16_t i = 15; i >= 0; i--)
-	 v = (v << 1) | regsi;
-
-	return v;
 }
 
-bool	firecode_checker::check (const uint8_t *x) {
-uint16_t state = (x2 << 8) | x3;
+//	x0-1 contains parity, x2-10 contains data
+uint16_t firecodeChecker::crc16 (const uint8_t *x) {
+uint16_t crc = 0;
 
-	for (int16_t i = 4; i < 11; i++) {
-	 const uint16_t istate = tab state >> 8;
-	 state = ((istate & 0x00ff) ^ xi) |
-	 ((istate ^ state << 8) & 0xff00);
+	for (int i = 2; i < 11; i++) {
+	 int pos = (crc >> 8) ^ x i;
+	 crc = (crc << 8) ^ crcTable pos;
 	}
 
-	for (int16_t i = 0; i < 2; i++) {
-	 const uint16_t istate = tab state >> 8;
-	 state = ((istate & 0x00ff) ^ x i) |
-	 ((istate ^ state << 8) & 0xff00);
+	for (int i = 0; i < 2; i++) {
+	 int pos = (crc >> 8) ^ x i;
+	 crc = (crc << 8) ^ crcTable pos;
 	}
+	return crc;
+}
 
-	return state == 0;
+//	return true if firecode check is passed
+bool	firecodeChecker::check (const uint8_t *x) {
+	return crc16 (x) == 0;
 }
 
+//	return true if firecode check is passed OR 
+//	an error burst up to 6 bits was corrected
+bool	firecodeChecker::checkAndCorrect (uint8_t *x) {
+uint16_t syndrome = crc16 (x);
+
+	if (syndrome == 0) // no error
+	 return true;
+
+	uint8_t error = syndromeTable syndrome & 0xff;
+	if (error != 0) {
+	 int bit = syndromeTable syndrome >> 8;
+	 x bit / 8		^= error >> (bit % 8);
+	 x bit / 8 + 1	^= error << (8 - (bit % 8));
+	 return true;
+	}
+	return false;
+}

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/firecode-checker.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/firecode-checker.h Changed

@@ -1,5 +1,4 @@
-#
-/* -*- c++ -*- */
+
 /*
 * Copyright 2004,2010 Free Software Foundation, Inc.
 *
@@ -20,24 +19,29 @@
 * the Free Software Foundation, Inc., 51 Franklin Street,
 * Boston, MA 02110-1301, USA.
 */
-//
+
 //	This is a (partial) rewrite of the GNU radio code, for use
 //	within the DAB/DAB+ sdr-j receiver software
-//	all rights are acknowledged.
 //
 #pragma once
 #include	<cstdint>
 
-
-class firecode_checker {
+class firecodeChecker {
 public:
-		firecode_checker();
-		~firecode_checker();
+		firecodeChecker ();
+		~firecodeChecker();
 // error detection. x0-1 contains parity, x2-10 contains data
-	bool	check (const uint8_t *x); // return true if firecode check is passed
+// return true if firecode check is passed
+	bool	check		(const uint8_t *);
+	bool	checkAndCorrect	(uint8_t *);
+
 private:
-	uint16_t tab256;
-	uint16_t run8(unsigned char regs);
-	static const uint8_t g16;
+	void	fillSyndromeTable	();
+	uint16_t crc16			(const uint8_t *);
+
+//	g(x)=(x^11+1)(x^5+x^3+x^2+x+1)=x^16+x^14+x^13+x^12+x^11+x^5+x^3+x^2+x+1
+	const uint16_t	polynom = 0x782f;
+	uint16_t	 crcTable 256;
+	uint16_t	 syndromeTable65536;
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/mp2processor.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/mp2processor.cpp Changed

@@ -34,8 +34,10 @@
 #ifdef _MSC_VER
 #define FASTCALL __fastcall
 #else
+#ifndef	FASTCALL
 #define FASTCALL
 #endif
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // TABLES AND CONSTANTS //
@@ -215,6 +217,9 @@
 };
 
 
+#define	NOT_SYNCED	0
+#define	GETTING_RATE	1
+#define	GETTING_DATA	2
 ////////////////////////////////////////////////////////////////////////////////
 //	The initialization is now done in the constructor
 //	(J van Katwijk)
@@ -227,19 +232,18 @@
 	 FILE		*dump,
 	 bool		backgroundFlag):
 	 my_padhandler (mr, backgroundFlag) {
-int16_t	i, j;
 int16_t *nPtr = &N 00;
 
 	// compute Nij
-	for (i = 0; i < 64; i ++)
-	 for (j = 0; j < 32; ++j)
+	for (int16_t i = 0; i < 64; i ++)
+	 for (int16_t j = 0; j < 32; ++j)
 	 *nPtr++ = (int16_t) (256.0 *
 	 cos(((16 + i) * ((j << 1) + 1)) *
 	 0.0490873852123405));
 
 	// perform local initialization:
-	for (i = 0; i < 2; ++i)
-	 for (j = 1023; j >= 0; j--)
+	for (int i = 0; i < 2; ++i)
+	 for (int16_t j = 1023; j >= 0; j--)
 	 V ij = 0;
 
 	myRadioInterface	= mr;
@@ -259,8 +263,8 @@
 	Voffs		= 0;
 	baudRate	= 48000;	// default for DAB
 	MP2framesize	= 24 * bitRate;	// may be changed
-	MP2frame	= new uint8_t 2 * MP2framesize;
-	MP2Header_OK	= 0;
+	MP2frame. resize (2 * MP2framesize);
+	MP2Header_state	= NOT_SYNCED;
 	MP2headerCount	= 0;
 	MP2bitCount	= 0;
 	numberofFrames	= 0;
@@ -268,7 +272,6 @@
 }
 
 	mp2Processor::~mp2Processor () {
-	delete MP2frame;
 }
 //
 
@@ -287,8 +290,8 @@
 // //
 ////////////////////////////////////////////////////////////////////////////////
 
-int32_t	mp2Processor::mp2sampleRate	(uint8_t *frame) {
-	if (!frame)
+int32_t	mp2Processor::mp2sampleRate	(std::vector<uint8_t> &frame) {
+	if (frame. size () == 0)
 	 return 0;
 	if (( frame0 != 0xFF) // no valid syncword?
 	 || ((frame1 & 0xF6) != 0xF4) // no MPEG-1/2 Audio Layer II?
@@ -298,7 +301,6 @@
 + ((frame2 >> 2) & 3); // actual rate
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // DECODE HELPER FUNCTIONS //
 ////////////////////////////////////////////////////////////////////////////////
@@ -312,7 +314,7 @@
 
 void 	mp2Processor::read_samples (struct quantizer_spec *q,
 	 int scalefactor, int *sample) {
-int idx, adj, scale;
+int adj, scale;
 int val;
 
 	if (!q) {
@@ -338,24 +340,23 @@
 	 sample 1 = val % adj;
 	 sample 2 = val / adj;
 	} else { // decode direct samples
-	 for (idx = 0; idx < 3; ++idx)
+	 for (int idx = 0; idx < 3; ++idx)
 	 sample idx = get_bits (q -> cw_bits);
 	}
 
 	// postmultiply samples
 	scale = 65536 / (adj + 1);
 	adj = ((adj + 1) >> 1) - 1;
-	for (idx = 0; idx < 3; ++idx) {
+	for (int idx = 0; idx < 3; ++idx) {
 // step 1: renormalization to -1..1
- val = (adj - sampleidx) * scale;
+	 val = (adj - sampleidx) * scale;
 // step 2: apply scalefactor
- sampleidx = ( val * (scalefactor >> 12) // upper part
+	 sampleidx = ( val * (scalefactor >> 12) // upper part
 + ((val * (scalefactor & 4095) + 2048) >> 12)) // lower part
 >> 12; // scale adjust
 	}
 }
 
-
 #define show_bits(bit_count) (bit_window >> (24 - (bit_count)))
 
 int32_t mp2Processor::get_bits (int32_t bit_count) {
@@ -371,19 +372,20 @@
 	return result;
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // FRAME DECODE FUNCTION //
 ////////////////////////////////////////////////////////////////////////////////
 
-int32_t	mp2Processor::mp2decodeFrame (uint8_t *frame, int16_t *pcm) {
+int32_t	mp2Processor::mp2decodeFrame (std::vector<uint8_t> &frame,
+	 int16_t *pcm) {
 uint32_t bit_rate_index_minus1;
 uint32_t sampling_frequency;
 uint32_t padding_bit;
 uint32_t mode;
 uint32_t frameSize;
 int32_t	bound, sblimit;
-int32_t sb, ch, gr, part, idx, nch, i, j, sum;
+//int32_t sb, ch, gr, part, idx, nch, i, j,
+int32_t nch, sum;
 int32_t table_idx;
 
 	numberofFrames ++;
@@ -401,7 +403,6 @@
 	 return 0;
 	}
 
-
 	// set up the bitstream reader
 	bit_window	= frame 2 << 16;
 	bits_in_window	= 8;
@@ -447,11 +448,11 @@
 	 return frameSize; // no decoding
 
 	if (dump == nullptr) {
-	 frameBuffer	-> putDataIntoBuffer (frame, frameSize);
+	 frameBuffer	-> putDataIntoBuffer (frame. data (), frameSize);
 	 newFrame ((int)frameSize);
 	}
 	else 		// some background dumping in the file "dump"
-	 fwrite (frame, 1, frameSize, dump);
+	 fwrite (frame. data (), 1, frameSize, dump);
 
 // prepare the quantizer table lookups
 	if (sampling_frequency & 4) {
@@ -471,18 +472,18 @@
 	 bound = sblimit;
 
 	// read the allocation information
-	for (sb = 0; sb < bound; ++sb)
-	 for (ch = 0; ch < 2; ++ch)
+	for (int sb = 0; sb < bound; ++sb)
+	 for (uint16_t ch = 0; ch < 2; ++ch)
 	 allocation chsb = read_allocation(sb, table_idx);
 
-	for (sb = bound; sb < sblimit; ++sb)
+	for (int sb = bound; sb < sblimit; ++sb)
 	 allocation0sb =
 	 allocation1sb = read_allocation (sb, table_idx);
 
 	// read scale factor selector information
 	nch = (mode == MONO) ? 1 : 2;
-	for (sb = 0; sb < sblimit; ++sb) {
-	 for (ch = 0; ch < nch; ++ch)
+	for (int sb = 0; sb < sblimit; ++sb) {
+	 for (int16_t ch = 0; ch < nch; ++ch)
 	 if (allocation chsb)
 	 scfsi chsb = get_bits (2);
 
@@ -491,8 +492,8 @@
 	}
 
 	// read scale factors
-	for (sb = 0; sb < sblimit; ++sb) {
-	 for (ch = 0; ch < nch; ++ch) {
+	for (int16_t sb = 0; sb < sblimit; ++sb) {
+	 for (int16_t ch = 0; ch < nch; ++ch) {
 	 if (allocationchsb) {

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/mp2processor.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/mp2processor.h Changed

@@ -63,7 +63,7 @@
 	 bool);
 			~mp2Processor	();
 	void		addtoFrame	(const std::vector<uint8_t> &);
-
+	void		stop		();
 private:
 	RadioInterface	*myRadioInterface;
 	RingBuffer<complex16>	*buffer;
@@ -71,13 +71,14 @@
 	FILE		*dump;
 	int16_t		bitRate;
 	padHandler	my_padhandler;
-	int32_t		mp2sampleRate	(uint8_t *);
-	int32_t		mp2decodeFrame	(uint8_t *, int16_t *);
+	int32_t		mp2sampleRate	(std::vector<uint8_t> &);
+	int32_t		mp2decodeFrame	(std::vector<uint8_t> &, int16_t *);
 	int32_t		baudRate;
 	void		setSamplerate		(int32_t);
 	struct quantizer_spec *read_allocation (int, int);
 	void		read_samples	(struct quantizer_spec *, int, int *);
 	int32_t		get_bits	(int32_t);
+	void		handle_PAD	(const std::vector<uint8_t> &);
 	int16_t		V 21024;
 	int16_t		Voffs;
 	int16_t		N 6432;
@@ -90,13 +91,13 @@
 	int32_t		bit_window;
 	int32_t		bits_in_window;
 	uint8_t		*frame_pos;
-	uint8_t		* MP2frame;
+	std::vector<uint8_t> MP2frame;
 
 	int16_t		MP2framesize;
-	int16_t		MP2Header_OK;
+	uint8_t		MP2Header_state;
 	int16_t		MP2headerCount;
 	int16_t		MP2bitCount;
-	void		addbittoMP2	(uint8_t *, uint8_t, int16_t);
+	void		addbittoMP2	(std::vector<uint8_t> &, uint8_t, int16_t);
 	int16_t		numberofFrames;
 	int16_t		errorFrames;
 signals:

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/mp4processor.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/mp4processor.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2013 .. 2024
+ * Copyright (C) 2014 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -38,6 +38,9 @@
 #include	"pad-handler.h"
 #include	"bitWriter.h"
 
+//static int	totalErrorLines = 0;
+//static int	totalRepairs	= 0;
+//static	int	teller = 0;
 //
 /**
 *	\class mp4Processor is the main handler for the aac frames
@@ -53,11 +56,11 @@
 	 my_padhandler (mr, backgroundFlag),
 	 my_rsDecoder (8, 0435, 0, 1, 10),
 	 aacDecoder (mr, b) {
-
 	myRadioInterface	= mr;
 	this	-> bitRate	= bitRate;	// input rate
 	this	-> frameBuffer	= frameBuffer;
 	this	-> dump		= dump;
+	this	-> backgroundFlag	= backgroundFlag;
 	connect (this, &mp4Processor::show_frameErrors,
 	 mr, &RadioInterface::show_frameErrors);
 	connect (this, &mp4Processor::show_rsErrors,
@@ -85,10 +88,15 @@
 	successFrames		= 0;
 	rsErrors		= 0;
 	totalCorrections	= 0;
-	goodFrames		= 0;
+
+//	teller			= 0;
+//	totalErrorLines		= 0;
+//	totalRepairs		= 0;
+	stopWorking. store (false);
 }
 
 	mp4Processor::~mp4Processor () {
+	stop ();
 }
 /**
 *	\brief addtoFrame
@@ -102,105 +110,66 @@
 */
 void	mp4Processor::addtoFrame (const std::vector<uint8_t> &V) {
 int16_t	nbits	= 24 * bitRate;
+int16_t nbytes	= nbits / 8;
 uint8_t	temp	= 0;
 
-	for (int i = 0; i < nbits / 8; i ++) {	// in bytes
+	if (stopWorking)
+	 return;
+	locker. lock ();
+	for (int i = 0; i < nbytes; i ++) {	// in bytes
 	 temp = 0;
 	 for (int j = 0; j < 8; j ++)
 	 temp = (temp << 1) | (V i * 8 + j & 01);
-	 frameBytes blockFillIndex * nbits / 8 + i = temp;
+	 frameBytes blockFillIndex * nbytes + i = temp;
 	}
 //
 	blocksInBuffer ++;
 	blockFillIndex = (blockFillIndex + 1) % 5;
+	frameCount ++;
 //
 /**
 *	we take the last five blocks to look at
 */
-	if (blocksInBuffer >= 5) {
-///	first, we show the "successrate"
-	 if (++frameCount >= 25) {
-	 frameCount = 0;
-	 show_frameErrors (frameErrors);
-	 frameErrors = 0;
-	 }
-/**
- *	starting for real: check the fire code
- *	if the firecode is OK, we handle the frame
- *	and adjust the buffer here for the next round
- *	if the firecode check fails, we shift one block
- */
-	 handleRS (frameBytes, blockFillIndex * nbits / 8,
-	 outVector, frameErrors, rsErrors);
-	 if (frameErrors > 0) {	// cannot fix the potential frame 
-	 blocksInBuffer = 4;
-	 return;
-	 }
-	 
-	 if (!fc. check (outVector. data ())) {
-	 blocksInBuffer = 4;
-	 return;
-	 }
-
-	 if (!processSuperframe (outVector)) {
-	 frameErrors ++;
-	 blocksInBuffer = 0;
-	 return;
-	 }
+	if (blocksInBuffer < 5) {
+	 locker. unlock ();
+	 return;
+	}
+//
+//	The buffer is filled enough, let's process
+///	first, we show the number of successful frames
+	if (++frameCount >= 25) {
+	 frameCount = 0;
+	 show_frameErrors (frameErrors);
+	 frameErrors = 0;
+	}
+//
+//	Thanks to the "healing" checkAndCorrect function, we
+//	do not need to apply a RS before testing
+	if (!fc. checkAndCorrect (&frameBytes blockFillIndex * nbytes)) {
+	 blocksInBuffer = 4;	
+	 locker. unlock ();
+	 return;
+	}
+//
+	if (!handleRS (frameBytes. data (), blockFillIndex * nbytes,
+	 outVector, frameErrors, rsErrors)) {
+	 blocksInBuffer = 4;
+	 locker. unlock ();
+	 return;
+	}
 
-//	when here, both firecode and superframe are OK
-//	since we processed a full cycle of 5 blocks, we just start a
-//	new sequence, beginning with block blockFillIndex
-	 blocksInBuffer	= 0;
-	 totalCorrections += rsErrors;
-	 if (++ goodFrames >= 100) {
-	 show_rsCorrections (totalCorrections, crcErrors);
-	 totalCorrections = 0;
-	 goodFrames = 0;
-	 }
-	 if (++successFrames > 25) {
-	 show_rsErrors (rsErrors);
+	blocksInBuffer = 0;
+	processSuperframe (frameBytes. data (), blockFillIndex * nbytes);
+	if (++successFrames > 25) {
+	 show_rsErrors (rsErrors);
 	 successFrames	= 0;
 	 rsErrors	= 0;
-	 }
-	}
-}
-/**
- *	\brief processSuperframe
- *
- *	First, we know the firecode checker gave green light
- *	We correct the errors using RS
- */
-
-void	mp4Processor::handleRS (const std::vector<uint8_t> &frameBytes, 
-	 int16_t base, 
-	 std::vector<uint8_t> &outVector,
-	 int16_t &errorLines, int16_t &repairs) {
-uint8_t		rsIn	120;
-uint8_t		rsOut	110;
-int16_t		ler;
-	errorLines	= 0;
-	repairs		= 0;
-/**
- *	apply reed-solomon error repar
- *	OK, what we now have is a vector with RSDims * 120 uint8_t's
- *	the superframe, containing parity bytes for error repair
- *	take into account the interleaving that is applied.
- */
-	for (int j = 0; j < RSDims; j ++) {
-	 for (int k = 0; k < 120; k ++) 
-	 rsIn k = frameBytes (base + j + k * RSDims) % (RSDims * 120);
-	 ler = my_rsDecoder. dec (rsIn, rsOut, 135);
-	 for (int k = 0; k < 110; k ++) 
-	 outVector j + k * RSDims = rsOut k;
-	 if (ler < 0)
-	 errorLines ++;
-	 else
-	 repairs += ler;
-	}
+	}	// end of ... >= 5
+	locker. unlock ();
 }
-
-bool	mp4Processor::processSuperframe (std::vector<uint8_t> &outVector){
+//
+//	when handling a superframe we want to be sure that the fc is correct
+bool	mp4Processor::processSuperframe (uint8_t *frameBytes, int16_t index) {
 uint8_t		num_aus;
 int		tmp;
 stream_parms streamParameters;
@@ -284,78 +253,64 @@
 //	just a sanity check
 	 if ((aac_frame_length >= 960) || (aac_frame_length < 0)) {

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/audio/mp4processor.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/audio/mp4processor.h Changed

@@ -35,6 +35,7 @@
 #include	"firecode-checker.h"
 #include	"reed-solomon.h"
 #include	<QObject>
+#include	<mutex>
 #include	"pad-handler.h"
 
 #ifdef	__WITH_FDK_AAC__
@@ -56,6 +57,7 @@
 	 bool);
 			~mp4Processor	();
 	void		addtoFrame	(const std::vector<uint8_t> &);
+	void		stop		();
 private:
 	RadioInterface	*myRadioInterface;
 	padHandler	my_padhandler;
@@ -65,20 +67,26 @@
 #else
 	faadDecoder	aacDecoder;
 #endif
+	firecodeChecker	fc;
 
-	void		handleRS (const std::vector<uint8_t> &frameBytes,
+	std::atomic<bool>	stopWorking;
+	std::mutex		locker;
+	bool		handleRS (const uint8_t *frameBytes,
 	 int16_t base,
 std::vector<uint8_t> &outVector,
 	 int16_t &errorLines, int16_t &repairs);
 
-	bool		processSuperframe (std::vector<uint8_t> &);
+	bool		processSuperframe (uint8_t *, int16_t);
 	int		build_aacFile (int16_t aac_frame_len,
 stream_parms *sp,
 uint8_t	*data,
 std::vector<uint8_t> &fileBuffer);
 
+	void		handle_PAD	(const std::vector<uint8_t> &, int);
 	FILE		*dump;
+	bool		backgroundFlag;
 	uint8_t		procMode;
+	int16_t		superFrameSyncer;
 	int16_t		superFramesize;
 	int16_t		blockFillIndex;
 	int16_t		blocksInBuffer;
@@ -98,7 +106,6 @@
 	std::vector<uint8_t> outVector;
 	int16_t		RSDims;
 	int16_t		au_start	10;
-	firecode_checker	fc;
 signals:
 	void		show_frameErrors		(int);
 	void		show_rsErrors			(int);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/backend-driver.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/backend-driver.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/backend-driver.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/backend-driver.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/backend.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/backend.cpp Changed

@@ -102,9 +102,10 @@
 
 	Backend::~Backend () {
 #ifdef	__THREADED_BACKEND__
-	running. store (false);
-	while (this -> isRunning())
-	 usleep (1000);
+	if (!running. load () &&
+	 !this -> isRunning ())
+	 return;
+	stopRunning ();
 #endif
 }
 
@@ -112,7 +113,7 @@
 	(void)cnt;
 #ifdef	__THREADED_BACKEND__
 	while (!freeSlots. tryAcquire (1, 200))
-	 if (!running)
+	 if (!running. load ()) 
 	 return 0;
 	memcpy (theData nextIn. data (), softBits,
 	 fragmentSize * sizeof (int16_t));
@@ -149,29 +150,38 @@
 //	and the energy dispersal
 	for (uint16_t i = 0; i < bitRate * 24; i ++)
 	 hardBits i ^= disperseVector i;
-
-	driver. addtoFrame (hardBits);
+#ifdef	__THREADED_BACKEND__
+	if (running. load ())
+#endif
+	 driver. addtoFrame (hardBits);
 }
 
 #ifdef	__THREADED_BACKEND__
-void	Backend::run() {
-
-	while (running. load()) {
-	 while (!usedSlots. tryAcquire (1, 200)) 
-	 if (!running)
+void	Backend::run () {
+	while (running. load ()) {
+	 while (!usedSlots. tryAcquire (1, 200)) {
+	 if (!running. load ()) {
 	 return;
-	 processSegment (theData nextOut. data());
+	 }
+	 }
+	 locker. lock ();
+	 if (running. load ())
+	 processSegment (theData nextOut. data());
+	 locker. unlock ();
 	}
 }
 #endif
 
 //	It might take a msec for the task to stop
-void	Backend::stopRunning() {
+void	Backend::stopRunning () {
 #ifdef	__THREADED_BACKEND__
-	running = false;
-	while (this -> isRunning())
-	 usleep (1);
-//	myAudioSink	-> stop();
+//	we want to be certain that after calling the "stop" the
+//	backend interpreter does not start with processing new data
+	locker. lock ();
+	running. store (false);
+	locker. unlock ();
+	while (!this -> isFinished ())
+	 usleep (1000);
 #endif
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/backend.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/backend.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/adv-datahandler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/adv-datahandler.cpp Changed

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

@@ -28,7 +28,8 @@
 #include	"virtual-datahandler.h"
 #include	"ip-datahandler.h"
 #include	"mot-handler.h"
-#include	"journaline-datahandler.h"
+#include	"journaline-controller.h"
+//#include	"journaline-datahandler.h"
 #include	"tdc-datahandler.h"
 #include	"adv-datahandler.h"
 
@@ -67,7 +68,8 @@
 
 	 case 5:
 	 if (appType == 0x44a)
-	 my_dataHandler. reset (new journaline_dataHandler ());
+//	 my_dataHandler. reset (new journaline_dataHandler ());
+	 my_dataHandler. reset (new journalineController (mr));
 	 else
 	 if (appType == 1500)
 	 my_dataHandler. reset (new adv_dataHandler (mr, dataBuffer, appType));
@@ -82,7 +84,8 @@
 	 break;
 
 	 case 44:
-	 my_dataHandler. reset (new journaline_dataHandler ());
+	 my_dataHandler. reset (new journalineController (mr));
+//	 my_dataHandler. reset (new journaline_dataHandler ());
 	 break;
 
 	 case 59:
@@ -233,13 +236,17 @@
 //	with data, bext 9 * 22 bytes RS data
 	if ((pLength == 24) && (address == 1022)) {	// RS packet
 	 uint8_t counter = getBits (vec, 2, 4);
-	 registerFEC (vec, counter);
-	 if (FEC_complete ()) {
-	 processRS (AppVector, FECVector);
-	 handle_RSpackets (AppVector);
-	 clear_FECtable ();
-	 fillPointer = 0;
+	 if (counter < 9) {	// zo hoort het
+	 registerFEC (vec, counter);
+	 if (FEC_complete ()) {
+	 processRS (AppVector, FECVector);
+	 handle_RSpackets (AppVector);
+	 clear_FECtable ();
+	 fillPointer = 0;
+	 }
 	 }
+	 else
+	 fprintf (stderr, "Foute counter: %d\n", counter);
 	}
 	else {
 //	addPacket checks the size and sets fillPointer to 0 id erroneous
@@ -375,3 +382,5 @@
 	 appData i = table i % RSDIMSi / RSDIMS;
 }
 
+void	dataProcessor::stop	() {}
+

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

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/epg/epg-compiler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/epg/epg-compiler.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/epg/epg-compiler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/epg/epg-compiler.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/journaline-controller.cpp Added

@@ -0,0 +1,58 @@
+#
+/*
+ * Copyright (C) 2015 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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
+ */
+
+//
+//	Since handling journaline implies showing an interactive screen
+//	it was found to be "better" to handle the journaline data
+//	in the main thread.
+//	A small controller is added, interfacing between
+//	the backend processes and the actual handler
+#include	"journaline-controller.h"
+#include	"radio.h"
+//
+static int key	= 0;
+
+	journalineController::journalineController (RadioInterface *mr) {
+	connect (this, &journalineController::startJournaline,
+	 mr, &RadioInterface::startJournaline);
+	connect (this, &journalineController::stopJournaline,
+	 mr, &RadioInterface::stopJournaline);
+	connect (this, &journalineController::send_mscDatagroup,
+	 mr, &RadioInterface::journalineData);
+	currentKey	= key;
+	key ++;
+	emit startJournaline (currentKey);
+}
+
+	journalineController::~journalineController () {
+	emit stopJournaline (currentKey);
+}
+
+void	journalineController::
+	 add_mscDatagroup (const std::vector<uint8_t> &msc) {
+QByteArray v;
+	for (int i = 0; i < msc. size (); i ++)
+	 v. push_back (msc i);
+	emit send_mscDatagroup (v, currentKey);
+}
+

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/journaline-controller.h Added

@@ -0,0 +1,45 @@
+#
+/*
+ * Copyright (C) 2015 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#pragma once
+
+#include	<QObject>
+#include	<QByteArray>
+#include	"virtual-datahandler.h"
+class	RadioInterface;
+
+class journalineController: public virtual_dataHandler {
+Q_OBJECT
+public:
+		journalineController	(RadioInterface*);
+		~journalineController	();
+	void	add_mscDatagroup	(const std::vector<uint8_t> &);
+private:
+	int	currentKey;
+signals:
+	void	startJournaline		(int);
+	void	stopJournaline		(int);
+	void	send_mscDatagroup	(QByteArray, int);
+};
+

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

@@ -28,12 +28,11 @@
 #include	"newsobject.h"
 #include	"NML.h"
 
+static bool running = false;
 static
-void my_callBack (
-    const DAB_DATAGROUP_DECODER_msc_datagroup_header_t *header,
-    const unsigned long len,
-    const unsigned char *buf,
-    void *arg) {
+void	my_callBack (const DAB_DATAGROUP_DECODER_msc_datagroup_header_t *header,
+	             const unsigned long len, const unsigned char *buf,
+	             void *arg) {
 	struct timeval theTime;
 	gettimeofday (&theTime, NULL);
 	(void) header;
@@ -54,17 +53,22 @@
 	delete ttt;
 }
 
-	journaline_dataHandler::journaline_dataHandler():
+	journaline_dataHandler::journaline_dataHandler ():
 	                                  theScreen (table){
 	theDecoder	= DAB_DATAGROUP_DECODER_createDec (my_callBack, this);
 	init_dataBase ();
 	connect (this, &journaline_dataHandler::start,
 	         &theScreen, &journalineScreen::start);
+	running = true;
 }
 
 	journaline_dataHandler::~journaline_dataHandler() {
+	theScreen. hide ();
+	if (!running)
+	   return;
 	DAB_DATAGROUP_DECODER_deleteDec (theDecoder);
 	destroy_dataBase ();
+	running = false;
 }
 
 //void	journaline_dataHandler::add_mscDatagroup (QByteArray &msc) {
@@ -81,6 +85,15 @@
 	   return;
 }
 
+void	journaline_dataHandler::stop		() {
+	theScreen. hide ();
+	if (!running)
+	   return;
+	DAB_DATAGROUP_DECODER_deleteDec (theDecoder);
+	destroy_dataBase ();
+	running = false;
+}
+
 void	journaline_dataHandler::init_dataBase 	() {
 	destroy_dataBase ();
 	table. resize (0);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/journaline-datahandler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/journaline-datahandler.h Changed

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

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

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/mot/mot-dir.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/mot/mot-dir.cpp Changed

@@ -45,17 +45,12 @@
 	this	-> dir_segmentSize	= segmentSize;
 //	fprintf (stderr, "transportId %d, dirSize %d, numObjects %d, segmentSize %d\n",
 //	 transportId, dirSize, objects, segmentSize);
-	connect (this, &motDirectory::report_startDir,
-	 mr, &RadioInterface::report_startDir); 
-	connect (this, &motDirectory::report_completeDir,
-	 mr, &RadioInterface::report_completeDir);
 	dir_segments. resize (dirSize);
 	motComponents. resize (objects);
 	for (int i = 0; i < objects; i ++) {
 	 motComponents i. inUse = false;
 	 motComponents i. motSlide	= nullptr;
 	}
-	report_startDir (numObjects);
 	dir_segments. resize (segmentSize);
 	memcpy (&dir_segments 0, segment, segmentSize);
 	marked 0 = true;
@@ -133,7 +128,6 @@
 //uint8_t	*data			= dir_segments;
 uint16_t extensionLength	= (dir_segments currentBase << 8) |
 	 dir_segments currentBase + 1;
-	report_completeDir ();
 	currentBase += 2;
 //	int PLI = dir_segments currentBase >> 6;
 //	int paramId	= dir_segments currentBase & 0x3F;

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/mot/mot-dir.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/mot/mot-dir.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/pad-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/pad-handler.cpp Changed

@@ -36,13 +36,12 @@
 	 myRadioInterface (mr) {
 	this	-> backgroundFlag	= backgroundFlag;
 
-	connect (this, &padHandler::show_label,
-	 mr, &RadioInterface::show_label);
+	connect (this, &padHandler::showLabel,
+	 mr, &RadioInterface::showLabel);
 	connect (this, &padHandler::show_mothandling,
 	 mr, &RadioInterface::show_mothandling);
-	connect (this, &padHandler::show_title,
-	 mr, &RadioInterface::show_title);
-//	currentSlide	= nullptr;
+	connect (this, &padHandler::show_dl2,
+	 mr, &RadioInterface::show_dl2);
 //
 //	mscGroupElement indicates whether we are handling an
 //	msc datagroup or not.
@@ -70,11 +69,15 @@
 	the_DL2. IR		= 10;
 	for (int i = 0; i < 4; i ++)
 	 the_DL2. entity i. ct = 65;
+
+	DL2_record. theText	= "";
+	DL2_record. title	= "";
+	DL2_record. composer	= "";
+	DL2_record. stationname	= "";
+	DL2_record. currentProgram	= "";
 }
 
 	padHandler::~padHandler() {
-//	if (currentSlide != nullptr)
-//	 delete currentSlide;
 }
 
 //	Data is stored reverse, we pass the vector and the index of the
@@ -143,11 +146,12 @@
 	 if (firstSegment && !lastSegment) {
 	 segmentNumber = b last - 2 >> 4;
 	 if (dynamicLabelText. size () > 0) { 
-	 QString displayText = toQStringUsingCharset 
-	 ((char *)(dynamicLabelText. data()),
-	 (CharacterSet)charSet,
-	 dynamicLabelText. size());
-	 show_label (displayText, (int)charSet);
+	 QString displayText =
+	 toQStringUsingCharset (
+	 (char *)(dynamicLabelText. data()),
+	 (CharacterSet)charSet,
+	 dynamicLabelText. size());
+	 showLabel (displayText, (int)charSet);
 	 }
 	 dynamicLabelText = "";
 	 }
@@ -197,7 +201,7 @@
 	 (CharacterSet) charSet,
 	 dynamicLabelText. size ());
 //	 fprintf (stderr, "%s \n", displayText. toLatin1 (). data ());
-	 show_label (displayText, (int)charSet);
+	 showLabel (displayText, (int)charSet);
 	 }
 	 dynamicLabelText. clear();
 	 }
@@ -362,10 +366,11 @@
 #endif
 	 }
 //
-//	etsi TS 102 980 specifies the DL plus objects, I just let it go
-//	for the time being
+//	etsi TS 102 980 specifies the DL plus objects, 
 	 if (Cflag) {		// special dynamic label command
 	 uint16_t Command = (prefix >> 8) & 0x0f;
+	 uint8_t field_2	= (prefix >> 4) & 0x0f;
+	 uint8_t field_3	= prefix & 0x0f;
 	 switch (Command) {
 	 case 1:
 #ifdef	_PAD_TRACE_
@@ -378,8 +383,10 @@
 #ifdef	_PAD_TRACE_
 	 fprintf (stderr, "DL plus command\n");
 #endif
-	 if (!backgroundFlag)
-	 add_toDL2 (&data 2);
+	 if (!backgroundFlag) {
+	 if (dataLength > 2)
+	 add_toDL2 (&data 2, field_2, field_3);
+	 }
 	 break;
 	 default:
 //	 fprintf (stderr, "unknown command %d\n", Command);
@@ -409,7 +416,7 @@
 	 dynamicLabelText. size ());
 	 if (!backgroundFlag) {
 	 add_toDL2 (displayText);
-	 show_label (displayText, (int)charSet);
+	 showLabel (displayText, (int)charSet);
 	 }
 	 segmentno = -1;
 	 }
@@ -435,14 +442,14 @@
 	 
 	 dynamicLabelText. append ((const char *)data, dataLength);
 	 if (!moreXPad && isLastSegment) {
-	 QString displayText = toQStringUsingCharset 
+	 QString displayText = toQStringUsingCharset 
 	 ((char *)(dynamicLabelText. data()),
 	 (CharacterSet)charSet,
 	 dynamicLabelText. size());
-	 if (!backgroundFlag) {
-	 add_toDL2 (displayText);
-	 show_label (displayText, (int)charSet);
-	 }
+	 if (!backgroundFlag) {
+	 add_toDL2 (displayText);
+	 showLabel (displayText, (int)charSet);
+	 }
 	 }
 	}
 }
@@ -571,15 +578,15 @@
 //	handling MOT in the PAD, we only deal here with type 3/4
 	switch (groupType) {
 	 case 3:
-	 if (currentSlide == nullptr) {
+	 if (currentSlide. isNull ()) {
 //	 fprintf (stderr, "creating %d\n", transportId);
 	 currentSlide. reset (new motObject (myRadioInterface,
-	 false,
-	 	 transportId,
-	 &data index + 2,
-	 segmentSize,
-	 lastFlag,
-	 backgroundFlag));
+	 false,
+	 	 transportId,
+	 &data index + 2,
+	 segmentSize,
+	 lastFlag,
+	 backgroundFlag));
 	 }
 	 else {
 	 if (currentSlide -> get_transportId() == transportId)
@@ -600,7 +607,7 @@
 	 break;
 
 	 case 4:
-	 if (currentSlide == nullptr)
+	 if (currentSlide. isNull ())
 	 return;
 	 if (currentSlide -> get_transportId() == transportId) {
 //	 fprintf (stderr, "add segment %d of %d\n",
@@ -612,46 +619,103 @@
 	 }
 	 break;
 
-	 default:		// cannot happen
+	 default:		// cannot (should not) happen
 	 fprintf (stderr, "Not yet handled mot in pad %d (%X)\n",
 	 groupType, transportId);
 	 break;
 	}
 }
 
-
+//
+//
+//	Experimental code to extract titles and composers from
+//	the DL2 data
 void	padHandler::add_toDL2 (const QString &text) {
-	if (the_DL2. dlsText != text) {
-	 the_DL2. dlsText = text;
-//	 fprintf (stderr, "dl2 fragment %s\n", text. toLatin1 (). data ());
-	 the_DL2. valid = true;	// non existent key
-	 for (int i = 0; i < 4; i ++)
-	 the_DL2. entity i. ct = 65;
+	if (DL2_record. theText != text) {
+	 DL2_record. theText = text;
+	 DL2_record. valid	= true;
 	}
 }
 
-void	padHandler::add_toDL2 (const uint8_t *data) {
-int IT	= (data 0 & 0x08) >> 3;
-int IR	= (data 2 & 0x04) >> 2; 
-int NT	= data 2 & 0x03;
+QString padHandler::extractText (uint16_t start, uint16_t length) {
+QString res;
+	if (start + length >= DL2_record. theText. size ())
+	 return "";
+	for (int i = start; i <= start + length; i ++)
+	 res = res + QChar (DL2_record. theText. at (i));
+	return res;
+}
 
-	if ((the_DL2. IT == IT) && (the_DL2. IR == IR))
+void	padHandler::add_toDL2 (const uint8_t *data,
+	 uint8_t field_2, uint8_t field_3) {
+	if (DL2_record. theText. size () == 0)
 	 return;
-

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/data/pad-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/data/pad-handler.h Changed

@@ -71,7 +71,6 @@
 	bool		pad_crc			(uint8_t *, int16_t);
 	QByteArray	dynamicLabelText;
 	int16_t		charSet;
-//	motObject	*currentSlide;
 	QScopedPointer<motObject>	currentSlide;
 	uint8_t		last_appType;
 	bool		mscGroupElement;
@@ -95,13 +94,23 @@
 std::vector<uint8_t> msc_dataGroupBuffer;
 
 //	Experimental
+	struct {
+	 QString theText;
+	 bool		valid;
+	 QString	title;
+	 QString	composer;
+	 QString	stationname;
+	 QString	currentProgram;
+	} DL2_record;
 	DL2_base	the_DL2;
+	QString		extractText		(uint16_t, uint16_t);
 	void		add_toDL2		(const QString &);
-	void		add_toDL2		(const uint8_t *);
+	void		add_toDL2		(const uint8_t *,
+	 uint8_t, uint8_t);
 signals:
-	void		show_label		(const QString &, int);
+	void		showLabel		(const QString &, int);
 	void		show_mothandling	(bool);
-	void		show_title		(uint8_t, uint8_t,
+	void		show_dl2		(uint8_t, uint8_t,
 	 const QString &);
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/frame-processor.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/frame-processor.h Changed

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

@@ -212,13 +212,15 @@
 	nrServices ((int)(theBackends. size ()));
 }
 
-void	mscHandler::stopBackend	(int subchId, int flag) {
+void	mscHandler::stopBackend	(const QString &serviceName,
+	 int subchId, int flag) {
 	locker. lock ();
 	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);
+	 if ((b -> serviceName == serviceName) &&
+	 (b -> subChId == subchId) && (b -> borf == flag)) {
 	 b -> stopRunning ();
+	 usleep (1000);
 	 delete b;
 	 theBackends. erase (theBackends. begin () + i);
 	 break;
@@ -251,7 +253,7 @@
 
 bool	mscHandler::serviceRuns	(uint32_t SId, uint16_t subChId) {
 	for (auto &backend : theBackends)
-	 if ((backend -> serviceId == SId) && (backend -> subChId == subChId))
+	 if ((backend -> serviceId == (int) SId) && (backend -> subChId == subChId))
 	 return true;
 	return false;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/backend/msc-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/backend/msc-handler.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/airspy-2/airspy-2.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/airspy-2/airspy-2.cpp Changed

@@ -24,7 +24,7 @@
 #include	"position-handler.h"
 #include	"airspyselect.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
 
@@ -39,16 +39,16 @@
 
 	airspy_2::airspy_2 (QSettings *s,
 	 const QString &recorderVersion,
-	 logger	*theLogger) :	// dummy for now
+	 errorLogger	*theLogger) :
 _I_Buffer (4 * 1024 * 1024) {
 int	result;
 int	distance	= 1000000;
 std::vector <uint32_t> sampleRates;
 uint32_t samplerateCount;
 
-	(void)theLogger;
 	this	-> airspySettings	= s;
 	this	-> recorderVersion	= recorderVersion;
+	theErrorLogger			= theLogger;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, AIRSPY_SETTINGS);
 	myFrame. show		();
@@ -116,7 +116,7 @@
 
 	(void) my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
 	(void) my_airspy_get_samplerates (device, &samplerateCount, 0);
-	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
+//	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
 	sampleRates. resize (samplerateCount);
 	my_airspy_get_samplerates (device,
 	 sampleRates. data(), samplerateCount);
@@ -174,19 +174,19 @@
 	 this, &airspy_2::set_vga_gain);
 	connect (mixerSlider, &QSlider::valueChanged,
 	 this, &airspy_2::set_mixer_gain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (lnaButton, &QCheckBox::checkStateChanged,
 #else
 	connect (lnaButton, &QCheckBox::stateChanged,
 #endif
 	 this, &airspy_2::set_lna_agc);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (mixerButton, &QCheckBox::checkStateChanged,
 #else
 	connect (mixerButton, &QCheckBox::stateChanged,
 #endif
 	 this, &airspy_2::set_mixer_agc);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (biasButton, &QCheckBox::checkStateChanged,
 #else
 	connect (biasButton, &QCheckBox::stateChanged,
@@ -255,14 +255,14 @@
 
 	if (result != AIRSPY_SUCCESS) {
 	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("my_airspy_set_freq() failed: %s (%d)\n",
-	 my_airspy_error_name((airspy_error)result), result);
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
 	}
 	result = my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
 	if (result != AIRSPY_SUCCESS) {
 	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("my_airspy_set_sample_type() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
 	 return false;
 	}
 
@@ -270,11 +270,10 @@
 	 (airspy_sample_block_cb_fn)callback, this);
 	if (result != AIRSPY_SUCCESS) {
 	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("my_airspy_start_rx() failed: %s (%d)\n",
-	 my_airspy_error_name((airspy_error)result), result);
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name((airspy_error)result));
 	 return false;
 	}
-
 //
 //	Hier moeten we de tab en gain weer zetten
 	restore_gainSliders (freq / MHz (1), tab);
@@ -303,8 +302,8 @@
 
 	if (result != AIRSPY_SUCCESS ) {
 	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("my_airspy_stop_rx() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
 	}
 	running. store (false);
 	resetBuffer ();
@@ -374,8 +373,8 @@
 int result = my_airspy_board_partid_serialno_read (device,
 	 &read_partid_serialno);
 	if (result != AIRSPY_SUCCESS) {
-	 printf ("failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
 	 return "UNKNOWN";
 	} else {
 	 snprintf (serial, sizeof(serial), "%08X%08X", 
@@ -387,15 +386,6 @@
 //
 //	not used here
 int	airspy_2::open() {
-//int result = my_airspy_open (&device);
-//
-//	if (result != AIRSPY_SUCCESS) {
-//	 printf ("airspy_open() failed: %s (%d)\n",
-//	 my_airspy_error_name((airspy_error)result), result);
-//	 return -1;
-//	} else {
-//	 return 0;
-//	}
 	return 0;
 }
 
@@ -432,156 +422,167 @@
 	my_airspy_init	= (pfn_airspy_init)
 	 library_p -> resolve ("airspy_init");
 	if (my_airspy_init == nullptr) {
-	 fprintf (stderr, "Could not find airspy_init\n");
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_init");
 	 return false;
 	}
 
 	my_airspy_exit	= (pfn_airspy_exit)
 	 library_p -> resolve ("airspy_exit");
 	if (my_airspy_exit == nullptr) {
-	 fprintf (stderr, "Could not find airspy_exit\n");
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_exit");
 	 return false;
 	}
 
 	my_airspy_list_devices	= (pfn_airspy_list_devices)
 	 library_p -> resolve ("airspy_list_devices");
 	if (my_airspy_list_devices == nullptr) {
-	 fprintf (stderr, "Could not find airspy_list_devices\n");
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_list_devices");
 	 return false;
 	}
 	
 	my_airspy_open	= (pfn_airspy_open)
 	 library_p -> resolve ("airspy_open");
 	if (my_airspy_open == nullptr) {
-	 fprintf (stderr, "Could not find airspy_open\n");
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_open");
 	 return false;
 	}
 
 	my_airspy_close	= (pfn_airspy_close)
 	 library_p -> resolve ("airspy_close");
 	if (my_airspy_close == nullptr) {
-	 fprintf (stderr, "Could not find airspy_close\n");
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_close");
 	 return false;
 	}
 
 	my_airspy_get_samplerates	= (pfn_airspy_get_samplerates)
 	 library_p -> resolve ("airspy_get_samplerates");
 	if (my_airspy_get_samplerates == nullptr) {
-	 fprintf (stderr, "Could not find airspy_get_samplerates\n");
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_get_samplerates");
 	 return false;
 	}
 
 	my_airspy_set_samplerate	= (pfn_airspy_set_samplerate)
 	 library_p -> resolve ("airspy_set_samplerate");
 	if (my_airspy_set_samplerate == nullptr) {
-	 fprintf (stderr, "Could not find airspy_set_samplerate\n");
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_set_samplerate");
 	 return false;
 	}
 
 	my_airspy_start_rx	= (pfn_airspy_start_rx)
 	 library_p -> resolve ("airspy_start_rx");
 	if (my_airspy_start_rx == nullptr) {
-	 fprintf (stderr, "Could not find airspy_start_rx\n");
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_start_rx");
 	 return false;
 	}
 
 	my_airspy_stop_rx	= (pfn_airspy_stop_rx)

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/airspy-2/airspy-2.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/airspy-2/airspy-2.h Changed

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

@@ -24,6 +24,7 @@
 #include	<QFileDialog>
 #include	<QMessageBox>
 #include	"device-exceptions.h"
+#include	"errorlog.h"
 
 #ifdef	HAVE_RTLSDR_V3
 #include	"rtlsdr-handler-win.h"
@@ -114,8 +115,10 @@
 #define	WAV_FILE	0103
 #define	XML_FILE	0104
 
-	deviceChooser::deviceChooser (QSettings *dabSettings) {
-	this	-> dabSettings	= dabSettings;
+	deviceChooser::deviceChooser (errorLogger *theErrorLogger,
+	 QSettings *dabSettings) {
+	this	-> theErrorLogger	= theErrorLogger;
+	this	-> dabSettings		= dabSettings;
 	deviceList. push_back (deviceItem ("select input", NO_ENTRY));
 	deviceList. push_back (deviceItem ("file input", FILE_INPUT));
 #ifdef	HAVE_SDRPLAY_V3
@@ -186,13 +189,13 @@
 }
 
 deviceHandler	*deviceChooser::createDevice (const QString &deviceName,
-	 const QString &version,
-	 logger *theLogger) {
+	 const QString &version) {
 deviceHandler	*inputDevice;
 	try {
-	 inputDevice = _createDevice (deviceName, version, theLogger);
+	 inputDevice = _createDevice (deviceName, version);
 	} catch (std::exception &e) {
 	 QMessageBox:: warning (nullptr, "Warning", e. what ());
+	 theErrorLogger -> add (deviceName, QString (e. what ()));
 	 return nullptr;
 	}
 	catch (...) {
@@ -203,8 +206,7 @@
 }
 
 deviceHandler	*deviceChooser::_createDevice (const QString &s,
-	 const QString &version,
-	 logger *theLogger) {
+	 const QString &version) {
 int	deviceNumber	= getDeviceIndex (s);
 
 	if (deviceNumber < 0)
@@ -213,50 +215,55 @@
 	switch (deviceNumber) {
 #ifdef	HAVE_SDRPLAY_V2
 	 case SDRPLAY_V2_DEVICE:
-	 return new sdrplayHandler_v2 (dabSettings, version, theLogger);
+	 return new sdrplayHandler_v2 (dabSettings, version,
+	 theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_SDRPLAY_V3
 	 case SDRPLAY_V3_DEVICE:
-	 return new sdrplayHandler_v3 (dabSettings, version, theLogger);
+	 return new sdrplayHandler_v3 (dabSettings, version,
+	 theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_RTLSDR_V3
 	 case RTLSDR_DEVICE_V3:
-	 return new rtlsdrHandler_win (dabSettings, version, theLogger);
+	 return new rtlsdrHandler_win (dabSettings, version, 
+	 theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_RTLSDR_V4
 	 case RTLSDR_DEVICE_V4:
-	 return new rtlsdrHandler_win (dabSettings, version, theLogger);
+	 return new rtlsdrHandler_win (dabSettings, version,
+	 theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_RTLSDR
 	 case RTLSDR_DEVICE:
-	 return new rtlsdrHandler (dabSettings, version, theLogger);
+	 return new rtlsdrHandler (dabSettings, version,
+	 theErrorLogger);
 	 break;
 #endif
 #ifdef 	HAVE_AIRSPY_2
 	 case AIRSPY_DEVICE:
-	 return new airspy_2 (dabSettings, version, theLogger);
+	 return new airspy_2 (dabSettings, version, theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_HACKRF
 	 case HACKRF_DEVICE:
-	 return new hackrfHandler (dabSettings, version, theLogger);
+	 return new hackrfHandler (dabSettings, version, theErrorLogger);
 #endif
 #ifdef	HAVE_LIME
 	 case LIME_DEVICE:
-	 return new limeHandler (dabSettings, version, theLogger);
+	 return new limeHandler (dabSettings, version, theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_PLUTO
 	 case PLUTO_DEVICE:
-	 return new plutoHandler (dabSettings, version, theLogger);
+	 return new plutoHandler (dabSettings, version, theErrorLogger);
 #endif
 #ifdef HAVE_RTL_TCP
 	 case RTL_TCP_DEVICE:
-	 return new rtl_tcp_client (dabSettings);
+	 return new rtl_tcp_client (dabSettings, version, theErrorLogger);
 #endif
 #ifdef HAVE_EXTIO
 	 case EXTIO_DEVICE:
@@ -275,12 +282,14 @@
 #endif
 #ifdef HAVE_SPYSERVER_16
 	 case SPYSERVER_DEVICE_16:
-	 return new spyServer_client (dabSettings);
+	 return new spyServer_client (dabSettings, version,
+	 theErrorLogger);
 	 break;
 #endif
 #ifdef HAVE_SPYSERVER_8
 	 case SPYSERVER_DEVICE_8:
-	 return new spyServer_client_8 (dabSettings);
+	 return new spyServer_client_8 (dabSettings, version,
+	 theErrorLogger);
 	 break;
 #endif
 	 case FILE_INPUT:

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/device-chooser.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/device-chooser.h Changed

@@ -17,7 +17,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with Qt-DAB-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
 */
 #pragma once
@@ -28,20 +28,19 @@
 #include	<QStringList>
 #include	<vector>
 class		logger;
+class		errorLogger;
 
 class	deviceChooser final {
 public:
-			deviceChooser	(QSettings *);
+			deviceChooser	(errorLogger *, QSettings *);
 			~deviceChooser	();
 	QStringList	getDeviceList	();
 	int		getDeviceIndex	(const QString &);	
-	deviceHandler	*createDevice	(const QString &,
-	 const QString &, logger *);
+	deviceHandler	*createDevice	(const QString &, const QString &);
 private:
 
 	QString		getFileName	(uint8_t &);
-	deviceHandler	*_createDevice	(const QString &,
-	 const QString &, logger *);
+	deviceHandler	*_createDevice	(const QString &, const QString &);
 	class	deviceItem {
 	public:
 		QString	deviceName;
@@ -52,6 +51,7 @@
 		};
 		~deviceItem	() {};
 	};
+	errorLogger	*theErrorLogger;
 	std::vector<deviceItem> deviceList;
 	QSettings	*dabSettings;
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/extio-handler/common-readers.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/extio-handler/common-readers.cpp Changed

@@ -40,13 +40,12 @@
 //
 //	apparently bytes are read in from low byte to high byte
 void	reader_16::processData	(float IQoffs, void *data, int cnt) {
-int32_t	i;
 std::complex<float> IQData blockSize;
 uint8_t	*p	= (uint8_t *)data;
 	(void)IQoffs;
 	(void)cnt;
 
-	for (i = 0; i < blockSize; i ++) {
+	for (int i = 0; i < blockSize; i ++) {
 	 uint8_t r0	= p 4 * i;
 	 uint8_t r1	= p 4 * i + 1;
 	 uint8_t i0	= p 4 * i + 2;
@@ -76,13 +75,12 @@
 }
 
 void	reader_24::processData	(float IQoffs, void *data, int cnt) {
-int32_t	i;
 std::complex<float>	IQData blockSize;
 uint8_t	*p	= (uint8_t *)data;
 	(void)IQoffs;
 	(void)cnt;
 
-	for (i = 0; i < blockSize; i ++) {
+	for (int i = 0; i < blockSize; i ++) {
 	 uint8_t r0	= p 6 * i;
 	 uint8_t r1	= p 6 * i + 1;
 	 uint8_t r2	= p 6 * i + 2;
@@ -114,13 +112,12 @@
 }
 
 void	reader_32::processData	(float IQoffs, void *data, int cnt) {
-int32_t	i;
 std::complex<float> IQData blockSize;
 uint8_t	*p	= (uint8_t *)data;
 	(void)IQoffs;
 	(void)cnt;
 
-	for (i = 0; i < blockSize; i ++) {
+	for (int i = 0; i < blockSize; i ++) {
 	 uint8_t r0	= p 8 * i;
 	 uint8_t r1	= p 8 * i + 1;
 	 uint8_t r2	= p 8 * i + 2;
@@ -149,20 +146,18 @@
 	reader_float::reader_float (RingBuffer<std::complex<float>> *p,
 	 int32_t rate):
 	 virtualReader (p, rate) {
-int16_t	i;
 }
 
-	reader_float::~reader_float (void) {
+	reader_float::~reader_float () {
 }
 //
 void	reader_float::processData	(float IQoffs, void *data, int cnt) {
-int32_t	i, j;
 std::complex<float> IQData blockSize;
 float	*p	= (float *)data;
 	(void)IQoffs;
 	(void)cnt;
 
-	for (i = 0; i < blockSize; i ++) 
+	for (int i = 0; i < blockSize; i ++) 
 	 IQData i	= std::complex<float> (p 2 * i, p 2 * i + 1);
 
 	convertandStore (IQData, blockSize);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/filereader-widget.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/filereader-widget.h Changed

@@ -1,3 +1,25 @@
+#
+/*
+ *    Copyright (C) 2016 .. 2024
+ *    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
+ */
 
 #pragma once
 
@@ -15,13 +37,26 @@
 	QLCDNumber	*currentTime;
 	QLabel		*seconds;
 	QLCDNumber	*totalTime;
-
+	QLabel		*deviceLabel;
+	QLabel		*theDevice;
+	QLabel		*typeLabel;
+	QLabel		*typeOfFile;
+	QLabel		*amountLabel;
+	QLabel		*sampleCount;
+	QLabel		*frequencyLabel;
 	filereaderWidget () {}
 	~filereaderWidget () {}
 
 void	setupUi		(QWidget *qw) {
 	titleLabel	= new QLabel ("Playing pre-recorded file");
 	nameofFile	= new QLabel ();
+	deviceLabel	= new QLabel ();
+	theDevice	= new QLabel ();
+	typeLabel	= new QLabel ("filetype ");
+	typeOfFile	= new QLabel ();
+	amountLabel	= new QLabel (" nr samples ");
+	sampleCount	= new QLabel ();
+	frequencyLabel	= new QLabel	();
 	fileProgress	= new QProgressBar ();
 	currentTime	= new QLCDNumber	();
 	currentTime	->  setFrameShape (QFrame::NoFrame);
@@ -32,7 +67,15 @@
 
 	totalTime	->  setFrameShape (QFrame::NoFrame);
 	totalTime	->  setSegmentStyle (QLCDNumber::Flat);
-
+	QHBoxLayout *line_2	= new QHBoxLayout ();
+	line_2		-> addWidget	(deviceLabel);
+	line_2		-> addWidget (theDevice);
+	QHBoxLayout *line_3	= new QHBoxLayout ();
+	line_3		-> addWidget (typeLabel);
+	line_3		-> addWidget (typeOfFile);
+	line_3		-> addWidget (amountLabel);
+	line_3		-> addWidget (sampleCount);
+	line_3		-> addWidget (frequencyLabel);
 	QHBoxLayout *bottom	= new QHBoxLayout ();
 	bottom		-> addWidget (currentTime);
 	bottom		-> addWidget (seconds);
@@ -41,6 +84,8 @@
 	QVBoxLayout *base	= new QVBoxLayout ();
 	base		-> addWidget (titleLabel);
 	base		-> addWidget (nameofFile);
+	base		-> addItem	(line_2);
+	base		-> addItem	(line_3);
 	base		-> addWidget (fileProgress);
 	base		-> addItem   (bottom);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/filereader-widget.ui -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/filereader-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>461</width>
- <height>169</height>
+ <width>460</width>
+ <height>148</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -28,6 +28,38 @@
 </widget>
 </item>
 <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>type of file</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="typeOfFile">
+ <property name="text">
+ <string>RIFF</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>nr samples </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="sampleCount">
+ <property name="text">
+ <string>10000000</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
 <widget class="QProgressBar" name="fileProgress">
 <property name="value">
 <number>24</number>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/new-reader/new-reader.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/new-reader/new-reader.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/new-reader/new-reader.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/new-reader/new-reader.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/new-reader/newfiles.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/new-reader/newfiles.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/new-reader/newfiles.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/new-reader/newfiles.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/new-reader/riff-reader.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/new-reader/riff-reader.cpp Changed

@@ -43,14 +43,15 @@
 uint32_t segmentSize;
 char header 5;
 
-	bitDepth	= 15;	// default
+ header 4	= 0;
+	bitDepth	= 0;	// i.e. unknown
 	tunedFrequency	= -1;
 	denominator	= 0;
- header 4 = 0;
+	theDevice	= "";
 	filePointer = fopen (fileName. toLatin1 (). data (), "rb");
 if (filePointer == nullptr) {
 	 QString val =
- QString ("File '%1' is no valid SDR file").arg(fileName);
+ QString ("File '%1' cannot be found").arg(fileName);
 throw device_exception (val. toStdString ());
 }
 
@@ -70,11 +71,23 @@
 QString ("File '%1' is no valid SDR file").arg(fileName);
 throw device_exception (val. toStdString ());
 }
+	typeOfFile = header;
+	if (readBytes == READ4BYTES)
+	 typeOfFile += " int16";
+	if (readBytes == READ6BYTES)
+	 typeOfFile += " int24";
+	if (readBytes == READ8BYTES)
+	 typeOfFile += " int32";
 }
 
 	riffReader::~riffReader () {
 	fclose (filePointer);
 }
+
+QString	riffReader::fileType () {
+	return typeOfFile;
+}
+
 //
 //	To keep things simple, we have
 //	separated "handlers" for the chunk handling for
@@ -83,12 +96,13 @@
 //	differences are in the beginning and in the end.
 void	riffReader::setupFor_wavType (uint32_t segmentSize) {
 char header 5;
-	header 0 = 0;
+
+	header 4 = 0;
 	fread (header, 1, 4, filePointer);
 //	fprintf (stderr, "Header %s\n", header);
 	if (QString (header) != "WAVE") {
 	 QString val =
- QString ("File '%1' is no valid SDR file").arg(fileName);
+ QString ("File '%1' is no valid SDR file").arg(fileName);
 throw device_exception (val. toStdString ());
 }
 //	fprintf (stderr, "Header %s\n", header);
@@ -161,6 +175,12 @@
 	 if (QString (header) == "bits")
 	 fread (&bitDepth, 1, 4, filePointer);
 	 else
+	 if (QString (header) == "sys ") {
+	 char temp 255;
+	 fread (temp, 1, segmentSize, filePointer);
+	 theDevice	= QString (temp);
+	 }
+	 else
 	 fseek (filePointer, segmentSize, SEEK_CUR);
 	 fread (header, 1, 4, filePointer);
 //	 fprintf (stderr, "Now we read %s\n", header);
@@ -171,7 +191,7 @@
 }
 	}
 
-	denominator	= value_for (bitDepth);
+	denominator	= bitDepth != 0 ? value_for (bitDepth) : 32768;
 	if (QString (header) != "data") {	// should not happen
 	 QString val =
 QString ("File '%1' is no valid SDR file").arg(fileName);
@@ -187,8 +207,9 @@
 }
 
 void	riffReader::setupFor_bw64Type (uint32_t segmentSize) {
-int	dataSize;
+uint64_t	dataSize;
 char header 5;
+
 	header 4 = 0;
 //	We expect a "WAVE" header, enclosing an "bw64 " header
 	fread (header, 1, 4, filePointer);
@@ -210,14 +231,21 @@
 	int ds64Size;
 	fread (&ds64Size, 1, 4, filePointer);
 //	fprintf (stderr, "ds64Size %d\n", ds64Size);
-	fread (&dataSize, 8, 1, filePointer);
-	fread (&dataSize, 8, 1, filePointer);
+	uint32_t a_low;
+	uint32_t a_high;
+	fread (&a_low, 4, 1, filePointer);
+	fread (&a_high, 4, 1, filePointer);
+	dataSize	= ((uint64_t)a_high << 32) | a_low;
+	uint32_t bytesLow;
+	uint32_t bytesHigh;
+	fread (&bytesLow, 4, 1, filePointer);
+	fread (&bytesHigh, 4, 1, filePointer);
+	dataSize = ((uint64_t)bytesHigh << 32) | bytesLow;
 	uint32_t dummy;
 	for (int i = ds64Size - 4 * 4; i < ds64Size; i += 4)
 	 fread (&dummy, 1, 4, filePointer);
-	fprintf (stderr, "Komen we hier nog?\n");
 	fread (header, 1, 4, filePointer);
-	fprintf (stderr, "header -> %s\n", header);
+//	fprintf (stderr, "header -> %s\n", header);
 	if (QString (header) != "fmt ") {
 	 QString val =
 QString ("File '%1' is no valid SDR file").arg(fileName);
@@ -234,7 +262,7 @@
 	fread (&formatTag, 1, sizeof (uint16_t), filePointer);
 	fread (&nrChannels, 1, sizeof (uint16_t), filePointer);
 	fread (&samplingRate, 1, 4, filePointer);
-	fprintf (stderr, "%d %d %d\n", formatTag, nrChannels, samplingRate);
+//	fprintf (stderr, "%d %d %d\n", formatTag, nrChannels, samplingRate);
 	if ((formatTag != 01) ||
 	 (nrChannels != 02) || (samplingRate != SAMPLERATE)) {
 	 QString val =
@@ -278,6 +306,12 @@
 	 if (QString (header) == "bits")
 	 fread (&bitDepth, 1, 4, filePointer);
 	 else
+	 if (QString (header) == "sys ") {
+	 char temp 255;
+	 fread (temp, 1, segmentSize, filePointer);
+	 theDevice	= QString (temp);
+	 }
+	 else
 	 fseek (filePointer, segmentSize, SEEK_CUR);
 	 fread (header, 1, 4, filePointer);
 //	 fprintf (stderr, "Now we read %s\n", header);
@@ -288,7 +322,7 @@
 }
 	}
 
-	denominator	= value_for (bitDepth);
+	denominator	= bitDepth != 0 ? value_for (bitDepth): 32768;
 	if (QString (header) != "data") {	// should not happen
 	 QString val =
 QString ("File '%1' is no valid SDR file").arg(fileName);
@@ -384,3 +418,7 @@
 	return tunedFrequency;
 }
 
+QString		riffReader::getDevice	() {
+	return theDevice;
+}
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/new-reader/riff-reader.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/new-reader/riff-reader.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/rawfiles-new/raw-reader.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/rawfiles-new/raw-reader.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/rawfiles-new/rawfiles.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/rawfiles-new/rawfiles.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/xml-filereader/xml-descriptor.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/xml-filereader/xml-descriptor.cpp Changed

@@ -19,7 +19,6 @@
 * 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	"xml-descriptor.h"
 #include	"device-handler.h"
@@ -31,17 +30,22 @@
 	fprintf (stderr, "sampleRate =	%d\n", sampleRate);
 	fprintf (stderr, "nrChannels	= %d\n", nrChannels);
 	fprintf (stderr, "bitsperChannel = %d\n", bitsperChannel);
-	fprintf (stderr, "container	= %s\n", container. toLatin1 (). data ());
+	fprintf (stderr, "container	= %s\n",
+	 container. toLatin1 (). data ());
 	fprintf (stderr, "byteOrder	= %s\n",
-	 byteOrder. toLatin1 (). data ());
+	 byteOrder. toLatin1 (). data ());
 	fprintf (stderr, "iqOrder	= %s\n",
-	 iqOrder. toLatin1 (). data ());
+	 iqOrder. toLatin1 (). data ());
 	fprintf (stderr, "deviceGain	= %d\n", deviceGain);
 	 
 	fprintf (stderr, "nrBlocks	= %d (%d)\n",
-	 nrBlocks, (int)(blockList. size ()));
+	 nrBlocks, (int)(blockList. size ()));
 	for (int i = 0; i < (int)blockList. size (); i ++)
+#ifdef	__MINGW32__
+	 fprintf (stderr, ">>> %d %lld %s %d %s\n",
+#else
 	 fprintf (stderr, ">>> %d %ld %s %d %s\n",
+#endif
 	 blockList. at (i). blockNumber,
 	 blockList. at (i). nrElements,
 	 blockList. at (i). typeofUnit. toLatin1 (). data (),
@@ -101,7 +105,7 @@
 	xmlDescriptor::xmlDescriptor (FILE *f, bool *ok) {
 QDomDocument xmlDoc;
 QByteArray xmlText;
-int	zeroCount = 0;
+int		zeroCount = 0;
 //
 //	set default values
 	nrChannels	= 2;
@@ -109,10 +113,9 @@
 	container	= "int16_t";
 	byteOrder	= QString ("MSB");
 	iqOrder		="IQ";
-	uint8_t		theChar;
 	deviceGain	= -1;
 	while (zeroCount < 500) {
-	 theChar = fgetc (f);
+	 uint8_t theChar = fgetc (f);
 	 if (theChar == 0)
 	 zeroCount ++;
 	 else

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/xml-filereader/xml-filereader.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/xml-filereader/xml-filereader.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/xml-filereader/xml-reader.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/xml-filereader/xml-reader.cpp Changed

@@ -67,6 +67,12 @@
 //	buffer is one larger
 	convBufferSize		= fd -> sampleRate / 1000;
 	continuous. store (true);
+	for (int i = 0; i < 256; i ++)
+// the offset 127.38f is due to the input data comes usually from
+// an SDR stick which has its DC offset a bit shifted from ideal
+// (from old-dab)
+ mapTable i = ((float)i - 127.38) / 128.0;
+
 	float samplesPerMsec	= SAMPLERATE / 1000.0;
 	for (int i = 0; i < SAMPLERATE / 1000; i ++) {
 	 float inVal = float (fd -> sampleRate / 1000);
@@ -77,7 +83,7 @@
 	convIndex	= 0;
 	convBuffer. resize (convBufferSize + 1);
 	nrElements	= fd -> blockList 0. nrElements;
-
+	
 	connect (this, &xml_Reader::setProgress,
 	 parent, &xml_fileReader::setProgress);
 
@@ -110,7 +116,11 @@
 	nextStop = currentTime ();
 	for (int blocks = 0; blocks < fd -> nrBlocks; blocks ++) {
 	 samplesToRead	= compute_nrSamples (file, blocks);
+#ifdef	__MINGW32__
+	 fprintf (stderr, "samples to read %lld\n", samplesToRead);
+#else
 	 fprintf (stderr, "samples to read %ld\n", samplesToRead);
+#endif
 	 samplesRead		= 0;
 	 do {
 	 while ((samplesRead <= samplesToRead) && running. load ()) {
@@ -168,8 +178,11 @@
 	}
 	else	// typeofUnit = "sample"
 	 samplesToRead = nrElements;
-
+#ifdef __MINGW32__
+	fprintf (stderr, "%lld samples have to be read, order is %s\n",
+#else
 	fprintf (stderr, "%ld samples have to be read, order is %s\n",
+#endif
 	 samplesToRead, fd -> iqOrder. toLatin1 (). data ());
 	return samplesToRead;
 }
@@ -192,25 +205,6 @@
 	return SAMPLERATE / 1000;
 }
 	
-static 
-float mapTable = {
- -128 / 128.0 , -127 / 128.0 , -126 / 128.0 , -125 / 128.0 , -124 / 128.0 , -123 / 128.0 , -122 / 128.0 , -121 / 128.0 , -120 / 128.0 , -119 / 128.0 , -118 / 128.0 , -117 / 128.0 , -116 / 128.0 , -115 / 128.0 , -114 / 128.0 , -113 / 128.0 
-, -112 / 128.0 , -111 / 128.0 , -110 / 128.0 , -109 / 128.0 , -108 / 128.0 , -107 / 128.0 , -106 / 128.0 , -105 / 128.0 , -104 / 128.0 , -103 / 128.0 , -102 / 128.0 , -101 / 128.0 , -100 / 128.0 , -99 / 128.0 , -98 / 128.0 , -97 / 128.0 
-, -96 / 128.0 , -95 / 128.0 , -94 / 128.0 , -93 / 128.0 , -92 / 128.0 , -91 / 128.0 , -90 / 128.0 , -89 / 128.0 , -88 / 128.0 , -87 / 128.0 , -86 / 128.0 , -85 / 128.0 , -84 / 128.0 , -83 / 128.0 , -82 / 128.0 , -81 / 128.0 
-, -80 / 128.0 , -79 / 128.0 , -78 / 128.0 , -77 / 128.0 , -76 / 128.0 , -75 / 128.0 , -74 / 128.0 , -73 / 128.0 , -72 / 128.0 , -71 / 128.0 , -70 / 128.0 , -69 / 128.0 , -68 / 128.0 , -67 / 128.0 , -66 / 128.0 , -65 / 128.0 
-, -64 / 128.0 , -63 / 128.0 , -62 / 128.0 , -61 / 128.0 , -60 / 128.0 , -59 / 128.0 , -58 / 128.0 , -57 / 128.0 , -56 / 128.0 , -55 / 128.0 , -54 / 128.0 , -53 / 128.0 , -52 / 128.0 , -51 / 128.0 , -50 / 128.0 , -49 / 128.0 
-, -48 / 128.0 , -47 / 128.0 , -46 / 128.0 , -45 / 128.0 , -44 / 128.0 , -43 / 128.0 , -42 / 128.0 , -41 / 128.0 , -40 / 128.0 , -39 / 128.0 , -38 / 128.0 , -37 / 128.0 , -36 / 128.0 , -35 / 128.0 , -34 / 128.0 , -33 / 128.0 
-, -32 / 128.0 , -31 / 128.0 , -30 / 128.0 , -29 / 128.0 , -28 / 128.0 , -27 / 128.0 , -26 / 128.0 , -25 / 128.0 , -24 / 128.0 , -23 / 128.0 , -22 / 128.0 , -21 / 128.0 , -20 / 128.0 , -19 / 128.0 , -18 / 128.0 , -17 / 128.0 
-, -16 / 128.0 , -15 / 128.0 , -14 / 128.0 , -13 / 128.0 , -12 / 128.0 , -11 / 128.0 , -10 / 128.0 , -9 / 128.0 , -8 / 128.0 , -7 / 128.0 , -6 / 128.0 , -5 / 128.0 , -4 / 128.0 , -3 / 128.0 , -2 / 128.0 , -1 / 128.0 
-, 0 / 128.0 , 1 / 128.0 , 2 / 128.0 , 3 / 128.0 , 4 / 128.0 , 5 / 128.0 , 6 / 128.0 , 7 / 128.0 , 8 / 128.0 , 9 / 128.0 , 10 / 128.0 , 11 / 128.0 , 12 / 128.0 , 13 / 128.0 , 14 / 128.0 , 15 / 128.0 
-, 16 / 128.0 , 17 / 128.0 , 18 / 128.0 , 19 / 128.0 , 20 / 128.0 , 21 / 128.0 , 22 / 128.0 , 23 / 128.0 , 24 / 128.0 , 25 / 128.0 , 26 / 128.0 , 27 / 128.0 , 28 / 128.0 , 29 / 128.0 , 30 / 128.0 , 31 / 128.0 
-, 32 / 128.0 , 33 / 128.0 , 34 / 128.0 , 35 / 128.0 , 36 / 128.0 , 37 / 128.0 , 38 / 128.0 , 39 / 128.0 , 40 / 128.0 , 41 / 128.0 , 42 / 128.0 , 43 / 128.0 , 44 / 128.0 , 45 / 128.0 , 46 / 128.0 , 47 / 128.0 
-, 48 / 128.0 , 49 / 128.0 , 50 / 128.0 , 51 / 128.0 , 52 / 128.0 , 53 / 128.0 , 54 / 128.0 , 55 / 128.0 , 56 / 128.0 , 57 / 128.0 , 58 / 128.0 , 59 / 128.0 , 60 / 128.0 , 61 / 128.0 , 62 / 128.0 , 63 / 128.0 
-, 64 / 128.0 , 65 / 128.0 , 66 / 128.0 , 67 / 128.0 , 68 / 128.0 , 69 / 128.0 , 70 / 128.0 , 71 / 128.0 , 72 / 128.0 , 73 / 128.0 , 74 / 128.0 , 75 / 128.0 , 76 / 128.0 , 77 / 128.0 , 78 / 128.0 , 79 / 128.0 
-, 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
-, 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
-, 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
-
 //
 //	the readers
 void	xml_Reader::readElements_IQ (FILE *theFile, 
@@ -326,31 +320,52 @@
 
 	if (fd -> container == "float32") {
 	 auto *lbuf = dynVec (uint8_t, 8 * amount);
+	 bitsToFloat bTf_real, bTf_imag;
 size_t objectsRead = fread (lbuf, 4, 2 * amount, theFile);
 if (fd -> byteOrder == "MSB") {
 for (size_t i = 0; i < objectsRead / 2; i ++) {
- int32_t temp_32_1 = (lbuf 8 * i << 24) |
-	 (lbuf 8 * i + 1 << 16) |
-	 (lbuf 8 * i + 2 << 8) | lbuf 8 * i + 3;
-	 float t1	=*(float *)(&temp_32_1);
- int32_t temp_32_2 = (lbuf 8 * i + 4 << 24) |
-	 (lbuf 8 * i + 5 << 16) |
-	 (lbuf 8 * i + 6 << 8) | lbuf 8 * i + 7;
-	 float t2	=*(float *)(&temp_32_2);
-	 buffer i = std::complex<float> (t1, t2);
+//	 int32_t temp_32_1 = (lbuf 8 * i << 24) |
+//	 (lbuf 8 * i + 1 << 16) |
+//	 (lbuf 8 * i + 2 << 8) | lbuf 8 * i + 3;
+//	 float t1	=*(float *)(&temp_32_1);
+// int32_t temp_32_2 = (lbuf 8 * i + 4 << 24) |
+//	 (lbuf 8 * i + 5 << 16) |
+//	 (lbuf 8 * i + 6 << 8) | lbuf 8 * i + 7;
+//	 float t2	=*(float *)(&temp_32_2);
+//	 buffer i = std::complex<float> (t1, t2);
+ bTf_real. bitValue = (lbuf 8 * i << 24) |
+	 (lbuf 8 * i + 1 << 16) |
+	 (lbuf 8 * i + 2 << 8) |
+	 lbuf 8 * i + 3;
+ bTf_imag. bitValue = (lbuf 8 * i + 4 << 24) |
+	 (lbuf 8 * i + 5 << 16) |
+	 (lbuf 8 * i + 6 << 8) |
+	 lbuf 8 * i + 7;
+	 buffer i = std::complex<float> (bTf_real. floatValue, 
+	 bTf_imag. floatValue);
 	 }
 	 }
 	 else {
 for (size_t i = 0; i < objectsRead / 2; i ++) {
- int32_t temp_32_1 = (lbuf 8 * i + 3 << 24) |
-	 (lbuf 8 * i + 2 << 16) |
-	 (lbuf 8 * i + 1 << 8) | lbuf 8 * i;
-	 float t1	=*(float *)(&temp_32_1);
- int32_t temp_32_2 = (lbuf 8 * i + 7 << 24) |
-	 (lbuf 8 * i + 6 << 16) |
-	 (lbuf 8 * i + 5 << 8) | lbuf 8 * i + 4;
-	 float t2	=*(float *)(&temp_32_2);
-	 buffer i = std::complex<float> (t1, t2);
+//	 int32_t temp_32_1 = (lbuf 8 * i + 3 << 24) |
+//	 (lbuf 8 * i + 2 << 16) |
+//	 (lbuf 8 * i + 1 << 8) | lbuf 8 * i;
+//	 float t1	=*(float *)(&temp_32_1);
+// int32_t temp_32_2 = (lbuf 8 * i + 7 << 24) |
+//	 (lbuf 8 * i + 6 << 16) |
+//	 (lbuf 8 * i + 5 << 8) | lbuf 8 * i + 4;
+//	 float t2	=*(float *)(&temp_32_2);
+//	 buffer i = std::complex<float> (t1, t2);
+ bTf_real. bitValue = (lbuf 8 * i + 3 << 24) |
+	 (lbuf 8 * i + 2 << 16) |
+	 (lbuf 8 * i + 1 << 8) |
+	 lbuf 8 * i;
+ bTf_imag. bitValue = (lbuf 8 * i + 7 << 24) |
+	 (lbuf 8 * i + 6 << 16) |
+	 (lbuf 8 * i + 5 << 8) |
+	 lbuf 8 * i + 4;
+	 buffer i = std::complex<float> (bTf_real. floatValue,
+	 bTf_imag. floatValue);
 	 }
 	 }
 	 return;
@@ -471,30 +486,51 @@
 	if (fd -> container == "float32") {
 	 auto *lbuf = dynVec (uint8_t, 6 * amount);
 size_t objectsRead = fread (lbuf, 4, 2 * amount, theFile);
+	 bitsToFloat bTf_real, bTf_imag;
 if (fd -> byteOrder == "MSB") {
 for (size_t i = 0; i < objectsRead / 2; i ++) {
- int32_t temp_32_1 = (lbuf 8 * i << 24) |
-	 (lbuf 8 * i + 1 << 16) |
-	 (lbuf 8 * i + 2 << 8) | lbuf 8 * i + 3;
-	 float t1	=*(float *)(&temp_32_1);
- int32_t temp_32_2 = (lbuf 8 * i + 4 << 24) |
-	 (lbuf 8 * i + 5 << 16) |
-	 (lbuf 8 * i + 6 << 8) | lbuf 8 * i + 7;
-	 float t2	=*(float *)(&temp_32_2);
-	 buffer i = std::complex<float> (t1, t2);
+//	 int32_t temp_32_1 = (lbuf 8 * i << 24) |
+//	 (lbuf 8 * i + 1 << 16) |
+//	 (lbuf 8 * i + 2 << 8) | lbuf 8 * i + 3;
+//	 float t1	=*(float *)(&temp_32_1);
+// int32_t temp_32_2 = (lbuf 8 * i + 4 << 24) |
+//	 (lbuf 8 * i + 5 << 16) |
+//	 (lbuf 8 * i + 6 << 8) | lbuf 8 * i + 7;
+//	 float t2	=*(float *)(&temp_32_2);
+//	 buffer i = std::complex<float> (t1, t2);
+ bTf_real. bitValue = (lbuf 8 * i << 24) |
+	 (lbuf 8 * i + 1 << 16) |
+	 (lbuf 8 * i + 2 << 8) |
+	 lbuf 8 * i + 3;
+ bTf_imag. bitValue = (lbuf 8 * i + 4 << 24) |
+	 (lbuf 8 * i + 5 << 16) |
+	 (lbuf 8 * i + 6 << 8) |
+	 lbuf 8 * i + 7;
+	 buffer i = std::complex<float> (bTf_real. floatValue,
+	 bTf_imag. floatValue);
 	 }
 	 }
 	 else {
 for (size_t i = 0; i < objectsRead / 2; i ++) {
- int32_t temp_32_1 = (lbuf 8 * i + 3 << 24) |
-	 (lbuf 8 * i + 2 << 16) |
-	 (lbuf 8 * i + 1 << 8) | lbuf 8 * i;
-	 float t1	=*(float *)(&temp_32_1);
- int32_t temp_32_2 = (lbuf 8 * i + 7 << 24) |
-	 (lbuf 8 * i + 6 << 16) |
-	 (lbuf 8 * i + 5 << 8) | lbuf 8 * i + 4;
-	 float t2	=*(float *)(&temp_32_2);
-	 buffer i = std::complex<float> (t1, t2);
+//	 int32_t temp_32_1 = (lbuf 8 * i + 3 << 24) |
+//	 (lbuf 8 * i + 2 << 16) |
+//	 (lbuf 8 * i + 1 << 8) | lbuf 8 * i;
+//	 float t1	=*(float *)(&temp_32_1);
+// int32_t temp_32_2 = (lbuf 8 * i + 7 << 24) |
+//	 (lbuf 8 * i + 6 << 16) |
+//	 (lbuf 8 * i + 5 << 8) | lbuf 8 * i + 4;
+//	 float t2	=*(float *)(&temp_32_2);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/filereaders/xml-filereader/xml-reader.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/filereaders/xml-filereader/xml-reader.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/hackrf-handler/hackrf-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/hackrf-handler/hackrf-handler.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2023
+ * Copyright (C) 2014 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -35,7 +35,7 @@
 #include	"position-handler.h"
 #include	"xml-filewriter.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
 
@@ -46,11 +46,12 @@
 
 	hackrfHandler::hackrfHandler (QSettings *s,
 	 const QString &recVersion,
-	 logger	*theLogger) : // dummy for now
+	 errorLogger	*theLogger) : 
 	 _I_Buffer (4 * 1024 * 1024),
 	 hackrfSettings (s),
 	 recorderVersion (recVersion) {
-	(void)theLogger;
+hackrf_error errorCode;
+	theErrorLogger		= theLogger;
 setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, HACKRF_SETTINGS);
 
@@ -96,50 +97,59 @@
 	 "hack_AmpEnable", 0) != 0;
 	AmpEnableButton	-> setCheckState (isChecked ? Qt::Checked : 
 	 Qt::Unchecked);
+
 	ppm_correction -> setValue (
 	 value_i (hackrfSettings, HACKRF_SETTINGS,
 	 "hack_ppmCorrection", 0));
+	ppmValue	= ppm_correction -> value ();
 	save_gainSettings	=
 	 value_i (hackrfSettings, HACKRF_SETTINGS,
 	 "save_gainSettings", 1);
 //
-	if (hackrf_init () != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error)(hackrf_init ());
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception ("init failed"));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
 
-	if (hackrf_open (&theDevice) != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error)(hackrf_open (&theDevice));
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception ("open failure"));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
 
-	if (hackrf_set_sample_rate (theDevice, (float)SAMPLERATE) != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error) (hackrf_set_sample_rate (theDevice,
+	 (float)SAMPLERATE));
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception ("error setting samplerate"));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
 
-	int test = hackrf_set_baseband_filter_bandwidth (theDevice, 1750000);
-	if (test != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error)
+	 (hackrf_baseband_filter (theDevice, 1750000));
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception ("failure setting bandwidth"));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
 
-	if (hackrf_set_freq (theDevice, 220000000) != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error)(hackrf_set_freq (theDevice, 220000000));
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception ("failure setting frequency"));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
-
 	uint16_t regValue;
-	test = hackrf_si5351c_read (theDevice, 162, &regValue);
-	if (test != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error)(hackrf_si5351c_read (theDevice,
+	 162, &regValue));
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception ("failure reading board name"));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
 
-	int res = this -> hackrf_si5351c_write (theDevice, 162, regValue);
-	if (res != HACKRF_SUCCESS) {
+	errorCode = (hackrf_error)(hackrf_si5351c_write (theDevice,
+	 162, regValue));
+	if (errorCode != HACKRF_SUCCESS) {
 	 delete library_p;
-	 throw (device_exception (this -> hackrf_error_name (hackrf_error (res))));
+	 throw (device_exception (hackrf_error_name (errorCode)));
 	}
 
 	handle_LNAGain	(lnaGainSlider		-> value());
@@ -153,20 +163,23 @@
 	 this, &hackrfHandler::handle_LNAGain);
 	connect (vgaGainSlider, &QSlider::valueChanged,
 	 this, &hackrfHandler::handle_VGAGain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (biasT_button, &QCheckBox::checkStateChanged,
 #else
 	connect (biasT_button, &QCheckBox::stateChanged,
 #endif
 	 this, &hackrfHandler::handle_biasT);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (AmpEnableButton, &QCheckBox::checkStateChanged,
 #else
 	connect (AmpEnableButton, &QCheckBox::stateChanged,
 #endif
 	 this, &hackrfHandler::handle_Ampli);
+
 	connect (ppm_correction, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &hackrfHandler::handle_ppmCorrection);
+	connect (samplerate_correction, qOverload<int>(&QSpinBox::valueChanged),
+	 this, &hackrfHandler::handle_samplerateCorrection);
 	connect (dumpButton, &QPushButton::clicked,
 	 this, &hackrfHandler::handle_xmlDump);
 
@@ -177,11 +190,17 @@
 	 serialNumber	= serial;
 	 else
 	 serialNumber	= "???";
-	 serial_number_display -> setText (serial);
+	 while ((serialNumber. size () > 0) &&(serialNumber 0 == '0'))
+	 serialNumber. remove (0, 1);
+	 
+	 serial_number_display -> setText (serialNumber);
 	 enum hackrf_usb_board_id board_id =
 	 deviceList -> usb_board_ids 0;
 	 usb_board_id_display ->
 	 setText (this -> hackrf_usb_board_id_name (board_id));
+	 char version 255;
+	 hackrf_version_string_read (theDevice, version, 255);
+	 versionDisplay -> setText (version);
 	}
 	connect (this, &hackrfHandler::signal_antEnable,
 	 biasT_button, &QCheckBox::setChecked);
@@ -221,13 +240,11 @@
 //
 
 void	hackrfHandler::handle_LNAGain	(int newGain) {
-int	res;
 	if ((newGain <= 40) && (newGain >= 0)) {
-	 res	= this -> hackrf_set_lna_gain (theDevice, newGain);
+	 int res	= this -> hackrf_set_lna_gain (theDevice, newGain);
 	 if (res != HACKRF_SUCCESS) {
 	 showStatus (this -> hackrf_error_name (hackrf_error (res)));
-	 fprintf (stderr, "Problem with hackrf_lna_gain :\n");
-	 fprintf (stderr, "%s \n",
+	 theErrorLogger -> add ("Hackrf lnaGain",
 	 this -> hackrf_error_name (hackrf_error (res)));
 	 return;
 	 }
@@ -236,13 +253,11 @@
 }
 
 void	hackrfHandler::handle_VGAGain	(int newGain) {
-int	res;
 	if ((newGain <= 62) && (newGain >= 0)) {
-	 res	= this -> hackrf_set_vga_gain (theDevice, newGain);
+	 int res	= this -> hackrf_set_vga_gain (theDevice, newGain & ~0x01);
 	 if (res != HACKRF_SUCCESS) {
 	 showStatus (this -> hackrf_error_name (hackrf_error (res)));
-	 fprintf (stderr, "Problem with hackrf_vga_gain :\n");
-	 fprintf (stderr, "%s \n",
+	 theErrorLogger -> add ("Hackrf vgaGain",
 	 this -> hackrf_error_name (hackrf_error (res)));
 	 return;
 	 }
@@ -257,11 +272,9 @@
 	(void)d;
 	b = biasT_button	-> checkState() == Qt::Checked;
 	res = this -> hackrf_set_antenna_enable (theDevice, b);
-//	fprintf(stderr,"Passed %d\n",(int)b);
 	if (res != HACKRF_SUCCESS) {
 	 showStatus (this -> hackrf_error_name (hackrf_error (res)));
-	 fprintf (stderr, "Problem with hackrf_set_antenna_enable :\n");
-	 fprintf (stderr, "%s \n",
+	 theErrorLogger -> add ("Hackrf",
 	 this -> hackrf_error_name (hackrf_error (res)));
 	 return;
 	}

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/hackrf-handler/hackrf-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/hackrf-handler/hackrf-handler.h Changed

@@ -35,7 +35,9 @@
 #include	"ui_hackrf-widget.h"
 #include	"libhackrf/hackrf.h"
 #include	<QLibrary>
-class		logger;
+class		errorLogger;
+
+#include	"equalizer.h"
 
 typedef int (*hackrf_sample_block_cb_fn)(hackrf_transfer *transfer);
 
@@ -67,6 +69,7 @@
 typedef	int	(*pfn_hackrf_is_streaming) (hackrf_device *);
 typedef	const char	*(*pfn_hackrf_error_name) (enum hackrf_error errcode);
 typedef	const char	*(*pfn_hackrf_usb_board_id_name) (enum hackrf_usb_board_id);
+typedef int	(*pfn_hackrf_version_string_read)(hackrf_device *, char *, int);
 // contributed by Fabio
 typedef int	(*pfn_hackrf_set_antenna_enable)
 	 (hackrf_device *, const uint8_t);
@@ -85,7 +88,8 @@
 Q_OBJECT
 public:
 			hackrfHandler		(QSettings *,
-	 const QString &, logger *);
+	 const QString &,
+	 errorLogger *);
 			~hackrfHandler		();
 
 	bool		restartReader		(int32_t, int skipped = 0);
@@ -112,7 +116,7 @@
 	pfn_hackrf_stop_rx	hackrf_stop_rx;
 	pfn_hackrf_device_list	hackrf_device_list;
 	pfn_hackrf_set_baseband_filter_bandwidth
-	 hackrf_set_baseband_filter_bandwidth;
+	 hackrf_baseband_filter;
 	pfn_hackrf_set_lna_gain	hackrf_set_lna_gain;
 	pfn_hackrf_set_vga_gain	hackrf_set_vga_gain;
 	pfn_hackrf_set_freq	hackrf_set_freq;
@@ -122,7 +126,8 @@
 	pfn_hackrf_error_name	hackrf_error_name;
 	pfn_hackrf_usb_board_id_name
 	 hackrf_usb_board_id_name;
-
+	pfn_hackrf_version_string_read
+	 hackrf_version_string_read;
 //	aggiunta Fabio
 	pfn_hackrf_set_antenna_enable hackrf_set_antenna_enable;
 	pfn_hackrf_set_amp_enable hackrf_set_amp_enable;
@@ -130,15 +135,17 @@
 	pfn_hackrf_si5351c_write hackrf_si5351c_write;
 	pfn_hackrf_board_rev_read	hackrf_board_rev_read;
 
+	int			ppmValue;
 //	Fine aggiunta
 
 	QSettings		*hackrfSettings;
 	QString			recorderVersion;
+	errorLogger		*theErrorLogger;
 	std::atomic<bool>	running;
 	QLibrary*		library_p;
 	QString			serialNumber;
 
- xml_fileWriter		*xmlWriter;
+	xml_fileWriter		*xmlWriter;
 std::atomic<bool>	dumping;
 	bool			save_gainSettings;
 
@@ -158,7 +165,8 @@
 // contributed by Fabio
 	void			handle_biasT		(int);
 	void			handle_Ampli		(int);
-	void			handle_ppmCorrection (int);
+	void			handle_ppmCorrection	(int);
+	void			handle_samplerateCorrection	(int);
 // Fine aggiunta
 	void			handle_xmlDump	();
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/hackrf-handler/hackrf-widget.ui -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/hackrf-handler/hackrf-widget.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>287</width>
- <height>312</height>
+ <height>348</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -44,6 +44,9 @@
 </item>
 <item>
 <widget class="QSpinBox" name="ppm_correction">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Unfortunately, the hackrf API does not support ppm handling so ppm handling is done by - in software - adapting the channel frequencies&lt;/p&gt;&lt;p&gt;Since it takes time for the software to react on a change, make changes one step at the time and wait a while&lt;/p&gt;&lt;p&gt;(Note 1 ppm on 227360 KHz is 227 Hz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="minimum">
 <number>-100</number>
 </property>
@@ -53,6 +56,13 @@
 </widget>
 </item>
 <item>
+ <widget class="QSpinBox" name="samplerate_correction">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Experimental. My hackrf device shows a pretty large samplerate offset (clock offset on the spectrum display), app -36 for channel 12C, i.e. 227360 Khz. With this spinbox the samplerate can be altered. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QLabel" name="usb_board_id_display">
 <property name="text">
 <string/>
@@ -178,16 +188,16 @@
 </property>
 </widget>
 </item>
- <item>
- <widget class="QLabel" name="serialNumber">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
 </layout>
 </item>
 <item>
+ <widget class="QLabel" name="versionDisplay">
+ <property name="text">
+ <string>versionDisplay</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QLabel" name="statusLabel">
 <property name="text">
 <string>status</string>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/hackrf-handler/libhackrf/hackrf.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/hackrf-handler/libhackrf/hackrf.h Changed

@@ -1,7 +1,7 @@
 /*
+Copyright (c) 2012-2022 Great Scott Gadgets <info@greatscottgadgets.com>
 Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
 Copyright (c) 2013, Benjamin Vernoux <titanmkd@gmail.com>
-Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
 
 All rights reserved.
 
@@ -24,71 +24,784 @@
 #ifndef __HACKRF_H__
 #define __HACKRF_H__
 
-#include <cstdint>
-
+#include <stdint.h>
+#include <sys/types.h>
+#include <stdbool.h> // for bool
 #ifdef _WIN32
- #define ADD_EXPORTS
- 
- /* You should define ADD_EXPORTS *only* when building the DLL. */
- #ifdef ADD_EXPORTS
- #define ADDAPI __declspec(dllexport)
- #else
- #define ADDAPI __declspec(dllimport)
- #endif
-
- /* Define calling convention in one place, for convenience. */
- #define ADDCALL __cdecl
+	#define ADD_EXPORTS
+
+	/* You should define ADD_EXPORTS *only* when building the DLL. */
+	#ifdef ADD_EXPORTS
+		#define ADDAPI __declspec(dllexport)
+	#else
+		#define ADDAPI __declspec(dllimport)
+	#endif
+
+	/* Define calling convention in one place, for convenience. */
+	#define ADDCALL __cdecl
 
 #else /* _WIN32 not defined. */
 
- /* Define with no value on non-Windows OSes. */
- #define ADDAPI
- #define ADDCALL
+	#define ADDAPI
+	#define ADDCALL
 
 #endif
 
+/**
+ * @defgroup library Library related functions and enums
+ * 
+ * @brief Library initialization, exit, error handling, etc.
+ * 
+ * # Library initialization & exit
+ * 
+ * The libhackrf library needs to be initialized in order to use most of its functions. This can be achieved via the function @ref hackrf_init. This initializes internal state and initializes `libusb`. You should only call this function on startup, but it's safe to call it later as well, only it does nothing.
+ * 
+ * When exiting the program, a call to @ref hackrf_exit should be called. This releases all resources, stops background thread and exits `libusb`. This function should only be called if all streaming is stopped and all devices are closed via @ref hackrf_close, else the error @ref HACKRF_ERROR_NOT_LAST_DEVICE is returned.
+ * 
+ * # Error handling
+ * 
+ * Many of the functions in libhackrf can signal errors via returning @ref hackrf_error. This enum is backed by an integer, thus these functions are declared to return an int, but they in fact return an enum variant. The special case @ref HACKRF_SUCCESS signals no errors, so return values should be matched for that. It is also set to the value 0, so boolean conversion can also be used. The function @ref hackrf_error_name can be used to convert the enum into a human-readable string, useful for logging the error.
+ * 
+ * There is a special variant @ref HACKRF_TRUE, used by some functions that return boolean. This fact is explicitly mentioned at those functions.
+ * 
+ * Typical error-handling code example:
+ * ```c
+ * result = hackrf_init();
+ * if (result != HACKRF_SUCCESS) {
+ * fprintf(stderr,
+ * "hackrf_init() failed: %s (%d)\n",
+ * hackrf_error_name(result),
+ * result);
+ * return EXIT_FAILURE;
+ * }
+ * ```
+ * 
+ * Instead of `if (result != HACKRF_SUCCESS)` the line `if (result)` can also be used with the exact same behaviour.
+ * 
+ * The special case @ref HACKRF_TRUE is only used by @ref hackrf_is_streaming
+ * 
+ * # Enum conversion
+ * 
+ * Most of the enums defined in libhackrf have a corresponding `_name` function that converts the enum value into a human-readable string. All strings returned by these functions are statically allocated and do not need to be `free`d. An example is the already mentioned @ref hackrf_error_name function for the @ref hackrf_error enum.
+ * 
+ * # Library internals
+ * 
+ * The library uses `libusb` (version 1.0) to communicate with HackRF hardware. It uses both the synchronous and asynchronous API for communication (asynchronous for streaming data to/from the device, and synchronous for everything else). The asynchronous API requires to periodically call a variant of `libusb_handle_events`, so the library creates a new "transfer thread" for each device doing that using the `pthread` library. The library uses multiple transfers for each device (@ref hackrf_get_transfer_queue_depth).
+ *
+ * # USB API versions
+ * As all functionality of HackRF devices requires cooperation between the firmware and the host, both devices can have outdated software. If host machine software is outdated, the new functions will be unalaviable in `hackrf.h`, causing linking errors. If the device firmware is outdated, the functions will return @ref HACKRF_ERROR_USB_API_VERSION.
+ * Since device firmware and USB API are separate (but closely related), USB API has its own version numbers.
+ * Here is a list of all the functions that require a certain minimum USB API version, up to version 0x0107
+ * ## 0x0102
+ * - @ref hackrf_set_hw_sync_mode
+ * - @ref hackrf_init_sweep
+ * - @ref hackrf_set_operacake_ports
+ * - @ref hackrf_reset
+ * ## 0x0103
+ * - @ref hackrf_spiflash_status
+ * - @ref hackrf_spiflash_clear_status
+ * - @ref hackrf_set_operacake_ranges
+ * - @ref hackrf_set_operacake_freq_ranges
+ * - @ref hackrf_set_clkout_enable
+ * - @ref hackrf_operacake_gpio_test
+ * - @ref hackrf_cpld_checksum
+ * ## 0x0104
+ * - @ref hackrf_set_ui_enable
+ * - @ref hackrf_start_rx_sweep
+ * ## 0x0105
+ * - @ref hackrf_get_operacake_boards
+ * - @ref hackrf_set_operacake_mode
+ * - @ref hackrf_get_operacake_mode
+ * - @ref hackrf_set_operacake_dwell_times
+ * ## 0x0106
+ * - @ref hackrf_get_m0_state
+ * - @ref hackrf_set_tx_underrun_limit
+ * - @ref hackrf_set_rx_overrun_limit
+ * - @ref hackrf_get_clkin_status
+ * - @ref hackrf_board_rev_read
+ * - @ref hackrf_supported_platform_read
+ * ## 0x0107
+ * - @ref hackrf_set_leds
+ */
+
+/**
+ * @defgroup device Device listing, opening, closing and querying
+ * 
+ * @brief Managing HackRF devices and querying information about them
+ * 
+ * The libhackrf library interacts via HackRF hardware through a @ref hackrf_device handle. This handle is opaque, meaning its fields are internal to the library and should not be accessed by user code. To use a device, it first needs to be opened, than it can be interacted with, and finally the device needs to be closed via @ref hackrf_close.
+ * 
+ * # Opening devices
+ * 
+ * ## Open first device
+ * 
+ * @ref hackrf_open opens the first USB device (chosen by libusb). Useful if only one HackRF device is expected to be present.
+ * 
+ * ## Open by serial
+ * 
+ * @ref hackrf_open_by_serial opens a device by a given serial (suffix). If no serial is specified it defaults to @ref hackrf_open
+ * 
+ * ## Open by listing
+ * 
+ * All connected HackRF devices can be listed via @ref hackrf_device_list. The list must be freed by @ref hackrf_device_list_free.
+ * 
+ * This struct lists all devices and their serial numbers. Any one of them can be opened by @ref hackrf_device_list_open. All the fields should be treated read-only!
+ * 
+ * # Closing devices
+ * 
+ * If the device is not needed anymore, then it can be closed via @ref hackrf_close. Closing a device terminates all ongoing transfers, and resets the device to IDLE mode.
+ * 
+ * # Querying device information
+ * 
+ * ## Board ID
+ * 
+ * Board ID identifies the type of HackRF board connected. See the enum @ref hackrf_board_id for possible values. The value can be read by @ref hackrf_board_id_read and converted into a human-readable string using @ref hackrf_board_id_name. When reading, the initial value of the enum should be @ref BOARD_ID_UNDETECTED.
+ * 
+ * ## Version string
+ * 
+ * Version string identifies the firmware version on the board. It can be read with the function @ref hackrf_version_string_read
+ * 
+ * ## USB API version
+ * 
+ * USB API version identifies the USB API supported by the device's firmware. It is coded as a xx.xx 16-bit value, and can be read by @ref hackrf_usb_api_version_read
+ * 
+ * Example of reading firmware and USB API version (from hackrf_info.c(https://github.com/greatscottgadgets/hackrf/blob/eff4a20022ca5d7f11405c3cdeea6c4195e347d0/host/hackrf-tools/src/hackrf_info.c#L157-L178)):
+ * 
+ * ```c
+ * result = hackrf_version_string_read(device, &version0, 255);
+ * if (result != HACKRF_SUCCESS) {
+ * fprintf(stderr,
+ * "hackrf_version_string_read() failed: %s (%d)\n",
+ * hackrf_error_name(result),
+ * result);
+ * return EXIT_FAILURE;
+ * }
+ *
+ *
+ * result = hackrf_usb_api_version_read(device, &usb_version);
+ * if (result != HACKRF_SUCCESS) {
+ * fprintf(stderr,
+ * "hackrf_usb_api_version_read() failed: %s (%d)\n",
+ * hackrf_error_name(result),
+ * result);
+ * return EXIT_FAILURE;
+ * }
+ * printf("Firmware Version: %s (API:%x.%02x)\n",
+ * version,
+ * (usb_version >> 8) & 0xFF,
+ * usb_version & 0xFF);
+ * ```
+ * 
+ * 
+ * ## Part ID and serial number
+ *

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/lime-handler/lime-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/lime-handler/lime-handler.cpp Changed

@@ -22,11 +22,11 @@
 */
 
 #include	<QTime>
-#include	"dab-constants.h"
 #include	"lime-handler.h"
 #include	"position-handler.h"
+#include	"xml-filewriter.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
 
@@ -39,16 +39,17 @@
 
 	limeHandler::limeHandler (QSettings *s,
 	 const QString &recorderVersion,
-	 logger	*theLogger): // dummy for now
+	 errorLogger	*theLogger):
 	 _I_Buffer (4 * 1024 * 1024),
-	 theFilter (5, 1560000 / 2, SAMPLERATE) {
+	 theFilter (5, 1560000 / 2, 2048000) {
 	this	-> limeSettings		= s;
 	this	-> recorderVersion	= recorderVersion;
-	(void)theLogger;
+	this	-> theErrorLogger	= theLogger;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, LIME_SETTINGS);
 	myFrame. show	();
 
+	myFrame. setWindowTitle ("LimeSDR control");
 	filtering	= false;
 
 	currentDepth	= value_i (limeSettings, LIME_SETTINGS,
@@ -62,25 +63,28 @@
 #else
 const char *libraryString = "libLimeSuite.so";
 #endif
-
-	library_p = new QLibrary (libraryString);
- library_p -> load();
-
+	
+ library_p	= new QLibrary (libraryString);
+ library_p	-> load ();
 if (!library_p -> isLoaded ()) {
 throw (device_exception ("failed to open " +
 std::string (libraryString)));
 }
 
-	if (!load_limeFunctions()) {
-	 delete library_p;
- throw (device_exception ("could not load all required lib functions"));
+ if (!load_limeFunctions ()) {
+ delete library_p;
+ throw (device_exception ("could not find one or more library functions"));
 }
-//
+
+	libraryLoaded	= true;
 // From here we have a library available
 	int ndevs	= LMS_GetDeviceList (limedevices);
-	if (ndevs == 0) {	// no devices found
-	 delete library_p;
+	if (ndevs == 0) 	// no devices found
 	 throw (device_exception ("No lime device found"));
+	else
+	if (ndevs < 0) {
+	 const char *error = LMS_GetLastErrorMessage ();
+	 throw (device_exception (error));
 	}
 
 	for (int i = 0; i < ndevs; i ++)
@@ -88,46 +92,54 @@
 
 	int res		= LMS_Open (&theDevice, nullptr, nullptr);
 	if (res < 0) {	// some error
-	 delete library_p;
-	 throw (device_exception ("failed to open device"));
+	 const char * error = LMS_GetLastErrorMessage ();
+	 throw (device_exception (error));
 	}
 
+	nameOfDevice	-> setText (limedevices 0);
 	res		= LMS_Init (theDevice);
 	if (res < 0) {	// some error
+	 const char * error = LMS_GetLastErrorMessage ();
 	 LMS_Close (&theDevice);
-	 delete library_p;
-	 throw (device_exception ("failed to initialize device"));
+	 throw (device_exception (error));
 	}
 
 	res		= LMS_GetNumChannels (theDevice, LMS_CH_RX);
+	if (res == 0) {	// no channels
+	 throw (device_exception ("could not set number of channels"));
+	 LMS_Close (&theDevice);
+	}
 	if (res < 0) {	// some error
+	 const char * error = LMS_GetLastErrorMessage ();
 	 LMS_Close (&theDevice);
-	 delete library_p;
-	 throw (device_exception ("could not set number of channels"));
+	 throw (device_exception (error));
 	}
 
 	fprintf (stderr, "device %s supports %d channels\n",
 	 limedevices 0, res);
 	res		= LMS_EnableChannel (theDevice, LMS_CH_RX, 0, true);
-	if (res < 0) {	// some error
+	if (res != 0) {	// some error
+	 const char * error = LMS_GetLastErrorMessage ();
 	 LMS_Close (theDevice);
-	 delete library_p;
-	 throw (device_exception ("could not enable channels"));
+	 throw (device_exception (error));
 	}
 
-	res	= LMS_SetSampleRate (theDevice, (float)SAMPLERATE, 0);
-	if (res < 0) {
+	res	= LMS_SetSampleRate (theDevice, 2048000.0, 1);
+	if (res != 0) {
+	 const char * error = LMS_GetLastErrorMessage ();
 	 LMS_Close (theDevice);
-	 delete library_p;
-	 throw (device_exception ("could not set samplerate"));
+	 throw (device_exception (error));
 	}
 
 	float_type host_Hz, rf_Hz;
 	res	= LMS_GetSampleRate (theDevice, LMS_CH_RX, 0,
 	 &host_Hz, &rf_Hz);
+	if (res != 0) {
+	 const char * error = LMS_GetLastErrorMessage ();
+	 LMS_Close (theDevice);
+	 throw (device_exception (error));
+	}
 
-	fprintf (stderr, "samplerate = %f %f\n", (float)host_Hz, (float)rf_Hz);
-	
 	res		= LMS_GetAntennaList (theDevice, LMS_CH_RX, 0, antennas);
 	for (int i = 0; i < res; i ++) 	
 	 antennaList	-> addItem (QString (antennas i));
@@ -147,29 +159,63 @@
 
 //	default antenna setting
 	res		= LMS_SetAntenna (theDevice, LMS_CH_RX, 0, 
-	 antennaList -> currentIndex());
+	 antennaList -> currentIndex ());
+	if (res != 0) {
+	 const char * error = LMS_GetLastErrorMessage ();
+	 LMS_Close (theDevice);
+	 throw (device_exception (error));
+	}
 
 //	default frequency
 	res		= LMS_SetLOFrequency (theDevice, LMS_CH_RX,
 	 0, 220000000.0);
 	if (res < 0) {
+	 const char * error = LMS_GetLastErrorMessage ();
 	 LMS_Close (theDevice);
-	 delete library_p;
-	 throw (device_exception ("could not set LO frequency"));
+	 throw (device_exception (error));
 	}
-
-	res		= LMS_SetLPFBW (theDevice, LMS_CH_RX,
-	 0, 1536000.0);
+//
+	lms_range_t	range;
+	res		= LMS_GetLPFBWRange (theDevice, LMS_CH_RX, &range);
 	if (res < 0) {
+	 const char * error = LMS_GetLastErrorMessage ();
 	 LMS_Close (theDevice);
-	 delete library_p;
-	 throw (device_exception ("could not set bandwidth"));
+	 throw (device_exception (error));
+	}
+
+	double	bandWidth	= 1536000;
+	fprintf (stderr, "range %f - %f\n",
+	 (float)range. min, (float)range. max);
+	if (bandWidth < range. min)
+	 bandWidth = range. min + 100;
+//	res		= LMS_SetLPFBW (theDevice, LMS_CH_RX,
+//	 0, bandWidth);
+//	if (res < 0) {
+//	 const char * error = LMS_GetLastErrorMessage ();
+//	 LMS_Close (theDevice);
+//	 throw (device_exception (error));
+//	}
+
+	res		= LMS_SetGFIRLPF (theDevice, LMS_CH_RX,
+	 0, true, bandWidth);
+	if (res < 0) {
+	 const char * error = LMS_GetLastErrorMessage ();
+	 LMS_Close (theDevice);
+	 throw (device_exception (error));
 	}

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/lime-handler/lime-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/lime-handler/lime-handler.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2025
+ * Copyright (C) 2016 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -27,7 +27,6 @@
 #include	<QFrame>
 #include	<QSettings>
 #include	<QLibrary>
-#include	<QScopedPointer>
 #include	<atomic>
 #include	<vector>
 #include	"dab-constants.h"
@@ -36,8 +35,13 @@
 #include	"device-handler.h"
 #include	"lime-widget.h"
 #include	"fir-filters.h"
-#include	"xml-filewriter.h"
-class		logger;
+class		errorLogger;
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
 
 class	xml_fileWriter;
 
@@ -74,10 +78,15 @@
 	 size_t chan, float_type *gain);
 typedef	int	(*pfn_LMS_GetGaindB)(lms_device_t *device, bool dir_tx,
 	 size_t chan, unsigned *gain);
+typedef int	(*pfn_LMS_GetLPFBWRange)(lms_device_t *dev, bool dir_tx,
+	 lms_range_t *range);
 typedef	int	(*pfn_LMS_SetLPFBW)(lms_device_t *device, bool dir_tx,
 	 size_t chan, float_type bandwidth);
 typedef	int	(*pfn_LMS_GetLPFBW)(lms_device_t *device, bool dir_tx,
 size_t chan, float_type *bandwidth);
+typedef	int	(*pfn_LMS_SetGFIRLPF)(lms_device_t *device, bool dir_tx,
+ size_t chan, bool enabled,
+	 float_type bandwidth);
 typedef	int 	(*pfn_LMS_Calibrate)(lms_device_t *device, bool dir_tx,
 	 size_t chan, double bw, unsigned flags);
 typedef	int	(*pfn_LMS_SetupStream)(lms_device_t *device,
@@ -92,44 +101,47 @@
 	 unsigned timeout_ms);
 typedef	int	(*pfn_LMS_GetStreamStatus)(lms_stream_t *stream,
 	 lms_stream_status_t* status);
+typedef	const char * (*pfn_LMS_GetLastErrorMessage)();
+//
+/////////////////////////////////////////////////////////////////////////
 
 class	limeHandler: //public QThread,
 	 public deviceHandler, public limeWidget {
 Q_OBJECT
 public:
 			limeHandler		(QSettings *,
-	 const QString &, logger *);
+	 const QString &,
+	 errorLogger *);
 			~limeHandler		();
 
-	bool		restartReader		(int32_t, int skipped = 0);
+	bool		restartReader		(int32_t,
+	 int samplesSkipped = 0);
 	void		stopReader		();
 	int32_t getSamples (std::complex<float> *, int32_t);
 int32_t Samples			();
 void resetBuffer		();
 int16_t bitDepth		();
 	QString		deviceName		();
-
-	void		startDump		();
-	void		stopDump		();
 private:
-	QFrame		myFrame;
 	RingBuffer<std::complex<int16_t>> _I_Buffer;
 	QString		recorderVersion;
+	errorLogger	*theErrorLogger;
 	QString		deviceModel;
 	QSettings	*limeSettings;
-	QLibrary	*library_p;
 	std::atomic<bool>	running;
 	lms_device_t	*theDevice;
 	lms_name_t	antennas 10;
 	bool		load_limeFunctions();
+	QLibrary	*library_p;
 	bool		libraryLoaded;
 	lms_stream_meta_t meta;
 lms_stream_t stream;
 void		run			();
 
- QScopedPointer<xml_fileWriter> xmlWriter;
- bool setup_xmlDump		(bool);
+ xml_fileWriter *xmlWriter;
+ bool setup_xmlDump ();
 void close_xmlDump ();
+ std::atomic<bool> dumping;
 
 	void		record_gainSettings	(int);
 	void		update_gainSettings	(int);
@@ -157,8 +169,10 @@
 	pfn_LMS_SetGaindB	LMS_SetGaindB;
 	pfn_LMS_GetNormalizedGain	LMS_GetNormalizedGain;
 	pfn_LMS_GetGaindB	LMS_GetGaindB;
+	pfn_LMS_GetLPFBWRange	LMS_GetLPFBWRange;
 	pfn_LMS_SetLPFBW	LMS_SetLPFBW;
 	pfn_LMS_GetLPFBW	LMS_GetLPFBW;
+	pfn_LMS_SetGFIRLPF	LMS_SetGFIRLPF;
 	pfn_LMS_Calibrate	LMS_Calibrate;
 
 	pfn_LMS_SetupStream	LMS_SetupStream;
@@ -167,6 +181,7 @@
 	pfn_LMS_StopStream	LMS_StopStream;
 	pfn_LMS_RecvStream	LMS_RecvStream;
 	pfn_LMS_GetStreamStatus	LMS_GetStreamStatus;
+	pfn_LMS_GetLastErrorMessage LMS_GetLastErrorMessage;
 signals:
 	void		new_gainValue	(int);
 private slots:

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/lime-handler/lime-widget.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/lime-handler/lime-widget.h Changed

@@ -1,5 +1,28 @@
-#ifndef	__LIME_WIDGET__
-#define	__LIME_WIDGET__
+#
+/*
+ * Copyright (C) 2014 .. 2023
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#pragma once
 
 #include	<QLabel>
 #include	<QSpinBox>
@@ -22,15 +45,20 @@
 	QLabel		*underrunLabel;
 	QLCDNumber	*overrunDisplay;
 	QLabel		*overrunLabel;
+	QLCDNumber	*fifoDisplay;
+	QLabel		*fifoLabel;
 	QPushButton	*dumpButton;
 	QCheckBox	*filterSelector;
 	QSpinBox	*filterDepth;
+	QLabel		*nameOfDevice;
+	QLabel		*frequencyLabel;
 
 	limeWidget	() {}
 	~limeWidget	() {}
 
-void	setupUi		(QWidget *qw) {
+void	setupUi		(QFrame *qw) {
 	titleLabel	= new QLabel	("lime handler");
+	nameOfDevice	= new QLabel	("deviceName");
 	gainSelector	= new QSpinBox	();
 	gainLabel	= new QLabel	("gain");
 	actualGain	= new QLCDNumber ();
@@ -40,9 +68,12 @@
 	underrunLabel	= new QLabel	("underruns");
 	overrunDisplay	= new QLCDNumber ();
 	overrunLabel	= new QLabel	("overruns");
+	fifoDisplay	= new QLCDNumber ();
+	fifoLabel	= new QLabel ("fifo");
 	dumpButton	= new QPushButton	();
 	filterSelector	= new QCheckBox	("filter");
 	filterDepth	= new QSpinBox	();
+	frequencyLabel	= new QLabel ();
 	filterDepth	-> setRange (5, 25);
 	dumpButton	-> setText ("Dump");
 	actualGain	-> setFrameShape (QFrame::NoFrame);
@@ -51,6 +82,8 @@
 underrunDisplay	-> setSegmentStyle (QLCDNumber::Flat);
 	overrunDisplay	-> setFrameShape (QFrame::NoFrame);
 overrunDisplay	-> setSegmentStyle (QLCDNumber::Flat);
+	fifoDisplay	-> setFrameShape (QFrame::NoFrame);
+ fifoDisplay	-> setSegmentStyle (QLCDNumber::Flat);
 
 	QHBoxLayout *line2	= new QHBoxLayout ();
 	line2		-> addWidget (gainSelector);
@@ -61,15 +94,18 @@
 	line3		-> addWidget (antennaList);
 	line3		-> addSpacing (3);
 	line3		-> addWidget (antennaLabel);
+	line3		-> addWidget (frequencyLabel);
 
 	QHBoxLayout *line4	= new QHBoxLayout ();
-	line4		-> addWidget (underrunDisplay);
 	line4		-> addWidget (underrunLabel);
-	line4		-> addWidget (filterSelector);
-
+	line4		-> addWidget (underrunDisplay);
+	line4		-> addWidget (overrunLabel);
+	line4		-> addWidget (overrunDisplay);
+	
 	QHBoxLayout *line5	= new QHBoxLayout ();
-	line5		-> addWidget (overrunDisplay);
-	line5		-> addWidget (overrunLabel);
+	line5		-> addWidget (fifoLabel);
+	line5		-> addWidget (fifoDisplay);
+	line5		-> addWidget (filterSelector);
 	line5		-> addWidget (filterDepth);
 
 	QHBoxLayout *line1	= new QHBoxLayout ();
@@ -82,10 +118,10 @@
 	base		-> addItem	(line3);
 	base		-> addItem	(line4);
 	base		-> addItem	(line5);
+	base		-> addWidget	(nameOfDevice);
 
 	qw	-> setLayout (base);
 }
 };
 
-#endif

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/pluto-handler/pluto-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/pluto-handler/pluto-handler.cpp Changed

@@ -28,7 +28,7 @@
 #include	"pluto-handler.h"
 #include	"position-handler.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
 
@@ -46,157 +46,18 @@
 snprintf (tmpstr, sizeof(tmpstr), "%s%d", type, id);
 return tmpstr;
 }
+//
+//	Nite that while Ubuntu 22 has the support libraries in the
+//	repository, Fedora does NOT
+///////////////////////////////////////////////////////////////////////////
 
-int	plutoHandler::
-	ad9361_set_trx_fir_enable (struct iio_device *dev, int enable) {
-int ret = iio_device_attr_write_bool (dev,
-	 "in_out_voltage_filter_fir_en",
-	 !!enable);
-	if (ret < 0)
-	 ret = iio_channel_attr_write_bool (
-	 iio_device_find_channel(dev, "out", false),
-	 "voltage_filter_fir_en", !!enable);
-	return ret;
-}
-
-int	plutoHandler::
-	ad9361_get_trx_fir_enable (struct iio_device *dev, int *enable) {
-bool value;
-
-	int ret = iio_device_attr_read_bool (dev,
-	 "in_out_voltage_filter_fir_en",
-	 &value);
-
-	if (ret < 0)
-	 ret = iio_channel_attr_read_bool (
-	 iio_device_find_channel (dev, "out", false),
-	 "voltage_filter_fir_en", &value);
-	if (!ret)
-	 *enable	= value;
-
-	return ret;
-}
-
-/* returns ad9361 phy device */
-struct iio_device* plutoHandler::get_ad9361_phy (struct iio_context *ctx) {
-struct iio_device *dev = iio_context_find_device (ctx, "ad9361-phy");
-	return dev;
-}
-
-/* finds AD9361 streaming IIO devices */
-bool 	plutoHandler::get_ad9361_stream_dev (struct iio_context *ctx,
-	 enum iodev d, struct iio_device **dev) {
-	switch (d) {
-	case TX:
-	 *dev = iio_context_find_device (ctx, "cf-ad9361-dds-core-lpc");
-	 return *dev != NULL;
-
-	case RX:
-	 *dev = iio_context_find_device (ctx, "cf-ad9361-lpc");
-	 return *dev != NULL;
-
-	default: 
-	 return false;
-	}
-}
-
-/* finds AD9361 streaming IIO channels */
-bool	plutoHandler::get_ad9361_stream_ch (__notused struct iio_context *ctx,
-	 enum iodev d,
-	 struct iio_device *dev,
-	 int chid,
-	 struct iio_channel **chn) {
-	*chn = iio_device_find_channel (dev,
-	 get_ch_name ("voltage", chid),
-	 d == TX);
-	if (!*chn)
-	 *chn = iio_device_find_channel (dev,
-	 get_ch_name ("altvoltage", chid),
-	 d == TX);
-	return *chn != NULL;
-}
-
-/* finds AD9361 phy IIO configuration channel with id chid */
-bool	plutoHandler::get_phy_chan (struct iio_context *ctx,
-	 enum iodev d, int chid, struct iio_channel **chn) {
-	switch (d) {
-	 case RX:
-	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
-	 get_ch_name ("voltage", chid),
-	 false);
-	 return *chn != NULL;
-
-	 case TX:
-	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
-	 get_ch_name ("voltage", chid),
-	 true);
-	 return *chn != NULL;
-
-	 default: 
-	 return false;
-	}
-}
-
-/* finds AD9361 local oscillator IIO configuration channels */
-bool	plutoHandler::get_lo_chan (struct iio_context *ctx,
-	 enum iodev d, struct iio_channel **chn) {
-// LO chan is always output, i.e. true
-	switch (d) {
-	 case RX:
-	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
-	 get_ch_name ("altvoltage", 0),
-	 true);
-	 return *chn != NULL;
-
-	 case TX:
-	 *chn = iio_device_find_channel (get_ad9361_phy (ctx),
-	 get_ch_name ("altvoltage", 1),
-	 true);
-	 return *chn != NULL;
-
-	 default: 
-	 return false;
-	}
-}
-
-/* applies streaming configuration through IIO */
-bool	plutoHandler::cfg_ad9361_streaming_ch (struct iio_context *ctx,
-	 struct stream_cfg *cfg,
-	 enum iodev type, int chid) {
-struct iio_channel *chn = NULL;
-int	ret;
-
-// Configure phy and lo channels
-	printf("* Acquiring AD9361 phy channel %d\n", chid);
-	if (!get_phy_chan (ctx, type, chid, &chn)) {
-	 return false;
-	}
-	ret = iio_channel_attr_write (chn,
-	 "rf_port_select", cfg -> rfport);
-	if (ret < 0)
-	 return false;
-	ret = iio_channel_attr_write_longlong (chn,
-	 "rf_bandwidth", cfg -> bw_hz);
-	ret = iio_channel_attr_write_longlong (chn,
-	 "sampling_frequency",
-	 cfg -> fs_hz);
-
-// Configure LO channel
-	printf("* Acquiring AD9361 %s lo channel\n", type == TX ? "TX" : "RX");
-	if (!get_lo_chan (ctx, type, &chn)) {
-	 return false;
-	}
-	ret = iio_channel_attr_write_longlong (chn,
-	 "frequency", cfg -> lo_hz);
-	return true;
-}
 
 	plutoHandler::plutoHandler (QSettings *s,
 	 const QString &recorderVersion,
-	 logger	*theLogger):	// dummy for now
+	 errorLogger *theLogger):
 	 _I_Buffer (4 * 1024 * 1024) {
 	plutoSettings			= s;
-	(void)theLogger;
+	this	-> theErrorLogger	= theLogger;
 	this	-> recorderVersion	= recorderVersion;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, PLUTO_SETTINGS);
@@ -205,7 +66,7 @@
 #ifdef	__MINGW32__
 	const char * libName = "libiio.dll";
 #else
-	const char * libName= "libiio.so";
+	const char * libName= "libiio.so.0";
 #endif
 
 	pHandle		= new QLibrary (libName);
@@ -218,12 +79,18 @@
 	 throw device_exception ("Failed to open " + std::string (libName));
 	}
 
-	bool success			= loadFunctions ();
+	bool success			= load_iioFunctions ();
 	if (!success) {
 	 delete pHandle;
 	 throw device_exception ("could not load all required lib functions");
 	}
 
+	char git_tag 8;
+	unsigned int major;
+	unsigned int minor;
+	iio_library_get_version (&major, &minor, git_tag);
+	fprintf (stderr, "Library version %d %d %s\n", 
+	 major, minor, git_tag);
 	this	-> ctx			= nullptr;

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/pluto-handler/pluto-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/pluto-handler/pluto-handler.h Changed

@@ -46,7 +46,7 @@
 //#define GETPROCADDRESS dlsym
 //#endif
 
-class	logger;
+class	errorLogger;
 
 #ifndef	PLUTO_RATE
 #define	PLUTO_RATE	2112000
@@ -115,6 +115,10 @@
 typedef void * (*pfn_iio_buffer_end)(const struct iio_buffer *buf);
 typedef void * (*pfn_iio_buffer_first)(const struct iio_buffer *buf,
 const struct iio_channel *chn);
+typedef void (*pfn_iio_strerror)(int err, char *, size_t len);
+typedef void (*pfn_iio_library_get_version)(unsigned int *major,
+	 unsigned int *minor,
+	 char git_tag 8);
 
 struct stream_cfg {
 long long bw_hz;
@@ -128,7 +132,8 @@
 Q_OBJECT
 public:
 			plutoHandler		(QSettings *,
-	 const QString &, logger *);
+	 const QString &,
+	 errorLogger *);
 		~plutoHandler		();
 	bool		restartReader		(int32_t, int skipped = 0);
 	void		stopReader		();
@@ -141,9 +146,10 @@
 	void		startDump		();
 	void		stopDump		();
 private:
-	bool			loadFunctions	();
+	bool			load_iioFunctions	();
 	QLibrary		*pHandle;
 	RingBuffer<std::complex<float>>	_I_Buffer;
+	errorLogger		*theErrorLogger;
 	QSettings		*plutoSettings;
 	QString			recorderVersion;
 	QScopedPointer<xml_fileWriter>	xmlWriter;
@@ -254,6 +260,10 @@
 	 iio_buffer_end;
 	pfn_iio_buffer_first
 		 iio_buffer_first;
+	pfn_iio_strerror	
+	 			iio_strerror;
+	pfn_iio_library_get_version
+				iio_library_get_version;
 
 signals:
 	void		new_gainValue		(int);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/pluto-handler/pluto-widget.ui -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/pluto-handler/pluto-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>324</width>
- <height>224</height>
+ <width>290</width>
+ <height>248</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -53,26 +53,23 @@
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="label">
- <property name="toolTip">
- <string>Experimental interface for Adalm Pluto. No garantees!!</string>
- </property>
+ <widget class="QLabel" name="contextName">
 <property name="text">
- <string>Pluto interface</string>
+ <string>context name</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="contextName">
+ <widget class="QLabel" name="name_of_device">
 <property name="text">
- <string>context name</string>
+ <string>device name: AD9361</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="name_of_device">
+ <widget class="QLabel" name="statusLabel">
 <property name="text">
- <string>device name</string>
+ <string>statuslabel</string>
 </property>
 </widget>
 </item>
@@ -106,18 +103,6 @@
 </item>
 </layout>
 </item>
- <item>
- <widget class="QLabel" name="serial_number_display">
- <property name="font">
- 
- <pointsize>11</pointsize>
- 
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
 </layout>
 </widget>
 <resources/>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/rtl_tcp/rtl_tcp-widget.ui -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/rtl_tcp/rtl_tcp-widget.ui Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/rtl_tcp/rtl_tcp_client.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/rtl_tcp/rtl_tcp_client.cpp Changed

@@ -32,25 +32,42 @@
 #include	<QDir>
 #include	"dab-constants.h"
 #include	"rtl_tcp_client.h"
+#include	"rtl-sdr.h"
 #include	"device-exceptions.h"
 #include	"position-handler.h"
 #include	"settings-handler.h"
+#include	"errorlog.h"
+#include	"xml-filewriter.h"
+
+#if (!defined (__MINGW32__))
+	#include	<netinet/in.h>
+#endif
 
 #define	RTL_TCP_SETTINGS	"rtl_tcp_settings"
 #define	DEFAULT_FREQUENCY	(kHz (220000))
 
-	rtl_tcp_client::rtl_tcp_client (QSettings *s):
+typedef struct { 	// 12 bytes, 3 * 4 bytes
+	char Magic 4;
+	uint32_t tunerType;
+	uint32_t tunerGainCount;
+} dongleInfo_t;
+
+	rtl_tcp_client::rtl_tcp_client (QSettings *s,
+	 const QString &recorder,
+	 errorLogger *theLogger):
 	 _I_Buffer (32 * 32768) {
 
 	remoteSettings		= s;
+	recorderVersion		= recorder;
+	theErrorLogger		= theLogger;
 	setupUi (&myFrame);
-	QString groupName = RTL_TCP_SETTINGS;
- setPositionAndSize (s, &myFrame, groupName);
+ setPositionAndSize (s, &myFrame, RTL_TCP_SETTINGS);
 myFrame. show ();
-	ipAddress	= "127.0.0.1";
 
 	for (int i = 0; i < 256; i ++)
-	 convTable i = (float)(i - 128.0) / 128.0;
+	 convTable i = ((float)i - 128.0) / 128.0;
+
+	ipAddress		= "127.0.0.1";	// the default
 
 	Gain		=
 	 value_i (remoteSettings, RTL_TCP_SETTINGS, "Gain", 20);
@@ -67,7 +84,7 @@
 
 	gainSelector	-> setValue (Gain);
 	PpmSelector	-> setValue (Ppm);
-	setAgcMode	(AgcMode);
+	agcSelector	-> setChecked (AgcMode);
 	portSelector	-> setValue (basePort);
 	addressSelector	-> setText (ipAddress);
 	vfoFrequency	= DEFAULT_FREQUENCY;
@@ -81,56 +98,64 @@
 	 this, &rtl_tcp_client::sendGain);
 	connect (PpmSelector, qOverload<double>(&QDoubleSpinBox::valueChanged),
 	 this, &rtl_tcp_client::set_fCorrection);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+	connect (xml_dumpButton, &QPushButton::clicked,
+	 this, &rtl_tcp_client::set_xmlDump);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (agcSelector, &QCheckBox::checkStateChanged,
 #else
 	connect (agcSelector, &QCheckBox::stateChanged,
 #endif
 	 this, &rtl_tcp_client::setAgcMode);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (biasTSelector, &QCheckBox::checkStateChanged,
 #else
-	connect (biasTSelector, &QCkeckBox::stateChanged,
+	connect (biasTSelector, &QCheckBox::stateChanged,
 #endif
 	 this, &rtl_tcp_client::setBiasT);
-	connect (portSelector, &QSpinBox::valueChanged,
+	connect (portSelector, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &rtl_tcp_client::setPort);
 	connect (addressSelector, &QLineEdit::returnPressed,
 	 this, &rtl_tcp_client::setAddress);
-	theState -> setText("waiting to start");
+
+	xml_dumping. store (false);
+	theState	-> setText("waiting to start");
+	xml_dumpButton	-> setText ("Dump to xml");
+	xmlWriter	= nullptr;
 }
 
 	rtl_tcp_client::~rtl_tcp_client () {
 	storeWidgetPosition (remoteSettings, &myFrame, RTL_TCP_SETTINGS);
 
-	if (!connected) 
-	 return;
-// close previous connection
-	 stopReader ();
+	stopReader ();
 	store (remoteSettings, RTL_TCP_SETTINGS, "remoteserver",
-	 toServer. peerAddress (). toString ());
+	 toServer. peerAddress (). toString ());
 	store (remoteSettings, RTL_TCP_SETTINGS, "basePort", basePort);
-
 	store (remoteSettings, RTL_TCP_SETTINGS, "Gain", Gain);
 	store (remoteSettings, RTL_TCP_SETTINGS, "Ppm", Ppm);
 	store (remoteSettings, RTL_TCP_SETTINGS, "AgcMode", AgcMode);
 	store (remoteSettings, RTL_TCP_SETTINGS, "biasT", biasT);
+	toServer. close ();
+	connected = false;
 	myFrame. hide ();
 	toServer. close ();
 }
 
 void	rtl_tcp_client::wantConnect () {
-	if (connected)
-	 return;
+	if (connected) {
+	 setDisconnect ();
+	}
 
 	QString s = ipAddress;
 	toServer. connectToHost (QHostAddress (s), basePort);
 	if (!toServer.waitForConnected(2000)) {
 	 QMessageBox::warning(&myFrame,
 	 tr("sdr"), tr("connection failed\n"));
+	 QString t = "Connection to " + s + "failed";
+	 theErrorLogger -> add ("RTL_TCP", t);
 	 return;
 	}
-	connected = true;
+
+	connected	= true;
 	theState -> setText ("connected");
 	sendRate	(SAMPLERATE);
 	setAgcMode	(AgcMode);
@@ -138,10 +163,10 @@
 	setBandwidth	(1536000);
 	setBiasT	(biasT);
 	toServer. waitForBytesWritten ();
+	dongleInfoIn	= false;
 }
 
 bool	rtl_tcp_client::restartReader (int32_t freq, int skipped) {
-
 	if (!connected)
 	 return true;
 	vfoFrequency = freq;
@@ -157,6 +182,7 @@
 
 	if (!connected)
 	 return;
+	close_xmlDump ();
 	disconnect (&toServer, &QIODevice::readyRead,
 	 this, &rtl_tcp_client::readData);
 	_I_Buffer. FlushRingBuffer ();
@@ -184,19 +210,59 @@
 uint8_t buffer 2 * SEGMENT_SIZE;
 std::complex<float> localBuffer SEGMENT_SIZE;
 
-	while (toServer. bytesAvailable() > 2 * SEGMENT_SIZE) {
-	 toServer. read ((char *)buffer, SEGMENT_SIZE);
-	 for (int i = 0; i < SEGMENT_SIZE; i ++)
-	 localBuffer i =
-	 std::complex<float> (convTable buffer 2 * i,
-	 convTable buffer 2 * i + 1);
-	 if (toSkip > 0)
-	 toSkip -= SEGMENT_SIZE;
-	 else
-	 _I_Buffer. putDataIntoBuffer (localBuffer, SEGMENT_SIZE);
+	if (!dongleInfoIn) {
+	 dongleInfo_t dongleInfo;
+	 if (toServer. bytesAvailable () >=
+	 (qint64)sizeof (dongleInfo)) {
+	 toServer. read ((char *)&dongleInfo, sizeof (dongleInfo));
+	 dongleInfoIn = true;
+	 if (memcmp (dongleInfo. Magic, "RTL0", 4) == 0) {
+	 switch (htonl (dongleInfo. tunerType)) {
+	 case RTLSDR_TUNER_E4000:
+	 tunerText = "E4000";
+ break;
+ case RTLSDR_TUNER_FC0012:
+ tunerText = "FC0012";
+ break;
+ case RTLSDR_TUNER_FC0013:
+ tunerText = "FC0013";
+ break;
+ case RTLSDR_TUNER_FC2580:
+ tunerText = "FC2580";
+ break;
+ case RTLSDR_TUNER_R820T:
+ tunerText = "R820T";
+ break;
+ case RTLSDR_TUNER_R828D:
+ tunerText = "R828D";
+ break;
+ default:
+ tunerText = "unknown";
+	 break;
+	 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/rtl_tcp/rtl_tcp_client.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/rtl_tcp/rtl_tcp_client.h Changed

@@ -39,10 +39,15 @@
 #include "ringbuffer.h"
 #include "ui_rtl_tcp-widget.h"
 
+class	xml_fileWriter;
+class	errorLogger;
+
 class rtl_tcp_client : public deviceHandler, Ui_rtl_tcp_widget {
 Q_OBJECT
 public:
-			rtl_tcp_client	(QSettings *);
+			rtl_tcp_client	(QSettings *,
+	 const QString &,
+	 errorLogger *);
 			~rtl_tcp_client	();
 	int32_t		getRate		();
 	bool		restartReader	(int32_t, int skipped = 0);
@@ -54,8 +59,11 @@
 	QString		deviceName	();
 	bool		isFileInput	();
 
+	QString		tunerText;
+	bool		dongleInfoIn;
 private:
 	RingBuffer<std::complex<float>> _I_Buffer;
+	errorLogger	*theErrorLogger;
 	void		sendVFO		(int32_t);
 	void		sendRate	(int32_t);
 	void		sendCommand	(uint8_t, int32_t);
@@ -75,6 +83,12 @@
 
 	float		convTable 256;
 
+	QString		recorderVersion;
+	xml_fileWriter	*xmlWriter;
+ 	bool setup_xmlDump ();
+ void close_xmlDump ();
+ std::atomic<bool> xml_dumping;
+
 private slots:
 	void		sendGain	(int);
 	void		set_fCorrection	(double);
@@ -86,5 +100,7 @@
 	void		setPort		(int);
 	void		setAddress	();
 	void		setAgcMode	(int);
+
+	void		set_xmlDump	();
 };

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2013 .. 2025
+ * Copyright (C) 2014 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -33,21 +33,21 @@
 #include	"rtl-dongleselect.h"
 #include	"rtl-sdr.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settings-handler.h"
 
-#define	CORRF	0.005
-#ifdef	__MINGW32__
-#define	GETPROCADDRESS	GetProcAddress
-#else
-#define	GETPROCADDRESS	dlsym
-#endif
+//#define	CORRF	0.005
+//#ifdef	__MINGW32__
+//#define	GETPROCADDRESS	GetProcAddress
+//#else
+//#define	GETPROCADDRESS	dlsym
+//#endif
 
 //
 //	Our wrapper is a simple classs
 	rtlsdrHandler::rtlsdrHandler (QSettings *s,
 	 const QString &recorderVersion,
-	 logger	*theLogger):	// dummy for now
+	 errorLogger	*theLogger):
 	 _I_Buffer (8 * 1024 * 1024),
 	 theFilter (5, 1560000 / 2, SAMPLERATE) {
 int16_t	deviceCount;
@@ -60,8 +60,9 @@
 	(void)theLogger;
 	rtlsdrSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
+	this	-> theErrorLogger	= theLogger;
 	setupUi (&myFrame);
-	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
+//	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
 	myFrame. show ();
 	filtering			= false;
 
@@ -137,9 +138,18 @@
 	 fprintf (stderr, "\n");
 	}
 
-	if (rtlsdr_set_tuner_bandwidth != nullptr)
-	 rtlsdr_set_tuner_bandwidth (theDevice, KHz (1575));
-	rtlsdr_set_tuner_gain_mode (theDevice, 1);
+	if (rtlsdr_set_tuner_bandwidth != nullptr) {
+	 r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (1575));
+	 if (r != 0) {
+	 QString t = QString ("cannot set frequency to 1575 KHz");
+	 theErrorLogger -> add ("RTLSDR", t);
+	 }
+	}
+	r = rtlsdr_set_tuner_gain_mode (theDevice, 1);
+	if (r != 0) {
+	 QString t = QString ("cannot set gainmode to 1");
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 //
 //	See what the saved values are and restore the GUI settings
 	temp = value_s (rtlsdrSettings, "rtlsdrSettings",
@@ -158,7 +168,12 @@
 	 value_i (rtlsdrSettings, "rtlsdrSettings",
 	 "save_gainSettings", 1) != 0;
 
-	(void)this -> rtlsdr_set_center_freq (theDevice, 220000000);
+	int res = this -> rtlsdr_set_center_freq (theDevice, 220000000);
+	if (res != 0) {
+	 QString t = QString ("cannot set frequency to ") +
+	 QString::number (220000000);
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 
 	rtlsdr_get_usb_strings (theDevice, manufac, product, serial);
 	fprintf (stderr, "%s %s %s\n",
@@ -170,12 +185,19 @@
 	 rtlsdr_set_agc_mode (theDevice, 1);
 	else
 	 rtlsdr_set_agc_mode (theDevice, 0);
-	rtlsdr_set_tuner_gain	(theDevice, 
+
+	res = rtlsdr_set_tuner_gain	(theDevice, 
 	 gainControl -> currentText (). toInt ());
+	if (res != 0) {
+	 QString t = QString ("cannot set tuner gain to ") +
+	 gainControl -> currentText ();
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 	set_ppmCorrection	(ppm_correction -> value());
 
 	for (int i = 0; i < 256; i ++)
-	 convTable i = (-128.0 + i) / 128.0;
+	 convTable i = (i - 127.38) / 128.0;
+
 //	and attach the buttons/sliders to the actions
 	connect (gainControl,
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
@@ -184,7 +206,7 @@
 	 qOverload<const QString &>(&QComboBox::activated),
 #endif
 	 this, &rtlsdrHandler::set_ExternalGain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (agcControl, &QCheckBox::checkStateChanged,
 #else
 	connect (agcControl, &QCheckBox::stateChanged,
@@ -196,13 +218,13 @@
 	 this, &rtlsdrHandler::set_xmlDump);
 	connect (iq_dumpButton, &QPushButton::clicked,
 	 this, &rtlsdrHandler::set_iqDump);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (biasControl, &QCheckBox::checkStateChanged,
 #else
 	connect (biasControl, &QCheckBox::stateChanged,
 #endif
 	 this, &rtlsdrHandler::set_biasControl);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (filterSelector, &QCheckBox::checkStateChanged,
 #else
 	connect (filterSelector, &QCheckBox::stateChanged,
@@ -254,7 +276,13 @@
 }
 
 bool	rtlsdrHandler::restartReader	(int32_t freq, int skipped) {
-	(void)(this -> rtlsdr_set_center_freq (theDevice, freq));
+	int res = this -> rtlsdr_set_center_freq (theDevice, freq);
+	if (res != 0) {
+	 QString t = QString ("Cannot set frequency to ") +
+	 QString::number (freq);
+	 theErrorLogger -> add ("RTLSDR", t);
+	 return false;
+	}
 	if (save_gainSettings)
 	 update_gainSettings (freq / MHz (1));
 
@@ -293,24 +321,53 @@
 //
 //	when selecting the gain from a table, use the table value
 void	rtlsdrHandler::set_ExternalGain	(const QString &gain) {
-	rtlsdr_set_tuner_gain (theDevice, gain. toInt());
+	int res = rtlsdr_set_tuner_gain (theDevice, gain. toInt());
+	if (res != 0) {
+	 QString t = QString ("Cannot set gain to ") +
+	 QString::number (gain. toInt ());
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 }
 //
 void	rtlsdrHandler::set_autogain	(int dummy) {
 	(void)dummy;
-	rtlsdr_set_agc_mode (theDevice, agcControl -> isChecked () ? 1 : 0);
-	rtlsdr_set_tuner_gain (theDevice, 
+	int res = rtlsdr_set_agc_mode (theDevice,
+	 agcControl -> isChecked () ? 1 : 0);
+	if (res != 0) {
+	 QString t = QString ("Cannot set agc mode to ") +
+	 (agcControl -> isChecked () ? "1" : "0");
+	 theErrorLogger -> add ("RTLSDR", t);
+	 return;
+	}
+	res = rtlsdr_set_tuner_gain (theDevice, 
 	 gainControl -> currentText (). toInt ());
+	if (res != 0) {
+	 QString t = QString ("Cannot set tuner gain to ") +
+	 gainControl -> currentText ();
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 }
 //
 void	rtlsdrHandler::set_biasControl	(int dummy) {
 	(void)dummy;
-	if (rtlsdr_set_bias_tee != nullptr)
-	 rtlsdr_set_bias_tee (theDevice, biasControl -> isChecked () ? 1 : 0);
+	if (rtlsdr_set_bias_tee != nullptr) {
+	 int res = rtlsdr_set_bias_tee (theDevice,
+	 biasControl -> isChecked () ? 1 : 0);
+	 if (res != 0) {
+	 QString t = QString ("Cannot set bias tee to ") +
+	 (biasControl -> isChecked () ? "1" : "0");
+	 theErrorLogger -> add ("RTLSDR", t);
+	 }
+	}
 }
 //	correction is in Hz
 void	rtlsdrHandler::set_ppmCorrection	(int32_t ppm) {
-	this -> rtlsdr_set_freq_correction (theDevice, ppm);
+	int res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
+	if (res != 0) {

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

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2013 .. 2017
+ * Copyright (C) 201 .. 2024
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -17,13 +17,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with Qt-SDR; 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
- *
- * 	This particular driver is a very simple wrapper around the
- * 	librtlsdr. In order to keep things simple, we dynamically
- * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
- * 	are greatly acknowledged
 */
 
 #include	<QThread>
@@ -33,9 +28,10 @@
 #include	"rtl-sdr.h"
 #include	"xml-filewriter.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settings-handler.h"
 
+#define	CORRF		0.005
 #define	READLEN_DEFAULT	(4 * 8192)
 //
 //	For the callback, we do need some environment which
@@ -44,25 +40,6 @@
 //	This is the user-side call back function
 //	ctx is the calling task
 
-static 
-float convTable = {
- -128 / 128.0 , -127 / 128.0 , -126 / 128.0 , -125 / 128.0 , -124 / 128.0 , -123 / 128.0 , -122 / 128.0 , -121 / 128.0 , -120 / 128.0 , -119 / 128.0 , -118 / 128.0 , -117 / 128.0 , -116 / 128.0 , -115 / 128.0 , -114 / 128.0 , -113 / 128.0 
-, -112 / 128.0 , -111 / 128.0 , -110 / 128.0 , -109 / 128.0 , -108 / 128.0 , -107 / 128.0 , -106 / 128.0 , -105 / 128.0 , -104 / 128.0 , -103 / 128.0 , -102 / 128.0 , -101 / 128.0 , -100 / 128.0 , -99 / 128.0 , -98 / 128.0 , -97 / 128.0 
-, -96 / 128.0 , -95 / 128.0 , -94 / 128.0 , -93 / 128.0 , -92 / 128.0 , -91 / 128.0 , -90 / 128.0 , -89 / 128.0 , -88 / 128.0 , -87 / 128.0 , -86 / 128.0 , -85 / 128.0 , -84 / 128.0 , -83 / 128.0 , -82 / 128.0 , -81 / 128.0 
-, -80 / 128.0 , -79 / 128.0 , -78 / 128.0 , -77 / 128.0 , -76 / 128.0 , -75 / 128.0 , -74 / 128.0 , -73 / 128.0 , -72 / 128.0 , -71 / 128.0 , -70 / 128.0 , -69 / 128.0 , -68 / 128.0 , -67 / 128.0 , -66 / 128.0 , -65 / 128.0 
-, -64 / 128.0 , -63 / 128.0 , -62 / 128.0 , -61 / 128.0 , -60 / 128.0 , -59 / 128.0 , -58 / 128.0 , -57 / 128.0 , -56 / 128.0 , -55 / 128.0 , -54 / 128.0 , -53 / 128.0 , -52 / 128.0 , -51 / 128.0 , -50 / 128.0 , -49 / 128.0 
-, -48 / 128.0 , -47 / 128.0 , -46 / 128.0 , -45 / 128.0 , -44 / 128.0 , -43 / 128.0 , -42 / 128.0 , -41 / 128.0 , -40 / 128.0 , -39 / 128.0 , -38 / 128.0 , -37 / 128.0 , -36 / 128.0 , -35 / 128.0 , -34 / 128.0 , -33 / 128.0 
-, -32 / 128.0 , -31 / 128.0 , -30 / 128.0 , -29 / 128.0 , -28 / 128.0 , -27 / 128.0 , -26 / 128.0 , -25 / 128.0 , -24 / 128.0 , -23 / 128.0 , -22 / 128.0 , -21 / 128.0 , -20 / 128.0 , -19 / 128.0 , -18 / 128.0 , -17 / 128.0 
-, -16 / 128.0 , -15 / 128.0 , -14 / 128.0 , -13 / 128.0 , -12 / 128.0 , -11 / 128.0 , -10 / 128.0 , -9 / 128.0 , -8 / 128.0 , -7 / 128.0 , -6 / 128.0 , -5 / 128.0 , -4 / 128.0 , -3 / 128.0 , -2 / 128.0 , -1 / 128.0 
-, 0 / 128.0 , 1 / 128.0 , 2 / 128.0 , 3 / 128.0 , 4 / 128.0 , 5 / 128.0 , 6 / 128.0 , 7 / 128.0 , 8 / 128.0 , 9 / 128.0 , 10 / 128.0 , 11 / 128.0 , 12 / 128.0 , 13 / 128.0 , 14 / 128.0 , 15 / 128.0 
-, 16 / 128.0 , 17 / 128.0 , 18 / 128.0 , 19 / 128.0 , 20 / 128.0 , 21 / 128.0 , 22 / 128.0 , 23 / 128.0 , 24 / 128.0 , 25 / 128.0 , 26 / 128.0 , 27 / 128.0 , 28 / 128.0 , 29 / 128.0 , 30 / 128.0 , 31 / 128.0 
-, 32 / 128.0 , 33 / 128.0 , 34 / 128.0 , 35 / 128.0 , 36 / 128.0 , 37 / 128.0 , 38 / 128.0 , 39 / 128.0 , 40 / 128.0 , 41 / 128.0 , 42 / 128.0 , 43 / 128.0 , 44 / 128.0 , 45 / 128.0 , 46 / 128.0 , 47 / 128.0 
-, 48 / 128.0 , 49 / 128.0 , 50 / 128.0 , 51 / 128.0 , 52 / 128.0 , 53 / 128.0 , 54 / 128.0 , 55 / 128.0 , 56 / 128.0 , 57 / 128.0 , 58 / 128.0 , 59 / 128.0 , 60 / 128.0 , 61 / 128.0 , 62 / 128.0 , 63 / 128.0 
-, 64 / 128.0 , 65 / 128.0 , 66 / 128.0 , 67 / 128.0 , 68 / 128.0 , 69 / 128.0 , 70 / 128.0 , 71 / 128.0 , 72 / 128.0 , 73 / 128.0 , 74 / 128.0 , 75 / 128.0 , 76 / 128.0 , 77 / 128.0 , 78 / 128.0 , 79 / 128.0 
-, 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
-, 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
-, 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
-
 static
 void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
 rtlsdrHandler_win	*theStick	= (rtlsdrHandler_win *)ctx;
@@ -104,23 +81,28 @@
 };
 //
 //	Our wrapper is a simple classs
+//
+//	The Windows implementation differs from the Linux one. It
+//	turns out that windows has some (well, a lot) problems with
+//	enthousiastic killing and restarting the usb-interfacing thread
+//	So, here we have the solution that the support thread remains
+//	active during stop/restart sequences
 	rtlsdrHandler_win::rtlsdrHandler_win (QSettings *s,
 	 const QString &recorderVersion,
-	 logger *theLogger): // dummy now
+	 errorLogger *theLogger):
 	 _I_Buffer (8 * 1024 * 1024),
 	 theFilter (5, 1560000 / 2, 2048000) {
 int16_t	deviceCount;
 int32_t	r;
 int16_t	deviceIndex;
-int16_t	i;
 QString	temp;
 int	k;
 char	manufac 256, product 256, serial 256;
-	(void)theLogger;
 	rtlsdrSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
+	this	-> theErrorLogger	= theLogger;
 setupUi (&myFrame);
-	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
+//	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
 	myFrame. show();
 	filtering			= false;
 
@@ -169,7 +151,7 @@
 	fprintf (stderr, "Supported gain values (%d): ", gainsCount);
 	{ int gains gainsCount;
 	 gainsCount	= rtlsdr_get_tuner_gains (theDevice, gains);
-	 for (i = gainsCount; i > 0; i--) {
+	 for (int i = gainsCount; i > 0; i--) {
 	 fprintf (stderr, "%.1f ", gains i - 1 / 10.0);
 	 gainControl -> addItem (QString::number (gains i - 1));
 	 }
@@ -211,6 +193,9 @@
 	 gainControl -> currentText (). toInt ());
 	set_ppmCorrection	(ppm_correction -> value());
 
+	for (int i = 0; i < 256; i ++)
+	 convTable i = ((float)i - 127.38) / 128.0;
+
 //	and attach the buttons/sliders to the actions
 	connect (gainControl,
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
@@ -219,7 +204,7 @@
 	 qOverload<const QString &>(&QComboBox::activated),
 #endif
 	 this, &rtlsdrHandler_win::set_ExternalGain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (agcControl, &QCheckBox::checkStateChanged,
 #else
 	connect (agcControl, &QCheckBox::stateChanged,
@@ -231,13 +216,13 @@
 	 this, &rtlsdrHandler_win::set_xmlDump);
 	connect (iq_dumpButton, &QPushButton::clicked,
 	 this, &rtlsdrHandler_win::set_iqDump);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (biasControl, &QCheckBox::checkStateChanged,
 #else
 	connect (biasControl, &QCheckBox::stateChanged,
 #endif
 	 this, &rtlsdrHandler_win::set_biasControl);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (filterSelector, &QCheckBox::checkStateChanged,
 #else
 	connect (filterSelector, &QCheckBox::stateChanged,
@@ -316,64 +301,55 @@
 //
 //	when selecting the gain from a table, use the table value
 void	rtlsdrHandler_win::set_ExternalGain	(const QString &gain) {
-	rtlsdr_set_tuner_gain (theDevice, gain. toInt());
+	int res = rtlsdr_set_tuner_gain (theDevice, gain. toInt());
+	if (res != 0) { 
+	 QString t = QString ("cannot set gain to ") + gain;
+	 theErrorLogger -> add ("RTLSDR", t);	
+	}
 }
 //
 void	rtlsdrHandler_win::set_autogain	(int dummy) {
 	(void)dummy;
-	rtlsdr_set_agc_mode (theDevice, agcControl -> isChecked () ? 1 : 0);
-	rtlsdr_set_tuner_gain (theDevice, 
+	int res = rtlsdr_set_agc_mode (theDevice,
+	 agcControl -> isChecked () ? 1 : 0);
+	if (res != 0) {
+	 QString t = "Problem with agcControl to " +
+	 QString::number (agcControl -> isChecked () ? 1 : 0);
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
+	res = rtlsdr_set_tuner_gain (theDevice, 
 	 gainControl -> currentText (). toInt ());
+	if (res != 0) {
+	 QString t = "Problem with gaincontrol to " +
+	 QString::number (agcControl -> isChecked () ? 1 : 0);
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 }
 //
 void	rtlsdrHandler_win::set_biasControl	(int dummy) {
 	(void)dummy;
-	rtlsdr_set_bias_tee (theDevice, biasControl -> isChecked () ? 1 : 0);
+	int res = rtlsdr_set_bias_tee (theDevice,
+	 biasControl -> isChecked () ? 1 : 0);
+	if (res != 0) {
+	 QString t = "Problem with biascontrol to " +
+	 QString::number (biasControl -> isChecked () ? 1 : 0);
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 }
 //	correction is in Hz
 void	rtlsdrHandler_win::set_ppmCorrection	(int32_t ppm) {
-	rtlsdr_set_freq_correction (theDevice, ppm);
+	int res = rtlsdr_set_freq_correction (theDevice, ppm);
+	if (res != 0) {
+	 QString t = "Problem with ppm correction to " +
+	 QString::number (ppm);
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
 }
 
 int32_t	rtlsdrHandler_win::getSamples (std::complex<float> *V, int32_t size) { 
-std::complex<uint8_t> temp size;
-int	amount;
-static uint8_t dumpBuffer 4096;
-static int iqTeller	= 0;
-
 	if (!isActive. load ())
 	 return 0;

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

@@ -36,7 +36,7 @@
 #include	"ui_rtlsdr-widget.h"
 class	dll_driver_win;
 class	xml_fileWriter;
-class	logger;
+class	errorLogger;
 //
 //	This class is a simple wrapper around the
 //	rtlsdr library that is read in as dll (or .so file in linux)
@@ -46,7 +46,8 @@
 Q_OBJECT
 public:
 			rtlsdrHandler_win	(QSettings *,
-	 const QString &, logger *);
+	 const QString &,
+	 errorLogger *);
 			~rtlsdrHandler_win	();
 	bool		restartReader		(int32_t, int skipped = 0);
 	void		stopReader		();
@@ -59,12 +60,13 @@
 	QString		deviceName		();
 
 //	These need to be visible for the separate usb handling thread
-	RingBuffer<std::complex<uint8_t>> _I_Buffer;
 	struct rtlsdr_dev	*theDevice;
 	std::atomic<bool>	isActive;
 	void		processBuffer (uint8_t *, uint32_t);
 private:
+	RingBuffer<std::complex<float>> _I_Buffer;
 	QSettings	*rtlsdrSettings;
+	errorLogger	*theErrorLogger;
 	int32_t		inputRate;
 	int32_t		deviceCount;
 	dll_driver_win	*workerHandle;
@@ -89,9 +91,9 @@
 	LowPassFIR	theFilter;
 	int		currentDepth;
 	void		reportOverflow		(bool);
-
-	double		m_dcI;
-	double		m_dcQ;
+	float		convTable		256;
+//	double		m_dcI;
+//	double		m_dcQ;
 
 signals:
 	void		new_gainIndex		(int);

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

@@ -34,7 +34,7 @@
 #include	"sdrplayselect.h"
 #include	"xml-filewriter.h"
 #include	"device-exceptions.h"
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
 
@@ -70,15 +70,15 @@
 	sdrplayHandler_v2::
 	 sdrplayHandler_v2 (QSettings *s,
 	 const QString &recorderVersion,
-	 logger	*theLogger): // dummy right now
+	 errorLogger *theErrorLogger):
 	 _I_Buffer (4 * 1024 * 1024) {
 mir_sdr_ErrT	err;
 float	ver;
 mir_sdr_DeviceT devDesc 4;
-
-	(void)theLogger;
+mir_sdr_ErrT res;
 	sdrplaySettings			= s;
 	this	-> recorderVersion	= recorderVersion;
+	this	-> theErrorLogger	= theErrorLogger;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, SDRPLAY_SETTINGS_V2);
 	myFrame.setWindowFlag(Qt::Tool, true);
@@ -96,9 +96,10 @@
 	 throw (device_exception ("function in mir_sdr_api not found"));
 	};
 
-	if (my_mir_sdr_ApiVersion (&ver) != mir_sdr_Success) {
+	res = my_mir_sdr_ApiVersion (&ver);
+	if (res != mir_sdr_Success) {
 	 releaseLibrary ();
-	 throw (device_exception ("api problem"));
+	 throw (device_exception (errorCodes (res). toLatin1 (). data ()));
 	}
 
 	if (ver < 2.13) {
@@ -196,12 +197,17 @@
 	 nrBits		= 14;
 	 denominator	= 8192;
 	 antennaSelector -> show();
-	 my_mir_sdr_RSPII_RfNotchEnable (1);
-	 if (err != mir_sdr_Success) 
-	 fprintf (stderr, "error %d in setting rfNotch\n", err);
+	 err = my_mir_sdr_RSPII_RfNotchEnable (1);
+	 if (err != mir_sdr_Success) {
+	 QString t = QString ("NOTCH enable failed") + errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t); 
+	 }
 	 err = my_mir_sdr_RSPII_AntennaControl (mir_sdr_RSPII_ANTENNA_A);
-	 if (err != mir_sdr_Success) 
-	 fprintf (stderr, "error %d in setting antenna\n", err);
+	 if (err != mir_sdr_Success) {
+	 QString t = QString ("Antenna control failed ") +
+	 errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	 }
 	 connect (antennaSelector,
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
 	 &QComboBox::textActivated,
@@ -218,8 +224,11 @@
 	 denominator	= 8192;
 	 tunerSelector	-> show();
 	 err	= my_mir_sdr_rspDuo_TunerSel (mir_sdr_rspDuo_Tuner_1);
-	 if (err != mir_sdr_Success) 
-	 fprintf (stderr, "error %d in setting of rspDuo\n", err);
+	 if (err != mir_sdr_Success) {
+	 QString t = QString ("Selecting tuner SDRDu ") +
+	 errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	 }
 	 connect (tunerSelector,
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
 	 &QComboBox::textActivated,
@@ -257,7 +266,7 @@
 	}
 	deviceLabel	-> setText (deviceModel);
 //	and be prepared for future changes in the settings
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (debugControl, &QCheckBox::checkStateChanged,
 #else
 	connect (debugControl, &QCheckBox::stateChanged,
@@ -267,7 +276,7 @@
 	 this, &sdrplayHandler_v2::handle_ppmControl);
 	connect (dumpButton, &QPushButton::clicked,
 	 this, &sdrplayHandler_v2::handle_xmlDump);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (biasT_selector, &QCheckBox::checkStateChanged,
 #else
 	connect (biasT_selector, &QCheckBox::stateChanged,
@@ -423,23 +432,31 @@
 	 (mir_sdr_GainChangeCallback_t)myGainChangeCallback,
 	 this);
 	if (err != mir_sdr_Success) {
-	 fprintf (stderr, "streamInit error = %s\n",
-	 errorCodes (err). toLatin1(). data());
+	 QString t = QString ("StreamInit error ") + errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
 	 return false;
 	}
-	if (err != mir_sdr_Success) 
-	 fprintf (stderr, "setting gain failed (plaats 2)\n");
 	err	= my_mir_sdr_SetPpm (double (ppmControl -> value()));
-	if (err != mir_sdr_Success) 
-	 fprintf (stderr, "error = %s\n",
-	 errorCodes (err). toLatin1(). data());
+	if (err != mir_sdr_Success) {
+	 QString t = QString ("Error in setting ppm to ") +
+	 QString::number (ppmControl -> value ()) +
+	 errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	}
 
 	if (agc == 1) {
-	 my_mir_sdr_AgcControl (mir_sdr_AGC_5HZ,
-	 -30,
-	 0, 0, 0, 0, lnaGainSetting -> value());
-	 GRdBSelector		-> hide ();
-	 gainsliderLabel	-> hide ();
+	 err = my_mir_sdr_AgcControl (mir_sdr_AGC_5HZ, -30,
+	 0, 0, 0, 0, lnaGainSetting -> value());
+	 if (err != mir_sdr_Success) {
+	 QString t = "Cannot set agc control with lna " +
+	 lnaGainSetting -> value () +
+	 errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	 }
+	 else {
+	 GRdBSelector		-> hide ();
+	 gainsliderLabel	-> hide ();
+	 }
 	}
 	else {
 	 GRdBSelector		-> show ();
@@ -448,18 +465,23 @@
 	
 
 	err		= my_mir_sdr_SetDcMode (4, 1);
-	if (err != mir_sdr_Success)
-	 fprintf (stderr, "error = %s\n",
-	 errorCodes (err). toLatin1(). data());
+	if (err != mir_sdr_Success) {
+	 QString t = QString ("Error with SetDcMode ") + errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	}
 	err		= my_mir_sdr_SetDcTrackTime (63);
-	if (err != mir_sdr_Success)
-	 fprintf (stderr, "error = %s\n",
-	 errorCodes (err). toLatin1(). data());
+	if (err != mir_sdr_Success) {
+	 QString t = QString ("Error with SetDcTrackTime ") +
+	 errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	}
 	err		= my_mir_sdr_DCoffsetIQimbalanceControl (1, 0);
-	if (err != mir_sdr_Success)
- fprintf (stderr, "error = %s\n",
- errorCodes (err). toLatin1(). data());
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+	if (err != mir_sdr_Success) {
+	 QString t = QString ("Error with offsetIQBalanceControl") +
+	 errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	}
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	connect (agcControl, &QCheckBox::checkStateChanged,
 #else
 	connect (agcControl, &QCheckBox::stateChanged,
@@ -488,7 +510,7 @@
 	 this, &sdrplayHandler_v2::handle_ifgainReduction);
 	disconnect (lnaGainSetting, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &sdrplayHandler_v2::handle_lnagainReduction);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
 	disconnect (agcControl, &QCheckBox::checkStateChanged,
 #else
 	disconnect (agcControl, &QCheckBox::stateChanged,
@@ -498,10 +520,11 @@
 	 record_gainSettings	(lastFrequency / MHz (1));
 
 	close_xmlDump ();		// just to be sure
-	err	= my_mir_sdr_StreamUninit();
-	if (err != mir_sdr_Success)
-	 fprintf (stderr, "error = %s\n",
-	 errorCodes (err). toLatin1(). data());
+	err	= my_mir_sdr_StreamUninit ();
+	if (err != mir_sdr_Success) {
+	 QString t = QString ("Error with streamUnInit ") + errorCodes (err);
+	 theErrorLogger -> add ("SDRPLAY_V2", t);
+	}
 	_I_Buffer. FlushRingBuffer();
 	running. store (false);
 }
@@ -539,21 +562,27 @@

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp Changed

@@ -21,7 +21,7 @@
  */
 #include	"Rsp1A-handler.h"
 #include	"sdrplay-handler-v3.h"
-
+#include	"errorlog.h"
 static
 int     RSP1A_Table 4 11 = {
 	{7,  0, 6, 12, 18, 37, 42, 61, -1, -1, -1},
@@ -31,6 +31,7 @@
 };
 
 	Rsp1A_handler::Rsp1A_handler (sdrplayHandler_v3 *parent,
+	                              errorLogger	*theLogger,
 	                              sdrplay_api_DeviceT *chosenDevice,
 	                              int	freq,
 	                              bool	agcMode,
@@ -46,7 +47,7 @@
 	                                          lnaState,
 	                                          GRdB,
 	                                          biasT, ppmValue) {
-
+	theErrorLogger			= theLogger;
 	this	-> deviceModel		= "RSP-1A";
 	this	-> nrBits		= 12;
 	this	-> lnaUpperBound	= lnaStates (freq);
@@ -92,7 +93,9 @@
                                             sdrplay_api_Update_Tuner_Frf,
                                             sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger	-> add (deviceModel, errorString);
 	   return false;
 	}
 
@@ -119,7 +122,9 @@
 	                                    sdrplay_api_Update_Tuner_Gr,
 	                                    sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger	-> add (deviceModel, errorString);
 	   return false;
 	}
 	this	-> lnaState	= lnaState;
@@ -138,9 +143,9 @@
 	                          sdrplay_api_Update_Rsp1a_BiasTControl,
 		                  sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
-	   fprintf (stderr, "setBiasT: error %s\n",
-	                         parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger	-> add (deviceModel, errorString);
 	   return false;
 	}
 	return true;
@@ -153,7 +158,10 @@
 	err = parent -> sdrplay_api_Update (chosenDevice -> dev,
                                            chosenDevice -> tuner,
                                            sdrplay_api_Update_Rsp1a_RfNotchControl, sdrplay_api_Update_Ext1_None);
-	if (err != sdrplay_api_Success)
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	if (err != sdrplay_api_Success) {
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger	-> add (deviceModel, errorString);
+	}
 	return err == sdrplay_api_Success;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/Rsp1A-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/Rsp1A-handler.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspDuo-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspDuo-handler.cpp Changed

@@ -21,8 +21,10 @@
  */
 #include	"RspDuo-handler.h"
 #include	"sdrplay-handler-v3.h"
+#include	"errorlog.h"
 
 	RspDuo_handler::RspDuo_handler (sdrplayHandler_v3 *parent,
+	                                errorLogger	*theLogger,
 	                                sdrplay_api_DeviceT *chosenDevice,
 	                                int	freq,
 	                                bool	agcMode,
@@ -44,6 +46,7 @@
 	(void)antennaValue;
 	(void)tuner;
 	this	-> parent		= parent;
+	theErrorLogger			= theLogger;
 	this	-> deviceModel		= "RSP-Duo";
 	this	-> nrBits		= 14;
 	this    -> lnaUpperBound	=  lnaStates (freq);
@@ -100,7 +103,9 @@
                                             sdrplay_api_Update_Tuner_Frf,
                                             sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 
@@ -127,7 +132,9 @@
 	                                    sdrplay_api_Update_Tuner_Gr,
 	                                    sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 	this	-> lnaState	= lnaState;
@@ -151,7 +158,9 @@
 	                                     sdrplay_api_Update_RspDuo_AmPortSelect,
 	                                     sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 
@@ -169,8 +178,10 @@
 	                          &chosenDevice -> tuner, 
 	                          sdrplay_api_RspDuo_AMPORT_2);
 	if (err != sdrplay_api_Success) {
-	   showState (QString  ("Tunerswitch ") + 
-	                       parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString =  QString ("Tunerswitch ") + 
+	                       parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	}
 	else {
 	   showState (QString  ("Switched to tuner ") + QString::number (tuner));
@@ -189,8 +200,11 @@
                                   chosenDevice	-> tuner,
 	                          sdrplay_api_Update_RspDuo_BiasTControl,
 		                  sdrplay_api_Update_Ext1_None);
-	if (err != sdrplay_api_Success)
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	if (err != sdrplay_api_Success) {
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	}
 	return err == sdrplay_api_Success;
 }
 
@@ -206,8 +220,11 @@
 	                                    chosenDevice -> tuner,
                                             (sdrplay_api_ReasonForUpdateT)(sdrplay_api_Update_RspDuo_RfNotchControl | sdrplay_api_Update_RspDuo_Tuner1AmNotchControl),
 	                                      sdrplay_api_Update_Ext1_None);
-	if (err != sdrplay_api_Success)
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	if (err != sdrplay_api_Success) {
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	}
 	return err == sdrplay_api_Success;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspDuo-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspDuo-handler.h Changed

@@ -25,20 +25,22 @@
 #include	"Rsp-device.h"
 
 class	sdrplayHandler_v3;
+class	errorLogger;
 
 class	RspDuo_handler: public RspDevice {
 public:
 		RspDuo_handler (sdrplayHandler_v3 *parent,
-	                       sdrplay_api_DeviceT *chosenDevice,
-	                       int	freq,
-	                       bool	agcMode,
-	                       int	lnaState,
-	                       int 	GRdB,
-	                       int	antennaValue,
-	                       int	tuner,
-	                       bool	biasT,
-	                       bool	notch,
-	                       double	ppmValue);
+	                        errorLogger	*,
+	                        sdrplay_api_DeviceT *chosenDevice,
+	                        int	freq,
+	                        bool	agcMode,
+	                        int	lnaState,
+	                        int 	GRdB,
+	                        int	antennaValue,
+	                        int	tuner,
+	                        bool	biasT,
+	                        bool	notch,
+	                        double	ppmValue);
 		~RspDuo_handler	();
 
 	int	lnaStates	(int frequency);
@@ -53,4 +55,5 @@
 	int	getLnaGain	(int, int);
 	sdrplayHandler_v3	*parent;
 	int	currentTuner;
+	errorLogger	*theErrorLogger;
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspDx-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspDx-handler.cpp Changed

@@ -21,8 +21,10 @@
  */
 #include	"RspDx-handler.h"
 #include	"sdrplay-handler-v3.h"
+#include	"errorlog.h"
 
 	RspDx_handler::RspDx_handler (sdrplayHandler_v3 *parent,
+	                              errorLogger	*theLogger,
 	                              sdrplay_api_DeviceT *chosenDevice,
 	                              int	freq,
 	                              bool	agcMode,
@@ -40,6 +42,7 @@
 	                                          GRdB,
 	                                          biasT,
 	                                          ppmValue) {
+	theErrorLogger			= theLogger;
 	setAntenna (antennaValue);
 	this	-> deviceModel		= "RSP-Dx";
 	this	-> nrBits		= 14;
@@ -106,7 +109,9 @@
                                             sdrplay_api_Update_Tuner_Frf,
                                             sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 
@@ -126,7 +131,9 @@
 	                                    sdrplay_api_Update_Tuner_Gr,
 	                                    sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 
@@ -150,8 +157,9 @@
 	                                     sdrplay_api_Update_None,
 	                                     sdrplay_api_Update_RspDx_AntennaControl);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
-	   fprintf (stderr, "Updating antenna to %c failst\n", antenna);
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 	return true;
@@ -165,8 +173,11 @@
 	                                    chosenDevice -> tuner,
 	                                    sdrplay_api_Update_None,
 	                                    sdrplay_api_Update_RspDx_HdrEnable);
-	if (err != sdrplay_api_Success) 
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	if (err != sdrplay_api_Success) {
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	}
 	return err == sdrplay_api_Success;
 }
 
@@ -182,8 +193,11 @@
 	                                 chosenDevice -> tuner,
 	                                 sdrplay_api_Update_None,
 	               	                 sdrplay_api_Update_RspDx_BiasTControl);
-	if (err != sdrplay_api_Success) 
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	if (err != sdrplay_api_Success) {
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	}
 	return err == sdrplay_api_Success;
 }
 
@@ -200,7 +214,10 @@
 	                                    chosenDevice -> tuner,
 	                                    sdrplay_api_Update_None,
 	                                    sdrplay_api_Update_RspDx_RfNotchControl);
-	if (err != sdrplay_api_Success) 
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	if (err != sdrplay_api_Success) {
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
+	}
 	return err == sdrplay_api_Success;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspDx-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspDx-handler.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspI-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspI-handler.cpp Changed

@@ -21,6 +21,7 @@
  */
 #include	"RspI-handler.h"
 #include	"sdrplay-handler-v3.h"
+#include	"errorlog.h"
 
 static
 int	RSP1_Table 35 = {
@@ -30,6 +31,7 @@
 
 
 	Rsp1_handler::Rsp1_handler   (sdrplayHandler_v3 *parent,
+	                              errorLogger	*theLogger,
 	                              sdrplay_api_DeviceT *chosenDevice,
 	                              int	freq,
 	                              bool	agcMode,
@@ -44,7 +46,7 @@
 	                                          lnaState,
 	                                          GRdB,
 	                                          biasT, ppmValue) {
-
+	theErrorLogger			= theLogger;
 	this	-> deviceModel		= "RSP-1";
 	this	-> nrBits		= 12;
 	this	-> lnaUpperBound =  lnaStates (freq);
@@ -86,7 +88,9 @@
                                             sdrplay_api_Update_Tuner_Frf,
                                             sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 
@@ -107,7 +111,9 @@
 	                                    sdrplay_api_Update_Tuner_Gr,
 	                                    sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	   showState (parent -> sdrplay_api_GetErrorString (err));
+	   QString errorString = parent -> sdrplay_api_GetErrorString (err);
+	   showState (errorString);
+	   theErrorLogger -> add (deviceModel, errorString);
 	   return false;
 	}
 	this	-> lnaState	= lnaState;

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspI-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspI-handler.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspII-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspII-handler.cpp Changed

@@ -21,8 +21,10 @@
 */
 #include	"RspII-handler.h"
 #include	"sdrplay-handler-v3.h"
+#include	"errorlog.h"
 
 	RspII_handler::RspII_handler (sdrplayHandler_v3 *parent,
+	 errorLogger	*theLogger,
 	 sdrplay_api_DeviceT *chosenDevice,
 	 int	freq,
 	 bool	agcMode,
@@ -41,6 +43,7 @@
 	 biasT,
 	 ppmValue) {
 	setAntenna (antennaValue);
+	theErrorLogger			= theLogger;
 	this	-> deviceModel		= "RSP-II";
 	this	-> nrBits		= 14;
 	if (freq < Mhz (420))
@@ -118,9 +121,9 @@
 	 sdrplay_api_Update_Tuner_Gr,
 	 sdrplay_api_Update_Ext1_None);
 	if (err != sdrplay_api_Success) {
-	 showState (parent -> sdrplay_api_GetErrorString (err));
-	 fprintf (stderr, "grdb: error %s\n",
-	 parent -> sdrplay_api_GetErrorString (err));
+	 QString errString = parent -> sdrplay_api_GetErrorString (err);
+	 showState (errString);
+	 theErrorLogger -> add (deviceModel, errString);
 	 return false;
 	}
 	this	-> lnaState	= lnaState;
@@ -142,8 +145,11 @@
 	 chosenDevice -> tuner,
 	 sdrplay_api_Update_Rsp2_AntennaControl,
 	 sdrplay_api_Update_Ext1_None);
-	if (err != sdrplay_api_Success) 
-	 showState (QString (parent -> sdrplay_api_GetErrorString (err)));
+	if (err != sdrplay_api_Success) {
+	 QString errString = parent -> sdrplay_api_GetErrorString (err);
+	 showState (errString);
+	 theErrorLogger -> add (deviceModel, errString);
+	}
 	return err == sdrplay_api_Success;
 }
 
@@ -157,8 +163,11 @@
 chosenDevice -> tuner,
 sdrplay_api_Update_Rsp2_BiasTControl,
 sdrplay_api_Update_Ext1_None);
-	if (err != sdrplay_api_Success)
-	 showState (QString (parent -> sdrplay_api_GetErrorString (err)));
+	if (err != sdrplay_api_Success) {
+	 QString errString = parent -> sdrplay_api_GetErrorString (err);
+	 showState (errString);
+	 theErrorLogger -> add (deviceModel, errString);
+	}
 	return err == sdrplay_api_Success;
 }
 
@@ -172,8 +181,11 @@
 chosenDevice -> tuner,
 sdrplay_api_Update_Rsp2_RfNotchControl,
 sdrplay_api_Update_Ext1_None);
-	if (err != sdrplay_api_Success)
-	 showState (QString (parent -> sdrplay_api_GetErrorString (err)));
+	if (err != sdrplay_api_Success) {
+	 QString errString = parent -> sdrplay_api_GetErrorString (err);
+	 showState (errString);
+	 theErrorLogger -> add (deviceModel, errString);
+	}
 	return err == sdrplay_api_Success;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/RspII-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/RspII-handler.h Changed

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

@@ -30,7 +30,7 @@
 #include	"sdrplay-commands.h"
 #include	"xml-filewriter.h"
 
-#include	"logger.h"
+#include	"errorlog.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
 
@@ -92,11 +92,11 @@
 	sdrplayHandler_v3::
 	           sdrplayHandler_v3  (QSettings *s,
 	                               const QString &recorderVersion,
-	                               logger	*theLogger): // dummy right now
+	                               errorLogger *theLogger):
 	                                          _I_Buffer (4 * 1024 * 1024) {
 	sdrplaySettings			= s;
 	this	-> recorderVersion	= recorderVersion;
-	(void)theLogger;
+	theErrorLogger			= theLogger;
         setupUi (&myFrame);
 	QString	groupName	= SDRPLAY_SETTINGS;
 	setPositionAndSize (s, &myFrame, groupName);
@@ -445,7 +445,7 @@
 	                                      recorderVersion,
 	                                      direct);
 	} catch (...) {
-	   fprintf (stderr, "Setup_xml handler failed\n");
+	   theErrorLogger -> add (recorderVersion, "Setup_xml handler failed");
 	   return false;
 	}
 	dumping. store (true);
@@ -587,7 +587,7 @@
 //	try to open the API
 	err	= sdrplay_api_Open ();
 	if (err != sdrplay_api_Success) {
-	   fprintf (stderr, "sdrplay_api_Open failed %s\n",
+	   theErrorLogger -> add (recorderVersion,
 	                          sdrplay_api_GetErrorString (err));
 	   failFlag. store (true);
 	   releaseLibrary	();
@@ -600,7 +600,7 @@
 //	Check API versions match
         err = sdrplay_api_ApiVersion (&apiVersion);
         if (err  != sdrplay_api_Success) {
-           fprintf (stderr, "sdrplay_api_ApiVersion failed %s\n",
+	   theErrorLogger -> add (recorderVersion,
                                      sdrplay_api_GetErrorString (err));
 	   errorCode	= 4;
 	   goto closeAPI;
@@ -621,8 +621,8 @@
 	{  int s	= sizeof (devs) / sizeof (sdrplay_api_DeviceT);
 	   err	= sdrplay_api_GetDevices (devs, &ndev, s);
 	   if (err != sdrplay_api_Success) {
-	      fprintf (stderr, "sdrplay_api_GetDevices failed %s\n",
-	                      sdrplay_api_GetErrorString (err));
+	      theErrorLogger -> add (recorderVersion,
+	                           sdrplay_api_GetErrorString (err));
 	      errorCode		= 6;
 	      goto unlockDevice_closeAPI;
 	   }
@@ -630,7 +630,7 @@
 
 	fprintf (stderr, "we have devices\n");
 	if (ndev == 0) {
-	   fprintf (stderr, "no valid device found\n");
+	   theErrorLogger -> add (recorderVersion, "no valid device found\n");
 	   errorCode	= 7;
 	   goto unlockDevice_closeAPI;
 	}
@@ -641,7 +641,7 @@
 	chosenDevice	-> tuner  = sdrplay_api_Tuner_A;
 	err	= sdrplay_api_SelectDevice (chosenDevice);
 	if (err != sdrplay_api_Success) {
-	   fprintf (stderr, "sdrplay_api_SelectDevice failed %s\n",
+	   theErrorLogger -> add (recorderVersion,
 	                         sdrplay_api_GetErrorString (err));
 	   errorCode	= 8;
 	   goto unlockDevice_closeAPI;
@@ -672,14 +672,15 @@
 	         deviceModel	=  hwVersion == SDRPLAY_RSPdx_?
 	            	                     "RSPDx" : "RSPDxR2";
 	         theRsp. reset (new  RspDx_handler (this,
-	                                     chosenDevice,
-	                                     KHz (220000),
-	                                     agcMode,
-	                                     lnaState,
-	                                     GRdBValue,
-	                                     antennaValue,
-	                                     biasT,
-	                                     notch,  ppmValue));
+	                                            theErrorLogger,
+	                                            chosenDevice,
+	                                            KHz (220000),
+	                                            agcMode,
+	                                            lnaState,
+	                                            GRdBValue,
+	                                            antennaValue,
+	                                            biasT,
+	                                            notch,  ppmValue));
 	         break;
 
 	      case SDRPLAY_RSP1_ :
@@ -689,12 +690,13 @@
 	         biasT_selector -> setEnabled (false);
 	         notch_selector -> setEnabled (false);
 	         theRsp. reset (new Rsp1_handler  (this,
-	                                     chosenDevice,
-	                                     KHz (220000),
-	                                     agcMode,
-	                                     lnaState,
-	                                     GRdBValue,
-	                                     biasT, ppmValue));
+	                                           theErrorLogger,
+	                                           chosenDevice,
+	                                           KHz (220000),
+	                                           agcMode,
+	                                           lnaState,
+	                                           GRdBValue,
+	                                           biasT, ppmValue));
 	         break;
 
 	      case SDRPLAY_RSP1A_ :
@@ -704,14 +706,15 @@
 	         deviceModel	= hwVersion == SDRPLAY_RSP1A_ ? "RSP-1A" :
 	                                                        "RSP-1B";
 	         theRsp. reset (new Rsp1A_handler (this,
-	                                     chosenDevice,
-	                                     KHz (220000),
-	                                     agcMode,
-	                                     lnaState,
-	                                     GRdBValue,
-	                                     biasT,
-	                                     notch,
-	                                     ppmValue));
+	                                           theErrorLogger,
+	                                           chosenDevice,
+	                                           KHz (220000),
+	                                           agcMode,
+	                                           lnaState,
+	                                           GRdBValue,
+	                                           biasT,
+	                                           notch,
+	                                           ppmValue));
 	         break;
 
 	      case SDRPLAY_RSP2_ :
@@ -720,14 +723,15 @@
 	         denominator	= 4096.0f;
 	         deviceModel	= "RSP-II";
 	         theRsp. reset (new RspII_handler (this,
-	                                     chosenDevice,
-	                                     KHz (220000),
-	                                     agcMode,
-	                                     lnaState,
-	                                     GRdBValue,
-	                                     antennaValue,
-	                                     biasT,
-	                                     notch,  ppmValue));
+		                                   theErrorLogger,
+	                                           chosenDevice,
+	                                           KHz (220000),
+	                                           agcMode,
+	                                           lnaState,
+	                                           GRdBValue,
+	                                           antennaValue,
+	                                           biasT,
+	                                           notch,  ppmValue));
 	         break;
 
 	      case SDRPLAY_RSPduo_ :
@@ -743,15 +747,16 @@
 #endif
 	         this, &sdrplayHandler_v3::setSelectTuner);
 	         theRsp. reset (new RspDuo_handler (this,
-	                                      chosenDevice,
-	                                      KHz (220000),
-	                                      agcMode,
-	                                      lnaState,
-	                                      GRdBValue,
-	                                      antennaValue,
-	                                      1,
-	                                      biasT,
-	                                      notch, ppmValue));
+	                                            theErrorLogger,
+	                                            chosenDevice,
+	                                            KHz (220000),
+	                                            agcMode,
+	                                            lnaState,
+	                                            GRdBValue,
+	                                            antennaValue,
+	                                            1,
+	                                            biasT,
+	                                            notch, ppmValue));
 	         break;
 
 	      default:
@@ -761,12 +766,12 @@
 	         lnaBounds	= 4;
 	         lnaGainSetting	-> setRange (0, lnaBounds - 1);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/soapy/soapy-converter.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/soapy/soapy-converter.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/soapy/soapy-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/soapy/soapy-handler.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-16/spyserver-client.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-16/spyserver-client.cpp Changed

@@ -42,18 +42,23 @@
 #include	"position-handler.h"
 #include	"settings-handler.h"
 
+#include	"xml-filewriter.h"
+#include	"errorlog.h"
+
 #define	DEFAULT_FREQUENCY	(Khz (227360))
 #define	SPY_SERVER_16_SETTINGS	"SPY_SERVER_16_SETTINGS"
 
-	spyServer_client::spyServer_client	(QSettings *s):
+	spyServer_client::spyServer_client	(QSettings *s,
+	 const QString &recorder,
+	 errorLogger *theLogger):
 	 _I_Buffer (8 * 32 * 32768),
-	 tmpBuffer (32 * 32768),
-	 hostLineEdit (nullptr) {
+	 tmpBuffer (32 * 32768) {
 	spyServer_settings	= s;
+	recorderVersion		= recorder;
+	theErrorLogger		= theLogger;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, SPY_SERVER_16_SETTINGS);
 	myFrame. show		();
-	hostLineEdit. hide ();
 
 //	setting the defaults and constants
 	settings. gain		= value_i (spyServer_settings,
@@ -78,7 +83,8 @@
 //
 	connect (spyServer_connect, &QPushButton::clicked,
 	 this, &spyServer_client::wantConnect);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 connect (autogain_selector, &QCheckBox::checkStateChanged,
 #else
 connect (autogain_selector, &QCheckBox::stateChanged,
@@ -88,13 +94,23 @@
 	 this, &spyServer_client::setGain);
 	connect (portNumber, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &spyServer_client::set_portNumber);
-	theState	-> setText ("waiting to start");
+	connect (xml_dumpButton, &QPushButton::clicked,
+ this, &spyServer_client::set_xmlDump);
+ theState -> setText ("waiting to start");
+ xml_dumpButton -> setText ("Dump to xml");
+ 
+ xmlWriter = nullptr;
+ xml_dumping. store (false);
 }
 
 	spyServer_client::~spyServer_client () {
 	if (connected) {		// close previous connection
 	 stopReader();
-	 connected = false;
+ if (!theServer. isNull ()) {
+ theServer -> stop_running ();
+ theServer. reset ();
+ }
+ connected = false;
 	}
 	store (spyServer_settings, SPY_SERVER_16_SETTINGS,
 	 "spyServer_client-gain", settings. gain);
@@ -106,13 +122,21 @@
 //
 void	spyServer_client::wantConnect () {
 QString ipAddress;
-int16_t	i;
 QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
 
-	if (connected)
-	 return;
+	if (connected) {
+	 stopReader ();
+	 if (!theServer. isNull ()) { // it better be
+ theServer -> stop_running ();
+ theServer. reset ();
+ }
+ spyServer_connect -> setText ("connect");
+ theState -> setText ("Enter IP address, \nthen press return");
+ return;
+ }
+
 	// use the first non-localhost IPv4 address
-	for (i = 0; i < ipAddressesList.size (); ++i) {
+	for (int16_t i = 0; i < ipAddressesList.size (); ++i) {
 	 if (ipAddressesList.at (i) != QHostAddress::LocalHost &&
 	 ipAddressesList. at (i). toIPv4Address()) {
 	 ipAddress = ipAddressesList. at(i). toString();
@@ -124,12 +148,11 @@
 	 ipAddress = QHostAddress (QHostAddress::LocalHost).toString();
 	ipAddress =value_s (spyServer_settings, SPY_SERVER_16_SETTINGS,
 	 "remote-server", ipAddress);
-	hostLineEdit. setText (ipAddress);
-	hostLineEdit. setInputMask ("000.000.000.000");
+	hostLineEdit -> setText (ipAddress);
+	hostLineEdit -> setInputMask ("000.000.000.000");
 //	Setting default IP address
-	hostLineEdit. show ();
 	theState	-> setText ("Enter IP address, \nthen press return");
-	connect (&hostLineEdit, &QLineEdit::returnPressed,
+	connect (hostLineEdit, &QLineEdit::returnPressed,
 	 this, &spyServer_client::setConnection);
 }
 
@@ -138,7 +161,7 @@
 //	inserted text. The format is the IP-V4 format.
 //	Using this text, we try to connect,
 void	spyServer_client::setConnection () {
-QString s	= hostLineEdit. text();
+QString s	= hostLineEdit -> text();
 QString theAddress	= QHostAddress (s). toString ();
 	onConnect. store (false);
 	settings. basePort	= portNumber -> value ();
@@ -150,10 +173,12 @@
 	 theServer. reset ();		// ???
 	 QMessageBox::warning (nullptr, tr ("Warning"),
 tr ("Connection failed"));
+	 QString t = "Connecting to " + theAddress + " failed";
+	 theErrorLogger -> add ("spyServer-16", t);
 	 return;
 	}
 	if (theServer. isNull ()) {
-	 fprintf (stderr, "Connecting failed\n");
+	 theErrorLogger	-> add ("spyServer-16", "onnecting failed");
 	 return;
 	}
 
@@ -161,12 +186,25 @@
 	 this, &spyServer_client::handle_checkTimer);
 	checkTimer. start (2000);
 	timedOut	= false;
-	while (!onConnect. load () && !timedOut) 
+	int delay	= 2000;
+//
+//	If the server cannot find suitable devices,
+//	then the connection is made, but no data is transmitted
+	while (!onConnect. load () && !timedOut) {
+	 delay --;
+	 if (delay == 0) {
+	 checkTimer. stop ();
+	 timedOut = true;
+	 break;
+	 }
 	 usleep (1000);
+	}
+
 	if (timedOut) {
 	 QMessageBox::warning (nullptr, tr ("Warning"),
 tr ("no answers, fatal"));
 	 theServer. reset ();
+	 theState	-> setText ("No connection or devices\n");
 	 connected = false;
 	 return;
 	}
@@ -175,10 +213,13 @@
 	disconnect (&checkTimer, &QTimer::timeout,
 	 this, &spyServer_client::handle_checkTimer);
 	theServer	-> connection_set ();
+	spyServer_connect	-> setText ("disconnect");
 
 	struct DeviceInfo theDevice;
 	theServer	-> get_deviceInfo (theDevice);
 
+	uint32_t serial	= theServer -> get_deviceInfo (theDevice);
+
 	if (theDevice. DeviceType == DEVICE_AIRSPY_ONE) {
 	 nameOfDevice	-> setText ("Airspy One");
 	}
@@ -191,7 +232,10 @@
 	 return;
 	}
 
-	this -> deviceNumber	-> setText (QString::number (theDevice. DeviceSerial));
+	if (theDevice. DeviceSerial == 0)
+	 this -> deviceNumber -> hide ();
+	else
+	 this -> deviceNumber	-> setText (QString::number (theDevice. DeviceSerial));
 	uint32_t max_samp_rate	= theDevice. MaximumSampleRate;
 	uint32_t decim_stages	= theDevice. DecimationStageCount;
 	int desired_decim_stage = -1;
@@ -201,19 +245,30 @@
 	 theServer. reset ();
 	 return;
 	}
+
+	targetRate	= 0;
 	for (uint16_t i = 0; i < decim_stages; ++i ) {
-	 int testRate = (uint32_t)(max_samp_rate / (1 << i));
-	 if (testRate == SAMPLERATE) {
+	 targetRate = (uint32_t)(max_samp_rate / (1 << i));
+	 if (targetRate == SAMPLERATE) {
 	 desired_decim_stage = i;
 	 resample_ratio = 1;
 	 break;
 	 } else
-	 if (testRate > SAMPLERATE) {
-//	remember the next-largest rate that is available
-	 desired_decim_stage = i;

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-16/spyserver-client.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-16/spyserver-client.h Changed

@@ -40,11 +40,16 @@
 #include	"ui_spyserver-widget.h"
 #include	"spy-handler.h"
 
+class	xml_fileWriter;
+class	errorLogger;
+
 class	spyServer_client: //public QObject,
 	 public deviceHandler, Ui_spyServer_widget {
 Q_OBJECT
 public:
-			spyServer_client	(QSettings *);
+			spyServer_client	(QSettings *,
+	 const QString &,
+ errorLogger *);
 			~spyServer_client	();
 	int32_t		getRate		();
 	bool		restartReader	(int32_t, int skipped = 0);
@@ -72,13 +77,16 @@
 	void		handle_autogain	(int);
 	void		handle_checkTimer	();
 	void		set_portNumber	(int);
+
+	void		set_xmlDump	();
+
 public slots:
 	void		data_ready	();
 private:
 	RingBuffer<std::complex<float>>	_I_Buffer;
+	errorLogger		*theErrorLogger;
 	RingBuffer<int16_t>	tmpBuffer;
 	QTimer		checkTimer;
-	QLineEdit	hostLineEdit;
 	QScopedPointer<spyHandler> theServer;
 	bool		isvalidRate	(int32_t);
 	QSettings	*spyServer_settings;
@@ -91,12 +99,20 @@
 	FILE		*dumpfilePointer;
 	std::atomic<bool>	onConnect;
 	bool		timedOut;
+
+	int		targetRate;
 	int16_t convBufferSize;
 int16_t convIndex;
 std::vector <std::complex<float> > convBuffer;
 int16_t mapTable_int SAMPLERATE / 1000;
 float mapTable_float SAMPLERATE / 1000;
 	int		selectedRate;
+
+ QString recorderVersion;
+ xml_fileWriter *xmlWriter;
+ bool setup_xmlDump ();
+ void close_xmlDump ();
+ std::atomic<bool> xml_dumping;
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-16/spyserver-widget.ui -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-16/spyserver-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>207</width>
- <height>268</height>
+ <width>202</width>
+ <height>381</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -26,6 +26,9 @@
 </layout>
 </item>
 <item>
+ <widget class="QLineEdit" name="hostLineEdit"/>
+ </item>
+ <item>
 <layout class="QHBoxLayout" name="horizontalLayout_4">
 <item>
 <widget class="QLabel" name="label_4">
@@ -76,6 +79,13 @@
 </layout>
 </item>
 <item>
+ <widget class="QPushButton" name="xml_dumpButton">
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QLabel" name="theState">
 <property name="text">
 <string>state</string>
@@ -85,14 +95,21 @@
 <item>
 <widget class="QLabel" name="nameOfDevice">
 <property name="text">
- <string>TextLabel</string>
+ <string>device name</string>
 </property>
 </widget>
 </item>
 <item>
 <widget class="QLabel" name="deviceNumber">
 <property name="text">
- <string>TextLabel</string>
+ <string>serial number</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="rateLabel">
+ <property name="text">
+ <string>samplerate</string>
 </property>
 </widget>
 </item>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-16/tcp-client.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-16/tcp-client.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-8/spy-handler-8.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-8/spy-handler-8.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-8/spyserver-client-8.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-8/spyserver-client-8.cpp Changed

@@ -42,18 +42,23 @@
 #include	"position-handler.h"
 #include	"settings-handler.h"
 
+#include	"xml-filewriter.h"
+#include	"errorlog.h"
+
 #define	DEFAULT_FREQUENCY	(Khz (227360))
 #define	SPY_SERVER_8_SETTINGS	"SPY_SERVER_8_SETTINGS"
 
-	spyServer_client_8::spyServer_client_8	(QSettings *s):
+	spyServer_client_8::spyServer_client_8	(QSettings *s,
+	 const QString &recorder,
+	 errorLogger *theLogger):
 	 _I_Buffer (32 * 32768),
-	 tmpBuffer (32 * 32768),
-	 hostLineEdit (nullptr) {
+	 tmpBuffer (32 * 32768) {
 	spyServer_settings	= s;
+	recorderVersion		= recorder;
+	theErrorLogger		= theLogger;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, SPY_SERVER_8_SETTINGS);
 	myFrame. show		();
-	hostLineEdit. hide ();
 
 //	setting the defaults and constants
 	settings. gain		= value_i (spyServer_settings,
@@ -76,10 +81,11 @@
 	settings. sample_bits		= 16;
 //
 	for (int i = 0; i < 256; i ++)
-	 convTable i = (-128.0 + i) / 128.0;
+	 convTable i = ((float)i - 127.38) / 128.0;
+
 	connect (spyServer_connect, &QPushButton::clicked,
 this, &spyServer_client_8::wantConnect);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 connect (autogain_selector, &QCheckBox::checkStateChanged,
 #else
 connect (autogain_selector, &QCheckBox::stateChanged,
@@ -89,12 +95,23 @@
 this, &spyServer_client_8::setGain);
 connect (portNumber, qOverload<int>(&QSpinBox::valueChanged),
 this, &spyServer_client_8::set_portNumber);
+	connect (xml_dumpButton, &QPushButton::clicked,
+	 this, &spyServer_client_8::set_xmlDump);
 	theState	-> setText ("waiting to start");
+	xml_dumpButton	-> setText ("Dump to xml");
+
+	xmlWriter	= nullptr;
+	xml_dumping. store (false);
 }
 
 	spyServer_client_8::~spyServer_client_8 () {
 	if (connected) {		// close previous connection
 	 stopReader();
+	
+	 if (!theServer. isNull ()) {
+	 theServer -> stop_running ();
+	 theServer. reset ();
+	 }
 	 connected = false;
 	}
 	store (spyServer_settings, SPY_SERVER_8_SETTINGS,
@@ -109,8 +126,16 @@
 QString ipAddress;
 QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
 
-	if (connected)
+	if (connected) {
+	 stopReader ();
+	 if (!theServer. isNull ()) {	// it better be
+	 theServer -> stop_running ();
+	 theServer. reset ();
+	 }
+	 spyServer_connect	-> setText ("connect");
+	 theState	-> setText ("Enter IP address, \nthen press return");
 	 return;
+	}
 	// use the first non-localhost IPv4 address
 	for (uint16_t i = 0; i < ipAddressesList.size (); i ++) {
 	 if (ipAddressesList.at (i) != QHostAddress::LocalHost &&
@@ -125,13 +150,12 @@
 	ipAddress	= value_s (spyServer_settings,
 	 SPY_SERVER_8_SETTINGS,
 	 "remote-server", ipAddress);
-	hostLineEdit. setText (ipAddress);
+	hostLineEdit -> setText (ipAddress);
 
-	hostLineEdit. setInputMask ("000.000.000.000");
+	hostLineEdit -> setInputMask ("000.000.000.000");
 //	Setting default IP address
-	hostLineEdit. show ();
 	theState	-> setText ("Enter IP address, \nthen press return");
-	connect (&hostLineEdit, &QLineEdit::returnPressed,
+	connect (hostLineEdit, &QLineEdit::returnPressed,
 	 this, &spyServer_client_8::setConnection);
 }
 
@@ -140,7 +164,7 @@
 //	inserted text. The format is the IP-V4 format.
 //	Using this text, we try to connect,
 void	spyServer_client_8::setConnection () {
-QString s	= hostLineEdit. text();
+QString s	= hostLineEdit -> text();
 QString theAddress	= QHostAddress (s). toString ();
 	onConnect. store (false);
 	settings. basePort	= portNumber -> value ();
@@ -152,31 +176,48 @@
 	 theServer. reset ();		// ???
 	 QMessageBox::warning (nullptr, tr ("Warning"),
 tr ("Connection failed"));
+	 QString t = "Connecting to " + theAddress + " failed";
+	 theErrorLogger -> add ("spyServer-8", t);
 	 return;
 	}
+
 	if (theServer. isNull ()) {
-	 fprintf (stderr, "Connecting failed\n");
+	 theErrorLogger -> add ("spyServer-8", "Connecting failed");
 	 return;
 	}
 
 	connect (&checkTimer, &QTimer::timeout,
 	 this, &spyServer_client_8::handle_checkTimer);
 	timedOut	= false;
-	checkTimer. start (2000);
-	while (!onConnect. load () && !timedOut) 
+	checkTimer. start (1000);
+//
+//	If the server connects but could not find a suitable
+//	device, connection stands but no data is transferred
+	int delay	= 2000;		// 2 seconds
+	while (!onConnect. load () && !timedOut) {
+	 delay --;
+	 if (delay == 0) {
+	 checkTimer. stop ();
+	 timedOut	= true;
+	 break;
+	 }
 	 usleep (1000);
+	}
+
 	if (timedOut) {
-	 QMessageBox::warning (nullptr, tr ("Warning"),
- tr ("no answers, fatal"));
+	 theState	-> setText ("No connection or no device");
 	 theServer. reset ();
 	 connected = false;
 	 return;
 	}
+
 	checkTimer. stop ();	
 	disconnect (&checkTimer, &QTimer::timeout,
 	 this, &spyServer_client_8::handle_checkTimer);
+	fprintf (stderr, "WE HAVE A CONNECTION\n");
 	theServer	-> connection_set ();
 
+	spyServer_connect	-> setText ("disconnect");
 	struct DeviceInfo theDevice;
 	theServer	-> get_deviceInfo (theDevice);
 
@@ -192,7 +233,10 @@
 	 return;
 	}
 
-	this -> deviceNumber	-> setText (QString::number (theDevice. DeviceSerial));
+	if (theDevice. DeviceSerial == 0)
+	 this -> deviceNumber -> hide ();
+	else
+	 this -> deviceNumber	-> setText (QString::number (theDevice. DeviceSerial));
 	uint32_t max_samp_rate	= theDevice. MaximumSampleRate;
 	uint32_t decim_stages	= theDevice. DecimationStageCount;
 	int desired_decim_stage = -1;
@@ -212,16 +256,26 @@
 	 break;
 	 } else
 	 if (targetRate > SAMPLERATE) {
-//	remember the next-largest rate that is available
-	 desired_decim_stage = i;
-	 resample_ratio = SAMPLERATE / (double)targetRate;
-	 settings. sample_rate = targetRate;
-	 }
+	 if ((i < decim_stages - 1) &&
+	 ((uint32_t) max_samp_rate / (i << (i + 1)))) {
+	 desired_decim_stage = i;
+	 resample_ratio = SAMPLERATE / ((double)targetRate);
+	 settings. sample_rate = targetRate;
+	 break;
+	 }	
+	 } else
+ if (targetRate < SAMPLERATE) {
+ desired_decim_stage = i;
+ resample_ratio = SAMPLERATE / (double)targetRate;
+ settings. sample_rate = targetRate;
+	 break;
+ }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-8/spyserver-client-8.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-8/spyserver-client-8.h Changed

@@ -41,12 +41,16 @@
 
 #include	"spy-handler-8.h"
 
+class	xml_fileWriter;
+class	errorLogger;
 
 class	spyServer_client_8: //public QObject,
 	 public deviceHandler, Ui_spyServer_widget_8 {
 Q_OBJECT
 public:
-			spyServer_client_8	(QSettings *);
+			spyServer_client_8	(QSettings *,
+	 const QString &,
+	 errorLogger *);
 			~spyServer_client_8	();
 	int32_t		getRate		();
 	bool		restartReader	(int32_t, int skipped = 0);
@@ -75,14 +79,17 @@
 	void		handle_autogain (int);
 void handle_checkTimer ();
 void set_portNumber (int);
+
+	void		set_xmlDump	();
+
 public slots:
 	void		data_ready	();
 private:
 	RingBuffer<std::complex<float>>	_I_Buffer;
+	errorLogger	*theErrorLogger;
 	RingBuffer<uint8_t>	tmpBuffer;
 	QTimer		checkTimer;
 	QScopedPointer<spyHandler_8>	theServer;
-	QLineEdit	hostLineEdit;
 	bool		isvalidRate	(int32_t);
 	QSettings	*spyServer_settings;
 	int32_t		theRate;
@@ -102,6 +109,13 @@
 int16_t mapTable_int SAMPLERATE / 1000;
 float mapTable_float SAMPLERATE / 1000;
 int selectedRate;
+
+
+	QString		recorderVersion;
+	xml_fileWriter *xmlWriter;
+ bool setup_xmlDump ();
+ void close_xmlDump ();
+ std::atomic<bool> xml_dumping;
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-8/spyserver-widget-8.ui -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-8/spyserver-widget-8.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>239</width>
- <height>279</height>
+ <width>233</width>
+ <height>405</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -26,6 +26,9 @@
 </layout>
 </item>
 <item>
+ <widget class="QLineEdit" name="hostLineEdit"/>
+ </item>
+ <item>
 <layout class="QHBoxLayout" name="horizontalLayout_4">
 <item>
 <widget class="QLabel" name="label_4">
@@ -76,6 +79,13 @@
 </layout>
 </item>
 <item>
+ <widget class="QPushButton" name="xml_dumpButton">
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QLabel" name="theState">
 <property name="text">
 <string>state</string>
@@ -85,14 +95,21 @@
 <item>
 <widget class="QLabel" name="nameOfDevice">
 <property name="text">
- <string>TextLabel</string>
+ <string>device name</string>
 </property>
 </widget>
 </item>
 <item>
 <widget class="QLabel" name="deviceNumber">
 <property name="text">
- <string>TextLabel</string>
+ <string>serial number</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="rateLabel">
+ <property name="text">
+ <string>samplerate</string>
 </property>
 </widget>
 </item>

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/devices/spy-server-8/tcp-client-8.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/devices/spy-server-8/tcp-client-8.cpp Changed

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

@@ -43,55 +43,7 @@
 #include	"uep-protection.h"
 #include	<memory>
 
-static uint16_t const crctab_1021256 = {
- 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
- 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
- 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
- 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
- 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
- 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
- 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
- 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
- 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
- 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
- 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
- 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
- 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
- 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
- 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
- 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
- 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
- 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
- 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
- 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
- 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
- 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
- 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
- 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
- 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
- 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
- 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
- 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
- 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
- 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
- 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
- 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
-};
-
-static
-uint16_t calc_crc (unsigned char *data,
-	 int length,
-	 uint16_t const *crctab, unsigned int crc) { 
-int count;
-unsigned int temp;
-
-	for (count = 0; count < length; ++count) {
-	 temp = (*data++ ^ (crc >> 8)) & 0xff;
-	 crc = crctab temp ^ (crc << 8);
-	}
-
-	return crc & 0xffff;
-} 
+#include	"crc-handlers.h"
 
 int16_t cif_In 55296;
 int16_t	cifVector 1655296;
@@ -239,10 +191,7 @@
 //
 //	EOF - CRC
 //	The "data bytes" are stored in the range base .. offset
-	 int crc = calc_crc (&(theVector base),
-	 offset - base,
-	 crctab_1021, 0xFFFF);
-	 crc = ~crc;
+	 uint16_t crc = calc_crc (&(theVector base), offset - base);
 	 theVector offset ++ = (crc & 0xFF00) >> 8;
 	 theVector offset ++ = crc & 0xFF;
 //
@@ -346,8 +295,8 @@
 	eti fillPointer ++ = 0xFF;
 	eti fillPointer ++ = 0xFF;
 //	HCRC
-	int HCRC = calc_crc (&eti 4, fillPointer - 4, crctab_1021, 0xffff);
-	HCRC =~ HCRC;
+	int HCRC = calc_crc (&eti 4, fillPointer - 4);
+//	HCRC =~ HCRC;
 	eti fillPointer ++ = (HCRC & 0xff00) >> 8;
 	eti fillPointer ++ = HCRC & 0xff;

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/correlator.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/correlator.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/correlator.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/correlator.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/estimator.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/estimator.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2023
+ * Copyright (C) 2016 .. 2023
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -20,55 +20,47 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include	"estimator.h"
+#include	"estimator.h" 
 #include	<QVector>
 #include	<cstring>
 #include	"radio.h"
 #include	<vector>
+/**
+ */
 
-//
-		estimator::estimator (RadioInterface *mr,
-	 processParams	*p,
-	 phaseTable	*theTable):
-	 params (p -> dabMode),
-	 fft_forward (params. get_T_u (),
-	 false),
-	 fft_backwards (params. get_T_u (),
-	 true) {
-	(void)mr;
+	estimator::estimator (RadioInterface *mr,
+	 processParams	*p,
+	 phaseTable 	*theTable) :
+	 params (p -> dabMode),
+	 fft_forward (params. get_T_u (), false),
+	 fft_backwards (params. get_T_u (), true) {
+
+	this	-> theTable	= theTable;
 	this	-> T_u		= params. get_T_u();
 	this	-> T_g		= params. get_T_g();
 	this	-> carriers	= params. get_carriers();
-	fftSize			= T_u;
-	refTable.		resize (T_u);
-//	and organized as -inf ..0 .. inf
-	for (int i = 0; i < T_u; i ++) {
-	 refTable i = theTable -> refTable (T_u / 2 + i) % T_u;
-	}
 }
 
 	estimator::~estimator () {
 }
 
-void	estimator::estimate	(std::vector<Complex> v,
-	 std::vector <Complex> &resultRow) {
+/**
+ */
+//
+void	estimator::estimate (std::vector <Complex> v,
+	 std::vector<Complex> &CI_Vector) {
 
-	resultRow. resize (NR_TAPS);
 	fft_forward. fft (v);
-	Complex hhh T_u;
-	for (int i = 0; i < T_u; i ++)
-	 hhh i = Complex (0, 0);
-	for (int i = - carriers / 2; i < carriers / 2; i ++) {
-	 int index = (T_u + i) % T_u;
-	 if (index != 0) {
-	 hhh T_u / 2 + i =
-	 v index / refTable T_u / 2 + i;
-	 }
-	}
-	fft_backwards. fft (hhh);
 //
-	for (int i = 0; i < NR_TAPS - 4; i ++)
-	 resultRow i + 4 = Complex (real (hhh i) * 10.0,
-	 imag (hhh i) * 10.0);
+//	into the frequency domain, now correlate
+	for (int i = 0; i < T_u; i ++) 
+//	 v i = v i * conj (theTable -> refTable i);
+	 v i = v i * Complex (real (theTable -> refTable i),
+	 -imag (theTable -> refTable i));
+
+//	and, again, back into the time domain
+	fft_backwards. fft (v);
+	for (int i = 0; i < NR_TAPS; i ++)
+	 CI_Vector i = v i;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/estimator.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/estimator.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2016 .. 2023
+ * Copyright (C) 2016 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -27,20 +27,15 @@
 #include	<cstdio>
 #include	<cstdint>
 #include	<vector>
-#include <QString>
-#include "dab-constants.h"
-#include <vector>
-
 #include	"fft-handler.h"
 #include	"phasetable.h"
 #include	"dab-constants.h"
 #include	"dab-params.h"
 #include	"process-params.h"
-#include	"ringbuffer.h"
+
 class	RadioInterface;
 
-class estimator : public QObject {
-Q_OBJECT
+class estimator {
 public:
 			estimator 		(RadioInterface *,
 	 processParams *,
@@ -48,8 +43,8 @@
 			~estimator		();
 	void		estimate		(std::vector<Complex>,
 	 std::vector<Complex> &);
-//	This one is used in the ofdm decoder
 private:
+	phaseTable	*theTable;
 	dabParams	params;
 	fftHandler	fft_forward;
 	fftHandler	fft_backwards;
@@ -57,10 +52,5 @@
 	int32_t		T_u;
 	int32_t		T_g;
 	int16_t		carriers;
-
- int16_t numberofTaps;
- int16_t fftSize;
-signals:
-	void		showCorrelation	(int, int, QVector<int>);
 };

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/fib-config.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/fib-config.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/fib-config.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/fib-config.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/fib-decoder.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/fib-decoder.cpp Changed

@@ -36,8 +36,6 @@
 #include	<QStringList>
 #include	"dab-tables.h"
 #include	"time-converter.h"
-
-#include	"dab-tables.h"
 //
 //
 //	The fibDecoder was rewritten since the "old" one
@@ -68,7 +66,6 @@
 //	Note that they may change "roles", 
 	currentConfig	= new fibConfig();
 	nextConfig	= new fibConfig();
-	theEnsemble	= new ensemble ();
 	CIFcount	= 0;
 	mjd		= 0;
 }
@@ -76,12 +73,13 @@
 	fibDecoder::~fibDecoder () {
 	delete	nextConfig;
 	delete	currentConfig;
-	delete	theEnsemble;
 }
 
 //	FIB's are segments of 256 bits. When here, we already
 //	passed the crc and we start unpacking into FIGs
 //	This is merely a dispatcher
+//	The caller, fic-handler, has ensured that the CRC
+//	is correct, we trust the fic handler
 void	fibDecoder::processFIB (uint8_t *p, uint16_t fib) {
 int8_t	processedBytes	= 0;
 uint8_t	*d		= p;
@@ -91,8 +89,10 @@
 	while (processedBytes < 30) {
 	 uint8_t FIGtype	= getBits_3 (d, 0);
 	 uint8_t FIGlength	= getBits_5 (d, 3);
-	 if ((FIGtype == 0x07) && (FIGlength == 0x3F))
+	 if ((FIGtype == 0x07) && (FIGlength == 0x3F)) {
+	 fibLocker. unlock ();
 	 return;
+	 }
 
 	 switch (FIGtype) {
 	 case 0:			
@@ -116,7 +116,6 @@
 //	Thanks to Ronny Kunze, who discovered that I used
 //	a p rather than a d
 	 processedBytes += getBits_5 (d, 3) + 1;
-//	 processedBytes += getBits (p, 3, 5) + 1;
 	 d = p + processedBytes * 8;
 	}
 	fibLocker. unlock();
@@ -203,8 +202,8 @@
 	 break;
 
 	 case 20:		// service component information (8.1.4)
-	 FIG0Extension20 (d);
-	 break;		// to be implemented
+	 FIG0Extension20 (d);	 // not encountered yet
+	 break;	
 
 	 case 21:		// frequency information (8.1.8)
 	 FIG0Extension21 (d);
@@ -241,15 +240,15 @@
 //	FIG0/0 indicated a change in channel organization
 //	The info is MCI
 void	fibDecoder::FIG0Extension0 (uint8_t *d) {
+const uint8_t CN_bit	= getBits_1 (d, 8 + 0);
 uint16_t EId;
 uint8_t changeFlag;
 uint16_t highpart, lowpart;
 int16_t occurrenceChange;
-//uint8_t CN_bit	= getBits_1 (d, 8 + 0);
 uint8_t		alarmFlag;
 static	uint8_t prevChangeFlag	= 0;
 
-//	(void)CN_bit;
+	(void)CN_bit;
 	EId = getBits (d, 16, 16);
 	(void)EId;
 	changeFlag = getBits_2 (d, 16 + 16);
@@ -268,7 +267,7 @@
 	 fibConfig 	*temp	= currentConfig;
 	 currentConfig	= nextConfig;
 	 nextConfig		= temp;
-	 nextConfig	-> reset ();
+	 nextConfig		-> reset ();
 //	 cleanupServiceList ();
 	 emit changeinConfiguration ();
 	}
@@ -283,10 +282,10 @@
 //	relevant CIF.
 void	fibDecoder::FIG0Extension1 (uint8_t *d) {
 int16_t	used		= 2;		// offset in bytes
-int16_t	Length		= getBits_5 (d, 3);
-uint8_t	CN_bit		= getBits_1 (d, 8 + 0);
-uint8_t	OE_bit		= getBits_1 (d, 8 + 1);
-uint8_t	PD_bit		= getBits_1 (d, 8 + 2);
+const int16_t	Length			= getBits_5 (d, 3);
+const uint8_t	CN_bit	= getBits_1 (d, 8 + 0);
+const uint8_t	OE_bit	= getBits_1 (d, 8 + 1);
+const uint8_t	PD_bit	= getBits_1 (d, 8 + 2);
 
 	while (used < Length - 1)
 	 used = HandleFIG0Extension1 (d, used, CN_bit, OE_bit, PD_bit);
@@ -297,7 +296,6 @@
 	 const uint8_t CN_bit,
 	 const uint8_t OE_bit,
 	 const uint8_t PD_bit) {
-
 int16_t	bitOffset	= offset * 8;
 const int16_t subChId	= getBits_6 (d, bitOffset);
 const int16_t startAdr	= getBits (d, bitOffset + 6, 10);
@@ -315,26 +313,26 @@
 	channel. FEC_scheme	= 0;	// corrected later on
 
 	if (getBits_1 (d, bitOffset + 16) == 0) {	// short form
-	 tabelIndex = getBits_6 (d, bitOffset + 18);
+	 tabelIndex		= getBits_6 (d, bitOffset + 18);
 	 channel. Length	= ProtLevel tabelIndex0;
 	 channel. shortForm	= true;		// short form
 	 channel. protLevel	= ProtLevel tabelIndex1;
-	 channel. bitRate		= ProtLevel tabelIndex2;
+	 channel. bitRate	= ProtLevel tabelIndex2;
 	 bitOffset += 24;
 	}
 	else { 	// EEP long form
 	 channel. shortForm	= false;
 	 option = getBits_3 (d, bitOffset + 17);
 	 if (option == 0) { 		// A Level protection
-	 protLevel			= getBits (d, bitOffset + 20, 2);
+	 protLevel		= getBits (d, bitOffset + 20, 2);
 	 channel.	protLevel	= protLevel;
-	 chanSize	= getBits (d, bitOffset + 22, 10);
+	 chanSize		= getBits (d, bitOffset + 22, 10);
 	 channel. Length	= chanSize;
 	 channel. bitRate	= chanSize / table_1 protLevel * 8;
 	 }
 	 else			// option should be 001
 	 if (option == 001) {		// B Level protection
-	 protLevel			= getBits_2 (d, bitOffset + 20);
+	 protLevel		= getBits_2 (d, bitOffset + 20);
 	 channel. protLevel	= protLevel + (1 << 2);
 	 chanSize		= getBits (d, bitOffset + 22, 10);
 	 channel. Length	= chanSize;
@@ -348,7 +346,6 @@
 	if (localBase -> findIndex_subChannel_table (subChId) >= 0)
 	 return bitOffset / 8;
 //
-	
 	localBase -> subChannel_table. push_back (channel);
 	return bitOffset / 8;	// we return bytes
 }
@@ -357,7 +354,7 @@
 //	bind channels to SIds
 void	fibDecoder::FIG0Extension2 (uint8_t *d) {
 int16_t	used	= 2;		// offset in bytes
-int16_t	Length	= getBits_5 (d, 3);
+const int16_t	Length	= getBits_5 (d, 3);
 const uint8_t	CN_bit	= getBits_1 (d, 8 + 0);
 const uint8_t	OE_bit	= getBits_1 (d, 8 + 1);
 const uint8_t	PD_bit	= getBits_1 (d, 8 + 2);
@@ -378,11 +375,9 @@
 uint8_t		cId;
 uint32_t	SId;
 int16_t		numberofComponents;
-
 fibConfig	*localBase = CN_bit == 0 ? currentConfig : nextConfig;
 	
 	(void)OE_bit;
-
 	if (PD_bit == 1) {		// long Sid, data
 	 ecc	= getBits_8 (d, bitOffset);	(void)ecc;
 	 cId	= getBits_4 (d, bitOffset + 4);
@@ -440,7 +435,7 @@
 //	Service component in packet mode 6.3.2
 void	fibDecoder::FIG0Extension3 (uint8_t *d) {
 int16_t used = 2; // offset in bytes
-int16_t Length = getBits_5 (d, 3);
+const int16_t Length = getBits_5 (d, 3);
 const uint8_t CN_bit = getBits_1 (d, 8 + 0);
 const uint8_t OE_bit = getBits_1 (d, 8 + 1);
 const uint8_t PD_bit = getBits_1 (d, 8 + 2);
@@ -490,7 +485,7 @@
 //	Service component language 8.1.2
 void	fibDecoder::FIG0Extension5 (uint8_t *d) {
 int16_t	used		= 2;		// offset in bytes
-int16_t	Length		= getBits_5 (d, 3);
+const int16_t Length	= getBits_5 (d, 3);
 const uint8_t CN_bit	= getBits_1 (d, 8 + 0);
 const uint8_t OE_bit	= getBits_1 (d, 8 + 1);
 const uint8_t PD_bit	= getBits_1 (d, 8 + 2);
@@ -500,7 +495,7 @@
 	}
 }
 
-int16_t	fibDecoder::HandleFIG0Extension5 (uint8_t* d,
+int16_t	fibDecoder::HandleFIG0Extension5 (uint8_t	*d,
 	 uint16_t 	offset,
 	 const uint8_t CN_bit,

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/fib-decoder.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/fib-decoder.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/fic-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/fic-handler.cpp Changed

@@ -192,11 +192,16 @@
 
 	if (!running. load ())
 	 return false;
-	memset (viterbiInput, 0, (FIC_BLOCKSIZE + FIC_RESIDU) * sizeof (int16_t));
+//	memset (viterbiInput, 0,
+//	 (FIC_BLOCKSIZE + FIC_RESIDU) * sizeof (int16_t));
 
 	for (int i = 0; i < FIC_BLOCKSIZE + FIC_RESIDU; i ++)
-	 if (punctureTable i)
-	 viterbiInput i = ficInput inputCount ++;
+	 viterbiInput i = punctureTable i ?
+	 ficInput inputCount ++ : 0;
+//	 if (punctureTable i)
+//	 viterbiInput i = ficInput inputCount ++;
+//	 else
+//	 viterbiInput i = 0;
 /**
 *	Now we have the full word ready for deconvolution
 *	deconvolution is according to DAB standard section 11.2
@@ -231,11 +236,10 @@
 *	first step: energy dispersal according to the DAB standard
 *	We use a predefined vector PRBS
 */
-	for (int i = 0; i < FIC_BLOCKSIZE / 4; i ++)
+	for (int i = 0; i < FIC_BLOCKSIZE / 4; i ++) {
 	 hardBits i ^= PRBS i;
-
-	for (int i = 0; i < FIC_BLOCKSIZE / 4; i ++)
 	 fibBits ficno * FIC_BLOCKSIZE / 4 + i = hardBits i;
+	}
 /**
 *	each of the 3 fib blocks is protected by a crc
 *	(we know that there are three fib blocks each time we are here)

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/freqsyncer.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/freqsyncer.cpp Changed

@@ -28,31 +28,17 @@
 
 	freqSyncer::freqSyncer (RadioInterface *mr,
 	 processParams	*p,
-	 phaseTable	*theTable,
-	 bool		speedUp,
-	 uint8_t		correlator):
+	 phaseTable	*theTable):
 	 params (p -> dabMode),
 	 fft_forward (params. get_T_u (), false),
 	 go_forward (TEST_SIZE, false),
 	 go_backwards (TEST_SIZE, true) {
 	(void)mr;
-	this	-> speedUp	= speedUp;
-	this	-> correlator	= correlator;
-//	this	-> diff_length	= p -> diff_length;
-	this	-> diff_length	= 128;
 	this	-> theTable	= theTable;
 	this	-> T_u		= params. get_T_u();
 	this	-> T_g		= params. get_T_g();
 	this	-> carriers	= params. get_carriers();
 
-	phaseDifferences. resize (diff_length);
-// prepare a table for the coarse frequency synchronization
-// can be a static one, actually, we are only interested in
-// the ones with a null
-	for (int i = 1; i <= diff_length; i ++) 
-	 phaseDifferences i - 1 =
-	 abs (arg (theTable -> refTable (T_u + i) % T_u *
-	 conj (theTable -> refTable (T_u + i + 1) % T_u)));
 //	first of all: compute the phases
 	for (int i = -TEST_SIZE / 2; i < TEST_SIZE / 2; i ++) {
 	 t1 TEST_SIZE / 2 + i = theTable -> refTable (T_u + i) % T_u *
@@ -67,141 +53,41 @@
 //
 //	an approach that works fine is to correlate the phasedifferences
 //	between subsequent carriers
-//	We start with an estimate of the offset by looking at the 
-//	best fit of begin and end segment of the carrier sequence
-//	from the input to the carrier sequence in the predefined
-//	null symbol
 #define	SEARCH_RANGE	(2 * 32)
 //
 //	Note: the vector v is being processed, its value is not constant
 int16_t	freqSyncer::
-	 estimate_CarrierOffset (std::vector<Complex> v) {
+	 estimateCarrierOffset (std::vector<Complex> v) {
 
 	fft_forward. fft (v);
 //
-//	The coarse frequency offset is computed by looking at the
-//	phase differences of subsequenct carriers in the
-//	predefined data vs the incoming symbol 0.
-//	The current approach is pretty simple, we just look at the
-//	low values (phase 0) and the higher values on the positions
-//	defined by the predefined data.
-//	A simple optimization was to just make a (not too wild) guess
-//	of the position of the NULL carrier, and applying the
-//	search on just a few carriers around this assumed null carrier.
-//
 //	Willem S suggested to apply a more "scientific" approach to
 //	compute the correlation between the phases, required for
 //	computing the coarse frequency offset.
 //	Inspired by https://phys.uri.edu/nigh/NumRec/bookfpdf/f13-2.pdf
 //	(and of course using the approach in the time syncing),
-//	I experimented with different "test" sizes and, while testsize 128
-//	works pretty well, it underperforms compared to the more basic
-//	approach that consists of counting high and low values
 //
-	if (correlator == FFT_CORR) {
-	 for (int i = -TEST_SIZE / 2; i < TEST_SIZE / 2; i ++) {
-	 t2 TEST_SIZE / 2 + i = v (T_u + i) % T_u *
+	for (int i = -TEST_SIZE / 2; i < TEST_SIZE / 2; i ++) {
+	 t2 TEST_SIZE / 2 + i = v (T_u + i) % T_u *
 	 conj (v (T_u + i + 1) % T_u);
 //	 t2 TEST_SIZE / 2 +i = Complex (arg (t2 i), 0);
-	 }
+	}
 //	apply the FFT
-	 go_forward. fft (t2);
-	 for (int i = 0; i < TEST_SIZE; i ++)
-	 t2 i = t1 i * conj (t2 i);
+	go_forward. fft (t2);
+	for (int i = 0; i < TEST_SIZE; i ++)
+	 t2 i = t1 i * conj (t2 i);
 //	and go back
-	 go_backwards. fft (t2);
-	 int theCarrier	= -1000;
-	 float mm	= -0;
-	 for (int i = -SEARCH_RANGE / 2 ; i < SEARCH_RANGE / 2; i ++) {
-	 if (abs (t2 (TEST_SIZE + i) % TEST_SIZE) > mm) {
-	 mm = abs (t2 (TEST_SIZE + i) % TEST_SIZE);
-	 theCarrier = i;
-	 }
-	 }
-	 if ((theCarrier == -SEARCH_RANGE) || (theCarrier == SEARCH_RANGE))
-	 return 100;
-	 return theCarrier;
-	}
-	else {
-	 int16_t index_1 = 100, index_2 = 100;
-	 int starter_1	= - SEARCH_RANGE / 2;	// the default
-	 float	computedDiffs SEARCH_RANGE + diff_length + 1;
-	 float	test T_u;
-	 for (int i = 0; i < T_u / 2; i ++) {
-	 test i		= jan_abs (v T_u / 2 + i);
-	 test T_u / 2 + i	= jan_abs (v i);
-	 }
-#define	SUM_SIZE	75
-	 if (speedUp) {
-//	 We look with a moving sum of the first and the last
-//	 SUM_SIZE carriers to a full sequence of "carrier" carriers
-//	 for a maximum.
-//	 if found, we have a rough estimate of where the NULL carrier is
-	 double xx	= 0;
-	 double max	= 0;
-	 for (int j = - SEARCH_RANGE / 2;
-	 j < -SEARCH_RANGE / 2 + SUM_SIZE; j ++) {
-	 xx += test T_u / 2 - carriers / 2 + j;
-	 xx += test T_u / 2 + carriers / 2 - SUM_SIZE + j;
-	 }
-	 for (int i = -SEARCH_RANGE / 2; i < SEARCH_RANGE / 2; i ++) {
-	 xx -= test T_u / 2 - carriers / 2 + i;
-	 xx += test T_u / 2 - carriers / 2 + i + SUM_SIZE;
-	 xx -= test T_u / 2 + (carriers / 2 - SUM_SIZE) + i;
-	 xx += test T_u / 2 + (carriers / 2 - SUM_SIZE) + i + SUM_SIZE;
-	 if (xx > max) {
-	 max = xx;
-	 starter_1 = i;
-	 }
-	 }
-	 }
-
-//	the actual search for the best fit of the incoming data wrt
-//	the predefined data is done over a range of app 20 carriers
-	 if (starter_1 - 10 < - SEARCH_RANGE / 2)
-	 starter_1 = - 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) =
-	 jan_abs (arg (v i % T_u *
-	 conj (v (i + 1) % T_u)));
-	 }
-
-	 float	Mmin	= 1000;
-	 float	Mmax	= 0;
-	 int	length	= speedUp ? 20 : SEARCH_RANGE;
-	 for (int i = T_u + starter_1;
-	 i < T_u + starter_1 + length; i ++) {
-	 float sum1	= 0;
-	 float sum2	= 0;
-//
-//	Since correlation with lots of zeros in the reference
-//	vector does not make much sense (the reference values
-//	are 0, PI/ 2 and PI).
-//	We therefore compute the sum of the values that should be 0,
-//	and the sum of the values that should be either PI / 2 or PI
-//	and compute the minimum resp max value (and index)
-//	If the indices are the same, we believe we found a solution
-	 for (int j = 1; j < diff_length; j ++) {
-	 if (phaseDifferences j - 1 < 0.1) {
-	 sum1 += computedDiffs i - (T_u - SEARCH_RANGE / 2) + j;
-	 }
-	 if (phaseDifferences j - 1 > M_PI / 2 - 0.1) {
-	 sum2 += computedDiffs i - (T_u - SEARCH_RANGE / 2) + j;
-	 }
-	 }
-	 if (sum1 < Mmin) {
-	 Mmin = sum1;
-	 index_1 = i;
-	 }
-	 if (sum2 > Mmax) {
-	 Mmax = sum2;
-	 index_2 = i;
-	 }
+	go_backwards. fft (t2);
+	int theCarrier	= -1000;
+	float mm	= -0;
+	for (int i = -SEARCH_RANGE / 2 ; i < SEARCH_RANGE / 2; i ++) {
+	 if (abs (t2 (TEST_SIZE + i) % TEST_SIZE) > mm) {
+	 mm = abs (t2 (TEST_SIZE + i) % TEST_SIZE);
+	 theCarrier = i;
 	 }
-	 if (index_1 != index_2)
-	 return 100;
-	 return index_1 - T_u; 
 	}
+	if ((theCarrier == -SEARCH_RANGE) || (theCarrier == SEARCH_RANGE))
+	 return 100;
+	return theCarrier;
 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/freqsyncer.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/freqsyncer.h Changed

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

@@ -24,9 +24,6 @@
 *	should reconstruct the data blocks.
 *	Ofdm_decoder is called for Block_0 and the FIC blocks,
 *	its invocation results in 2 * Tu bits
- *
- *	The commented decoders were from Thomas Neder and used in an
- *	experiment, the "shifting" from fftBinRaw to fftBin is from his work
 */
 #include	<vector>
 #include	"ofdm-decoder.h"
@@ -43,26 +40,13 @@
 *	will extract the Tu samples, do an FFT and extract the
 *	carriers and map them on (soft) bits
 */
-#define	ALPHA	0.01f
+#define	ALPHA	0.005f
 static inline
 Complex	normalize (const Complex &V) {
-float Length	= jan_abs (V);
+DABFLOAT Length	= jan_abs (V);
 	return Length == 0.0f ? Complex (0.0, 0.0) : V / (DABFLOAT)Length;
 }
 
-#define	GRANULARITY	5000
-#define	TABLE_SIZE	(int)(GRANULARITY + RAD_PER_DEGREE * 30.0)
-//Complex makeComplex (DABFLOAT phase) {
-//DABFLOAT p2	= phase * phase;
-//DABFLOAT p3	= p2 * phase;
-//DABFLOAT p4	= p3 * phase;
-//DABFLOAT p5	= p4 * phase;
-//DABFLOAT p6	= p5 * phase;
-//DABFLOAT sine	= phase - p3 / 6 + p5 / 120;
-//DABFLOAT cosi	= 1 - p2 / 2 + p4 / 24 - p6 / 720;
-//	return Complex (cosi, sine);
-//}
-
 	ofdmDecoder::ofdmDecoder	(RadioInterface *mr,
 	 uint8_t	dabMode,
 	 int16_t	bitDepth,
@@ -78,12 +62,10 @@
 	 phaseReference (params. get_T_u ()),
 	 conjVector (params. get_T_u ()),
 	 fft_buffer (params. get_T_u ()),
-		 stdDevVector (params. get_T_u ()),
-	 IntegAbsPhaseVector (params. get_T_u ()),
+	 sigmaSQ_Vector (params. get_T_u ()),
 	 meanLevelVector (params. get_T_u ()),
-	 meanPowerVector (params. get_T_u ()),
-	 meanSigmaSqVector (params. get_T_u ())
-{
+	 stdDevVector (params. get_T_u ()),
+	 angleVector (params. get_T_u ()) {
 	(void)bitDepth;
 	connect (this, &ofdmDecoder::showIQ,
 	 myRadioInterface, &RadioInterface::showIQ);
@@ -102,14 +84,9 @@
 
 	reset ();
 	iqSelector		= SHOW_DECODED;
+//	iqSelector		= SHOW_RAW;
 	decoder			= DECODER_1;
-
-	nullPower		= 0.1f;
-	compTable. resize (TABLE_SIZE);
-	for (int i = 0; i < TABLE_SIZE; i ++) {
-	 float argum = (float)(i - TABLE_SIZE / 2) / TABLE_SIZE;
-	 compTable i = Complex (cos (argum), sin (argum));
-	}
+	sqrt_2			= sqrt (2);
 }
 
 	ofdmDecoder::~ofdmDecoder	() {
@@ -119,33 +96,25 @@
 }
 //
 void	ofdmDecoder::reset ()	{
-	memset (stdDevVector. data (),		0, T_u * sizeof (DABFLOAT));
-	memset (IntegAbsPhaseVector. data (),	0, T_u * sizeof (DABFLOAT));
-	memset (meanLevelVector. data (),	0, T_u * sizeof (DABFLOAT));
-	memset (meanPowerVector. data (),	0, T_u * sizeof (DABFLOAT));
-	memset (meanSigmaSqVector. data (),	0, T_u * sizeof (DABFLOAT));
+	for (int i = 0; i < T_u; i ++) {
+	 sigmaSQ_Vector i	= 0;
+	 meanLevelVector i	= 0;
+	 stdDevVector i	= 0;
+	 angleVector i	= M_PI_4;
+	}
 	meanValue	= 1.0f;
+	avgBit		= 1.0f;
 }
 //
-void	ofdmDecoder::setPowerLevel	(DABFLOAT level) {
-	nullPower = level * level;
-}
-
-float	ofdmDecoder::processBlock_0 (
-	 std::vector <Complex> buffer, bool withTII) {
+void	ofdmDecoder::processBlock_0 (std::vector <Complex> buffer) {
 	fft. fft (buffer);
 //	we are now in the frequency domain, and we keep the carriers
-//	as coming from the FFT as phase reference.
+//	for their phases.
 //
 	memcpy (phaseReference. data (), buffer. data (),
 	 T_u * sizeof (Complex));
 
-	Complex temp	= Complex (0, 0);;
-	if (withTII) {
-	 return arg (temp);
-	}
-
-	return 0;
+	Complex temp	= Complex (0, 0);
 }
 //
 //	Just interested. In the ideal case the constellation of the
@@ -160,7 +129,7 @@
 static float f_d = 1;
 	for (int i = 0; i < carriers; i ++) {
 	 Complex ss	= v T_u / 2 - carriers / 2 + i;
-	 float ab	= jan_abs (ss) / sqrt (2);
+	 float ab	= jan_abs (ss) / sqrt_2;
 	 f_n		= 0.99 * f_n + 0.01 * (jan_abs (ss) * jan_abs (ss));
 	 float R	= abs (abs (real (ss)) - ab);
 	 float I	= abs (abs (imag (ss)) - ab);
@@ -188,24 +157,59 @@
 	return x < 0 ? -1 : x > 0 ? 1 : 0;
 }
 
-void	limit_symmetrically (DABFLOAT &v, float limit) {
+void	limit_symmetrically (DABFLOAT &v, DABFLOAT limit) {
 	if (v < -limit)
 	 v = -limit;
 	if (v > limit)
 	 v = limit;
 }
 //
-//	How to compute a sin or cos for (hopefully) small angles,
-//	Some tests showed the using the first few terms of the
-//	Taylor series for angles up to PI / 4 were up to the fourth
-//	decimal correct.
-//	A more performance oriented solution could be a table,
-//	but then, the granularity of the table should be pretty high.
+//	The decoders 1 and 2 are based on "Soft optimal 2" in
+//	"Soft decisions for DQPSK demodulation for the Viterbi
+//	decoding of the convolutional codes"
+//	Thushara C Hewavithana and Mike Brooks
+//
+//	the formula (decoders 1 and 2) (in my own words)
+//	Corrector = sqrt (2) / (SigmaSQ * (1 /SNR + 2))
+//	where corrector is to be applied on real (symbol) and imag (symbol)
+//	The implied assumption here is that abs (symbol) == 1,
+//
+//	The basic idea behind the formula is to enlarge the
+//	spread in sizes of the real (symb) and imag (symb),
+//	which is obviously inversely proportional with the sigmaSq
+//
+//	It shows that the resulting values for "Corrector" are
+//	small, so for mapping those on -127 .. 127 a "scaler" is needed
+//	(Thanks to Rolf Zerr, aka Old-dab).
+//
+//	Decoder 4 is an interpretation of the so-called "Optimal 3" 
+//	version in the aforementioned paper.
+//	It is still experimental!!!
+
+static inline
+Complex w (DABFLOAT kn) {
+	DABFLOAT re	= cos (kn * M_PI / 4);
+	DABFLOAT im	= sin (kn * M_PI / 4);
+	return Complex (re, im);
+}
+
+static inline
+DABFLOAT makeA (int i, Complex S, Complex prevS) {
+	return abs (prevS + w (-i) * S);
+}
+
+static inline
+DABFLOAT IO	(DABFLOAT x) {
+	return std::cyl_bessel_i (0.0f, x);
+}
 
 void	ofdmDecoder::decode (std::vector <Complex> &buffer,
 	 int32_t blkno,
-	 std::vector<int16_t> &softbits) {
-DABFLOAT sum = 0;
+	 std::vector<int16_t> &softbits,
+	 DABFLOAT snr) {
+
+DABFLOAT sum	= 0;
+DABFLOAT bitSum	= 0;
 
 	memcpy (fft_buffer. data (), &((buffer. data ()) T_g),
 	 T_u * sizeof (Complex));
@@ -215,145 +219,127 @@
 //	a little optimization: we do not interchange the
 //	positive/negative frequencies to their right positions.
 //	The de-interleaving understands this
-//	DABFLOAT max	= 0;

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/ofdm-decoder.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/ofdm-decoder.h Changed

@@ -52,25 +52,26 @@
 	 RingBuffer<float> *devBuffer,
 	 RingBuffer<Complex> * iqBuffer = nullptr);
 		~ofdmDecoder		();
-	void	setPowerLevel		(DABFLOAT);
-	float	processBlock_0		(std::vector<Complex>, bool);
+	void	setNullLevel		(const std::vector<Complex> &);
+//
+//	Note: the parameter should not be altered, it is used later on
+	void	processBlock_0		(std::vector<Complex>);
 	void	decode			(std::vector<Complex> &,
 	 int32_t n,
-	 std::vector<int16_t> &);
+	 std::vector<int16_t> &, DABFLOAT);
 	void	stop			();
 	void	reset			();
 	void	handle_iqSelector	();
 	void	handle_decoderSelector	(int);
 private:
-	RadioInterface	*myRadioInterface;
-	dabParams	params;
-	phaseTable	theTable;
-	interLeaver myMapper;
-	fftHandler	fft;
+	RadioInterface		*myRadioInterface;
+	dabParams		params;
+	phaseTable		theTable;
+	interLeaver		myMapper;
+	fftHandler		fft;
 	RingBuffer<float>	*devBuffer;
 	RingBuffer<Complex>	*iqBuffer;
 
-	std::vector<Complex>	compTable;
 	float		computeQuality		(Complex *);
 	float		compute_timeOffset (Complex *,
 	 Complex *);
@@ -83,21 +84,24 @@
 	int32_t		T_g;
 	int32_t		nrBlocks;
 	int32_t		carriers;
-	DABFLOAT	nullPower;
 	std::vector<Complex>	phaseReference;
 	std::vector<int16_t>	ibits;
 	std::vector<Complex>	conjVector;
 	std::vector<Complex>	fft_buffer;
-	std::vector<DABFLOAT>	stdDevVector;
-	std::vector<DABFLOAT> 	IntegAbsPhaseVector;
+	std::vector<DABFLOAT>	sigmaSQ_Vector;
 	std::vector<DABFLOAT>	meanLevelVector;
-	std::vector<DABFLOAT>	meanPowerVector;
-	std::vector<DABFLOAT>	meanSigmaSqVector;
-	
+	std::vector<DABFLOAT>	stdDevVector;
+	std::vector<DABFLOAT>	angleVector;
+	std::vector<DABFLOAT>	powerLevelVector;
+	std::vector<DABFLOAT>	nullLevelVector;
+
 	float		meanValue;
+	float		avgBit;
 	int		iqSelector;
 	int		decoder;
 	int		repetitionCounter;
+
+	double		sqrt_2;
 signals:
 	void		showIQ		(int);
 	void		show_quality	(float, float, float);

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

@@ -30,8 +30,8 @@
 #include	"timesyncer.h"
 #include	"freqsyncer.h"
 #include	"ringbuffer.h"
-#include	"estimator.h"
 #include	"correlator.h"
+#include	"estimator.h"
 #include	"logger.h"
 #include	"settingNames.h"
 #include	"settings-handler.h"
@@ -74,7 +74,8 @@
 	 theMscHandler (mr, p -> dabMode,
 	 p -> frameBuffer,
 	 theLogger,
-	 cpuSupport) {
+	 cpuSupport),
+	 theTable (p -> dabMode) {
 
 	this	-> p			= p;
 	this	-> theLogger		= theLogger;
@@ -93,24 +94,22 @@
 	this	-> carriers		= params. get_carriers ();
 	this	-> carrierDiff		= params. get_carrierDiff ();
 
-	this	-> freqSpeedUp		= 
-	 value_i (dabSettings, CONFIG_HANDLER, "SPEED_UP", 0) != 0;
-	this	-> freqCorrelator		=
-	 value_i (dabSettings, CONFIG_HANDLER, "SELECT_CORR", 0);
 	this	-> tiiDelay		= p -> tii_delay;
 	this	-> tiiCounter		= 0;
 	this	-> correlationOrder	= 
 	 value_i (dabSettings, CONFIG_HANDLER,
 	 S_CORRELATION_ORDER, 0) != 0;
 	this	-> dxMode		=
-	 value_i (dabSettings, CONFIG_HANDLER, S_DX_MODE, 0) != 0;
+	 		 value_i (dabSettings,
+	 CONFIG_HANDLER,
+	 S_DX_MODE, 0) != 0;
 	this	-> decoder		= value_i (dabSettings, CONFIG_HANDLER, 
 	 "decoders", DECODER_1); 
 	this	-> selectedTII		= value_i (dabSettings, CONFIG_HANDLER,		 	 "tii-detector", 1) == 0 ?
 	 TII_OLD : TII_NEW;
 
 	this	-> etiOn		= false;
-	ofdmBuffer. resize (2 * T_s);
+	ofdmBuffer. resize (3 * T_s);
 	fineOffset			= 0;	
 	coarseOffset			= 0;	
 	correctionNeeded		= true;
@@ -148,6 +147,8 @@
 	tiiFilter_active = value_i (settings_p, CONFIG_HANDLER,
 	 "tiiFilter", 1) != 0;
 	theOfdmDecoder. handle_decoderSelector (decoder);
+
+	this	-> snr		= 10;	// until we know better
 }
 
 	ofdmHandler::~ofdmHandler () {
@@ -206,12 +207,9 @@
 */
 void	ofdmHandler::run	() {
 timeSyncer	myTimeSyncer (&theReader);
-phaseTable	theTable (p -> dabMode);
 TII_Detector_B	theTIIDetector_OLD (p -> dabMode, &theTable, settings_p);
 TII_Detector_A	theTIIDetector_NEW (p -> dabMode, &theTable);
-freqSyncer	myFreqSyncer (radioInterface_p, p, &theTable,
-	 freqSpeedUp, freqCorrelator);
-estimator	myEstimator (radioInterface_p, p, &theTable);
+freqSyncer	myFreqSyncer (radioInterface_p, p, &theTable);
 correlator	myCorrelator (radioInterface_p, p, &theTable);
 int32_t		startIndex	= -1;
 std::vector<int16_t> softbits;
@@ -219,11 +217,12 @@
 int	sampleCount	= 0;
 int	totalSamples	= 0;
 int	cCount		= 0;
-float	snr		= 0;
 bool	inSync		= false;
 int	tryCounter	= 0;
 Complex tester	T_u / 2;
 int	snrCount	= 0;
+
+	this	-> snr		= 10; 	// until really computed
 	softbits. resize (2 * params. get_carriers());
 	fineOffset		= 0;
 	coarseOffset		= 0;
@@ -307,6 +306,7 @@
 	 startIndex = myCorrelator. findIndex (ofdmBuffer,
 	 correlationOrder,
 	 2.5 * thresHold);
+//
 	 if (nullShower) {
 	 memcpy (&tester T_u / 4, ofdmBuffer. data (),
 	 T_u / 4 * sizeof (Complex));
@@ -325,14 +325,30 @@
 	 }
 	 sampleCount = startIndex;
 	 }
-
+	 
 	 goodFrames ++;
 	 double cLevel	= 0;
 	 cCount	= 0;
+
+//	The size of the ofdm Buffer is large enough to 
+//	read All data of the first block in
+	 theReader. getSamples (ofdmBuffer,
+	 T_u,
+	 startIndex,
+	 coarseOffset + fineOffset, true);
+	 
+	 static int abc = 0;
+	 if (radioInterface_p -> channelOn ()) {
+	 if (++abc > 10) {
+	 generate_CI (ofdmBuffer, startIndex);
+	 abc = 0;
+	 }
+	 }
+//
+//	Then we move the data of the first block to the start of the buffer:
 	 memmove (ofdmBuffer. data (),
 	 &((ofdmBuffer. data()) startIndex),
-	 (T_u - startIndex) * sizeof (Complex));
-	 int ofdmBufferIndex	= T_u - startIndex;
+	 T_u * sizeof (Complex));
 
 //Block_0:
 /**
@@ -342,29 +358,11 @@
 *	first datablock.
 *	We read the missing samples in the ofdm buffer
 */
-	 theReader. getSamples (ofdmBuffer,
-	 ofdmBufferIndex,
-	 T_u - ofdmBufferIndex,
-	 coarseOffset + fineOffset, true);
-	 static int abc = 0;
-	 if (radioInterface_p -> channelOn ()) {
-	 if (++abc > 10) { 
-	 std::vector<Complex> result;
-	 myEstimator. estimate (ofdmBuffer, result);
-	 if (channelBuffer_p != nullptr) {
-	 channelBuffer_p -> putDataIntoBuffer (result. data (),
-	 result. size ());
-	 emit showChannel (result. size ());
-	 }
-	 abc = 0;
-	 }
-	 }
 	 sampleCount	+= T_u;
 	 bool frame_with_TII = 
 	 (p -> dabMode == 1) &&
 	 ((theFicHandler. getCIFcount () & 0x7) == 0);
-	 (void) theOfdmDecoder. processBlock_0 (ofdmBuffer,
-	 frame_with_TII);
+	 (void) theOfdmDecoder. processBlock_0 (ofdmBuffer);
 #ifdef	__MSC_THREAD__
 	 if (!scanMode)
 	 theMscHandler. processBlock_0 (ofdmBuffer. data());
@@ -375,7 +373,7 @@
 	 correctionNeeded = !theFicHandler. syncReached ();
 	 if (correctionNeeded && (tryCounter == 0)) {
 	 int correction	=
-	 myFreqSyncer. estimate_CarrierOffset (ofdmBuffer);
+	 myFreqSyncer. estimateCarrierOffset (ofdmBuffer);
 	 if (correction != 100) {
 	 if (abs (coarseOffset) > Khz (35))
 	 coarseOffset = 0;
@@ -402,7 +400,7 @@
 *	The first ones are the FIC blocks these are handled within
 *	the thread executing this "task", the other blocks
 *	are passed on to be handled in the mscHandler, running
- *	in a different thread.
+ *	possibly in a different thread.
 *	We immediately start with building up an average of
 *	the phase difference between the samples in the cyclic prefix
 *	and the	corresponding samples in the datapart.
@@ -427,7 +425,7 @@
 //	If "eti_on" we process all data here
 	 if (etiOn) {
 	 theOfdmDecoder.
-	 decode (ofdmBuffer, ofdmSymbolCount, softbits);
+	 decode (ofdmBuffer, ofdmSymbolCount, softbits, snr);
 	 if (ofdmSymbolCount <= 3) 
 	 theFicHandler.
 	 processFICBlock (softbits, ofdmSymbolCount);
@@ -445,7 +443,7 @@
 //	the payload at all
 	 if (ofdmSymbolCount <= 3) {
 	 theOfdmDecoder.
- decode (ofdmBuffer, ofdmSymbolCount, softbits);
+ decode (ofdmBuffer, ofdmSymbolCount, softbits, snr);
 	 theFicHandler. 
 processFICBlock (softbits, ofdmSymbolCount);
 	 }
@@ -456,7 +454,7 @@
 #else
 	 if (ofdmSymbolCount >= 4) {
 	 theOfdmDecoder.
-	 decode (ofdmBuffer, ofdmSymbolCount, softbits);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/ofdm-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/ofdm-handler.h Changed

@@ -62,7 +62,8 @@
 	void		stop			();
 
 	void		selectTII		(uint8_t);
-	void		startDumping		(const QString &, int, int);
+	void		startDumping		(const QString &, int, 
+	 int, const QString);
 	void		stopDumping		();
 	bool		startEtiGenerator	(const QString &);
 	void		stopEtiGenerator	();
@@ -104,7 +105,8 @@
 //	for the mscHandler
 //	void		resetServices		();
 //	void		stopService		(descriptorType *, int);
-	void		stopService		(int, int);
+	void		stopService		(const QString &,
+	 int, int);
 	bool		setAudioChannel		(audiodata &,
 	 RingBuffer<std::complex<int16_t>> *,
 	 FILE *, int);
@@ -114,6 +116,7 @@
 	void		handleDecoderSelector	(int);
 	void		setCorrelationOrder	(bool);
 	void		setDXMode		(bool);
+	void		set_dcRemoval		(bool);
 private:
 	RadioInterface		*radioInterface_p;
 	processParams		*p;
@@ -126,9 +129,11 @@
 	etiGenerator		theEtiGenerator;
 	ofdmDecoder		theOfdmDecoder;
 	mscHandler		theMscHandler;
+	phaseTable		theTable;
 
-	uint8_t			selectedTII;
 
+	uint8_t			selectedTII;
+	DABFLOAT		snr;
 	int16_t			tiiThreshold;
 	bool			tiiCollisions_active;
 	bool			tiiFilter_active;
@@ -168,6 +173,9 @@
 	bool			freqSpeedUp;
 	uint8_t			freqCorrelator;
 virtual	void			run		();
+	void			generate_CI	(const std::vector<Complex> &,
+	 int);
+
 signals:
 	void		setSynced		(bool);
 	void		noSignalFound		();

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

@@ -67,6 +67,9 @@
 	dcRemoval	= false;
 	dcReal		= 0;
 	dcImag		= 0;
+	IQ_Real		= 0;
+	IQ_Imag		= 0;
+
 	repetitionCounter	= 8;
 	for (i = 0; i < SAMPLERATE; i ++)
 	 oscillatorTable i = Complex
@@ -83,6 +86,7 @@
 	connect (this, &sampleReader::show_dcOffset,
 	 mr, &RadioInterface::show_dcOffset);
 	running. store (true);
+
 }
 
 	sampleReader::~sampleReader () {
@@ -143,22 +147,24 @@
 	}
 //	OK, we have samples!!
 	for (int i = 0; i < nrSamples; i ++) {
+	 float Alpha	= 1.0 / SAMPLERATE;
 	 std::complex<float> v = buffer i;
-//
 	 if (dcRemoval) {
-	 DABFLOAT real_V = real (v);
-	 DABFLOAT imag_V = imag (v);
-	 dcReal	= average (dcReal, real_V, ALPHA);
-	 dcImag	= average (dcImag, imag_V, ALPHA);
-	 v = Complex (real_V - dcReal, imag_V - dcImag);
-
-	 static int teller = 0;
+	 dcReal		= compute_avg (dcReal, real (v), Alpha);
+	 dcImag		= compute_avg (dcImag, imag (v), Alpha);
+	 v = std::complex<float> (real (v) - dcReal, imag (v) - dcImag);
+	 v = theEqualizer. equalize (v);
+	 DABFLOAT real_V	= abs (real (v));
+	 DABFLOAT imag_V	= abs (imag (v)); 
+	 IQ_Real		= compute_avg (IQ_Real, real_V, Alpha);
+	 IQ_Imag		= compute_avg (IQ_Imag, imag_V, Alpha);
+	 static int teller = 0; 
 	 if (++teller >= SAMPLERATE) {
-	 show_dcOffset ((dcReal + dcImag) / 2);
+	 show_dcOffset (10 * (IQ_Real - IQ_Imag) / 
+	 ((IQ_Real + IQ_Imag) / 2));
 	 teller = 0;
 	 }
 	 }
-	 
 
 //	first: adjust frequency. We need Hz accuracy
 //	Note that "phase" itself might be negative
@@ -185,11 +191,17 @@
 }
 
 void	sampleReader::startDumping (const QString &fileName,
-	 int freq, int bitDepth) {
-	sourceDumper. init (fileName, SAMPLERATE, freq, bitDepth);
+	 int freq, int bitDepth, 
+	 const QString deviceName) {
+	sourceDumper. init (fileName, SAMPLERATE,
+	 freq, bitDepth, deviceName);
 }
 
 void	sampleReader::stopDumping() {
 	sourceDumper.close ();
 }
 
+void	sampleReader::set_dcRemoval	(bool b) {
+	dcRemoval	= b;
+}
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/frontend/sample-reader.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/frontend/sample-reader.h Changed

@@ -33,8 +33,9 @@
 #include	<vector>
 #include	"device-handler.h"
 #include	"ringbuffer.h"
-#include	"wavWriter.h"
-//
+#include	"riffWriter.h"
+
+#include	"equalizer.h"
 // Note:
 // It was found that enlarging the buffersize to e.g. 8192
 // cannot be handled properly by the underlying system.
@@ -55,10 +56,12 @@
 	 void	getSamples	(std::vector<Complex> &v,
 	 int index,
 	 int32_t n, int32_t phase, bool saving);
-	 void	startDumping	(const QString &, int, int);
-	 void	stopDumping();
+	 void	startDumping	(const QString &, int, int, const QString);
+	 void	stopDumping	();
+	 void	set_dcRemoval	(bool);
 private:
-	 wavWriter		sourceDumper;
+	 riffWriter	sourceDumper;
+	 equalizer		theEqualizer;
 	 RadioInterface	*myRadioInterface;
 	 deviceHandler	*theRig;
 	 RingBuffer<Complex> *spectrumBuffer;
@@ -81,6 +84,8 @@
 	 bool		dcRemoval;
 	 DABFLOAT		dcReal;
 	 DABFLOAT		dcImag;
+	 DABFLOAT		IQ_Real;
+	 DABFLOAT		IQ_Imag;
 
 signals:
 	 void		show_spectrum	(int);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/aboutdialog.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/aboutdialog.cpp Changed

@@ -78,7 +78,7 @@
 	ui -> appName 		-> setText ("Qt-DAB");
 	ui -> author 		-> setText(tr("Developed by")+" Jan van Katwijk (<a href=\"mailto:J.vanKatwijk@gmail.com\">J.vanKatwijk@gmail.com</a>)");
 	ui -> author		-> setTextInteractionFlags (Qt::TextBrowserInteraction);
-	ui -> version		-> setText (QString("Version-6.%1").arg ("9.3"));
+	ui -> version		-> setText (QString("Version-6.%1").arg ("9.4"));
 	QString theDate		= QString (__DATE__) + " " + QString (__TIME__);
 	ui -> buildInfo ->	setText (QString ("Built on ") + theDate + QString (", Commit ") + QString (GITHASH) + " with " + support);
 	ui -> sourceLocation	-> setText ("Sources are at <a href=\"https://github.com/JvanKatwijk/qt-dab\">github> </a>");
@@ -103,7 +103,7 @@
 	 "<li> Andreas Mikula, for continuous support </li>" +
 	 "<li> Jarod Middelman, for continuous feedback</li>" +
 	 "<li> Stefan Poeschel, for providing code for saving AAC </li>" +
-	 "<li> Rolf Zerr, for an improved TII decoder </li>" +
+	 "<li> Rolf Zerr, for an improved TII decoder and some other improvements </li>" +
 	 "</ul>");
 //	ui -> configuration -> setTextInteractionFlags (Qt::TextBrowserInteraction);
 	ui -> configuration -> setOpenExternalLinks(true);
@@ -127,14 +127,17 @@
 #ifdef	HAVE_PLUTO 
 "<li>Adalm Pluto device<a href=\"https://www.analog.com/\">Adalm Pluto One</a></li>"
 #endif
+#ifdef	HAVE_RTL_TCP
+			 "<li>Client for RTL_TCP</li>"
+#endif
 #ifdef HAVE_SOAPY
 "<li>Soapy interface<a href=\"https://github.com/pothosware/SoapySDR/wiki\">SoapySDR</a></li>"
 #endif
 #ifdef HAVE_SPYSERVER_16
 "<li>SpyServer interface<a href=\"https://airspy.com/download/\">spyserver</a></li>"
 #endif
- "<li> and has support for reading (and writing) files in different formats.</li>");
-
+ "<li> and has support for reading (and writing) files in different formats, including files (in xml and in RIFF/Raw64 format) with sizes larger than 4 Gb.</li>"
+	"</ul>");
 ui->disclaimer->setText("Copyright © 2016-2024 Jan van Katwijk"
 "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, "

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

@@ -67,6 +67,8 @@
 } decoders = {
 {"decoder_a", DECODER_1},
 {"decoder_b", DECODER_2},
+{"decoder_c", DECODER_3},
+{"decoder_d", DECODER_4},
 {"", 0}
 };
 
@@ -80,16 +82,14 @@
 
 	configHandler::configHandler (RadioInterface *parent,
 	 QSettings *settings):
-	 myFrame (nullptr) {
+	 superFrame (nullptr) {
 	this	-> myRadioInterface	= parent;
 	this	-> dabSettings		= settings;
-	this -> setupUi (&myFrame);
-	setPositionAndSize (settings, &myFrame, CONFIG_HANDLER);
+	this -> setupUi (this);
+	setPositionAndSize (settings, this, CONFIG_HANDLER);
 	hide ();
-	connect (&myFrame, &superFrame::frameClosed,
-	 this, &configHandler::frameClosed);
-	connect (&myFrame, &superFrame::makePicture,
-	 this, &configHandler::handle_mouseClicked);
+//	connect (&myFrame, &superFrame::makePicture,
+//	 this, &configHandler::handle_mouseClicked);
 //	inits of checkboxes etc in the configuration widget,
 //	note that ONLY the GUI is set, values are not used
 	
@@ -167,6 +167,11 @@
 
 	b = value_i (dabSettings, CONFIG_HANDLER, AUTO_HTTP, 9) != 0;
 	this	-> auto_http -> setChecked (b);
+
+	b = value_i (dabSettings, CONFIG_HANDLER,
+	 "dcRemoval", 1) == 1;
+	this -> dcRemoval -> setChecked (b);
+
 	int c = value_i (dabSettings, CONFIG_HANDLER, "tiiCollisions", 0);
 	this	-> tiiCollisions -> setValue (c);
 	b = value_i (dabSettings, CONFIG_HANDLER, TII_FILTER, 1) != 0;
@@ -208,7 +213,7 @@
 	 myRadioInterface, &RadioInterface::handle_tiiFilter);
 	connect (pathButton, &QPushButton::clicked,
 	 this, &configHandler::handle_pathButton);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (auto_http, &QCheckBox::checkStateChanged,
 #else
 	connect (auto_http, &QCheckBox::stateChanged,
@@ -216,19 +221,19 @@
 	 this, &configHandler::handle_auto_http);
 	connect (tiiCollisions, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &configHandler::handle_tiiCollisions);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (tiiFilter, &QCheckBox::checkStateChanged,
 #else
 	connect (tiiFilter, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_tiiFilter);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (tiiSelector, &QCheckBox::checkStateChanged,
 #else
 	connect (tiiSelector, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_tiiSelector);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (allTIISelector, &QCheckBox::checkStateChanged,
 #else
 	connect (allTIISelector, &QCheckBox::stateChanged,
@@ -238,24 +243,16 @@
 	 myRadioInterface, &RadioInterface::process_tiiSelector);
 	connect (activeServices, &clickablelabel::clicked,
 	 myRadioInterface, &RadioInterface::handle_activeServices);
+	connect (this, &configHandler::set_dcRemoval,
+	 myRadioInterface, &RadioInterface::handle_dcRemoval);
 	set_Colors ();
 }
 
 	configHandler::~configHandler	() {
-	if (!myFrame. isHidden ())
-	 storeWidgetPosition (dabSettings, &myFrame, CONFIG_HANDLER);
-}
-
-void	configHandler::show		() {
-	myFrame. show ();
-}
-
-void	configHandler::hide		() {
-	myFrame. hide ();
-}
-
-bool	configHandler::isHidden		() {
-	return myFrame. isHidden ();
+	fprintf (stderr, "Stopping the confighandler\n");
+	if (!this -> isHidden ())
+	 storeWidgetPosition (dabSettings, this, CONFIG_HANDLER);
+	hide ();
 }
 
 void	configHandler::setDeviceList	(const QStringList &sl) {
@@ -395,13 +392,13 @@
 //
 //	Now the checkboxes
 //	top line
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (audioServices_only, &QCheckBox::checkStateChanged,
 #else
 	connect (audioServices_only, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_audioServices_only);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (correlationSelector, &QCheckBox::checkStateChanged,
 #else
 	connect (correlationSelector, &QCheckBox::stateChanged,
@@ -412,7 +409,7 @@
 	int upload = value_i (dabSettings, CONFIG_HANDLER,
 	 "UPLOAD_ENABLED", 0);
 	if (upload != 0)
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	 connect (upload_selector, &QCheckBox::checkStateChanged,
 #else
 	 connect (upload_selector, &QCheckBox::stateChanged,
@@ -420,7 +417,7 @@
 	 this, &configHandler::handle_upload_selector);
 	else
 	 upload_selector -> setEnabled (false);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (logger_selector, &QCheckBox::checkStateChanged,
 #else
 	connect (logger_selector, &QCheckBox::stateChanged,
@@ -429,14 +426,14 @@
 
 //	third line
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (utc_selector, &QCheckBox::checkStateChanged,
 #else
 	connect (utc_selector, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_utc_selector);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (onTop, &QCheckBox::checkStateChanged,
 #else
 	connect (onTop, &QCheckBox::stateChanged,
@@ -445,21 +442,21 @@
 //
 //	fourthline
 //	here we expect the close without asking
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (epg_selector, &QCheckBox::checkStateChanged,
 #else
 	connect (epg_selector, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_epgSelector);
 	connect (localBrowserSelector,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	 &QCheckBox::checkStateChanged,
 #else
 		 &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_localBrowser);
 //
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (etiActivated_selector, &QCheckBox::checkStateChanged,
 #else
 	connect (etiActivated_selector, &QCheckBox::stateChanged,
@@ -467,19 +464,27 @@
 	 myRadioInterface, &RadioInterface::handle_eti_activeSelector);
 //
 //	fifh line
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (showAll_selector, &QCheckBox::checkStateChanged,
 #else
 	connect (showAll_selector, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_showAll_Selector);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
-	connect (saveSlides, &QCheckBox::checkStateChanged,
+//	sixth ine
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect (dcRemoval, &QCheckBox::checkStateChanged,
 #else

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

@@ -35,18 +35,14 @@
 //	In this version, a separate config handler is introduced
 //	that - as the name suggests - controls the configWidget
 
-class	configHandler: public QObject, public Ui_configWidget {
+class	configHandler: public superFrame, public Ui_configWidget {
 Q_OBJECT
 public:
 		configHandler		(RadioInterface *parent,
 	                                 QSettings *settings);
 		~configHandler		();
 
-	void	show			();
-	void	hide			();
-	bool	isHidden		();
 	void	set_connections		();
-
 	void	set_activeServices	(int);
 //
 //	the value extractors
@@ -89,10 +85,11 @@
 	bool	get_audioServices_only	();
 	bool	get_allTIISelector	();
 
+	bool	get_dcRemoval		();
+	bool	get_saveTitles		();
 private:
 	RadioInterface	*myRadioInterface;
 	QSettings	*dabSettings;
-	superFrame	myFrame;
 	int		serviceOrder;
 	void		set_Colors		();
 	void		set_buttonColors	(QPushButton *b,
@@ -138,7 +135,9 @@
 	void	handle_allTIISelector		(int);
 	void	handle_audioServices_only	(int);
 	void	handle_auto_http		(int);
-
+	
+	void	handle_dcRemoval		(int);
+	void	handle_saveTitles		(int);
 	void	handle_tiiCollisions		(int);
 	void	handle_tiiFilter		(int);
 
@@ -157,7 +156,6 @@
 
 	void	set_serviceOrder	(int);
 	void	set_dcRemoval		(bool);
-	void	frameClosed		();
 
 	void	process_tiiCollisions	(int);
 	void	process_tiiFilter	(bool);

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/display-widget.cpp Added

@@ -0,0 +1,618 @@
+#
+/*
+ * Copyright (C) 2016 .. 2023
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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	<QSettings>
+#include	<QDir>
+#include	"display-widget.h"
+#include	"spectrum-scope.h"
+#include	"null-scope.h"
+#include	"correlation-scope.h"
+#include	"channel-scope.h"
+#include	"dev-scope.h"
+#include	"waterfall-scope.h"
+#include	"iqdisplay.h"
+
+#include	"dab-constants.h"
+#include	"position-handler.h"
+#include	"settingNames.h"
+#include	"settings-handler.h"
+
+#define	DISPLAY_WIDGET_SETTINGS	"displayWidget"
+
+	displayWidget::displayWidget	(RadioInterface	*mr,
+	 QSettings	*dabSettings):
+	 myFrame (nullptr),
+	 theFFT (4 * 512, false),
+	 dabSettings_p (dabSettings) {
+	(void)mr;
+	QString settingsHeader	= DISPLAY_WIDGET_SETTINGS;
+	setupUi (&myFrame);
+	setPositionAndSize (dabSettings_p, &myFrame, 
+	 DISPLAY_WIDGET_SETTINGS);
+	connect (&myFrame, &superFrame::frameClosed,
+	 this, &displayWidget::frameClosed); 
+	connect (&myFrame, &superFrame::makePicture, 
+ this, &displayWidget::handle_mouseClicked);
+//
+	myFrame. hide ();
+
+	dcOffset_display	-> show ();
+	dcOffset_label		-> show ();
+//	the "workers"
+	spectrumScope_p		= new spectrumScope	(spectrumDisplay,
+	 512, dabSettings_p);
+	nullScope_p		= new nullScope		(nullDisplay,
+	 512, dabSettings_p);
+	correlationScope_p	= new correlationScope (correlationDisplay,
+	 256, dabSettings_p);
+	TII_Scope_p		= new spectrumScope	(tiiDisplay,
+	 192, dabSettings_p,
+	 true);
+	channelScope_p		= new channelScope	(channelPlot,
+	 NR_TAPS,
+	 dabSettings_p);
+	devScope_p		= new devScope		(devPlot,
+	 512, dabSettings_p);
+	IQDisplay_p		= new IQDisplay		(iqDisplay);
+	waterfallScope_p	= new waterfallScope	(waterfallDisplay,
+	 512, 50);
+//
+//	and the settings for the sliders:
+	int sliderValue		= value_i (dabSettings_p,
+	 DISPLAY_WIDGET_SETTINGS,
+	 "spectrumSlider", 30);
+	spectrumSlider		-> setValue (sliderValue);
+ currentTab		= value_i (dabSettings_p,
+		 DISPLAY_WIDGET_SETTINGS,
+	 "tabSettings", 0);
+ tabWidget		-> setCurrentIndex (currentTab);
+	sliderValue		= value_i (dabSettings_p,
+	 DISPLAY_WIDGET_SETTINGS,
+	 "correlationSlider", 50);
+	correlationSlider	-> setValue (sliderValue);
+	correlationLength -> setValue (500);
+	correlationsVector 	-> 
+	 setStyleSheet (
+	 "QLabel {background-color : green; color: white}");
+
+	sliderValue		=
+	 value_i (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "iqSliderValue", 50);
+	scopeSlider		-> setValue (sliderValue);
+	ncpScope		= 
+	 value_i (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "ncpScope", 0) != 0;
+	if (ncpScope != 0)
+	 ncpScope_checkBox -> setChecked (true);
+	sliderValue		= value_i (dabSettings_p, 
+	 DISPLAY_WIDGET_SETTINGS,
+	 "tiiSlider", 00);
+	tiiSlider		-> setValue (sliderValue);
+	sliderValue		= value_i (dabSettings_p,
+	 DISPLAY_WIDGET_SETTINGS,
+	 "deviationSlider", 0);
+	deviationSlider		-> setValue (sliderValue);
+	sliderValue		= value_i (dabSettings_p,
+	 DISPLAY_WIDGET_SETTINGS,
+		 "channelSlider", 20);
+	channelSlider		-> setValue (sliderValue);
+
+	setMarkers		= value_i (dabSettings_p,
+	 DISPLAY_WIDGET_SETTINGS,
+	 "setMarkers", 0) != 0;
+	show_marksButton	-> 
+	 setStyleSheet (
+	 "background-color : green; color: white");
+	if (setMarkers)
+	 show_marksButton	-> setText ("no markers");
+	else
+	 show_marksButton	-> setText ("set markers");
+//
+	connect (tabWidget, &QTabWidget::currentChanged,
+ this, &displayWidget::switch_tab);
+	connect (IQDisplay_p, qOverload<>(&IQDisplay::rightMouseClick),
+	 this, &displayWidget::rightMouseClick);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	connect (ncpScope_checkBox, &QCheckBox::checkStateChanged,
+#else
+	connect (ncpScope_checkBox, &QCheckBox::stateChanged,
+#endif
+	 this, &displayWidget::handleNcpScope_checkBox);
+	connect (show_marksButton, &QPushButton::clicked,
+	 this, &displayWidget::handleMarksButton);
+//
+	for (int i = 0; i < 2048; i ++)
+	 workingBuffer i = 0; 
+}
+
+	displayWidget::~displayWidget () {
+	if (!myFrame. isHidden ()) {
+	 storeWidgetPosition (dabSettings_p, &myFrame,
+	 DISPLAY_WIDGET_SETTINGS);
+	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "iqSliderValue", scopeSlider -> value ());
+	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "spectrumSlider", spectrumSlider -> value ());
+	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "correlationSlider", correlationSlider -> value ());
+	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "tiiSlider", tiiSlider -> value ());
+	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "deviationSlider", deviationSlider -> value ());
+	 store (dabSettings_p, DISPLAY_WIDGET_SETTINGS,
+	 "channelSlider", channelSlider -> value ());
+	 myFrame. hide	();
+	}
+	delete		spectrumScope_p;
+	delete		waterfallScope_p;
+	delete		nullScope_p;
+	delete		correlationScope_p;
+	delete		TII_Scope_p;
+	delete		channelScope_p;
+	delete		devScope_p;
+	delete		IQDisplay_p;
+}
+
+void	displayWidget::switch_tab	(int t) {
+	currentTab	= t;
+	store (dabSettings_p, DISPLAY_WIDGET_SETTINGS, "tabSettings", t);
+	waterfallScope_p	-> cleanUp ();
+	for (int i = 0; i < 2048; i ++)
+	 workingBuffer i = 0;
+}
+
+int	displayWidget::getTab		() {
+	return currentTab == 0 ? SHOW_SPECTRUM :
+	 currentTab == 1 ? SHOW_CORRELATION :
+	 currentTab == 2 ? SHOW_NULL : 
+	 currentTab == 3 ? SHOW_TII :
+	 currentTab == 4 ? SHOW_CHANNEL : SHOW_STDDEV;
+}
+
+///////////////////////////////////////////////////////////////////////
+//	entries
+///////////////////////////////////////////////////////////////////////
+//
+//	for "spectrum" we get a segment of 2048 timedomain samples
+//	we take the fft and average a little
+void	displayWidget::showSpectrum	(std::vector<Complex> &v, int freq) {
+int	l	= v. size ();

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/display-widget.h Added

@@ -0,0 +1,123 @@
+#
+/*
+ * Copyright (C) 2016 .. 2024
+ * 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
+ */
+#pragma once
+
+#include "dab-constants.h"
+#include	<QObject>
+#include	"qwt-2.h"
+#include	<qwt_plot.h>
+#include	<QVector>
+#include	<QByteArray>
+#include	"fft-handler.h"
+#include	"super-frame.h"
+#include	"db-element.h"
+#include	"ui_scopewidget.h"
+
+#define	SHOW_SPECTRUM		0
+#define	SHOW_CORRELATION	1
+#define	SHOW_NULL		2
+#define	SHOW_TII		3
+#define	SHOW_CHANNEL		4
+#define	SHOW_STDDEV		5
+
+class	RadioInterface;
+class	QSettings;
+
+class	spectrumScope;
+class	waterfallScope;
+class	nullScope;
+class	correlationScope;
+class	devScope;
+class	channelScope;
+class	IQDisplay;
+
+class	displayWidget: public QObject, public Ui_scopeWidget {
+Q_OBJECT
+public:
+		displayWidget	(RadioInterface *,
+	 QSettings *);
+		~displayWidget	();
+	int	getTab		();
+	void	setBitDepth	(int);
+
+	void	setSilent	();
+	void	showSpectrum	(std::vector<Complex> &, int);
+	void	showNULL	(Complex *, int, int);
+	void	showCorrelation	(const std::vector<float> &,
+	 QVector<int> &, int,
+	 std::vector<transmitter> &);
+//	 std::vector<transmitterDesc> &);
+	void	showTII		(std::vector<Complex>, int, int);
+	void	showChannel	(const std::vector<Complex>);
+	void	showStdDev	(const std::vector<float>);
+
+	void	showIQ		(const std::vector<Complex>);
+
+	void	showFICBER	(float);
+	void	showQuality	(float, float, float);
+	void	showCorrector	(int, float);
+	void	showSNR		(float);
+	void	showCorrection	(int);
+	void	showClock_err	(int);
+	void	showFrequency	(const QString &, int);
+
+	void	cleanTII	();
+	void	showCPULoad	(float);
+	void	showTransmitters	(std::vector<transmitter> &);
+
+	void	showDCOffset	(float);
+	void	set_dcRemoval	(bool);
+	void	setSyncLabel	(bool);
+	void	show		();
+	void	hide		();
+	bool	isHidden	();
+
+private:
+	superFrame		myFrame;
+	fftHandler		theFFT;
+	QSettings		*dabSettings_p;
+	spectrumScope		*spectrumScope_p;
+	waterfallScope		*waterfallScope_p;
+	nullScope		*nullScope_p;
+	correlationScope	*correlationScope_p;
+	spectrumScope		*TII_Scope_p;
+	devScope		*devScope_p;
+	channelScope		*channelScope_p;
+	IQDisplay		*IQDisplay_p;
+
+	DABFLOAT		workingBuffer 2048;
+	int			currentTab;
+	int			ncpScope;
+	bool			setMarkers;
+private slots:
+	void		switch_tab		(int);
+	void		rightMouseClick		();
+	void		handleNcpScope_checkBox (int);
+	void		handleMarksButton	();
+	void		handle_mouseClicked	();
+signals:
+	void		mouseClick	();
+	void		frameClosed	();
+};
+
+

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

@@ -154,6 +154,16 @@
 	 }
 }
 
+void	ensembleHandler::selectCurrentItem () {
+int row		= currentRow ();
+int column	= currentColumn	();
+	if ((row < 0) || (row > rowCount ()))
+	 return;
+	if ((column < 0) || (column > 1))
+	 return;
+	clickOnService (row, column);
+}
+
 void	ensembleHandler::clickOnService	(int row, int column) {
 	QTableWidgetItem *theItem_0 = this -> item (row, 0);
 	QString theService	= theItem_0 -> text ();
@@ -161,7 +171,7 @@
 //
 	if (ensembleMode == SHOW_ENSEMBLE) {
 	 QString theMark		= theItem_1 -> text ();
-	 int index = inEnsembleList (theService);
+	 int index			= inEnsembleList (theService);
 	 if (index < 0)	// should not happen
 	 return;
 //
@@ -192,14 +202,17 @@
 	 unSelect ();
 	 int index = inEnsembleList (theService);
 	 this -> clearSelection ();
+//
 	 selectService (ensembleList index. name,
 	 ensembleList index. channel);
-	 if (index >= 0) {		// should not happen
+	 if (index >= 0) {	
 	 ensembleList index. selected = true;
 	 }
 	 }
 	 return;
-	}	// apparently ensembleMode == SHOW_PRESETS
+	}	
+
+//	if w fall through, apparently ensembleMode == SHOW_PRESETS
 
 	if (!handlePresets)	// should not occur
 	 return;
@@ -336,14 +349,15 @@
 //bool	audioOnly	= value_i (ensembleSettings, CONFIG_HANDLER,
 //	 AUDIOSERVICES_ONLY, 1);
 	clearTable ();
+//	setCurrentCell (0, 0);
 	if (ensembleMode == SHOW_ENSEMBLE) {
 	 this -> setHorizontalHeaderLabels (
 	 QStringList () << tr ("service") <<
 	 tr ("fav"));
 	 for (uint16_t i = 0; i < ensembleList. size (); i ++) {
-	 if (!(seems_epg (ensembleList i. name) ||
-	 isAudio (ensembleList i. SId)))
-	 continue;
+//	 if (!(seems_epg (ensembleList i. name) ||
+//	 isAudio (ensembleList i. SId)))
+//	 continue;
 	 bool toMark = false;
 	 if (handlePresets)
 	 toMark = inFavorites (ensembleList i. name) >= 0;
@@ -351,6 +365,9 @@
 	 ensembleList i. channel, toMark, currentRow);
 
 	 if (ensembleList i. selected) {
+	 QTableWidgetItem *theItem = this -> item (currentRow, 0);
+	 setCurrentItem (theItem, QItemSelectionModel::SelectCurrent);
+	 this -> setFocus ();
 	 setFont (MARKED, currentRow);
 	 }
 	 else
@@ -366,6 +383,7 @@
 	 addRow (favorites i. name,
 	 favorites i. channel, true, currentRow);
 	 if (favorites i. selected) {
+	 setCurrentCell (currentRow, 0);
 	 setFont (MARKED, currentRow);
 	 }
 	 else
@@ -507,6 +525,7 @@
 	 this -> insertRow (row);
 	 QTableWidgetItem *item_0 = new QTableWidgetItem;
 	 item_0	-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
+	 item_0	-> setFlags (Qt::ItemIsSelectable|Qt::ItemIsEnabled);
 	 this -> setItem (row, 0, item_0);
 	 QTableWidgetItem *item_1 = new QTableWidgetItem;
 	 this -> item (row, 0) -> setText (service);
@@ -514,12 +533,14 @@
 	 this -> item (row, 0) -> setForeground (QColor(fontColor));
 	 if (ensembleMode == SHOW_PRESETS) {
 	 item_1	-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
+	 item_1	-> setFlags (Qt::ItemIsSelectable|Qt::ItemIsEnabled);
 	 this -> setItem (row, 1, item_1);
 	 this -> item (row, 1) -> setText (channel);
 	 this -> item (row, 1) -> setFont (channelFont);
 	 }
 	 else {
 	 item_1	-> setTextAlignment (Qt::AlignHCenter |Qt::AlignVCenter);
+	 item_1	-> setFlags (Qt::ItemIsSelectable|Qt::ItemIsEnabled);
 	 this -> setItem (row, 1, item_1);
 	 this -> item (row, 1) -> setText (Mark ? "*": " ");
 	 }

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/ensemble-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/ensemble-handler.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/forms-v7/aboutdialog.ui Changed

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

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>513</width>
- <height>405</height>
+ <width>507</width>
+ <height>445</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -177,6 +177,9 @@
 <layout class="QHBoxLayout" name="horizontalLayout">
 <item>
 <widget class="clickablelabel" name="activeServices">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of active (sub)services. Each (sub)service runs in ots own thread.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string>0</string>
 </property>
@@ -577,11 +580,7 @@
 </property>
 </widget>
 </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
+ <item row="4" column="0">
 <widget class="QCheckBox" name="logger_selector">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If set, a log file is maintained (as usual for windows in the folder in the home folder and for Linux in the directory /tmp in a folder/directory Qt-DAB-files) in a txt file :logFile.txt, in which activities such as selecting a device, channel, service, dump are written, preceded by the time of the activity.&lt;/p&gt;&lt;p&gt;The setting of the selector is maintained between program invocations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -591,6 +590,24 @@
 </property>
 </widget>
 </item>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="dcRemoval">
+ <property name="text">
+ <string>dc removal</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QCheckBox" name="saveTitlesSelector">
+ <property name="text">
+ <string>save titles</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
 <widget class="QSpinBox" name="tiiCollisions">
 <property name="toolTip">

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/forms-v7/scopewidget.ui Added

@@ -0,0 +1,585 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>scopeWidget</class>
+ <widget class="QWidget" name="scopeWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>780</width>
+ <height>607</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>spectrumscope</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>301</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tabwidget here contains the tabs for the different scopes, supported by this Qt-DAB implementation&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="currentIndex">
+ <number>3</number>
+ </property>
+ <widget class="QWidget" name="spectr">
+ <attribute name="title">
+ <string>Spectrum</string>
+ </attribute>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QSlider" name="spectrumSlider">
+ <property name="orientation">
+ <enum>Qt::Orientation::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="spectrumDisplay">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>175</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spectrum of the incoming signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="correlation">
+ <attribute name="title">
+ <string>Corr</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QSlider" name="correlationSlider">
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="correlationDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fine time synchronization is by correlation. Ideally the match is on or around the 504-th sample.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="show_marksButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The encoding of the TII data (if any) can be used to get an estimate of the delay of the signal. This estimate (not always very accurate) then can be used to label the peaks in the correlation scope (these peaks can also be used to compute a delay in the arrival of the signal of a particular transmitter) label the peaks in the correlation scope with the TII numbers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>show marks</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="correlationsVector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The result of matching is shown here. The best match is usually with a sample on or around&lt;/p&gt;&lt;p&gt;sample number 504. The other matches - if any - are shown as two numbers, the offset in the input and the additional distance - compared to the distance of the best match - in km.&lt;/p&gt;&lt;p&gt;Note that it is NOT the distance between transmitter and rfeceiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="correlationLength">
+ <property name="minimum">
+ <number>400</number>
+ </property>
+ <property name="maximum">
+ <number>8005</number>
+ </property>
+ <property name="singleStep">
+ <number>50</number>
+ </property>
+ <property name="value">
+ <number>600</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="null period">
+ <attribute name="title">
+ <string>NULL</string>
+ </attribute>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QwtPlot" name="nullDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The samples from the end of the NULL period and the start of the first data block of the DAB frame&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tii scope">
+ <attribute name="title">
+ <string>TII</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QSlider" name="tiiSlider">
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="tiiDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The TII is encoded in the NULL period of a DAB frame. The NULL part is transformed into 1536 carriers, where the data is repeated 4 times, each time in a segment of 384 carriers. The data elements of the TII value are build up in 4 rods, each consisting on two subsequent carriers.&lt;/p&gt;&lt;p&gt;The scope shows the 192 elements of the collapsed data. The TII values are (in some cases) recognizable as 4 rods. The 4 rods are forming a 4 out of 8 code.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="tiiLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="channel">
+ <attribute name="title">
+ <string>channel</string>
+ </attribute>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QSlider" name="channelSlider">
+ <property name="maximum">
+ <number>50</number>
+ </property>
+ <property name="value">
+ <number>20</number>
+ </property>
+ <property name="sliderPosition">
+ <number>20</number>

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/forms-v7/scopewidget.ui-new Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/forms-v7/scopewidget.ui-orig Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/radio.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/radio.cpp Changed

@@ -31,6 +31,7 @@
 #include	<QDir>
 #include	<QColorDialog>
 #include	<QToolTip>
+#include	<QKeyEvent>
 #include	<fstream>
 #include	"dab-constants.h"
 #include	"mot-content-types.h"
@@ -49,7 +50,7 @@
 #include	"mapport.h"
 #include	"techdata.h"
 #include	"aboutdialog.h"
-#include	"cacheElement.h"
+#include	"db-element.h"
 #include	"distances.h"
 #include	"position-handler.h"
 #include	"settings-handler.h"
@@ -68,6 +69,8 @@
 #include	<QScreen>
 #include	<QDomElement>
 
+#include	"basic-print.h"
+
 #if defined (__MINGW32__) || defined (_WIN32)
 #include <windows.h>
 __int64 FileTimeToInt64 (FILETIME & ft) {
@@ -171,13 +174,15 @@
 	 theAudioConverter (this),
 	 theScanlistHandler (this,
 	 scanListFile),
-	 theDeviceChoser (Si),
+	 theErrorLogger (Si),
+	 theDeviceChoser (&theErrorLogger, Si),
 	 theDXDisplay (this, Si),
 	 theLogger	(Si),
 	 theSCANHandler (this, Si,
 	 freqExtension),
 	 theTIIProcessor (tiiFile),
-	 myTimeTable (this, Si) {
+	 myTimeTable (this, Si),
+	 epgVertaler (&theErrorLogger) {
 int16_t k;
 QString h;
 
@@ -252,8 +257,8 @@
 	 if (p. load (":res/radio-pictures/details24.png", "png"))
 	 serviceButton -> setPixmap (p. scaled (30, 30,
 	 Qt::KeepAspectRatio));
-	 else
-	 fprintf (stderr, "Loading details button failed\n");
+	 else 
+	 theErrorLogger. add ("main", "Loading details button failed");
 	 if (p. load (":res/radio-pictures/folder_button.png", "png"))
 	 folder_shower -> setPixmap (p. scaled (30, 30, Qt::KeepAspectRatio));
 	}
@@ -297,11 +302,11 @@
 	 this, &RadioInterface::handle_newDisplayFrame_closed);
 
 #ifdef HAVE_RTLSDR_V3
-	SystemVersion	= QString ("9.3") + " with RTLSDR-V3";
+	SystemVersion	= QString ("9.4") + " with RTLSDR-V3";
 #elif HAVE_RTLSDR_V4
-	SystemVersion	= QString ("9.3") + " with RTLSDR-V4";
+	SystemVersion	= QString ("9.4") + " with RTLSDR-V4";
 #else
-	SystemVersion	= QString ("9.3");
+	SystemVersion	= QString ("9.4");
 #endif
 #if QT_VERSION > QT_VERSION_CHECK (6, 0, 0)
 	version		= "Qt6-DAB-6." + SystemVersion ;
@@ -444,7 +449,9 @@
 	pauzeTimer. setSingleShot (true);
 	connect (&pauzeTimer, &QTimer::timeout,
 	 this, &RadioInterface::show_pauzeSlide);
-
+	stressTimer. setSingleShot (true);
+	connect (&stressTimer, &QTimer::timeout,
+	 this, &RadioInterface::handle_nextServiceButton);
 	myTimeTable. hide ();
 
 	connect (&theScanlistHandler, &scanListHandler::handleScanListSelect,
@@ -561,6 +568,7 @@
 	leftAudio	-> setAlarmEnabled (true); 
 	rightAudio	-> setAlarmEnabled(true);
 
+	journalineKey		= -1;
 //	do we show controls?
 	bool visible	=
 	 value_i (dabSettings_p, DAB_GENERAL, 
@@ -671,6 +679,8 @@
 	 abort ();
 	}
 
+	theOFDMHandler	-> set_dcRemoval (configHandler_p -> get_dcRemoval ());
+	theNewDisplay. set_dcRemoval (configHandler_p -> get_dcRemoval ());
 	channel. cleanChannel ();
 //
 //	Note: this is NOT "theEnsembleHandler. reset ()" !!!!
@@ -717,6 +727,20 @@
 
 ///////////////////////////////////////////////////////////////////////////
 //
+static
+bool	seems_epg (const QString &name) {
+	return name. contains ("-EPG ", Qt::CaseInsensitive) ||
+ name. contains (" EPG ", Qt::CaseInsensitive) ||
+ name. contains ("Spored", Qt::CaseInsensitive) ||
+ name. contains ("NivaaEPG", Qt::CaseInsensitive) ||
+ name. contains ("SPI", Qt::CaseSensitive) ||
+ name. contains ("BBC Guide", Qt::CaseInsensitive) ||
+ name. contains ("BBC Guide", Qt::CaseInsensitive) ||
+ name. contains ("EPG_", Qt::CaseInsensitive) ||
+ name. contains ("EPG-", Qt::CaseInsensitive) ||
+ name. startsWith ("EPG ", Qt::CaseInsensitive);
+}
+//
 //	a slot, called by the fic/fib handlers
 void	RadioInterface::addToEnsemble (const QString &serviceName,
 	 int32_t SId, int subChId) {
@@ -731,7 +755,11 @@
 
 	if (theEnsembleHandler -> alreadyIn (ed))
 	 return;
-
+	if (((SId & 0xFFFF0000) != 0) &&
+	 (configHandler_p -> get_audioServices_only ())) {
+	 if (!seems_epg (serviceName))
+	 return;
+	}
 	bool added	= theEnsembleHandler -> addToEnsemble (ed);
 	if (added) {
 	 channel. nrServices ++;
@@ -809,7 +837,8 @@
 ///////////////////////////////////////////////////////////////////////////
 
 void	RadioInterface::handle_contentButton	() {
-QStringList s	= basicPrint ();
+basicPrint thePrinter;
+QStringList s	= thePrinter. print (theOFDMHandler -> contentPrint ());
 
 	if (contentTable_p != nullptr) {
 	 contentTable_p -> hide ();
@@ -821,13 +850,13 @@
 	
 	contentTable_p		= new contentTable (this, dabSettings_p,
 	 channel. channelName,
-	 scanWidth ());
+	 thePrinter. scanWidth ());
 	connect (contentTable_p, &contentTable::goService,
 	 this, &RadioInterface::handle_contentSelector);
 
 	contentTable_p		-> addLine (headLine);
 	for (auto &tr : channel. transmitters) {
-	 QString transmitterLine = build_transmitterLine (tr. theTransmitter);
+	 QString transmitterLine = build_transmitterLine (tr);
 	 contentTable_p	-> addLine (transmitterLine);
 	}
 
@@ -994,9 +1023,10 @@
 	QString textName = QDir::toNativeSeparators (path_for_files + name);
 
 	FILE *x = fopen (textName. toUtf8 (). data (), "w+b");
-	if (x == nullptr)
-	 fprintf (stderr, "cannot write file %s\n",
-	 textName. toUtf8 (). data ());
+	if (x == nullptr) {
+	 QString t = QString ("problem to open file ") + textName;
+	 theErrorLogger. add ("main", t);
+	}
 	else {
 	 (void)fwrite (result. data (), 1, result.length(), x);
 	 fclose (x);
@@ -1061,9 +1091,11 @@
 	 QDir (). mkpath (temp);	
 	 pict	= QDir::toNativeSeparators (pict);
 	 FILE *x = fopen (pict. toUtf8 (). data (), "w+b");
-	 if (x == nullptr)
-	 fprintf (stderr, "cannot write file %s\n",
-	 pict. toUtf8 (). data ());
+	 if (x == nullptr) {
+	 QString t = QString ("Problem opening picture file (writing) ") +
+	 pict;
+	 theErrorLogger. add ("main", t);
+	 }
 	 else {
 	 theLogger. log (logger::LOG_SLIDE_WRITTEN, pict);
 	 (void)fwrite (data. data(), 1, data.length(), x);
@@ -1276,8 +1308,6 @@
 	theNewDisplay.		hide ();
 	theDXDisplay.		hide ();
 	theEnsembleHandler	-> hide ();
-	configHandler_p		-> hide ();
-	techWindow_p		-> hide ();
 	if (the_aboutLabel != nullptr) {
 	 the_aboutLabel -> hide ();
 	 delete the_aboutLabel;
@@ -1287,6 +1317,8 @@
 	 contentTable_p -> hide ();
 	 delete contentTable_p;
 	}

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/radio.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/radio.h Changed

@@ -70,10 +70,13 @@
 #include	"ensemble-handler.h"
 #include	"config-handler.h"
 #include	"logger.h"
+#include	"errorlog.h"
 
 #include	"ofdm-handler.h"
 
 #include	<QScopedPointer>
+#include	"journaline-datahandler.h"
+
 class	QSettings;
 class	ofdmHandler;
 class	deviceHandler;
@@ -155,6 +158,7 @@
 //
 //	Pretty important, the channel descriptor is supposed to
 //	contain all data related to the currently selected class
+
 class	channelDescriptor {
 public:
 	channelDescriptor () {
@@ -178,42 +182,43 @@
 	int		lto;
 	QString		countryName;
 	int		nrTransmitters;
-	std::vector<transmitterDesc>	transmitters;
+	std::vector<transmitter>	transmitters;
+	QString		transmitterName;
 	int		snr;
 	bool		announcing;
 	position	targetPos;
 	QDate		theDate;
 	int8_t		mainId;
 	int8_t		subId;
-	QString		transmitterName;
 	float		height;
 	float		distance;
 	float		azimuth;
 	bool		audioActive;
 	std::vector<mmDescriptor>servicePictures;
 	void	cleanChannel () {
-	transmitters. resize (0);
-	servicePictures. resize (0);
-	realChannel	= true;
-	serviceCount	= -1;
-	nrServices	= 0;
-	tunedFrequency	= -1;
-	ensembleName	= "";
-	nrTransmitters	= 0;
-	countryName	= "";
-	hasEcc		= false;
-	Eid		= 0;
-	targetPos	= position {0, 0};
-	mainId		= -1;
-	subId		= -1;
-	transmitterName	= "";
-	snr		= 0;
-	announcing	= false;
-	height		= -1;
-	distance	= -1;
-	audioActive	= false;
-	currentService. isValid	= false;
-	currentService. frameDumper	= nullptr;
+	 transmitters. resize (0);
+	 servicePictures. resize (0);
+	 runningTasks. resize (0);
+	 realChannel		= true;
+	 serviceCount		= -1;
+	 nrServices		= 0;
+	 tunedFrequency	= -1;
+	 ensembleName		= "";
+	 nrTransmitters	= 0;
+	 countryName		= "";
+	 hasEcc		= false;
+	 Eid			= 0;
+	 targetPos		= position {0, 0};
+	 mainId		= -1;
+	 subId		= -1;
+	 transmitterName	= "";
+	 snr			= 0;
+	 announcing		= false;
+	 height		= -1;
+	 distance		= -1;
+	 audioActive	 	= false;
+	 currentService. isValid	= false;
+	 currentService. frameDumper	= nullptr;
 	}
 };
 
@@ -237,6 +242,7 @@
 	bool	devScopeOn		();
 protected:
 	bool			eventFilter (QObject *obj, QEvent *event);
+	void			focusInEvent (QFocusEvent *);
 private:
 	FILE			*dlTextFile;
 	RingBuffer<Complex>	theSpectrumBuffer;
@@ -261,6 +267,7 @@
 	converter_48000		theAudioConverter;
 
 	scanListHandler		theScanlistHandler;
+	errorLogger		theErrorLogger;
 	deviceChooser		theDeviceChoser;
 	dxDisplay		theDXDisplay;
 	logger			theLogger;
@@ -269,7 +276,6 @@
 	timeTableHandler	myTimeTable;
 	xmlExtractor		xmlHandler;
 	epgCompiler		epgVertaler;
-
 //	end of variables that are initalized
 
 	QScopedPointer<configHandler>	configHandler_p;
@@ -278,6 +284,8 @@
 	QScopedPointer<deviceHandler>	inputDevice_p;
 	bool			autoStart_http		();
 	bool			dxMode;
+	QScopedPointer<journaline_dataHandler>	journalineHandler;
+	int			journalineKey;
 //
 //	Since the local position does not depend on the channel selected
 //	the local position is not stored in the channel data
@@ -314,6 +322,7 @@
 #endif
 	QTimer			epgTimer;
 	QTimer			pauzeTimer;
+	QTimer			stressTimer;
 	QString			path_for_files;
 #ifdef	_SEND_DATAGRAM_
 	QUdpSocket		dataOut_socket;
@@ -395,8 +404,8 @@
 
 	QString			buildHeadLine		();
 	QString			build_kop		();
-	QString			build_cont_addLine	(transmitterDesc &);
-	QString		 build_transmitterLine	(const cacheElement &);
+	QString			build_cont_addLine	(const transmitter &);
+	QString		 build_transmitterLine	(const transmitter &);
 
 	void			show_for_single_scan	();
 	void			show_for_continuous	();
@@ -427,10 +436,10 @@
 	void			stopScan_continuous	();
 
 	void			setPeakLevel	(const std::vector<float> &);
-	QString			createTIILabel	(const cacheElement *);
-	void			addtoLogFile	(const cacheElement *);
+	QString			createTIILabel	(const transmitter &);
+	void			addtoLogFile	(const transmitter &);
 	void			removeFromList	(uint8_t, uint8_t);
-	cacheElement		*inList		(uint8_t, uint8_t);
+	transmitter		*inList		(uint8_t, uint8_t);
 //
 //	EPG extraction
 	void			extractServiceInformation (const QDomDocument &,
@@ -443,24 +452,18 @@
 
 	void			announcement_start	(uint16_t, uint16_t);	
 	void			announcement_stop	();
+
+	bool			handle_keyEvent		(int);
 //
-//	new printing approach
-	QStringList		basicPrint		();
-	QString			audioHeader		();
-	QString			packetHeader		();
-	QString			audioData		(contentType &);
-	QString			packetData		(contentType &);
-	int			scanWidth		();
 signals:
 	void			select_ensemble_font	();
 	void			select_ensemble_fontSize	();
 	void			select_ensemble_fontColor	();
 
+	void			call_scanButton		();
 public slots:
 	void			lto_ecc			(int, int);
 	void			setFreqList		();
-	void			report_startDir		(int);
-	void			report_completeDir	();
 	void			channelSignal		(const QString &);
 	void			show_dcOffset		(float);
 	void			startScanning		();
@@ -480,7 +483,7 @@
 	void			show_ficQuality		(int, int);
 	void			show_ficBER		(float);
 	void			set_synced		(bool);
-	void			show_label		(const QString &, int);
+	void			showLabel		(const QString &, int);
 	void			handle_motObject	(QByteArray,
 	 QString,
 	 int, bool, bool);
@@ -550,6 +553,10 @@
 	void			handleFramedumpButton	();
 	void			handleAudiodumpButton 	();
 
+	void			startJournaline			(int);
+	void			stopJournaline			(int);
+	void			journalineData			(QByteArray,

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes Added

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/audio-display.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/audio-display.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/channel-scope.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/channel-scope.h Changed

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

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/correlation-scope.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/dev-scope.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/dev-scope.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/iqdisplay.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/iqdisplay.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/null-scope.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/null-scope.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/spectrogramdata.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/spectrogramdata.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/spectrum-scope.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/spectrum-scope.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/waterfall-scope.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/waterfall-scope.cpp-xxx Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/scopes/waterfall-scope.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/snr-viewer Added

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/snr-viewer/snr-viewer.cpp Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/snr-viewer/snr-viewer.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/snr-viewer/snr-widget.ui Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/techdata.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/techdata.cpp Changed

@@ -43,19 +43,21 @@
 		techData::techData	(RadioInterface *mr,
 	 QSettings	*s,
 	 RingBuffer<std::complex<int16_t>> *audioData):
-	 myFrame (nullptr) {
+	 superFrame (nullptr) {
 	myRadioInterface	= mr;
 	dabSettings		= s;
 	this	-> audioData	= audioData;
 
- setupUi (&myFrame);
+ setupUi (this);
 	QString settingsHeader	= TECHDATA_SETTING;
 
-	setPositionAndSize (dabSettings, &myFrame, TECHDATA_SETTING);
+	setPositionAndSize (dabSettings, this, TECHDATA_SETTING);
 
 //	formLayout -> setLabelAlignment (Qt::AlignLeft);
-//	myFrame. setWindowFlag (Qt::Tool, true);
-	myFrame. hide ();
+//
+//	we start being hidden, the radio decides whether we are visible
+//	or not
+	this	-> hide ();
 	timeTable_button	-> setEnabled (false);
 	theAudioDisplay	= new audioDisplay (mr, audio, dabSettings);
 
@@ -82,8 +84,6 @@
 setStyleSheet (temp. arg (audiodumpButton_color,
 audiodumpButton_font));
 
-	connect (&myFrame, &superFrame::frameClosed,
-	 this, &techData::frameClosed);
 	connect (framedumpButton, &smallPushButton::rightClicked,
 this, &techData::colorFramedumpButton);
 connect (audiodumpButton, &smallPushButton::rightClicked,
@@ -99,8 +99,9 @@
 }
 
 		techData::~techData	() {
-	if (!myFrame. isHidden ())
-	 storeWidgetPosition (dabSettings, &myFrame, TECHDATA_SETTING);
+	if (!isHidden ())
+	 storeWidgetPosition (dabSettings, this, TECHDATA_SETTING);
+	hide ();
 	delete theAudioDisplay;
 }
 
@@ -135,18 +136,6 @@
 	bitRateLabel		-> setText (QString::number (ad -> bitRate) + " kbits");
 }
 
-void	techData::show		() {
-	myFrame. show ();
-}
-
-void	techData::hide		() {
-	myFrame. hide ();
-}
-
-bool	techData::isHidden	() {
-	return myFrame. isHidden ();
-}
-
 void	techData::showFrameErrors	(int e) {
 	QPalette p	= frameError_display -> palette();
 	if (100 - 4 * e < 80)
@@ -278,7 +267,7 @@
 std::complex<int16_t> buffer amount;
 
 	audioData -> getDataFromBuffer (buffer, amount);
-	if (myFrame. isHidden ())
+	if (isHidden ())
 	 return;
 	theAudioDisplay -> createSpectrum (buffer, amount, rate);
 	
@@ -390,4 +379,3 @@
 	missedLabel	-> hide ();
 	missedSamples	-> hide ();
 }
-

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/main/techdata.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/main/techdata.h Changed

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

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/protection/uep-protection.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/protection/uep-protection.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/audiosystem-selector.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/audiosystem-selector.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/basic-print.cpp Added

@@ -0,0 +1,156 @@
+#
+/*
+ * Copyright (C) 2016 .. 2024
+ * 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	"basic-print.h"
+#include	"dab-tables.h"
+
+//	the fib decoder passes on the (more or less) raw data,
+//	needed to show the attributes of the different services
+//
+static
+const char *audioHeader =
+	" ; serviceName; serviceId; subChannel; start address (CU's); "\
+	" length (CU's); protection; code rate; bitrate; dab type;" \
+	" language; program type; fm freq;";
+static
+const char *packetHeader =
+	" ; serviceName; serviceId; subChannel; start address (CU's); "\
+	" length (CU's); protection; code rate; appType; FEC_scheme;" \
+	 "packetAddress; DSCTy;";
+
+	basicPrint::basicPrint	()	{}
+
+	basicPrint::~basicPrint	()	{}
+
+QStringList basicPrint::print (QList<contentType> serviceData) {
+QStringList out;
+	bool hasContents = false;
+	for (auto &ct : serviceData) {
+	 if (ct. TMid != 0)	// no audio
+	 continue;
+	 if (!hasContents)
+	 out << QString (audioHeader);
+	 hasContents = true;
+	 out << audioData (ct);
+	}
+	hasContents = false;
+	for (auto &ct : serviceData) {
+	 if (ct. TMid != 3)	// no packet
+	 continue;
+	 if (!hasContents)
+	 out << QString (packetHeader);
+	 hasContents = true;
+	 out << packetData (ct);
+	}
+	return out;
+}
+
+QString	basicPrint::audioData	(contentType &ct) {
+	return QString (ct. isRunning ? "+" : "") + ";" +
+	 QString (ct. serviceName)+ ";" +
+	 QString::number (ct. SId, 16) + ";" +
+	 QString::number (ct. subChId) + ";" +
+	 QString::number (ct. startAddress)+ ";" +
+	 QString::number (ct. length) + ";" +
+	 ct. protLevel + ";" +
+	 ct. codeRate + ";" +
+	 QString::number (ct. bitRate) + ";" +
+	 (ct. ASCTy_DSCTy == DAB_PLUS ? "DAB+" : "DAB") + ";" +
+	 getLanguage (ct. language) + ";" +
+	 getProgramType (ct. programType) + ";" +
+	 ((ct. fmFrequencies. size () > 0) ?
+ QString::number (ct. fmFrequencies 0) : " ");
+}
+
+static
+QString kindOfService (uint8_t DSCTy, uint16_t appType) {
+QString dtype;
+	switch (DSCTy) {
+	 case 1:
+	 return "TMC (unsupported)";
+	 case 2:
+	 return "EWS, (unsupported)";
+	 case 3:
+	 return "ITTS, (unsupported)";
+	 case 4:
+	 return "paging";
+	 case 5 :
+	 if (appType == 0x44a)
+	 return "journaline";
+	 else
+	 if (appType == 1500)
+	 return "adv_adc data";
+	 else
+	 if (appType == 4)
+	 return "tdc data";
+	 else
+	 return "unsupported";
+	 break;
+	 case 24:
+	 return "MPEG-2 Transport stream";
+	 case 44 :
+	 dtype = "journaline";
+	 break;
+	 case 59:
+	 dtype = "ip data";
+	 break;
+	 case 60 :
+	 if (appType == 7)
+	 return "EPG/SPI";
+	 else
+	 return "MOT data";
+	 break;
+	 case 61:
+	 return "Proprietary";
+	 default:
+	 return "unsupported";
+	}
+	return QString ("");
+}
+	
+QString	basicPrint::packetData	(contentType &ct) {
+QString res	= QString (ct. isRunning ? "+" : "") + ";" +
+	 QString (ct. serviceName)+ ";" +
+	 QString::number (ct. SId, 16) + ";" +
+	 QString::number (ct. subChId) + ";" +
+	 QString::number (ct. startAddress)+ ";" +
+	 QString::number (ct. length) + ";" +
+	 ct. protLevel + ";" +
+	 ct. codeRate + ";" +
+	 QString::number (ct. appType) + ";" +
+	 QString::number (ct. FEC_scheme) + ";" +
+	 QString::number (ct. packetAddress) + ";" +
+	 kindOfService (ct. ASCTy_DSCTy, ct. appType) + ";";
+	 return res;
+}
+
+//	We terminate the sequences with a ";", so that is why the
+//	actual number is 1 smaller
+int	basicPrint::scanWidth	() {
+QString s1	= audioHeader;
+QString s2	= packetHeader;
+QStringList l1 = s1. split (";");
+QStringList l2 = s2. split (";");
+	return l1. size () >= l2. size () ? l1. size () -1 : l2. size () - 1;
+}
+

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/basic-print.h Added

@@ -0,0 +1,42 @@
+#
+/*
+ * Copyright (C) 2016 .. 2024
+ * 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
+ */
+
+
+#pragma once
+
+#include	<QList>
+#include	<QString>
+#include	<QStringList>
+#include	"dab-constants.h"
+
+class basicPrint {
+public:
+		basicPrint	();
+		~basicPrint	();
+QStringList	print		(QList<contentType>);
+int		scanWidth	();
+private:
+QString		audioData	(contentType &);
+QString		packetData	(contentType &);
+};
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/charsets.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/charsets.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/converter_48000.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/converter_48000.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/coordinates.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/coordinates.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/coordinates.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/coordinates.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/country-codes.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/country-codes.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/crc-handlers.cpp Added

@@ -0,0 +1,114 @@
+#
+/*
+ * Copyright 2004,2010 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+//
+//	This is a (partial) rewrite of the GNU radio code, for use
+//	within the DAB/DAB+ software
+//
+//	The idea of using the "1021" table, already present in the eti
+//	generator for all "1021" crc (byte) checks is from old-dab
+//	(aka Rolf Zerr)
+//
+
+#include	<stdint.h>
+#include	<cstring>
+#include	"crc-handlers.h"
+
+// g(x)=x^16+x^12+x^5+1 (ITU-T Recommendation X.25).
+static uint16_t const crctab_1021256 = {
+ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
+ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
+ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
+ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
+ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
+ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
+ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
+ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
+ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
+ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
+ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
+ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
+ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
+ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
+ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
+ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
+ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
+ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
+ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
+ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
+ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
+ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
+ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
+ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
+ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
+ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
+ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
+ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
+ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
+ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
+ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
+};
+//
+//	
+uint16_t calc_crc (const uint8_t *data, int length) {
+uint16_t	crc	= 0xFFFF;
+
+	for (int i = 0; i < length; i ++) {
+	 uint32_t temp = (*data++ ^ (crc >> 8)) & 0xff;
+	 crc = crctab_1021 temp ^ (crc << 8);
+	}
+
+	return ~crc & 0xFFFF;
+} 
+
+// the CRC is expected behind the msg pointer + len with length 2 bytes
+bool	check_crc_bytes (const uint8_t *msg, const int len) {
+uint16_t accumulator = calc_crc (msg, len);
+// ok, now check with the crc that is contained in the au
+	const uint16_t crc = (msglen << 8) | msglen + 1;
+	return (crc ^ accumulator) == 0;
+}
+
+//bool	check_crc_bytes (const uint8_t *msg, int32_t len) {
+//uint16_t	accumulator	= 0xFFFF;
+//uint16_t	crc;
+//uint16_t	genpoly		= 0x1021;
+//
+//	for (int i = 0; i < len; i ++) {
+//	 uint16_t xx = msg i;
+//	 int16_t data = xx << 8;
+//	 for (int j = 8; j > 0; j--) {
+//	 if ((data ^ accumulator) & 0x8000)
+//	 accumulator = ((accumulator << 1) ^ genpoly) & 0xFFFF;
+//	 else
+//	 accumulator = (accumulator << 1) & 0xFFFF;
+//	 data = (data << 1) & 0xFFFF;
+//	 }
+//	}
+////
+////	ok, now check with the crc that is contained
+////	in the au
+//	crc	= ~((msg len << 8) | msg len + 1) & 0xFFFF;
+//	return (crc ^ accumulator) == 0;
+//}
+
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/crc-handlers.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/crc-handlers.h Changed

@@ -24,6 +24,15 @@
 //	inline functions for crc handling
 #pragma once
 #include	<stdint.h>
+//
+//	there depend on an large table
+//	calc_crc computes - as the name suggests the crc value
+uint16_t calc_crc	(const uint8_t *data, int length);
+//	check_crc_bytes checks the crc assuming it is contained
+//	in the last 16 bits of the data
+bool	check_crc_bytes (const uint8_t *data, int length);
+
+//	this one is inline
 
 static inline
 bool	check_CRC_bits (const uint8_t *inBuf, int32_t size) {
@@ -58,27 +67,36 @@
 	return Sum == 0;
 }
 
-static inline
-bool	check_crc_bytes (const uint8_t *msg, int32_t len) {
-uint16_t	accumulator	= 0xFFFF;
-uint16_t	crc;
-uint16_t	genpoly		= 0x1021;
 
-	for (int i = 0; i < len; i ++) {
-	 uint16_t xx = msg i;
-	 int16_t data = xx << 8;
-	 for (int j = 8; j > 0; j--) {
-	 if ((data ^ accumulator) & 0x8000)
-	 accumulator = ((accumulator << 1) ^ genpoly) & 0xFFFF;
-	 else
-	 accumulator = (accumulator << 1) & 0xFFFF;
-	 data = (data << 1) & 0xFFFF;
-	 }
-	}
+//static inline
+//bool	check_crc_bytes (const uint8_t *msg, int32_t len) {
+//uint16_t	accumulator	= 0xFFFF;
+//uint16_t	crc;
+//uint16_t	genpoly		= 0x1021;
 //
-//	ok, now check with the crc that is contained
-//	in the au
-	crc	= ~((msg len << 8) | msg len + 1) & 0xFFFF;
-	return (crc ^ accumulator) == 0;
-}
+//uint16_t r1 = calc_crc (msg, len, crctab_1021, 0xFFFF);
+//	for (int i = 0; i < len; i ++) {
+//	 uint16_t xx = msg i;
+//	 int16_t data = xx << 8;
+//	 for (int j = 8; j > 0; j--) {
+//	 if ((data ^ accumulator) & 0x8000)
+//	 accumulator = ((accumulator << 1) ^ genpoly) & 0xFFFF;
+//	 else
+//	 accumulator = (accumulator << 1) & 0xFFFF;
+//	 data = (data << 1) & 0xFFFF;
+//	 }
+//	}
+////
+////	ok, now check with the crc that is contained
+////	in the au
+//	crc	= ~((msg len << 8) | msg len + 1) & 0xFFFF;
+//
+//	static int teller = 0 ;
+//	teller ++;
+//	if (teller > 25) {
+//	 fprintf (stderr, "%x - %x\n", r1, crc);
+//	 teller = 0;
+//	}
+//	return (crc ^ accumulator) == 0;
+//}

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/dab-constants.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/dab-constants.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/dab-params.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/dab-params.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/dab-tables.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/dab-tables.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/db-element.h Added

@@ -0,0 +1,154 @@
+#
+/*
+ * Copyright (C) 2015 .. 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
+ */
+#pragma once
+
+//
+//	In case there is access to a database, the elements of
+//	that database are read in and per line converted to am accessible
+//	struct
+//
+//	we use the "key's" for fast detecting the database index (if any)
+#include	<string>
+#include	<QString>
+#include	"distances.h"
+//
+//	The dbElements are the ones in the database, they contain
+//	the (apparently) static data
+//	keys are added for easyier lookup
+class dbElement {
+public:
+	uint32_t	key_1;	// Eid + mainId + subId
+	uint16_t	key_2;	// channel in Hex format
+	bool		valid;
+//
+//	data returned from the database
+	QString		country;
+	QString		channel;
+	QString		ensemble;
+	uint16_t 	Eid;
+	uint8_t		mainId;
+	uint8_t		subId;
+	QString		transmitterName;
+	float		latitude;
+	float		longitude;
+	float		altitude;
+	float		height;
+	QString		polarization;
+	float		frequency;
+	float		power;
+	QString		direction;
+//
+	dbElement	() {
+	 key_1		= 0;
+	 key_2		= 0;
+	 valid		= false;
+	 ensemble		= "";
+	 country		= "not known";
+	 channel		= "";
+	 ensemble		= "";
+	 Eid			= 0;
+	 mainId		= 255;
+	 subId		= 255;
+	 transmitterName	= "not in database";
+	 latitude		= 0;
+	 longitude		= 0;
+	 power		= 0;
+	 height		= 0;
+	 power		= 0;
+	 polarization		= "";
+	 frequency		= 0;
+	 direction		= "";
+	}
+	~dbElement	()	{}
+};
+
+//
+//	During processing we add some non-static data
+//	and call the stuff "transmitter"
+class	transmitter: public dbElement {
+public:
+//
+//	There are values differing per instance of the 
+//	same transmitter
+	uint16_t	pattern;
+	float		strength;
+	float		distance;
+	float		azimuth;
+	float		phase;
+	bool		norm;
+	bool		collision;
+
+	bool		isStrongest;
+//
+//	for the http driver
+	uint8_t		type;
+	QString		dateTime;
+	transmitter	(const dbElement *dbE) {
+	 country	= dbE -> country;
+ channel	= dbE -> channel;
+	 ensemble	= dbE -> ensemble;
+	 Eid		= dbE -> Eid;
+	 mainId	= dbE -> mainId;
+	 subId	= dbE -> subId;
+	 transmitterName = dbE -> transmitterName;
+	 latitude	= dbE -> latitude;
+	 longitude	= dbE -> longitude;
+	 altitude	= dbE -> altitude;
+	 height	= dbE -> height;
+	 polarization	= dbE -> polarization;
+	 frequency	= dbE -> frequency;
+	 power	= dbE -> power;
+	 direction	= dbE -> direction;
+
+	 phase	= 0;
+	 norm		= false;
+	 collision	= false;
+	 isStrongest	= false;
+	}
+
+	transmitter () {
+	 valid		= false;
+//	 ensemble		= "";
+//	 country		= "not known";
+//	 channel		= "";
+//	 ensemble		= "";
+//	 Eid			= 0;
+//	 mainId		= 255;
+//	 subId		= 255;
+//	 transmitterName	= "not in database";
+//	 latitude		= 0;
+//	 longitude		= 0;
+//	 power		= 0;
+//	 height		= 0;
+//	 power		= 0;
+//	 polarization		= "";
+//	 frequency		= 0;
+//	 direction		= "";
+//	 phase		= 0;
+//	 norm			= false;
+//	 collision		= false;
+//	 isStrongest		= false;
+	}
+	~transmitter	()	{}
+};
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/dl-cache.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/dl-cache.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/dxDisplay.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/dxDisplay.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/dxDisplay.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/dxDisplay.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2024
+ * Copyright (C) 2016 .. 2024
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -17,6 +17,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
+ * along with DAB-library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #pragma once
@@ -28,7 +29,7 @@
 #include	<QObject>
 #include	<QSettings>
 #include	<qwt_compass.h>
-#include	"cacheElement.h"
+#include	"db-element.h"
 class	RadioInterface;
 
 class	dxDisplay:public QFrame {
@@ -37,7 +38,7 @@
 		dxDisplay	(RadioInterface *, QSettings *);
 		~dxDisplay	();
 	void	setChannel	(const QString &, const QString &);
-	void	addRow		(cacheElement &theTransmitter, bool);
+	void	addRow		(transmitter &theTransmitter, bool);
 	void	addRow		(uint8_t, uint8_t, const QString &);
 	void	cleanUp		();
 	void	show		();

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/element-selector.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/element-selector.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/element-selector.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/element-selector.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/equalizer.h Added

@@ -0,0 +1,80 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2025
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of Qt-DAB
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation version 2 of the License.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+//	In an OFDM system such as DAB, IQ imbalance appears as a form of
+//	intercarrier interference (ICI), where the signal from a mirror
+//	subcarrier leaks into the desired subcarrier, and the signal
+//	on the desired subcarrier is scaled and rotated.
+//	This manifests as a distorted constellation diagram at the receiver,
+//	with points appearing scaled and rotated, and also results in
+//	a degraded bit error rate (BER). 
+//
+//	At some point, one of the configured input devices showed a 
+//	large difference in size of the I and Q component.
+//
+//	The  IQ imbalance is blindly detected by correlating the I
+//	and Q paths. The complex result of the complex conjugate product
+//	of the I and Q data path is proportional to the IQ quadrature error.
+//	Any DC offset is removed first and amplitude normalization is provided
+//	by a computed gain component
+//
+//	especially 
+//	https://dsp.stackexchange.com/questions/49136/detecting-i-q-imbalance
+//	is worth reading
+
+#pragma once
+#include	"dab-constants.h"
+
+class	equalizer {
+private:
+DABFLOAT	I_avg;
+DABFLOAT	Q_avg;
+DABFLOAT	IQ_avg;
+DABFLOAT	Q_out;
+DABFLOAT	Alpha_;
+public:
+	equalizer	() {
+	I_avg		= 1.0f;		// meanII
+	Q_avg		= 1.0;
+	IQ_avg		= 1.0f;		// meanIQ
+	Q_out		= 1.0f;		// meanQQ
+	Alpha_		= 1.0 / 2048000.0;
+}
+	~equalizer	() {}
+
+Complex	equalize	(Complex v) {
+	DABFLOAT v_i	= real (v);
+	DABFLOAT v_q	= imag (v);
+	I_avg		= compute_avg (I_avg, square (v_i), Alpha_);
+	Q_avg		= compute_avg (Q_avg, square (v_q), Alpha_);
+	IQ_avg		= compute_avg (IQ_avg, v_i * v_q, Alpha_);
+	DABFLOAT Beta	= -IQ_avg / (sqrt (I_avg) * sqrt (Q_avg));
+	DABFLOAT K	= v_q + Beta * v_i;
+	Q_out		= compute_avg (Q_out, square (K), Alpha_);
+	DABFLOAT Q_gain	= std::sqrt (I_avg / Q_out);
+	return Complex (v_i, K * Q_gain);
+}
+
+};
+
+

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/errorlog.cpp Added

@@ -0,0 +1,54 @@
+#
+/*
+ * Copyright (C) 2015, 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	"errorlog.h"
+#include	"findfilenames.h"
+#include	<QDir>
+
+		errorLogger::errorLogger	(QSettings *settings) {
+findfileNames fileNameFinder (settings);
+
+	this	-> settings	= settings;
+	this	-> logFile	= nullptr;
+	logFileName		= fileNameFinder. basicPath ();
+	if (!logFileName. endsWith ('/'))
+	 logFileName += '/';
+	logFileName	+= "errorlog.txt";
+	logFileName	= QDir::toNativeSeparators (logFileName);
+	logFile			= fopen (logFileName. toLatin1(). data (), "a");
+}
+		errorLogger::~errorLogger	() {
+	if (logFile != nullptr)
+	 fclose (logFile);
+}
+void	errorLogger::add		(const QString deviceName,
+	 const QString theError) {
+	if (logFile == nullptr)
+	 return;
+	QDateTime dateTime	= QDateTime::currentDateTime ();
+	QString date		= dateTime. toString (Qt::ISODate);
+	QString theText		= deviceName + " at " + date +
+	 " -> " + theError;
+	fprintf (logFile, "%s \n", theText. toLatin1 (). data ());
+}
+

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/errorlog.h Added

@@ -0,0 +1,44 @@
+#
+/*
+ * Copyright (C) 2015, 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
+ */
+
+#pragma once
+
+#include	<stdio.h>
+#include	<stdint.h>
+#include	<QString>
+#include	<QSettings>
+#include	<QMutex>
+
+class	errorLogger {
+public:
+		errorLogger	(QSettings *);
+		~errorLogger	();
+	void	add		(const QString deviceName, const QString error);
+private:
+	QSettings	*settings;
+	QString		logFileName;
+	FILE		*logFile;
+	QMutex		locker;
+};
+
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/fft-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/fft-handler.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/gui-elements/super-frame.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/gui-elements/super-frame.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/gui-elements/super-frame.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/gui-elements/super-frame.h Changed

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

@@ -493,7 +493,7 @@
 	return std::string (temp);
 }
 //
-std::string httpHandler::coordinatesToJson (std::vector<httpData> &t) {
+std::string httpHandler::coordinatesToJson (std::vector<transmitter> &t) {
 char buf 512;
 QString Jsontxt;
 
@@ -512,15 +512,15 @@
 	 "{\"type\":%d, \"ensemble\":\"%s\", \"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dateTime\":\"%s\", \"tiiValue\":%d, \"snr\":%f, \"dist\":%d, \"azimuth\":%d, \"power\":%d,\"altitude\":%d, \"height\":%d, \"direction\":\"%s\", \"polarisation\":\"%s\"}",
 	 t 0. type,
 	 t 0. ensemble. toUtf8 (). data (),
-	 dotNumber (t 0. coords. latitude). c_str (),
-	 dotNumber (t 0. coords. longitude). c_str (),
+	 dotNumber (t 0. latitude). c_str (),
+	 dotNumber (t 0. longitude). c_str (),
 	 t 0. transmitterName. toUtf8 (). data (),
-	 t 0. channelName. toUtf8 (). data (),
+	 t 0. channel. toUtf8 (). data (),
 	 t 0. dateTime. toUtf8 (). data (),
 	 (t 0. mainId << 8) | (t 0. subId),
-	 10 * log10 (t 0. snr + 0.01),
-	 t 0. distance,
-	 t 0. azimuth,
+	 10 * log10 (t 0. strength + 0.01),
+	 (int)(t 0. distance),
+	 (int)(t 0. azimuth),
 	 (int)(t 0. power * 100),
 	 (int)(t 0. altitude),
 	 (int)(t 0. height),
@@ -539,29 +539,31 @@
 void	httpHandler::putData	(uint8_t type,
 	 position target) {
 	for (unsigned long i = 0; i < transmitterList. size (); i ++)
-	 if ((transmitterList i. coords. latitude == target. latitude) &&
-	 (transmitterList i. coords. longitude == target. longitude))
+	 if ((transmitterList i. latitude == target. latitude) &&
+	 (transmitterList i. longitude == target. longitude))
 	 return;
 	 
-	httpData t;
+	transmitter t;
 	t. type			= type;
+	t. country		= "unknown";
+	t. channel		= "unknown";
+	t. ensemble		= "unknown";
 	t. Eid			= 0;
-	t. ensemble		= "";
-	t. coords		= target;
-	t. transmitterName	= "";
-	t. channelName		= "";
-	t. dateTime		= "";
-	t. polarization		= "";
-	t. direction		= "";
 	t. mainId		= 0;
 	t. subId		= 0;
-	t. snr			= 0;
-	t. distance		= 0;
-	t. azimuth		= 0;
-	t. power		= 0;
+	t. transmitterName	= "not in database";
 	t. altitude		= 0;
 	t. height		= 0;
+	t. latitude		= target. latitude;
+	t. longitude		= target. longitude;
+	t. polarization		= "";
+	t. power		= 0;
+	t. direction		= "";
 
+	t. strength		= 0;
+	t. distance		= 0;
+	t. azimuth		= 0;
+	t. dateTime		= "";
 	locker. lock ();
 	if (type == MAP_RESET)
 	 transmitterList. resize (0);
@@ -570,52 +572,34 @@
 }
 
 void	httpHandler::putData	(uint8_t	type,
-	 struct transmitterDesc	*theTr,
-	 const QString		&theTime,
-	 const QString		&channelName,
-	 float	 snr) {
-	(void)snr;
-	float latitude	= theTr -> theTransmitter. latitude;
-	float longitude	= theTr -> theTransmitter. longitude;
+	 transmitter	&theTr,
+	 const QString	&theTime) {
+//	 const QString	&channelName,
+//	 float	 snr) {
+	float latitude	= theTr. latitude;
+	float longitude	= theTr. longitude;
 	for (unsigned long i = 0; i < transmitterList. size (); i ++)
-	 if ((transmitterList i. coords. latitude == latitude) &&
-	 (transmitterList i. coords. longitude == longitude ) &&
+	 if ((transmitterList i. latitude == latitude) &&
+	 (transmitterList i. longitude == longitude ) &&
 	 (transmitterList i. type == type))
 	 return;
 
-	 
-	httpData t;
-	t. type			= type;
-	t. ensemble		= theTr -> theTransmitter. ensemble;
-	t. Eid			= theTr -> theTransmitter. Eid;
-	t. coords. latitude	= latitude;
-	t. coords. longitude	= longitude;
-	t. transmitterName	= theTr -> theTransmitter. transmitterName;
-	t. channelName		= channelName;
-	t. dateTime		= theTime;
-	t. polarization		= theTr -> theTransmitter. polarization;
-	t. direction		= theTr -> theTransmitter. direction;
-	t. mainId		= theTr -> theTransmitter. mainId;
-	t. subId		= theTr -> theTransmitter. subId;
-	t. snr			= theTr -> theTransmitter. strength;
-	t. distance		= theTr -> theTransmitter. distance;
-	t. azimuth		= theTr -> theTransmitter. azimuth;
-	t. power		= theTr -> theTransmitter. power;
-	t. altitude		= theTr -> theTransmitter. altitude;
-	t. height		= theTr -> theTransmitter. height;
+	theTr. type		= type;
+	theTr. dateTime		= theTime;
+//	theTr. strength		= snr;
 
 	locker. lock ();
-	transmitterList. push_back (t);
+	transmitterList. push_back (theTr);
+//	transmitterList. push_back (t);
 	locker. unlock ();
-//	fprintf (stderr, "Vectorsize %d\n", transmitterList. size ());
 
 	for (int i = 0; i < (int)(transmitterVector. size ()); i ++) {
 	 if ((transmitterVector. at (i). transmitterName ==
-	 t. transmitterName) &&
-	 (transmitterVector. at (i). channelName ==
-	 t. channelName) &&
+	 theTr. transmitterName) &&
+	 (transmitterVector. at (i). channel ==
+	 theTr. channel) &&
 	 (transmitterVector. at (i). type ==
-	 t. type)) {
+	 theTr. type)) {
 	 return;
 	 }
 	}
@@ -623,20 +607,20 @@
 	if ((saveFile != nullptr) &&
 	 ((type != MAP_RESET) && (type != MAP_FRAME))) {
 	 fprintf (saveFile, "%s; %f; %f; %s; %s; %d; %d; %d; %d; %f, %d, %d, %s\n",
-	 channelName. toUtf8 (). data (),
-	 t. coords. latitude,
-	 t. coords. longitude,
-	 t. transmitterName. toUtf8 (). data (),
-	 t. dateTime. toUtf8 (). data (),
-	 t. mainId,
-	 t. subId,
-	 (int)(t. distance),
-	 (int)(t. azimuth),
-	 t. power,
-	 (int)(t. altitude),
-	 (int)(t. height),
-	 t. direction. toUtf8 (). data ());
-	 transmitterVector. push_back (t);
+	 theTr. channel. toUtf8 (). data (),
+	 theTr. latitude,
+	 theTr. longitude,
+	 theTr. transmitterName. toUtf8 (). data (),
+	 theTr. dateTime. toUtf8 (). data (),
+	 theTr. mainId,
+	 theTr. subId,
+	 (int)(theTr. distance),
+	 (int)(theTr. azimuth),
+	 theTr. power,
+	 (int)(theTr. altitude),
+	 (int)(theTr. height),
+	 theTr. direction. toUtf8 (). data ());
+	 transmitterVector. push_back (theTr);
 	}
 }

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

@@ -33,28 +33,9 @@
 #include	<QString>
 #include	<QSettings>
 #include	"tii-mapper.h"
-#include	"cacheElement.h"
+#include	"db-element.h"
 class	RadioInterface;
-
-typedef struct {
-	uint8_t		type;
-	QString		ensemble;
-	position	coords;
-	QString		transmitterName;
-	QString 	channelName;
-	QString		dateTime;
-	QString		polarization;
-	uint16_t	Eid;
-	uint8_t		mainId;
-	uint8_t		subId;
-	QString		direction;
-	float		snr;
-	int		distance;
-	int		azimuth;
-	float		power;
-	float		altitude;
-	float		height;
-} httpData;
+//
 
 class	httpHandler: public QObject {
 Q_OBJECT
@@ -72,19 +53,16 @@
 	void	run		();
 	void	putData		(uint8_t, position);
 	void	putData		(uint8_t	type,
-	 struct transmitterDesc *theTr,
-	 const QString & theTime,
-	 const QString & channelName,
-	 float snr);
+	 transmitter	&Tr,
+	 const QString & theTime);
 	
 private:
 	QSettings		*dabSettings;
 	FILE			*saveFile;
-	QString			*saveName;
 	RadioInterface		*parent;
 	QString			mapPort;
 	position		homeAddress;
-	std::vector<httpData> transmitterVector;
+	std::vector<transmitter> transmitterVector;
 
 #ifdef	__MINGW32__
 	std::wstring	browserAddress;
@@ -94,8 +72,8 @@
 	std::atomic<bool>	running;
 	std::thread	threadHandle;
 	std::string theMap		(position address);
-	std::string	coordinatesToJson (std::vector<httpData> &t);
-	std::vector<httpData>	transmitterList;
+	std::string	coordinatesToJson (std::vector<transmitter> &t);
+	std::vector<transmitter> transmitterList;
 	std::mutex	locker;
 	bool		autoBrowser_off;
 signals:

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/qwt-2.h Changed

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/riffWriter.cpp Added

@@ -0,0 +1,225 @@
+#
+/*
+ * Copyright (C) 2014 .. 2025
+ * 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
+ */
+//
+//	The RIFF writer writes the input samples into a "wav" file
+//	with the samplerate of SAMPLERATE (2048000), as 16 bit int's, and a "chunk"
+//	(chunk Id "freq") is added that contains the frequency
+//
+//	The BW64 format is derived from Recommendation ITU-R BS.2088-1 (10/2019)
+//	Long-form file format for the international
+//	exchange of audio programme materials with metadata
+
+#include	"riffWriter.h"
+
+static
+const char	* riff	= "RIFF";
+static
+const char	* junk	= "JUNK";
+static
+const char	* bw64	= "BW64";
+static
+const char	* ds64	= "ds64";
+static
+const char	* wave	= "WAVE";
+static
+const char	* fmt	= "fmt ";
+static
+const char	* aux1	= "freq";
+static
+const char	* aux2	= "bits";
+static
+const char	* aux3	= "sys ";
+static
+const char	* data	= "data";
+
+	riffWriter::riffWriter	() {
+	isValid = false;
+}
+
+	riffWriter::~riffWriter	() {}
+//
+//	The riffWriter is used for 
+//	- dumping the source input, i.e. large file with samplerate 2049000
+//	- writing the audio output out
+//	The default values in the init are merely for the source dump
+bool	riffWriter::init	(const QString &fileName, const int sampleRate, 
+	 const int frequency, const int bitDepth,
+	 QString creatorText) {
+	isValid			= false;
+	filePointer		= fopen (fileName. toUtf8 (). data (), "wb");
+	if (filePointer == nullptr)
+	 return false;
+
+	fwrite (riff, 1, 4, filePointer);
+
+//	the ultimate filesize is written at location 4
+	fseek (filePointer, 4, SEEK_CUR);
+
+//	The default header:
+	locationCounter		= 8;
+	fwrite (wave, 1, 4, filePointer);
+	locationCounter		+= 4;
+//
+//	junk block
+	fwrite (junk, 1, 4, filePointer);
+	locationCounter		+= 4;
+	uint32_t junkSize	= 32;
+	fwrite (&junkSize, 1, 4, filePointer);
+	locationCounter		+= 4;
+	char junkNix 32	= {0};
+	fwrite (&junkNix, 1, 32, filePointer);
+	locationCounter		+= 32;
+
+	fwrite (fmt, 1, 4, filePointer);
+	locationCounter		+= 4;
+	uint32_t fmtSize	= 16;
+	fwrite (&fmtSize, 1, 4, filePointer);
+	locationCounter		+= 4;
+	uint16_t	formatTag	= 01;
+	fwrite (&formatTag, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+	uint16_t	nrChannels	= 2;
+	fwrite (&nrChannels, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+	uint32_t	samplingRate	= sampleRate;
+	fwrite (&samplingRate, 1, sizeof (uint32_t), filePointer);
+	locationCounter		+= 4;
+	uint32_t	bytesperSecond	= 4 * samplingRate;
+	fwrite (&bytesperSecond, 1, sizeof (uint32_t), filePointer);
+	locationCounter		+= 4;
+	uint16_t	bytesperBlock	= 4;
+	fwrite (&bytesperBlock, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+	uint16_t bitsperSample		= 16;
+	fwrite (&bitsperSample, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+//
+//	the "freq" chunk
+	if (frequency > 0) {
+	 fwrite (aux1, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 int freqLen		= sizeof (int32_t);
+	 fwrite (&freqLen, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 fwrite (&frequency, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	}
+//
+//	the "bitdepth" chunk
+	if (bitDepth > 0) {
+	 fwrite (aux2, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 int bitDepthLen	= 4;
+	 fwrite (&bitDepthLen, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 fwrite (&bitDepth, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	}
+//	the "creator" chunk
+	if (bitDepth > 0) {
+	 fwrite (aux3, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 int size = strlen (creatorText. toLatin1 (). data ());
+	 locationCounter	+= 4;
+	 fwrite (&size, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 fwrite (creatorText. toLatin1 (). data (), 1, size, filePointer);
+	 locationCounter	+= size;
+	}
+//
+//	start of the "data" chunk
+	fwrite (data, 1, 4, filePointer);
+	locationCounter		+= 4;
+
+	nrElements	= 0;
+	isValid		= true;
+	return true;
+}
+
+void	riffWriter::close	() {
+	if (!isValid)
+	 return;
+	isValid		= false;
+	uint64_t nrBytes	= nrElements * 2 * sizeof (int16_t);
+
+	fprintf (stderr, "nrBytes = %ld\n", nrBytes);
+//	reset the fp to the location where the nr bytes in the
+//	data chunk should be written
+	fseek (filePointer, 0, SEEK_SET);
+	if (nrBytes < (uint64_t)0xFFFFFFFF) {
+//	 fwrite (bw64, 1, 4, filePointer);
+	 fseek (filePointer, locationCounter, SEEK_SET);
+	 fwrite (&nrBytes, 1, 4, filePointer);
+//
+//	compute the number if of to be recorded in the RIFF count
+	 fseek (filePointer, 0, SEEK_END);
+	 int riffSize	= ftell (filePointer) - 8;
+//
+//	and record the value at loc 4
+	 fseek (filePointer, 4, SEEK_SET);
+	 fwrite (&riffSize, 1, 4, filePointer);
+	 fseek (filePointer, 0, SEEK_END);
+	 fclose (filePointer);
+	 return;
+	}
+//	a large file, make it BW64
+	fprintf (stderr, "LARGE FILE\n");
+	uint32_t minusOne = 0xFFFFFFFF;
+	fwrite (bw64, 1, 4, filePointer);
+	fwrite (&minusOne, 1, 4, filePointer);
+	fseek (filePointer, locationCounter, SEEK_SET);
+	fwrite (&minusOne, 1, 4, filePointer);
+//	compute the number if of to be recorded in the RIFF count
+	fseek (filePointer, 0, SEEK_END);
+	uint64_t riffSize	= ftell (filePointer) - 8;
+//	just fill the ds64 struct
+	fseek (filePointer, 12, SEEK_SET);
+	fwrite (ds64, 1, 4, filePointer);
+	fseek (filePointer, 20, SEEK_SET);
+	uint64_t theSize	= riffSize;

qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/riffWriter.h Added

@@ -0,0 +1,52 @@
+#
+/*
+ * Copyright (C) 2016 .. 2025
+ * 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
+ */
+//
+//	This version of riffWriter starts assuming the filesize will remain
+//	below 4 G, if - when closing - it turns out the the file size exceeds
+//	the 4G border, the type is changed into BW64
+
+#pragma once
+
+#include	<QString>
+#include	<stdio.h>
+#include	<stdint.h>
+
+class riffWriter {
+public:
+		riffWriter	();
+		~riffWriter	();
+	bool	init		(const QString &, int,
+	 int bitDepth = 0,
+	 int frequency = 0,
+	 QString creator = "Qt-DAB-6.9.3");
+	void	write		(int16_t *buff, uint64_t samples);
+	void	close		();
+	bool	isActive	();
+private:
+	FILE		*filePointer;
+	uint64_t	nrElements;
+	std::fpos_t	dataPos;
+	bool		isValid;
+	uint64_t	locationCounter;
+};
+

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/scan-handler.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/scan-handler.cpp Changed

@@ -108,16 +108,18 @@
 	scanHandler::scanHandler (RadioInterface *theRadio,
 	                                         QSettings *s,
 	                                         const QString &extFile):
-	                                             myWidget (nullptr),
+	                                             superFrame (nullptr),
 	                                             scanTable (s),
 	                                             filenameFinder (s) {
 	this	-> theRadio		= theRadio;
 	this	-> dabSettings		= s;
 	this	-> selectedBand		= nullptr;
-	this	->  no_scanTables	= false;
+	this	-> no_scanTables	= false;
 #ifndef	__MINGW32__
 	if (extFile != "") 
 	   selectedBand = load_extFile (extFile);
+#else
+	(void)extFile;
 #endif
 	if (selectedBand != nullptr)
 	   no_scanTables	= true;
@@ -170,9 +172,9 @@
 	LV		-> addLayout (LH_2);
 	LV		-> addWidget (scanModeSelector);
 	LV		-> addWidget (contentWidget);
-        myWidget. setLayout (LV);
-	myWidget. setWindowTitle ("scan monitor");
-	setPositionAndSize (dabSettings, &myWidget, SCAN_HANDLER);
+        this ->  setLayout (LV);
+	this ->  setWindowTitle ("scan monitor");
+	setPositionAndSize (dabSettings, this, SCAN_HANDLER);
 
 	if (!no_scanTables)
 	   scanTable. setup_scanTable (selectedBand);
@@ -223,8 +225,8 @@
 }
 
 	scanHandler::~scanHandler () {
-	if (!myWidget. isHidden ())
-	   storeWidgetPosition (dabSettings, &myWidget, SCAN_HANDLER);
+	if (!this ->  isHidden ())
+	   storeWidgetPosition (dabSettings, this, SCAN_HANDLER);
 	clearTable	();
 	scanTable. hide_scanTable ();
         delete  contentWidget;
@@ -252,17 +254,17 @@
 	addRow ();	// for the ensemble name
 }
 
-void	scanHandler::show	() {
-	myWidget. show ();
-}
-
-void	scanHandler::hide	() {
-	myWidget. hide ();
-	scanTable. hide_scanTable ();
-}
+//void	scanHandler::show	() {
+//	myWidget. show ();
+//}
+//
+//void	scanHandler::hide	() {
+//	myWidget. hide ();
+//	scanTable. hide_scanTable ();
+//}
 
 bool	scanHandler::isVisible	() {
-	return !myWidget. isHidden ();
+	return !this ->  isHidden ();
 }
 
 int16_t	scanHandler::addRow () {

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/scan-handler.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/scan-handler.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/tii-mapper.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/tii-mapper.cpp Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/tii-mapper.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/tii-mapper.h Changed

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

@@ -37,7 +37,7 @@
 #define	ENSEMBLE	3
 #define	EID		4
 #define	TII		5
-#define	LOCATION	6
+#define	TRANSMITTERNAME	6
 #define	LATITUDE	7
 #define	LONGITUDE	8
 #define	ALTITUDE	9
@@ -53,14 +53,14 @@
 		tiiReader::~tiiReader	() {
 }
 //
-std::vector<cacheElement> tiiReader::readFile (const QString &s) {
-std::vector<cacheElement> res;
+std::vector<dbElement> tiiReader::readFile (const QString &s) {
+std::vector<dbElement> res;
 	if (s == "") {
 	 return res;
 	}
 
 	res. resize (0);
-	Rflag = s. endsWith ("/.txdata.tii");
+	Rflag = s. endsWith (".txdata.tii");
 	FILE	*f	= fopen (s. toUtf8 (). data (), "r+b");
 #ifdef	__TRACE__
 	if (f == nullptr)
@@ -73,7 +73,7 @@
 #ifdef	__TRACE__
 	fprintf (stderr, "File %s is opened\n", s. toUtf8 (). data ());
 #endif
-	cacheElement ed;
+	dbElement ed;
 	res. push_back (ed);	// the dummy one
 	int	count = 1; 
 	char	buffer 1024;
@@ -82,7 +82,7 @@
 	if (Rflag)
 	 shift	= fgetc (f);
 	while (eread (buffer, 1024, f, shift) != nullptr) {
-	 cacheElement ed;
+	 dbElement ed;
 	 if (feof (f))
 	 break;
 	 columnVector. resize (0);
@@ -96,7 +96,7 @@
 	 ed. subId		= get_subId (columnVector TII);
 	 ed. channel		= columnVector CHANNEL. trimmed ();
 	 ed. ensemble 	= columnVector ENSEMBLE. trimmed ();
-	 ed. transmitterName	= columnVector LOCATION;
+	 ed. transmitterName	= columnVector TRANSMITTERNAME;
 	 ed. latitude		= convert (columnVector LATITUDE);
 	 ed. longitude	= convert (columnVector LONGITUDE);
 	 ed. power		= convert (columnVector POWER);

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/tii-reader.h -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/tii-reader.h Changed

qt-dab-Qt-DAB-6.9.3.tar.gz/sources/support/uploader.cpp -> qt-dab-Qt-DAB-6.9.4.tar.gz/sources/support/uploader.cpp Changed

Difference Between Revision 51 and home:wkazubski / qt-dab