Packman Build Service PMBS

qt-dab.changes Changed

qt-dab.spec Changed

qt-dab-no-return.patch Deleted

_service Changed

_service:download_url:qt-dab-3.21.tar.gz/qt-dab-3.0-a.png Deleted

_service:download_url:qt-dab-3.21.tar.gz/qt-dab-3.0-c.png Deleted

_service:download_url:qt-dab-3.21.tar.gz/qt-dab-3.0-d.png Deleted

_service:download_url:qt-dab-3.21.tar.gz/qt-dab-scanresult.png Deleted

_service:download_url:qt-dab-3.21.tar.gz/scanner-table.cpp Deleted

@@ -1,125 +0,0 @@
-#
-/*
- *    Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB 
- *
- *    Qt-DAB is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    Qt-DAB is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include        <QDataStream>
-#include	"scanner-table.h"
-#include        "radio.h"
-
-	scannerTable::scannerTable (RadioInterface *) {
-	myWidget        = new QScrollArea (NULL);
-        myWidget        -> resize (200, 200);
-        myWidget        -> setWidgetResizable(true);
-	
-        outputWidget     = new QTableWidget (0, 5);
-	outputWidget	-> setColumnWidth (0, 150);
-	outputWidget	-> setColumnWidth (4, 150);
-        myWidget        -> setWidget (outputWidget);
-        outputWidget     -> setHorizontalHeaderLabels (
-	                          QStringList () << tr ("scan result"));
-}
-
-	scannerTable::~scannerTable () {
-int16_t i;
-int16_t rows    = outputWidget -> rowCount ();
-
-        for (i = rows; i > 0; i --)
-           outputWidget -> removeRow (i);
-        delete  outputWidget;
-        delete  myWidget;
-}
-
-void	scannerTable::clear	() {
-int	rows	= outputWidget -> rowCount ();
-	for (int i = rows; i > 0; i ++) 
-	   outputWidget -> removeRow (i);
-}
-
-void	scannerTable::show	() {
-	myWidget	-> show ();
-}
-
-void	scannerTable::hide	() {
-	myWidget	-> hide ();
-}
-
-int16_t	scannerTable::addRow () {
-int16_t row     = outputWidget -> rowCount ();
-
-        outputWidget     -> insertRow (row);
-        QTableWidgetItem *item0 = new QTableWidgetItem;
-        item0           -> setTextAlignment (Qt::AlignLeft |Qt::AlignVCenter);
-        outputWidget     -> setItem (row, 0, item0);
-
-        QTableWidgetItem *item1 = new QTableWidgetItem;
-        item1           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-        outputWidget     -> setItem (row, 1, item1);
-
-        QTableWidgetItem *item2 = new QTableWidgetItem;
-        item2           -> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
-        outputWidget    -> setItem (row, 2, item2);
-
-        QTableWidgetItem *item3 = new QTableWidgetItem;
-        item3           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-        outputWidget    -> setItem (row, 3, item3);
-
-        QTableWidgetItem *item4 = new QTableWidgetItem;
-        item4           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-        outputWidget    -> setItem (row, 4, item4);
-	return row;
-}
-
-void	scannerTable::newEnsemble	(QString currentChannel,
-	                                 QString ensembleName,
-	                                 QString freq,
-	                                 QString snr,
-	                                 QString transmitters) {
-int16_t row	= addRow ();
-
-	outputWidget	-> item (row, 0) -> setText (currentChannel);
-	outputWidget	-> item (row, 1) -> setText (ensembleName);
-	outputWidget	-> item (row, 2) -> setText (freq);
-	outputWidget	-> item (row, 3) -> setText (snr);
-	outputWidget	-> item (row, 4) -> setText (transmitters);
-
-	row	= addRow ();
-	outputWidget	-> item (row, 0) -> setText ("serviceName");
-	outputWidget	-> item (row, 1) -> setText ("type ");
-	outputWidget	-> item (row, 2) -> setText ("bit rate");
-	outputWidget	-> item (row, 3) -> setText ("protection level");
-	outputWidget	-> item (row, 4) -> setText ("code rate");
-}
-
-void	scannerTable::add_to_Ensemble	(QString serviceName,
-	                                 QString dabType,
-	                                 QString bitRate,
-	                                 QString protLevel,
-	                                 QString codeRate) {
-int16_t	row = addRow ();
-
-	outputWidget	-> item (row, 0) -> setText (serviceName);
-	outputWidget	-> item (row, 1) -> setText (dabType);
-	outputWidget	-> item (row, 2) -> setText (bitRate);
-	outputWidget	-> item (row, 3) -> setText (protLevel);
-	outputWidget	-> item (row, 4) -> setText (codeRate);
-}
-
-

_service:download_url:qt-dab-3.21.tar.gz/scanner-table.h Deleted

@@ -1,54 +0,0 @@
-#
-/*
- *    Copyright (C) 2019
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
- *
- *    This file is part of Qt-DAB
- *
- *    Qt-DAB is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    Qt-DAB is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with dab-scanner; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef	__SCANNER_TABLE__
-#define	__SCANNER_TABLE__
-
-#include	<QWidget>
-#include	<QObject>
-#include	<QScrollArea>
-#include	<QTableWidget>
-#include	<QStringList>
-#include	<QTableWidgetItem>
-#include	<QObject>
-#include	<QString>
-
-class	RadioInterface;
-
-class	scannerTable: QObject {
-Q_OBJECT
-public:
-		scannerTable	(RadioInterface *);
-		~scannerTable	();
-	void	show		();
-	void	hide		();
-	void	newEnsemble	(QString, QString, QString, QString, QString);
-	void	add_to_Ensemble	(QString, QString, QString, QString, QString);
-	void	clear		();
-private:
-	QScrollArea	*myWidget;
-	QTableWidget	*outputWidget;
-	int16_t		addRow	();
-};
-
-#endif
-

_service:download_url:qt-dab-3.21.tar.gz/src/backend/data/virtual-datahandler.cpp Deleted

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

_service:download_url:qt-dab-3.21.tar.gz/src/backend/frame-processor.cpp Deleted

@@ -1,35 +0,0 @@
-#
-/*
- *    Copyright (C) 2014 .. 2017
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB.
- *    Qt-DAB is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    Qt-DAB is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#include	"frame-processor.h"
-
-	frameProcessor::frameProcessor() {
-}
-
-	frameProcessor::~frameProcessor() {
-}
-
-void	frameProcessor::addtoFrame	(std::vector<uint8_t> v) {
-	(void)v;
-	fprintf (stderr, "foute boel");
-}
-

_service:download_url:qt-dab-3.21.tar.gz/.travis.yml -> _service:download_url:qt-dab-3.3.tar.gz/.travis.yml Changed

_service:download_url:qt-dab-3.21.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-3.3.tar.gz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-3.21-Beta)
+set (objectName qt-dab-3.3)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -203,7 +203,6 @@
 
 	set (${objectName}_HDRS
 	     ./dab-processor.h
-	     ./scanner-table.h
 	     ./service-description/service-descriptor.h 
 	     ./service-description/audio-descriptor.h 
 	     ./service-description/data-descriptor.h 
@@ -215,6 +214,8 @@
 	     ./includes/ofdm/phasetable.h
 	     ./includes/ofdm/freq-interleaver.h
 	     ./includes/ofdm/fib-decoder.h
+	     ./includes/ofdm/dab-config.h
+	     ./includes/ofdm/fib-table.h
 	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/timesyncer.h
@@ -282,6 +283,7 @@
 	     ./includes/support/verysmallpushbutton.h
 	     ./includes/support/smallcombobox.h
 	     ./includes/support/history-handler.h
+	     ./includes/support/scanner-table.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./correlation-viewer/correlation-viewer.h 
@@ -292,7 +294,6 @@
 	     ${${objectName}_SRCS}
 	     ./main.cpp
 	     ./dab-processor.cpp
-	     ./scanner-table.cpp
 	     ./service-description/audio-descriptor.cpp
 	     ./service-description/data-descriptor.cpp
              ./src/ofdm/sample-reader.cpp
@@ -309,7 +310,6 @@
 	     ./src/protection/eep-protection.cpp
 	     ./src/protection/uep-protection.cpp
 	     ./src/backend/firecode-checker.cpp
-	     ./src/backend/frame-processor.cpp
 	     ./src/backend/charsets.cpp
 	     ./src/backend/galois.cpp
 	     ./src/backend/reed-solomon.cpp
@@ -330,7 +330,6 @@
 	     ./src/backend/data/journaline/dabdgdec_impl.c
 	     ./src/backend/data/journaline/newsobject.cpp
 	     ./src/backend/data/journaline/NML.cpp
-	     ./src/backend/data/virtual-datahandler.cpp
 	     ./src/backend/data/tdc-datahandler.cpp
 	     ./src/backend/data/pad-handler.cpp
 	     ./src/backend/data/mot/mot-handler.cpp
@@ -365,6 +364,7 @@
 	     ./src/support/history-handler.cpp
 	     ./src/support/viterbi-jan/viterbi-handler.cpp
 	     ./src/support/viterbi-spiral/viterbi-spiral.cpp
+	     ./src/support/scanner-table.cpp
 	     ./src/scopes-qwt6/iqdisplay.cpp 
 	     ./spectrum-viewer/spectrum-viewer.cpp 
 	     ./correlation-viewer/correlation-viewer.cpp 
@@ -373,7 +373,6 @@
 
 	set (${objectName}_MOCS
 	     ./dab-processor.h
-	     ./scanner-table.h
 	     ./includes/output/audio-base.h
 	     ./includes/output/audiosink.h
 	     ./includes/ofdm/sample-reader.h
@@ -382,6 +381,7 @@
 	     ./includes/ofdm/fib-decoder.h
 	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/tii_detector.h
+	     ./includes/backend/msc-handler.h
 	     ./includes/backend/backend.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp2processor.h
@@ -408,6 +408,7 @@
 	     ./includes/support/verysmallpushbutton.h
 	     ./includes/support/smallcombobox.h
 	     ./includes/support/history-handler.h
+	     ./includes/support/scanner-table.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./correlation-viewer/correlation-viewer.h

_service:download_url:qt-dab-3.21.tar.gz/README.md -> _service:download_url:qt-dab-3.3.tar.gz/README.md Changed

@@ -1,98 +1,9 @@
-# Qt-DAB-3.2-Beta [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-3.3 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.2-Beta is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). It is the successor of both DAB-rpi and sdr-j-DAB, two former programs by the same author.
+Qt-DAB-3.3 is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). It is the successor of both DAB-rpi and sdr-j-DAB, two former programs by the same author.
 
----------------------------------------------------------------------
-Summary of new features in Qt-DAB-3.21-Beta
----------------------------------------------------------------------
 
-Note that the installer for Windows for version 3.21 Beta is
-not yet available.
-
-![Qt-DAB scan result](/qt-dab-scanresult.png?raw=true)
-
-Qt-DAB 3.21 distinguishes itself from the previous version by 
-a number of visible changes:
-
- * based on user requests, the *scanning* function is changed.
-While in previous versions scanning stopped as soon as a channel with valid
-DAB data is encountered, in this version touching the scanning button will
-instruct the software to perform a *single scan* over all channels
-in the selected band.
-During the scan, a separate window will be shown with the results
-of the scan as shown in the picture.
-
-Since for me the *scan* button is used as a "search for next channel with data"
-button, the "old" behaviour is still available as option. Add "normalScan=1"
-to the .qt-dab.ini file and behaviour is as it used to be.
-
- * stereo indicator disappeared on the main GUI, and its place is taken
-by the progress bar showing the quality of the FIC decoding. Since this
-indicator is independent on the selected service its place is the main
-widget rather than the technical details widget, describing the selected
-service
-
- * support is added for the V3 version of the SDRplay library. As known (at 
-least with the SDRplay users), SDRplay ltd developed the Duo and the new RSPdx,
-and future support will be through the V3 library (currently 3.06).
-
--------------------------------------------------------------------------
-xml-files and support
--------------------------------------------------------------------------
-
-Clemens Schmidt, author of the QIRX program and me defined a format
-for storing and exchanging "raw" data: xml-files.
-Such a file contains in the first bytes - up to 5000 - a description
-in xml - as source - of the data contents. This xml description
-describes in detail  the coding of the elements.
-As an example, a description of data obtained by dumping AIRspy
-input. 
-
- ```
-	<?xml version="1.0" encoding="utf-8"?>
-	<SDR>
-	  <Recorder Name="Qt-DAB" Version="3.2-Beta"/>
-	  <Device Name="AIRspy" Model="I"/>
-	  <Time Value="Wed Dec 18 12:39:34 2019" Unit="UTC"/>
-	  
-	  <Sample>
-	    <Samplerate Value="2500000" Unit="Hz"/>
-	    <Channels Bits="12" Container="int16" Ordering="LSB">
-	      <Channel Value="I"/>
-	      <Channel Value="Q"/>
-	    </Channels>
-	  </Sample>
-	  
-	  <Datablocks>
-	    <Datablock Number="1" Count="375783424" Unit="Channel">
-	      <Frequency Value="227360" Unit="KHz"/>
-	      <Modulation Value="DAB"/>
-	    </Datablock>
-	  </Datablocks>
-	</SDR>
-
- ```
-
-The device handlers in Qt-DAB-3.21 support generating a raw file encoded
-in such an xml file.
-
-While the current implementation for reading such files is limited to
-a single data block, the reader contains a *cont* button that, when
-touched while playing the data, will cause continuous playing of the
-data in the data block.
-
-![Qt-DAB with xml input](/qt-dab-xml.png?raw=true)
-
-The picture shows the reader when reading a file, generated from raw
-data emitted by the Hackrf device.
-
-----------------------------------------------------------------------
-Why a Beta version
-----------------------------------------------------------------------
-
-In spite of extensive testing on RPI, x64 Linux and Windows,
-the software still may contain some errors.
-Error reports are appreciated.
+![Qt-DAB with xml input](/qt-dab-3.3.png?raw=true)
 
 ------------------------------------------------------------------
 Table of Contents
@@ -114,104 +25,65 @@
   * [Raspberry PI](#raspberry-pi)
   * [appImage for x64 Linux systems](#appimage-for-x64-linux-systems)
 * [Interfacing to another device](#interfacing-to-another-device)
+* [New in Qt-DAB 3.3](#New-in-Qt-DAB-3.3)
+* [Using other bands than Band III or L Band](#other-bands)
+* [xml-files and support](#xml-files-and-support)
 * [Copyright](#copyright)
 
--------------------------------------------------------------------
-------------------------------------------------------------------
-
-![Qt-DAB with sdrplay input](/qt-dab-3.0-a.png?raw=true)
-
-------------------------------------------------------------------
-Features
-------------------------------------------------------------------
-
-  * DAB (mp2) and DAB+ (HE-AAC v1, HE-AAC v2 and LC-AAC) decoding
-  * MOT SlideShow (SLS)
-  * Dynamic Label (DLS) 
-  * Both DAB bands supported: 
-  	* VHF Band III
-   	* L-Band (only used in Czech Republic and Vatican) (see "obsolete properties")
-  * Spectrum view (incl. constellation diagram, impulse response, TII spectrum)
-  * Scanning function (scan the subsequent channels in the selected band until a channel is encountered where a DAB signal is detected)
-  * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, 4 quality bars)
-  * Detailed information for other services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type)
-  * Automatic display of TII (Transmitter Identification Information) data when transmitted
-  * Presets for easy switching of programs in different ensembles (see *Presets*)
-  * Dumping of the complete DAB channel (Warning: produces large raw files!) into \* sdr files and playing them again later
-  * Saving audio as uncompressed wave files
-  * Saving aac frames from DAB+ services for processing by e.g. VLC
-  * Saving the ensemble content (description of audio and data streams, including almost all technical data) into a text file readable by e.g *LibreOfficeCalc*
-  * Supports inputs from 
-  	- SDRplay (both RSP I and RSP II),
-  	- Airspy, including Airspy mini,
-   	- SDR DAB sticks (RTL2838U or similar), 
-	- HACKRF One, 
-	- limeSDR, 
-	- Soapy (experimental, Linux only), and
-   	- prerecorded dump (*.raw, *.iq and *.sdr) 
-	- rtl_tcp servers
-  * Clean interface to add other devices, see below.
-
-Not  (Not yet or partly) implemented:
-
-  * DMB (Audio and Video)
-  * TPEG: when configured, TPEG messages are being sent to a TCP port; sources for a simple client are part of the source distribution.
-  * EPG: when configured, the EPG decoding will generate so called EHB files.
-  * Journaline (an untested Journaline implementation is part of the sources).
-  * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888).
-  * Other bands than used for terrestrial broadcasting in Europe (like DAB over cable)
 
 ------------------------------------------------------------------
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.2-Beta** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-3.3** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
 Some other programs are derived from the sources of Qt-DAB, a "light" version **dabradio**, an SDRPlay-specific version **sdrplayDab**, a command-line based version and a stand-alone server version **dab-server**.
 The versions with a GUI are implemented in C++, using the Qt framework for the implementation of the GUI. The command-line version dab-cmdline and the dab-server are implemented using C++, and do not depend on Qt.
 
-The **dab-server** can be installed to run as a "service" on an RPI, with control - over a bluetooth connection - from an "app" on an Android tablet.
+The **dab-server** can be installed to run as a "service" on e.g. an RPI, with control - over a bluetooth connection - from an "app" on an Android tablet.
 
 Furthermore, for DX purposes, a **dab-scanner** is implemented that allows
 for a continuous scanning of selected channels in a given band. Results are 
 written in a txt file, formatted for use with *LibreOffice Calc* and
 comparable programs.
 
-**dabradio**, **sdrplayDab**, the Qt-free version **dab-cmdline**, the **dab-server** and the **dab-scanner** have their own repository on Github.
+**dabradio**, **sdrplayDab**, the **dab-scanner** and the Qt-free versions **dab-cmdline** and the **dab-server** have their own repository on Github.
 
-Qt-DAB-3.2-Beta also supports input from an rtl-tcp server (see osmocom software) and from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`). Obviously there is a provision for dumping the input into an (\*.sdr)-file. 
+Qt-DAB-3.3 also supports file input, from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`) and on the aforementionedxml files. Obviously there is a provision for dumping the input into an (\*.sdr)-file and - for most configured devices - as xml file. 
 
-Note that if the rtl_tcp server is used as input device, the connection needs to support the inputrate, i.e. 2,048,000 I/Q samples (i.e. 2 * 2,048,000 bytes/second).
+Finally, Qt-DAB supports input from an rtl_tcp server, if such server is used as input device, the connection needs to support the inputrate, i.e. 2,048,000 I/Q samples (i.e. 2 * 2,048,000 bytes/second).
 
 Since the Qt-DAB program has to run on a headless RPI 2/3 using the home WiFi, the resulting PCM output can be sent - if so configured - to a TCP port (Sources for a small client are part of the source distribution).
 
-For further information please visit http://www.sdr-j.tk
+See also the section of configuring Qt-DAB
 
 ------------------------------------------------------------------
 Widgets and scopes
 ------------------------------------------------------------------
 
-The picture below shows Qt-DAB's main window and the other 6 **optional**
-widgets
+The picture on top shows Qt-DAB's main window and the other 5 **optional**
+widgets:
 
-* a widget with controls for the attached device,
-* a widget showing the technical information of the *selected service* as well
+  * a widget with controls for the attached device,

_service:download_url:qt-dab-3.21.tar.gz/correlation-viewer/correlation-viewer.cpp -> _service:download_url:qt-dab-3.3.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

@@ -5,6 +5,7 @@
  *    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
@@ -25,14 +26,15 @@
 #include	<QColor>
 
 	correlationViewer::correlationViewer	(RadioInterface	*mr,
+	                                         QSettings	*s,
 	                                         RingBuffer<float> *b) {
-int16_t	i;
 QString	colorString	= "black";
 QColor	displayColor;
 QColor	gridColor;
 QColor	curveColor;
 
 	this	-> myRadioInterface	= mr;
+	plotLength	= s -> value ("plotLength", 1000). toInt ();
 	this	-> responseBuffer	= b;
 	colorString			= "black";
 	displayColor			= QColor (colorString);
@@ -79,8 +81,6 @@
 }
 
 void	correlationViewer::showIndex	(int32_t v) {
-int32_t	i;
-
 QString theText;
 
 	if (v == -1) {
@@ -96,9 +96,9 @@
 	   theText	= QString (" ");
 	else {
 	   theText	= QString (" trans ");
-	   for (int i = 1; i < indexVector. size(); i ++) {
+	   for (uint16_t i = 1; i < indexVector. size(); i ++) {
 	      char t [255];
-	      sprintf (t, " (%d -> %d msec) ", i,
+	      sprintf (t, " (%d -> %d usec) ", i,
 	                      (indexVector. at (i) - indexVector. at (0)) / 2);
               theText. append (t);
 	   }
@@ -119,32 +119,32 @@
 }
 
 static int lcount = 0;
-void	correlationViewer::showCorrelation (int32_t dots) {
+void	correlationViewer::showCorrelation (int32_t dots, int marker) {
 uint16_t	i;
-double X_axis [dots];
-float data [dots];
-double Y_values [dots];
+double X_axis	[plotLength];
+double Y_values [plotLength];
+float data	[dots];
 float	mmax	= 0;
 
 	responseBuffer	-> getDataFromBuffer (data, dots);
 	if (myFrame -> isHidden())
 	   return;
 
-	for (i = 0; i < dots; i ++) 
-	   X_axis [i] = i;
+	for (i = 0; i < plotLength; i ++) 
+	   X_axis [i] = marker - plotLength / 2 + i;
 
-	for (i = 0; i < dots; i ++) {
-	   Y_values [i] = get_db (data [i]);
+	for (i = 0; i < plotLength; i ++) {
+	   Y_values [i] = get_db (data [marker - plotLength / 2 + i]);
 	   if (Y_values [i] > mmax)
 	      mmax = Y_values [i];
 	}
 
-	if (++lcount < 3)
-	   return;
-	lcount = 0;
+//	if (++lcount < 3)
+//	   return;
+//	lcount = 0;
 	plotgrid	-> setAxisScale (QwtPlot::xBottom,
-				         (double)0,
-				         (double)dots);
+				         (double)marker - plotLength / 2,
+				         (double)marker + plotLength / 2 - 1);
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
 				         get_db (0), mmax);
@@ -152,12 +152,12 @@
 	spectrumCurve   -> setBaseline  (get_db (0));
 
 	Y_values [0]		= get_db (0);
-	Y_values [dots - 1] 	= get_db (0);
-	spectrumCurve	-> setSamples (X_axis, Y_values, dots);
+	Y_values [plotLength - 1] 	= get_db (0);
+	spectrumCurve	-> setSamples (X_axis, Y_values, plotLength);
 	plotgrid	-> replot(); 
 }
 
 float	correlationViewer::get_db (float x) {
-	return 20 * log10 ((x + 1) / (float)(512));
+	return 20 * log10 ((x + 1) / (float)(4 * 512));
 }

_service:download_url:qt-dab-3.21.tar.gz/correlation-viewer/correlation-viewer.h -> _service:download_url:qt-dab-3.3.tar.gz/correlation-viewer/correlation-viewer.h Changed

_service:download_url:qt-dab-3.21.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-3.3.tar.gz/dab-processor.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C) 2014 .. 2017
+ *    Copyright (C) 2014 .. 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -21,7 +21,7 @@
  */
 #include	"dab-processor.h"
 
