Request 5550 (accepted)

Overview

Request 5550 (accepted)

Update to 4.3.5.1 (4.351)

Created by wkazubski about 2 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

qt-dab.spec Changed

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/file-driver.cpp Deleted

@@ -1,52 +0,0 @@
-#
-/*
- * Copyright (C) 2019
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Programming
- *
- * This file is part of the fm-dab streamer (the streamer)
- * the streamer 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.
- *
- * the streamer 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 the streamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#define	BUF_SIZE	512
-
-#include	"file-driver.h"
-
-	fileDriver::fileDriver	(std::string fileName, int rate) {
-	sf_info. samplerate	= rate;
-	sf_info. channels	= 2;
-	sf_info. format		= SF_FORMAT_WAV | SF_FORMAT_FLOAT;
-	oFile			= sf_open (fileName. c_str (),
-	 SFM_WRITE, &sf_info);
-	if (oFile == NULL)
-	 throw (23);
- localBuffer. resize (2 * BUF_SIZE);
-	localBufferP		= 0;
-}
-
-	fileDriver::~fileDriver	(void) {
-	 sf_close (oFile);
-	}
-
-void	fileDriver::sendSample	(std::complex<float> sample) {
-	localBuffer [2 * localBufferP ] = real (sample);
-	localBuffer [2 * localBufferP + 1] = imag (sample);
-	localBufferP ++;
-	if (localBufferP >= BUF_SIZE) {
-	 sf_writef_float (oFile, localBuffer. data (), BUF_SIZE);
-	 localBufferP = 0;
-	}
-}
-

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/file-driver.h Deleted

@@ -1,49 +0,0 @@
-#
-/*
- * Copyright (C) 2019
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Programming
- *
- * This file is part of the dab streamer
- * dab streamer 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.
- *
- * dab streamer 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 streamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef	__FILE_DRIVER__
-#define	__FILE_DRIVER__
-
-#include	<stdint.h>
-#include	<sys/types.h>
-#include	<string>
-#include	<thread>
-#include	<unistd.h>
-#include	<sndfile.h>
-#include	<vector>
-#include	<complex>
-#include	"ringbuffer.h"
-#include	"output-driver.h"
-
-class	fileDriver : public outputDriver {
-public:
-		fileDriver	(std::string, int);
-		~fileDriver	(void);
-	void	sendSample	(std::complex<float>);
-private:
-	SNDFILE		*oFile;
-	SF_INFO		sf_info;
-	std::vector<float> localBuffer;
-	int		localBufferP;
-};
-#endif
-

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/lowpass-filter.cpp Deleted

@@ -1,106 +0,0 @@
-#
-/*
- * Copyright (C) 2020
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of dab-2-fm
- *
- * dab-2-fm 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.
- *
- * dab-2-fm 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-2-fm; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include	"fir-filters.h"
-#ifndef	__MINGW32__
-#include	"alloca.h"
-#endif
-
-//FIR LowPass
-
-	LowPassFIR::LowPassFIR (int16_t firsize,
-	 int32_t Fc, int32_t fs){
-float	f	= (float)Fc / fs;
-float	sum	= 0.0;
-int16_t		i;
-float	*temp 	= (float *)alloca (firsize * sizeof (float));
-
-	filterSize	= firsize;
-	filterKernel	= new std::complex<float> [filterSize];
-	Buffer		= new std::complex<float> [filterSize];
-	ip		= 0;
-
-	for (i = 0; i < filterSize; i ++) {
-	 filterKernel [i]	= 0;
-	 Buffer [i]		= 0;
-	}
-
-	for (i = 0; i < filterSize; i ++) {
-	 if (i == filterSize / 2)
-	 temp [i] = 2 * M_PI * f;
-	 else 
-	 temp [i] =
-	 sin (2 * M_PI * f * (i - filterSize/2))/ (i - filterSize/2);
-//
-//	Blackman window
-	 temp [i] *= (0.42 -
-		 0.5 * cos (2 * M_PI * (float)i / filterSize) +
-		 0.08 * cos (4 * M_PI * (float)i / filterSize));
-
-	 sum += temp [i];
-	}
-
-	for (i = 0; i < filterSize; i ++)
-	 filterKernel [i] = std::complex<float> (temp [i] / sum, 0);
-}
-
-	LowPassFIR::~LowPassFIR () {
-	delete[]	filterKernel;
-	delete[]	Buffer;
-}
-//
-//	we process the samples backwards rather than reversing
-//	the kernel
-std::complex<float>	LowPassFIR::Pass (std::complex<float> z) {
-int16_t	i;
-std::complex<float>	tmp	= 0;
-
-	Buffer [ip]	= z;
-	for (i = 0; i < filterSize; i ++) {
-	 int16_t index = ip - i;
-	 if (index < 0)
-	 index += filterSize;
-	 tmp		+= Buffer [index] * filterKernel [i];
-	}
-
-	ip = (ip + 1) % filterSize;
-	return tmp;
-}
-
-float LowPassFIR::Pass (float v) {
-int16_t		i;
-float	tmp	= 0;
-
-	Buffer [ip] = std::complex<float> (v, 0);
-	for (i = 0; i < filterSize; i ++) {
-	 int16_t index = ip - i;
-	 if (index < 0)
-	 index += filterSize;
-	 tmp += real (Buffer [index]) * real (filterKernel [i]);
-	}
-
-	ip = (ip + 1) % filterSize;
-	return tmp;
-}
-
-

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/lowpass-filter.h Deleted

@@ -1,46 +0,0 @@
-#
-/*
- * Copyright (C) 2020
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of dab-2-fm
- *
- * dab-2-fm 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.
- *
- * dab-2-fm 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-2-fm; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __FIR_LOWPASSFILTER__
-#define __FIR_LOWPASSFILTER__
-
-#include	"dab-constants.h"
-
-class	LowPassFIR {
-public:
-			LowPassFIR (int16_t,	// order
-	 int32_t, 	// cutoff frequency
-	 int32_t	// samplerate
-	 );
-			~LowPassFIR (void);
-	std::complex<float>	Pass		(std::complex<float>);
-	float			Pass		(float);
-private:
-	int16_t		filterSize;
-	std::complex<float>	*filterKernel;
-	std::complex<float>	*Buffer;
-	int16_t		ip;
-};
-
-#endif
-

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/output-driver.cpp Deleted

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/output-driver.h Deleted

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

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

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

@@ -1,9 +1,104 @@
-# 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.351 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)
 
-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.
+Qt-DAB-4.351 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.351.png?raw=true)
+![4.4](/screen-4.3511.png?raw=true)
+
+----------------------------------------------------------------
+Building an executable for qt-dab: a few notes
+----------------------------------------------------------------
+
+While for Linux-x64 and Windows there are precompiled versions, there
+may be reasons to build an executable. Building an executable is not
+very complicated,  it is described in detail in the manual.
+Since it is customary to avoid reading a manual, here are the
+basic steps for the build process.
+
+Step 1:	
+
+	Install required libraries, see section 5.5.3 (page 29) of the manual.
+	It turns out that in recent versions of Debian (and related) distributions
+	the lib *qt5-default* does not exist as as separate library.
+	It seems to be part of another of the qt5 packages that is installed.
+	Be aware that different distributions store qt files on different
+	locations, adapt the INCLUDEPATH setting in the ".pro" file if needed.
+
+Step 2:
+
+	While there are dozens of configuration options, take note of the
+	following ones:
+
+	for devices "pluto", "pluto-rxtx" and "soapy" software should have
+	been installed, so leave them commented out when not available.
+	For other devices, e.g. sdrplay, airspy, etc, configuration does not
+	require availability of the drivers (of course using the device does)
+
+	For X64 PC's one may choose the option "CONFIG+=PC" (for selecting SSE
+	instructions). If unsure, use "CONFIG+=NO_SSE".
+
+	For letting the software show the transmitter and the azimuth,
+	choose  "CONFIG += tiiLib".
+
+step 3:
+
+	run qmake (variants of the name are qt5-qmake, qmake-qt5)
+	which generates a Makefile and then run "Make". 
+
+step 4:
+
+	Install the file "tiiFile.zip" (after unpacking) in the user's home
+	directory (filename .txdata.tii). The file contains the
+	database data for finding the transmitter's name and location.
+	If the file cannot be found, Qt-DAB will just function without
+	showing the names.
+
+	If running on an x64 PC or *bullseye* on the RPI you might consider
+	to install *libtii-lib.so* in "usr/local/lib" from "dab-maxi/library".
+	Note however that that that library needs "curl" to be installed
+	and source code for *libtii-lib.so* is not free.
+	*libtii-lib.so* contains functionality for uploading
+	a new database version (the "load" button on the configuration widget).
+	If Qt-DAB cannot find the library, it will just function without
+	the additional functionality.
+
+Note:
+
+	Building a version on a fresh install of "bullseye" on the RPI gave
+	a version that wouldn't run: The *Qt_PLUGIN_PATH* was not set.
+	Setting it as given below solved - for me - the problem
+
+	Qt_5= /usr/lib/arm-linux-gnueabihf/qt5
+	export QT_PLUGIN_PATH=$Qt_5/plugins
+
+-----------------------------------------------------------------
+Difference between 4.351 and previous versions
+-----------------------------------------------------------------
+
+Since some time the EPG handling in Qt-DAB was automatic, i.e.
+on selecting a channel, the software looked for a service providing
+an EPG and started that in the background.
+
+The implementation was rather ad hoc, and the difference between 4.351
+and previous versions is that in 4.351 more general notion of
+"background service" is implemented.
+
+By clicking with the right hand mouse button on a DAB+ service (not the
+currently selected one) that service is started as background service,
+a file menu appears with a reasonable name suggestion where the
+sound output will be written to.
+Clicking again with the right hand mouse button on the service name
+will stop the background service. Obviously, on changing the channel
+the background services will be stopped as well.
+
+There is no limit to the amount of background services, obviously
+running background services takes some processing power, and there is
+no objection to selecting a service, running in the background, as
+foreground service: the background service will just continue.
+
+The names of the services in the service list, running in the background are 
+indicated by a **green italic** font (see the pictures at the top)
 
-![overview](/screen-4.35.png?raw=true)
-[4.35](/screen-4.351.png?raw=true)
 
 ------------------------------------------------------------------
 Table of Contents
@@ -21,9 +116,8 @@
 * [Scanning and the skip table](#scanning-and-the-skip-table)
 * [Saving synamic label texts](#Saving-dynamic-label-texts)
 * [Scheduling option](#Scheduling-option)
-* [Obsolete properties](#Obsolete-properties)
-* [Installation on Windows](#installation-on-windows)
-* [Installation on Linux x64](#installation-on-linux-x64)
+* [Installation on Windows](#Installation-on-windows)
+* [Installation on Linux x64](#Installation-on-linux-x64)
 * [Interfacing to another device](#Interfacing-to-another-device)
 * [Using user-specified bands](#Using-user-specified-bands)
 * [xml-files and support](#xml-files-and-support)
@@ -36,28 +130,11 @@
 Introduction
 ------------------------------------------------------------------
 
-**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.
+**Qt-DAB-4.351** 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.
 
-While it is not very complicated to generate an executable for either
-Qt-DAB or dabMini, for Linux-x64 appImages exist for both Qt-DAB and dabMini.
-For Windows installers  are available.
-
-Qt-DAB makes extensive use of a GUI. Personally, grown up in the time of
-ASR-33 terminals and "command lines", I sometimes prefer a simple command line
-over a GUI.
-Therefore, a **terminal-DAB-xxx** version was developed, a
-simpler version, just for listening to a DAB service, making use of the
-command line and curses library.
-
-For those who are nostalgic to the era and the sound
-of nice wooden radios with glowing tubes,
-Qt-DAB can be configured such that - using the Adalm Pluto as device -
-the audio of audio services is transmitted in FM stereo on a
-user specified frequency with the "dynamic label" sent as RDS.
-
 ------------------------------------------------------------------
 Features
 ------------------------------------------------------------------
@@ -84,21 +161,23 @@
   * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888),
   * TPEG output: when configured the data is sent to a specified ip address,
   * EPG detection and building up a time table,
-  * Supports configuration as input device:
-	- Adalm Pluto,
+  * Supports as input device:
    	- SDR DAB sticks (RTL2838U or similar), 
 	- HACKRF One, 
   	- Airspy, including Airspy mini,
   	- SDRplay (RSP I, RSP II, RSP Duo and RSP Dx), with separate entries for v2 and v3 library
 	- limeSDR, 
+	- Adalm Pluto,
 	- Soapy (experimental, Linux only), 
 	- ExtIO (expertimental, Windows only),
 	- rtl_tcp servers.
   * Always supported input from:
    	- 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 days ahead
+  * Clean device interface, easy to add other devices.
+  * Scheduling the start of (channel:service) pairs or operations as frame dump or audio dump, even for days ahead.
+  * Showing the name of the transmitter received as well as the distance to the receiver and the azimuth.
+  * background services. Since 4.351 it is possible to run an arbitray number of DAB+ audioservices (from the current ensemble) as background service with the output sent to a file.
 
 Not yet or partly implemented:
 
@@ -119,7 +198,7 @@
 
 Qt-DAB always shows a main widget; a number of  **optional**
 widgets is visible under user control.
-The while set of widgets is shown below
+The whole set of widgets is shown below
 
 ![Qt-DAB main widget](/qt-dab-screen.png?raw=true)
 
@@ -128,7 +207,7 @@
 of the element (the tooltip on the copyright label shows (a.o) the date the executable was generated.)
 
 
-![4.](/mainwidget.png?raw=true)
+![4.](/screen-4.351.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.
@@ -192,9 +271,9 @@
 
 ![Qt-DAB dabMini](/dab-mini.png?raw=true)
 
-Other than Qt-DAB, there is no device selector. On program start up
-the software polls the availability of configured devices, the first
-one that seems OK is selected.
+Other than Qt-DAB, there is *no* device selector. On program start up
+the software polls the configured devices, the first one that seems OK
+is selected.
 
 The GUI contains some selectors for setting device properties,
 depending on the selected device (usually gain, lna and agc).
@@ -254,12 +333,8 @@
 Colors for Qt-DAB
 ----------------------------------------------------------------------
 
-Setting colors is rather personal, that is why Qt-DAB provides
-the possibility of setting a color to buttons and displays.
-(in total there are 20 push buttons, 18 on the main GUI, 2 on the
-technical data widget).
-
-To ease life a little, selecting a color setting for a button is
+There are 20 push buttons, 18 on the main GUI, 2 on the
+technical data widget. Selecting a color setting for a button is
 now made easy: right clock with the mouse on the button, and a
 small menu appears on which the color for the button can be
 selected (one of a predefined list), and next a similar menu appears
@@ -290,8 +365,8 @@
 contains 39 channels, so - depending on your position - there is
 quite a number of channels where no DAB signal is to be found.
 
-As in **dabChannel**, Qt-DAB has an extended mechanism to skip
-specified channels during a scan, a so-called **skipTable**.
+Qt-DAB has an extended mechanism to skip specified channels during a scan,
+a so-called **skipTable**.
 The configuration widget contains a button to make the **skipTable**
 visible. Such a skipTable shows all channels in the selected band, 
 each channel labeled with a field containing a "+" or a "-" sign.
@@ -300,8 +375,6 @@
 
 When DX-ing, one wants to direct the antenna to different countries
 in different directions.
-Ideally there is a skipTable for each direction, and
-Qt-DAB supports that.
 The configuration widget contains a button **skipFile**,
 when touched a file selection menu appears where one can select a skipfile.
 **If the file does not exist yet, it will be created.**
@@ -353,27 +426,10 @@
 
 ![scheduler](/scheduler.png?raw=true)
 
-
 Specifying a time and day is stored in a table, maintained between
-program invocations. Of course, on program (re)start. On restart
+program invocations.  On restart
 all schedule elements on passed dates are removed.
 
--------------------------------------------------------------------------
-Obsolete properties
--------------------------------------------------------------------------
-
-The current DAB standard eliminated the support for Modes other than Mode 1 and Bands other than VHF Band III, Qt-DAB still supports these features.
-Explicitly setting the Mode and/or the Band is possible by
-including appropriate command lines in the ".qt-dab.ini" file.
-
-For the *Mode*, one will add/set a line
-
-	dabMode=Mode x, where x is either 1, 2 or 4
-
-For the *Band*, one will add/set a line
-
-	dabBand=band, where band is either VHF Band III or L_Band
-
 ------------------------------------------------------------------
 Installation on Windows
 --------------------------------------------------------------------
@@ -391,38 +447,8 @@
 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.
-
-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)
+Of course it is possible to generate an executable,  the manual
+contains a complete script for Ubuntu type Linux versions.
 
 -----------------------------------------------------------------------
 Interfacing to another SDR device
@@ -442,10 +468,6 @@
 
 While it is known that the DAB transmissions are now all in Band III,
 there are situations where it might is desirable to use other frequencies.
-If you want to experiment with a modulator, connected to an SDR device
-on other frequencies than the default one (or you want just to
-have a restricted number of channels from Band III or L Band), Qt-DAB
-offers a possibility to specify a list of channels to be used.
 Specify in a file a list of channels, e.g.
 
 	jan	227360
@@ -512,11 +534,8 @@
 EPG-Handling
 ----------------------------------------------------------------------
 
-In Qt-DAB a first step is made to implement support for
-EPG (Electronic Program Guide).
-
 In the current implementation, an EPG Handler is automatically started
-whenever within an ensemble a service is recognized as carrier of
+as backgroujnd service whenever a service is recognized as carrier of
 EPG data.
 The handler will collect information about the program guides for the
 various services, and when collected, allow the user to view it
@@ -535,18 +554,12 @@
 Recording the SNR
 -----------------------------------------------------------------------
 
-Computation of the SNR is done with all DAB frames. As is known,
-a sampled DAB frame starts with a null period of app 2600 samples, followed by
-76 blocks (each about 2500 samples) with data. SNR is computed as the ratio between the amplitudes in the data blocks and the amplitudes of the
+A sampled DAB frame starts with a null period of app 2600 samples, followed by
+76 blocks (each about 2500 samples) with data. SNR is computed as
+the ratio between the amplitudes in the data blocks and the amplitudes of the
 samples in the null period.
 
-The configuration widget contains a spinbox that can be used to set the
-"speed" of displaying data.
-If the value "1" is chosen, the result of each snr computation is shown,
-if a value larger than "1" is chosen that number of computations will be
-averaged and the result shown.
-The default value for the X-axis of the display in the widget is 312.
-
+The development of the SNR over time can be made visible in the SNR widget.
 As configuration option, the widget can be equipped with a **dump** button,
 touching the button will show a menu for file selection. Once a file
 is selected, the results of the computations are not only shown, but recorded
@@ -566,19 +579,15 @@
 -----------------------------------------------------------------------
 
 As (probably) known, the **Adalm Pluto** device has receive and transmit
-capabilities. In a previous project, an extension was made to a
-dab-cmdline version using the Adalm pluto device,
-to allow the transmission on FM of a preselected
-service.
-
-As an exercise - and slightly experimental - the functionality was
-added to qt-dab.
-
-If - on configuration - **pluto-rxtx** is included as device rather than
-**pluto**, and if pluto-rxtx is selected as (input)device on the main
-widget, the audio
-of the selected service, augmented with the text of the dynamic label
-encoded as RDS signal, will be transmitted on a specified frequency.
+capabilities.  For configuring pluto there are three options:
+
+ * pluto, whichn requires the support libraries to be installed;
+
+ * pluto-2, which - as most other device handlers - will try to read in the required functions from the library when selected, and
+
+ * pluto-rxtx, which supports transmitting the audio as received from a DAB sevrice in FM stereo on a user specified frequency. It requires the libad9361 and libiio to be installed.
+
+The precompiled versions were configured with "pluto-2".
 
 As default, the transmit frequency is 110 MHz, however, the user can specify
 the frequency (obviously within the range supported by the Adalm-Pluto)

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

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-4.35)
+set (objectName qt-dab-4.351)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -88,9 +88,9 @@
 	set(DATA_STREAMER true)
 endif ()
 
-if (DEFINED TRY_EPG)
+#if (DEFINED TRY_EPG)
 	set(TRY_EPG true)
-endif ()
+#endif ()
 
 if (DEFINED VITERBI_SSE)
 	set(VITERBI_SSE true)
@@ -194,7 +194,7 @@
 	           ../includes/backend/data/journaline
 	           ../includes/backend/data/mot
 	           ../includes/support
-	           ../src/support/tii-library
+	           ../src/support/tii-codes
 	           ../includes/support/viterbi-jan
 	           ../includes/support/viterbi-spiral
 	           ../includes/output
@@ -271,7 +271,6 @@
 	     ../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/viterbi-jan/viterbi-handler.h
 	     ../includes/support/viterbi-spiral/viterbi-spiral.h
@@ -294,7 +293,7 @@
 	     ../includes/support/dl-cache.h
 	     ../includes/support/ITU_Region_1.h
 	     ../includes/support/coordinates.h
-	     ../src/support/tii-library/tii-codes.h
+	     ../src/support/tii-codes/tii-codes.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
@@ -366,7 +365,6 @@
 	     ../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/preset-handler.cpp
 	     ../src/support/presetcombobox.cpp
@@ -388,7 +386,7 @@
 	     ../src/support/content-table.cpp
 	     ../src/support/ITU_Region_1.cpp
 	     ../src/support/coordinates.cpp
-	     ../src/support/tii-library/tii-codes.cpp
+	     ../src/support/tii-codes/tii-codes.cpp
 	     ../src/scopes-qwt6/iqdisplay.cpp 
 	     ../spectrum-viewer/spectrum-viewer.cpp 
 	     ../correlation-viewer/correlation-viewer.cpp

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/dab-streamer.cpp -> qt-dab-4.351.tar.gz/dab-maxi/dab-streamer/dab-streamer.cpp Changed

@@ -4,20 +4,20 @@
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computer
 *
- * This file is part of dab-2-fm
+ * This file is part of Qt-DAB
 *
- * dab-2-fm is free software; you can redistribute it and/or modify
+ * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
- * dab-2-fm is distributed in the hope that it will be useful,
+ * 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-2-fm; if not, write to the Free Software
+ * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 * rds encoding is heavily based on the "fmstation"
@@ -29,8 +29,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <stdint.h>
-//#include	<sndfile.h>
-//#include	<samplerate.h>
 #include	<math.h>
 #include	<atomic>
 #include	<sys/time.h>
@@ -50,10 +48,9 @@
 		dabStreamer::dabStreamer (int		inRate,
 	 int		outRate,
 	 plutoHandler	*generator):
+	 lowPassFilter (11, 15000, inRate),
 	 pcmBuffer (8 * 32768),
-	 rdsBuffer (256),
-	 lowPassFilter (11, 15000, inRate) {
-
+	 rdsBuffer (2 * 256) {
 	this	-> inRate		= inRate;
 	this	-> outRate		= outRate;
 	this	-> generator		= generator;
@@ -112,7 +109,7 @@
 float lBuffer [2 * amount];
 
 	while (pcmBuffer. GetRingBufferWriteAvailable () < 2 * amount)
-	 usleep (400);
+	 usleep (1000);
 	for (int i = 0; i < amount; i ++) {
 	 std::complex<float> x = std::complex<float> (v [2 * i],
 	 v [2 * i + 1]);
@@ -171,10 +168,11 @@
 
 	 while (running. load () && 
 	 (pcmBuffer. GetRingBufferReadAvailable () < inRate / 10)) {
-	 std::complex<float> filler [48];
-	 memset (filler, 0, 48 * sizeof (std::complex<float>));
-	 usleep (1000);
+//	 std::complex<float> filler [48];
+//	 memset (filler, 0, 48 * sizeof (std::complex<float>));
+	 usleep (10000);
 	 }
+
 	 if (!running. load ())
 	 break;
 	 readCount	= pcmBuffer. getDataFromBuffer (lBuf, inRate / 10);
@@ -249,10 +247,6 @@
 	 double	symclk		= sinTable [ind_4];
 	 double bit_d	= 0;
 
-//#define MANCH_ENCODE(clk, bit) (((clk ^ bit) << 1) | ((clk ^ 0x1 ^ bit)))
-
-//#define NRZ(in) (double)(((int)((in) & 0x1) << 1) - 1)
-
 	 if ((symclk_p <= 0) && (symclk > 0)) {
 	 e		= group -> bits [bpos]^ prev_e;
 	 m		= MANCH_ENCODE (symclk_b, e);
@@ -280,7 +274,6 @@
 //
 //	sound elements are preempted
 	 samp_s		= preemp (samp_s);
-
 	 double lpr	= (samp_s.l + samp_s.r);
 	 double lmr	= (samp_s.l - samp_s.r);
 
@@ -307,7 +300,12 @@
 	 if (nextPhase < 0)
 	 nextPhase += 2 * M_PI;
 	 int index	= nextPhase / (2 * M_PI) * outRate;
-	 generator -> sendSample (oscillatorTable [index]);
+//
+//	there might be an issue with the resulting index, nextPhase
+//	may be nan, inf, or just too large
+	 int aa	= index % outRate;
+	 if (aa == index)
+	 generator -> sendSample (oscillatorTable [index]);
 	 pos++;
 	}
 }

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/dab-streamer.h -> qt-dab-4.351.tar.gz/dab-maxi/dab-streamer/dab-streamer.h Changed

@@ -4,39 +4,38 @@
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
- * This file is part of the dab streamer
+ * This file is part of Qt-DAB
 *
- * dab streamer is free software; you can redistribute it and/or modify
+ * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
- * dab streamer is distributed in the hope that it will be useful,
+ * 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-streamer; if not, write to the Free Software
+ * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 *	rds encoding is heavily based on the "fmstation"
 *	from Jan Roemisch (github.com/maxx23), all rights acknowledged
 */
 
