Request 5533 (accepted)

Overview

Request 5533 (accepted)

Update qt-dab to release 4.35

Created by wkazubski almost 3 years ago
In state accepted

Submit qt-dab

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

dab-mini.changes Changed

qt-dab.changes Changed

dab-mini.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package dab-mini
 #
-# Copyright (c) 2014-2021 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2022 Wojciech Kazubski <wk@ire.pw.edu.pl>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 %define bname qt-dab
-%define qtdabversion 4.1.1
+%define sversion 4.35
 
 Name: dab-mini
 Version: 2.0
@@ -24,13 +24,8 @@
 License: GPL-2.0-or-later
 Summary: Simple DAB/DAB+ receiver
 Url: http://www.sdr-j.tk/index.html
-%if 0%{?suse_version}
 Group: Productivity/Multimedia/Other
-%endif
-%if 0%{?fedora}
-Group: Applications/Multimedia
-%endif
-Source0: https://github.com/JvanKatwijk/%{bname}/archive/%{bname}-%{qtdabversion}.tar.gz
+Source0: https://github.com/JvanKatwijk/%{bname}/archive/refs/tags/%{sversion}.tar.gz#/%{bname}-%{sversion}.tar.gz
 Patch1: %{bname}-use-qwt6-qt5.patch
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -45,20 +40,10 @@
 BuildRequires: pkgconfig(samplerate)
 BuildRequires: pkgconfig(sndfile)
 BuildRequires: ImageMagick
-%if 0%{?suse_version}
 BuildRequires: libusb-1_0-devel
 BuildRequires: libfaad-devel
 BuildRequires: update-desktop-files
 BuildRequires: hicolor-icon-theme
-%endif
-%if 0%{?fedora}
-BuildRequires: qt-devel > 4
-BuildRequires: libusb1-devel
-BuildRequires: faad2-devel
-BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
-%define x_qmake qmake-qt4 
-%endif
 
 %description
 This is the implementation of a -relatively simple DAB/DAB+ receiver.
@@ -68,22 +53,19 @@
 
 
 %prep
-%setup -q -n %{bname}-%{bname}-4.11
+%setup -q -n %{bname}-%{sversion}
 %patch1 -p 1
-#rm devices/sdrplay-handler-v2/mirsdrapi-rsp.h
 
 
 %build
-#qmake-qt5 qt-dab.pro
 cd dab-mini
 %cmake \
 -DAIRSPY=ON \
 -DHACKRF=ON \
 -DRTLSDR=ON \
 -DRTLTCP=ON \
- -DSDRPLAY=ON \
- 
-make
+ -DSDRPLAY=ON
+%cmake_build
 
 
 %install
@@ -92,15 +74,8 @@
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}/usr/dabMini-2.0 %{buildroot}%{_bindir}/dabMini
 
-%if 0%{?suse_version}
+#install desktop file
 %suse_update_desktop_file -G Qt-DAB -i dabMini AudioVideo Tuner 
-%endif
-%if 0%{?fedora}
-desktop-file-install \
- --vendor= \
- --dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
-%endif
 
 #create and install icons
 convert %{name}.ico %{name}.png

qt-dab.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package qt-dab
 #
-# Copyright (c) 2014-2021 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2022 Wojciech Kazubski <wk@ire.pw.edu.pl>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,16 @@
 #
 
 %define bname qt-dab
+%define sversion 4.35
 
 Name: %{bname}
-Version: 4.1.1
+Version: 4.3.5
 Release: 0
 License: GPL-2.0-or-later
 Summary: Simple DAB/DAB+ receiver
 Url: http://www.sdr-j.tk/index.html
-%if 0%{?suse_version}
 Group: Productivity/Multimedia/Other
-%endif
-%if 0%{?fedora}
-Group: Applications/Multimedia
-%endif
-Source0: https://github.com/JvanKatwijk/%{name}/archive/%{bname}-%{version}.tar.gz
+Source0: https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{sversion}.tar.gz#/%{name}-%{sversion}.tar.gz
 Patch1: %{bname}-use-qwt6-qt5.patch
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -44,20 +40,10 @@
 BuildRequires: pkgconfig(samplerate)
 BuildRequires: pkgconfig(sndfile)
 BuildRequires: ImageMagick
-%if 0%{?suse_version}
 BuildRequires: libusb-1_0-devel
 BuildRequires: libfaad-devel
 BuildRequires: update-desktop-files
 BuildRequires: hicolor-icon-theme
-%endif
-%if 0%{?fedora}
-BuildRequires: qt-devel > 4
-BuildRequires: libusb1-devel
-BuildRequires: faad2-devel
-BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
-%define x_qmake qmake-qt4 
-%endif
 
 %description
 This is the implementation of a -relatively simple DAB/DAB+ receiver.
@@ -67,39 +53,29 @@
 
 
 %prep
-%setup -q -n %{name}-%{name}-4.11
+%setup -q -n %{name}-%{sversion}
 %patch1 -p 1
-#rm devices/sdrplay-handler-v2/mirsdrapi-rsp.h
 
 
 %build
-#qmake-qt5 qt-dab.pro
 cd dab-maxi
 %cmake \
 -DAIRSPY=ON \
 -DHACKRF=ON \
 -DRTLSDR=ON \
 -DRTLTCP=ON \
- -DSDRPLAY=ON \
- 
-make
+ -DSDRPLAY=ON
+%cmake_build
 
 
 %install
 cd dab-maxi
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/%{name}-4.11 %{buildroot}%{_bindir}/%{name}
+mv %{buildroot}/usr/%{name}-%{sversion} %{buildroot}%{_bindir}/%{name}
 
-%if 0%{?suse_version}
+#install desktop file
 %suse_update_desktop_file -G Qt-DAB -i %{name} AudioVideo Tuner 
-%endif
-%if 0%{?fedora}
-desktop-file-install \
- --vendor= \
- --dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
-%endif
 
 #create and install icons
 convert %{bname}.ico %{name}.png

qt-dab-4.1.1.tar.gz/dab-content.png Deleted

qt-dab-4.1.1.tar.gz/dab-maxi/command.sh Deleted

qt-dab-4.1.1.tar.gz/docs/qt-dab.pdf Deleted

qt-dab-4.1.1.tar.gz/includes/support/ensemble-printer.h Deleted

@@ -1,60 +0,0 @@
-#
-/*
- * Copyright (C) 2013, 2014, 2015, 2016, 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef	__ENSEMBLE_PRINTER__
-#define	__ENSEMBLE_PRINTER__
-//
-//	a simple convenience class to print - whenever the button is
-//	pressed - the content of the ensemble with relevant data.
-//	The output can be viewed (a.o) in LibreOfficeCalc
-#include	<QString>
-#include	<QByteArray>
-#include	"dab-constants.h"
-#include	<vector>
-#include	<cstdint>
-#include	<cstdio>
-
-class	dabProcessor;
-
-class	ensemblePrinter {
-public:
-		ensemblePrinter();
-		~ensemblePrinter();
-	void	showEnsembleData	(QString,
-	 int32_t,
-	 QString,	// time
-	 QByteArray,	// TII data
-	 std::vector<serviceId>,
-	 dabProcessor *,
-	 FILE *);
-	void	showSummaryData		(QString, int32_t,
-	 QString,	// SNR
-	 QString,	// time
-	 QByteArray,	// TII Data
-	 std::vector<serviceId>,	//
-	 dabProcessor	*,
-	 FILE *);
-private:
-	QString	code_to_string		(uint8_t, uint8_t);
-};
-
-#endif

qt-dab-4.1.1.tar.gz/includes/support/scanner-table.h Deleted

@@ -1,59 +0,0 @@
-#
-/*
- * Copyright (C) 2019
- * 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 dab-scanner; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef	__SCANNER_TABLE__
-#define	__SCANNER_TABLE__
-
-#include	<QWidget>
-#include	<QObject>
-#include	<QScrollArea>
-#include	<QTableWidget>
-#include	<QStringList>
-#include	<QTableWidgetItem>
-#include	<QObject>
-#include	<QString>
-#include	<QByteArray>
-class	RadioInterface;
-
-class	scannerTable: QObject {
-Q_OBJECT
-public:
-		scannerTable	(RadioInterface *);
-		~scannerTable	();
-	void	show		();
-	void	hide		();
-	void	newEnsemble	(QString, QString, QString,
-	 QString, QString, QByteArray);
-	void	new_headline	();
-	void	add_to_Ensemble	(QString, QString, QString,
-	 QString, QString, QString);
-	void	clear		();
-	void	dump		(const QString &);
-private:
-	QScrollArea	*myWidget;
-	QTableWidget	*outputWidget;
-	int16_t		addRow	();
-	bool		is_clear;
-};
-
-#endif
-

qt-dab-4.1.1.tar.gz/qt-dab-config-widget.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-epg-widget.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-general-information.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-main-widget.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-scan-result.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-screen.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-terminal-dab.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-tii-spectrum-widget.png Deleted

qt-dab-4.1.1.tar.gz/qt-dab-totaal.png Deleted

qt-dab-4.1.1.tar.gz/qt-usersguide.png Deleted

qt-dab-4.1.1.tar.gz/qt0dab-snrView-widget.png Deleted

qt-dab-4.1.1.tar.gz/schedule.png Deleted

qt-dab-4.1.1.tar.gz/screen-4.11-1.png Deleted

qt-dab-4.1.1.tar.gz/screen-4.11-2.png Deleted

qt-dab-4.1.1.tar.gz/src/backend/data/epg-2/epg-decoder.o Deleted

qt-dab-4.1.1.tar.gz/src/support/ensemble-printer.cpp Deleted

@@ -1,210 +0,0 @@
-#
-/*
- * Copyright (C) 2013, 2014, 2015, 2016, 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB 
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include	<cstdio>
-#include	<QStringList>
-#include	"ensemble-printer.h"
-#include	"country-codes.h"
-#include	"dab-tables.h"
-#include	"text-mapper.h"
-#include	"dab-processor.h"
-
-static
-const char *uep_rates [] = {nullptr, "7/20", "2/5", "1/2", "3/5", "3/4"};
-static
-const char *eep_Arates [] = {nullptr, "1/4", "3/8", "1/2", "3/4"};
-static
-const char *eep_Brates [] = {nullptr, "4/9", "4/7", "4/6", "4/5"};
-
-
-		ensemblePrinter:: ensemblePrinter() {
-}
-
-		ensemblePrinter::~ensemblePrinter() {
-}
-
-QString		ensemblePrinter::code_to_string (uint8_t ecc,
-	 uint8_t countryId) {
-int16_t	i = 0;
-
-	while (countryTable [i]. ecc != 0) {
-	 if ((countryTable [i]. ecc == ecc) &&
-	 (countryTable [i]. countryId == countryId))
-	 return QString (countryTable [i]. countryName);
-	 i ++;
-	}
-	return QString (" ");
-}
-
-static
-QString textfor (QByteArray transmitters) {
-QString s;
-//	fprintf (stderr, "in textfor: transmitters. size = %d\n", transmitters. size ());
-	if (transmitters. size () == 0)
-	 return " ";
-	for (int i = 0; i < transmitters. size (); i += 2)
-	 s = s + " (" + QString::number (transmitters. at (i)) +
-	 "+" + QString::number (transmitters. at (i + 1)) + ")";
-	return s;
-}
-
-void	ensemblePrinter::showSummaryData (QString	channel,
-	 int32_t	freq,
-	 QString	SNR,
-	 QString	theTime,
-	 QByteArray	transmitters,
-	 std::vector<serviceId> Services,
-	 dabProcessor *my_dabProcessor,
-	 FILE		*file_P) {
-uint8_t ecc_byte	= my_dabProcessor -> get_ecc();
-QString	ensembleLabel	= my_dabProcessor -> get_ensembleName();
-int32_t	ensembleId	= my_dabProcessor -> get_ensembleId();
-QString currentChannel	= channel;
-int32_t	frequency	= freq;
-bool	firstData;
-
-	if (ensembleLabel == QString (""))
-	 return;
-
-	fprintf (file_P, "\n\n\n");
-	fprintf (file_P, "%s; %s; %X; frequency %d; transmitterId(s) %s; %s; nr services %d;%s \n\n",
-	 currentChannel. toUtf8(). data(),
-	 ensembleLabel. toUtf8(). data(),
-	 ensembleId,
-	 frequency / 1000,
-	 textfor (transmitters). toLatin1 (). data (),
-	 SNR. toLatin1 (). data (),
-	 Services. size (),
-	 theTime. toUtf8(). data ());
-}
-
-
-
-void	ensemblePrinter::showEnsembleData (QString	channel,
-	 int32_t	freq,
-	 QString	theTime,
-	 QByteArray	transmitters,
-	 std::vector<serviceId> Services,
-	 dabProcessor *my_dabProcessor,
-	 FILE		*file_P) {
-uint8_t	countryId;
-int16_t	i;
-textMapper	theMapper;
-uint8_t ecc_byte	= my_dabProcessor -> get_ecc();
-QString	ensembleLabel	= my_dabProcessor -> get_ensembleName();
-int32_t	ensembleId	= my_dabProcessor -> get_ensembleId();
-QString currentChannel	= channel;
-int32_t	frequency	= freq;
-bool	firstData;
-
-	if (ensembleLabel == QString (""))
-	 return;
-
-	fprintf (file_P, "\n\n\n");
-	fprintf (file_P, "%s; ensembleId %X; channel %s; frequency %d; time of recording %s; tii %s\n\n",
-	 ensembleLabel. toUtf8(). data(),
-	 ensembleId,
-	 currentChannel. toUtf8(). data(),
-	 frequency / 1000,
-	 theTime. toUtf8(). data (),
-	 textfor (transmitters). toLatin1 (). data ());
-	 
-	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");
-
-	for (const auto serv : Services) {
-	 QString audioService = serv. name;
-	 audiodata d;
-	 my_dabProcessor -> dataforAudioService (audioService, &d);
-	 if (!d. defined)
-	 continue;
-	 QString protL	= getProtectionLevel (d. shortForm, 
-	 d. protLevel);
-	 QString codeRate	= getCodeRate (d. shortForm, 
-	 d. protLevel);
-	 countryId = (d. SId >> 12) & 0xF;
-	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%s;%s;%s;%s;%s;\n",
-	 audioService. toUtf8(). data(),
-	 code_to_string (ecc_byte, countryId). toUtf8(). data(),
-	 d. SId,
-	 d. subchId,
-	 d. startAddr,
-	 d. length,
-	 d. bitRate,
-	 d. ASCTy == 077 ? "DAB+" : "DAB",
-	 protL. toUtf8(). data(),
-	 codeRate. toUtf8(). data(),
-	 theMapper. get_programm_language_string (d. language),
-	 theMapper. get_programm_type_string (d. programType) );
-	}
-
-	firstData	= true;
-	for (serviceId dataService: Services) {
-	 for (i = 0; i < 5; i ++) {
-	 packetdata d;
-	 my_dabProcessor -> dataforPacketService (dataService. name,
- &d, i);
-	 if (!d. defined)
-	 continue;
-
-	 if (firstData) {
-	 fprintf (file_P, "\n\n\nData Services\nprogram name;;serviceId;subchannelId;start address;length (CU); bit rate; FEC; prot level; appType ; subService ; \n\n");
-	 firstData = false;
-	 }
-
-	 uint16_t h = d. protLevel;
-	 QString protL;
-	 QString codeRate;
-	 if (!d. shortForm) {
-	 protL = "EEP ";
-	 protL. append (QString::number ((h & 03) + 1));
-	 if ((h & (1 << 2)) == 0) {
-	 protL. append ("-A");
-	 codeRate = eep_Arates [(h & 03) + 1];
-	 }
-	 else {
-	 protL. append ("-B");
-	 codeRate = eep_Brates [(h & 03) + 1];
-	 }
-	 h = (h & 03) + 1;
-	 }
-	 else {
-	 protL = "UEP ";
-	 protL. append (QString::number (h));
-	 codeRate = uep_rates [h];
-	 }
-	 countryId = (d. SId >> (5 * 4)) & 0xF;
-	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%d;%s;%d;%s;;\n",
-	 dataService. name. toUtf8(). data(),
-	 code_to_string (ecc_byte, countryId). toUtf8(). data(),
-	 d. SId,
-	 d. subchId,
-	 d. startAddr,
-	 d. length,
-	 d. bitRate,
-	 d. FEC_scheme,
-	 protL. toUtf8(). data(),
-	 d. appType,
-	 d. compnr == 0 ? "no": "yes");
-	 }
-	}
-}
-

qt-dab-4.1.1.tar.gz/src/support/scanner-table.cpp Deleted

@@ -1,168 +0,0 @@
-#
-/*
- * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
- * 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 <QDataStream>
-#include	"scanner-table.h"
-#include "radio.h"
-
-	scannerTable::scannerTable (RadioInterface *) {
-	myWidget = new QScrollArea (NULL);
- myWidget -> resize (200, 200);
- myWidget -> setWidgetResizable(true);
-	
- outputWidget = new QTableWidget (0, 6);
-	outputWidget	-> setColumnWidth (0, 150);
-	outputWidget	-> setColumnWidth (4, 150);
- myWidget -> setWidget (outputWidget);
- outputWidget	-> setHorizontalHeaderLabels (
-	 QStringList () << tr ("scan result"));
-	is_clear	= true;
-}
-
-	scannerTable::~scannerTable () {
-int16_t i;
-int16_t rows = outputWidget -> rowCount ();
-
-	if (!is_clear)
- for (i = rows; i > 0; i --)
- outputWidget -> removeRow (i - 1);
- delete outputWidget;
- delete myWidget;
-}
-
-void	scannerTable::dump	(const QString &fileName) {
-FILE	*dumpFile;
-	dumpFile	= fopen (fileName. toUtf8 (). data (), "w");
-	if (dumpFile == nullptr)
-	 return;
-
-	for (int i = 0; i < outputWidget -> rowCount (); i ++) {
-	 for (int j = 0; j < outputWidget -> columnCount (); j ++) {
-	 QString t = outputWidget -> item (i, j) -> text ();
-	 fprintf (dumpFile, "%s;", t. toUtf8 (). data ());
-	 }
-	 fprintf (dumpFile, "\n");
-	}
-	fclose (dumpFile);
-}
-
-void	scannerTable::clear	() {
-int	rows	= outputWidget -> rowCount ();
-	if (is_clear)
-	 return;
-	for (int i = rows; i > 0; i --) 
-	 outputWidget -> removeRow (i - 1);
-	is_clear	= true;
-}
-
-void	scannerTable::show	() {
-	myWidget	-> show ();
-}
-
-void	scannerTable::hide	() {
-	myWidget	-> hide ();
-}
-
-int16_t	scannerTable::addRow () {
-int16_t row = outputWidget -> rowCount ();
-
-	is_clear	= false;
- outputWidget -> insertRow (row);
- QTableWidgetItem *item0 = new QTableWidgetItem;
- item0 -> setTextAlignment (Qt::AlignLeft |Qt::AlignVCenter);
- outputWidget -> setItem (row, 0, item0);
-
- QTableWidgetItem *item1 = new QTableWidgetItem;
- item1 -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
- outputWidget -> setItem (row, 1, item1);
-
- QTableWidgetItem *item2 = new QTableWidgetItem;
- item2 -> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
- outputWidget -> setItem (row, 2, item2);
-
- QTableWidgetItem *item3 = new QTableWidgetItem;
- item3 -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
- outputWidget -> setItem (row, 3, item3);
-
- QTableWidgetItem *item4 = new QTableWidgetItem;
- item4 -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
- outputWidget -> setItem (row, 4, item4);
-
- QTableWidgetItem *item5 = new QTableWidgetItem;
- item4 -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
- outputWidget -> setItem (row, 5, item5);
-	return row;
-}
-
-static
-QString textfor (QByteArray transmitters) {
-QString res;
-	if (transmitters. size () == 0)
-	 return " ";
-	for (int i = 0; i < transmitters. size (); i += 2)
-	 res = res + " (" + QString::number (transmitters. at (i)) +
-	 "+" + QString::number (transmitters. at (i + 1)) + ")";
-	return res;
-}
-	
-void	scannerTable::newEnsemble	(QString currentChannel,
-	 QString ensembleName,
-	 QString ensembleId,
-	 QString freq,
-	 QString snr,
-	 QByteArray transmitters) {
-int16_t row	= addRow ();
-	outputWidget	-> item (row, 0) -> setText (currentChannel);
-	outputWidget	-> item (row, 1) -> setText (ensembleName);
-	outputWidget	-> item (row, 2) -> setText (ensembleId);
-	outputWidget	-> item (row, 3) -> setText (freq);
-	outputWidget	-> item (row, 4) -> setText (snr);
-	outputWidget	-> item (row, 5) -> setText (textfor (transmitters));
-}
-
-void	scannerTable::new_headline	() {
-int16_t	row	= addRow ();
-	outputWidget	-> item (row, 0) -> setText ("serviceName");
-	outputWidget	-> item (row, 1) -> setText ("serviceId");
-	outputWidget	-> item (row, 2) -> setText ("type ");
-	outputWidget	-> item (row, 3) -> setText ("bit rate");
-	outputWidget	-> item (row, 4) -> setText ("protection level");
-	outputWidget	-> item (row, 5) -> setText ("code rate");
-}
-
-void	scannerTable::add_to_Ensemble	(QString serviceName,
-	 QString serviceId,
-	 QString dabType,
-	 QString bitRate,
-	 QString protLevel,
-	 QString codeRate) {
-int16_t	row = addRow ();
-
-	outputWidget	-> item (row, 0) -> setText (serviceName);
-	outputWidget	-> item (row, 1) -> setText (serviceId);
-	outputWidget	-> item (row, 2) -> setText (dabType);
-	outputWidget	-> item (row, 3) -> setText (bitRate);
-	outputWidget	-> item (row, 4) -> setText (protLevel);
-	outputWidget	-> item (row, 5) -> setText (codeRate);
-}
-
-

qt-dab-4.1.1.tar.gz/startup.png Deleted

qt-dab-4.1.1.tar.gz/README.md -> qt-dab-4.35.tar.gz/README.md Changed

@@ -1,9 +1,9 @@
-# Qt-DAB-4.11 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)
+# Qt-DAB-4.35 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)
 
-Qt-DAB-4.11 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
+Qt-DAB-4.35 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
 
-![overview](/screen-4.11-2.png?raw=true)
-![4.11](/screen-4.11-1.png?raw=true)
+![overview](/screen-4.35.png?raw=true)
+[4.35](/screen-4.351.png?raw=true)
 
 ------------------------------------------------------------------
 Table of Contents
@@ -36,7 +36,7 @@
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-4.11** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI 2 and up.
+**Qt-DAB-4.35** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI 2 and up.
 
 It provides an abundant amount of selectors and displays, most of
 which can be switched off, but are of interest for those who want to see aspects of the DAB signal and want to be in control.
@@ -74,6 +74,7 @@
   * Detailed information on reception and selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, alternative FM frequency if available, 4 quality bars),
   * Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type) in the service list,
   * Automatic display of TII (Transmitter Identification Information) data when transmitted,
+  * If configured, the TII data is mapped upon a transmitter's name,
   * *Presets* for easy switching of programs in different ensembles (see section *Presets*),
   * *Dumping* of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files or xml file formats and playing them again later (see section on xml format),
   * Saving audio as uncompressed wave files,
@@ -97,7 +98,7 @@
    	- prerecorded dump (*.raw, *.iq and *.sdr),
 	- xml format files.
   * Clean device interface, easy to add other devices, see below.
-  * Scheduling the start of channel:service pairs or operations as frame dump or audio dump, even for unattented operation.
+  * Scheduling the start of channel:service pairs or operations as frame dump or audio dump, even for days ahead
 
 Not yet or partly implemented:
 
@@ -126,9 +127,8 @@
 *tool tips* briefly explaining the (in most cases obvious) function
 of the element (the tooltip on the copyright label shows (a.o) the date the executable was generated.)
 
-New in 4.11 is a button which determines the visibility of the control buttons.
 
-![4.11](/screen-4.11-1.png?raw=true)
+![4.](/mainwidget.png?raw=true)
 
 The elements in the **left part** of the widget, below the list of services,
  are concerned with selecting a channel and a service. To ease operation the channel selector is augmented with a "-" and a "+" button for selecting the previous resp. next channel.
@@ -171,16 +171,15 @@
 
 ![Qt-DAB totaal](/qt-dab-scan.png?raw=true)
 
-Another - an eight' - widget shows when running a *scan*; the widget 
+Another  widget shows when running a *scan*; the widget 
 shows the contents of the ensembles found in the selected channels.
 Since 3.5 the
 possibility exists to save a detailed description of the services
 in the different channels, in a format easy to process with LibreOffice
-or comparable programs.
+or comparable programs (a csv file).
 
-Depending on a setting in the ".ini" file, a logo or slide, transmitted
-as Program Associated Data with the audio transmission, will be shown here or on a separate widget
-(the setting can be modified from the configuration widget).
+Depending on a setting in configuration widget, a logo or slide, transmitted
+as Program Associated Data with the audio transmission, will be shown here or on a separate widget.
 
 ---------------------------------------------------------------------
 dabMini and duoreceiver
@@ -224,7 +223,7 @@
 on configuring for creating an executable (Linux), and even a
 complete description on how to add a device to the configuration.
 
-![Qt-DAB documentation](/qt-usersguide.png?raw=true)
+![Qt-DAB documentation](/qt-dab-manual.png?raw=true)
 
 ----------------------------------------------------------------------
 Presets for Qt-DAB and dabMini
@@ -238,6 +237,8 @@
 to switch to the channel for the service and the service.
 
 The presets are stored in an xml file, `.qt-dab-presets.xml`.
+Removing an entry in the presetlist is by **right-clicking with the
+mouse** on the entry.
 
 ----------------------------------------------------------------------
 Storing gain settings
@@ -334,7 +335,8 @@
 Touching the schedule button on the main widget
 shows a list of services to select from (the services in the currently
 selected channel, and the list of services in the preset list).
-A user specified time can be linked to the selected service.
+A user specified time today or the next days can be linked to the
+selected service.
 
 As additional feature, some operations can be scheduled as well:
 
@@ -351,22 +353,10 @@
 
 ![scheduler](/scheduler.png?raw=true)
 
-For **Linux** there is an additional option: specifying a schedule list
-as parameter in the command line for an **at** command.
-This is especially useful for
-unattended operation. When I have to go out, but want to record
-something on a later time, the feature allows starting
-Qt-DAB ad a specified time and executing the schedule commands.
 
-The sourcetree for dabMaxi contains a file "testfile" and a
-file "command.sh" that can be used as inspiration for specifying
-an unattended operation of Qt-DAB.
-
-As an example
-
-   at 13:45 -f command.sh
-
-will start Qt-DAB  at 13:45 and execute the schedule commands from "testfile".
+Specifying a time and day is stored in a table, maintained between
+program invocations. Of course, on program (re)start. On restart
+all schedule elements on passed dates are removed.
 
 -------------------------------------------------------------------------
 Obsolete properties
@@ -401,30 +391,38 @@
 http::github.com/JvanKatwijk/qt-dab/releases. The appImage contains
 next to the executable qt-dab program, the required libraries.
 
+The precompiled versions, i.e. the AppImage and the Windows setup
+file have the facilities compiled in, but the database used
+might be differently encoded.
+
 Of course it is possible to generate an executable, the 
 aforementioned user's manual
 contains a complete script that can be used to install all required
 libraries, download the sources and build an executable on an Ubuntu
 (Debian) based system.
 
-Since the main OS on the RPI's, has the same roots
-as Ubuntu, the script for Ubuntu can be used to install Qt-DAB
-on an RPI.
-
-Note that the source tree contains two variants next to the Qt-DAB program,
-a **dabMini** program, a dab decoder with a minimal interface, and **dab-2**
-an experimental  variant.
-Both use large parts of the same sources as Qt-DAB does.
- 
-For **dabMini**, an appImage is available for use on an x64 based
-Linux system. The user's manual contains a complete
-script, tested on an RPI 2 and 3 for generating an executable.
-
-**dab-2** is experimental and **NOT** supported
-
-Note that Linux allows connecting audio handlers as "pulse" and "pipewire"
-to bluetooth, making it easy to listen using a bluetooth
-connected soundbar or bluetooth connected ear- or headphomes.
+Qt-DAB-4.30 added as configuration option, the possibility to show
+the name of the tranmitter whose TII  (Transmitter Identification
+Information) is seen, as well as the distance of the receiver to that
+transmitter and the azimuth.
+
+Note that  - since the provider of the database has asked to keep
+the source of the database out of sight, and some "user's" are
+showing contempt to that request - I am unfortunately forced to
+leave the database related code decoupled from the source tree
+and the sources are only available under a restricted license.
+A library in binary formar, containing the functionality, is available for use
+under Linux-x64 and RPI's 
+
+The default for compilation is with  "CONFIG += tiiLib".
+On start up, Qt-DAB will look for the library "libtii-lib.so",
+and - if found - will load the functions from that library.
+If no library is found, Qt-DAB will function without being able to
+map TII data onto transmitter names.
+
+The alternative is to configure for "CONGIG += preCompiled",
+but then you will need some additional source which is only available
+under a restricted license (contact me privately for information)
 
 -----------------------------------------------------------------------
 Interfacing to another SDR device
@@ -531,7 +529,7 @@
 ![epg data](/qt-dab-epg-data.png?raw=true)
 
 The software is experimental though and - at least here - the times
-on the time table are two hours off.
+on the time table in UTC.
 
 -----------------------------------------------------------------------
 Recording the SNR
@@ -599,7 +597,7 @@
 Copyright
 ------------------------------------------------------------------------
 
-	Copyright (C)  2016 .. 2021
+	Copyright (C)  2016 .. 2022
 	Jan van Katwijk (J.vanKatwijk@gmail.com)
 	Lazy Chair Computing

qt-dab-4.1.1.tar.gz/correlation-viewer/correlation-viewer.cpp -> qt-dab-4.35.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

@@ -49,6 +49,8 @@
 	 "white"). toString();
 	curveColor	= QColor (colorString);
 	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
+	int lengthSetting	= dabSettings -> value ("plotLength", 3).
+		 toInt ();
 	dabSettings	-> endGroup ();
 	setupUi (&myFrame);
 
@@ -77,7 +79,11 @@
 Qt::RightButton);
 connect (lm_picker, SIGNAL (selected (const QPointF&)),
 this, SLOT (rightMouseClick (const QPointF &)));
-
+//
+//	set the length of the display
+	correlationLength	-> setValue (lengthSetting);
+	connect (correlationLength, SIGNAL (valueChanged (int)),	
+	 this, SLOT (handle_correlationLength (int)));
 	spectrumCurve. setPen (QPen(curveColor, 2.0));
 	spectrumCurve. setOrientation (Qt::Horizontal);
 	spectrumCurve. setBaseline	(0);
@@ -143,8 +149,10 @@
 	if (myFrame. isHidden())
 	 return;
 
+	dabSettings	-> beginGroup ("correlationViewer");
 	int plotLength	= dabSettings -> value ("plotLength",
-	 10). toInt () * 100;
+	 5). toInt () * 100;
+	dabSettings	-> endGroup ();
 	if (plotLength > 1024)
 	 plotLength = 1024;
 	double X_axis	[plotLength];
@@ -180,7 +188,6 @@
 	 for (int i = 0; i < v. size (); i ++)
 	 theText += QString::number (v. at (i)) + " ";
 	}
-	theText += "Selected sample " + QString::number (marker);
 	indexDisplay -> setText (theText);
 }
 
@@ -236,3 +243,9 @@
 	plotgrid	-> setCanvasBackground (this -> displayColor);
 }
 
+void	correlationViewer::handle_correlationLength	(int l) {
+	dabSettings	-> beginGroup ("correlationViewer");
+	dabSettings	-> setValue ("plotLength", l);
+	dabSettings	-> endGroup ();
+}
+

qt-dab-4.1.1.tar.gz/correlation-viewer/correlation-viewer.h -> qt-dab-4.35.tar.gz/correlation-viewer/correlation-viewer.h Changed

qt-dab-4.1.1.tar.gz/correlation-viewer/correlation-widget.ui -> qt-dab-4.35.tar.gz/correlation-viewer/correlation-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>330</width>
- <height>206</height>
+ <width>345</width>
+ <height>227</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -28,14 +28,31 @@
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="indexDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter is detected, the relative distance - in msec - is shown between the arrival time of the data of the transmitter that is used, and the arrival time of the data of the other transmitter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="indexDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter is detected, the relative distance - in msec - is shown between the arrival time of the data of the transmitter that is used, and the arrival time of the data of the other transmitter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="correlationLength">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>7</number>
+ </property>
+ <property name="value">
+ <number>3</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </widget>

qt-dab-4.1.1.tar.gz/dab-maxi/CMakeLists.txt -> qt-dab-4.35.tar.gz/dab-maxi/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-4.11)
+set (objectName qt-dab-4.35)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -194,6 +194,7 @@
 	           ../includes/backend/data/journaline
 	           ../includes/backend/data/mot
 	           ../includes/support
+	           ../src/support/tii-library
 	           ../includes/support/viterbi-jan
 	           ../includes/support/viterbi-spiral
 	           ../includes/output
@@ -215,7 +216,7 @@
 	     ../service-description/service-descriptor.h 
 	     ../service-description/audio-descriptor.h 
 	     ../service-description/data-descriptor.h 
-             ../includes/country-codes.h
+//           ../includes/country-codes.h
 	     ../includes/dab-constants.h
 	     ../includes/mot-content-types.h 
              ../includes/ofdm/sample-reader.h
@@ -272,7 +273,6 @@
 	     ../includes/support/band-handler.h
 	     ../includes/support/text-mapper.h
 	     ../includes/support/dab-tables.h
-	     ../includes/support/ensemble-printer.h
 	     ../includes/support/viterbi-jan/viterbi-handler.h
 	     ../includes/support/viterbi-spiral/viterbi-spiral.h
 	     ../includes/support/preset-handler.h
@@ -284,14 +284,17 @@
 	     ../includes/support/verysmallpushbutton.h
 	     ../includes/support/smallcombobox.h
 	     ../includes/support/history-handler.h
-	     ../includes/support/scanner-table.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
 	     ../includes/support/element-selector.h
 	     ../includes/support/time-table.h
 	     ../includes/support/findfilenames.h
+	     ../includes/support/content-table.h
 	     ../includes/support/dl-cache.h
+	     ../includes/support/ITU_Region_1.h
+	     ../includes/support/coordinates.h
+	     ../src/support/tii-library/tii-codes.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
@@ -324,6 +327,7 @@
 	     ../src/ofdm/fib-decoder.cpp
 	     ../src/ofdm/fic-handler.cpp
 	     ../src/ofdm/tii_detector.cpp
+	     ../src/ofdm/channel.cpp
 	     ../src/ofdm/timesyncer.cpp
 	     ../src/protection/protTables.cpp
 	     ../src/protection/protection.cpp
@@ -364,7 +368,6 @@
 	     ../src/support/band-handler.cpp
 	     ../src/support/text-mapper.cpp
 	     ../src/support/dab-tables.cpp
-	     ../src/support/ensemble-printer.cpp
 	     ../src/support/preset-handler.cpp
 	     ../src/support/presetcombobox.cpp
 	     ../src/support/smallqlistview.cpp
@@ -376,13 +379,16 @@
 	     ../src/support/history-handler.cpp
 	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
-	     ../src/support/scanner-table.cpp
 	     ../src/support/color-selector.cpp
 	     ../src/support/scheduler.cpp
 	     ../src/support/schedule-selector.cpp
 	     ../src/support/element-selector.cpp
 	     ../src/support/time-table.cpp
 	     ../src/support/findfilenames.cpp
+	     ../src/support/content-table.cpp
+	     ../src/support/ITU_Region_1.cpp
+	     ../src/support/coordinates.cpp
+	     ../src/support/tii-library/tii-codes.cpp
 	     ../src/scopes-qwt6/iqdisplay.cpp 
 	     ../spectrum-viewer/spectrum-viewer.cpp 
 	     ../correlation-viewer/correlation-viewer.cpp 
@@ -409,6 +415,7 @@
 	     ../includes/ofdm/fib-decoder.h
 	     ../includes/ofdm/fic-handler.h
 	     ../includes/ofdm/tii_detector.h
+	     ../includes/ofdm/channel.h
 	     ../includes/backend/msc-handler.h
 	     ../includes/backend/backend.h
 	     ../includes/backend/audio/mp2processor.h
@@ -432,12 +439,13 @@
 	     ../includes/support/verysmallpushbutton.h
 	     ../includes/support/smallcombobox.h
 	     ../includes/support/history-handler.h
-	     ../includes/support/scanner-table.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/scheduler.h
 	     ../includes/support/schedule-selector.h
 	     ../includes/support/element-selector.h
 	     ../includes/support/time-table.h
+	     ../includes/support/content-table.h
+	     ../includes/support/coordinates.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h

qt-dab-4.35.tar.gz/dab-maxi/library Added

qt-dab-4.35.tar.gz/dab-maxi/library/LICENSE Added

qt-dab-4.35.tar.gz/dab-maxi/library/libtii-lib.so Added

qt-dab-4.1.1.tar.gz/dab-maxi/main.cpp -> qt-dab-4.35.tar.gz/dab-maxi/main.cpp Changed

qt-dab-4.1.1.tar.gz/dab-maxi/qt-dab.pro -> qt-dab-4.35.tar.gz/dab-maxi/qt-dab.pro Changed

@@ -27,6 +27,12 @@
 
 TRANSLATIONS = i18n/de_DE.ts
 
+#
+#       For more parallel processing, uncomment the following
+#       defines
+#DEFINES        += __MSC_THREAD__
+#DEFINES        +=  __THREADED_BACKEND
+
 DEPENDPATH += . \
 	      ../src \
 	      ../includes \
@@ -95,7 +101,6 @@
 	   ../service-description/data-descriptor.h \
 	   ../includes/dab-constants.h \
 	   ../includes/mot-content-types.h \
-	   ../includes/country-codes.h \
 	   ../includes/ofdm/timesyncer.h \
 	   ../includes/ofdm/sample-reader.h \
 	   ../includes/ofdm/ofdm-decoder.h \
@@ -151,12 +156,10 @@
 	   ../includes/support/viterbi-spiral/viterbi-spiral.h \
            ../includes/support/fft-handler.h \
 	   ../includes/support/ringbuffer.h \
-#	   ../includes/support/Xtan2.h \
 	   ../includes/support/dab-params.h \
 	   ../includes/support/band-handler.h \
 	   ../includes/support/text-mapper.h \
 	   ../includes/support/dab-tables.h \
-	   ../includes/support/ensemble-printer.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/presetcombobox.h \
 	   ../includes/support/smallcombobox.h \
@@ -166,7 +169,6 @@
 	   ../includes/support/smallqlistview.h \
 	   ../includes/support/smallspinbox.h \
 	   ../includes/support/history-handler.h \
-	   ../includes/support/scanner-table.h \
 	   ../includes/support/color-selector.h \
 	   ../includes/support/scheduler.h \
 	   ../includes/support/schedule-selector.h \
@@ -174,6 +176,9 @@
 	   ../includes/support/time-table.h \
 	   ../includes/support/findfilenames.h \
 	   ../includes/support/dl-cache.h \
+	   ../includes/support/content-table.h \
+	   ../includes/support/ITU_Region_1.h \
+	   ../includes/support/coordinates.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../spectrum-viewer/spectrum-viewer.h \
@@ -259,12 +264,10 @@
 	   ../src/support/viterbi-jan/viterbi-handler.cpp \
 	   ../src/support/viterbi-spiral/viterbi-spiral.cpp \
            ../src/support/fft-handler.cpp \
-#	   ../src/support/Xtan2.cpp \
 	   ../src/support/dab-params.cpp \
 	   ../src/support/band-handler.cpp \
 	   ../src/support/text-mapper.cpp \
 	   ../src/support/dab-tables.cpp \
-	   ../src/support/ensemble-printer.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
 	   ../src/support/smallcombobox.cpp \
@@ -274,13 +277,15 @@
 	   ../src/support/smallqlistview.cpp \
 	   ../src/support/smallspinbox.cpp \
 	   ../src/support/history-handler.cpp \
-	   ../src/support/scanner-table.cpp \
 	   ../src/support/color-selector.cpp \
 	   ../src/support/scheduler.cpp \
 	   ../src/support/schedule-selector.cpp \
 	   ../src/support/element-selector.cpp \
 	   ../src/support/time-table.cpp \
 	   ../src/support/findfilenames.cpp \
+	   ../src/support/content-table.cpp \
+	   ../src/support/ITU_Region_1.cpp \
+	   ../src/support/coordinates.cpp \
 	   ../src/scopes-qwt6/iqdisplay.cpp \
 	   ../spectrum-viewer/spectrum-viewer.cpp \
 	   ../correlation-viewer/correlation-viewer.cpp \
@@ -299,7 +304,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-4.11
+TARGET		= qt-dab-4.35
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -340,6 +345,10 @@
 #CONFIG		+= colibri
 CONFIG		+= faad
 #CONFIG		+= fdk-aac
+#CONFIG		+= JAN
+#CONFIG		+= preCompiled
+CONFIG		+= tiiLib
+#CONFIG		+= noTables
 #very experimental, simple server for connecting to a tdc handler
 #CONFIG		+= datastreamer
 #to handle output of embedded an IP data stream, uncomment
@@ -374,7 +383,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-4.11
+#	TARGET		= qt-dab64-4.35
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -394,7 +403,7 @@
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-4.11
+	TARGET		= qt-dab32-4.35
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
@@ -410,6 +419,9 @@
 	CONFIG		+= pluto-2
 	CONFIG		+= NO_SSE
 	DEFINES		+= __THREADED_BACKEND
+#	CONFIG		+= noTables
+#	CONFIG		+= JAN
+	CONFIG		+= preCompiled
 #
 #	end of 32/64 specifics
 INCLUDEPATH	+= /usr/local/include
@@ -439,7 +451,7 @@
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
-CONFIG		+= try-epg		# do not use
+CONFIG	+= try-epg		# do not use
 DEFINES	+= __DUMP_SNR__		# for experiments only
 }
 #	devices
@@ -727,4 +739,31 @@
 	LIBS		+= -lfdk-aac
 }
 
+JAN	{
+	DEFINES		+= __WITH_JAN__
+	INCLUDEPATH	+= /usr/include/eigen3
+	HEADERS		+= ../includes/ofdm/channel.h 
+	SOURCES		+= ../src/ofdm/channel.cpp
+}
+
+preCompiled {
+	LIBS		+= -lcurl
+	INCLUDEPATH	+= /home/jan/curl
+	INCLUDEPATH	+= ../../TII-CODES
+	HEADERS		+= ../../TII-CODES/tii-codes.h
+	SOURCES		+= ../../TII-CODES/tii-codes.cpp
+}
+
+tiiLib	{
+	INCLUDEPATH	+= ../src/support/tii-library
+	HEADERS		+= ../src/support/tii-library/tii-codes.h
+	SOURCES		+= ../src/support/tii-library/tii-codes.cpp
+}
+
+noTables {
+	INCLUDEPATH	+= ../src/support/tii-codes
+	HEADERS		+= ../src/support/tii-codes/tii-codes.h
+	SOURCES		+= ../src/support/tii-codes/tii-codes.cpp
+}
+

qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp -> qt-dab-4.35.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp Changed

@@ -47,13 +47,13 @@
 	setupUi (&myFrame);
 	myFrame. show		();
 
-	airspySettings	-> beginGroup ("airspySettings");
+	airspySettings		-> beginGroup ("airspySettings");
 	int16_t temp 		= airspySettings -> value ("linearity", 10).
-	 toInt();
+	 toInt();
 	linearitySlider		-> setValue (temp);
 	linearityDisplay	-> display (temp);
 	temp			= airspySettings -> value ("sensitivity", 10).
-	 toInt();
+	 toInt();
 	sensitivitySlider	-> setValue (temp);
 	sensitivityDisplay	-> display (temp);
 
@@ -209,13 +209,16 @@
 	convBufferSize		= selectedRate / 1000;
 	for (i = 0; i < 2048; i ++) {
 	 float inVal	= float (selectedRate / 1000);
-	 mapTable_int [i]	= int (floor (i * (inVal / 2048.0)));
+	 mapTable_int [i]	= int (floor (i * (inVal / 2048.0)));
 	 mapTable_float [i]	= i * (inVal / 2048.0) - mapTable_int [i];
 	}
 	convIndex	= 0;
 	convBuffer. resize (convBufferSize + 1);
-
+//
 	tabWidget	-> setCurrentIndex (0);
+	set_vga_gain	(vgaSlider	-> value ());
+	set_lna_gain	(lnaSlider	-> value ());
+	set_mixer_gain	(mixerSlider	-> value ());
 	connect (linearitySlider, SIGNAL (valueChanged (int)),
 	 this, SLOT (set_linearity (int)));
 	connect (sensitivitySlider, SIGNAL (valueChanged (int)),
@@ -238,7 +241,6 @@
 	 this, SLOT (set_xmlDump ()));
 	connect (filterSelector, SIGNAL (stateChanged (int)),
 	 this, SLOT (set_filter (int)));
-
 //
 //	and to restore settings, we need
 	connect (this, SIGNAL (new_lnaGainValue (int)),
@@ -344,15 +346,10 @@
 	 return true;
 
 	vfoFrequency	= freq;
-	if (save_gainSettings) {
+	if (save_gainSettings) 
 	 update_gainSettings (freq / MHz (1));
-	 set_vga_gain		(vgaSlider -> value ());
-	 set_lna_gain		(lnaSlider -> value ());
-	 set_mixer_gain	(mixerSlider -> value ());
-	 my_airspy_set_lna_agc	(device, lna_agc ? 1 : 0);
-	 my_airspy_set_mixer_agc (device, mixer_agc ? 1 : 0);
-	 my_airspy_set_rf_bias	(device, rf_bias ? 1 : 0);
-	}
+//
+//	sliders are now set,
 	result = my_airspy_set_freq (device, freq);
 
 	if (result != AIRSPY_SUCCESS) {
@@ -368,6 +365,17 @@
 	 return false;
 	}
 
+	result = my_airspy_start_rx (device,
+	 (airspy_sample_block_cb_fn)callback, this);
+	if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airspy_start_rx() failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+	 return false;
+	}
+	fprintf (stderr, "currentTab %d\n", currentTab);
+	my_airspy_set_lna_agc	(device, lna_agc ? 1 : 0);
+	my_airspy_set_mixer_agc	(device, mixer_agc ? 1 : 0);
+	my_airspy_set_rf_bias	(device, rf_bias ? 1 : 0);
 	if (currentTab == 0)
 	 set_sensitivity	(sensitivitySlider -> value());
 	else 
@@ -379,13 +387,6 @@
 	 set_lna_gain		(lnaGain);
 	}
 	
-	result = my_airspy_start_rx (device,
-	 (airspy_sample_block_cb_fn)callback, this);
-	if (result != AIRSPY_SUCCESS) {
-	 printf ("my_airspy_start_rx() failed: %s (%d)\n",
-	 my_airspy_error_name((airspy_error)result), result);
-	 return false;
-	}
 //
 	running. store (true);
 	return true;
@@ -515,6 +516,7 @@
 //	} else {
 //	 return 0;
 //	}
+	return 0;
 }
 
 //
@@ -610,6 +612,8 @@
 void	airspyHandler::set_vga_gain (int value) {
 int result = my_airspy_set_vga_gain (device, vgaGain = value);
 
+	fprintf (stderr, "vgaGain %d, result %d\n",
+	 vgaGain, result);
 	if (result != AIRSPY_SUCCESS) {
 	 printf ("airspy_set_vga_gain() failed: %s (%d)\n",
 	 my_airspy_error_name ((airspy_error)result), result);
@@ -625,8 +629,8 @@
 */
 void	airspyHandler::set_lna_agc	(int dummy) {
 	(void)dummy;
-	lna_agc	= !lnaButton	-> isChecked ();
-int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
+	lna_agc	= lnaButton	-> isChecked ();
+	int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
 
 	if (result != AIRSPY_SUCCESS) {
 	 printf ("airspy_set_lna_agc() failed: %s (%d)\n",
@@ -993,15 +997,51 @@
 if (result. size () != 9) // should not happen
 return;
 
- linearity		= result. at (0). toInt ();
- sensitivity		= result. at (1). toInt ();
- lnaGainValue		= result. at (2). toInt ();
-	mixerGainValue		= result. at (3). toInt ();
-	vgaGainValue		= result. at (4). toInt ();
 	lna_agc			= result. at (5). toInt ();
 	mixer_agc		= result. at (6). toInt ();
 	rf_bias			= result. at (7). toInt ();
 	tab_setting		= result. at (8). toInt ();
+	switch (tab_setting) {
+	 case 0:	// sensitivity
+ sensitivity		= result. at (1). toInt ();
+	 sensitivitySlider -> blockSignals (true);
+	 new_sensitivityValue	(sensitivity);
+	 new_sensitivityDisplay	(sensitivity);
+	 while (sensitivitySlider -> value () != sensitivity)
+	 usleep (1000);
+	 sensitivitySlider -> blockSignals (false);
+	 break;
+	 case 1:	// linearity
+ linearity		= result. at (0). toInt ();
+	 linearitySlider	-> blockSignals (true);
+	 new_linearityValue	(linearity);
+	 new_linearityDisplay	(linearity);
+	 while (linearitySlider -> value () != linearity)
+	 usleep (1000);
+	 linearitySlider	-> blockSignals (false);
+	 break;
+	 default:
+	 break;
+	}
+	lnaGainValue		= result. at (2). toInt ();
+	mixerGainValue		= result. at (3). toInt ();
+	vgaGainValue		= result. at (4). toInt ();
+//
+//	setting sliders should not lead to signals
+	lnaSlider		-> blockSignals (true);
+	new_lnaGainValue	(lnaGainValue);
+	new_lnaDisplay		(lnaGainValue);
+	while (lnaSlider -> value () != lnaGainValue)
+	 usleep (1000);
+	lnaSlider		-> blockSignals (false);
+
+
+	mixerSlider	-> blockSignals (true);
+	new_mixerValue	(mixerGainValue);
+	new_mixerDisplay	(mixerGainValue);
+	while (mixerSlider -> value () != mixerGainValue)
+	 usleep (1000);
+	mixerSlider	-> blockSignals (false);
 
 	lnaButton	-> blockSignals (true);
 	lnaButton	-> setChecked (lna_agc);
@@ -1017,13 +1057,6 @@
 	biasButton	-> setChecked (rf_bias);
 	usleep (1000);
 	biasButton	-> blockSignals (false);
-	
-	lnaSlider	-> blockSignals (true);
-	new_lnaGainValue	(lnaGainValue);
-	new_lnaDisplay		(lnaGainValue);
-	while (lnaSlider -> value () != lnaGainValue)
-	 usleep (1000);
-	lnaSlider	-> blockSignals (false);
 
 	vgaSlider	-> blockSignals (true);
 	new_vgaGainValue	(vgaGainValue);
@@ -1032,27 +1065,6 @@
 	 usleep (1000);
 	vgaSlider	-> blockSignals (false);
 
-	mixerSlider	-> blockSignals (true);
-	new_mixerValue		(mixerGainValue);
-	new_mixerDisplay	(mixerGainValue);
-	while (mixerSlider -> value () != mixerGainValue)
-	 usleep (1000);
-	mixerSlider	-> blockSignals (false);
-
-	linearitySlider	-> blockSignals (true);
-	new_linearityValue	(linearity);
-	new_linearityDisplay	(linearity);
-	while (linearitySlider -> value () != linearity)
-	 usleep (1000);
-	linearitySlider	-> blockSignals (false);
-
-	sensitivitySlider -> blockSignals (true);
-	new_sensitivityValue	(sensitivity);
-	new_sensitivityDisplay	(sensitivity);
-	while (sensitivitySlider -> value () != sensitivity)
-	 usleep (1000);
-	sensitivitySlider -> blockSignals (false);
-
 	tabWidget	-> blockSignals (true);
 	new_tabSetting (tab_setting);
 	while (tabWidget -> currentIndex () != tab_setting)

qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.cpp -> qt-dab-4.35.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -288,29 +288,30 @@
 	xml_dumping. store (false);
 }
 
-	rtlsdrHandler::~rtlsdrHandler() {
+	rtlsdrHandler::~rtlsdrHandler () {
 	if (Handle == nullptr) {	// nothing achieved earlier on
 	 return;
 	}
+	stopReader	();
 	myFrame. hide ();
-	this -> rtlsdr_cancel_async (device);
+	this	-> rtlsdr_cancel_async (device);
+	this	-> rtlsdr_reset_buffer (device);
 	while (!workerHandle -> isFinished()) 
 	 usleep (100);
 	_I_Buffer. FlushRingBuffer();
 	delete	workerHandle;
-	workerHandle = nullptr;
-	stopReader	();
+	workerHandle	= nullptr;
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
 	rtlsdrSettings	-> setValue ("externalGain",
-	 gainControl -> currentText());
+	 gainControl -> currentText());
 	rtlsdrSettings	-> setValue ("autogain",
 	 agcControl -> isChecked () ? "1" : "0");
 	rtlsdrSettings	-> setValue ("ppm_correction",
 	 ppm_correction -> value());
 	rtlsdrSettings	-> setValue ("filterDepth", filterDepth -> value ());
-	rtlsdrSettings	-> sync();
+	rtlsdrSettings	-> sync ();
 	rtlsdrSettings	-> endGroup();
-	
+	usleep (1000);
 	this		-> rtlsdr_close (device);
 #ifdef __MINGW32__
 	FreeLibrary (Handle);
@@ -382,6 +383,8 @@
 std::complex<uint8_t> temp [size];
 int	amount;
 
+	if (!isActive)
+	 return 0;
 static uint8_t dumpBuffer [4096];
 static int iqTeller	= 0;
 
@@ -418,6 +421,8 @@
 }
 
 int32_t	rtlsdrHandler::Samples() {
+	if (!isActive)
+	 return 0;
 	return _I_Buffer. GetRingBufferReadAvailable ();
 }
 //

qt-dab-4.1.1.tar.gz/dab-maxi/radio.cpp -> qt-dab-4.35.tar.gz/dab-maxi/radio.cpp Changed

@@ -40,7 +40,6 @@
 #include	<vector>
 #include	"radio.h"
 #include	"band-handler.h"
-#include	"ensemble-printer.h"
 #include	"audio-descriptor.h"
 #include	"data-descriptor.h"
 #include	"rawfiles.h"
@@ -50,6 +49,8 @@
 #include	"schedule-selector.h"
 #include	"element-selector.h"
 #include	"dab-tables.h"
+#include	"ITU_Region_1.h"
+#include	"coordinates.h"
 #ifdef	TCP_STREAMER
 #include	"tcp-streamer.h"
 #elif	QT_AUDIO
@@ -201,21 +202,6 @@
 	return 1;
 }
 
-#ifdef	__LOGGING__
-void	RadioInterface::LOG	(const QString &a1, const QString &a2) {
-QString theTime	= QDateTime::currentDateTime (). toString ();
-	if (logFile == nullptr)
-	 return;
-	fprintf (logFile, "at %s: %s %s\n",
-	 theTime. toUtf8 (). data (),
-	 a1. toUtf8 (). data (), a2. toUtf8 (). data ());
-}
-#else
-void	RadioInterface::LOG	(const QString &a1, const QString &a2) {
-	(void)a1; (void)a2;
-}
-
-#endif
 	RadioInterface::RadioInterface (QSettings	*Si,
 	 const QString	&presetFile,
 	 const QString	&freqExtension,
@@ -244,16 +230,16 @@
 	 my_tiiViewer (
 	 this, Si,
 	 &tiiBuffer),
-	 my_snrViewer (
-	 this, Si),
+	 my_snrViewer (this, Si),
 	 my_presetHandler (this),
 	 theBand (freqExtension, Si),
-	 theTable (this),
-	 filenameFinder (Si),
+//	 theTable (this),
 	 dataDisplay (nullptr),
 	 configDisplay (nullptr),
 	 the_dlCache (10),
-	 theScheduler (this) {
+	 tiiProcessor (),
+	 filenameFinder (Si),
+	 theScheduler (this, schedule) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -262,15 +248,17 @@
 	dabSettings		= Si;
 	this	-> error_report	= error_report;
 	this	-> fmFrequency	= fmFrequency;
-	this	-> externalSchedule	= schedule;
 	this	-> dlTextFile	= nullptr;
+	this	-> ficDumpPointer	= nullptr;
 	running. 		store (false);
 	scanning. 		store (false);
 	my_dabProcessor		= nullptr;
 	isSynced		= false;
 	stereoSetting		= false;
 	serviceCount		= -1;
-//
+	my_contentTable		= nullptr;
+	my_scanTable		= nullptr;
+
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
 	globals. spectrumBuffer	= &spectrumBuffer;
@@ -335,11 +323,11 @@
 	x = dabSettings -> value ("switchDelay", 8). toInt ();
 	configWidget. switchDelaySetting -> setValue (x);
 
-	int snrDelay = dabSettings -> value ("snrDelay", 5). toInt ();
-	configWidget. snrDelaySetting -> setValue (snrDelay);
-
+	bool b	= dabSettings	-> value ("utcSelector", 0). toInt () == 1;
+	configWidget. utcSelector -> setChecked (b);
 	currentService. valid	= false;
 	nextService. valid	= false;
+	secondService. valid	= false;
 
 	if (dabSettings -> value ("has-presetName", 0). toInt () != 0) {
 	 configWidget. saveServiceSelector -> setChecked (true);
@@ -361,17 +349,10 @@
 	 }
 	}
 
-	dabSettings	-> beginGroup ("snrViewer");
-	configWidget. snrHeightSelector -> setValue (dabSettings -> value ("snrHeight", 15). toInt ());
-	configWidget. snrLengthSelector -> setValue (dabSettings -> value ("snrLength", 312). toInt ());
-	dabSettings	-> endGroup ();
-//
-#ifdef	__LOGGING__
+	connect (configWidget. loadTableButton, SIGNAL (clicked ()),
+	 this, SLOT (loadTable ()));
+	
 	logFile		= nullptr;
-	QString abc	= dabSettings	-> value ("logFile", ""). toString ();
-	if (abc != "")
-	 logFile	= fopen (abc. toUtf8 (). data (), "a");
-#endif
 	int scanMode	=
 	 dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
 	configWidget. scanmodeSelector -> setCurrentIndex (scanMode);
@@ -440,8 +421,10 @@
 #ifdef	TRY_EPG
 	epgPath		= dabSettings -> value ("epgPath", "/tmp"). toString ();
 	connect (&epgProcessor,
-	 SIGNAL (set_epgData (int, int, const QString &)),
-	 this, SLOT (set_epgData (int, int, const QString &)));
+	 SIGNAL (set_epgData (int, int,
+	 const QString &, const QString &)),
+	 this, SLOT (set_epgData (int, int,
+	 const QString &, const QString &)));
 	if ((epgPath != "") && (!epgPath. endsWith ("/")))
 	 epgPath = epgPath + "/";
 //	timer for autostart epg service
@@ -457,6 +440,7 @@
 	my_history = new historyHandler (this, historyFile);
 	my_timeTable		= new timeTableHandler (this);
 	my_timeTable	-> hide ();
+
 	connect (my_history, SIGNAL (handle_historySelect (const QString &)),
 	 this, SLOT (handle_historySelect (const QString &)));
 	connect (this, SIGNAL (set_newChannel (int)),
@@ -465,6 +449,8 @@
 	 presetSelector, SLOT (setCurrentIndex (int)));
 	connect (configWidget. dlTextButton, SIGNAL (clicked ()),
 	 this, SLOT (handle_dlTextButton ()));
+	connect (configWidget. loggerButton, SIGNAL (stateChanged (int)),
+	 this, SLOT (handle_LoggerButton (int)));
 
 //	restore some settings from previous incarnations
 	QString t =
@@ -561,6 +547,15 @@
 	 this, SLOT (color_muteButton ()));
 //	display the version
 	copyrightLabel	-> setToolTip (footText ());
+	presetSelector	-> setToolTip (presetText ());
+
+	connect (configWidget. set_coordinatesButton, SIGNAL (clicked ()),
+	 this, SLOT (handle_set_coordinatesButton ()));
+	QString tiiFileName = dabSettings -> value ("tiiFile", ""). toString ();
+	channel. tiiFile	= false;
+	if (tiiFileName != "") {
+	 channel. tiiFile = tiiProcessor. tiiFile (tiiFileName);
+	}
 
 //	and start the timer(s)
 //	The displaytimer is there to show the number of
@@ -687,8 +682,7 @@
 	currentServiceDescriptor	= nullptr;
 
 	if (inputDevice != nullptr) {
-	 LOG ("start with ",
-	 inputDevice -> deviceName (). toUtf8 (). data ());
+	 LOG ("start with ", inputDevice -> deviceName ());
 	 if (doStart ()) {
 	 qApp	-> installEventFilter (this);
 	 return;
@@ -705,6 +699,10 @@
 	qApp	-> installEventFilter (this);
 }
 
+QString	RadioInterface::presetText () {
+return QString ("In version 4.35 the way elements are removed from the presets is changed. Just click with the right mouse button on the text of the item and the item will be removed from the presetList");
+}
+
 QString RadioInterface::footText () {
 	version			= QString (CURRENT_VERSION);
 	QString versionText = "Qt-DAB-version: " + QString(CURRENT_VERSION) + "\n";
@@ -744,8 +742,6 @@
 
 	my_dabProcessor	= new dabProcessor (this, inputDevice, &globals);
 
-	int snrDelay = dabSettings -> value ("snrDelay", 5). toInt ();
-	my_snrViewer. set_snrDelay (snrDelay);
 //	Some buttons should not be touched before we have a device
 	connectGUI ();
 
@@ -787,8 +783,6 @@
 	connect (configWidget. tii_detectorMode, SIGNAL (stateChanged (int)),
 	 this, SLOT (handle_tii_detectorMode (int)));
 
-	if (externalSchedule != "")
-	 theScheduler. addExternalSchedule (externalSchedule);
 	startChannel (channelSelector -> currentText ());
 	running. store (true);
 	return true;
@@ -804,7 +798,7 @@
 	if (s == nullptr)	// cannot happen
 	 return;
 
-	s	-> setValue ("channel", channelSelector -> currentText ());
+	s	-> setValue ("channel", channel. channelName);
 	s	-> setValue ("device",
 	 deviceSelector -> currentText());
 	s	-> setValue ("soundchannel",
@@ -820,6 +814,8 @@
 	 my_correlationViewer. isHidden () ? 0 : 1);
 	s	-> setValue ("snrVisible",
 	 my_snrViewer. isHidden () ? 0 : 1);
+	s	-> setValue ("utcSelector",
+	 configWidget. utcSelector -> isChecked () ? 1 : 0);
 	s	-> sync();
 }
 //
@@ -851,15 +847,15 @@
 	if (isMember (serviceList, ed))
 	 return;
 
-	ed. subChId	= my_dabProcessor -> getSubChId (serviceName, SId);
+	ed. subChId	=
+	 my_dabProcessor -> getSubChId (serviceName, SId);
 	serviceOrder	=
 	 dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
 
 	serviceList = insert (serviceList, ed, serviceOrder);
-	my_history -> addElement (channelSelector -> currentText (),
-	 serviceName);
+	my_history -> addElement (channel. channelName, serviceName);
 	model. clear ();
-	for (const auto serv : serviceList) {
+	for (auto serv : serviceList) {
 	 model. appendRow (new QStandardItem (serv. name));
 	}
 	for (int i = 0; i < model. rowCount (); i ++) {
@@ -868,8 +864,10 @@
 	}
 
 	ensembleDisplay -> setModel (&model);
-	if (serviceCount == model.rowCount ())
+	if (serviceCount == model.rowCount () && !scanning) {
+	 presetTimer. stop ();
 	 setPresetStation ();
+	}
 }
 //
 //	The ensembleId is written as hexadecimal, however, the 
@@ -892,13 +890,23 @@
 	if (!running. load())
 	 return;
 
-	
 	QFont font	= ensembleId -> font ();
 	font. setPointSize (13);
 	font. setBold (true);
 	ensembleId	-> setFont (font);
 	ensembleId	-> setAlignment(Qt::AlignCenter);
 	ensembleId	-> setText (v + QString (":") + hextoString (id));
+
+	channel. ensembleName	= v;
+	channel. Eid		= id;
+	channel. countryName	= "";
+	channel. transmitterName	= "";
+	channel. has_ecc	= false;
+	channel. ecc_byte	= 0;
+	channel. countryName	= "";
+	channel. mainId		= 0;
+	channel. subId		= 0;
+	channel. nrTransmitters	= 0;
 	if (configWidget. scanmodeSelector -> currentIndex () == SCAN_TO_DATA)
 	 stopScanning (false);
 }
@@ -906,30 +914,46 @@
 ///////////////////////////////////////////////////////////////////////////
 
 void	RadioInterface::handle_contentButton	() {
-ensemblePrinter	my_Printer;
-QString	utcTime		= convertTime (UTC. year, UTC. month, UTC. day,
-	 UTC. hour, UTC. minute);
-QString	currentChannel	= channelSelector -> currentText ();
-int	frequency	= inputDevice	-> getVFOFrequency ();
-
-	if (!running. load() || (ensembleId -> text () == QString ("")))
-	 return;
-	if (scanning. load ())
-	 return;
+QStringList s	= my_dabProcessor -> basicPrint ();
 
-	FILE *fileP	=
-	 filenameFinder. findContentDump_fileName (currentChannel);
-	if (fileP	== nullptr)
-	 return;
-//
-//	we asserted that my_dabProcessor exists
-	my_Printer. showEnsembleData (currentChannel,
-	 frequency,
-	 utcTime,
-	 transmitters,
-	 serviceList,
-	 my_dabProcessor, fileP);
-	fclose (fileP);
+	if (my_contentTable != nullptr) {
+	 my_contentTable -> hide ();
+	 delete my_contentTable;
+	 my_contentTable = nullptr;
+	 return;
+	}
+	QString theTime;
+	QString SNR	= "SNR " + QString::number (snrDisplay -> value ());
+	if (configWidget. utcSelector -> isChecked ())
+	 theTime	= convertTime (UTC. year, UTC. month,
+	 UTC. day, UTC. hour, UTC. minute);
+	else
+	 theTime	= convertTime (localTime. year, localTime. month,
+	 localTime. day, localTime. hour,
+	 localTime. minute);
+
+	QString header		= channel. ensembleName + ";" +
+	 channel. channelName + ";" +
+ QString::number (channel. frequency) + ";" +
+ hextoString (channel. Eid) + " " + ";" +
+ transmitter_coordinates -> text () + " " + ";" +
+	 theTime + ";" +
+	 SNR + ";" +
+ QString::number (serviceList. size ()) + ";" +
+ distanceLabel -> text ();
+
+	my_contentTable		= new contentTable (this, dabSettings,
+	 channel. channelName,
+	 my_dabProcessor -> scanWidth ());
+	connect (my_contentTable, SIGNAL (goService (const QString &)),
+ this, SLOT (handle_contentSelector (const QString &)));
+
+
+	my_contentTable		-> addLine (header);
+	my_contentTable		-> addLine ("\n");
+	for (int i = 0; i < s. size (); i ++) 
+	 my_contentTable	-> addLine (s. at (i));
+	my_contentTable -> show ();
 }
 
 void	checkDir (QString &s) {
@@ -995,22 +1019,27 @@
 	 my_dabProcessor -> get_ensembleId ();
 	 uint32_t currentSId =
 	 extract_epg (name, serviceList, ensembleId);
-	 fprintf (stderr, "currentSID = %X\n", currentSId);
-	 if (currentSId != 0) {
+	 if (true) {
+//	 if (currentSId != 0) {
 	 FILE *f = fopen (name. toUtf8 (). data (), "w+b");
 	 if (f == nullptr)
 	 fprintf (stderr, "Opening %s failed\n",
 	 name. toUtf8 (). data ());
-	
-	 fwrite (epgData. data (), 1, epgData. size (), f);
-	 fclose (f);
+	 else {
+	 fwrite (epgData. data (), 1, epgData. size (), f);
+	 fprintf (stderr, "writing epgdata to %s\n",
+	 name. toUtf8 (). data ());
+	 fclose (f);
+	 }
+	 int subType = 
+	 getContentSubType ((MOTContentType)contentType);
 	 epgProcessor. process_epg (epgData. data (), 
-	 epgData. size (), currentSId);
+	 epgData. size (), currentSId,
+	 subType);
+
 	 }
-//	 epgHandler. decode (epgData, realName);
+	 epgHandler. decode (epgData, realName);
 	 }
-//	 fprintf (stderr, "epg file %s\n",
-//	 realName. toUtf8 (). data ());
 #endif
 	 return;
 
@@ -1177,16 +1206,20 @@
 	if (currentService. valid) 
 	 s = currentService;
 	stopScanning (false);
-	stopService ();
-	fprintf (stderr, "change detected\n");
+//
+	stopService	(s);
+	if (secondService. valid)
+	 stopService (secondService);
+	fprintf (stderr, "change will be effected\n");
 	serviceOrder	= 
 	 dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
-//
+
+	
 //	we rebuild the services list from the fib and
 //	then we (try to) restart the service
 	serviceList	= my_dabProcessor -> getServices (serviceOrder);
 	model. clear	();
-	for (const auto serv : serviceList)
+	for (auto serv : serviceList)
 	 model. appendRow (new QStandardItem (serv. name));
 	int row = model. rowCount ();
 	for (int i = 0; i < row; i ++) {
@@ -1195,28 +1228,39 @@
 	}
 	ensembleDisplay -> setModel (&model);
 //
-//	and restart the one that was running
-	if (s. valid) {
-	 if (s. SCIds != 0) { // secondary service may be gone
-	 if (my_dabProcessor -> findService (s. SId, s. SCIds) ==
-	 s. serviceName) {
-	 startService (&s);
-	 return;
-	 }
-	 else {
-	 s. SCIds = 0;
-	 s. serviceName =
-	 my_dabProcessor -> findService (s. SId, s. SCIds);
-	 }
+//	and restart the services that - may be - were running
+	if (secondService. valid) {
+	 packetdata pd;
+	 my_dabProcessor -> dataforPacketService (secondService. serviceName,
+	 &pd, 0);
+	 if (pd. defined) {
+	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer);
+	 secondService. serviceName = pd. serviceName;
+ secondService. is_audio = false;
+ secondService. channel = channel. channelName;
+ secondService. SId = pd. SId;
+ secondService. SCIds = pd. SCIds;
+ secondService. subChId = pd. subchId;
+ secondService. valid = true;
 	 }
-//	checking for the main service
-	 if (s. serviceName != 
-	 my_dabProcessor -> findService (s. SId, s. SCIds)) {
-	 QMessageBox::warning (this, tr ("Warning"),
-	 tr ("insufficient data for this program\n"));
+	 else
+	 secondService. valid = false;
+	}
+
+//	Of course, it may be disappeared
+	if (s. valid) {
+	 QString ss = my_dabProcessor -> findService (s. SId, s. SCIds);
+	 if (ss != "") {
+	 startService (&s);
 	 return;
 	 }
-	 startService (&s);
+//
+//	The service is gone, it may be the subservice of another one
+	 s. SCIds = 0;
+	 s. serviceName =
+	 my_dabProcessor -> findService (s. SId, s. SCIds);
+	 if (s. serviceName != "")
+	 startService (&s);
 	}
 }
 //
@@ -1275,12 +1319,22 @@
 #endif
 	if (my_dabProcessor != nullptr)
 	 my_dabProcessor -> stop ();
+	if (my_contentTable != nullptr) {
+	 my_contentTable -> clearTable ();
+	 my_contentTable -> hide ();
+	 delete my_contentTable;
+	}
+	if (my_scanTable != nullptr) {
+	 my_scanTable	-> clearTable ();
+	 my_scanTable	-> hide ();
+	 delete my_scanTable;
+	}
 	my_presetHandler. savePresets (presetSelector);
 	theBand. saveSettings	();
 	stop_frameDumping	();
 	stop_sourceDumping	();
 	stop_audioDumping	();
-	theTable. hide		();
+//	theTable. hide		();
 	theBand. hide		();
 	theScheduler. hide	();
 	configDisplay. hide	();
@@ -1289,11 +1343,9 @@
 	 motSlides	-> hide ();
 	LOG ("terminating ", "");
 	usleep (1000);		// pending signals
-#ifdef	__LOGGING__
 	if (logFile != nullptr)
 	 fclose (logFile);
 	logFile	= nullptr;
-#endif
 //	everything should be halted by now
 
 	dabSettings	-> sync ();
@@ -1311,8 +1363,6 @@
 	 delete	motSlides;
 	if (currentServiceDescriptor != nullptr)
 	 delete currentServiceDescriptor;
-//	delete	dataDisplay;
-//	delete	configDisplay;
 	delete	my_history;
 	delete	my_timeTable;
 //	close();
@@ -1379,6 +1429,7 @@
 deviceHandler	*inputDevice	= nullptr;
 //	OK, everything quiet, now let us see what to do
 
+	channel. realChannel	= true;		// until proven otherwise
 #ifdef	HAVE_SDRPLAY_V2
 	if (s == "sdrplay") {
 	 try {
@@ -1595,6 +1646,7 @@
 	 file		= QDir::toNativeSeparators (file);
 	 try {
 	 inputDevice	= new xml_fileReader (file);
+	 channel. realChannel	= false;
 	 hideButtons();
 	 }
 	 catch (int e) {
@@ -1606,7 +1658,7 @@
 	else
 	if ((s == "file input(.iq)") || (s == "file input(.raw)")) {
 	 const char *p;
-	 if (s == "file input (.iq)")
+	 if (s == "file input(.iq)")
 	 p = "iq data (*iq)";
 	 else
 	 p = "raw data (*raw)";
@@ -1621,6 +1673,7 @@
 	 try {
 	 inputDevice	= new rawFiles (file);
 	 hideButtons();
+	 channel. realChannel	= false;
 	 }
 	 catch (int e) {
 	 QMessageBox::warning (this, tr ("Warning"),
@@ -1640,6 +1693,7 @@
 	 file		= QDir::toNativeSeparators (file);
 	 try {
 	 inputDevice	= new wavFiles (file);
+	 channel. realChannel	= false;
 	 hideButtons();	
 	 }
 	 catch (int e) {
@@ -1678,9 +1732,7 @@
 	 fprintf (stderr, "device is deleted\n");
 	 inputDevice = nullptr;
 	}
-	LOG ("selecting ", 
-	 deviceName. toUtf8 (). data ());
-	fprintf (stderr, "going for a device %s\n", deviceName. toUtf8 (). data ());
+	LOG ("selecting ", deviceName);
 	inputDevice		= setDevice (deviceName);
 	if (inputDevice == nullptr) {
 	 inputDevice = new deviceHandler ();
@@ -1750,7 +1802,12 @@
 	this	-> UTC. day		= d2;
 	this	-> UTC. hour		= h2;
 	this	-> UTC. minute		= m2;
-	QString result	= convertTime (year, month, day, hours, minutes);
+	QString result;
+	if (configWidget. utcSelector -> isChecked ())
+	 result	= convertTime (year, month, day, h2, m2);
+	else
+	 result	= convertTime (year, month, day,
+	 hours, minutes);
 	localTimeDisplay -> setText (result);
 }
 
@@ -1897,7 +1954,7 @@
 //	the_dlCache. add (s);
 	if (the_dlCache. addifNew (s))
 	 return;
-	QString currentChannel = channelSelector -> currentText ();
+	QString currentChannel = channel. channelName;
 	QDateTime theDateTime	= QDateTime::currentDateTime ();
 	fprintf (dlTextFile, "%s.%s %4d-%02d-%02d %02d:%02d:%02d %s\n",
 	 currentChannel. toUtf8 (). data (),
@@ -1928,6 +1985,15 @@
 //	In this version we show the spectrum even when the
 //	mainId and subId did not change
 
+void	RadioInterface::show_null (int amount) {
+std::complex<float> B [amount];
+QVector<float> V (amount);
+	tiiBuffer. getDataFromBuffer (B, amount);
+	for (int i = 0; i < amount; i ++)
+	 V [i] = abs (B [i]);
+	my_tiiViewer. show_nullPeriod (V, 100);
+}
+
 static
 QString	tiiNumber (int n) {
 	if (n >= 10)
@@ -1942,9 +2008,13 @@
 void	RadioInterface::show_tii	(int mainId, int subId) {
 QString a = "Est: ";
 bool	found	= false;
+QString	country	= "";
+bool	tiiChange	= false;
+
 	if (mainId == 0xFF) 
 	 return;
-	for (int i = 0; i < transmitters. size (); i += 2) {
+
+	for (int i = 0; i < (int)(transmitters. size ()); i += 2) {
 	 if ((transmitters. at (i) == (mainId & 0x7F)) &&
 	 (transmitters. at (i + 1) == subId)) {
 	 found = true;
@@ -1956,14 +2026,105 @@
 	 transmitters. append (mainId & 0x7F);
 	 transmitters. append (subId);
 	}
+
 	if (!running. load())
 	 return;
 
-	a = a + " " + tiiNumber (mainId) + " " + tiiNumber (subId);
+	if ((mainId != channel. mainId) ||
+	 (subId != channel. subId)) {
+	 LOG ("tii numbers", tiiNumber (mainId) + " " + tiiNumber (subId));
+	 tiiChange = true;
+	}
+
+	channel. mainId	= mainId;
+	channel. subId	= subId;
 
+	a = a + " " + tiiNumber (mainId) + " " + tiiNumber (subId);
 	transmitter_coordinates	-> setAlignment (Qt::AlignRight);
 	transmitter_coordinates	-> setText (a);
 	my_tiiViewer. showTransmitters (transmitters);
+
+//	if - for the first time now - we see an ecc value,
+//	we check whether or not a tii files is available
+	if (!channel. has_ecc && (my_dabProcessor -> get_ecc () != 0)) {
+	 channel. ecc_byte	= my_dabProcessor -> get_ecc ();
+	 country		= find_ITU_code (channel. ecc_byte,
+	 (channel. Eid >> 12) &0xF);
+	 channel. has_ecc	= true;
+	 channel. transmitterName = "";
+	}
+
+	if (channel. tiiFile) {
+	 if (tiiChange || (channel. transmitterName == "")) {
+	 if (!tiiProcessor. is_black (channel. Eid, mainId, subId)) {
+	 QString theName =
+	 tiiProcessor.
+	 get_transmitterName (channel. realChannel?
+	 channel. channelName :
+	 "any",
+//	 channel. countryName,
+	 channel. Eid,
+	 mainId, subId);
+	 if (theName == "") {
+	 tiiProcessor. set_black (channel. Eid, mainId, subId);
+	 LOG ("Not found ",
+	 QString::number (channel. Eid, 16) + " " +
+	 QString::number (mainId) + " " +
+	 QString::number (subId));
+	 }
+	 else 
+	 if (theName != channel. transmitterName) {
+	 channel. transmitterName = theName;
+	 float latitude, longitude;
+	 tiiProcessor. get_coordinates (&latitude,
+	 &longitude,
+	 channel. realChannel ?
+	 channel. channelName :
+	 "any",
+	 theName);
+	 fprintf (stderr, "%s (%f, %f)\n",
+	 theName. toUtf8 (). data (),
+	 latitude, longitude);
+	 LOG ("transmitter ", channel. transmitterName);
+	 LOG ("coordinates ", 
+	 QString::number (latitude) + " " +
+	 QString::number (longitude));
+	 LOG ("current SNR ",
+	 QString::number (snrDisplay -> value ()));
+	 QString labelText = channel. transmitterName;
+//
+// if our own position is known, we show the distance
+ float ownLatitude =
+ dabSettings -> value ("latitude", 0). toFloat ();
+ float ownLongitude =
+ dabSettings -> value ("longitude", 0). toFloat ();
+ if ((ownLatitude != 0) && (ownLongitude != 0)) {
+	 int distance = tiiProcessor.
+	 distance (latitude, longitude,
+	 ownLatitude, ownLongitude);
+	 int hoek	 = tiiProcessor.
+	 corner (latitude, longitude,
+	 ownLatitude, ownLongitude);
+	 LOG ("distance ", QString::number (distance));
+	 LOG ("corner ", QString::number (hoek));
+	 labelText += + " " +
+	 QString::number (distance) + " km" +
+	 " " + QString::number (hoek);
+	 labelText += QString::fromLatin1 (" \xb0 ");
+	 fprintf (stderr, "%s\n",
+	 labelText. toUtf8 (). data ());
+	 distanceLabel -> setText (labelText);
+	 
+	 }
+	 }
+	 }
+	}
+	}
+	if ((country != "") && (country != channel. countryName)) {
+	 transmitter_country	-> setText (country);
+	 channel. countryName	= country;
+	 LOG ("country", channel. countryName);
+	}
 }
 
 void	RadioInterface::showSpectrum	(int32_t amount) {
@@ -1981,12 +2142,14 @@
 	my_spectrumViewer. showIQ (amount);
 }
 
-void	RadioInterface::showQuality	(float q) {
+void	RadioInterface::showQuality	(float q, float timeOffset,
+	 float sco, float freqOffset) {
 	if (!running. load())
 	 return;
 
-	my_spectrumViewer. showQuality (q);
+	my_spectrumViewer. showQuality (q, timeOffset, sco, freqOffset);
 }
+
 //
 //	called from the MP4 decoder
 void	RadioInterface::show_rsCorrections	(int c) {
@@ -2006,12 +2169,14 @@
 //
 //	called from the phasesynchronizer
 void	RadioInterface::showCorrelation	(int amount, int marker,
-	 QVector<int> v) {
+	 QVector<int> v) {
 	if (!running. load())
 	 return;
 	my_correlationViewer. showCorrelation (amount, marker, v);
-	QString t = "Transm " + QString::number (v. size ());
-	nrTransmitters	-> setText (t);
+
+//	if (channel. nrTransmitters != v. size ())
+//	 LOG ("nr transmitters ", QString::number (v. size ()));
+	channel. nrTransmitters = v. size ();
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -2123,7 +2288,7 @@
 //
 void	RadioInterface::start_sourceDumping () {
 QString deviceName	= inputDevice -> deviceName ();
-QString channelName	= channelSelector -> currentText ();
+QString channelName	= channel. channelName;
 	
 	if (scanning. load ())
 	 return;
@@ -2360,8 +2525,6 @@
 	 this, SLOT (handle_configSetting ()));
 	connect (configWidget. muteTimeSetting, SIGNAL (valueChanged (int)),
 	 this, SLOT (handle_muteTimeSetting (int)));
-	connect (configWidget. snrDelaySetting, SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_snrDelaySetting (int)));
 	connect (configWidget. switchDelaySetting,
 	 SIGNAL (valueChanged (int)),
 	 this, SLOT (handle_switchDelaySetting (int)));
@@ -2371,8 +2534,6 @@
 	 this, SLOT (handle_orderServiceIds ()));
 	connect (configWidget. ordersubChannelIds, SIGNAL (clicked ()),
 	 this, SLOT (handle_ordersubChannelIds ()));
-	connect (configWidget. plotLengthSetting, SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_plotLengthSetting (int)));
 	connect (configWidget. scanmodeSelector,
 	 SIGNAL (currentIndexChanged (int)),
 	 this, SLOT (handle_scanmodeSelector (int)));
@@ -2380,10 +2541,6 @@
 	 this, SLOT (handle_motslideSelector (int)));
 	connect (configWidget. saveServiceSelector, SIGNAL (stateChanged (int)),
 	 this, SLOT (handle_saveServiceSelector (int)));
-	connect (configWidget. snrHeightSelector, SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_snrHeightSelector (int)));
-	connect (configWidget. snrLengthSelector, SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_snrLengthSelector (int)));
 	connect (configWidget. skipList_button, SIGNAL (clicked ()),
 	 this, SLOT (handle_skipList_button ()));
 	connect (configWidget. skipFile_button, SIGNAL (clicked ()),
@@ -2450,19 +2607,12 @@
 	 this, SLOT (handle_orderServiceIds ()));
 	disconnect (configWidget. ordersubChannelIds, SIGNAL (clicked ()),
 	 this, SLOT (handle_ordersubChannelIds ()));
-	disconnect (configWidget. plotLengthSetting,
-	 SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_plotLengthSetting (int)));
 	disconnect (configWidget. scanmodeSelector, SIGNAL (currentIndexChanged (int)),
 	 this, SLOT (handle_scanmodeSelector (int)));
 	disconnect (configWidget. motslideSelector, SIGNAL (stateChanged (int)),
 	 this, SLOT (handle_motslideSelector (int)));
 	disconnect (configWidget. saveServiceSelector, SIGNAL (stateChanged (int)),
 	 this, SLOT (handle_saveServiceSelector (int)));
-	disconnect (configWidget. snrHeightSelector, SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_snrHeightSelector (int)));
-	disconnect (configWidget. snrLengthSelector, SIGNAL (valueChanged (int)),
-	 this, SLOT (handle_snrLengthSelector (int)));
 	disconnect (configWidget. skipList_button, SIGNAL (clicked ()),
 	 this, SLOT (handle_skipList_button ()));
 	disconnect (configWidget. skipFile_button, SIGNAL (clicked ()),
@@ -2513,7 +2663,8 @@
 	 fprintf (stderr, "currentservice = %s (%d)\n",
 	 currentService. serviceName. toUtf8 (). data (),
 	 currentService. valid);
-	 stopService ();
+	 stopService (currentService);
+	 currentService. valid = false;
 	 selectService (ensembleDisplay -> currentIndex ());
 	 stopScanning (false);
 	 }
@@ -2620,6 +2771,16 @@
 	localSelect (s);
 }
 
+void	RadioInterface::handle_contentSelector (const QString &s) {
+	if (!running. load ())
+ return;
+
+ presetTimer. stop ();
+ fprintf (stderr, "going for %s\n", s. toUtf8 (). data ());
+ localSelect (s);
+}
+
+
 void	RadioInterface::localSelect (const QString &s) {
 	QStringList list = s.split (":", QString::SkipEmptyParts);
 if (list. length () != 2)
@@ -2635,14 +2796,18 @@
 	QStringList list = s.split (":", QString::SkipEmptyParts);
 if (list. length () != 2)
 return;
-	QString channel = list. at (0);
+	QString theChannel = list. at (0);
 	QString service	= list. at (1);
 	for (int i = service. size (); i < 16; i ++)
 	 service. append (' ');
-	localSelect (channel, service);
+
+	fprintf (stderr, "going for channel %s, service %s\n",
+	 theChannel. toUtf8(). data (),
+	 service. toUtf8 (). data ());
+	localSelect (theChannel, service);
 }
 
-void	RadioInterface::localSelect (const QString &channel,
+void	RadioInterface::localSelect (const QString &theChannel,
 	 const QString &service) {
 int	switchDelay;
 	stopScanning (false);
@@ -2651,8 +2816,9 @@
 	 return;
 	}
 
-	if (channel == channelSelector -> currentText ()) {
-	 stopService ();
+	if (theChannel == channel. channelName) {
+	 stopService (currentService);
+	 currentService. valid = false;
 	 dabService s;
 	 my_dabProcessor -> getParameters (service, &s. SId, &s. SCIds);
 	 if (s. SId == 0) {
@@ -2670,7 +2836,7 @@
 // waiting a while
 	stopChannel ();
 // trying to start the selected service
-	int k = channelSelector -> findText (channel);
+	int k = channelSelector -> findText (theChannel);
 	if (k != -1) {
 	 new_channelIndex (k);
 	}
@@ -2681,7 +2847,7 @@
 	}
 
 	nextService. valid		= true;
-	nextService. channel		= channel;
+	nextService. channel		= theChannel;
 	nextService. serviceName = service;
 	nextService. SId = 0;
 	nextService. SCIds = 0;
@@ -2698,7 +2864,7 @@
 //	handling services: stop and start
 ///////////////////////////////////////////////////////////////////////////
 
-void	RadioInterface::stopService	() {
+void	RadioInterface::stopService	(dabService &s) {
 	presetTimer. stop ();
 	channelTimer. stop ();
 	stop_muting	();
@@ -2714,36 +2880,29 @@
 	if (frameDumper != nullptr) {
 	 stop_frameDumping ();
 	}
+
 	if (audioDumper != nullptr) {
 	 stop_audioDumping ();
 	}
-	if (currentService. valid) {
-	 QString serviceName = currentService. serviceName;
-	 if (my_dabProcessor -> is_audioService (serviceName)) {
-	 audiodata ad;
-	 my_dabProcessor -> dataforAudioService (serviceName, &ad);
-	 my_dabProcessor -> stopService (&ad);
-	 soundOut	-> stop ();
-	 for (int i = 0; i < 10; i ++) {
+
+	if (s. valid) {
+	 my_dabProcessor -> stopService (s. subChId);
+	 if (s. is_audio) {
+	 soundOut -> stop ();
+	 for (int i = 0; i < 5; i ++) {
 	 packetdata pd;
-	 my_dabProcessor -> dataforPacketService (ad. serviceName, &pd, i);
+	 my_dabProcessor -> dataforPacketService (s. serviceName, &pd, i);
 	 if (pd. defined) {
-	 my_dabProcessor -> stopService (&pd);
+	 my_dabProcessor -> stopService (pd. subchId);
 	 break;
 	 }
 	 }
 	 }
-	 else {
-	 packetdata pd;
-	 my_dabProcessor -> dataforPacketService (serviceName, &pd, 0);
-	 if (pd. defined)
-	 my_dabProcessor -> stopService (&pd);
-	 }
 
 	 for (int i = 0; i < model. rowCount (); i ++) {
 	 QString itemText =
 	 model. index (i, 0). data (Qt::DisplayRole). toString ();
-	 if (itemText == serviceName) {
+	 if (itemText == s. serviceName) {
 	 colorService (model. index (i, 0), Qt::black, fontSize);
 	 break;
 	 }
@@ -2752,6 +2911,7 @@
 	cleanScreen	();
 }
 //
+//
 void	RadioInterface::selectService (QModelIndex ind) {
 QString	currentProgram = ind. data (Qt::DisplayRole). toString();
 	if (!running. load ())
@@ -2767,7 +2927,8 @@
 	channelTimer.	stop	();
 	stopScanning	(false);
 
-	stopService 	();		// if any
+	stopService 	(currentService);		// if any
+	currentService. valid = false;
 
 	dabService s;
 	s. serviceName = currentProgram;
@@ -2807,10 +2968,11 @@
 	 if (ad. defined) {
 	 currentService. valid		= true;
 	 currentService. is_audio	= true;
+	 currentService. subChId	= ad. subchId;
 	 if (my_dabProcessor -> has_timeTable (ad. SId))
 	 techData. timeTable_button -> show ();
 	 start_audioService (&ad);
-	 QString s = channelSelector -> currentText ();
+	 QString s = channel. channelName;
 	 s. append (":");
 	 s. append (serviceName);
 	 dabSettings	-> setValue ("presetname", s);
@@ -2819,6 +2981,7 @@
 	 if (my_dabProcessor -> is_packetService (serviceName)) {
 	 currentService. valid		= true;
 	 currentService. is_audio	= false;
+	 currentService. subChId	= ad. subchId;
 	 start_packetService (serviceName);
 	 dabSettings	-> setValue ("presetname", "");
 	 }
@@ -2844,6 +3007,8 @@
 void	RadioInterface::cleanScreen	() {
 	serviceLabel			-> setText ("");
 	dynamicLabel			-> setText ("");
+//	distanceLabel			-> setText ("");
+
 	if (motSlides != nullptr) {
 	 delete motSlides;
 	 motSlides = nullptr;
@@ -2882,9 +3047,9 @@
 
 	QDateTime theDateTime	= QDateTime::currentDateTime ();
 	QTime theTime		= theDateTime. time ();
-	fprintf (stderr, "we start %s at %.2d:%.2d\n",
-	 ad -> serviceName. toUtf8 (). data (),
-	 theTime. hour (), theTime. minute ());
+//	fprintf (stderr, "we start %s at %.2d:%.2d\n",
+//	 ad -> serviceName. toUtf8 (). data (),
+//	 theTime. hour (), theTime. minute ());
 	serviceLabel -> setAlignment(Qt::AlignCenter);
 	serviceLabel -> setText (ad -> serviceName);
 	currentService. valid	= true;
@@ -3025,7 +3190,8 @@
 
 	QString oldService	= currentService. serviceName;
 	
-	stopService ();
+	stopService (currentService);
+	currentService. valid = false;
 
 	if ((serviceList. size () != 0) && (oldService != "")) {
 	 for (int i = 0; i < (int)(serviceList. size ()); i ++) {
@@ -3067,10 +3233,10 @@
 	if (!nextService. valid)
 	 return;
 
-	if (nextService. channel != channelSelector -> currentText ())
+	if (nextService. channel != channel. channelName)
 	 return;
 
-	if (ensembleId -> text () == QString ("")) {
+	if (channel. Eid == 0) {
 	 QMessageBox::warning (this, tr ("Warning"),
 	 tr ("Oops, ensemble not yet recognized\nselect service manually\n"));
 	 return;
@@ -3106,12 +3272,13 @@
 ///////////////////////////////////////////////////////////////////////////
 //	Precondition: no channel should be active
 //	
-void	RadioInterface::startChannel (const QString &channel) {
+void	RadioInterface::startChannel (const QString &theChannel) {
 int	tunedFrequency	=
-	 theBand. Frequency (channel);
-	serviceCount		= 0;
+	 theBand. Frequency (theChannel);
+	LOG ("channel starts ", theChannel);
+	serviceCount		= -1;
 	frequencyDisplay	-> display (tunedFrequency / 1000000.0);
-	dabSettings		-> setValue ("channel", channel);
+	dabSettings		-> setValue ("channel", theChannel);
 	inputDevice		-> resetBuffer ();
 	serviceList. clear ();
 	model. clear ();
@@ -3119,6 +3286,14 @@
 	cleanScreen	();
 	inputDevice		-> restartReader (tunedFrequency);
 	my_dabProcessor		-> start (tunedFrequency);
+	channel. has_ecc	= false;
+	channel. transmitterName	= "";
+	channel. ensembleName	= "";
+	channel. Eid		= 0;
+	channel. mainId		= 0;
+	channel. subId		= 0;
+	channel. channelName	= theChannel;
+	channel. frequency	= tunedFrequency / 1000;
 	show_for_safety ();
 	int	switchDelay	=
 	 dabSettings -> value ("switchDelay", 8). toInt ();
@@ -3133,12 +3308,23 @@
 void	RadioInterface::stopChannel	() {
 	if (inputDevice == nullptr)		// should not happen
 	 return;
+	LOG ("channel stops ", channel. channelName);
 	stop_sourceDumping	();
 	stop_audioDumping	();
 	soundOut	-> stop ();
 	stop_muting		();
 	epgLabel	-> hide ();
+	if (my_contentTable != nullptr) {
+	 my_contentTable -> hide ();
+	 delete my_contentTable;
+	 my_contentTable = nullptr;
+	}
 //	note framedumping - if any - was already stopped
+//	ficDumping - if on - is stopped
+	if (ficDumpPointer != nullptr) {
+	 my_dabProcessor -> stop_ficDump ();
+	 ficDumpPointer = nullptr;
+	}
 #ifdef	TRY_EPG
 	epgTimer. stop		();
 	techData. timeTable_button -> hide ();
@@ -3146,6 +3332,13 @@
 #endif
 	presetTimer. stop 	();
 	channelTimer. stop	();
+	channel. Eid		= 0;
+	channel. ensembleName	= "";
+	channel. has_ecc	= false;
+	channel. transmitterName = "";
+	transmitter_country -> setText ("");
+ transmitter_coordinates -> setText ("");
+
 //
 //	The services - if any - need to be stopped
 	hide_for_safety	();	// hide some buttons
@@ -3158,6 +3351,7 @@
 	usleep (1000);		// may be handling pending signals?
 	currentService. valid	= false;
 	nextService. valid	= false;
+	secondService. valid	= false;
 
 //	all stopped, now look at the GUI elements
 	ficError_display	-> setValue (0);
@@ -3173,6 +3367,8 @@
 	 ensembleDisplay	-> setModel (&model);
 //	 ensembleDisplay	-> blockSignals (false);
 	 cleanScreen	();
+	 epgLabel		-> hide ();
+	 distanceLabel	-> setText ("");
 //	}
 }
 
@@ -3259,7 +3455,26 @@
 	else {
 	 cc = theBand. firstChannel ();
 	}
+	LOG ("scanning starts with ", QString::number (cc));
 	scanning. store (true);
+	if ((scanMode == SINGLE_SCAN) || (scanMode == SCAN_CONTINUOUSLY)) {
+	 if (my_scanTable == nullptr) 
+	 my_scanTable = new contentTable (this, dabSettings,
+	 "scan", 
+	 my_dabProcessor -> scanWidth ());
+	 else
+	 my_scanTable -> clearTable ();
+	 QString topLine = QString ("ensemble") + ";" +
+	 "channelName" + ";" +
+	 "frequency (KHz)" + ";" +
+	 "Eid" + ";" +
+	 "time" + ";" +
+	 "tii" + ";" +
+	 "SNR" + ";" +
+	 "nr services" + ";";
+	 my_scanTable -> addLine (topLine);
+	 my_scanTable	-> addLine ("\n");
+	}
 	if (scanMode == SINGLE_SCAN)
 	 scanDumpFile	= filenameFinder. findScanDump_fileName ();
 	else
@@ -3281,10 +3496,10 @@
 	channelTimer. start (switchDelay * 1000);
 
 	startChannel (channelSelector -> currentText ());
-	if (scanMode != SCAN_TO_DATA) {
-	 theTable. clear ();
-	 theTable. show ();
-	}
+//	if (scanMode != SCAN_TO_DATA) {
+//	 theTable. clear ();
+//	 theTable. show ();
+//	}
 }
 
 void	RadioInterface::stopScanning	(bool dump) {
@@ -3292,7 +3507,8 @@
 	 this, SLOT (No_Signal_Found ()));
 	(void)dump;
 	scanButton -> setText ("scan");
-
+	if (scanning. load ())
+	 LOG ("scanning stops ", "");
 	my_dabProcessor	-> set_scanMode (false);
 	if (!running. load () || !scanning. load ())
 	 return;
@@ -3300,10 +3516,11 @@
 	channelTimer. stop ();
 	scanning. store (false);
 	if (scanDumpFile != nullptr) {
+	 if (my_scanTable != nullptr) 
+	 my_scanTable -> dump (scanDumpFile);
 	 fclose (scanDumpFile);
 	 scanDumpFile = nullptr;
 	}
-
 //	theTable. hide ();
 }
 
@@ -3331,6 +3548,7 @@
 	 stopChannel ();
 //	 if (scanMode != SCAN_TO_DATA)
 	 cc = theBand. nextChannel (cc);
+	 fprintf (stderr, "going to channel %d\n", cc);
 	 if ((cc >= channelSelector -> count ()) &&
 	 (scanMode == SINGLE_SCAN)) {
 	 stopScanning (true);
@@ -3367,88 +3585,50 @@
 ////////////////////////////////////////////////////////////////////////////
 	
 void	RadioInterface::showServices () {
-ensemblePrinter	my_Printer;
 int	scanMode	= configWidget. scanmodeSelector -> currentIndex ();
 QString SNR 		= "SNR " + QString::number (snrDisplay -> value ());
-QString ensembleId	= hextoString (my_dabProcessor -> get_ensembleId ());
 
 	if (my_dabProcessor == nullptr) {	// cannot happen
 	 fprintf (stderr, "Expert error 26\n");
 	 return;
 	}
-	theTable. newEnsemble (" ",
-	 channelSelector -> currentText (),
-	 my_dabProcessor	-> get_ensembleName (),
-	 ensembleId,
-	 SNR,
-	 transmitters);
-	if (scanMode == SINGLE_SCAN) {
-	 theTable. new_headline ();
-	 for (serviceId serv: serviceList) {
-	 QString audioService = serv. name;
-	 audiodata d;
-	 my_dabProcessor -> dataforAudioService (audioService, &d);
-	 if (!d. defined)
-	 continue;
-
-	 QString serviceId = hextoString (d. SId);
-	 QString bitRate = QString::number (d. bitRate);
-	 QString protL = getProtectionLevel (d. shortForm,
-	 d. protLevel);
-	 QString codeRate = getCodeRate (d. shortForm,
-	 d. protLevel);
-	 theTable.
-	 add_to_Ensemble (audioService, serviceId,
-	 d. ASCTy == 077 ? "DAB+ (plus)" : "DAB",
-	 bitRate, protL, codeRate);
-	 }
-
-	 for (serviceId serv: serviceList) {
-	 QString packetService = serv. name;
-	 packetdata d;
-	 my_dabProcessor -> dataforPacketService (packetService, &d, 0);
-	 if (!d. defined)
-	 continue;
 
-	 QString soort	= d. DSCTy == 60 ? "mot data" :
-	 d. DSCTy == 59 ? "ip data" :
-	 d. DSCTy == 44 ? "journaline data" :
-	 d. DSCTy == 5 ? "tdc data" :
-	 "unknow data";
-	 QString serviceId;
-	 serviceId. setNum (d. SId, 16);
-	 QString bitRate = QString::number (d. bitRate);
-	 QString protL = getProtectionLevel (d. shortForm,
-	 d. protLevel);
-	 QString codeRate = getCodeRate (d. shortForm,
-	 d. protLevel);
-	 theTable.
-	 add_to_Ensemble (packetService, serviceId,
-	 soort,
-	 bitRate, protL, codeRate);
-	 }
-	}
-	if (scanDumpFile != nullptr) {
-	 QString utcTime	= convertTime (UTC. year, UTC.month,
-	 UTC. day, UTC. hour, 
-	 UTC. minute);
-	 if (scanMode == SINGLE_SCAN)
-	 my_Printer. showEnsembleData (channelSelector -> currentText (),
-	 inputDevice -> getVFOFrequency (),
-	 utcTime,
-	 transmitters,
-	 serviceList,
-	 my_dabProcessor, scanDumpFile);
-	 else
-	 if (scanMode == SCAN_CONTINUOUSLY)
-	 my_Printer. showSummaryData (channelSelector -> currentText (),
-	 inputDevice -> getVFOFrequency (),
-	 SNR,
-	 utcTime,
-	 transmitters,
-	 serviceList,
-	 my_dabProcessor,
-	 scanDumpFile);
+	QString utcTime	= convertTime (UTC. year, UTC.month,
+	 UTC. day, UTC. hour, 
+	 UTC. minute);
+	if (scanMode == SINGLE_SCAN) {
+	 QString headLine = channel. ensembleName + ";" +
+	 channel. channelName + ";" +
+	 QString::number (channel. frequency) + ";" +
+	 hextoString (channel. Eid) + " " + ";" +
+	 transmitter_coordinates -> text () + " " + ";" +
+	 utcTime + ";" +
+	 SNR + ";" +
+	 QString::number (serviceList. size ()) + ";" +
+	 distanceLabel -> text ();
+	 QStringList s = my_dabProcessor -> basicPrint ();
+	 my_scanTable -> addLine (headLine);
+	 my_scanTable -> addLine ("\n;\n");
+	 for (int i = 0; i < s. size (); i ++)
+	 my_scanTable -> addLine (s. at (i));
+	 my_scanTable -> addLine ("\n;\n;\n");
+	 my_scanTable -> show ();
+	}
+	else
+	if (scanMode == SCAN_CONTINUOUSLY) {
+	 QString headLine = channel. ensembleName + ";" +
+	 channel. channelName + ";" +
+	 QString::number (channel. frequency) + ";" +
+	 hextoString (channel. Eid) + ";" +
+	 utcTime + ";" +
+	 transmitter_coordinates -> text () + ";" +
+	 SNR + ";" +
+	 QString::number (serviceList. size ()) + ";" +
+	 distanceLabel -> text ();
+
+	 my_scanTable -> addLine ("\n");
+	 my_scanTable -> addLine (headLine);
+	 my_scanTable	-> show ();
 	}
 }
 
@@ -3456,7 +3636,7 @@
 //
 bool	RadioInterface::isMember (std::vector<serviceId> a,
 	 serviceId b) {
-	for (const auto serv : a)
+	for (auto serv : a)
 	 if (serv. name == b. name)
 	 return true;
 	return false;
@@ -3476,7 +3656,7 @@
 	QString baseS		= "";
 
 	bool	inserted	= false;
-	for (const auto serv : l) {
+	for (auto serv : l) {
 	 if (!inserted) {
 	 if (order == ID_BASED) {
 	 if ((baseN <= n. SId) && (n. SId <= serv. SId)) {
@@ -3789,7 +3969,6 @@
 	techData. audiodumpButton ->
 	 setStyleSheet (temp. arg (audiodumpButton_color,
 	 audiodumpButton_font));
-//	techData. muteButton	-> setStyleSheet (temp. arg (muteButton_color,
 	muteButton	-> setStyleSheet (temp. arg (muteButton_color,
 	 muteButton_font));
 	configWidget.
@@ -3939,10 +4118,6 @@
 	dabSettings	-> setValue ("switchDelay", newV);
 }
 
-void	RadioInterface::handle_plotLengthSetting	(int l) {
-	dabSettings -> setValue ("plotLength", l);
-}
-
 void	RadioInterface::handle_scanmodeSelector		(int d) {
 	dabSettings	-> setValue ("scanMode", d); 
 }
@@ -3959,14 +4134,6 @@
 	 configWidget. saveServiceSelector -> isChecked () ? 1 : 0);
 }
 
-void	RadioInterface::handle_snrHeightSelector	(int d) {
-	my_snrViewer. setHeight (d);
-}
-
-void	RadioInterface::handle_snrLengthSelector	(int d) {
-	my_snrViewer. setLength (d);
-}
-
 void	RadioInterface::handle_orderAlfabetical		() {
 	dabSettings -> setValue ("serviceOrder", ALPHA_BASED);
 }
@@ -3993,11 +4160,13 @@
 	theSelector. addtoList ("framedump");
 	theSelector. addtoList ("audiodump");
 	theSelector. addtoList ("dlText");
+	theSelector. addtoList ("ficDump");
 	candidates	+= "nothing";
 	candidates	+= "exit";
 	candidates	+= "framedump";
 	candidates	+= "audiodump";
 	candidates	+= "dlText";
+	candidates	+= "ficDump";
 	for (uint16_t i = 0; i < serviceList. size (); i ++) {
 	 QString service = channelSelector -> currentText () +
 	 ":" + serviceList. at (i). name;
@@ -4016,7 +4185,10 @@
 	scheduleService		= candidates. at (selected);
 	{ elementSelector	theElementSelector (scheduleService);
 	 int	targetTime	= theElementSelector. QDialog::exec ();
+	 int delayDays	= (targetTime & 0XF0000) >> 16;
+	 targetTime		= targetTime & 0xFFFF;
 	 theScheduler. addRow (scheduleService,
+	 delayDays,
 	 targetTime / 60, 
 	 targetTime % 60);
 	}
@@ -4031,7 +4203,7 @@
 	 return;
 
 	if (s == "exit") {
-	 configWidget. closeDirect -> setChecked (true);
+	 configWidget. closeDirect	-> setChecked (true);
 	 QWidget::close ();
 	 return;
 	}
@@ -4051,12 +4223,30 @@
 	 return;
 	}
 
+	if (s == "ficDump") {
+	 scheduled_ficDumping ();
+	 return;
+	}
+
 	presetTimer. stop ();
 	if (scanning. load ())
 stopScanning (false);
 	scheduleSelect (s);
 }
 
+void	RadioInterface::scheduled_ficDumping () {
+	if (ficDumpPointer == nullptr) {
+	 ficDumpPointer =
+ filenameFinder. find_ficDump_file (channel. channelName);
+ if (ficDumpPointer == nullptr)
+ return;
+	 my_dabProcessor -> start_ficDump (ficDumpPointer);
+	 return;
+	}
+	my_dabProcessor	-> stop_ficDump ();
+	ficDumpPointer == nullptr;
+}
+
 //-------------------------------------------------------------------------
 //------------------------------------------------------------------------
 
@@ -4065,7 +4255,7 @@
 	epgTimer. stop ();
 	if (scanning. load ())
 	 return;
-	for (const auto serv : serviceList) {
+	for (auto serv : serviceList) {
 	 if (serv. name. contains ("-EPG ", Qt::CaseInsensitive) ||
 	 serv. name. contains (" EPG ", Qt::CaseInsensitive) ||
 serv. name. contains ("Spored", Qt::CaseInsensitive) ||
@@ -4085,10 +4275,17 @@
 	 fprintf (stderr, "Starting hidden service %s\n",
 	 serv. name. toUtf8 (). data ());
 	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer);
+	 secondService. serviceName = pd. serviceName;
+	 secondService. is_audio = false;
+	 secondService. channel	= channel. channelName;
+	 secondService. SId	= pd. SId;
+	 secondService. SCIds	= pd. SCIds;
+	 secondService. subChId	= pd. subchId;
+	 secondService. valid	= true;
 	 break;
 	 }
 	 }
-//#ifdef	__DABDATA__
+#ifdef	__DABDATA__
 	 else {
 	 packetdata pd;
 	 my_dabProcessor -> dataforPacketService (serv. name, &pd, 0);
@@ -4098,10 +4295,17 @@
 	 fprintf (stderr, "Starting hidden service %s\n",
 	 serv. name. toUtf8 (). data ());
 	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer);
+	 secondService. serviceName = pd. serviceName;
+	 secondService. is_audio = false;
+	 secondService. channel	= channel. channelName;
+	 secondService. SId	= pd. SId;
+	 secondService. SCIds	= pd. SCIds;
+	 secondService. subChId	= pd. subchId;
+	 secondService. valid	= true;
 	 break;
 	 }
 	 }
-//#endif
+#endif
 	}
 }
 #endif
@@ -4113,7 +4317,8 @@
 uint32_t RadioInterface::extract_epg (QString name,
 	 std::vector<serviceId> serviceList,
 	 uint32_t ensembleId) {
-	for (const auto serv : serviceList) {
+	(void)ensembleId;
+	for (auto serv : serviceList) {
 	 if (name. contains (QString::number (serv. SId, 16),
 	 Qt::CaseInsensitive)) 
 	 
@@ -4122,10 +4327,12 @@
 	return 0;
 }
 
-void	RadioInterface::set_epgData (int SId,
-	 int theTime, const QString &theText) {
+void	RadioInterface::set_epgData (int SId, int theTime,
+	 const QString &theText,
+	 const QString &theDescr) {
 	if (my_dabProcessor != nullptr)
-	 my_dabProcessor -> set_epgData (SId, theTime, theText);
+	 my_dabProcessor -> set_epgData (SId, theTime,
+	 theText, theDescr);
 }
 
 #endif
@@ -4144,7 +4351,8 @@
 	 my_dabProcessor -> find_epgData (currentService. SId);
 	for (const auto& element: res)
 	 my_timeTable -> addElement (element. theTime,
-	 element. theText);
+	 element. theText,
+	 element. theDescr);
 }
 
 void	RadioInterface::handle_skipList_button () {
@@ -4161,11 +4369,6 @@
 	theBand. setup_skipList (fileName);
 }
 
-void	RadioInterface::handle_snrDelaySetting	(int del) {
-	my_snrViewer. set_snrDelay (del);
-	dabSettings	-> setValue ("snrDelay", del);
-}
-
 void	RadioInterface::handle_tii_detectorMode (int d) {
 bool	b = configWidget. tii_detectorMode -> isChecked ();
 	my_dabProcessor	-> set_tiiDetectorMode (b);
@@ -4219,3 +4422,53 @@
 	serviceCount = n;
 }
 
+void	RadioInterface::LOG	(const QString &a1, const QString &a2) {
+QString theTime;
+	if (logFile == nullptr)
+	 return;
+	if (configWidget. utcSelector -> isChecked ())
+ theTime = convertTime (UTC. year, UTC. month, UTC. day,
+	 UTC. hour, UTC. minute);
+	else
+	 theTime = QDateTime::currentDateTime (). toString ();
+
+	fprintf (logFile, "at %s: %s %s\n",
+	 theTime. toUtf8 (). data (),
+	 a1. toUtf8 (). data (), a2. toUtf8 (). data ());
+}
+
+void	RadioInterface::handle_LoggerButton (int s) {
+	(void)s;
+
+	if (configWidget. loggerButton -> isChecked ()) {
+	 if (logFile == nullptr)
+	 logFile = filenameFinder. findLogFileName ();
+	}
+	else
+	if (logFile != nullptr) {
+	 fclose (logFile);
+	 logFile = nullptr;
+	}
+}
+
+void	RadioInterface::handle_set_coordinatesButton	() {
+coordinates theCoordinator (dabSettings);
+	(void)theCoordinator. QDialog::exec();
+}
+
+void	RadioInterface::loadTable	 () {
+QString	tableFile	= dabSettings -> value ("tiiFile", ""). toString ();
+
+	if (tableFile == "") {
+	 tableFile = QDir::homePath () + "/.txdata.tii";
+	 dabSettings -> setValue ("tiiFile", tableFile);
+	}
+	tiiProcessor. loadTable (tableFile);
+	if (tiiProcessor. valid ()) {
+	 fprintf (stderr, "tablefile is loaded\n");
+	 channel. tiiFile	= tiiProcessor. tiiFile (tableFile);
+	}
+	else
+	 channel. tiiFile = false;
+}
+

qt-dab-4.1.1.tar.gz/dab-maxi/radio.h -> qt-dab-4.35.tar.gz/dab-maxi/radio.h Changed

@@ -44,12 +44,14 @@
 #include	"text-mapper.h"
 #include	"process-params.h"
 #include	"dl-cache.h"
+#include	"tii-codes.h"
+#include	"content-table.h"
 #include	<memory>
 #ifdef	DATA_STREAMER
 #include	"tcp-server.h"
 #endif
 #include	"preset-handler.h"
-#include	"scanner-table.h"
+//#include	"scanner-table.h"
 #ifdef	TRY_EPG
 #include	"epgdec.h"
 #include	"epg-decoder.h"
@@ -88,6 +90,7 @@
 	QString		serviceName;
 	uint32_t	SId;
 	int		SCIds;
+	int		subChId;
 	bool		valid;
 	bool		is_audio;
 };
@@ -101,6 +104,7 @@
 	int	second;
 };
 
+
 class RadioInterface: public QWidget, private Ui_dabradio {
 Q_OBJECT
 public:
@@ -133,21 +137,21 @@
 	snrViewer		my_snrViewer;
 	presetHandler		my_presetHandler;
 	bandHandler		theBand;
-	scannerTable		theTable;
+//	scannerTable		theTable;
 	QFrame			dataDisplay;
 	QFrame			configDisplay;
 	dlCache			the_dlCache;
+	tiiHandler		tiiProcessor;
 	findfileNames		filenameFinder;
+	Scheduler		theScheduler;
 	processParams		globals;
 	QString			version;
 	QString			theFont;
 	int			fontSize;
 	int			fmFrequency;
-	Scheduler		theScheduler;
-	QString			externalSchedule;
-#ifdef	__LOGGING__
+	contentTable		*my_contentTable;
+	contentTable		*my_scanTable;
 	FILE			*logFile;
-#endif
 	void			LOG		(const QString &,
 	 const QString &);
 	int			serviceOrder;
@@ -159,6 +163,7 @@
 	QSettings		*dabSettings;
 	dabService		currentService;
 	dabService		nextService;
+	dabService		secondService;
 
 	QByteArray		transmitters;
 	int16_t			tii_delay;
@@ -218,7 +223,6 @@
 	QTimer			displayTimer;
 	QTimer			channelTimer;
 	QTimer			presetTimer;
-	QTimer			startTimer;
 	QTimer			muteTimer;
 	int			muteDelay;
 	int32_t			numberofSeconds;
@@ -237,6 +241,7 @@
 	void			set_buttonColors	(QPushButton *,
 	 const QString &);
 	QString			footText		();
+	QString			presetText		();
 	void			cleanScreen		();
 	void			set_picturePath		();
 	void			dumpControlState	(QSettings *);
@@ -255,6 +260,8 @@
 void			stop_audioDumping ();
 void			scheduled_audioDumping	();
 	void			scheduled_dlTextDumping ();
+	void			scheduled_ficDumping ();
+	FILE			*ficDumpPointer;
 
 void			start_sourceDumping ();
 void			stop_sourceDumping ();
@@ -263,7 +270,7 @@
 	void			scheduled_frameDumping	(const QString &);
 	void			startChannel		(const QString &);
 	void			stopChannel		();
-	void			stopService		();
+	void			stopService		(dabService &);
 	void			startService		(dabService *);
 	void			colorService		(QModelIndex ind,
 	 QColor c, int pt);
@@ -279,6 +286,32 @@
 	void			show_MOTlabel		(QByteArray, int,
 QString, int);
 	void			stop_muting		();
+	struct {
+	 float latitude;
+	 float longitude;
+	} homeAddress;
+
+	struct tiiStruct {
+	 uint8_t mainId;
+	 uint8_t subId;
+	 bool	searched_for_name;
+	};
+
+	struct {
+	 QString	channelName;
+	 bool		realChannel;
+	 int		frequency;
+	 QString	ensembleName;
+	 uint32_t	Eid;
+	 bool		has_ecc;
+	 uint8_t	ecc_byte;
+	 bool		tiiFile;
+	 QString	transmitterName;
+	 uint8_t	mainId;
+	 uint8_t	subId;
+	 QString	countryName;
+	 int		nrTransmitters;
+	} channel;
 enum direction {FORWARD, BACKWARDS};
 
 	void			handle_serviceButton	(direction);
@@ -316,11 +349,11 @@
 	void			No_Signal_Found		();
 	void			show_motHandling	(bool);
 	void			setSyncLost		();
-	void			showCorrelation		(int, int,
-	 QVector<int>);
+	void			showCorrelation		(int, int, 
+	 QVector<int>);
 	void			showSpectrum		(int);
 	void			showIQ			(int);
-	void			showQuality		(float);
+	void			showQuality		(float, float, float, float);
 	void			show_rsCorrections	(int);
 	void			show_tii		(int, int);
 	void			show_tii_spectrum	();
@@ -333,14 +366,20 @@
 	void			newFrame		(int);
 
 	void			show_clockError		(int);
+	void			show_null		(int);
 #ifdef	TRY_EPG
-	void			set_epgData		(int,
-	 int, const QString &);
+	void			set_epgData		(int, int,
+	 const QString &,
+	 const QString &);
 	void			epgTimer_timeOut	();
 #endif
 	void			switchVisibility	(QWidget *);
 	void			nrServices		(int);
 
+	void			handle_presetSelector	(const QString &);
+	void			handle_contentSelector	(const QString &);
+
+
 //	Somehow, these must be connected to the GUI
 private slots:
 	void			handle_timeTable	();
@@ -363,7 +402,6 @@
 void			handle_framedumpButton	();
 	void			handle_audiodumpButton 	();
 
-	void			handle_presetSelector	(const QString &);
 	void			handle_prevServiceButton	();
 void			handle_nextServiceButton	();
 	void			selectChannel		(const QString &);
@@ -417,16 +455,14 @@
 	void			handle_orderAlfabetical		();
 	void			handle_orderServiceIds		();
 	void			handle_ordersubChannelIds	();
-	void			handle_plotLengthSetting	(int);
 	void			handle_scanmodeSelector		(int);
 	void			handle_motslideSelector		(int);
 	void			handle_saveServiceSelector	(int);
-	void			handle_snrHeightSelector	(int);
-	void			handle_snrLengthSelector	(int);
 	void			handle_skipList_button		();
 	void			handle_skipFile_button		();
-	void			handle_snrDelaySetting		(int);
 	void			handle_tii_detectorMode		(int);
-
+	void			handle_LoggerButton		(int);
+	void			handle_set_coordinatesButton	();
+	void			loadTable			();
 };
 #endif

qt-dab-4.1.1.tar.gz/dab-mini.png -> qt-dab-4.35.tar.gz/dab-mini.png Changed

qt-dab-4.1.1.tar.gz/dab-mini/dab-mini.pro -> qt-dab-4.35.tar.gz/dab-mini/dab-mini.pro Changed

@@ -7,9 +7,9 @@
 TEMPLATE	= app
 TARGET		= dabMini-2.1
 QT		+= widgets xml
-#CONFIG		+= console
-CONFIG		-= console
-QMAKE_CXXFLAGS	+= -std=c++11
+CONFIG		+= console
+#CONFIG		-= console
+QMAKE_CXXFLAGS	+= -std=c++14
 QMAKE_CFLAGS	+=  -flto -ffast-math
 MAKE_CXXFLAGS	+=  -flto -ffast-math
 #QMAKE_CFLAGS	+=  -g
@@ -19,6 +19,12 @@
 RC_ICONS	=  dab-mini.ico
 RESOURCES	+= resources.qrc
 
+#
+#	For more parallel processing, uncomment the following
+#	defines
+#DEFINES	+= __MSC_THREAD__
+#DEFINES	+=  __THREADED_BACKEND
+
 TRANSLATIONS = i18n/de_DE.ts
 
 DEPENDPATH += . \
@@ -128,7 +134,6 @@
 	   ../includes/support/band-handler.h \
 	   ../includes/support/text-mapper.h \
 	   ../includes/support/dab-tables.h \
-	   ../includes/support/ensemble-printer.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/smallcombobox.h \
 	   ../includes/support/smallspinbox.h \
@@ -140,6 +145,7 @@
 	   ../includes/support/scheduler.h \
 	   ../includes/support/schedule-selector.h \
 	   ../includes/support/element-selector.h \
+	   ../includes/support/ITU_Region_1.h \
 	   ./devices-dab-mini/device-handler.h
 
 FORMS	+= ./dab-mini.ui
@@ -201,7 +207,6 @@
 	   ../src/support/band-handler.cpp \
 	   ../src/support/text-mapper.cpp \
 	   ../src/support/dab-tables.cpp \
-	   ../src/support/ensemble-printer.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
 	   ../src/support/smallcombobox.cpp \
@@ -212,6 +217,7 @@
 	   ../src/support/scheduler.cpp \
            ../src/support/schedule-selector.cpp \
            ../src/support/element-selector.cpp \
+	   ../src/support/ITU_Region_1.cpp \
            ../src/support/findfilenames.cpp \
 	   ./devices-dab-mini/device-handler.cpp
 #

qt-dab-4.1.1.tar.gz/dab-mini/main.cpp -> qt-dab-4.35.tar.gz/dab-mini/main.cpp Changed

@@ -34,6 +34,7 @@
 
 #define DEFAULT_INI     ".dab-mini.ini"
 #define	PRESETS		".dab-mini-presets.xml"
+#define	SCHEDULE	".dab-mini-schedule.ini"
 #ifndef	GITHASH
 #define	GITHASH	"      "
 #endif
@@ -75,6 +76,7 @@
 // Default values
 QSettings       *dabSettings;           // ini file
 QString		presetName	= PRESETS;
+QString		scheduleName	= SCHEDULE;
 int     opt;
 
 	QCoreApplication::setOrganizationName ("Lazy Chair Computing");
@@ -99,6 +101,10 @@
 	presets. append ("/");
 	presets. append (presetName);
 	presets = QDir::toNativeSeparators (presets);
+	QString schedule	= QDir::homePath ();
+	schedule. append ("/");
+	schedule. append (scheduleName);
+	schedule  = QDir::toNativeSeparators (schedule);
 
 /*
  *      Before we connect control to the gui, we have to
@@ -116,7 +122,8 @@
 
 	a. setWindowIcon (QIcon (":/dab-mini.ico"));
 
-	MyRadioInterface = new RadioInterface (dabSettings, presets);
+	MyRadioInterface = new RadioInterface (dabSettings,
+	                                       presets, schedule);
 	MyRadioInterface -> show();
         a. exec();
 /*
@@ -126,7 +133,7 @@
 	fflush (stdout);
 	fflush (stderr);
 	qDebug ("It is done\n");
-//	delete MyRadioInterface;
+	delete MyRadioInterface;
 	delete dabSettings;
 	return 1;
 }

qt-dab-4.1.1.tar.gz/dab-mini/radio.cpp -> qt-dab-4.35.tar.gz/dab-mini/radio.cpp Changed

@@ -78,6 +78,7 @@
 //	not touched here
 	RadioInterface::RadioInterface (QSettings	*Si,
 	 const QString	&presetFile,
+	 const QString	&schedule,
 	 QWidget		*parent):
 	 QWidget (parent),
 	 spectrumBuffer (2 * 32768),
@@ -92,7 +93,7 @@
 	 theBand ("", Si ),
 	 filenameFinder (Si),
 	 the_dlCache (10),
-	 theScheduler (this) {
+	 theScheduler (this, schedule) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -153,7 +154,7 @@
 
 //	Where do we leave the audio out?
 	streamoutSelector	-> hide();
-// just sound out
+//	just sound out
 	soundOut		= new audioSink		(latency);
 
 	((audioSink *)soundOut)	-> setupChannels (streamoutSelector);
@@ -211,6 +212,8 @@
 
 	currentService. valid	= false;
 	nextService. valid	= false;
+	secondService. valid	= false;
+
 	bool has_presetName	=
 	 dabSettings -> value ("has-presetName", 1). toInt() != 0;
 	if (has_presetName) {
@@ -266,7 +269,7 @@
 }
 
 QString RadioInterface::footText () {
- QString versionText = "dabMini-1.0: ";
+ QString versionText = "dabMini-2.0: ";
 versionText += "Copyright J van Katwijk, J. vanKatwijk@gmail.com\n";
 versionText += "Rights of Qt, fftw, portaudio, libsamplerate libfaad gratefully acknowledged";
 versionText += "Rights of other contribuants gratefully acknowledged\n";
@@ -395,14 +398,15 @@
 *	how do we find that?
 */
 void	RadioInterface::changeinConfiguration() {
-	if (running. load ()) {
-	 dabService s;
-	 if (currentService. valid) { 
-	 s = currentService;
-	 stopService ();
-	 }
-	 stop_secondService ();
-	 fprintf (stderr, "change detected\n");
+	if (!running. load ()) 
+	 return;
+	dabService s;
+	if (currentService. valid) { 
+	 s = currentService;
+	 stopService (s);
+	}
+	stop_secondService ();
+	fprintf (stderr, "change detected\n");
 //
 //	we rebuild the services list from the fib and
 //	then we (try to) restart the service
@@ -418,29 +422,20 @@
 	 ensembleDisplay -> setModel (&model);
 //
 //	and restart the one that was running
-	 if (s. valid) {
-	 if (s. SCIds != 0) { // secondary service may be gone
-	 if (my_dabProcessor -> findService (s. SId, s. SCIds) ==
-	 s. serviceName) {
-	 startService (&s);
-	 return;
-	 }
-	 else {
-	 s. SCIds = 0;
-	 s. serviceName =
-	 my_dabProcessor -> findService (s. SId, s. SCIds);
-	 }
-	 }
-//	checking for the main service
-	 if (s. serviceName != 
-	 my_dabProcessor -> findService (s. SId, s. SCIds)) {
-	 QMessageBox::warning (this, tr ("Warning"),
- tr ("insufficient data for this program\n"));
- return;
- }
 
+	if (s. valid) {
+	 QString ss = my_dabProcessor -> findService (s. SId, s. SCIds);
+	 if (ss != "") {
 	 startService (&s);
+	 return;
 	 }
+//
+//	The service is gone, it may be the subservice of another one
+	 s. SCIds = 0;
+	 s. serviceName =
+	 my_dabProcessor -> findService (s. SId, s. SCIds);
+	 if (s. serviceName != "")
+	 startService (&s);
 	}
 }
 //
@@ -479,6 +474,7 @@
 	my_dabProcessor		-> stop();		// definitely concurrent
 	if (dlTextFile != nullptr)
 	 fclose (dlTextFile);
+	theScheduler. hide ();
 	usleep (1000);		// give space to clean up pending signals
 //	everything should be halted by now
 	delete		soundOut;
@@ -616,6 +612,7 @@
 	 QString (hourString) + ":" +
 	 QString (minuteString);
 	timeDisplay -> setText (result);
+	(void)sec;
 }
 
 //void	RadioInterface::showTime	(const QString &s) {
@@ -681,8 +678,8 @@
 toUtf8 (). data (),
 	 theDateTime.
 	 toString ("yy-mm-dd hh:mm:ss").
-	 toLatin1 (). data (),
-	 s. toLatin1 (). data ());
+	 toUtf8 (). data (),
+	 s. toUtf8 (). data ());
 	
 }
 
@@ -719,8 +716,10 @@
 	(void)amount;
 }
 
-void	RadioInterface::showQuality	(float q) {
-	(void)q;
+void	RadioInterface::showQuality	(float q, float timeOffset,
+	 float sco, float freqOffset) {
+	(void)q; (void)timeOffset;
+	(void)sco; (void)freqOffset;
 }
 
 void	RadioInterface::show_rsCorrections	(int c) {
@@ -731,6 +730,10 @@
 	(void)e;
 }
 
+void	RadioInterface::show_null	(int e) {
+	(void)e;
+}
+
 void	RadioInterface::showCorrelation	(int amount, int marker) {
 	(void)amount; (void)marker;
 }
@@ -781,7 +784,8 @@
 //	 fprintf (stderr, "currentservice = %s (%d)\n",
 //	 currentService. serviceName. toLatin1 (). data (),
 //	 currentService. valid);
-	 stopService ();	// basically redundant
+	 stopService (currentService);	// basically redundant
+	 currentService. valid = false;
 	 selectService (ensembleDisplay -> currentIndex ());
 	 }
 }
@@ -863,15 +867,16 @@
 QString service = list. at (1);
 for (int i = service. size (); i < 16; i ++)
 service. append (' ');
-	fprintf (stderr, "scheduling %s %s\n", channel. toLatin1 (). data (),
-	 service. toLatin1 (). data ());
+	fprintf (stderr, "scheduling %s %s\n", channel. toUtf8 (). data (),
+	 service. toUtf8 (). data ());
 localSelect (channel, service);
 }
 
 void	RadioInterface::localSelect (const QString &channel,
 	 const QString &service) {
 	if (channel == channelSelector -> currentText ()) {
-	 stopService ();
+	 stopService (currentService);
+	 currentService. valid = false;
 	 dabService s;
 	 my_dabProcessor -> getParameters (service, &s. SId, &s. SCIds);
 	 if (s. SId == 0) {
@@ -919,16 +924,12 @@
 //	handling services: stop, select and start
 ///////////////////////////////////////////////////////////////////////////
 
-void	RadioInterface::stopService	() {
+void	RadioInterface::stopService	(dabService &s) {
 	presetTimer. stop ();
 	presetSelector -> setCurrentIndex (0);
 	signalTimer. stop ();
-	if (currentService. valid) {
-	 fprintf (stderr, "stopping service\n");
-	 audiodata ad;
-	 my_dabProcessor -> dataforAudioService (currentService. serviceName,
-	 &ad);
-	 my_dabProcessor -> stopService (&ad);
+	if (s. valid) {
+	 my_dabProcessor -> stopService (s. subChId);
 	 usleep (1000);
 	 soundOut	-> stop ();
 	 QString serviceName = currentService. serviceName;
@@ -941,13 +942,14 @@
 	 }
 	 }
 	}
-	currentService. valid	= false;
+	s. valid	= false;
 	cleanScreen	();
 }
 //
 void	RadioInterface::selectService (QModelIndex ind) {
 QString	currentProgram = ind. data (Qt::DisplayRole). toString();
-	stopService 	();		// if any
+	stopService 	(currentService);		// if any
+	currentService. valid = false;
 
 	dabService s;
 	my_dabProcessor -> getParameters (currentProgram, &s. SId, &s. SCIds);
@@ -967,7 +969,7 @@
 	if (currentService. valid) {
 	 fprintf (stderr, "Niet verwacht, service %s is still valid\n",
 	 currentService. serviceName. toUtf8 (). data ());
-	 stopService ();
+//	 stopService (currentService);
 	}
 
 	ficBlocks		= 0;
@@ -979,13 +981,16 @@
 	 QString itemText =
 	 model. index (i, 0). data (Qt::DisplayRole). toString ();
 	 if (itemText == serviceName) {
+	 audiodata ad;
 	 colorService (model. index (i, 0), Qt::red, 13);
 	 serviceLabel	-> setStyleSheet ("QLabel {color : black}");
 	 serviceLabel	-> setText (serviceName);
-	 if (my_dabProcessor -> is_audioService (serviceName)) {
-	 start_audioService (serviceName);
-	 currentService. valid = true;
+	 my_dabProcessor -> dataforAudioService (serviceName, &ad);
+ if (ad. defined) {
+ currentService. valid = true;
 	 currentService. serviceName = serviceName;
+	 currentService. subChId	= ad. subchId;
+	 start_audioService (serviceName);
 	 }
 	 else
 	 fprintf (stderr, "%s not supported\n",
@@ -1050,7 +1055,8 @@
 	QString oldService	= currentService. serviceName;
 	disconnect (prev_serviceButton, SIGNAL (clicked ()),
 	 this, SLOT (handle_prevServiceButton ()));
-	stopService ();
+	stopService (currentService);
+	currentService. valid	= false;
 	if ((serviceList. size () != 0) &&
 	 (oldService != "")) {
 	 for (int i = 0; i < (int)(serviceList. size ()); i ++) {
@@ -1089,7 +1095,8 @@
 	QString oldService = currentService. serviceName;
 	disconnect (next_serviceButton, SIGNAL (clicked ()),
 	 this, SLOT (handle_nextServiceButton ()));
-	stopService ();
+	stopService (currentService);
+	currentService. valid = false;
 	if ((serviceList. size () != 0) && (oldService != "")) {
 	 for (int i = 0; i < (int)(serviceList. size ()); i ++) {
 	 if (serviceList. at (i). name == oldService) {
@@ -1135,7 +1142,6 @@
 	QString presetName	= nextService. serviceName;
 	for (const auto& service: serviceList) {
 	 if (service. name. contains (presetName)) {
-	 fprintf (stderr, "going to select %s\n", presetName. toUtf8 (). data ());
 	 dabService s;
 	 s. serviceName = presetName;
 	 my_dabProcessor	-> getParameters (presetName, &s. SId, &s. SCIds);
@@ -1249,7 +1255,7 @@
 //
 bool	RadioInterface::isMember (std::vector<serviceId> a,
 	 serviceId b) {
-	for (const auto serv : a)
+	for (auto serv : a)
 	 if (serv. name == b. name)
 	 return true;
 	return false;
@@ -1266,7 +1272,7 @@
 	int 	baseN		= 0;
 	QString baseS		= "";
 	bool	inserted	= false;
-	for (const auto serv : l) {
+	for (auto serv : l) {
 	 if (!inserted &&
 	 (order == ID_BASED ?
 	 ((baseN < (int)n. SId) && (n. SId <= serv. SId)):
@@ -1337,6 +1343,7 @@
 
 	secondService. serviceName = s;
 	secondService. valid	= true;
+	secondService. subChId	= ad. subchId;
 	ad. procMode	= __ONLY_DATA;
 	frameBuffer. FlushRingBuffer ();
 	my_dabProcessor -> set_audioChannel (&ad, &audioBuffer);
@@ -1347,12 +1354,8 @@
 	 return;
 	if (!secondService. valid)
 	 return;
-	fprintf (stderr, "stopping second service %s\n",
-	 secondService. serviceName. toUtf8 (). data ());
-	audiodata ad;
-	my_dabProcessor	-> dataforAudioService (secondService. serviceName,
-	 &ad);
-	my_dabProcessor -> stopService (&ad);
+	my_dabProcessor -> stopService (secondService. subChId);
+	secondService. valid = false;
 	fclose (frameDumper);
 	frameDumper = nullptr;
 }
@@ -1427,11 +1430,12 @@
 
 	int selected		= theSelector. QDialog::exec ();
 	scheduleService		= candidates. at (selected);
-	fprintf (stderr, "selected %d %s\n", selected, 
-	 scheduleService. toLatin1 (). data ());
 	{ elementSelector	theElementSelector (scheduleService);
 	 int	targetTime	= theElementSelector. QDialog::exec ();
+	 int delayDays	= (targetTime & 0xFF0000) >> 16;
+	 targetTime		= targetTime & 0xFFFF;
 	 theScheduler. addRow (scheduleService,
+	 delayDays,
 	 targetTime / 60, 
 	 targetTime % 60);
 	}

qt-dab-4.1.1.tar.gz/dab-mini/radio.h -> qt-dab-4.35.tar.gz/dab-mini/radio.h Changed

@@ -60,7 +60,9 @@
 	QString		serviceName;
 	uint32_t	SId;
 	int		SCIds;
+	int		subChId;
 	bool		valid;
+	
 };
 
 class RadioInterface: public QWidget, private Ui_dab_mini {
@@ -68,6 +70,7 @@
 public:
 		RadioInterface		(QSettings	*,
 	                                 const QString	&,
+	                                 const QString	&,
 	                                 QWidget	*parent = nullptr);
 		~RadioInterface		();
 
@@ -140,7 +143,7 @@
 	void			start_audioService	(const QString &);
 	void			startChannel		(const QString &);
 	void			stopChannel		();
-	void			stopService		();
+	void			stopService		(dabService &);
 	void			startService		(dabService *);
 	void			colorService		(QModelIndex ind,
 	                                                   QColor c, int pt);
@@ -181,7 +184,7 @@
 	void			showIndex		(int);
 	void			showSpectrum		(int);
 	void			showIQ			(int);
-	void			showQuality		(float);
+	void			showQuality		(float, float, float, float);
 	void			show_rsCorrections	(int);
 	void			show_tii		(int, int);
 	void			show_tii_spectrum	();
@@ -195,6 +198,7 @@
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);
 	void			show_clockError		(int);
+	void			show_null		(int);
 	void			scheduler_timeOut	(const QString &);
 	void			nrServices		(int);
 	void			showCorrelation		(int, int,

qt-dab-4.1.1.tar.gz/dab-processor.cpp -> qt-dab-4.35.tar.gz/dab-processor.cpp Changed

@@ -98,6 +98,8 @@
 	 mr, SLOT (show_snr (int)));
 	connect (this, SIGNAL (show_clockErr (int)),
 	 mr, SLOT (show_clockError (int)));
+	connect (this, SIGNAL (show_null (int)),
+	 mr, SLOT (show_null (int)));
 	my_TII_Detector. reset();
 }
 
@@ -152,6 +154,8 @@
 int	totalSamples	= 0;
 double	cLevel		= 0;
 int	cCount		= 0;
+bool dumpvlag		= false;
+QVector<std::complex<float>> tester (T_null / 2 + T_u);
 //	inputDevice	-> resetBuffer ();
 //	inputDevice	-> restartReader (frequency);
 	ibits. resize (2 * params. get_carriers());
@@ -219,6 +223,17 @@
 	 }
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_u, coarseOffset + fineOffset);
+#ifdef	__SHOW_BLOCK_0_
+	static int testteller = 0;
+	 testteller ++;
+	 if (testteller >= 5) {
+	 testteller = 0;
+	 for (int i = 0; i < T_u; i ++)
+	 tester [T_null / 2 + i] = ofdmBuffer [i];
+	 tiiBuffer -> putDataIntoBuffer (tester. data (), tester. size ());
+	 show_null (tester. size ());
+	 }
+#endif
 /**
 *	We now have to find the exact first sample of the non-null period.
 *	We use a correlation that will find the first sample after the
@@ -261,6 +276,14 @@
 	 myReader. getSamples (&((ofdmBuffer. data()) [ofdmBufferIndex]),
 	 T_u - ofdmBufferIndex,
 	 coarseOffset + fineOffset);
+
+#ifdef	__WITH_JAN__
+	 static int abc = 0;
+	 if (++abc > 10) {
+	 phaseSynchronizer. estimate (ofdmBuffer);
+	 abc = 0;
+	 }
+#endif
 	 sampleCount	+= T_u;
 	 my_ofdmDecoder. processBlock_0 (ofdmBuffer);
 	 if (!scanMode)
@@ -319,6 +342,10 @@
 */
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_null, coarseOffset + fineOffset);
+#ifdef	__SHOW_BLOCK_0_
+	 for (int i = 0; i < T_null / 2; i ++)
+	 tester [i] = ofdmBuffer [T_null / 2 + i];
+#endif
 	 sampleCount += T_null;
 	 float sum	= 0;
 	 for (i = 0; i < T_null; i ++)
@@ -341,7 +368,8 @@
 *	The TII data is encoded in the null period of the
 *	odd frames 
 */
- if (params. get_dabMode () == 1) {
+#ifndef	__SHOW_BLOCK_0_
+	 if (params. get_dabMode () == 1) {
 	 if (wasSecond (my_ficHandler. get_CIFcount(), &params)) {
 	 my_TII_Detector. addBuffer (ofdmBuffer);
 	 if (++tii_counter >= tii_delay) {
@@ -358,6 +386,7 @@
 	 }
 	 }
 	 }
+#endif
 /**
 *	The first sample to be found for the next frame should be T_g
 *	samples ahead. Before going for the next frame, we
@@ -455,6 +484,10 @@
 	return my_ficHandler. get_ecc();
 }
 
+uint16_t dabProcessor::get_countryName	() {
+	return my_ficHandler. get_countryName ();
+}
+
 int32_t dabProcessor::get_ensembleId	() {
 	return my_ficHandler. get_ensembleId();
 }
@@ -463,9 +496,10 @@
 	return my_ficHandler. get_ensembleName();
 }
 
-void	dabProcessor::set_epgData	(int SId,
-	 int32_t theTime, const QString &s) {
-	my_ficHandler. set_epgData (SId, theTime, s);
+void	dabProcessor::set_epgData	(int SId, int32_t theTime,
+	 const QString &s,
+	 const QString &d) {
+	my_ficHandler. set_epgData (SId, theTime, s, d);
 }
 
 bool	dabProcessor::has_timeTable	(uint32_t SId) {
@@ -476,6 +510,13 @@
 	return my_ficHandler. find_epgData (SId);
 }
 
+QStringList dabProcessor::basicPrint	() {
+	return my_ficHandler. basicPrint ();
+}
+
+int	dabProcessor::scanWidth		() {
+	return my_ficHandler. scanWidth ();
+}
 //
 //	for the mscHandler:
 void	dabProcessor::reset_Services	() {
@@ -484,8 +525,14 @@
 }
 
 void	dabProcessor::stopService (descriptorType *d) {
+	fprintf (stderr, "function obsolete\n");
 	if (!scanMode)
-	 my_mscHandler. stopService (d);
+	 my_mscHandler. stopService (d -> subchId);
+}
+
+void	dabProcessor::stopService (int subChId) {
+	if (!scanMode)
+	 my_mscHandler. stopService (subChId);
 }
 
 bool dabProcessor::set_audioChannel (audiodata *d,
@@ -513,7 +560,7 @@
 }
 
 bool	dabProcessor::wasSecond (int16_t cf, dabParams *p) {
- switch (p -> get_dabMode()) {
+	switch (p -> get_dabMode()) {
 	 default:
 	 case 1:
 	 return (cf & 07) >= 4;
@@ -525,3 +572,11 @@
 	}
 }
 
+void	dabProcessor::start_ficDump	(FILE *f) {
+	my_ficHandler. start_ficDump (f);
+}
+
+void	dabProcessor::stop_ficDump	() {
+	my_ficHandler. stop_ficDump ();
+}
+

qt-dab-4.1.1.tar.gz/dab-processor.h -> qt-dab-4.35.tar.gz/dab-processor.h Changed

@@ -79,14 +79,21 @@
 uint8_t		get_ecc			();
 int32_t		get_ensembleId		();
 QString		get_ensembleName	();
+	uint16_t	get_countryName		();
 	void		set_epgData		(int32_t, int32_t,
-	 const QString &);
+	 const QString &,
+	 const QString &);
 	bool		has_timeTable		(uint32_t);
 	std::vector<epgElement>	find_epgData		(uint32_t);
-//
+
+	QStringList	basicPrint		();
+	int		scanWidth		();
+	void		start_ficDump		(FILE *);
+	void		stop_ficDump		();
 //	for the mscHandler
 	void		reset_Services		();
 	void		stopService		(descriptorType *);
+	void		stopService		(int);
 	bool		set_audioChannel	(audiodata *,
 	 RingBuffer<int16_t> *);
 	bool		set_dataChannel		(packetdata *,
@@ -144,6 +151,7 @@
 	void		show_snr		(float, float, float,
 	 float, float);
 	void		show_clockErr		(int);
+	void		show_null		(int);
 };
 #endif

qt-dab-4.35.tar.gz/dab-screen.png Added

qt-dab-4.35.tar.gz/docs/manual.pdf Added

qt-dab-4.1.1.tar.gz/forms/config-helper.ui -> qt-dab-4.35.tar.gz/forms/config-helper.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>343</width>
- <height>606</height>
+ <height>518</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -44,86 +44,6 @@
 </property>
 </widget>
 </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string> PlotLength (unit 100)</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="smallSpinBox" name="plotLengthSetting">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>10</number>
- </property>
- <property name="value">
- <number>5</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>snr height</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QSpinBox" name="snrHeightSelector">
- <property name="minimum">
- <number>5</number>
- </property>
- <property name="value">
- <number>15</number>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>snr Length</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QSpinBox" name="snrLengthSelector">
- <property name="minimum">
- <number>112</number>
- </property>
- <property name="maximum">
- <number>5000</number>
- </property>
- <property name="singleStep">
- <number>50</number>
- </property>
- <property name="value">
- <number>312</number>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QSpinBox" name="snrDelaySetting">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>10</number>
- </property>
- <property name="value">
- <number>5</number>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>snr compression</string>
- </property>
- </widget>
- </item>
 </layout>
 </item>
 <item>
@@ -207,6 +127,27 @@
 </widget>
 </item>
 <item>
+ <widget class="QCheckBox" name="loggerButton">
+ <property name="text">
+ <string> logger</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="utcSelector">
+ <property name="text">
+ <string> utc Selector</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="loadTableButton">
+ <property name="text">
+ <string>load table</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
 <widget class="QLabel" name="label_3">
@@ -252,14 +193,25 @@
 </layout>
 </item>
 <item>
- <widget class="smallPushButton" name="dlTextButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save the lines of text that appear as dynamic label&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>dlText</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="smallPushButton" name="dlTextButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save the lines of text that appear as dynamic label&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>dlText</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallPushButton" name="set_coordinatesButton">
+ <property name="text">
+ <string>coordinates</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </widget>

qt-dab-4.1.1.tar.gz/forms/dabradio.ui -> qt-dab-4.35.tar.gz/forms/dabradio.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>624</width>
- <height>439</height>
+ <height>464</height>
 </rect>
 </property>
 <property name="sizePolicy">
@@ -17,7 +17,7 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB-4.11</string>
+ <string>Qt-DAB-4.35</string>
 </property>
 <layout class="QHBoxLayout" name="horizontalLayout_11">
 <item>
@@ -462,9 +462,9 @@
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="nrTransmitters">
+ <widget class="QLabel" name="transmitter_country">
 <property name="text">
- <string>TextLabel</string>
+ <string/>
 </property>
 </widget>
 </item>
@@ -552,6 +552,13 @@
 </widget>
 </item>
 <item>
+ <widget class="QLabel" name="distanceLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QWidget" name="controlWidget" native="true">
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>

qt-dab-4.1.1.tar.gz/includes/backend/data/epg-2/epg-decoder.h -> qt-dab-4.35.tar.gz/includes/backend/data/epg-2/epg-decoder.h Changed

@@ -20,8 +20,7 @@
 * along with Qt-TAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef	__EPG_DECODER__
-#define	__EPG_DECODER__
+
 
 #include	<QObject>
 #include	<stdio.h>
@@ -35,9 +34,13 @@
 	QString		shortName;
 	QString		mediumName;
 	QString		longName;
+	QString		shortDescription;
+	QString		longDescription;
 	int		startTime;
+	int		stopTime;
 	progDesc	() {
 	 startTime	= -1;
+	 stopTime	= -1;
 	}
 	void	clean		() {
 	 startTime	= -1;
@@ -45,6 +48,8 @@
 	 mediumName	= "";
 	 shortName	= "";
 	 ident	= "";
+	 shortDescription	= "";
+	 longDescription	= "";
 	}
 	 
 };
@@ -52,43 +57,77 @@
 class	epgDecoder: public QObject {
 Q_OBJECT
 public:
-			epgDecoder		();
-			~epgDecoder		();
 
-	int		process_epg		(uint8_t *, int, uint32_t);
+		epgDecoder	();
+		~epgDecoder	();
+
+int	process_epg	(uint8_t *v, int e_length,
+	 uint32_t SId, int subType);
 private:
-	uint32_t	SId;
-	QString		stringTable [20];
-	int		getBit			(uint8_t *, int);
-	uint32_t	getBits			(uint8_t *, int, int);
+	uint32_t SId;
+ QString stringTable [20];
+	int		subType;
+	int	getBit			(uint8_t *v, int bitnr);
+	uint32_t getBits		(uint8_t *v, int bitnr, int length);
+	int	process_programGroups	(uint8_t *v, int index);
+	int	process_programGroup	(uint8_t *v, int index);
+	int	process_schedule	(uint8_t *v, int index);
+	int	process_program		(uint8_t *v, int index);
+	int	process_scope		(uint8_t *v, int index);
+	int	process_serviceScope	(uint8_t *v, int index);
+	int	process_mediaDescription (uint8_t *v, int index, progDesc *);
+	int	process_ensemble	(uint8_t *v, int index);
+	int	process_service		(uint8_t *v, int index);
+	int	process_location	(uint8_t *v, int index, progDesc *);
+	int	process_bearer		(uint8_t *v, int index);
+	int	process_geoLocation	(uint8_t *v, int index);
+	int	process_programmeEvent	(uint8_t *v, int index);
+	int	process_onDemand	(uint8_t *v, int index);
+	int	process_genre		(uint8_t *v, int index, progDesc *);
+	int	process_keyWords	(uint8_t *v, int index);
+	int	process_link		(uint8_t *v, int index);
+	int	process_shortName	(uint8_t *v, int index, progDesc *);
+	int	process_mediumName	(uint8_t *v, int index, progDesc *);
+	int	process_longName	(uint8_t *v, int index, progDesc *);
+	int	process_shortDescription (uint8_t *v, int index, progDesc *);
+	int	process_longDescription (uint8_t *v, int index, progDesc *);
+	int	process_multiMedia	(uint8_t *v, int index);
+	int	process_radiodns	(uint8_t *v, int index);
+	int	process_time		(uint8_t *v, int index, int *);
+	int	process_relativeTime	(uint8_t *v, int index);
+	int	process_memberOf	(uint8_t *v, int index);
+	int	process_presentationTime (uint8_t *v, int index);
+	int	process_acquisitionTime (uint8_t *v, int index);
 
-	int		process_epgElement	(uint8_t *, int);
-	int		schedule_element	(uint8_t *, int);
-	int		programme_element	(uint8_t *, int, progDesc *);
-	int		process_mediaDescription	(uint8_t *, int);
-	int		process_location	(uint8_t *, int, progDesc *);
-	int		location_element	(uint8_t *, int, progDesc *);
-	int		time_element		(uint8_t *, int);
-	int		genre_element		(uint8_t *, int);
-	int		bearer_element		(uint8_t *, int);
-	int		multimedia		(uint8_t *, int);
+	int	process_country		(uint8_t *v, int index);
+	int	process_point		(uint8_t *v, int index);
+	int	process_polygon		(uint8_t *v, int index);
+//
+	int	process_412		(uint8_t *v, int index);
+	int	process_440		(uint8_t *v, int index);
+	int	process_46		(uint8_t *v, int index);
+	int	process_471		(uint8_t *v, int index);
+	int	process_472		(uint8_t *v, int index);
+	int	process_473		(uint8_t *v, int index);
+	int	process_474		(uint8_t *v, int index, int *);
+	int	process_475		(uint8_t *v, int index);
+	int	process_476		(uint8_t *v, int index);
+	int	process_481		(uint8_t *v, int index);
+	int	process_482		(uint8_t *v, int index);
+	int	process_483		(uint8_t *v, int index);
+	int	process_484		(uint8_t *v, int index);
+	int	process_485		(uint8_t *v, int index);
+	int	process_4171		(uint8_t *v, int index);
 
-	void		process_tokens		(uint8_t *, int, int);
-	int		process_token		(uint8_t *, int);
-	void		process_45		(uint8_t *, int, int);
-	void		process_46		(uint8_t *, int, int);
-	QString		process_471		(uint8_t *, int, int);
-	void		process_472		(uint8_t *, int, int);
-	void		process_473		(uint8_t *, int, int);
-	int		process_474		(uint8_t *, int, int);
-	void		process_475		(uint8_t *, int, int);
-	void		process_476		(uint8_t *, int, int);
-	QString		process_481		(uint8_t *, int, int);
-	void		process_483		(uint8_t *, int, int);
-	void		record			(progDesc *);
+	int	process_tokenTable	(uint8_t *v, int index);
+	int	process_token		(uint8_t *v, int index);
+	int	process_defaultLanguage	(uint8_t *v, int index);
+	int	process_obsolete	(uint8_t *v, int index);
+
+	void	record			(progDesc *);
 signals:
-	void		set_epgData		(int, int, const QString &);
+	void	set_epgData		(int, int,
+	 const QString &,
+	 const QString &);
 };
 
-#endif
-

qt-dab-4.35.tar.gz/includes/backend/data/epg-2a Added

qt-dab-4.35.tar.gz/includes/backend/data/epg-2a/epg-decoder.h Added

@@ -0,0 +1,94 @@
+#
+/*
+ * Copyright (C) 2013 .. 2020
+ * 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-TAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__EPG_DECODER__
+#define	__EPG_DECODER__
+
+#include	<QObject>
+#include	<stdio.h>
+#include	<stdint.h>
+#include	<stdlib.h>
+#include	<QString>
+
+class progDesc {
+public:
+	QString		ident;
+	QString		shortName;
+	QString		mediumName;
+	QString		longName;
+	int		startTime;
+	progDesc	() {
+	 startTime	= -1;
+	}
+	void	clean		() {
+	 startTime	= -1;
+	 longName	= "";
+	 mediumName	= "";
+	 shortName	= "";
+	 ident	= "";
+	}
+	 
+};
+
+class	epgDecoder: public QObject {
+Q_OBJECT
+public:
+			epgDecoder		();
+			~epgDecoder		();
+
+	int		process_epg		(uint8_t *, int, uint32_t);
+private:
+	uint32_t	SId;
+	QString		stringTable [20];
+	int		getBit			(uint8_t *, int);
+	uint32_t	getBits			(uint8_t *, int, int);
+
+	int		process_epgElement	(uint8_t *, int);
+	int		schedule_element	(uint8_t *, int);
+	int		programme_element	(uint8_t *, int, progDesc *);
+	int		process_mediaDescription	(uint8_t *, int);
+	int		process_location	(uint8_t *, int, progDesc *);
+	int		location_element	(uint8_t *, int, progDesc *);
+	int		time_element		(uint8_t *, int);
+	int		genre_element		(uint8_t *, int);
+	int		bearer_element		(uint8_t *, int);
+	int		multimedia		(uint8_t *, int);
+
+	void		process_tokens		(uint8_t *, int, int);
+	int		process_token		(uint8_t *, int);
+	void		process_45		(uint8_t *, int, int);
+	void		process_46		(uint8_t *, int, int);
+	QString		process_471		(uint8_t *, int, int);
+	void		process_472		(uint8_t *, int, int);
+	void		process_473		(uint8_t *, int, int);
+	int		process_474		(uint8_t *, int, int);
+	void		process_475		(uint8_t *, int, int);
+	void		process_476		(uint8_t *, int, int);
+	QString		process_481		(uint8_t *, int, int);
+	void		process_483		(uint8_t *, int, int);
+	void		record			(progDesc *);
+signals:
+	void		set_epgData		(int, int, const QString &);
+};
+
+#endif
+

qt-dab-4.1.1.tar.gz/includes/backend/msc-handler.h -> qt-dab-4.35.tar.gz/includes/backend/msc-handler.h Changed

qt-dab-4.1.1.tar.gz/includes/country-codes.h -> qt-dab-4.35.tar.gz/includes/country-codes.h Changed

qt-dab-4.1.1.tar.gz/includes/dab-constants.h -> qt-dab-4.35.tar.gz/includes/dab-constants.h Changed

qt-dab-4.35.tar.gz/includes/ofdm/channel.h Added

@@ -0,0 +1,55 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the SDR-J 
+ * SDR-J is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * SDR-J is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SDR-J; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#
+#ifndef	__CHANNEL_H
+#define	__CHANNEL_H
+
+#ifdef	__WITH_JAN__
+#include	<Eigen/Dense>
+#include	<QString>
+#include	"dab-constants.h"
+#include	<vector>
+using namespace	Eigen;
+
+//	The processor for estimating the channel(s) of a single
+//	symbol
+class	channel {
+public:
+		channel		(std::vector<std::complex<float>> &, int, int);
+		~channel	();
+	void	estimate	(std::complex<float> *, std::complex<float> *);
+private:
+	int16_t		numberofCarriers;
+	int16_t		numberofPilots;
+	int16_t		numberofTaps;
+	int16_t		fftSize;
+	typedef Matrix<std::complex<float>, Dynamic, Dynamic> MatrixXd;
+	typedef Matrix<std::complex<float>, Dynamic, 1> Vector;
+	MatrixXd	F_p;
+	MatrixXd	S_p;
+	MatrixXd	S_pxF_p;
+	std::vector<int16_t>	pilotTable;
+};
+
+#endif
+#endif
+

qt-dab-4.1.1.tar.gz/includes/ofdm/dab-config.h -> qt-dab-4.35.tar.gz/includes/ofdm/dab-config.h Changed

qt-dab-4.1.1.tar.gz/includes/ofdm/fib-decoder.h -> qt-dab-4.35.tar.gz/includes/ofdm/fib-decoder.h Changed

@@ -57,14 +57,19 @@
 	QString		findService	(uint32_t, int);
 	void		getParameters	(const QString &, uint32_t *, int *);
 uint8_t		get_ecc		();
+	uint16_t	get_countryName ();
+	uint8_t		get_countryId	();
 	int32_t		get_ensembleId	();
 	QString		get_ensembleName	();
 	int32_t		get_CIFcount	();	
-	void		set_epgData	(uint32_t, int32_t, const QString);
+	void		set_epgData	(uint32_t, int32_t,
+	 const QString &, const QString &);
 	std::vector<epgElement> get_timeTable	(uint32_t);
 	std::vector<epgElement> get_timeTable	(const QString &);
 	bool		has_timeTable	(uint32_t SId);
 	std::vector<epgElement>	find_epgData	(uint32_t);
+	QStringList	basicPrint 		();
+	int		scanWidth		();
 protected:
 	void	process_FIB		(uint8_t *, uint16_t);
 private:
@@ -162,6 +167,27 @@
 	QMutex		fibLocker;
 	int		CIFcount;
 
+	QString		serviceName		(int index);
+	QString		serviceIdOf		(int index);
+	QString		subChannelOf		(int index);
+	QString		startAddressOf		(int index);
+	QString		lengthOf 		(int index);
+	QString		protLevelOf		(int index);
+	QString		codeRateOf 		(int index);
+	QString		bitRateOf 		(int index);
+	QString		dabType 		(int index);
+	QString		languageOf 		(int index);
+	QString		programTypeOf		(int index);
+	QString		fmFreqOf		(int index);
+	QString		appTypeOf		(int index);
+	QString		FEC_scheme		(int index);
+	QString		packetAddress		(int index);
+	QString		DSCTy			(int index);
+//
+	QString		audioHeader		();
+	QString		packetHeader		();
+	QString		audioData		(int index);
+	QString		packetData		(int index);
 signals:
 	void		addtoEnsemble		(const QString &, int);
 	void		nameofEnsemble		(int, const QString &);

qt-dab-4.1.1.tar.gz/includes/ofdm/fic-handler.h -> qt-dab-4.35.tar.gz/includes/ofdm/fic-handler.h Changed

qt-dab-4.1.1.tar.gz/includes/ofdm/ofdm-decoder.h -> qt-dab-4.35.tar.gz/includes/ofdm/ofdm-decoder.h Changed

qt-dab-4.1.1.tar.gz/includes/ofdm/phasereference.h -> qt-dab-4.35.tar.gz/includes/ofdm/phasereference.h Changed

qt-dab-4.1.1.tar.gz/includes/scopes-qwt6/spectrogramdata.h -> qt-dab-4.35.tar.gz/includes/scopes-qwt6/spectrogramdata.h Changed

@@ -24,15 +24,27 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 */
-#ifndef	__SPECTROGRAM
-#define	__SPECTROGRAM
+#ifndef	__SPECTROGRAM_H
+#define	__SPECTROGRAM_H
 
 #include	<cstdio>
 #include	<cstdlib>
 #include	<qwt_interval.h>
-#include	<qwt_raster_data.h>
+#include	<QPen>
+//
+//	Qwt 6.2 is different from the 6.1 version, these mods
+//	seem to work
+//#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0602)
+# include	<qwt_raster_data.h>
+//#else
+//# include	<qwt_matrix_raster_data.h>
+//#endif
 
+//#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0602)
 class	SpectrogramData: public QwtRasterData {
+//#else
+//class	SpectrogramData: public QwtMatrixRasterData {
+//#endif
 public:
 	double	*data;		// pointer to actual data
 	int	left;		// index of left most element in raster
@@ -44,7 +56,11 @@
 
 	SpectrogramData (double *data, int left, int width, int height,
 	 int datawidth, double max):
- QwtRasterData() {
+//#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0602)
+ QwtRasterData () {
+//#else
+//	QwtMatrixRasterData () {
+//#endif
 	this	-> data		= data;
 	this	-> left		= left;
 	this	-> width	= width;
@@ -57,7 +73,6 @@
 	setInterval (Qt::YAxis, QwtInterval (0, height));
 	setInterval (Qt::ZAxis, QwtInterval (0, max));
 #endif
-
 }
 
 void	initRaster (const QRectF &x, const QSize &raster) {

qt-dab-4.35.tar.gz/includes/support/ITU_Region_1.h Added

qt-dab-4.35.tar.gz/includes/support/content-table.h Added

@@ -0,0 +1,69 @@
+#
+/*
+ * Copyright (C) 2021
+ * 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 dab-scanner; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__CONTENT_TABLE__
+#define	__CONTENT_TABLE__
+
+#include	<QWidget>
+#include	<QObject>
+#include	<QScrollArea>
+#include	<QTableWidget>
+#include	<QStringList>
+#include	<QTableWidgetItem>
+#include	<QObject>
+#include	<QString>
+#include	<QByteArray>
+
+#include	"text-mapper.h"
+class	RadioInterface;
+class	QSettings;
+class	audiodata;
+
+class	contentTable: public QObject {
+Q_OBJECT
+public:
+		contentTable	(RadioInterface *, QSettings *,
+	 const QString &, int);
+		~contentTable	();
+	void	show		();
+	void	hide		();
+	bool	isVisible	();
+	void	clearTable	();
+	void	addLine		(const QString &);
+	void	dump		(FILE *);
+private:
+	QString		channel;
+	int		columns;
+	RadioInterface	*theRadio;
+	QSettings	*dabSettings;
+	QScrollArea	*myWidget;
+	QTableWidget	*contentWidget;
+	int16_t		addRow	();
+	bool		is_clear;
+private slots:
+	void		selectService	(int, int);
+	void		dump		(int, int);
+signals:
+	void		goService	(const QString &);
+};
+
+#endif

qt-dab-4.35.tar.gz/includes/support/coordinates.h Added

@@ -0,0 +1,54 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__COORDINATES_H
+#define	__COORDINATES_H
+#include	<QDialog>
+#include	<QLabel>
+#include	<QLineEdit>
+#include	<QPushButton>
+
+class	QSettings;
+
+class	coordinates: public QDialog {
+Q_OBJECT
+	public:
+		coordinates	(QSettings *);
+		~coordinates	();
+	private:
+	QSettings	*dabSettings;
+	QLabel		*latitudeText;
+ QLineEdit	*latitude;
+ QLabel		*longitudeText;
+ QLineEdit	*longitude;
+	QPushButton	*acceptButton;
+	bool		latitudeValue;
+	bool		longitudeValue;
+private slots:
+	void		set_latitude 	();
+	void		set_longitude	();
+	void		handle_acceptButton () ;
+};
+
+#endif
+
+

qt-dab-4.1.1.tar.gz/includes/support/dl-cache.h -> qt-dab-4.35.tar.gz/includes/support/dl-cache.h Changed

qt-dab-4.1.1.tar.gz/includes/support/element-selector.h -> qt-dab-4.35.tar.gz/includes/support/element-selector.h Changed

qt-dab-4.1.1.tar.gz/includes/support/findfilenames.h -> qt-dab-4.35.tar.gz/includes/support/findfilenames.h Changed

qt-dab-4.1.1.tar.gz/includes/support/presetcombobox.h -> qt-dab-4.35.tar.gz/includes/support/presetcombobox.h Changed

@@ -1,63 +1,42 @@
-/*****************************************************************************
- * Copyright (C) 2018 Shie Erlich <krusader@users.sourceforge.net> *
- * Copyright (C) 2018 Rafi Yanai <krusader@users.sourceforge.net> *
- * Copyright (C) 2018 Krusader Krew [https://krusader.org] *
- * *
- * This file is part of Krusader [https://krusader.org]. *
- * *
- * Krusader 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. *
- * *
- * Krusader 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 Krusader. If not, see [http://www.gnu.org/licenses/]. *
- *****************************************************************************/
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 #ifndef	__PRESET_COMBOBOX__
 #define	__PRESET_COMBOBOX__
 
 #include	<QEvent>
 #include	<QComboBox>
 #include	<QSize>
+#include	<QMouseEvent>
 
-class KHBoxEventFilter : public QObject {
-Q_OBJECT
-public:
-	explicit KHBoxEventFilter(QObject *parent = nullptr):
-	 QObject(parent) {}
-protected:
-	bool eventFilter(QObject *obj, QEvent *event) override;
-};
-
-//! An event filter for the popup list of a presetComboBox, e.g.
-// it deletes the current item when the user presses Shift+Del
-class KHBoxListEventFilter : public QObject {
-Q_OBJECT
-public:
- explicit KHBoxListEventFilter (QObject *parent = nullptr):
-	 QObject(parent) {}
-
-protected:
- bool eventFilter(QObject *obj, QEvent *event) override;
-};
-
-//! A specialized version of a QComboBox, e.g. it deletes the current item when the user presses Shift+Del
+//	A specialized version of a QComboBox, e.g. it deletes
+//	the current item when the user uses the right mouse button
 class presetComboBox : public QComboBox {
 Q_OBJECT
 
 public:
 	explicit presetComboBox(QWidget *parent = nullptr);
-
 	QSize	sizeHint	()const;
-protected:
-	KHBoxEventFilter boxEF;
-	KHBoxListEventFilter listEF;
-	void	mouseDoubleClickEvent	(QMouseEvent *e);
+	bool	eventFilter (QObject *o, QEvent *e);
 };
 
 #endif

qt-dab-4.1.1.tar.gz/includes/support/scheduler.h -> qt-dab-4.35.tar.gz/includes/support/scheduler.h Changed

qt-dab-4.1.1.tar.gz/includes/support/time-table.h -> qt-dab-4.35.tar.gz/includes/support/time-table.h Changed

qt-dab-4.35.tar.gz/mainwidget.png Added

qt-dab-4.1.1.tar.gz/qt-dab-epg-data.png -> qt-dab-4.35.tar.gz/qt-dab-epg-data.png Changed

qt-dab-4.1.1.tar.gz/qt-dab-main-controls.png -> qt-dab-4.35.tar.gz/qt-dab-main-controls.png Changed

qt-dab-4.1.1.tar.gz/qt-dab-scan.png -> qt-dab-4.35.tar.gz/qt-dab-scan.png Changed

qt-dab-4.1.1.tar.gz/qt-dab-technical-widget.png -> qt-dab-4.35.tar.gz/qt-dab-technical-widget.png Changed

qt-dab-4.1.1.tar.gz/scheduler.png -> qt-dab-4.35.tar.gz/scheduler.png Changed

qt-dab-4.35.tar.gz/screen-4.35.png Added

qt-dab-4.35.tar.gz/screen-4.351.png Added

qt-dab-4.1.1.tar.gz/snr-viewer/snr-viewer.cpp -> qt-dab-4.35.tar.gz/snr-viewer/snr-viewer.cpp Changed

@@ -41,9 +41,9 @@
 	dabSettings	-> beginGroup ("snrViewer");
 	plotLength	= dabSettings -> value ("snrLength", 312). toInt ();
 	plotHeight	= dabSettings -> value ("snrHeight", 15). toInt ();
-	 
-	colorString	= dabSettings -> value ("displayColor",
-	 "black"). toString();
+	delayCount	= dabSettings	-> value ("snrDelay", 5). toInt ();
+	colorString	= dabSettings -> value ("displayColor", "black").
+	 toString ();
 	displayColor	= QColor (colorString);
 	colorString	= dabSettings -> value ("gridColor",
 	 "white"). toString();
@@ -53,13 +53,19 @@
 	curveColor	= QColor (colorString);
 	dabSettings	-> endGroup ();
 	setupUi (&myFrame);
-#ifdef	__DUMP_SNR__
+
+	snrLengthSelector -> setValue (plotLength);
+	snrSlider	-> setValue (plotHeight);
+	snrCompressionSelector -> setValue (delayCount);
 	snrDumpFile. store (nullptr);
 	connect (snrDumpButton, SIGNAL (clicked ()),
 	 this, SLOT (handle_snrDumpButton ()));
-#else
-	snrDumpButton 	-> hide ();
-#endif
+	connect (snrSlider, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_snrHeight (int)));
+	connect (snrCompressionSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_snrDelay (int)));
+	connect (snrLengthSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_snrLength (int)));
 	plotgrid	= snrPlot;
 	plotgrid	-> setCanvasBackground (displayColor);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
@@ -101,46 +107,15 @@
 	 X_axis [i] = i;
 	 Y_Buffer [i] = 0;
 	}
-	delayCount	= 5;
 	delayBufferP	= 0;
 }
 
 	snrViewer::~snrViewer () {
-#ifdef	__DUMP_SNR__
 	stopDumping 	();
-#endif
 //	delete lm_picker;
 //	delete lpickerMachine;
 }
 
-void	snrViewer::setHeight	(int n) {
-	plotHeight	= n;
-	dabSettings	-> beginGroup ("snrViewer");
-	dabSettings	-> setValue ("snrHeight", n);
-	dabSettings	-> endGroup ();
-	plotgrid	-> setAxisScale (QwtPlot::yLeft,
-				 0, plotHeight);
-	plotgrid	-> enableAxis (QwtPlot::yLeft);
-//	spectrum_curve. setBaseline (0);
-}
-
-void	snrViewer::setLength	(int n) {
-	Y_Buffer. resize (n);
-	X_axis. resize (n);
-	if (n > plotLength) {
-	 for (int i = plotLength; i < n; i ++) {
-	 Y_Buffer [i] = 0;
-	 X_axis [i] = i;
-	 }
-	}
-	plotLength = n;
-	dabSettings	-> beginGroup ("snrViewer");
-	dabSettings	-> setValue ("snrLength", plotLength);
-	dabSettings	-> endGroup ();
-	plotgrid	-> setAxisScale (QwtPlot::xBottom,
-	 0, plotLength - 1);
-	plotgrid	-> enableAxis (QwtPlot::xBottom);
-}
 
 void	snrViewer::show () {
 	myFrame. show();
@@ -148,23 +123,13 @@
 
 void	snrViewer::hide	() {
 	myFrame. hide();
-#ifdef	__DUMP_SNR__
 	stopDumping ();
-#endif
 }
 
 bool	snrViewer::isHidden () {
 	return myFrame. isHidden();
 }
 
-void	snrViewer::set_snrDelay	(int d) {
-	if ((0 <= d) && (d <= 10))
-	 delayCount = d;
-	else
-	 delayCount = 5;
-	delayBufferP	= 0;
-}
-
 void	snrViewer::add_snr	(float snr) {
 static float delayBuffer [10];
 float	sum	= 0;
@@ -191,11 +156,9 @@
 	 (plotLength - VIEWBUFFER_SIZE) * sizeof (double));
 	 for (int i = 0; i < VIEWBUFFER_SIZE; i ++)
 	 Y_Buffer [i] = displayBuffer [i];
-#ifdef	__DUMP_SNR__
 	 if (snrDumpFile. load () != nullptr)
 	 fwrite (displayBuffer, sizeof (float), 
 	 VIEWBUFFER_SIZE, snrDumpFile. load ());
-#endif
 	}
 }
 
@@ -204,10 +167,8 @@
 	memmove (&(Y_Buffer. data () [1]), &(Y_Buffer. data () [0]),
 	 (plotLength - 1) * sizeof (double));
 	Y_Buffer [0]	= snr;
-#ifdef	__DUMP_SNR__
 	if (snrDumpFile. load () != nullptr)
 	 fwrite (&snr, sizeof (float), 1, snrDumpFile. load ());
-#endif
 }
 
 void	snrViewer::show_snr () {
@@ -272,7 +233,6 @@
 	plotgrid	-> setCanvasBackground (this -> displayColor);
 }
 
-#ifdef	__DUMP_SNR__
 void	snrViewer::handle_snrDumpButton () {
 	if (snrDumpFile. load () != nullptr) {
 	 stopDumping ();
@@ -312,4 +272,45 @@
 	snrDumpFile. store (file);
 	snrDumpButton -> setText ("dumping");
 }
-#endif
+
+
+void	snrViewer::set_snrDelay	(int d) {
+	if ((0 <= d) && (d <= 10))
+	 delayCount = d;
+	else
+	 delayCount = 5;
+	delayBufferP	= 0;
+	dabSettings	-> beginGroup ("snrViewer");
+	dabSettings -> setValue ("snrDelay", d);
+	dabSettings	-> endGroup ();
+
+}
+
+void	snrViewer::set_snrHeight	(int n) {
+	plotHeight	= n;
+	dabSettings	-> beginGroup ("snrViewer");
+	dabSettings	-> setValue ("snrHeight", n);
+	dabSettings	-> endGroup ();
+	plotgrid	-> setAxisScale (QwtPlot::yLeft,
+				 0, plotHeight);
+	plotgrid	-> enableAxis (QwtPlot::yLeft);
+//	spectrum_curve. setBaseline (0);
+}
+
+void	snrViewer::set_snrLength	(int n) {
+	Y_Buffer. resize (n);
+	X_axis. resize (n);
+	if (n > plotLength) {
+	 for (int i = plotLength; i < n; i ++) {
+	 Y_Buffer [i] = 0;
+	 X_axis [i] = i;
+	 }
+	}
+	plotLength = n;
+	dabSettings	-> beginGroup ("snrViewer");
+	dabSettings	-> setValue ("snrLength", plotLength);
+	dabSettings	-> endGroup ();
+	plotgrid	-> setAxisScale (QwtPlot::xBottom,
+	 0, plotLength - 1);
+	plotgrid	-> enableAxis (QwtPlot::xBottom);
+}

qt-dab-4.1.1.tar.gz/snr-viewer/snr-viewer.h -> qt-dab-4.35.tar.gz/snr-viewer/snr-viewer.h Changed

qt-dab-4.1.1.tar.gz/snr-viewer/snr-widget.ui -> qt-dab-4.35.tar.gz/snr-viewer/snr-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>330</width>
- <height>243</height>
+ <width>398</width>
+ <height>174</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -15,34 +15,68 @@
 </property>
 <layout class="QVBoxLayout" name="verticalLayout">
 <item>
- <widget class="QwtPlot" name="snrPlot">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;snr display. As well known a DAB frame starts with a so-called null period, a period where the amplitude of the transmitted signal is (should be) zero. So, it is an excellent noise floor, and the SNR shown is computed as 20 * log10 (average amplitude from data blocks / average amplitude null period). One thing though. in many SFN's the transmitters add an encoding og the transmitter id (tii) to each second DABframe. So for uneven compressions you see the difference on SNR between the first and second frames&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QSlider" name="snrSlider">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>141</height>
+ </size>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="snrPlot">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>141</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;snr display. As well known a DAB frame starts with a so-called null period, a period where the amplitude of the transmitted signal is (should be) zero. So, it is an excellent noise floor, and the SNR shown is computed as 20 * log10 (average amplitude from data blocks / average amplitude null period). One thing though. in many SFN's the transmitters add an encoding og the transmitter id (tii) to each second DABframe. So for uneven compressions you see the difference on SNR between the first and second frames&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
- <widget class="QPushButton" name="snrDumpButton">
- <property name="text">
- <string>dump</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="indexDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter is detected, the relative distance - in msec - is shown between the arrival time of the data of the transmitter that is used, and the arrival time of the data of the other transmitter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="snrDumpButton">
+ <property name="text">
+ <string>dump</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="snrCompressionSelector">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="snrLengthSelector">
+ <property name="minimum">
+ <number>100</number>
+ </property>
+ <property name="maximum">
+ <number>500</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </widget>

qt-dab-4.1.1.tar.gz/spectrum-viewer/scopewidget.ui -> qt-dab-4.35.tar.gz/spectrum-viewer/scopewidget.ui Changed

@@ -6,14 +6,14 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>620</width>
- <height>216</height>
+ <width>556</width>
+ <height>187</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>spectrumscope</string>
 </property>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout">
 <item>
@@ -34,42 +34,41 @@
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrumview. &lt;/p&gt;&lt;p&gt;The spectrum of the incoming signal is shown here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QwtPlot" name="iqDisplay">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>202</height>
+ </size>
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram.&lt;/p&gt;&lt;/p&gt;The decoded symbols consist of a complex value, i.e. a value in a two dimensional space. Ideally, the diagram shows 4 dots, one in each quadrant. The number below the diagram (at left) shows - in dB - the deviation of the ideal position.&lt;/p&gt;&lt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrumview. &lt;/p&gt;&lt;p&gt;The spectrum of the incoming signal is shown here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </string>
 </property>
 </widget>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout">
 <item>
- <widget class="QLCDNumber" name="quality_display">
- <property name="toolTip">
- <string>Quality indicator: the &quot;quality&quot; of the decoded signal is measured as Modulation Error Rate, using the formula from section 6.9.2 of TR 101 290 Measurement guidelines for DVB.
-An &quot;ideal&quot; (i.e. synthetic) signal reaches a value of over 20. Poor signals give values around 0</string>
+ <widget class="QwtPlot" name="iqDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>191</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>169</height>
+ </size>
 </property>
- </widget>
- </item>
- <item>
- <widget class="QLCDNumber" name="clockError">
 <property name="toolTip">
- <string>clock offset. The value indicates the number of samples too many or too few for 10 DAB frames (which is about 1 second).</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram.&lt;/p&gt;&lt;/p&gt;The decoded symbols consist of a complex value, i.e. a value in a two dimensional space. Ideally, the diagram shows 4 dots, one in each quadrant. The number below the diagram (at left) shows - in dB - the deviation of the ideal position.&lt;/p&gt;&lt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 </widget>
 </item>
@@ -90,6 +89,91 @@
 </item>
 </layout>
 </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLCDNumber" name="quality_display">
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>Quality indicator: the &quot;quality&quot; of the decoded signal is measured as Modulation Error Rate, using the formula from section 6.9.2 of TR 101 290 Measurement guidelines for DVB.
+An &quot;ideal&quot; (i.e. synthetic) signal reaches a value of over 20. Poor signals give values around 0</string>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLCDNumber" name="clockError">
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>clock offset. The value indicates the number of samples too many or too few for 10 DAB frames (which is about 1 second).</string>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLCDNumber" name="timeOffsetDisplay">
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;time offset, an indication of the time offset of the samples&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="scoOffsetDisplay">
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sample clock offset. &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="frequencyOffsetDisplay">
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequeny offset, the computed frequency error, after applying the estimated frequency correction.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
 </layout>
 </widget>
 <customwidgets>

qt-dab-4.1.1.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> qt-dab-4.35.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

qt-dab-4.1.1.tar.gz/spectrum-viewer/spectrum-viewer.h -> qt-dab-4.35.tar.gz/spectrum-viewer/spectrum-viewer.h Changed

qt-dab-4.1.1.tar.gz/src/backend/backend.cpp -> qt-dab-4.35.tar.gz/src/backend/backend.cpp Changed

qt-dab-4.1.1.tar.gz/src/backend/data/data-processor.cpp -> qt-dab-4.35.tar.gz/src/backend/data/data-processor.cpp Changed

@@ -80,6 +80,7 @@
 void	dataProcessor::addtoFrame (std::vector<uint8_t> outV) {
 //	There is - obviously - some exception, that is
 //	when the DG flag is on and there are no datagroups for DSCTy5
+
 	 if ((this -> DSCTy == 5) &&
 	 (this -> DGflag))	// no datagroups
 	 handleTDCAsyncstream (outV. data(), 24 * bitRate);
@@ -115,14 +116,14 @@
 uint16_t command	= getBits_1 (data, 16);
 int32_t	usefulLength	= getBits_7 (data, 17);
 //	if (usefulLength > 0)
-//	 fprintf (stderr, "CI = %d, address = %d, usefulLength = %d\n",
+//	 fprintf (stderr, "CI = %d, address = %d, usefulLength = %d\n",
 //	 continuityIndex, address, usefulLength);
 
 	if (continuityIndex != expectedIndex) {
 	 expectedIndex = 0;
 	 return;
 	}
-//
+
 	expectedIndex = (expectedIndex + 1 ) % 4;
 	(void)command;
 
@@ -133,8 +134,8 @@
 	if (address == 0)
 	 return;		// padding packet
 //
-//	if (packetAddress != address)	// sorry
-//	 return;
+	if (packetAddress != address)	// sorry
+	 return;
 	
 //	assemble the full MSC datagroup

qt-dab-4.1.1.tar.gz/src/backend/data/epg-2/epg-decoder.cpp -> qt-dab-4.35.tar.gz/src/backend/data/epg-2/epg-decoder.cpp Changed

@@ -26,6 +26,7 @@
 #include	"epg-decoder.h"
 
 #define	EPG_TAG			0X02
+#define	SERVICE_TAG		0X03
 
 //
 	epgDecoder::epgDecoder	() {
@@ -54,15 +55,17 @@
 	return res;
 }
 
-int	epgDecoder::process_epg	(uint8_t *v, int e_length, uint32_t SId) {
+int	epgDecoder::process_epg	(uint8_t *v, int e_length,
+	 uint32_t SId, int subType) {
 int	ind	= 0;
 uint8_t	tag	= v [0];
 int length	= v [1];
 int	index	= 0;
 
 	this	-> SId	= SId;
-	if (v [0] != EPG_TAG)
-	 return length;
+	this	-> subType	= subType;
+	if ((v [0] != EPG_TAG) && (v [0] != SERVICE_TAG))
+	 return e_length;
 
 	if (length == 0xFE) {
 	 length = (v [2] << 8) | v [3];
@@ -77,13 +80,70 @@
 	 index	= 2;
 
 	int endPoint	= index + length;
-
-	while (index < endPoint)
-	 index = process_epgElement (v, index);
+	if (tag == EPG_TAG) {
+	 while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x04:		// process tokenTable
+	 index = process_tokenTable (v, index);
+	 break;
+
+	 case 0x20:	// process ProgramGroups
+	 index = process_programGroups (v, index);
+	 break;
+
+	 case 0x21:	// process_schedule (v, index);
+	 index = process_schedule (v, index);
+	 break;
+
+	 case 0x05:	// obsolete
+	 index = process_obsolete (v, index);
+	 break;
+
+	 case 0x06:	// default language
+	 index = process_defaultLanguage (v, index);
+	 break;
+
+	 default:
+	 return endPoint;
+	 }
+	 }
+	 return endPoint;
+	}
+	
+	if (tag == SERVICE_TAG)	{	// superfluous test
+	 switch (v [index]) {
+	 case 0x06:	// default language
+	 index = process_defaultLanguage (v, index);
+	 break;
+
+	 case 0x26:	// ensemble
+	 index = process_ensemble (v, index);
+	 break;
+
+	 case 0x28:	// process_service
+	 index = process_service (v, index);
+	 break;
+
+	 case 0x80:	// version
+	 index = process_483 (v, index);
+	 break;
+
+	 case 0x81:	// creation time
+	 index = process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x82:	// originator
+	 index = process_440 (v, index);
+	 break;
+
+	 case 0x83:	// serviceProvider
+	 index	= process_440 (v, index);
+	 }
+	}
 	return endPoint;
 }
 
-int32_t	epgDecoder::process_epgElement	(uint8_t *v, int index) {
+int	epgDecoder::process_programGroups (uint8_t *v, int index) {
 uint8_t	tag	= v [index];
 int length	= v [index + 1];
 
@@ -101,41 +161,120 @@
 
 	int endPoint	= index + length;
 
-	switch (tag) {
-	 case 0x04: 		// token table element
-	 while (index < endPoint)
-	 index = process_token (v, index);
-	 return endPoint;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x23:	// programGroup
+	 index	= process_programGroup (v, index);
+	 break;
 
-	 case 0x05:		// obsolete
-	 return endPoint;
+	 case 0x80:	// Version
+	 index = process_483 (v, index);
+	 break;
 
-	 case 0x06:		// default language
-//	 for (int i = 0; i < length; i ++)
-//	 fprintf (stderr, "%c", v [index + i]);
-	 return endPoint;
+	 case 0x81:	// creation Time
+	 index = process_474 (v, index, nullptr);
+	 break;
 
-	 case 0x20:		// programmeGroups
-	 return endPoint;
+	 case 0x82:	// Originator
+	 index = process_440 (v, index);
+	 break;
 
-	 case 0x21:		// schedule
-	 while (index < endPoint) 
-	 index = schedule_element (v, index);
-	 return endPoint;
+	 default:
+	 fprintf (stderr, " in programGroups we missed %x\n", v [index]);
+	 return endPoint;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_programGroup (uint8_t *v, int index) {
+int length	= v [index + 1];
+progDesc p;
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
 
-	 case 0x22:		//alternate source
-	 return endPoint;
+	int endPoint	= index + length;
 
-	 default:
-//	 fprintf (stderr, "Missed tag %d in epg\n", tag);
-	 return endPoint;
+	p. clean ();
+	while (index < endPoint) {
+//	 fprintf (stderr, "In process_programmeGroup tag %x\n", v [index]);
+	 switch (v [index]) {
+	 case 0x10:	// shortName
+	 index = process_shortName (v, index, &p);
+	 break;
+
+	 case 0x11:	// mediumName
+	 index = process_mediumName (v, index, &p);
+	 break;
+
+	 case 0x12:	// longName
+	 index = process_longName (v, index, &p);
+	 break;
+
+	 case 0x13:	// mediaDescription
+	 index = process_mediaDescription (v, index, &p);
+	 break;
+
+	 case 0x14:	// genre
+	 index = process_genre (v, index, &p);
+	 break;
+
+	 case 0x16:	// keywords
+	 index = process_keyWords (v, index);
+	 break;
+
+	 case 0x17:	// member of
+	 index = process_memberOf (v, index);
+	 break;
+
+	 case 0x18:	// link
+	 index	= process_link (v, index);
+	 break;
+
+	 case 0x20:	// programGroups
+	 index	= process_programGroups (v, index);
+	 break;
+
+	 case 0x80:	// id
+	 index	= process_471 (v, index);
+	 break;
+
+	 case 0x81:	// shortId
+	 index	= process_472 (v, index);
+	 break;
+
+	 case 0x82:	// version
+	 index	= process_483 (v, index);
+	 break;
+
+	 case 0x83:	// type
+	 index	= process_46 (v, index);
+	 break;
+
+	 case 0x84:	// number of items
+	 index	= process_484 (v, index);
+	 break;
+
+	 default:
+	 fprintf (stderr, " in programGroup we missed %x\n", v [index]);
+	 return endPoint;
+	 }
 	}
+	record (&p);
+	return endPoint;
 }
 
-int	epgDecoder::schedule_element (uint8_t *v, int index) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_schedule (uint8_t *v, int index) {
 int length	= v [index + 1];
-progDesc	theElement;
 
 	if (length == 0XFE) {
 	 length = (v [index + 2] << 8) | v [index + 3];
@@ -151,44 +290,40 @@
 
 	int endPoint	= index + length;
 
-//	fprintf (stderr, "schedule element %x (length %d)\n", tag, length);
-	switch (tag) {
-	 case 0x1C:		// programme
-	 theElement. clean ();
-	 while (index < endPoint) {
-	 index = programme_element (v, index, &theElement);
-	 }
-	 record (&theElement);
-	 return endPoint;
-
-	 case 0x24:		// scope
-//	 fprintf (stderr, "we have a service scope\n");
-	 return endPoint;
-
-//	the attributes
-	 case 0x80:		// version
-	 process_483 (v, index, length);
-	 return endPoint;
-
-	 case 0x81: {		// creation time
-	 int time = process_474 (v, index, length);
-//	 fprintf (stderr, "schedule created at %.2d:%.2d\n",
-//	 time / 60, time % 60);
-	 return endPoint;
-	 }
-	
-	 case 0x82:		// originator
-	 return endPoint;
+	while (index < endPoint) {
+//	 fprintf (stderr, "in process_schedule with tag %x\n", v [index]);
+	 switch (v [index]) {
+	 case 0x1C:
+	 index	= process_program (v, index);
+	 break;
+
+	 case 0x24:	// scope
+	 index = process_scope (v, index);
+	 break;
 
-	 default:
-	 fprintf (stderr, "missed tag $d in schedule\n", tag);
-	 return index + length;
+	 case 0x80:	// version
+	 index	= process_483 (v, index);
+	 break;
+
+	 case 0x81:	// creation time
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x82:	// originator
+	 index	= process_440 (v, index);
+	 break;
+
+	 default:
+	 fprintf (stderr, " in schedule missed %x\n", v [index]);
+	 return endPoint;
+	 }
 	}
+	return endPoint;
 }
 
-int	epgDecoder::programme_element (uint8_t *v, int index, progDesc *p) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_program (uint8_t *v, int index) {
 int length	= v [index + 1];
+progDesc theElement;
 
 	if (length == 0XFE) {
 	 length = (v [index + 2] << 8) | v [index + 3];
@@ -203,59 +338,158 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-//	fprintf (stderr, "programmeElement, tag %x, length %d\n", tag, length);
-	switch (tag) {
-	 case 0x80:			// Id
-	 p -> ident = process_471 (v, index, length);
-	 return endPoint;
 
-	 case 0x81:
-//	 process_472 (v, index, length);
-	 return endPoint;
-
-	 case 0x82:
-	 case 0x83:
-	 return endPoint;
+	theElement. clean ();
+	while (index < endPoint) {
+//	 fprintf (stderr, "in process_programme with tag %x\n", v [index]);
+	 switch (v [index]) {
+	 case 0x10:	// shortName
+	 index	= process_shortName (v, index, &theElement);
+	 break;
+
+	 case 0x11:	// mediumName
+	 index	= process_mediumName (v, index, &theElement);
+	 break;
+
+	 case 0x12:	// longName
+	 index	= process_longName (v, index, &theElement);
+	 break;
+
+	 case 0x13:	// mediaDescription
+	 index	= process_mediaDescription (v, index, &theElement);
+	 break;
+
+	 case 0x14:	// genre
+	 index	= process_genre (v, index, &theElement);
+	 break;
+
+	 case 0x16:	// keywords
+	 index	= process_keyWords (v, index);
+	 break;
+
+	 case 0x17:	// memberOf
+	 index	= process_memberOf (v, index);
+	 break;
+
+	 case 0x18:	// link
+	 index	= process_link (v, index);
+	 break;
+
+	 case 0x19:	// location
+	 index	= process_location (v, index, &theElement);
+	 break;
+
+	 case 0x2E:	// programmeEvent
+	 index	= process_programmeEvent (v, index);
+	 break;
+
+	 case 0x36:	// inDemand
+	 index	= process_onDemand (v, index);
+	 break;
+
+	 case 0x80:	// id
+	 index	= process_471	(v, index);
+	 break;
+
+	 case 0x81:	// shortId
+	 index	= process_472 (v, index);
+	 break;
+
+	 case 0x82:	// version
+	 index	= process_483 (v, index);
+	 break;
+
+	 case 0x83:	// recommendation
+	 index	= process_46 (v, index);
+	 break;
+
+	 case 0x84:	// broadcast
+	 index	= process_46 (v, index);
+	 break;
+
+	 case 0x86:	// xml:lang
+	 index	= process_481 (v, index);
+	 break;
+
+	 default:
+	 fprintf (stderr, "In programme we missed %x\n", v [index]);
+	 return endPoint;
+	 }
+	}
+	record (&theElement);
+	return endPoint;
+}
 
-	 case 0x84:			// broadcast
-	 return endPoint;
+int	epgDecoder::process_scope (uint8_t *v, int index) {
+int length	= v [index + 1];
 
-	 case 0x86:			// xml:lan
-	 return endPoint;
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
 
-	 case 0x10:			// shortName
-	 p -> shortName = process_481 (v, index, length);
-	 return endPoint;
+	int endPoint	= index + length;
 
-	 case 0x11:			// mediumName
-	 p -> mediumName = process_481 (v, index, length);
-	 return endPoint;
+	while (index < endPoint) {
+	 int startTime;
+	 int stopTime;
+	 switch (v [index]) {
+	 case 0x25:	// serviceScope
+	 index	= process_serviceScope (v, index);
+	 break;
+
+	 case 0x80:	// start time
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x81:	// stop time
+	 index	= process_474 (v, index, nullptr);
+	 break;
+	 }
+	}
+	return endPoint;
+}
 
-	 case 0x12:			// longName
-	 p -> longName = process_481 (v, index, length);
-	 return endPoint;
+int	epgDecoder::process_serviceScope (uint8_t *v, int index) {
+int length	= v [index + 1];
 
-	 case 0x13:			// media description
-	 process_mediaDescription	(v, index);
-	 return endPoint;
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
 
-	 case 0x14:
-	 while (index < endPoint)
-	 index	= genre_element (v, index);
-	 return endPoint;
+	int endPoint	= index + length;
 
-	 case 0x19:			// location
-	 process_location		(v, index, p);
-	 return endPoint;
+	while (index < endPoint) {
+//	 fprintf (stderr, "in serviceScope with tag %x\n", v [index]);
+	 switch (v [index]) {
+	 case 0x80:	// id
+	 index	= process_476 (v, index);
+	 break;
 
-	 default:
-//	 fprintf (stderr, "missed tag with programme %x\n", tag);
-	 return endPoint;
+	 default:
+	 fprintf (stderr, "in process_serviceScope %d\n", v [index]);
+	 }
 	}
+	return endPoint;
 }
 
-int	epgDecoder::process_mediaDescription	(uint8_t *v, int index) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_mediaDescription (uint8_t *v, int index,
+	 progDesc *p) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -270,16 +504,30 @@
 	else
 	 index += 2;
 
-//	fprintf (stderr, "mediaDescription, tag %x (%d)\n", tag, length);
 	int endPoint	= index + length;
-	while (index < endPoint) 
-	 index = multimedia (v, index);
 
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x1A:	// shortDescription
+	 index	= process_shortDescription (v, index, p);
+	 break;
+
+	 case 0x1B:	// longDescription 
+	 index	= process_longDescription (v, index, p);
+	 break;
+
+	 case 0x2B:	// multiMedia
+	 index	= process_multiMedia (v, index);
+	 break;
+
+	 default:
+	 return endPoint;
+	 }
+	}
 	return endPoint;
 }
 
-int	epgDecoder::process_location	(uint8_t *v, int index, progDesc *p) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_ensemble (uint8_t *v, int index) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -295,14 +543,51 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-	while (index < endPoint) 
-	 index = location_element (v, index, p);
 
+	while (index < endPoint) {
+//	 fprintf (stderr, "in process_ensemble we have %x\n", v [index]);
+	 switch (v [index]) {
+	 case 0x10:	// shortName
+	 index	= process_shortName (v, index, nullptr);
+	 break;
+
+	 case 0x11:	// mediumName
+	 index	= process_mediumName	(v, index, nullptr);
+	 break;
+
+	 case 0x12:	// longName
+	 index	= process_longName (v, index, nullptr);
+	 break;
+
+	 case 0x13:	// mediaDescription
+	 index	= process_mediaDescription (v, index, nullptr);
+	 break;
+
+	 case 0x16:	// keywords
+	 index	= process_keyWords (v, index);
+	 break;
+
+	 case 0x18:	// link
+	 index	= process_link (v, index);
+	 break;
+
+	 case 0x28:	// service
+	 index	= process_service (v, index);
+	 break;
+
+	 case 0x80:	// id
+	 index	= process_4171 (v, index);
+	 break;
+
+	 default:
+	 fprintf (stderr, "Process_ensemble: We cannot deal with %x\n", v [index]);
+	 return endPoint;
+	 }
+	}
 	return endPoint;
 }
 
-int	epgDecoder::location_element (uint8_t *v, int index, progDesc *p) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_service (uint8_t *v, int index) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -319,35 +604,53 @@
 
 	int endPoint	= index + length;
 
-	switch (tag) {
-	 case 0x2C:		// time
-	 while (index < endPoint) 
-	 index = time_element (v, index);
-	 return endPoint;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x10:	// shortName
+	 index	= process_shortName (v, index, nullptr);
+	 break;
+
+	 case 0x11:	// mediumName
+	 index	= process_mediumName (v, index, nullptr);
+	 break;
+
+	 case 0x12:	// longname
+	 index	= process_longName	(v, index, nullptr);
+	 break;
+
+	 case 0x13:	// media description 
+	 index	= process_mediaDescription (v, index, nullptr);
+	 break;
 
-	 case 0x2D:		// bearer
-	 while (index < endPoint)
-	 index = bearer_element (v, index);
-	 return endPoint;
+	 case 0x14:	// genre
+	 index	= process_genre (v, index, nullptr);
+	 break;
 
-	 case 0x2F:		// relative time
-	 return index + length;
+	 case 0x16:	// keyWords
+	 index	= process_keyWords (v, index);
+	 break;
 
-	 case 0x80: {	// starttime
-	 p -> startTime = process_474	(v, index, length);
-	 return index + length;
+	 case 0x29:	// bearer
+	 index	= process_bearer (v, index);
+	 break;
+
+	 case 0x31:	// radiodns
+	 index	= process_radiodns (v, index);
+	 break;
+
+	 case 0x32:	// geolocation
+	 index	= process_geoLocation (v, index);
+	 break;
+
+	 case 0x80:	// version
+	 index	= process_483 (v, index);
+	 break;
 	 }
-	 case 0x81:		// duration
-	 process_475	(v, index, length);
-	 return index + length;
-	 default:
-	 return index + length;
 	}
-	return index + length;
+	return endPoint;
 }
 
-int	epgDecoder::multimedia	(uint8_t *v, int index) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_location (uint8_t *v, int index, progDesc *p) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -362,11 +665,29 @@
 	else
 	 index += 2;
 
-	return index + length;
+	int endPoint	= index + length;
+	if (p == nullptr)
+	 return endPoint;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x2C:	// time	
+	 index	= process_time	(v, index, &p -> startTime);
+	 break;
+
+	 case 0x29:	// bearer
+	 index	= process_bearer (v, index);
+	 break;
+
+	 case 0x2F:	// relativeTime
+	 process_relativeTime (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
 }
 
-int	epgDecoder::time_element (uint8_t *v, int index) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_bearer (uint8_t *v, int index) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -381,29 +702,27 @@
 	else
 	 index += 2;
 
-	switch (tag) {
-	 case 0x80:		// time
-//	 process_474	(v, index, length);
-	 return index + length;
+	int endPoint	= index + length;
 
-	 case 0x81:		// duration
-	 process_475	(v, index, length);
-	 return index + length;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x32:	// geolocation
+	 index	= process_geoLocation (v, index);
+	 break;
 
-	 case 0x82:		// actual time
-	 { int xx = process_474	(v, index, length);
-//	 fprintf (stderr, "actual time %d %d\n",
-//	 xx / 60, xx % 60);
-	 }
-	 return index + length;
+	 case 0x80:	// id
+	 index	= process_476 (v, index);
+	 break;
 
-	 default:
-	 return index + length;
+	 case 0x82:	// url
+	 index	= process_440 (v, index);
+	 break;
+	 }
 	}
+	return endPoint;
 }
 
-int	epgDecoder::genre_element	(uint8_t *v, int index) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_geoLocation (uint8_t *v, int index ) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -418,19 +737,35 @@
 	else
 	 index += 2;
 
-	switch (tag) {
-	 case 0x80:
-	 case 0x81:
-	 return index + length;
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x33:	// country
+	 index	= process_country (v, index);
+	 break;
+
+	 case 0x34:	// Point
+	 index	= process_point (v, index);
+	 break;
 
-	 default:		// cannot happen
-	 return index + length;
+	 case 0x35:	// polygon
+	 index	= process_polygon (v, index);
+	 break;
+
+	 case 0x80:	// xml:id
+	 index	= process_440 (v, index);
+	 break;
+
+	 case 0x81:	// ref
+	 index	= process_440 (v, index);
+	 break;
+	 }
 	}
+	return endPoint;
 }
 
-
-int	epgDecoder::bearer_element (uint8_t *v, int index) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_programmeEvent (uint8_t *v, int index) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -445,108 +780,253 @@
 	else
 	 index += 2;
 
-	switch (tag) {
-	 case 0x80:		// time
-	 process_476	(v, index, length);
-	 return index + length;
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x10:	// shortName
+	 index	= process_shortName (v, index, nullptr);
+	 break;
+
+	 case 0x11:	// mediumName
+	 index	= process_mediumName (v, index, nullptr);
+	 break;
+
+	 case 0x12:	// longName
+	 index	= process_longName (v, index, nullptr);
+	 break;
+
+	 case 0x13:	// mediaDescription
+	 index	= process_mediaDescription (v, index, nullptr);
+	 break;
+
+	 case 0x14:	// genre
+	 index	= process_genre (v, index, nullptr);
+	 break;
 
-	 default:
-	 return index + length;
+	 case 0x16:	// keywords
+	 index	= process_keyWords (v, index);
+	 break;
+
+	 case 0x17:	// memberOf
+	 index	= process_memberOf (v, index);
+	 break;
+
+	 case 0x18:	// link
+	 index	= process_link (v, index);
+	 break;
+
+	 case 0x19:	// location
+	 index	= process_location (v, index, nullptr);
+	 break;
+
+	 case 0x36:	// onDemand
+	 index	= process_onDemand (v, index);
+	 break;
+
+	 case 0x80:	// id
+	 index	= process_471 (v, index);
+	 break;
+
+	 case 0x81:	// shortId
+	 index	= process_472 (v, index);
+	 break;
+
+	 case 0x82:	// version
+	 index	= process_483 (v, index);
+	 break;
+
+	 case 0x83:	// recommendation
+	 index	= process_46 (v, index);
+	 break;
+
+	 case 0x84:	// broadcast
+	 index	= process_46 (v, index);
+	 break;
+
+	 case 0x86:	// xml:lang
+	 index	= process_481 (v, index);
+	 break;
+	 }
 	}
+	return endPoint;
 }
 
-int	epgDecoder::process_token (uint8_t *v, int index) {
-uint8_t tag	= v [index];
-int	length	= v [index + 1];
-char	text [length + 1];
+int	epgDecoder::process_onDemand (uint8_t *v, int index) {
+int length	= v [index + 1];
 
-	index += 2;
-	for (int i = 0; i < length; i ++)
-	 text [i] = v [index + i];
-	text [length] = 0;
-	stringTable [tag] = QString::fromUtf8 (text);
-	return index + length;
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x29:	// bearer
+	 index	= process_bearer (v, index);
+	 break;
+
+	 case 0x37:	// presentation time
+	 index	= process_presentationTime (v, index);
+	 break;
+
+	 case 0x38:	// acquisitionTime
+	 index	= process_acquisitionTime (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
 }
+
+int	epgDecoder::process_genre (uint8_t *v, int index, progDesc *p) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	if (p == nullptr)
+	 return endPoint;
 	
-void	epgDecoder::process_45	(uint8_t *v, int index, int length) {
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// href
+	 index	= process_412 (v, index);
+	 break;
+
+	 case 0x81:	// type
+	 index	= process_46 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
 }
 
-void	epgDecoder::process_46	(uint8_t *v, int index, int length) {
-}
+int	epgDecoder::process_keyWords (uint8_t *v, int index) {
+int length	= v [index + 1];
 
-QString	epgDecoder::process_471 (uint8_t *v, int index, int length) {
-QString result = "";
-	for (int i = 0; i < length; i ++)
-	 result. append (v [index + i]);
-	return result;
-}
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
 
-void	epgDecoder::process_472 (uint8_t *v, int index, int length) {
-uint32_t shortCRID = (((v [index] << 8) | v [index + 1]) << 8) | v [index + 2];
+	int endPoint	= index + length;
 
-	fprintf (stderr, "short CRID %X\n", shortCRID);
-}
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// xml:lang
+	 index	= process_481 (v, index);
+	 break;
 
-void	epgDecoder::process_473 (uint8_t *v, int index, int length) {
+	 default:
+//	 fprintf (stderr, "in process_keyWords with %d\n", v [index]);
+	 return endPoint;
+	 }
+	}
+	return endPoint;
 }
 
-int	epgDecoder::process_474	(uint8_t *v, int index, int length) {
-uint8_t ltoFlag = getBit (v, 8 * index + 19);
-uint8_t utcFlag	= getBit (v, 8 * index + 20);
-int	hours;
-int	minutes;
-int	ltoBase;
-
-//	fprintf (stderr, "Handling time, utcFlag %d, ltoFlag %d\n",
-//	 utcFlag, ltoFlag);
-	hours	= getBits (v, 8 * index + 21, 5);
-	minutes	= getBits (v, 8 * index + 26, 6);
+int	epgDecoder::process_link (uint8_t *v, int index) {
+int length	= v [index + 1];
 
-//	fprintf (stderr, "hours = %d, minutes = %d\n", hours, minutes);
-	if (utcFlag)
-	 ltoBase = 48;
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
 	else
-	 ltoBase = 32;
+	 index += 2;
 
-	if (ltoFlag) {
-	 uint16_t halfHours = getBits (v, 8 * index + ltoBase, 8);
-//	 fprintf (stderr, "half hpurs sign %d, value %d\n",
-//	 halfHours & 0x20, halfHours & 0x1F);
-	 if (halfHours & 0x20)
-	 halfHours = - halfHours & 0x1F;
-	 else
-	 halfHours = halfHours & 0x1F;
-	 minutes += halfHours * 30;
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// uri
+	 index	= process_440 (v, index);
+	 break;
+
+	 case 0x81:	// mimeValue
+	 index	= process_473 (v, index);
+	 break;
+
+	 case 0x82:	// xml:lang
+	 index	= process_481 (v, index);
+	 break;
+
+	 case 0x83:	// description
+	 index	= process_440 (v, index);
+	 break;
+
+	 case 0x84:	// expiryTime
+	 index	= process_474 (v, index, nullptr);
+	 break;
+	 }
 	}
-	
-	return hours * 60 + minutes;
+	return endPoint;
 }
 
-void	epgDecoder::process_475 (uint8_t *v, int index, int length) {
-uint16_t duration	= (v [index] << 8) | v [index + 1];
+int	epgDecoder::process_shortName (uint8_t *v, int index, progDesc *p) {
+int length	= v [index + 1];
 
-	duration /= 60;
-//	fprintf (stderr, "duration is %d uur en %d minuten\n",
-//	 duration / 60, duration % 60);
-}
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
 
-void	epgDecoder::process_476 (uint8_t *v, int index, int length) {
-uint8_t ensFlag = getBit (v, 8 * index + 1);
-uint8_t sidFlag	= getBit (v, 8 * index + 3);
-	
-	if (ensFlag == 1)
-	 if (sidFlag == 0)
-	 fprintf (stderr, "SId = %X\n", getBits (v, 8 * index + 32, 16));
+	int endPoint	= index + length;
+	if (p == nullptr)
+	 return endPoint;
 
-	if (ensFlag == 0)
-	 if (sidFlag == 0)
-	 fprintf (stderr, "SId = %X\n", getBits (v, 8 * index + 8, 16));
+	if (v [index + 1] == 1) {
+	 p -> shortName = stringTable [v [index + 2]]. toLatin1 (). data ();
+	 return endPoint;
+	}
+	char t [255];
+	for (int i = 0; i < length; i ++)
+	 t [i] = v [index + i + 2];
+	t [length] = 0;
+	p -> shortName = QString::fromUtf8 (t);
+	return endPoint;
 }
 
-QString	epgDecoder::process_481	(uint8_t *v, int index, int elength) {
-uint8_t	tag	= v [index];
+int	epgDecoder::process_mediumName (uint8_t *v, int index, progDesc *p) {
 int length	= v [index + 1];
-QString result = "";
 
 	if (length == 0XFE) {
 	 length = (v [index + 2] << 8) | v [index + 3];
@@ -560,27 +1040,826 @@
 	else
 	 index += 2;
 
-	switch (tag) {
-	 case 0x01:
-	 if (length == 1)
-	 return stringTable [v [index]];
-	 else {
-	 char temp [length + 1];
-	 for (int i = 0; i < length; i ++)
-	 temp [i] = v [index + i];
-	 temp [length] = 0;
-	 result = QString::fromUtf8 (temp);
-	 }
-	 break;
-	 default:
-	 break;
+	int endPoint	= index + length;
+	if (p == nullptr)
+	 return endPoint;
+
+	if (v [index + 1] == 1) {
+	 p -> mediumName = stringTable [v [index + 2]]. toLatin1 (). data ();
+	 return endPoint;
 	}
-	return result;
+	char t [255];
+	for (int i = 0; i < length; i ++)
+	 t [i] = v [index + i + 2];
+	t [length] = 0;
+	p -> mediumName = QString::fromUtf8 (t);
+	return endPoint;
 }
 
-void	epgDecoder::process_483	(uint8_t *v, int index, int elength) {
-//	fprintf (stderr, "Version %d\n",
-//	 (v [index + 0] << 8) | v [index + 1]);
+int	epgDecoder::process_longName (uint8_t *v, int index, progDesc *p) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	if (p == nullptr)
+	 return endPoint;
+
+	if (v [index + 1] == 1) {
+	 p -> longName = stringTable [v [index + 2]]. toLatin1 (). data ();
+	 return endPoint;
+	}
+	char t [255];
+	for (int i = 0; i < length; i ++)
+	 t [i] = v [index + i + 2];
+	t [length] = 0;
+	p -> longName = QString::fromUtf8 (t);
+	return endPoint;
+}
+
+int	epgDecoder::process_shortDescription (uint8_t *v, int index,
+	 progDesc *p) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	if (p == nullptr)
+	 return endPoint;
+
+	if (v [index + 1] == 1) {
+	 p -> shortDescription =
+	 stringTable [v [index + 2]]. toLatin1 (). data ();
+	 return endPoint;
+	}
+
+	char t [511];
+	for (int i = 0; i < length; i ++)
+	 t [i] = v [index + i + 2];
+	t [length] = 0;
+	p -> shortDescription = QString::fromUtf8 (t);
+	return endPoint;
+}
+
+int	epgDecoder::process_longDescription (uint8_t *v,
+	 int index, progDesc *p) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	if (p == nullptr)
+	 return endPoint;
+
+	if (v [index + 1] == 1) {
+	 p -> longDescription =
+	 stringTable [v [index + 2]]. toLatin1 (). data ();
+	 return endPoint;
+	}
+	char t [511];
+	for (int i = 0; i < length; i ++)
+	 t [i] = v [index + i + 2];
+	t [length] = 0;
+	p -> longDescription = QString::fromUtf8 (t);
+	return endPoint;
+}
+
+int	epgDecoder::process_multiMedia (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// mimevalue	
+	 index	= process_473 (v, index);
+	 break;
+
+	 case 0x81:	// xml_lang
+	 index	= process_481 (v, index);
+	 break;
+
+	 case 0x82:	// uri
+	 index	= process_440 (v, index);
+	 break;
+
+	 case 0x83:	// type
+	 index	= process_46 (v, index);
+	 break;
+
+	 case 0x84:	// width
+	 index	= process_485 (v, index);
+	 break;
+
+	 case 0x85:
+	 index	= process_485 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_radiodns (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// fqdn
+	 index	= process_440 (v, index);
+	 break;
+
+	 case 0x81:	// serviceIdentifier
+	 index	= process_440 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_time (uint8_t *v, int index, int *t) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// time
+	 index	= process_474 (v, index, t);
+	 break;
+
+	 case 0x81:	// duration
+	 index	= process_475 (v, index);
+	 break;
+
+	 case 0x82:	// actualTime
+	 index	= process_474 (v, index, nullptr);
+	 break;
+	
+	 case 0x83:	// actual duration
+	 index	= process_475 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+	
+int	epgDecoder::process_relativeTime (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// time
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x81:	// duration
+	 index	= process_475 (v, index);
+	 break;
+
+	 case 0x82:	// actualTime
+	 index	= process_474 (v, index, nullptr);
+	 break;
+	
+	 case 0x83:	// actual duration
+	 index	= process_475 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_memberOf (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// id
+	 index	= process_471 (v, index);
+	 break;
+
+	 case 0x81:	// shortId
+	 index	= process_472 (v, index);
+	 break;
+
+	 case 0x82:	// Index
+	 index	= process_482 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_presentationTime (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// start
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x81:	// end
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x82:	// duration
+	 index	= process_475 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_acquisitionTime (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:	// start
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x81:	// end
+	 index	= process_474 (v, index, nullptr);
+	 break;
+
+	 case 0x82:	// duration
+	 index	= process_475 (v, index);
+	 break;
+	 }
+	}
+	return endPoint;
+}
+
+int	epgDecoder::process_country	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	return endPoint;
+}
+
+int	epgDecoder::process_point	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	return endPoint;
+}
+
+int	epgDecoder::process_polygon	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint	= index + length;
+	return endPoint;
+}
+
+//
+//////////////////////////////////////////////////////////////////////////
+//	
+//	Attribute handlers
+//
+/////////////////////////////////////////////////////////////////////////////
+//
+int	epgDecoder::process_412	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_440	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_46	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_471	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_472	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_473	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+//
+//	ETSI TS 102 371: 4.7.4 time point
+int	epgDecoder::process_474	(uint8_t *v, int index, int *t) {
+int length	= v [index + 1];
+uint8_t ltoFlag;
+uint8_t utcFlag;
+int hours;
+int minutes;
+int ltoBase;
+
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+	int endPoint	= index + length;
+
+	if (t == nullptr)
+	 return endPoint;
+	ltoFlag	= getBit (v, 8 * index + 19);
+	utcFlag	= getBit (v, 8 * index + 20);
+
+	hours = getBits (v, 8 * index + 21, 5);
+	minutes = getBits (v, 8 * index + 26, 6);
+
+	if (ltoFlag) {
+	 uint16_t halfHours = getBits (v, 8 * index + ltoBase, 8);
+	 if (halfHours & 0x20)
+ halfHours = - halfHours & 0x1F;
+ else
+ halfHours = halfHours & 0x1F;
+ minutes += halfHours * 30;
+ }
+	*t	= hours * 60 + minutes;
+	return index + length;
+}
+//
+//	ETSI TS 102 371: 4.7.5 Duration type
+int	epgDecoder::process_475	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int duration	= (v [index] << 8) | v [index + 1];
+//	fprintf (stderr, "duration %d (%d)\n", duration / 60, duration % 60); 
+	return index + length;
+}
+
+int	epgDecoder::process_476	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+	uint8_t ensFlag = getBit (v, 8 * index + 1);
+	uint8_t sidFlag = getBit (v, 8 * index + 3);
+
+ if (ensFlag == 1)
+ if (sidFlag == 0)
+ fprintf (stderr, "SId = %X\n", getBits (v, 8 * index + 32, 16));
+	else
+ if (ensFlag == 0)
+ if (sidFlag == 0)
+ fprintf (stderr, "SId = %X\n", getBits (v, 8 * index + 8, 16));
+	return index + length;
+}
+
+int	epgDecoder::process_481	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+//	fprintf (stderr, "481 returns %d\n", index + length);
+	return index + length;
+}
+
+int	epgDecoder::process_482	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_483	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_484	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int numbers = (v [index] << 8) | v [index + 1];
+//	fprintf (stderr, "484 says %d elements\n", numbers);
+	return index + length;
+}
+
+int	epgDecoder::process_485	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_4171	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
+}
+
+int	epgDecoder::process_tokenTable	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	int endPoint = index + length;
+//	token table element, section 4.9
+	while (index < endPoint)
+	 index = process_token (v, index);
+	return endPoint;
+}
+
+int	epgDecoder::process_token (uint8_t *v, int index) {
+uint8_t tag	= v [index];
+int	length	= v [index + 1];
+char	text [length + 1];
+
+	index += 2;
+	for (int i = 0; i < length; i ++)
+	 text [i] = v [index + i];
+	text [length] = 0;
+	stringTable [tag] = QString::fromUtf8 (text);
+	return index + length;
+}
+
+int	epgDecoder::process_defaultLanguage	(uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+//	fprintf (stderr, "default language with length %d\n", length);
+	return index + length;
+}
+
+int	epgDecoder::process_obsolete (uint8_t *v, int index) {
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	 length = (v [index + 2] << 8) | v [index + 3];
+	 index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	 length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	 index += 5;
+	}
+	else
+	 index += 2;
+
+	return index + length;
 }
 
 void	epgDecoder::record (progDesc *theElement) {
@@ -594,5 +1873,6 @@
 	set_epgData (this -> SId, theElement -> startTime,
 	 theElement -> longName != QString ("") ?
 	 theElement -> longName:
-	 theElement -> mediumName);
+	 theElement -> mediumName,
+	 theElement -> shortDescription);
 }

qt-dab-4.35.tar.gz/src/backend/data/epg-2/syntax Added

@@ -0,0 +1,207 @@
+
+
+epg (0x02) : tokenTable (0x04) 
+	     programmeGroups (0x20)
+	     schedule (0x21)
+	     defaultLanguage (0x06)
+
+serviceInformation (0x03): tokenTable (0x04)
+	    defaultLanguage (0x06)
+	    ensemble (0x26) 
+	    service (0x28)
+
+	   version	(0x80)		// 4.8.3
+	   creationTime (0x81)		// 4.7.4
+	   originator	(0x82)		// 4.4.0
+	   serviceProvider (0x83) 	// 4.4.0
+
+programGroups (0x20): programGroup (0x23)
+	   version (0x80)		// 4.8.3
+	   creationTime (0x81)		// 4.7.4
+	   originator (0x82)		// 4.4.0
+
+programGroup (0x23): shortName (0x10)
+	      mediumName (0x11)
+	      longName (0x12)
+	      mediaDescription (0x13)
+	      genre (0x14)
+	      keywords (0x16)
+	      memberof (0x17)
+	      link (0x18)
+	      programGroups (0x20)
+
+	      id (0x80)			// 4.7.1
+	      shortId (0x81)		// 4.7.2
+	      version (0x82)		// 4.8.3
+	      type (0x83)		// 4.6
+	      numofItems (0x84)		// 4.8.4
+
+schedule (0x21): program (0x1C)
+	      scope (0x24)
+
+	      version (0x80)		// 4.8.3
+	      creationtime (0x81)	// 4.7.4
+	      originator (0x82)		// 4.4.0
+
+shortName (0x10):
+
+mediumname (0x11) :
+
+longName (0x12):
+
+mediaDescription (0x13): 
+
+genre (0x14):
+
+keywords (0x15):
+
+memberof (0x17):
+
+link (0x18): 
+
+program (0x1C): shortName (0x10)
+	   mediumName (0x11)
+	   longName (0x12)
+	   mediaDescription (0x13)
+	   genre (0x14)
+	   keywords (0x16)
+	   memberOf (0x17)
+	   link (0x18)
+	   location (0x19)
+	   onDemand (0x36)
+	   programmeEvent (0x2E)
+
+	id (0x80)			// 4.7.1
+	shortId (0x81)			// 4.7.2
+	version (0x82)			// 4.8.3
+	recommendation (0x83)		// 4.6
+	broadcast (0x84)		// 4.6
+	xml:lang (0x86)			// 4.8.1
+
+scope (0x24): serviceScope (0x25)
+	   startTime (0x80)		// 4.7.4
+	   stopTime  (0x81)		// 4.7.4
+
+serviceScope (0x25):
+	   id (0x80)			// 4.7.6
+
+mediaDescription (0x13): shortDescription (0x1A)
+	       longDescription (0x1B)
+	      multiMedia (0x2B)
+	      
+ensemble (0x26): shortName (0x10)
+	      mediumName (0x11)
+	      longName (0x12)
+	      mediaDescription (0x13)
+	      keywords (0x16)
+	      link (0x18)
+	      service (0x28)
+
+	   id (0x80)		// 4.17.1
+
+service (0x28):	shortName (0x10)
+	      mediumName (0x11)
+	      longName (0x12)
+	      mediaDescription (0x13)
+	      genre (0x14)
+	      keyWords (0x16)
+	      bearer (0x29)
+	      radiodns (0x31)
+	      geolocation (0x32)
+
+	      version (0x80)	// 4.8.3
+
+location (0x19): time (0x2C)
+	       bearer (0x2D)
+	       relativeTime (0x2F)
+
+bearer (0x29):	geolocation (0x32)
+
+geoLocation (0x32):	country (0x33)
+	        point (0x34)
+	        polygon (0x35)
+
+programmeEvent (0x2E): shortName (0x10)
+	         mediumName (0x11)
+	         longName (0x12)
+	         mediaDescription (0x13)
+	         genre (0x14)
+	         keywords (0x16)
+	         memberOf (0x17)
+	         link (0x18)
+	         location (0x19)
+	         onDemand (0x36)
+
+	      id (0x80)				// 4.7.1
+	      shortId (0x81)			// 4.7.2
+	      version (0x82)			// 4.8.3
+	      recommendation (0x83)		// 4.6
+	      broadcast (0x84)			// 4.6
+	      xml:lang (0x86)			// 4.8.1
+
+
+onDemand (0x36): bearer (0x29)
+	         presentationTime (0x37)
+	         acquisitionTime (0x38)
+
+genre (0x14)	: href (0x80)	// 4.12
+	          type (0x81)	// 4.6
+
+keywords (0x15): xml:lang (0x80)	// 4.8.1
+
+link (0x17)	: uri (0x80)		// 4.4.0
+	          mimeValue (0x81)	// 4.7.3
+	          xml_lang (0x82)	// 4.8.1
+	          description (0x83)	// 4.4.0
+	          expiryTime (0x84)	// 4.7.4
+
+shortName:	xml:lang (0x80)		// 4.8.1
+
+mediumName:	xml:lang (0x80)		// 4.8.1
+
+longName:	xml:lang (0x80)		// 4.8.1
+
+shortDescription:	xml:lang (0x80)	// 4.8.1
+
+longDescription:	xml:lang (0x80)	// 4.8.1
+
+multimedia:	mimeValue (0x80)	// 4.7.3
+	        xml_lang  (0x81)	// 4.8.1
+	        uri (0x82)		// 4.4.0
+	        type (0x83)		// 4.6
+	        width (0x84)		// 4.8.5
+	        heigth (0x85)		// 4.8.5
+
+bearer:		id (0x80)		// 4.7.6
+	        url (0x82)		// 4.4.0
+
+geolocation:	xml:id	(0x80)		// 4.4.0
+	        ref  (0x81)		// 4.4.0
+
+
+radiodns (0x31)	fqdn (0x80)		// 4.4.0
+	        serviceIdentifier (0x81)	// 4.4.0
+
+time (0x2C):	time (0x80)		// 4.7.4
+	        duration (0x81)		// 4.7.5
+	        actualTime (0x82)	// 4.7.4
+	        actualDuration (0x83)	// 4.7.5
+
+relativeTime:	time (0x80)		// 4.7.4
+	        duration (0x81)		// 4.7.5
+	        actualTime (0x82)	// 4.7.4
+	        actualDuration (0x83)	// 4.7.5
+
+memberOf:	Id (0x80)		// 4.7.1
+	        shortId (0x81)		// 4.7.2
+	        Index (0x83)		// 4.8.2
+
+presentationTime:
+	        start (0x80)		// 4.7.4
+	        end   (0x81)		// 4.7.4
+	        duration (0x82)		// 4.7.5
+
+acquisitionTime:
+	        start (0x80)		// 4.7.4
+	        end   (0x81)		// 4.7.4
+

qt-dab-4.1.1.tar.gz/src/backend/data/epg/epgdec.cpp -> qt-dab-4.35.tar.gz/src/backend/data/epg/epgdec.cpp Changed

qt-dab-4.1.1.tar.gz/src/backend/data/mot/mot-handler.cpp -> qt-dab-4.35.tar.gz/src/backend/data/mot/mot-handler.cpp Changed

qt-dab-4.1.1.tar.gz/src/backend/data/mot/mot-object.cpp -> qt-dab-4.35.tar.gz/src/backend/data/mot/mot-object.cpp Changed

qt-dab-4.1.1.tar.gz/src/backend/data/pad-handler.cpp -> qt-dab-4.35.tar.gz/src/backend/data/pad-handler.cpp Changed

@@ -197,7 +197,7 @@
 	 if (mscGroupElement && (xpadLength > 0)) {
 
 	 if (last < xpadLength - 1) {
-	 fprintf(stderr, "handle_variablePAD: last < xpadLength - 1\n");
+//	 fprintf(stderr, "handle_variablePAD: last < xpadLength - 1\n");
 	 return;
 	 }
 
@@ -267,7 +267,7 @@
 	 last_appType = appType;
 	 base -= length;
 	 if (base < 0 && i < CI_Index - 1) {
-	 fprintf (stderr, "Hier gaat het fout, base = %d\n", base);
+//	 fprintf (stderr, "Hier gaat het fout, base = %d\n", base);
 	 return;
 	 }
 	}
@@ -416,10 +416,10 @@
 int32_t	size	= data. size() < (uint32_t)dataGroupLength ? data. size() :
 	 dataGroupLength;
 
-if (size < 2) {
-	fprintf (stderr, "build_MSC_segment: data size < 2\n");
-	return;
-}
+	if (size < 2) {
+	 fprintf (stderr, "build_MSC_segment: data size < 2\n");
+	 return;
+	}
 	 
 uint8_t		groupType	= data [0] & 0xF;
 //uint8_t	continuityIndex = (data [1] & 0xF0) >> 4;
@@ -462,23 +462,22 @@
 	 if ((data [index] & 0x10) != 0) { //transportid flag
 	 transportId = data [index + 1] << 8 |
 	 data [index + 2];
+//	 fprintf (stderr, "transportId = %d\n", transportId);
 	 index += 3;
 	 }
-	 else {
+//	 else {
 //	 fprintf (stderr, "sorry no transportId\n");
-	 return;
-	 }
+//	 return;
+//	 }
 	 index += (lengthIndicator - 2);
 	}
 
-	if (transportId == 0)	// no idea wat it means
-	 return;
+//	if (transportId == 0)	// no idea wat it means
+//	 return;
 
 	uint32_t segmentSize	= ((data [index + 0] & 0x1F) << 8) |
 	 data [index + 1];
-//	fprintf (stderr, "segmentSize = %d (transportId = %d)\n",
-//	 segmentSize, transportId);
-//
+
 //	handling MOT in the PAD, we only deal here with type 3/4
 	switch (groupType) {
 	 case 3:

qt-dab-4.1.1.tar.gz/src/backend/msc-handler.cpp -> qt-dab-4.35.tar.gz/src/backend/msc-handler.cpp Changed

@@ -218,6 +218,7 @@
 }
 
 void	mscHandler::stopService	(descriptorType *d) {
+	fprintf (stderr, "obsolete function stopService\n");
 	locker. lock ();
 	for (int i = 0; i < theBackends. size (); i ++) {
 	 Backend *b = theBackends. at (i);
@@ -232,23 +233,42 @@
 	locker. unlock ();
 }
 
+void	mscHandler::stopService	(int subchId) {
+	locker. lock ();
+	for (int i = 0; i < theBackends. size (); i ++) {
+	 Backend *b = theBackends. at (i);
+	 if (b -> subChId == subchId) {
+	 fprintf (stderr, "stopping subchannel %d\n", subchId);
+	 b -> stopRunning ();
+	 delete b;
+	 theBackends. erase (theBackends. begin () + i);
+	 }
+	}
+	locker. unlock ();
+}
+
 bool	mscHandler::set_Channel (descriptorType *d,
 	 RingBuffer<int16_t> *audioBuffer,
 	 RingBuffer<uint8_t> *dataBuffer) {
+	fprintf (stderr, "going to open %s\n",
+	 d -> serviceName. toLatin1 (). data ());
 	locker. lock();
 	for (int i = 0; i < theBackends. size (); i ++) {
-	 if (d -> SId == theBackends. at (i) -> serviceId) {
+	 if (d -> subchId == theBackends. at (i) -> subChId) {
 	 fprintf (stderr, "The service is already running\n");
-	 locker. unlock ();
-	 return false;
+	 theBackends. at (i) -> stopRunning ();
+	 delete theBackends. at (i);
+	 theBackends. erase (theBackends. begin () + i);
 	 }
 	}
+	locker. unlock ();
 	theBackends. push_back (new Backend (myRadioInterface,
 	 d,
 	 audioBuffer,
 	 dataBuffer,
 	 frameBuffer));
-	locker. unlock();
+	fprintf (stderr, "we have now %d backends running\n",
+	 theBackends. size ());
 	return true;
 }

qt-dab-4.35.tar.gz/src/ofdm/channel.cpp Added

@@ -0,0 +1,65 @@
+
+#include	"channel.h"
+
+#ifdef	__WITH_JAN__
+#include <Eigen/QR>
+#include <Eigen/Dense>
+
+static inline
+complex<float> createExp (float s) {
+ return complex<float> (cos (s), - sin (s));
+}
+
+
+	channel::channel	(std::vector<std::complex<float>> &refTable,
+	 int nrPilots, int nrTaps) {
+	fftSize = 2048;
+ numberofCarriers	= 1536;
+ numberofPilots		= nrPilots;
+ numberofTaps		= nrTaps;
+ F_p = MatrixXd (numberofPilots, numberofTaps);
+ S_p = MatrixXd (numberofPilots,
+ numberofPilots);
+ S_pxF_p = MatrixXd (numberofPilots, numberofTaps);
+//
+ pilotTable. resize (numberofPilots);
+
+	for (int i = 0; i < numberofPilots; i ++)
+	 pilotTable [i] = i + 1;
+
+	for (int row = 0; row < numberofPilots; row ++)
+ for (int col = 0; col < numberofPilots; col ++)
+ S_p (row, col) = std::complex<float> (0, 0);
+ for (int index = 0; index < numberofPilots; index ++)
+	 S_p (index, index) = refTable [pilotTable [index]];
+
+	for (int pilotIndex = 0; pilotIndex < numberofPilots; pilotIndex ++) {
+	 for (int tap = 0; tap < numberofTaps; tap ++)
+	 F_p (pilotIndex, tap) =
+	 cdiv (createExp (2 * M_PI *
+	 (fftSize / 2 + pilotTable [pilotIndex]) *
+	 tap / fftSize), sqrt (fftSize));
+	}
+	S_pxF_p = S_p * F_p;
+}
+
+	channel::~channel	() {}
+
+void	channel::estimate	(std::complex<float> *testRow,
+	 std::complex<float> *resultRow) {
+Vector h_td (numberofTaps);
+Vector H_fd (numberofPilots);
+Vector X_p (numberofPilots);
+//
+ for (int index = 0; index < numberofPilots; index ++)
+ X_p (index) = testRow [pilotTable [index]];
+//
+//// Ok, the matrices are filled, now computing the channelvalues
+ h_td = S_pxF_p. bdcSvd (ComputeThinU | ComputeThinV). solve (X_p);
+ H_fd = F_p * h_td;
+//
+ for (int index = 0; index < numberofPilots; index ++)
+ resultRow [index] = h_td (index);
+}
+#endif
+

qt-dab-4.1.1.tar.gz/src/ofdm/fib-decoder.cpp -> qt-dab-4.35.tar.gz/src/ofdm/fib-decoder.cpp Changed

@@ -31,6 +31,9 @@
 #include	"charsets.h"
 #include	"dab-config.h"
 #include	"fib-table.h"
+#include	<QStringList>
+#include	"text-mapper.h"
+#include	"dab-tables.h"
 //
 //
 	fibDecoder::fibDecoder (RadioInterface *mr) {
@@ -67,7 +70,9 @@
 	delete	ensemble;
 }
 
-//
+static
+uint8_t bits [] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+
 //	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
@@ -261,6 +266,7 @@
 //	if (alarmFlag)
 //	 fprintf (stderr, "serious problem\n");
 }
+
 //
 //	Subchannel organization 6.2.1
 //	FIG0 extension 1 creates a mapping between the
@@ -371,7 +377,7 @@
 	 uint8_t PD_bit) {
 int16_t		bitOffset	= 8 * offset;
 int16_t		i;
-uint8_t		ecc;
+uint8_t		ecc = 0;
 uint8_t		cId;
 uint32_t	SId;
 int16_t		numberofComponents;
@@ -380,7 +386,7 @@
 
 	if (PD_bit == 1) {		// long Sid, data
 	 ecc	= getBits_8 (d, bitOffset);	(void)ecc;
-	 cId	= getBits_4 (d, bitOffset + 1);
+	 cId	= getBits_4 (d, bitOffset + 4);
 	 SId	= getLBits (d, bitOffset, 32);
 	 bitOffset	+= 32;
 	}
@@ -390,6 +396,7 @@
 	 bitOffset	+= 16;
 	}
 
+	ensemble -> countryId	= cId;
 	numberofComponents	= getBits_4 (d, bitOffset + 4);
 	bitOffset	+= 8;
 
@@ -639,7 +646,7 @@
 	 uint8_t CN_bit,
 	 uint8_t OE_bit,
 	 uint8_t pdBit) {
-int16_t	bitOffset		= used * 8;
+int16_t	bitOffset	= used * 8;
 uint32_t	SId	= getLBits (d, bitOffset, pdBit == 1 ? 32 : 16);
 uint16_t	SCIds;
 int16_t		NoApplications;
@@ -662,6 +669,11 @@
 	 if (serviceIndex == -1)
 	 continue;
 
+//	 if (getBits (d, bitOffset + 16, 8) == 1)
+//	 fprintf (stderr, "%s has a 1\n",
+//	 ensemble -> services [serviceIndex]. serviceLabel.
+//	 toLatin1 (). data ());
+	 
 	 int compIndex =
 	 findServiceComponent (localBase, SId, SCIds);
 	 if (compIndex != -1) {
@@ -1206,6 +1218,7 @@
 	}
 	return -1;
 }
+
 int	fibDecoder::findService	 (uint32_t SId) {
 int	i;
 	for (i = 0; i < 64; i ++) {
@@ -1590,12 +1603,21 @@
 	return CIFcount;
 }
 
-uint8_t	fibDecoder::get_ecc() {
+uint8_t	fibDecoder::get_ecc	() {
 	if (ensemble -> ecc_Present)
 	 return ensemble -> ecc_byte;
 	return 0;
 }
 
+uint16_t fibDecoder::get_countryName () {
+	return (get_ecc () << 8) | get_countryId ();
+}
+
+uint8_t	fibDecoder::get_countryId () {
+	return ensemble -> countryId;
+}
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 //	Country, LTO & international table 8.1.3.2
@@ -1759,7 +1781,8 @@
 }
 
 void	fibDecoder::set_epgData	(uint32_t SId, int32_t theTime, 
-	 const QString theText) {
+	 const QString &theText,
+	 const QString &theDescr) {
 	for (int i = 0; i < 64; i ++) {
 if (ensemble -> services [i]. inUse &&
 ensemble -> services [i]. SId == SId) {
@@ -1767,12 +1790,14 @@
 	 for (uint16_t j = 0; j < S -> epgData. size (); j ++) {
 	 if (S -> epgData. at (j). theTime == theTime) {
 	 S -> epgData.at (j). theText = theText;
+	 S -> epgData.at (j). theDescr = theDescr;
 	 return;	
 	 }
 	 }
 	 epgElement ep;
 	 ep. theTime	= theTime;
 	 ep. theText	= theText;
+	 ep. theDescr	= theDescr;
 	 S -> epgData. push_back (ep);
 	 return;
 	 }
@@ -1817,3 +1842,242 @@
 	return res;
 }
 
+
+//	the generic print function generates - using the component descriptors
+//	as index - a QStringList as a model for a csv file
+//
+//	header for audio services
+//	serviceName
+//	serviceId
+//	subChannel
+//	startAddress
+//	length (in CU's)
+//	DAB or DAB+
+//	prot level
+//	code rate
+//	bitrate
+//	language
+//	program type
+//	alternative fm frequency
+//
+//	header for data services
+//	serviceName
+//	serviceId
+//	subChannel
+//	startAddress
+//	length
+//	prot level
+//	code rate
+//	appType
+//	FEC
+//	packet address
+//	comp nr
+
+QStringList	fibDecoder::basicPrint () {
+QStringList out;
+	bool hasContents = false;
+	for (int i = 0; i < 64; i ++) {
+	 if (currentConfig -> serviceComps [i]. inUse) {
+	 if (currentConfig -> serviceComps [i]. TMid != 0) // audio
+	 continue;
+	 if (!hasContents) 
+	 out << audioHeader ();
+	 hasContents = true;
+	 out << audioData (i);
+	 }
+	}
+	hasContents = false;
+	for (int i = 0; i < 64; i ++) {
+	 if (currentConfig -> serviceComps [i]. inUse) {
+	 if (currentConfig -> serviceComps [i]. TMid != 3) // packet
+	 continue;
+	 if (!hasContents) {
+	 out << "\n\n";
+	 out << packetHeader ();
+	 }
+	 hasContents = true;
+	 out << packetData (i);
+	 }
+	}
+	return out;
+}
+//
+//
+QString	fibDecoder::serviceName		(int index) { 
+int sid	= currentConfig -> serviceComps [index]. SId;
+int serviceIndex	= findService (sid);
+	if (serviceIndex != -1)
+	 return ensemble -> services [serviceIndex]. serviceLabel;
+	return "";
+}
+
+QString	fibDecoder::serviceIdOf		(int index) { 
+	return QString::number (currentConfig -> serviceComps [index]. SId, 16);
+}
+
+QString	fibDecoder::subChannelOf 	(int index) {
+	return QString::number (currentConfig -> serviceComps [index]. subchannelId);
+}
+
+QString	fibDecoder::startAddressOf 	(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+int startAddr	= currentConfig -> subChannels [subChannel]. startAddr;
+	return QString::number (startAddr);
+}
+
+QString	fibDecoder::lengthOf 		(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+int Length	= currentConfig -> subChannels [subChannel]. Length;
+	return QString::number (Length);
+}
+
+QString	fibDecoder::protLevelOf 	(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+bool	shortForm	= currentConfig -> subChannels [subChannel]. shortForm;
+int	protLevel	= currentConfig -> subChannels [subChannel]. protLevel;
+	return getProtectionLevel (shortForm, protLevel);
+}
+
+QString	fibDecoder::codeRateOf 		(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+bool	shortForm	= currentConfig -> subChannels [subChannel]. shortForm;
+int	protLevel	= currentConfig -> subChannels [subChannel]. protLevel;
+	return getCodeRate (shortForm, protLevel);
+}
+
+QString	fibDecoder::bitRateOf		(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+int bitRate	= currentConfig -> subChannels [subChannel]. bitRate;
+	return QString::number (bitRate);
+}
+
+QString	fibDecoder::dabType 		(int index) {
+int dabType	= currentConfig -> serviceComps [index]. ASCTy;
+	return dabType == 077 ? "DAB+" : "DAB";
+}
+
+QString	fibDecoder::languageOf 		(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+int language	= currentConfig -> subChannels [subChannel]. language;
+textMapper theMapper;
+
+	return theMapper. get_programm_language_string (language);
+}
+
+QString	fibDecoder::programTypeOf	(int index) {
+int sid = currentConfig -> serviceComps [index]. SId;
+int serviceIndex = findService (sid);
+int programType		= ensemble -> services [serviceIndex]. programType;
+textMapper theMapper;
+
+	return theMapper. get_programm_type_string (programType);
+}
+
+QString	fibDecoder::fmFreqOf		(int index) {
+int sid	= currentConfig -> serviceComps [index]. SId;
+int serviceIndex	= findService (sid);
+	return ensemble -> services [serviceIndex]. fmFrequency != -1 ?
+ QString::number (ensemble -> services [serviceIndex].fmFrequency):
+	 " ";
+}
+
+QString	fibDecoder::appTypeOf		(int index) {
+int appType	= currentConfig -> serviceComps [index]. appType;
+	return QString::number (appType);
+}
+
+QString	fibDecoder::FEC_scheme		(int index) {
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+int FEC_scheme	= currentConfig -> subChannels [subChannel]. FEC_scheme;
+	return QString::number (FEC_scheme);
+}
+
+QString	fibDecoder::packetAddress	(int index) {
+int packetAddr = currentConfig -> serviceComps [index]. packetAddress;
+	return QString::number (packetAddr);
+}
+
+QString	fibDecoder::DSCTy		(int index) {
+int DSCTy	= currentConfig -> serviceComps [index]. DSCTy;
+	switch (DSCTy) {
+	 case 60 :
+	 return "mot data";
+	 case 59:
+	 return "ip data";
+	 case 44 :
+	 return "journaline data";
+	 case 5 :
+	 return "tdc data";
+	 default:
+	 return "unknow data";
+	}
+}
+//
+QString	fibDecoder::audioHeader		() {
+	return	QString ("serviceName") + ";" +
+	 "serviceId" + ";" +
+		"subChannel" + ";" +
+		"start address (CU's)" + ";" +
+		"length (CU's)" + ";" +
+		"protection" + ";" +
+		"code rate" + ";" +
+	 "bitrate" + ";" +
+		"dab type" + ";" +
+		"language" + ";" +
+		"program type" + ";" +
+		"fm freq" + ";";
+}
+
+QString	fibDecoder::audioData		(int index) {
+	return QString (serviceName (index)) + ";" +
+	 serviceIdOf (index) + ";" +
+	 subChannelOf (index) + ";" +
+	 startAddressOf (index) + ";" +
+	 lengthOf (index) + ";" +
+	 protLevelOf (index) + ";" +
+	 codeRateOf (index) + ";" +
+	 bitRateOf (index) + ";" +
+	 dabType (index) + ";" +
+	 languageOf (index) + ";" +
+	 programTypeOf (index) + ";" +
+	 fmFreqOf (index) + ";";
+}
+//
+QString	fibDecoder::packetHeader		() {
+	return	QString ("serviceName") + ";" +
+	 "serviceId" + ";" + 
+		"subChannel" + ";" +
+		"start address" + ";" +
+		"length" + ";" +
+		"protection" + ";" +
+		"code rate" + ";" +
+	 "appType" + ";" +
+	 "FEC_scheme" + ";" +
+	 "packetAddress" + ";" +
+	 "DSCTy" + ";";
+}
+
+QString	fibDecoder::packetData	(int index) {
+	return serviceName (index) + ";" +
+	 serviceIdOf (index) + ";" +
+	 subChannelOf (index) + ";" +
+	 startAddressOf (index) + ";" +
+	 lengthOf (index) + ";" +
+	 protLevelOf (index) + ";" +
+	 codeRateOf (index) + ";" +
+	 appTypeOf (index) + ";" +
+	 FEC_scheme (index) + ";" +
+	 packetAddress (index) + ";" +
+	 DSCTy (index) + ";";
+}
+//
+//	We terminate the sequences with a ";", so that is why the
+//	actual number is 1 smaller
+int	fibDecoder::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-4.1.1.tar.gz/src/ofdm/fic-handler.cpp -> qt-dab-4.35.tar.gz/src/ofdm/fic-handler.cpp Changed

@@ -59,7 +59,6 @@
 	ficBlocks	= 0;
 	ficMissed	= 0;
 	ficRatio	= 0;
-
 	for (i = 0; i < 768; i ++) {
 	 PRBS [i] = shiftRegister [8] ^ shiftRegister [4];
 	 for (j = 8; j > 0; j --)
@@ -106,11 +105,13 @@
 
 	connect (this, SIGNAL (show_ficSuccess (bool)),
 	 mr, SLOT (show_ficSuccess (bool)));
+
+	ficPointer	= 0;
+	ficDumpPointer	= nullptr;
 }
 
 		ficHandler::~ficHandler() {
 }
-
 	
 /**
 *	\brief process_ficBlock
@@ -126,7 +127,7 @@
 *	The function is called with a blkno. This should be 1, 2 or 3
 *	for each time 2304 bits are in, we call process_ficInput
 */
-void	ficHandler::process_ficBlock (std::vector<int16_t> data,
+void	ficHandler::process_ficBlock (std::vector<int16_t> &data,
 	 int16_t blkno) {
 int32_t	i;
 
@@ -193,6 +194,7 @@
 *	was lost.
 */
 
+	static int ccc = 0;
 	for (i = ficno * 3; i < ficno * 3 + 3; i ++) {
 	 uint8_t *p = &bitBuffer_out [(i % 3) * 256];
 	 if (!check_CRC_bits (p, 256)) {
@@ -200,6 +202,20 @@
 	 continue;
 	 }
 
+	 for (int j = 0; j < 32; j ++) {
+	 ficBuffer [j] = 0;
+	 for (int k = 0; k < 8; k ++) {
+	 ficBuffer [j] <<= 1;
+	 ficBuffer [j] &= 0xFE;
+	 ficBuffer [j] |= p [8 * j + k] ? 1 : 0;
+	 }
+	 }
+
+	 ficLocker. lock ();
+	 if (ficDumpPointer != nullptr) 
+	 fwrite (ficBuffer, 1, 32, ficDumpPointer);
+	 ficLocker. unlock ();
+
 	 show_ficSuccess (true);
 	 fibDecoder::process_FIB (p, ficno);
 	}
@@ -212,4 +228,16 @@
 	clearEnsemble ();
 }
 
+void	ficHandler::start_ficDump	(FILE *f) {
+	if (ficDumpPointer != nullptr)
+	 return;
+	ficDumpPointer = f;
+}
+
+void	ficHandler::stop_ficDump	() {
+	ficLocker. lock ();
+	ficDumpPointer = nullptr;
+	ficLocker. unlock ();
+}
+

qt-dab-4.1.1.tar.gz/src/ofdm/ofdm-decoder.cpp -> qt-dab-4.35.tar.gz/src/ofdm/ofdm-decoder.cpp Changed

@@ -52,8 +52,8 @@
 	this	-> iqBuffer		= iqBuffer;
 	connect (this, SIGNAL (showIQ (int)),
 	 myRadioInterface, SLOT (showIQ (int)));
-	connect (this, SIGNAL (showQuality (float)),
-	 myRadioInterface, SLOT (showQuality (float)));
+	connect (this, SIGNAL (showQuality (float, float, float, float)),
+	 myRadioInterface, SLOT (showQuality (float, float, float, float)));
 //
 	this	-> T_s			= params. get_T_s();
 	this	-> T_u			= params. get_T_u();
@@ -185,10 +185,14 @@
 	 iqBuffer	-> putDataIntoBuffer (&conjVector [T_u / 2 - carriers / 2],
 	 carriers);
 	 showIQ	(carriers);
-	 showQuality		(computeQuality (conjVector));
-//	 compute_timeOffset	(fft_buffer, phaseReference. data ());
-//	 compute_clockOffset	(fft_buffer, phaseReference. data ());
-//	 compute_frequencyOffset	(fft_buffer, phaseReference. data ());
+	 float Quality	= computeQuality (conjVector);
+	 float timeOffset	= compute_timeOffset (fft_buffer,
+	 phaseReference. data ());
+	 float sco		= compute_clockOffset (fft_buffer,
+	 phaseReference. data ());
+	 float freqOffset	= compute_frequencyOffset (fft_buffer,
+	 phaseReference. data ());
+	 showQuality (Quality, timeOffset, sco, freqOffset);
 	 cnt = 0;
 	 }
 	}
@@ -206,7 +210,7 @@
 //	so, with that in mind we experiment with formula 5.39
 //	and 5.40 from "OFDM Baseband Receiver Design for Wireless
 //	Communications (Chiueh and Tsai)"
-void	ofdmDecoder::compute_timeOffset (std::complex<float> *r,
+float	ofdmDecoder::compute_timeOffset (std::complex<float> *r,
 	 std::complex<float> *v) {
 std::complex<float> leftTerm;
 std::complex<float> rightTerm;
@@ -226,10 +230,10 @@
 	 sum += conj (leftTerm) * rightTerm;
 	}
 
-	fprintf (stderr, "timeOffset = %f\n", arg (sum));
+	return arg (sum);
 }
 
-void	ofdmDecoder::compute_frequencyOffset (std::complex<float> *r,
+float	ofdmDecoder::compute_frequencyOffset (std::complex<float> *r,
 	 std::complex<float> *c) {
 
 std::complex<float> theta = std::complex<float> (0, 0);
@@ -242,12 +246,11 @@
 	 theta	+= val * std::complex<float> (1, -1);
 	}
 
-	fprintf (stderr, "frequency offset %f Hz \n",
-	 arg (theta) / (2 * M_PI) * 2048000 / T_u);
+	return arg (theta) / (2 * M_PI) * 2048000 / T_u;
 }
 
-void	ofdmDecoder::compute_clockOffset (std::complex<float> *r,
-	 std::complex<float> *v) {
+float	ofdmDecoder::compute_clockOffset (std::complex<float> *r,
+	 std::complex<float> *v) {
 float	offsa	= 0;
 int	offsb	= 0;
 
@@ -268,7 +271,7 @@
 	float sampleClockOffset = 
 	 offsa / (2 * M_PI * (float)T_s/ T_u * offsb);
 
-	fprintf (stderr, "clockOffset = %f\n", sampleClockOffset);
+	return sampleClockOffset;
 }

qt-dab-4.1.1.tar.gz/src/ofdm/phasereference.cpp -> qt-dab-4.35.tar.gz/src/ofdm/phasereference.cpp Changed

@@ -25,6 +25,9 @@
 #include	<cstring>
 #include	"radio.h"
 #include	<vector>
+#ifdef	__WITH_JAN__
+#include	"channel.h"
+#endif
 /**
 *	\class phaseReference
 *	Implements the correlation that is used to identify
@@ -33,6 +36,9 @@
 *	The class inherits from the phaseTable.
 */
 
+#define	PILOTS	100
+#define	TAPS	100
+
 	phaseReference::phaseReference (RadioInterface *mr,
 	 processParams	*p):
 	 phaseTable (p -> dabMode),
@@ -76,9 +82,16 @@
 	
 	connect (this, SIGNAL (showCorrelation (int, int, QVector<int>)),
 	 mr, SLOT (showCorrelation (int, int, QVector<int>)));
+
+#ifdef	__WITH_JAN__
+	theEstimator	= new channel (refTable, PILOTS, TAPS);
+#endif
 }
 
 	phaseReference::~phaseReference() {
+#ifdef	__WITH_JAN__
+	delete theEstimator;
+#endif
 }
 
 /**
@@ -98,8 +111,6 @@
 float	sum		= 0;
 float	Max		= -1000;
 float	lbuf [T_u / 2];
-float	mbuf [T_u / 2];
-std::vector<int> resultVector;
 
 	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
 	my_fftHandler. do_FFT();
@@ -114,30 +125,28 @@
 */
 	for (i = 0; i < T_u / 2; i ++) {
 	 lbuf [i] = jan_abs (fft_buffer [i]);
-	 mbuf [i] = lbuf [i];
 	 sum	+= lbuf [i];
 	}
 
 	sum /= T_u / 2;
-//	
 	QVector<int> indices;
-	std::vector<float> maxValues;
-	for (i = 0; i < 200; i ++) {
-	 if (lbuf [T_g - 100 + i] > Max) {
-	 maxIndex = T_g - 100 + i;
-	 Max = lbuf [T_g - 100 + i];
-	 if (Max / sum >= threshold) {
-	 if ((indices. size () > 0) &&
-	 (indices. at (indices. size () - 1) == maxIndex - 1)) {
-	 if (maxValues. at (indices. size () - 1) < Max) {
-	 indices. replace (indices. size () - 1, maxIndex);
-	 maxValues. at (indices. size () - 1) = Max;
-	 }
+
+	for (i = T_g - 250; i < T_g + 250; i ++) {
+	 if (lbuf [i] / sum > threshold) {
+	 bool foundOne = true;
+	 for (int j = 1; (j < 10) && (i + j < T_g + 250); j ++) {
+	 if (lbuf [i + j] > lbuf [i]) {
+	 foundOne = false;
+	 break;
 	 }
-	 else {
-	 indices. push_back (maxIndex);
-	 maxValues. push_back (Max);
+	 }
+	 if (foundOne) {
+	 indices. push_back (i);
+	 if (lbuf [i]> Max){
+	 Max = lbuf [i];
+	 maxIndex = i;
 	 }
+	 i += 10;
 	 }
 	 }
 	}
@@ -148,7 +157,7 @@
 
 	if (response != nullptr) {
 	 if (++displayCounter > framesperSecond / 2) {
-	 response	-> putDataIntoBuffer (mbuf, T_u / 2);
+	 response	-> putDataIntoBuffer (lbuf, T_u / 2);
 	 showCorrelation (T_u / 2, T_g, indices);
 	 displayCounter	= 0;
 	 }
@@ -231,3 +240,36 @@
 	return arg (sum);
 }
 
+#ifdef	__WITH_JAN__
+void	phaseReference::estimate	(std::vector<std::complex<float>>& v) {
+std::complex<float> h_td [TAPS];
+
+	for (int i = 0; i < T_u; i ++)
+	 fft_buffer [i] = v [i];
+	
+	my_fftHandler. do_FFT();
+	theEstimator -> estimate (fft_buffer, h_td);
+
+//	float	Tau		= 0;
+//	float	teller		= 0;
+//	float	noemer		= 0;
+//	for (int i = - TAPS / 2; i < TAPS / 2; i ++) {
+//	 float h_ts = abs (h_td [TAPS / 2 + i]) * abs (h_td [TAPS / 2 + i]);
+//	 teller += i * h_ts;
+//	 noemer += h_ts;
+//	}
+//	Tau	= teller / noemer;
+//	teller	= 0;
+//	noemer	= 0;
+//
+//	for (int i = -TAPS / 2; i < TAPS / 2; i ++) {
+//	 float h_ts = abs (h_td [TAPS / 2 + i]) * abs (h_td [TAPS / 2 + i]);
+//	 teller += (i - Tau) * (i - Tau) * h_ts;
+//	 noemer += h_ts;
+//	}
+//	
+//	fprintf (stderr, "Tau = %f, rms delay spread %f\n", Tau,
+//	 teller / noemer);
+}
+
+#endif

qt-dab-4.1.1.tar.gz/src/output/audiosink.cpp -> qt-dab-4.35.tar.gz/src/output/audiosink.cpp Changed

qt-dab-4.35.tar.gz/src/support/ITU_Region_1.cpp Added

@@ -0,0 +1,142 @@
+
+
+#include	"ITU_Region_1.h"
+
+
+struct {
+	uint8_t ecc;
+	uint8_t countryId;
+	const char * ITU_Code;
+	const char * Country;
+} ITU_table_1  [] = {
+{0xE0, 0x09, "ALB", "Albania"},
+{0xE0, 0x02, "ALG", "Algeria"},
+{0xE0, 0x03, "AND", "Andorra"},
+{0xE4, 0x0A, "ARM", "Armenia"},
+{0xE0, 0x0A, "AUT", "Austria"},
+{0xE3, 0x0B, "AZE", "Azerbaijan"},
+{0xE0, 0x0B, "AZR", "Azores"},
+{0xE0, 0x06, "BEL", "Belgium"},
+{0xE3, 0x0F, "BLR", "Belarus"},
+{0xE4, 0x0F, "BIH", "Bosnia"},
+{0xE1, 0x08, "BUL", "Bulgaria"},
+{0xE0, 0x0E, "CNR", "Canaries"},
+{0xE3, 0x0C, "HRV", "Croatia"},
+{0xE1, 0x02, "CYP", "Cyprus"},
+{0xE2, 0x02, "CZE", "Czech Republic"},
+{0xE1, 0x09, "DNK", "Danmark"},
+{0xE0, 0x0F, "EGY", "Egypt"},
+{0xE4, 0x02, "EST", "Estonia"},
+{0xE1, 0x09, "DNK", "Faroer"},
+{0xE1, 0x06, "FNL", "Finland"},
+{0xE1, 0x0F, "F",   "France"},
+{0xE4, 0x0C, "GEO", "Georgia"},
+{0xE0, 0x0D, "DE",   "Germany"},
+{0xE0, 0x01, "DE",   "Germany"},
+{0xE1, 0x0A, "GIB", "Gibraltar"},
+{0xE1, 0x01, "GRC", "Greece"},
+{0xE0, 0x0B, "HNG", "Hungary"},
+{0xE2, 0x0A, "ISL", "Iceland"},
+{0xE1, 0x0B, "IRQ", "Iraq"},
+{0xE3, 0x02, "IRL", "Ireland"},
+{0xE0, 0x04, "ISR", "Israel"},
+{0xE0, 0x05, "I",   "Italy"},
+{0xE1, 0x05, "JOR", "Jordan"},
+{0xE3, 0x0D, "KAZ", "Kazakhstan"},
+{0xE4, 0x07, "---", "Kosovo"},
+{0xE4, 0x03, "KGZ", "Kyrgyzstan"},
+{0xE3, 0x09, "LVA", "Latvia"},
+{0xE3, 0x0A, "LBN", "Lebanon"},
+{0xE1, 0x0D, "LBY", "Libya"},
+{0xE2, 0x09, "LIE", "Liechtenstein"},
+{0xE1, 0x07, "LUX", "Luxembourg"},
+{0xE4, 0x03, "MKD", "Macedonia"},
+{0xE2, 0x08, "MDR", "Madeira"},
+{0xE0, 0x0C, "MLT", "Malta"},
+{0xE4, 0x01, "MDA", "Moldova"},
+{0xE2, 0x0B, "MCO", "Monaco"},
+{0xE3, 0x01, "MNE", "Montenegro"},
+{0xE2, 0x01, "MRC", "Morocco"},
+{0xE3, 0x08, "NL", "Netherlands"},
+//{0xE3, 0x08, "HOL", "Netherlands"},
+{0xE2, 0x0F, "NOR", "Norway"},
+{0xE0, 0x08, "---", "Palestine"},
+{0xE2, 0x03, "POL", "Poland"},
+{0xE4, 0x08, "POR", "Portugal"},
+{0xE1, 0x0E, "ROU", "Romania"},
+{0xE0, 0x07, "RUS", "Russian Federation"},
+{0xE1, 0x03, "SM ", "San Marino"},
+{0xE2, 0x0D, "SRB", "Serbia"},
+{0xE2, 0x05, "SVK", "Slovakia"},
+{0xE4, 0x09, "SVN", "Slovenia"},
+{0xE2, 0x0E, "E",   "Spain"},
+{0xE3, 0x0E, "S",   "Sweden"},
+{0xE1, 0x04, "SUI", "Switzerland"},
+{0xE2, 0x06, "SYR", "Syria"},
+{0xE3, 0x05, "TJK", "Tajikistan"},
+{0xE2, 0x07, "TUN", "Tunesia"},
+{0xE3, 0x03, "TUR", "Turkey"},
+{0xE4, 0x0E, "TKM", "Turkmenistan"},
+{0xE4, 0x06, "UKR", "Ukraine"},
+{0xE1, 0x0C, "GB",   "United Kingdom"},
+{0xE1, 0x0C, "G",   "United Kingdom"},
+{0xE4, 0x0B, "UZB", "Uzbekistan"},
+{0xE2, 0x04, "CVA", "Vatican"},
+{0, 0, "", ""}
+};
+
+struct {
+	uint8_t ecc;
+	uint8_t countryId;
+	const char * ITU_Code;
+	const char * Country;
+} ITU_table_4  [] = {
+{0xF0, 0x0A, "AFG", "Afghanistan"},
+{0xF0, 0x09, "ARS", "Saudi Arabia"},
+{0xF0, 0x01, "AU", "Australia"},
+//{0xF0, 0x01, "acc", "Australia"},
+{0xF0, 0x02, "arn", "Australia"},
+{0xF0, 0x03, "acn", "Australia"},
+{0xF0, 0x04, "arq", "Australia"},
+{0xF0, 0x05, "arc", "Australia"},
+{0xF0, 0x06, "arw", "Australia"},
+{0xF0, 0x06, "arc", "Australia"},
+{0, 0, "", ""}
+};
+
+
+QString         find_ITU_code (uint8_t ecc, uint8_t countryId) {
+	if ((ecc >> 4) == 0xE) {
+	   for (int i = 0; ITU_table_1 [i]. ecc != 0; i ++)
+	      if ((ITU_table_1 [i]. ecc == ecc) &&
+	                    (ITU_table_1 [i]. countryId == countryId))
+	         return  ITU_table_1 [i]. ITU_Code;	
+	}
+	else
+	if ((ecc >> 4) == 0xF) {
+	   for (int i = 0; ITU_table_1 [i]. ecc != 0; i ++)
+	      if ((ITU_table_4 [i]. ecc == ecc) &&
+	                    (ITU_table_4 [i]. countryId == countryId))
+	         return  ITU_table_4 [i]. ITU_Code;
+	}
+	return "";
+}
+
+QString         find_Country (uint8_t ecc, uint8_t countryId) {
+	if ((ecc >> 4) == 0xE) {
+	   for (int i = 0; ITU_table_1 [i]. ecc != 0; i ++)
+	      if ((ITU_table_1 [i]. ecc == ecc) &&
+	                    (ITU_table_1 [i]. countryId == countryId))
+	         return  ITU_table_1 [i]. Country;
+	}
+	else
+	if ((ecc >> 4) == 0xF) {
+	   for (int i = 0; ITU_table_4 [i]. ecc != 0; i ++)
+	      if ((ITU_table_4 [i]. ecc == ecc) &&
+	                    (ITU_table_4 [i]. countryId == countryId))
+	         return  ITU_table_4 [i]. Country;
+	}
+
+	return "";
+}
+

qt-dab-4.1.1.tar.gz/src/support/band-handler.cpp -> qt-dab-4.35.tar.gz/src/support/band-handler.cpp Changed

@@ -115,7 +115,7 @@
 	if (a_band == QString (""))
 	 return;
 	if (a_band != QString ("")) {
-	 f = fopen (a_band. toLatin1 (). data (), "r");
+	 f = fopen (a_band. toUtf8 (). data (), "r");
 	 if (f == nullptr)
 	 return;
 	}
@@ -127,7 +127,7 @@
 	while ((filler < 100) && (amount > 0)) {
 	 amount = getline (&line, &amount, f);
 //	 fprintf (stderr, "%s (%d)\n", line, (int)amount);
-	 if ((int)amount == 0) {
+	 if ((int)amount <= 0) {
 	 break;
 	 }
 	 line [amount] = 0;
@@ -136,6 +136,7 @@
 	 int res = sscanf (line, "%s %d", channelName, &freq);
 	 if (res != 2)
 	 continue;
+	 fprintf (stderr, "adding %s %d\n", channelName, freq);
 	 alternatives [filler]. key	= QString (channelName);
 	 alternatives [filler]. fKHz	= freq;
 	 alternatives [filler]. skip	= false;
@@ -356,7 +357,7 @@
 theTable. item (row, 1) -> setText ("-");
 	selectedBand [row]. skip = s2 != "-";
 //	fprintf (stderr, "we zetten voor %s de zaak op %d\n",
-//	 selectedBand [row]. key. toLatin1 (). data (),
+//	 selectedBand [row]. key. toUtf8 (). data (),
 //	 selectedBand [row]. skip);
 }

qt-dab-4.35.tar.gz/src/support/content-table.cpp Added

@@ -0,0 +1,152 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ * 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 <QDataStream>
+#include	<QSettings>
+#include	"content-table.h"
+#include "radio.h"
+#include	"dab-constants.h"
+#include	"findfilenames.h"
+
+static
+const char *uep_rates [] = {nullptr, "7/20", "2/5", "1/2", "3/5", "3/4"};
+static
+const char *eep_Arates [] = {nullptr, "1/4", "3/8", "1/2", "3/4"};
+static
+const char *eep_Brates [] = {nullptr, "4/9", "4/7", "4/6", "4/5"};
+
+	contentTable::contentTable (RadioInterface *theRadio, 
+	 QSettings *s,
+	 const QString &channel,
+	 int cols) {
+	this	-> theRadio	= theRadio;
+	this	-> dabSettings	= s;
+	this	-> channel	= channel;
+	this	-> columns	= cols;
+	myWidget = new QScrollArea (NULL);
+ myWidget -> resize (200, 200);
+ myWidget -> setWidgetResizable(true);
+ contentWidget	= new QTableWidget (0, cols);
+	contentWidget	-> setColumnWidth (0, 150);
+	contentWidget	-> setColumnWidth (4, 150);
+ myWidget	-> setWidget (contentWidget);
+ contentWidget	-> setHorizontalHeaderLabels (
+	 QStringList () << tr ("current ensemble"));
+
+	connect (contentWidget, SIGNAL (cellClicked (int, int)),
+ this, SLOT (selectService (int, int)));
+	connect (contentWidget, SIGNAL (cellDoubleClicked (int, int)),
+ this, SLOT (dump (int, int)));
+//	connect (this, SIGNAL (goService (const QString &)),
+//	 theRadio, SLOT (handle_contentSelector (const QString &)));
+
+	addRow ();	// for the ensemble name
+}
+
+	contentTable::~contentTable () {
+	clearTable ();
+ delete contentWidget;
+ delete myWidget;
+}
+
+void	contentTable::clearTable	() {
+int	rows	= contentWidget -> rowCount ();
+	for (int i = rows; i > 0; i --) 
+	 contentWidget -> removeRow (i - 1);
+	addRow ();	// for the ensemble name
+}
+
+void	contentTable::show	() {
+	myWidget	-> show ();
+}
+
+void	contentTable::hide	() {
+	myWidget	-> hide ();
+}
+
+bool	contentTable::isVisible	() {
+	return !myWidget -> isHidden ();
+}
+
+void	contentTable::selectService (int row, int column) {
+QTableWidgetItem* theItem = contentWidget -> item (row, 0);
+
+	if (row < 2)
+	 return;
+ (void)column;
+ QString theService = theItem -> text ();
+	fprintf (stderr, "selecting %s\n", theService. toUtf8 (). data ());
+	goService (theService);
+}
+
+void	contentTable::dump	(int row, int column) {
+findfileNames filenameFinder (dabSettings);
+FILE	*dumpFile 	= filenameFinder. findContentDump_fileName (channel);
+
+	if (dumpFile == nullptr)
+	 return;
+
+	for (int i = 0; i < contentWidget -> rowCount (); i ++) {
+	 for (int j = 0; j < contentWidget -> columnCount (); j ++) {
+	 QString t = contentWidget -> item (i, j) -> text ();
+	 fprintf (dumpFile, "%s;", t. toUtf8 (). data ());
+	 }
+	 fprintf (dumpFile, "\n");
+	}
+	fclose (dumpFile);
+}
+
+void	contentTable::dump	(FILE * dumpFilePointer) {
+	if (dumpFilePointer == nullptr)
+	 return;
+	for (int i = 0; i < contentWidget -> rowCount (); i ++) {
+	 for (int j = 0; j < contentWidget -> columnCount (); j ++) {
+	 QString t = contentWidget -> item (i, j) -> text ();
+	 fprintf (dumpFilePointer, "%s;", t. toUtf8 (). data ());
+	 }
+	 fprintf (dumpFilePointer, "\n");
+	}
+}
+
+int16_t	contentTable::addRow () {
+int16_t row	= contentWidget -> rowCount ();
+
+ contentWidget -> insertRow (row);
+
+	for (int i = 0; i < columns; i ++) {
+ QTableWidgetItem *item0 = new QTableWidgetItem;
+ item0 -> setTextAlignment (Qt::AlignLeft |
+	 Qt::AlignVCenter);
+ contentWidget -> setItem (row, i, item0);
+	}
+	return row;
+}
+
+void	contentTable::addLine (const QString &s) {
+int	row	= addRow ();
+QStringList h	= s. split (";");
+
+	for (int i = 0; i < h. size (); i ++)
+	 if (i < columns) 		// just for safety
+	 contentWidget -> item (row, i) -> setText (h. at (i));
+}
+

qt-dab-4.35.tar.gz/src/support/coordinates.cpp Added

@@ -0,0 +1,88 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
+ * 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	"coordinates.h"
+#include	<QDoubleValidator>
+#include	<QFormLayout>
+#include	<QFormLayout>
+#include	<QVBoxLayout>
+#include	<QSettings>
+
+	coordinates::coordinates	(QSettings *dabSettings) {
+	this	-> dabSettings = dabSettings;
+	latitudeText	= new QLabel (this);
+	latitudeText	-> setText ("latitude (decimal)");
+	QDoubleValidator *la = new QDoubleValidator (-90.0, 9.0, 5);
+	latitude	= new QLineEdit (this);	
+	latitude	-> setValidator (la);
+	longitudeText	= new QLabel (this);
+	longitudeText	-> setText ("longitude (decimal)");
+	QDoubleValidator *lo = new QDoubleValidator (-180.0, 180.0, 5);
+	longitude	= new QLineEdit (this);
+	longitude	-> setValidator (lo);
+	QFormLayout	*layout = new QFormLayout;
+	layout		-> addWidget (latitudeText);
+	layout		-> addWidget (latitude);
+	layout		-> addWidget (longitudeText);
+	layout		-> addWidget (longitude);
+	setWindowTitle ("select coordinates");
+	acceptButton	= new QPushButton ("accept");
+	QVBoxLayout	*total = new QVBoxLayout;
+	total		-> addItem (layout);
+	total		-> addWidget (acceptButton);
+	setLayout (total);
+	connect (latitude, SIGNAL (returnPressed ()),
+	 this, SLOT (set_latitude ()));
+	connect (longitude, SIGNAL (returnPressed ()),
+	 this, SLOT (set_longitude ()));
+	connect (acceptButton, SIGNAL (clicked ()),
+	 this, SLOT (handle_acceptButton ()));
+	show ();
+	latitudeValue	= false;	
+	longitudeValue	= false;
+}
+
+	coordinates::~coordinates	() {
+	hide ();
+	delete	acceptButton;
+	delete	latitudeText;
+	delete	longitudeText;	
+	delete	latitude;
+	delete	longitude;	
+}
+
+void	coordinates::set_latitude () {
+	latitudeValue	= true;
+}
+
+void	coordinates::set_longitude () {
+	longitudeValue = true;
+}
+
+void	coordinates::handle_acceptButton () {
+	if (!latitude || !longitude)
+	 return;
+	dabSettings	-> setValue ("latitude", latitude -> text ());
+	dabSettings	-> setValue ("longitude", longitude -> text ());
+	QDialog::done (0);
+}
+

qt-dab-4.35.tar.gz/src/support/distance.cpp Added

qt-dab-4.1.1.tar.gz/src/support/element-selector.cpp -> qt-dab-4.35.tar.gz/src/support/element-selector.cpp Changed

@@ -27,13 +27,30 @@
 //
 	elementSelector::elementSelector (const QString &serviceName):
 	 theService (serviceName),
+	 dayBox (),
 	 hourBox (),
 	 minuteBox (),
 	 readyBox ("ready") {
 	 
 QTime currentTime = QTime::currentTime ();
 QHBoxLayout	*layOut = new QHBoxLayout ();
+QDate currentDate	= QDate::currentDate ();
+QDate workingDate	= currentDate;
 
+	dayBox. addItem ("today");
+	workingDate = workingDate. addDays (1);
+	dayBox. addItem (QDate::shortDayName (workingDate. dayOfWeek ()));
+	workingDate = workingDate. addDays (1);
+	dayBox. addItem (QDate::shortDayName (workingDate. dayOfWeek ()));
+	workingDate = workingDate. addDays (1);
+	dayBox. addItem (QDate::shortDayName (workingDate. dayOfWeek ()));
+	workingDate = workingDate. addDays (1);
+	dayBox. addItem (QDate::shortDayName (workingDate. dayOfWeek ()));
+	workingDate = workingDate. addDays (1);
+	dayBox. addItem (QDate::shortDayName (workingDate. dayOfWeek ()));
+	workingDate = workingDate. addDays (1);
+	dayBox. addItem (QDate::shortDayName (workingDate. dayOfWeek ()));
+	dayBox. setToolTip ("days ahead");
 	hourBox. setToolTip ("select the hour in the range 0 .. 23");
 	hourBox. setMaximum (23);
 	hourBox. setValue (currentTime. hour ());
@@ -41,10 +58,11 @@
 	minuteBox. setMaximum (59);
 	minuteBox. setValue (currentTime. minute ());
 	readyBox. setToolTip ("click here when time is set");
-	layOut -> addWidget (&theService);
-	layOut -> addWidget (&hourBox);
-	layOut -> addWidget (&minuteBox);
-	layOut -> addWidget (&readyBox);
+	layOut	-> addWidget (&theService);
+	layOut	-> addWidget (&dayBox);
+	layOut	-> addWidget (&hourBox);
+	layOut	-> addWidget (&minuteBox);
+	layOut	-> addWidget (&readyBox);
 	setWindowTitle (tr("time select"));
 	setLayout (layOut);
 
@@ -57,6 +75,9 @@
 
 void	elementSelector::collectData () {
 int	val	= hourBox. value () * 60 + minuteBox. value ();
+int	x	= dayBox. currentIndex ();
+
+	val	|= x << 16;
 	if (readyBox. isChecked ())
 	 QDialog::done (val);
 }

qt-dab-4.1.1.tar.gz/src/support/findfilenames.cpp -> qt-dab-4.35.tar.gz/src/support/findfilenames.cpp Changed

@@ -50,13 +50,15 @@
 	 if (!isValid (theTime. at (i)))
 	 theTime. replace (i, 1, '-');
 	suggestedFileName = saveDir + "Qt-DAB-" + channel +
-	 "-" + theTime + ".txt";
+	 "-" + theTime + ".csv";
+	suggestedFileName = QDir::toNativeSeparators (suggestedFileName);
+
 
 	QString fileName = QFileDialog::
 	 getSaveFileName (nullptr,
 	 "Save file ...",
 	 suggestedFileName,
-	 "Text (*.txt)",
+	 "csv (*.csv)",
 	 Q_NULLPTR,
 	 QFileDialog::DontUseNativeDialog);
 	if (fileName == "")
@@ -250,13 +252,13 @@
 	 if (!isValid (theTime. at (i)))
 	 theTime. replace (i, 1, '-');
 	QString suggestedFileName =
-	 saveDir + "Qt-DAB-scan" + "-" + theTime + ".txt";
+	 saveDir + "Qt-DAB-scan" + "-" + theTime + ".csv";
 
 	QString fileName = QFileDialog::
 	 getSaveFileName (nullptr,
 	 "Save file ...",
 	 suggestedFileName,
-	 "Text (*.txt)",
+	 "csv (*.csv)",
 	 Q_NULLPTR,
 	 QFileDialog::DontUseNativeDialog);
 	if (fileName == nullptr) // canceled?
@@ -285,13 +287,13 @@
 	 if (!isValid (theTime. at (i)))
 	 theTime. replace (i, 1, '-');
 	QString suggestedFileName =
-	 saveDir + "Qt-DAB-summary" + "-" + theTime + ".txt";
+	 saveDir + "Qt-DAB-summary" + "-" + theTime + ".csv";
 
 	QString fileName = QFileDialog::
 	 getSaveFileName (nullptr,
 	 "Save file ...",
 	 suggestedFileName,
-	 "Text (*.txt)",
+	 "csv (*.csv)",
 	 Q_NULLPTR,
 	 QFileDialog::DontUseNativeDialog);
 	if (fileName == nullptr)	// canceled ?
@@ -357,3 +359,45 @@
 return fileName;
 }
 
+FILE	* findfileNames::findLogFileName	() {
+QString saveDir = dabSettings -> value ("contentDir",
+ QDir::homePath ()). toString ();
+QString theTime = QDateTime::currentDateTime (). toString ();
+
+ if ((saveDir != "") && (!saveDir. endsWith ('/')))
+ saveDir = saveDir + '/';
+
+	for (int i = 0; i < theTime. length (); i ++)
+	 if (!isValid (theTime. at (i)))
+	 theTime. replace (i, 1, '-');
+
+ QString suggestedFileName = saveDir + "Qt-DAB-LOG" +
+ "-" + theTime + ".txt";
+	QString fileName = 
+ QFileDialog::getSaveFileName (nullptr,
+ "Save File",
+ suggestedFileName. toUtf8 (). data (),
+ "Text (*.txt)",
+	 Q_NULLPTR,
+	 QFileDialog::DontUseNativeDialog);
+	if (fileName == "")
+	 return nullptr;	
+	return fopen (fileName. toUtf8 (). data (), "w");
+}
+
+FILE	* findfileNames::find_ficDump_file	(const QString &channel) {
+QString	saveDir = dabSettings -> value ("contentDir",
+ QDir::homePath ()). toString ();
+QString theTime	= QDateTime::currentDateTime (). toString ();
+
+	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+	 saveDir = saveDir + '/';
+
+	for (int i = 0; i < theTime. length (); i ++)
+	 if (!isValid (theTime. at (i)))
+	 theTime. replace (i, 1, '-');
+
+	QString fileName = saveDir + channel + "-" + theTime + ".fic";
+	return fopen (fileName. toUtf8 (). data (), "w+b");
+}
+

qt-dab-4.1.1.tar.gz/src/support/history-handler.cpp -> qt-dab-4.35.tar.gz/src/support/history-handler.cpp Changed

qt-dab-4.1.1.tar.gz/src/support/presetcombobox.cpp -> qt-dab-4.35.tar.gz/src/support/presetcombobox.cpp Changed

@@ -1,79 +1,66 @@
-/*****************************************************************************
- * Copyright (C) 2018 Shie Erlich <krusader@users.sourceforge.net> *
- * Copyright (C) 2018 Rafi Yanai <krusader@users.sourceforge.net> *
- * Copyright (C) 2018 Krusader Krew [https://krusader.org] *
- * *
- * This file is part of Krusader [https://krusader.org]. *
- * *
- * Krusader 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. *
- * *
- * Krusader 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 Krusader. If not, see [http://www.gnu.org/licenses/]. *
- *****************************************************************************/
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ * 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 "presetcombobox.h"
 
 #include <QEvent>
-#include <QKeyEvent>
 #include <QAbstractItemView>
 
-bool KHBoxEventFilter::eventFilter (QObject *obj, QEvent *event) {
-	if (event -> type () == QEvent::KeyPress) {
-	 auto keyEvent = static_cast<QKeyEvent *>(event);
-	 if ((keyEvent->modifiers() == Qt::ShiftModifier) &&
-	 (keyEvent->key() == Qt::Key::Key_Delete)) {
-//	 auto box = dynamic_cast<QComboBox *>(obj);
-	 auto box = dynamic_cast<presetComboBox *>(obj);
-	 if (box != nullptr) {
-//	Delete the current item
-	 QString content = box -> currentText ();
-	 box->removeItem(box->currentIndex());
-	 return true;
-	 }
-	 }
-	}
-//	Perform the usual event processing
-	return QObject::eventFilter(obj, event);
-}
-
-bool	KHBoxListEventFilter::eventFilter (QObject *obj, QEvent *event) {
-	if (event -> type () == QEvent::KeyPress) {
-	 auto keyEvent = static_cast<QKeyEvent *>(event);
-	 if ((keyEvent->modifiers() == Qt::ShiftModifier) &&
-	 (keyEvent->key() == Qt::Key::Key_Delete)) {
-	 auto iv = dynamic_cast<QAbstractItemView *>(obj);
-	 if (iv->model() != nullptr) {
-//	Delete the current item from the popup list
-	 iv -> model()->removeRow(iv->currentIndex().row());
-	 return true;
-	 }
-	 }
-	}
-//	Perform the usual event processing
-	return QObject::eventFilter(obj, event);
-}
-
 presetComboBox::presetComboBox (QWidget *parent):
 	 QComboBox(parent) {
-	installEventFilter (&boxEF);
 	QAbstractItemView* iv = view ();
-	if (iv != nullptr)
-	 iv -> installEventFilter (&listEF);
+	iv -> viewport () -> installEventFilter (this);
 }
-
+//
+//	It seems that the combobox reacts on pree as well as release
+//	events
+bool	presetComboBox::eventFilter (QObject *obj, QEvent *event) {
+//
+//	Ignore the release event explicitly
+	if ((event -> type () == QEvent::MouseButtonRelease) &&
+	 (static_cast<QMouseEvent *>(event) -> button () ==
+	 Qt::RightButton)) {
+	 return true;
+	}
+//
+//	This is what we are going for
+	if (event -> type () == QEvent::MouseButtonPress) {
+	 if (static_cast<QMouseEvent *>(event) -> button () ==
+	 Qt::RightButton) {
+ 	 QAbstractItemView* view = this -> view ();
+	 QMouseEvent *me = static_cast<QMouseEvent *> (event);
+	 QModelIndex index = view -> indexAt (me -> pos ());
+ 	 if (!index.isValid()) 
+	 return QObject::eventFilter (obj, event);
+//	 QString item = this -> model () -> data (index, Qt::DisplayRole).toString();
+	 this	-> removeItem (index. row ());
+	 return true;
+	 }
+	}
+ 	return QObject::eventFilter (obj, event);
+}
+	 
 QSize presetComboBox:: sizeHint ()const {
 QSize temp = QComboBox::sizeHint ();
 return QSize (temp. rwidth () / 6, temp. rheight () / 4);
 }
 
-void	presetComboBox::mouseDoubleClickEvent (QMouseEvent *e) {
-	fprintf (stderr, "double mouse click\n");
-}
-

qt-dab-4.1.1.tar.gz/src/support/scheduler.cpp -> qt-dab-4.35.tar.gz/src/support/scheduler.cpp Changed

@@ -26,18 +26,34 @@
 #include	<iostream>
 #include	<fstream>
 #include	<string>
+#include	<QStringList>
+
 #define	SWITCHTIME	15
+#define	MINUTES_PER_DAY	(24 * 60)
+#define	MINUTES_PER_HOUR 60
+#define	WAITING_PERIOD	600000
+//
+///
+//	Note
+//	In this version, we maintain time as being relative to 1 jan
+//	wakeupTime is given in minutes,
+//	currentTime is eventually computed in seconds
+//	the time difference then is in seconds and the delay in msec
+//
+QString weekdays [7];
 
-	Scheduler::Scheduler (RadioInterface *mr):
+	Scheduler::Scheduler (RadioInterface *mr, const QString &fileName):
 	 myWidget (nullptr) {
 	myWidget. resize (240, 200);
 	myWidget. setWidgetResizable(true);
+	this	-> fileName	= fileName;
 
-	tableWidget 	= new QTableWidget (0, 2);
+	referenceDate	= QDate::currentDate ();
+	tableWidget 	= new QTableWidget (0, 3);
 	tableWidget	-> setColumnWidth (0, 120);
 	myWidget. setWidget(tableWidget);
 	tableWidget 	-> setHorizontalHeaderLabels (
-	 QStringList () << tr ("service name ") << tr ("time"));
+	 QStringList () << tr ("service name ") << tr ("day") << tr ("time"));
 	connect (tableWidget, SIGNAL (cellDoubleClicked (int, int)),
 	 this, SLOT (removeRow (int, int)));
 	wakeupTimer. setSingleShot (true);
@@ -46,7 +62,10 @@
 	 this, SLOT (handle_timeOut ()));
 	connect (this, SIGNAL (timeOut (const QString &)),
 	 mr, SLOT (scheduler_timeOut (const QString &)));
-	this	-> wakeupTime = 24 * 60 + 60;
+	this	-> wakeupTime = 365 * MINUTES_PER_DAY;
+	for (int i = 1; i <= 7; i ++)
+	 weekdays [i - 1] = QDate::shortDayName (i);
+	read (fileName);
 }
 
 	Scheduler::~Scheduler () {
@@ -54,6 +73,7 @@
 int16_t	rows	= tableWidget -> rowCount ();
 	myWidget. hide ();
 	wakeupTimer. stop ();
+	dump (fileName);
 	for (i = rows; i > 0; i --)
 	 tableWidget -> removeRow (i);
 	delete	tableWidget;
@@ -75,45 +95,46 @@
 	 tableWidget -> removeRow (i);
 }
 
-void	Scheduler::addExternalSchedule	(const QString &fileName) {
-std::ifstream f (fileName. toLatin1 (). data ());
 
-	std::string str;
-	size_t amount	= 256;
-	while (true) {
-	 if (!std::getline (f, str))
-	 break;
+int	dayDiff (const QString &dayRef, const QString &dayTest) {
+int index_1, index_2;
 
-//	just to be on the safe side
-	 if (str. size () < 10)
-	 continue;
-	 QStringList res = QString::fromStdString (str). split ("	");
-	 if (res. size () != 2)
-	 continue;
-	 QStringList t = QString (res [1]). split (":");
-	 if (t. size () != 2)
-	 continue;
-	 int hours	= t [0]. toInt ();
-	 int minutes	= t [1]. toInt ();
-	 if ((hours < 0) || (hours >= 24))
-	 continue;
-	 if ((minutes < 0) || (minutes >= 60))
-	 continue;
-	 addRow (res [0], hours, minutes);
-	}
+	for (index_1 = 0; weekdays [index_1] != dayRef; index_1 ++);
+	for (index_2 = 0; weekdays [index_2] != dayTest; index_2 ++);
+	if (index_1 > index_2)
+	 index_2 += 7;
+	return index_2 - index_1;
 }
 
-void	Scheduler::addRow (const QString &name, int hours, int minutes) {
-int16_t	row	= tableWidget -> rowCount ();
-int	wakeupTime	= hours * 60 + minutes;
+void	Scheduler::addRow (const QString &name, int day,
+	 int hours, int minutes) {
+int16_t	row		= tableWidget -> rowCount ();
 QString	recordTime	= QString::number (hours / 10) +
 	 QString::number (hours % 10);
+QDate	wakeupDate	= QDate::currentDate ();	// default
+QDate	currentDate	= QDate::currentDate ();	// 
+QTime	currentTime	= QTime::currentTime ();
+
 
+	if (tableWidget -> rowCount () == 0) 
+	 referenceDate = QDate::currentDate ();
+	wakeupTimer. stop ();
+	wakeupDate	= wakeupDate. addDays (day);
+	int theNow	= - currentDate. daysTo (referenceDate);
+	int delayDays	= - wakeupDate. daysTo (referenceDate);
+
+	int currentSeconds	= (theNow * MINUTES_PER_DAY +
+	 currentTime. hour () * MINUTES_PER_HOUR + 
+	 currentTime. minute ()) * 60 +
+	 currentTime. second ();
+	int wakeupTime	= (delayDays * MINUTES_PER_DAY +
+	 hours * MINUTES_PER_HOUR + minutes) * 60;
+	QString	startDay	= QDate::shortDayName (referenceDate. dayOfWeek ());
+	QString wakeupDay	= QDate::shortDayName (wakeupDate. dayOfWeek ());
 	recordTime. append (":");
 	recordTime. append (QString::number (minutes / 10) +
 	 QString::number (minutes % 10));
 
-	wakeupTimer. stop ();
 	tableWidget	-> insertRow (row);
 	QTableWidgetItem *item0	= new QTableWidgetItem;
 	item0		-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
@@ -123,25 +144,31 @@
 	item1		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	tableWidget	-> setItem (row, 1, item1);
 
+	QTableWidgetItem *item2 = new QTableWidgetItem;
+	item2		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 2, item2);
+
 	tableWidget	-> setCurrentItem (item0);
 	tableWidget	-> item (row, 0) -> setText (name);
-	tableWidget	-> item (row, 1) -> setText (recordTime);
+	tableWidget	-> item (row, 1) -> setText (wakeupDay);
+	tableWidget	-> item (row, 2) -> setText (recordTime);
+	
 	if (wakeupTime < this -> wakeupTime) {
 	 this -> wakeupTime = wakeupTime;
 	 this	-> wakeupIndex = tableWidget -> rowCount () - 1;
 	};
 
-	wakeupTimer. stop ();
-	QTime current = QTime::currentTime ();
-	int64_t currentTime = current. hour () * 60 + current. minute ();
-	currentTime = currentTime * 60 + current. second ();
-	int theDelay	= this -> wakeupTime * 60 - currentTime - SWITCHTIME;
-	if (theDelay <= 0) 
+	int tempDelay	= this -> wakeupTime - currentSeconds;
+//	fprintf (stderr, "waiting time %d hours %d minutes\n",
+//	 tempDelay / MINUTES_PER_HOUR / 60,
+//	 tempDelay / MINUTES_PER_HOUR % 60);
+	int theDelay	= this -> wakeupTime - currentSeconds - SWITCHTIME;
+	if (theDelay <= 1000) 
 	 theDelay = 1000;	// milliseconds
 	else
 	 theDelay = 1000 * theDelay;
-	if (theDelay > 600000)
-	 theDelay = 600000;
+	if (theDelay > WAITING_PERIOD)
+	 theDelay = WAITING_PERIOD;
 	wakeupTimer. setInterval (theDelay);
 	wakeupTimer. start (theDelay);
 	show ();
@@ -152,32 +179,47 @@
 	wakeupTimer. stop ();
 	tableWidget	-> removeRow (row);
 	if (tableWidget -> rowCount () == 0) {
-	 wakeupTime	= 25 * 60 + 60;
+	 wakeupTime	= 365 * MINUTES_PER_DAY;
 	 wakeupTimer. stop ();
 	 hide ();
 	 return;
 	}
+//
+//	and recompute the wakeupTime
+	QString startDay	= QDate::shortDayName (referenceDate. dayOfWeek ());
 	for (int i = 0; i < tableWidget -> rowCount (); i ++) {
-	 QString testTime = tableWidget -> item (i, 1) -> text ();
-	 QStringList test = testTime. split (":");
-	 int hours	= test. at (0). toInt ();
-	 int minutes	= test. at (1) . toInt ();
-	 if (hours * 60 + minutes < wakeupTime) {
-	 wakeupTime = hours * 60 + minutes;
+	 QString testTime	= tableWidget -> item (i, 2) -> text ();
+	 QStringList test	= testTime. split (":");
+	 int hours		= test. at (0). toInt ();
+	 int minutes		= test. at (1). toInt ();
+
+	 QString wakeupDay	= tableWidget -> item (i, 1) -> text ();
+	 int delayDays	= dayDiff (startDay, wakeupDay);
+	 int testSeconds	= (delayDays * MINUTES_PER_DAY +
+	 hours * MINUTES_PER_HOUR + minutes) * 60;
+	 if (testSeconds < this -> wakeupTime) {
+	 this -> wakeupTime = testSeconds;
 	 wakeupIndex = i;
 	 }
 	}
-	QTime current = QTime::currentTime ();
-	int64_t currentTime = current. hour () * 60 + current. minute ();
-	currentTime = 60 * currentTime + current. second ();
-	int64_t theDelay	= wakeupTime * 60 - currentTime - SWITCHTIME; // seconds
+
+	QDate currentDate	= QDate::currentDate ();
+	int theNow		= - currentDate. daysTo (referenceDate);
+	QTime	currentTime	= QTime::currentTime ();
+	int currentSeconds	= (theNow * MINUTES_PER_DAY +
+	 currentTime. hour () * MINUTES_PER_HOUR +
+	 currentTime. minute ()) * 60 +
+	 currentTime. second ();
+
+	int64_t theDelay
+	 = this -> wakeupTime - currentSeconds - SWITCHTIME; // seconds
 	if (theDelay <= 0) 
 	 theDelay = 1000;	// milliseconds
 	else
 	 theDelay = 1000 * theDelay;
 
-	if (theDelay > 600000)
-	 theDelay = 600000;
+	if (theDelay > WAITING_PERIOD)
+	 theDelay = WAITING_PERIOD;
 	wakeupTimer. setInterval (theDelay);
 	wakeupTimer. start (theDelay);
 }
@@ -186,27 +228,184 @@
 //	delays
 void	Scheduler::handle_timeOut () {
 QString	service	= tableWidget -> item (wakeupIndex, 0) -> text ();
-QTime current = QTime::currentTime ();
-int64_t currentTime = current. hour () * 60 + current. minute ();
-	currentTime = 60 * currentTime + current. second ();
 
-	if (currentTime >= wakeupTime * 60 - SWITCHTIME) {
-	 wakeupTime	= 24 * 60 + 60;
+QDate currentDate = QDate::currentDate ();
+int theNow = - currentDate. daysTo (referenceDate);
+QTime currentTime	= QTime::currentTime ();
+int	currentSeconds	= (theNow * MINUTES_PER_DAY +
+ currentTime. hour () * MINUTES_PER_HOUR +
+ currentTime. minute ()) * 60 +
+ currentTime. second ();
+
+	if (currentSeconds >= wakeupTime - SWITCHTIME) {
+	 wakeupTime	= 365 * MINUTES_PER_DAY;	// minutes
 	 removeRow (wakeupIndex, 0);
+
+	
+//	and recompute the nearest wakeupTime
+	 QString startDay	=
+	 QDate::shortDayName (referenceDate. dayOfWeek ());
+	 for (int i = 0; i < tableWidget -> rowCount (); i ++) {
+	 QString testTime = tableWidget -> item (i, 2) -> text ();
+	 QStringList test = testTime. split (":");
+	 int hours	= test. at (0). toInt ();
+	 int minutes	= test. at (1) . toInt ();
+	 QString wakeupDay	= tableWidget -> item (i, 1) -> text ();
+	 int delayDays	= dayDiff (startDay, wakeupDay);
+	 int testSeconds	= (delayDays * MINUTES_PER_DAY +
+	 hours * MINUTES_PER_HOUR + minutes) * 60;
+
+	 if (testSeconds < this -> wakeupTime) {
+	 this -> wakeupTime = testSeconds;
+	 wakeupIndex = i;
+	 }
+	 }
+	 service = service. trimmed ();
+	 fprintf (stderr, "we starten de service %s\n",
+	 service. toUtf8 (). data ());
 	 emit timeOut (service);
 	 return;
 	}
 
-	fprintf (stderr, "currentTime %d\n", (int)currentTime);
-	int64_t theDelay	= wakeupTime * 60 - currentTime - SWITCHTIME; // seconds
-	if (theDelay <= 0) 
+	int theDelay	=
+	 this -> wakeupTime - currentSeconds - SWITCHTIME; // seconds
+	if (theDelay <= 500) 
 	 theDelay = 1000;	// milliseconds
 	else
-	 theDelay = 1000 * theDelay;
+	 theDelay = 1000 * theDelay;	// in millseconds
 
-	if (theDelay > 600000)
-	 theDelay = 600000;
+	if (theDelay > WAITING_PERIOD)
+	 theDelay = WAITING_PERIOD;
 	wakeupTimer. setInterval (theDelay);
 	wakeupTimer. start (theDelay);
 }
 
+void	Scheduler::dump (const QString &file) {
+FILE *dumpFile	= fopen (file. toUtf8 (). data (), "w");
+
+	fprintf (stderr, "dumpfile %s is opened %s\n",
+	 file. toUtf8 (). data (),
+	 dumpFile == nullptr ? "not good" : "good");
+	if (dumpFile == nullptr)
+	 return;
+
+	QString startDay =
+ QDate::shortDayName (referenceDate. dayOfWeek ());
+
+//	fprintf (stderr, " there are %d elements to be printed\n",
+//	 tableWidget -> rowCount ());
+	fprintf (dumpFile, "// dump schedule file with %d elements\n",
+	 tableWidget -> rowCount ());
+	fprintf (dumpFile, "reference: %d %d %d\n",
+	 referenceDate. year (),
+	 referenceDate. month (),
+	 referenceDate. day ());
+	for (int row = 0; row < tableWidget -> rowCount (); row ++) {
+//	 fprintf (stderr, "writing a line\n");
+	 QString service	=
+	 tableWidget -> item (row, 0) -> text ();
+	 QString wakeupDay	=
+	 tableWidget -> item (row, 1) -> text ();
+//	 fprintf (stderr, "computing diff %s %s\n",
+//	 startDay. toUtf8 (). data (),
+//	 wakeupDay. toUtf8 (). data ());
+	 int delayDays	= dayDiff (startDay, wakeupDay);
+//	 fprintf (stderr, "delayDays = %d\n", delayDays);
+	 QString wakeupTime	=
+	 tableWidget -> item (row, 2) -> text ();
+	 QStringList t = wakeupTime . split (":");
+ if (t. size () != 2)
+ continue;
+ int hours = t [0]. toInt ();
+ int minutes = t [1]. toInt ();
+
+	 fprintf (dumpFile, "element: | %s | %d %d %d %d\n",
+	 service. toUtf8 (). data (),
+	 delayDays, hours, minutes, -(delayDays + hours + minutes));
+	}
+
+	fprintf (stderr, "dumpFile will be closed\n");
+	fclose (dumpFile);
+}
+//
+//	when reading in an "old" schedule, we have to translate the dates
+//	by subtracting the nr of days passed since the "old" schedule
+//	was made. Of course, schedule elements in the past
+//	are ignored
+void	Scheduler::read (const QString &fileName) {
+std::ifstream f (fileName. toUtf8 (). data ());
+QDate currentDate = QDate::currentDate ();
+QTime currentTime = QTime::currentTime ();
+QDate startDate;
+
+	std::string str;
+	size_t amount	= 256;
+	while (true) {
+	 if (!std::getline (f, str))
+	 break;
+
+//	fprintf (stderr, "read a line %s\n", str.c_str ());
+// just to be on the safe side
+ if (str. size () < 10)
+ continue;
+
+	 if (str. find ("//") < str. length ())
+	 continue;
+
+	 if (str. find ("reference:") < str. length ()) {
+	 int day, month, year;
+	 char x [255];
+	 sscanf (str. c_str (), "%s %d %d %d",
+	 x, &year, &month, &day);
+	 startDate = QDate (year, month, day);
+//	 fprintf (stderr, "statDate daysTo %d\n",
+//	 currentDate. daysTo (startDate));
+	 if (currentDate. daysTo (startDate) <= -7) {
+	 fprintf (stderr, "too long ago, ignored\n");
+	 return;
+	 }
+	 continue;
+	 }
+
+	 if (str. find ("element:") < str.length ()) {
+	 std::string service;
+	 QString temp	= QString::fromStdString (str);
+	 QStringList ss = temp. split ('|');
+//	 fprintf (stderr, "split count %d\n", ss. count ());
+	 for (int i = 0; i < ss. count (); i ++)
+	 fprintf (stderr, "%s \n", ss. at (i). toUtf8 (). data ());
+	 if (ss. count () != 3)
+	 return;
+	 service = ss. at (1). toUtf8 (). data ();
+	 std::string rest = ss. at (2). toUtf8 (). data ();
+	 int delayDays, hour, minutes, sum;
+	 sscanf (rest. c_str (), "%d %d %d %d",
+	 &delayDays, &hour, &minutes, &sum);
+//	 fprintf (stderr, "na de scan: delayDays %d\n", delayDays);
+	 if (sum + delayDays + hour + minutes != 0)
+	 continue;
+//	first a simple validity check on the data
+	 if ((delayDays < 0) || (delayDays >= 7))
+	 continue;
+	 if ((hour < 0) || (hour > 23))
+	 continue;
+	 if ((minutes < 0) || (minutes > 59))
+	 continue; 
+//	Then, a check to see if it is still a meaningful entry,
+//	i.e. delayDay is not in the past relative to the current time
+	 delayDays	+= currentDate. daysTo (startDate);
+//
+//	Note that, if delayDays > 0, test will always yield false
+	 int testMinutes	= (delayDays * MINUTES_PER_DAY +
+	 hour * MINUTES_PER_HOUR + minutes);
+	 int refMinutes	= currentTime. hour () * MINUTES_PER_HOUR +
+	 currentTime. minute ();
+//	 fprintf (stderr, "delayDays = %d\n", delayDays);
+	 if (testMinutes >= refMinutes) 
+	 addRow (service. c_str (), delayDays, hour, minutes);
+//	 else
+//	 fprintf (stderr, "schedule for service %s is out of date\n",
+//	 service. c_str ());
+	 }
+	}
+}

qt-dab-4.35.tar.gz/src/support/tii-codes Added

qt-dab-4.35.tar.gz/src/support/tii-codes/tii-codes.cpp Added

@@ -0,0 +1,184 @@
+#
+/*
+ * Copyright (C) 2014 .. 2021
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<stdio.h>
+#include	<QDir>
+#include	<QString>
+#include	<QStringList>
+#include	<math.h>
+#include	"dab-constants.h"
+#include	"tii-codes.h"
+#include	"ITU_Region_1.h"
+#include	<QSettings>
+#include	<QMessageBox>
+
+#define	SEPARATOR	';'
+#define	COUNTRY		1
+#define	CHANNEL		2
+#define	LABEL		3
+#define	EID		4
+#define	TII		5
+#define	LOCATION	6
+#define	LATITUDE	7
+#define	LONGITUDE	8
+#define	NR_COLUMNS	10
+
+#ifdef __LOAD_TABLES__
+#include <curl/curl.h>
+#endif
+		tiiHandler::tiiHandler	() {
+}
+		tiiHandler::~tiiHandler	() {
+}
+
+//
+bool	tiiHandler::tiiFile	(const QString &s) {
+	(void)s;
+	return false;
+}
+	
+	QString tiiHandler::
+	 get_transmitterName (const QString &channel,
+	 uint16_t Eid,
+ uint8_t mainId, uint8_t subId) {
+	(void)channel;
+	(void)Eid; (void)mainId; (void)subId;
+	return "";
+}
+
+void	tiiHandler::get_coordinates (float *latitude, float * longitude,
+	 const QString &channel,
+	 const QString &transmitter) {
+	(void)channel; (void)transmitter;
+	*latitude	= 0;
+	*longitude	= 0;
+}
+
+float	tiiHandler::convert (const QString &s) {
+bool	flag;
+float	v;
+	v = s. trimmed (). toFloat (&flag);
+	if (!flag)
+	 v = 0;
+	return v;
+}
+
+uint16_t tiiHandler::get_Eid (const QString &s) {
+bool	flag;
+uint16_t res;
+	res = s. trimmed (). toInt (&flag, 16);
+	if (!flag)
+	 res = 0;
+	return res;
+}
+
+uint8_t	tiiHandler::get_mainId (const QString &s) {
+bool flag;
+uint16_t res;
+	res = s. trimmed (). toInt (&flag);
+	if (!flag)
+	 res = 0;
+	return res / 100;
+}
+
+uint8_t tiiHandler::get_subId (const QString &s) {
+bool flag;
+uint16_t res;
+	res = s. trimmed (). toInt (&flag);
+	if (!flag)
+	 res = 0;
+	return res % 100;
+}
+
+int	tiiHandler::readColumns (std::vector<QString> &v, char *b, int N) {
+	(void)v; (void)b; (void)N;
+	return 0;
+}
+
+//
+//	Great circle distance (https://towardsdatascience.com/calculating-the-distance-between-two-locations-using-geocodes-1136d810e517)
+//	en
+//	https://www.movable-type.co.uk/scripts/latlong.html
+//	Haversine formula applied
+int	tiiHandler::distance (float latitude, float longitude,
+	 float homeLatitude, float homeLongitude) {
+	(void)latitude; (void)longitude;
+	(void)homeLatitude; (void)homeLongitude;
+	return 0;
+}
+
+int	tiiHandler::corner (float latitude, float longitude,
+	 float homeLatitude, float homeLongitude) {
+	(void)latitude; (void)longitude;
+	(void)homeLatitude; (void)homeLongitude;
+	return 0;
+}
+
+void	tiiHandler::readFile (FILE *f) {
+	(void)f;
+}
+
+void	tiiHandler::set_black (uint16_t Eid, uint8_t mainId, uint8_t subId) {
+black element;
+	element. Eid = Eid;
+	element. mainId	= mainId;
+	element. subId	= subId;
+	blackList. push_back (element);
+}
+
+bool	tiiHandler::is_black (uint16_t Eid, uint8_t mainId, uint8_t subId) {
+
+	for (int i = 0; i < blackList. size (); i ++)
+	 if ((blackList [i]. Eid == Eid) &&
+	 (blackList [i]. mainId == mainId) &&
+	 (blackList [i]. subId == subId))
+	 return true;
+	return false;
+}
+
+char	*tiiHandler::eread (char * buffer, int amount, FILE *f) {
+	(void)buffer; (void)amount; (void)f;
+	return buffer;
+}
+
+QString	tiiHandler::entry (const char *s) {
+	(void)s;
+	return QString ("");
+}
+
+static
+size_t writeCallBack (void *contents, size_t size,
+ size_t nmemb, void *userP) {
+ ((std::string *)userP) -> append ((char *)contents, size * nmemb);
+ return size * nmemb;
+}
+
+void	tiiHandler::loadTable (const QString &tf) {
+	(void)tf;
+	QMessageBox::warning (nullptr, "Warning",
+ "Not supported in this version");
+}
+
+bool	tiiHandler::valid	() {
+	return false;;
+}
+

qt-dab-4.35.tar.gz/src/support/tii-codes/tii-codes.h Added

@@ -0,0 +1,83 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__TII_HANDLER_H
+#define	__TII_HANDLER_H
+#include	<stdint.h>
+#include	<QString>
+#include	<stdio.h>
+#include	<vector>
+#include	<QSettings>
+
+typedef struct {
+	QString	country;
+	QString	channel;
+	QString ensemble;
+	uint16_t Eid;
+	uint8_t mainId;
+	uint8_t	subId;
+	QString transmitterName;
+	float	latitude;
+	float	longitude;
+} cacheElement;
+
+typedef struct {
+	uint16_t Eid;
+	uint8_t mainId;
+	uint8_t subId;
+} black;
+
+class	tiiHandler {
+public:
+		tiiHandler	();
+		~tiiHandler	();
+	bool	tiiFile 	(const QString &);
+	QString	get_transmitterName (const QString &,
+	 uint16_t Eid,
+	 uint8_t mainId, uint8_t subId);
+	void	get_coordinates	(float *, float *,
+	 const QString &, const QString &);
+	int	distance	(float, float, float, float);
+	int	corner		(float, float, float, float);
+	bool	is_black	(uint16_t, uint8_t, uint8_t);
+	void	set_black	(uint16_t, uint8_t, uint8_t);	
+	void	loadTable	(const QString &tf);
+	bool	valid		();
+
+private:
+std::vector<black> blackList;
+std::vector<cacheElement> cache;
+QString	tiifileName;
+	float	convert		(const QString &);
+	uint16_t get_Eid	(const QString &);
+	uint8_t get_mainId	(const QString &);
+	uint8_t	get_subId	(const QString &);
+	int	readColumns	(std::vector<QString> &, char *, int);
+	void	readFile	(FILE *);
+	char	*eread		(char *, int, FILE *);
+	uint8_t	shift;
+	QString	entry		(const char *);
+	FILE	*curl_f;
+};
+
+
+#endif

qt-dab-4.35.tar.gz/src/support/tii-library Added

qt-dab-4.35.tar.gz/src/support/tii-library/tii-codes.cpp Added

@@ -0,0 +1,176 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 2 of the License.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	"tii-codes.h"
+#include	<QMessageBox>
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
+
+	tiiHandler::tiiHandler	() {
+	Handle		= dlopen ("libtii-lib.so", RTLD_NOW | RTLD_GLOBAL);
+	fprintf (stderr, "%s\n", dlerror ());
+	if (Handle == nullptr)
+	 Handle	= dlopen ("/usr/local/lib/tii-lib.so",
+	 RTLD_NOW | RTLD_GLOBAL);
+	fprintf (stderr, "%s\n", dlerror ());
+	if (Handle == nullptr)
+	 fprintf (stderr, "Library not loaded\n");
+//	set the defaults
+	init_tii_L	= nullptr;
+	close_tii_L	= nullptr;
+	tiiFileL	= nullptr;
+	loadTableL	= nullptr;
+	get_transmitterNameL	= nullptr;
+	get_coordinatesL	= nullptr;
+	distanceL	= nullptr;
+	cornerL		= nullptr;
+	is_blackL	= nullptr;
+	set_blackL	= nullptr;
+	loadFunctions	();
+	if (init_tii_L != nullptr)
+	 handler	= init_tii_L ();
+	else
+	 handler	= nullptr;
+}
+
+	tiiHandler::~tiiHandler	() { 
+	if (close_tii_L != nullptr)
+	 close_tii_L (handler);
+}
+
+bool	tiiHandler::tiiFile (const QString &s) {
+	if (tiiFileL != nullptr)
+	 return tiiFileL (handler, s. toStdString ());
+	return false;
+}
+
+QString	tiiHandler::get_transmitterName (const QString & channel,
+	 uint16_t Eid,
+	 uint8_t mainId, uint8_t subId) {
+std::string res;
+
+	if (get_transmitterNameL != nullptr)
+	 res = get_transmitterNameL (handler,
+	 channel. toStdString (),
+	 Eid, mainId, subId);
+	else
+	 res = "";
+	return QString::fromStdString (res);
+}
+
+void	tiiHandler::get_coordinates	(float *lat, float *lon,
+	 const QString &channel,
+	 const QString &name) {
+	if (get_coordinatesL != nullptr)
+	 get_coordinatesL (handler, lat, lon,
+	 channel. toStdString (), name. toStdString ());
+	else {
+	 *lat = 0;
+	 *lon = 0;
+	}
+}
+
+int	tiiHandler::distance		(float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+	if (distanceL != nullptr)
+	 return distanceL (handler, latitude1, longitude1,
+	 latitude2, longitude2);
+	else
+	 return 0;
+}
+
+int	tiiHandler::corner		(float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+	if (cornerL != nullptr)
+	 return cornerL (handler, latitude1, longitude1,
+	 latitude2, longitude2);
+	else
+	 return 0;
+}
+
+bool	tiiHandler::is_black		(uint16_t Eid,
+	 uint8_t mainId, uint8_t subId) {
+	if (is_blackL != nullptr)
+	 return is_blackL (handler, Eid, mainId, subId);
+	else
+	 return false;
+}
+
+void	tiiHandler::set_black		(uint16_t Eid,
+	 uint8_t mainId, uint8_t subId) {
+	if (set_blackL != nullptr) 
+	 set_blackL (handler, Eid, mainId, subId);
+}
+
+void	tiiHandler::loadTable		(const QString &tf) {
+	if (loadTableL != nullptr)
+	 loadTableL (handler, tf. toStdString ());
+}
+
+bool	tiiHandler::valid		() {
+	return handler != nullptr;
+}
+
+bool	tiiHandler::loadFunctions	() {
+	init_tii_L	= (init_tii_P)
+ GETPROCADDRESS (this -> Handle,
+ "init_tii_L");
+	if (init_tii_L == nullptr)
+	 fprintf (stderr, "init_tii_L not loaded\n");
+
+	close_tii_L	= (close_tii_P)
+ GETPROCADDRESS (this -> Handle,
+ "close_tii_L");
+	tiiFileL	= (tiiFileP)
+ GETPROCADDRESS (this -> Handle,
+ "tiiFileL");
+	if (tiiFileL == nullptr)
+	 fprintf (stderr, "tiiFileL not loaded\n");
+	loadTableL	= (loadTableP)
+ GETPROCADDRESS (this -> Handle,
+ "loadTableL");
+	get_transmitterNameL	= (get_transmitterNameP)
+ GETPROCADDRESS (this -> Handle,
+ "get_transmitterNameL");
+	if (get_transmitterNameL == nullptr)
+	 fprintf (stderr, "could not load transmitterName\n");
+	get_coordinatesL	= (get_coordinatesP)
+ GETPROCADDRESS (this -> Handle,
+ "get_coordinatesL");
+	distanceL	= (distanceP)
+ GETPROCADDRESS (this -> Handle,
+ "distanceL");
+	cornerL		= (cornerP)
+ GETPROCADDRESS (this -> Handle,
+ "cornerL");
+	is_blackL	= (is_blackP)
+ GETPROCADDRESS (this -> Handle,
+ "is_blackL");
+	set_blackL	= (set_blackP)
+ GETPROCADDRESS (this -> Handle,
+ "set_blackL");
+	return true;
+}
+

qt-dab-4.35.tar.gz/src/support/tii-library/tii-codes.h Added

@@ -0,0 +1,76 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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
+ */
+#ifndef	__TII_HANDLER_H
+#define	__TII_HANDLER_H
+#include	<stdint.h>
+#include	<QString>
+#include	<QSettings>
+#include	"dlfcn.h"
+typedef	void	*HINSTANCE;
+
+//	DLL and ".so" function prototypes
+typedef void	*(*init_tii_P)	();
+typedef void	(*close_tii_P)	(void *);
+typedef bool	(*tiiFileP)	(void *, const std::string &);
+typedef void	(*loadTableP)	(void *, const std::string &);
+typedef	std::string	(*get_transmitterNameP) (void *, const std::string &,
+	 uint16_t, uint8_t, uint8_t);
+typedef	void	(*get_coordinatesP) (void *, float *, float *,
+	 const std::string &, const std::string &);
+typedef	int	(*distanceP)	(void *, float, float, float, float);
+typedef int	(*cornerP)	(void *, float, float, float, float);
+typedef bool	(*is_blackP)	(void *, uint16_t, uint8_t, uint8_t);
+typedef void	(*set_blackP)	(void *, uint16_t, uint8_t, uint8_t);
+
+class	tiiHandler {
+public:
+		tiiHandler	();
+		~tiiHandler	();
+	bool	tiiFile		(const QString &);
+	QString	get_transmitterName	(const QString &,
+	 uint16_t, uint8_t, uint8_t);
+	void	get_coordinates	(float *, float *, const QString &, const QString &);
+ int distance (float, float, float, float);
+ int corner (float, float, float, float);
+ bool is_black (uint16_t, uint8_t, uint8_t);
+ void set_black (uint16_t, uint8_t, uint8_t);
+ void loadTable (const QString &tf);
+ bool valid ();
+private:
+	void	*handler;
+
+	HINSTANCE	Handle;
+	bool		loadFunctions	();
+	init_tii_P	init_tii_L;
+	close_tii_P	close_tii_L;
+	tiiFileP	tiiFileL;
+	loadTableP	loadTableL;
+	get_transmitterNameP get_transmitterNameL;
+	get_coordinatesP	get_coordinatesL;
+	distanceP	distanceL;
+	cornerP		cornerL;
+	is_blackP	is_blackL;
+	set_blackP	set_blackL;
+};
+#endif
+
+

qt-dab-4.1.1.tar.gz/src/support/time-table.cpp -> qt-dab-4.35.tar.gz/src/support/time-table.cpp Changed

qt-dab-4.1.1.tar.gz/tii-viewer/tii-viewer.cpp -> qt-dab-4.35.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -53,7 +53,7 @@
 
 	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
 	displaySize	= dabSettings -> value ("displaySize",
-	 1024).toInt();
+	 512).toInt();
 	dabSettings	-> endGroup ();
 	if ((displaySize & (displaySize - 1)) != 0)
 	 displaySize = 1024;
@@ -169,11 +169,11 @@
 double	temp	= (double)INPUT_RATE / 2 / displaySize;
 int16_t	averageCount	= 3;
 
-	 
 	(void)amount;
 	if (tiiBuffer -> GetRingBufferReadAvailable() < spectrumSize) {
 	 return;
 	}
+
 	tiiBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
 	tiiBuffer	-> FlushRingBuffer ();
 	if (myFrame. isHidden ())
@@ -235,7 +235,8 @@
 				 X_axis [displaySize - 1]);
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
-				 get_db (0), get_db (0) + amp);
+				 get_db (0), get_db (0) + amp1 * 40);
+//				 get_db (0), get_db (0) + amp);
 //				 get_db (0), 0);
 
 	for (i = 0; i < displaySize; i ++) 
@@ -323,3 +324,41 @@
 	plotgrid	-> setCanvasBackground (this -> displayColor);
 }
 
+static
+double	Y_values [2000] = {0};
+void	tiiViewer::show_nullPeriod (const QVector<float> &v, double amp2) {
+double	X_axis [displaySize];
+double	amp	= AmplificationSlider -> value();
+
+
+	for (int i = 0; i < displaySize; i ++) {
+	 X_axis [i] = i * v. size () / displaySize;;
+	 double x = 0;
+	 for (int j = 0; j < v. size () / displaySize; j ++)
+	 x = abs (v [i * v. size () / displaySize + j]);
+	 Y_values [i] = x;
+	}
+
+	float Max	= 0;
+	for (int i = 0; i < displaySize; i ++)
+	 if (Y_values [i] > Max)
+	 Max = Y_values [i];
+
+	plotgrid -> setAxisScale (QwtPlot::xBottom,
+ (double)X_axis [0],
+ X_axis [displaySize - 1]);
+ plotgrid -> enableAxis (QwtPlot::xBottom);
+ plotgrid -> setAxisScale (QwtPlot::yLeft,
+ 0, Max * 2);
+// get_db (0), 0);
+//	for (int i = 0; i < displaySize; i ++) 
+//	 Y_values [i] = get_db (amp * Y_values [i]); 
+
+	spectrumCurve. setBaseline (0);
+	Y_values [0]		= 0;
+	Y_values [displaySize - 1] = 0;
+
+	spectrumCurve. setSamples (X_axis, Y_values, displaySize);
+	plotgrid	-> replot(); 
+}
+

qt-dab-4.1.1.tar.gz/tii-viewer/tii-viewer.h -> qt-dab-4.35.tar.gz/tii-viewer/tii-viewer.h Changed

Build Results
RPM Lint

Refresh

Comments for request 5533 0

Request History

wkazubski created request almost 3 years ago

Update qt-dab to release 4.35

wkazubski accepted request almost 3 years ago