-#include <utility>
+#include	<utility>
 #include	"fic-handler.h"
 #include	"msc-handler.h"
 #include	"radio.h"
@@ -193,7 +193,7 @@
 //
 Check_endofNULL:
 	   myReader. getSamples (ofdmBuffer. data(),
-	                        T_u, coarseOffset + fineOffset);
+	                         T_u, coarseOffset + fineOffset);
 /**
   *	We now have to find the exact first sample of the non-null period.
   *	We use a correlation that will find the first sample after the
@@ -213,7 +213,7 @@
   *	Once here, we are synchronized, we need to copy the data we
   *	used for synchronization for block 0
   */
-	   memmove (ofdmBuffer. data(),
+	   memmove (ofdmBuffer. data (),
 	        &((ofdmBuffer. data()) [startIndex]),
 	                  (T_u - startIndex) * sizeof (std::complex<float>));
 	   int ofdmBufferIndex	= T_u - startIndex;
@@ -235,7 +235,7 @@
 
 //	Here we look only at the block_0 when we need a coarse
 //	frequency synchronization.
-       correctionNeeded	= !my_ficHandler. syncReached();
+	   correctionNeeded	= !my_ficHandler. syncReached();
 	   if (correctionNeeded) {
 	      int correction	=
 	            phaseSynchronizer. estimate_CarrierOffset (ofdmBuffer);
@@ -254,10 +254,9 @@
   *	the thread executing this "task", the other blocks
   *	are passed on to be handled in the mscHandler, running
   *	in a different thread.
-  *	 We immediately
-  *	start with building up an average of the phase difference
-  *	between the samples in the cyclic prefix and the
-  *	corresponding samples in the datapart.
+  *	We immediately start with building up an average of
+  *	the phase difference between the samples in the cyclic prefix
+  *	and the	corresponding samples in the datapart.
   */
 	   FreqCorr	= std::complex<float> (0, 0);
 	   for (int ofdmSymbolCount = 1;
@@ -380,7 +379,6 @@
 
 void	dabProcessor::coarseCorrectorOff() {
 	correctionNeeded	= false;
-	theRig	-> setOffset (coarseOffset);
 }
 
 void	dabProcessor::set_scanMode	(bool b) {
@@ -388,10 +386,24 @@
 	attempts	= 0;
 }
 //
-//	just a convenience function
+//	just a convenience functions
+
+QString	dabProcessor::findService		(uint32_t SId, int SCIds) {
+	return my_ficHandler. findService (SId, SCIds);
+}
+
+void	dabProcessor::getParameters		(const QString &s,
+	                                         uint32_t *p_SId, int*p_SCIds) {
+	my_ficHandler. getParameters (s, p_SId, p_SCIds);
+}
+
+QStringList	dabProcessor::getServices	() {
+	return my_ficHandler. getServices ();
+}
+
 bool	dabProcessor::is_audioService	(const QString &s) {
 audiodata ad;
-	my_ficHandler. dataforAudioService (s, &ad, 0);
+	my_ficHandler. dataforAudioService (s, &ad);
 	return ad. defined;
 }
 
@@ -402,16 +414,16 @@
 }
 
 void	dabProcessor::dataforAudioService	(const QString &s,
-	                                          audiodata *d, int16_t c) {
-	my_ficHandler. dataforAudioService (s, d, c);
+	                                         audiodata *d) {
+	my_ficHandler. dataforAudioService (s, d);
 }
 
 void	dabProcessor::dataforPacketService	(const QString &s,
-	                                         packetdata *d, int16_t c) {
-	my_ficHandler. dataforPacketService (s, d, c);
+	                                         packetdata *pd,
+	                                         int16_t compnr) {
+	my_ficHandler. dataforPacketService (s, pd, compnr);
 }
 
-
 void	dabProcessor::reset_msc() {
 	my_mscHandler. reset();
 }
@@ -426,7 +438,6 @@
 	my_mscHandler. set_Channel (d, (RingBuffer<int16_t> *)nullptr, b);
 }
 
-
 uint8_t	dabProcessor::get_ecc() {
 	return my_ficHandler. get_ecc();
 }

_service:download_url:qt-dab-3.21.tar.gz/dab-processor.h -> _service:download_url:qt-dab-3.3.tar.gz/dab-processor.h Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/rawfiles-new/raw-reader.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/rawfiles-new/raw-reader.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/rawfiles-new/rawfiles.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/rawfiles-new/rawfiles.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/rawfiles-new/rawfiles.h -> _service:download_url:qt-dab-3.3.tar.gz/devices/rawfiles-new/rawfiles.h Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -272,10 +272,14 @@
 	         this, SLOT (set_autogain (const QString &)));
 	connect (ppm_correction, SIGNAL (valueChanged (int)),
 	         this, SLOT (set_ppmCorrection  (int)));
-	connect (dumpButton, SIGNAL (clicked ()),
+	connect (xml_dumpButton, SIGNAL (clicked ()),
 	         this, SLOT (set_xmlDump ()));
+	connect (iq_dumpButton, SIGNAL (clicked ()),
+	         this, SLOT (set_iqDump ()));
 	xmlDumper       = nullptr;
-	dumping. store (false);
+	iqDumper	= nullptr;
+	iq_dumping. store (false);
+	xml_dumping. store (false);
 
 }
 
@@ -387,12 +391,26 @@
 std::complex<uint8_t> temp [size];
 int	amount;
 
+static uint8_t dumpBuffer [4096];
+static int iqTeller	= 0;
 	amount = _I_Buffer	-> getDataFromBuffer (temp, size);
 	for (int i = 0; i < amount; i ++) 
 	   V [i] = std::complex<float> (mapTable [real (temp [i])],
 	                                mapTable [imag (temp [i])]);
-	if (dumping. load ())
+	if (xml_dumping. load ())
 	   xmlWriter -> add (temp, amount);
+	else
+	if (iq_dumping. load ()) {
+	   for (int i = 0; i < size; i ++) {
+	      dumpBuffer [iqTeller]	= real (temp [i]);
+	      dumpBuffer [iqTeller + 1]	= imag (temp [i]);
+	      iqTeller += 2;
+	      if (iqTeller >= 4096) {
+	         fwrite (dumpBuffer, 1, 4096, iqDumper);
+	         iqTeller = 0;
+	      }
+	   }
+	}
 	return amount;
 }
 
@@ -554,14 +572,51 @@
 	return 8;
 }
 
+void	rtlsdrHandler::set_iqDump	() {
+	if (iqDumper == nullptr) {
+	   if (setup_iqDump ())
+              iq_dumpButton	-> setText ("writing raw file");
+	      xml_dumpButton	-> hide ();
+        }
+        else {
+           close_iqDump ();
+           iq_dumpButton	-> setText ("Dump to raw");
+	   xml_dumpButton	-> show ();
+        }
+}
+
+bool	rtlsdrHandler::setup_iqDump () {
+	QString fileName = QFileDialog::getSaveFileName (nullptr,
+	                                         tr ("Save file ..."),
+	                                         QDir::homePath(),
+	                                         tr ("raw (*.raw)"));
+        fileName        = QDir::toNativeSeparators (fileName);
+        iqDumper	= fopen (fileName. toUtf8 (). data (), "w");
+	if (iqDumper == nullptr)
+	   return false;
+	
+	iq_dumping. store (true);
+	return true;
+}
+
+void	rtlsdrHandler::close_iqDump () {
+	if (iqDumper == nullptr)	// this can happen !!
+	   return;
+	iq_dumping. store (false);
+	fclose (iqDumper);
+	iqDumper	= nullptr;
+}
+	   
 void	rtlsdrHandler::set_xmlDump () {
 	if (xmlDumper == nullptr) {
 	  if (setup_xmlDump ())
-	      dumpButton	-> setText ("writing");
+	      xml_dumpButton	-> setText ("writing xml file");
+	      iq_dumpButton	-> hide	();
 	}
 	else {
 	   close_xmlDump ();
-	   dumpButton	-> setText ("Dump");
+	   xml_dumpButton	-> setText ("Dump to xml");
+	   iq_dumpButton	-> show	();
 	}
 }
 
@@ -583,14 +638,14 @@
 	                                      "rtlsdr",
 	                                      deviceModel,
 	                                      recorderVersion);