-#ifndef __DAB_STREAMER__
-#define __DAB_STREAMER__
+#ifndef __DAB_STREAMER_H
+#define __DAB_STREAMER_H
 
 #include	<thread>
 #include	<stdint.h>
 #include	<stdio.h>
-//#include	<sndfile.h>
 #include	<complex>
 #include	<atomic>
 #include	"ringbuffer.h"
 #include	"audio-base.h"
 #include	"ringbuffer.h"
-#include	"lowpass-filter.h"
+#include	"fir-filters.h"
 #include	<string>
 
 class	plutoHandler;
@@ -139,9 +138,9 @@
 	void	addRds			(const std::string);
 	void	stop			(void);
 private:
+	LowPassFIR	lowPassFilter;
 	RingBuffer<float> pcmBuffer;
 	RingBuffer<char> rdsBuffer;
-	LowPassFIR	lowPassFilter;
 	void		run			(void);
 	std::thread	threadHandle;
 	int		inRate;

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/up-filter.cpp -> qt-dab-4.351.tar.gz/dab-maxi/dab-streamer/up-filter.cpp Changed

@@ -1,5 +1,30 @@
 #
+/*
+ * 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 Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<math.h>
 #include	"up-filter.h"
+#ifndef M_PI
+# define M_PI 3.14159265358979323846 /* pi */
+#endif
 
 static inline
 std::complex<float> cmul (std::complex<float> in, float y) {

qt-dab-4.35.tar.gz/dab-maxi/dab-streamer/up-filter.h -> qt-dab-4.351.tar.gz/dab-maxi/dab-streamer/up-filter.h Changed

@@ -1,6 +1,27 @@
 #
-#ifndef	__UP_FILTER__
-#define	__UP_FILTER__
+/*
+ * 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 Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__UP_FILTER_H
+#define	__UP_FILTER_H
 
 #include	<complex>
 #include	<vector>
@@ -21,5 +42,3 @@
 };
 #endif
 
-
-

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

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

@@ -107,7 +107,6 @@
 	   ../includes/ofdm/phasereference.h \
 	   ../includes/ofdm/phasetable.h \
 	   ../includes/ofdm/freq-interleaver.h \
-#	   ../includes/ofdm/tii_table.h \
 	   ../includes/ofdm/tii_detector.h \
 	   ../includes/ofdm/fic-handler.h \
 	   ../includes/ofdm/fib-decoder.h  \
@@ -120,7 +119,6 @@
 	   ../includes/backend/msc-handler.h \
 	   ../includes/backend/galois.h \
 	   ../includes/backend/reed-solomon.h \
-#	   ../includes/backend/rscodec.h \
 	   ../includes/backend/charsets.h \
 	   ../includes/backend/firecode-checker.h \
 	   ../includes/backend/frame-processor.h \
@@ -158,7 +156,6 @@
 	   ../includes/support/ringbuffer.h \
 	   ../includes/support/dab-params.h \
 	   ../includes/support/band-handler.h \
-	   ../includes/support/text-mapper.h \
 	   ../includes/support/dab-tables.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/presetcombobox.h \
@@ -187,7 +184,6 @@
 	   ../snr-viewer/snr-viewer.h \
 	   ./qt-devices/device-handler.h \
 	   ./qt-devices/xml-filewriter.h \
-#	   ./qt-devices/filereader-widget.h \
 	   ./qt-devices/rawfiles-new/rawfiles.h \
 	   ./qt-devices/rawfiles-new/raw-reader.h \
            ./qt-devices/wavfiles-new/wavfiles.h \
@@ -220,7 +216,6 @@
 	   ../src/ofdm/phasereference.cpp \
 	   ../src/ofdm/phasetable.cpp \
 	   ../src/ofdm/freq-interleaver.cpp \
-#	   ../src/ofdm/tii_table.cpp \
 	   ../src/ofdm/tii_detector.cpp \
 	   ../src/ofdm/fic-handler.cpp \
 	   ../src/ofdm/fib-decoder.cpp  \
@@ -231,10 +226,8 @@
 	   ../src/backend/msc-handler.cpp \
 	   ../src/backend/galois.cpp \
 	   ../src/backend/reed-solomon.cpp \
-#	   ../src/backend/rscodec.cpp \
 	   ../src/backend/charsets.cpp \
 	   ../src/backend/firecode-checker.cpp \
-#	   ../src/backend/frame-processor.cpp \
 	   ../src/backend/backend.cpp \
            ../src/backend/backend-driver.cpp \
            ../src/backend/backend-deconvolver.cpp \
@@ -243,7 +236,6 @@
 	   ../src/backend/audio/bitWriter.cpp \
 	   ../src/backend/data/pad-handler.cpp \
 	   ../src/backend/data/data-processor.cpp \
-#	   ../src/backend/data/virtual-datahandler.cpp \
 	   ../src/backend/data/tdc-datahandler.cpp \
 	   ../src/backend/data/ip-datahandler.cpp \
 	   ../src/backend/data/mot/mot-handler.cpp \
@@ -266,7 +258,6 @@
            ../src/support/fft-handler.cpp \
 	   ../src/support/dab-params.cpp \
 	   ../src/support/band-handler.cpp \
-	   ../src/support/text-mapper.cpp \
 	   ../src/support/dab-tables.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
@@ -304,7 +295,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-4.35
+TARGET		= qt-dab-4.351
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -332,15 +323,16 @@
 # comment or uncomment for the devices you want to have support for
 # (you obviously have libraries installed for the selected ones)
 CONFIG		+= sdrplay-v2
-CONFIG		+= sdrplay-v3		# pretty experimental
+CONFIG		+= sdrplay-v3	
 CONFIG		+= dabstick
 CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
 CONFIG		+= lime
-#CONFIG		+= soapy
+CONFIG		+= soapy
 #CONFIG		+= pluto-rxtx
 #CONFIG		+= pluto
+CONFIG		+= pluto-2
 #CONFIG		+= elad-device
 #CONFIG		+= colibri
 CONFIG		+= faad
@@ -348,11 +340,10 @@
 #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
-CONFIG		+= send_datagram
+#CONFIG		+= send_datagram
 
 #if you want to listen remote, uncomment
 #CONFIG		+= tcp-streamer		# use for remote listening
@@ -360,15 +351,15 @@
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
-DEFINES	+= __LOGGING__
-CONFIG		+= try-epg		# do not use
+CONFIG		+= try-epg		
 CONFIG		+= PC
+#CONFIG		+= NO_SSE
 #CONFIG		+= RPI
 #DEFINES	+= SHOW_MISSING
+DEFINES		+= __LOGGING__
 DEFINES		+= __DUMP_SNR__		# for experiments only
 }
 
-
 # an attempt to have it run under W32 through cross compilation
 win32 {
 exists ("../.git") {
@@ -383,7 +374,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-4.35
+#	TARGET		= qt-dab64-4.351
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -403,7 +394,7 @@
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-4.35
+	TARGET		= qt-dab32-4.351
 	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
@@ -416,12 +407,14 @@
 	CONFIG		+= sdrplay-v3
 	CONFIG		+= hackrf
 	CONFIG		+= lime
+#	CONFIG		+= pluto
+#	CONFIG		+= pluto-rxtx
 	CONFIG		+= pluto-2
 	CONFIG		+= NO_SSE
 	DEFINES		+= __THREADED_BACKEND
-#	CONFIG		+= noTables
 #	CONFIG		+= JAN
 	CONFIG		+= preCompiled
+#	CONFIG		+= tiiLib
 #
 #	end of 32/64 specifics
 INCLUDEPATH	+= /usr/local/include
@@ -581,12 +574,10 @@
 	INCLUDEPATH	+= ./dab-streamer
 	HEADERS		+= ./qt-devices/pluto-rxtx/dabFilter.h
 	HEADERS		+= ./qt-devices/pluto-rxtx/pluto-rxtx-handler.h 
-	HEADERS		+= ./dab-streamer/dab-streamer.h \
-	                   ./dab-streamer/lowpass-filter.h \
+	HEADERS		+= ./dab-streamer/dab-streamer.h 
 	                   ./dab-streamer/up-filter.h
 	SOURCES		+= ./qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp 
 	SOURCES		+= ./dab-streamer/dab-streamer.cpp \
-	                   ./dab-streamer/lowpass-filter.cpp \
 	                   ./dab-streamer/up-filter.cpp
 	FORMS		+= ./qt-devices/pluto-rxtx/pluto-rxtx-widget.ui
 	LIBS		+= -liio -lad9361
@@ -760,7 +751,7 @@
 	SOURCES		+= ../src/support/tii-library/tii-codes.cpp
 }
 
-noTables {
+basic	{
 	INCLUDEPATH	+= ../src/support/tii-codes
 	HEADERS		+= ../src/support/tii-codes/tii-codes.h
 	SOURCES		+= ../src/support/tii-codes/tii-codes.cpp

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

qt-dab-4.35.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.h -> qt-dab-4.351.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.h Changed

@@ -35,52 +35,52 @@
 
 	class	xml_fileWriter;
 extern "C"  {
-typedef	int (*pfn_airspy_init)();
-typedef int (*pfn_airspy_exit)();
-typedef int (*pfn_airspy_list_devices)(uint64_t *, int);
-typedef int (*pfn_airspy_open) (struct airspy_device**, uint64_t);
-//typedef int (*pfn_airspy_open) (struct airspy_device**);
-typedef int (*pfn_airspy_close) (struct airspy_device*);
-typedef int (*pfn_airspy_get_samplerates) (struct airspy_device* device,
+ typedef int (*pfn_airspy_init)();
+ typedef int (*pfn_airspy_exit)();
+ typedef int (*pfn_airspy_list_devices)(uint64_t *, int);
+ typedef int (*pfn_airspy_open) (struct airspy_device**, uint64_t);
+// typedef int (*pfn_airspy_open) (struct airspy_device**);
+ typedef int (*pfn_airspy_close) (struct airspy_device*);
+ typedef int (*pfn_airspy_get_samplerates) (struct airspy_device* device,
 	                                   uint32_t* buffer,
 	                                   const uint32_t len);
-typedef int (*pfn_airspy_set_samplerate) (struct airspy_device* device,
+ typedef int (*pfn_airspy_set_samplerate) (struct airspy_device* device,
 	                                  uint32_t samplerate);
-typedef int (*pfn_airspy_start_rx) (struct airspy_device* device,
+ typedef int (*pfn_airspy_start_rx) (struct airspy_device* device,
 	                            airspy_sample_block_cb_fn callback,
 	                            void* rx_ctx);
-typedef int (*pfn_airspy_stop_rx) (struct airspy_device* device);
+ typedef int (*pfn_airspy_stop_rx) (struct airspy_device* device);
 
-typedef int (*pfn_airspy_set_sample_type) (struct airspy_device *,
+ typedef int (*pfn_airspy_set_sample_type) (struct airspy_device *,
 	                                   airspy_sample_type);
-typedef int (*pfn_airspy_set_freq) (struct airspy_device* device,
+ typedef int (*pfn_airspy_set_freq) (struct airspy_device* device,
 	                            const uint32_t freq_hz);
 
-typedef int (*pfn_airspy_set_lna_gain) (struct airspy_device* device,
+ typedef int (*pfn_airspy_set_lna_gain) (struct airspy_device* device,
 	                                uint8_t value);
 
-typedef int (*pfn_airspy_set_mixer_gain) (struct airspy_device* device,
+ typedef int (*pfn_airspy_set_mixer_gain) (struct airspy_device* device,
 	                                  uint8_t value);
 
-typedef int (*pfn_airspy_set_vga_gain) (struct airspy_device*
+ typedef int (*pfn_airspy_set_vga_gain) (struct airspy_device*
 	                                device, uint8_t
 	                                value);
-typedef int (*pfn_airspy_set_lna_agc) (struct airspy_device* device,
+ typedef int (*pfn_airspy_set_lna_agc) (struct airspy_device* device,
 	                               uint8_t value);
-typedef int (*pfn_airspy_set_mixer_agc) (struct airspy_device* device,
+ typedef int (*pfn_airspy_set_mixer_agc) (struct airspy_device* device,
 	                                 uint8_t value);
 
-typedef int (*pfn_airspy_set_rf_bias) (struct airspy_device* dev,
+ typedef int (*pfn_airspy_set_rf_bias) (struct airspy_device* dev,
 	                               uint8_t value);
 
-typedef const char* (*pfn_airspy_error_name) (enum airspy_error errcode);
-typedef int (*pfn_airspy_board_id_read) (struct airspy_device *,
+ typedef const char* (*pfn_airspy_error_name) (enum airspy_error errcode);
+ typedef int (*pfn_airspy_board_id_read) (struct airspy_device *,
 	                                         uint8_t *);
-typedef const char* (*pfn_airspy_board_id_name) (enum airspy_board_id board_id);
-typedef int (*pfn_airspy_board_partid_serialno_read)(struct airspy_device* device, airspy_read_partid_serialno_t* read_partid_serialno);
+ typedef const char* (*pfn_airspy_board_id_name) (enum airspy_board_id board_id);
+ typedef int (*pfn_airspy_board_partid_serialno_read)(struct airspy_device* device, airspy_read_partid_serialno_t* read_partid_serialno);
 
-typedef int (*pfn_airspy_set_linearity_gain) (struct airspy_device* device, uint8_t value);
-typedef int (*pfn_airspy_set_sensitivity_gain)(struct airspy_device* device, uint8_t value);
+ typedef int (*pfn_airspy_set_linearity_gain) (struct airspy_device* device, uint8_t value);
+ typedef int (*pfn_airspy_set_sensitivity_gain)(struct airspy_device* device, uint8_t value);
 }
 
 class airspyHandler: public QObject,

qt-dab-4.351.tar.gz/dab-maxi/qt-devices/pluto-rxtx/ad9361.h Added

@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2015 Analog Devices, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ */
+
+ /** @file ad9361.h
+ * @brief Public interface */
+
+#ifndef __AD9361_H__
+#define __AD9361_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @defgroup FLAGS MCS Flags
+ *
+ * @{
+ */
+/** Flag for ad9361_multichip_sync which verifies interface timing between
+ master and all slaves is identical
+*/
+#define FIXUP_INTERFACE_TIMING	1
+/** Flag for ad9361_multichip_sync which checks if master and associated slaves
+ have the same sample rate
+*/
+#define CHECK_SAMPLE_RATES	2
+
+/** @} */
+
+#ifdef _WIN32
+# ifdef LIBAD9361_EXPORTS
+#	define __api __declspec(dllexport)
+# else
+#	define __api __declspec(dllimport)
+# endif
+#elif __GNUC__ >= 4 && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+# define __api __attribute__((visibility ("default")))
+#else
+# define __api
+#endif
+
+struct iio_context;
+struct iio_device;
+
+/**
+ * @struct filter_design_parameters
+ * @brief Custom Filter Design Parameters
+ *
+ * A structure for custom filter designs for the AD936X programmable FIR
+ * in both TX and RX paths.
+ */
+struct filter_design_parameters {
+ double Rdata; /**< Data rate of digital interface */
+ double Fpass; /**< Stop edge frequency in hertz of passband */
+ double Fstop; /**< Start edge frequency in hertz of stopband */
+ double caldiv; /**< Baseband analog filter calibration divider setting [1-511] */
+ double FIR; /**< Decimation/Interpolation setting of FIR [1,2,4] */
+ double HB1; /**< Decimation/Interpolation setting of HB1 [1,2] */
+ double DAC_div; /**< Divider enable setting of DAC clock [0,1] */
+ const char *Type; /**< Designer mode (only Lowpass supported) */
+ const char *RxTx; /**< Filter path [Tx,Rx] */
+ double RFbw; /**< 3dB corner of analog filter in hertz */
+ double converter_rate; /**< Rate of ADC in hertz */
+ double PLL_rate; /**< Rate of PLL in hertz */
+ double Fcenter; /**< Center frequency in hertz of bandpass (Unused) */
+ double wnom; /**< RF bandwidth of analog filter in hertz */
+ double FIRdBmin; /**< Minimum stop band attentuation of the FIR in dB */
+ double int_FIR; /**< Enable use of internal FIR filter [0,1] */
+ double PLL_mult; /**< Ratio of converter to PLL rate */
+ double Apass; /**< Desired passband ripple in dB */
+ double Astop; /**< Desired stopband attenuation in dB */
+ double phEQ; /**< Enable phase equalization [0,1] */
+ double HB2; /**< Decimation/Interpolation setting of HB2 [1,2] */
+ double HB3; /**< Decimation/Interpolation setting of HB3 [1,2,3] */
+ double maxTaps; /**< Maximum allowed FIR taps */
+};
+
+/* ---------------------------------------------------------------------------*/
+/* ------------------------- Top-level functions -----------------------------*/
+/** @defgroup TopLevel Top-level functions
+ * @{ */
+
+
+/** @brief Multi-chip synchronization (MCS) management
+ * @param master A pointer to an iio_device structure
+ * @param slaves A double pointer to an iio_device structure
+ * @param num_slaves Number of slave devices associated with the master
+ * @param flags Control flags for MCS configuration
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_multichip_sync(struct iio_device *master,
+		struct iio_device **slaves, unsigned int num_slaves,
+		unsigned int flags);
+
+/** @brief FMComms5 specific MCS management
+ * @param ctx A pointer to an iio_context structure
+ * @param flags Control flags for MCS configuration
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_fmcomms5_multichip_sync(
+		struct iio_context *ctx, unsigned int flags);
+
+/** @brief Baseband rate configuration with generic filter support
+ * @param dev A pointer to an iio_device structure
+ * @param rate Rate in samples per second of desired baseband rate
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned
+ *
+ * NOTE: Three possible filters are loaded based on required rate and
+ * associated decimation/interpolation. These filters are generally very wide
+ * band and not waveform specific. */
+__api int ad9361_set_bb_rate(struct iio_device *dev, unsigned long rate);
+
+/** @brief Enable or disable transmit and receiver FIRs simultaneously
+ * @param dev A pointer to an iio_device structure
+ * @param enable Integer to enable FIRs when 1 or disable when 0
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_set_trx_fir_enable(struct iio_device *dev, int enable);
+
+/** @brief Get current enable value of transmit and receiver FIRs
+ * @param dev A pointer to an iio_device structure
+ * @param enable Returned integer value of FIR enabled
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_get_trx_fir_enable(struct iio_device *dev, int *enable);
+
+/** @brief Design custom FIR filter from specific design criteria
+ * @param parameters A pointer filter designer structure
+ * @param taps A pointer to taps of designed filter
+ * @param num_taps A pointer to integer number of taps designed in taps
+ * @param gain Integer gain for designed filter
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_generate_fir_taps(struct filter_design_parameters *parameters,
+ short *taps, int *num_taps, int *gain);
+
+/** @brief Calculate the clock path rates for both transmit and receiver paths
+ * @param tx_sample_rate Sample rate in samples per second of desired baseband rate
+ * @param rate_gov Rate governor enable setting forcing HB3=3 when enabled
+ * @param rx_path_clks A pointer to a unsigned long variable where the 6 RX path rates should be stored
+ * @param tx_path_clks A pointer to a unsigned long variable where the 6 TX path rates should be stored
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_calculate_rf_clock_chain(unsigned long tx_sample_rate,
+ unsigned long rate_gov,
+ unsigned long *rx_path_clks,
+ unsigned long *tx_path_clks);
+
+/** @brief Calculate the clock path rates and default filter settings for both transmit and receiver for a desired baseband rate
+ * @param fdpTX Filter design parameters structure where TX filter design parameters will be stored
+ * @param fdpRX Filter design parameters structure where RX filter design parameters will be stored
+ * @param sample_rate Desired basedband sample rate in samples per second for both RX and TX filter configurations
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_calculate_rf_clock_chain_fdp(struct filter_design_parameters *fdpTX,
+ struct filter_design_parameters *fdpRX,
+ unsigned long sample_rate);
+
+/** @brief Baseband rate configuration with custom filter support based on desired baseband sample rate
+ * @param dev A pointer to an iio_device structure
+ * @param rate Rate in samples per second of desired baseband rate
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned
+ *
+ * NOTE: Designed filter will have the following configuration:
+ * Fpass = rate / 3
+ * Fstop = Fpass * 1.25
+ * wnomTX = 1.6 * Fstop
+ * wnomRX = 1.4 * Fstop */
+__api int ad9361_set_bb_rate_custom_filter_auto(struct iio_device *dev,
+ unsigned long rate);
+
+/** @brief Baseband rate configuration with custom filter support based on desired baseband sample rate and simplified filter configuration
+ * @param dev A pointer to an iio_device structure
+ * @param rate Rate in samples per second of desired baseband rate
+ * @param Fpass Stop edge frequency in hertz of passband
+ * @param Fstop Start edge frequency in hertz of stopband
+ * @param wnom_tx TX RF bandwidth of analog filter in hertz
+ * @param wnom_rx RX RF bandwidth of analog filter in hertz
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned */
+__api int ad9361_set_bb_rate_custom_filter_manual(struct iio_device *dev,
+ unsigned long rate, unsigned long Fpass,
+ unsigned long Fstop, unsigned long wnom_tx,
+ unsigned long wnom_rx);
+
+/** @brief FMComms5 phase synchronize all TX and RX channels together
+ * @param ctx A pointer to an iio_context structure
+ * @param lo Frequency in hertz of LO for TX and RX
+ * @return On success, 0 is returned
+ * @return On error, a negative errno code is returned. If -2 is returned calibration failed
+ *
+ * NOTES: To perform calibration the following side effects occur:
+ * - RF bandwidths of both TX and RX are expanded to the current sample rate. It can be changed after calibration without effecting phase synchronization.
+ * - DDSs are enabled and left on after synchronization. Changing these DDSs or switching to DMA sources will not effect phase synchronization.
+ * - TX and RX LOs are set to the same frequency based on the input provided. LO changes can invalidate phase synchronization.
+ * - AGCs are set to manual mode at predetermined hardware gains for TX and RX. Gain changes can invalidate phase synchronization.
+ *
+ * Phase synchronization is valid until the LOs are retuned or sample rates change or gains are modified.
+ *
+ * External Links:
+ * - <a href="https://wiki.analog.com/resources/eval/user-guides/ad-fmcomms5-ebz/multi-chip-sync">Detailed information on synchronization process</a>
+ * - <a href="https://wiki.analog.com/resources/eval/user-guides/ad-fmcomms5-ebz/hardware">Phase synchronization performance can depend on revision of hardware</a>*/
+__api int ad9361_fmcomms5_phase_sync(struct iio_context *ctx, long long lo);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#undef __api
+
+#endif /* __AD9361_H__ */

qt-dab-4.35.tar.gz/dab-maxi/qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp -> qt-dab-4.351.tar.gz/dab-maxi/qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp Changed

@@ -43,7 +43,7 @@
 	return tmpstr;
 }
 
-enum iodev { RX, TX };
+enum iodev {RX, TX};
 
 int	ad9361_set_trx_fir_enable(struct iio_device *dev, int enable) {
 int ret = iio_device_attr_write_bool (dev,
@@ -191,13 +191,21 @@
 	return true;
 }
 
+
+extern "C" {
+int ad9361_set_bb_rate_custom_filter_manual(struct iio_device *dev,
+                                                  unsigned long rate, unsigned long Fpass,
+                                                  unsigned long Fstop, unsigned long wnom_tx,
+                                                  unsigned long wnom_rx);
+}
+
 	plutoHandler::plutoHandler  (QSettings *s,
 	                             QString &recorderVersion,
 	                             int	fmFrequency):
 	                                  myFrame (nullptr),
 	                                  _I_Buffer (4 * 1024 * 1024),
 	                                  _O_Buffer (4 * 1024 * 1024),
-	                                  theFilter (13, 192000, FM_RATE) {
+	                                  theFilter (21, 192000, FM_RATE) {
 	
 	plutoSettings			= s;
 	this	-> recorderVersion	= recorderVersion;
@@ -810,7 +818,7 @@
 
 	this	-> fmFrequency	= freq * KHz (1);
 	get_lo_chan (ctx, TX, &lo_channel);
-	tx_cfg. lo_hz   = this	-> frequency;
+	tx_cfg. lo_hz   = this	-> fmFrequency;
 	int ret = iio_channel_attr_write_longlong
 	                             (lo_channel,
 	                                   "frequency", tx_cfg. lo_hz);

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

@@ -327,7 +327,6 @@
 	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);
@@ -351,7 +350,7 @@
 
 	connect (configWidget. loadTableButton, SIGNAL (clicked ()),
 	 this, SLOT (loadTable ()));
-	
+
 	logFile		= nullptr;
 	int scanMode	=
 	 dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
@@ -365,6 +364,11 @@
 	x = dabSettings -> value ("closeDirect", 0). toInt ();
 	if (x != 0)
 	 configWidget. closeDirect -> setChecked (true);
+
+	x = dabSettings -> value ("epg2xml", 0). toInt ();
+	if (x != 0)
+	 configWidget. epg2xmlSelector -> setChecked (true);
+
 	x = dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
 	if (x == ALPHA_BASED)
 	 configWidget. orderAlfabetical -> setChecked (true);
@@ -700,7 +704,7 @@
 }
 
 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");
+	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 () {
@@ -816,6 +820,8 @@
 	 my_snrViewer. isHidden () ? 0 : 1);
 	s	-> setValue ("utcSelector",
 	 configWidget. utcSelector -> isChecked () ? 1 : 0);
+	s	-> setValue ("epg2xml",
+	 configWidget. epg2xmlSelector -> isChecked () ? 1 : 0);
 	s	-> sync();
 }
 //
@@ -1019,26 +1025,17 @@
 	 my_dabProcessor -> get_ensembleId ();
 	 uint32_t currentSId =
 	 extract_epg (name, serviceList, ensembleId);
-	 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 ());
-	 else {
-	 fwrite (epgData. data (), 1, epgData. size (), f);
-	 fprintf (stderr, "writing epgdata to %s\n",
-	 name. toUtf8 (). data ());
-	 fclose (f);
-	 }
-	 int subType = 
+	 uint32_t julianDate	=
+	 my_dabProcessor -> julianDate ();
+	 int subType = 
 	 getContentSubType ((MOTContentType)contentType);
