Packman Build Service PMBS

qt-dab.changes Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.7.2.tar.gz/README.md -> _service:download_url:qt-dab-4.0.tar.gz/README.md Changed

@@ -1,6 +1,9 @@
-# Qt-DAB-3.72 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-4/0 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.72 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
+Qt-DAB-4.0 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
+
+Since the original 3.71 version there were quite many changes, both visible
+and invisible. So, it was time for a new version number
 
 ![overview](/qt-dab-screen.png?raw=true)
 
@@ -11,40 +14,37 @@
 * [Introduction](#introduction)
 * [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes-for-qt-dab)
+* [dabMini](#dabMini)
 * [Documentation](#documentation)
-* [Presets](#presets-for-qt-dab-dabmini-and-dab-2)
-* [Colors](#Colors-for-Qt-DAB)
-* [History](maintaining-history-for-qt-dab-and-dab-2)
-* [Comment on some settings](#comment-on-some-settings)
+* [Presets](#presets-for-qt-dab)
+* [Colors](#colors-for-qt-dab)
+* [Maintaining History](#maintaining-history)
+* [Comment on some config settings](#comment-on-some--configuration-settings)
 * [Obsolete properties](#obsolete-properties)
 * [Installation on Windows](#installation-on-windows)
-* [Installation on Linux](#installation-on-linux-pc-and-rpi)
+* [Installation on Linux x64](#installation-on-linux-x64)
 * [Configuring](#configuring)
 * [Interfacing to another device](#interfacing-to-another-device)
 * [Using other bands than Band III or L Band](#using-other-bands-than-band-iii-or-l-band)
 * [xml-files and support](#xml-files-and-support)
-* [EPG-Handling](#EPG-Handling)
-* [Recording the SNR](#Recording-the-SNR)
-* [Scanning and the skip table](#Scanning-and-the-skip-table)
-* [Pluto device and fm transmission](#Pluto-device-and-fm-transmission)
+* [EPG-Handling](#epg-handling)
+* [Recording the SNR](#recording-the-snr)
+* [Scanning and the skip table](#scanning-and-the-skip-table)
+* [Pluto device and fm transmission](#pluto-device-and-fm-transmission)
 * [Copyright](#copyright)
 
 ------------------------------------------------------------------
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.72** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-4.0** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
 It provides an abundant amount of selectors and displays, most of
 which can be switched off, but are of interest for those who want to see aspects of the DAB signal.
 
-While it is not very complicated to generate an executable, for Linux-x64
-an appImage exists that will run Qt-DAB instantly, and for Windows an installer
-is available.
-
-The main difference between 3.7 and its predecessor is the introduction
-of **skipTables**. Such a table allows the specification of channels
-that can be skipped duting a scan.
+While it is not very complicated to generate an executable for either
+Qt-DAB or dabMini, for Linux-x64 appImages exist  for both Qt-DAB and dabMini.
+For Windows an installer is available.
 
 Qt-DAB makes extensive use of a GUI. Personally, grown up in the time of
 ASR-33 terminals and "command lines", I often prefer a simple command line
@@ -56,8 +56,9 @@
 ![Qt-DAB terminal DAB](/qt-dab-terminal-dab.png?raw=true)
 
 For those who are nostalgic to the era of nice wooden radios with glowing tubes,
-a program exists - for the Pluto - to receive DAB and transmit a selected
-service in FM stereo with the "dynamic label" sent as RDS.
+Qt-DAB can be configured such that - using the Adalm Pluto as device -
+the audio of a selected service is transmitted on a user specified frequency
+ in FM stereo with the "dynamic label" sent as RDS.
 
 ------------------------------------------------------------------
 Features
@@ -68,15 +69,15 @@
   * Dynamic Label (DLS) 
   * Both DAB bands supported): 
   	* VHF Band III (default),
-   	* L-Band (obsolete now)
+   	* L-Band (obsolete now),
+	* a user defined Band
   * Modes I, II and IV (Mode I default, Modes II and IV obsolete, but can be set in the ".ini" file)m
   * Views on the signal: spectrum view incl. constellation diagram, correlation result, TII spectrum and the SNR over time.
   * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, alternative FM frequency if available, 4 quality bars),
   * Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type),
   * Automatic display of TII (Transmitter Identification Information) data when transmitted,
   * *Presets* for easy switching of programs in different ensembles (see section *Presets*),
-  * Dumping of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files and playing them again later,
-  * Dumping the input in xml format (see section on xml format),
+  * Dumping of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files or xml file formats and playing them again later (see section on xml format),
   * Saving audio as uncompressed wave files,
   * Saving aac frames from DAB+ services for processing by e.g. VLC,
   * Saving the ensemble content description: audio and data streams, including almost all technical data) into a text file readable by e.g *LibreOfficeCalc*
@@ -84,7 +85,7 @@
   * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888),
   * TPEG output: when configured the data is sent to a specified ip address,
   * EPG detection and building up a time table,
-  * Supports inputs from 
+  * Supports configuration as input device:
 	- Adalm Pluto,
    	- SDR DAB sticks (RTL2838U or similar), 
 	- HACKRF One, 
@@ -93,9 +94,10 @@
 	- limeSDR, 
 	- Soapy (experimental, Linux only), 
 	- ExtIO (expertimental, Windows only),
-   	- prerecorded dump (*.raw, *.iq and *.sdr),
-	- xml format files, and
 	- rtl_tcp servers.
+  *Always supported input from:
+   	- prerecorded dump (*.raw, *.iq and *.sdr),
+	- xml format files.
   * Clean interface to add other devices, see below.
 
 Not yet or partly implemented:
@@ -108,23 +110,23 @@
 Note:
 While the 2.13 support for SDRplay devices is able to handle
 the RSP 1, RSP II, RSP Ia and RSP duo, for handling the RSP-Dx one
-needs 3.06 (3.07) support
+needs 3.0X support
 
 ------------------------------------------------------------------
 Widgets and scopes for Qt-DAB
 ------------------------------------------------------------------
 
-Qt-DAB shows a main widget and a number of  **optional**
-widgets, visible or invisible under user's control
+Qt-DAB always shows a main widget; a number of  **optional**
+widgets is visible or invisible under user's control
 
   * a widget with controls for the attached device,
-  * a widget for additional configuration settings.
+  * a widget for additional configuration settings,
   * a widget showing the technical information of the *selected service* as well
 as some information on the quality of the decoding, 
-  * a widget showing the spectrum of the received radio signal and the constellation of the decoded signal,
+  * a widget showing the spectrum of the received radio signal, the constellation of the decoded signal and some quality parameters,,
   * a widget showing the spectrum of the NULL period between successive DAB frames from which the TII is derived,
   * a widget showing the correlations response(s) from different transmitters in the SFN,
-  * a widget showing the development - over time - of the SNR
+  * a widget showing the development - over time - of the SNR,
   * if configured and data is detected, the time table for the current audio service
 
 ![Qt-DAB totaal](/qt-dab-totaal.png?raw=true)
@@ -144,24 +146,18 @@
 of the element (the tooltip on the copyright label shows (a.o) the date the executable was generated.)
 
 The elements in the **left part** of the widget, below the list of services,
- are concerned with selecting a channel and service. 
-
-To ease operation the channel selector is augmented with a "-" and a "+"
-button for selecting the previous resp. next channel.
+ are concerned with selecting a channel and a service. To ease operation the channel selector is augmented with a "-" and a "+" button for selecting the previous resp. next channel.
 
-To ease selection of a service, a second pair of "-" and "+" buttons
-is available, now for selecting the previous resp. the next service 
-on the list.
+To ease selection of a service, a second pair of "-" and "+" buttons is available, now for selecting the previous resp. the next service on the list.
 
 Some general data is displayed on the top right part of the widget, 
-such as run time and current time, frequency offset and
-(overall) processor load.
+such as run time and current time, frequency offset and (overall) processor load.
 
 In the middle part, name of the ensemble and name of the selected service
 are displayed, complemented with the text of the dynamic label.
 
-Some data on the selected service - if any - is to be found on
-a separate widget, the "technical data" widget.
+Some data on the selected service - if any - can be found on
+a separate widget, the "technical data" widget. 
 This widget will show where the data for the
 service is to be found in the DAB frames, and how it is encoded.
 
@@ -169,7 +165,7 @@
 as Program Associated Data with the audio transmission, will be shown here or on a separate widget
 (the setting can be modified from the configuration widget).
 
-The other selectors are concentrated on the bottom part of the right side
+Most selectors are concentrated on the bottom part of the right side
 of the widget. Buttons to make scopes visible, to store input and or
 output into a file, to select input device and the audio and to
 scan and store a description of the ensemble are in that section.
@@ -182,6 +178,26 @@
 
 ![Qt-DAB scan result](/qt-dab-scan-result.png?raw=true)
 
+---------------------------------------------------------------------
+dabMini
+---------------------------------------------------------------------
+
+**dabMini** is a version of the DAB decoder with a minimal GUI.
+dabMini is built from the same  sources as Qt-DAB, so
+modifications to the Qt-DAB sources are automatically applied to

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/CMakeLists.txt -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/CMakeLists.txt Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/i18n/de_DE.qm -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/i18n/de_DE.qm Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/i18n/de_DE.ts -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/i18n/de_DE.ts Changed

@@ -4,210 +4,207 @@
 <context>
 <name>RadioInterface</name>
 <message>
- <location filename="../radio.cpp" line="945"/>
- <location filename="../radio.cpp" line="1088"/>
- <location filename="../radio.cpp" line="1102"/>
- <location filename="../radio.cpp" line="1116"/>
- <location filename="../radio.cpp" line="1130"/>
- <location filename="../radio.cpp" line="1144"/>
- <location filename="../radio.cpp" line="1158"/>
- <location filename="../radio.cpp" line="1174"/>
- <location filename="../radio.cpp" line="1189"/>
- <location filename="../radio.cpp" line="1203"/>
- <location filename="../radio.cpp" line="1217"/>
- <location filename="../radio.cpp" line="1231"/>
- <location filename="../radio.cpp" line="1252"/>
- <location filename="../radio.cpp" line="1271"/>
- <location filename="../radio.cpp" line="1289"/>
- <location filename="../radio.cpp" line="1309"/>
- <location filename="../radio.cpp" line="1775"/>
- <location filename="../radio.cpp" line="2087"/>
- <location filename="../radio.cpp" line="2107"/>
- <location filename="../radio.cpp" line="2177"/>
- <location filename="../radio.cpp" line="2263"/>
- <location filename="../radio.cpp" line="2397"/>
- <location filename="../radio.cpp" line="2439"/>
- <location filename="../radio.cpp" line="2464"/>
- <location filename="../radio.cpp" line="2481"/>
+ <location filename="../radio.cpp" line="1155"/>
+ <location filename="../radio.cpp" line="1322"/>
+ <location filename="../radio.cpp" line="1336"/>
+ <location filename="../radio.cpp" line="1350"/>
+ <location filename="../radio.cpp" line="1365"/>
+ <location filename="../radio.cpp" line="1379"/>
+ <location filename="../radio.cpp" line="1393"/>
+ <location filename="../radio.cpp" line="1407"/>
+ <location filename="../radio.cpp" line="1426"/>
+ <location filename="../radio.cpp" line="1440"/>
+ <location filename="../radio.cpp" line="1455"/>
+ <location filename="../radio.cpp" line="1469"/>
+ <location filename="../radio.cpp" line="1483"/>
+ <location filename="../radio.cpp" line="1499"/>
+ <location filename="../radio.cpp" line="1519"/>
+ <location filename="../radio.cpp" line="1544"/>
+ <location filename="../radio.cpp" line="1564"/>
+ <location filename="../radio.cpp" line="2478"/>
+ <location filename="../radio.cpp" line="2497"/>
+ <location filename="../radio.cpp" line="2588"/>
+ <location filename="../radio.cpp" line="2683"/>
+ <location filename="../radio.cpp" line="2850"/>
+ <location filename="../radio.cpp" line="2872"/>
+ <location filename="../radio.cpp" line="2889"/>
+ <location filename="../radio.cpp" line="3788"/>
 <source>Warning</source>
- <translation type="unfinished"></translation>
+ <translation>Warnung</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1089"/>
+ <location filename="../radio.cpp" line="1366"/>
 <source>Airspy or Airspy mini not found
 </source>
- <translation type="unfinished"></translation>
+ <translation>Airspy oder Airspy mini nicht gefunden
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1103"/>
+ <location filename="../radio.cpp" line="1380"/>
 <source>hackrf not found
 </source>
- <translation type="unfinished"></translation>
+ <translation>hackrf nicht gefunden
+</translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1441"/>
+ <source>no colibri device found
+</source>
+ <translation>kein colibri Gerät gefunden
+</translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1470"/>
+ <source>no elad device found
+</source>
+ <translation>kein elad Gerät gefunden
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1117"/>
+ <location filename="../radio.cpp" line="1484"/>
 <source>no soapy device found
 </source>
- <translation type="unfinished"></translation>
+ <translation>kein soapy Gerät gefunden
+</translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="2765"/>
+ <source>could not start this service
+</source>
+ <translation>konnte diesen Service nicht starten
+</translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="3789"/>
+ <source>cannot set alarm in the past
+</source>
+ <translation>kann Alarm nicht in die Vergangenheit setzen
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1131"/>
+ <location filename="../radio.cpp" line="1394"/>
 <source>no lime device found
 </source>
- <translation type="unfinished"></translation>
+ <translation>kein lime Gerät gefunden
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1145"/>
- <location filename="../radio.cpp" line="1159"/>
+ <location filename="../radio.cpp" line="1408"/>
+ <location filename="../radio.cpp" line="1427"/>
 <source>no pluto device found
 </source>
- <translation type="unfinished"></translation>
+ <translation>kein pluto Gerät gefunden
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1175"/>
+ <location filename="../radio.cpp" line="1500"/>
 <source>extio: no luck
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1190"/>
+ <location filename="../radio.cpp" line="1456"/>
 <source>rtl_tcp: no luck
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1204"/>
- <location filename="../radio.cpp" line="1218"/>
+ <location filename="../radio.cpp" line="1323"/>
+ <location filename="../radio.cpp" line="1337"/>
 <source>SDRplay: no library or device
 </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../radio.cpp" line="2672"/>
- <source>save the scan?
-</source>
- <translation type="unfinished"></translation>
+ <translation>SDRplay: keine Bibliothek oder Gerät
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1232"/>
+ <location filename="../radio.cpp" line="1351"/>
 <source>DAB stick not found! Please use one with RTL2832U or similar chipset!
 </source>
- <translation type="unfinished"></translation>
+ <translation>DAB-Stick nicht gefunden! Bitte einen mit RTL2832U oder ähnlichem Chipsatz verwenden!
+</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1241"/>
- <location filename="../radio.cpp" line="1260"/>
- <location filename="../radio.cpp" line="1279"/>
- <location filename="../radio.cpp" line="1297"/>
+ <location filename="../radio.cpp" line="1508"/>
+ <location filename="../radio.cpp" line="1533"/>
+ <location filename="../radio.cpp" line="1552"/>
 <source>Open file ...</source>
- <translation type="unfinished"></translation>
+ <translation>Datei öffnen ...</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1243"/>
+ <location filename="../radio.cpp" line="1510"/>
 <source>xml data (*.*)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1262"/>
- <source>iq data (*.iq)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../radio.cpp" line="1253"/>
- <location filename="../radio.cpp" line="1272"/>
- <location filename="../radio.cpp" line="1290"/>

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/main.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/main.cpp Changed

@@ -75,6 +75,7 @@
 QSettings *dabSettings; // ini file
 QString		presetName	= PRESETS;
 int32_t		dataPort	= 8888;
+int32_t		clockPort	= 8889;
 int opt;
 QString freqExtension		= "";
 bool	error_report		= false;
@@ -85,7 +86,7 @@
 	QCoreApplication::setApplicationName ("qt-dab");
 	QCoreApplication::setApplicationVersion (QString (CURRENT_VERSION) + " Git: " + GITHASH);
 
-	while ((opt = getopt (argc, argv, "i:P:Q:A:TMF:")) != -1) {
+	while ((opt = getopt (argc, argv, "C:i:P:Q:A:TMF:")) != -1) {
 	 switch (opt) {
 	 case 'i':
 	 initFileName = fullPathfor (QString (optarg));
@@ -95,6 +96,10 @@
 	 dataPort	= atoi (optarg);
 	 break;
 
+	 case 'C':
+	 clockPort	= atoi (optarg);
+	 break;
+
 	 case 'A':
 	 freqExtension	= optarg;
 	 break;
@@ -143,6 +148,7 @@
 	 freqExtension,
 	 error_report,
 	 dataPort,
+	 clockPort,
 	 fmFrequency
 );
 	MyRadioInterface -> show();
@@ -160,7 +166,7 @@
 }
 
 void	setTranslator (QString Language) {
-QTranslator Translator;
+QTranslator *Translator = new QTranslator;
 
 //	German is special (as always)
 	if ((Language == "de_AT") || (Language == "de_CH"))
@@ -168,9 +174,9 @@
 //
 //	what about Dutch?
 	bool TranslatorLoaded =
-	 Translator. load (QString(":/i18n/") + Language);
+	 Translator -> load (QString(":/i18n/") + Language);
 	qDebug() << "main:" << "Set language" << Language;
-	QCoreApplication::installTranslator (&Translator);
+	QCoreApplication::installTranslator (Translator);
 
 	if (!TranslatorLoaded) {
 	 qDebug() << "main:" << "Error while loading language specifics" << Language << "use English \"en_GB\" instead";

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-dab.pro -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-dab.pro Changed

@@ -9,8 +9,8 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++14
-#QMAKE_CFLAGS	+=  -O4 -ffast-math
-#QMAKE_CXXFLAGS	+=  -O4 -ffast-math
+QMAKE_CFLAGS	+=  -O4 -ffast-math
+QMAKE_CXXFLAGS	+=  -O4 -ffast-math
 QMAKE_CXXFLAGS	+=  -ffast-math -flto
 QMAKE_CFLAGS	+=  -ffast-math -flto
 QMAKE_LFLAGS	+=  -ffast-math -flto
@@ -138,7 +138,7 @@
 	   ../includes/backend/data/journaline/dabdgdec_impl.h \
 	   ../includes/backend/data/journaline/newsobject.h \
 	   ../includes/backend/data/journaline/NML.h \
-#	   ../includes/output/fir-filters.h \
+	   ../includes/output/fir-filters.h \
 	   ../includes/output/audio-base.h \
 	   ../includes/output/newconverter.h \
 	   ../includes/output/audiosink.h \
@@ -166,6 +166,7 @@
 	   ../includes/support/alarm-selector.h \
 	   ../includes/support/time-table.h \
 	   ../includes/support/findfilenames.h \
+	   ../includes/support/dl-cache.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../spectrum-viewer/spectrum-viewer.h \
@@ -244,6 +245,7 @@
 	   ../src/backend/data/journaline/dabdgdec_impl.c \
 	   ../src/backend/data/journaline/newsobject.cpp \
 	   ../src/backend/data/journaline/NML.cpp \
+	   ../src/output/fir-filters.cpp \
 	   ../src/output/audio-base.cpp \
 	   ../src/output/newconverter.cpp \
 	   ../src/output/audiosink.cpp \
@@ -287,7 +289,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-3.72
+TARGET		= qt-dab-4.0
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -330,7 +332,6 @@
 #CONFIG		+= fdk-aac
 #very experimental, simple server for connecting to a tdc handler
 #CONFIG		+= datastreamer
-
 #to handle output of embedded an IP data stream, uncomment
 CONFIG		+= send_datagram
 
@@ -346,7 +347,6 @@
 #CONFIG		+= RPI
 #DEFINES	+= SHOW_MISSING
 DEFINES		+= __DUMP_SNR__		# for experiments only
-DEFINES		+=__KEEP_GAIN_SETTINGS__
 }
 
 
@@ -364,26 +364,27 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-3.72
+#	TARGET		= qt-dab64-4.0
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
 #	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
 #	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
-#	LIBS		+= -liio
+##	LIBS		+= -liio
 ##	#CONFIG		+= extio
 #	CONFIG		+= airspy
 #	CONFIG		+= rtl_tcp
 #	CONFIG		+= dabstick
 #	CONFIG		+= sdrplay-v2
 #	CONFIG		+= pluto-2
-##	CONFIG		+= sdrplay-v3
+#	CONFIG		+= sdrplay-v3
 ##	CONFIG		+= hackrf
 ##	CONFIG		+= lime
 #	CONFIG		+= NO_SSE
+#	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-3.72
+	TARGET		= qt-dab32-4.0
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
@@ -430,7 +431,6 @@
 
 CONFIG		+= try-epg		# do not use
 DEFINES	+= __DUMP_SNR__		# for experiments only
-DEFINES		+=__KEEP_GAIN_SETTINGS__
 }
 #	devices
 #
@@ -651,12 +651,12 @@
 
 datastreamer	{
 	DEFINES		+= DATA_STREAMER
+	DEFINES		+= CLOCK_STREAMER
 	INCLUDEPATH	+= ../server-thread
 	HEADERS		+= ../server-thread/tcp-server.h
 	SOURCES		+= ../server-thread/tcp-server.cpp
 }
 
-
 # for RPI use:
 RPI	{
 	DEFINES		+= __MSC_THREAD__

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/hackrf-handler/hackrf-handler.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/hackrf-handler/hackrf-handler.cpp Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/lime-handler/lime-handler.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/lime-handler/lime-handler.cpp Changed

@@ -34,12 +34,20 @@
 	limeHandler::limeHandler (QSettings *s,
 	 QString &recorderVersion):
 	 myFrame (nullptr),
-	 _I_Buffer (4* 1024 * 1024) {
+	 _I_Buffer (4* 1024 * 1024),
+	 theFilter (5, 1560000 / 2, 2048000) {
 	this	-> limeSettings		= s;
 	this	-> recorderVersion	= recorderVersion;
 	setupUi (&myFrame);
 	myFrame. show	();
 
+	filtering	= false;
+
+	limeSettings	-> beginGroup ("limeSettings");
+	currentDepth	= limeSettings	-> value ("filterDepth", 5). toInt ();
+	limeSettings	-> endGroup ();
+	filterDepth	-> setValue (currentDepth);
+	theFilter. resize (currentDepth);
 #ifdef __MINGW32__
 const char *libraryString = "LimeSuite.dll";
 Handle = LoadLibrary ((wchar_t *)L"LimeSuite.dll");
@@ -165,6 +173,8 @@
 	 this, SLOT (set_xmlDump ()));
 	connect (this, SIGNAL (new_gainValue (int)),
 	 gainSelector, SLOT (setValue (int)));
+	connect (filterSelector, SIGNAL (stateChanged (int)),
+	 this, SLOT (set_filter (int)));
 	xmlDumper	= nullptr;
 	dumping. store (false);
 	running. store (false);
@@ -179,6 +189,7 @@
 	limeSettings	-> beginGroup ("limeSettings");
 	limeSettings	-> setValue ("antenna", antennaList -> currentText());
 	limeSettings	-> setValue ("gain", gainSelector -> value());
+	limeSettings	-> setValue ("filterDepth", filterDepth -> value ());
 	limeSettings	-> endGroup();
 	LMS_Close (theDevice);
 }
@@ -204,6 +215,11 @@
 	(void)LMS_SetAntenna (theDevice, LMS_CH_RX, 0, ind);
 }
 
+void	limeHandler::set_filter		(int c) {
+	filtering	= filterSelector -> isChecked ();
+	fprintf (stderr, "filter set %s\n", filtering ? "on" : "off");
+}
+
 bool	limeHandler::restartReader	(int32_t freq) {
 int	res;
 
@@ -249,11 +265,22 @@
 
 int	limeHandler::getSamples	(std::complex<float> *V, int32_t size) {
 std::complex<int16_t> temp [size];
-int i;
+
 int amount = _I_Buffer. getDataFromBuffer (temp, size);
- for (i = 0; i < amount; i ++)
- V [i] = std::complex<float> (real (temp [i]) / 2048.0,
- imag (temp [i]) / 2048.0);
+	if (filtering) {
+	 if (filterDepth -> value () != currentDepth) {
+	 currentDepth = filterDepth -> value ();
+	 theFilter. resize (currentDepth);
+	 }
+ for (int i = 0; i < amount; i ++) 
+	 V [i] = theFilter. Pass (std::complex<float> (
+	 real (temp [i]) / 2048.0,
+	 imag (temp [i]) / 2048.0));
+	}
+	else
+ for (int i = 0; i < amount; i ++)
+ V [i] = std::complex<float> (real (temp [i]) / 2048.0,
+ imag (temp [i]) / 2048.0);
 if (dumping. load ())
 xmlWriter -> add (temp, amount);
 return amount;
@@ -583,6 +610,7 @@
 	new_gainValue (gainValue);
 	while (gainSelector -> value () != gainValue)
 	 usleep (1000);
+	actualGain	-> display (gainValue);
 	gainSelector	-> blockSignals (false);
 }

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/lime-handler/lime-handler.h -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/lime-handler/lime-handler.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/lime-handler/lime-widget.h -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/lime-handler/lime-widget.h Changed

@@ -8,6 +8,7 @@
 #include	<QPushButton>
 #include	<QHBoxLayout>
 #include	<QVBoxLayout>
+#include	<QCheckBox>
 
 class	limeWidget {
 public:
@@ -22,6 +23,8 @@
 	QLCDNumber	*overrunDisplay;
 	QLabel		*overrunLabel;
 	QPushButton	*dumpButton;
+	QCheckBox	*filterSelector;
+	QSpinBox	*filterDepth;
 
 	limeWidget	() {}
 	~limeWidget	() {}
@@ -38,6 +41,9 @@
 	overrunDisplay	= new QLCDNumber ();
 	overrunLabel	= new QLabel	("overruns");
 	dumpButton	= new QPushButton	();
+	filterSelector	= new QCheckBox	("filter");
+	filterDepth	= new QSpinBox	();
+	filterDepth	-> setRange (5, 25);
 	dumpButton	-> setText ("Dump");
 	actualGain	-> setFrameShape (QFrame::NoFrame);
 actualGain	-> setSegmentStyle (QLCDNumber::Flat);
@@ -59,10 +65,12 @@
 	QHBoxLayout *line4	= new QHBoxLayout ();
 	line4		-> addWidget (underrunDisplay);
 	line4		-> addWidget (underrunLabel);
+	line4		-> addWidget (filterSelector);
 
 	QHBoxLayout *line5	= new QHBoxLayout ();
 	line5		-> addWidget (overrunDisplay);
 	line5		-> addWidget (overrunLabel);
+	line5		-> addWidget (filterDepth);
 
 	QHBoxLayout *line1	= new QHBoxLayout ();
 	line1		-> addWidget (titleLabel);

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-handler.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-handler.cpp Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -116,7 +116,8 @@
 	rtlsdrHandler::rtlsdrHandler (QSettings *s,
 	 QString &recorderVersion):
 	 _I_Buffer (8 * 1024 * 1024),
-	 myFrame (nullptr) {
+	 myFrame (nullptr),
+	 theFilter (5, 1560000 / 2, 2048000) {
 int16_t	deviceCount;
 int32_t	r;
 int16_t	deviceIndex;
@@ -129,12 +130,22 @@
 	this	-> recorderVersion	= recorderVersion;
 	setupUi (&myFrame);
 	myFrame. show();
+	filtering			= false;
+
+	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
+	currentDepth		= rtlsdrSettings -> value ("filterDepth", 5). toInt ();
+	rtlsdrSettings	-> endGroup ();
+	filterDepth	-> setValue (currentDepth);
+	theFilter. resize (currentDepth);
+
 	inputRate			= 2048000;
 	workerHandle			= nullptr;
 	isActive		= false;
 #ifdef	__MINGW32__
 	const char *libraryString	= "librtlsdr.dll";
 	Handle		= LoadLibrary ((wchar_t *)L"librtlsdr.dll");
+	if (Handle == nullptr) 
+	 Handle = LoadLibrary ((wchar_t *)L"rtlsdr.dll");
 	if (Handle == nullptr) {
 	 fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
 	 throw (20);
@@ -263,6 +274,8 @@
 	 this, SLOT (set_iqDump ()));
 	connect (biasControl, SIGNAL (stateChanged (int)),
 	 this, SLOT (set_biasControl (int)));
+	connect (filterSelector, SIGNAL (stateChanged (int)),
+	 this, SLOT (set_filter (int)));
 	xmlDumper = nullptr;
 //
 //	and for saving/restoring the gain setting:
@@ -294,6 +307,7 @@
 	 agcControl -> isChecked () ? "1" : "0");
 	rtlsdrSettings	-> setValue ("ppm_correction",
 	 ppm_correction -> value());
+	rtlsdrSettings	-> setValue ("filterDepth", filterDepth -> value ());
 	rtlsdrSettings	-> sync();
 	rtlsdrSettings	-> endGroup();
 	
@@ -313,6 +327,10 @@
 	return (int32_t)(this -> rtlsdr_get_center_freq (device));
 }
 //
+void	rtlsdrHandler::set_filter	(int c) {
+ filtering = filterSelector -> isChecked ();
+}
+
 bool	rtlsdrHandler::restartReader	(int32_t freq) {
 int32_t	r;
 
@@ -320,9 +338,8 @@
 	if (save_gainSettings)
 	 update_gainSettings (freq / MHz (1));
 
-	rtlsdr_set_agc_mode (device, agcControl -> isChecked () ? 1 : 0);
-	rtlsdr_set_tuner_gain (device,
-	 gainControl -> currentText (). toInt ());
+	set_autogain (agcControl -> isChecked ());
+	set_ExternalGain (gainControl -> currentText ());
 	if (workerHandle == nullptr) {
 	 r = this -> rtlsdr_reset_buffer (device);
 	 workerHandle	= new dll_driver (this);
@@ -367,10 +384,22 @@
 
 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]) & 0xFF],
-	 mapTable [imag (temp [i]) & 0xFF]);
+	if (filtering) {
+	 if (filterDepth -> value () != currentDepth) {
+	 currentDepth = filterDepth -> value ();
+	 theFilter. resize (currentDepth);
+	 }
+	 for (int i = 0; i < amount; i ++) 
+	 V [i] =theFilter. Pass (
+ std::complex<float> (mapTable [real (temp [i]) & 0xFF],
+	 mapTable [imag (temp [i]) & 0xFF]));
+	}
+	else
+	 for (int i = 0; i < amount; i ++) 
+	 V [i] = std::complex<float> (mapTable [real (temp [i]) & 0xFF],
+	 mapTable [imag (temp [i]) & 0xFF]);
 	if (xml_dumping. load ())
 	 xmlWriter -> add (temp, amount);
 	else
@@ -729,6 +758,7 @@
 	new_agcSetting (agc == 1);
 	while (agcControl -> isChecked () != (agc == 1))
 	 usleep (1000);
+	set_autogain (agcControl -> isChecked ());
 	agcControl	-> blockSignals (false);
 }

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.h -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-widget.ui -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>206</width>
- <height>344</height>
+ <width>242</width>
+ <height>345</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -60,18 +60,49 @@
 </widget>
 </item>
 <item>
- <widget class="QCheckBox" name="agcControl">
- <property name="text">
- <string>autogain</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="text">
+ <string>autogain</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="filterSelector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DABsticks do not have much filtering. A software filter - 1560KHz wide - can be selected&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>filter</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
- <widget class="QCheckBox" name="biasControl">
- <property name="text">
- <string>biasT</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QCheckBox" name="biasControl">
+ <property name="text">
+ <string>biasT</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="filterDepth">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;select the depth of the software 1560 KHz filter. Be aware that for a filter depth N N* 2048000 extra additions and complex multiplications are done&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>5</number>
+ </property>
+ <property name="maximum">
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
 <widget class="QPushButton" name="xml_dumpButton">

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/radio.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/radio.cpp Changed

@@ -82,12 +82,13 @@
 #ifdef	HAVE_LIME
 #include	"lime-handler.h"
 #endif
-#ifdef	HAVE_PLUTO_RXTX
-#include	"pluto-rxtx-handler.h"
-#include	"dab-streamer.h"
-#endif
 #ifdef	HAVE_PLUTO
 #include	"pluto-handler.h"
+#elif	HAVE_PLUTO_2
+#include	"pluto-handler-2.h"
+#elif	HAVE_PLUTO_RXTX
+#include	"pluto-rxtx-handler.h"
+#include	"dab-streamer.h"
 #endif
 #ifdef	HAVE_SOAPY
 #include	"soapy-handler.h"
@@ -182,6 +183,7 @@
 #define	FRAMEDUMP_BUTTON	QString ("framedumpButton")
 #define	AUDIODUMP_BUTTON	QString ("audiodumpButton")
 #define	CONFIG_BUTTON		QString	("configButton")
+#define	DLTEXT_BUTTON		QString	("dlTextButton")
 
 static
 uint8_t convert (QString s) {
@@ -216,6 +218,7 @@
 	                                const QString	&freqExtension,
 	                                bool		error_report,
 	                                int32_t		dataPort,
+	                                int32_t		clockPort,
 	                                int		fmFrequency,
 	                                QWidget		*parent):
 	                                        QWidget (parent),
@@ -242,7 +245,10 @@
 	                                        my_presetHandler (this),
 	                                        theBand (freqExtension, Si),
 	                                        theTable (this),
-	                                        filenameFinder (Si) {
+	                                        filenameFinder (Si),
+	                                        dataDisplay (nullptr),
+	                                        configDisplay (nullptr),
+	                                        the_dlCache (10) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -251,6 +257,7 @@
 	dabSettings		= Si;
 	this	-> error_report	= error_report;
 	this	-> fmFrequency	= fmFrequency;
+	this	-> dlTextFile	= nullptr;
 	running. 		store (false);
 	scanning. 		store (false);
 	my_dabProcessor		= nullptr;
@@ -306,14 +313,14 @@
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
 //
-	dataDisplay	= new QFrame (nullptr);
-	techData. setupUi (dataDisplay);
+//	dataDisplay	= new QFrame (nullptr);
+	techData. setupUi (&dataDisplay);
 	techData. timeTable_button -> hide ();
 
 	epgLabel	-> hide ();
 	epgLabel	-> setStyleSheet ("QLabel {background-color : yellow}");
-	configDisplay	= new QFrame (nullptr);
-	configWidget. setupUi (configDisplay);
+//	configDisplay	= new QFrame (nullptr);
+	configWidget. setupUi (&configDisplay);
 
 	int x = dabSettings -> value ("muteTime", 2). toInt ();
 	configWidget. muteTimeSetting -> setValue (x);
@@ -359,6 +366,9 @@
 	if (motselectionMode)
 	   configWidget. motslideSelector -> setChecked (true);
 
+	x = dabSettings -> value ("closeDirect", 0). toInt ();
+	if (x != 0)
+	   configWidget. closeDirect -> setChecked (true);
 	x = dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
 	if (x == ALPHA_BASED)
 	   configWidget. orderAlfabetical -> setChecked (true);
@@ -369,7 +379,7 @@
 	   configWidget. ordersubChannelIds -> setChecked (true);
 
 	motSlides		= nullptr;
-	dataDisplay		-> hide ();
+	dataDisplay. hide ();
 	stillMuting		-> hide ();
 	serviceList. clear ();
         model . clear ();
@@ -385,6 +395,11 @@
 #else
 	(void)dataPort;
 #endif
+#ifdef	CLOCK_STREAMER
+	clockStreamer		= new tcpServer (clockPort);
+#else
+	(void)clockPort;
+#endif
 
 //	Where do we leave the audio out?
 	streamoutSelector	-> hide();
@@ -506,6 +521,8 @@
 	         this, SLOT (color_sourcedumpButton (void)));
 	connect (configButton, SIGNAL (rightClicked (void)),
 	         this, SLOT (color_configButton (void)));
+	connect (dlTextButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_dlTextButton (void)));
 
 	connect	(prevChannelButton, SIGNAL (rightClicked (void)),
 	         this, SLOT (color_prevChannelButton (void)));
@@ -526,6 +543,8 @@
 //	         this, SLOT (color_muteButton (void)));
 	connect (muteButton, SIGNAL (rightClicked ()),
 	         this, SLOT (color_muteButton ()));
+	connect (dlTextButton, SIGNAL (clicked ()),	
+	         this, SLOT (handle_dlTextButton ()));
 //	display the version
 	copyrightLabel	-> setToolTip (footText ());
 
@@ -737,6 +756,13 @@
 	   presetTimer. start 		(switchDelay * 1000);
 	}
 
+	bool dm = dabSettings -> value ("tii_detector", 0). toInt () == 1;
+	if (dm)
+	   configWidget. tii_detectorMode -> setChecked (true);
+	my_dabProcessor -> set_tiiDetectorMode (dm);
+	connect (configWidget. tii_detectorMode, SIGNAL (stateChanged (int)),
+                    this, SLOT (handle_tii_detectorMode (int)));
+
 	startChannel (channelSelector -> currentText ());
 	running. store (true);
 	return true;
@@ -1196,6 +1222,10 @@
 	fprintf (stderr, "going to close the dataStreamer\n");
 	delete		dataStreamer;
 #endif
+#ifdef	CLOCK_STREAMER
+	fprintf (stderr, "going to close the clockstreamer\n");
+	delete	clockStreamer;
+#endif
 	displayTimer.	stop	();
 	channelTimer.	stop	();
 	presetTimer.	stop	();
@@ -1204,6 +1234,8 @@
 #endif
 	alarmTimer.	stop	();
 	soundOut	-> stop ();
+	if (dlTextFile != nullptr)
+	   fclose (dlTextFile);
 #ifdef	HAVE_PLUTO_RXTX
 	if (streamerOut != nullptr)
 	   streamerOut	-> stop ();
@@ -1217,7 +1249,7 @@
 	stop_audioDumping	();
 	theTable. hide		();
 	theBand. hide		();
-	dataDisplay	->  hide();
+	dataDisplay. hide();
 	if (motSlides != nullptr)
 	   motSlides	-> hide ();
 	LOG ("terminating ", "");
@@ -1244,8 +1276,8 @@
 	   delete	motSlides;
 	if (currentServiceDescriptor != nullptr)
 	   delete currentServiceDescriptor;
-	delete	dataDisplay;
-	delete	configDisplay;
+//	delete	dataDisplay;
+//	delete	configDisplay;
 	delete	my_history;
 	delete	my_timeTable;
 //	close();
@@ -1404,9 +1436,24 @@
 	      showButtons();
 	   }
 	   catch (int e) {
-	      QMessageBox::warning (this, tr ("Warning"),
+	      switch (e) {
+	         case 22:
+	            QMessageBox::warning (this, tr ("warning"),
+	                                  tr ("failed to open libiio.dll\n"));
+	            return nullptr;
+	         case 23:
+	            QMessageBox::warning (this, tr ("warning"),
+	                                 tr ("error in loading functions\n"));
+	            return nullptr;
+	         case 24:
+	            QMessageBox::warning (this, tr ("Warning"),
 	                                  tr ("no pluto device found\n"));
-	      return nullptr;
+	            return nullptr;
+	         default:
+	            QMessageBox::warning (this, tr ("Warning"),
+	                                  tr ("some else with pluto\n"));
+	            return nullptr;
+	      }

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/radio.h -> _service:download_url:qt-dab-4.0.tar.gz/dab-maxi/radio.h Changed

@@ -42,6 +42,7 @@
 #include "band-handler.h"
 #include	"text-mapper.h"
 #include	"process-params.h"
+#include	"dl-cache.h"
 #include	<memory>
 #ifdef	DATA_STREAMER
 #include	"tcp-server.h"
@@ -93,6 +94,7 @@
 	int	day;
 	int	hour;
 	int	minute;
+	int	second;
 };
 
 class RadioInterface: public QWidget, private Ui_dabradio {
@@ -102,7 +104,8 @@
 	 const QString	&,
 	 const QString	&,
 	 bool,
-	 int32_t	 dataPort,
+	 int32_t	dataPort,
+	 int32_t	clockPort,
 	 int,
 	 QWidget	*parent = nullptr);
 		~RadioInterface		();
@@ -110,6 +113,7 @@
 protected:
 	bool			eventFilter (QObject *obj, QEvent *event);
 private:
+	FILE			*dlTextFile;
 	RingBuffer<std::complex<float>> spectrumBuffer;
 	RingBuffer<std::complex<float>> iqBuffer;
 	RingBuffer<std::complex<float>> tiiBuffer;
@@ -125,6 +129,9 @@
 	presetHandler		my_presetHandler;
 	bandHandler		theBand;
 	scannerTable		theTable;
+	QFrame			dataDisplay;
+	QFrame			configDisplay;
+	dlCache			the_dlCache;
 	findfileNames		filenameFinder;
 	processParams		globals;
 	QString			version;
@@ -139,9 +146,9 @@
 	int			serviceOrder;
 	bool			error_report;
 	Ui_technical_data	techData;
-	QFrame			*dataDisplay;
+//	QFrame			*dataDisplay;
 	Ui_configWidget		configWidget;
-	QFrame			*configDisplay;
+//	QFrame			*configDisplay;
 	QSettings		*dabSettings;
 	dabService		currentService;
 	dabService		nextService;
@@ -166,6 +173,9 @@
 #ifdef	DATA_STREAMER
 	tcpServer		*dataStreamer;
 #endif
+#ifdef	CLOCK_STREAMER
+	tcpServer		*clockStreamer;
+#endif
 #ifdef	TRY_EPG
 	CEPGDecoder		epgHandler;
 	epgDecoder		epgProcessor;
@@ -298,10 +308,11 @@
 	void			showQuality		(float);
 	void			show_rsCorrections	(int);
 	void			show_tii		(int, int);
+	void			show_tii_spectrum	();
 	void			closeEvent		(QCloseEvent *event);
 	void			clockTime		(int, int, int,
 	 int, int,
-	 int, int, int);
+	 int, int, int, int);
 	void			startAnnouncement	(const QString &, int);
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);
@@ -352,6 +363,8 @@
 	void			handle_muteButton	();
 	void			muteButton_timeOut	();
 	void			alarmTimer_timeOut	();
+	void			handle_dlTextButton ();
+
 //
 //	color handlers
 	void			color_contentButton	();
@@ -373,6 +386,7 @@
 	void			color_framedumpButton	();
 	void			color_audiodumpButton	();
 	void			color_configButton	();
+	void			color_dlTextButton	();
 //
 //	config handlers
 	void			handle_configSetting		();
@@ -392,5 +406,7 @@
 	void			handle_skipList_button		();
 	void			handle_skipFile_button		();
 	void			handle_snrDelaySetting		(int);
+	void			handle_tii_detectorMode		(int);
+
 };
 #endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-mini.png -> _service:download_url:qt-dab-4.0.tar.gz/dab-mini.png Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-mini/dab-mini.pro -> _service:download_url:qt-dab-4.0.tar.gz/dab-mini/dab-mini.pro Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-mini/dab-mini.ui -> _service:download_url:qt-dab-4.0.tar.gz/dab-mini/dab-mini.ui Changed

@@ -6,322 +6,234 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>314</width>
- <height>357</height>
+ <width>353</width>
+ <height>424</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>dabMini</string>
 </property>
- <widget class="smallComboBox" name="streamoutSelector">
- <property name="geometry">
- <rect>
- <x>180</x>
- <y>210</y>
- <width>126</width>
- <height>37</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- <widget class="QLabel" name="dynamicLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>260</y>
- <width>301</width>
- <height>41</height>
- </rect>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- <widget class="presetComboBox" name="presetSelector">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>310</y>
- <width>151</width>
- <height>37</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
 <item>
- <property name="text">
- <string>Presets</string>
- </property>
- </item>
- </widget>
- <widget class="smallSpinBox" name="lnaSelector">
- <property name="geometry">
- <rect>
- <x>180</x>
- <y>80</y>
- <width>121</width>
- <height>31</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>LNA state for the sdrplay, the range of values depends on the model of the RSP</string>
- </property>
- </widget>
- <widget class="QCheckBox" name="agcControl">
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>10</y>
- <width>52</width>
- <height>25</height>
- </rect>
- </property>
- <property name="text">
- <string>agc</string>
- </property>
- </widget>
- <widget class="QLabel" name="timeDisplay">
- <property name="geometry">
- <rect>
- <x>180</x>
- <y>240</y>
- <width>131</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- <widget class="smallSpinBox" name="gainSelector">
- <property name="geometry">
- <rect>
- <x>180</x>
- <y>40</y>
- <width>121</width>
- <height>31</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>gain(reduction).
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="timeDisplay">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="serviceLabel">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="ensembleId">
+ <property name="font">
+ 
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallQListView" name="ensembleDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="ficLabel">
+ <property name="text">
+ <string>FIC</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="copyrightLabel">
+ <property name="text">
+ <string>©</string>

_service:download_url:qt-dab-4.0.tar.gz/dab-mini/dab-mini.ui-orig Added

@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dab_mini</class>
+ <widget class="QWidget" name="dab_mini">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>314</width>
+ <height>357</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>dabMini</string>
+ </property>
+ <widget class="smallComboBox" name="streamoutSelector">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>210</y>
+ <width>126</width>
+ <height>37</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget class="QLabel" name="dynamicLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>260</y>
+ <width>301</width>
+ <height>41</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="presetComboBox" name="presetSelector">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>310</y>
+ <width>151</width>
+ <height>37</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>Presets</string>
+ </property>
+ </item>
+ </widget>
+ <widget class="smallSpinBox" name="lnaSelector">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>80</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>LNA state for the sdrplay, the range of values depends on the model of the RSP</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>10</y>
+ <width>52</width>
+ <height>25</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="timeDisplay">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>240</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="smallSpinBox" name="gainSelector">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>40</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>gain(reduction).
+For the SDRplay: it is gain reduction in the range 20 .. 59
+For the RTLSDR is is gain, range depending on the device</string>
+ </property>
+ </widget>
+ <widget class="smallComboBox" name="channelSelector">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>120</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Channel selector. </string>
+ </property>
+ </widget>
+ <widget class="smallQListView" name="ensembleDisplay">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>73</y>
+ <width>159</width>
+ <height>171</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <widget class="QLabel" name="serviceLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>40</y>
+ <width>159</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="ensembleId">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>10</y>
+ <width>151</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>12</pointsize>

_service:download_url:qt-dab-3.7.2.tar.gz/dab-mini/radio.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-mini/radio.cpp Changed

@@ -323,7 +323,7 @@
 int row = model. rowCount ();
 for (int i = 0; i < row; i ++) {
 model. setData (model. index (i, 0),
- QFont ("Cantarell", 11), Qt::FontRole);
+ QFont ("Cantarell", 10), Qt::FontRole);
 }
 
 ensembleDisplay -> setModel (&model);
@@ -402,7 +402,7 @@
 	 int row = model. rowCount ();
 	 for (int i = 0; i < row; i ++) {
 	 model. setData (model. index (i, 0),
-	 QFont ("Cantarell", 11), Qt::FontRole);
+	 QFont ("Cantarell", 10), Qt::FontRole);
 	 }
 	 ensembleDisplay -> setModel (&model);
 //
@@ -587,7 +587,8 @@
 };
 
 void	RadioInterface::clockTime (int year, int month, int day,
-	 int hours, int minutes){
+	 int hours, int minutes,
+	 int d2, int h2, int m2, int sec){
 char dayString [3];
 char hourString [3];
 char minuteString [3];
@@ -670,6 +671,9 @@
 
 }
 
+void	RadioInterface::show_tii_spectrum () {
+}
+
 void	RadioInterface::show_tii	(int s1, int s2) {
 	(void)s1; (void)s2;
 }
@@ -884,7 +888,7 @@
 	 QString itemText =
 	 model. index (i, 0). data (Qt::DisplayRole). toString ();
 	 if (itemText == serviceName) {
-	 colorService (model. index (i, 0), Qt::black, 11);
+	 colorService (model. index (i, 0), Qt::black, 10);
 	 break;
 	 }
 	 }
@@ -927,7 +931,7 @@
 	 QString itemText =
 	 model. index (i, 0). data (Qt::DisplayRole). toString ();
 	 if (itemText == serviceName) {
-	 colorService (model. index (i, 0), Qt::red, 15);
+	 colorService (model. index (i, 0), Qt::red, 13);
 	 serviceLabel	-> setStyleSheet ("QLabel {color : black}");
 	 serviceLabel	-> setText (serviceName);
 	 if (my_dabProcessor -> is_audioService (serviceName)) {
@@ -1003,7 +1007,7 @@
 	 (oldService != "")) {
 	 for (int i = 0; i < (int)(serviceList. size ()); i ++) {
 	 if (serviceList. at (i). name == oldService) {
-	 colorService (model. index (i, 0), Qt::black, 11);
+	 colorService (model. index (i, 0), Qt::black, 10);
 	 i = i - 1;
 	 if (i < 0)
 	 i = serviceList. size () - 1;
@@ -1041,7 +1045,7 @@
 	if ((serviceList. size () != 0) && (oldService != "")) {
 	 for (int i = 0; i < (int)(serviceList. size ()); i ++) {
 	 if (serviceList. at (i). name == oldService) {
-	 colorService (model. index (i, 0), Qt::black, 11);
+	 colorService (model. index (i, 0), Qt::black, 10);
 	 i = i + 1;
 	 if (i >= (int)(serviceList. size ()))
 	 i = 0;
@@ -1320,11 +1324,20 @@
 	}
 }
 
+void setButtonFont (QPushButton *b, QString text, int size) {
+ QFont font = b -> font ();
+ font. setPointSize (size);
+ b -> setFont (font);
+ b -> setText (text);
+ b -> update ();
+}
+
 void RadioInterface::handle_muteButton () {
 if (muting) {
 muteTimer. stop ();
 disconnect (&muteTimer, SIGNAL (timeout ()),
 this, SLOT (handle_muteButton ()));
+	 setButtonFont (muteButton, "mute", 10);
 muting = false;
 return;
 }
@@ -1332,6 +1345,7 @@
 connect (&muteTimer, SIGNAL (timeout (void)),
 this, SLOT (handle_muteButton (void)));
 muteTimer. start (muteDelay * 1000);
+ setButtonFont (muteButton, "muting", 11);
 muting = true;
 }

_service:download_url:qt-dab-3.7.2.tar.gz/dab-mini/radio.h -> _service:download_url:qt-dab-4.0.tar.gz/dab-mini/radio.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-4.0.tar.gz/dab-processor.cpp Changed

@@ -92,6 +92,8 @@
 	         myRadioInterface, SLOT (showSpectrum (int)));
 	connect (this, SIGNAL (show_tii (int, int)),
 	         myRadioInterface, SLOT (show_tii (int, int)));
+	connect (this, SIGNAL (show_tii_spectrum ()),
+	         myRadioInterface, SLOT (show_tii_spectrum ()));
 	connect (this, SIGNAL (show_snr (int)),
 	         mr, SLOT (show_snr (int)));
 	connect (this, SIGNAL (show_clockErr (int)),
@@ -111,6 +113,10 @@
 	}
 }
 
+void	dabProcessor::set_tiiDetectorMode	(bool b) {
+	my_TII_Detector. setMode (b);
+}
+
 void	dabProcessor::start (int frequency) {
 	this	-> frequency	= frequency;
 	my_ficHandler. reset	();
@@ -339,11 +345,12 @@
 	     if (wasSecond (my_ficHandler. get_CIFcount(), &params)) {
 	         my_TII_Detector. addBuffer (ofdmBuffer);
 	         if (++tii_counter >= tii_delay) {
+	            tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
+	            show_tii_spectrum ();
 	            uint16_t res = my_TII_Detector. processNULL ();
 	            if (res != 0) {
 	               uint8_t mainId	= res >> 8;
 	               uint8_t subId	= res & 0xFF;
-	               tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
 	               show_tii (mainId, subId);
 	            }
 	            tii_counter = 0;

_service:download_url:qt-dab-3.7.2.tar.gz/dab-processor.h -> _service:download_url:qt-dab-4.0.tar.gz/dab-processor.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/docs/qt-dab.pdf -> _service:download_url:qt-dab-4.0.tar.gz/docs/qt-dab.pdf Changed

_service:download_url:qt-dab-3.7.2.tar.gz/forms/config-helper.ui -> _service:download_url:qt-dab-4.0.tar.gz/forms/config-helper.ui Changed

_service:download_url:qt-dab-3.7.2.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-4.0.tar.gz/forms/dabradio.ui Changed

@@ -6,7 +6,7 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>642</width>
+ <width>756</width>
 <height>412</height>
 </rect>
 </property>
@@ -17,7 +17,7 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB-3.72</string>
+ <string>Qt-DAB-4.0</string>
 </property>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
@@ -542,42 +542,29 @@
 </item>
 <item>
 <layout class="QGridLayout" name="gridLayout">
- <item row="2" column="0" colspan="4">
- <widget class="smallComboBox" name="streamoutSelector">
+ <item row="0" column="0">
+ <widget class="verySmallPushButton" name="contentButton">
 <property name="sizePolicy">
- <sizepolicy hsizetype="Ignored" vsizetype="Expanding">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
 <property name="font">
 
- <family>DejaVu Sans</family>
 <pointsize>10</pointsize>
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a device (channel) for the audio output. On program start up a default is chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <item>
- <property name="text">
- <string>Audio Device</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="smallPushButton" name="historyButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;history feature. The software maintains a list of all services encountered. Touching this button will show (hide) the list. By clicking with the left mouse button the software will try to select the service pointed to, by clicking with the ruight mouse button the lit will be deleted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This will open a 'save as ... dialog' where you can select a file to store a description of the content of the current DAB ensemble (Audio and Data) in a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>list</string>
+ <string>Content</string>
 </property>
 </widget>
 </item>
- <item row="3" column="6" colspan="2">
- <widget class="verySmallPushButton" name="configButton">
+ <item row="0" column="1" colspan="2">
+ <widget class="verySmallPushButton" name="detailButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -591,37 +578,31 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;Touching this button will show/hide a widget where some configuration settings can be changed. &lt;br /&gt;&lt;br /&gt;The config widget also contains a posisbility for setting an alarm like signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for further technical information about the selected program&lt;/p&gt;&lt;p&gt;Push again for closing the pop-up-window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>config</string>
+ <string>Detail</string>
 </property>
 </widget>
 </item>
- <item row="3" column="1" colspan="3">
- <widget class="verySmallPushButton" name="dumpButton">
+ <item row="0" column="3" colspan="2">
+ <widget class="verySmallPushButton" name="resetButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save the raw input. Pushing will cause a menu to appear where a filename can be selected. Please note the big filesizes!&lt;/p&gt;&lt;p&gt;Push again to stop recording. You can reload it by using the file input (*.sdr) option. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to reset, i.e. restart synchronization.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>Raw dump</string>
+ <string>reset</string>
 </property>
 </widget>
 </item>
- <item row="1" column="0" colspan="2">
- <widget class="verySmallPushButton" name="devicewidgetButton">
+ <item row="0" column="5" colspan="2">
+ <widget class="verySmallPushButton" name="scanButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -635,15 +616,17 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching the scan button will cause the software to make a single scan over all channels. Ensembles (and their services) found will be displayed in a separate window.&lt;/p&gt;&lt;p&gt;The windows will be visible as long as the scanning mode is on &lt;br/&gt;
+(note that after completing the scan, i.e. the cycle from channel 5A to 13F, &lt;br /&gt;
+the software will wait until the scanner is officially stopped).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>device</string>
+ <string>Scan</string>
 </property>
 </widget>
 </item>
- <item row="3" column="4" colspan="2">
- <widget class="verySmallPushButton" name="snrButton">
+ <item row="1" column="0">
+ <widget class="verySmallPushButton" name="devicewidgetButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -657,15 +640,15 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The snrViewer button controls a widget that - when enabled - will show the development of SNR over time. Parameters of the screen, height (the Y-axis) and the number of measurements (X-axis) can be set in the configuration widget.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>snr viewer</string>
+ <string>device</string>
 </property>
 </widget>
 </item>
- <item row="0" column="6" colspan="2">
- <widget class="verySmallPushButton" name="scanButton">
+ <item row="1" column="1" colspan="3">
+ <widget class="verySmallPushButton" name="show_correlationButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -679,17 +662,20 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching the scan button will cause the software to make a single scan over all channels. Ensembles (and their services) found will be displayed in a separate window.&lt;/p&gt;&lt;p&gt;The windows will be visible as long as the scanning mode is on &lt;br/&gt;
-(note that after completing the scan, i.e. the cycle from channel 5A to 13F, &lt;br /&gt;
-the software will wait until the scanner is officially stopped).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;
+Touching this button will show (or hide) the resulting correlation of the first&lt;br /&gt;
+ datablock of the DAB ensemble with the values as they should be. &lt;br /&gt;&lt;br /&gt;
+The &quot;peaks&quot; (if any) show the samples where the correlation is strongest. &lt;br /&gt;
+More than one peak shows more than one transmitter within
+the reach &lt;br /&gt;of this receiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>Scan</string>
+ <string>corr-result</string>
 </property>
 </widget>
 </item>
- <item row="1" column="2" colspan="3">
- <widget class="verySmallPushButton" name="show_correlationButton">
+ <item row="1" column="4" colspan="2">
+ <widget class="verySmallPushButton" name="show_spectrumButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -703,22 +689,27 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;
-Touching this button will show (or hide) the resulting correlation of the first&lt;br /&gt;
- datablock of the DAB ensemble with the values as they should be. &lt;br /&gt;&lt;br /&gt;
-The &quot;peaks&quot; (if any) show the samples where the correlation is strongest. &lt;br /&gt;
-More than one peak shows more than one transmitter within
-the reach &lt;br /&gt;of this receiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spectrum and the constellation of the DAB signal is shown when pressing this button. &lt;br /&gt;&lt;br /&gt;Pressing it again will cause the spectrum and constellation to be invisible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>corr-result</string>
+ <string>spectrum</string>
 </property>
 </widget>

_service:download_url:qt-dab-4.0.tar.gz/forms/dabradio.ui-3.72 Added

@@ -0,0 +1,869 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabradio</class>
+ <widget class="QWidget" name="dabradio">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>642</width>
+ <height>412</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Qt-DAB-3.72</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QWidget" name="leftPane" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>3</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="smallQListView" name="ensembleDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>10</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting a service is by clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;left &lt;/span&gt;mouse button on the name of the service.&lt;/p&gt;&lt;p&gt;Clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;right mouse button on the name of the selected service &lt;/span&gt;in this list will add the service to the presets.&lt;/p&gt;&lt;p&gt;Clicking with the right mouse button on the name of any other of the listed services will show some data on that service.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="presetComboBox" name="presetSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Presets are short cuts to services - possibly in ensembles in different channels - that are obtained by clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;right &lt;/span&gt;mouse button on the name of the service &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;in the list of services when selected&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;Removing a name from the presets is by selecting the service in this combobox and pressing the shift+delete combination.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Presets</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="smallPushButton" name="prevServiceButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head&gt;&lt;/head&gt;&lt;body&gt;
+&lt;p&gt;Select the previous service on the list of services&lt;br /&gt;(the previous one of the first element is the last element of the list).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallPushButton" name="nextServiceButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head /&gt; &lt;body&gt;&lt;p&gt;Select the next service on the list of services &lt;br /&gt;(the next of the last element is the first element).&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="smallComboBox" name="channelSelector">
+ <property name="toolTip">
+ <string>Channel selector.</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>channels</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="smallPushButton" name="prevChannelButton">
+ <property name="toolTip">
+ <string>Select the previous channel.</string>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallPushButton" name="nextChannelButton">
+ <property name="toolTip">
+ <string>Select the next channel of the list maintained in the channel selector.</string>
+ </property>
+ <property name="text">
+ <string>+</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="rightPane" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QLCDNumber" name="stillMuting"/>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QLabel" name="runtimeDisplay">
+ <property name="frameShape">
+ <enum>QFrame::Panel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string>run-time</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="localTimeDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;Local time is the time as received from the transmission. &lt;br /&gt;&lt;br /&gt;If you are running recordings, then
+it is definitely not the time on your clock.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Panel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string>localTime</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="copyrightLabel">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB copyright:&lt;/p&gt;&lt;p&gt;J van Katwijk, Lazy Chair Computing. J.vanKatwijk@gmail.com&lt;/p&gt;&lt;p&gt;Copyright of the Qt toolkit used: the Qt Company&lt;/p&gt;&lt;p&gt;Copyright of the libraries used for SDRplay, rtl-sdr based sticks, AIRspy, portaudio, libsndfile and libsamplerate and libfftw3 to their developers&lt;/p&gt;&lt;p&gt;Copyright of the MP2 library used Martin J Fiedler&lt;/p&gt;&lt;p&gt;Copyright of the firecode checker: Gnu Radio&lt;/p&gt;&lt;p&gt;Copyright of the Reed Solomon Decoder software: Phil Karns&lt;/p&gt;&lt;p&gt;Copyright of the code to create a correct header for the AAC files: Stefan Poeschel&lt;/p&gt;&lt;p&gt;All copyrights gratefully acknowledged&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The current layout of the GUI is based on a design of Luo Zhang, Thanks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Qt-DAB (an SDR-J program) 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.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>

_service:download_url:qt-dab-3.7.2.tar.gz/forms/dabradio.ui-old -> _service:download_url:qt-dab-4.0.tar.gz/forms/dabradio.ui-old Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>642</width>
- <height>407</height>
+ <width>756</width>
+ <height>412</height>
 </rect>
 </property>
 <property name="sizePolicy">
@@ -17,7 +17,7 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB-3.5</string>
+ <string>Qt-DAB-4.0</string>
 </property>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
@@ -75,7 +75,8 @@
 <item>
 <widget class="smallPushButton" name="prevServiceButton">
 <property name="toolTip">
- <string>Select the previous service on the list of services (the previous one of the first element is the last element of the list).</string>
+ <string>&lt;html&gt;&lt;head&gt;&lt;/head&gt;&lt;body&gt;
+&lt;p&gt;Select the previous service on the list of services&lt;br /&gt;(the previous one of the first element is the last element of the list).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>-</string>
@@ -85,7 +86,7 @@
 <item>
 <widget class="smallPushButton" name="nextServiceButton">
 <property name="toolTip">
- <string>Select the next service on the list of services (the next of the last element is the first element).</string>
+ <string>&lt;html&gt;&lt;head /&gt; &lt;body&gt;&lt;p&gt;Select the next service on the list of services &lt;br /&gt;(the next of the last element is the first element).&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>+</string>
@@ -147,6 +148,9 @@
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout_6">
 <item>
+ <widget class="QLCDNumber" name="stillMuting"/>
+ </item>
+ <item>
 <layout class="QHBoxLayout" name="horizontalLayout_9">
 <item>
 <widget class="QLabel" name="runtimeDisplay">
@@ -167,8 +171,8 @@
 <item>
 <widget class="QLabel" name="localTimeDisplay">
 <property name="toolTip">
- <string>Local time is the time as received from the transmission. If you are running recordings, then
-it is definitely not the time on your clock.</string>
+ <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;Local time is the time as received from the transmission. &lt;br /&gt;&lt;br /&gt;If you are running recordings, then
+it is definitely not the time on your clock.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="frameShape">
 <enum>QFrame::Panel</enum>
@@ -201,6 +205,13 @@
 </property>
 </widget>
 </item>
+ <item>
+ <widget class="verySmallPushButton" name="muteButton">
+ <property name="text">
+ <string>mute</string>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -401,13 +412,6 @@
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>FIC </string>
- </property>
- </widget>
- </item>
- <item>
 <widget class="QProgressBar" name="ficError_display">
 <property name="maximumSize">
 <size>
@@ -420,6 +424,27 @@
 </property>
 </widget>
 </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>FIC </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="epgLabel">
+ <property name="text">
+ <string>EPG</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="alarmLabel">
+ <property name="text">
+ <string>Alarm</string>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -517,8 +542,29 @@
 </item>
 <item>
 <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="2" colspan="3">
- <widget class="smallPushButton" name="detailButton">
+ <item row="0" column="0">
+ <widget class="verySmallPushButton" name="contentButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <pointsize>10</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This will open a 'save as ... dialog' where you can select a file to store a description of the content of the current DAB ensemble (Audio and Data) in a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>Content</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2">
+ <widget class="verySmallPushButton" name="detailButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -539,8 +585,8 @@
 </property>
 </widget>
 </item>
- <item row="0" column="5">
- <widget class="smallPushButton" name="resetButton">
+ <item row="0" column="3" colspan="2">
+ <widget class="verySmallPushButton" name="resetButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -555,8 +601,8 @@
 </property>
 </widget>
 </item>
- <item row="0" column="6" colspan="2">
- <widget class="smallPushButton" name="scanButton">
+ <item row="0" column="5" colspan="2">
+ <widget class="verySmallPushButton" name="scanButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -570,18 +616,17 @@
 
 </property>
 <property name="toolTip">
- <string>Touching the scan button will cause the software to make a single scan over all channels in the selected band. Ensembles (and their services) found will be displayed in a separate window.
-The windows will be visible as long as the scanning mode is on (note that after completing the
-scan, i.e. the cycle from (in Mode I) channel 5A to 13F, the software will wait until the scanner
-is officlally stopped).</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching the scan button will cause the software to make a single scan over all channels. Ensembles (and their services) found will be displayed in a separate window.&lt;/p&gt;&lt;p&gt;The windows will be visible as long as the scanning mode is on &lt;br/&gt;
+(note that after completing the scan, i.e. the cycle from channel 5A to 13F, &lt;br /&gt;
+the software will wait until the scanner is officially stopped).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>Scan</string>
 </property>
 </widget>
 </item>
- <item row="1" column="0" colspan="2">
- <widget class="smallPushButton" name="show_tiiButton">
+ <item row="1" column="0">
+ <widget class="verySmallPushButton" name="devicewidgetButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -595,15 +640,15 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If configured - pushing this button will switch the spectrum display between &amp;quot;regular&amp;quot; and a spectrum showing the &amp;quot;null symbol&amp;quot; period. In the console window the pattern, main ID and sub ID of the TII will be displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

_service:download_url:qt-dab-3.7.2.tar.gz/includes/backend/data/mot/mot-dir.h -> _service:download_url:qt-dab-4.0.tar.gz/includes/backend/data/mot/mot-dir.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-4.0.tar.gz/includes/dab-constants.h Changed

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

_service:download_url:qt-dab-3.7.2.tar.gz/includes/ofdm/tii_detector.h -> _service:download_url:qt-dab-4.0.tar.gz/includes/ofdm/tii_detector.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/includes/output/fir-filters.h -> _service:download_url:qt-dab-4.0.tar.gz/includes/output/fir-filters.h Changed

_service:download_url:qt-dab-4.0.tar.gz/includes/support/dl-cache.h Added

_service:download_url:qt-dab-3.7.2.tar.gz/includes/support/findfilenames.h -> _service:download_url:qt-dab-4.0.tar.gz/includes/support/findfilenames.h Changed

_service:download_url:qt-dab-3.7.2.tar.gz/qt-dab-main-controls.png -> _service:download_url:qt-dab-4.0.tar.gz/qt-dab-main-controls.png Changed

_service:download_url:qt-dab-3.7.2.tar.gz/qt-dab-main-widget.png -> _service:download_url:qt-dab-4.0.tar.gz/qt-dab-main-widget.png Changed

_service:download_url:qt-dab-3.7.2.tar.gz/qt-dab-screen.png -> _service:download_url:qt-dab-4.0.tar.gz/qt-dab-screen.png Changed

_service:download_url:qt-dab-3.7.2.tar.gz/qt-dab-totaal.png -> _service:download_url:qt-dab-4.0.tar.gz/qt-dab-totaal.png Changed

_service:download_url:qt-dab-3.7.2.tar.gz/qt-usersguide.png -> _service:download_url:qt-dab-4.0.tar.gz/qt-usersguide.png Changed

_service:download_url:qt-dab-3.7.2.tar.gz/snr-viewer/snr-widget.ui -> _service:download_url:qt-dab-4.0.tar.gz/snr-viewer/snr-widget.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>330</width>
- <height>188</height>
+ <height>243</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -23,7 +23,7 @@
 </sizepolicy>
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;snr display. As well known a DAB frame starts with a so-called null period, a period where the amplitude of the transmitted signal is (should be) zero. So, it is an excellent noise floor, and the SNR shown is computed as 10 * log10 (average amplitude from data blocks / average amplitude null period)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;snr display. As well known a DAB frame starts with a so-called null period, a period where the amplitude of the transmitted signal is (should be) zero. So, it is an excellent noise floor, and the SNR shown is computed as 20 * log10 (average amplitude from data blocks / average amplitude null period). One thing though. in many SFN's the transmitters add an encoding og the transmitter id (tii) to each second DABframe. So for uneven compressions you see the difference on SNR between the first and second frames&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 </widget>
 </item>

_service:download_url:qt-dab-3.7.2.tar.gz/src/backend/backend-driver.cpp -> _service:download_url:qt-dab-4.0.tar.gz/src/backend/backend-driver.cpp Changed

_service:download_url:qt-dab-3.7.2.tar.gz/src/backend/data/mot/mot-dir.cpp -> _service:download_url:qt-dab-4.0.tar.gz/src/backend/data/mot/mot-dir.cpp Changed

@@ -43,22 +43,23 @@
 	 this	-> dir_segmentSize	= segmentSize;
 	 fprintf (stderr, "dirSize %d, numObjects %d, segmentSize %d\n",
 	 dirSize, objects, segmentSize);
-	 dir_segments		= new uint8_t [dirSize];
-	 motComponents	= new motComponentType [objects];
-	 for (i = 0; i < objects; i ++)
+	 dir_segments. resize (dirSize);
+	 motComponents. resize (objects);
+	 for (i = 0; i < objects; i ++) {
 	 motComponents [i]. inUse = false;
+	 motComponents [i]. motSlide	= nullptr;
+	 }
 	 memcpy (&dir_segments [0], segment, segmentSize);
 	 marked [0] = true;
-	}
+}
 
 	motDirectory::~motDirectory() {
 int	i;
-	delete []	dir_segments;
 
 	for (i = 0; i < numObjects; i ++) 
-	 if (motComponents [i]. inUse)
-	 delete [] motComponents [i]. motSlide;
-	delete []	motComponents;
+	 if (motComponents [i]. inUse &&
+	 (motComponents [i]. motSlide != nullptr)) 
+	 delete motComponents [i]. motSlide;
 }
 
 motObject	*motDirectory::getHandle (uint16_t transportId) {
@@ -118,18 +119,18 @@
 
 void	motDirectory::analyse_theDirectory() {
 uint32_t	currentBase	= 11;	// in bytes
-uint8_t	*data			= dir_segments;
+//uint8_t	*data			= dir_segments;
 uint16_t extensionLength	= (dir_segments [currentBase] << 8) |
-	 data [currentBase + 1];
+	 dir_segments [currentBase + 1];
 
 	currentBase += 2 + extensionLength;
 	for (int i = 0; i < numObjects; i ++) {
-	 uint16_t transportId	= (data [currentBase] << 8) |
-	 data [currentBase + 1];
+	 uint16_t transportId	= (dir_segments [currentBase] << 8) |
+	 dir_segments [currentBase + 1];
 	 if (transportId == 0)	// just a dummy
 	 break;
 
-	 uint8_t *segment	= &data [currentBase + 2];
+	 uint8_t *segment	= &dir_segments [currentBase + 2];
 	 motObject *handle	= new motObject (myRadioInterface,
 	 true,
 	 transportId,

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

@@ -48,13 +48,14 @@
 	motHandler::~motHandler() {
 int	i;
 
-	for (i = 0; i < 15; i ++)
+	for (i = 0; i < 15; i ++) {
 	 if (motTable [i]. orderNumber > 0) {
 	 if (motTable [i]. motSlide != nullptr) {
 	 delete motTable [i]. motSlide;
 	 motTable [i]. motSlide = nullptr;
 	 }
 	 }
+	}
 	if (theDirectory != nullptr)
 	 delete theDirectory;
 }
@@ -137,14 +138,14 @@
 	 break; 
 
 	 case 4: {
-	 motObject *h = getHandle (transportId);
-//	 if ((h == nullptr) && (segmentNumber != 0))
-//	 break;
-	 if (h != nullptr)
-	 h -> addBodySegment (&motVector [2],
-	 segmentNumber,
-	 segmentSize,
-	 lastFlag);
+	 motObject *h = getHandle (transportId);
+//	 if ((h == nullptr) && (segmentNumber != 0))
+//	 break;
+	 if (h != nullptr)
+	 h -> addBodySegment (&motVector [2],
+	 segmentNumber,
+	 segmentSize,
+	 lastFlag);
 	 }
 	 break;
 
@@ -189,6 +190,7 @@
 	 break;
 
 	 default:
+	 fprintf (stderr, "mot groupType %d\n", groupType);
 	 return;
 	}
 }

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

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

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

@@ -42,9 +42,10 @@
 	connect (this, SIGNAL (nameofEnsemble (int, const QString &)),
 	 myRadioInterface,
 	 SLOT (nameofEnsemble (int, const QString &)));
-	connect (this, SIGNAL (clockTime (int, int, int, int, int, int, int, int)),
+	connect (this, SIGNAL (clockTime (int, int, int, int, int,
+	 int, int, int, int)),
 	 myRadioInterface, SLOT (clockTime (int, int, int, int, int,
-	 int, int, int)));
+	 int, int, int, int)));
 	connect (this, SIGNAL (changeinConfiguration ()),
 	 myRadioInterface, SLOT (changeinConfiguration ()));
 	connect (this, SIGNAL (startAnnouncement (const QString &, int)),
@@ -1736,20 +1737,24 @@
 //
 //	take care of different time zones
 	bool	change = false;
-	for (int i = 0; i < 5; i ++) {
+	for (int i = 0; i < 6; i ++) {
 	 if (theTime [i] != dateTime [i])
 	 change = true;
 	 dateTime [i] = theTime [i];
 	}
 
+#ifdef	CLOCK_STREAMER
+	change = true;
+#endif
 	if (change) {
 	 int utc_day	= dateTime [2];
 	 int utc_hour	= dateTime [3];
 	 int utc_minute = dateTime [4];
+	 int utc_seconds = dateTime [5];
 	 adjustTime (dateTime);
 	 emit clockTime (dateTime [0], dateTime [1],
 	 dateTime [2], dateTime [3], dateTime [4],
-	 utc_day, utc_hour, utc_minute);
+	 utc_day, utc_hour, utc_minute, utc_seconds);
 	}
 }

_service:download_url:qt-dab-3.7.2.tar.gz/src/ofdm/tii_detector.cpp -> _service:download_url:qt-dab-4.0.tar.gz/src/ofdm/tii_detector.cpp Changed

@@ -119,19 +119,22 @@
 	fft_buffer		= my_fftHandler. getVector();	
 	window. resize 		(T_u);
 	for (i = 0; i < T_u; i ++)
-	 window [i] = (0.42 -
-	 0.5 * cos (2 * M_PI * (float)i / T_u) +
-	 0.08 * cos (4 * M_PI * (float)i / T_u));
+	 window [i] = 0.54 - 0.46 * cos (2 * M_PI * (float)i / T_u);
 
 	for (i = 0; i < 70; ++i) 
 	 invTable [table [i]] = i;
 	for (i = 71; i < 256; i ++)
 	 invTable [i] = -1;
+	detectMode_new	= false;
 }
 
 		TII_Detector::~TII_Detector() {
 }
 
+void	TII_Detector::setMode	(bool b) {
+	detectMode_new = b;
+}
+
 
 void	TII_Detector::reset() {
 	for (int i = 0; i < T_u; i ++)
@@ -256,23 +259,41 @@
 	for (i = 0; i < NUM_GROUPS; i ++) 
 	 x [i] = hulpTable [maxIndex + GROUPSIZE * i];
 //
-//	we extract the four max values as bits
-	uint16_t pattern	= 0;
-	for (i = 0; i < 4; i ++) {
-	 float mmax	= 0;
-	 int ind		= -1;
-	 for (int k = 0; k < NUM_GROUPS; k ++) {
-	 if (x [k] > mmax) {
-	 mmax = x [k];
-	 ind = k;
+//	find the best match
+	int finInd = -1;
+	if (detectMode_new) {
+	 float mm = 0;
+	 for (int k = 0; k < sizeof (table); k ++) {
+	 float val = 0;
+	 for (int l = 0; l < NUM_GROUPS; l ++)
+	 if ((table [k] & bits [l]) != 0)
+	 val += x [l];
+	 if (val > mm) {
+	 mm = val;
+	 finInd = k;
 	 }
 	 }
-
-	 if (ind != -1) {
-	 x [ind] = 0;
-	 pattern |= bits [ind];
+	}
+	else {		// detectMode_new is false
+////	we extract the four max values as bits
+	 uint16_t pattern	= 0;
+	 for (i = 0; i < 4; i ++) {
+	 float mmax	= 0;
+	 int ind		= -1;
+	 for (int k = 0; k < NUM_GROUPS; k ++) {
+	 if (x [k] > mmax) {
+	 mmax = x [k];
+	 ind = k;
+	 }
+	 }
+	 if (ind != -1) {
+	 x [ind] = 0;
+	 pattern |= bits [ind];
+	 }
 	 }
+	 finInd = invTable [pattern];
 	}
-	return maxIndex + (invTable [pattern]) * 256;
+
+	return maxIndex + finInd * 256;
 }

_service:download_url:qt-dab-3.7.2.tar.gz/src/output/fir-filters.cpp -> _service:download_url:qt-dab-4.0.tar.gz/src/output/fir-filters.cpp Changed

@@ -31,27 +31,26 @@
 
 	LowPassFIR::LowPassFIR (int16_t firsize,
 	 int32_t Fc, int32_t fs){
-float	f	= (float)Fc / fs;
 float	sum	= 0.0;
-int16_t		i;
 float	*temp 	= (float *)alloca (firsize * sizeof (float));
 
-	filterSize	= firsize;
-	filterKernel	= new std::complex<float> [filterSize];
-	Buffer		= new std::complex<float> [filterSize];
-	ip		= 0;
+	this -> frequency	= (float)Fc / fs;
+	this -> filterSize	= firsize;
+	filterKernel.	resize (filterSize);
+	Buffer.		resize (filterSize);
+	this -> ip		= 0;
 
-	for (i = 0; i < filterSize; i ++) {
+	for (int i = 0; i < filterSize; i ++) {
 	 filterKernel [i]	= 0;
 	 Buffer [i]		= 0;
 	}
 
-	for (i = 0; i < filterSize; i ++) {
+	for (int i = 0; i < filterSize; i ++) {
 	 if (i == filterSize / 2)
-	 temp [i] = 2 * M_PI * f;
+	 temp [i] = 2 * M_PI * frequency;
 	 else 
 	 temp [i] =
-	 sin (2 * M_PI * f * (i - filterSize/2))/ (i - filterSize/2);
+	 sin (2 * M_PI * frequency * (i - filterSize/2))/ (i - filterSize/2);
 //
 //	Blackman window
 	 temp [i] *= (0.42 -
@@ -61,13 +60,43 @@
 	 sum += temp [i];
 	}
 
-	for (i = 0; i < filterSize; i ++)
+	for (int i = 0; i < filterSize; i ++)
 	 filterKernel [i] = std::complex<float> (temp [i] / sum, 0);
 }
 
 	LowPassFIR::~LowPassFIR () {
-	delete[]	filterKernel;
-	delete[]	Buffer;
+}
+
+void	LowPassFIR::resize (int newSize) {
+float	*temp 	= (float *)alloca (newSize * sizeof (float));
+float	sum = 0;
+
+	filterSize	= newSize;
+	filterKernel. resize (filterSize);
+	Buffer. resize (filterSize);
+	ip		= 0;
+
+	for (int i = 0; i < filterSize; i ++) {
+	 filterKernel [i]	= 0;
+	}
+
+	for (int i = 0; i < filterSize; i ++) {
+	 if (i == filterSize / 2)
+	 temp [i] = 2 * M_PI * frequency;
+	 else 
+	 temp [i] =
+	 sin (2 * M_PI * frequency * (i - filterSize/2))/ (i - filterSize/2);
+//
+//	Blackman window
+	 temp [i] *= (0.42 -
+		 0.5 * cos (2 * M_PI * (float)i / filterSize) +
+		 0.08 * cos (4 * M_PI * (float)i / filterSize));
+
+	 sum += temp [i];
+	}
+
+	for (int i = 0; i < filterSize; i ++)
+	 filterKernel [i] = std::complex<float> (temp [i] / sum, 0);
 }
 //
 //	we process the samples backwards rather than reversing

_service:download_url:qt-dab-3.7.2.tar.gz/src/support/findfilenames.cpp -> _service:download_url:qt-dab-4.0.tar.gz/src/support/findfilenames.cpp Changed

@@ -285,5 +285,29 @@
 	return fileName;
 }
 
+QString findfileNames::finddlText_fileName	() {
+QString saveDir = dabSettings -> value ("contentDir",
+ QDir::homePath ()). toString ();
+QString theTime = QDateTime::currentDateTime (). toString ();
+
+ if ((saveDir != "") && (!saveDir. endsWith ('/')))
+ saveDir = saveDir + '/';
+
+	for (int i = 0; i < theTime. length (); i ++)
+	 if (!isValid (theTime. at (i)))
+	 theTime. replace (i, 1, '-');
+
+ QString suggestedFileName = saveDir + "Qt-DAB-dlText" +
+ "-" + theTime + ".txt";
+	fprintf (stderr, "save file %s\n", suggestedFileName. toLatin1 (). data ());
+ QString fileName =
+ QFileDialog::getSaveFileName (nullptr,
+ "Open file ...",
+ suggestedFileName. toLatin1 (). data (),
+ "Text (*.txt)");
+ fileName = QDir::toNativeSeparators (fileName);
+ return fileName;
+}
+

_service:download_url:qt-dab-3.7.2.tar.gz/src/support/viterbi-spiral/spiral-sse.c -> _service:download_url:qt-dab-4.0.tar.gz/src/support/viterbi-spiral/spiral-sse.c Changed

Changes of Revision 38