-	dumping. store (true);
+	xml_dumping. store (true);
 	return true;
 }
 
 void	rtlsdrHandler::close_xmlDump () {
 	if (xmlDumper == nullptr)	// this can happen !!
 	   return;
-	dumping. store (false);
+	xml_dumping. store (false);
 	usleep (1000);
 	xmlWriter	-> computeHeader ();
 	delete xmlWriter;

_service:download_url:qt-dab-3.21.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.h -> _service:download_url:qt-dab-3.3.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.h Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/rtlsdr-handler/rtlsdr-widget.ui -> _service:download_url:qt-dab-3.3.tar.gz/devices/rtlsdr-handler/rtlsdr-widget.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>225</width>
-    <height>263</height>
+    <width>203</width>
+    <height>302</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -80,12 +80,19 @@
     </widget>
    </item>
    <item>
-    <widget class="QPushButton" name="dumpButton">
+    <widget class="QPushButton" name="xml_dumpButton">
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string>dump</string>
+      <string>dump to xml file</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="iq_dumpButton">
+     <property name="text">
+      <string>dump to raw file</string>
      </property>
     </widget>
    </item>

_service:download_url:qt-dab-3.21.tar.gz/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include Added

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_callback.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_control.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_dev.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_rsp1a.h Added

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_rsp2.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_rspDuo.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_rspDx.h Added

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

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_rx_channel.h Added

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/include/sdrplay_api_tuner.h Added

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

_service:download_url:qt-dab-3.21.tar.gz/devices/sdrplay-handler-v3/sdrplay-controller.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-controller.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/virtual-input.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/virtual-input.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/virtual-input.h -> _service:download_url:qt-dab-3.3.tar.gz/devices/virtual-input.h Changed

@@ -5,6 +5,7 @@
  *    Lazy Chair Computing
  *
  *    This file is part of the Qt-DAB program
+ *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
@@ -34,24 +35,18 @@
 
 class	virtualInput: public QThread {
 public:
-			virtualInput();
-virtual			~virtualInput();
-virtual		void	setVFOFrequency	(int32_t);
-virtual		int32_t	getVFOFrequency();
-virtual		int32_t	defaultFrequency();
-virtual		bool	restartReader	(int32_t);
-virtual		void	stopReader();
+			virtualInput	();
+virtual			~virtualInput	();
+virtual		int32_t	getVFOFrequency() {return 0;}
+virtual		bool	restartReader	(int32_t freq);
+virtual		void	stopReader	();
 virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
-virtual		int32_t	Samples();
-virtual		void	resetBuffer();
+virtual		int32_t	Samples		();
+virtual		void	resetBuffer	();
 virtual		int16_t	bitDepth	() { return 10;}
-virtual		int32_t	getOffset();
-virtual		void	setOffset	(int32_t);
 virtual		void	hide		();
 virtual		void	show		();
 virtual		bool	isHidden	();
-virtual		int	getBufferSpace	();
-virtual		int	getOverflows	() { return -1; }
 //
 protected:
 		int32_t	lastFrequency;

_service:download_url:qt-dab-3.21.tar.gz/devices/wavfiles-new/wav-reader.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/wavfiles-new/wav-reader.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/xml-filereader/element-reader.h -> _service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/element-reader.h Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/xml-filereader/xml-filereader.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xml-filereader.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/devices/xml-filereader/xml-reader.cpp -> _service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xml-reader.cpp Changed

@@ -4,10 +4,7 @@
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
- *    This file is part of the Qt-DAB (formerly SDR-J, JSDR).
- *    Many of the ideas as implemented in Qt-DAB are derived from
- *    other work, made available through the GNU general Public License.
- *    All copyrights of the original authors are acknowledged.
+ *    This file is part of the Qt-DAB
  *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -28,9 +25,6 @@
 #include	"xml-filereader.h"
 #include	<sys/time.h>
 #include	<stdio.h>
-#include	"rawfiles.h"
-
-#include	"element-reader.h"
 
 static	int shift (int a) {
 int r	= 1;
@@ -64,6 +58,9 @@
 	this	-> fd		= fd;
 	this	-> filePointer	= filePointer;
 	sampleBuffer		= b;
+//
+//	convBufferSize is a little confusing since the actual 
+//	buffer is one larger
 	convBufferSize		= fd -> sampleRate / 1000;
 	continuous. store (false);
 
@@ -75,7 +72,6 @@
 
 	convIndex	= 0;
 	convBuffer. resize (convBufferSize + 1);
-	fprintf (stderr, "nu hier naar toe\n");
 	nrElements	= fd -> blockList [0]. nrElements;
 
 	connect (this, SIGNAL (setProgress (int, int)),
@@ -115,21 +111,31 @@
 	   samplesRead		= 0;
 	   do {
 	      while ((samplesRead <= samplesToRead) && running. load ()) {
+
 	         if (fd -> iqOrder == "IQ") 
-	            samplesRead += readSamples_IQ (file, blockSize);
+	            samplesRead += readSamples (file,
+	                                        &xml_Reader::readElements_IQ);
 	         else
 	          if (fd -> iqOrder == "QI")
-	            samplesRead += readSamples_QI (file, blockSize);
+	            samplesRead += readSamples (file, 
+	                                        &xml_Reader::readElements_QI);
 	         else
 	         if (fd -> iqOrder == "I_Only")
-	            samplesRead += readSamples_I (file, blockSize);
+	            samplesRead += readSamples (file,
+	                                        &xml_Reader::readElements_I);
 	         else
-	            samplesRead += readSamples_Q (file, blockSize);
+	            samplesRead += readSamples (file,
+	                                        &xml_Reader::readElements_Q);
+
 	         if (++cycleCount >= 200) {
 	            setProgress (samplesRead, samplesToRead);
 	            cycleCount = 0;
 	         }
-	         nextStop = nextStop + ((uint64_t)blockSize * 1000) / 2048;
+//
+//	the readSamples function returns 1 msec of data,
+//	we assume taking this data does not take time
+//	         nextStop = nextStop + ((uint64_t)blockSize * 1000) / 2048;
+	         nextStop = nextStop + (uint64_t)1000;
 	         if (nextStop > currentTime ())
 	            usleep ( nextStop - currentTime ());
 	      }
@@ -151,6 +157,7 @@
 int	nrElements	= fd -> blockList. at (blockNumber). nrElements;
 int	samplesToRead	= 0;
 
+	(void)f;
 	if (fd -> blockList. at (blockNumber). typeofUnit == "Channel") {
 	   if ((fd -> iqOrder == "IQ") ||
 	       (fd -> iqOrder == "QI"))
@@ -166,105 +173,24 @@
 	return samplesToRead;
 }
 
-int	xml_Reader::readSamples_IQ (FILE *f, int amount) {
-float I_element, Q_element;
-int	sampleCount	= 0;
-
-	while (sampleCount < amount) {
-	   I_element = readElement (f);
-	   Q_element = readElement (f);
-
-	   convBuffer [convIndex ++] = std::complex<float>(I_element, Q_element);
-	   if (convIndex >= convBufferSize + 1) {
-	      std::complex<float> temp [2048];
-	      for (int i = 0; i < 2048; i ++) {
-	         int16_t inpBase = mapTable_int [i];
-	         float   inpRatio = mapTable_float [i];
-	         temp [i] = compmul (convBuffer [inpBase + 1], inpRatio) +
-	                    compmul (convBuffer [inpBase], 1 - inpRatio);
-	      }
-	      convBuffer [0] = convBuffer [convBufferSize];
-	      convIndex	= 1;
-	      sampleBuffer -> putDataIntoBuffer (temp, 2048);
-	      return 2048;
-	   }
-	}
-	return sampleCount;
-}
+int	xml_Reader::readSamples (FILE *theFile, 
+	                         void(xml_Reader::*r)(FILE *theFile,
+	                                    std::complex<float> *, int)) {
+std::complex<float> temp [2048];
 
-int	xml_Reader::readSamples_QI (FILE *f, int amount) {
-float I_element, Q_element;
-int	sampleCount	= 0;
-
-	while (sampleCount < amount) {
-	   Q_element = readElement (f);
-	   I_element = readElement (f);
-	   convBuffer [convIndex ++] = std::complex<float>(I_element,
-	                                                   Q_element);
-	   if (convIndex >= convBufferSize + 1) {
-	      std::complex<float> temp [2048];
-	      for (int i = 0; i < 2048; i ++) {
-	         int16_t inpBase = mapTable_int [i];
-	         float   inpRatio = mapTable_float [i];
-	         temp [i] = compmul (convBuffer [inpBase + 1], inpRatio) +
-	                    compmul (convBuffer [inpBase], 1 - inpRatio);
-	      }
-	      convBuffer [0] = convBuffer [convBufferSize];
-	      convIndex	= 1;
-	      sampleBuffer -> putDataIntoBuffer (temp, 2048);
-	      return 2048;
-	   }
-	}
-	return sampleCount;
-}
-int	xml_Reader::readSamples_I (FILE *f, int amount) {
-float I_element, Q_element;
-int	sampleCount	= 0;
-
-	while (sampleCount < amount) {
-	   convBuffer [convIndex ++] = 
-	                     std::complex<float> (readElement (f), 0);
-	   if (convIndex >= convBufferSize + 1) {
-	      std::complex<float> temp [2048];
-	      for (int i = 0; i < 2048; i ++) {
-	         int16_t inpBase = mapTable_int [i];
-	         float   inpRatio = mapTable_float [i];
-	         temp [i] = compmul (convBuffer [inpBase + 1], inpRatio) +
-	                    compmul (convBuffer [inpBase], 1 - inpRatio);
-	      }
-	      convBuffer [0] = convBuffer [convBufferSize];
-	      convIndex	= 1;
-	      sampleBuffer -> putDataIntoBuffer (temp, 2048);
-	      return 2048;
-	   }
-	}
-	return sampleCount;
-}
-int	xml_Reader::readSamples_Q (FILE *f, int amount) {
-float I_element, Q_element;
-int	sampleCount	= 0;
-
-	while (sampleCount < amount) {
-	   convBuffer [convIndex ++] = 
-	                       std::complex<float> (0, readElement (f));
-
-	   if (convIndex >= convBufferSize + 1) {
-	      std::complex<float> temp [2048];
-	      for (int i = 0; i < 2048; i ++) {
-	         int16_t inpBase = mapTable_int [i];
-	         float   inpRatio = mapTable_float [i];
-	         temp [i] = compmul (convBuffer [inpBase + 1], inpRatio) +
-	                    compmul (convBuffer [inpBase], 1 - inpRatio);
-	      }
-	      convBuffer [0] = convBuffer [convBufferSize];
-	      convIndex	= 1;
-	      sampleBuffer -> putDataIntoBuffer (temp, 2048);
-	      return 2048;
-	   }
+	(*this.*r) (theFile, &convBuffer [1], convBufferSize);
+	for (int i = 0; i < 2048; i ++) {
+	   int16_t inpBase	= mapTable_int [i];
+	   float   inpRatio	= mapTable_float [i];
+	   temp [i] = compmul (convBuffer [inpBase + 1], inpRatio) +
+	                       compmul (convBuffer [inpBase], 1 - inpRatio);
 	}
-	return sampleCount;
+	convBuffer [0] = convBuffer [convBufferSize];
+	convIndex = 1;
+	sampleBuffer -> putDataIntoBuffer (temp, 2048);
+	return 2048;

_service:download_url:qt-dab-3.21.tar.gz/devices/xml-filereader/xml-reader.h -> _service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xml-reader.h Changed

@@ -4,10 +4,7 @@
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
- *    This file is part of the Qt-DAB (formerly SDR-J, JSDR).
- *    Many of the ideas as implemented in Qt-DAB are derived from
- *    other work, made available through the GNU general Public License.
- *    All copyrights of the original authors are acknowledged.
+ *    This file is part of the Qt-DAB 
  *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -62,11 +59,17 @@
 	std::atomic<bool> running;
 	void		run ();
 	int		compute_nrSamples 	(FILE *f, int blockNumber);
-	int		readSamples_IQ		(FILE *f, int amount);
-	int		readSamples_QI		(FILE *f, int amount);
-	int		readSamples_I		(FILE *f, int amount);
-	int		readSamples_Q		(FILE *f, int amount);
-	float		readElement		(FILE *f);
+	int		readSamples		(FILE *f, 
+	                                       void(xml_Reader::*)(FILE *,
+	                                          std::complex<float> *, int));
+	void		readElements_IQ		(FILE *f,
+	                                         std::complex<float> *, int amount);
+	void		readElements_QI		(FILE *f, 
+	                                         std::complex<float> *, int amount);
+	void		readElements_I		(FILE *f, 
+	                                         std::complex<float> *, int amount);
+	void		readElements_Q		(FILE *f, 
+	                                         std::complex<float> *, int amount);
 //
 //	for the conversion - if any
 	int16_t         convBufferSize;

_service:download_url:qt-dab-3.21.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-3.3.tar.gz/forms/dabradio.ui Changed

_service:download_url:qt-dab-3.21.tar.gz/forms/technical_data.ui -> _service:download_url:qt-dab-3.3.tar.gz/forms/technical_data.ui Changed

@@ -32,13 +32,33 @@
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>serviceId</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLCDNumber" name="serviceIdDisplay">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="mode">
+        <enum>QLCDNumber::Hex</enum>
+       </property>
+       <property name="segmentStyle">
+        <enum>QLCDNumber::Flat</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Start Address of CU</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item row="1" column="1">
       <widget class="QLCDNumber" name="startAddressDisplay">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
@@ -48,14 +68,14 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Used CUs</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="2" column="1">
       <widget class="QLCDNumber" name="lengthDisplay">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
@@ -65,14 +85,14 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>Subchannel ID</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QLCDNumber" name="subChIdDisplay">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
@@ -82,14 +102,14 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="l6">
        <property name="text">
         <string>Bitrate in kBit/s</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="QLCDNumber" name="bitrateDisplay">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>

_service:download_url:qt-dab-3.3.tar.gz/includes/backend/audio/fdk-aac.h Added

@@ -0,0 +1,72 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *	Use the fdk-aac library.
+ */
+#ifdef	__WITH_FDK_AAC__
+#ifndef	__FDK_AAC__
+#define	__FDK_AAC__
+
+#include	<QObject>
+#include	<stdint.h>
+#include	<aacdecoder_lib.h>
+#include	"ringbuffer.h"
+
+
+typedef struct {
+        int     rfa;
+        int     dacRate;
+        int     sbrFlag;
+        int     psFlag;
+        int     aacChannelMode;
+        int     mpegSurround;
+        int     CoreChConfig;
+        int     CoreSrIndex;
+        int     ExtensionSrIndex;
+} stream_parms;
+
+class	RadioInterface;
+//
+/**
+  *	fdkAAC is an interface to the fdk-aac library,
+  *	using the LOAS protocol
+  */
+class	fdkAAC : public QObject {
+Q_OBJECT
+public:
+		fdkAAC (RadioInterface *mr,
+                        RingBuffer<int16_t> *buffer);
+		~fdkAAC	();
+
+int16_t		MP42PCM (stream_parms *sp,
+                         uint8_t   packet [],
+                         int16_t   packetLength);
+private:
+	RingBuffer<int16_t>	*audioBuffer;
+	bool			working;
+	HANDLE_AACDECODER	handle;
+signals:
+	void			newAudio	(int, int);
+};
+
+#endif
+#endif

_service:download_url:qt-dab-3.21.tar.gz/includes/backend/audio/mp4processor.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/backend/audio/mp4processor.h Changed

_service:download_url:qt-dab-3.21.tar.gz/includes/backend/backend.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/backend/backend.h Changed

@@ -43,18 +43,23 @@
 class	Backend {
 #endif
 public:
-	Backend	(RadioInterface	*mr,
-	         descriptorType	*d,
-	         RingBuffer<int16_t> *,
-	         RingBuffer<uint8_t> *,
-	         RingBuffer<uint8_t> *,
-	         QString	picturesPath);
-	~Backend();
-int32_t	process		(int16_t *, int16_t);
-void	stopRunning();
+		Backend	(RadioInterface	*mr,
+	                 descriptorType	*d,
+	                 RingBuffer<int16_t> *,
+	                 RingBuffer<uint8_t> *,
+	                 RingBuffer<uint8_t> *,
+	                 QString	picturesPath);
+		~Backend();
+	int32_t	process		(int16_t *, int16_t);
+	void	stopRunning();
+//
+//	we need sometimes to access the key parameters for decoding
 	int		startAddr;
 	int		Length;
-	descriptorType	theDescriptor;
+	bool		shortForm;
+	int		protLevel;
+	int16_t		bitRate;
+	QString		serviceName;
 private:
 #ifdef	__THREADED_BACKEND
 void	run();
@@ -65,10 +70,11 @@
 	int16_t		nextIn;
 	int16_t		nextOut;
 #endif
-void	processSegment	(int16_t *Data);
+	void		processSegment	(int16_t *Data);
+	RadioInterface	*radioInterface;
 
-	int16_t		bitRate;
 	int16_t		fragmentSize;
+	int		serviceId;
 	std::vector<uint8_t> outV;
 	std::vector<std::vector <int16_t>> interleaveData;
 	std::vector<int16_t> tempX;

_service:download_url:qt-dab-3.21.tar.gz/includes/backend/data/mot/mot-object.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/backend/data/mot/mot-object.h Changed

_service:download_url:qt-dab-3.21.tar.gz/includes/backend/data/virtual-datahandler.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/backend/data/virtual-datahandler.h Changed

_service:download_url:qt-dab-3.21.tar.gz/includes/backend/frame-processor.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/backend/frame-processor.h Changed

_service:download_url:qt-dab-3.21.tar.gz/includes/backend/msc-handler.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/backend/msc-handler.h Changed

_service:download_url:qt-dab-3.21.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/dab-constants.h Changed

_service:download_url:qt-dab-3.3.tar.gz/includes/ofdm/dab-config.h Added

@@ -0,0 +1,195 @@
+#
+/*
+ *    Copyright (C) 2018, 2019, 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * 	fib decoder. Functionality is shared between fic handler, i.e. the
+ *	one preparing the FIC blocks for processing, and the mainthread
+ *	from which calls are coming on selecting a program
+ *
+ *
+ *	Definition of the "configuration" as maintained during reception of
+ *	a channel
+ */
+#ifndef	__FIB_CONFIG__
+#define	__FIB_CONFIG__
+
+class	service {
+public:
+	service() {
+	   reset	();
+	}
+	~service() {
+		reset	();
+	}
+void	reset		() {
+	inUse		= false;
+	SId		= 0;
+	SCIds		= 0;
+	hasName		= false;
+	serviceLabel	= "";
+	language	= 0;
+	programType	= 0;
+	is_shown	= false;
+	fmFrequency	= -1;
+}
+bool		inUse;
+uint32_t	SId;
+int		SCIds;
+bool		hasName;
+QString		serviceLabel;
+int		language;
+int		programType;
+bool		is_shown;
+int32_t		fmFrequency;
+};
+
+class ensembleDescriptor {
+public:
+	ensembleDescriptor	() {
+	   reset	();
+	}
+	~ensembleDescriptor	() {}
+void	reset		() {
+	namePresent	= false;
+	ecc_Present	= false;
+	isSynced	= false;
+	for (int i = 0; i < 64; i ++) 
+	   services [i]. reset ();
+}
+
+QString ensembleName;
+int32_t ensembleId;
+bool    namePresent;
+bool	ecc_Present;
+uint8_t	ecc_byte;
+bool	isSynced;
+service	services [64];
+};
+
+class	subChannelDescriptor {
+public:
+	subChannelDescriptor() {
+	   reset	();
+	}
+	~subChannelDescriptor() {}
+
+void	reset		() {
+	inUse	= false;
+	language	= 0;
+	FEC_scheme	= 0;
+}
+bool		inUse;
+int32_t		SubChId;
+int32_t		startAddr;
+int32_t		Length;
+bool		shortForm;
+int32_t		protLevel;
+int32_t		bitRate;
+int16_t		language;
+int16_t		FEC_scheme;
+int16_t		SCIds;		// for audio channels
+};
+
+//      The service component describes the actual service
+//      It really should be a union, the component data for
+//      audio and data are quite different
+class	serviceComponentDescriptor {
+public:
+	serviceComponentDescriptor() {
+	   reset	();
+	}
+	~serviceComponentDescriptor() {}
+
+void	reset		() {
+	inUse		= false;
+	is_madePublic	= false;
+	SCIds		= -1;
+	componentNr	= -1;
+	SCId		= -1;
+	subchannelId	= -1;
+}
+
+bool		inUse;		// field in use
+int8_t		TMid;		// the transport mode
+uint32_t	SId;
+int16_t		SCIds;		// component within service
+int16_t		subchannelId;	// used in both audio and packet
+int16_t		componentNr;    // component
+int16_t		ASCTy;          // used for audio
+int16_t		DSCTy;		// used in packet
+int16_t		PS_flag;	// use for both audio and packet
+uint16_t	SCId;           // Component Id (12 bit, unique)
+uint8_t		CAflag;         // used in packet (or not at all)
+uint8_t		DGflag;         // used for TDC
+int16_t		packetAddress;  // used in packet
+int16_t		appType;        // used in packet and Xpad
+int16_t		language;
+bool		is_madePublic;  // used to make service visible
+};
+
+//
+//	cluster is for announcement handling
+class	Cluster {
+public:
+uint16_t flags;
+std::vector<uint16_t> services;
+bool	inUse;
+int	announcing;
+int	clusterId;
+
+	Cluster () {
+	   flags	= 0;
+	   services. resize (0);
+	   inUse	= false;
+	   announcing	= 0;
+	   clusterId	= -1;
+	}
+	~Cluster () {
+	   flags	= 0;
+	   services. resize (0);
+	   inUse	= false;
+	   announcing	= 0;
+	   clusterId	= -1;
+	}
+};
+
+class	dabConfig {
+public:
+	dabConfig	() {
+	reset	();
+}
+	~dabConfig	() {
+}
+
+void	reset	() {
+	int i;
+	for (i = 0; i < 64; i ++) {
+	   subChannels  [i]. reset ();
+	   serviceComps [i]. reset ();
+	}
+}
+
+subChannelDescriptor		subChannels [64];
+serviceComponentDescriptor      serviceComps [64];
+Cluster				clusterTable [128];
+};
+
+#endif

_service:download_url:qt-dab-3.21.tar.gz/includes/ofdm/fib-decoder.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/ofdm/fib-decoder.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C) 2013
+ *    Copyright (C) 2013 .. 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -33,32 +33,35 @@
 class	RadioInterface;
 
 class	ensembleDescriptor;
-class	dataBase;
+class	dabConfig;
+class	Cluster;
 
 class	fibDecoder: public QObject {
 Q_OBJECT
 public:
-		fibDecoder		(RadioInterface *);
-		~fibDecoder();
+			fibDecoder	(RadioInterface *);
+			~fibDecoder	();
 
-	void	clearEnsemble();
-	bool	syncReached();
-	void	dataforAudioService	(const QString &,
-	                                      audiodata *, int16_t);
+	void		clearEnsemble	();
+	bool		syncReached	();
+	void	dataforAudioService	(const QString &, audiodata *);
 	void	dataforPacketService	(const QString &,
 	                                      packetdata *, int16_t);
-        uint8_t get_ecc();
-	int32_t	get_ensembleId();
-	QString get_ensembleName();
-	int32_t	get_CIFcount();	
-	void	print_Overview ();
+
+	QStringList	getServices	();
+	QString		findService	(uint32_t, int);
+	void		getParameters	(const QString &, uint32_t *, int *);
+        uint8_t		get_ecc		();
+	int32_t		get_ensembleId	();
+	QString		get_ensembleName	();
+	int32_t		get_CIFcount	();	
+	void		print_Overview	();
 protected:
-	void	newFrame();
 	void	process_FIB		(uint8_t *, uint16_t);
 private:
 	RadioInterface	*myRadioInterface;
-	dataBase	*currentBase;
-	dataBase	*nextBase;
+	dabConfig	*currentConfig;
+	dabConfig	*nextConfig;
 	ensembleDescriptor	*ensemble;
 	void		process_FIG0		(uint8_t *);
 	void		process_FIG1		(uint8_t *);
@@ -66,9 +69,9 @@
 	void		FIG0Extension1		(uint8_t *);
 	void		FIG0Extension2		(uint8_t *);
 	void		FIG0Extension3		(uint8_t *);
-	void		FIG0Extension4		(uint8_t *);
+//	void		FIG0Extension4		(uint8_t *);
 	void		FIG0Extension5		(uint8_t *);
-	void		FIG0Extension6		(uint8_t *);
+//	void		FIG0Extension6		(uint8_t *);
 	void		FIG0Extension7		(uint8_t *);
 	void		FIG0Extension8		(uint8_t *);
 	void		FIG0Extension9		(uint8_t *);
@@ -82,13 +85,13 @@
 	void		FIG0Extension17		(uint8_t *);
 	void		FIG0Extension18		(uint8_t *);
 	void		FIG0Extension19		(uint8_t *);
-	void		FIG0Extension20		(uint8_t *);
+//	void		FIG0Extension20		(uint8_t *);
 	void		FIG0Extension21		(uint8_t *);
 //	void		FIG0Extension22		(uint8_t *);
 //	void		FIG0Extension23		(uint8_t *);
-	void		FIG0Extension24		(uint8_t *);
-	void		FIG0Extension25		(uint8_t *);
-	void		FIG0Extension26		(uint8_t *);
+//	void		FIG0Extension24		(uint8_t *);
+//	void		FIG0Extension25		(uint8_t *);
+//	void		FIG0Extension26		(uint8_t *);
 
 	int16_t		HandleFIG0Extension1	(uint8_t *,
 	                                         int16_t,
@@ -99,14 +102,18 @@
 	int16_t		HandleFIG0Extension3	(uint8_t *,
 	                                         int16_t,
 	                                         uint8_t, uint8_t, uint8_t);
-	int16_t		HandleFIG0Extension5	(uint8_t *, int16_t);
+	int16_t		HandleFIG0Extension5	(uint8_t *,
+	                                         uint8_t, uint8_t, uint8_t,
+	                                         int16_t);
 	int16_t		HandleFIG0Extension8	(uint8_t *,
 	                                         int16_t,
 	                                         uint8_t, uint8_t, uint8_t);
 	int16_t		HandleFIG0Extension13	(uint8_t *,
 	                                         int16_t,
 	                                         uint8_t, uint8_t, uint8_t);
-	int16_t		HandleFIG0Extension21	(uint8_t*, int16_t);
+	int16_t		HandleFIG0Extension21	(uint8_t*,
+	                                         uint8_t, uint8_t, uint8_t,
+	                                         int16_t);
 
 	void		FIG1Extension0		(uint8_t *);
 	void		FIG1Extension1		(uint8_t *);
@@ -116,38 +123,41 @@
 	void		FIG1Extension5		(uint8_t *);
 	void		FIG1Extension6		(uint8_t *);
 
-	int		findServiceIndex	(uint32_t);
-	int		setServiceIndex		(uint32_t);
-	int		findServiceComponent	(dataBase *, int16_t);
-	int		findServiceComponentinService	(dataBase *,
-	                                                 uint32_t, int16_t);
+	int		findService		(const QString &);
+	int		findService		(uint32_t);
+	void		cleanupServiceList	();
+	void		createService		(QString name,
+	                                         uint32_t SId, int SCIds);
 
-        void            bind_audioService (dataBase *,
-	                                   int8_t,
-                                           uint32_t, int16_t,
-                                           int16_t, int16_t, int16_t);
-        void            bind_packetService (dataBase *,
-	                                    int8_t,
-                                            uint32_t, int16_t,
-                                            int16_t, int16_t, int16_t);
-	int		findService	(const QString &);
-//	void		bind_SCIds_to_ServiceComponent (uint16_t, uint16_t);
-//	void		bind_SCIds_to_SubChannel	(uint16_t, uint16_t);
-//	void		bindServiceComponenttoService	(uint32_t, uint16_t, uint8_t);
-//	void		bind_xpadComponent		(uint32_t, uin16_t, uint8_t);
-	void		setCluster (int clusterId,
-                                int16_t serviceIndex, uint16_t asuFlags);
-	QString		announcements (uint16_t a);
+	int		findServiceComponent	(dabConfig *, int16_t);
+	int		findComponent		(dabConfig *db,
+	                                         uint32_t SId,
+                                                 int16_t subChId);
+	int		findServiceComponent	(dabConfig *,
+	                                         uint32_t, uint8_t);
+        void            bind_audioService	(dabConfig *,
+	                                         int8_t,
+                                                 uint32_t, int16_t,
+                                                 int16_t, int16_t, int16_t);
+	void		bind_packetService	(dabConfig *,
+                                                 int8_t,
+                                                 uint32_t, int16_t,
+                                                 int16_t, int16_t, int16_t);
+	QString		announcements		(uint16_t);
+	void		setCluster		(dabConfig *, 
+	                                         int, int16_t, uint16_t);
+	Cluster		*getCluster		(dabConfig *, int16_t);
 	int32_t		dateTime [8];
 	QMutex		fibLocker;
 	int		CIFcount;
+
 signals:
-	void		addtoEnsemble	(const QString &);
-	void		nameofEnsemble  (int, const QString &);
-	void		setTime		(const QString &);
-	void		changeinConfiguration();
-	void		startAnnouncement (const QString &, int);
-	void		stopAnnouncement  (const QString &, int);
+	void		addtoEnsemble		(const QString &, int);
+	void		nameofEnsemble		(int, const QString &);
+	void		setTime			(const QString &);
+	void		changeinConfiguration	();
+	void		startAnnouncement	(const QString &, int);
+	void		stopAnnouncement	(const QString &, int);
 };
 
 #endif

_service:download_url:qt-dab-3.3.tar.gz/includes/ofdm/fib-table.h Added

@@ -0,0 +1,99 @@
+#
+/*
+ *    Copyright (C) 2018, 2019, 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * 	fib decoder. Functionality is shared between fic handler, i.e. the
+ *	one preparing the FIC blocks for processing, and the mainthread
+ *	from which calls are coming on selecting a program
+ *
+ *
+ *	Definition of the "configuration" as maintained during reception of
+ *	a channel
+ *
+ *	file is to be included in the source of fib-decoder
+ */
+// Tabelle ETSI EN 300 401 Page 50
+// Table is copied from the work of Michael Hoehn
+   const int ProtLevel[64][3]   = {{16,5,32},	// Index 0
+	                           {21,4,32},
+	                           {24,3,32},
+	                           {29,2,32},
+	                           {35,1,32},	// Index 4
+	                           {24,5,48},
+	                           {29,4,48},
+	                           {35,3,48},
+	                           {42,2,48},
+	                           {52,1,48},	// Index 9
+	                           {29,5,56},
+	                           {35,4,56},
+	                           {42,3,56},
+	                           {52,2,56},
+	                           {32,5,64},	// Index 14
+	                           {42,4,64},
+	                           {48,3,64},
+	                           {58,2,64},
+	                           {70,1,64},
+	                           {40,5,80},	// Index 19
+	                           {52,4,80},
+	                           {58,3,80},
+	                           {70,2,80},
+	                           {84,1,80},
+	                           {48,5,96},	// Index 24
+	                           {58,4,96},
+	                           {70,3,96},
+	                           {84,2,96},
+	                           {104,1,96},
+	                           {58,5,112},	// Index 29
+	                           {70,4,112},
+	                           {84,3,112},
+	                           {104,2,112},
+	                           {64,5,128},
+	                           {84,4,128},	// Index 34
+	                           {96,3,128},
+	                           {116,2,128},
+	                           {140,1,128},
+	                           {80,5,160},
+	                           {104,4,160},	// Index 39
+	                           {116,3,160},
+	                           {140,2,160},
+	                           {168,1,160},
+	                           {96,5,192},
+	                           {116,4,192},	// Index 44
+	                           {140,3,192},
+	                           {168,2,192},
+	                           {208,1,192},
+	                           {116,5,224},
+	                           {140,4,224},	// Index 49
+	                           {168,3,224},
+	                           {208,2,224},
+	                           {232,1,224},
+	                           {128,5,256},
+	                           {168,4,256},	// Index 54
+	                           {192,3,256},
+	                           {232,2,256},
+	                           {280,1,256},
+	                           {160,5,320},
+	                           {208,4,320},	// index 59
+	                           {280,2,320},
+	                           {192,5,384},
+	                           {280,3,384},
+	                           {416,1,384}};
+

_service:download_url:qt-dab-3.21.tar.gz/includes/ofdm/phasereference.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/ofdm/phasereference.h Changed

_service:download_url:qt-dab-3.21.tar.gz/includes/support/band-handler.h -> _service:download_url:qt-dab-3.3.tar.gz/includes/support/band-handler.h Changed

_service:download_url:qt-dab-3.3.tar.gz/includes/support/scanner-table.h Added

@@ -0,0 +1,57 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Programming
+ *
+ *    This file is part of Qt-DAB
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-scanner; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef	__SCANNER_TABLE__
+#define	__SCANNER_TABLE__
+
+#include	<QWidget>
+#include	<QObject>
+#include	<QScrollArea>
+#include	<QTableWidget>
+#include	<QStringList>
+#include	<QTableWidgetItem>
+#include	<QObject>
+#include	<QString>
+
+class	RadioInterface;
+
+class	scannerTable: QObject {
+Q_OBJECT
+public:
+		scannerTable	(RadioInterface *);
+		~scannerTable	();
+	void	show		();
+	void	hide		();
+	void	newEnsemble	(QString, QString, QString,
+	                                     QString, QString, QString);
+	void	add_to_Ensemble	(QString, QString, QString,
+	                                     QString, QString, QString);
+	void	clear		();
+private:
+	QScrollArea	*myWidget;
+	QTableWidget	*outputWidget;
+	int16_t		addRow	();
+	bool		is_clear;
+};
+
+#endif
+

_service:download_url:qt-dab-3.21.tar.gz/interfacing.txt -> _service:download_url:qt-dab-3.3.tar.gz/interfacing.txt Changed

@@ -27,7 +27,7 @@
 virtual		void	setVFOFrequency	(int32_t);
 virtual		int32_t	getVFOFrequency	(void);
 virtual		int32_t	defaultFrequency(void);
-virtual		bool	restartReader	(void);
+virtual		bool	restartReader	(int32_t);
 virtual		void	stopReader	(void);
 virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
 virtual		int32_t	Samples		(void);
@@ -51,6 +51,7 @@
 the function restartReader is supposed to start or restart the generation of 
 samples from the device. Note that while not specified explicitly
 the assumed samplerate is 2048000, with a bandwidth of 1536000 Hz.
+The parameter indicates the frequency to be selected
 
 the function stopReader will do the opposite,
 it will stop the generation of the samplestream.
@@ -59,25 +60,32 @@
 to 2048000, so in that driver the software takes care of translating the
 samplerate to 2048000.
 
-The function Samples will tell the amount of samples currently available, the qt-software
-will use that function to check whether or not sufficient samples are
-available to continue processing. 
+The function Samples will tell the amount of samples currently available,
+the qt-dab software will use that function to check whether or not
+sufficient samples are available to continue processing. 
+
 getSamples will try to extract the specified amount of samples - I/Q samples
 as complex float numbers - from the buffer from the device driver.
 It will return the amount actually read, in case the buffer in the
 device driver contains less than the requested amount, it will not wait.
+It assumes that the samplerate is just 2048000, i.e. rate conversions
+need to be done in the device handler.
 
 The function resetBuffer will clear the buffer in the device driver, it is
 used when switching channels.
 
 The function bitdepth returns - as the name suggests - the number of bits
 in the (elements of the) sample. E.g dabsticks provide 8 bits, SDRplay 12.
-The value is used to scale the scopes.
+The value is used to scale the Y-axis of the scopes.
 
 The device driver might have a small GUI, with probably a slider or spinbox
 for gain, and maybe other settings. See one of the existing device drivers
 for examples.
 
+if the drives does contain its own GUI, the function "show" is called
+whenever it should be visible, the function "hide" when it should
+be hidden and the function "isHidden" to return the status, being hidden or not.
+
 --------------------------------------------------------------------------
 Modifications to the file radio.cpp
 --------------------------------------------------------------------------
@@ -92,7 +100,6 @@
 #include	"new-device.h"
 #endif
 
-
 step 2.
 The selectable devices are listed in a combobox on the main GUI. 
 Add the lines

_service:download_url:qt-dab-3.21.tar.gz/main.cpp -> _service:download_url:qt-dab-3.3.tar.gz/main.cpp Changed

@@ -80,13 +80,14 @@
 QString		presetName	= PRESETS;
 int32_t		dataPort	= 8888;
 int     opt;
-
+QString freqExtension		= "";
+	
 	QCoreApplication::setOrganizationName ("Lazy Chair Computing");
 	QCoreApplication::setOrganizationDomain ("Lazy Chair Computing");
 	QCoreApplication::setApplicationName ("qt-dab");
 	QCoreApplication::setApplicationVersion (QString (CURRENT_VERSION) + " Git: " + GITHASH);
 
-	while ((opt = getopt (argc, argv, "i:P:Q:")) != -1) {
+	while ((opt = getopt (argc, argv, "i:P:Q:A:")) != -1) {
 	   switch (opt) {
 	      case 'i':
 	         initFileName = fullPathfor (QString (optarg));
@@ -96,7 +97,11 @@
 	         dataPort	= atoi (optarg);
 	         break;
 
-	     default:
+	      case 'A':
+	         freqExtension	= optarg;
+	         break;
+
+	      default:
 	         break;
 	   }
 	}
@@ -126,6 +131,7 @@
 
 	MyRadioInterface = new RadioInterface (dabSettings,
 	                                       presets,
+	                                       freqExtension,
 	                                       dataPort
                                                );
 	MyRadioInterface -> show();

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3-history.png Added

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3-kaal.png Added

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3-presets.png Added

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3.png Added

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-buttons.png Added

_service:download_url:qt-dab-3.21.tar.gz/qt-dab-installer.iss -> _service:download_url:qt-dab-3.3.tar.gz/qt-dab-installer.iss Changed

@@ -2,10 +2,10 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "qt-dab"
-#define MyAppVersion "3.21-Beta"
+#define MyAppVersion "3.3-Beta"
 #define MyAppPublisher "Lazy Chair Computing"
 #define MyAppURL "https://github.com/JvanKatwijk/qt-dab"
-#define MyAppExeName "qt-dab-3.21-Beta.exe";
+#define MyAppExeName "qt-dab-3.3.exe";
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -34,7 +34,7 @@
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "D:\sdr-j-development\windows-qt-dab\qt-dab-3.21-Beta.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\sdr-j-development\windows-qt-dab\qt-dab-3.3.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\sdr-j-development\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "C:\Users\JvanK\Downloads\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-scanner.png Added

_service:download_url:qt-dab-3.21.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-3.3.tar.gz/qt-dab.pro Changed

@@ -5,16 +5,16 @@
 ######################################################################
 
 TEMPLATE	= app
-TARGET		= qt-dab-3.21-Beta
+TARGET		= qt-dab-3.3
 QT		+= widgets xml
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
-#QMAKE_CFLAGS	+=  -flto -ffast-math
-#MAKE_CXXFLAGS	+=  -flto -ffast-math
-QMAKE_CFLAGS	+=  -g
-QMAKE_CXXFLAGS	+=  -g
-QMAKE_LFLAGS	+=  -g
+QMAKE_CFLAGS	+=  -flto -ffast-math
+MAKE_CXXFLAGS	+=  -flto -ffast-math
+#QMAKE_CFLAGS	+=  -g
+#QMAKE_CXXFLAGS	+=  -g
+#QMAKE_LFLAGS	+=  -g
 QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
 RC_ICONS	=  qt-dab.ico
 RESOURCES	+= resources.qrc
@@ -82,7 +82,6 @@
 # Input
 HEADERS += ./radio.h \
 	   ./dab-processor.h \
-	   ./scanner-table.h \
 	   ./service-description/service-descriptor.h \
 	   ./service-description/audio-descriptor.h \
 	   ./service-description/data-descriptor.h \
@@ -98,6 +97,8 @@
 	   ./includes/ofdm/tii_detector.h \
 	   ./includes/ofdm/fic-handler.h \
 	   ./includes/ofdm/fib-decoder.h  \
+	   ./includes/ofdm/fib-table.h \
+	   ./includes/ofdm/dab-config.h \
 	   ./includes/protection/protTables.h \
 	   ./includes/protection/protection.h \
 	   ./includes/protection/eep-protection.h \
@@ -115,7 +116,6 @@
 	   ./includes/backend/audio/mp2processor.h \
 	   ./includes/backend/audio/mp4processor.h \
 	   ./includes/backend/audio/bitWriter.h \
-	   ./includes/backend/audio/faad-decoder.h \
 	   ./includes/backend/data/data-processor.h \
 	   ./includes/backend/data/pad-handler.h \
 	   ./includes/backend/data/virtual-datahandler.h \
@@ -154,6 +154,7 @@
 	   ./includes/support/verysmallpushbutton.h \
 	   ./includes/support/smallqlistview.h \
 	   ./includes/support/history-handler.h \
+	   ./includes/support/scanner-table.h \
 	   ./includes/scopes-qwt6/spectrogramdata.h \
 	   ./includes/scopes-qwt6/iqdisplay.h \
 	   ./devices/virtual-input.h \
@@ -184,7 +185,6 @@
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
 	   ./dab-processor.cpp \
-	   ./scanner-table.cpp \
 	   ./service-description/audio-descriptor.cpp \
 	   ./service-description/data-descriptor.cpp \
 	   ./src/ofdm/timesyncer.cpp \
@@ -207,17 +207,16 @@
 	   ./src/backend/rscodec.cpp \
 	   ./src/backend/charsets.cpp \
 	   ./src/backend/firecode-checker.cpp \
-	   ./src/backend/frame-processor.cpp \
+#	   ./src/backend/frame-processor.cpp \
 	   ./src/backend/backend.cpp \
            ./src/backend/backend-driver.cpp \
            ./src/backend/backend-deconvolver.cpp \
 	   ./src/backend/audio/mp2processor.cpp \
 	   ./src/backend/audio/mp4processor.cpp \
 	   ./src/backend/audio/bitWriter.cpp \
-	   ./src/backend/audio/faad-decoder.cpp \
 	   ./src/backend/data/pad-handler.cpp \
 	   ./src/backend/data/data-processor.cpp \
-	   ./src/backend/data/virtual-datahandler.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 \
@@ -250,6 +249,7 @@
 	   ./src/support/verysmallpushbutton.cpp \
 	   ./src/support/smallqlistview.cpp \
 	   ./src/support/history-handler.cpp \
+	   ./src/support/scanner-table.cpp \
 	   ./src/scopes-qwt6/iqdisplay.cpp \
 	   ./devices/virtual-input.cpp \
 	   ./devices/xml-filewriter.cpp \
@@ -285,7 +285,6 @@
 LIBS		+= -lz
 LIBS		+= -lsndfile
 LIBS		+= -lsamplerate
-LIBS		+= -lfaad
 #correct this for the correct path to the qwt6 library on your system
 #LIBS		+= -lqwt
 LIBS		+= -lqwt-qt5
@@ -299,18 +298,20 @@
 CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
-CONFIG		+= soapy
+#CONFIG		+= soapy
 #CONFIG		+= elad_s1	# does not work yet
 
+CONFIG		+= faad
+#CONFIG		+= fdk-aac
 #very experimental, simple server for connecting to a tdc handler
-#CONFIG		+= datastreamer
+CONFIG		+= datastreamer
 
 #to handle output of embedded an IP data stream, uncomment
 CONFIG		+= send_datagram
 
 #if you want to listen remote, uncomment
 #CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default qt way of soud out
+#otherwise, if you want to use the default qt way of sound out
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
@@ -352,7 +353,6 @@
 #INCLUDEPATH	+= /mingw/include
 #INCLUDEPATH	+= /mingw64/include/qwt
 #INCLUDEPATH	+= C:/msys64/mingw64/include/qwt
-LIBS		+= -lfaad
 LIBS		+= -lfftw3f -lfftw3
 LIBS		+= -lportaudio
 LIBS		+= -lsndfile
@@ -362,14 +362,13 @@
 LIBS		+= -lwinmm
 LIBS 		+= -lstdc++
 LIBS		+= -lws2_32
-LIBS		+= -lfaad
 LIBS		+= -lusb-1.0
 LIBS		+= -lz
 #correct this for the correct path to the qwt6 library on your system
 #mingw64 wants the first one, cross compiling mingw64-32 the second one
 #LIBS		+= -lqwt
 LIBS		+= -lqwt-qt5
-
+CONFIG		+= faad
 #CONFIG		+= extio
 CONFIG		+= airspy
 CONFIG		+= rtl_tcp
@@ -425,7 +424,8 @@
 sdrplay-v3 {
 	DEFINES		+= HAVE_SDRPLAY_V3
 	DEPENDPATH	+= ./devices/sdrplay-handler-v3
-	INCLUDEPATH	+= ./devices/sdrplay-handler-v3
+	INCLUDEPATH	+= ./devices/sdrplay-handler-v3 \
+	                   ./devices/sdrplay-handler-v3/include
 	HEADERS		+= ./devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
 	                   ./devices/sdrplay-handler-v3/control-queue.h \
 	                   ./devices/sdrplay-handler-v3/sdrplay-controller.h 
@@ -595,4 +595,18 @@
 	SOURCES		+= ./src/support/viterbi-spiral/spiral-no-sse.c
 }
 
+faad	{
+	DEFINES		+= __WITH_FAAD__
+	HEADERS		+= ./includes/backend/audio/faad-decoder.h 
+	SOURCES		+= ./src/backend/audio/faad-decoder.cpp 
+	LIBS		+= -lfaad
+}
+
+fdk-aac	{
+	DEFINES		+= __WITH_FDK_AAC__
+	INCLUDEPATH	+= /usr/local/include/fdk-aac
+	HEADERS		+= ./includes/backend/audio/fdk-aac.h 
+	SOURCES		+= ./src/backend/audio/fdk-aac.cpp 
+	LIBS		+= -lfdk-aac
+}

_service:download_url:qt-dab-3.21.tar.gz/radio.cpp -> _service:download_url:qt-dab-3.3.tar.gz/radio.cpp Changed

@@ -148,10 +148,12 @@
 
 	RadioInterface::RadioInterface (QSettings	*Si,
 	                                const QString	&presetFile,
+	                                const QString	&freqExtension,
 	                                int32_t		dataPort,
 	                                QWidget		*parent):
 	                                        QWidget (parent),
 	                                        my_presetHandler (this),
+	                                        theBand (freqExtension),
 	                                        theTable (this) {
 int16_t	latency;
 int16_t k;
@@ -160,10 +162,10 @@
 uint8_t	dabBand;
 
 	dabSettings		= Si;
-	running. store (false);
-	scanning. store (false);
+	running. 		store (false);
+	scanning. 		store (false);
 	isSynced		= false;
-	serviceList. resize (0);
+	runningServices. 	resize (0);
 	spectrumBuffer          =
 	                  new RingBuffer<std::complex<float>> (2 * 32768);
 	iqBuffer		=
@@ -176,9 +178,8 @@
 	                  new RingBuffer<int16_t>(16 * 32768);
 	frameBuffer		=
 	                  new RingBuffer<uint8_t> (2 * 32768);
-
-	dataBuffer		= new RingBuffer<uint8_t>(32768);
-	
+	dataBuffer		=
+	                  new RingBuffer<uint8_t>(32768);
 	switchTime		=
 	                  dabSettings -> value ("switchTime", 8000). toInt ();
 	latency			=
@@ -189,7 +190,11 @@
 	if (has_presetName) {
 	   presetName		=
 	              dabSettings -> value ("presetname", ""). toString();
-	   serviceList. push_back (presetName);
+	   dabService s;
+	   s. serviceName = presetName;
+	   s. SId	  = 0;
+	   s. SCIds	  = 0;
+	   runningServices. push_back (s);
 	}
 #ifdef	_SEND_DATAGRAM_
 	ipAddress		= dabSettings -> value ("ipAddress", "127.0.0.1"). toString();
@@ -205,6 +210,7 @@
  *	stop whever a channel with data is found.
  */
 
+	noSort		= dabSettings -> value ("noSort", 0). toInt () == 1;
 	normalScan	= dabSettings -> value ("normalScan", 0). toInt () == 1;
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
@@ -257,6 +263,7 @@
 	                                       iqBuffer);
 
 	my_correlationViewer	= new correlationViewer (this,
+	                                                 dabSettings,
 	                                                 responseBuffer);
 
 	my_tiiViewer		= new tiiViewer (this, tiiBuffer);
@@ -489,7 +496,7 @@
 	                                      frameBuffer
 	                                      );
 
-	if (serviceList. size () > 0) {
+	if (runningServices. size () > 0) {
 	   presetTimer. setSingleShot	(true);
 	   presetTimer. setInterval 	(switchTime);
 	   presetTimer. start 		(switchTime);
@@ -512,9 +519,13 @@
 void	RadioInterface::dumpControlState (QSettings *s) {
 	if (s == nullptr)	// cannot happen
 	   return;
+	QString presetName;
+	
+	if (runningServices. size () > 0) {
+	   dabService serv = runningServices. back ();
+	   s	-> setValue ("presetname", serv. serviceName);
+	}
 
-	if (serviceList. size () > 0)
-	   s	-> setValue ("presetname", serviceList. back ());
 	s	-> setValue ("device",
 	                      deviceSelector -> currentText());
 	s	-> setValue ("channel",
@@ -545,15 +556,25 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 //	a slot, called by the fic/fib handlers
-void	RadioInterface::addtoEnsemble (const QString &serviceName) {
+void	RadioInterface::addtoEnsemble (const QString &serviceName,
+	                                             int32_t serviceId) {
 	if (!running. load())
 	   return;
 
+	(void)serviceId;
 	if (Services. contains (serviceName))
 	   return;
-
 	Services << serviceName;
-	Services. sort ();
+#if 0
+	fprintf (stderr, "adding %s serviceId %x subchId %d\n",
+	                          serviceName. toLatin1 (). data (),
+	                          serviceId, subChId);
+#endif
+	my_history -> addElement (channelSelector -> currentText (),
+	                                                        serviceName);
+
+	if (!noSort)
+	   Services. sort ();
 	model. clear ();
         for (const auto serv : Services)
            model. appendRow (new QStandardItem (serv));
@@ -562,9 +583,8 @@
            model. setData (model. index (i, 0),
                       QFont ("Cantarell", 11), Qt::FontRole);
         }
+
         ensembleDisplay -> setModel (&model);
-	my_history -> addElement (channelSelector -> currentText (),
-	                                                        serviceName);
 }
 //
 //	The ensembleId is written as hexadecimal, however, the 
@@ -722,12 +742,61 @@
 }
 
 /**
-  *	called from fic/fib
+  *	If a change is detected, we have to restart the selected
+  *	service - if any. If the service is a secondary service,
+  *	it might be the case that we have to start the main service
+  *	how do we find that?
   */
 void	RadioInterface::changeinConfiguration() {
-	if (running. load()) {
-	   stopChannel	();
-	   startChannel	(channelSelector -> currentText ());
+	if (running. load ()) {
+	   dabService s;
+	   if (runningServices. size () > 0) 
+	      s = runningServices. at (runningServices. size () - 1);
+	   stopScanning    ();
+	   stopService     ();
+	   fprintf (stderr, "change detected\n");
+//
+//	we rebuild the services list from the fib and
+//	then we (try to) restart the service
+	   Services	= my_dabProcessor -> getServices ();
+	   if (!noSort) {
+	      Services. sort	();
+	      model. clear	();
+	      for (const auto serv : Services)
+	         model. appendRow (new QStandardItem (serv));
+	      int row = model. rowCount ();
+	      for (int i = 0; i < row; i ++) {
+	         model. setData (model. index (i, 0),
+	         QFont ("Cantarell", 11), Qt::FontRole);
+	      }
+	   }
+	   ensembleDisplay -> setModel (&model);
+//
+//	and restart the one that was running
+	   if (s. serviceName != "") {
+	      if (s. SCIds != 0) { // secondary service may be gone
+	         if (my_dabProcessor -> findService (s. SId, s. SCIds) ==
+	                                                   s. serviceName) {
+	            runningServices. push_back (s);
+	            startService (&s);
+	            return;
+	         }
+	         else {
+	            s. SCIds = 0;
+	            s. serviceName =
+	                  my_dabProcessor -> findService (s. SId, s. SCIds);
+	         }
+	      }
+//	checking for the main service
+	      if (s. serviceName != 
+	                 my_dabProcessor -> findService (s. SId, s. SCIds)) {
+	         QMessageBox::warning (this, tr ("Warning"),
+                                tr ("insufficient data for this program\n"));
+                 return;
+              }
+	      runningServices. push_back (s);
+	      startService (&s);
+	   }
 	}
 }
 //
@@ -1200,6 +1269,7 @@

_service:download_url:qt-dab-3.21.tar.gz/radio.h -> _service:download_url:qt-dab-3.3.tar.gz/radio.h Changed

@@ -63,23 +63,36 @@
  *	The main gui object. It inherits from
  *	QWidget and the generated form
  */
+
+class dabService {
+public:
+	QString		serviceName;
+	uint32_t	SId;
+	int		SCIds;
+};
+	
 class RadioInterface: public QWidget, private Ui_dabradio {
 Q_OBJECT
 public:
 		RadioInterface		(QSettings	*,
 	                                 const QString	&,
+	                                 const QString	&,
 	                                 int32_t	 dataPort,
 	                                 QWidget	*parent = nullptr);
-		~RadioInterface();
+		~RadioInterface		();
 
 protected:
-	bool	eventFilter (QObject *obj, QEvent *event);
+	bool			eventFilter (QObject *obj, QEvent *event);
 private:
 	QString			version;
+	bool			noSort;
+	presetHandler		my_presetHandler;
+	bandHandler		theBand;
+	scannerTable		theTable;
 	Ui_technical_data	techData;
 	QFrame			*dataDisplay;
 	QSettings		*dabSettings;
-	std::vector<QString>	serviceList;
+	std::vector<dabService>	runningServices;
         spectrumViewer		*my_spectrumViewer;
 	RingBuffer<std::complex<float>>  *spectrumBuffer;
 	RingBuffer<std::complex<float>>  *iqBuffer;
@@ -89,15 +102,12 @@
 	tiiViewer		*my_tiiViewer;
 
 	bool			normalScan;
-	presetHandler		my_presetHandler;
-	scannerTable		theTable;
 	int16_t			tii_delay;
 	int32_t			dataPort;
 	serviceDescriptor	*currentService;
 
 	std::vector<int>	secondariesVector;
 	bool			isSynced;
-	bandHandler		theBand;
 	std::atomic<bool>	running;
 	std::atomic<bool>	scanning;
 	virtualInput		*inputDevice;
@@ -157,15 +167,16 @@
 	void			startChannel		(const QString &);
 	void			stopChannel		();
 	void			stopService		();
-	void			startService		(const QString &);
+	void			startService		(dabService *);
 	void			colorService		(QModelIndex ind,
 	                                                   QColor c, int pt);
 	void			localSelect		(const QString &s);
 	QString			filenameSuggestion 	(QString);
 	void			showServices		();
+
 public slots:
 	void			set_CorrectorDisplay	(int);
-	void			addtoEnsemble		(const QString &);
+	void			addtoEnsemble		(const QString &, int);
 	void			nameofEnsemble		(int, const QString &);
 	void			show_frameErrors	(int);
 	void			show_rsErrors		(int);
@@ -186,7 +197,7 @@
 	void			No_Signal_Found		();
 	void			show_motHandling	(bool);
 	void			setSyncLost		();
-	void			showImpulse		(int);
+	void			showCorrelation		(int, int);
 	void			showIndex		(int);
 	void			showSpectrum		(int);
 	void			showIQ			(int);

_service:download_url:qt-dab-3.21.tar.gz/script-for-debian -> _service:download_url:qt-dab-3.3.tar.gz/script-for-debian Changed

_service:download_url:qt-dab-3.21.tar.gz/server-thread/tcp-server.cpp -> _service:download_url:qt-dab-3.3.tar.gz/server-thread/tcp-server.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/service-description/audio-descriptor.cpp -> _service:download_url:qt-dab-3.3.tar.gz/service-description/audio-descriptor.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/service-description/data-descriptor.cpp -> _service:download_url:qt-dab-3.3.tar.gz/service-description/data-descriptor.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/sound-client/audiosink.cpp -> _service:download_url:qt-dab-3.3.tar.gz/sound-client/audiosink.cpp Changed

@@ -53,11 +53,11 @@
 	   qDebug ("Api %d is %s\n", i, Pa_GetHostApiInfo (i) -> name);
 
 	numofDevices	= Pa_GetDeviceCount ();
-	ostream		= NULL;
+	ostream		= nullptr;
 }
 
 	audioSink::~audioSink	(void) {
-	if ((ostream != NULL) && !Pa_IsStreamStopped (ostream)) {
+	if ((ostream != nullptr) && !Pa_IsStreamStopped (ostream)) {
 	   paCallbackReturn = paAbort;
 	   (void) Pa_AbortStream (ostream);
 	   while (!Pa_IsStreamStopped (ostream))
@@ -65,7 +65,7 @@
 	   writerRunning = false;
 	}
 
-	if (ostream != NULL)
+	if (ostream != nullptr)
 	   Pa_CloseStream (ostream);
 
 	if (portAudio)
@@ -80,7 +80,7 @@
 	if (!isValidDevice (odev))
 	   return false;
 
-	if ((ostream != NULL) && !Pa_IsStreamStopped (ostream)) {
+	if ((ostream != nullptr) && !Pa_IsStreamStopped (ostream)) {
 	   paCallbackReturn = paAbort;
 	   (void) Pa_AbortStream (ostream);
 	   while (!Pa_IsStreamStopped (ostream))
@@ -88,7 +88,7 @@
 	   writerRunning = false;
 	}
 
-	if (ostream != NULL)
+	if (ostream != nullptr)
 	   Pa_CloseStream (ostream);
 
 	outputParameters. device		= odev;
@@ -103,11 +103,11 @@
 //	if (bufSize < 0 || bufSize > 17300)
 //	   bufSize = 16384;
 
-	outputParameters. hostApiSpecificStreamInfo = NULL;
+	outputParameters. hostApiSpecificStreamInfo = nullptr;
 //
 	fprintf (stderr, "Suggested size for outputbuffer = %d\n", bufSize);
 	err = Pa_OpenStream (&ostream,
-	                     NULL,
+	                     nullptr,
 	                     &outputParameters,
 	                     CardRate,
 	                     bufSize,
@@ -165,9 +165,9 @@
 	outputParameters -> channelCount	= 2;	/* I and Q	*/
 	outputParameters -> sampleFormat	= paFloat32;
 	outputParameters -> suggestedLatency	= 0;
-	outputParameters -> hostApiSpecificStreamInfo = NULL;
+	outputParameters -> hostApiSpecificStreamInfo = nullptr;
 
-	return Pa_IsFormatSupported (NULL, outputParameters, Rate) ==
+	return Pa_IsFormatSupported (nullptr, outputParameters, Rate) ==
 	                                          paFormatIsSupported;
 }
 /*
@@ -233,7 +233,7 @@
 	   return name;
 
 	deviceInfo = Pa_GetDeviceInfo (ch);
-	if (deviceInfo == NULL)
+	if (deviceInfo == nullptr)
 	   return name;
 	if (deviceInfo -> maxOutputChannels <= 0)
 	   return name;

_service:download_url:qt-dab-3.21.tar.gz/spectrum-viewer/scopewidget.ui -> _service:download_url:qt-dab-3.3.tar.gz/spectrum-viewer/scopewidget.ui Changed

_service:download_url:qt-dab-3.21.tar.gz/src/backend/audio/bitWriter.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/audio/bitWriter.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/backend/audio/faad-decoder.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/audio/faad-decoder.cpp Changed

_service:download_url:qt-dab-3.3.tar.gz/src/backend/audio/fdk-aac.cpp Added

@@ -0,0 +1,119 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *	Use the fdk-aac library.
+ */
+#include	"mp4processor.h"
+#include	"radio.h"
+//
+#include	<cstring>
+#include	"charsets.h"
+#include	"fdk-aac.h"
+
+//
+/**
+  *	\class mp4Processor is the main handler for the aac frames
+  *	the class proper processes input and extracts the aac frames
+  *	that are processed by the "faadDecoder" class
+  */
+	fdkAAC::fdkAAC (RadioInterface *mr,
+                        RingBuffer<int16_t> *buffer) {
+        this    -> audioBuffer  = buffer;
+	working			= false;
+	handle			= aacDecoder_Open (TT_MP4_LOAS, 1);
+	if (handle == nullptr)
+	   return;
+	connect (this, SIGNAL (newAudio (int, int)),
+	         mr, SLOT (newAudio (int, int)));
+	working			= true;
+}
+
+	fdkAAC::~fdkAAC () {
+	if (working)
+	   aacDecoder_Close (handle);
+}
+
+int16_t	fdkAAC::MP42PCM (stream_parms *sp,
+                         uint8_t   packet [],
+                         int16_t   packetLength) {
+uint32_t	packet_size;
+uint32_t	valid;
+AAC_DECODER_ERROR err;
+uint8_t		*ptr	= packet;
+INT_PCM 	decode_buf [8 * sizeof (INT_PCM) * 2048];
+INT_PCM		*bufp	= &decode_buf [0];
+int		output_size	= 8 * 2048; 
+
+	if (!working)
+	   return -1;
+
+	if ((packet [0] != 0x56)  || ((packet [1] >> 5) != 7)) 
+	   return -1;
+
+
+	packet_size  = ((packet [1] & 0x1F) << 8) | packet [2] + 3;
+	if (packet_size != packetLength)
+	   return -1;
+
+	valid = packet_size;
+	err = aacDecoder_Fill (handle, &ptr, &packet_size, &valid);
+	if (err != AAC_DEC_OK) 
+	   return -1;
+
+	err = aacDecoder_DecodeFrame (handle,
+	                              bufp,
+		                      output_size, 0);
+	if (err == AAC_DEC_NOT_ENOUGH_BITS)
+	   return -1;
+
+	if (err != AAC_DEC_OK) 
+	   return -1;
+
+	CStreamInfo *info = aacDecoder_GetStreamInfo (handle);
+	if (!info || info -> sampleRate <= 0) 
+	   return -1;
+
+        if (info -> numChannels == 2) {
+           audioBuffer  -> putDataIntoBuffer (bufp, info -> frameSize * 2);
+	   if (audioBuffer -> GetRingBufferReadAvailable() >
+	                          (int)info -> sampleRate / 8)
+              newAudio (info -> frameSize, info -> sampleRate);
+        }
+        else
+        if (info -> numChannels == 1) {
+           int16_t *buffer = (int16_t *)alloca (2 * info -> frameSize);
+           int16_t i;
+           for (i = 0; i < info -> frameSize; i ++) {
+              buffer [2 * i]	= ((int16_t *)bufp) [i];
+              buffer [2 * i + 1] = bufp [2 * i];
+           }
+           audioBuffer  -> putDataIntoBuffer (buffer, info -> frameSize * 2);
+	   if (audioBuffer -> GetRingBufferReadAvailable() >
+	                          (int)info -> sampleRate / 8)
+              newAudio (info -> frameSize, info -> sampleRate);
+        }
+        else
+           fprintf (stderr, "Cannot handle these channels\n");
+
+        return info -> numChannels; 
+}
+

_service:download_url:qt-dab-3.21.tar.gz/src/backend/audio/mp4processor.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/audio/mp4processor.cpp Changed

@@ -24,7 +24,7 @@
  *	is the addition from Stefan Poeschel to create a
  *	header for the aac that matches, really a big help!!!!
  *
- *	Furthermore, the code in the "build_aacFile" function is
+ *	(2019:)Furthermore, the code in the "build_aacFile" function is
  *	his as well. Chapeau!
  ************************************************************************
  */
@@ -35,6 +35,7 @@
 #include	"charsets.h"
 #include	"pad-handler.h"
 #include	"bitWriter.h"
+
 //
 /**
   *	\class mp4Processor is the main handler for the aac frames
@@ -42,13 +43,12 @@
   *	that are processed by the "faadDecoder" class
   */
 	mp4Processor::mp4Processor (RadioInterface	*mr,
-	                            int16_t	bitRate,
+	                            int16_t		bitRate,
 	                            RingBuffer<int16_t> *b,
 	                            RingBuffer<uint8_t> *frameBuffer,
 	                            QString	picturesPath)
 	                               :my_padhandler (mr, picturesPath),
- 	                                my_rsDecoder (8, 0435, 0, 1, 10),
-	                                aacDecoder (mr, b) {
+ 	                                my_rsDecoder (8, 0435, 0, 1, 10) {
 
 	myRadioInterface	= mr;
 	this	-> frameBuffer	= frameBuffer;
@@ -62,7 +62,11 @@
 	         mr, SLOT (setStereo (bool)));
 	connect (this, SIGNAL (newFrame (int)),
 	         mr, SLOT (newFrame (int)));
-
+#ifdef	__WITH_FDK_AAC__
+	aacDecoder		= new fdkAAC (mr, b);
+#else
+	aacDecoder		= new faadDecoder (mr, b);
+#endif
 	this	-> bitRate	= bitRate;	// input rate
 
 	superFramesize		= 110 * (bitRate / 8);
@@ -80,6 +84,7 @@
 }
 
 	mp4Processor::~mp4Processor() {
+	delete aacDecoder;
 }
 
 /**
@@ -264,8 +269,6 @@
 //	but first the crc check
 	   if (check_crc_bytes (&outVector [au_start [i]],
 	                                aac_frame_length)) {
-	      bool err;
-//
 //	first handle the pad data if any
 	      if (((outVector [au_start [i + 0]] >> 5) & 07) == 4) {
 	                                      
@@ -288,16 +291,21 @@
 	      newFrame (segmentSize);
 //
 //	then handle the audio
-
+#ifdef	__WITH_FDK_AAC__
+	      tmp = aacDecoder -> MP42PCM (&streamParameters, 
+	                                   fileBuffer. data (), 
+	                                   segmentSize);
+#else
 	      uint8_t theAudioUnit [2 * 960 + 10];	// sure, large enough
 
 	      memcpy (theAudioUnit,
 	                 &outVector [au_start [i]], aac_frame_length);
 	      memset (&theAudioUnit [aac_frame_length], 0, 10);
 
-	      tmp = aacDecoder. MP42PCM (&streamParameters,
-	                                 theAudioUnit,
-	                                 aac_frame_length);
+	      tmp = aacDecoder -> MP42PCM (&streamParameters,
+	                                   theAudioUnit,
+	                                   aac_frame_length);
+#endif
 //	      emit isStereo (streamParameters. aacChannelMode);
 	      emit isStereo (tmp == 2);

_service:download_url:qt-dab-3.21.tar.gz/src/backend/backend.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/backend.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/backend/data/data-processor.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/data/data-processor.cpp Changed

@@ -48,6 +48,7 @@
 	this	-> expectedIndex	= 0;
 	switch (DSCTy) {
 	   default:
+	      fprintf (stderr, "DSCTy %d not supported\n", DSCTy);
 	      my_dataHandler	= new virtual_dataHandler();
 	      break;
 
@@ -66,6 +67,7 @@
 	   case 60:
 	      my_dataHandler	= new motHandler (mr, picturesPath);
 	      break;
+	   
 	}
 
 	packetState	= 0;
@@ -113,7 +115,6 @@
 int16_t	address		= getBits   (data, 6, 10);
 uint16_t command	= getBits_1 (data, 16);
 int32_t	usefulLength	= getBits_7 (data, 17);
-int32_t	i;
 //	if (usefulLength > 0)
 //	      fprintf (stderr, "CI = %d, address = %d, usefulLength = %d\n",
 //	                       continuityIndex, address, usefulLength);
@@ -142,13 +143,13 @@
 	   if (firstLast == 02) {	// first packet
 	      packetState = 1;
 	      series. resize (usefulLength * 8);
-	      for (i = 0; i < series. size(); i ++)
+	      for (uint16_t i = 0; i < series. size(); i ++)
 	         series [i] = data [24 + i];
 	   }
 	   else
 	   if (firstLast == 03) {	// single packet, mostly padding
 	      series. resize (usefulLength * 8);
-	      for (i = 0; i < series. size(); i ++)
+	      for (uint16_t i = 0; i < series. size(); i ++)
 	         series [i] = data [24 + i];
 	      my_dataHandler	-> add_mscDatagroup (series);
 	   }
@@ -160,14 +161,14 @@
 	   if (firstLast == 0) {	// intermediate packet
 	      int32_t currentLength = series. size();
 	      series. resize (currentLength + 8 * usefulLength);
-	      for (i = 0; i < 8 * usefulLength; i ++)
+	      for (uint16_t i = 0; i < 8 * usefulLength; i ++)
 	         series [currentLength + i] = data [24 + i];
 	   }
 	   else
 	   if (firstLast == 01) {	// last packet
 	      int32_t currentLength = series. size();
 	      series. resize (currentLength + 8 * usefulLength);
-	      for (i = 0; i < 8 * usefulLength; i ++)
+	      for (uint16_t i = 0; i < 8 * usefulLength; i ++)
 	         series [currentLength + i] = data [24 + i];
 
 	      my_dataHandler	-> add_mscDatagroup (series);
@@ -177,7 +178,7 @@
 	   if (firstLast == 02) {	// first packet, previous one erroneous
 	      packetState = 1;
 	      series. resize (usefulLength * 8);
-	      for (i = 0; i < series. size(); i ++)
+	      for (uint16_t i = 0; i < series. size(); i ++)
 	         series [i] = data [24 + i];
 	   }
 	   else {

_service:download_url:qt-dab-3.21.tar.gz/src/backend/data/mot/mot-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/data/mot/mot-handler.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/backend/data/mot/mot-object.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/data/mot/mot-object.cpp Changed

@@ -52,7 +52,7 @@
 	contentsubType	= ((segment [5] & 0x01) << 8) | segment [6];
 
 //	we are actually only interested in the name, if any
-        while (pointer < headerSize) {
+        while ((uint16_t)pointer < headerSize) {
            uint8_t PLI	= (segment [pointer] & 0300) >> 6;
            uint8_t paramId = (segment [pointer] & 077);
            uint16_t     length;
@@ -158,6 +158,7 @@
 	   checkDir (realName);
 	   std::vector<uint8_t> epgData (result. begin(), result. end());
 	   epgHandler. decode (epgData, realName);
+	   fprintf (stderr, "epg file %s\n", realName. toLatin1 (). data ());
 #endif
 	   return;
 	}
@@ -173,7 +174,7 @@
 	   fprintf (stderr, "going to write file %s\n",
 	                         realName. toUtf8(). data());
 	   checkDir (realName);
-	   FILE *x = fopen (realName. toLatin1(). data(), "w+b");
+	   FILE *x = fopen (realName. toLatin1 (). data(), "w+b");
 	   if (x == nullptr)
 	      fprintf (stderr, "cannot write file %s\n",
 	                           realName. toUtf8(). data());

_service:download_url:qt-dab-3.21.tar.gz/src/backend/data/pad-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/data/pad-handler.cpp Changed

@@ -269,7 +269,7 @@
 //	A dynamic label is created from a sequence of (dynamic) xpad
 //	fields, starting with CI = 2, continuing with CI = 3
 void	padHandler::dynamicLabel (uint8_t *data, int16_t length, uint8_t CI) {
-static int16_t segmentno           = 0;
+static int16_t segmentno	   = 0;
 static int16_t remainDataLength    = 0;
 static bool    isLastSegment       = false;
 static bool    moreXPad            = false;
@@ -367,7 +367,7 @@
 //	   show_motHandling (true);
 //	}
 
-	if (data. size() >= dataGroupLength) {	// msc element is single item
+	if (data. size() >= (uint16_t)dataGroupLength) { // msc element is single item
 	   msc_dataGroupBuffer. clear();
 	   build_MSC_segment (data);
 	   mscGroupElement = false;
@@ -384,7 +384,6 @@
 
 //
 void	padHandler::add_MSC_element	(std::vector<uint8_t> data) {
-int16_t	i;
 int32_t	currentLength = msc_dataGroupBuffer. size();
 //
 //	just to ensure that, when a "12" appType is missing, the
@@ -395,7 +394,7 @@
 
 	msc_dataGroupBuffer. insert (std::end (msc_dataGroupBuffer),
 	                             std::begin (data), std::end (data));
-	if (msc_dataGroupBuffer. size() >= dataGroupLength) {
+	if (msc_dataGroupBuffer. size() >= (uint32_t)dataGroupLength) {
 	   build_MSC_segment (msc_dataGroupBuffer);
 	   msc_dataGroupBuffer. clear();
 //	   mscGroupElement	= false;
@@ -407,16 +406,16 @@
 //	we have a MOT segment, let us look what is in it
 //	according to DAB 300 401 (page 37) the header (MSC data group)
 //	is
-int32_t	size	= data. size() < dataGroupLength ? data. size() :
+int32_t	size	= data. size() < (uint32_t)dataGroupLength ? data. size() :
 	                                            dataGroupLength;
 	   
-	uint8_t		groupType	=  data [0] & 0xF;
-	uint8_t		continuityIndex = (data [1] & 0xF0) >> 4;
-	uint8_t		repetitionIndex =  data [1] & 0xF;
-	int16_t		segmentNumber	= -1;		// default
-	uint16_t	transportId	= 0;	// default
-	bool		lastFlag	= false;	// default
-	uint16_t	index;
+uint8_t		groupType	=  data [0] & 0xF;
+//uint8_t	continuityIndex = (data [1] & 0xF0) >> 4;
+//uint8_t	repetitionIndex =  data [1] & 0xF;
+int16_t		segmentNumber	= -1;		// default
+uint16_t	transportId	= 0;	// default
+bool		lastFlag	= false;	// default
+uint16_t	index;
 
 	if ((data [0] & 0x40) != 0) {
 	   bool res	= check_crc_bytes (data. data(), size - 2);

_service:download_url:qt-dab-3.21.tar.gz/src/backend/data/tdc-datahandler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/data/tdc-datahandler.cpp Changed

@@ -41,9 +41,9 @@
 //---------------------------------------------------------------------------
 uint16_t usCalculCRC (uint8_t *buf, int lg) {
 uint16_t crc;
-uint	count;
+int	count;
 	crc = 0xFFFF;
-	for (count= 0; count < lg; count++) {
+	for (count = 0; count < lg; count++) {
 	   crc = (uint16_t) (swap (crc) ^ (uint16_t)buf [count]);
 	   crc ^= ((uint8_t)crc) >> 4;
 	   crc = (uint16_t)
@@ -94,16 +94,14 @@
 	   int size = length < 11 ? length : 11;
 	   for (i = 0; i < size; i ++)
 	      checkVector [5 + i] = getBits (data,  offset + 7 * 8 + i * 8, 8);
-	   checkVector [5 + length] = getBits (data, offset + 4 * 8, 8);
-	   checkVector [5 + length + 1] =
-	                                 getBits (data, offset + 5 * 8, 8);
-	   if (check_crc_bytes (checkVector, 5 + length + 2) != 0) {
+	   checkVector [5 + size]	= getBits (data, offset + 4 * 8, 8);
+	   checkVector [5 + size + 1]	= getBits (data, offset + 5 * 8, 8);
+	   if (!check_crc_bytes (checkVector, 5 + size)) {
 	      fprintf (stderr, "crc failed\n");
 	      return;
 	   }
 
-//	   fprintf (stderr, "handling tdc frametype %d\n", frametypeIndicator);
-	   if (frametypeIndicator == 0)
+	   if (frametypeIndicator == 0) 
 	      offset = handleFrame_type_0 (data, offset + 7 * 8, length);
 	   else
 	   if (frametypeIndicator == 1)
@@ -114,13 +112,19 @@
 }
 
 int32_t	tdc_dataHandler::handleFrame_type_0 (uint8_t *data,
-	                                    int32_t offset, int32_t length) {
+	                                     int32_t offset, int32_t length) {
 int16_t i;
 int16_t noS	= getBits (data, offset, 8);
 uint8_t buffer [length];
-
+	
 	for (i = 0; i < length; i ++)
 	   buffer [i] = getBits (data, offset + i * 8, 8);
+	if (!check_crc_bytes (buffer, length - 2))
+	   fprintf (stderr, "crc ook hier fout\n");
+#if 0
+	fprintf (stderr, "nrServices %d, SID-A %d SID-B %d SID-C %d\n",
+	                  buffer [0], buffer [1], buffer [2], buffer [3]);
+#endif
 	dataBuffer -> putDataIntoBuffer (buffer, length);
 	bytesOut (0, length);
 	return offset + length * 8;
@@ -131,17 +135,35 @@
 	                                     int32_t length) {
 int16_t i;
 uint8_t buffer [length];
-
-//	fprintf (stderr, " frametype 1 met %o %o %o\n",
-//                                     getBits (data, offset,      8),
-//                                     getBits (data, offset + 8,  8),
-//                                     getBits (data, offset + 16, 8));
-
-//	fprintf (stderr, "encryption %d\n", getBits (data, offset + 24, 8));
-
+int	lOffset;
+int	llengths = length - 4;
+#if 0
+	fprintf (stderr, " frametype 1  (length %d) met %d %d %d\n", length,
+	                             getBits (data, offset,      8),
+	                             getBits (data, offset + 8,  8),
+	                             getBits (data, offset + 16, 8));
+	fprintf (stderr, "encryption %d\n", getBits (data, offset + 24, 8));
+#endif
 	for (i = 0; i < length; i ++)
 	   buffer [i] = getBits (data, offset + i * 8, 8);
 	dataBuffer	-> putDataIntoBuffer (buffer, length);
+	if (getBits (data, offset + 24, 8) == 0) {	// no encryption
+	   lOffset	= offset + 4 * 8;
+	   do {
+	      int compInd	= getBits (data, lOffset, 8);	
+	      int flength	= getBits (data, lOffset + 8, 16);
+	      int crc		= getBits (data, lOffset + 3 * 8, 8);
+#if 0
+	      fprintf (stderr, "segment %d, length %d\n",
+	                                 compInd, flength);
+	      for (i = 5; i < flength; i ++)
+	         fprintf (stderr, "%c", buffer [i]);
+	      fprintf (stderr, "\n");
+#endif
+	      lOffset	+= (flength + 5) * 8;
+	      llengths -= flength + 5;
+	   } while (llengths > 10);
+	}
 	bytesOut (1, length);
 	return offset + length * 8;
 }
@@ -160,6 +182,7 @@
 int16_t	length	= getBits (data, offset + 8, 16);
 int16_t	size	= length < 13 ? length : 13;
 uint16_t	crc;
+
 	if (length < 0)
 	   return false;		// assumed garbage
 	crc	= getBits (data, offset + 24, 16); 	// the crc

_service:download_url:qt-dab-3.21.tar.gz/src/backend/msc-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/backend/msc-handler.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/ofdm/fib-decoder.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/ofdm/fib-decoder.cpp Changed

@@ -1,10 +1,11 @@
 #
 /*
- *    Copyright (C) 2018, 2019
+ *    Copyright (C) 2018, 2019, 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
  *    This file is part of the Qt-DAB program
+ *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
@@ -28,282 +29,39 @@
 #include	<vector>
 #include	"radio.h"
 #include	"charsets.h"
+#include	"dab-config.h"
+#include	"fib-table.h"
 //
 //
-// Tabelle ETSI EN 300 401 Page 50
-// Table is copied from the work of Michael Hoehn
-   const int ProtLevel[64][3]   = {{16,5,32},	// Index 0
-	                           {21,4,32},
-	                           {24,3,32},
-	                           {29,2,32},
-	                           {35,1,32},	// Index 4
-	                           {24,5,48},
-	                           {29,4,48},
-	                           {35,3,48},
-	                           {42,2,48},
-	                           {52,1,48},	// Index 9
-	                           {29,5,56},
-	                           {35,4,56},
-	                           {42,3,56},
-	                           {52,2,56},
-	                           {32,5,64},	// Index 14
-	                           {42,4,64},
-	                           {48,3,64},
-	                           {58,2,64},
-	                           {70,1,64},
-	                           {40,5,80},	// Index 19
-	                           {52,4,80},
-	                           {58,3,80},
-	                           {70,2,80},
-	                           {84,1,80},
-	                           {48,5,96},	// Index 24
-	                           {58,4,96},
-	                           {70,3,96},
-	                           {84,2,96},
-	                           {104,1,96},
-	                           {58,5,112},	// Index 29
-	                           {70,4,112},
-	                           {84,3,112},
-	                           {104,2,112},
-	                           {64,5,128},
-	                           {84,4,128},	// Index 34
-	                           {96,3,128},
-	                           {116,2,128},
-	                           {140,1,128},
-	                           {80,5,160},
-	                           {104,4,160},	// Index 39
-	                           {116,3,160},
-	                           {140,2,160},
-	                           {168,1,160},
-	                           {96,5,192},
-	                           {116,4,192},	// Index 44
-	                           {140,3,192},
-	                           {168,2,192},
-	                           {208,1,192},
-	                           {116,5,224},
-	                           {140,4,224},	// Index 49
-	                           {168,3,224},
-	                           {208,2,224},
-	                           {232,1,224},
-	                           {128,5,256},
-	                           {168,4,256},	// Index 54
-	                           {192,3,256},
-	                           {232,2,256},
-	                           {280,1,256},
-	                           {160,5,320},
-	                           {208,4,320},	// index 59
-	                           {280,2,320},
-	                           {192,5,384},
-	                           {280,3,384},
-	                           {416,1,384}};
-
-//
-class	service {
-public:
-	service() {
-	   clear();
-	}
-	~service() {
-		clear();
-	}
-	void		clear() {
-	   inUse	= false;
-	   hasName	= false;
-	   language	= 0;
-	   programType	= 0;
-	   serviceLabel	= "";
-	   is_shown	= false;
-	   fmFrequency	= -1;
-	}
-	bool		inUse;
-	uint32_t	serviceId;
-	bool		hasName;
-	QString		serviceLabel;
-	int		language;
-	int		programType;
-	bool		is_shown;
-	int32_t		fmFrequency;
-};
-
-class ensembleDescriptor {
-public:
-	ensembleDescriptor() {
-	   clear();
-	   for (int i = 0; i < 64; i ++)
-	   services [i]. clear();
-	}
-	~ensembleDescriptor() {}
-	void		clear() {
-	   namePresent	= false;
-	   ecc_Present	= false;
-	   isSynced	= false;
-	}
-	QString ensembleName;
-	int32_t ensembleId;
-	bool    namePresent;
-	bool	ecc_Present;
-	uint8_t	ecc_byte;
-	bool	isSynced;
-	service	services [64];
-};
-
-class	subChannelDescriptor {
-public:
-	subChannelDescriptor() {
-	   clear();
-	}
-	~subChannelDescriptor() {}
-	void		clear() {
-	   inUse	= false;
-	   language	= 0;
-	   FEC_scheme	= 0;
-	}
-	bool		inUse;
-	int32_t		SubChId;
-	int32_t		startAddr;
-	int32_t		Length;
-	bool		shortForm;
-	int32_t		protLevel;
-	int32_t		bitRate;
-	int16_t		language;
-	int16_t		FEC_scheme;
-	int16_t		SCIds;		// for audio channels
-};
-
-//      The service component describes the actual service
-//      It really should be a union, the component data for
-//      audio and data are quite different
-class	serviceComponentDescriptor {
-public:
-	serviceComponentDescriptor() {
-	   clear();
-	}
-	~serviceComponentDescriptor() {}
-	void		clear() {
-	   inUse		= false;
-	   is_madePublic	= false;
-	   SCIds		= -1;
-	   componentNr		= -1;
-	   SCId			= -1;
-	   componentNr		= -1;
-	}
-
-	bool		inUse;		// field in use
-	int8_t		TMid;		// the transport mode
-	int16_t		serviceIndex;	// belongs to the service
-	int16_t		subchannelId;	// used in both audio and packet
-	int16_t		componentNr;    // component
-	int16_t		SCIds;		// component within service
-	int16_t		ASCTy;          // used for audio
-	int16_t		PS_flag;	// use for both audio and packet
-	uint16_t	SCId;           // Component Id (12 bit, unique)
-	uint8_t		CAflag;         // used in packet (or not at all)
-	int16_t		DSCTy;		// used in packet
-	uint8_t		DGflag;         // used for TDC
-	int16_t		packetAddress;  // used in packet
-	int16_t		appType;        // used in packet and Xpad
-	int16_t		language;
-	bool		is_madePublic;  // used to make service visible
-};
-
-//
-//	The implementation of the services is in service components
-//	and subchannels. We prepare - a little - for the possibility

_service:download_url:qt-dab-3.21.tar.gz/src/ofdm/fic-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/ofdm/fic-handler.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/ofdm/ofdm-decoder.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/ofdm/ofdm-decoder.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/ofdm/phasereference.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/ofdm/phasereference.cpp Changed

@@ -1,4 +1,3 @@
-
 #
 /*
  *    Copyright (C) 2014 .. 2017
@@ -77,8 +76,8 @@
 	   phaseDifferences [i - 1] = abs (arg (refTable [(T_u + i) % T_u] *
 	                         conj (refTable [(T_u + i + 1) % T_u])));
 
-	connect (this, SIGNAL (showImpulse (int)),
-	         mr,   SLOT   (showImpulse (int)));
+	connect (this, SIGNAL (showCorrelation (int, int)),
+	         mr,   SLOT   (showCorrelation (int, int)));
 	connect (this, SIGNAL (showIndex   (int)),
 	         mr,   SLOT   (showIndex   (int)));
 }
@@ -106,7 +105,7 @@
 float	mbuf [T_u / 2];
 std::vector<int> resultVector;
 
-	memcpy (fft_buffer, v. data(), T_u * sizeof (std::complex<float>));
+	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
 	my_fftHandler. do_FFT();
 //
 //	into the frequency domain, now correlate
@@ -125,7 +124,7 @@
 
 	sum /= T_u / 2;
 //	
-	for (i = 0; i < 100; i ++) {
+	for (i = 0; i < 200; i ++) {
 	   if (lbuf [T_g - 80 + i] > Max) {
 	      maxIndex = T_g - 80 + i;
 	      Max = lbuf [T_g - 80 + i];
@@ -143,13 +142,13 @@
 	for (int k = 0; k < depth; k ++) {
 	   float MMax = 0;
 	   int	lIndex = -1;
-	   for (i = T_g - 100; i < T_u / 2 - 200; i ++) {
+	   for (i = T_g - 100; i < T_g / 2 + 200; i ++) {
 	      if (lbuf [i] > MMax) {
 	         MMax = lbuf [i];
 	         lIndex = i;
 	      }
 	   }
-	   if (MMax < Max / 1.4)
+	   if (0.7 * MMax < Max)
 	      break;
 	   if (lIndex > 0) {
 	      resultVector . push_back (lIndex);
@@ -161,9 +160,9 @@
 	}
 
 	if (response != nullptr) {
-	   if (++displayCounter > framesperSecond / 4) {
+	   if (++displayCounter > framesperSecond / 2) {
 	      response	-> putDataIntoBuffer (mbuf, T_u / 2);
-	      showImpulse (T_u / 2);
+	      showCorrelation (T_u / 2, T_g);
 	      displayCounter	= 0;
 	      if (resultVector. at (0) > 0) {
 	         showIndex (-1);

_service:download_url:qt-dab-3.21.tar.gz/src/scopes-qwt6/iqdisplay.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/scopes-qwt6/iqdisplay.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/support/band-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/support/band-handler.cpp Changed

@@ -19,17 +19,25 @@
  *    along with Qt-DAB; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
+//
+//
+//	The issue:
+//	suppose that someone wants to add some -non official -
+//	frequencies, e.g. amateur bands.
+//	we therefore use the "frequencies_1" and "frequencies_2"
+//	tables for initializing the "bandIII" and "LBand" tables
+//	and allow the BandIII table to be overwritten by a
+//	supplied table.
+//
 #include	"band-handler.h"
 #include	"dab-constants.h"
-
-struct dabFrequencies {
-	const char	*key;
-	int	fKHz;
-};
+#include	<stdio.h>
 
 static
-struct dabFrequencies bandIII_frequencies [] = {
+struct {
+	const char *key;
+	int	fKHz;
+} frequencies_1 [] = {
 {"5A",	174928},
 {"5B",	176640},
 {"5C",	178352},
@@ -72,7 +80,10 @@
 };
 
 static
-struct dabFrequencies Lband_frequencies [] = {
+struct  {
+	const char *key;
+	int	fKHz;
+} frequencies_2 [] = {
 {"LA", 1452960},
 {"LB", 1454672},
 {"LC", 1456384},
@@ -92,11 +103,74 @@
 {nullptr, 0}
 };
 
-	bandHandler::bandHandler() {}
+typedef struct {
+	QString key;
+	int fKHz;
+}dab_frequencies;
+
+dab_frequencies bandIII_frequencies [100];
+dab_frequencies Lband_frequencies   [100];
+
+	bandHandler::bandHandler (const QString &a_band) {
+int filler;
+	for (filler = 0; frequencies_2 [filler]. fKHz != 0; filler ++) {
+	   Lband_frequencies [filler]. key =
+	                        QString (frequencies_2 [filler]. key);
+	   Lband_frequencies [filler]. fKHz =
+	                        frequencies_2 [filler]. fKHz;
+	}
+	Lband_frequencies [filler]. fKHz = 0;
+//
+	FILE *f	= nullptr;
+#ifndef	__MINGW32__
+	if (a_band != "")
+	   f = fopen (a_band. toLatin1 (). data (), "r");
+#endif
+	if (f == nullptr) {
+	   for (filler = 0; frequencies_1 [filler]. fKHz != 0; filler ++) {
+	      bandIII_frequencies [filler]. key =
+	                               QString (frequencies_1 [filler]. key);
+	      bandIII_frequencies [filler]. fKHz =
+	                               frequencies_1 [filler]. fKHz;
+	   }
+	   bandIII_frequencies [filler]. fKHz = 0;
+	   return;
+	}
+
+#ifndef	__MINGW32__
+//	OK we have a file with - hopefully - some input
+	int	cnt	= 0;
+	size_t	amount	= 128;
+	filler		= 0;
+	char *line	= (char *) malloc (256);
+	while ((cnt < 100) && (amount > 0)) {
+	   amount = getline (&line, &amount, f);
+	   fprintf (stderr, "%s (%d)\n", line, (int)amount);
+	   if ((int)amount == 0) {
+	      break;
+	   }
+	   line [amount] = 0;
+	   char channelName [128];
+	   int freq;
+	   cnt ++;
+	   int res = sscanf (line, "%s %d", channelName, &freq);
+	   if (res != 2)
+	      continue;
+	   bandIII_frequencies [filler]. fKHz	= freq;
+	   bandIII_frequencies [filler]. key	= QString (channelName);
+	   filler ++;
+	}
+
+	bandIII_frequencies [filler]. fKHz	= 0;
+	free (line);
+	fclose (f);
+#endif
+}
+
 	bandHandler::~bandHandler() {}
 
 void	bandHandler::setupChannels (QComboBox *s, uint8_t band) {
-struct dabFrequencies *t;
+dab_frequencies *t;
 int16_t	i;
 int16_t	c	= s -> count();
 
@@ -117,7 +191,7 @@
 //	find the frequency for a given channel in a given band
 int32_t	bandHandler::Frequency (QString Channel) {
 int32_t	tunedFrequency		= 0;
-struct dabFrequencies	*finger;
+dab_frequencies	*finger;
 int	i;
 
 	if (theBand == BAND_III)

_service:download_url:qt-dab-3.21.tar.gz/src/support/ensemble-printer.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/support/ensemble-printer.cpp Changed

@@ -82,30 +82,28 @@
 	                
 	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");
 	for (QString& audioService: Services) {
-	   for (i = 0; i < 5; i ++) {
-	      audiodata d;
-	      my_dabProcessor -> dataforAudioService (audioService, &d, i);
-	      if (!d. defined)
-	         continue;
-	      QString protL	= getProtectionLevel (d. shortForm, 
-	                                              d. protLevel);
-	      QString codeRate	= getCodeRate (d. shortForm, 
+	   audiodata d;
+	   my_dabProcessor -> dataforAudioService (audioService, &d);
+	   if (!d. defined)
+	      continue;
+	   QString protL	= getProtectionLevel (d. shortForm, 
+	                                           d. protLevel);
+	   QString codeRate	= getCodeRate (d. shortForm, 
 	                                       d. protLevel);
-	      countryId = (d. serviceId >> 12) & 0xF;
-	      fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%s;%s;%s;%s;%s;\n",
-	                            audioService. toUtf8(). data(),
-	                     code_to_string (ecc_byte, countryId). toUtf8(). data(),
-	                     d. serviceId,
-	                     d. subchId,
-	                     d. startAddr,
-	                     d. length,
-	                     d. bitRate,
-	                     d. ASCTy == 077 ? "DAB+" : "DAB",
-	                     protL. toUtf8(). data(),
-	                     codeRate. toUtf8(). data(),
-	                     theMapper. get_programm_language_string (d. language),
-	                     theMapper. get_programm_type_string (d. programType) );
-	   }
+	   countryId = (d. SId >> 12) & 0xF;
+	   fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%s;%s;%s;%s;%s;\n",
+	                 audioService. toUtf8(). data(),
+	                 code_to_string (ecc_byte, countryId). toUtf8(). data(),
+	                 d. SId,
+	                 d. subchId,
+	                 d. startAddr,
+	                 d. length,
+	                 d. bitRate,
+	                 d. ASCTy == 077 ? "DAB+" : "DAB",
+	                 protL. toUtf8(). data(),
+	                 codeRate. toUtf8(). data(),
+	                 theMapper. get_programm_language_string (d. language),
+	                 theMapper. get_programm_type_string (d. programType) );
 	}
 
 	firstData	= true;
@@ -142,11 +140,11 @@
 	         protL. append (QString::number (h));
 	         codeRate = uep_rates [h + 1];
 	      }
-	      countryId = (d. serviceId >> (5 * 4)) & 0xF;
+	      countryId = (d. SId >> (5 * 4)) & 0xF;
 	      fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%d;%s;%d;%s;;\n",
 	                        dataService. toUtf8(). data(),
 	                     code_to_string (ecc_byte, countryId). toUtf8(). data(),
-	                     d. serviceId,
+	                     d. SId,
 	                     d. subchId,
 	                     d. startAddr,
 	                     d. length,

_service:download_url:qt-dab-3.21.tar.gz/src/support/history-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/support/history-handler.cpp Changed

_service:download_url:qt-dab-3.21.tar.gz/src/support/preset-handler.cpp -> _service:download_url:qt-dab-3.3.tar.gz/src/support/preset-handler.cpp Changed

_service:download_url:qt-dab-3.3.tar.gz/src/support/scanner-table.cpp Added

@@ -0,0 +1,140 @@
+#
+/*
+ *    Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB 
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include        <QDataStream>
+#include	"scanner-table.h"
+#include        "radio.h"
+
+	scannerTable::scannerTable (RadioInterface *) {
+	myWidget        = new QScrollArea (NULL);
+        myWidget        -> resize (200, 200);
+        myWidget        -> setWidgetResizable(true);
+	
+        outputWidget     = new QTableWidget (0, 6);
+	outputWidget	-> setColumnWidth (0, 150);
+	outputWidget	-> setColumnWidth (4, 150);
+        myWidget        -> setWidget (outputWidget);
+        outputWidget	-> setHorizontalHeaderLabels (
+	                          QStringList () << tr ("scan result"));
+	is_clear	= true;
+}
+
+	scannerTable::~scannerTable () {
+int16_t i;
+int16_t rows    = outputWidget -> rowCount ();
+
+	if (!is_clear)
+           for (i = rows; i > 0; i --)
+              outputWidget -> removeRow (i - 1);
+        delete  outputWidget;
+        delete  myWidget;
+}
+
+void	scannerTable::clear	() {
+int	rows	= outputWidget -> rowCount ();
+	if (is_clear)
+	   return;
+	for (int i = rows; i > 0; i --) 
+	   outputWidget -> removeRow (i - 1);
+	is_clear	= true;
+}
+
+void	scannerTable::show	() {
+	myWidget	-> show ();
+}
+
+void	scannerTable::hide	() {
+	myWidget	-> hide ();
+}
+
+int16_t	scannerTable::addRow () {
+int16_t row     = outputWidget -> rowCount ();
+
+	is_clear	= false;
+        outputWidget     -> insertRow (row);
+        QTableWidgetItem *item0 = new QTableWidgetItem;
+        item0           -> setTextAlignment (Qt::AlignLeft |Qt::AlignVCenter);
+        outputWidget     -> setItem (row, 0, item0);
+
+        QTableWidgetItem *item1 = new QTableWidgetItem;
+        item1           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        outputWidget     -> setItem (row, 1, item1);
+
+        QTableWidgetItem *item2 = new QTableWidgetItem;
+        item2           -> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
+        outputWidget    -> setItem (row, 2, item2);
+
+        QTableWidgetItem *item3 = new QTableWidgetItem;
+        item3           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        outputWidget    -> setItem (row, 3, item3);
+
+        QTableWidgetItem *item4 = new QTableWidgetItem;
+        item4           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        outputWidget    -> setItem (row, 4, item4);
+
+        QTableWidgetItem *item5 = new QTableWidgetItem;
+        item4           -> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        outputWidget    -> setItem (row, 5, item5);
+	return row;
+}
+
+void	scannerTable::newEnsemble	(QString currentChannel,
+	                                 QString ensembleName,
+	                                 QString ensembleId,
+	                                 QString freq,
+	                                 QString snr,
+	                                 QString transmitters) {
+int16_t row	= addRow ();
+
+	outputWidget	-> item (row, 0) -> setText (currentChannel);
+	outputWidget	-> item (row, 1) -> setText (ensembleName);
+	outputWidget	-> item (row, 2) -> setText (ensembleId);
+	outputWidget	-> item (row, 3) -> setText (freq);
+	outputWidget	-> item (row, 4) -> setText (snr);
+	outputWidget	-> item (row, 5) -> setText (transmitters);
+
+	row	= addRow ();
+	outputWidget	-> item (row, 0) -> setText ("serviceName");
+	outputWidget	-> item (row, 1) -> setText ("serviceId");
+	outputWidget	-> item (row, 2) -> setText ("type ");
+	outputWidget	-> item (row, 3) -> setText ("bit rate");
+	outputWidget	-> item (row, 4) -> setText ("protection level");
+	outputWidget	-> item (row, 5) -> setText ("code rate");
+}
+
+void	scannerTable::add_to_Ensemble	(QString serviceName,
+	                                 QString serviceId,
+	                                 QString dabType,
+	                                 QString bitRate,
+	                                 QString protLevel,
+	                                 QString codeRate) {
+int16_t	row = addRow ();
+
+	outputWidget	-> item (row, 0) -> setText (serviceName);
+	outputWidget	-> item (row, 1) -> setText (serviceId);
+	outputWidget	-> item (row, 2) -> setText (dabType);
+	outputWidget	-> item (row, 3) -> setText (bitRate);
+	outputWidget	-> item (row, 4) -> setText (protLevel);
+	outputWidget	-> item (row, 5) -> setText (codeRate);
+}
+
+

_service:download_url:qt-dab-3.3.tar.gz/testband Added

Changes of Revision 17