-	 epgProcessor. process_epg (epgData. data (), 
+	 epgProcessor. process_epg (epgData. data (), 
 	 epgData. size (), currentSId,
-	 subType);
-
-	 }
-	 epgHandler. decode (epgData, realName);
+	 subType,
+	 julianDate);
+	 if (configWidget. epg2xmlSelector -> isChecked ())
+	 epgHandler. decode (epgData, name);
+//	 epgHandler. decode (epgData, realName);
 	 }
 #endif
 	 return;
@@ -1208,8 +1205,14 @@
 	stopScanning (false);
 //
 	stopService	(s);
-	if (secondService. valid)
-	 stopService (secondService);
+//
+//	we stop all secondary services as well, but we maintain theer
+//	description, file descriptors remain of course
+//
+	for (int i = 0; i < backgroundServices. size (); i ++)
+	 my_dabProcessor -> stopService (backgroundServices. at (i). subChId,
+	 BACK_GROUND);
+
 	fprintf (stderr, "change will be effected\n");
 	serviceOrder	= 
 	 dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
@@ -1228,25 +1231,6 @@
 	}
 	ensembleDisplay -> setModel (&model);
 //
-//	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;
-	 }
-	 else
-	 secondService. valid = false;
-	}
-
 //	Of course, it may be disappeared
 	if (s. valid) {
 	 QString ss = my_dabProcessor -> findService (s. SId, s. SCIds);
@@ -1262,6 +1246,42 @@
 	 if (s. serviceName != "")
 	 startService (&s);
 	}
+//
+//	we also have to restart all background services,
+	for (int i = 0; i < backgroundServices. size (); i ++) {
+	 QString ss = my_dabProcessor -> findService (s. SId, s. SCIds);
+	 if (ss == "") {	// it is gone, close the file if any
+	 if (backgroundServices. at (i). fd != nullptr)
+	 fclose (backgroundServices. at (i). fd);
+	 backgroundServices. erase
+	 (backgroundServices. begin () + i);
+	 }
+	 else {	// (re)start the service
+	 if (my_dabProcessor -> is_audioService (ss)) {
+	 audiodata ad;
+	 FILE *f = backgroundServices. at (i). fd;
+	 my_dabProcessor -> dataforAudioService (ss, &ad);
+	 my_dabProcessor -> 
+ set_audioChannel (&ad, &audioBuffer, f, BACK_GROUND);	 
+ backgroundServices. at (i). subChId = ad. subchId;
+	 }
+	 else {
+	 packetdata pd;
+	 my_dabProcessor -> dataforPacketService (ss, &pd, 0);
+	 my_dabProcessor -> 
+ set_dataChannel (&pd, &dataBuffer, BACK_GROUND);	 
+ backgroundServices. at (i). subChId = pd. subchId;
+	 }
+	 for (int j = 0; j < model. rowCount (); j ++) {
+	 QString itemText =
+ model. index (j, 0). data (Qt::DisplayRole). toString ();
+	 if (itemText == ss) {
+	 colorService (model. index (j, 0), Qt::green,
+	 fontSize + 2, true);
+	 }
+	 }
+	 }
+	}
 }
 //
 //	In order to not overload with an enormous amount of
@@ -1947,11 +1967,9 @@
 	 dynamicLabel -> setWordWrap (true);
 	 dynamicLabel	-> setText (s);
 	}
+//	if we dtText is ON, some work is still to be done
 	if (dlTextFile == nullptr)
 	 return;
-//	if (the_dlCache. isMember (s))
-//	 return;
-//	the_dlCache. add (s);
 	if (the_dlCache. addifNew (s))
 	 return;
 	QString currentChannel = channel. channelName;
@@ -2115,11 +2133,11 @@
 	 labelText. toUtf8 (). data ());
 	 distanceLabel -> setText (labelText);
 	 
+	 }
 	 }
 	 }
 	 }
 	}
-	}
 	if ((country != "") && (country != channel. countryName)) {
 	 transmitter_country	-> setText (country);
 	 channel. countryName	= country;
@@ -2173,9 +2191,6 @@
 	if (!running. load())
 	 return;
 	my_correlationViewer. showCorrelation (amount, marker, v);
-
-//	if (channel. nrTransmitters != v. size ())
-//	 LOG ("nr transmitters ", QString::number (v. size ()));
 	channel. nrTransmitters = v. size ();
 }
 
@@ -2687,6 +2702,7 @@
 	 packetdata pd;
 	 QString serviceName =
 	 this -> ensembleDisplay -> indexAt (ev -> pos()). data().toString();
+	 serviceName = serviceName. right (16);
 	 if (serviceName. at (1) == ' ')
 	 return true;
 
@@ -2702,21 +2718,71 @@
 	 presetSelector -> addItem (itemText);
 	 return true;
 	 }
-	 
-	 if (ad. defined) {
-	 if (currentServiceDescriptor != nullptr) 
-	 delete currentServiceDescriptor;
-	 currentServiceDescriptor	= new audioDescriptor (&ad);
-	 return true;
-	 }
 
-	 my_dabProcessor -> dataforPacketService (serviceName, &pd, 0);
-	 if (pd. defined) {
-	 if (currentServiceDescriptor != nullptr)
-	 delete currentServiceDescriptor;
-	 currentServiceDescriptor	= new dataDescriptor (&pd);
+	 if ((ad. defined) && (ad. ASCTy == 077)) {
+	 for (int i = 0; i < backgroundServices. size (); i ++) {
+	 if (backgroundServices. at (i). serviceName ==
+	 serviceName) {
+	 my_dabProcessor -> stopService (ad. subchId,
+	 BACK_GROUND);
+	 if (backgroundServices. at (i). fd != nullptr)
+	 fclose (backgroundServices. at (i). fd);
+	 backgroundServices. erase
+	 (backgroundServices. begin () + i);
+	 fprintf (stderr, "Background %s gestopt\n",
+	 serviceName. toUtf8 (). data ());
+
+	 for (int j = 0; j < model. rowCount (); j ++) {
+ QString itemText =
+ model. index (j, 0). data (Qt::DisplayRole). toString ();
+ if (itemText == serviceName) {
+ colorService (model. index (j, 0), Qt::black, fontSize);
+	 }
+	 }
+	 return true;
+	 }
+	 }
+	 FILE *f =
+	 filenameFinder. findFrameDump_fileName (serviceName, true);
+	 if (f == nullptr)
+	 return true;
+
+	 (void)my_dabProcessor ->
+	 set_audioChannel (&ad, &audioBuffer, f, BACK_GROUND);
+	 
+	 dabService s;
+	 s. channel	= ad. channel;
+	 s. serviceName	= ad. serviceName;
+	 s. SId		= ad. SId;
+	 s. SCIds	= ad. SCIds;
+	 s. subChId	= ad. subchId;
+	 s. fd		= f;
+	 backgroundServices. push_back (s);
+	 for (int j = 0; j < model. rowCount (); j ++) {
+	 QString itemText =
+ model. index (j, 0). data (Qt::DisplayRole). toString ();
+	 if (itemText == s. serviceName) {
+	 colorService (model. index (j, 0),
+	 Qt::green, fontSize + 2, true);
+	 }
+		 }
 	 return true;
 	 }
+//	 
+//	 if (ad. defined) {
+//	 if (currentServiceDescriptor != nullptr) 
+//	 delete currentServiceDescriptor;
+//	 currentServiceDescriptor	= new audioDescriptor (&ad);
+//	 return true;
+//	 }
+//
+//	 my_dabProcessor -> dataforPacketService (serviceName, &pd, 0);
+//	 if (pd. defined) {
+//	 if (currentServiceDescriptor != nullptr)
+//	 delete currentServiceDescriptor;
+//	 currentServiceDescriptor	= new dataDescriptor (&pd);
+//	 return true;
+//	 }
 	 }
 	}
 
@@ -2886,26 +2952,40 @@
 	}
 
 	if (s. valid) {
-	 my_dabProcessor -> stopService (s. subChId);
+	 my_dabProcessor -> stopService (s. subChId, FORE_GROUND);
 	 if (s. is_audio) {
 	 soundOut -> stop ();
 	 for (int i = 0; i < 5; i ++) {
 	 packetdata pd;
-	 my_dabProcessor -> dataforPacketService (s. serviceName, &pd, i);
+	 my_dabProcessor -> dataforPacketService (s. serviceName,
+	 &pd, i);
 	 if (pd. defined) {
-	 my_dabProcessor -> stopService (pd. subchId);
+	 my_dabProcessor -> stopService (pd. subchId, FORE_GROUND);
 	 break;
 	 }
 	 }
 	 }
-
+//
+//	The name of the service - on stopping it - will be - normally -
+//	made back again in the service list. An exception is when another
+//	instance of the service runs as background process, then the
+//	name should be made green, italic
 	 for (int i = 0; i < model. rowCount (); i ++) {
 	 QString itemText =
 	 model. index (i, 0). data (Qt::DisplayRole). toString ();
-	 if (itemText == s. serviceName) {
-	 colorService (model. index (i, 0), Qt::black, fontSize);
-	 break;
-	 }
+	 if (itemText != s. serviceName) 
+	 continue;
+	 for (int j = 0; j < backgroundServices. size (); j ++) {
+	 if (backgroundServices. at (j). serviceName ==
+	 s. serviceName) {
+	 colorService (model. index (i, 0),
+	 Qt::green, fontSize + 2, true);
+	 cleanScreen ();
+	 return;
+	 }
+	 }	// ok, service is not background as well
+	 colorService (model. index (i, 0), Qt::black, fontSize);
+	 break;
 	 }
 	}
 	cleanScreen	();
@@ -2913,7 +2993,8 @@
 //
 //
 void	RadioInterface::selectService (QModelIndex ind) {
-QString	currentProgram = ind. data (Qt::DisplayRole). toString();
+QString	currentProgram = ind. data (Qt::DisplayRole). toString ();
+
 	if (!running. load ())
 	 return;
 
@@ -2950,13 +3031,14 @@
 	LOG ("start service ", serviceName. toUtf8 (). data ());
 	LOG ("service has SNR ", QString::number (snrDisplay -> value ()));
 	techData. timeTable_button -> hide ();
+//
+//	mark the selected service in the service list
 	int rowCount	= model. rowCount ();
 	for (int i = 0; i < rowCount; i ++) {
 	 QString itemText =
 	 model. index (i, 0). data (Qt::DisplayRole). toString ();
-	 if (itemText == serviceName) {
+	 if (itemText == serviceName) {
 	 colorService (model. index (i, 0), Qt::red, fontSize + 4);
-//	 serviceLabel	-> setStyleSheet ("QLabel {color : black}");
 	 QFont font = serviceLabel -> font ();
 	 font. setPointSize (16);
 	 font. setBold (true);
@@ -2995,11 +3077,12 @@
 	}
 }
 
-void RadioInterface::colorService (QModelIndex ind, QColor c, int pt) {
+void RadioInterface::colorService (QModelIndex ind, QColor c, int pt,
+	 bool italic) {
 	QMap <int, QVariant> vMap = model. itemData (ind);
 	vMap. insert (Qt::ForegroundRole, QVariant (QBrush (c)));
 	model. setItemData (ind, vMap);
-	model. setData (ind, QFont (theFont, pt), Qt::FontRole);
+	model. setData (ind, QFont (theFont, pt, -1, italic), Qt::FontRole);
 }
 //
 //	This function is only used in the Gui to clear
@@ -3047,19 +3130,17 @@
 
 	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 ());
 	serviceLabel -> setAlignment(Qt::AlignCenter);
 	serviceLabel -> setText (ad -> serviceName);
 	currentService. valid	= true;
 
-	(void)my_dabProcessor -> set_audioChannel (ad, &audioBuffer);
+	(void)my_dabProcessor -> set_audioChannel (ad, &audioBuffer,
+	 nullptr, FORE_GROUND);
 	for (int i = 1; i < 10; i ++) {
 	 packetdata pd;
 	 my_dabProcessor -> dataforPacketService (ad -> serviceName, &pd, i);
 	 if (pd. defined) {
-	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer);
+	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer, FORE_GROUND);
 	 fprintf (stderr, "adding %s (%d) as subservice\n",
 	 pd. serviceName. toUtf8 (). data (),
 	 pd. subchId);
@@ -3093,9 +3174,10 @@
 	 ad -> protLevel));
 	techData. language ->
 	 setText (getLanguage (ad -> language));
-	techData. programType ->
-	 setText (the_textMapper.
-	 get_programm_type_string (ad -> programType));
+	techData. programType -> 
+	 setText (getProgramType (ad -> programType));
+//	 setText (the_textMapper.
+//	 get_programm_type_string (ad -> programType));
 	if (ad -> fmFrequency == -1) {
 	 techData. fmFrequency	-> hide ();
 	 techData. fmLabel		-> hide	();
@@ -3120,7 +3202,8 @@
 	 return;
 	}
 
-	if (!my_dabProcessor -> set_dataChannel (&pd, &dataBuffer)) {
+	if (!my_dabProcessor -> set_dataChannel (&pd,
+	 &dataBuffer, FORE_GROUND)) {
 	 QMessageBox::warning (this, tr ("sdr"),
 	 tr ("could not start this service\n"));
 	 return;
@@ -3309,6 +3392,20 @@
 	if (inputDevice == nullptr)		// should not happen
 	 return;
 	LOG ("channel stops ", channel. channelName);
+	fprintf (stderr, "we have now as background services\n");
+	for (int i = 0; i < backgroundServices. size (); i ++)
+	 fprintf (stderr, "%s (%d)\n",
+	 backgroundServices. at (i). serviceName. toLatin1 (). data (),
+	 backgroundServices. at (i). subChId);
+	
+	for (int i = 0; i < backgroundServices. size (); i ++) {
+	 dabService s = backgroundServices. at (i);
+	 my_dabProcessor -> stopService (s. subChId, BACK_GROUND);
+	 if (s. fd != nullptr)
+	 fclose (s. fd);
+	}
+	backgroundServices. clear ();
+	 
 	stop_sourceDumping	();
 	stop_audioDumping	();
 	soundOut	-> stop ();
@@ -3351,7 +3448,6 @@
 	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);
@@ -4274,15 +4370,25 @@
 	 epgLabel	-> show ();
 	 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;
+	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer, BACK_GROUND);
+	 dabService s;
+ s. channel = pd. channel;
+ s. serviceName = pd. serviceName;
+ s. SId = pd. SId;
+ s. SCIds = pd. SCIds;
+ s. subChId = pd. subchId;
+ s. fd = nullptr;
+ backgroundServices. push_back (s);
+
+	 for (int j = 0; j < model. rowCount (); j ++) {
+ QString itemText =
+ model. index (j, 0). data (Qt::DisplayRole). toString ();
+ if (itemText == pd. serviceName) {
+ colorService (model. index (j, 0), Qt::green,
+ fontSize + 2, true);
+	 break;
+ }
+	 }
 	 }
 	 }
 #ifdef	__DABDATA__
@@ -4294,14 +4400,15 @@
 	 epgLabel -> show ();
 	 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;
+	 my_dabProcessor -> set_dataChannel (&pd, &dataBuffer, BACK_GROUND);
+	 dabService s;
+ s. channel = channel. channelName;
+ s. serviceName = pd. serviceName;
+ s. SId = pd. SId;
+ s. SCIds = pd. SCIds;
+ s. subChId = pd. subchId;
+ s. fd = nullptr;
+ backgroundServices. push_back (s);
 	 break;
 	 }
 	 }

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

@@ -41,7 +41,6 @@
 #include	"dab-processor.h"
 #include	"ringbuffer.h"
 #include "band-handler.h"
-#include	"text-mapper.h"
 #include	"process-params.h"
 #include	"dl-cache.h"
 #include	"tii-codes.h"
@@ -93,6 +92,7 @@
 	int		subChId;
 	bool		valid;
 	bool		is_audio;
+	FILE		*fd;
 };
 
 struct	theTime {
@@ -104,7 +104,6 @@
 	int	second;
 };
 
-
 class RadioInterface: public QWidget, private Ui_dabradio {
 Q_OBJECT
 public:
@@ -137,7 +136,6 @@
 	snrViewer		my_snrViewer;
 	presetHandler		my_presetHandler;
 	bandHandler		theBand;
-//	scannerTable		theTable;
 	QFrame			dataDisplay;
 	QFrame			configDisplay;
 	dlCache			the_dlCache;
@@ -157,20 +155,17 @@
 	int			serviceOrder;
 	bool			error_report;
 	Ui_technical_data	techData;
-//	QFrame			*dataDisplay;
 	Ui_configWidget		configWidget;
-//	QFrame			*configDisplay;
 	QSettings		*dabSettings;
 	dabService		currentService;
 	dabService		nextService;
-	dabService		secondService;
-
+//	dabService		secondService;
+	std::vector<dabService> backgroundServices;
 	QByteArray		transmitters;
 	int16_t			tii_delay;
 	int32_t			dataPort;
 	serviceDescriptor	*currentServiceDescriptor;
 	QLabel			*motSlides;
-//	std::vector<int>	secondariesVector;
 	bool			isSynced;
 	bool			stereoSetting;
 	std::atomic<bool>	running;
@@ -179,7 +174,7 @@
 #ifdef	HAVE_PLUTO_RXTX
 	dabStreamer		*streamerOut;
 #endif
-	textMapper		the_textMapper;
+//	textMapper		the_textMapper;
 	dabProcessor		*my_dabProcessor;
 	audioBase		*soundOut;
 #ifdef	DATA_STREAMER
@@ -273,7 +268,8 @@
 	void			stopService		(dabService &);
 	void			startService		(dabService *);
 	void			colorService		(QModelIndex ind,
-	 QColor c, int pt);
+	 QColor c, int pt,
+	 bool italic = false);
 	void			localSelect		(const QString &s);
 	void			scheduleSelect		(const QString &s);
 	void			localSelect		(const QString &,

qt-dab-4.35.tar.gz/dab-maxi/testfile -> qt-dab-4.351.tar.gz/dab-maxi/testfile Changed

qt-dab-4.351.tar.gz/dab-maxi/tiiFile.zip Added

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

@@ -929,7 +929,7 @@
 	presetSelector -> setCurrentIndex (0);
 	signalTimer. stop ();
 	if (s. valid) {
-	 my_dabProcessor -> stopService (s. subChId);
+	 my_dabProcessor -> stopService (s. subChId, FORE_GROUND);
 	 usleep (1000);
 	 soundOut	-> stop ();
 	 QString serviceName = currentService. serviceName;
@@ -1031,8 +1031,8 @@
 	serviceLabel -> setText (serviceName);
 	serviceLabel -> setAlignment(Qt::AlignLeft);
 
-	ad. procMode	= __ONLY_SOUND;
-	my_dabProcessor -> set_audioChannel (&ad, &audioBuffer);
+//	ad. procMode	= __ONLY_SOUND;
+	my_dabProcessor -> set_audioChannel (&ad, &audioBuffer, nullptr, FORE_GROUND );
 //	activate sound
 	soundOut -> restart ();
 }
@@ -1307,46 +1307,47 @@
 void	RadioInterface::start_secondService	(const QString &s) {
 audiodata ad;
 
-	my_dabProcessor	-> dataforAudioService (s, &ad);
-	if (!ad. defined)
-	 return;
-	QString saveDir		= QDir::homePath ();
-	if ((saveDir != "") && (!saveDir. endsWith ('/')))
- saveDir = saveDir + '/';
-
- QString theTime = timeDisplay -> text ();
- QString suggestedFileName =
-	 secondService. serviceName + 
-	 channelSelector -> currentText () +
- "-" + theTime;
- for (int i = 0; i < suggestedFileName. length (); i ++)
- if (!isValid (suggestedFileName. at (i)))
- suggestedFileName. replace (i, 1, '-');
-	suggestedFileName = saveDir + suggestedFileName;
- fprintf (stderr, "suggested filename %s\n",
- suggestedFileName. toUtf8 (). data ());
- QString fileName = QFileDialog::getSaveFileName (this,
- tr ("Save file ..."),
- suggestedFileName + ".aac",
- tr ("aac (*.aac)"));
- if (fileName == "")
- return;
-
-	fileName = QDir::toNativeSeparators (fileName);
-	frameDumper	= fopen (fileName. toUtf8(). data(), "w");
-
- if (frameDumper == nullptr) {
- fprintf (stderr, "Could not open file %s\n",
- fileName. toUtf8(). data());
- return;
- }
-
-	secondService. serviceName = s;
-	secondService. valid	= true;
-	secondService. subChId	= ad. subchId;
-	ad. procMode	= __ONLY_DATA;
-	frameBuffer. FlushRingBuffer ();
-	my_dabProcessor -> set_audioChannel (&ad, &audioBuffer);
+	return;
+//	my_dabProcessor	-> dataforAudioService (s, &ad);
+//	if (!ad. defined)
+//	 return;
+//	QString saveDir		= QDir::homePath ();
+//	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+// saveDir = saveDir + '/';
+//
+// QString theTime = timeDisplay -> text ();
+// QString suggestedFileName =
+//	 secondService. serviceName + 
+//	 channelSelector -> currentText () +
+// "-" + theTime;
+// for (int i = 0; i < suggestedFileName. length (); i ++)
+// if (!isValid (suggestedFileName. at (i)))
+// suggestedFileName. replace (i, 1, '-');
+//	suggestedFileName = saveDir + suggestedFileName;
+// fprintf (stderr, "suggested filename %s\n",
+// suggestedFileName. toUtf8 (). data ());
+// QString fileName = QFileDialog::getSaveFileName (this,
+// tr ("Save file ..."),
+// suggestedFileName + ".aac",
+// tr ("aac (*.aac)"));
+// if (fileName == "")
+// return;
+//
+//	fileName = QDir::toNativeSeparators (fileName);
+//	frameDumper	= fopen (fileName. toUtf8(). data(), "w");
+//
+// if (frameDumper == nullptr) {
+// fprintf (stderr, "Could not open file %s\n",
+// fileName. toUtf8(). data());
+// return;
+// }
+//
+//	secondService. serviceName = s;
+//	secondService. valid	= true;
+//	secondService. subChId	= ad. subchId;
+//	ad. procMode	= __ONLY_DATA;
+//	frameBuffer. FlushRingBuffer ();
+//	my_dabProcessor -> set_audioChannel (&ad, &audioBuffer);
 }
 
 void	RadioInterface::stop_secondService () {
@@ -1354,7 +1355,7 @@
 	 return;
 	if (!secondService. valid)
 	 return;
-	my_dabProcessor -> stopService (secondService. subChId);
+//	my_dabProcessor -> stopService (secondService. subChId);
 	secondService. valid = false;
 	fclose (frameDumper);
 	frameDumper = nullptr;

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

@@ -524,29 +524,33 @@
 	 my_mscHandler. reset_Channel ();
 }
 
-void	dabProcessor::stopService (descriptorType *d) {
+void	dabProcessor::stopService (descriptorType *d, int flag) {
 	fprintf (stderr, "function obsolete\n");
 	if (!scanMode)
-	 my_mscHandler. stopService (d -> subchId);
+	 my_mscHandler. stopService (d -> subchId, flag);
 }
 
-void	dabProcessor::stopService (int subChId) {
+void	dabProcessor::stopService (int subChId, int flag) {
 	if (!scanMode)
-	 my_mscHandler. stopService (subChId);
+	 my_mscHandler. stopService (subChId, flag);
 }
 
 bool dabProcessor::set_audioChannel (audiodata *d,
-	 RingBuffer<int16_t> *b) {
+	 RingBuffer<int16_t> *b,
+	 FILE *dump, int flag) {
 	if (!scanMode)
-	 return my_mscHandler. set_Channel (d, b, (RingBuffer<uint8_t> *)nullptr);
+	 return my_mscHandler. set_Channel (d, b,
+	 (RingBuffer<uint8_t> *)nullptr, dump, flag);
 	else
 	 return false;
 }
 
 bool dabProcessor::set_dataChannel (packetdata *d,
-	 RingBuffer<uint8_t> *b) {
+	 RingBuffer<uint8_t> *b, int flag) {
 	if (!scanMode)
-	 return my_mscHandler. set_Channel (d, (RingBuffer<int16_t> *)nullptr, b);
+	 return my_mscHandler. set_Channel (d,
+	 (RingBuffer<int16_t> *)nullptr, b,
+	 nullptr, flag);
 	else
 	 return false;
 }
@@ -580,3 +584,7 @@
 	my_ficHandler. stop_ficDump ();
 }
 
+uint32_t dabProcessor::julianDate	() {
+	return my_ficHandler. julianDate ();
+}
+

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

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

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>343</width>
- <height>518</height>
+ <height>549</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -114,6 +114,9 @@
 </item>
 <item>
 <widget class="QCheckBox" name="tii_detectorMode">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;a second implementation of the tii decoder can be selected here. The decoder &amp;quot;sees&amp;quot; more tii data, but also more erroneous data.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string> new tii detector</string>
 </property>
@@ -121,6 +124,9 @@
 </item>
 <item>
 <widget class="QCheckBox" name="closeDirect">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you are bored with the explicit request to stop, touch this one, and stopping is direct&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string> close without asking</string>
 </property>
@@ -128,6 +134,9 @@
 </item>
 <item>
 <widget class="QCheckBox" name="loggerButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sometime one wants to see what was done, the logger just dumps some data into a file, showing the selections made.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string> logger</string>
 </property>
@@ -135,13 +144,29 @@
 </item>
 <item>
 <widget class="QCheckBox" name="utcSelector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you want to see UTC in the logs select this one.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string> utc Selector</string>
 </property>
 </widget>
 </item>
 <item>
+ <widget class="QCheckBox" name="epg2xmlSelector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The EPG detector has two components, one collecting data to present as &amp;quot;time table&amp;quot; for today,&lt;/p&gt;&lt;p&gt;the other one - using a library written by Julian Cable from the BBC - to generate textual xml.&lt;/p&gt;&lt;p&gt;If selected, the xml will be generated. Note howevet that we encountered at least one example&lt;/p&gt;&lt;p&gt;here the library generating the textual xml causes a crash.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string> epg to xml</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QPushButton" name="loadTableButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching this button instructs the software to (try to) load a so-called tii table, a table with the&lt;/p&gt;&lt;p&gt;encodings of tii data.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string>load table</string>
 </property>

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

qt-dab-4.35.tar.gz/includes/backend/audio/mp2processor.h -> qt-dab-4.351.tar.gz/includes/backend/audio/mp2processor.h Changed

qt-dab-4.35.tar.gz/includes/backend/audio/mp4processor.h -> qt-dab-4.351.tar.gz/includes/backend/audio/mp4processor.h Changed

qt-dab-4.35.tar.gz/includes/backend/backend-driver.h -> qt-dab-4.351.tar.gz/includes/backend/backend-driver.h Changed

qt-dab-4.35.tar.gz/includes/backend/backend.h -> qt-dab-4.351.tar.gz/includes/backend/backend.h Changed

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

@@ -62,18 +62,19 @@
 		~epgDecoder	();
 
 int	process_epg	(uint8_t *v, int e_length,
-	                 uint32_t SId, int subType);
+	                 uint32_t SId, int subType, uint32_t theDay);
 private:
 	uint32_t        SId;
         QString         stringTable [20];
 	int		subType;
+	uint32_t	julianDate;
 	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_program		(uint8_t *v, int index, progDesc *);
+	int	process_scope		(uint8_t *v, int index, progDesc *);
 	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);
@@ -125,6 +126,7 @@
 	int	process_obsolete	(uint8_t *v, int index);
 
 	void	record			(progDesc *);
+	QString	getCData		(uint8_t *v, int index, int elength);
 signals:
 	void	set_epgData		(int, int,
 	                                 const QString &,

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

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

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

qt-dab-4.35.tar.gz/includes/output/fir-filters.h -> qt-dab-4.351.tar.gz/includes/output/fir-filters.h Changed

qt-dab-4.35.tar.gz/includes/support/content-table.h -> qt-dab-4.351.tar.gz/includes/support/content-table.h Changed

qt-dab-4.35.tar.gz/includes/support/dab-tables.h -> qt-dab-4.351.tar.gz/includes/support/dab-tables.h Changed

qt-dab-4.351.tar.gz/includes/support/text-mapper.h-xxx Changed

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

qt-dab-4.35.tar.gz/screen-4.351.png -> qt-dab-4.351.tar.gz/screen-4.351.png Changed

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

qt-dab-4.35.tar.gz/service-description/audio-descriptor.cpp -> qt-dab-4.351.tar.gz/service-description/audio-descriptor.cpp Changed

qt-dab-4.35.tar.gz/service-description/audio-descriptor.h -> qt-dab-4.351.tar.gz/service-description/audio-descriptor.h Changed

qt-dab-4.35.tar.gz/service-description/data-descriptor.h -> qt-dab-4.351.tar.gz/service-description/data-descriptor.h Changed

qt-dab-4.35.tar.gz/src/backend/audio/mp2processor.cpp -> qt-dab-4.351.tar.gz/src/backend/audio/mp2processor.cpp Changed

@@ -221,8 +221,7 @@
 
 	mp2Processor::mp2Processor (RadioInterface	*mr,
 	 int16_t		bitRate,
-	 RingBuffer<int16_t> *buffer,
-	 RingBuffer<uint8_t> *frameBuffer):
+	 RingBuffer<int16_t> *buffer):
 	 my_padhandler (mr) {
 int16_t	i, j;
 int16_t *nPtr = &N [0][0];
@@ -281,13 +280,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 int32_t	mp2Processor::mp2sampleRate	(uint8_t *frame) {
- if (!frame)
- return 0;
- if (( frame[0] != 0xFF) // no valid syncword?
- || ((frame[1] & 0xF6) != 0xF4) // no MPEG-1/2 Audio Layer II?
- || ((frame[2] - 0x10) >= 0xE0)) // invalid bitrate?
- return 0;
- return sample_rates[(((frame[1] & 0x08) >> 1) ^ 4) // MPEG-1/2 switch
+	if (!frame)
+	 return 0;
+	if (( frame[0] != 0xFF) // no valid syncword?
+	 || ((frame[1] & 0xF6) != 0xF4) // no MPEG-1/2 Audio Layer II?
+	 || ((frame[2] - 0x10) >= 0xE0)) // invalid bitrate?
+	 return 0;
+	return sample_rates[(((frame[1] & 0x08) >> 1) ^ 4) // MPEG-1/2 switch
 + ((frame[2] >> 2) & 3)]; // actual rate
 }
 
@@ -303,7 +302,6 @@
 return table_idx ? (&quantizer_table[table_idx - 1]) : nullptr;
 }
 
-
 void 	mp2Processor::read_samples (struct quantizer_spec *q,
 	 int scalefactor, int *sample) {
 int idx, adj, scale;

qt-dab-4.35.tar.gz/src/backend/audio/mp4processor.cpp -> qt-dab-4.351.tar.gz/src/backend/audio/mp4processor.cpp Changed

@@ -47,13 +47,13 @@
 	 int16_t		bitRate,
 	 RingBuffer<int16_t> *b,
 	 RingBuffer<uint8_t> *frameBuffer,
-	 uint8_t		procMode)
-	 :my_padhandler (mr),
+	 FILE		*dump):
+	 my_padhandler (mr),
 	 my_rsDecoder (8, 0435, 0, 1, 10) {
 
 	myRadioInterface	= mr;
 	this	-> frameBuffer	= frameBuffer;
-	this	-> procMode	= procMode;
+	this	-> dump		= dump;
 	connect (this, SIGNAL (show_frameErrors (int)),
 	 mr, SLOT (show_frameErrors (int)));
 	connect (this, SIGNAL (show_rsErrors (int)),
@@ -285,20 +285,22 @@
 	 aac_frame_length)) {
 //
 //	firs prepare dumping
-	 if ((procMode == __BOTH) || (procMode == __ONLY_DATA)) {
-	 std::vector<uint8_t> fileBuffer;
-	 int segmentSize =
+	 std::vector<uint8_t> fileBuffer;
+	 int segmentSize =
 	 build_aacFile (aac_frame_length,
 	 &streamParameters,
 	 &(outVector. data () [au_start [i]]),
 	 fileBuffer);
+	 if (dump == nullptr) {
 	 frameBuffer -> putDataIntoBuffer (fileBuffer. data (),
 	 segmentSize);
 	 newFrame (segmentSize);
 	 }
+	 else
+	 fwrite (fileBuffer. data (), 1, segmentSize, dump);
 
-	 if ((procMode == __BOTH) || (procMode == __ONLY_SOUND)) {
 //	first handle the pad data if any
+	 if (dump == nullptr) {
 	 if (((outVector [au_start [i + 0]] >> 5) & 07) == 4) {
 	 int16_t count = outVector [au_start [i] + 1];
 	 uint8_t buffer [count];
@@ -310,12 +312,6 @@
 //
 //	then handle the audio
 #ifdef	__WITH_FDK_AAC__
-	 std::vector<uint8_t> fileBuffer;
-	 int segmentSize =
-	 build_aacFile (aac_frame_length,
-	 &streamParameters,
-	 &(outVector. data () [au_start [i]]),
-	 fileBuffer);
 	 tmp = aacDecoder -> MP42PCM (&streamParameters, 
 	 fileBuffer. data (), 
 	 segmentSize);
@@ -332,6 +328,7 @@
 #endif
 	 emit isStereo ((streamParameters. aacChannelMode == 1) ||
 	 (streamParameters. psFlag == 1));
+
 	 if (tmp <= 0) 
 	 aacErrors ++;
 	 if (++aacFrames > 25) {
@@ -344,10 +341,10 @@
 	 else {
 	 fprintf (stderr, "CRC failure with dab+ frame %d (%d)\n",
 	 i, num_aus);
+	 }
 //
 //	what would happen if the errors were in the 10 parity bytes
 //	rather than in the 110 payload bytes?
-	 }
 	}
 	return true;
 }

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

@@ -32,13 +32,13 @@
 	 descriptorType *d,
 	 RingBuffer<int16_t> *audioBuffer,
 	 RingBuffer<uint8_t> *dataBuffer,
-	 RingBuffer<uint8_t> *frameBuffer) {
+	 RingBuffer<uint8_t> *frameBuffer,
+	 FILE *dump) {
 	if (d -> type == AUDIO_SERVICE) {
 	 if (((audiodata *)d) -> ASCTy != 077) {
 theProcessor = new mp2Processor (mr,
 	 d -> bitRate,
- audioBuffer,
-	 frameBuffer);
+ audioBuffer);
 	 }
 else
 if (((audiodata *)d) -> ASCTy == 077) {
@@ -46,14 +46,14 @@
 	 d -> bitRate,
 audioBuffer,
 	 frameBuffer,
-	 d -> procMode);
+	 dump);
 	 }
 	}
 	else
 	if (d -> type == PACKET_SERVICE)
 	 theProcessor = new dataProcessor (mr,
 	 (packetdata *)d,
-	 dataBuffer);
+	 dataBuffer);
 	else
 	 theProcessor = new frameProcessor ();	// should not happen
 }

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

@@ -34,14 +34,15 @@
 	 descriptorType	*d,
 	 RingBuffer<int16_t> *audiobuffer,
 	 RingBuffer<uint8_t> *databuffer,	
-	 RingBuffer<uint8_t> *frameBuffer):
+	 RingBuffer<uint8_t> *frameBuffer,
+	 FILE *dump, int flag):
 	 deconvolver (d),
 	 outV (d -> bitRate * 24),
 	 driver (mr, 
 	 d,
 	 audiobuffer,
 	 databuffer,
-	 frameBuffer) 
+	 frameBuffer, dump) 
 #ifdef	__THREADED_BACKEND
 	 ,freeSlots (NUMBER_SLOTS) 
 #endif 
@@ -57,6 +58,7 @@
 	this	-> shortForm		= d -> shortForm;
 	this	-> protLevel		= d -> protLevel;
 	this	-> subChId		= d -> subchId;
+	this	-> borf			= flag;
 
 //	fprintf (stderr, "starting a backend for %s (%X) %d\n",
 //	 serviceName. toUtf8 (). data (),

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

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

@@ -24,10 +24,11 @@
 #include	<stdint.h>
 #include	<stdlib.h>
 #include	"epg-decoder.h"
+#include	<QDate>
 
 #define	EPG_TAG			0X02
 #define	SERVICE_TAG		0X03
-
+#define	__EPG_TRACE__		1
 //
 	epgDecoder::epgDecoder	() {
 }
@@ -56,7 +57,7 @@
 }
 
 int	epgDecoder::process_epg	(uint8_t *v, int e_length,
-	 uint32_t SId, int subType) {
+	 uint32_t SId, int subType, uint32_t theDay) {
 int	ind	= 0;
 uint8_t	tag	= v [0];
 int length	= v [1];
@@ -64,6 +65,7 @@
 
 	this	-> SId	= SId;
 	this	-> subType	= subType;
+	this	-> julianDate	= theDay;
 	if ((v [0] != EPG_TAG) && (v [0] != SERVICE_TAG))
 	 return e_length;
 
@@ -104,6 +106,9 @@
 	 break;
 
 	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr, "in EPG tag %x missing\n", v [index]);
+#endif
 	 return endPoint;
 	 }
 	 }
@@ -138,6 +143,13 @@
 
 	 case 0x83:	// serviceProvider
 	 index	= process_440 (v, index);
+	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr, "%x unsupported tag\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -180,7 +192,10 @@
 	 break;
 
 	 default:
-	 fprintf (stderr, " in programGroups we missed %x\n", v [index]);
+#ifdef	__EPG_TRACE
+	 fprintf (stderr, "in programGroups we missed %x\n",
+	 v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
@@ -206,7 +221,6 @@
 
 	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);
@@ -256,16 +270,19 @@
 	 index	= process_483 (v, index);
 	 break;
 
-	 case 0x83:	// type
-	 index	= process_46 (v, index);
-	 break;
+//	 case 0x83:	// type
+//	 index	= process_46 (v, index);
+//	 break;
 
-	 case 0x84:	// number of items
-	 index	= process_484 (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]);
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "in programGroup we missed %x\n", v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
@@ -275,6 +292,7 @@
 
 int	epgDecoder::process_schedule (uint8_t *v, int index) {
 int length	= v [index + 1];
+progDesc p;
 
 	if (length == 0XFE) {
 	 length = (v [index + 2] << 8) | v [index + 3];
@@ -291,14 +309,13 @@
 	int endPoint	= index + length;
 
 	while (index < endPoint) {
-//	 fprintf (stderr, "in process_schedule with tag %x\n", v [index]);
 	 switch (v [index]) {
 	 case 0x1C:
-	 index	= process_program (v, index);
+	 index	= process_program (v, index, nullptr);
 	 break;
 
 	 case 0x24:	// scope
-	 index = process_scope (v, index);
+	 index = process_scope (v, index, &p);
 	 break;
 
 	 case 0x80:	// version
@@ -314,14 +331,17 @@
 	 break;
 
 	 default:
-	 fprintf (stderr, " in schedule missed %x\n", v [index]);
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr, "in schedule missed %x\n", v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
+//	record (&p);
 	return endPoint;
 }
 
-int	epgDecoder::process_program (uint8_t *v, int index) {
+int	epgDecoder::process_program (uint8_t *v, int index, progDesc *p) {
 int length	= v [index + 1];
 progDesc theElement;
 
@@ -339,9 +359,7 @@
 
 	int endPoint	= index + length;
 
-	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);
@@ -412,7 +430,9 @@
 	 break;
 
 	 default:
+#ifdef	__EPG_TRACE__
 	 fprintf (stderr, "In programme we missed %x\n", v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
@@ -420,7 +440,7 @@
 	return endPoint;
 }
 
-int	epgDecoder::process_scope (uint8_t *v, int index) {
+int	epgDecoder::process_scope (uint8_t *v, int index, progDesc *p) {
 int length	= v [index + 1];
 
 	if (length == 0XFE) {
@@ -436,7 +456,6 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
 	while (index < endPoint) {
 	 int startTime;
 	 int stopTime;
@@ -446,12 +465,18 @@
 	 break;
 
 	 case 0x80:	// start time
-	 index	= process_474 (v, index, nullptr);
+	 index	= process_474 (v, index, &p -> startTime);
 	 break;
 
 	 case 0x81:	// stop time
-	 index	= process_474 (v, index, nullptr);
+	 index	= process_474 (v, index, &p -> stopTime);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr, "%x in scope not handled\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -473,16 +498,21 @@
 	 index += 2;
 
 	int endPoint	= index + length;
+	return endPoint;
+//
+//	Untested function
 
 	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:
+#ifdef	__EPG_TRACE__
 	 fprintf (stderr, "in process_serviceScope %d\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -505,7 +535,6 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x1A:	// shortDescription
@@ -521,6 +550,10 @@
 	 break;
 
 	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr, "%x not handled in mediaDescription\n",
+	 v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
@@ -545,7 +578,6 @@
 	int endPoint	= index + length;
 
 	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);
@@ -580,7 +612,10 @@
 	 break;
 
 	 default:
-	 fprintf (stderr, "Process_ensemble: We cannot deal with %x\n", v [index]);
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "Process_ensemble: missing handle %x\n", v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
@@ -645,6 +680,13 @@
 	 case 0x80:	// version
 	 index	= process_483 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not handled in service desc\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -682,6 +724,13 @@
 	 case 0x2F:	// relativeTime
 	 process_relativeTime (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not handled in processLocation\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -703,7 +752,9 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
+	return endPoint;
+//
+//	Thius function is not tested
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x32:	// geolocation
@@ -717,6 +768,13 @@
 	 case 0x82:	// url
 	 index	= process_440 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported as bearer\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -738,7 +796,9 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
+	return endPoint;
+//
+//	Thus function is not tested
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x33:	// country
@@ -760,6 +820,13 @@
 	 case 0x81:	// ref
 	 index	= process_440 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported in geolocation\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -847,6 +914,13 @@
 	 case 0x86:	// xml:lang
 	 index	= process_481 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported in programmeEvent\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -882,6 +956,13 @@
 	 case 0x38:	// acquisitionTime
 	 index	= process_acquisitionTime (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "%x not supported in onDemand\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -905,16 +986,23 @@
 	int endPoint	= index + length;
 	if (p == nullptr)
 	 return endPoint;
-	
+
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x80:	// href
 	 index	= process_412 (v, index);
-	 break;
+	 return endPoint;
 
 	 case 0x81:	// type
 	 index	= process_46 (v, index);
-	 break;
+	 return endPoint;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported in genre\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -937,6 +1025,9 @@
 
 	int endPoint	= index + length;
 
+	return endPoint;
+//
+//	This function is not tested
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x80:	// xml:lang
@@ -944,7 +1035,10 @@
 	 break;
 
 	 default:
-//	 fprintf (stderr, "in process_keyWords with %d\n", v [index]);
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "in process_keyWords with %x\n", v [index]);
+#endif
 	 return endPoint;
 	 }
 	}
@@ -967,7 +1061,10 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
+//
+//	this function is not tested
+//
+	int t;
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x80:	// uri
@@ -987,8 +1084,16 @@
 	 break;
 
 	 case 0x84:	// expiryTime
-	 index	= process_474 (v, index, nullptr);
+	 index	= process_474 (v, index, &t);
+	 fprintf (stderr, "expiry time = %d\n", t);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported in link\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1013,15 +1118,24 @@
 	if (p == nullptr)
 	 return endPoint;
 
-	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);
+ while (index < endPoint) {
+ switch (v [index]) {
+ case 0x80:
+ index = process_481 (v, index);
+ break;
+
+	 case 0x01:
+	 p -> shortName	= getCData (v, index, length);	
+	 return endPoint;
+
+ default:
+ fprintf (stderr, "unknown in shortName %x\n", v [index]);
+ p -> shortName = "";
+ return endPoint;
+ }
+ }
+
+	p -> shortName	= "error";
 	return endPoint;
 }
 
@@ -1044,15 +1158,23 @@
 	if (p == nullptr)
 	 return endPoint;
 
-	if (v [index + 1] == 1) {
-	 p -> mediumName = stringTable [v [index + 2]]. toLatin1 (). data ();
-	 return endPoint;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:
+	 index = process_481 (v, index);
+	 break;
+
+	 case 0x01:
+	 p -> mediumName = getCData (v, index, length);
+	 return endPoint;
+
+	 default:
+	 fprintf (stderr, "unknown in medium name %x\n", v [index]);
+	 p -> mediumName = "";
+	 return endPoint;
+	 }
 	}
-	char t [255];
-	for (int i = 0; i < length; i ++)
-	 t [i] = v [index + i + 2];
-	t [length] = 0;
-	p -> mediumName = QString::fromUtf8 (t);
+	p -> mediumName = "error";
 	return endPoint;
 }
 
@@ -1075,15 +1197,23 @@
 	if (p == nullptr)
 	 return endPoint;
 
-	if (v [index + 1] == 1) {
-	 p -> longName = stringTable [v [index + 2]]. toLatin1 (). data ();
-	 return endPoint;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:
+	 index = process_481 (v, index);
+	 break;
+
+	 case 0x01:
+	 p -> longName = getCData (v, index, length);
+	 return endPoint;
+
+	 default:
+	 fprintf (stderr, "unknown in long name %x\n", v [index]);
+	 p -> longName = "";
+	 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);
+	p -> longName	= "error";
 	return endPoint;
 }
 
@@ -1108,17 +1238,23 @@
 	if (p == nullptr)
 	 return endPoint;
 
-	if (v [index + 1] == 1) {
-	 p -> shortDescription =
-	 stringTable [v [index + 2]]. toLatin1 (). data ();
-	 return endPoint;
-	}
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:
+	 index = process_481 (v, index);
+	 break;
 
-	char t [511];
-	for (int i = 0; i < length; i ++)
-	 t [i] = v [index + i + 2];
-	t [length] = 0;
-	p -> shortDescription = QString::fromUtf8 (t);
+	 case 0x01:
+	 p -> shortDescription = getCData (v, index, length);
+	 return endPoint;
+
+	 default:
+	 fprintf (stderr, "unknown in shortDescription %x\n", v [index]);
+	 p -> shortDescription = "";
+	 return endPoint;
+	 }
+	}
+	p -> shortDescription = "error";
 	return endPoint;
 }
 
@@ -1142,16 +1278,24 @@
 	if (p == nullptr)
 	 return endPoint;
 
-	if (v [index + 1] == 1) {
-	 p -> longDescription =
-	 stringTable [v [index + 2]]. toLatin1 (). data ();
-	 return endPoint;
+	while (index < endPoint) {
+	 switch (v [index]) {
+	 case 0x80:
+	 index = process_481 (v, index);
+	 break;
+
+	 case 0x01:
+	 p -> longDescription = getCData (v, index, length);
+	 return endPoint;
+
+	 default:
+	 fprintf (stderr, "unknown in long Description %x\n",
+	 v [index]);
+	 p -> longDescription = "";
+	 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);
+	p -> longDescription = "error";
 	return endPoint;
 }
 
@@ -1171,7 +1315,8 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
+//
+//	This function is not tested
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x80:	// mimevalue	
@@ -1182,7 +1327,7 @@
 	 index	= process_481 (v, index);
 	 break;
 
-	 case 0x82:	// uri
+	 case 0x82:	// url
 	 index	= process_440 (v, index);
 	 break;
 
@@ -1197,6 +1342,13 @@
 	 case 0x85:
 	 index	= process_485 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "%x not supported in multimedia\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1218,7 +1370,8 @@
 	 index += 2;
 
 	int endPoint	= index + length;
-
+//
+//	The function is untested
 	while (index < endPoint) {
 	 switch (v [index]) {
 	 case 0x80:	// fqdn
@@ -1228,6 +1381,13 @@
 	 case 0x81:	// serviceIdentifier
 	 index	= process_440 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "%x has no support in radiodns\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1266,6 +1426,13 @@
 	 case 0x83:	// actual duration
 	 index	= process_475 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported in timespec\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1305,6 +1472,13 @@
 	 case 0x83:	// actual duration
 	 index	= process_475 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "%x not supported in relative time\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1340,6 +1514,13 @@
 	 case 0x82:	// Index
 	 index	= process_482 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "%x not supported in member-of\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1375,6 +1556,13 @@
 	 case 0x82:	// duration
 	 index	= process_475 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 	 "%x not supported in presentation time\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1410,6 +1598,13 @@
 	 case 0x82:	// duration
 	 index	= process_475 (v, index);
 	 break;
+
+	 default:
+#ifdef	__EPG_TRACE__
+	 fprintf (stderr,
+	 "%x not supported in acquisition time\n", v [index]);
+#endif
+	 return endPoint;
 	 }
 	}
 	return endPoint;
@@ -1481,19 +1676,8 @@
 //
 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;
-
+//
+//	This function is incomplete and its value should be ignored
 	return index + length;
 }
 
@@ -1612,6 +1796,17 @@
 
 	if (t == nullptr)
 	 return endPoint;
+
+
+	uint32_t	date	= getBits (v, 8 * index + 1, 17);
+	if (julianDate != date) {
+//	 fprintf (stderr, "%d vs schedule date %d\n",
+//	 julianDate, date);
+	 *t = -1;
+	 return endPoint;
+	}
+//
+//	we need to know whether it is today or not
 	ltoFlag	= getBit (v, 8 * index + 19);
 	utcFlag	= getBit (v, 8 * index + 20);
 
@@ -1731,6 +1926,8 @@
 	else
 	 index += 2;
 
+	int numbers = (v [index] << 8) | v [index + 1];
+	fprintf (stderr, "Version %d\n", numbers);
 	return index + length;
 }
 
@@ -1813,11 +2010,23 @@
 }
 
 int	epgDecoder::process_token (uint8_t *v, int index) {
-uint8_t tag	= v [index];
+int	tag	= v [index];
 int	length	= v [index + 1];
-char	text [length + 1];
 
-	index += 2;
+	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;
+
+	char	text [length + 1];
 	for (int i = 0; i < length; i ++)
 	 text [i] = v [index + i];
 	text [length] = 0;
@@ -1865,14 +2074,48 @@
 void	epgDecoder::record (progDesc *theElement) {
 	if (theElement -> startTime == -1)
 	 return;
-	
+
 	if ((theElement -> mediumName == QString ("")) &&
+	 (theElement -> shortName == QString ("")) &&
 	 (theElement -> longName == QString ("")))
 	 return;
 
 	set_epgData (this -> SId, theElement -> startTime,
 	 theElement -> longName != QString ("") ?
 	 theElement -> longName:
-	 theElement -> mediumName,
+	 theElement -> mediumName != QString ("") ?
+	 theElement -> mediumName :
+	 theElement -> shortName,
 	 theElement -> shortDescription);
 }
+
+QString	epgDecoder::getCData	(uint8_t *v, int index, int eLength) {
+int length;
+	if (v [index] != 0x1)
+	 return "";
+
+	if (v [index + 1] == 1) {
+	 return stringTable [v [index + 2]];
+	}
+
+	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;
+
+	char text [length + 1];
+	for (int i = 0; i < length; i ++)
+	 text [i] = v [index + i];
+	text [length] = 0;
+	return QString::fromUtf8 (text);
+
+}
+

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

@@ -217,12 +217,12 @@
 	locker. unlock ();
 }
 
-void	mscHandler::stopService	(descriptorType *d) {
+void	mscHandler::stopService	(descriptorType *d, int flag) {
 	fprintf (stderr, "obsolete function stopService\n");
 	locker. lock ();
 	for (int i = 0; i < theBackends. size (); i ++) {
 	 Backend *b = theBackends. at (i);
-	 if (b -> subChId == d -> subchId) {
+	 if ((b -> subChId == d -> subchId) && (b -> borf == flag)) {
 	 fprintf (stderr, "stopping (sub)service at subchannel %d\n",
 	 d -> subchId);
 	 b -> stopRunning ();
@@ -233,11 +233,11 @@
 	locker. unlock ();
 }
 
-void	mscHandler::stopService	(int subchId) {
+void	mscHandler::stopService	(int subchId, int flag) {
 	locker. lock ();
 	for (int i = 0; i < theBackends. size (); i ++) {
 	 Backend *b = theBackends. at (i);
-	 if (b -> subChId == subchId) {
+	 if ((b -> subChId == subchId) && (b -> borf == flag)) {
 	 fprintf (stderr, "stopping subchannel %d\n", subchId);
 	 b -> stopRunning ();
 	 delete b;
@@ -249,24 +249,26 @@
 
 bool	mscHandler::set_Channel (descriptorType *d,
 	 RingBuffer<int16_t> *audioBuffer,
-	 RingBuffer<uint8_t> *dataBuffer) {
+	 RingBuffer<uint8_t> *dataBuffer,
+	 FILE *dump, int flag) {
 	fprintf (stderr, "going to open %s\n",
 	 d -> serviceName. toLatin1 (). data ());
-	locker. lock();
-	for (int i = 0; i < theBackends. size (); i ++) {
-	 if (d -> subchId == theBackends. at (i) -> subChId) {
-	 fprintf (stderr, "The service is already running\n");
-	 theBackends. at (i) -> stopRunning ();
-	 delete theBackends. at (i);
-	 theBackends. erase (theBackends. begin () + i);
-	 }
-	}
-	locker. unlock ();
+//	locker. lock();
+//	for (int i = 0; i < theBackends. size (); i ++) {
+//	 if (d -> subchId == theBackends. at (i) -> subChId) {
+//	 fprintf (stderr, "The service is already running\n");
+//	 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));
+	 frameBuffer,
+	 dump, flag));
 	fprintf (stderr, "we have now %d backends running\n",
 	 theBackends. size ());
 	return true;

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

@@ -32,7 +32,7 @@
 #include	"dab-config.h"
 #include	"fib-table.h"
 #include	<QStringList>
-#include	"text-mapper.h"
+//#include	"text-mapper.h"
 #include	"dab-tables.h"
 //
 //
@@ -62,6 +62,7 @@
 	nextConfig	= new dabConfig();
 	ensemble	= new ensembleDescriptor();
 	CIFcount	= 0;
+	mjd		= 0;
 }
 	
 	fibDecoder::~fibDecoder() {
@@ -70,8 +71,8 @@
 	delete	ensemble;
 }
 
-static
-uint8_t bits [] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+//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
@@ -529,6 +530,7 @@
 int16_t language;
 dabConfig	*localBase	= CN_bit == 0 ? currentConfig : nextConfig;
 
+	(void)OE_bit; (void)PD_bit;
 	if (lsFlag == 0) {	// short form
 	 if (getBits_1 (d, bitOffset + 1) == 0) {
 	 int16_t subChId	= getBits_6 (d, bitOffset + 2);
@@ -640,7 +642,8 @@
 	while (used < Length) 
 	 used = HandleFIG0Extension13 (d, used, CN_bit, OE_bit, PD_bit);
 }
-
+//
+//	section 6.3.6 User application Data
 int16_t	fibDecoder::HandleFIG0Extension13 (uint8_t *d,
 	 int16_t used,
 	 uint8_t CN_bit,
@@ -654,6 +657,7 @@
 int16_t		appType;
 dabConfig	*localBase	= CN_bit == 0 ? currentConfig : nextConfig;
 
+	(void)OE_bit;
 	bitOffset	+= pdBit == 1 ? 32 : 16;
 	SCIds		= getBits_4 (d, bitOffset);
 	NoApplications	= getBits_4 (d, bitOffset + 4);
@@ -669,11 +673,7 @@
 	 if (serviceIndex == -1)
 	 continue;
 
-//	 if (getBits (d, bitOffset + 16, 8) == 1)
-//	 fprintf (stderr, "%s has a 1\n",
-//	 ensemble -> services [serviceIndex]. serviceLabel.
-//	 toLatin1 (). data ());
-	 
+//	 fprintf (stderr, "appTYpe = %x\n", appType);
 	 int compIndex =
 	 findServiceComponent (localBase, SId, SCIds);
 	 if (compIndex != -1) {
@@ -1337,7 +1337,7 @@
 	if (!syncReached ())
 	 return;
 	Cluster *myCluster = getCluster (localBase, clusterId);
-	if (myCluster == NULL)
+	if (myCluster == nullptr)
 	 return;
 	if (myCluster -> flags != asuFlags) {
 //	 fprintf (stderr, "for cluster %d, the flags change from %x to %x\n",
@@ -1386,6 +1386,8 @@
 
 int	fibDecoder::getSubChId	(const QString &s, uint32_t dummy_SId) {
 int serviceIndex	= findService (s);
+
+	(void)dummy_SId;
 	fibLocker. lock();
 
 	int SId		= ensemble	-> services [serviceIndex]. SId;
@@ -1545,11 +1547,12 @@
 	int 	baseN		= 0;
 	QString baseS		= "";
 	bool	inserted	= false;
-	for (const auto serv : l) {
+	for (const auto &serv : l) {
 	 if (!inserted &&
 	 (order == ID_BASED ?
-	 ((baseN < n. SId) && (n. SId <= serv. SId)):
-	 ((baseS < n. name) && (n. name < serv. name)))) {
+	 ((baseN < (int) n. SId) &&
+	 ((int)n. SId <= (int) (&serv) -> SId)):
+	 ((baseS < n. name) && (n. name < (&serv) -> name)))) {
 	 k. push_back (n);
 	 inserted = true;
 	 }
@@ -1725,7 +1728,8 @@
 //	Michael Hoehn
 void fibDecoder::FIG0Extension10 (uint8_t *dd) {
 int16_t		offset = 16;
-int32_t		mjd	= getLBits (dd, offset + 1, 17);
+this	->	mjd	= getLBits (dd, offset + 1, 17);
+
 //	Modified Julian Date (recompute according to wikipedia)
 int32_t J	= mjd + 2400001;
 int32_t j	= J + 32044;
@@ -1786,6 +1790,7 @@
 	for (int i = 0; i < 64; i ++) {
 if (ensemble -> services [i]. inUse &&
 ensemble -> services [i]. SId == SId) {
+	 
 	 service *S = &(ensemble -> services [i]);
 	 for (uint16_t j = 0; j < S -> epgData. size (); j ++) {
 	 if (S -> epgData. at (j). theTime == theTime) {
@@ -1891,6 +1896,8 @@
 	 if (currentConfig -> serviceComps [i]. inUse) {
 	 if (currentConfig -> serviceComps [i]. TMid != 3) // packet
 	 continue;
+	 if (subChannelOf (i) == "")
+	 continue;
 	 if (!hasContents) {
 	 out << "\n\n";
 	 out << packetHeader ();
@@ -1916,7 +1923,10 @@
 }
 
 QString	fibDecoder::subChannelOf 	(int index) {
-	return QString::number (currentConfig -> serviceComps [index]. subchannelId);
+int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
+	if (subChannel < 0)
+	 return "";
+	return QString::number (subChannel);
 }
 
 QString	fibDecoder::startAddressOf 	(int index) {
@@ -1959,18 +1969,20 @@
 QString	fibDecoder::languageOf 		(int index) {
 int subChannel	= currentConfig -> serviceComps [index]. subchannelId;
 int language	= currentConfig -> subChannels [subChannel]. language;
-textMapper theMapper;
+//textMapper theMapper;
 
-	return theMapper. get_programm_language_string (language);
+	return getLanguage (language);
+//	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;
+//textMapper theMapper;
 
-	return theMapper. get_programm_type_string (programType);
+	return getProgramType (programType);
+//	return theMapper. get_programm_type_string (programType);
 }
 
 QString	fibDecoder::fmFreqOf		(int index) {
@@ -2081,3 +2093,7 @@
 	return l1. size () >= l2. size () ? l1. size () -1 : l2. size () - 1;
 }
 
+uint32_t	fibDecoder::julianDate	() {
+	return mjd;
+}
+

qt-dab-4.35.tar.gz/src/output/fir-filters.cpp -> qt-dab-4.351.tar.gz/src/output/fir-filters.cpp Changed

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

qt-dab-4.35.tar.gz/src/support/content-table.cpp -> qt-dab-4.351.tar.gz/src/support/content-table.cpp Changed

qt-dab-4.35.tar.gz/src/support/dab-tables.cpp -> qt-dab-4.351.tar.gz/src/support/dab-tables.cpp Changed

@@ -478,7 +478,9 @@
 }
 
 //	from Table 12
-const char *getProgramType_Not_NorthAmerica (int16_t programType) {
+//
+//const char *getProgramType_Not_NorthAmerica (int16_t programType) {
+const char *getProgramType (int16_t programType) {
 
 	switch (programType) {
 	   case 0:     return "No programme type";
@@ -556,52 +558,52 @@
 	}
 }
 
-const char *getProgramType (bool gotInterTabId,
-	                    uint8_t interTabId, int16_t programType) {
-	if (gotInterTabId &&  (interTabId == 1))
-	   return getProgramType_Not_NorthAmerica (programType);
-	else
-	if (gotInterTabId && (interTabId == 2))
-	   return getProgramType_For_NorthAmerica (programType);
-	else {
-	   switch (programType) {
-	      case 0:     return "unknown programme type 0";
-	      case 1:     return "unknown programme type 1";
-	      case 2:     return "unknown programme type 2";
-	      case 3:     return "unknown programme type 3";
-	      case 4:     return "unknown programme type 4";
-	      case 5:     return "unknown programme type 5";
-	      case 6:     return "unknown programme type 6";
-	      case 7:     return "unknown programme type 7";
-	      case 8:     return "unknown programme type 8";
-	      case 9:     return "unknown programme type 9";
-	      case 10:    return "unknown programme type 10";
-	      case 11:    return "unknown programme type 11";
-	      case 12:    return "unknown programme type 12";
-	      case 13:    return "unknown programme type 13";
-	      case 14:    return "unknown programme type 14";
-	      case 15:    return "unknown programme type 15";
-	      case 16:    return "unknown programme type 16";
-	      case 17:    return "unknown programme type 17";
-	      case 18:    return "unknown programme type 18";
-	      case 19:    return "unknown programme type 19";
-	      case 20:    return "unknown programme type 20";
-	      case 21:    return "unknown programme type 21";
-	      case 22:    return "unknown programme type 22";
-	      case 23:    return "unknown programme type 23";
-	      case 24:    return "unknown programme type 24";
-	      case 25:    return "unknown programme type 25";
-	      case 26:    return "unknown programme type 26";
-	      case 27:    return "unknown programme type 27";
-	      case 28:    return "unknown programme type 28";
-	      case 29:    return "unknown programme type 29";
-	      case 30:    return "unknown programme type 30";
-	      case 31:    return "unknown programme type 31";
-	      default:    return "unknown programme type";
-	   }
-	}
-	return "unknown programme type";
-}
+//const char *getProgramType (bool gotInterTabId,
+//	                    uint8_t interTabId, int16_t programType) {
+//	if (gotInterTabId &&  (interTabId == 1))
+//	   return getProgramType_Not_NorthAmerica (programType);
+//	else
+//	if (gotInterTabId && (interTabId == 2))
+//	   return getProgramType_For_NorthAmerica (programType);
+//	else {
+//	   switch (programType) {
+//	      case 0:     return "unknown programme type 0";
+//	      case 1:     return "unknown programme type 1";
+//	      case 2:     return "unknown programme type 2";
+//	      case 3:     return "unknown programme type 3";
+//	      case 4:     return "unknown programme type 4";
+//	      case 5:     return "unknown programme type 5";
+//	      case 6:     return "unknown programme type 6";
+//	      case 7:     return "unknown programme type 7";
+//	      case 8:     return "unknown programme type 8";
+//	      case 9:     return "unknown programme type 9";
+//	      case 10:    return "unknown programme type 10";
+//	      case 11:    return "unknown programme type 11";
+//	      case 12:    return "unknown programme type 12";
+//	      case 13:    return "unknown programme type 13";
+//	      case 14:    return "unknown programme type 14";
+//	      case 15:    return "unknown programme type 15";
+//	      case 16:    return "unknown programme type 16";
+//	      case 17:    return "unknown programme type 17";
+//	      case 18:    return "unknown programme type 18";
+//	      case 19:    return "unknown programme type 19";
+//	      case 20:    return "unknown programme type 20";
+//	      case 21:    return "unknown programme type 21";
+//	      case 22:    return "unknown programme type 22";
+//	      case 23:    return "unknown programme type 23";
+//	      case 24:    return "unknown programme type 24";
+//	      case 25:    return "unknown programme type 25";
+//	      case 26:    return "unknown programme type 26";
+//	      case 27:    return "unknown programme type 27";
+//	      case 28:    return "unknown programme type 28";
+//	      case 29:    return "unknown programme type 29";
+//	      case 30:    return "unknown programme type 30";
+//	      case 31:    return "unknown programme type 31";
+//	      default:    return "unknown programme type";
+//	   }
+//	}
+//	return "unknown programme type";
+//}
 
 //	11-bit from HandleFIG0Extension13, see ETSI TS 101 756 table 16
 const char *getUserApplicationType (int16_t appType) {

qt-dab-4.351.tar.gz/src/support/text-mapper.cpp-xxx Changed

qt-dab-4.35.tar.gz/src/support/tii-codes/tii-codes.cpp -> qt-dab-4.351.tar.gz/src/support/tii-codes/tii-codes.cpp Changed

@@ -42,9 +42,6 @@
 #define	LONGITUDE	8
 #define	NR_COLUMNS	10
 
-#ifdef __LOAD_TABLES__
-#include <curl/curl.h>
-#endif
 		tiiHandler::tiiHandler	() {
 }
 		tiiHandler::~tiiHandler	() {
@@ -52,25 +49,53 @@
 
 //
 bool	tiiHandler::tiiFile	(const QString &s) {
-	(void)s;
-	return false;
+bool	res = false;
+	if (s == "") {
+	 return false;
+	}
+	blackList. resize (0);
+	cache. resize (0);
+	FILE	*f	= fopen (s. toUtf8 (). data (), "r+b");
+	if (f != nullptr) {
+	 fprintf (stderr, "tiiFile is %s\n", s. toUtf8 (). data ());
+	 res = true;
+	 readFile (f);
+	 fclose (f);
+	}
+	return res;
 }
 	
 	QString tiiHandler::
 	 get_transmitterName (const QString &channel,
 	 uint16_t Eid,
 uint8_t mainId, uint8_t subId) {
-	(void)channel;
-	(void)Eid; (void)mainId; (void)subId;
+//	fprintf (stderr, "looking for %s %X %d %d\n",
+//	 channel. toLatin1 (). data (),
+//	 Eid, mainId, subId);
+	for (int i = 0; i < (int)(cache. size ()); i ++) {
+	 if (((channel == "any") || (channel == cache [i]. channel)) &&
+	 (cache [i]. Eid == Eid) && (cache [i]. mainId == mainId) &&
+	 (cache [i]. subId == subId)) {
+	 return cache [i]. transmitterName;
+	 }
+	}
 	return "";
 }
 
 void	tiiHandler::get_coordinates (float *latitude, float * longitude,
 	 const QString &channel,
 	 const QString &transmitter) {
-	(void)channel; (void)transmitter;
-	*latitude	= 0;
-	*longitude	= 0;
+
+	for (int i = 0; i < (int)(cache. size ()); i++) {
+ if (((channel == "any") || (channel == cache [i]. channel)) &&
+ (cache [i]. transmitterName == transmitter)) {
+ *latitude = cache [i]. latitude;
+ *longitude = cache [i]. longitude;
+ return;
+ }
+ }
+ *latitude = 0;
+ *longitude = 0;
 }
 
 float	tiiHandler::convert (const QString &s) {
@@ -110,8 +135,26 @@
 }
 
 int	tiiHandler::readColumns (std::vector<QString> &v, char *b, int N) {
-	(void)v; (void)b; (void)N;
-	return 0;
+int charp	= 0;
+char	tb [256];
+int elementCount = 0;
+QString element;
+	v. resize (0);
+	while ((*b != 0) && (*b != '\n')) {
+	 if (*b == SEPARATOR) {
+	 tb [charp] = 0;
+	 QString ss = QString::fromUtf8 (tb);
+	 v. push_back (ss);
+	 charp = 0;
+	 elementCount ++;
+	 if (elementCount >= N)
+	 return N;
+	 }
+	 else
+	 tb [charp ++] = *b;
+	 b ++;
+	}
+	return elementCount;
 }
 
 //
@@ -119,22 +162,65 @@
 //	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::distance_2 (float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+double	R	= 6371;
+double	Phi1	= latitude1 * M_PI / 180;
+double	Phi2	= latitude2 * M_PI / 180;
+double	dPhi	= (latitude2 - latitude1) * M_PI / 180;
+double	dDelta	= (longitude2 - longitude1) * M_PI / 180;
 
-int	tiiHandler::corner (float latitude, float longitude,
-	 float homeLatitude, float homeLongitude) {
-	(void)latitude; (void)longitude;
-	(void)homeLatitude; (void)homeLongitude;
-	return 0;
+	if ((latitude2 == 0) || (longitude2 == 0))
+	 return -32768;
+//double	a	= sin (dPhi / 2) * sin (dPhi / 2) + cos (Phi1) * cos (Phi2) *
+//	 sin (dDelta / 2) * sin (dDelta / 2);
+//double	c	= 2 * atan2 (sqrt (a), sqrt (1 - a));
+
+double 	x	= dDelta * cos ((Phi1 + Phi2) / 2);
+double	y	= (Phi2 - Phi1);
+double	d	= sqrt (x * x + y * y);
+//
+//	return (int)(R * c + 0.5);
+	return (int)(R * d + 0.5);
 }
 
-void	tiiHandler::readFile (FILE *f) {
-	(void)f;
+int	tiiHandler::distance (float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+bool	dy_sign	= latitude1 > latitude2;
+double	dx;
+double dy	= distance_2 (latitude1, longitude2,	
+	 latitude2, longitude2);
+	if (dy_sign)		// lat1 is "higher" than lat2
+	 dx = distance_2 (latitude1, longitude1,
+	 latitude1, longitude2);
+	else
+	 dx = distance_2 (latitude2, longitude1,
+	 latitude2, longitude2);
+	return sqrt (dx * dx + dy * dy);
+}
+	
+int	tiiHandler::corner (float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+bool dx_sign	= longitude1 - longitude2 > 0;
+bool dy_sign	= latitude1 - latitude2 > 0;
+double dx;
+double dy	= distance (latitude1, longitude2,	
+	 latitude2, longitude2);
+	if (dy_sign)		// lat1 is "higher" than lat2
+	 dx = distance (latitude1, longitude1,
+	 latitude1, longitude2);
+	else
+	 dx = distance (latitude2, longitude1,
+	 latitude2, longitude2);
+float azimuth = atan2 (dy, dx);
+	 
+	if (dx_sign && dy_sign)		// eerste kwadrant
+	 return (int)((M_PI / 2 - azimuth) / M_PI * 180);
+	if (dx_sign && !dy_sign)	// tweede kwadrant
+	 return (int)((M_PI / 2 + azimuth) / M_PI * 180);
+	if (!dx_sign && !dy_sign)	// derde kwadrant
+	 return (int)((3 * M_PI / 2 - azimuth) / M_PI * 180);
+	return (int)((3 * M_PI / 2 + azimuth) / M_PI * 180);
 }
 
 void	tiiHandler::set_black (uint16_t Eid, uint8_t mainId, uint8_t subId) {
@@ -155,30 +241,58 @@
 	return false;
 }
 
-char	*tiiHandler::eread (char * buffer, int amount, FILE *f) {
-	(void)buffer; (void)amount; (void)f;
-	return buffer;
-}
+void	tiiHandler::readFile (FILE *f) {
+int	count = 0; 
+char	buffer [1024];
+std::vector<QString> columnVector;
 
-QString	tiiHandler::entry (const char *s) {
-	(void)s;
-	return QString ("");
+	this	-> shift	= fgetc (f);
+	while (eread (buffer, 1024, f) != nullptr) {
+	 cacheElement ed;
+	 if (feof (f))
+	 break;
+	 columnVector. resize (0);
+	 int columns = readColumns (columnVector, buffer, NR_COLUMNS);
+	 if (columns < NR_COLUMNS)
+	 continue;
+	 ed. country		= columnVector [COUNTRY]. trimmed ();
+	 ed. Eid		= get_Eid (columnVector [EID]);
+	 ed. mainId		= get_mainId (columnVector [TII]);
+	 ed. subId		= get_subId (columnVector [TII]);
+	 ed. channel		= columnVector [CHANNEL]. trimmed ();
+	 ed. ensemble 	= columnVector [LABEL]. trimmed ();
+	 ed. transmitterName	= columnVector [LOCATION];
+	 ed. latitude		= convert (columnVector [LATITUDE]);
+	 ed. longitude	= convert (columnVector [LONGITUDE]);
+	 if (count >= cache. size ())
+	 cache. resize (cache. size () + 500);
+	 cache. at (count) = ed;
+	 count ++;
+	}
+	cache. resize (count);
 }
-
-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;
+bool	tiiHandler::valid	() {
+	return false;;
 }
 
-void	tiiHandler::loadTable (const QString &tf) {
-	(void)tf;
-	QMessageBox::warning (nullptr, "Warning",
- "Not supported in this version");
+void	tiiHandler::loadTable	(const QString &s) {
+	(void)s;
 }
 
-bool	tiiHandler::valid	() {
-	return false;;
+char *tiiHandler::eread (char * buffer, int amount, FILE *f) {
+char *bufferP;
+ if (fgets (buffer, amount, f) == nullptr)
+ return nullptr;
+ bufferP = buffer;
+ while (*bufferP != 0) {
+ if (shift != 0xAA)
+ *bufferP -= shift;
+ else
+ *bufferP ^= 0xAA;
+ bufferP ++;
+ }
+ *bufferP = 0;
+ return buffer;
 }
 
+

qt-dab-4.35.tar.gz/src/support/tii-codes/tii-codes.h -> qt-dab-4.351.tar.gz/src/support/tii-codes/tii-codes.h Changed

qt-dab-4.35.tar.gz/src/support/tii-library/tii-codes.cpp -> qt-dab-4.351.tar.gz/src/support/tii-library/tii-codes.cpp Changed

@@ -19,8 +19,27 @@
 * 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>
+#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 __MINGW32__
 #define GETPROCADDRESS GetProcAddress
@@ -32,6 +51,9 @@
 	Handle		= dlopen ("libtii-lib.so", RTLD_NOW | RTLD_GLOBAL);
 	fprintf (stderr, "%s\n", dlerror ());
 	if (Handle == nullptr)
+	 Handle	= dlopen ("/usr/local/lib/libtii-lib.so",
+	 RTLD_NOW | RTLD_GLOBAL);
+	if (Handle == nullptr)
 	 Handle	= dlopen ("/usr/local/lib/tii-lib.so",
 	 RTLD_NOW | RTLD_GLOBAL);
 	fprintf (stderr, "%s\n", dlerror ());
@@ -40,14 +62,7 @@
 //	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;
+	loadTable_L	= nullptr;
 	loadFunctions	();
 	if (init_tii_L != nullptr)
 	 handler	= init_tii_L ();
@@ -61,72 +76,240 @@
 }
 
 bool	tiiHandler::tiiFile (const QString &s) {
-	if (tiiFileL != nullptr)
-	 return tiiFileL (handler, s. toStdString ());
-	return false;
+bool	res = false;
+	if (s == "") {
+	 return false;
+	}
+	blackList. resize (0);
+	cache. resize (0);
+	FILE	*f	= fopen (s. toUtf8 (). data (), "r+b");
+	if (f != nullptr) {
+	 fprintf (stderr, "tiiFile is %s\n", s. toUtf8 (). data ());
+	 res = true;
+	 readFile (f);
+	 fclose (f);
+	}
+	return res;
 }
 
 QString	tiiHandler::get_transmitterName (const QString & channel,
 	 uint16_t Eid,
 	 uint8_t mainId, uint8_t subId) {
-std::string res;
+//	fprintf (stderr, "looking for %s %X %d %d\n",
+//	 channel. toLatin1 (). data (),
+//	 Eid, mainId, subId);
+	for (int i = 0; i < (int)(cache. size ()); i ++) {
+	 if (((channel == "any") || (channel == cache [i]. channel)) &&
+	 (cache [i]. Eid == Eid) && (cache [i]. mainId == mainId) &&
+	 (cache [i]. subId == subId)) {
+	 return cache [i]. transmitterName;
+	 }
+	}
+	return "";
+}
 
-	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;
+void tiiHandler::get_coordinates (float *latitude, float * longitude,
+	 const QString &channel,
+	 const QString &transmitter) {
+	for (int i = 0; i < (int)(cache. size ()); i++) {
+	 if (((channel == "any") || (channel == cache [i]. channel)) &&
+	 (cache [i]. transmitterName == transmitter)) {
+	 *latitude = cache [i]. latitude;
+	 *longitude = cache [i]. longitude;
+	 return;
+	 }
 	}
+	*latitude = 0;
+	*longitude = 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_2 (float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+double	R	= 6371;
+double	Phi1	= latitude1 * M_PI / 180;
+double	Phi2	= latitude2 * M_PI / 180;
+double	dPhi	= (latitude2 - latitude1) * M_PI / 180;
+double	dDelta	= (longitude2 - longitude1) * M_PI / 180;
 
-int	tiiHandler::distance		(float latitude1, float longitude1,
-	 float latitude2, float longitude2) {
-	if (distanceL != nullptr)
-	 return distanceL (handler, latitude1, longitude1,
-	 latitude2, longitude2);
-	else
-	 return 0;
+	if ((latitude2 == 0) || (longitude2 == 0))
+	 return -32768;
+//double	a	= sin (dPhi / 2) * sin (dPhi / 2) + cos (Phi1) * cos (Phi2) *
+//	 sin (dDelta / 2) * sin (dDelta / 2);
+//double	c	= 2 * atan2 (sqrt (a), sqrt (1 - a));
+
+double 	x	= dDelta * cos ((Phi1 + Phi2) / 2);
+double	y	= (Phi2 - Phi1);
+double	d	= sqrt (x * x + y * y);
+//
+//	return (int)(R * c + 0.5);
+	return (int)(R * d + 0.5);
 }
 
-int	tiiHandler::corner		(float latitude1, float longitude1,
-	 float latitude2, float longitude2) {
-	if (cornerL != nullptr)
-	 return cornerL (handler, latitude1, longitude1,
-	 latitude2, longitude2);
+int	tiiHandler::distance (float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+bool	dy_sign	= latitude1 > latitude2;
+double	dx;
+double dy	= distance_2 (latitude1, longitude2,	
+	 latitude2, longitude2);
+	if (dy_sign)		// lat1 is "higher" than lat2
+	 dx = distance_2 (latitude1, longitude1,
+	 latitude1, longitude2);
+	else
+	 dx = distance_2 (latitude2, longitude1,
+	 latitude2, longitude2);
+	return sqrt (dx * dx + dy * dy);
+}
+	
+int	tiiHandler::corner (float latitude1, float longitude1,
+	 float latitude2, float longitude2) {
+bool dx_sign	= longitude1 - longitude2 > 0;
+bool dy_sign	= latitude1 - latitude2 > 0;
+double dx;
+double dy	= distance (latitude1, longitude2,	
+	 latitude2, longitude2);
+	if (dy_sign)		// lat1 is "higher" than lat2
+	 dx = distance (latitude1, longitude1,
+	 latitude1, longitude2);
 	else
-	 return 0;
+	 dx = distance (latitude2, longitude1,
+	 latitude2, longitude2);
+float azimuth = atan2 (dy, dx);
+	 
+	if (dx_sign && dy_sign)		// eerste kwadrant
+	 return (int)((M_PI / 2 - azimuth) / M_PI * 180);
+	if (dx_sign && !dy_sign)	// tweede kwadrant
+	 return (int)((M_PI / 2 + azimuth) / M_PI * 180);
+	if (!dx_sign && !dy_sign)	// derde kwadrant
+	 return (int)((3 * M_PI / 2 - azimuth) / M_PI * 180);
+	return (int)((3 * M_PI / 2 + azimuth) / M_PI * 180);
 }
 
 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;
+	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;
 }
 
 void	tiiHandler::set_black		(uint16_t Eid,
 	 uint8_t mainId, uint8_t subId) {
-	if (set_blackL != nullptr) 
-	 set_blackL (handler, Eid, mainId, subId);
+black element;
+	element. Eid = Eid;
+	element. mainId = mainId;
+	element. subId = subId;
+	blackList. push_back (element);
 }
 
-void	tiiHandler::loadTable		(const QString &tf) {
-	if (loadTableL != nullptr)
-	 loadTableL (handler, tf. toStdString ());
+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;
+}
+void	tiiHandler::readFile (FILE *f) {
+int	count = 0; 
+char	buffer [1024];
+std::vector<QString> columnVector;
+
+	this	-> shift	= fgetc (f);
+	while (eread (buffer, 1024, f) != nullptr) {
+	 cacheElement ed;
+	 if (feof (f))
+	 break;
+	 columnVector. resize (0);
+	 int columns = readColumns (columnVector, buffer, NR_COLUMNS);
+	 if (columns < NR_COLUMNS)
+	 continue;
+	 ed. country		= columnVector [COUNTRY]. trimmed ();
+	 ed. Eid		= get_Eid (columnVector [EID]);
+	 ed. mainId		= get_mainId (columnVector [TII]);
+	 ed. subId		= get_subId (columnVector [TII]);
+	 ed. channel		= columnVector [CHANNEL]. trimmed ();
+	 ed. ensemble 	= columnVector [LABEL]. trimmed ();
+	 ed. transmitterName	= columnVector [LOCATION];
+	 ed. latitude		= convert (columnVector [LATITUDE]);
+	 ed. longitude	= convert (columnVector [LONGITUDE]);
+	 if (count >= cache. size ())
+	 cache. resize (cache. size () + 500);
+	 cache. at (count) = ed;
+	 count ++;
+	}
+	cache. resize (count);
+}
+
+int	tiiHandler::readColumns (std::vector<QString> &v, char *b, int N) {
+int charp	= 0;
+char	tb [256];
+int elementCount = 0;
+QString element;
+	v. resize (0);
+	while ((*b != 0) && (*b != '\n')) {
+	 if (*b == SEPARATOR) {
+	 tb [charp] = 0;
+	 QString ss = QString::fromUtf8 (tb);
+	 v. push_back (ss);
+	 charp = 0;
+	 elementCount ++;
+	 if (elementCount >= N)
+	 return N;
+	 }
+	 else
+	 tb [charp ++] = *b;
+	 b ++;
+	}
+	return elementCount;
+}
+
+char *tiiHandler::eread (char * buffer, int amount, FILE *f) {
+char *bufferP;
+	if (fgets (buffer, amount, f) == nullptr)
+	 return nullptr;
+	bufferP = buffer;
+	while (*bufferP != 0) {
+	 if (shift != 0xAA)
+	 *bufferP -= shift;
+	 else
+	 *bufferP ^= 0xAA;
+	 bufferP ++;
+	}
+	*bufferP = 0;
+	return buffer;
 }
 
 bool	tiiHandler::valid		() {
@@ -135,42 +318,22 @@
 
 bool	tiiHandler::loadFunctions	() {
 	init_tii_L	= (init_tii_P)
- GETPROCADDRESS (this -> Handle,
- "init_tii_L");
+	 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");
+	 GETPROCADDRESS (this -> Handle,
+	 "close_tii_L");
+	loadTable_L	= (loadTable_P)
+	 GETPROCADDRESS (this -> Handle,
+	 "loadTableL");
 	return true;
 }
 
+void	tiiHandler::loadTable		(const QString &tf) {
+	if (loadTable_L != nullptr)
+	 loadTable_L (handler, tf. toStdString ());
+}
+

qt-dab-4.35.tar.gz/src/support/tii-library/tii-codes.h -> qt-dab-4.351.tar.gz/src/support/tii-library/tii-codes.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2017
+ * Copyright (C) 2014 .. 2022
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -27,19 +27,28 @@
 #include	"dlfcn.h"
 typedef	void	*HINSTANCE;
 
+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;
+
 //	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);
+typedef void	(*loadTable_P)	(void *, const std::string &);
 
 class	tiiHandler {
 public:
@@ -49,27 +58,34 @@
 	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 distance_2	(float, float, float, float);
+ 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;
+
 	void	*handler;
 
+	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;
+
 	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;
+	loadTable_P	loadTable_L;
 };
 #endif

qt-dab-4.35.tar.gz/testband -> qt-dab-4.351.tar.gz/testband Changed

Build Results
RPM Lint

Refresh

Comments for request 5550 0

Request History

wkazubski created request about 2 years ago

Update to 4.3.5.1 (4.351)

wkazubski accepted request about 2 years ago