Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 62

qt-dab.changes Changed

qt-dab.spec Changed

@@ -16,13 +16,13 @@
 #
 
 Name:           qt-dab
-Version:        6.9.6
+Version:        6.10
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/Qt-DAB-%{version}.tar.gz#/%{name}-Qt-DAB-%{version}.tar.gz
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  cmake
 %if 0%{?suse_version} >= 1600
 BuildRequires:  gcc-c++
@@ -54,7 +54,7 @@
 
 
 %prep
-%setup -q -n %{name}-Qt-DAB-%{version}
+%setup -q
 
 #fix docs permissions
 chmod a-x AUTHORS
@@ -67,7 +67,7 @@
 export CXX="/usr/bin/g++-13"
 %endif
 %cmake \
-    -DAIRSPY=ON \
+    -DAIRSPY=OFF \
     -DHACKRF=ON \
     -DRTLSDR=ON \
     -DRTLTCP=ON \
@@ -80,14 +80,14 @@
 
 # move binary to /usr/bin and rename it
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/Qt-DAB %{buildroot}%{_bindir}/%{name}-6.9.5
+mv %{buildroot}/usr/Qt-DAB %{buildroot}%{_bindir}/%{name}-6.10
 
 # install desktop file
-%suse_update_desktop_file -G Qt-DAB -i %{name}-6.9 AudioVideo Tuner 
+%suse_update_desktop_file -G Qt-DAB -i %{name}-6.10 AudioVideo Tuner 
 
 # install icon
-%define iconname %{name}-6.9.5
-convert qt-dab-6.9.5.ico %{name}.png
+%define iconname %{name}-6.10
+convert qt-dab-6.10.ico %{name}.png
 install -Dpm 0644 %{name}-0.png \
 	%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{iconname}.png
 install -Dpm 0644 %{name}-1.png \
@@ -114,8 +114,8 @@
 %files
 %doc AUTHORS README.md
 %license COPYING
-%{_bindir}/%{name}-6.9.5
-%{_datadir}/applications/%{name}-6.9.desktop
+%{_bindir}/%{name}-6.10
+%{_datadir}/applications/%{name}-6.10.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{iconname}.png
 
 %changelog

qt-dab-Qt-DAB-6.9.6.tar.gz/CMakeLists.txt -> qt-dab-6.10.tar.gz/CMakeLists.txt Changed

@@ -175,279 +175,292 @@
 	)
 
 	set (${objectName}_HDRS
-	     ./sources/main/radio.h
-	     ./sources/main/aboutdialog.h
-	     ./sources/main/config-handler.h
-	     ./sources/main/ensemble-handler.h
-	     ./sources/main/techdata.h
-	     ./sources/main/display-widget.h 
-             ./sources/main/scopes/spectrum-scope.h 
-             ./sources/main/scopes/correlation-scope.h 
-             ./sources/main/scopes/null-scope.h 
-             ./sources/main/scopes/channel-scope.h 
-	     ./sources/main/scopes/dev-scope.h
-             ./sources/main/scopes/waterfall-scope.h 
-             ./sources/main/scopes/iqdisplay.h 
-	     ./sources/main/scopes/audio-display.h
-	     ./sources/main/scopes/spectrogramdata.h
-	     ./sources/main/snr-viewer/snr-viewer.h
-	     ./sources/eti-handler/eti-generator.h
-	     ./sources/frontend/ofdm-handler.h
-             ./sources/frontend/sample-reader.h
-	     ./sources/frontend/timesyncer.h
-	     ./sources/frontend/correlator.h
-	     ./sources/frontend/estimator.h
-	     ./sources/frontend/freqsyncer.h
-	     ./sources/frontend/ofdm-decoder.h
-	     ./sources/frontend/phasetable.h
-	     ./sources/frontend/freq-interleaver.h
-	     ./sources/frontend/tii-detector.h
-	     ./sources/frontend/tii-detector-1.h
-	     ./sources/frontend/tii-detector-2.h
-	     ./sources/frontend/fic-handling/fic-handler.h
-	     ./sources/frontend/fic-handling/ensemble.h
-	     ./sources/frontend/fic-handling/fib-dbtypes.h
-	     ./sources/frontend/fic-handing/fib-config.h
-	     ./sources/frontend/fic-handling/fib-decoder.h
-	     ./sources/frontend/fic-handling/fib-table.h
-	     ./sources/protection/protTables.h
-	     ./sources/protection/protection.h
-	     ./sources/protection/uep-protection.h
-	     ./sources/protection/eep-protection.h
-	     ./sources/support/equalizer.h
-	     ./sources/support/qwt-2.h
-	     ./sources/support/audiosystem-selector.h
-	     ./sources/support/bandpass-filter.h
-	     ./sources/support/bit-extractor.h
-	     ./sources/support/db-element.h
-	     ./sources/support/basic-print.h
-	     ./sources/support/charsets.h
-	     ./sources/support/content-table.h
-	     ./sources/support/converter_48000.h
-	     ./sources/support/coordinates.h
-	     ./sources/support/country-codes.h
-	     ./sources/support/crc-handlers.h
-	     ./sources/support/dab-constants.h
-	     ./sources/support/dab-params.h
-	     ./sources/support/dab-tables.h
-	     ./sources/support/distances.h
-	     ./sources/support/dl-cache.h
-	     ./sources/support/dxDisplay.h
-	     ./sources/support/element-selector.h
-	     ./sources/support/fft-handler.h
-	     ./sources/support/findfilenames.h
-	     ./sources/support/fir-filters.h
-	     ./sources/support/http-handler.h
-	     ./sources/support/ITU_Region_1.h
-	     ./sources/support/logger.h
-	     ./sources/support/errorlog.h
-	     ./sources/support/mapport.h
-	     ./sources/support/mot-content-types.h
-	     ./sources/support/position-handler.h
-	     ./sources/support/process-params.h
-	     ./sources/support/ringbuffer.h
-	     ./sources/support/scan-handler.h
-	     ./sources/support/scanlist-handler.h
-	     ./sources/support/scantable-handler.h
-	     ./sources/support/scheduler.h
-	     ./sources/support/schedule-selector.h
-	     ./sources/support/settingNames.h
-	     ./sources/support/settings-handler.h
-	     ./sources/support/skin-handler.h
-	     ./sources/support/tii-mapper.h
-	     ./sources/support/tii-reader.h
-	     ./sources/support/time-converter.h
-	     ./sources/support/time-table.h
-	     ./sources/support/uploader.h
-	     ./sources/support/riffWriter.h
-	     ./sources/support/dl2-handler.h
-	     ./sources/support/gui-elements/presetcombobox.h
-	     ./sources/support/gui-elements/circular-button.h
-	     ./sources/support/gui-elements/clickable-label.h
-	     ./sources/support/gui-elements/color-selector.h
-	     ./sources/support/gui-elements/font-chooser.h 
-	     ./sources/support/gui-elements/icon-label.h 
-             ./sources/support/gui-elements/newpushbutton.h 
-             ./sources/support/gui-elements//normalpushbutton.h 
-	     ./sources/support/gui-elements/smallcombobox.h 
-             ./sources/support/gui-elements/smallpushbutton.h 
-             ./sources/support/gui-elements/smallqlistview.h 
-             ./sources/support/gui-elements/smallspinbox.h 
-             ./sources/support/gui-elements/super-frame.h 
-	     ./sources/support/gui-elements/verysmallpushbutton.h 
-	     ./sources/backend/backend.h
-	     ./sources/backend/backend-deconvolver.h
-	     ./sources/backend/backend-driver.h
-	     ./sources/backend/frame-processor.h
-	     ./sources/backend/msc-handler.h
-	     ./sources/backend/reed-solomon/galois.h
-	     ./sources/backend/reed-solomon/reed-solomon.h
-	     ./sources/backend/audio/bitWriter.h
-	     ./sources/backend/audio/firecode-checker.h
-	     ./sources/backend/audio/mp2processor.h
-	     ./sources/backend/audio/mp4processor.h
-	     ./sources/backend/audio/neaacdec.h
-	     ./sources/backend/data/adv-datahandler.h
-	     ./sources/backend/data/data-processor.h
-	     ./sources/backend/data/ip-datahandler.h
-	     ./sources/backend/data/journaline-controller.h
-	     ./sources/backend/data/journaline-datahandler.h
-	     ./sources/backend/data/journaline-screen.h
-	     ./sources/backend/data/pad-handler.h
-	     ./sources/backend/data/tdc-datahandler.h
-	     ./sources/backend/data/virtual-datahandler.h
-	     ./sources/backend/data/epg/epg-compiler.h
-	     ./sources/backend/data/epg/xml-extractor.h
-	     ./sources/backend/data/journaline/cpplog.h
-	     ./sources/backend/data/journaline/crc_8_16.h
-	     ./sources/backend/data/journaline/dabdatagroupdecoder.h
-	     ./sources/backend/data/journaline/dabdgdec_impl.h
-	     ./sources/backend/data/journaline/log.h
-	     ./sources/backend/data/journaline/newsobject.h
-	     ./sources/backend/data/journaline/newssvcdec_impl.h
-	     ./sources/backend/data/journaline/NML.h
-	     ./sources/backend/data/journaline/Splitter.h
-	     ./sources/backend/data/mot/mot-dir.h
-	     ./sources/backend/data/mot/mot-handler.h
-	     ./sources/backend/data/mot/mot-object.h
-	     ./sources/output/audio-player.h
-	     ./sources/devices/device-handler.h
-	     ./sources/devices/device-exceptions.h
-	     ./sources/qt-devicces/xml-filewriter.h
+	   ./sources/main/display-widget.h 
+	   ./sources/main/scopes/spectrum-scope.h 
+	   ./sources/main/scopes/correlation-scope.h 
+	   ./sources/main/scopes/null-scope.h 
+	   ./sources/main/scopes/channel-scope.h 
+	   ./sources/main/scopes/dev-scope.h 
+	   ./sources/main/scopes/waterfall-scope.h 
+	   ./sources/main/scopes/iqdisplay.h 
+	   ./sources/main/scopes/audio-display.h 
+	   ./sources/main//scopes/spectrogramdata.h 
+	   ./sources/main/snr-viewer/snr-viewer.h 
+	   ./sources/main/ensemble-handler.h 
+	   ./sources/main/config-handler.h 
+	   ./sources/main/tech-window.h 
+	   ./sources/main/copyrightLabel.h 
+	   ./sources/main/dxDisplay.h 
+	   ./sources/eti-handler/eti-generator.h 
+	   ./sources/frontend/ofdm-handler.h 
+	   ./sources/frontend/timesyncer.h 
+	   ./sources/frontend/sample-reader.h 
+	   ./sources/frontend/ofdm-decoder.h 
+	   ./sources/frontend/correlator.h 
+	   ./sources/frontend/estimator.h 
+	   ./sources/frontend/freqsyncer.h 
+	   ./sources/frontend/phasetable.h 
+	   ./sources/frontend/freq-interleaver.h 
+	   ./sources/frontend/tii-detector-1.h 
+	   ./sources/frontend/fic-handling/fic-handler.h 
+	   ./sources/frontend/fic-handling/ensemble.h  
+	   ./sources/frontend/fic-handling/fib-dbtypes.h  
+	   ./sources/frontend/fic-handling/fib-config.h  
+	   ./sources/frontend/fic-handling/fib-decoder.h  
+	   ./sources/frontend/fic-handling/fib-table.h 
+	   ./sources/protection/protTables.h 
+	   ./sources/protection/protection.h 
+	   ./sources/protection/eep-protection.h 
+	   ./sources/protection/uep-protection.h 
+	   ./sources/backend/msc-handler.h 
+	   ./sources/backend/reed-solomon/galois.h 
+	   ./sources/backend/reed-solomon/reed-solomon.h 
+	   ./sources/backend/frame-processor.h 
+	   ./sources/backend/backend.h 
+	   ./sources/backend/backend-driver.h 
+	   ./sources/backend/backend-deconvolver.h 
+	   ./sources/backend/audio/firecode-checker.h 
+	   ./sources/backend/audio/mp2processor.h 
+	   ./sources/backend/audio/mp4processor.h 
+	   ./sources/backend/audio/bitWriter.h 
+	   ./sources/backend/data/data-processor.h 
+	   ./sources/backend/data/pad-handler.h 
+	   ./sources/backend/data/virtual-datahandler.h 
+	   ./sources/backend/data/tdc-datahandler.h 
+	   ./sources/backend/data/ip-datahandler.h 
+	   ./sources/backend/data/adv-datahandler.h 
+	   ./sources/backend/data/mot/mot-handler.h 
+	   ./sources/backend/data/mot/mot-object.h 
+	   ./sources/backend/data/mot/mot-dir.h

qt-dab-Qt-DAB-6.9.6.tar.gz/README.md -> qt-dab-6.10.tar.gz/README.md Changed

@@ -1,35 +1,67 @@
-# Qt-DAB-6.9
+# Qt-DAB-6.10
 
 -------------------------------------------------------------------
 
 !6.9(/res/read_me/qt-dab-logo.png?raw=true)
 
+------------------------------------------------------------------------
+Qt-DAB-6.10: Showing maps off-line
+-----------------------------------------------------------------------
 
--------------------------------------------------------------------------
-Just for playing around (Not in the precompiled version still)
---------------------------------------------------------------------------
+When scanning, we usually see a lot of "dots" appearing on the map.
+However, when we close, the information on what we have seen is lost.
+Qt-DAB-6.10 provides an option to save this information, and -
+at least as important - show it off-line.
 
-The SDRplay RSPDuo is obviously an incredible device, depending on the
-mode two separate tuners.
-The regular SDRplay V3 device handling software in Qt-DAB is already
-capable of handling the Duo in single mode, with tuner selection.
+For that purpose, a small separate tool was built, the so-called
+**map-viewer**.
+With this map-viewer, a stored file, created by Qt-DAB-6.10, can be read in
+and a variety of "views" is possible.
+One of the interesting things now is of course that such a file can 
+be stored in an archive, and used later on to compare results, results
+from yourself of from others.
 
-As a programming exercise, I added - as a separate device handler -
-a "duo" handler, where two tuners are running on the same channel
+!6.9(/res/read_me/map-viewer.png?raw=true)
 
-!6.9(/res/read_me/rsp-duocontrol.png?raw=true)
+It seems obvious that the "reload" button is used to load or reload
+a file. 
+The view selection is at the bottom
+ * from the file, a list of channels with data is extracted, the **channel selector** lets you choose the channel, the data from which is then shown
+
+ * from the file, a list of ensembles is extracted, the **ensemble selector** lets you choose the ensemble, the data from which is shown.
+
+ * Of course, if you want all data to be shown, there is the "showAll" button.
+
+ * in some cases - e.g. in Belgium - one could receive data from more
+than the home country. The mapviewer shows a **country selector** with which
+one may select one of the countries from which data is received.
+If a country is selected, the other three selectors (channel, ensemble and
+showAll) are restricted to the selected country.
+
+Of course, the mapViewer starts the webbrowser if needed, that means
+that you can start the browser by clicking on the **http** button, but
+if not done, selecting a channel or an ensemble (of "all") will start the
+browser.
+
+The default setting is on port 8081 (note, Qt-DAB uses 8080 as default),
+the port number can be changed, but changes will only have effect
+at the next program invocation.
 
-The device handler shows left the control for the "A" tuner, to
-the right for the "B" tuner, and in between a selector for selecting
-  * output is from tuner A
-  * output is from tuner B
-  * output is the addition of tuners A and B, i.e. A + B
-  * output is the subtraction of the B output from the A output.
+------------------------------------------------------------------------
+Scanning an saving the file
+------------------------------------------------------------------------
 
-The "A" tuner has - apart from the agc selector, a "AM notch" selector,
-and the "B" tuner has - apart from the "agc selector a "biasT" selector.
+!6.9(/res/read_me/selecting-map.png?raw=true)
 
+Qt-DAB-6.10 has - on the configuration window - a selector that - when set -
+tells Qt-DAB to generate a file from the contents of the map.
 
+!6.9(/res/read_me/stay-time.png?raw=true)
+
+**Please be aware that when scanning the time Qt-DAB will wait when
+encountering data in a channel before switching to the (a) next channel.
+The selector was moved from the configuration window to the scan handler.
+The default time is now set to 20 seconds, increments are 20 seconds each.**
 
 --------------------------------------------------------------------------
 About Qt-DAB
@@ -38,39 +70,21 @@
 *Qt-DAB* is software for Linux, Windows, MacOS and Raspberry Pi for listening to terrestrial **Digital Audio Broadcasting (DAB and DAB+)**.
 
 Qt-DAB is GUI based, for a command line version, see **dab-cmdline**.
-Qt-DAB  has a single *main* widget that contains essentially all that is needed for selecting channels and services and listening to a service. Other widgets, visible under user control, show a myriad of controls, and a tremendous amount of data in the DAB signal and the resulting audio, 
+Qt-DAB  has a single *main* window that contains essentially all that is needed for selecting channels and services and listening to a service. Other windows, visible under user control, show a myriad of controls, and a tremendous amount of data extracted from the DAB signal and the resulting audio, 
 
 !6.9(/res/read_me/qt-dab-front-picture.png?raw=true)
 
 Of course, as for previous versions, for the current version,
-*Qt-DAB-6.9.5*, predefined executables and installers are available.
-For Windows  a 32 bit installer is available, and for Linux there is an x64 AppImage.
-
--------------------------------------------------------------------
-What is new/different in Qt-DAB-6.9.5
--------------------------------------------------------------------
-
-While Qt-DAB-6.9.5 resembles Qt-DAB-6.9.4, there are a few noticeable
-differences.
-
- * the combobox on the configuration widget with which an input device was selected is gone. Now the main widget shows on the top line a small icon with which a device selection table can be made visible. After selecting a device, the device selection table disappears automatically.
-
- * improved support for the SDRplay RspDuo: tuner selection is possible,
-
- * Windows support for both RTLSDR V3 and V4 in a single installer,
-
- * the scanList has a more prominent role. It shows the (channel, service) pairs of all channels visited. Using file input, the scanList will not be visible (seems logical), and the configuration window as a selector indicating that on program termination the list is cleared (obviously normally it is maintained between program invocations),
-
- * preloaded database. The precompiled versions contain a preloaded database. The configuration widget has a selector to choose between loading - on program startup - this preloaded database or one you loaded into the home directory.
+*Qt-DAB-6.9.6*, predefined executables and installers are available.
+For Linux there is an x64 AppImage, for Windows there is a single 64 bit installer, one with separate entries to select a V3 or V4 rtlsdr device.
 
 Table of Contents
 =================================================================
 
 * Introduction(#introduction)
 * Features(#features)
-* Widgets and scopes(#widgets-and-scopes)
+* Windows and scopes(#windows-and-scopes)
 * Devices and device support(#devices-and-device-support)
-* Tuning accuracy(#tuning-accuracy)
 * Scan control(#scan-control)
 * Displaying TII data(#displaying-TII-data)
 * EPG Handling and time tables(#epg-handling-and-time-tables)
@@ -81,46 +95,42 @@
 * Installation on Linux(#installation-on-Linux)
 * Notes on building an executable(#building-an-executable-for-qt-dab-a-few-notes)
 * Using user specified bands(#using-user-specified-bands)
-* Copyright(#copyright)
+* Copyright and acknowledgements(#copyright-and-acknowledgements)
 
 Introduction
 =================================================================
 
 *Qt-DAB* is designed to be used with a variety of SDR devices.
 Precompiled versions for Windows and Linux (x64) are available
-that support most of these devices for which Qt-DAB provides support (see below).
+that support most devices for which Qt-DAB provides support (see below).
 Thanks to Richard Huber, *Qt-DAB* can be compiled on the Mac as well, though it is most likely not a trivial exercise.
 
-*Qt-DAB* is GUI driven, the full GUI shows 4+ widgets, one of them is the
-*main widget* - one with sufficient controls to select channels and service(s)  which is always visible. This main widget contains selectors
-for controlling the visibility of (the) other widgets.
-
 Features
 =================================================================
   
   * Qt-DAB supports most common SDR devices directly. The device interface is quite simple and in a different document it is explained in detail how to use the interface  to implement control for other devices;
+  * Qt-DAB recognizes and interprets **TII** (Transmitter Identification Information) data of - if the received signal is from multiple transmitters - *all* detectable transmitters, can be made visible simultaneously, and Qt-DAB displays the transmitters on a map in a browser. A separate tool is available to download a database, the precompiled versions contain a copy of the database;
+  * Qt-DAB starts **EPG/SPI** services automatically as  **background task** and provides means to show resulting time tables;
+  * Qt-DAB supports **journaline**, often transmitted as subservice, if a journaline (sub)service is detected, auto starts a small journaline window;
+  * Qt-DAB supports so-called **favorites** (i.e. channel, service pairs) for easy switching between services in different ensembles (see below),
+  * Qt-DAB allows running an arbitrary amount of audio services from the current ensemble as **background service**, with the output sent to a file,
   * Qt-DAB supports a **scanList**, i.e. a list with channel/service pairs encountered. Obviously, selecting a service from this list is possible;
-  * Qt-DAB supports so-called *favorites* (i.e. channel, service pairs) for easy switching between services in different ensembles (see below),
-  * Qt-DAB recognizes and interprets **TII** (Transmitter Identification Information) data of - if the received signal is from multiple transmitters - *all* detectable transmitters, can be made visible simultaneously, and displays the transmitters on a map. A separate tool is available to download the required database.
-  * Qt-DAB starts EPG/SPI services automatically as background task and provides means to show resulting time tables;
-  * Qt-DAB supports **journaline**, often transmitted as subservice, and auto starts a small journaline window;
-  * Qt-DAB allows running an arbitrary amount of audio services from the current ensemble as *background service*, with the output sent to a file,
-  * Qt-DAB offers options to select other bands, i.e. the L-Band, or channel descriptions from a user provided file and it supports obsolete modes (Mode II and Mode IV),
-  * Qt-DAB offers the possibility of generating an **ETI file** from the currently selected channel,
+  * Qt-DAB offers the possibility of generating an **ETI file** from the ensemble in the currently selected channel,
   * Qt-DAB offers different views on the input data, see below,
-  * Qt-DAB offers the possibility of scanning through all - or a selected subset - channels of the band,
+  * Qt-DAB offers the possibility of **scanning** through all - or a selected subset - channels of the band,
+  * Qt-DAB offers options to select other bands, i.e. the L-Band, or channel descriptions from a user provided file and it supports obsolete modes (Mode II and Mode IV),
   * and much more ...
 
 Widgets and scopes
 =======================================================================
 
-!6.9(/res/read_me/Qt_DAB-6.9.5.png)
+!6.9(/res/read_me/Qt_DAB-6.9.6.png)
 
-The *main widget* (see picture) of Qt-DAB (always visible), contains  the settings for controlling the visibility of other widgets.
-The window shows - left half - a list of services (either from the currently selected channel or from the favourites). Selecting a service is just by clicking on the name.
-The right half of the widget shows the dynamic label, and the slides - if transmitted as part of the service - or a series of default slides.
+The **main window** (see picture) of Qt-DAB (always visible), contains selectors for controlling the visibility of other windows.
+The window shows - left half - a list of services (either from the currently selected channel or from **favourites**). Selecting a service is just by clicking on the name.
+The right half of the window shows the dynamic label, and the slides - if transmitted as part of the service - or a series of default slides.
 
-  * touching the *ensemble name* (NPO (8001) in the picture) makes the *content table*, i.e. an overview of the content of the ensemble, visible with the possibility of storing the data in a file in ".csv" format. If the content table is visible, touching the name again will hide it;
+  * touching the **ensemble name** (NPO (8001) in the picture seen top left) makes the **content table**, i.e. an overview of the content of the ensemble, visible with the possibility of storing the data in a file in ".csv" format. If the content table is visible. Touching the ensemble name again will hide it;
 
 !6.9(/res/read_me/content-table.png)
 
@@ -128,58 +138,63 @@
 
 The picture above shows the topline op the right half of the main window.
 
- * touching the small icon left on the top of the right half will show (or hide) the *technical widget*, a widget showing all technical details as well as strength indicators and 
-a spectrum of the audio of the selected service;
+ * touching the small icon left on the top of the right half will show (or hide) the **technical window**, a window showing all technical details as well as strength indicators and a spectrum of the audio of the selected service;

qt-dab-Qt-DAB-6.9.6.tar.gz/app-files/appimage/AppRun -> qt-dab-6.10.tar.gz/app-files/appimage/AppRun Changed

qt-dab-6.10.tar.gz/app-files/qt-dab-10-256x26.png Changed

qt-dab-6.10.tar.gz/app-files/qt-dab-6.10.desktop Added

qt-dab-6.10.tar.gz/app-files/qt-dab-6.10.ico Changed

qt-dab-6.10.tar.gz/app-files/qt-dab-6.10.png Added

qt-dab-6.10.tar.gz/obsolete/aboutdialog.cpp Added

@@ -0,0 +1,178 @@
+#
+/*
+ * Copyright (C) 2017 .. 2026
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<QDesktopServices>
+#include	"aboutdialog.h"
+#include	"ui_aboutdialog.h"
+#include	"dab-constants.h"
+#include	<QDateTime>
+#ifdef	__WITH_FDK_AAC__
+#include <aacdecoder_lib.h>
+#else
+#include "neaacdec.h"
+
+#endif
+	AboutDialog::AboutDialog (QWidget *parent) :
+	 QDialog(parent),
+	 ui (new Ui::AboutDialog) {
+
+	QString support;
+#ifdef	SSE_AVAILABLE	
+	support		= "(spiral + sse)";
+#elif	NO_SSE_AVAILABLE
+	support		= "(spiral scalar)";
+#elif	__AVX2__
+	support		= "(yang + avx2)";
+#elif	__SSE4_1__	
+	support		= "(yang + sse)";
+#else
+	support		= "(yang scalar)";
+#endif
+QString	aacSupport;
+#ifdef __WITH_FDK_AAC__
+	LIB_INFO libInfo FDK_MODULE_LAST;
+	FDKinitLibInfo (libInfo);
+	aacDecoder_GetLibInfo (libInfo);
+	
+	for (int i = 0; i < FDK_MODULE_LAST; i++) {
+	 if (libInfo i. module_id == FDK_AACDEC) {
+	 aacSupport = QString(libInfoi.title) + " "
+	 + QString(libInfoi.versionStr);
+	 break;
+	 }
+	}
+#else
+	aacSupport	= QString ("faad2 ") + QString (FAAD2_VERSION);
+#endif
+QString aacComment;
+#ifdef __WITH_FDK_AAC__
+	aacComment = "<li> " + aacSupport + " , <a href=\"https://github.com/mstorsjo/fdk-aac\">fdk-aac</a> Copyright © 1995 - 2018 Fraunhofer-Gesellschaft " +
+ "zur Förderung der angewandten Forschung e.V.</li>";
+#else
+	aacComment = "<li>" + aacSupport + " <a href=\"https://github.com/knik0/faad2\">FAAD2</a> Copyright © 2003-2005 M. Bakker, Nero AG</li>";
+#endif
+
+	ui -> setupUi (this);
+	QPixmap p;
+	p. load (":res/pauze-slide.png", "png");
+	ui -> appIcon		-> setPixmap (p);
+	ui -> appName 		-> setText ("Qt-DAB");
+	ui -> author 		-> setText(tr("Developed by")+" Jan van Katwijk (<a href=\"mailto:J.vanKatwijk@gmail.com\">J.vanKatwijk@gmail.com</a>)");
+	ui -> author		-> setTextInteractionFlags (Qt::TextBrowserInteraction);
+	ui -> version		-> setText (QString("Version-6.%1").arg ("9.6"));
+	QString theDate		= QString (__DATE__) + " " + QString (__TIME__);
+	ui -> buildInfo ->	setText (QString ("Built on ") + theDate + QString (", Commit ") + QString (GITHASH) + " with " + support);
+	ui -> sourceLocation	-> setText ("Sources are at <a href=\"https://github.com/JvanKatwijk/qt-dab\">github> </a>");
+	ui -> sourceLocation	-> setOpenExternalLinks(true);
+	ui -> qtVersion		-> setText (QString(tr("Qt-DAB uses Qt %1")).arg(QT_VERSION_STR));
+
+	ui -> libraries -> setText (tr("Qt-DAB uses following libraries (and greatly acknowledges the copyright):")+
+ "<ul>" +
+	 "<li>The excellent Qt framework by Qt, and the Qwt library (version 6.2) by Uwe Rathmann</li>" +
+ "<li><a href=\"www.fftw.org\">FFTW</a> by Matteo Frigo and Steven G Johnsom</li>" +
+ "<li><a href=\"https://github.com/Opendigitalradio/ka9q-fec\">Reed Solonon</a> by Phil Karn, KA9Q</li>" +
+ "<li><a href=\"https://www.spiral.net/software/viterbi.html\">viterbi code generator</a> by the Spiral project</li>" +
+ "<li><a href=\"https://github.com/williamyang98/ViterbiDecoderCpp\"> the excellent header only viterbi library</a> by William Yang, based on Phil Karn's library</li>" +
+ "<li><a href=\"www.portaudio.com/\">Portaudio</a> by Ross Bencina, Phil Burke and many others</li>" +
+ "<li>An MP2 decoder by Martin J Fiedler (martin.fiedler@gmx.net)</li>" +
+	 "<li>\"NewsService Journaline(R) Decoder\", CopyRight (c) 2003, 2001-2014 Fraunhofer IID, Erlangen, Germany</li>" +
+	 aacComment +
+				 "</ul>");
+	ui -> acknowledgementsLabel -> setText (tr("Special thanks to") +
+ "<ul>"
+	 "<li> Herman Wijnants, for continuous suggestions and feedback</li>" +
+	 "<li> Andreas Mikula, for continuous support </li>" +
+	 "<li> Jarod Middelman, for continuous feedback</li>" +
+	 "<li> Stefan Poeschel, for providing code for saving AAC </li>" +
+	 "<li> Rolf Zerr, for an improved code elements a.o TII decoder </li>" +
+	 "</ul>");
+	ui -> configuration -> setOpenExternalLinks (true);
+	ui -> configuration -> setText (tr("Qt-DAB is configured with:")+
+ "<ul>"
+#if defined (HAVE_SDRPLAY_V3) || defined (HAVE_SDRPLAY_V2)
+ "<li> All SDRplay RSP devices<a href=\"https://www.sdrplay.com/\">SDRplay/a></li>"
+#endif
+#if defined (HAVE_RTLSDR) || defined (HAVE_RTLSDR_V3) || defined ( HAVE_RTLSDR_V4)
+ "<li> rtlsdr dabstick <a href=\"https://osmocom.org/projects/rtl-sdr/wiki/rtl-sdr\">rtlsdr</a>with improvements from \"olddab\" </li>"
+#endif
+#ifdef HAVE_AIRSPY
+ "<li> Airspy devices <a href=\"https://github.com/airspy\">AirSpy</a></li>"
+#endif
+#ifdef	HAVE_HACKRF 
+ "<li>Hackrf devices<a href=\"https://greatscottgadgets.com/hackrf/one\">Hackrf One</a>.</li>"
+#endif
+#ifdef	HAVE_LIME 
+ "<li> Lime SDR devices<a href=\"https://limemicro.com/products/limesdr\">Lime sdr</a> by Lime micro systems</li>"
+#endif
+#ifdef	HAVE_PLUTO 
+ "<li>Adalm Pluto device<a href=\"https://www.analog.com/\">Adalm Pluto One</a></li>"
+#endif
+#ifdef	HAVE_RTL_TCP
+			 "<li>Client for RTL_TCP</li>"
+#endif
+#ifdef HAVE_SOAPY
+ "<li>Soapy interface<a href=\"https://github.com/pothosware/SoapySDR/wiki\">SoapySDR</a></li>"
+#endif
+#ifdef HAVE_SPYSERVER_16
+ "<li>SpyServer interface<a href=\"https://airspy.com/download/\">spyserver</a></li>"
+#endif
+ "<li> and has support for reading (and writing) files in different formats, including files (in xml and in RIFF/Raw64 format) with sizes larger than 4 Gb.</li>"
+	"</ul>");
+ui->disclaimer->setText("Copyright © 2016-2026 Jan van Katwijk"
+ "Qt-DAB is distributed under the GPL V2 license "
+ "in the hope that it will be useful, "
+ "but WITHOUT ANA WARRANTY; without even the"
+ "implied warranty of MERCHANTIBILITY or FITNESS FOR, "
+ "A PARTICULAR PURPOSE."
+	 "See the Gnu General Public License for more details "
+ "The above copyright notice and this permission notice shall be included in all copies or substantial "
+ "portions of the Software."
+);
+
+	QObject::connect (
+ ui -> version, &QLabel::linkActivated,
+ =(const QString & link) {
+	 QDesktopServices::openUrl(QUrl::fromUserInput(link)); 
+	 }
+ );
+
+	QObject::connect (
+ ui -> author, &QLabel::linkActivated,
+ =(const QString & link) {
+	 QDesktopServices::openUrl(QUrl::fromUserInput(link));
+	 }
+ );
+
+	QObject::connect(
+ ui -> libraries, &QLabel::linkActivated,
+ =(const QString & link) {
+	 QDesktopServices::openUrl(QUrl::fromUserInput(link));
+	 }
+ );
+
+}
+
+	AboutDialog::~AboutDialog () {
+	delete ui;
+}
+

qt-dab-6.10.tar.gz/obsolete/aboutdialog.h Changed

qt-dab-6.10.tar.gz/qt-dab-6.10-build.txt Added

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=/home/jan/Qt/6.8.1/gcc_64/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/home/jan/qwt-6.3.0/lib
+export PATH=/home/jan/Qt/6.8.1/gcc_64/bin:$PATH
+
+ls -lh .
+rm -rf *_autogen
+mkdir -p ./appdir/usr/bin
+mkdir -p ./appdir/usr/share/applications
+mkdir -p ./appdir/usr/share/icons/hicolor/128x128/apps/
+mkdir -p ./appdir/usr/share/icons/hicolor/256x256/apps/
+
+cp linux-bin/qt-dab* 	appdir/usr/bin/qt-dab-6.10
+cp app-files/qt-dab-6.10.desktop	appdir/usr/share/applications
+cp ../res/radio-pictures/qt-dab-6.10-128x128.png	appdir/qt-dab-6.10.png
+cp ../res/radio-pictures/qt-dab-6.10-128x128.png	appdir/usr/share/icons/hicolor/128x128/apps/
+cp ../res/radio-pictures/qt-dab-6.10-256x256.png	appdir/usr/share/icons/hicolor/256x256/apps/
+
+touch appdir/qt-dab-6.10.png
+  
+wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+chmod a+x linuxdeployqt*.AppImage
+unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs -no-translations
+./linuxdeployqt*.AppImage --appimage-extract
+find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
+chmod a+x app-files/appimage/* ; rm appdir/AppRun ; cp app-files/appimage/* appdir/
+export PATH=squashfs-root/usr/bin/:$PATH
+squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)
+find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+:

qt-dab-6.10.tar.gz/qt-dab-6.10.ico Added

qt-dab-6.10.tar.gz/qt-dab-6.10.pro Added

@@ -0,0 +1,902 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue Oct 6 19:48:14 2009
+#	CONFIG		+= sdrplay-v3
+# but modified by me to accomodate for the includes for qwt, hamlib and
+# portaudio
+######################################################################
+
+TEMPLATE	= app
+QT		+= widgets xml multimedia
+QT		+= network
+#CONFIG		+= console
+CONFIG		-= console
+QMAKE_CXXFLAGS	+= -std=c++20
+
+#mingw64 on Windows does not seem to support lto
+win32 {
+QMAKE_CFLAGS	+=  -O3 -ffast-math -g
+QMAKE_CXXFLAGS	+=  -O3 -ffast-math -g
+QMAKE_LFLAGS	+=  -O3 -ffast-math -g
+}
+
+unix {
+QMAKE_CXXFLAGS	+=  -ffast-math -flto 
+QMAKE_CFLAGS	+=  -ffast-math -flto
+QMAKE_LFLAGS	+=  -ffast-math -flto
+#QMAKE_CFLAGS	+=  -g -fsanitize=address 
+#QMAKE_CXXFLAGS	+=  -g -fsanitize=address 
+#QMAKE_LFLAGS	+=  -g -fsanitize=address
+}
+
+QMAKE_CXXFLAGS += -isystem $$QT_INSTALL_HEADERS
+RC_ICONS	=  qt-dab-6.10.ico
+RESOURCES	+= resources.qrc
+
+TRANSLATIONS = ../i18n/de_DE.ts
+#
+#       For more parallel processing, uncomment the following
+#       defines
+DEFINES		+= __THREADED_BACKEND__
+
+#	not yet functioning
+#DEFINES        += _UPLOAD_SCAN_RESULT_
+
+#DEFINES	+= __EPG_TRACE__  
+DEPENDPATH += . \
+	      ..sources \
+	      ./sources/backend\
+	      ./sources/backend/reed-solomon \
+	      ./sources/backend/audio \
+	      ./sources/backend/data \
+	      ./sources/backend/data/epg \
+	      ./sources/backend/data/mot \
+	      ./sources/backend/data/journaline \
+	      ./sources/eti-handler \
+	      ./sources/main \
+	      ./sources/main/forms-v7 \
+	      ./sources/main/snr-viewer \
+	      ./sources/frontend \
+	      ./sources/frontend/fic-handling \
+	      ./sources/output \
+	      ./sources/output/portaudio \
+	      ./sources/protection \
+	      ./sources/devices \
+	      ./sources/support \
+	      ./sources/support/gui-elements \
+	      ./sources/devices \
+	      ./sources/devices/filereaders/ \
+	      ./sources/devices/filereaders/new-reader \
+	      ./sources/devices/filereaders/rawfiles-new \
+	      ./sources/devices/filereaders/xml-filereader 
+	
+
+INCLUDEPATH += . \
+	      ..sources \
+	      ./sources/backend\
+	      ./sources/backend/reed-solomon \
+	      ./sources/backend/audio \
+	      ./sources/backend/data \
+	      ./sources/backend/data/epg \
+	      ./sources/backend/data/mot \
+	      ./sources/backend/data/journaline \
+	      ./sources/eti-handler \
+	      ./sources/main \
+	      ./sources/main/forms-v7 \
+	      ./sources/main/scopes \
+	      ./sources/main/snr-viewer \
+	      ./sources/frontend \
+	      ./sources/frontend/fic-handling \
+	      ./sources/output \
+	      ./sources/output/portaudio \
+	      ./sources/protection \
+	      ./sources/devices \
+#	      ./sources/scopes-qwt6 \
+	      ./sources/support \
+	      ./sources/support/gui-elements \
+	      ./sources/devices \
+	      ./sources/devices/filereaders/ \
+	      ./sources/devices/filereaders/new-reader \
+	      ./sources/devices/filereaders/rawfiles-new \
+	      ./sources/devices/filereaders/xml-filereader 
+	
+
+# Input
+HEADERS += ./sources/main/radio.h \
+	   ./sources/main/display-widget.h \
+	   ./sources/main/scopes/spectrum-scope.h \
+	   ./sources/main/scopes/correlation-scope.h \
+	   ./sources/main/scopes/null-scope.h \
+	   ./sources/main/scopes/channel-scope.h \
+	   ./sources/main/scopes/dev-scope.h \
+	   ./sources/main/scopes/waterfall-scope.h \
+	   ./sources/main/scopes/iqdisplay.h \
+	   ./sources/main/scopes/audio-display.h \
+	   ./sources/main//scopes/spectrogramdata.h \
+	   ./sources/main/snr-viewer/snr-viewer.h \
+	   ./sources/main/ensemble-handler.h \
+	   ./sources/main/config-handler.h \
+	   ./sources/main/tech-window.h \
+	   ./sources/main/copyrightLabel.h \
+	   ./sources/main/dxDisplay.h \
+	   ./sources/eti-handler/eti-generator.h \
+	   ./sources/frontend/ofdm-handler.h \
+	   ./sources/frontend/timesyncer.h \
+	   ./sources/frontend/sample-reader.h \
+	   ./sources/frontend/ofdm-decoder.h \
+	   ./sources/frontend/correlator.h \
+	   ./sources/frontend/estimator.h \
+	   ./sources/frontend/freqsyncer.h \
+	   ./sources/frontend/phasetable.h \
+	   ./sources/frontend/freq-interleaver.h \
+	   ./sources/frontend/tii-detector-1.h \
+	   ./sources/frontend/fic-handling/fic-handler.h \
+	   ./sources/frontend/fic-handling/ensemble.h  \
+	   ./sources/frontend/fic-handling/fib-dbtypes.h  \
+	   ./sources/frontend/fic-handling/fib-config.h  \
+	   ./sources/frontend/fic-handling/fib-decoder.h  \
+	   ./sources/frontend/fic-handling/fib-table.h \
+	   ./sources/protection/protTables.h \
+	   ./sources/protection/protection.h \
+	   ./sources/protection/eep-protection.h \
+	   ./sources/protection/uep-protection.h \
+	   ./sources/backend/msc-handler.h \
+	   ./sources/backend/reed-solomon/galois.h \
+	   ./sources/backend/reed-solomon/reed-solomon.h \
+	   ./sources/backend/frame-processor.h \
+	   ./sources/backend/backend.h \
+	   ./sources/backend/backend-driver.h \
+	   ./sources/backend/backend-deconvolver.h \
+	   ./sources/backend/audio/firecode-checker.h \
+	   ./sources/backend/audio/mp2processor.h \
+	   ./sources/backend/audio/mp4processor.h \
+	   ./sources/backend/audio/bitWriter.h \
+	   ./sources/backend/data/data-processor.h \
+	   ./sources/backend/data/pad-handler.h \
+	   ./sources/backend/data/virtual-datahandler.h \
+	   ./sources/backend/data/tdc-datahandler.h \
+	   ./sources/backend/data/ip-datahandler.h \
+	   ./sources/backend/data/adv-datahandler.h \
+	   ./sources/backend/data/mot/mot-handler.h \
+	   ./sources/backend/data/mot/mot-object.h \
+	   ./sources/backend/data/mot/mot-dir.h \
+	   ./sources/backend/data/journaline-controller.h \
+	   ./sources/backend/data/journaline-datahandler.h \
+	   ./sources/backend/data/journaline-screen.h \
+	   ./sources/backend/data/journaline/dabdatagroupdecoder.h \
+	   ./sources/backend/data/journaline/crc_8_16.h \
+	   ./sources/backend/data/journaline/log.h \
+	   ./sources/backend/data/journaline/newssvcdec_impl.h \
+	   ./sources/backend/data/journaline/Splitter.h \
+	   ./sources/backend/data/journaline/dabdgdec_impl.h \
+	   ./sources/backend/data/journaline/newsobject.h \
+	   ./sources/backend/data/journaline/NML.h \
+	   ./sources/backend/data/epg/epg-compiler.h \
+	   ./sources/backend/data/epg/xml-extractor.h \
+	   ./sources/output/converter_48000.h \
+	   ./sources/output/audio-player.h \
+	   ./sources/support/scan-handler.h \
+	   ./sources/support/scantable-handler.h \
+	   ./sources/support/audiosystem-selector.h \
+	   ./sources/support/dl2-handler.h \
+	   ./sources/support/http-handler.h \
+	   ./sources/support/timetable-control.h \
+	   ./sources/support/dab-constants.h \
+	   ./sources/support/bit-extractors.h \
+	   ./sources/support/charsets.h \
+	   ./sources/support/crc-handlers.h \
+	   ./sources/support/mot-content-types.h \
+	   ./sources/support/distances.h \
+	   ./sources/support/time-converter.h \
+	   ./sources/support/logger.h \
+	   ./sources/support/errorlog.h \
+	   ./sources/support/db-element.h \
+	   ./sources/support/settingNames.h \
+	   ./sources/support/fft-handler.h \
+	   ./sources/support/process-params.h \
+	   ./sources/support/ringbuffer.h \
+	   ./sources/support/dab-params.h \
+	   ./sources/support/dab-tables.h \
+	   ./sources/support/scanlist-handler.h \

qt-dab-Qt-DAB-6.9.6.tar.gz/res/qt-map-69.html -> qt-dab-6.10.tar.gz/res/qt-map-69.html Changed

@@ -6,7 +6,7 @@
 	<link rel="icon" href="data:,">
 	<style type="text/css">
 	 html { height: 100% }
-	 body { height: 100%; margin: 0; padding: 0 }
+	 body { height: 100%; margin: 0; padding: 0; overflow: hidden }
 	 .transmitter-icon {
 	 padding:0px;
 	 margin:0px;
@@ -14,6 +14,7 @@
 	 #map_canvas { height: 100% }
 	 #info {
 	 position: absolute;
+	 overflow-y: auto;
 	 width:20%;
 	 height:100%;
 	 bottom:0px;
@@ -59,6 +60,7 @@
 	 const MAP_CURRENT 		= 8;
 	 const SHOW_SINGLE		= 16;	
 	 const SHOW_ALL		= 32;
+	 const MAP_CLOSE		= 64;
 
 	 const ICON_FURTHEST		= 1;
 	 const ICON_TOPFRAME		= 2;
@@ -104,7 +106,7 @@
 	 delete Transmitters i;
 	 }
 
-	 Transmitters = {};
+	 Transmitters	= {};
 	 transmitterIndex	= 0;
 	 largestDistance	= 0;
 	 afstand		= 0;
@@ -201,6 +203,16 @@
 	 let ttt = document. getElementById ('current');
 	 for (var t = 0; t < data. length; t ++) {
 	 let target = data t;
+	 if (target. type == MAP_CLOSE) {
+	 try {
+	 server. close ();
+	 } catch (e) {}
+	 try {
+	 window. close ();
+	 } catch (e) {}
+	 continue;
+	 }
+	 else
 	 if (target. type == MAP_RESET) {
 	 handle_map_reset ();
 	 continue;
@@ -346,7 +358,7 @@
 /* Setup our timer to poll from the server. */
 	 window.setInterval(function () {
 	 fetchData ();
-	 }, 2000);
+	 }, 1000);
 	}
 
 //

qt-dab-Qt-DAB-6.9.6.tar.gz/res/qt-map.html -> qt-dab-6.10.tar.gz/res/qt-map.html Changed

qt-dab-6.10.tar.gz/res/read_me/Qt_DAB-6.9.6.png Added

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/bbc-3.png -> qt-dab-6.10.tar.gz/res/read_me/bbc-3.png Changed

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

qt-dab-6.10.tar.gz/res/read_me/erroneous-lines.png Added

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/journaline-1.png -> qt-dab-6.10.tar.gz/res/read_me/journaline-1.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/journaline-2.png -> qt-dab-6.10.tar.gz/res/read_me/journaline-2.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/mainwindow-buttons.png -> qt-dab-6.10.tar.gz/res/read_me/mainwindow-buttons.png Changed

qt-dab-6.10.tar.gz/res/read_me/map-viewer.png Added

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/qt-dab-channel.png -> qt-dab-6.10.tar.gz/res/read_me/qt-dab-channel.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/qt-dab-correlation.png -> qt-dab-6.10.tar.gz/res/read_me/qt-dab-correlation.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/qt-dab-front-picture.png -> qt-dab-6.10.tar.gz/res/read_me/qt-dab-front-picture.png Changed

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

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/qt-dab-stddev.png -> qt-dab-6.10.tar.gz/res/read_me/qt-dab-stddev.png Changed

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

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/riff-reader-large.png -> qt-dab-6.10.tar.gz/res/read_me/riff-reader-large.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/riff-reader-small.png -> qt-dab-6.10.tar.gz/res/read_me/riff-reader-small.png Changed

qt-dab-6.10.tar.gz/res/read_me/selecting-map.png Added

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

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/topline.png -> qt-dab-6.10.tar.gz/res/read_me/topline.png Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/xml-reader.png -> qt-dab-6.10.tar.gz/res/read_me/xml-reader.png Changed

qt-dab-6.10.tar.gz/res/stay-time.png Added

qt-dab-Qt-DAB-6.9.6.tar.gz/resources.qrc -> qt-dab-6.10.tar.gz/resources.qrc Changed

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

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

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

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/audio/mp4processor.cpp-old -> qt-dab-6.10.tar.gz/sources/backend/audio/mp4processor.cpp-old Changed

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/backend-driver.cpp -> qt-dab-6.10.tar.gz/sources/backend/backend-driver.cpp Changed

@@ -29,11 +29,10 @@
 //	Driver program for the selected backend. Embodying that in a
 //	separate class makes the "Backend" class simpler.
 
-
 	backendDriver::backendDriver (RadioInterface *mr,
 	 logger		*theLogger,
-	 descriptorType *d,
-	 bool	backgroundFlag,
+	 descriptorType	*d,
+	 bool		backgroundFlag,
 	 RingBuffer<std::complex<int16_t>> *audioBuffer,
 	 RingBuffer<uint8_t> *dataBuffer,
 	 RingBuffer<uint8_t> *frameBuffer,
@@ -42,23 +41,25 @@
 	 if (((audiodata *)d) -> ASCTy == DAB_OLD) {
 	 theLogger -> log (logger::LOG_SERVICE_STARTS,
 	 "MP2 service ", d -> bitRate);
- theProcessor. reset (new mp2Processor (mr,
-	 d -> bitRate,
- audioBuffer,
-	 frameBuffer,
-	 dump,
-	 backgroundFlag));
+ theProcessor. reset (new mp2Processor (mr, 
+	 d	-> SId,
+	 d	-> bitRate,
+ audioBuffer,
+	 frameBuffer,
+	 dump,
+	 backgroundFlag));
 	 }
 else
 if (((audiodata *)d) -> ASCTy == DAB_PLUS) {
 	 theLogger -> log (logger::LOG_SERVICE_STARTS,
 	 "MP4 service ", d -> bitRate);
 theProcessor. reset (new mp4Processor (mr,
-	 d -> bitRate,
- audioBuffer,
-	 frameBuffer,
-	 dump,
-	 backgroundFlag));
+	 d -> SId,
+	 d -> bitRate,
+ audioBuffer,
+	 frameBuffer,
+	 dump,
+	 backgroundFlag));
 	 }
 	 else
 	 theProcessor. reset (new frameProcessor ());	// should not happen
@@ -67,15 +68,13 @@
 	if (d -> type == PACKET_SERVICE) {
 	 theProcessor. reset (new dataProcessor (mr,
 	 (packetdata *)d,
-	 dataBuffer,
-	 backgroundFlag));
+	 dataBuffer));
 	}
 	else
 	 theProcessor. reset (new frameProcessor ());	// should not happen
 	running. store (true);;
 }
 
-
 backendDriver::~backendDriver() {
 	running. store (false);
 	theProcessor. reset ();
@@ -95,3 +94,8 @@
 	theProcessor. reset ();
 }
 
+void	backendDriver::set_dataTracer (bool b) {
+	theProcessor	-> set_dataTracer (b);
+}
+
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/backend-driver.h -> qt-dab-6.10.tar.gz/sources/backend/backend-driver.h Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/backend.cpp -> qt-dab-6.10.tar.gz/sources/backend/backend.cpp Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/backend.h -> qt-dab-6.10.tar.gz/sources/backend/backend.h Changed

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/adv-datahandler.h -> qt-dab-6.10.tar.gz/sources/backend/data/adv-datahandler.h Changed

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

@@ -42,10 +42,10 @@
 //	fragmentsize == Length * CUSize
 	dataProcessor::dataProcessor	(RadioInterface *mr,
 	 packetdata	*pd,
-	 RingBuffer<uint8_t> *dataBuffer,
-	 bool	backgroundFlag):
+	 RingBuffer<uint8_t> *dataBuffer):
 	 my_rsDecoder (8, 0435, 0, 1, 16) {
 	this	-> myRadioInterface	= mr;
+	this	-> SId			= pd -> SId;
 	this	-> bitRate		= pd -> bitRate;
 	this	-> DSCTy		= pd -> DSCTy;
 	this	-> appType		= pd -> appType;
@@ -53,7 +53,10 @@
 	this	-> DGflag		= pd -> DGflag;
 	this	-> FEC_scheme		= pd -> FEC_scheme;
 	this	-> dataBuffer		= dataBuffer;
-
+	this	-> traceFlag		= false;
+	teller				= 0;
+	fouten				= 0;
+	tracer. resize (0);
 	AppVector. resize (RSDIMS * FRAMESIZE + 48);
 	FECVector. resize (9 * 22);
 	for (int i = 0; i < 9; i ++)
@@ -93,7 +96,7 @@
 	 break;
 
 	 case 60:
-	 my_dataHandler. reset (new motHandler (mr, backgroundFlag));
+	 my_dataHandler. reset (new motHandler (mr, SId));
 	 break;
 	 
 	}
@@ -122,10 +125,11 @@
 	 if (length < pLength)	// be on the safe side
 	 return;
 
-	 if (!FEC_scheme) 
-	 handlePacket (data);
-	 else
+	 const uint16_t paddr = getBits (data, 6, 10);
+	 if ((paddr == 1022) || FEC_scheme)
 	 handleRSPacket (data);
+	 else
+	 handlePacket (data);
 //
 //	prepare for the next round
 	 length -= pLength;
@@ -137,13 +141,32 @@
 }
 
 void	dataProcessor::handlePacket (const uint8_t *vec) {
+	if (traceFlag)
+	 teller ++;
 	uint8_t Length	= (getBits (vec, 0, 2) + 1) * 24;
 	if (!check_CRC_bits (vec, Length * 8)) {
-//	 fprintf (stderr, "crc fails %d\n", Length);
+	 if (traceFlag) {
+	 fouten ++;
+	 fprintf (stderr, "crc error in %d (%d) ->", teller, Length);
+	 for (int i = 0; i < (int)(tracer. size ()); i ++)
+	 fprintf (stderr, "(%d -> %d %d) ",
+	 tracer i. packetNumber,
+	 tracer i. key, tracer i. size);
+	 fprintf (stderr, "\n");
+	 tracer. resize (0);
+	 }
+//	 assembling = false;
 	 return;
 	}
-//	fprintf (stderr, "packet crc OK %d\n", Length);
-
+	
+	if (traceFlag && (teller >= 2000)) {
+	 fprintf (stderr, "in %d packets, we had %d crc errors\n",
+	 teller, fouten);
+	 teller = 0;
+	 fouten = 0;
+	}
+//
+//	TS 300 401 5.3.2.0
 //	Continuity index:
 	const uint8_t cntIdx	= getBits (vec, 2, 2);
 //	First/Last flag:
@@ -152,7 +175,6 @@
 	const uint16_t paddr	= getBits (vec, 6, 10);
 //	Useful data length
 	const uint8_t udlen	= getBits (vec, 17,7); 
-//	fprintf (stderr, "udlen = %d\n", udlen);
 
 	if (paddr != packetAddress) 	// wrong address
 	 return;
@@ -161,11 +183,13 @@
 	 return;
 
 	if (cntIdx != (last_cntIdx + 1) % 4) {
-//	 fprintf (stderr, "packet cntIdx %d expected %d address %d\n",
-//	 cntIdx, last_cntIdx, paddr);
+//	 fprintf (stderr, "packet %d cntIdx %d expected %d address %d\n",
+//	 teller, cntIdx, last_cntIdx, paddr);
 //	packet is OK, so try to process it
 //	which obviously only makes sense if flflg == 2,
 	 assembling = false;
+	 if (traceFlag)
+	 tracer. resize (0);
 	}
 
 	last_cntIdx = cntIdx;
@@ -178,6 +202,14 @@
 
 	switch (flflg) {
 	 case 2: // First data group packet
+	 if (traceFlag) {
+	 traceElement t;
+	 t. packetNumber = teller;
+	 t. key = 2;
+	 t. size = udlen;
+	 tracer. resize (0);
+	 tracer. push_back (t);
+	 }
 	 series. resize (udlen * 8);
 	 for (uint16_t i = 0; i < udlen * 8; i ++)
 	 series i = vec 3 * 8 + i;
@@ -186,10 +218,26 @@
 
 	 case 0: // Intermediate data group packet
 	 if (assembling) {
+	 if (traceFlag) {
+	 traceElement t;
+	 t. packetNumber = teller;
+	 t. key = 0;
+	 t. size = udlen;
+	 tracer. push_back (t);
+	 }
 	 int currentLength = series. size ();
 	 if (currentLength + udlen * 8 > 8 * 8192) {
+	 if (traceFlag) {
+	 fprintf (stderr, "%d elements, size %d\n",
+	 (int)(tracer. size ()),
+	 currentLength / 8 + udlen);
+	 for (int i = 0; i < (int)(tracer. size ()); i ++)
+	 fprintf (stderr, "(%d -> %d %d) ",
+	 tracer i. packetNumber,
+	 tracer i. key, tracer i. size);
+	 fprintf (stderr, "\n");
+	 }
 	 assembling = false;
-//	 fprintf (stderr, "too large???\n");
 	 return;
 	 }
 	 series. resize (currentLength + udlen * 8);
@@ -200,10 +248,26 @@
 
 	 case 1: // Last data group packet
 	 if (assembling) {
+	 if (traceFlag) {
+	 traceElement t;
+	 t. packetNumber = teller;
+	 t. key = 1;
+	 t. size = udlen;
+	 tracer. push_back (t);
+	 }
 	 int currentLength = series. size ();
-	 if (currentLength + udlen * 8 > 8 * 8192) {
+	 if (currentLength + udlen * 8 >= 8 * 8192) {
+	 if (traceFlag) {
+	 fprintf (stderr, "%d elements, size %d\n",
+	 (int)(tracer. size ()),
+	 currentLength / 8 + udlen);
+	 for (int i = 0; i < (int)(tracer. size ()); i ++)
+	 fprintf (stderr, "(%d -> %d %d) ",
+	 tracer i. packetNumber,
+	 tracer i. key, tracer i. size);
+	 fprintf (stderr, "\n");
+	 }
 	 assembling = false;
-//	 fprintf (stderr, "too large???\n");
 	 return;
 	 }
 	 series. resize (currentLength + udlen * 8);
@@ -220,15 +284,17 @@
 	 return;
 
 	 case 3: { // Single packet, mostly padding
-	 if (Length > 3 * 8 + udlen * 8) {
-	 series. resize (udlen * 8);
-	 for (uint8_t i = 0; i < udlen * 8; i ++)
-	 series i = vec 3 * 8 + i;
-	 if (series. size () > 0)
-	 my_dataHandler -> add_mscDatagroup (series);
-	 }
-	 series. resize (0);
- }
+	 if (assembling) {
+	 if (Length > 3 * 8 + udlen * 8) {
+	 series. resize (udlen * 8);
+	 for (uint8_t i = 0; i < udlen * 8; i ++)
+	 series i = vec 3 * 8 + i;
+	 if (series. size () > 0)

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

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2015 .. 2017
+ * Copyright (C) 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -27,15 +27,15 @@
 #include	"radio.h"
 
 	motDirectory::motDirectory (RadioInterface *mr,
+	 uint32_t	SId,
 	 uint16_t	transportId,
 	 int16_t	segmentSize,
 	 int32_t	dirSize,
 	 int16_t	objects,
-	 uint8_t	*segment,
-	 bool	backgroundFlag) {
+	 uint8_t	*segment) {
 
 	this	-> myRadioInterface	= mr;
-	this	-> backgroundFlag	= backgroundFlag;
+	this	-> SId			= SId;
 	for (int i = 0; i < 512; i ++)
 	 marked i = false;
 	num_dirSegments	= -1;
@@ -43,8 +43,6 @@
 	this	-> dirSize	= dirSize;
 	this	-> numObjects	= objects;
 	this	-> dir_segmentSize	= segmentSize;
-//	fprintf (stderr, "transportId %d, dirSize %d, numObjects %d, segmentSize %d\n",
-//	 transportId, dirSize, objects, segmentSize);
 	dir_segments. resize (dirSize);
 	motComponents. resize (objects);
 	for (int i = 0; i < objects; i ++) {
@@ -96,7 +94,6 @@
 	 bool	lastSegment) {
 int16_t	i;
 
-//	fprintf (stderr, "adding dir segment %d\n", segmentNumber);
 	if (this -> transportId != transportId)
 	 return;
 	if (this -> marked segmentNumber)
@@ -114,6 +111,7 @@
 	 if (!this -> marked i)
 	 return;
 //	 yes we have all data to build up the directory
+	
 	 analyse_theDirectory();
 	 
 //	 fprintf (stderr, "Going to inspect the directory\n");
@@ -143,12 +141,12 @@
 //	 fprintf (stderr, "motObject with transportId %d and \n", transportId);
 	 uint8_t *segment	= &dir_segments currentBase + 2;
 	 motObject *handle	= new motObject (myRadioInterface,
+	 SId,
 	 true,
 	 transportId,
 	 segment,
 	 -1,
-	 false,
-	 backgroundFlag);
+	 false);
 	 
 	 currentBase		+= 2 + handle -> get_headerSize();
 	 setHandle (handle, transportId);

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

@@ -1,10 +1,10 @@
 #
 /*
- * Copyright (C) 2015 .. 2017
+ * Copyright (C) 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
- * This file is part of the Qt-DAB
+ * This file is part of Qt-DAB
 *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -35,12 +35,12 @@
 Q_OBJECT
 public:
 			motDirectory	(RadioInterface *,
+	 uint32_t,	// SId
 	 uint16_t,
 	 int16_t,
 	 int32_t,
 	 int16_t,
-	 uint8_t *,
-	 bool);
+	 uint8_t *);
 			~motDirectory	();
 	motObject	*getHandle	(uint16_t);
 	void		setHandle	(motObject *, uint16_t);
@@ -54,8 +54,8 @@
 	void		analyse_theDirectory();
 	uint16_t	transportId;
 
+	uint32_t	SId;
 	RadioInterface	*myRadioInterface;
-	bool		backgroundFlag;
 	std::vector<uint8_t>	dir_segments;
 	bool		marked 512;
 	int16_t		dir_segmentSize;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/mot/mot-handler.cpp -> qt-dab-6.10.tar.gz/sources/backend/data/mot/mot-handler.cpp Changed

@@ -31,28 +31,31 @@
 //
 //	we "cache" the most recent single motSlides (not those in a directory)
 //
+
+#define TABLESIZE	128
 struct motTable_ {
 	uint16_t	transportId;
 	int32_t		orderNumber;
 	motObject	*motSlide;
-} motTable 55;
+} motTable TABLESIZE;
 
 	motHandler::motHandler (RadioInterface *mr,
-	 bool backgroundFlag) {
+	 uint32_t	SId) {
 	myRadioInterface	= mr;
-	this	-> backgroundFlag	= backgroundFlag;
+	this	-> SId		= SId;
 	orderNumber		= 0;
 
 	theDirectory		= nullptr;
-	for (int i = 0; i < 55; i ++) {
+	for (int i = 0; i < TABLESIZE; i ++) {
 	 motTable i. orderNumber	= -1;
 	 motTable i. motSlide	= nullptr;
+	 motTable i. transportId	= 0;
 	}
 }
 
 	motHandler::~motHandler	() {
 
-	for (int i = 0; i < 55; i ++) {
+	for (int i = 0; i < TABLESIZE; i ++) {
 	 if (motTable i. orderNumber > 0) {
 	 if (motTable i. motSlide != nullptr) {
 	 delete motTable i. motSlide;
@@ -125,35 +128,25 @@
 	uint32_t segmentSize = ((motVector 0 & 0x1F) << 8) |
 	 motVector 1;
 	switch (groupType) {
-	 case 3:
+	 case 3:	// mot header
 	 if (segmentNumber == 0) {
 	 motObject *h = getHandle (transportId);
-	 if (h != nullptr) 
-	 break;
-	 h = new motObject (myRadioInterface,
-	 false,	// not within a directory
-	 transportId,
-	 &motVector 2,	
-	 segmentSize,
-	 lastFlag,
-	 backgroundFlag);
-	 setHandle (h, transportId);
+	 if (h == nullptr) {
+	 h = new motObject (myRadioInterface,
+	 SId,
+	 false,	// not within a directory
+	 transportId,
+	 &motVector 2,
+	 segmentSize,
+	 lastFlag);
+	 setHandle (h, transportId);
+	 }
 	 }
 	 break; 
 
 	 case 4: {
 	 motObject *h = getHandle (transportId);
-	 if ((h == nullptr) && (segmentNumber == 0)) {
-	 h = new motObject (myRadioInterface,
-	 false,	// not within a directory
-	 transportId,
-	 &motVector 2,	
-	 segmentSize,
-	 lastFlag,
-	 backgroundFlag);
-	 setHandle (h, transportId);
-	 }
-	 if (h != nullptr)
+	 if (h != nullptr) 
 	 h -> addBodySegment (&motVector 2,
 	 segmentNumber,
 	 segmentSize,
@@ -181,15 +174,14 @@
 //	 int32_t segSize
 //	 = ((segment 9 & 0x1F) << 8) | segment 10;
 	 theDirectory	= new motDirectory (myRadioInterface,
+	 SId,
 	 transportId,
 	 segmentSize,
 	 dirSize,
 	 numObjects,
-	 segment,
-	 backgroundFlag);
+	 segment);
 	 }
 	 else {
-//	 fprintf (stderr, "Creating directory segment %X\n", transportId);
 	 if ((theDirectory == nullptr) || 
 	 (theDirectory -> get_transportId() != transportId))
 	 break;
@@ -201,6 +193,10 @@
 	 }
 	 break;
 
+	 case 7:
+//	 fprintf (stderr, "transportId in type 7 %d\n", transportId);
+	 break;
+	 
 	 default:
 //	 fprintf (stderr, "mot groupType %d\n", groupType);
 	 return;
@@ -210,7 +206,7 @@
 motObject	*motHandler::getHandle (uint16_t transportId) {
 int	i;
 
-	for (i = 0; i < 15; i ++) 
+	for (i = 0; i < TABLESIZE; i ++) 
 	 if ((motTable i. orderNumber >= 0) &&
 	 (motTable i. transportId == transportId))
 	 return motTable i. motSlide;
@@ -224,8 +220,9 @@
 int	oldest	= orderNumber;
 int	index	= 0;
 
-	for (i = 0; i < 15; i ++)
-	 if (motTable i. orderNumber == -1) {
+	for (i = 0; i < TABLESIZE; i ++)
+	 if ((motTable i. orderNumber == -1) ||
+	 (motTable i. motSlide == nullptr)) {
 	 motTable i. orderNumber = orderNumber ++;
 	 motTable i. transportId = transportId;
 	 motTable i. motSlide	= h;
@@ -234,7 +231,7 @@
 //
 //	if here, the cache is full, so we delete the oldest one
 	index	= 0;
-	for (i = 0; i < 15; i ++)
+	for (i = 0; i < TABLESIZE; i ++)
 	 if (motTable i. orderNumber < oldest) {
 	 oldest = motTable i. orderNumber;
 	 index = i;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/mot/mot-handler.h -> qt-dab-6.10.tar.gz/sources/backend/data/mot/mot-handler.h Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/mot/mot-object.cpp -> qt-dab-6.10.tar.gz/sources/backend/data/mot/mot-object.cpp Changed

@@ -20,8 +20,14 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
- *	MOT handling is a crime, here we have a single class responsible
- *	for handling a single MOT message with a given transportId
+ *	We pack each MOT object into a single instance of the class
+ *	motObject. The class is instantiated with a "type 3", i.e.
+ *	header object.
+ *	MOTobjects are identified by their TransportId.
+ *	The callers assure that when calling motObject or 
+ *	its functions, they share their unique transportId;
+ *	The associated body segments have to wait until the header
+ *	is in.
 */
 #include	"mot-object.h"
 #include	"radio.h"
@@ -29,26 +35,24 @@
 #include	"charsets.h"
 
 	 motObject::motObject (RadioInterface *mr,
+	 uint32_t	SId,
 	 bool		dirElement,
 	 uint16_t	transportId,
 	 const uint8_t	*segment,
 	 int32_t	segmentSize,
-	 bool		lastFlag,
-	 bool		backgroundFlag) {
+	 bool		lastFlag) {
 int32_t pointer = 7;
 uint16_t	rawContentType = 0;
 
-	(void)segmentSize;
 	(void)lastFlag;
+	this	-> SId			= SId;
 	this	-> dirElement		= dirElement;
-	this	-> backgroundFlag	= backgroundFlag;
-
 	this	-> name			= "";
+	this	-> transportId		= transportId;
+	this	-> segmentSize		= segmentSize;
 	connect (this, &motObject::handle_motObject,
 	 mr, &RadioInterface::handle_motObject);
-	this	-> transportId		= transportId;
 	this	-> numofSegments	= -1;
-	this	-> segmentSize		= -1;
 
 	headerSize =
 	 ((segment 3 & 0x0F) << 9) |
@@ -63,14 +67,10 @@
 	rawContentType	|= ((segment 5 & 0x01) << 8) | segment 6;
 	contentType = static_cast<MOTContentType>(rawContentType);
 
-//	fprintf (stderr, "headerSize %d, bodySize %d. contentType %d, transportId %X, segmentSize %d, lastFlag %d\n",
-//	 headerSize, bodySize, b, transportId, 
-//	 segmentSize, lastFlag);
-
-//	we are actually only interested in the name, if any
 	int reference = segmentSize == -1 ? headerSize :
 	 headerSize == -1 ? segmentSize :
 	 std::min ((int)headerSize, (int)segmentSize);
+
 while ((uint16_t)pointer < reference) {
 uint8_t PLI	= (segment pointer & 0300) >> 6;
 uint8_t paramId = (segment pointer & 077);
@@ -88,23 +88,55 @@
 pointer += 5;
 break;
 
- case 03:
- if ((segment pointer + 1 & 0200) != 0) {
- length = (segment pointer + 1 & 0177) << 8 |
+ case 03: {
+ if ((segment pointer + 1 & 0x80) != 0) {
+ length = (segment pointer + 1 & 0x7F) << 8 |
 segment pointer + 2;
-	 
- pointer += 3 ;
+ pointer = pointer + 3 ;
 }
 else {
- length = segment pointer + 1 & 0177;
- pointer += 2;
+ length = segment pointer + 1 & 0x7F;
+	 pointer = pointer + 2;
 }
 	 switch (paramId) {
-	 case 12: {
+	 case 0:	// reserved for MOT protocol extensons
+	 case 2:	// reserved for MOT protocol extenions
+	 case 3:	// reserved for MOT protocol extenions
+	 case 4:	// reserved for MOT protocol extenions
+	 case 6:	// reserved for MOT protocol extenions
+	 case 8:	// reserved for MOT protocol extenions
+	 case 14:	// reserved for MOT protocol extenions
+	 case 15:	// reserved for MOT protocol extenions
+	 pointer += length;
+	 break;
+
+	 case 5:	// trigger time
+	 pointer += length;	// 
+	 break;
+
+	 case 7:	// retransmsission distance
+	 pointer += length;	// 6.3.4.1.5
+	 break;
+
+	 case 9:	// expiration time
+//	 fprintf (stderr, "expiration time\n");
+	 pointer += length;	//6.2.3.1.1
+	 break;
+
+	 case 10:	// priority
+	 pointer += length;	// 6.2.3.1.4
+	 break;
+	 
+	 case 11:	// label
+	 pointer += length;
+	 break;
+
+	 case 12: {	// contentName 6.2.2.1.1
 uint8_t charSet = segment pointer >> 4;
 	 QByteArray nameText;
 for (int i = 1; i < length; i ++) {
- nameText. append (segment pointer + i);
+	 if (i < 32)
+ nameText. append (segment pointer + i);
 	 }
 	 name = toQStringUsingCharset (
 	 (const char *)nameText. data (),
@@ -113,25 +145,31 @@
 pointer += length;
 	 break;
 	 }
-	 case 2:	// creation time
-	 case 3:	// start validity
-	 case 4:	// expiretime
-	 case 5:	// triggerTime
-	 case 6:	// version number
-	 case 7: 	// retransmission distance
-	 case 8:	// group reference
-	 case 10:	// priority
-	 case 11:	// label
-	 case 15:	// content description
-//	 fprintf (stderr, "Key was %d\n", paramId);
- pointer += length;
+
+	 case 13:	// Unique Body Version
+	 pointer += length;
+	 break;
+
+	 case 16:	// Mime type
+ pointer += length;	// 6.2.2.1.2
+	 break;
+
+	 case 17:	// compression type
+//	 fprintf (stderr, "we have compression type\n");
+	 pointer += length;	// 6.2.2.1.3
+	 break;
+
+	 case 33:	// CAInfo
+//	 fprintf (stderr, "CAInfo detected\n");
+	 pointer += length;	//6.2.3.2.1
 	 break;
 
 	 default:
-	 pointer += headerSize;	// this is so wrong!!!
+	 pointer += length;	// this is so wrong!!!
 	 break;
 	 }
 }
+	 }
 	}
 }
 
@@ -144,7 +182,8 @@
 
 // type 4 is a segment.
 //	The pad/dir software will only call this whenever it has
-//	established that the current slide has the right transportId
+//	established that the current slide has a header with the
+//	same transport Id
 //
 //	Note that segments do not need to come in in the right order
 void	motObject::addBodySegment (const uint8_t	*bodySegment,
@@ -154,12 +193,11 @@
 
 	if ((segmentNumber < 0) || (segmentNumber >= 8192))
 	 return;
-
+//
+//	check already exists
 	if (motMap. find (segmentNumber) != motMap. end ())
 	 return;
 
-//	fprintf (stderr, "adding segment %d to %d (last ? %d)\n",
-//	 segmentNumber, transportId, lastFlag);
 // Note that the last segment may have a different size
 if (!lastFlag && (this -> segmentSize == -1))
 this -> segmentSize = segmentSize;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/backend/data/mot/mot-object.h -> qt-dab-6.10.tar.gz/sources/backend/data/mot/mot-object.h Changed

@@ -1,10 +1,10 @@
 #
 /*
- * Copyright (C) 2015 .. 2017
+ * Copyright (C) 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
- * This file is part of the Qt-DAB program
+ * This file is part of Qt-DAB
 *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -40,12 +40,12 @@
 Q_OBJECT
 public:
 		motObject (RadioInterface *mr,
+	 uint32_t	SId,
 	 bool		dirElement,
 	 uint16_t	transportId,
 	 const uint8_t	*segment,
 	 int32_t	segmentSize,
-	 bool		lastFlag,
-	 bool		backgroundFlag);
+	 bool		lastFlag);
 		~motObject	();
 	void	addBodySegment (const uint8_t	*bodySegment,
 int16_t	segmentNumber,
@@ -54,7 +54,7 @@
 	uint16_t	get_transportId	();
 	int		get_headerSize	();
 private:
-	bool		backgroundFlag;
+	uint32_t	SId;
 	bool		dirElement;
 	QString		picturePath;
 	uint16_t	transportId;
@@ -66,9 +66,8 @@
 	QString		name;
 	void		handleComplete	();
 	std::map<int, QByteArray> motMap;
-
+	
 signals:
- void	the_picture	(QByteArray, int, QString);
-	void	handle_motObject (QByteArray, QString, int, bool, bool);
+	void	handle_motObject (QByteArray, QString, int, bool, uint32_t);
 };

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

@@ -32,8 +32,10 @@
 *	Handles the pad segments passed on from mp2- and mp4Processor
 */
 	padHandler::padHandler	(RadioInterface *mr,
+	 uint32_t	SId,
 	 bool backgroundFlag):
 	 myRadioInterface (mr) {
+	this	-> SId			= SId;
 	this	-> backgroundFlag	= backgroundFlag;
 
 	connect (this, &padHandler::showLabel,
@@ -328,7 +330,8 @@
 //
 //	A dynamic label is created from a sequence of (dynamic) xpad
 //	fields, starting with CI = 2, continuing with CI = 3
-void	padHandler::dynamicLabel (const uint8_t *data, int16_t length, uint8_t CI) {
+void	padHandler::dynamicLabel (const uint8_t *data,
+	 int16_t length, uint8_t CI) {
 int16_t dataLength = 0;
 
 	if ((CI & 037) == 02) {	// start of segment
@@ -381,11 +384,13 @@
 	 break;
 	 case 2:
 #ifdef	_PAD_TRACE_
-	 fprintf (stderr, "DL plus command\n");
+	 fprintf (stderr, "DL plus command, dataLength %d\n",
+	 dataLength);
 #endif
 	 if (!backgroundFlag) {
-	 if (dataLength > 2)
-	 add_toDL2 (&data 2, field_2, field_3);
+	 if (dataLength > 2) {
+	 add_toDL2 (&data 2, dataLength - 2, field_2, field_3);
+	 }
 	 }
 	 break;
 	 default:
@@ -578,44 +583,25 @@
 //	handling MOT in the PAD, we only deal here with type 3/4
 	switch (groupType) {
 	 case 3:
-	 if (currentSlide. isNull ()) {
-//	 fprintf (stderr, "creating %d\n", transportId);
-	 currentSlide. reset (new motObject (myRadioInterface,
-	 false,
-	 	 transportId,
-	 &data index + 2,
-	 segmentSize,
-	 lastFlag,
-	 backgroundFlag));
-	 }
-	 else {
-	 if (currentSlide -> get_transportId() == transportId)
-	 break;
-//	 fprintf (stderr, "out goes %d, in comes %d\n",
-//	 currentSlide -> get_transportId(),
-//	 transportId);
-//	 delete currentSlide;
-	 currentSlide. reset (new motObject (myRadioInterface,
-	 false,
-	 	 transportId,
-	 &data index + 2,
-	 segmentSize,
-	 lastFlag,
-	 backgroundFlag
-	 ));
-	 }
+	 if (currentSlide. isNull () ||
+	 (currentSlide -> get_transportId() != transportId))
+	 currentSlide. reset (new motObject (myRadioInterface,
+	 SId,
+	 false,
+	 transportId,
+	 &data index + 2,
+	 segmentSize,
+	 lastFlag));
 	 break;
 
-	 case 4:
-	 if (currentSlide. isNull ())
+	 case 4: {
+	 if (currentSlide. isNull () ||
+	 (currentSlide -> get_transportId() != transportId))
 	 return;
-	 if (currentSlide -> get_transportId() == transportId) {
-//	 fprintf (stderr, "add segment %d of %d\n",
-//	 segmentNumber, transportId);
-	 currentSlide -> addBodySegment (&data index + 2,
-	 segmentNumber,
-	 segmentSize,
-	 lastFlag);
+	 currentSlide -> addBodySegment (&data index + 2,
+	 segmentNumber,
+	 segmentSize,
+	 lastFlag);
 	 }
 	 break;
 
@@ -625,8 +611,6 @@
 	 break;
 	}
 }
-
-//
 //
 //	Experimental code to extract titles and composers from
 //	the DL2 data
@@ -646,19 +630,24 @@
 	return res;
 }
 
-void	padHandler::add_toDL2 (const uint8_t *data,
+void	padHandler::add_toDL2 (const uint8_t *data, int dataLength,
 	 uint8_t field_2, uint8_t field_3) {
 	(void)field_2; (void)field_3;
 	if (DL2_record. theText. size () == 0)
 	 return;
-//	uint8_t CId	= (data 0 >> 4) & 0x0f;
+	int DL_size	= (int)((uint8_t)field_3) + 1;
+	uint8_t CId	= (data 0 >> 4) & 0x0f;
+	if (CId != 0)		// should not happen
+	 return;
 	uint8_t CB	= data 0 & 0x0f;
 	if ((CB & 04) == 0)	// IR should be "running"
 	 return;
 	uint8_t NT	= data 0 & 0x03;
 	uint8_t IT	= CB & 0x08;
+	if (dataLength <= DL_size)
+	 return;
 	for (int i = 0; i <= NT; i ++) {
-	 uint8_t contentType	= data 1 + 3 * i + 0 & 0x3F;
+	 uint8_t contentType	= data 1 + 3 * i + 0 & 0x7F;
 	 uint8_t startMarker	= data 1 + 3 * i + 1 & 0x7F;
 	 uint8_t lengthMarker = data 1 + 3 * i + 2 & 0x7F;
 	 switch (contentType) {

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

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

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

@@ -50,40 +50,21 @@
 	 params (dabMode),
 	 myMapper (dabMode),
 	 myRadioInterface (mr),
-	 frameBuffer (frameBuffer_i)
-#ifdef	__MSC_THREAD__
-	 ,fft (params. get_T_u (), false)
-	 ,bufferSpace (params. get_L())
-#endif		 
-{
+	 frameBuffer (frameBuffer_i) {
 	this	-> theLogger	= theLogger;
 	this	-> cpuSupport	= cpuSupport;
 	cifVector. resize (55296);
 	BitsperBlock		= 2 * params. get_carriers();
 	softBits. resize (BitsperBlock);
 	nrBlocks		= params. get_L();
-	connect (this, &mscHandler::nrServices,
+	connect (this, &mscHandler::activeServices,
 	 mr, &RadioInterface::nrActiveServices);
 	
 
 	numberofblocksperCIF = cifTable (dabMode - 1) & 03;
-#ifdef	__MSC_THREAD__
-	phaseReference	.resize (params. get_T_u());
-	command. resize (nrBlocks);
-	for (int i = 0; i < nrBlocks; i ++)
-	 command i. resize (params. get_T_u());
-	amount = 0;
-	running. store (false);
-	start ();
-#endif
 }
 
 		mscHandler::~mscHandler () {
-#ifdef	__MSC_THREAD__
-	running. store (false);
-	while (isRunning())
-	 usleep (100);
-#endif
 	locker. lock();
 	for (auto &b : theBackends) {
 	 b -> stopRunning();
@@ -97,84 +78,9 @@
 //	Input is put into a buffer, a the code in a separate thread
 //	will handle the data from the buffer
 void	mscHandler::processBlock_0 (Complex *b) {
-#ifdef	__MSC_THREAD__
-	bufferSpace. acquire (1);
-	memcpy (command 0. data(), b,
-	 params. get_T_u() * sizeof (Complex));
-	helper. lock();
-	amount ++;
- commandHandler. wakeOne();
- helper. unlock();
-#else
-	(void)b;
 	fprintf (stderr, "Why am I called?\n");
-#endif
-}
-
-#ifdef	__MSC_THREAD__
-void	mscHandler::processMsc	(std::vector<Complex> &b,
-	 int offset, int blkno) {
-	bufferSpace. acquire (1);
- memcpy (command blkno. data (), &(b. data ())offset,
-	 params. get_T_u() * sizeof (Complex));
- helper. lock();
- amount ++;
- commandHandler. wakeOne();
- helper. unlock();
 }
 
-void mscHandler::run () {
-int	currentBlock	= 0;
-Complex fft_buffer params. get_T_u ();
-Complex conjVector params. get_T_u ();
-int	carriers	= params. get_carriers ();
-
-	if (running. load ()) {
-	 fprintf (stderr, "already running\n");
-	 return;
-	}
-
-	running. store (true);
- while (running. load()) {
- helper. lock();
- commandHandler. wait (&helper, 100);
- helper. unlock();
- while ((amount > 0) && running. load()) {
-	 memcpy (fft_buffer, command currentBlock. data(),
-	 params. get_T_u() * sizeof (Complex));
-//
-//	block 3 and up are needed as basis for demodulation the "mext" block
-//	"our" msc blocks start with blkno 4
-	 fft. fft (fft_buffer);
- if (currentBlock >= 4) {
- for (int i = 0; i < carriers; i ++) {
- int16_t index = myMapper. mapIn (i);
- if (index < 0)
- index += params. get_T_u();
-
- Complex r1 = fft_buffer index *
- conj (phaseReference index);
-	 conjVector index = r1;
-
-	 float ab1	= jan_abs (r1);
- softBbits i	= (int16_t) (- real (r1) * MAX_VITERBI / ab1);
- softBits carriers + i =
-	 (int16_t) (- imag (r1) * MAX_VITERBI / ab1);
- }
-
-	 processMscBlock (softBits, currentBlock);
-	 }
-	 memcpy (phaseReference. data (), fft_buffer,
-	 params. get_T_u() * sizeof (Complex));
- bufferSpace. release (1);
- helper. lock();
- currentBlock = (currentBlock + 1) % (nrBlocks);
- amount -= 1;
- helper. unlock();
- }
- }
-}
-#else
 void	mscHandler::processMsc	(std::vector<Complex> &b,
 	 int offset, int blkno) {
 	(void)b;
@@ -182,7 +88,6 @@
 	(void)blkno;
 	fprintf (stderr, "I should not be called\n");
 }
-#endif
 //
 //	Note, the set_Channel function is called from within a
 //	different thread than the process_mscBlock method is,
@@ -191,13 +96,6 @@
 //	thread executing process_mscBlock
 void	mscHandler::resetBuffers	() {
 	resetChannel ();
-#ifdef	__MSC_THREAD__
-	running. store (false);
-	while (isRunning ())
-	 wait (100);
-	bufferSpace. release (params. get_L () - bufferSpace. available ());
-	start ();
-#endif
 }
 
 void	mscHandler::resetChannel () {
@@ -209,7 +107,7 @@
 	}
 	theBackends. resize (0);
 	locker. unlock ();
-	nrServices ((int)(theBackends. size ()));
+	activeServices ((int)(theBackends. size ()));
 }
 
 void	mscHandler::stopBackend	(const QString &serviceName,
@@ -227,7 +125,7 @@
 	 }
 	}
 	locker. unlock ();
-	nrServices ((int)(theBackends. size ()));
+	activeServices ((int)(theBackends. size ()));
 }
 //
 //	Note that - in general - the backens run in their own thread
@@ -244,8 +142,8 @@
 	 frameBuffer,
 	 dump,
 	 flag,
-	 cpuSupport)); 
-	nrServices ((int)(theBackends. size ()));
+	 cpuSupport));
+	activeServices ((int)(theBackends. size ()));
 	return true;
 }
 
@@ -287,3 +185,10 @@
 	}
 	locker. unlock();
 }
+
+void	mscHandler::set_dataTracer	(bool v) {
+	for (auto &be: theBackends) 
+	 if (be -> is_dataBackend ()) 
+	 be -> set_dataTracer (v);
+}
+

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

@@ -1,10 +1,10 @@
 #
 /*
- * Copyright (C) 2013 .. 2024
+ * Copyright (C) 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
- * This file is part of the Qt-DAB
+ * This file is part of Qt-DAB
 *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,14 +23,7 @@
 #
 #pragma once
 
-#ifdef __MSC_THREAD__
-#include	<QThread>
-#include	<QWaitCondition>
-#include	<QSemaphore>
-#include	"fft-handler.h"
-#else
 #include	<QObject>
-#endif
 #include	<QMutex>
 #include	<atomic>
 #include	<cstdio>
@@ -48,11 +41,7 @@
 class	Backend;
 class	logger;
 
-#ifdef	__MSC_THREAD__
-class mscHandler: public QThread {
-#else
 class	mscHandler: public QObject {
-#endif
 Q_OBJECT
 public:
 			mscHandler		(RadioInterface *,
@@ -74,6 +63,7 @@
 	void		resetChannel		();
 	void		resetBuffers		();
 	bool		serviceRuns		(uint32_t SId, uint16_t subChId);
+	void		set_dataTracer		(bool);
 private:
 
 	dabParams	params;
@@ -82,11 +72,6 @@
 	RingBuffer<uint8_t>	*frameBuffer;
 	logger		*theLogger;
 	uint8_t		cpuSupport;
-#ifdef	__MSC_THREAD__
-	fftHandler	fft;
- QSemaphore bufferSpace;
-#endif
-
 	RingBuffer<uint8_t>	*dataBuffer;
 	QMutex		locker;
 	bool		audioService;
@@ -102,16 +87,7 @@
 void processMsc	(int32_t n);
 QMutex helper;
 	int		nrBlocks;
-#ifdef	__MSC_THREAD__
-	std::vector<Complex> phaseReference;
- void processBlock_0	();
- std::vector<std::vector<Complex > > command;
- int16_t amount;
-	void run();
- QWaitCondition commandHandler;
- std::atomic<bool> running;
-#endif
 signals:
-	void		nrServices	(int);
+	void		activeServices	(int);
 };

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/CMakeLists.txt -> qt-dab-6.10.tar.gz/sources/devices/CMakeLists.txt Changed

@@ -96,6 +96,7 @@
 	        ${${devicesLibName}_MOCS}
 	        ./sdrplay-handler-v3/sdrplay-handler-v3.h
 	        ./sdrplay-handler-v3/sdrplay-commands.h 
+	        ./sdrplay-handler-v3/sdrplayselect.h 
 	        ./sdrplay-handler-v3/Rsp-device.h 
 	        ./sdrplay-handler-v3/RspI-handler.h 
 	        ./sdrplay-handler-v3/Rsp1A-handler.h 
@@ -113,6 +114,7 @@
 	        ${${devicesLibName}_HDRS}
 	        ./sdrplay-handler-v3/sdrplay-handler-v3.h
 	        ./sdrplay-handler-v3/sdrplay-commands.h
+	        ./sdrplay-handler-v3/sdrplayselect-v3.h
 	        ./sdrplay-handler-v3/include/sdrplay_api.h
 	        ./sdrplay-handler-v3/Rsp-device.h 
 	        ./sdrplay-handler-v3/RspI-handler.h 
@@ -125,6 +127,7 @@
 	   set (${devicesLibName}_SRCS
 	        ${${devicesLibName}_SRCS}
 	        ./sdrplay-handler-v3/sdrplay-handler-v3.cpp
+	        ./sdrplay-handler-v3/sdrplayselect-v3.cpp
                 ./sdrplay-handler-v3/Rsp-device.cpp 
 	        ./sdrplay-handler-v3/RspI-handler.cpp 
 	        ./sdrplay-handler-v3/Rsp1A-handler.cpp

qt-dab-6.10.tar.gz/sources/devices/airspy-handler Added

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspy-handler.cpp Added

@@ -0,0 +1,969 @@
+#
+/**
+ * IW0HDV Extio
+ *
+ * Copyright 2015 by Andrea Montefusco IW0HDV
+ *
+ * Licensed under GNU General Public License 3.0 or later. 
+ * Some rights reserved. See COPYING, AUTHORS.
+ *
+ * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
+ *
+ *	recoding, taking parts and extending for the airspyHandler interface
+ *	for the Qt-DAB program
+ *	jan van Katwijk
+ *	Lazy Chair Computing
+ */
+
+#include	<QPoint>
+#include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	"dab-constants.h"
+#include	"airspy-handler.h"
+#include	"position-handler.h"
+#include	"airspyselect.h"
+#include	"device-exceptions.h"
+#include	"errorlog.h"
+#include	"settingNames.h"
+#include	"settings-handler.h"
+
+#define	AIRSPY_SETTINGS	"airspySettings"
+#define	TAB_SETTINGS	"tabSettings"
+#define	CONV_QUALITY	"convQuality"
+
+static
+const	int	EXTIO_NS	= 8192;
+static
+const	int	EXTIO_BASE_TYPE_SIZE = sizeof (float);
+
+	airspyHandler::airspyHandler (QSettings *s,
+	 const QString &recorderVersion,
+	 errorLogger	*theLogger) :
+ _I_Buffer (4 * 1024 * 1024) {
+int	result;
+int	distance	= 1000000;
+std::vector <uint32_t> sampleRates;
+uint32_t samplerateCount;
+
+	this	-> airspySettings	= s;
+	this	-> recorderVersion	= recorderVersion;
+	theErrorLogger			= theLogger;
+	setupUi (&myFrame);
+	setPositionAndSize (s, &myFrame, AIRSPY_SETTINGS);
+	myFrame. show		();
+//
+//	Since we have different tabs, with different sliders for
+//	gain setting, restoring the settings is a tedious task
+	int tab	= value_i (airspySettings, AIRSPY_SETTINGS, TAB_SETTINGS, 2);
+ tabWidget	-> setCurrentIndex (tab);
+	restore_gainSliders (200, tab);
+
+	device			= nullptr;
+	serialNumber		= 0;
+
+#ifdef	__MINGW32__
+	const char *libraryString = "airspy.dll";
+#else
+	const char *libraryString = "libairspy.so";
+#endif
+	
+ library_p = new QLibrary (libraryString);
+ library_p -> load();
+
+ if (!library_p -> isLoaded ()) {
+ throw (device_exception ("failed to open " +
+ std::string (libraryString)));
+ }
+
+	if (!load_airspyFunctions ()) {
+	 delete library_p;
+	 throw (device_exception ("one or more library functions could not be loaded"));
+	}
+//
+	strcpy (serial,"");
+	if (this -> my_airspy_init () != AIRSPY_SUCCESS) {
+	 delete library_p;
+	 throw (device_exception ("could not init"));
+	}
+
+	uint64_t deviceList 4;
+	int	deviceIndex;
+	int numofDevs = my_airspy_list_devices (deviceList, 4)
+;
+	if (numofDevs == 0) {
+	 delete library_p;
+	 throw (device_exception ("No airspy device was detected"));
+	}
+
+	if (numofDevs > 1) {
+ airspySelect deviceSelector;
+ for (deviceIndex = 0; deviceIndex < (int)numofDevs; deviceIndex ++) {
+ deviceSelector.
+ addtoList (QString::number (deviceList deviceIndex));
+ }
+ deviceIndex = deviceSelector. QDialog::exec();
+ }
+	else
+	 deviceIndex = 0;
+	
+	result = my_airspy_open (&device, deviceList deviceIndex);
+	if (result != AIRSPY_SUCCESS) {
+	 delete library_p;
+	 throw (device_exception
+	 (my_airspy_error_name ((airspy_error)result)));
+	}
+
+	(void) my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
+	(void) my_airspy_get_samplerates (device, &samplerateCount, 0);
+//	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
+	sampleRates. resize (samplerateCount);
+	my_airspy_get_samplerates (device,
+	 sampleRates. data(), samplerateCount);
+
+	selectedRate	= 0;
+	for (int i = 0; i < (int)samplerateCount; i ++) {
+	 fprintf (stderr, "%d \n", sampleRates i);
+	 if (abs ((int)sampleRates i - SAMPLERATE) < distance) {
+	 distance	= abs ((int)sampleRates i - SAMPLERATE);
+	 selectedRate = sampleRates i;
+	 }
+	}
+
+	if (selectedRate == 0) {
+	 delete library_p;
+	 throw (device_exception ("Cannot handle the samplerates"));
+	}
+
+	samplerateLabel	-> setText (QString::number (selectedRate));
+	result = my_airspy_set_samplerate (device, selectedRate);
+
+	if (result != AIRSPY_SUCCESS) {
+	 delete library_p;
+	 throw (device_exception
+	 (my_airspy_error_name ((enum airspy_error)result)));
+	}
+	filterDepth		= value_i (airspySettings, AIRSPY_SETTINGS,
+	 CONV_QUALITY, 7);
+	convQuality_setter	-> setValue (filterDepth);
+ theFilter. reset (new LowPassFIR (filterDepth,
+	 1536000 / 2, selectedRate));
+
+// The sizes of the mapTables follow from the input and output rate
+// (selectedRate / 1000) vs (SAMPLERATE / 1000)
+// so we end up with buffers with 1 msec content
+ convBufferSize = selectedRate / 1000;
+	float samplesPerMsec	= SAMPLERATE / 1000.0;
+ for (int i = 0; i < SAMPLERATE / 1000; i ++) {
+ float inVal = float (selectedRate / 1000);
+ mapTable_int i = int (floor (i * (inVal / samplesPerMsec)));
+ mapTable_float i = i * (inVal / samplesPerMsec) - mapTable_int i;
+ }
+ convIndex = 0;
+ convBuffer. resize (convBufferSize + 1);
+
+//
+	restore_gainSettings (tab);
+	connect (linearitySlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_linearity);
+	connect (sensitivitySlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_sensitivity);
+	connect (lnaSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_lna_gain);
+	connect (vgaSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_vga_gain);
+	connect (mixerSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_mixer_gain);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	connect (lnaButton, &QCheckBox::checkStateChanged,
+#else
+	connect (lnaButton, &QCheckBox::stateChanged,
+#endif
+	 this, &airspyHandler::set_lna_agc);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	connect (mixerButton, &QCheckBox::checkStateChanged,
+#else
+	connect (mixerButton, &QCheckBox::stateChanged,
+#endif
+	 this, &airspyHandler::set_mixer_agc);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	connect (biasButton, &QCheckBox::checkStateChanged,
+#else
+	connect (biasButton, &QCheckBox::stateChanged,
+#endif
+	 this, &airspyHandler::set_rf_bias);
+	connect (tabWidget, &QTabWidget::currentChanged,
+	 this, &airspyHandler::switch_tab);
+	connect (dumpButton, &QPushButton::clicked,
+	 this, &airspyHandler::set_xmlDump);
+	connect (this, &airspyHandler::new_tabSetting,

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspy-handler.h Added

@@ -0,0 +1,196 @@
+#
+/**
+ * IW0HDV Extio
+ *
+ * Copyright 2015 by Andrea Montefusco IW0HDV
+ *
+ * Licensed under GNU General Public License 3.0 or later. 
+ * Some rights reserved. See COPYING, AUTHORS.
+ *
+ * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
+ *
+ *	recoding and taking parts for the airspyRadio interface
+ *	for the Qt-DAB program
+ *	jan van Katwijk
+ *	Lazy Chair Computing
+ */
+#pragma once
+
+#include	<QObject>
+#include	<QSettings>
+#include	<QFrame>
+#include	<vector>
+#include	<atomic>
+#include	<mutex>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"ui_airspy-widget.h"
+#include	<QLibrary>
+#ifndef	__MINGW32__
+#include	"libairspy/airspy.h"
+#else
+#include	"libairspy/airspy.h"
+#endif
+#include	"fir-filters.h"
+
+#include	<QScopedPointer>
+#include	"xml-filewriter.h"
+class	errorLogger;
+
+extern "C" {
+ typedef int (*pfn_airspy_init)();
+ typedef int (*pfn_airspy_exit)();
+ typedef int (*pfn_airspy_list_devices)(uint64_t *, int);
+ typedef int (*pfn_airspy_open) (struct airspy_device**, uint64_t);
+// typedef int (*pfn_airspy_open) (struct airspy_device**);
+ typedef int (*pfn_airspy_close) (struct airspy_device*);
+ typedef int (*pfn_airspy_get_samplerates) (struct airspy_device* device,
+	 uint32_t* buffer,
+	 const uint32_t len);
+ typedef int (*pfn_airspy_set_samplerate) (struct airspy_device* device,
+	 uint32_t samplerate);
+ typedef int (*pfn_airspy_start_rx) (struct airspy_device* device,
+	 airspy_sample_block_cb_fn callback,
+	 void* rx_ctx);
+ typedef int (*pfn_airspy_stop_rx) (struct airspy_device* device);
+
+ typedef int (*pfn_airspy_set_sample_type) (struct airspy_device *,
+	 airspy_sample_type);
+ typedef int (*pfn_airspy_set_freq) (struct airspy_device* device,
+	 const uint32_t freq_hz);
+
+ typedef int (*pfn_airspy_set_lna_gain) (struct airspy_device* device,
+	 uint8_t value);
+
+ typedef int (*pfn_airspy_set_mixer_gain) (struct airspy_device* device,
+	 uint8_t value);
+
+ typedef int (*pfn_airspy_set_vga_gain) (struct airspy_device*
+	 device, uint8_t
+	 value);
+ typedef int (*pfn_airspy_set_lna_agc) (struct airspy_device* device,
+	 uint8_t value);
+ typedef int (*pfn_airspy_set_mixer_agc) (struct airspy_device* device,
+	 uint8_t value);
+
+ typedef int (*pfn_airspy_set_rf_bias) (struct airspy_device* dev,
+	 uint8_t value);
+
+ typedef const char* (*pfn_airspy_error_name) (enum airspy_error errcode);
+ typedef int (*pfn_airspy_board_id_read) (struct airspy_device *,
+	 uint8_t *);
+ typedef const char* (*pfn_airspy_board_id_name) (enum airspy_board_id board_id);
+ typedef int (*pfn_airspy_board_partid_serialno_read)(struct airspy_device* device, airspy_read_partid_serialno_t* read_partid_serialno);
+
+ typedef int (*pfn_airspy_set_linearity_gain) (struct airspy_device* device, uint8_t value);
+ typedef int (*pfn_airspy_set_sensitivity_gain)(struct airspy_device* device, uint8_t value);
+}
+
+class airspyHandler: public deviceHandler, public Ui_airspyWidget {
+Q_OBJECT
+public:
+			airspyHandler		(QSettings *,
+	 const QString &,
+	 errorLogger *);
+			~airspyHandler		();
+//	int32_t		defaultFrequency	();
+	bool		restartReader		(int32_t, int samplesSkipped = 0);
+	void		stopReader		();
+	int32_t		getSamples		(std::complex<float> *v, int32_t size);
+	int32_t		Samples			();
+	void		resetBuffer		();
+	int16_t		bitDepth		();
+//	int		getBufferSpace		();
+	QString		deviceName		();
+
+	void		startDump		();
+	void		stopDump		();
+	int16_t		currentTab;
+private:
+	RingBuffer<std::complex<float>> _I_Buffer;
+	errorLogger	*theErrorLogger;
+	QString		recorderVersion;
+	void		check_error		(bool, const std::string);
+ QScopedPointer<xml_fileWriter>	xmlWriter;
+ bool setup_xmlDump		(bool);
+ void close_xmlDump ();
+ std::atomic<bool> dumping;
+	void		record_gainSettings	(int, int);
+	void		restore_gainSliders	(int, int);
+	void		restore_gainSettings	(int);
+	QSettings	*airspySettings;
+	void		showStatus		(const QString);
+	QScopedPointer<LowPassFIR>	theFilter;
+	int		filterDepth;
+private slots:
+	void		set_linearity		(int value);
+	void		set_sensitivity		(int value);
+	void		set_lna_gain		(int value);
+	void		set_mixer_gain		(int value);
+	void		set_vga_gain		(int value);
+	void		set_lna_agc		(int);
+	void		set_mixer_agc		(int);
+	void		set_rf_bias		(int);
+	void		switch_tab		(int);
+	void		set_xmlDump		();
+signals:
+	void		new_tabSetting		(int);
+private:
+	bool		load_airspyFunctions	();
+//	The functions to be extracted from the dll/.so file
+	pfn_airspy_init		 my_airspy_init;
+	pfn_airspy_exit		 my_airspy_exit;
+	pfn_airspy_error_name	 my_airspy_error_name;
+	pfn_airspy_list_devices	 my_airspy_list_devices;
+	pfn_airspy_open		 my_airspy_open;
+	pfn_airspy_close	 my_airspy_close;
+	pfn_airspy_get_samplerates my_airspy_get_samplerates;
+	pfn_airspy_set_samplerate my_airspy_set_samplerate;
+	pfn_airspy_start_rx	 my_airspy_start_rx;
+	pfn_airspy_stop_rx	 my_airspy_stop_rx;
+	pfn_airspy_set_sample_type my_airspy_set_sample_type;
+	pfn_airspy_set_freq	 my_airspy_set_freq;
+	pfn_airspy_set_lna_gain	 my_airspy_set_lna_gain;
+	pfn_airspy_set_mixer_gain my_airspy_set_mixer_gain;
+	pfn_airspy_set_vga_gain	 my_airspy_set_vga_gain;
+	pfn_airspy_set_linearity_gain my_airspy_set_linearity_gain;
+	pfn_airspy_set_sensitivity_gain my_airspy_set_sensitivity_gain;
+	pfn_airspy_set_lna_agc	 my_airspy_set_lna_agc;
+	pfn_airspy_set_mixer_agc my_airspy_set_mixer_agc;
+	pfn_airspy_set_rf_bias	 my_airspy_set_rf_bias;
+	pfn_airspy_board_id_read my_airspy_board_id_read;
+	pfn_airspy_board_id_name my_airspy_board_id_name;
+	pfn_airspy_board_partid_serialno_read
+		 my_airspy_board_partid_serialno_read;
+//
+	QLibrary	*library_p;
+	bool		success;
+	std::atomic<bool>	running;
+	bool		lna_agc;
+	bool		mixer_agc;
+	bool		rf_bias;
+const	char*		board_id_name();
+
+	int16_t		vgaGain;
+	int16_t		mixerGain;
+	int16_t		lnaGain;
+	int32_t		selectedRate;
+	int16_t convBufferSize;
+ int16_t convIndex;
+ std::vector <std::complex<float> > convBuffer;
+ int16_t mapTable_int 4 * 512;
+ float mapTable_float 4 * 512;
+	int32_t		inputRate;
+ int32_t inp;
+	struct airspy_device* device;
+	uint64_t 	serialNumber;
+	char		serial 128;
+static
+	int		callback(airspy_transfer_t *);
+	int		data_available (void *buf, int buf_size);
+const	char *		getSerial();
+	int		open();
+};
+
+

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspy-widget.ui Added

@@ -0,0 +1,582 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>airspyWidget</class>
+ <widget class="QWidget" name="airspyWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>410</width>
+ <height>355</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>airspy</string>
+ </property>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>130</y>
+ <width>381</width>
+ <height>201</height>
+ </rect>
+ </property>
+ <property name="currentIndex">
+ <number>2</number>
+ </property>
+ <widget class="QWidget" name="tab_1">
+ <attribute name="title">
+ <string>sensitivity</string>
+ </attribute>
+ <widget class="QSlider" name="sensitivitySlider">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>251</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>21</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivity_lnaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>60</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Shape::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivity_mixerDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>80</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Shape::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivity_vgaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>100</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Shape::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_5">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>60</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna gain</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_6">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>80</y>
+ <width>91</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mixer gain</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_7">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>100</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>vga gain</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivityDisplay">
+ <property name="geometry">
+ <rect>
+ <x>280</x>
+ <y>20</y>
+ <width>41</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>linearity</string>
+ </attribute>
+ <widget class="QSlider" name="linearitySlider">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>251</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>21</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="linearityDisplay">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>20</y>
+ <width>51</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspyfilter.cpp Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspyfilter.h Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspyselect.cpp Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/airspyselect.h Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/libairspy Added

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/libairspy/airspy.h Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/libairspy/airspy_commands.h Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/libairspy/filters.h Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/libairspy/iqconverter_float.h Changed

qt-dab-6.10.tar.gz/sources/devices/airspy-handler/libairspy/iqconverter_int16.h Changed

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

@@ -23,20 +23,21 @@
 #include	"device-chooser.h"
 #include	<QFileDialog>
 #include	<QMessageBox>
+#include	<QInputDialog>
 #include	"device-exceptions.h"
+#include	"settings-handler.h"
 #include	"errorlog.h"
 
 #include	<QModelIndex>
-
-#ifdef	HAVE_RTLSDR_V3
-#include	"rtlsdr-handler-win.h"
-#define	RTLSDR_DEVICE_V3	0200
-#define	RTLSDR_DEVICE_V4	0201
-#endif
 #ifdef	HAVE_RTLSDR
 #include	"rtlsdr-handler.h"
+#ifdef	__MINGW32__
+#define	RTLSDR_DEVICE_V3	0200
+#define	RTLSDR_DEVICE_V4	0201
+#else
 #define	RTLSDR_DEVICE		0222
 #endif
+#endif
 #ifdef	HAVE_SDRPLAY_V2
 #include	"sdrplay-handler-v2.h"
 #define	SDRPLAY_V2_DEVICE	0202
@@ -48,9 +49,6 @@
 #ifdef	HAVE_AIRSPY
 #include	"airspy-handler.h"
 #define	AIRSPY_DEVICE		0204
-#elif	HAVE_AIRSPY_2
-#include	"airspy-2.h"
-#define	AIRSPY_DEVICE		0204
 #endif
 #ifdef	HAVE_HACKRF
 #include	"hackrf-handler.h"
@@ -73,10 +71,6 @@
 #define	USRP_DEVICE		0211
 #endif
 #ifdef	__MINGW32__
-#ifdef	HAVE_EXTIO
-#include	"extio-handler.h"
-#define	EXTIO_DEVICE		0212
-#endif
 #endif
 #ifdef	HAVE_RTL_TCP
 #include	"rtl_tcp_client.h"
@@ -149,20 +143,20 @@
 #endif
 //
 //	RTLSDR handlers for windows differ from the one for Linux
-#ifdef	HAVE_RTLSDR_V3
+#ifdef	HAVE_RTLSDR
+#ifdef	__MINGW32__
 	deviceList. push_back (deviceItem ("dabstick-v3", RTLSDR_DEVICE_V3));
 	addtoList ("dabstick-v3");
 	deviceList. push_back (deviceItem ("dabstick-v4", RTLSDR_DEVICE_V4));
 	addtoList ("dabstick-v4");
-#endif
-//	This is the one for linux
-#ifdef	HAVE_RTLSDR
+#else
 	deviceList. push_back (deviceItem ("dabstick", RTLSDR_DEVICE));
 	addtoList ("dabstick");
 #endif
-#ifdef	HAVE_AIRSPY_2
-	deviceList. push_back (deviceItem ("airspy-2", AIRSPY_DEVICE));
-	addtoList ("airspy-2");
+#endif
+#ifdef	HAVE_AIRSPY
+	deviceList. push_back (deviceItem ("airspy", AIRSPY_DEVICE));
+	addtoList ("airspy");
 #endif
 #ifdef	HAVE_HACKRF
 	deviceList. push_back (deviceItem ("hackrf", HACKRF_DEVICE));
@@ -261,28 +255,27 @@
 	 theErrorLogger);
 	 break;
 #endif
-#ifdef	HAVE_RTLSDR_V3
+#ifdef	HAVE_RTLSDR
+#ifdef	__MINGW32__
 	 case RTLSDR_DEVICE_V3:
-	 return new rtlsdrHandler_win (dabSettings,
-	 "librtlsdr-V3.dll",
-	 version, theErrorLogger);
+	 return new rtlsdrHandler (dabSettings, "librtlsdr-V3.dll", 3,
+	 version, theErrorLogger);
 	 break;
 
 	 case RTLSDR_DEVICE_V4:
-	 return new rtlsdrHandler_win (dabSettings,	
-	 "librtlsdr-V4.dll",
-	 version, theErrorLogger);
+	 return new rtlsdrHandler (dabSettings, "librtlsdr-V4.dll", 4,
+	 version, theErrorLogger);
 	 break;
-#endif
-#ifdef	HAVE_RTLSDR
+#else
 	 case RTLSDR_DEVICE:
-	 return new rtlsdrHandler (dabSettings, version,
-	 theErrorLogger);
+	 return new rtlsdrHandler (dabSettings, "librtlsdr.so", 3,
+	 version, theErrorLogger);
 	 break;
 #endif
-#ifdef 	HAVE_AIRSPY_2
+#endif
+#ifdef 	HAVE_AIRSPY
 	 case AIRSPY_DEVICE:
-	 return new airspy_2 (dabSettings, version, theErrorLogger);
+	 return new airspyHandler (dabSettings, version, theErrorLogger);
 	 break;
 #endif
 #ifdef	HAVE_HACKRF
@@ -295,8 +288,23 @@
 	 break;
 #endif
 #ifdef	HAVE_PLUTO
-	 case PLUTO_DEVICE:
-	 return new plutoHandler (dabSettings, version, theErrorLogger);
+	 case PLUTO_DEVICE: {
+	 bool ok = false;
+	 QString context =
+	 value_s (dabSettings, CONFIG_HANDLER,
+	 "plutoContext", "pluto.local");
+	 context = QInputDialog::
+	 getText (this, tr("QInputDialog::getText()"),
+ tr("pluto context:"),
+	 QLineEdit::Normal,
+ context, &ok);
+	 if (!ok || context.isEmpty ())
+	 return nullptr;
+	 store (dabSettings, CONFIG_HANDLER,
+	 "plutoContext", context);
+	 return new plutoHandler (dabSettings, version,
+	 context, theErrorLogger);
+	 }
 #endif
 #ifdef HAVE_RTL_TCP
 	 case RTL_TCP_DEVICE:
@@ -334,17 +342,23 @@
 	 QString fileName	= getFileName (fileType);
 	 if (fileName == "")
 	 throw (device_exception ("no file"));
-	 switch (fileType) {
-	 case RAW_FILE_RAW:
-	 case RAW_FILE_IQ:
-	 return new rawFiles (dabSettings, fileName);
-	 case WAV_FILE:
+	 FILE *test = fopen (fileName. toLatin1 (). data (), "r");
+	 char buffer 10;
+	 int s = fread (buffer, 1, 10, test);
+	 fclose (test);
+	 if (s < 10)
+	 throw (device_exception ("illegal file"));
+	 buffer 6 = 0;
+	 if (QString (buffer) == "<?xml ")
+	 return new xml_fileReader (dabSettings, fileName);
+	 buffer 4 = 0;
+	 if ((QString (buffer) == "RIFF") ||
+	 (QString (buffer) == "BW64"))
 	 return new newFiles (dabSettings, fileName);
-	 case XML_FILE:
-	 return new xml_fileReader (dabSettings, fileName);
-	 default:
-	 throw (device_exception ("no file"));
-	 }
+	 if ((fileType == RAW_FILE_RAW) ||
+	 (fileType == RAW_FILE_IQ))
+	 return new rawFiles (dabSettings, fileName);
+	 throw (device_exception ("no file"));
 	 }
 	 break;

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

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

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C) 2013 .. 2017
+ *    Copyright (C) 2013 .. 2025
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -44,6 +44,7 @@
 	fileLength		= theReader -> elementCount ();
 	theReader	-> reset ();
 	period          = (BUFFERSIZE * 1000) / (SAMPLERATE / 1000);// full IQś read
+	newPosition. store (0);
 	running. store (false);
 	start ();
 }
@@ -79,6 +80,14 @@
 	         usleep (100);
 	      }
 
+	      if (newPosition. load () > 0) {
+	         uint64_t newPos =
+	               (uint64_t)(newPosition. load () / 100.0 * fileLength);
+	         theReader	-> set_newPosition (newPos);         
+                 newPosition. store (0); 
+                 teller = 20;
+              }
+
 	      if (++teller >= 20) {
 	         int64_t xx = theReader -> currentPos ();
 	         float progress = (float)xx / fileLength;
@@ -100,3 +109,7 @@
 	} catch (int e) {}
 }
 
+void	newReader::handle_progressSlider	(int value) {
+	newPosition. store (value);
+}
+

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

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

@@ -36,7 +36,7 @@
 	newFiles::newFiles (QSettings *s,
 	 const QString &fileName):
 	 _I_Buffer (__BUFFERSIZE__),
-	 theReader (fileName) {
+	 theReader (fileName) {
 	newFilesSettings	= s;
 	setupUi (&myFrame);
 	setPositionAndSize (s, &myFrame, WAVSETTINGS);
@@ -44,7 +44,15 @@
 	myFrame. show	();
 	this -> fileName	= fileName;
 	nameofFile		-> setText (fileName);
-	fileProgress		-> setValue (0);
+	progressSlider		-> setValue (0);
+	sliderFree. store (true);
+ connect (progressSlider, &QSlider::sliderPressed,
+ this, &newFiles::handle_sliderPressed);
+ connect (progressSlider, &QSlider::sliderMoved, 
+ this, &newFiles::handle_sliderMoved);
+ connect (progressSlider, &QSlider::sliderReleased, 
+ this, &newFiles::handle_sliderReleased);
+
 	currentTime		-> display (0);
 //
 //	The reader knows it all
@@ -61,13 +69,13 @@
 	int32_t	Freq	= theReader. getVFOFrequency ();
 	if (Freq > 0)
 	 frequencyLabel -> setText (" Freq:" + QString::number (Freq / 1000));
-	running. store (false);
+	readerTask. reset ();
 }
 //
 //	Note that running == true <==> readerTask has value assigned
 
 	newFiles::~newFiles	() {
-	if (running. load()) {
+	if (!readerTask. isNull ()) {
 	 readerTask	-> stopReader();
 	 while (readerTask -> isRunning())
 	 usleep (500);
@@ -79,21 +87,17 @@
 bool	newFiles::restartReader		(int32_t freq, int skipped) {
 	(void)freq;
 	(void)skipped;
-	if (running. load())
- return true;
 readerTask. reset (new newReader (this, &theReader, &_I_Buffer));
- running. store (true);
 return true;
 }
 
 void	newFiles::stopReader	() {
- if (running. load()) {
+	if (!readerTask. isNull ()) {
 readerTask -> stopReader();
 while (readerTask -> isRunning())
 usleep (100);
 	 readerTask. reset ();
 }
- running. store (false);
 }
 
 //	size is in I/Q pairs
@@ -113,7 +117,9 @@
 }
 
 void newFiles::setProgress (int progress, float timelength) {
- fileProgress	-> setValue (progress);
+ if (sliderFree. load ())
+	 progressSlider -> setValue (progress);
+//	fileProgress	-> setValue (progress);
 	currentTime	-> display (QString ("%1").arg(timelength, 0, 'f', 1));
 }
 
@@ -129,3 +135,20 @@
 	return QString (".wav file: ") + fileName;
 }
 
+
+void	newFiles::handle_sliderPressed () {
+ sliderFree. store (false);
+} 
+ 
+void	newFiles::handle_sliderMoved (int value) {
+ if (readerTask == nullptr)
+ return;
+//	fprintf (stderr, "set to %d\n", value);
+ readerTask -> handle_progressSlider (value);
+} 
+ 
+void	newFiles::handle_sliderReleased () {
+ sliderFree. store (true);
+}
+
+

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

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

@@ -55,6 +55,7 @@
 throw device_exception (val. toStdString ());
 }
 
+	newPosition. store (0);
 	this	-> fileName	= fileName;
 fread (header, 1, 4, filePointer);
 fread (&segmentSize, 1, 4, filePointer);
@@ -184,6 +185,7 @@
 	 fseek (filePointer, segmentSize, SEEK_CUR);
 	 fread (header, 1, 4, filePointer);
 //	 fprintf (stderr, "Now we read %s\n", header);
+
 	 if (feof (filePointer)) {
 	 QString val =
 QString ("File '%1' is no valid SDR file").arg(fileName);
@@ -202,8 +204,11 @@
 	fread (&xxx, 1, 4, filePointer);
 //	fprintf (stderr, "nrbytes in data %d\n", nrElements);
 	nrElements = xxx / blockAlign;
+//	fprintf (stderr, "nrElements %d\n", nrElements);
 	remainingElements	= nrElements;
 	std::fgetpos (filePointer, &baseofData);
+	basePosition = ftell (filePointer);
+//	fprintf (stderr, "base = %d\n", (int)basePosition);
 }
 
 void	riffReader::setupFor_bw64Type (uint32_t segmentSize) {
@@ -342,6 +347,12 @@
 
 int	riffReader::read (std::complex<float> *buffer, uint64_t nrSamples) {
 
+	if (newPosition. load () > 0) {
+	 uint64_t offset = newPosition. load () * sampleSize ();
+	 fseek (filePointer, basePosition + offset, SEEK_SET);
+	 remainingElements = nrElements - newPosition. load ();
+	 newPosition. store (0);
+	}
 	switch (readBytes) {
 	 case READ4BYTES:
 	 return read4Bytes (buffer, nrSamples);
@@ -422,3 +433,11 @@
 	return theDevice;
 }
 
+int	riffReader::sampleSize () {
+	return readBytes == READ4BYTES ? 4 :
+	 READ6BYTES ? 6 : 8;
+}
+
+void	riffReader::set_newPosition (uint64_t v) {
+	newPosition. store (v);
+}

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

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2013 .. 2017
+ * Copyright (C) 2013 .. 2024
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -51,11 +51,11 @@
 	this	-> _I_Buffer	= _I_Buffer;
 
 	fseek (filePointer, 0, SEEK_END);
-	fileLength		= ftell (filePointer);
-	fprintf (stderr, "fileLength = %d\n", (int)fileLength);
+	fileLength	= ftell (filePointer);
+//	fprintf (stderr, "fileLength = %d\n", (int)fileLength);
 	fseek (filePointer, 0, SEEK_SET);
 	period = (RAW_BUFFERSIZE * 1000) / (2 * SAMPLERATE / 1000); // full IQś read
-	fprintf (stderr, "Period = %d\n", (int)period);
+//	fprintf (stderr, "Period = %d\n", (int)period);
 	for (int i = 0; i < 256; i ++)
 //	the offset 127.38f is due to the input data comes usually from 
 //	an SDR stick which has its DC offset a bit shifted from ideal
@@ -64,6 +64,7 @@
 	running. store (false);
 	connect (this, &rawReader::setProgress,
 	 parent, &rawFiles::setProgress);
+	newPosition. store (0);
 	fseek (filePointer, 0, SEEK_SET);
 	start	();
 }
@@ -79,10 +80,9 @@
 	 usleep (200);
 	}
 }
-
 //
 void	rawReader::run () {
-int64_t	nextStop;
+int64_t nextStop;
 int	teller	= 0;
 std::complex<float> localBuffer RAW_BUFFERSIZE / 2;
 
@@ -90,12 +90,21 @@
 	nextStop = getMyTime();
 	try {
 	 while (running. load()) {
-	 while (_I_Buffer -> WriteSpace() < RAW_BUFFERSIZE + 10) {
+	 while (_I_Buffer -> WriteSpace () < RAW_BUFFERSIZE + 10) {
 	 if (!running. load())
 	 throw (32);
 	 usleep (100);
 	 }
-	
+
+	 if (newPosition. load () > 0) {
+	 int newPos =
+	 (int)(newPosition. load () / 100.0 * fileLength / 2);
+	 int sampleSize = 2;
+	 fseek (filePointer, newPos * sampleSize, SEEK_SET);
+	 newPosition. store (0);
+	 teller = 20;
+	 }
+
 	 if (++teller >= 20) {
 	 int xx = ftell (filePointer);
 	 float progress = (float)xx / fileLength;
@@ -120,10 +129,14 @@
 	 4 * mapTable rawDataBuffer 2 * i + 1);
 	 _I_Buffer -> putDataIntoBuffer (localBuffer, 
 	 RAW_BUFFERSIZE / 2);
-	 if (nextStop - getMyTime() > 0)
+	 if ((int)(nextStop - getMyTime()) > 0)
 	 usleep (nextStop - getMyTime());
 	 }
 	} catch (int e) {}
 	fprintf (stderr, "taak voor replay eindigt hier\n");
 }
 
+void	rawReader::handle_progressSlider (int v) {
+	newPosition. store (v);
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/filereaders/rawfiles-new/raw-reader.h -> qt-dab-6.10.tar.gz/sources/devices/filereaders/rawfiles-new/raw-reader.h Changed

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

@@ -62,7 +62,15 @@
 	int64_t fileLength      = ftell (filePointer);
         totalTime       -> display ((float)fileLength / (SAMPLERATE * 2));
 	fseek (filePointer, 0, SEEK_SET);
-	fileProgress    -> setValue (0);
+	progressSlider	-> setValue (0);
+	sliderFree. store (true);
+        connect (progressSlider, &QSlider::sliderPressed,
+                 this, &rawFiles::handle_sliderPressed);
+        connect (progressSlider, &QSlider::sliderMoved, 
+                 this, &rawFiles::handle_sliderMoved);
+        connect (progressSlider, &QSlider::sliderReleased,  
+                 this, &rawFiles::handle_sliderReleased);
+
         currentTime     -> display (0);
 	typeOfFile	-> setText ("raw, 8 bits");
 	sampleCount	-> setText (QString::number (fileLength / 2));
@@ -76,6 +84,7 @@
 	      usleep (100);
 	   readerTask. reset ();
 	}
+
 	storeWidgetPosition (rawFilesSettings, &myFrame, RAWSETTINGS);
 	if (filePointer != nullptr)
 	   fclose (filePointer);
@@ -120,8 +129,10 @@
 }
 
 void	rawFiles::setProgress (int progress, float timelength) {
-	fileProgress      -> setValue (progress);
-	currentTime       -> display (timelength / 1000);
+	if (sliderFree. load ())
+	   progressSlider	-> setValue (progress);
+//	fileProgress	-> setValue (progress);
+	currentTime	-> display (timelength / 1000);
 }
 
 bool	rawFiles::isFileInput	() {
@@ -133,3 +144,18 @@
 	return res;
 }
 
+void	rawFiles::handle_sliderPressed	() {
+	sliderFree. store (false);
+}
+
+void	rawFiles::handle_sliderMoved	(int value) {
+	if (readerTask == nullptr)
+	   return;
+	readerTask	-> handle_progressSlider (value);
+}
+
+void	rawFiles::handle_sliderReleased	() {
+	sliderFree. store (true);
+}
+
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/filereaders/rawfiles-new/rawfiles.h -> qt-dab-6.10.tar.gz/sources/devices/filereaders/rawfiles-new/rawfiles.h Changed

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2019
+ * Copyright (C) 2014 .. 2024
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -91,7 +91,7 @@
 }
 
 void	xmlDescriptor::add_freqtoBlock	(int blockno, int freq) {
-	fprintf (stderr, "adding freq %d %d\n", blockno, freq);
+//	fprintf (stderr, "adding freq %d %d\n", blockno, freq);
 	blockList. at (blockno). frequency = freq;
 }
 
@@ -187,8 +187,8 @@
 	 if (component. tagName () == "deviceGain") {
 	 QString SR = component. attribute ("Value", "-1");
 	 deviceGain	= SR. toInt ();
-	 fprintf (stderr, "The gain is %d (%s)\n",
-	 deviceGain, SR.toLatin1 (). data ());
+//	 fprintf (stderr, "The gain is %d (%s)\n",
+//	 deviceGain, SR.toLatin1 (). data ());
 	 }
 	 if (component. tagName () == "Datablocks") {
 //	 QString Count = component.attribute ("Count", "3");
@@ -199,7 +199,7 @@
 	 if (nodes. at (j). isComment ()) {
 	 continue;
 	 }
-	 fprintf (stderr, "Datablocks has %d siblings\n", nodes. count ());
+//	 fprintf (stderr, "Datablocks has %d siblings\n", nodes. count ());
 	 QDomElement Child = nodes. at (j). toElement ();
 	 if (Child. tagName () == "Datablock") {
 	 bool ok;
@@ -243,3 +243,10 @@
 //	printDescriptor ();
 }
 
+int	xmlDescriptor::sampleSize () {
+int	bytes	= bitsperChannel <= 8 ? 1 :
+	 bitsperChannel <= 16 ? 2 :
+	 bitsperChannel <= 24 ? 3 : 4;
+	return nrChannels * bytes;
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/filereaders/xml-filereader/xml-descriptor.h -> qt-dab-6.10.tar.gz/sources/devices/filereaders/xml-filereader/xml-descriptor.h Changed

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2013 .. 2024
+ * Copyright (C) 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -20,7 +20,6 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-//#include	<QFileDialog>
 #include	<QString>
 #include	"xml-filereader.h"
 #include	<cstdio>
@@ -52,15 +51,17 @@
 	if (fileName == nullptr) 	// should not happen
 	 throw device_exception ("no file specified");
 //
-//	back to normal
-	setupUi	(&myFrame);
-	setPositionAndSize (s, &myFrame, XMLSETTINGS);
-	myFrame. show	();
-
 	theFile	= fopen (fileName. toUtf8 (). data (), "rb");
 	if (theFile == nullptr) {
 	 throw device_exception ("cannot open " + fileName. toStdString ());
 	}
+
+//	back to normal
+	setupUi	(&myFrame);
+	setPositionAndSize (s, &myFrame, XMLSETTINGS);
+	myFrame. show	();
+//
+//	we have a file, so show the filename
 	filenameLabel	-> setText (fileName);
 	
 	bool	ok	= false;
@@ -70,14 +71,32 @@
 	 throw device_exception (fileName. toStdString () + "no xml file");
 	}
 
-	fileProgress		-> setValue (0);
+	progressSlider		-> setValue (0);
+	sliderFree. store (true);
+	connect (progressSlider, &QSlider::sliderPressed,
+	 this, &xml_fileReader::handle_sliderPressed);
+	connect (progressSlider, &QSlider::sliderMoved,
+	 this, &xml_fileReader::handle_sliderMoved);
+	connect (progressSlider, &QSlider::sliderReleased,
+	 this, &xml_fileReader::handle_sliderReleased);
+
+	this	-> theRate	= theDescriptor -> sampleRate;
+	this	-> theFrequency	=
+	 theDescriptor -> blockList 0. frequency;
 currentTime		-> display (0);
-	samplerateDisplay	-> display (theDescriptor -> sampleRate);
-	nrBitsDisplay		-> display (theDescriptor -> bitsperChannel);
+	frequencyDisplay	-> setAlignment (Qt::AlignRight);
+	frequencyDisplay	-> setText (QString::number (theFrequency / 1000) + " kHz");
+	samplerateDisplay	-> setAlignment (Qt::AlignRight);
+	samplerateDisplay	-> setText (QString::number (theRate));
+	nrBitsDisplay		-> setAlignment (Qt::AlignRight);
+	nrBitsDisplay		-> setText (QString::number (theDescriptor -> bitsperChannel));
+	QString res = QString::number (theDescriptor -> blockList 0. nrElements);
+	nrElementsDisplay	-> setAlignment (Qt::AlignRight);
+	nrElementsDisplay	-> setText (res);
+
 	containerLabel		-> setText (theDescriptor -> container);
 	iqOrderLabel		-> setText (theDescriptor -> iqOrder);
 	byteOrderLabel		-> setText (theDescriptor -> byteOrder);
-	frequencyDisplay	-> display (theDescriptor -> blockList 0. frequency / 1000.0);
 	deviceGainLabel		-> hide ();
 	if (theDescriptor -> deviceGain > 0) {
 	 deviceGainLabel	-> show ();
@@ -91,9 +110,7 @@
 	deviceModel		-> setText (theDescriptor -> deviceModel);
 	recorderName		-> setText (theDescriptor -> recorderName);
 	recorderVersion		-> setText (theDescriptor -> recorderVersion);
-	recordingTime		-> setText (theDescriptor -> recordingTime);
-	QString res = QString::number (theDescriptor -> blockList 0. nrElements);
-	nrElementsDisplay	-> display (res);
+	recordingTime		-> setText ("recorded at: " + theDescriptor -> recordingTime);
 #ifdef __MINGW32__
 	fprintf (stderr, "nrElements = %lld\n",
 #else
@@ -102,16 +119,32 @@
 	 theDescriptor -> blockList 0.nrElements);
 	connect (continuousButton, &QPushButton::clicked,
 	 this, &xml_fileReader::handle_continuousButton);
+
+	uint64_t nrElements = 0;	
+	for (uint16_t i = 0; i < theDescriptor -> nrBlocks; i ++) 
+	 nrElements += theDescriptor ->blockList i. nrElements;
+	uint16_t sampleSize = theDescriptor -> sampleSize ();
+
+	fseek (theFile, 0, SEEK_END);
+	uint64_t fileLength	= ftell (theFile);
+	
+	dataStart	= fileLength -
+	 (uint64_t)(nrElements * (sampleSize / 2));
+	startpoint	-> setText (QString::number (dataStart));
+	if (dataStart <=1000) // as with DABstar
+	 dataStart = 5000;
+
 	running. store (false);
 }
 
 	xml_fileReader::~xml_fileReader	() {
-	if (running. load()) {
+	if (running. load ()) {
 	 theReader	-> stopReader();
 	 while (theReader -> isRunning())
 	 usleep (100);
 	 theReader. reset ();
 	}
+
 	storeWidgetPosition (xmlFilesSettings, &myFrame, XMLSETTINGS);
 	if (theFile != nullptr)		// cannot happen
 	 fclose (theFile);
@@ -126,7 +159,7 @@
 	 return true;
 	theReader. reset (new xml_Reader (this, theFile,
 	 theDescriptor. data (),
-	 5000, &_I_Buffer));
+	 dataStart, &_I_Buffer));
 	running. store (true);
 	return true;
 }
@@ -142,8 +175,7 @@
 }
 
 //	size is in "samples"
-int32_t	xml_fileReader::getSamples	(std::complex<float> *V,
-	 int32_t size) {
+int32_t	xml_fileReader::getSamples	(std::complex<float> *V, int32_t size) {
 
 	if (theFile == nullptr)		// should not happen
 	 return 0;
@@ -161,13 +193,16 @@
 }
 
 void	xml_fileReader::setProgress (int samplesRead, int samplesToRead) {
-	fileProgress	-> setValue ((float)samplesRead / samplesToRead * 100);
-	currentTime	-> display (samplesRead / (float)SAMPLERATE);
-	totalTime	-> display (samplesToRead / (float)SAMPLERATE);
+	if (theFile == nullptr)		// should not happen
+	 return;
+	if (sliderFree. load ())
+	 progressSlider -> setValue ((float)samplesRead / samplesToRead * 100);
+	currentTime	-> display (samplesRead / theRate);
+	totalTime	-> display (samplesToRead / theRate);
 }
 
 int	xml_fileReader::getVFOFrequency	() {
-	return theDescriptor -> blockList 0. frequency;
+	return theFrequency;
 }
 
 void	xml_fileReader::handle_continuousButton () {
@@ -187,3 +222,17 @@
 	return res;
 }
 
+void	xml_fileReader::handle_sliderPressed	() {
+	sliderFree. store (false);
+}
+
+void	xml_fileReader::handle_sliderMoved	(int value) {
+	if (theReader == nullptr)
+	 return;
+	theReader	-> handle_progressSlider (value);
+}
+
+void	xml_fileReader::handle_sliderReleased	() {
+	sliderFree. store (true);
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/filereaders/xml-filereader/xml-filereader.h -> qt-dab-6.10.tar.gz/sources/devices/filereaders/xml-filereader/xml-filereader.h Changed

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2019
+ * Copyright (C) 2014 .. 2024
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -62,7 +62,8 @@
 	this	-> fd		= fd;
 	this	-> filePointer	= filePointer;
 	sampleBuffer		= b;
-//
+	newPosition. store (0);
+
 //	convBufferSize is a little confusing since the actual 
 //	buffer is one larger
 	convBufferSize		= fd -> sampleRate / 1000;
@@ -87,7 +88,7 @@
 	connect (this, &xml_Reader::setProgress,
 	 parent, &xml_fileReader::setProgress);
 
-	fprintf (stderr, "reader task wordt gestart\n");
+//	fprintf (stderr, "reader task wordt gestart\n");
 	start ();
 }
 
@@ -140,6 +141,20 @@
 	 samplesRead += readSamples (file,
 	 &xml_Reader::readElements_Q);
 
+	 if (newPosition. load () > 0) {
+//	 fprintf (stderr, "newposition %d\n",
+//	 newPosition. load ());
+	 samplesRead =
+	 (int) (newPosition. load () / 100.0 * samplesToRead);
+//	 fprintf (stderr, "samplesRead %ld\n", samplesRead);
+	 uint64_t filePos = startPoint + samplesRead * 
+	 fd -> sampleSize ();
+//	 fprintf (stderr, "startPoint %d, filePos %d\n",
+//	 (int)startPoint, (int)filePos);
+	 fseek (file, filePos, SEEK_SET);
+	 newPosition. store (0);
+	 cycleCount = 200;
+	 }
 	 if (++cycleCount >= 200) {
 	 setProgress (samplesRead, samplesToRead);
 	 cycleCount = 0;
@@ -196,8 +211,8 @@
 	for (int i = 0; i < SAMPLERATE / 1000; i ++) {
 	 int16_t inpBase	= mapTable_int i;
 	 float inpRatio	= mapTable_float i;
-	 temp i = compmul (convBuffer inpBase + 1, inpRatio) +
-	 compmul (convBuffer inpBase, 1 - inpRatio);
+	 temp i = convBuffer inpBase + 1 * inpRatio +
+	 convBuffer inpBase * (1.0f - inpRatio);
 	}
 	convBuffer 0 = convBuffer convBufferSize;
 	convIndex = 1;
@@ -797,3 +812,7 @@
 	}
 }
 
+void	xml_Reader::handle_progressSlider	(int v) {
+	newPosition. store (v);
+}
+

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/filereaders/xml-filereader/xmlfiles.ui -> qt-dab-6.10.tar.gz/sources/devices/filereaders/xml-filereader/xmlfiles.ui Changed

@@ -6,14 +6,14 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>297</width>
- <height>408</height>
+ <width>319</width>
+ <height>429</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>xmlfiles</string>
 </property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
+ <layout class="QVBoxLayout" name="verticalLayout">
 <item>
 <widget class="QLabel" name="filenameLabel">
 <property name="toolTip">
@@ -25,12 +25,12 @@
 </widget>
 </item>
 <item>
- <widget class="QProgressBar" name="fileProgress">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;File progress&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <widget class="QSlider" name="progressSlider">
+ <property name="maximum">
+ <number>100</number>
 </property>
- <property name="value">
- <number>24</number>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
 </property>
 </widget>
 </item>
@@ -66,68 +66,63 @@
 </layout>
 </item>
 <item>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
 <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="recorderName">
- <property name="text">
- <string>recorder</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="recorderVersion">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording software and version.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="deviceVersion">
- <property name="text">
- <string>deviceName</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="deviceModel">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording device&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="deviceVersion">
+ <property name="text">
+ <string>deviceName</string>
+ </property>
+ </widget>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>recorded at </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="recordingTime">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording time (it's not the current time)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="deviceModel">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording device&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>devicemodel</string>
+ </property>
+ </widget>
 </item>
 <item>
- <widget class="QLabel" name="deviceGainLabel">
+ <widget class="QLabel" name="recordingTime">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording time (it's not the current time)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>record time</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="recorderName">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="recorderVersion">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows recording software and version.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string>TextLabel</string>
 </property>
@@ -136,127 +131,156 @@
 </layout>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="modulationtypeLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="typeofUnitLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="byteOrderLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QLabel" name="containerLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>

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

@@ -185,6 +185,7 @@
 
 	hackrf_device_list_t *deviceList = this -> hackrf_device_list();
 	if (deviceList != nullptr) {	// well, it should be
+	   
 	   char *serial = deviceList -> serial_numbers 0;
 	   if (serial != nullptr) 
 	      serialNumber	= serial;
@@ -198,9 +199,14 @@
 	                 deviceList -> usb_board_ids 0;
 	   usb_board_id_display ->
 	                setText (this -> hackrf_usb_board_id_name (board_id));
-	   char version 255;
-	   hackrf_version_string_read (theDevice, version, 255);
-	   versionDisplay -> setText (version);
+	   uint8_t res;
+	   hackrf_board_rev_read (theDevice, &res);
+	   revisionIndicator	-> display (res);
+
+	   QString ff = hackrf_library_version ();
+	   QString  gg = hackrf_library_release ();
+	   versionLabel -> setText ("library version " + ff);
+	   releaseLabel -> setText ("release " + gg);
 	}
 	connect (this, &hackrfHandler::signal_antEnable,
 	         biasT_button, &QCheckBox::setChecked);
@@ -646,13 +652,33 @@
 	                     "Could not find hackrf_version_string_read\n");
 	   return false;
 	}
-//	this	-> hackrf_board_rev_read =
-//	              (pfn_hackrf_board_rev_read)
-//	                      library_p ->resolve ("hackrf_board_rev_read");
-//	if (hackrf_board_rev_read == nullptr) {
-//	   fprintf (stderr, "Could not find hackrf_board_rev_read\n");
-//	   return false;
-//	}
+
+	this	-> hackrf_library_version =
+	              (pfn_hackrf_library_version)
+	                     library_p -> resolve("hackrf_library_version");
+	if (hackrf_library_version == nullptr) {
+	   theErrorLogger -> add ("Hackrf",
+	                     "Could not find hackrf_library_version\n");
+	   return false;
+	}
+
+	this	-> hackrf_library_release =
+	              (pfn_hackrf_library_release)
+	                     library_p -> resolve("hackrf_library_release");
+	if (hackrf_library_release == nullptr) {
+	   theErrorLogger -> add ("Hackrf",
+	                     "Could not find hackrf_library_release\n");
+	   return false;
+	}
+
+	this	-> hackrf_board_rev_read =
+	              (pfn_hackrf_board_rev_read)
+	                      library_p ->resolve ("hackrf_board_rev_read");
+	if (hackrf_board_rev_read == nullptr) {
+	   fprintf (stderr, "Could not find hackrf_board_rev_read\n");
+	   return false;
+	}
+
 
 	fprintf (stderr, "OK, functions seem to be loaded\n");
 	return true;

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

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

@@ -15,63 +15,46 @@
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_4">
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
 <item>
 <layout class="QVBoxLayout" name="verticalLayout">
 <item>
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>GackRF one</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
 <item>
- <widget class="QLabel" name="label_5">
+ <widget class="QLabel" name="usb_board_id_display">
 <property name="text">
- <string>Hackrf</string>
+ <string>id display</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Serial Number</string>
+ <widget class="QLCDNumber" name="revisionIndicator">
+ <property name="frameShape">
+ <enum>QFrame::Shape::NoFrame</enum>
 </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="serial_number_display">
- <property name="font">
- 
- <pointsize>11</pointsize>
- 
+ <property name="lineWidth">
+ <number>2</number>
 </property>
- <property name="text">
- <string/>
+ <property name="digitCount">
+ <number>2</number>
 </property>
 </widget>
 </item>
 </layout>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Library:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="versionDisplay">
- <property name="text">
- <string>versionDisplay</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="versionLabel">
+ <property name="text">
+ <string>version</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="releaseLabel">
+ <property name="text">
+ <string>release</string>
+ </property>
+ </widget>
 </item>
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -95,36 +78,47 @@
 </layout>
 </item>
 <item>
- <widget class="QSpinBox" name="ppm_correction">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Unfortunately, the hackrf API does not support ppm handling so ppm handling is done by - in software - adapting the channel frequencies&lt;/p&gt;&lt;p&gt;Since it takes time for the software to react on a change, make changes one step at the time and wait a while&lt;/p&gt;&lt;p&gt;(Note 1 ppm on 227360 KHz is 227 Hz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="minimum">
- <number>-100</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>ppm Correction</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>ppm</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="ppm_correction">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Unfortunately, the hackrf API does not support ppm handling so ppm handling is done by - in software - adapting the channel frequencies&lt;/p&gt;&lt;p&gt;Since it takes time for the software to react on a change, make changes one step at the time and wait a while&lt;/p&gt;&lt;p&gt;(Note 1 ppm on 227360 KHz is 227 Hz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>-100</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="samplerate_correction">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Experimental. My hackrf device shows a pretty large samplerate offset (clock offset on the spectrum display), app -36 for channel 12C, i.e. 227360 Khz. With this spinbox the samplerate can be altered. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
- <widget class="QSpinBox" name="samplerate_correction">
+ <widget class="QPushButton" name="dumpButton">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Experimental. My hackrf device shows a pretty large samplerate offset (clock offset on the spectrum display), app -36 for channel 12C, i.e. 227360 Khz. With this spinbox the samplerate can be altered. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the HackRF into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="usb_board_id_display">
 <property name="text">
- <string/>
+ <string>Dump</string>
 </property>
 </widget>
 </item>
@@ -210,21 +204,45 @@
 </layout>
 </item>
 <item>
- <widget class="QPushButton" name="dumpButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the HackRF into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>Dump</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Hackrf</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Serial Number</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="serial_number_display">
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler Added

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/common-readers.cpp Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/common-readers.h Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/extio-handler.cpp Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/extio-handler.h Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/extio-widget.ui Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/reader.h Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/virtual-reader.cpp Changed

qt-dab-6.10.tar.gz/sources/devices/obsolete-handlers/extio-handler/virtual-reader.h Changed

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

@@ -47,13 +47,13 @@
         return tmpstr;
 }
 //
-//	Nite that while Ubuntu 22 has the support libraries in the
+//	Note that while Ubuntu 22 has the support libraries in the
 //	repository, Fedora does NOT
 ///////////////////////////////////////////////////////////////////////////
 
-
 	plutoHandler::plutoHandler  (QSettings *s,
 	                             const QString &recorderVersion,
+	                             const QString &context,
 	                             errorLogger *theLogger):
 	                                  _I_Buffer (4 * 1024 * 1024) {
 	plutoSettings			= s;
@@ -98,6 +98,7 @@
 
 	rx_cfg. bw_hz			= 1536000;
 	rx_cfg. fs_hz			= PLUTO_RATE;
+	rateLabel	-> setText (QString::number (PLUTO_RATE));
 	rx_cfg. lo_hz			= 220000000;
 	rx_cfg. rfport			= "A_BALANCED";
 
@@ -131,8 +132,9 @@
 	}
 
 	if (ctx == nullptr) {
-	   ctx = iio_create_network_context ("pluto.local");
-	   contextName	-> setText ("pluto.local");
+//	   ctx = iio_create_network_context ("pluto.local");
+	   ctx = iio_create_network_context (context. toLatin1 (). data ());
+	   contextName	-> setText (context);
 	}
 
 	if (ctx == nullptr) {
@@ -232,7 +234,7 @@
         }
         convIndex       = 0;
 	running. store (false);
-	int enabled;
+	int enabled	= 0;
 //
 //	go for the filter
 	ad9361_get_trx_fir_enable (get_ad9361_phy (ctx), &enabled);

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

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

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>290</width>
- <height>248</height>
+ <width>300</width>
+ <height>238</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -53,25 +53,64 @@
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="contextName">
- <property name="text">
- <string>context name</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="name_of_device">
- <property name="text">
- <string>device name: AD9361</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="statusLabel">
- <property name="text">
- <string>statuslabel</string>
- </property>
- </widget>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>contextname</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="contextName">
+ <property name="text">
+ <string>context name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QLabel" name="name_of_device">
+ <property name="text">
+ <string> AD9361</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>statuslabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QLabel" name="statusLabel">
+ <property name="text">
+ <string>statuslabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>samplerate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="2">
+ <widget class="QLabel" name="rateLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout">

qt-dab-6.10.tar.gz/sources/devices/riff-writer.cpp Added

@@ -0,0 +1,226 @@
+#
+/*
+ * Copyright (C) 2014 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+//
+//	The RIFF writer writes the input samples into a "wav" file
+//	with the samplerate of SAMPLERATE (2048000), as 16 bit int's,
+//	and a "chunk" (chunk Id "freq") is added that contains the frequency
+//
+//	The BW64 format is derived from
+//	"Recommendation ITU-R BS.2088-1 (10/2019)
+//	Long-form file format for the international
+//	exchange of audio programme materials with metadata"
+
+#include	"riff-writer.h"
+
+static
+const char	* riff	= "RIFF";
+static
+const char	* junk	= "JUNK";
+static
+const char	* bw64	= "BW64";
+static
+const char	* ds64	= "ds64";
+static
+const char	* wave	= "WAVE";
+static
+const char	* fmt	= "fmt ";
+static
+const char	* aux1	= "freq";
+static
+const char	* aux2	= "bits";
+static
+const char	* aux3	= "sys ";
+static
+const char	* data	= "data";
+
+	riffWriter::riffWriter	() {
+	isValid = false;
+}
+
+	riffWriter::~riffWriter	() {}
+//
+//	The riffWriter is used for 
+//	- dumping the source input, i.e. large file with samplerate 2049000
+//	- writing the audio output out
+//	The default values in the init are merely for the source dump
+bool	riffWriter::init	(const QString &fileName, const int sampleRate, 
+	 const int frequency, const int bitDepth,
+	 QString creatorText) {
+	isValid			= false;
+	filePointer		= fopen (fileName. toUtf8 (). data (), "wb");
+	if (filePointer == nullptr)
+	 return false;
+
+	fwrite (riff, 1, 4, filePointer);
+
+//	the ultimate filesize is written at location 4
+	fseek (filePointer, 4, SEEK_CUR);
+
+//	The default header:
+	locationCounter		= 8;
+	fwrite (wave, 1, 4, filePointer);
+	locationCounter		+= 4;
+//
+//	junk block
+	fwrite (junk, 1, 4, filePointer);
+	locationCounter		+= 4;
+	uint32_t junkSize	= 32;
+	fwrite (&junkSize, 1, 4, filePointer);
+	locationCounter		+= 4;
+	char junkNix 32	= {0};
+	fwrite (&junkNix, 1, 32, filePointer);
+	locationCounter		+= 32;
+
+	fwrite (fmt, 1, 4, filePointer);
+	locationCounter		+= 4;
+	uint32_t fmtSize	= 16;
+	fwrite (&fmtSize, 1, 4, filePointer);
+	locationCounter		+= 4;
+	uint16_t	formatTag	= 01;
+	fwrite (&formatTag, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+	uint16_t	nrChannels	= 2;
+	fwrite (&nrChannels, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+	uint32_t	samplingRate	= sampleRate;
+	fwrite (&samplingRate, 1, sizeof (uint32_t), filePointer);
+	locationCounter		+= 4;
+	uint32_t	bytesperSecond	= 4 * samplingRate;
+	fwrite (&bytesperSecond, 1, sizeof (uint32_t), filePointer);
+	locationCounter		+= 4;
+	uint16_t	bytesperBlock	= 4;
+	fwrite (&bytesperBlock, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+	uint16_t bitsperSample		= 16;
+	fwrite (&bitsperSample, 1, sizeof (uint16_t), filePointer);
+	locationCounter		+= 2;
+//
+//	the "freq" chunk
+	if (frequency > 0) {
+	 fwrite (aux1, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 int freqLen		= sizeof (int32_t);
+	 fwrite (&freqLen, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 fwrite (&frequency, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	}
+//
+//	the "bitdepth" chunk
+	if (bitDepth > 0) {
+	 fwrite (aux2, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 int bitDepthLen	= 4;
+	 fwrite (&bitDepthLen, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 fwrite (&bitDepth, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	}
+//	the "creator" chunk
+	if (bitDepth > 0) {
+	 fwrite (aux3, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 int size = strlen (creatorText. toLatin1 (). data ());
+	 locationCounter	+= 4;
+	 fwrite (&size, 1, 4, filePointer);
+	 locationCounter	+= 4;
+	 fwrite (creatorText. toLatin1 (). data (), 1, size, filePointer);
+	 locationCounter	+= size;
+	}
+//
+//	start of the "data" chunk
+	fwrite (data, 1, 4, filePointer);
+	locationCounter		+= 4;
+
+	nrElements	= 0;
+	isValid		= true;
+	return true;
+}
+
+void	riffWriter::close	() {
+	if (!isValid)
+	 return;
+	isValid		= false;
+	uint64_t nrBytes	= nrElements * 2 * sizeof (int16_t);
+
+	fprintf (stderr, "nrBytes = %ld\n", nrBytes);
+//	reset the fp to the location where the nr bytes in the
+//	data chunk should be written
+	fseek (filePointer, 0, SEEK_SET);
+	if (nrBytes < (uint64_t)0xFFFFFFFF) {
+//	 fwrite (bw64, 1, 4, filePointer);
+	 fseek (filePointer, locationCounter, SEEK_SET);
+	 fwrite (&nrBytes, 1, 4, filePointer);
+//
+//	compute the number if of to be recorded in the RIFF count
+	 fseek (filePointer, 0, SEEK_END);
+	 int riffSize	= ftell (filePointer) - 8;
+//
+//	and record the value at loc 4
+	 fseek (filePointer, 4, SEEK_SET);
+	 fwrite (&riffSize, 1, 4, filePointer);
+	 fseek (filePointer, 0, SEEK_END);
+	 fclose (filePointer);
+	 return;
+	}
+//	a large file, make it BW64
+	fprintf (stderr, "LARGE FILE\n");
+	uint32_t minusOne = 0xFFFFFFFF;
+	fwrite (bw64, 1, 4, filePointer);
+	fwrite (&minusOne, 1, 4, filePointer);
+	fseek (filePointer, locationCounter, SEEK_SET);
+	fwrite (&minusOne, 1, 4, filePointer);
+//	compute the number if of to be recorded in the RIFF count
+	fseek (filePointer, 0, SEEK_END);
+	uint64_t riffSize	= ftell (filePointer) - 8;
+//	just fill the ds64 struct
+	fseek (filePointer, 12, SEEK_SET);
+	fwrite (ds64, 1, 4, filePointer);
+	fseek (filePointer, 20, SEEK_SET);

qt-dab-6.10.tar.gz/sources/devices/riff-writer.h Added

@@ -0,0 +1,52 @@
+#
+/*
+ * Copyright (C) 2016 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+//
+//	This version of riffWriter starts assuming the filesize will remain
+//	below 4 G, if - when closing - it turns out the the file size exceeds
+//	the 4G border, the type is changed into BW64
+
+#pragma once
+
+#include	<QString>
+#include	<stdio.h>
+#include	<stdint.h>
+
+class riffWriter {
+public:
+		riffWriter	();
+		~riffWriter	();
+	bool	init		(const QString &, int,
+	 int bitDepth	= 0,
+	 int frequency	= 0,
+	 QString creator = "Qt-DAB-6.9.6");
+	void	write		(int16_t *buff, uint64_t samples);
+	void	close		();
+	bool	isActive	();
+private:
+	FILE		*filePointer;
+	uint64_t	nrElements;
+	std::fpos_t	dataPos;
+	bool		isValid;
+	uint64_t	locationCounter;
+};
+

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

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>214</width>
- <height>310</height>
+ <width>206</width>
+ <height>373</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -93,7 +93,7 @@
 </widget>
 </item>
 <item>
- <widget class="QDoubleSpinBox" name="PpmSelector">
+ <widget class="QDoubleSpinBox" name="ppmSelector">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ppm control. Tells the device the offset (in ppm) of the observed oscillator offset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
@@ -111,62 +111,97 @@
 </layout>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <widget class="QCheckBox" name="biasTSelector">
+ <property name="text">
+ <string>biasT</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
 <item>
- <widget class="QCheckBox" name="biasTSelector">
+ <widget class="QLabel" name="gainLabel">
 <property name="text">
- <string>biasT</string>
+ <string>IF Gain</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QCheckBox" name="agcSelector">
- <property name="text">
- <string>agc</string>
+ <widget class="QSpinBox" name="gainSelector">
+ <property name="suffix">
+ <string> dB</string>
+ </property>
+ <property name="maximum">
+ <number>99</number>
 </property>
 </widget>
 </item>
 </layout>
 </item>
 <item>
- <widget class="QPushButton" name="xml_dumpButton">
- <property name="text">
- <string>PushButton</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
 <item>
- <widget class="QSpinBox" name="gainSelector">
- <property name="suffix">
- <string> dB</string>
+ <widget class="QLabel" name="agcLabel">
+ <property name="text">
+ <string>AGC</string>
 </property>
- <property name="maximum">
- <number>999</number>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="hw_agc">
+ <property name="text">
+ <string>hw</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="gainLabel">
+ <widget class="QRadioButton" name="sw_agc">
+ <property name="text">
+ <string>sw</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="agc_off">
 <property name="text">
- <string>Gain</string>
+ <string>off</string>
 </property>
 </widget>
 </item>
 </layout>
 </item>
 <item>
- <widget class="QLabel" name="tunerLabel">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QLabel" name="tunerLabel">
+ <property name="text">
+ <string>Tuner</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="theState">
 <property name="text">
- <string>rtl_tcp_client</string>
+ <string/>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="theState">
+ <widget class="QPushButton" name="xml_dumpButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the dabstick into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
- <string/>
+ <string>Dump to xml file</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Qt-DAB: rtl_tcp client</string>
 </property>
 </widget>
 </item>

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

@@ -65,9 +65,10 @@
 myFrame. show ();
 
 	for (int i = 0; i < 256; i ++)
-	 convTable i = ((float)i - 128.0) / 128.0;
+	 convTable i = ((float)i - 127.38) / 128.0;
 
 	ipAddress		= "127.0.0.1";	// the default
+	addressSelector		-> setInputMask ("000.000.000.000");
 
 	Gain		=
 	 value_i (remoteSettings, RTL_TCP_SETTINGS, "Gain", 20);
@@ -75,16 +76,25 @@
 	 value_f (remoteSettings, RTL_TCP_SETTINGS, "Ppm", 0);
 	biasT		=
 	 value_f (remoteSettings, RTL_TCP_SETTINGS, "biasT", 0);
-	AgcMode		=
+	agcMode		=
 	 value_i (remoteSettings, RTL_TCP_SETTINGS, "AgcMode", 0);
 	basePort 	=
 	 value_i (remoteSettings, RTL_TCP_SETTINGS, "basePort", 1234);
 	ipAddress	=
 	 value_s (remoteSettings, RTL_TCP_SETTINGS, "remoteserver", ipAddress);
 
+	
 	gainSelector	-> setValue (Gain);
-	PpmSelector	-> setValue (Ppm);
-	agcSelector	-> setChecked (AgcMode);
+	ppmSelector	-> setValue (Ppm);
+	if (agcMode == 0) 
+ hw_agc -> setChecked (true);
+ else
+	if (agcMode == 1)
+	 agc_off	-> setChecked (true);
+	else
+ if (agcMode == 2)
+ sw_agc -> setChecked (true);
+
 	portSelector	-> setValue (basePort);
 	addressSelector	-> setText (ipAddress);
 	vfoFrequency	= DEFAULT_FREQUENCY;
@@ -94,19 +104,11 @@
 	 this, &rtl_tcp_client::wantConnect);
 	connect (tcp_disconnect, &QPushButton::clicked,
 	 this, &rtl_tcp_client::setDisconnect);
-	connect (gainSelector, qOverload<int>(&QSpinBox::valueChanged),
-	 this, &rtl_tcp_client::sendGain);
-	connect (PpmSelector, qOverload<double>(&QDoubleSpinBox::valueChanged),
+	connect (ppmSelector, qOverload<double>(&QDoubleSpinBox::valueChanged),
 	 this, &rtl_tcp_client::set_fCorrection);
 	connect (xml_dumpButton, &QPushButton::clicked,
 	 this, &rtl_tcp_client::set_xmlDump);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-	connect (agcSelector, &QCheckBox::checkStateChanged,
-#else
-	connect (agcSelector, &QCheckBox::stateChanged,
-#endif
-	 this, &rtl_tcp_client::setAgcMode);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (biasTSelector, &QCheckBox::checkStateChanged,
 #else
 	connect (biasTSelector, &QCheckBox::stateChanged,
@@ -116,6 +118,14 @@
 	 this, &rtl_tcp_client::setPort);
 	connect (addressSelector, &QLineEdit::returnPressed,
 	 this, &rtl_tcp_client::setAddress);
+	connect (gainSelector, qOverload<int>(&QSpinBox::valueChanged),
+	 this, &rtl_tcp_client::sendGain);
+	connect (hw_agc, &QRadioButton::clicked,
+	 this, &rtl_tcp_client::set_agc_hw);
+	connect (sw_agc, SIGNAL (clicked()),
+	 this, SLOT (set_agc_sw ()));
+	connect (agc_off, SIGNAL (clicked ()),
+	 this, SLOT (set_agc_off ()));
 
 	xml_dumping. store (false);
 	theState	-> setText("waiting to start");
@@ -127,13 +137,13 @@
 	storeWidgetPosition (remoteSettings, &myFrame, RTL_TCP_SETTINGS);
 
 	stopReader ();
-	store (remoteSettings, RTL_TCP_SETTINGS, "remoteserver",
-	 toServer. peerAddress (). toString ());
-	store (remoteSettings, RTL_TCP_SETTINGS, "basePort", basePort);
+//	store (remoteSettings, RTL_TCP_SETTINGS, "remoteserver",
+//	 toServer. peerAddress (). toString ());
+//	store (remoteSettings, RTL_TCP_SETTINGS, "basePort", basePort);
 	store (remoteSettings, RTL_TCP_SETTINGS, "Gain", Gain);
 	store (remoteSettings, RTL_TCP_SETTINGS, "Ppm", Ppm);
-	store (remoteSettings, RTL_TCP_SETTINGS, "AgcMode", AgcMode);
-	store (remoteSettings, RTL_TCP_SETTINGS, "biasT", biasT);
+//	store (remoteSettings, RTL_TCP_SETTINGS, "AgcMode", AgcMode);
+//	store (remoteSettings, RTL_TCP_SETTINGS, "biasT", biasT);
 	toServer. close ();
 	connected = false;
 	myFrame. hide ();
@@ -145,25 +155,29 @@
 	 setDisconnect ();
 	}
 
-	QString s = ipAddress;
-	toServer. connectToHost (QHostAddress (s), basePort);
-	if (!toServer.waitForConnected(2000)) {
-	 QMessageBox::warning(&myFrame,
-	 tr("sdr"), tr("connection failed\n"));
-	 QString t = "Connection to " + s + "failed";
+	ipAddress = addressSelector -> text ();
+	if (ipAddress == "")
+	 return;
+	toServer. connectToHost (QHostAddress (ipAddress), basePort);
+	if (!toServer.waitForConnected (2000)) {
+	 QMessageBox::warning (&myFrame,
+	 tr("sdr"), tr("connection failed\n"));
+	 QString t = "Connection to " + ipAddress + "failed";
 	 theErrorLogger -> add ("RTL_TCP", t);
 	 return;
 	}
 
+	store (remoteSettings, RTL_TCP_SETTINGS, "remoteserver", ipAddress);
 	connected	= true;
 	theState -> setText ("connected");
 	sendRate	(SAMPLERATE);
-	setAgcMode	(AgcMode);
+	setAgcMode	(agcMode);
 	set_fCorrection (Ppm);
 	setBandwidth	(1536000);
 	setBiasT	(biasT);
 	toServer. waitForBytesWritten ();
 	dongleInfoIn	= false;
+	dongleInfoIn	= true;
 }
 
 bool	rtl_tcp_client::restartReader (int32_t freq, int skipped) {
@@ -172,9 +186,11 @@
 	vfoFrequency = freq;
 	this -> toSkip = skipped;
 //	here the command to set the frequency
-	sendVFO (freq);
 	connect (&toServer, &QIODevice::readyRead,
 	 this, &rtl_tcp_client::readData);
+	setBandwidth (1536000);
+	setAgcMode (agcMode);
+	sendVFO (freq);
 	return true;
 }
 
@@ -241,17 +257,17 @@
 	 break;
 	 }
 	 tunerLabel -> setText (tunerText);
-	 fprintf (stderr, "gainType %X\n", dongleInfo. tunerGainCount);
 	 }
 	 }
 	}
 
+	dongleInfoIn = true;
 	if (dongleInfoIn) {
 	 if (xml_dumping. load ())
 	 xmlWriter -> add ((std::complex<uint8_t> *)buffer, SEGMENT_SIZE);
 
 	 while (toServer. bytesAvailable() > 2 * SEGMENT_SIZE) {
-	 toServer. read ((char *)buffer, SEGMENT_SIZE);
+	 toServer. read ((char *)buffer, 2 * SEGMENT_SIZE);
 	 for (int i = 0; i < SEGMENT_SIZE; i ++)
 	 localBuffer i =
 	 std::complex<float> (convTable buffer 2 * i,
@@ -294,11 +310,27 @@
 	sendCommand (0x02, rate);
 }
 
-void	rtl_tcp_client::setAgcMode (int agc) {
-	(void)agc;
-	bool b	= agcSelector -> isChecked ();
-	sendCommand (0x03, b);
+void	rtl_tcp_client::setAgcMode (uint8_t agc) {
+	agcMode	= agc;
+	store (remoteSettings, RTL_TCP_SETTINGS, "AgcMode", agcMode);
+	if (agc == 0)
+	 hw_agc	-> setChecked (true);
+	else
+	if (agc == 1)
+	 agc_off	-> setChecked (true);
+	else
+	if (agc == 2)
+	 sw_agc	-> setChecked (true);
+	sendCommand (0x08, agc == 0);
+	sendCommand (0x03, agc);
+	if (agc == 1) {
+	 Gain = gainSelector -> value ();
+	 sendCommand (0x04, 10 * Gain);
+	}
+	gainSelector	-> setEnabled (agc == 1);
+	gainLabel	-> setEnabled (agc == 1);
 }
+
 void	rtl_tcp_client::sendGain (int gain) {
 	Gain	= gain;
 	sendCommand (0x04, 10 * gain);
@@ -313,6 +345,7 @@

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

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler Added

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtl-dongleselect.cpp Changed

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtl-dongleselect.h Added

@@ -0,0 +1,49 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#
+#pragma once
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<cstdint>
+
+class	rtl_dongleSelect: public QDialog {
+Q_OBJECT
+public:
+			rtl_dongleSelect();
+			~rtl_dongleSelect();
+	void		addtoDongleList		(const char *);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel	dongleList;
+	QStringList	Dongles;
+	int16_t		selectedItem;
+private slots:
+	void		selectDongle	(QModelIndex);
+};
+
+

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtl-sdr.h Changed

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtl-sdr_export.h Changed

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtlsdr-handler.cpp Added

@@ -0,0 +1,938 @@
+#
+/*
+ * Copyright (C) 2014 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-SDR; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	This particular driver is a very simple wrapper around the
+ * 	librtlsdr. In order to keep things simple, we dynamically
+ * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
+ * 	are greatly acknowledged
+ */
+
+#include	<QThread>
+#include	"dab-constants.h"
+#include	"rtlsdr-handler.h"
+#include	"position-handler.h"
+#include	"rtl-dongleselect.h"
+#include	"rtl-sdr.h"
+#include	"device-exceptions.h"
+#include	"errorlog.h"
+#include	"settings-handler.h"
+
+#define	READLEN_DEFAULT	(4 * 8192)
+
+//
+//	For the callback, we do need some environment which
+//	is passed through the ctx parameter
+//
+//	This is the user-side call back function
+//	ctx is the calling task
+
+static
+void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
+rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
+
+	if ((theStick == nullptr) || (len != READLEN_DEFAULT)) {
+	 fprintf (stderr, "%d \n", len);
+	 return;
+	}
+
+	if (!theStick -> isActive. load ())
+	 return;
+	static_cast<rtlsdrHandler *>(ctx) -> processBuffer (buf, len);
+}
+//
+//	for handling the events in libusb, we need a controlthread
+//	whose sole purpose is to process the rtlsdr_read_async function
+//	from the lib.
+class	dll_driver: public QThread {
+private:
+	rtlsdrHandler	*theStick;
+public:
+
+	dll_driver (rtlsdrHandler *d) {
+	theStick	= d;
+	start		();
+}
+
+	~dll_driver	() {
+}
+
+private:
+void	run () {
+	theStick -> rtlsdr_read_async (theStick -> theDevice,
+	 (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
+	 (void *)theStick,
+	 0,
+	 READLEN_DEFAULT);
+//	fprintf (stderr, "dll_task terminates\n");
+	}
+};
+
+//
+//	The driver, a - reasonably simple - class is used for 
+//	both windows and linux. For Windows even two versions.
+//	The driver is therefore parameterized on the library
+//	it uses. The instantiator "knows" (we hope) the library
+//	to be used.
+//
+	rtlsdrHandler::rtlsdrHandler (QSettings *s,
+	 const QString libraryString,
+	 int theVersion,
+	 const QString &recorderVersion,
+	 errorLogger	*theLogger):
+	 _I_Buffer (8 * 1024 * 1024) {
+int16_t	deviceCount;
+int32_t	r;
+int16_t	deviceIndex;
+QString	temp;
+int	k;
+char	manufac 256, product 256, serial 256;
+
+	rtlsdrSettings			= s;
+	this	-> libraryString	= libraryString;
+	storageName			= QString ("rtlsdrSettings-V") +
+	 QString::number(theVersion);
+	this	-> recorderVersion	= recorderVersion;
+	this	-> theErrorLogger	= theLogger;
+	setupUi (&myFrame);
+//	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
+	myFrame. show ();
+	isActive. store (false);
+	previousGain		= 0;
+	phandle = new QLibrary (libraryString);
+	phandle -> load ();
+
+	if (!phandle -> isLoaded ()) {
+	 throw (device_exception (std::string ("failed to open ") + libraryString. toStdString ()));
+	}
+
+	if (!load_rtlFunctions ()) {
+	 delete (phandle);
+	 throw (device_exception ("could not load one or more essential library functions"));
+	}
+
+//	Ok, from here we have the library functions accessible
+	deviceCount 		= this -> rtlsdr_get_device_count ();
+	if (deviceCount == 0) {
+	 delete (phandle);
+	 throw (device_exception ("No rtlsdr device found"));
+	}
+
+	deviceIndex = 0;	// default
+	if (deviceCount > 1) {
+	 rtl_dongleSelect dongleSelector;
+	 for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
+	 dongleSelector.
+	 addtoDongleList (rtlsdr_get_device_name (deviceIndex));
+	 }
+	 deviceIndex = dongleSelector. QDialog::exec();
+	}
+//
+	if (rtlsdr_get_tuner_i2c_register == nullptr) {
+	 gainLabelText	-> hide ();
+	 tunerGainLabel	-> hide ();
+	}
+ 
+//	OK, now open the hardware
+	r		= this -> rtlsdr_open (&theDevice, deviceIndex);
+	if (r < 0) {
+	 delete phandle;
+	 throw (device_exception ("Opening rtlsdr device failed"));
+	}
+
+	if (rtlsdr_get_version != nullptr) {
+ uint32_t V = rtlsdr_get_version ();
+ uint16_t major = V >> 24;
+ uint16_t minor = (V & 0XFF0000) >> 16;
+ uint8_t micro = (V & 0xFF00) >> 8;
+ uint8_t nano = (V & 0XFF);
+	 libVersion -> setText (QString ("Library ") +
+	 QString::number (major) +
+ ":" + QString::number (minor) +
+ "-" + QString::number (micro) +
+ ":" + QString::number (nano) +
+	 ":" + libraryString);
+ }
+ else
+	 libVersion	-> setText (libraryString);
+
+	r = rtlsdr_set_sample_rate (theDevice, SAMPLERATE);
+	if (r < 0) {
+	 delete phandle;
+	 throw (device_exception ("Setting samplerate for rtlsdr failed"));
+	}
+
+	gainsCount = rtlsdr_get_tuner_gains (theDevice, nullptr);
+	fprintf (stderr, "Supported gain values (%d): ", gainsCount);
+	{ int gains gainsCount;
+	 gainsCount	= rtlsdr_get_tuner_gains (theDevice, gains);
+	 for (int i = gainsCount; i > 0; i--) {
+	 fprintf (stderr, "%.1f ", gains i - 1 / 10.0);
+	 gainControl -> addItem (QString::number (gains i - 1));
+	 }
+	 fprintf (stderr, "\n");
+	}
+
+	QString tunerType	= get_tunerType (rtlsdr_get_tuner_type (theDevice));
+	deviceModel	= rtlsdr_get_device_name (deviceIndex);
+	deviceVersion	-> setText (deviceModel);
+	product_display	-> setText (tunerType);
+
+	int currentBandWidth	=

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtlsdr-handler.h Added

@@ -0,0 +1,197 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ *
+ * Many of the ideas as implemented in Qt-DAB are derived from
+ * other work, made available through the GNU general Public License. 
+ * All copyrights of the original authors are recognized.
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#pragma once
+
+#include	<QObject>
+#include	<QSettings>
+#include	<QString>
+#include	<cstdio>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"device-handler.h"
+#include	"ringbuffer.h"
+#include	"ui_rtlsdr-widget.h"
+#include	<QLibrary>
+#include	<QScopedPointer>
+#include "xml-filewriter.h"
+
+class	errorLogger;
+class	dll_driver;
+//
+//	create typedefs for the library functions
+typedef	struct rtlsdr_dev rtlsdr_dev_t;
+extern "C" {
+typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
+typedef int (* pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
+typedef	int (* pfnrtlsdr_close) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
+typedef	int (* pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
+typedef	int (* pfnrtlsdr_set_tuner_bandwidth) (rtlsdr_dev_t *, uint32_t);
+typedef uint32_t (* pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
+typedef	int (* pfnrtlsdr_get_tuner_type) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_agc_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
+typedef	int (* pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_read_async) (rtlsdr_dev_t *,
+	 rtlsdr_read_async_cb_t,
+	 void *,
+	 uint32_t,
+	 uint32_t);
+typedef	int (*	pfnrtlsdr_set_bias_tee) (rtlsdr_dev_t *, int);
+typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
+typedef uint32_t (* pfnrtlsdr_get_device_count)();
+typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_freq_correction_ppb)(rtlsdr_dev_t *, int);
+typedef	char *(* pfnrtlsdr_get_device_name)(int);
+typedef int (* pfnrtlsdr_get_tuner_i2c_register)
+	 (rtlsdr_dev_t *, uint8_t*, int *, int *);
+typedef	int (* pfnrtlsdr_get_version)();
+}
+//	This class is a simple wrapper around the
+//	rtlsdr library, the relevant functions of it
+//	are read in from the dll (or .so file in linux)
+
+class	rtlsdrHandler: 
+	 public deviceHandler, public Ui_dabstickWidget {
+Q_OBJECT
+public:
+			rtlsdrHandler	(QSettings *,
+	 const QString, int,
+	 	 const QString &,
+	 	 errorLogger *);
+			~rtlsdrHandler	();
+	bool		restartReader	(int32_t, int skipped = 0);
+	void		stopReader	();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples		();
+	void		resetBuffer	();
+	int16_t		maxGain		();
+	int16_t		bitDepth	();
+	QString		deviceName	();
+
+	void		startDump	();
+	void		stopDump	();
+
+//	These need to be visible for the separate usb handling thread
+	pfnrtlsdr_read_async	rtlsdr_read_async;
+	struct rtlsdr_dev	*theDevice;
+	std::atomic<bool>	isActive;
+
+	void		processBuffer	(uint8_t *, uint32_t);
+private:
+	RingBuffer<std::complex<float>> _I_Buffer;
+	QSettings	*rtlsdrSettings;
+	errorLogger	*theErrorLogger;
+	int32_t		inputRate;
+	QString		libraryString;
+	int32_t		deviceCount;
+	QLibrary*	phandle;
+	dll_driver	*workerHandle;
+	int32_t		lastFrequency;
+	int16_t		gainsCount;
+	QString		deviceModel;
+	QString		recorderVersion;
+ xml_fileWriter	*xmlWriter;
+ bool setup_xmlDump		(bool);
+ void close_xmlDump		();
+ std::atomic<bool> xml_dumping;
+	FILE		*iqDumper;
+ bool setup_iqDump		();
+ void close_iqDump		();
+ std::atomic<bool> iq_dumping;
+	void		record_gainSettings	(int);
+	void		update_gainSettings	(int);
+	bool		save_gainSettings;
+
+	bool		previousGain;
+	QString		storageName;
+	QString		get_tunerType		(int);
+	bool		filtering;
+
+	void		set_off_agc		();
+	void		set_hw_agc		();
+	void		set_sw_agc		();
+	void		init_autogain		(int);
+
+	float		convTable	256;	// for int8 -> float
+	void		reportOverflow		(bool);
+	void		reportGain		();
+	float		m_dcI;
+	float		m_dcQ;
+//	here we need to load functions from the dll
+	bool		load_rtlFunctions	();
+	pfnrtlsdr_open	rtlsdr_open;
+	pfnrtlsdr_close	rtlsdr_close;
+	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
+
+	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
+	pfnrtlsdr_set_tuner_bandwidth rtlsdr_set_tuner_bandwidth;
+	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
+	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
+	pfnrtlsdr_get_tuner_type rtlsdr_get_tuner_type;
+	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
+	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
+	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
+	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
+	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
+	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
+	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
+	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
+	pfnrtlsdr_set_bias_tee rtlsdr_set_bias_tee;
+	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
+	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
+	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_set_freq_correction_ppb rtlsdr_set_freq_correction_ppb;
+	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+	pfnrtlsdr_get_tuner_i2c_register rtlsdr_get_tuner_i2c_register;
+	pfnrtlsdr_get_version rtlsdr_get_version;
+	
+signals:
+	void		new_gainIndex		(int);
+	void		new_agcSetting		(bool);
+
+	void		tickSignal		(bool);
+public slots:
+	void		handle_tickSignal	(bool);
+private slots:
+	void		set_ExternalGain	(const QString &);
+	void		set_autogain		(int);
+	void		set_ppmCorrection	(double);
+	void		set_xmlDump		();
+	void		set_iqDump		();
+	void		set_biasControl		(int);
+	void		set_bandWidth		(int);
+};
+
+

qt-dab-6.10.tar.gz/sources/devices/rtlsdr-handler/rtlsdr-widget.ui Added

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabstickWidget</class>
+ <widget class="QWidget" name="dabstickWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>281</width>
+ <height>560</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>RT2832 dabstick</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="tunedFrequency">
+ <property name="frameShape">
+ <enum>QFrame::Shape::Panel</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="gainLabelText">
+ <property name="text">
+ <string>gain</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="gainControl">
+ <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;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>actual gain</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="tunerGainLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>AGC</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="agc_hw">
+ <property name="text">
+ <string>HW</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="agc_sw">
+ <property name="text">
+ <string>SW</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="agc_off">
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QCheckBox" name="biasControl">
+ <property name="text">
+ <string>biasT</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>ppm</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="ppm_correction"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>bandwidth (kHz)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="bandwidth_selector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;bandwidth_selector&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>1500</number>
+ </property>
+ <property name="maximum">
+ <number>2200</number>
+ </property>
+ <property name="singleStep">
+ <number>10</number>
+ </property>
+ <property name="value">
+ <number>1750</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Dump </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="xml_dumpButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>xml</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="iq_dumpButton">
+ <property name="text">
+ <string>raw </string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="overflowLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="product_display">
+ <property name="frameShape">
+ <enum>QFrame::Shape::Box</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.cpp -> qt-dab-6.10.tar.gz/sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.cpp Changed

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

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

@@ -472,6 +472,7 @@
 bool	sdrplayHandler_v3::setupXmlDump (bool direct) {
 QString channel		= value_s (sdrplaySettings, DAB_GENERAL,
 	                                               "channel", "xx");
+	fprintf (stderr, "Direct = %d\n", direct);
 	xmlWriter	= nullptr;
 	try {
 	   xmlWriter	= new xml_fileWriter (sdrplaySettings,
@@ -682,9 +683,6 @@
 	}
 
 	chosenDevice	= &devs deviceIndex;
-	fprintf (stderr, "We get from the API: tuner %d, Mode %d\n",
-	                       (int)(chosenDevice -> tuner),
-	                       (int)(chosenDevice -> rspDuoMode));
 	chosenDevice	-> tuner  = sdrplay_api_Tuner_A;
 	chosenDevice	-> rspDuoMode = sdrplay_api_RspDuoMode_Single_Tuner;
 	err	= sdrplay_api_SelectDevice (chosenDevice);
@@ -707,7 +705,7 @@
 	hwVersion	= devs deviceIndex. hwVer;
 //
 	try {
-	   int antennaValue;
+	   int antennaValue	= 'A';
 	   int	lnaBounds;
 	   bool	notch	= value_i (sdrplaySettings, SDRPLAY_SETTINGS,
 	                                          SDRPLAY_NOTCH, 0) != 0;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/xml-filewriter.cpp -> qt-dab-6.10.tar.gz/sources/devices/xml-filewriter.cpp Changed

@@ -29,11 +29,6 @@
 	uint8_t byte_2;
 };
 
-static inline
-bool	isValid (QChar c) {
-	return c. isLetterOrNumber () || (c == '-') || (c == '/');
-}
-
 	xml_fileWriter::xml_fileWriter	(QSettings *settings,
 	 const QString &channel,
 	 int nrBits,
@@ -45,7 +40,7 @@
 const QString &deviceModel,
 const QString &recorderVersion,
 	 bool direct):
-	 filenameFinder (settings) {
+	 filenameFinder (settings) {
 uint8_t t	= 0;
 	QString fileName	=
 	 filenameFinder. find_xmlName (deviceName, channel, direct);
@@ -55,6 +50,10 @@
 	xmlFile		= fopen (fileName. toUtf8 (). data (), "w+b");
 	if (xmlFile == nullptr)
 	 throw (21);
+
+	bufferP_int16		= 0;
+	bufferP_uint8		= 0;
+	bufferP_int8		= 0;
 //	fprintf (stderr, "file is open\n");
 	this	-> nrBits	= nrBits;
 	this	-> container	= container;
@@ -99,7 +98,6 @@
 
 #define	BLOCK_SIZE	8192
 static int16_t buffer_int16 BLOCK_SIZE;
-static int bufferP_int16	= 0;
 void	xml_fileWriter::add	(std::complex<int16_t> * data, int count) {
 //	nrElements	+= 2 * count;
 //	fprintf (stderr, "count %d\n", count);
@@ -115,7 +113,6 @@
 }
 
 static uint8_t buffer_uint8 BLOCK_SIZE;
-static int bufferP_uint8	= 0;
 void	xml_fileWriter::add	(std::complex<uint8_t> * data, int count) {
 //	nrElements	+= 2 * count;
 	for (int i = 0; i < count; i ++) {
@@ -130,7 +127,6 @@
 }
 
 static int8_t buffer_int8 BLOCK_SIZE;
-static int bufferP_int8	= 0;
 void	xml_fileWriter::add	(std::complex<int8_t> * data, int count) {
 //	nrElements	+= 2 * count;
 	for (int i = 0; i < count; i ++) {

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/xml-filewriter.h -> qt-dab-6.10.tar.gz/sources/devices/xml-filewriter.h Changed

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

@@ -69,8 +69,8 @@
 //	again the last fib.
 //	In between there are more fib fields filled than CIFS
 //
-//	Since the odpprocessor (together with the decoder) takes quite an
-//	amount of cycles, the eti-generation is done in a different thread
+//	The odpprocessor (together with the decoder) takes quite an
+//	amount of cycles
 //	Note CIF counts from 0 .. 3
 //
 		etiGenerator::etiGenerator	(uint8_t dabMode,
@@ -98,10 +98,10 @@
 //	we probably need "reset" when handling a change in configuration
 //
 void	etiGenerator::reset	() {
-	for (int i = 0; i < descrambler. size (); i ++)
+	for (uint32_t i = 0; i < descrambler. size (); i ++)
 delete descrambler i;
 descrambler. resize (0);
- for (int i = 0; i < protTable. size (); i ++)
+ for (uint32_t i = 0; i < protTable. size (); i ++)
 delete protTable i;
 protTable. resize (0);
 
@@ -338,22 +338,22 @@
 	for (int i = 0; i < my_ficHandler -> nrChannels (); i ++) {
 	 channel_data data;
 	 my_ficHandler -> getChannelInfo (&data, i);
-	 parameter *t	= new parameter;
-	 t -> input	= input;
-	 t -> subChId	= data. id;
-	 t -> uepFlag	= data. uepFlag;
-	 t -> bitRate	= data. bitrate;
+	 parameter *t		= new parameter;
+	 t -> input		= input;
+	 t -> subChId		= data. id;
+	 t -> uepFlag		= data. uepFlag;
+	 t -> bitRate		= data. bitrate;
 	 t -> protLevel	= data. protlev;
 	 t -> start_cu	= data. start_cu;
 	 t -> size		= data. size;
-	 t -> output	= &output offset;
+	 t -> output		= &output offset;
 	 offset 		+= data. bitrate * 24 / 8;
 //
 //	We try to "reuse" the deconvolvers, i.e. if one
 //	already exists, we use it, otherwise we add a new one
 //	For the NPO with 8 services, we need 3 deconvolvers
 	 index	= -1;
-	 int key	= 0;
+	 uint32_t key	= 0;
 	 for (; key < protTable. size (); key ++) {
 	 int16_t bitRate, protLevel; bool uepFlag;
 	 protTable key -> getParameters (bitRate, protLevel, uepFlag);
@@ -442,10 +442,10 @@
 	if (etiFile != nullptr) {
 	 fclose (etiFile);
 	}
-	for (int i = 0; i < descrambler. size (); i ++)
+	for (uint32_t i = 0; i < descrambler. size (); i ++)
 delete descrambler i;
 descrambler. resize (0);
- for (int i = 0; i < protTable. size (); i ++)
+ for (uint32_t i = 0; i < protTable. size (); i ++)
 delete protTable i;
 protTable. resize (0);
 	etiFile	= nullptr;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/ensemble.cpp -> qt-dab-6.10.tar.gz/sources/frontend/fic-handling/ensemble.cpp Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/ensemble.h -> qt-dab-6.10.tar.gz/sources/frontend/fic-handling/ensemble.h Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/fib-decoder.cpp -> qt-dab-6.10.tar.gz/sources/frontend/fic-handling/fib-decoder.cpp Changed

@@ -16,6 +16,7 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
 *
+	
 * You should have received a copy of the GNU General Public License
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -172,10 +173,10 @@
 	 FIG0Extension10 (d);
 	 break;
 
-	 case 11:		// Reserved
+	 case 11:		// Obsolete
 	 break;
 
-	 case 12:		// Reserved
+	 case 12:		// Obsolete
 	 break;
 
 	 case 13: // user application information (6.3.6)
@@ -190,7 +191,7 @@
 	 FIG0Extension15 (d);
 	 break;
 
-	 case 16:		// Reserved
+	 case 16:		// Obsolete
 	 break;
 
 	 case 17:		// Program type (8.1.5)
@@ -213,7 +214,7 @@
 	 FIG0Extension21 (d);
 	 break;
 
-	 case 22:		// Reserved
+	 case 22:		// Obsolete
 	 break;
 
 	 case 23:		// Reserved
@@ -228,8 +229,8 @@
 	 case 26:		// OE announcement switching (8.1.6.4)
 	 break;		// not implemented
 
-	 case 27:		// Reserved
-	 case 28:		// Reserved
+	 case 27:		// Obsolete
+	 case 28:		// Obsolete
 	 case 29:		// Reserved
 	 case 30:		// Reserved
 	 case 31:		// Reserved
@@ -745,13 +746,13 @@
 //
 //	User Application Information 6.3.6
 void	fibDecoder::FIG0Extension13 (uint8_t *d) {
-int16_t	used	= 2;		// offset in bytes
-int16_t	Length		= getBits_5 (d, 3);
+int16_t	used			= 2;		// offset in bytes
+int16_t	length			= getBits_5 (d, 3);
 const uint8_t	CN_bit		= getBits_1 (d, 8 + 0);
 const uint8_t	OE_bit		= getBits_1 (d, 8 + 1);
 const uint8_t	PD_bit		= getBits_1 (d, 8 + 2);
 
-	while (used < Length) 
+	while (used < length) 
 	 used = HandleFIG0Extension13 (d, used, CN_bit, OE_bit, PD_bit);
 }
 //
@@ -763,22 +764,18 @@
 	 const uint8_t pdBit) {
 int16_t	bitOffset	= used * 8;
 uint32_t	SId	= getLBits (d, bitOffset, pdBit == 1 ? 32 : 16);
-uint16_t	SCIds;
-int16_t		NoApplications;
-int16_t		i;
 int16_t		appType;
 fibConfig	*localBase	= CN_bit == 0 ? currentConfig : nextConfig;
-
 fibConfig::AppType element;
-	(void)OE_bit;
-	bitOffset	+= pdBit == 1 ? 32 : 16;
-	SCIds		= getBits_4 (d, bitOffset);
-	NoApplications	= getBits_4 (d, bitOffset + 4);
-	bitOffset	+= 8;
-	element. SId	= SId;
-	element. SCIds	= SCIds;
 
-	for (i = 0; i < NoApplications; i ++) {
+	(void)OE_bit;
+	bitOffset		+= pdBit == 1 ? 32 : 16;
+	uint16_t SCIds		= getBits_4 (d, bitOffset);
+	int16_t NoApplications	= getBits_4 (d, bitOffset + 4);
+	bitOffset		+= 8;
+	element. SId		= SId;
+	element. SCIds		= SCIds;
+	for (int i = 0; i < NoApplications; i ++) {
 	 appType		= getBits (d, bitOffset, 11);
 	 int16_t length	= getBits_5 (d, bitOffset + 11);
 	 element. Apptype	= appType;
@@ -1433,11 +1430,11 @@
 	fibLocker. unlock ();
 }
 
-bool	fibDecoder::evenFrame		() {
-	return (CIFcount_lo. load () & 0x07) == 0;
+bool	fibDecoder::nonTIIFrame		() {
+	return (CIFcount_lo. load () & 0x07) >= 4;
 }
-//
 
+//
 
 uint32_t fibDecoder::julianDate		() {
 	return mjd;
@@ -1463,3 +1460,7 @@
 return res;
 }
 
+std::vector<basicService> fibDecoder::getServices	() {
+	return theEnsemble. getServices ();
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/fic-handling/fib-decoder.h -> qt-dab-6.10.tar.gz/sources/frontend/fic-handling/fib-decoder.h Changed

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

@@ -74,7 +74,26 @@
 static inline
 DABFLOAT makeA (int i, Complex S, Complex prevS) {
 	return abs (prevS + W_table i * S);
-//	return abs (prevS + w (-i) * S);
+}
+
+//
+//	Provided for computing the phase error by old-dab
+//	(aka Rolf Zerr)
+Complex makeComplex (DABFLOAT phase) {
+//	Minimax polynomial for sin(x) and cos(x) on -pi/4, pi/4
+//	Coefficients via Remez algorithm (Sollya)
+//	Max |error| < 1.5e-4 for sinus, < 6e-4 for cosinus
+
+	const DABFLOAT x2 = phase * phase;
+	const DABFLOAT s1 = 0.99903142452239990234375f;
+	const DABFLOAT s2 = -0.16034401953220367431640625;
+	const DABFLOAT sine = phase * (x2 * s2 + s1);
+
+	const DABFLOAT c1 = 0.9994032382965087890625f;
+	const DABFLOAT c2 = -0.495580852031707763671875;
+	const DABFLOAT c3 = 3.679168224334716796875e-2;
+	const DABFLOAT cosine = c1 + x2 * (x2 * c3 + c2);
+	return Complex (cosine, sine);
 }
 
 	ofdmDecoder::ofdmDecoder	(RadioInterface *mr,
@@ -111,11 +130,11 @@
 	this	-> T_g		= T_s - T_u;
 
 	repetitionCounter	= 10;
-
 	reset ();
 	iqSelector		= SHOW_DECODED;
 //	iqSelector		= SHOW_RAW;
 	decoder			= DECODER_1;
+
 	sqrt_2			= sqrt (2);
 //
 //	Prefil some tables for faster access
@@ -188,12 +207,6 @@
 //	their length, relative to each other,
 //	Ideally, the X and Y are of equal size, in practice they are not.
 
-static inline
-int	sign (DABFLOAT x) {
-	return x < 0 ? -1 : x > 0 ? 1 : 0;
-}
-
-
 void	limit_symmetrically (DABFLOAT &v, DABFLOAT limit) {
 	if (v < -limit)
 	 v = -limit;
@@ -222,155 +235,39 @@
 //	Decoder 4 is an interpretation of the so-called "Optimal 3" 
 //	version in the aforementioned paper.
 
-
 void	ofdmDecoder::decode (std::vector <Complex> &buffer,
-	 int32_t blkno,
+	 int32_t	blkno,
 	 std::vector<int16_t> &softbits,
-	 DABFLOAT snr) {
+	 DABFLOAT	snr, float clockError) {
 
 DABFLOAT sum	= 0;
-DABFLOAT bitSum	= 0;
+//DABFLOAT bitSum	= 0;
 
 	memcpy (fft_buffer. data (), &((buffer. data ()) T_g),
 	 T_u * sizeof (Complex));
 //	first step: do the FFT
 	fft. fft (fft_buffer. data ());
-
-//	a little optimization: we do not interchange the
-//	positive/negative frequencies to their right positions.
-//	The de-interleaving understands this
-
-	for (int i = 0; i < carriers; i ++) {
-	 int16_t	index	= myMapper. mapIn (i);
-	 if (index < 0) 
-	 index += T_u;
-	 Complex current	= fft_buffer index;
-	 Complex prevS	= phaseReference index;
-	 Complex fftBin	= current * normalize (conj (prevS));
-	 conjVector index	= fftBin;
-	 DABFLOAT binAbsLevel	= jan_abs (fftBin);
 //
-//	updates
-	 
-	 Complex fftBin_at_1	= Complex (abs (real (fftBin)),
-	 abs (imag (fftBin)));
-
-	 DABFLOAT angle	= arg (fftBin_at_1) - angleVector index;
-	 angleVector index	=
-	 compute_avg (angleVector index, angle, ALPHA);
-	 stdDevVector index	= 
-	 compute_avg (stdDevVector index,
-	 angle * angle, ALPHA);
-
-	 meanLevelVector index =
-	 compute_avg (meanLevelVector index, binAbsLevel, ALPHA);
-
-	 DABFLOAT d_x		= abs (real (fftBin_at_1)) -
-	 meanLevelVector index / sqrt_2;
-	 DABFLOAT d_y		= abs (imag (fftBin_at_1)) -
-	 meanLevelVector index / sqrt_2;
-	 DABFLOAT sigmaSQ	= d_x * d_x + d_y * d_y;
-	 sigmaSQ_Vector index =
-	 compute_avg (sigmaSQ_Vector index, sigmaSQ, ALPHA);
-//
-	 if (this -> decoder == DECODER_1) {
-	 DABFLOAT corrector	=
-	 1.5 * meanLevelVector index / sigmaSQ_Vector index;
-	 corrector			/= (1 / snr + 2);
-	 Complex R1	= corrector * normalize (fftBin) * 
-	 (DABFLOAT)(sqrt (binAbsLevel * 
-	 jan_abs (prevS)));
-	 DABFLOAT scaler		= 140.0 / meanValue;
-	 DABFLOAT leftBit		= - real (R1) * scaler;
-	 limit_symmetrically (leftBit, MAX_VITERBI);
-	 softbits i		= (int16_t)leftBit;
-
-	 DABFLOAT rightBit		= - imag (R1) * scaler;
-	 limit_symmetrically (rightBit, MAX_VITERBI);
-	 softbits i + carriers	= (int16_t)rightBit;
-
-	 sum			+= jan_abs (R1);
-	 }
-	 else 
-	 if (this -> decoder == DECODER_2) {	// decoder 2
-	 DABFLOAT corrector	=
-	 meanLevelVector index / sigmaSQ_Vector index;
-	 corrector		/= (1 / snr + 3);
-	 Complex R1	= corrector * normalize (fftBin) * 
-	 (DABFLOAT)(sqrt (binAbsLevel *
-	 jan_abs (prevS)));
-	 DABFLOAT scaler		= 100.0 / meanValue;
-	 DABFLOAT leftBit		= - real (R1) * scaler;
-	 limit_symmetrically (leftBit, MAX_VITERBI);
-	 softbits i		= (int16_t)leftBit;
-
-	 DABFLOAT rightBit		= - imag (R1) * scaler;
-	 limit_symmetrically (rightBit, MAX_VITERBI);
-	 softbits i + carriers	= (int16_t)rightBit;
-
-	 sum			+= jan_abs (R1);
-	 }
-	 else
-	 if (this -> decoder == DECODER_3) { // Optimal 1
-	 Complex R1	= fftBin * (DABFLOAT)(jan_abs (prevS));
-	 DABFLOAT scaler = 140.0 / meanValue;
-
-	 DABFLOAT leftBit = - real (R1) * scaler;
-	 limit_symmetrically (leftBit, MAX_VITERBI);
-	 softbits i = (int16_t)leftBit;
-
-	 DABFLOAT rightBit = - imag (R1) * scaler;
-	 limit_symmetrically (rightBit, MAX_VITERBI);
-	 softbits i + carriers = (int16_t)rightBit;
-
-	 sum += jan_abs (R1);
-	 }
-	 else 	// experimental optimum 3
-	 if (this -> decoder == DECODER_4) {	// decoder 4
-//	 DABFLOAT A = meanLevelVector index /
-	 DABFLOAT A = 1.0 / sigmaSQ_Vector index;
-	 DABFLOAT P1 = makeA (1, current, prevS) * A;
-	 DABFLOAT P7 = makeA (7, current, prevS) * A;
-	 DABFLOAT P3 = makeA (3, current, prevS) * A;
-	 DABFLOAT P5 = makeA (5, current, prevS) * A;
-
-	 DABFLOAT IO_P1 = IO (P1);
-	 DABFLOAT IO_P7 = IO (P7);
-	 DABFLOAT IO_P3 = IO (P3);
-	 DABFLOAT IO_P5 = IO (P5);
-
-	 DABFLOAT F1	= (IO_P1 + IO_P7) / (IO_P3 + IO_P5);
-	 DABFLOAT F2	= (IO_P1 + IO_P3) / (IO_P5 + IO_P7);
-	 if (std::isinf (F1))
-	 F1 = 10.0;
-	 if (std::isinf (F2))
-	 F2 = 10.0;
-	 if (F1 < 0.01)
-	 F1 = 0.01;
-	 if (F2 < 0.01)
-	 F2 = 0.01;
-	 DABFLOAT b1 = log (F1);
-	 DABFLOAT b2 = log (F2);
-
-	 if (std::isnan (b1))
-	 b1 = 0;
-	 if (std::isnan (b2))
-	 b2 = 0;
-	 DABFLOAT scaler = 140.0 / meanValue;
-
-	 DABFLOAT leftBit	= - b1 * scaler;
-	 limit_symmetrically (leftBit, MAX_VITERBI);
-	 softbits i	= (int16_t)leftBit;

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

@@ -56,11 +56,14 @@
 	void	processBlock_0		(std::vector<Complex>);
 	void	decode			(std::vector<Complex> &,
 	 int32_t n,
-	 std::vector<int16_t> &, DABFLOAT);
+	 std::vector<int16_t> &,
+	 DABFLOAT, float);
 	void	stop			();
 	void	reset			();
 	void	handle_iqSelector	();
 	void	handle_decoderSelector	(int);
+
+	void	set_correctPhase	(bool);
 private:
 	RadioInterface		*myRadioInterface;
 	dabParams		params;
@@ -70,6 +73,21 @@
 	RingBuffer<float>	*devBuffer;
 	RingBuffer<Complex>	*iqBuffer;
 
+	bool			correctPhase;
+	DABFLOAT		decoder_12 (const std::vector<Complex> &,
+ std::vector<int16_t> &,
+ DABFLOAT snr,
+ int decType,
+	 float	 rateError);
+	DABFLOAT		decoder_3 (const std::vector<Complex> &,
+ std::vector<int16_t> &,
+ DABFLOAT snr,
+	 float	 clockError);
+	DABFLOAT		decoder_4 (const std::vector<Complex> &,
+ std::vector<int16_t> &,
+ DABFLOAT snr);
+
+	std::vector<Complex>	compTable;
 	float		computeQuality		(Complex *);
 	float		compute_timeOffset (Complex *,
 	 Complex *);

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

@@ -37,10 +37,7 @@
 #include	"settings-handler.h"
 
 #include	"tii-detector-1.h"
-#include	"tii-detector-2.h"
 
-#define	TII_OLD	0100
-#define	TII_NEW	0101
 /**
 *	\brief ofdmHandler
 *	The ofdmHandler class is the driver of the processing
@@ -105,8 +102,6 @@
 	 S_DX_MODE, 0) != 0;
 	this	-> decoder		= value_i (dabSettings, CONFIG_HANDLER, 
 	 "decoders", DECODER_1); 
-	this	-> selectedTII		= value_i (dabSettings, CONFIG_HANDLER,		 	 "tii-detector", 1) == 0 ?
-	 TII_OLD : TII_NEW;
 
 	this	-> etiOn		= false;
 	ofdmBuffer. resize (3 * T_s);
@@ -142,10 +137,8 @@
 	 mr, &RadioInterface::show_Corrector);
 	tiiThreshold = value_i (settings_p, CONFIG_HANDLER,
 TII_THRESHOLD, 6);
-	tiiCollisions_active = value_i (settings_p, CONFIG_HANDLER,
-	 "tiiCollisions", 1) != 0;
-	tiiFilter_active = value_i (settings_p, CONFIG_HANDLER,
-	 "tiiFilter", 1) != 0;
+	tiiCollision	= value_i (settings_p, CONFIG_HANDLER,
+	 "tiiCollision", -1);
 	theOfdmDecoder. handle_decoderSelector (decoder);
 
 	this	-> snr		= 10;	// until we know better
@@ -167,19 +160,15 @@
 	tiiThreshold = threshold;
 }
 
-void	ofdmHandler::setTIICollisions	(bool b) {
-	tiiCollisions_active = b;
-}
-
-void	ofdmHandler::setTIIFilter	(bool b) {
-	tiiFilter_active	= b;
+void	ofdmHandler::setTIICollisions	(int subId) {
+	tiiCollision = subId;
 }
 
 void	ofdmHandler::start () {
 	fineOffset			= 0;	
 	coarseOffset			= 0;	
 	attempts			= 0;
-
+	rateError			= 0;
 	goodFrames			= 0;
 	badFrames			= 0;
 	totalFrames			= 0;
@@ -207,8 +196,7 @@
 */
 void	ofdmHandler::run	() {
 timeSyncer	myTimeSyncer (&theReader);
-TII_Detector_B	theTIIDetector_OLD (p -> dabMode, &theTable, settings_p);
-TII_Detector_A	theTIIDetector_NEW (p -> dabMode, &theTable);
+TII_Detector	theTIIDetector (p -> dabMode, &theTable);
 freqSyncer	myFreqSyncer (radioInterface_p, p, &theTable);
 correlator	myCorrelator (radioInterface_p, p, &theTable);
 int32_t		startIndex	= -1;
@@ -246,10 +234,7 @@
 	 frameCount	= 0;
 	 sampleCount	= 0;
 	 setSynced (false);
-	 if (selectedTII == TII_NEW)
-	 theTIIDetector_NEW. reset ();
-	 else
-	 theTIIDetector_OLD. reset ();
+	 theTIIDetector. reset ();
 	 switch (myTimeSyncer. sync (T_null, T_F)) {
 	 case TIMESYNC_ESTABLISHED:
 	 inSync	= true;
@@ -291,9 +276,11 @@
 	 bool nullShower	= false;
 	 totalSamples	+= sampleCount;
 	 if (frameCount >= 10) {
-	 int diff	= (totalSamples - frameCount * T_F);
-	 diff	= (int)((float)SAMPLERATE / (frameCount * T_F) * diff);
-	 showClockError (diff);
+	 rateError = SAMPLERATE * 
+	 (totalSamples / ((float)frameCount * T_F) - 1);
+//	 int diff	= (totalSamples - frameCount * T_F);
+//	 diff	= (int)((float)SAMPLERATE / (frameCount * T_F) * diff);
+	 showClockError ((int)rateError);
 	 totalSamples = 0;
 	 frameCount	= 0;
 	 nullShower = true;
@@ -302,7 +289,7 @@
 	 }
 
 	 theReader. getSamples (ofdmBuffer, 0,
-	 T_u, coarseOffset + fineOffset, false);
+	 T_u, coarseOffset + fineOffset, false);
 	 startIndex = myCorrelator. findIndex (ofdmBuffer,
 	 correlationOrder,
 	 2.5 * thresHold);
@@ -359,9 +346,6 @@
 *	We read the missing samples in the ofdm buffer
 */
 	 sampleCount	+= T_u;
-	 bool frame_with_TII = 
-	 (p -> dabMode == 1) &&
-	 theFicHandler. evenFrame ();
 	 (void) theOfdmDecoder. processBlock_0 (ofdmBuffer);
 #ifdef	__MSC_THREAD__
 	 if (!scanMode)
@@ -411,7 +395,7 @@
 	 for (int ofdmSymbolCount = 1;
 	 ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
 	 theReader. getSamples (ofdmBuffer, 0,
-	 T_s, coarseOffset + fineOffset, true);
+	 T_s, coarseOffset + fineOffset, true);
 	 sampleCount += T_s;
 	 for (int i = (int)T_u; i < (int)T_s; i ++) {
 	 FreqCorr +=
@@ -425,7 +409,8 @@
 //	If "eti_on" we process all data here
 	 if (etiOn) {
 	 theOfdmDecoder.
-	 decode (ofdmBuffer, ofdmSymbolCount, softbits, snr);
+	 decode (ofdmBuffer, ofdmSymbolCount,
+	 softbits, snr, rateError);
 	 if (ofdmSymbolCount <= 3) 
 	 theFicHandler.
 	 processFICBlock (softbits, ofdmSymbolCount);
@@ -443,7 +428,8 @@
 //	the payload at all
 	 if (ofdmSymbolCount <= 3) {
 	 theOfdmDecoder.
- decode (ofdmBuffer, ofdmSymbolCount, softbits, snr);
+ decode (ofdmBuffer, ofdmSymbolCount,
+	 softbits, snr, rateError);
 	 theFicHandler. 
 processFICBlock (softbits, ofdmSymbolCount);
 	 }
@@ -454,7 +440,8 @@
 #else
 	 if (ofdmSymbolCount >= 4) {
 	 theOfdmDecoder.
-	 decode (ofdmBuffer, ofdmSymbolCount, softbits, snr);
+	 decode (ofdmBuffer, ofdmSymbolCount,
+	 softbits, snr, rateError);
 	 theMscHandler.
 	 processMscBlock (softbits, ofdmSymbolCount);
 	 }
@@ -470,41 +457,41 @@
 //
 //	The snr is computed, where we take as "noise" the signal strength
 //	of the NULL period (the one without TII data)
-	 if (frame_with_TII) {
-	 if (selectedTII == TII_NEW)
-	 theTIIDetector_NEW. addBuffer (ofdmBuffer);
-	 else
-	 theTIIDetector_OLD. addBuffer (ofdmBuffer);
-	 if (++tiiCounter >= tiiDelay) {
-	 tiiBuffer_p -> putDataIntoBuffer (ofdmBuffer. data(),
-	 T_u);
+//	" The TII signal shall fill the null symbol of each transmission
+//	frame comprising the CIFs of CIF count 0, 1, 2, 3
+//	modulo 8 (transmission mode I).
+//	We have the CIF count of the previous frame
+	 if (p -> dabMode == 1) {
+	 int16_t CIF_hi, CIF_lo;
+	 theFicHandler. getCIFcount (CIF_hi, CIF_lo); 
+	 if ((CIF_lo & 0x07) >= 4) {
+	 theTIIDetector. addBuffer (ofdmBuffer);
+	 tiiBuffer_p -> putDataIntoBuffer (ofdmBuffer. data (),
+	 T_null);
 	 showTIIspectrum ();
-	 QVector<tiiData> resVec =
-	 selectedTII == TII_NEW ?
-	 theTIIDetector_NEW. processNULL (tiiThreshold,
-	 tiiCollisions_active,
-	 tiiFilter_active):
-	 theTIIDetector_OLD. processNULL (tiiThreshold,
-	 tiiCollisions_active,
-	 tiiFilter_active);
-	 showTIIData (resVec, 0);
-	 tiiCounter = 0;
+	 if (++tiiCounter >= tiiDelay) {
+	 tiiCounter = 0;
+	 QVector<tiiData> resVec =
+	 theTIIDetector. processNULL (tiiThreshold,
+	 tiiCollision);
+	 showTIIData (resVec, 0);
+	 }
 	 }
-	 }
-	 else {	// compute SNR
-	 float sum	= 0;
-	 for (int i = 0; i < T_null; i ++)
-	 sum += jan_abs (ofdmBuffer i);
-	 sum /= T_null;
-	 float snrV	=

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

@@ -34,6 +34,7 @@
 #include	<QSettings>
 #include	<vector>
 #include	<cstdint>
+#include	"dab-constants.h"
 #include	"sample-reader.h"
 #include	"fic-handler.h"
 #include	"msc-handler.h"
@@ -61,7 +62,6 @@
 //	void		start			(int32_t);
 	void		stop			();
 
-	void		selectTII		(uint8_t);
 	void		startDumping		(const QString &, int, 
 	 int, const QString);
 	void		stopDumping		();
@@ -70,6 +70,8 @@
 	void		resetEtiGenerator	();
 	void		setScanMode		(bool);
 	void		getFrameQuality		(int *, int*, int *);
+
+	void		set_dataTracer		(bool);
 //
 //	just a gadget
 	bool		serviceRuns		(uint32_t SId, uint16_t SCIds);
@@ -77,7 +79,7 @@
 //
 //	for the tii settings
 	void		setTIIThreshold		(int16_t);
-	void		setTIICollisions	(bool);
+	void		setTIICollisions	(int);
 	void		setTIIFilter		(bool);
 //	servicing our subordinates
 //	for the ficHandler:
@@ -118,6 +120,8 @@
 	void		setCorrelationOrder	(bool);
 	void		setDXMode		(bool);
 	void		set_dcRemoval		(bool);
+
+	std::vector<basicService> getServices	();
 private:
 	RadioInterface		*radioInterface_p;
 	processParams		*p;
@@ -136,7 +140,7 @@
 	uint8_t			selectedTII;
 	DABFLOAT		snr;
 	int16_t			tiiThreshold;
-	bool			tiiCollisions_active;
+	int			tiiCollision;
 	bool			tiiFilter_active;
 
 	int			decoder;
@@ -144,6 +148,7 @@
 	int			totalFrames;
 	int			goodFrames;
 	int			badFrames;
+	float			rateError;
 	bool			tiiSwitch;
 	int16_t			tiiDepth;
 	int16_t			echoEepth;

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

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/tii-detector-1.cpp -> qt-dab-6.10.tar.gz/sources/frontend/tii-detector-1.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2024
+ * Copyright (C) 2014 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -21,45 +21,183 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 //
-//	This implementation of the TII decoder is taken from
+//	This implementation of the TII decoder is based on
 //	Rolf Zerr's (aka old-dab) implemementation as done in DABstar.
+//	All rights acknowledged.
 
 #include "tii-detector-1.h"
+
 constexpr float F_DEG_PER_RAD = (float)(180.0 / M_PI);
 
+#ifndef M_PI
+# define M_PI 3.14159265358979323846 /* pi */
+#endif
+
+static
+uint8_t patternTable = {
+	0017,		// 0 0 0 0 1 1 1 1		0
+	0027,		// 0 0 0 1 0 1 1 1		1
+	0033,		// 0 0 0 1 1 0 1 1		2
+	0035,		// 0 0 0 1 1 1 0 1		3
+	0036,		// 0 0 0 1 1 1 1 0		4
+	0047,		// 0 0 1 0 0 1 1 1		5
+	0053,		// 0 0 1 0 1 0 1 1		6
+	0055,		// 0 0 1 0 1 1 0 1		7
+	0056,		// 0 0 1 0 1 1 1 0		8
+	0063,		// 0 0 1 1 0 0 1 1		9
+
+	0065,		// 0 0 1 1 0 1 0 1		10
+	0066,		// 0 0 1 1 0 1 1 0		11
+	0071,		// 0 0 1 1 1 0 0 1		12
+	0072,		// 0 0 1 1 1 0 1 0		13
+	0074,		// 0 0 1 1 1 1 0 0		14
+	0107,		// 0 1 0 0 0 1 1 1		15
+	0113,		// 0 1 0 0 1 0 1 1		16
+	0115,		// 0 1 0 0 1 1 0 1		17
+	0116,		// 0 1 0 0 1 1 1 0		18
+	0123,		// 0 1 0 1 0 0 1 1		19
+
+	0125,		// 0 1 0 1 0 1 0 1		20
+	0126,		// 0 1 0 1 0 1 1 0		21
+	0131,		// 0 1 0 1 1 0 0 1		22
+	0132,		// 0 1 0 1 1 0 1 0		23
+	0134,		// 0 1 0 1 1 1 0 0		24
+	0143,		// 0 1 1 0 0 0 1 1		25
+	0145,		// 0 1 1 0 0 1 0 1		26
+	0146,		// 0 1 1 0 0 1 1 0		27
+	0151,		// 0 1 1 0 1 0 0 1		28	
+	0152,		// 0 1 1 0 1 0 1 0		29
+
+	0154,		// 0 1 1 0 1 1 0 0		30
+	0161,		// 0 1 1 1 0 0 0 1		31
+	0162,		// 0 1 1 1 0 0 1 0		32
+	0164,		// 0 1 1 1 0 1 0 0		33
+	0170,		// 0 1 1 1 1 0 0 0		34
+	0207,		// 1 0 0 0 0 1 1 1		35
+	0213,		// 1 0 0 0 1 0 1 1		36
+	0215,		// 1 0 0 0 1 1 0 1		37
+	0216,		// 1 0 0 0 1 1 1 0		38
+	0223,		// 1 0 0 1 0 0 1 1		39
+
+	0225,		// 1 0 0 1 0 1 0 1		40
+	0226,		// 1 0 0 1 0 1 1 0		41
+	0231,		// 1 0 0 1 1 0 0 1		42
+	0232,		// 1 0 0 1 1 0 1 0		43
+	0234,		// 1 0 0 1 1 1 0 0		44
+	0243,		// 1 0 1 0 0 0 1 1		45
+	0245,		// 1 0 1 0 0 1 0 1		46
+	0246,		// 1 0 1 0 0 1 1 0		47
+	0251,		// 1 0 1 0 1 0 0 1		48
+	0252,		// 1 0 1 0 1 0 1 0		49
+
+	0254,		// 1 0 1 0 1 1 0 0		50
+	0261,		// 1 0 1 1 0 0 0 1		51
+	0262,		// 1 0 1 1 0 0 1 0		52
+	0264,		// 1 0 1 1 0 1 0 0		53
+	0270,		// 1 0 1 1 1 0 0 0		54
+	0303,		// 1 1 0 0 0 0 1 1		55
+	0305,		// 1 1 0 0 0 1 0 1		56
+	0306,		// 1 1 0 0 0 1 1 0		57
+	0311,		// 1 1 0 0 1 0 0 1		58
+	0312,		// 1 1 0 0 1 0 1 0		59
+
+	0314,		// 1 1 0 0 1 1 0 0		60
+	0321,		// 1 1 0 1 0 0 0 1		61
+	0322,		// 1 1 0 1 0 0 1 0		62
+	0324,		// 1 1 0 1 0 1 0 0		63
+	0330,		// 1 1 0 1 1 0 0 0		64
+	0341,		// 1 1 1 0 0 0 0 1		65
+	0342,		// 1 1 1 0 0 0 1 0		66
+	0344,		// 1 1 1 0 0 1 0 0		67
+	0350,		// 1 1 1 0 1 0 0 0		68
+	0360		// 1 1 1 1 0 0 0 0		69
+};
+
+static inline
+uint16_t	nrPatterns () {
+ return (uint16_t)sizeof (patternTable);
+}
 
 #define	SECTION_SIZE	192
 #define	NR_SECTIONS	4
 
-	TII_Detector_A::TII_Detector_A (uint8_t dabMode,
-	 phaseTable *theTable) :
-	 TII_Detector (dabMode,
-	 theTable) {
+	TII_Detector::TII_Detector (uint8_t dabMode,
+	 phaseTable *theTable) :
+	 params (dabMode),
+ T_u (params. get_T_u ()),
+ T_g (params. get_T_g ()),
+ carriers (params. get_carriers ()),
+ my_fftHandler (params. get_T_u (),
+ false) {
+ nullSymbolBuffer. resize (T_u);
+	rotationTable. resize (carriers);
+	int teller = 0;
+	for (int carrier = - carriers / 2;
+	 carrier < carriers / 2; carrier += 2) {
+	 int index = carrier < 0 ? carrier + T_u : carrier + 1;
+	 Complex r = theTable -> refTable index *
+	 conj (theTable -> refTable index + 1);
+//
+ float aa = (arg (r) < 0) ? arg (r) + 2 * M_PI : arg (r);
+//	the "arg" of r is one of 0 .. 3 * PI/2
+	 rotationTable teller ++ = (int)(floor ((aa + 0.1) / (M_PI / 2)));
+ }
 	carrierDelete	= false;
-	reset();
+	reset ();
 }
 
-	TII_Detector_A::~TII_Detector_A () { }
+	TII_Detector::~TII_Detector () { }
 
+void	TII_Detector::resetBuffer () {
+	for (int i = 0; i < T_u; i ++)
+	 nullSymbolBuffer i = Complex (0, 0);
+}
 
-void	TII_Detector_A::reset		() {
+void	TII_Detector::reset		() {
 	resetBuffer();
 	memset ((void *)decodedBuffer, 0, carriers / 2 * sizeof (Complex));
 }
 
+//	To eliminate (reduce?) noise in the input signal, we might
+//	add a few spectra before computing (up to the user)
+void TII_Detector::addBuffer (const std::vector<Complex> &v) {
+Complex tmpBuffer T_u;
+
+ for (int i = 0; i < T_u; i ++)
+ tmpBuffer i = v T_g + i;
+ my_fftHandler. fft (tmpBuffer);
+ for (int i = 0; i < T_u; i ++)
+ nullSymbolBuffer i += tmpBuffer i;
+}
+
+// rotate 0, 90, 180 or 270 degrees
+Complex	TII_Detector::rotate (Complex value, uint8_t phaseIndicator) { 
+ switch (phaseIndicator) {
+ case 0:
+ return value;
+ case 1:	// PI / 2
+ return Complex (imag (value), -real (value));
+ case 2:	// PI
+ return -value;
+ case 3:	// 3 * PI / 2
+ return Complex (-imag (value), real (value));
+ default: // should not happen
+ return value;
+ }
+}
+
 //	we map the "K" carriers (complex values) onto
 //	a collapsed vector of "K / 8" length,
 //	considered to consist of 8 segments of 24 values
 //	Each "value" is the sum of 4 pairs of subsequent carriers,
 //	taken from the 4 quadrants -768 .. 385, 384 .. -1, 1 .. 384, 385 .. 768
-void	TII_Detector_A::collapse (const Complex *inVec,
-	 Complex *etsiVec, Complex *nonetsiVec,
-	 bool tiiFilter) {
+void	TII_Detector::collapse (const Complex *inVec,
+	 Complex *etsiVec, Complex *nonetsiVec) {
 Complex buffer carriers / 2;
 
 	memcpy (buffer, inVec, carriers / 2 * sizeof (Complex));
 
-	int nrSections	= tiiFilter ? 2 : 4;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/tii-detector-1.h -> qt-dab-6.10.tar.gz/sources/frontend/tii-detector-1.h Changed

@@ -23,32 +23,40 @@
 
 #pragma once
 
-#include	<tii-detector.h>
 #include	<cstdint>
 #include	"dab-params.h"
 #include	<complex>
 #include	<vector>
 #include	"dab-constants.h"
-//#include	"fft-handler.h"
+#include	"fft-handler.h"
 #include	"phasetable.h"
 #include	<QVector>
-class	QSettings;
 
-class	TII_Detector_A : public TII_Detector {
+#define NUM_GROUPS 8
+#define GROUPSIZE 24
+class	TII_Detector {
 public:
-			TII_Detector_A	(uint8_t dabMode, phaseTable *theTable);
-			~TII_Detector_A	();
+			TII_Detector	(uint8_t dabMode, phaseTable *theTable);
+			~TII_Detector	();
 	void		reset		();
-	QVector<tiiData>	processNULL	(int16_t, uint8_t, bool);
+	void		addBuffer	(const std::vector<Complex> &);
+	QVector<tiiData>	processNULL	(int16_t, uint8_t);
 
 private:
-//	std::vector<Complex> table_2;
+	dabParams	params;
+	int16_t		T_u;
+	int16_t		T_g;
+	int16_t		carriers;
+	fftHandler	my_fftHandler;
 	bool		carrierDelete;
 	Complex		decodedBuffer 768;
+	std::vector<Complex> nullSymbolBuffer;
+	void		resetBuffer	();
 	void		collapse	(const Complex *, 
-	 Complex *, Complex *, bool);
-
+	 Complex *, Complex *);
 	int		tiiThreshold;
+	std::vector<uint8_t>	rotationTable;
+	Complex		rotate		(Complex, uint8_t);
 };

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/tii-detector-2.cpp -> qt-dab-6.10.tar.gz/sources/frontend/tii-detector-2.cpp Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/tii-detector.cpp -> qt-dab-6.10.tar.gz/sources/frontend/tii-detector.cpp Changed

@@ -112,6 +112,7 @@
 	0360		// 1 1 1 1 0 0 0 0		69
 };
 
+
 		TII_Detector::TII_Detector (uint8_t dabMode,
 	 phaseTable *theTable):
 	 params (dabMode),
@@ -125,14 +126,22 @@
 	for (int i = 0; i < T_u; i ++)
 	 window i = 0.54 - 0.46 * cos (2 * M_PI * (DABFLOAT)i / T_u);
 
-	table_2. resize (carriers / 2);
-	int teller = 0;
+	rotationTable. resize (carriers);
+ int teller = 0;
 for (int carrier = - carriers / 2;
 carrier < carriers / 2; carrier += 2) {
-	 int index = carrier < 0 ? carrier + T_u : carrier + 1;
- table_2 teller ++ = theTable -> refTable index *
+ int index = carrier < 0 ? carrier + T_u : carrier + 1;
+	 Complex r	= theTable -> refTable index *
 conj (theTable -> refTable index + 1);
+//
+//	the "arg" or r is one of 0 .. 3 * PI/2
+	 float aa = (arg (r) < 0) ? arg (r) + 2 * M_PI : arg (r);
+	 int bb = aa < 1 ? 0 :
+	 aa < 2 ? 1:
+	 aa < 3.5 ? 2 : 3;
+	 rotationTable teller ++ = bb;
 }
+
 }
 
 	TII_Detector::~TII_Detector () {
@@ -153,7 +162,8 @@
 Complex tmpBuffer T_u;
 
 	for (int i = 0; i < T_u; i ++)
- tmpBuffer i = v T_g + i;
+//	 tmpBuffer i = v i;
+	 tmpBuffer i = v T_g + i;
 	my_fftHandler. fft (tmpBuffer);
 	for (int i = 0; i < T_u; i ++)
 	 nullSymbolBuffer i += tmpBuffer i;
@@ -170,6 +180,10 @@
 	return result;
 }
 
+uint8_t		TII_Detector::getRotation (int n) {
+	return rotationTable n;
+}
+
 uint16_t	TII_Detector::getPattern (int n) {
 	return patternTable n;
 }
@@ -178,4 +192,20 @@
 	return (uint16_t)sizeof (patternTable);
 }
 
+// rotate 0, 90, 180 or -90 degrees
+Complex		TII_Detector::rotate (Complex value, uint8_t phaseIndicator) { 
+	switch (phaseIndicator) { 
+	 case 3:
+	 return Complex (-imag (value), real (value));
+	 case 2:
+	 return -value;
+	 case 1:
+	 return Complex (imag (value), -real (value));
+	 case 0:
+ return value;
+	 default: 	// should not happen
+	 return value;
+	}
+}
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/frontend/tii-detector.h -> qt-dab-6.10.tar.gz/sources/frontend/tii-detector.h Changed

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

@@ -88,14 +88,16 @@
 	this	-> setupUi (this);
 	setPositionAndSize (settings, this, CONFIG_HANDLER);
 	hide ();
-//	connect (&myFrame, &superFrame::makePicture,
-//	 this, &configHandler::handle_mouseClicked);
 //	inits of checkboxes etc in the configuration widget,
 //	note that ONLY the GUI is set, values are not used
+
 	
 	int x = value_i (dabSettings, CONFIG_HANDLER, MUTE_TIME_SETTING, 10);
 	this	-> muteTimeSetting -> setValue (x);
 
+	x	= value_i (dabSettings, CONFIG_HANDLER, SAVE_HTTP, 0);
+	mapViewSelector		-> setChecked (x != 0);
+
 int fontSize = 
 	 value_i (dabSettings, COLOR_SETTINGS, "fontSize", 10);
 	this	-> fontSizeSelector -> setValue (fontSize);
@@ -107,10 +109,6 @@
 	x = value_i (dabSettings, CONFIG_HANDLER, "localDB", 1);
 	this	-> localDB_selector	-> setChecked (x);
 
-	x = value_i (dabSettings, CONFIG_HANDLER, SWITCH_STAY_SETTING,
-	 10);
-	this	-> switchStaySetting -> setValue (x);
-
 	x = value_i ( dabSettings, CONFIG_HANDLER, SERVICE_ORDER_SETTING,
 	 ALPHA_BASED);
 	if (x == ALPHA_BASED)
@@ -121,7 +119,7 @@
 	else
 	 this -> ordersubChannelIds -> setChecked (true);
 	serviceOrder	= x;
-
+//
 //	first row of checkboxes
 //	unused element
 	x = value_i (dabSettings, CONFIG_HANDLER, LOG_MODE, 1);
@@ -136,6 +134,10 @@
 	 ON_TOP_SETTING, 0) == 1;
 	this -> onTop -> setChecked (b);
 //
+	b = value_i (dabSettings, CONFIG_HANDLER,
+	 "close_map", 0) != 0;
+	this	-> close_mapSelector	-> setChecked (b);
+
 //	third row of checkboxes
 	b = value_i (dabSettings, CONFIG_HANDLER,
 	 CLOSE_DIRECT_SETTING, 0) != 0;
@@ -151,7 +153,7 @@
 	this -> showAll_selector -> setChecked (b);
 
 	b = value_i (dabSettings, CONFIG_HANDLER,
-	 SAVE_SLIDES_SETTING, 0) == 1;
+	 SAVE_SLIDES_SETTING, 1) == 1;
 	this	-> saveSlides -> setChecked (b);
 
 	b = value_i (dabSettings, CONFIG_HANDLER,
@@ -170,10 +172,8 @@
 	 "dcRemoval", 1) == 1;
 	this -> dcRemoval -> setChecked (b);
 
-	int c = value_i (dabSettings, CONFIG_HANDLER, "tiiCollisions", 0);
+	int c = value_i (dabSettings, CONFIG_HANDLER, "tiiCollision", 0);
 	this	-> tiiCollisions -> setValue (c);
-	b = value_i (dabSettings, CONFIG_HANDLER, TII_FILTER, 1) != 0;
-	this	-> tiiFilter -> setChecked (b);
 
 #ifndef	__MSC_THREAD__
 	for (int i = 0; decoders i. decoderName != ""; i ++) 
@@ -190,25 +190,24 @@
 	 DECODERS, DECODER_1);
 	decoderSelector	-> setCurrentIndex (index_for_key (k));
 
-	int v = value_i (dabSettings, CONFIG_HANDLER, TII_DETECTOR_SETTING, 1);
-	this	-> tiiSelector	-> setChecked (v != 0);
-	if (v == 0) {
-	 tiiCollisions -> setEnabled (false);
-	 tiiThreshold_setter -> setMinimum (4);
-	}
-	else
-	 tiiThreshold_setter -> setMinimum (6);
+//	tiiCollisions -> setEnabled (false);
+	tiiThreshold_setter -> setMinimum (6);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect (mapViewSelector, &QCheckBox::checkStateChanged,
+#else
+	connect (mapViewSelector, &QCheckBox::stateChanged,
+#endif
+	this, &configHandler::handle_mapViewSelector);
 
-	v = value_i (dabSettings, CONFIG_HANDLER,
+	int v = value_i (dabSettings, CONFIG_HANDLER,
 	 TII_THRESHOLD, 12);
 	this -> tiiThreshold_setter -> setValue (v);
-
 	connect (tiiThreshold_setter, qOverload<int>(&QSpinBox::valueChanged),
 	 myRadioInterface, &RadioInterface::handle_tiiThreshold);
+
 	connect (this, &configHandler::process_tiiCollisions,
 	 myRadioInterface, &RadioInterface::handle_tiiCollisions);
-	connect (this, &configHandler::process_tiiFilter,
-	 myRadioInterface, &RadioInterface::handle_tiiFilter);
 	connect (pathButton, &QPushButton::clicked,
 	 this, &configHandler::handle_pathButton);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
@@ -220,29 +219,26 @@
 	connect (tiiCollisions, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &configHandler::handle_tiiCollisions);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-	connect (tiiFilter, &QCheckBox::checkStateChanged,
-#else
-	connect (tiiFilter, &QCheckBox::stateChanged,
-#endif
-	 this, &configHandler::handle_tiiFilter);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-	connect (tiiSelector, &QCheckBox::checkStateChanged,
-#else
-	connect (tiiSelector, &QCheckBox::stateChanged,
-#endif
-	 this, &configHandler::handle_tiiSelector);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (allTIISelector, &QCheckBox::checkStateChanged,
 #else
 	connect (allTIISelector, &QCheckBox::stateChanged,
 #endif
 	 this, &configHandler::handle_allTIISelector);
-	connect (this, &configHandler::process_tiiSelector,
-	 myRadioInterface, &RadioInterface::process_tiiSelector);
 	connect (activeServices, &clickablelabel::clicked,
 	 myRadioInterface, &RadioInterface::handle_activeServices);
 	connect (this, &configHandler::set_dcRemoval,
 	 myRadioInterface, &RadioInterface::handle_dcRemoval);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect (close_mapSelector, &QCheckBox::checkStateChanged,
+#else
+	connect (close_mapSelector, &QCheckBox::stateChanged,
+#endif
+	 this, &configHandler::handle_close_mapSelector);
+//
+//	Tracer special
+	connect	(tracerButton, &QPushButton::clicked,
+	 this, &configHandler::handle_tracerButton);
+	traceOn	= false;
 	set_Colors ();
 }
 
@@ -291,6 +287,7 @@
 	 this, &configHandler::color_pathButton);
 	connect (skinButton, &smallPushButton::rightClicked,
 	 this, &configHandler::color_skinButton);
+
 //
 //	real handlers
 	connect (scheduleButton, &QPushButton::clicked,
@@ -299,8 +296,6 @@
 	 this, &configHandler::handle_muteTimeSetting);
 	connect (switchDelaySetting, qOverload<int>(&QSpinBox::valueChanged),
 	 this, &configHandler::handle_switchDelaySetting);
-	connect (switchStaySetting, qOverload<int>(&QSpinBox::valueChanged),
-	 this, &configHandler::handle_switchStaySetting);
 	connect (orderAlfabetical, &QRadioButton::clicked,
 	 this, &configHandler::handle_orderAlfabetical);
 	connect (orderServiceIds, &QRadioButton::clicked,
@@ -422,6 +417,14 @@
 #endif
 	 this, &configHandler::handle_showAll_Selector);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	connect (saveSlides, &QCheckBox::checkStateChanged,
+#else
+	connect (saveSlider, &QCheckBox::stateChanged,
+#endif
+	 this, &configHandler::handle_saveSlides);
+
+
 //	sixth ine
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect (dcRemoval, &QCheckBox::checkStateChanged,
@@ -697,10 +700,6 @@
 	store (dabSettings, CONFIG_HANDLER, SWITCH_VALUE_SETTING, newV);
 }
 
-void	configHandler::handle_switchStaySetting	(int newV) {
-	store (dabSettings, CONFIG_HANDLER, SWITCH_STAY_SETTING, newV);
-}
-
 void	configHandler::handle_orderAlfabetical		() {
 	set_serviceOrder (ALPHA_BASED);
 	serviceOrder	= ALPHA_BASED;
@@ -893,10 +892,6 @@
 	return switchDelaySetting	-> value () * 1000;
 }
 
-int	configHandler::switchStayValue		() {
-	return switchStaySetting	-> value () * 60000;
-}
-

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

@@ -51,7 +51,6 @@
 	bool	upload_active		();
 	int	get_serviceOrder	();
 	int	switchDelayValue	();
-	int	switchStayValue		();
 	int	muteValue		();
 	
 	bool	closeDirect_active	();
@@ -80,13 +79,16 @@
 	bool	get_audioServices_only	();
 	bool	get_allTIISelector	();
 
+	bool	get_close_mapSelector	();
 	bool	get_dcRemoval		();
 	bool	get_saveTitles		();
 
+	bool	check_correctPhase	();
 	bool	get_clearScanList	();
 private:
 	RadioInterface	*myRadioInterface;
 	QSettings	*dabSettings;
+	bool		traceOn;
 	int		serviceOrder;
 	void		set_Colors		();
 	void		set_buttonColors	(QPushButton *b,
@@ -109,39 +111,47 @@
 	void	color_skinButton	();
 	void	color_pathButton	();
 //
+	void	handle_mapViewSelector		(int);
 //	and the handlers:
+	void	handle_tiiThreshold		(int);
+	void	handle_allTIISelector		(int);
 	void	handle_audioSelectButton	();
+	void	handle_pathButton		();
 	void	handle_upload_selector		(int);
 	void	handle_muteTimeSetting		(int);
 	void	handle_switchDelaySetting	(int);
-	void	handle_switchStaySetting	(int);
 	void	handle_orderAlfabetical		();
 	void	handle_orderServiceIds		();
 	void	handle_ordersubChannelIds	();
 	void	handle_portSelector		();
 	void	handle_skinSelector		();
-	void	handle_onTop			(int);
-	void	handle_localDB_Selector		(int);
+
+//	void	handle_upload_selector		(int);
 	void	handle_utc_selector		(int);
+	void	handle_auto_http		(int);
+//	void	handle_clear_on_exit		(int);
+
+	void	handle_localDB_Selector		(int);
 	void	handle_localBrowser		(int);
+	void	handle_onTop			(int);
+	void	handle_close_mapSelector	(int);
+
+//	void	handle_firstCorrelation		(int);
+//	void	handle_etiActivated		(int);
+//	void	handle_logger			(int);
+	void	handle_saveTitles		(int);
+
 	void	handle_showAll_Selector		(int);
 	void	handle_saveSlides		(int);
-	void	handle_decoderSelector		(const QString &s);
-	void	handle_tiiThreshold		(int);
-	void	handle_pathButton		();
-	void	handle_allTIISelector		(int);
 	void	handle_audioServices_only	(int);
-	void	handle_auto_http		(int);
-	
 	void	handle_dcRemoval		(int);
-	void	handle_saveTitles		(int);
-	void	handle_tiiCollisions		(int);
-	void	handle_tiiFilter		(int);
-
-	void	handle_tiiSelector		(int);
 
+	void	handle_decoderSelector		(const QString &s);
+	void	handle_tiiCollisions		(int);
 	void	handle_mouseClicked		();
-
+//
+//	for the tracer
+	void	handle_tracerButton		();
 signals:
 	void	selectDecoder		(int);
 	void	set_transmitters_local	(bool);
@@ -159,5 +169,6 @@
 	void	process_tiiFilter	(bool);
 
 	void	process_tiiSelector	(bool);
+	void	signal_dataTracer	(bool);
 };

qt-dab-6.10.tar.gz/sources/main/copyrightLabel.cpp Added

@@ -0,0 +1,209 @@
+#
+/*
+ * Copyright (C) 2015 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <QDateTime>
+#ifdef __WITH_FDK_AAC__
+#include <aacdecoder_lib.h>
+#else
+#include "neaacdec.h"
+#endif
+#include	"radio.h"
+
+#include	"copyrightLabel.h"
+
+	copyrightText::copyrightText (RadioInterface *theCaller,
+	 const QString &version):
+	 superFrame (nullptr) {
+//
+	titleLabel	= new QLabel;
+	titleLabel	-> setAlignment (Qt::AlignCenter);
+	titleLabel	-> setText ("Qt-DAB");
+
+	authorLabel	= new QLabel;
+	authorLabel	-> setText(tr("Qt-DAB is developed by")+" Jan van Katwijk (<a href=\"mailto:J.vanKatwijk@gmail.com\">J.vanKatwijk@gmail.com</a>)");
+ authorLabel	-> setTextInteractionFlags (Qt::TextBrowserInteraction);
+
+////////////////////////////////////////////////////////////////////////////
+//	version and build info
+	versionLabel	= new QLabel;
+	versionLabel	-> setText (QString("Current Version-6.%1").arg (version));
+//
+	qtVersionLabel	= new QLabel;
+	qtVersionLabel	-> setText (QString(tr("Qt-DAB uses Qt %1 and Qwt %2")).arg(QT_VERSION_STR). arg (QWT_VERSION_STR));
+
+///////////////////////////////////////////////////////////////////////////
+	QString support;
+#ifdef SSE_AVAILABLE
+ support = "(spiral + sse)";
+#elif NO_SSE_AVAILABLE
+ support = "(spiral scalar)";
+#elif __AVX2__
+ support = "(yang + avx2)";
+#elif __SSE4_1__
+ support = "(yang + sse)";
+#else
+ support = "(yang scalar)";
+#endif
+	QString theDate	= QString (__DATE__) + " " + QString (__TIME__);
+	buildLabel	= new QLabel;
+	buildLabel	-> setWordWrap (true);
+	buildLabel	-> setText (QString ("Built on ") + theDate + 
+ QString (", Commit ") + QString (GITHASH) + " with " + support);
+
+//	source location
+	sourceLocationLabel	= new QLabel;
+	sourceLocationLabel	-> setText ("Sources are at <a href=\"https://github.com/JvanKatwijk/qt-dab\">github> </a>");
+	sourceLocationLabel	-> setOpenExternalLinks (true);
+
+////////////////////////////////////////////////////////////////////////
+QString	aacSupport;
+#ifdef __WITH_FDK_AAC__
+	LIB_INFO libInfo FDK_MODULE_LAST;
+	FDKinitLibInfo (libInfo);
+	aacDecoder_GetLibInfo (libInfo);
+	
+	for (int i = 0; i < FDK_MODULE_LAST; i++) {
+	 if (libInfo i. module_id == FDK_AACDEC) {
+	 aacSupport = QString(libInfoi.title) + " "
+	 + QString(libInfoi.versionStr);
+	 break;
+	 }
+	}
+#else
+	aacSupport	= QString ("faad2 ") + QString (FAAD2_VERSION);
+#endif
+
+QString aacComment;
+#ifdef __WITH_FDK_AAC__
+	aacComment = "<li> " + aacSupport + " , <a href=\"https://github.com/mstorsjo/fdk-aac\">fdk-aac</a> Copyright © 1995 - 2018 Fraunhofer-Gesellschaft " +
+ "zur Förderung der angewandten Forschung e.V.</li>";
+#else
+	aacComment = "<li>" + aacSupport + " <a href=\"https://github.com/knik0/faad2\">FAAD2</a> Copyright © 2003-2005 M. Bakker, Nero AG</li>";
+#endif
+////////////////////////////////////////////////////////////////////
+//	we use a lot of libraries from others, ack their use
+///////////////////////////////////////////////////////////////////
+	librariesLabel	= new QLabel;
+	librariesLabel	-> setWordWrap (true);
+	librariesLabel -> setText (tr("Qt-DAB uses following libraries (and greatly acknowledges the copyright of their owners):")+
+ "<ul>" +
+	 "<li>The excellent Qt framework by Qt, and the Qwt library by Uwe Rathmann</li>" +
+ "<li><a href=\"www.fftw.org\">FFTW</a> by Matteo Frigo and Steven G Johnsom</li>" +
+ "<li><a href=\"https://github.com/Opendigitalradio/ka9q-fec\">Reed Solomon</a> by Phil Karn, KA9Q</li>" +
+ "<li><a href=\"https://www.spiral.net/software/viterbi.html\">viterbi code generator</a> by the Spiral project</li>" +
+ "<li><a href=\"https://github.com/williamyang98/ViterbiDecoderCpp\"> the excellent \"header only\" viterbi library</a> by William Yang, based on Phil Karn's library</li>" +
+ "<li><a href=\"www.portaudio.com/\">Portaudio</a> by Ross Bencina, Phil Burke and many others</li>" +
+ "<li>An MP2 decoder by Martin J Fiedler (martin.fiedler@gmx.net)</li>" +
+	 "<li>\"NewsService Journaline(R) Decoder\", CopyRight (c) 2003, 2001-2014 Fraunhofer IID, Erlangen, Germany</li>" +
+	 aacComment +
+				 "</ul>");
+/////////////////////////////////////////////////////////////////////////
+//	configuration
+////////////////////////////////////////////////////////////////////////
+
+	configurationLabel	= new QLabel;
+	configurationLabel -> setWordWrap (true);
+	configurationLabel -> setOpenExternalLinks (true);
+	configurationLabel -> setText (tr("This version of Qt-DAB is configured with:")+
+ "<ul>"
+#if defined (HAVE_SDRPLAY_V3) || defined (HAVE_SDRPLAY_V2)
+ "<li> All SDRplay RSP devices<a href=\"https://www.sdrplay.com/\">SDRplay/a></li>"
+#endif
+#if defined (HAVE_RTLSDR) || defined (HAVE_RTLSDR_V3) || defined ( HAVE_RTLSDR_V4)
+ "<li> rtlsdr dabstick <a href=\"https://osmocom.org/projects/rtl-sdr/wiki/rtl-sdr\">rtlsdr</a>with improvements from \"olddab\" </li>"
+#endif
+#ifdef HAVE_AIRSPY
+ "<li> Airspy devices <a href=\"https://github.com/airspy\">AirSpy</a></li>"
+#endif
+#ifdef	HAVE_HACKRF 
+ "<li>Hackrf devices<a href=\"https://greatscottgadgets.com/hackrf/one\">Hackrf One</a>.</li>"
+#endif
+#ifdef	HAVE_LIME 
+ "<li> Lime SDR devices<a href=\"https://limemicro.com/products/limesdr\">Lime sdr</a> by Lime micro systems</li>"
+#endif
+#ifdef	HAVE_PLUTO 
+ "<li>Adalm Pluto device<a href=\"https://www.analog.com/\">Adalm Pluto One</a></li>"
+#endif
+#ifdef	HAVE_RTL_TCP
+			 "<li>Client for RTL_TCP</li>"
+#endif
+#ifdef HAVE_SOAPY
+ "<li>Soapy interface<a href=\"https://github.com/pothosware/SoapySDR/wiki\">SoapySDR</a></li>"
+#endif
+#ifdef HAVE_SPYSERVER_16
+ "<li>SpyServer interface<a href=\"https://airspy.com/download/\">spyserver</a></li>"
+#endif
+ "<li> and has support for reading (and writing) files in different formats, including files (in xml and in RIFF/Raw64 format) with sizes larger than 4 Gb.</li>"
+	"</ul>");
+////////////////////////////////////////////////////////////////////////
+//	acknowlegdements
+////////////////////////////////////////////////////////////////////////
+	acknowledgementsLabel	= new QLabel;
+	acknowledgementsLabel -> setText (tr("Many people gave valuable feedback and input, Special thanks to") +
+ "<ul>"
+	 "<li> Herman Wijnants, for continuous suggestions and feedback</li>" +
+	 "<li> Andreas Mikula, for continuous support </li>" +
+	 "<li> Jarod Middelman, for continuous feedback</li>" +
+	 "<li> Stefan Poeschel, for providing code for saving AAC </li>" +
+	 "<li> Rolf Zerr, for improving code elements a.o TII decoder </li>" +
+	 "</ul>");
+//////////////////////////////////////////////////////////////////////////
+//	License issues
+///////////////////////////////////////////////////////////////////////////
+	disclaimerLabel	= new QTextEdit;
+	disclaimerLabel -> setText("Copyright © 2016-2026 Jan van Katwijk"
+ "Qt-DAB is distributed under the GPL V2 license "
+ "in the hope that it will be useful, "
+ "but WITHOUT ANA WARRANTY; without even the"
+ "implied warranty of MERCHANTIBILITY or FITNESS FOR, "
+ "A PARTICULAR PURPOSE. "
+ "This copyright notice shallbe included in all copies or substantial "
+ "portions of the Software.");
+//////////////////////////////////////////////////////////////////////////
+//	binding the "close" signal
+////////////////////////////////////////////////////////////////////////////
+	connect (this, &superFrame::frameClosed,
+	 theCaller, &RadioInterface::copyrightText_closed);
+////////////////////////////////////////////////////////////////////////////
+//	build up the layout
+///////////////////////////////////////////////////////////////////////////
+	theLayout	= new QVBoxLayout;
+	theLayout	-> addWidget (titleLabel);
+	theLayout	-> addWidget (versionLabel);
+	theLayout	-> addWidget (authorLabel);
+	theLayout	-> addWidget (buildLabel);
+	theLayout	-> addWidget (qtVersionLabel);
+	theLayout	-> addWidget (sourceLocationLabel);
+	theLayout	-> addWidget (librariesLabel);
+	theLayout	-> addWidget (configurationLabel);
+	theLayout	-> addWidget (acknowledgementsLabel);

qt-dab-6.10.tar.gz/sources/main/copyrightLabel.h Added

@@ -0,0 +1,52 @@
+#
+/*
+ * Copyright (C) 2015 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#pragma once
+
+#include	<QString>
+#include	<QLabel>
+#include	<QTextEdit>
+#include	<QVBoxLayout>
+#include	"super-frame.h"
+class	RadioInterface;
+
+class	copyrightText:public superFrame {
+Q_OBJECT
+public:
+	copyrightText	(RadioInterface *, const QString &);
+	~copyrightText	();
+private:
+
+	QLabel	*titleLabel;
+	QLabel	*authorLabel;
+	QLabel	*versionLabel;
+	QLabel	*buildLabel;
+	QLabel	*qtVersionLabel;
+	QLabel	*sourceLocationLabel;
+	QLabel	*librariesLabel;
+	QLabel	*configurationLabel;
+	QLabel	*acknowledgementsLabel;
+	QTextEdit	*disclaimerLabel;
+	QVBoxLayout	*theLayout;
+};
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/display-widget.cpp -> qt-dab-6.10.tar.gz/sources/main/display-widget.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2016 .. 2023
+ * Copyright (C) 2016 .. 2026
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -39,6 +39,9 @@
 
 #define	DISPLAY_WIDGET_SETTINGS	"displayWidget"
 
+#define	T_u	2048
+#define	carriers	1546
+
 	displayWidget::displayWidget	(RadioInterface	*mr,
 	 QSettings	*dabSettings):
 	 myFrame (nullptr),
@@ -331,28 +334,33 @@
 //	data is from the NULL period with TII data, after the
 //	FFT, we collapse to 192 "bin"s
 void	displayWidget::showTII	(std::vector<Complex> v, int freq, int marker) {
-floatQwt	X_axis 512;
+floatQwt	X_axis 512;	//	for the waterfall
 floatQwt	Y_value 512;
 
+	if (v. size () != T_u)
+	 return;
+
 	(void)freq;
-	if (currentTab != SHOW_TII)
+	if (currentTab != SHOW_TII)	// should not happen
 	 return;
 
 	theFFT. fft (v);
-//
+
 //	smoothen the data a little
 	for (uint32_t i = 0; i < v. size (); i ++)
-	 workingBuffer i = workingBuffer i * DABFLOAT (0.8) +
-	 abs (v i) * DABFLOAT (0.2);
+	 workingBuffer i = workingBuffer i * DABFLOAT (0.9) +
+	 abs (v i) * DABFLOAT (0.1);
 //
 //	in the regular scope we just show the data the tii decoder will
 //	be working on
-	floatQwt resVec 192;
-	for (int i = 0; i < 192; i ++) {
+	int startLoc	= T_u - carriers / 2;
+	floatQwt resVec carriers / 8;
+	for (int i = 0; i < carriers / 8; i ++) {
 	 resVec i = 0;
-	 for (int j = 0; j < 2; j ++) {
-	 int index = (1024 + 2 * i + j * 384) % 1024;
-	 resVec i += 2 * abs (workingBuffer index + workingBuffer index + 1);
+	 for (int j = 0; j < 4; j ++) {
+	 int index = ((startLoc + 2 * i + j * carriers / 4) % T_u);
+	 resVec i += 2 * workingBuffer index +
+	 workingBuffer index + 1;
 	 }
 	 X_axis i = i;
 	}
@@ -360,15 +368,18 @@
 	TII_Scope_p		-> display (X_axis, resVec, 96, 
 	 tiiSlider -> value (), marker);
 //
-//	for the waterfall we upsample from 192 -> 512
-	for (int i = 0; i < 512; i ++) {
-	 int index = (int)((float)i / 512 * 192);
-	 Y_value i = resVec index;
-	 X_axis i = index;
+//	for the waterfall we downsample again
+	for (int i = 0; i < T_u / 4; i ++) {
+	 Y_value i = 0;
+	 for (int j = 0; j < 4; j ++) {
+	 int index = (T_u / 2 + 4 * i + j) % T_u;
+	 Y_value i += workingBuffer index;
+	 }
+	 X_axis i = -T_u / 2 + 4 * i;
 	}
 
 	for (int i = 0; i < 512; i ++)
-	 Y_value i = 4 * (Y_value i - get_db (0)) / 8;
+	 Y_value i = (get_db (Y_value i) - get_db (0));
 	waterfallScope_p	-> display (X_axis, Y_value, 
 	 1.5 * waterfallSlider -> value (),
 	 96);

qt-dab-6.10.tar.gz/sources/main/dxDisplay.cpp Added

@@ -0,0 +1,311 @@
+#
+/*
+ * Copyright (C) 2024 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	"dxDisplay.h"
+#include	"radio.h"
+#include	"position-handler.h"
+#include	<QHeaderView>
+#include	<QHBoxLayout>
+#include	<qwt_compass.h>
+#include	<qlayout.h>
+#include	<qwt_compass_rose.h>
+#include	<qwt_dial_needle.h>
+#include	<QMap>
+
+static inline
+QString	convertNumber (uint16_t v) {
+uint16_t	firstDigit (v / 10);
+uint16_t	secondDigit (v % 10);
+	return QString::number (firstDigit) +
+	 QString::number (secondDigit);
+}
+
+	dxDisplay::dxDisplay (RadioInterface *mr, QSettings *s){
+	(void)mr;
+	dxSettings	= s;
+	myWidget	= new QScrollArea (nullptr);
+	myWidget	-> resize (220, 400);
+	myWidget	-> setWidgetResizable (true);
+
+	tableWidget 	= new QTableWidget (0, 13);
+	tableWidget	-> setColumnWidth (0, 30);	// mark
+	tableWidget	-> setColumnWidth (1, 50);	// pattern
+	tableWidget	-> setColumnWidth (2, 55);	// tii value
+	tableWidget	-> setColumnWidth (3, 50);	// phase
+	tableWidget	-> setColumnWidth (4, 60);	// strength
+	tableWidget	-> setColumnWidth (5, 70);	// azimuth
+	tableWidget	-> setColumnWidth (6, 80);	// distamce
+	tableWidget	-> setColumnWidth (7, 70);	// power
+	tableWidget	-> setColumnWidth (8, 50);	// altitude
+	tableWidget	-> setColumnWidth (9, 60);	// height
+	tableWidget	-> setColumnWidth (10, 60);	// direction
+	tableWidget	-> setColumnWidth (11, 80);	// delay
+	tableWidget	-> setColumnWidth (12, 250);	// transmitter
+
+	QHeaderView *headerView = tableWidget -> horizontalHeader ();
+	headerView	-> setSectionResizeMode (1, QHeaderView::Stretch);
+//	headerView	-> resizeSection (0, 50);
+	tableWidget 	-> setHorizontalHeaderLabels (
+	 QStringList () << tr ("x") << tr ("pat") <<
+	 tr ("tii") <<
+	 tr ("phase") <<
+	 tr ("strength") <<
+	 tr ("azimuth") << 
+	 tr ("dist") <<
+	 tr ("power") <<
+	 tr ("alt") <<
+	 tr ("height") <<
+	 tr ("dir") <<
+	 tr ("delay") <<
+	 tr ("transmitter")); 
+
+	theDial		= new QwtCompass ();
+	theDial		-> setLineWidth (8);
+
+	QMap<double, QString> map;
+	map.insert(0.0, "N");
+	map.insert(90.0, "E");
+	map.insert(180.0, "S");
+	map.insert(270.0, "W");
+
+	QwtSimpleCompassRose *rose = new QwtSimpleCompassRose( 4, 1 );
+ theDial->setRose( rose );
+	theDial -> setNeedle (
+	 new QwtCompassMagnetNeedle(QwtCompassMagnetNeedle::ThinStyle));
+	theDial -> setValue (220.0);
+
+	QHBoxLayout *l	= new QHBoxLayout ();
+	l -> addWidget (tableWidget);
+	l -> addWidget (theDial);
+	myWidget	-> setLayout (l);
+	myWidget	-> setWindowTitle ("dx display");
+	setPositionAndSize (s, myWidget, "DX_DISPLAY");
+	theChannel	= "";
+
+	connect (this, &superFrame::frameClosed,
+	 this, &dxDisplay::handle_frameClosed);
+}
+
+	dxDisplay::~dxDisplay () {
+	storeWidgetPosition (dxSettings, myWidget, "DX_DISPLAY");
+	int16_t	rows	= tableWidget -> rowCount ();
+	for (int row = rows; row > 0; row --)
+	 tableWidget -> removeRow (row);
+	delete	tableWidget;
+	delete	myWidget;
+}
+
+void	dxDisplay::storePosition () {
+	return;
+	if (!myWidget -> isHidden ())
+	 storeWidgetPosition (dxSettings, myWidget, "DX_DISPLAY");
+	myWidget	-> hide ();
+}
+
+void	dxDisplay::setChannel (const QString &channel,
+	 const QString &ensemble) {
+	myWidget -> setWindowTitle ("TII data: channel " +channel + " ensemble: " + ensemble);
+	theChannel	= channel;
+}
+
+void	dxDisplay::cleanUp	() {
+	int16_t	rows	= tableWidget -> rowCount ();
+	for (int row = rows; row >= 0; row --)
+	 tableWidget -> removeRow (row);
+	myWidget -> setWindowTitle ("dx display");
+	theChannel	= "";
+}
+
+int	dxDisplay::nrRows	() {
+	return tableWidget -> rowCount ();
+}
+
+void	dxDisplay::show	() {
+	myWidget	-> show ();
+}
+
+void	dxDisplay::hide	() {
+	myWidget	-> hide ();
+}
+
+bool	dxDisplay::isHidden () {
+	return myWidget	-> isHidden ();
+}
+
+void	dxDisplay::addRow (transmitter &theTransmitter, bool isStrongest) {
+int16_t	row	= tableWidget -> rowCount ();
+
+	const QString &transmitterName = theTransmitter. transmitterName;	
+	uint16_t pattern	= theTransmitter. pattern;
+	int mainId		= theTransmitter. mainId;
+	int subId		= theTransmitter. subId;
+	bool	etsi		= theTransmitter. norm;
+	float	phase		= theTransmitter. phase;
+	float	strength	= 10 * log10 (theTransmitter. strength + 0.01);
+	float distance		= theTransmitter. distance;
+	float delay		= (distance * 1000) / 299792458.0 * 2048000;
+	float azimuth		= theTransmitter. azimuth;
+	float power		= theTransmitter. power;
+	int altitude		= theTransmitter. altitude;
+	int height		= theTransmitter. height;
+	const QString &dir	= theTransmitter. direction;
+	bool	b		= isStrongest;
+
+	tableWidget	-> insertRow (row);	// the mark
+	QTableWidgetItem *item0	= new QTableWidgetItem;
+	item0		-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 0, item0);
+
+	QTableWidgetItem *item1 = new QTableWidgetItem;	// pattern
+	item1		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 1, item1);
+
+	QTableWidgetItem *item2 = new QTableWidgetItem;	// tii data
+	item2		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 2, item2);
+
+	QTableWidgetItem *item3 = new QTableWidgetItem;	 // etsi
+	item3		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 3, item3);
+
+	QTableWidgetItem *item4 = new QTableWidgetItem;	 // strength
+	item4		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 4, item4);
+
+	QTableWidgetItem *item6 = new QTableWidgetItem;	// azimuth
+	item6		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 6, item6);
+
+	QTableWidgetItem *item5 = new QTableWidgetItem;	// dist
+	item5		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 5, item5);

qt-dab-6.10.tar.gz/sources/main/dxDisplay.h Changed

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

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

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

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>521</width>
- <height>440</height>
+ <width>542</width>
+ <height>423</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -18,46 +18,50 @@
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_3">
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
 <item>
- <widget class="QCheckBox" name="tiiSelector">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB supports two different implementations for detecting TII values.&lt;/p&gt;&lt;p&gt;The &amp;quot;new&amp;quot; one (selected if checked) is very sensitive and if your antenna is too good might give too many false TII's&lt;/p&gt;&lt;p&gt;The old one is less senstive, but then, gives less false positives&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The new algorithm shows also phase data, with which an estimate is (can be) made what the delay of the signal is, and it supports looking for collisions with given subIds.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The old one is less fancy, shows only 0 for phase and does not support collisions.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>new tii detector</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="orderServiceIds">
- <property name="text">
- <string>serviceIds</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="orderAlfabetical">
- <property name="text">
- <string>alphabetically</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="ordersubChannelIds">
- <property name="text">
- <string>subchannelIds</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QRadioButton" name="orderServiceIds">
+ <property name="text">
+ <string>serviceIds</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="orderAlfabetical">
+ <property name="text">
+ <string>alphabetically</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="ordersubChannelIds">
+ <property name="text">
+ <string>subchannelIds</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="mapViewSelector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB provides the possibility of storing a representation of the map elements into a file, and showing the map off-line.&lt;/p&gt;&lt;p&gt;Having set this selector, instructs Qt-DAB to store a representation of the elements on the map into a file.&lt;/p&gt;&lt;p&gt;Name of the file is XXXYYY.xml, where XXX tells the name of the device used, and YYY tells the time and date of the &amp;quot;recording&amp;quot;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>mapview</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </item>
@@ -84,16 +88,6 @@
 </widget>
 </item>
 <item>
- <widget class="QCheckBox" name="tiiFilter">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;It shows that setting a lower threshold value allows (too) many false tii messages. A filter can be selected that inspects the potential tii values and blocks some of thoese that seem false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>tii filter</string>
- </property>
- </widget>
- </item>
- <item>
 <widget class="QCheckBox" name="allTIISelector">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If/when the threshold value for the TII detection is too low, the TII detector will &amp;quot;detect&amp;quot; non-existent transmitters. While some users want to see anythings that is detected, others (including myself) only want the &amp;quot;real&amp;quot; transmitters to appear on the DX display.&lt;/p&gt;&lt;p&gt;While by default the setting is &amp;quot;on&amp;quot;, switchin the selector 's value to &amp;quot;off&amp;quot; tells the software to show only transmitters known by the database.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -158,6 +152,16 @@
 </widget>
 </item>
 <item>
+ <widget class="smallPushButton" name="skinButton">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select one of a few &amp;quot;skin&amp;quot;s for the widgets in the program. Will be effective the next program invocation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>skin</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="smallPushButton" name="audioSelectButton">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose between portaudio or Qt-audio as audio handler (will be effective next program invocation). Note that if no audio channels for the Qt_audio driver can be found, the default setting of portaudio is applied.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -232,19 +236,6 @@
 </property>
 </widget>
 </item>
- <item row="1" column="1">
- <widget class="smallSpinBox" name="switchDelaySetting">
- <property name="toolTip">
- <string>Set here the delay, when searching for data in a channel, in seconds</string>
- </property>
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>99999</number>
- </property>
- </widget>
- </item>
 <item row="1" column="0">
 <widget class="QLabel" name="label_2">
 <property name="toolTip">
@@ -255,20 +246,13 @@
 </property>
 </widget>
 </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>stay time (in min)</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="smallSpinBox" name="switchStaySetting">
+ <item row="1" column="1">
+ <widget class="smallSpinBox" name="switchDelaySetting">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Once - with scanning in single mode - a DAB stream is detected in a channel, the channel will stay &amp;quot;on&amp;quot; for the amount of minutes specified here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>Set here the delay, when searching for data in a channel, in seconds</string>
 </property>
 <property name="minimum">
- <number>1</number>
+ <number>2</number>
 </property>
 <property name="maximum">
 <number>99999</number>
@@ -447,12 +431,9 @@
 </widget>
 </item>
 <item row="1" column="5">
- <widget class="smallPushButton" name="skinButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select one of a few &amp;quot;skin&amp;quot;s for the widgets in the program. Will be effective the next program invocation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
+ <widget class="smallPushButton" name="tracerButton">
 <property name="text">
- <string>skin</string>
+ <string/>
 </property>
 </widget>
 </item>
@@ -490,13 +471,20 @@
 </property>
 </widget>
 </item>
+ <item row="0" column="3">

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/dabradio-6.ui -> qt-dab-6.10.tar.gz/sources/main/forms-v7/dabradio-6.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>618</width>
- <height>337</height>
+ <height>316</height>
 </rect>
 </property>
 <property name="sizePolicy">
@@ -60,7 +60,7 @@
 <x>0</x>
 <y>0</y>
 <width>239</width>
- <height>183</height>
+ <height>162</height>
 </rect>
 </property>
 </widget>
@@ -139,7 +139,7 @@
 </layout>
 </item>
 <item>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout_6">
 <item>
@@ -223,7 +223,7 @@
 <item>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
- <widget class="QLabel" name="epgLabel">
+ <widget class="clickablelabel" name="epgLabel">
 <property name="text">
 <string/>
 </property>
@@ -281,6 +281,13 @@
 </widget>
 </item>
 <item>
+ <widget class="QLabel" name="protectionLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QLabel" name="rateLabel">
 <property name="text">
 <string>ratelabel</string>
@@ -330,102 +337,106 @@
 </widget>
 </item>
 <item>
- <widget class="QSlider" name="volumeSlider">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Volume slider is part of the Qt_Audio audio subsystem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout">
 <item>
- <widget class="QwtThermo" name="leftAudio">
- <property name="maximumSize">
- <size>
- <width>15</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LayoutDirection::RightToLeft</enum>
- </property>
- <property name="lowerBound">
- <double>-20.000000000000000</double>
- </property>
- <property name="upperBound">
- <double>0.000000000000000</double>
- </property>
- <property name="scaleMaxMajor">
- <number>9</number>
- </property>
- <property name="scaleMaxMinor">
- <number>2</number>
- </property>
- <property name="scaleStepSize">
- <double>3.000000000000000</double>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- <property name="scalePosition">
- <enum>QwtThermo::ScalePosition::TrailingScale</enum>
- </property>
- <property name="originMode">
- <enum>QwtThermo::OriginMode::OriginMinimum</enum>
- </property>
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="pipeWidth">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QwtThermo" name="rightAudio">
- <property name="maximumSize">
- <size>
- <width>15</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LayoutDirection::LeftToRight</enum>
- </property>
- <property name="lowerBound">
- <double>-20.000000000000000</double>
- </property>
- <property name="upperBound">
- <double>0.000000000000000</double>
- </property>
- <property name="scaleMaxMajor">
- <number>9</number>
- </property>
- <property name="scaleMaxMinor">
- <number>4</number>
- </property>
- <property name="scaleStepSize">
- <double>3.000000000000000</double>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- <property name="scalePosition">
- <enum>QwtThermo::ScalePosition::TrailingScale</enum>
- </property>
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="borderWidth">
- <number>1</number>
- </property>
- <property name="pipeWidth">
- <number>6</number>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QSlider" name="volumeSlider">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Volume slider is part of the Qt_Audio audio subsystem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtThermo" name="leftAudio">
+ <property name="maximumSize">
+ <size>
+ <width>15</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LayoutDirection::RightToLeft</enum>
+ </property>
+ <property name="lowerBound">
+ <double>-20.000000000000000</double>
+ </property>
+ <property name="upperBound">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="scaleMaxMajor">
+ <number>9</number>
+ </property>
+ <property name="scaleMaxMinor">
+ <number>2</number>
+ </property>
+ <property name="scaleStepSize">
+ <double>3.000000000000000</double>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Vertical</enum>
+ </property>
+ <property name="scalePosition">
+ <enum>QwtThermo::ScalePosition::TrailingScale</enum>
+ </property>
+ <property name="originMode">
+ <enum>QwtThermo::OriginMode::OriginMinimum</enum>
+ </property>
+ <property name="spacing">
+ <number>2</number>
+ </property>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/scopewidget.ui -> qt-dab-6.10.tar.gz/sources/main/forms-v7/scopewidget.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>780</width>
- <height>607</height>
+ <height>507</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -29,7 +29,7 @@
 <property name="maximumSize">
 <size>
 <width>16777215</width>
- <height>301</height>
+ <height>235</height>
 </size>
 </property>
 <property name="toolTip">
@@ -55,7 +55,7 @@
 <property name="minimumSize">
 <size>
 <width>0</width>
- <height>175</height>
+ <height>170</height>
 </size>
 </property>
 <property name="toolTip">
@@ -71,7 +71,7 @@
 </attribute>
 <layout class="QVBoxLayout" name="verticalLayout">
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
 <item>
 <widget class="QSlider" name="correlationSlider">
 <property name="value">
@@ -84,6 +84,12 @@
 </item>
 <item>
 <widget class="QwtPlot" name="correlationDisplay">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>165</height>
+ </size>
+ </property>
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fine time synchronization is by correlation. Ideally the match is on or around the 504-th sample.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
@@ -239,7 +245,7 @@
 </widget>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
 <item>
 <widget class="QSlider" name="waterfallSlider">
 <property name="maximum">
@@ -258,7 +264,7 @@
 <property name="maximumSize">
 <size>
 <width>448</width>
- <height>232</height>
+ <height>171</height>
 </size>
 </property>
 <property name="toolTip">
@@ -481,19 +487,6 @@
 </item>
 </layout>
 </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
 </layout>
 </item>
 </layout>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/forms-v7/technical_data.ui -> qt-dab-6.10.tar.gz/sources/main/forms-v7/technical_data.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>313</width>
- <height>733</height>
+ <width>309</width>
+ <height>660</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -58,16 +58,6 @@
 </layout>
 </item>
 <item>
- <widget class="smallPushButton" name="timeTable_button">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If an EPG service is active then - at least after some time - it is possible that the EPG handler has processed time table data.&lt;/p&gt;&lt;p&gt;Touching this button will activate the time table handler. If no time table can be found it will be reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>timeTable</string>
- </property>
- </widget>
- </item>
- <item>
 <layout class="QFormLayout" name="formLayout_2">
 <item row="0" column="0">
 <widget class="QLabel" name="label_3">
@@ -85,14 +75,14 @@
 <string>0</string>
 </property>
 <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
 <item row="1" column="0">
 <widget class="QLabel" name="label">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The data in the body of the DAB frame is organized in units of 64 bytes. The start address indicates the start address in the appropriate buffer in units.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The data in the body of the DAB frame is organized in usits of 64 bytes. The start address indicates the start address in the appropriate buffer in units.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>Start Address of CU</string>
@@ -105,7 +95,7 @@
 <string>0</string>
 </property>
 <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
@@ -125,7 +115,7 @@
 <string>0</string>
 </property>
 <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
@@ -142,7 +132,7 @@
 <string>0</string>
 </property>
 <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
@@ -151,97 +141,45 @@
 <item>
 <layout class="QGridLayout" name="gridLayout_2">
 <item row="0" column="0">
- <widget class="QLabel" name="label_5">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>17</height>
- </size>
- </property>
- <property name="text">
- <string>Prot. level:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="uepField">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows Protection Level and Type (A or B)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>uepField</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_12">
- <property name="text">
- <string>code rate:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="codeRate">
- <property name="text">
- <string>TextLabel</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
 <widget class="QLabel" name="label_8">
 <property name="text">
 <string>Type:</string>
 </property>
 </widget>
 </item>
- <item row="2" column="1">
+ <item row="0" column="1">
 <widget class="QLabel" name="ASCTy">
 <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
+ <enum>QFrame::Shape::NoFrame</enum>
 </property>
 <property name="text">
 <string>ASCTy</string>
 </property>
 <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
- <item row="3" column="0">
+ <item row="1" column="0">
 <widget class="QLabel" name="label_9">
 <property name="text">
 <string>Language:</string>
 </property>
 </widget>
 </item>
- <item row="3" column="1">
+ <item row="1" column="1">
 <widget class="QLabel" name="language">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Language (defined by provider)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
+ <enum>QFrame::Shape::NoFrame</enum>
 </property>
 <property name="text">
 <string>language</string>
 </property>
 <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
@@ -349,7 +287,7 @@
 </size>
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality of the DAB+ frames. &lt;/p&gt;&lt;p&gt;Indicator for the amount of times the frames contain more errors than the Reed Solomon correction could correct. &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;Quality of the DAB+ frames. &lt;/p&gt;&lt;p&gt;Indicator for the amount of times meaning the frames contain more errors than the Reed Solomon correction can correct. &lt;/p&gt;&lt;p&gt;100 is good.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="styleSheet">
 <string notr="true">QProgressBar::chunk { background: #e6e600; }</string>
@@ -373,7 +311,7 @@
 <item row="0" column="0">
 <widget class="QLabel" name="label_4">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The average number of corrections by the Reed Solomon procedure. The RS procedure is able to fix up to 5 erroneous bytes in a segment of 110 bytes.&lt;/p&gt;&lt;p&gt;The number tells how many errors were fiixed per 100 frames&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The average number of corrections by the Reed Solomon procedure. The RS procesure is able to fix up to 5 erroneous bytes in a segment of 110 bytes.&lt;/p&gt;&lt;p&gt;The number tells how many errors were fiixed per 100 frames&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>rs corrections/100</string>
@@ -386,17 +324,17 @@
 <string>The number of corrections made by the reed-solomon algorithm over 10 DAB+ frames (so the number does not relate to the classic DAB/MP2 frames)</string>
 </property>
 <property name="frameShape">
- <enum>QFrame::NoFrame</enum>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/radio.cpp -> qt-dab-6.10.tar.gz/sources/main/radio.cpp Changed

@@ -32,6 +32,7 @@
 #include	<QColorDialog>
 #include	<QToolTip>
 #include	<QKeyEvent>
+#include	<QDesktopServices>
 #include	<fstream>
 #include	"dab-constants.h"
 #include	"mot-content-types.h"
@@ -48,10 +49,10 @@
 #include	"ITU_Region_1.h"
 #include	"coordinates.h"
 #include	"mapport.h"
-#include	"techdata.h"
-#include	"aboutdialog.h"
+#include	"tech-window.h"
 #include	"db-element.h"
 #include	"distances.h"
+#include	"timetable-control.h"
 #include	"position-handler.h"
 #include	"settings-handler.h"
 #ifdef	TCP_STREAMER
@@ -74,6 +75,8 @@
 
 #include	<filesystem>
 
+#include	"copyrightLabel.h"
+
 namespace	fs= std::filesystem;
 
 #if defined (__MINGW32__) || defined (_WIN32)
@@ -180,27 +183,26 @@
 	 theScanlistHandler (this,
 	 scanListFile),
 	 theErrorLogger (Si),
-	 theDeviceChoser (&theErrorLogger, Si),
+	 theDeviceChooser (&theErrorLogger, Si),
 	 theDXDisplay (this, Si),
 	 theLogger	(Si),
 	 theSCANHandler (this, Si,
 	 freqExtension),
 	 theTIIProcessor (),
-	 myTimeTable (this, Si),
-	 epgVertaler (&theErrorLogger) {
+	 theEpgCompiler (&theErrorLogger) {
 int16_t k;
 QString h;
 
-	dabSettings_p			= Si;
+	theQSettings			= Si;
 	this	-> error_report		= error_report;
 	this	-> fmFrequency		= fmFrequency;
 	this	-> dlTextFile		= nullptr;
-	this	-> the_aboutLabel	= nullptr;
+	this	-> thecopyrightLabel	= nullptr;
 	running. 		store (false);
 	stereoSetting			= false;
-	contentTable_p			= nullptr;
-	scanTable_p			= nullptr;
-	mapHandler			= nullptr;
+	theContentTable			= nullptr;
+	theScanTable			= nullptr;
+	mapViewer			= nullptr;
 	theDXDisplay. hide ();
 //	"globals" is introduced to reduce the number of parameters
 //	for the ofdmHandler
@@ -215,28 +217,28 @@
 	globals. stdDevBuffer	= &stdDevBuffer;
 
 	globals. dabMode =
-	 value_i (dabSettings_p, DAB_GENERAL, "dabMode", 1);
+	 value_i (theQSettings, DAB_GENERAL, "dabMode", 1);
 	globals. threshold		=
-	 value_i (dabSettings_p, DAB_GENERAL, "threshold", 3);
+	 value_i (theQSettings, DAB_GENERAL, "threshold", 3);
 	globals. diff_length	=
-	 value_i (dabSettings_p, DAB_GENERAL, "diff_length", DIFF_LENGTH);
+	 value_i (theQSettings, DAB_GENERAL, "diff_length", DIFF_LENGTH);
 	globals. tii_delay =
-	 value_i (dabSettings_p, DAB_GENERAL, "tii_delay", 3);
-	if (globals. tii_delay < 2)
-	 globals. tii_delay	= 2;
+	 value_i (theQSettings, DAB_GENERAL, "tii_delay", 3);
+	if (globals. tii_delay < 3)
+	 globals. tii_delay	= 3;
 	globals. tii_depth =
-	 value_i (dabSettings_p, DAB_GENERAL, "tii_depth", 4);
+	 value_i (theQSettings, DAB_GENERAL, "tii_depth", 4);
 	globals. echo_depth =
-	 value_i (dabSettings_p, DAB_GENERAL, "echo_depth", 1);
+	 value_i (theQSettings, DAB_GENERAL, "echo_depth", 1);
 
 #ifdef	_SEND_DATAGRAM_
-	ipAddress	= value_s (dabSettings_p, "DATAGRAM",
+	ipAddress	= value_s (theQSettings, "DATAGRAM",
 	 "ipAddress", "127.0.0.1");
-	port		= value_i (dabSettings_p, "DATAGRAM",
+	port		= value_i (theQSettings, "DATAGRAM",
 	 "port" 8888);
 #endif
 //	set on top or not? checked at start up
-	if (value_i (dabSettings_p, DAB_GENERAL, "onTop", 0) == 1) 
+	if (value_i (theQSettings, DAB_GENERAL, "onTop", 0) == 1) 
 	 setWindowFlags (windowFlags () | Qt::WindowStaysOnTopHint);
 //
 //	signal strength icons
@@ -268,65 +270,60 @@
 	 folder_shower -> setPixmap (p. scaled (30, 30, Qt::KeepAspectRatio));
 	}
 
-
 	runtimeDisplay	-> hide ();
 //
 	connect (folder_shower, &clickablelabel::clicked,
 	 this, &RadioInterface::handle_folderButton);
-	dxMode = value_i (dabSettings_p, CONFIG_HANDLER, S_DX_MODE, 0) != 0;
-	tiiButton -> setText (dxMode ? "tii local" : "dx display");
-	connect (tiiButton, &QPushButton::clicked,
-	 this, &RadioInterface::handle_tiiButton);
+	dxMode = value_i (theQSettings, CONFIG_HANDLER, S_DX_MODE, 0) != 0;
+	connect (distanceLabel, &clickablelabel::clicked,
+	 this, &RadioInterface::handle_distanceLabel);
 
 //	put the widgets in the right place and create the workers
-	setPositionAndSize	(dabSettings_p, this, S_MAIN_WIDGET);
+	setPositionAndSize	(theQSettings, this, S_MAIN_WIDGET);
 
-	configHandler_p		= new configHandler (this, dabSettings_p);
-	theEnsembleHandler. reset (new ensembleHandler (this, dabSettings_p,
+	theConfigHandler		= new configHandler (this, theQSettings);
+	theEnsembleHandler. reset (new ensembleHandler (this, theQSettings,
 	 presetFile));
 //	we have the configuration handler and the ensemble handler,
 //	connect some signals directly
-	configHandler_p		-> set_activeServices (0);
-	configHandler_p		-> set_connections ();
+	theConfigHandler		-> set_activeServices (0);
+	theConfigHandler		-> set_connections ();
 
-	connect (configHandler_p, &configHandler::frameClosed,
+	connect (theConfigHandler, &configHandler::frameClosed,
 	 this, &RadioInterface::handle_configFrame_closed);
-	connect (configHandler_p, &configHandler::handle_fontSelect,
+	connect (theConfigHandler, &configHandler::handle_fontSelect,
 	 theEnsembleHandler. data (),
 	 &ensembleHandler::handleFontSelect);
-	connect (configHandler_p,
+	connect (theConfigHandler,
 	 &configHandler::handle_fontSizeSelect,
 	 theEnsembleHandler. data (),
 	 &ensembleHandler::handleFontSizeSelect);
-	connect (configHandler_p,
+	connect (theConfigHandler,
 	 &configHandler::handle_fontColorSelect,
 	 theEnsembleHandler. data (),
 	 &ensembleHandler::handleFontColorSelect);
-	connect (configHandler_p, &configHandler::set_serviceOrder,
+	connect (theConfigHandler, &configHandler::set_serviceOrder,
 	 theEnsembleHandler. data (),
 	 &ensembleHandler::setServiceOrder);
+	connect (theConfigHandler, &configHandler::signal_dataTracer,
+	 this, &RadioInterface::signal_dataTracer);
+
 	connect (&theNewDisplay, &displayWidget::frameClosed,
 	 this, &RadioInterface::handle_newDisplayFrame_closed);
 //
 //	Seen at DABstar, having a preloaded database seems nice
 //	although it may not be up to date
-	if (value_i (dabSettings_p, CONFIG_HANDLER, "localDB", 1) != 0) {
+	if (value_i (theQSettings, CONFIG_HANDLER, "localDB", 1) != 0) {
 	 theTIIProcessor. reload (":res/txdata.tii");
 	}
 	else
 	 theTIIProcessor. reload (tiiFile);
 	if (std::filesystem::exists (tiiFile. toLatin1 (). data ())) 
-	 configHandler_p -> enable_loadLib ();
+	 theConfigHandler -> enable_loadLib ();
 	else
 	 httpButton	-> setEnabled (false);
 
-//#ifdef HAVE_RTLSDR_V3
-//	SystemVersion	= QString ("9.5") + " with RTLSDR-V3";
-//#elif HAVE_RTLSDR_V4
-//	SystemVersion	= QString ("9.5") + " with RTLSDR-V4";
-//#else
-	SystemVersion	= QString ("9.5");
-//#endif
+	SystemVersion	= QString ("10");
 #if QT_VERSION > QT_VERSION_CHECK (6, 0, 0)
 	version		= "Qt6-DAB-6." + SystemVersion ;
 #else
@@ -341,22 +338,24 @@
 	 &ensembleHandler::start_background_task,
 	 this, &RadioInterface::handle_backgroundTask);
 	 
-	techWindow_p	= new techData (this, dabSettings_p, &theTechData);
+	theTechWindow	= new techWindow (this, theQSettings, &theTechData);
 	
-	connect (techWindow_p, &techData::frameClosed,
+	connect (theTechWindow, &techWindow::frameClosed,
 	 this, &RadioInterface::handle_techFrame_closed);

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/radio.h -> qt-dab-6.10.tar.gz/sources/main/radio.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2016 .. 2024
+ * Copyright (C) 2016 .. 2025
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -77,6 +77,8 @@
 #include	<QScopedPointer>
 #include	"journaline-datahandler.h"
 
+class	copyrightText;
+
 typedef struct {
 	uint32_t serviceId;
 	std::vector<multimediaElement> elements;
@@ -87,13 +89,13 @@
 class	deviceHandler;
 class	audioPlayer;
 class	common_fft;
-class	timeTableHandler;
+class	timeTableControl;
 class	audioDisplay;
 #ifdef	HAVE_PLUTO_RXTX
 class	dabStreamer;
 #endif
 
-class techData;
+class techWindow;
 //#include	"ui_config-helper.h"
 class	configHandler;
 
@@ -113,7 +115,6 @@
 #define NEXTSERVICE_BUTTON	QString ("nextServiceButton")
 #define	CONFIG_BUTTON		QString ("configButton")
 #define	HTTP_BUTTON		QString ("httpButton")
-#define	TII_BUTTON		QString ("tiiButton")
 /*
 *	The main gui object. It inherits from
 *	QWidget and the generated form
@@ -156,13 +157,8 @@
 	int	second;
 };
 
-//typedef struct {
-//	uint32_t serviceId;
-//	std::vector<multimediaElement> elements;
-//} mmDescriptor;
-//
-//	Pretty important, the channel descriptor is supposed to
-//	contain all data related to the currently selected class
+//	The channel descriptor is supposed to
+//	contain all data related to the currently selected channel
 
 class	channelDescriptor {
 public:
@@ -171,34 +167,37 @@
 }
 	~channelDescriptor () {
 }
-
+//
+	QDate		theDate;
+//	static channel info
 	QString		channelName;
-	int		tunedFrequency;
-	bool		realChannel;
-	bool		etiActive;
-	QString		ensembleName;
 	uint32_t	Eid;
+	QString		ensembleName;
+	QString		countryName;
+	int		tunedFrequency;
 	int		nrServices;	// measured
 	int		serviceCount;	// from FIC or nothing
-	dabService	currentService;
-	std::vector<dabService> runningTasks;
+	bool		realChannel;	// false if file input
 	bool		hasEcc;
 	uint8_t		eccByte;
 	int		lto;
-	QString		countryName;
+//	info on the transmitters seen
 	int		nrTransmitters;
 	std::vector<transmitter>	transmitters;
-	QString		transmitterName;
-	int		snr;
-	bool		announcing;
+	QString		strongestTransmitter;
 	position	targetPos;
-	QDate		theDate;
 	int8_t		mainId;
 	int8_t		subId;
 	float		height;
 	float		distance;
 	float		azimuth;
+	int		snr;
+//	info on services
+	dabService	currentService;
 	bool		audioActive;
+	bool		etiActive;	//
+	bool		announcing;
+	std::vector<dabService> runningTasks;
 	std::vector<mmDescriptor>servicePictures;
 	void	cleanChannel () {
 	 transmitters. resize (0);
@@ -216,14 +215,12 @@
 	 targetPos		= position {0, 0};
 	 mainId		= -1;
 	 subId		= -1;
-	 transmitterName	= "";
+	 strongestTransmitter	= "";
 	 snr			= 0;
 	 announcing		= false;
 	 height		= -1;
 	 distance		= -1;
 	 audioActive	 	= false;
-	 currentService. isValid	= false;
-	 currentService. frameDumper	= nullptr;
 	}
 };
 
@@ -272,115 +269,59 @@
 
 	scanListHandler		theScanlistHandler;
 	errorLogger		theErrorLogger;
-	deviceChooser		theDeviceChoser;
+	deviceChooser		theDeviceChooser;
 	dxDisplay		theDXDisplay;
 	logger			theLogger;
 	scanHandler		theSCANHandler;
 	tiiMapper		theTIIProcessor;
-	timeTableHandler	myTimeTable;
-	xmlExtractor		xmlHandler;
-	epgCompiler		epgVertaler;
+	xmlExtractor		theXmlExtractor;
+	epgCompiler		theEpgCompiler;
 //	end of variables that are initalized
 
 	QScopedPointer<ensembleHandler> theEnsembleHandler;
-//	QScopedPointer<configHandler>	configHandler_p;
-//	QScopedPointer<ofdmHandler>	theOFDMHandler;
-//	QScopedPointer<techData>	techWindow_p;
-	configHandler			*configHandler_p;
-	techData			*techWindow_p;
-	ofdmHandler			*theOFDMHandler;
-	deviceHandler			*inputDevice_p;
-	bool				autoStart_http		();
-	bool				dxMode;
+	configHandler			*theConfigHandler;
+	techWindow			*theTechWindow;
+	ofdmHandler			*theOfdmHandler;
+	deviceHandler			*theDeviceHandler;
 	journaline_dataHandler		*journalineHandler;
-	int				journalineKey;
-//
-//	Since the local position does not depend on the channel selected
-//	the local position is not stored in the channel data
-	position		localPos;
-	dabService		nextService;
-	std::vector<QPixmap>	strengthLabels;
-	httpHandler		*mapHandler;
-	processParams		globals;
-	QString			SystemVersion;
-	QString			version;
-	int			fmFrequency;
-	contentTable		*contentTable_p;
-	contentTable		*scanTable_p;
-	channelDescriptor	channel;
-	QDialog			*the_aboutLabel;
-	bool			error_report;
-	QSettings		*dabSettings_p;
-	int16_t			tii_delay;
-	int32_t			dataPort;
-	bool			stereoSetting;
-	std::atomic<bool>	running;
-//
-	QString			labelStyle;
+	httpHandler			*mapViewer;
+	contentTable			*theContentTable;
+	contentTable			*theScanTable;
+	copyrightText			*thecopyrightLabel;
+	QSettings			*theQSettings;
 #ifdef	HAVE_PLUTO_RXTX
-	dabStreamer		*streamerOut_p;
+	dabStreamer			*theDabStreamer;
 #endif
-	audioPlayer		*soundOut_p;
+	audioPlayer			*theAudioPlayer;
 #ifdef	DATA_STREAMER
-	tcpServer		*dataStreamer_p;
+	tcpServer			*theDataStreamer;
 #endif
 #ifdef	CLOCK_STREAMER
-	tcpServer		*clockStreamer_p;
+	tcpServer			*theClockStreamer;
 #endif
-	QTimer			pauzeTimer;
-	QTimer			stressTimer;

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

@@ -33,13 +33,13 @@
 	 dabSettings (dabSettings_i),
 	 plotGrid (plotGrid_i),
 	 spectrumCurve (""),
-	 fft (2048, false) {
+	 fft (1024, false) {
 
 int16_t	i;
 QString	colorString;
 
-	displaySize			= 512;
-	spectrumSize			= 2048;
+	displaySize			= 256;
+	spectrumSize			= 1024;
 	normalizer			= 16 * 2048;
 
 	for (int i = 0; i < displaySize; i ++)
@@ -81,7 +81,7 @@
 connect (lm_picker, qOverload<const QPointF&>(&QwtPlotPicker::selected),
 this, &audioDisplay::rightMouseClick);
 
- 	spectrumCurve. setPen (QPen (curveColor, 2.0));
+ 	spectrumCurve. setPen (QPen (curveColor, 3.0));
 	spectrumCurve. setOrientation (Qt::Horizontal);
 	spectrumCurve. setBaseline	(get_db (0));
 	if (brush) {
@@ -105,7 +105,7 @@
 	 int amount, int sampleRate) {
 auto X_axis	= dynVec (floatQwt, displaySize);
 auto Y_values	= dynVec (floatQwt, displaySize);
-int16_t	averageCount	= 3;
+int16_t	averageCount	= 5;
 
 	if (amount > spectrumSize)
 	 amount = spectrumSize;

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

@@ -101,8 +101,8 @@
 	 int amount,
 	 int sliderValue,
 	 const std::vector<corrElement> &ss) {
-auto *X_axis	= dynVec (floatQwt, amount);
-auto *Y_value	= dynVec (floatQwt, amount);
+floatQwt X_axis amount;
+floatQwt Y_value amount;
 floatQwt Max	= -200;
 floatQwt Min	= 1000;
 int	teller	= 0;
@@ -111,7 +111,9 @@
 	(void)T_g;
 	if ((int)(v. size ()) < amount)
 	 amount = v. size ();
-	for (int i = T_g - 104; i < T_g - 104 + amount; i ++) {
+	if (T_g - 154 + amount >= v. size ())
+	 amount = v. size () - (T_g - 154);
+	for (int i = T_g - 154; i < T_g - 154 + amount; i ++) {
 	 X_axis teller = i;
 	 int index = i - (T_g - 100);
 	 Y_value teller = get_db (v i);
@@ -127,13 +129,12 @@
 	 delete x;
 	}
 	Markers. resize (0);
-	int up_to_4	= 0;
+	int up_to_5	= 0;
 	for (auto &x : ss) {
-	 up_to_4 ++;
-	 if (up_to_4 > 4)
+	 up_to_5 ++;
+	 if (up_to_5 > 5)
 	 break;
 	 int x_coord = (int)(x. phase / 360 * 2048 + T_g - 104);
-static int teller = 0;
 	 if ((x_coord < X_axis 0) || (x_coord >= X_axis 0 + amount))
 	 continue;
 
@@ -142,11 +143,11 @@
 	 marker -> setYValue (200); 
 	 marker -> setLineStyle (QwtPlotMarker::VLine);
 //	 QwtText theText = x. Name;
-	 QwtText theText = ">>>>>> (" + QString::number (x. mainId) +
+	 QwtText theText = ">>>> (" + QString::number (x. mainId) +
 	 " " + QString::number (x. subId) + ")";
 	 QFont zz = theText. font ();
 	 int pp = zz. pointSize ();
-	 zz . setPointSize (pp + 3);
+	 zz . setPointSize (pp + 2);
 	 theText. setFont (zz);
 	 marker -> setLinePen (labelColor, 1.0);
 	 marker -> setLabelOrientation (Qt::Orientation::Vertical);

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

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2016 .. 2022
+ * Copyright (C) 2016 .. 2026
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -84,35 +84,37 @@
 	delete		grid;
 }
 
-void	devScope::display	(std::vector<float> V) {
-float	max	= 0;
-float	min	= 100;
-auto	*X_axis	= dynVec (floatQwt, V. size ());
-auto	*Y_values	= dynVec (floatQwt, V. size ());
-//double X_axis V. size ();
-//double Y_values V. size ();
-int	VSize	= V. size ();
-
-	for (int i = 0; i < VSize; i ++) {
-	 X_axis i = (float)(-VSize / 2 + i);
+void	devScope::display	(const std::vector<float> &V) {
+float	max	= -100;
+float	min	= 1000;
+int index_min; int index_max;
+floatQwt X_axis 1536;
+floatQwt Y_values 1536;
+//	we assume that V. size = 1536
+	for (int i = 0; i < V. size (); i ++) {
+	 X_axis i = -1536 / 2 + i;
 	 Y_values i = V i;
-	 if (V i > max)
+	 if (V i > max) {
 	 max = V i;
-	 if (V i < min)
+	 index_max = i;
+	 }
+	 if (V i < min) {
 	 min = V i;
+	 index_min = i;
+	 }
 	}
 
 	plotgrid	-> setAxisScale (QwtPlot::xBottom,
 				 (floatQwt)X_axis 0,
-				 (floatQwt)X_axis VSize - 1);
+				 (floatQwt)X_axis V. size () - 1);
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
-				 -20, 20);
+				 min - 1, max + 1);
 	spectrumCurve. setBaseline (0);
-	Y_values 0		= 0;
-	Y_values VSize - 1	= 0;
+//	Y_values 0		= 0;
+//	Y_values V. size () - 1	= 0;
 
-	spectrumCurve. setSamples (X_axis, Y_values, VSize);
+	spectrumCurve. setSamples (X_axis, Y_values, V. size ());
 	plotgrid	-> replot (); 
 }

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

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

@@ -125,25 +125,43 @@
 				 (floatQwt)X_axis 0,
 				 X_axis displaySize - 1);
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
-	plotgrid	-> setAxisScale (QwtPlot::yLeft,
-				 get_db (0), get_db (0) + 2.5 * Max);
 
-	spectrumCurve. setBaseline (get_db (0));
-	Y_value 0		= get_db (0);
-	Y_value displaySize - 1 = get_db (0);
+	if (hasMarker) {
+	 float MM	= get_db (0);
+	 float NN	= 1000000;
+	 for (int i = 0; i < displaySize; i ++) {
+	 Y_value i = get_db (Y_value i) - get_db (0);
+	 if (Y_value i > MM)
+	 MM = Y_value i;
+	 if (Y_value i < NN)
+	 NN = Y_value i;
+	 }
+	 plotgrid	-> setAxisScale (QwtPlot::yLeft,
+	 NN, 2 * MM - Amp / 100.0 * MM);
+	 spectrumCurve. setBaseline (NN - 10);
+	 Y_value 0		= NN - 10;
+	 Y_value displaySize - 1 = NN - 10;
+	}
+	else { 
+	 plotgrid	-> setAxisScale (QwtPlot::yLeft,
+				 get_db (0), get_db (0) + 2.5 * Max);
+	 spectrumCurve. setBaseline (get_db (0));
+	 Y_value 0		= get_db (0);
+	 Y_value displaySize - 1 = get_db (0);
+	}
 
 	spectrumCurve. setSamples (X_axis, Y_value, displaySize);
 	if (hasMarker && (marker != -1)) {
-	 QwtText theText = "startpoint " + QString::number (marker);
- QFont zz = theText. font ();
- int pp = zz. pointSize ();
- zz . setPointSize (pp + 3);
- theText. setFont (zz);
- Marker -> setLinePen (QColor ("yellow"), 1.0);
- Marker -> setLabelOrientation (Qt::Orientation::Vertical);
- Marker -> setLabelAlignment (Qt::AlignLeft);
- Marker -> setLabel (theText);
-	 Marker -> setXValue (marker + 96);
+	 QwtText theText = "subId " + QString::number (marker);
+	 QFont zz = theText. font ();
+	 int pp = zz. pointSize ();
+	 zz . setPointSize (pp + 3);
+	 theText. setFont (zz);
+	 Marker -> setLinePen (QColor ("yellow"), 1.0);
+	 Marker -> setLabelOrientation (Qt::Orientation::Vertical);
+	 Marker -> setLabelAlignment (Qt::AlignLeft);
+	 Marker -> setLabel (theText);
+	 Marker -> setXValue (marker);
 	}
 	plotgrid	-> replot (); 
 }

qt-dab-6.10.tar.gz/sources/main/tech-window.cpp Added

@@ -0,0 +1,381 @@
+#
+/*
+ * Copyright (C) 2016 .. 2026
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<QSettings>
+#include	"tech-window.h"
+#include	"radio.h"
+#include	"audio-display.h"
+#include	"dab-tables.h"
+#include	<QColorDialog>
+
+#include	"settingNames.h"
+#include	"settings-handler.h"
+#include	"position-handler.h"
+
+#define	TECHDATA_SETTING	"techWindowSettings"
+
+#define	DARK	"#00007f"
+#define	WHITE	"#ffffff"
+
+#define FRAMEDUMP_BUTTON QString ("framedumpButton") 
+#define AUDIODUMP_BUTTON QString ("audiodumpButton")
+
+		techWindow::techWindow	(RadioInterface *mr,
+	 QSettings	*s,
+	 RingBuffer<std::complex<int16_t>> *audioData):
+	 superFrame (nullptr) {
+	myRadioInterface	= mr;
+	dabSettings		= s;
+	this	-> audioData	= audioData;
+
+ setupUi (this);
+	QString settingsHeader	= TECHDATA_SETTING;
+
+	setPositionAndSize (dabSettings, this, TECHDATA_SETTING);
+
+//	we start being hidden, the radio decides whether we are visible
+//	or not
+	this	-> hide ();
+	theAudioDisplay	= new audioDisplay (mr, audio, dabSettings);
+
+	QString framedumpButton_color = 
+ value_s (dabSettings, COLOR_SETTINGS, 
+	 FRAMEDUMP_BUTTON + "_color", DARK);
+	QString framedumpButton_font = 
+ value_s (dabSettings, COLOR_SETTINGS,
+	 FRAMEDUMP_BUTTON + "_font", WHITE);
+	QString audiodumpButton_color = 
+ value_s (dabSettings, COLOR_SETTINGS,
+	 AUDIODUMP_BUTTON + "_color", DARK);
+	QString audiodumpButton_font = 
+ value_s (dabSettings, COLOR_SETTINGS,
+	 AUDIODUMP_BUTTON + "_font", WHITE);
+
+	QString temp = "QPushButton {background-color: %1; color: %2}";
+
+	framedumpButton ->
+ setStyleSheet (temp. arg (framedumpButton_color,
+ framedumpButton_font));
+
+	audiodumpButton ->
+ setStyleSheet (temp. arg (audiodumpButton_color,
+ audiodumpButton_font));
+
+	connect (framedumpButton, &smallPushButton::rightClicked,
+ this, &techWindow::colorFramedumpButton);
+ connect (audiodumpButton, &smallPushButton::rightClicked,
+ this, &techWindow::colorAudiodumpButton); 
+
+	connect (audiodumpButton, &QPushButton::clicked,
+	 mr, &RadioInterface::handleAudiodumpButton);
+	connect	(framedumpButton, &QPushButton::clicked,
+	 mr, &RadioInterface::handleFramedumpButton);
+
+	bitRateLabel	-> setStyleSheet ("color:red");
+	uepField	-> setStyleSheet ("color:magenta");
+	codeRate	-> setStyleSheet ("color:magenta");
+	psLabel		-> setStyleSheet ("color:cyan");
+	sbrLabel	-> setStyleSheet ("color:cyan");
+	audiorateLabel	-> setStyleSheet ("color:red");
+}
+
+		techWindow::~techWindow	() {
+	hide ();
+	delete theAudioDisplay;
+}
+
+void	techWindow::storePosition	() {
+	if (!isHidden ())
+	 storeWidgetPosition (dabSettings, this, TECHDATA_SETTING);
+}
+
+void	techWindow::cleanUp	() {
+	const QString ee ("-");
+	programName		-> setText (ee);
+	rsCorrections		-> display (0);
+	frameError_display	-> setValue (0);
+	rsError_display		-> setValue (0);
+	aacError_display	-> setValue (0);
+	startAddressDisplay	-> setText (QString::number (0));
+	lengthDisplay		-> setText (QString::number (0));
+	subChIdDisplay		-> setText (QString::number (0));
+	uepField		-> setText (ee);
+	codeRate		-> setText (ee);
+	ASCTy			-> setText (ee);
+	language		-> setText (ee);
+	audiorateLabel		-> setText (QString::number (0));
+}
+
+void	techWindow::showServiceData	(audiodata *ad) {
+	showServiceName		(ad -> serviceName, ad -> shortName);
+	showServiceId		(ad -> SId);
+	showStartAddress	(ad -> startAddr);
+	showLength		(ad -> length);
+	showSubChId		(ad -> subchId);
+	showUep			(ad -> shortForm, ad -> protLevel);
+	showCodeRate		(ad -> shortForm, ad -> protLevel);
+	showLanguage		(ad -> language);
+	showFm			(ad -> fmFrequencies);
+	bitRateLabel		-> setText (QString::number (ad -> bitRate) + " kbits");
+}
+
+void	techWindow::showFrameErrors	(int e) {
+	QPalette p	= frameError_display -> palette();
+	if (100 - 4 * e < 80)
+	 p. setColor (QPalette::Highlight, Qt::red);
+	else
+	 p. setColor (QPalette::Highlight, Qt::green);
+
+	frameError_display	-> setPalette (p);
+	frameError_display	-> setValue (100 - 4 * e);
+}
+
+void	techWindow::showAacErrors	(int e) {
+	QPalette p = aacError_display -> palette();
+ if (100 - 4 * e < 80)
+ p. setColor (QPalette::Highlight, Qt::red);
+ else
+ p. setColor (QPalette::Highlight, Qt::green);
+ aacError_display -> setPalette (p);
+ aacError_display -> setValue (100 - 4 * e);
+}
+
+void	techWindow::showRsErrors		(int e) {
+	QPalette p	= rsError_display -> palette();
+	if (100 - 4 * e < 80)
+	 p. setColor (QPalette::Highlight, Qt::red);
+	else
+	 p. setColor (QPalette::Highlight, Qt::green);
+	rsError_display	-> setPalette (p);
+	rsError_display	-> setValue (100 - 4 * e);
+}
+
+void	techWindow::showRsCorrections	(int c, int ec) {
+	rsCorrections -> display (c);
+	ecCorrections -> display (ec);
+}
+
+void	techWindow::updateFM		(std::vector<int> &fmFrequencies) {
+	if (fmFrequencies. size () == 0)
+	 return;
+	showFm		(fmFrequencies);
+}
+
+void	techWindow::showFrameDumpButton	(bool b) {
+	if (b)
+	 framedumpButton	-> show ();
+	else
+	 framedumpButton	-> hide ();
+}
+
+void	techWindow::showServiceName	(const QString &s1, const QString &s2) {
+	if ((s2 != "") && (s1 != s2)) 
+	 programName	-> setText (s1 + "(" + s2 + ")");
+	else
+	 programName -> setText (s1);
+}
+
+static
+QString hextoString (int v) {

qt-dab-6.10.tar.gz/sources/main/tech-window.h Added

@@ -0,0 +1,96 @@
+#
+/*
+ * Copyright (C) 2016 .. 2023
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#pragma once
+
+#include	<QObject>
+#include	<QFrame>
+#include	"ui_technical_data.h"
+#include	"dab-constants.h"
+#include	"audio-display.h"
+#include	"ringbuffer.h"
+#include	"super-frame.h"
+
+class	RadioInterface;
+class	QSettings;
+
+
+class	techWindow: public superFrame, public Ui_technical_data {
+Q_OBJECT
+public:
+		techWindow	(RadioInterface *,
+	 QSettings *,
+	 RingBuffer<std::complex<int16_t>> *audioData);
+		~techWindow	();
+	void	storePosition		();
+	void	showServiceData		(audiodata *);
+	void	cleanUp			();
+	void	isDABPlus		(bool);
+	void	hideMissedLabel		();
+	void	updateFM		(std::vector<int> &);
+private:
+	RadioInterface		*myRadioInterface;
+	QSettings		*dabSettings;
+	RingBuffer<std::complex<int16_t>>	*audioData;
+	audioDisplay		*theAudioDisplay;
+
+	void			setButtonColors	(QPushButton *,
+	 const QString &buttonName);
+
+public slots:
+	void		showFrameErrors		(int);
+	void		showAacErrors		(int);
+	void		showRsErrors		(int);
+	void		showRsCorrections	(int, int);
+	void		showFrameDumpButton	(bool);
+	void		showServiceName		(const QString &,
+	 const QString &);
+	void		showServiceId		(int);
+	void		showSubChId		(int);
+	void		showStartAddress	(int);
+	void		showLength		(int);
+	void		showLanguage		(int);
+	void		showUep			(int, int);
+	void		showCodeRate		(int, int);
+	void		showFm			(std::vector<int> &);
+	void		showRate		(int, bool, bool);
+	void		showStereo		(bool);
+
+	void		hideMissed		();
+	void		showMissed		(int);
+	void		audioDataAvailable	(int, int);
+
+	void		framedumpButton_text	(const QString &s, int);
+	void		audiodumpButton_text	(const QString &s, int);
+
+private slots:
+	void		colorFramedumpButton	();
+	void		colorAudiodumpButton	();
+
+signals:
+	void		handleAudioDumping	();
+	void		handleFrameDumping	();
+};
+
+

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

qt-dab-6.10.tar.gz/sources/output/converter_48000.cpp Changed

qt-dab-6.10.tar.gz/sources/output/converter_48000.h Added

@@ -0,0 +1,69 @@
+#
+/*
+ * Copyright (C) 2016 .. 2025
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB.
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#pragma once
+
+#include	<QObject>
+#include	"riff-writer.h"
+#include	"dab-constants.h"
+#include	<cstdio>
+#include	<mutex>
+#include	<QObject>
+#include	"ringbuffer.h"
+#include	"fir-filters.h"
+#include	<vector>
+#include	<complex>
+
+class	RadioInterface;
+
+class	converter_48000: public QObject {
+Q_OBJECT
+public:
+			converter_48000		(RadioInterface *);
+			~converter_48000	();
+	int		convert			(complex16*,
+	 int32_t, int, 
+	 std::vector<float> &);
+	 
+	void		start_audioDump		(const QString &);
+	void		stop_audioDump		();
+private:
+	int		convert_16000		(complex16 *,
+	 int, std::vector<float> &);
+	int		convert_24000		(complex16 *,
+	 int, std::vector<float> &);
+	int		convert_32000		(complex16 *,
+	 int, std::vector<float> &);
+	int		convert_48000		(complex16 *,
+	 int, std::vector<float> &);
+	riffWriter	theWriter;
+	std::vector<std::complex<float>>	buffer_32_96;
+	LowPassFIR	filter_16_48;
+	LowPassFIR	filter_24_48;
+	LowPassFIR	filter_32_96;
+	std::mutex	locker;
+	void		dump			(const float *, int);
+	void		dump			(const Complex *, int);
+	void		dump			(const complex16 *, int);
+};
+

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/output/portaudio/audiosink.cpp -> qt-dab-6.10.tar.gz/sources/output/portaudio/audiosink.cpp Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/protection/eep-protection.cpp -> qt-dab-6.10.tar.gz/sources/protection/eep-protection.cpp Changed

@@ -41,16 +41,16 @@
 L2 = 0;
 int8_t	*PI1, *PI2, *PI_X;
 
-	if ((protLevel & (1 << 2)) == 0) {	// set A profiles
-	 switch (protLevel & 03) {
-	 case 0:			// actually level 1
+	if ((protLevel & (1 << 2)) == 0) { // set A profiles, 11.3.2 
+	 switch (protLevel & 03) {	// 2 bits, choose one of 4
+	 case 0:			// actually level A1
 	 L1	= 6 * bitRate / 8 - 3;
 	 L2	= 3;
 	 PI1	= get_PCodes (24 - 1);
 	 PI2	= get_PCodes (23 - 1);
 	 break;
 
-	 case 1:			// actually level 2
+	 case 1:			// actually level A2
 	 if (bitRate == 8) {
 	 L1	= 5;
 	 L2	= 1;
@@ -64,14 +64,14 @@
 	 }
 	 break;
 
-	 case 2:			// actually level 3
+	 case 2:			// actually level A3
 	 L1	= 6 * bitRate / 8 - 3;
 	 L2	= 3;
 	 PI1	= get_PCodes (8 - 1);
 	 PI2	= get_PCodes (7 - 1);
 	 break;
 
-	 case 3:			// actually level 4
+	 case 3:			// actually level A4
 	 L1	= 4 * bitRate / 8 - 3;
 	 L2	= 2 * bitRate / 8 + 3;
 	 PI1	= get_PCodes (3 - 1);

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/content-table.cpp -> qt-dab-6.10.tar.gz/sources/support/content-table.cpp Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/dab-constants.h -> qt-dab-6.10.tar.gz/sources/support/dab-constants.h Changed

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/db-element.h -> qt-dab-6.10.tar.gz/sources/support/db-element.h Changed

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C)  2015 .. 2023
+ *    Copyright (C)  2015 .. 2025
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -24,7 +24,7 @@
 
 //
 //	In case there is access to a database, the elements of
-//	that database are read in and per line converted to am accessible
+//	that database are read in and per line converted to an accessible
 //	struct
 //
 //	we use the "key's" for fast detecting the database index (if any)
@@ -72,11 +72,11 @@
 	   transmitterName	= "not in database";
 	   latitude		= 0;
 	   longitude		= 0;
-	   power		= 0;
+	   altitude		= 0;
 	   height		= 0;
-	   power		= 0;
 	   polarization		= "";
 	   frequency		= 0;
+	   power		= 0;
 	   direction		= "";
 	}
 	~dbElement	()	{}
@@ -90,6 +90,8 @@
 //
 //	There are values differing per instance of the 
 //	same transmitter
+	float		home_X;
+	float		home_Y;
 	uint16_t	pattern;
 	float		strength;
 	float		distance;
@@ -97,7 +99,6 @@
 	float		phase;
 	bool		norm;
 	bool		collision;
-
 	bool		isStrongest;
 //
 //	for the http driver
@@ -119,7 +120,8 @@
 	   frequency	= dbE -> frequency;
 	   power	= dbE -> power;
 	   direction	= dbE -> direction;
-
+	   home_X	= 0;
+	   home_Y	= 0;
 	   phase	= 0;
 	   norm		= false;
 	   collision	= false;
@@ -128,26 +130,30 @@
 
 	transmitter () {
 	   valid		= false;
-//	   ensemble		= "";
-//	   country		= "not known";
-//	   channel		= "";
-//	   ensemble		= "";
-//	   Eid			= 0;
-//	   mainId		= 255;
-//	   subId		= 255;
-//	   transmitterName	= "not in database";
-//	   latitude		= 0;
-//	   longitude		= 0;
-//	   power		= 0;
-//	   height		= 0;
-//	   power		= 0;
-//	   polarization		= "";
-//	   frequency		= 0;
-//	   direction		= "";
-//	   phase		= 0;
-//	   norm			= false;
-//	   collision		= false;
-//	   isStrongest		= false;
+	   country		= "not known";
+	   channel		= "";
+	   ensemble		= "";
+	   Eid			= 0;
+	   mainId		= 0;
+	   subId		= 0;
+	   transmitterName	= "not in database";
+	   latitude		= 0;
+	   longitude		= 0;
+	   altitude		= 0;
+	   height		= 0;
+	   polarization		= "";
+	   frequency		= 0;
+	   power		= 0;
+	   direction		= "";
+
+	   pattern		= 0;
+	   strength		= 0;
+	   distance		= 0;
+	   azimuth		= 0;
+	   phase		= 0;
+	   norm			= false;
+	   collision		= false;
+	   isStrongest		= false;
 	}
 	~transmitter	()	{}
 };

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/findfilenames.cpp -> qt-dab-6.10.tar.gz/sources/support/findfilenames.cpp Changed

@@ -286,12 +286,11 @@
 	 suggestedFilename + ".uff",
 	 "xml (*.uff)");
 	fileName	= QDir::toNativeSeparators (fileName);
-	if (fileName == "")
-	 fileName = suggestedFilename;
+//	if (fileName == "")
+//	 fileName = suggestedFilename;
 	return fileName;
 }
 
-
 QString	findfileNames::basicPath	() {
 
 QString tempPath	= QDir::homePath () + "/Qt-DAB-files/";
@@ -304,6 +303,19 @@
 	return QDir::fromNativeSeparators (tempPath);
 }
 
+QString	findfileNames::find_mapdumpName	(const QString &deviceName) {
+QString result	= basicPath ();
+QDate	theDate;
+QTime	theTime;
+	QString timeString	= theDate. currentDate (). toString () + "-" +		 theTime. currentTime (). toString ();
+	result	+= deviceName + "-" + timeString;
+	for (int i = 4; i < result. length (); i ++)
+	 if (!isValid (result. at (i)))
+	 result. replace (i, 1, "-");
+	result	= QDir::toNativeSeparators (result + ".xml");
+	return result;
+}
+
 QString	findfileNames::checkDir		(const QString &s) {
 QString dir = s;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/findfilenames.h -> qt-dab-6.10.tar.gz/sources/support/findfilenames.h Changed

qt-dab-6.10.tar.gz/sources/support/gui-elements/position-handler.cpp Changed

qt-dab-6.10.tar.gz/sources/support/gui-elements/position-handler.h Changed

qt-dab-6.10.tar.gz/sources/support/gui-elements/qwt-2.h Changed

qt-dab-6.10.tar.gz/sources/support/gui-elements/settings-handler.cpp Changed

qt-dab-6.10.tar.gz/sources/support/gui-elements/settings-handler.h Changed

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

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

@@ -1,6 +1,6 @@
 #
 /*
- *	Copyright (C) 2016 .. 2023
+ *	Copyright (C) 2025
 *	Jan van Katwijk (J.vanKatwijk@gmail.com)
 *	Lazy Chair Computing
 *
@@ -25,409 +25,213 @@
 #include	<QTextStream>
 #include	<QDataStream>
 #include	<QByteArray>
+#include	<QDesktopServices>
+#include	<QMessageBox>
+#include	<QDateTime>
+
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<unistd.h>
 #include	<sys/types.h>
 #include	"distances.h"
-#ifndef	__MINGW32__
-#include	<sys/socket.h>
-#include	<fcntl.h>
-#include	<netinet/in.h>
-#include	<netdb.h>
-#include	<arpa/inet.h>
-#else
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#endif
-//#include	<err.h>
 #include	<cstring>
 
 #include	"settings-handler.h"
 #include	"settingNames.h"
+#include	"device-exceptions.h"
 #include	"http-handler.h"
 #include	"radio.h"
 
-	httpHandler::httpHandler (RadioInterface *parent,
-	 position	 homeAddress,
+	httpHandler::httpHandler (RadioInterface *theRadio,
+	 const QString &fileName,
+	 position	homeAddress,
+	 bool		autoBrowser_on,
+	 bool		close_map_on_exit,
 	 const QString &saveName,
-	 bool autoBrowser_off,
 	 QSettings	*settings) {
-	this	-> parent	= parent;
-	this	-> mapPort			=
-	 value_s (settings, MAP_HANDLING, MAP_PORT_SETTING,
- "8080");
+	this	-> theRadio	= theRadio;
+	this	-> nameOfMap	= fileName;
+	this	-> close_map_on_exit = close_map_on_exit;
+	this	-> saveName	= saveName;
+	this	-> dabSettings	= settings;
+	int mapPort		=
+	 value_i (settings, MAP_HANDLING, MAP_PORT_SETTING,
+ 8080);
 	QString address		= 
 	 value_s (settings, MAP_HANDLING, BROWSER_ADDRESS,
 	 "http://localhost");
+	QString browserAddress		= address + ":" +
+	 QString::number (mapPort);
+	this	-> homeAddress		= homeAddress;
 
-	QString temp		= address + ":" + mapPort;
-	this	-> homeAddress	= homeAddress;
-	this	-> autoBrowser_off	= autoBrowser_off;
-#ifdef	__MINGW32__
-	this	-> browserAddress	= temp. toStdWString ();
-#else
-	this	-> browserAddress	= temp. toStdString ();
-#endif
-	this	-> running. store (false);
-	this	-> dabSettings		= settings;
-	connect (this, &httpHandler::terminating,
-	 parent, &RadioInterface::http_terminate);
-	saveFile	= fopen (saveName. toUtf8 (). data (), "w");
-	if (saveFile != nullptr) {
-	 fprintf (saveFile, "Home location; %f; %f\n\n", 
-	 homeAddress. latitude, homeAddress. longitude);
-	 fprintf (saveFile, "channel; latitude; longitude;transmitter;date and time; mainId; subId; distance; azimuth; power, altitude, height, dir\n\n");
-	}
-
+	delayTimer. setSingleShot (true);
 	connect (this, &httpHandler::setChannel,
-	 parent, &RadioInterface::channelSignal);
-	transmitterVector. resize (0);
-	start ();
-}
-
-	httpHandler::~httpHandler	() {
-	if (running. load ()) {
-	 running. store (false);
-	 threadHandle. join ();
+	 theRadio, &RadioInterface::channelSignal);
+	connect (this, &QTcpServer::newConnection,
+	 this, &httpHandler::newConnection);
+	connect (&delayTimer, &QTimer::timeout,
+	 this, &httpHandler::handle_timeOut);
+
+	if (!autoBrowser_on) {
+	 if (!QDesktopServices::openUrl(QUrl (browserAddress))) {
+	 fprintf (stderr, "cannot open URL\n");
+	 throw device_exception ("cannot open URL");
+	 return;
+	 }
 	}
-	if (saveFile != nullptr)
-	 fclose (saveFile);
-}
 
-void	httpHandler::start	() {
-	threadHandle = std::thread (&httpHandler::run, this);
-	if (autoBrowser_off)
+	if (!this -> listen (QHostAddress::Any, mapPort)) {
+	 throw device_exception ("listening to port failed");
 	 return;
-#ifdef	__MINGW32__
-	fprintf (stderr, "browser address %s\n", browserAddress. c_str ());
-	ShellExecute (nullptr, L"open", browserAddress. c_str (),
-	 nullptr, nullptr, SW_SHOWNORMAL);
-#else
-	std::string x = "xdg-open " + browserAddress;
-	fprintf (stderr, "we gaan voor %s\n", x. c_str ());
-	(void)system (x. c_str ());
-#endif
-}
-
-void	httpHandler::stop	() {
-	if (running. load ()) {
-	 running. store (false);
-	 threadHandle. join ();
 	}
+
+	transmitterList. resize (0);
+	connection_stopped	= false;
+	closingInProgress. store (false);
 }
 
-#ifndef	__MINGW32__
-void	httpHandler::run	() {
-char	buffer 4096;
-bool	keepalive;
-char	*url;
-int one = 1, ClientSocket = 0, ListenSocket = 0;
-struct sockaddr_in svr_addr, cli_addr;
-std::string	content;
-std::string	ctype;
-
-	running. store (true);
-	socklen_t sin_len = sizeof (cli_addr);
-	ListenSocket = socket (AF_INET, SOCK_STREAM, 0);
-	fprintf (stderr, "Listensocket = %d\n", ListenSocket);
-	if (ListenSocket < 0) {
-	 running. store (false);
-	 terminating ();
-	 return;
-	}
+	httpHandler::~httpHandler	() {
+	if (this -> isListening ())
+	 this -> close ();
+	if (this	-> saveName != "")
+	 saveMap	();
+}
 
-	int flags	= fcntl (ListenSocket, F_GETFL);
-	fcntl (ListenSocket, F_SETFL, flags | O_NONBLOCK);
-	setsockopt (ListenSocket, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int));
-	svr_addr.sin_family = AF_INET;
-	svr_addr.sin_addr.s_addr = INADDR_ANY;
-	svr_addr.sin_port = htons (mapPort. toInt ());
-
-	if (::bind (ListenSocket, (struct sockaddr *) &svr_addr,
-	 sizeof (svr_addr)) == -1) {
-	 close (ListenSocket);
-	 running. store (false);
-	 terminating ();
-	 return;
+void	httpHandler::newConnection	() {
+	if (this -> hasPendingConnections ()) {
+	 QTcpSocket *socket = this -> nextPendingConnection ();
+	 connect (socket, &QTcpSocket::readyRead,
+	 this, &httpHandler::readSocket);
+	 connect (socket, &QAbstractSocket::disconnected,
+	 this, &httpHandler::discardSocket);
+	 connect (socket, &QTcpSocket::errorOccurred,
+	 this, &httpHandler::onSocketError);
 	}
+}
 //
-//	Now, we are listening to port XXXX, ready to accept a
-//	socket for anyone who needs us
-
-	::listen (ListenSocket, 5);

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

@@ -1,6 +1,6 @@
 #
 /*
- *	Copyright (C) 2016 .. 2023
+ *	Copyright (C) 2025
 *	Jan van Katwijk (J.vanKatwijk@gmail.com)
 *	Lazy Chair Computing
 *
@@ -24,7 +24,6 @@
 #pragma once
 
 #include	<QObject>
-#include	<thread>
 #include	<atomic>
 #include	<string>
 #include	<vector>
@@ -32,50 +31,62 @@
 #include	<mutex>
 #include	<QString>
 #include	<QSettings>
+#include	<QTimer>
+#include	<QDomDocument>
+#include	<QFile>
 #include	"tii-mapper.h"
 #include	"db-element.h"
+#include	<QTcpSocket>
+#include	<QTcpServer>
+#include	<QAbstractSocket>
 class	RadioInterface;
 //
 
-class	httpHandler: public QObject {
+class	httpHandler: public QTcpServer {
 Q_OBJECT
 public:
 		httpHandler	(RadioInterface *,
+	 const QString &fileName,
 	 position	address,
-	 const QString	&saveName,
 	 bool		autoBrowse,
-	 QSettings	*settings = nullptr);
+	 bool		map_close_on_exit,
+	 const QString &,
+	 QSettings	*settings);
 		~httpHandler	();
-	void	start		();
-	void	stop		();
-	void	run		();
-	void	putData		(uint8_t, position);
+	bool	isConnected	();
+	void	putData		(uint8_t	type);
 	void	putData		(uint8_t	type,
 	 transmitter	&Tr,
-	 const QString & theTime);
-	
+	 bool		utc);
 private:
+	QTimer			delayTimer;
+	RadioInterface		*theRadio;
+	QString			nameOfMap;
+	QString			saveName;
 	QSettings		*dabSettings;
-	FILE			*saveFile;
-	RadioInterface		*parent;
-	QString			mapPort;
 	position		homeAddress;
-	std::vector<transmitter> transmitterVector;
-
-#ifdef	__MINGW32__
-	std::wstring	browserAddress;
-#else
-	std::string	browserAddress;
-#endif
-	std::atomic<bool>	running;
-	std::thread	threadHandle;
-	std::string theMap		(position address);
-	std::string	coordinatesToJson (std::vector<transmitter> &t);
+	bool			close_map_on_exit;
+	QString			theMap		(const QString &fileName,
+	 position address);
+	QString			transmitterToJsonObject (transmitter &t);
 	std::vector<transmitter> transmitterList;
-	std::mutex	locker;
-	bool		autoBrowser_off;
+	std::mutex		locker;
+	bool			connection_stopped;
+	std::atomic<bool>	closingInProgress;
+	int			maxDelay;
+	std::vector<transmitter> saveStack;
+	bool			seenAlready	(const transmitter &);
+	QDomElement		getTransmitter	(QDomDocument &,
+	 const transmitter &tr);
+
+	void			saveMap		();
 signals:
-	void		terminating	();
-	void		setChannel	(const QString &);
+	void		setChannel		(const QString &);
+	void		mapClose_processed	();
+private slots:
+	void		newConnection		();
+	void		readSocket		();
+	void		discardSocket		();
+	void		handle_timeOut		();
+	void		onSocketError 		(QAbstractSocket::SocketError); 
 };
-

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

@@ -156,12 +156,17 @@
 contentWidget	= new QTableWidget (0, 4);
 	QHBoxLayout *LH	= new QHBoxLayout ();
 	QHBoxLayout *LH_2	= new QHBoxLayout ();
+	switchStaySetting	= new QSpinBox ();
+	switchStaySetting	-> setMinimum	(20);
+	switchStaySetting	-> setSingleStep (20);
+	switchStaySetting	-> setToolTip ("the value specifies the number of seconds Qt-DAB will hold the current channel when data was detected. Increments are also in units of 20 seconds");
 	LH		-> addWidget (startKnop);
 	LH		-> addWidget (stopKnop);
 	LH		-> addWidget (showKnop);
 	LH		-> addWidget (clearKnop);
 	LH		-> addWidget (dumpDirKnop);
 	LH		-> addWidget (dumpChecker);
+	LH_2		-> addWidget (switchStaySetting);
 	LH_2		-> addWidget (defaultLoad);
 	LH_2		-> addWidget (defaultStore);
 	LH_2		-> addWidget (loadKnop);
@@ -175,6 +180,8 @@
 this -> setLayout (LV);
 	this -> setWindowTitle ("scan monitor");
 	setPositionAndSize (dabSettings, this, SCAN_HANDLER);
+	int x = value_i (dabSettings, CONFIG_HANDLER, SWITCH_STAY_SETTING, 20);
+ this -> switchStaySetting -> setValue (x);
 
 	if (!no_scanTables)
 	 scanTable. setup_scanTable (selectedBand);
@@ -222,6 +229,10 @@
 	 theRadio, &RadioInterface::startScanning);
 	connect (this, &scanHandler::stopScanning,
 	 theRadio, &RadioInterface::stopScanning);
+
+	connect (switchStaySetting, qOverload<int>(&QSpinBox::valueChanged),
+ this, &scanHandler::handle_switchStaySetting);
+
 }
 
 	scanHandler::~scanHandler () {
@@ -507,6 +518,14 @@
 	return "";
 }
 
+void scanHandler::handle_switchStaySetting (int newV) {
+ store (dabSettings, CONFIG_HANDLER, SWITCH_STAY_SETTING, newV);
+} 
+
+int	scanHandler::switchStayValue	() {
+	return switchStaySetting	-> value () * 1000;
+}
+
 int16_t scanHandler::channelIndex (const QString &channel) {
 	for (int i = 0; selectedBand i. key != nullptr; i ++)
 	 if (selectedBand i. key == channel)

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/settingNames.h -> qt-dab-6.10.tar.gz/sources/support/settingNames.h Changed

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

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/time-table.cpp -> qt-dab-6.10.tar.gz/sources/support/time-table.cpp Changed

@@ -38,21 +38,11 @@
 //	showing a time table - the relevant xml file, decodes it
 //	and shows the result.
 //	
-	timeTableHandler::timeTableHandler (RadioInterface *radio,
-	 QSettings *dabSettings_p) {
-findfileNames	theFilenameFinder (dabSettings_p);
-QString		tempPath = theFilenameFinder. basicPath ();
-;
-	this	-> radio	= radio;
-	path_for_files =
-	 value_s (dabSettings_p, DAB_GENERAL,
-	 S_FILE_PATH, tempPath);
-	if (!path_for_files. endsWith ("/"))
-	 path_for_files += "/";
-	
-	myWidget = new QScrollArea (nullptr);
+	timeTableHandler::timeTableHandler (const QString &path,
+	 QSettings *dabSettings_p):
+	 superFrame (nullptr) {
 
-	myWidget -> setWidgetResizable (true);
+	path_for_files	= path;
 	QHBoxLayout *lo	= new QHBoxLayout;
 	left	= new QPushButton ("prev");
 	left	-> setToolTip ("set the date one day back");
@@ -71,7 +61,7 @@
 	lo	-> addWidget (dateLabel);
 	lo	-> addWidget (right);
 	lo	-> addWidget (rem);
-	
+
 	QVBoxLayout	*lv = new QVBoxLayout ();
 	programDisplay	= new QTableWidget (0, 4);
 	programDisplay	-> setColumnWidth (0, 150);
@@ -80,8 +70,9 @@
 	programDisplay	-> setColumnWidth (3, 450);
 	lv		-> addLayout (lo);
 	lv		-> addWidget (programDisplay);
-	myWidget -> setLayout (lv);
-	
+	this 	 -> setLayout (lv);
+
+	show ();
 	connect (left, &QPushButton::clicked,
 	 this, &timeTableHandler::handleLeft);
 	connect (right, &QPushButton::clicked,
@@ -96,20 +87,17 @@
 	timeTableHandler::~timeTableHandler () {
 	clear ();
 	delete	programDisplay;
-	delete	myWidget;
 }
 
 QString timeTableHandler::find_xmlFile (QDate& theDate,
 	 uint32_t Eid, uint32_t Sid) {
-QString fileName;
-	fileName	= path_for_files + QString::number (Eid, 16). toUpper () + "/";
 	char temp 40;
 	const char * formatString;
 	formatString = "%4d%02d%02d_%4X_SI.xml";
 	sprintf (temp, formatString,
 	 theDate. year (), theDate. month (),
 	 theDate. day (), Sid);
-	return fileName + QString (temp);
+	return path_for_files + QString (temp);
 }
 
 void	timeTableHandler::setUp		(const QDate &theDate,
@@ -300,6 +288,11 @@
 	 bodyText = bodyText. left (55) + "...";
 	item3	-> setText (bodyText);
 	programDisplay -> setItem (row, 3, item3);
+//	fprintf (stderr,
+//	 "<tr>\n<th>%s</th>\n<th>%s</th>\n<th>%s</th>\n</tr>\n",
+//	 start. toLatin1 (). data (),
+//	 duration. toLatin1 (). data (),
+//	 bodyText. toLatin1 (). data ());
 }
 
 void	timeTableHandler::addRow	() {	// add empty row
@@ -318,16 +311,16 @@
 	 programDisplay -> removeRow (i - 1);
 }
 
-void	timeTableHandler::show () {
-	myWidget -> show ();
-}
-
-void	timeTableHandler::hide () {
-	myWidget -> hide ();
-}
+//void	timeTableHandler::show () {
+//	this	-> show ();
+//}
+//
+//void	timeTableHandler::hide () {
+//	this	-> hide ();
+//}
 
 bool	timeTableHandler::isVisible () {
-	return !myWidget -> isHidden ();
+	return !this -> isHidden ();
 }
 
 QString	subString (const QString &s, int start, int length) {

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/time-table.h -> qt-dab-6.10.tar.gz/sources/support/time-table.h Changed

@@ -32,22 +32,23 @@
 #include	<QPushButton>
 #include	<QPixmap>
 #include	<QLabel>
+#include	"super-frame.h"
 #include	"xml-extractor.h"
 #include	<QDate>
 
 class	QSettings;
 class	RadioInterface;
 
-class	timeTableHandler: public QObject {
+class	timeTableHandler: public superFrame {
 Q_OBJECT
 public:
-		timeTableHandler	(RadioInterface *radio,
+		timeTableHandler	(const QString &path,
 	 QSettings *);
 		~timeTableHandler	();
 	void	display			(const scheduleDescriptor &);
 	void	clear			();
-	void show ();
- void hide ();
+//	void show ();
+//	void hide ();
 bool isVisible ();
 	void	setUp		(const QDate &, uint32_t,
 	 uint16_t, const QString &);
@@ -57,7 +58,6 @@
 	void		addHeader	(const scheduleDescriptor &);
 	void		addProgram	(const programDescriptor &);
 	RadioInterface	*radio;
-	QScrollArea *myWidget;
 QTableWidget *programDisplay;
 	QPushButton	*left;
 	QPushButton	*right;

qt-dab-6.10.tar.gz/sources/support/timetable-control.cpp Added

@@ -0,0 +1,171 @@
+#
+/*
+ * Copyright (C) 2016 .. 2023
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with dab-scanner; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<QSettings>
+#include	<QDir>
+#include	"timetable-control.h"
+#include	"time-table.h"
+#include	"findfilenames.h"
+#include	"settingNames.h"
+#include	"settings-handler.h"
+
+static
+QString	checkDir (const QString &s) {
+QString	dir = s;
+
+	if (!dir. endsWith (QChar ('/')))
+	 dir += QChar ('/');
+
+	if (QDir (dir). exists())
+	 return dir;
+	QDir (). mkpath (dir);
+	return dir;
+}
+
+	timeTableControl::timeTableControl (QString &ensemble, int32_t EId,
+	 std::vector<basicService> &services,
+	 QDate today,
+	 QSettings *dabSettings):
+	 superFrame (nullptr) {
+findfileNames theFilenameFinder (dabSettings);
+	this	-> ensemble	= ensemble;
+	this	-> EId		= EId;
+	this	-> services	= services;
+	this	-> today	= today;
+	this	-> dabSettings	= dabSettings;
+
+	this	-> serviceHandler		= nullptr;
+	contentWidget = new QTableWidget	(0, 2);
+	contentWidget -> setColumnWidth	(0, 150);
+	contentWidget -> setColumnWidth	(1, 50);
+	auto layout	= new QVBoxLayout	();
+	layout		-> addWidget		(contentWidget);
+	this		-> setLayout (layout);
+ contentWidget -> setHorizontalHeaderLabels (
+ QStringList () << ensemble << QString::number (EId, 16). toUpper ());
+	connect (contentWidget, &QTableWidget::cellClicked,
+	 this, &timeTableControl::selectService);
+
+	QString tempPath = theFilenameFinder. basicPath (); 
+ path_for_files =
+ value_s (dabSettings, DAB_GENERAL,
+ S_FILE_PATH, tempPath);
+	path_for_files = checkDir (path_for_files);
+	if (path_for_files == "")
+	 return;
+	path_for_files +=
+ QString::number (EId, 16). toUpper () + "/";
+ path_for_files = QDir::toNativeSeparators (path_for_files); 
+ if (!QDir (path_for_files). exists ())
+ QDir (). mkpath (path_for_files);
+	
+	QString	f1	= QString ("*") + "_SI.xml";
+	QString f2	= QString ("*") + "_si.xml";
+	QStringList theFilters;
+	theFilters << f1 << f2;
+	QDir theDirectory (path_for_files);
+	theDirectory.setNameFilters (theFilters);
+	QStringList files =
+	 theDirectory. entryList (theDirectory. nameFilters ());
+	show ();
+	for (auto &s: services) {
+	 element q;
+	 q. hasTable		= checkFor (files, s.SId);
+	 q. SId		= s. SId;
+	 q. serviceName	= s. serviceName;
+	 addRow (s. serviceName, s. SId, q. hasTable);
+	 otherTable. push_back (q);
+	}
+}
+
+	timeTableControl::~timeTableControl () {
+	hide ();
+	if (serviceHandler != nullptr)
+	 delete serviceHandler;
+	int rows	= contentWidget -> rowCount ();
+	for (int i = rows - 1; i >= 0; i --)
+	 contentWidget -> removeRow (i);
+	delete contentWidget;
+}
+
+void	timeTableControl::addRow (const QString &serviceName, int32_t EId,
+	 bool hasTables) {
+int16_t row = contentWidget -> rowCount ();
+
+ contentWidget -> insertRow (row);
+
+	QTableWidgetItem *item0 = new QTableWidgetItem;
+	item0 -> setTextAlignment (Qt::AlignLeft |
+ Qt::AlignVCenter);
+	item0		-> setText (serviceName);
+	if (hasTables)
+	 item0	-> setData (Qt::BackgroundRole, QColor ("green"));
+	else
+	 item0	-> setData (Qt::BackgroundRole, QColor ("red"));
+	contentWidget	-> setItem (row, 0, item0);
+
+	QTableWidgetItem *item1 = new QTableWidgetItem;
+	item1 -> setTextAlignment (Qt::AlignRight |
+ Qt::AlignVCenter);
+	item1		-> setText (QString::number (EId, 16));
+	contentWidget	-> setItem (row, 1, item1);
+}
+
+bool	timeTableControl::checkFor (const QStringList &files, int32_t SId) {
+QString XXX	= QString::number (SId, 16). toUpper ();
+	for (auto &ss : files)
+	 if (ss. contains (XXX))
+	 return true;
+	return false;
+}
+
+
+void	timeTableControl::selectService (int row, int column) {
+	QString service	= contentWidget	-> item (row, 1) -> text ();
+	bool b;
+	int SId		= service. toInt (&b, 16);
+	if (!b)
+	 return;
+	if (serviceHandler != nullptr)
+	 delete serviceHandler;
+	serviceHandler	= nullptr;
+	for (auto &e :otherTable) {
+	 if ((e. SId == SId) && e. hasTable) {
+	 serviceHandler	= new timeTableHandler (path_for_files,
+	 dabSettings);
+	 connect (serviceHandler, &superFrame::frameClosed,
+	 this, &timeTableControl::cleanup_serviceHandler);
+	 serviceHandler	-> setUp (today, EId, SId, e. serviceName);
+//	 QOixmap p;
+//	 if (get_serviceLogo (p, channel. currentService. SId))
+//	 serviceHandler. addLogo (p);
+	 break;
+	 }
+	}
+}
+//
+//	the timetable window was closed, we close the timetable itself
+void	timeTableControl::cleanup_serviceHandler () {
+	delete serviceHandler;	
+	serviceHandler	= nullptr;
+}
+

qt-dab-6.10.tar.gz/sources/support/timetable-control.h Added

@@ -0,0 +1,73 @@
+#
+/*
+ * Copyright (C) 2016 .. 2023
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with dab-scanner; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#pragma once
+
+#include	<QScrollArea>
+#include	<QString>
+#include	<QStringList>
+#include	<stdint.h>
+#include	<QDate>
+#include	<QTableWidget>
+#include	<QTableWidgetItem>
+#include	"radio.h"
+#include	"dab-constants.h"
+#include	"findfilenames.h"
+#include	"super-frame.h"
+
+class	QSettings;
+class	timeTableHandler;
+
+class	timeTableControl: public superFrame {
+Q_OBJECT
+public:
+		timeTableControl (QString &ensemble, int32_t EId,
+	 std::vector<basicService> &services,
+	 QDate today,
+	 QSettings	*);
+		~timeTableControl ();
+
+private:
+	class element {
+	 public:
+	 int32_t	SId;
+	 bool	hasTable;
+	 QString	serviceName;
+	};
+	QScrollArea	*theScrollArea;
+	QTableWidget	*contentWidget;
+	std::vector<basicService> services;
+	QString		ensemble;
+	int32_t		EId;
+	QDate		today;
+	QSettings	*dabSettings;
+	QString		path_for_files;
+	std::vector<element> otherTable;
+	timeTableHandler *serviceHandler;
+	void		addRow 	(const QString &, int32_t, bool);
+	bool		checkFor 	(const QStringList &, int32_t);
+public	slots:
+	void		selectService	(int, int);
+	void		cleanup_serviceHandler	();
+};
+

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

qt-dab-Qt-DAB-6.9.6.tar.gz/app-files/qt-dab-6.9.5.ico Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/app-files/qt-dab-6.9.desktop Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9-build.txt Deleted

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=/home/jan/Qt/6.8.1/gcc_64/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/home/jan/qwt-6.3.0/lib
-export PATH=/home/jan/Qt/6.8.1/gcc_64/bin:$PATH
-
-ls -lh .
-rm -rf *_autogen
-mkdir -p ./appdir/usr/bin
-mkdir -p ./appdir/usr/share/applications
-mkdir -p ./appdir/usr/share/icons/hicolor/128x128/apps/
-mkdir -p ./appdir/usr/share/icons/hicolor/256x256/apps/
-
-cp linux-bin/qt-dab* 	appdir/usr/bin/qt-dab-6.9.5
-cp app-files/qt-dab-6.9.desktop	appdir/usr/share/applications
-cp ../res/radio-pictures/qt-dab-6.9.5-128x128.png	appdir/qt-dab-6.9.5.png
-cp ../res/radio-pictures/qt-dab-6.9.5-128x128.png	appdir/usr/share/icons/hicolor/128x128/apps/
-cp ../res/radio-pictures/qt-dab-6.9-256x256.png	appdir/usr/share/icons/hicolor/256x256/apps/
-
-touch appdir/qt-dab-6.9.5.png
-  
-wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
-chmod a+x linuxdeployqt*.AppImage
-unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs -no-translations
-./linuxdeployqt*.AppImage --appimage-extract
-find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
-chmod a+x app-files/appimage/* ; rm appdir/AppRun ; cp app-files/appimage/* appdir/
-export PATH=squashfs-root/usr/bin/:$PATH
-squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)
-find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-:

qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9.pro Deleted

@@ -1,968 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Oct 6 19:48:14 2009
-#	CONFIG		+= sdrplay-v3
-# but modified by me to accomodate for the includes for qwt, hamlib and
-# portaudio
-######################################################################
-
-TEMPLATE	= app
-QT		+= widgets xml multimedia
-#CONFIG		+= console
-CONFIG		-= console
-QMAKE_CXXFLAGS	+= -std=c++20
-
-win32 {
-QMAKE_CXXFLAGS	+=  -ffast-math -flto 
-QMAKE_CFLAGS	+=  -ffast-math -flto
-QMAKE_LFLAGS	+=  -ffast-math -flto
-}
-
-unix {
-#QMAKE_CFLAGS	+=  -O3 -ffast-math -g
-#QMAKE_CXXFLAGS	+=  -O3 -ffast-math -g
-#QMAKE_LFLAGS	+=  -O3 -ffast-math -g
-#QMAKE_CFLAGS	+=  -O3 -ffast-math -pg
-@QMAKE_CXXFLAGS	+=  -O3 -ffast-math -pg
-#QMAKE_LFLAGS	+=  -O3 -ffast-math -pg
-QMAKE_CXXFLAGS	+=  -ffast-math -flto 
-QMAKE_CFLAGS	+=  -ffast-math -flto
-QMAKE_LFLAGS	+=  -ffast-math -flto
-#QMAKE_CFLAGS	+=  -g -fsanitize=address 
-#QMAKE_CXXFLAGS	+=  -g -fsanitize=address 
-#QMAKE_LFLAGS	+=  -g -fsanitize=address
-}
-
-#QMAKE_CFLAGS	+=  -pg
-#QMAKE_CXXFLAGS	+=  -pg
-#QMAKE_LFLAGS	+=  -pg
-QMAKE_CXXFLAGS += -isystem $$QT_INSTALL_HEADERS
-RC_ICONS	=  qt-dab-6.9.5.ico
-RESOURCES	+= resources.qrc
-
-TRANSLATIONS = ../i18n/de_DE.ts
-#
-#       For more parallel processing, uncomment the following
-#       defines
-#DEFINES	+= __MSC_THREAD__
-DEFINES		+= __THREADED_BACKEND__
-#DEFINES        += _UPLOAD_SCAN_RESULT_
-
-#DEFINES	+= __EPG_TRACE__  
-DEPENDPATH += . \
-	      ..sources \
-	      ./sources/backend\
-	      ./sources/backend/reed-solomon \
-	      ./sources/backend/audio \
-	      ./sources/backend/data \
-	      ./sources/backend/data/epg \
-	      ./sources/backend/data/mot \
-	      ./sources/backend/data/journaline \
-	      ./sources/eti-handler \
-	      ./sources/main \
-	      ./sources/main/forms-v7 \
-	      ./sources/main/snr-viewer \
-	      ./sources/frontend \
-	      ./sources/frontend/fic-handling \
-	      ./sources/output \
-	      ./sources/output/portaudio \
-	      ./sources/protection \
-	      ./sources/devices \
-	      ./sources/support \
-	      ./sources/support/gui-elements \
-	      ./sources/devices \
-	      ./sources/devices/filereaders/ \
-	      ./sources/devices/filereaders/new-reader \
-	      ./sources/devices/filereaders/rawfiles-new \
-	      ./sources/devices/filereaders/xml-filereader 
-	
-
-INCLUDEPATH += . \
-	      ..sources \
-	      ./sources/backend\
-	      ./sources/backend/reed-solomon \
-	      ./sources/backend/audio \
-	      ./sources/backend/data \
-	      ./sources/backend/data/epg \
-	      ./sources/backend/data/mot \
-	      ./sources/backend/data/journaline \
-	      ./sources/eti-handler \
-	      ./sources/main \
-	      ./sources/main/forms-v7 \
-	      ./sources/main/scopes \
-	      ./sources/main/snr-viewer \
-	      ./sources/frontend \
-	      ./sources/frontend/fic-handling \
-	      ./sources/output \
-	      ./sources/output/portaudio \
-	      ./sources/protection \
-	      ./sources/devices \
-#	      ./sources/scopes-qwt6 \
-	      ./sources/support \
-	      ./sources/support/gui-elements \
-	      ./sources/devices \
-	      ./sources/devices/filereaders/ \
-	      ./sources/devices/filereaders/new-reader \
-	      ./sources/devices/filereaders/rawfiles-new \
-	      ./sources/devices/filereaders/xml-filereader 
-	
-
-# Input
-HEADERS += ./sources/main/radio.h \
-	   ./sources/main/display-widget.h \
-	   ./sources/main/scopes/spectrum-scope.h \
-	   ./sources/main/scopes/correlation-scope.h \
-	   ./sources/main/scopes/null-scope.h \
-	   ./sources/main/scopes/channel-scope.h \
-	   ./sources/main/scopes/dev-scope.h \
-	   ./sources/main/scopes/waterfall-scope.h \
-	   ./sources/main/scopes/iqdisplay.h \
-	   ./sources/main/scopes/audio-display.h \
-	   ./sources/main//scopes/spectrogramdata.h \
-	   ./sources/main/snr-viewer/snr-viewer.h \
-	   ./sources/main/ensemble-handler.h \
-	   ./sources/main/config-handler.h \
-	   ./sources/main/techdata.h \
-	   ./sources/main/aboutdialog.h \
-	   ./sources/support/equalizer.h \
-	   ./sources/support/qwt-2.h \
-	   ./sources/support/scan-handler.h \
-	   ./sources/support/scantable-handler.h \
-	   ./sources/support/dxDisplay.h \
-	   ./sources/support/audiosystem-selector.h \
-	   ./sources/support/dl2-handler.h \
-	   ./sources/support/http-handler.h \
-	   ./sources/eti-handler/eti-generator.h \
-	   ./sources/frontend/ofdm-handler.h \
-	   ./sources/frontend/timesyncer.h \
-	   ./sources/frontend/sample-reader.h \
-	   ./sources/frontend/ofdm-decoder.h \
-	   ./sources/frontend/correlator.h \
-	   ./sources/frontend/estimator.h \
-	   ./sources/frontend/freqsyncer.h \
-	   ./sources/frontend/phasetable.h \
-	   ./sources/frontend/freq-interleaver.h \
-	   ./sources/frontend/tii-detector.h \
-	   ./sources/frontend/tii-detector-1.h \
-	   ./sources/frontend/tii-detector-2.h \
-	   ./sources/frontend/fic-handling/fic-handler.h \
-	   ./sources/frontend/fic-handling/ensemble.h  \
-	   ./sources/frontend/fic-handling/fib-dbtypes.h  \
-	   ./sources/frontend/fic-handling/fib-config.h  \
-	   ./sources/frontend/fic-handling/fib-decoder.h  \
-	   ./sources/frontend/fic-handling/fib-table.h \
-	   ./sources/protection/protTables.h \
-	   ./sources/protection/protection.h \
-	   ./sources/protection/eep-protection.h \
-	   ./sources/protection/uep-protection.h \
-	   ./sources/backend/msc-handler.h \
-	   ./sources/backend/reed-solomon/galois.h \
-	   ./sources/backend/reed-solomon/reed-solomon.h \
-	   ./sources/backend/frame-processor.h \
-	   ./sources/backend/backend.h \
-	   ./sources/backend/backend-driver.h \
-	   ./sources/backend/backend-deconvolver.h \
-	   ./sources/backend/audio/firecode-checker.h \
-	   ./sources/backend/audio/mp2processor.h \
-	   ./sources/backend/audio/mp4processor.h \
-	   ./sources/backend/audio/bitWriter.h \
-	   ./sources/backend/data/data-processor.h \
-	   ./sources/backend/data/pad-handler.h \
-	   ./sources/backend/data/virtual-datahandler.h \
-	   ./sources/backend/data/tdc-datahandler.h \
-	   ./sources/backend/data/ip-datahandler.h \
-	   ./sources/backend/data/adv-datahandler.h \
-	   ./sources/backend/data/mot/mot-handler.h \
-	   ./sources/backend/data/mot/mot-object.h \
-	   ./sources/backend/data/mot/mot-dir.h \
-	   ./sources/backend/data/journaline-controller.h \
-	   ./sources/backend/data/journaline-datahandler.h \
-	   ./sources/backend/data/journaline-screen.h \
-	   ./sources/backend/data/journaline/dabdatagroupdecoder.h \
-	   ./sources/backend/data/journaline/crc_8_16.h \
-	   ./sources/backend/data/journaline/log.h \
-	   ./sources/backend/data/journaline/newssvcdec_impl.h \
-	   ./sources/backend/data/journaline/Splitter.h \
-	   ./sources/backend/data/journaline/dabdgdec_impl.h \
-	   ./sources/backend/data/journaline/newsobject.h \
-	   ./sources/backend/data/journaline/NML.h \
-	   ./sources/backend/data/epg/epg-compiler.h \
-	   ./sources/backend/data/epg/xml-extractor.h \
-	   ./sources/output/audio-player.h \
-	   ./sources/support/dab-constants.h \
-	   ./sources/support/bit-extractors.h \
-	   ./sources/support/charsets.h \
-	   ./sources/support/crc-handlers.h \
-	   ./sources/support/mot-content-types.h \
-	   ./sources/support/distances.h \
-	   ./sources/support/time-converter.h \
-	   ./sources/support/logger.h \
-	   ./sources/support/errorlog.h \

qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9.pro-32 Deleted

@@ -1,988 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Oct 6 19:48:14 2009
-# but modified by me to accomodate for the includes for qwt, hamlib and
-# portaudio
-######################################################################
-
-TEMPLATE	= app
-QT		+= widgets xml multimedia
-#CONFIG		+= console
-CONFIG		-= console
-QMAKE_CXXFLAGS	+= -std=c++20
-
-win32 {
-QMAKE_CXXFLAGS	+=  -ffast-math -flto 
-QMAKE_CFLAGS	+=  -ffast-math -flto
-QMAKE_LFLAGS	+=  -ffast-math -flto
-}
-
-unix {
-#QMAKE_CFLAGS	+=  -O3 -ffast-math -g
-#QMAKE_CXXFLAGS	+=  -O3 -ffast-math -g
-#QMAKE_LFLAGS	+=  -O3 -ffast-math -g
-#QMAKE_CFLAGS	+=  -O3 -ffast-math -pg
-@QMAKE_CXXFLAGS	+=  -O3 -ffast-math -pg
-#QMAKE_LFLAGS	+=  -O3 -ffast-math -pg
-QMAKE_CXXFLAGS	+=  -ffast-math -flto 
-QMAKE_CFLAGS	+=  -ffast-math -flto
-QMAKE_LFLAGS	+=  -ffast-math -flto
-#QMAKE_CFLAGS	+=  -g -fsanitize=address 
-#QMAKE_CXXFLAGS	+=  -g -fsanitize=address 
-#QMAKE_LFLAGS	+=  -g -fsanitize=address
-}
-
-#QMAKE_CFLAGS	+=  -pg
-#QMAKE_CXXFLAGS	+=  -pg
-#QMAKE_LFLAGS	+=  -pg
-QMAKE_CXXFLAGS += -isystem $$QT_INSTALL_HEADERS
-RC_ICONS	=  qt-dab-6.9.5.ico
-RESOURCES	+= resources.qrc
-
-TRANSLATIONS = ../i18n/de_DE.ts
-#
-#       For more parallel processing, uncomment the following
-#       defines
-#DEFINES	+= __MSC_THREAD__
-DEFINES		+= __THREADED_BACKEND__
-DEFINES	+= __FFT_CORR__
-
-#For showing trace output
-#DEFINES	+= __EPG_TRACE__  
-DEPENDPATH += . \
-	      ..sources \
-	      ./sources/backend\
-	      ./sources/backend/reed-solomon \
-	      ./sources/backend/audio \
-	      ./sources/backend/data \
-	      ./sources/backend/data/epg \
-	      ./sources/backend/data/mot \
-	      ./sources/backend/data/journaline \
-	      ./sources/eti-handler \
-	      ./sources/main \
-	      ./sources/main/forms-v7 \
-	      ./sources/main/snr-viewer \
-	      ./sources/frontend \
-	      ./sources/frontend/fic-handling \
-	      ./sources/output \
-	      ./sources/output/portaudio \
-	      ./sources/protection \
-	      ./sources/devices \
-	      ./sources/support \
-	      ./sources/support/gui-elements \
-	      ./sources/devices \
-	      ./sources/devices/filereaders/ \
-	      ./sources/devices/filereaders/new-reader \
-	      ./sources/devices/filereaders/rawfiles-new \
-	      ./sources/devices/filereaders/xml-filereader 
-	
-
-INCLUDEPATH += . \
-	      ..sources \
-	      ./sources/backend\
-	      ./sources/backend/reed-solomon \
-	      ./sources/backend/audio \
-	      ./sources/backend/data \
-	      ./sources/backend/data/epg \
-	      ./sources/backend/data/mot \
-	      ./sources/backend/data/journaline \
-	      ./sources/eti-handler \
-	      ./sources/main \
-	      ./sources/main/forms-v7 \
-	      ./sources/main/scopes \
-	      ./sources/main/snr-viewer \
-	      ./sources/frontend \
-	      ./sources/frontend/fic-handling \
-	      ./sources/output \
-	      ./sources/output/portaudio \
-	      ./sources/protection \
-	      ./sources/devices \
-#	      ./sources/scopes-qwt6 \
-	      ./sources/support \
-	      ./sources/support/gui-elements \
-	      ./sources/devices \
-	      ./sources/devices/filereaders/ \
-	      ./sources/devices/filereaders/new-reader \
-	      ./sources/devices/filereaders/rawfiles-new \
-	      ./sources/devices/filereaders/xml-filereader 
-	
-
-# Input
-HEADERS += ./sources/main/radio.h \
-	   ./sources/main/display-widget.h \
-	   ./sources/main/scopes/spectrum-scope.h \
-	   ./sources/main/scopes/correlation-scope.h \
-	   ./sources/main/scopes/null-scope.h \
-	   ./sources/main/scopes/channel-scope.h \
-	   ./sources/main/scopes/dev-scope.h \
-	   ./sources/main/scopes/waterfall-scope.h \
-	   ./sources/main/scopes/iqdisplay.h \
-	   ./sources/main/scopes/audio-display.h \
-	   ./sources/main//scopes/spectrogramdata.h \
-	   ./sources/main/snr-viewer/snr-viewer.h \
-	   ./sources/main/ensemble-handler.h \
-	   ./sources/main/config-handler.h \
-	   ./sources/main/techdata.h \
-	   ./sources/main/aboutdialog.h \
-	   ./sources/support/equalizer.h \
-	   ./sources/support/qwt-2.h \
-	   ./sources/support/scan-handler.h \
-	   ./sources/support/scantable-handler.h \
-	   ./sources/support/dxDisplay.h \
-	   ./sources/support/audiosystem-selector.h \
-	   ./sources/support/dl2-handler.h \
-	   ./sources/eti-handler/eti-generator.h \
-	   ./sources/frontend/ofdm-handler.h \
-	   ./sources/frontend/timesyncer.h \
-	   ./sources/frontend/sample-reader.h \
-	   ./sources/frontend/ofdm-decoder.h \
-	   ./sources/frontend/correlator.h \
-	   ./sources/frontend/estimator.h \
-	   ./sources/frontend/freqsyncer.h \
-	   ./sources/frontend/phasetable.h \
-	   ./sources/frontend/freq-interleaver.h \
-	   ./sources/frontend/tii-detector.h \
-	   ./sources/frontend/tii-detector-1.h \
-	   ./sources/frontend/tii-detector-2.h \
-	   ./sources/frontend/fic-handling/fic-handler.h \
-	   ./sources/frontend/fic-handling/ensemble.h  \
-	   ./sources/frontend/fic-handling/fib-dbtypes.h  \
-	   ./sources/frontend/fic-handling/fib-config.h  \
-	   ./sources/frontend/fic-handling/fib-decoder.h  \
-	   ./sources/frontend/fic-handling/fib-table.h \
-	   ./sources/protection/protTables.h \
-	   ./sources/protection/protection.h \
-	   ./sources/protection/eep-protection.h \
-	   ./sources/protection/uep-protection.h \
-	   ./sources/backend/msc-handler.h \
-	   ./sources/backend/reed-solomon/galois.h \
-	   ./sources/backend/reed-solomon/reed-solomon.h \
-	   ./sources/backend/frame-processor.h \
-	   ./sources/backend/backend.h \
-	   ./sources/backend/backend-driver.h \
-	   ./sources/backend/backend-deconvolver.h \
-	   ./sources/backend/audio/firecode-checker.h \
-	   ./sources/backend/audio/mp2processor.h \
-	   ./sources/backend/audio/mp4processor.h \
-	   ./sources/backend/audio/bitWriter.h \
-	   ./sources/backend/data/data-processor.h \
-	   ./sources/backend/data/pad-handler.h \
-	   ./sources/backend/data/virtual-datahandler.h \
-	   ./sources/backend/data/tdc-datahandler.h \
-	   ./sources/backend/data/ip-datahandler.h \
-	   ./sources/backend/data/adv-datahandler.h \
-	   ./sources/backend/data/mot/mot-handler.h \
-	   ./sources/backend/data/mot/mot-object.h \
-	   ./sources/backend/data/mot/mot-dir.h \
-	   ./sources/backend/data/journaline-controller.h \
-	   ./sources/backend/data/journaline-datahandler.h \
-	   ./sources/backend/data/journaline-screen.h \
-	   ./sources/backend/data/journaline/dabdatagroupdecoder.h \
-	   ./sources/backend/data/journaline/crc_8_16.h \
-	   ./sources/backend/data/journaline/log.h \
-	   ./sources/backend/data/journaline/newssvcdec_impl.h \
-	   ./sources/backend/data/journaline/Splitter.h \
-	   ./sources/backend/data/journaline/dabdgdec_impl.h \
-	   ./sources/backend/data/journaline/newsobject.h \
-	   ./sources/backend/data/journaline/NML.h \
-	   ./sources/backend/data/epg/epg-compiler.h \
-	   ./sources/backend/data/epg/xml-extractor.h \
-	   ./sources/output/audio-player.h \
-	   ./sources/support/dab-constants.h \
-	   ./sources/support/bit-extractors.h \
-	   ./sources/support/charsets.h \
-	   ./sources/support/crc-handlers.h \
-	   ./sources/support/mot-content-types.h \
-	   ./sources/support/distances.h \
-	   ./sources/support/time-converter.h \
-	   ./sources/support/logger.h \
-	   ./sources/support/errorlog.h \
-	   ./sources/support/settings-handler.h \

qt-dab-Qt-DAB-6.9.6.tar.gz/qt-dab-6.9.pro-64 Deleted

@@ -1,959 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue Oct 6 19:48:14 2009
-# but modified by me to accomodate for the includes for qwt, hamlib and
-# portaudio
-######################################################################
-
-TEMPLATE	= app
-QT		+= widgets xml 
-#CONFIG		+= console
-CONFIG		-= console
-QMAKE_CXXFLAGS	+= -std=c++17
-CONFIG		+= release
-win32 {
-QMAKE_CFLAGS	+=  -O4 -ffast-math
-QMAKE_CXXFLAGS	+=  -O4 -ffast-math
-}
-unix {
-QMAKE_CXXFLAGS	+=  -ffast-math -flto
-QMAKE_CFLAGS	+=  -ffast-math -flto
-QMAKE_LFLAGS	+=  -ffast-math -flto
-#QMAKE_CFLAGS	+=  -g -fsanitize=address
-#QMAKE_CXXFLAGS	+=  -g -fsanitize=address
-#QMAKE_LFLAGS	+=  -g -fsanitize=address
-}
-
-#QMAKE_CFLAGS	+=  -pg
-#QMAKE_CXXFLAGS	+=  -pg
-#QMAKE_LFLAGS	+=  -pg
-QMAKE_CXXFLAGS += -isystem $$QT_INSTALL_HEADERS
-RC_ICONS	=  qt-dab-6.9.ico
-RESOURCES	+= resources.qrc
-
-TRANSLATIONS = ../i18n/de_DE.ts
-DEFINES		+= __HAS_CHANNEL__
-#
-#       For more parallel processing, uncomment the following
-#       defines
-#DEFINES	+= __MSC_THREAD__
-DEFINES		+=  __THREADED_BACKEND__
-
-#DEFINES	+= _UPLOAD_SCAN_RESULT_
-
-#For showing trace output
-#DEFINES	+= __EPG_TRACE__  
-
-DEPENDPATH += . \
-	      ./support \
-	      ./forms-v7/ \
-	      ./forms-v7/new-display \
-	      ./forms-v7/new-display/scopes \
-	      ./forms-v7/snr-viewer \
-	      ../eti-handler \
-	      ../src \
-	      ../includes \
-	      ../src/ofdm \
-	      ../src/protection \
-	      ../src/backend \
-	      ../src/backend/audio \
-	      ../src/backend/data \
-	      ../src/backend/data/mot \
-	      ../src/backend/data/journaline \
-	      ../src/output \
-	      ../src/support \
-	      ../src/support/tii-library \
-	      ../src/support/buttons \
-	      ../includes/ofdm \
-	      ../includes/protection \
-	      ../includes/backend \
-	      ../includes/backend/audio \
-	      ../includes/backend/data \
-	      ../includes/backend/data/mot \
-	      ../includes/backend/data/epg \
-	      ../includes/backend/data/journaline \
-	      ../includes/output \
-	      ../includes/support \
-	      ../includes/support/buttons \
-	      ../includes/scopes-qwt6 \
-	      ../qt-devices \
-	      ../qt-devices/filereaders \
-	      ../qt-devices/filereaders/rawfiles-new \
-	      ../qt-devices/filereaders/new-reader \
-	      ../qt-devices/filereaders/xml-filereader 
-	      
-
-INCLUDEPATH += . \
-	       ./support \
-	      ./forms-v7/ \
-	      ./forms-v7/new-display \
-	      ./forms-v7/new-display/scopes \
-	      ./forms-v7/snr-viewer \
-	      ../ \
-	      ../eti-handler \
-	      ../src \
-	      ../includes \
-	      ../includes/protection \
-	      ../includes/ofdm \
-	      ../includes/backend \
-	      ../includes/backend/audio \
-	      ../includes/backend/data \
-	      ../includes/backend/data/mot \
-	      ../includes/backend/data/journaline \
-	      ../includes/backend/data/epg \
-	      ../includes/output \
-	      ../includes/support \
-	      ../src/support/tii-library \
-	      ../includes/support/buttons \
-	      ../includes/scopes-qwt6 \
-	      ../qt-devices \
-	      ../qt-devices/filereaders \
-	      ../qt-devices/filereaders/rawfiles-new \
-	      ../qt-devices/filereaders/new-reader \
-	      ../qt-devices/filereaders/xml-filereader 
-
-# Input
-HEADERS += ./radio.h \
-	   ./support/techdata.h \
-	   ./support/super-frame.h \
-	   ./support/clickable-label.h \
-	   ./support/icon-label.h \
-	   ./support/scan-handler.h \
-	   ./support/scantable-handler.h \
-	   ./support/aboutdialog.h \
-	   ./support/ensemble-handler.h \
-           ./support/config-handler.h \
-	   ./support/audiosystem-selector.h \
-	   ./support/dxDisplay.h \
-	   ./forms-v7/qwt-2.h \
-	   ./forms-v7/new-display/display-widget.h \
-	   ./forms-v7/new-display/scopes/spectrum-scope.h \
-	   ./forms-v7/new-display/scopes/correlation-scope.h \
-	   ./forms-v7/new-display/scopes/null-scope.h \
-	   ./forms-v7/new-display/scopes/channel-scope.h \
-	   ./forms-v7/new-display/scopes/dev-scope.h \
-	   ./forms-v7/new-display/scopes/waterfall-scope.h \
-	   ./forms-v7/new-display/scopes/iqdisplay.h \
-	   ./forms-v7/new-display/scopes/audio-display.h \
-	   ./forms-v7/new-display/scopes/spectrogramdata.h \
-	   ./forms-v7/snr-viewer/snr-viewer.h \
-	   ../ofdm-handler.h \
-	   ../eti-handler/eti-generator.h \
-	   ../includes/dab-constants.h \
-	   ../includes/bit-extractors.h \
-	   ../includes/crc-handlers.h \
-	   ../includes/mot-content-types.h \
-	   ../includes/ofdm/timesyncer.h \
-	   ../includes/ofdm/sample-reader.h \
-	   ../includes/ofdm/ofdm-decoder.h \
-	   ../includes/ofdm/correlator.h \
-	   ../includes/ofdm/freqsyncer.h \
-	   ../includes/ofdm/phasetable.h \
-	   ../includes/ofdm/freq-interleaver.h \
-	   ../includes/ofdm/tii-detector.h \
-	   ../includes/ofdm/tii-detector-1.h \
-	   ../includes/ofdm/tii-detector-2.h \
-	   ../includes/ofdm/fic-handler.h \
-	   ../includes/ofdm/ensemble.h  \
-           ../includes/ofdm/fib-config.h  \
-           ../includes/ofdm/fib-printer.h  \
-	   ../includes/ofdm/fib-decoder.h  \
-	   ../includes/ofdm/fib-table.h \
-	   ../includes/ofdm/estimator.h \
-	   ../includes/protection/protTables.h \
-	   ../includes/protection/protection.h \
-	   ../includes/protection/eep-protection.h \
-	   ../includes/protection/uep-protection.h \
-	   ../includes/backend/msc-handler.h \
-	   ../includes/backend/galois.h \
-	   ../includes/backend/reed-solomon.h \
-	   ../includes/backend/charsets.h \
-	   ../includes/backend/firecode-checker.h \
-	   ../includes/backend/frame-processor.h \
-	   ../includes/backend/backend.h \
-	   ../includes/backend/backend-driver.h \
-	   ../includes/backend/backend-deconvolver.h \
-	   ../includes/backend/audio/mp2processor.h \
-	   ../includes/backend/audio/mp4processor.h \
-	   ../includes/backend/audio/bitWriter.h \
-	   ../includes/backend/data/data-processor.h \
-	   ../includes/backend/data/pad-handler.h \
-	   ../includes/backend/data/virtual-datahandler.h \
-	   ../includes/backend/data/tdc-datahandler.h \
-	   ../includes/backend/data/ip-datahandler.h \
-	   ../includes/backend/data/adv-datahandler.h \
-	   ../includes/backend/data/mot/mot-handler.h \
-	   ../includes/backend/data/mot/mot-object.h \
-	   ../includes/backend/data/mot/mot-dir.h \
-	   ../includes/backend/data/journaline-datahandler.h \
-	   ../includes/backend/data/journaline-screen.h \
-	   ../includes/backend/data/journaline/dabdatagroupdecoder.h \
-	   ../includes/backend/data/journaline/crc_8_16.h \
-	   ../includes/backend/data/journaline/log.h \
-	   ../includes/backend/data/journaline/newssvcdec_impl.h \
-	   ../includes/backend/data/journaline/Splitter.h \
-	   ../includes/backend/data/journaline/dabdgdec_impl.h \
-	   ../includes/backend/data/journaline/newsobject.h \
-	   ../includes/backend/data/journaline/NML.h \
-	   ../includes/backend/data/epg/epg-compiler.h \
-	   ../includes/backend/data/epg/xml-extractor.h \
-	   ../includes/output/audio-player.h \

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/Qt_DAB-6.9.1.png Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/Qt_DAB-6.9.2.png Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/res/read_me/Qt_DAB-6.9.5.png Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/airspy-2 Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/airspy-2/airspy-2.cpp Deleted

@@ -1,969 +0,0 @@
-#
-/**
- * IW0HDV Extio
- *
- * Copyright 2015 by Andrea Montefusco IW0HDV
- *
- * Licensed under GNU General Public License 3.0 or later. 
- * Some rights reserved. See COPYING, AUTHORS.
- *
- * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
- *
- *	recoding, taking parts and extending for the airspy_2 interface
- *	for the Qt-DAB program
- *	jan van Katwijk
- *	Lazy Chair Computing
- */
-
-#include	<QPoint>
-#include	<QFileDialog>
-#include	<QTime>
-#include	<QDate>
-#include	"dab-constants.h"
-#include	"airspy-2.h"
-#include	"position-handler.h"
-#include	"airspyselect.h"
-#include	"device-exceptions.h"
-#include	"errorlog.h"
-#include	"settingNames.h"
-#include	"settings-handler.h"
-
-#define	AIRSPY_SETTINGS	"airspySettings"
-#define	TAB_SETTINGS	"tabSettings"
-#define	CONV_QUALITY	"convQuality"
-
-static
-const	int	EXTIO_NS	= 8192;
-static
-const	int	EXTIO_BASE_TYPE_SIZE = sizeof (float);
-
-	airspy_2::airspy_2 (QSettings *s,
-	 const QString &recorderVersion,
-	 errorLogger	*theLogger) :
- _I_Buffer (4 * 1024 * 1024) {
-int	result;
-int	distance	= 1000000;
-std::vector <uint32_t> sampleRates;
-uint32_t samplerateCount;
-
-	this	-> airspySettings	= s;
-	this	-> recorderVersion	= recorderVersion;
-	theErrorLogger			= theLogger;
-	setupUi (&myFrame);
-	setPositionAndSize (s, &myFrame, AIRSPY_SETTINGS);
-	myFrame. show		();
-//
-//	Since we have different tabs, with different sliders for
-//	gain setting, restoring the settings is a tedious task
-	int tab	= value_i (airspySettings, AIRSPY_SETTINGS, TAB_SETTINGS, 2);
- tabWidget	-> setCurrentIndex (tab);
-	restore_gainSliders (200, tab);
-
-	device			= nullptr;
-	serialNumber		= 0;
-
-#ifdef	__MINGW32__
-	const char *libraryString = "airspy.dll";
-#else
-	const char *libraryString = "libairspy.so";
-#endif
-	
- library_p = new QLibrary (libraryString);
- library_p -> load();
-
- if (!library_p -> isLoaded ()) {
- throw (device_exception ("failed to open " +
- std::string (libraryString)));
- }
-
-	if (!load_airspyFunctions ()) {
-	 delete library_p;
-	 throw (device_exception ("one or more library functions could not be loaded"));
-	}
-//
-	strcpy (serial,"");
-	if (this -> my_airspy_init () != AIRSPY_SUCCESS) {
-	 delete library_p;
-	 throw (device_exception ("could not init"));
-	}
-
-	uint64_t deviceList 4;
-	int	deviceIndex;
-	int numofDevs = my_airspy_list_devices (deviceList, 4)
-;
-	if (numofDevs == 0) {
-	 delete library_p;
-	 throw (device_exception ("No airspy device was detected"));
-	}
-
-	if (numofDevs > 1) {
- airspySelect deviceSelector;
- for (deviceIndex = 0; deviceIndex < (int)numofDevs; deviceIndex ++) {
- deviceSelector.
- addtoList (QString::number (deviceList deviceIndex));
- }
- deviceIndex = deviceSelector. QDialog::exec();
- }
-	else
-	 deviceIndex = 0;
-	
-	result = my_airspy_open (&device, deviceList deviceIndex);
-	if (result != AIRSPY_SUCCESS) {
-	 delete library_p;
-	 throw (device_exception
-	 (my_airspy_error_name ((airspy_error)result)));
-	}
-
-	(void) my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
-	(void) my_airspy_get_samplerates (device, &samplerateCount, 0);
-//	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
-	sampleRates. resize (samplerateCount);
-	my_airspy_get_samplerates (device,
-	 sampleRates. data(), samplerateCount);
-
-	selectedRate	= 0;
-	for (int i = 0; i < (int)samplerateCount; i ++) {
-	 fprintf (stderr, "%d \n", sampleRates i);
-	 if (abs ((int)sampleRates i - SAMPLERATE) < distance) {
-	 distance	= abs ((int)sampleRates i - SAMPLERATE);
-	 selectedRate = sampleRates i;
-	 }
-	}
-
-	if (selectedRate == 0) {
-	 delete library_p;
-	 throw (device_exception ("Cannot handle the samplerates"));
-	}
-
-	fprintf (stderr, "selected samplerate = %d\n", selectedRate);
-	result = my_airspy_set_samplerate (device, selectedRate);
-
-	if (result != AIRSPY_SUCCESS) {
-	 delete library_p;
-	 throw (device_exception
-	 (my_airspy_error_name ((enum airspy_error)result)));
-	}
-	filterDepth		= value_i (airspySettings, AIRSPY_SETTINGS,
-	 CONV_QUALITY, 7);
-	convQuality_setter	-> setValue (filterDepth);
- theFilter. reset (new LowPassFIR (filterDepth,
-	 1536000 / 2, selectedRate));
-
-// The sizes of the mapTables follow from the input and output rate
-// (selectedRate / 1000) vs (SAMPLERATE / 1000)
-// so we end up with buffers with 1 msec content
- convBufferSize = selectedRate / 1000;
-	float samplesPerMsec	= SAMPLERATE / 1000.0;
- for (int i = 0; i < SAMPLERATE / 1000; i ++) {
- float inVal = float (selectedRate / 1000);
- mapTable_int i = int (floor (i * (inVal / samplesPerMsec)));
- mapTable_float i = i * (inVal / samplesPerMsec) - mapTable_int i;
- }
- convIndex = 0;
- convBuffer. resize (convBufferSize + 1);
-
-//
-	restore_gainSettings (tab);
-	connect (linearitySlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_linearity);
-	connect (sensitivitySlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_sensitivity);
-	connect (lnaSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_lna_gain);
-	connect (vgaSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_vga_gain);
-	connect (mixerSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_mixer_gain);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (lnaButton, &QCheckBox::checkStateChanged,
-#else
-	connect (lnaButton, &QCheckBox::stateChanged,
-#endif
-	 this, &airspy_2::set_lna_agc);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (mixerButton, &QCheckBox::checkStateChanged,
-#else
-	connect (mixerButton, &QCheckBox::stateChanged,
-#endif
-	 this, &airspy_2::set_mixer_agc);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (biasButton, &QCheckBox::checkStateChanged,
-#else
-	connect (biasButton, &QCheckBox::stateChanged,
-#endif
-	 this, &airspy_2::set_rf_bias);
-	connect (tabWidget, &QTabWidget::currentChanged,
-	 this, &airspy_2::switch_tab);
-	connect (dumpButton, &QPushButton::clicked,
-	 this, &airspy_2::set_xmlDump);
-	connect (this, &airspy_2::new_tabSetting,

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/airspy-2/airspy-2.h Deleted

@@ -1,197 +0,0 @@
-#
-/**
- * IW0HDV Extio
- *
- * Copyright 2015 by Andrea Montefusco IW0HDV
- *
- * Licensed under GNU General Public License 3.0 or later. 
- * Some rights reserved. See COPYING, AUTHORS.
- *
- * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
- *
- *	recoding and taking parts for the airspyRadio interface
- *	for the Qt-DAB program
- *	jan van Katwijk
- *	Lazy Chair Computing
- */
-#pragma once
-
-#include	<QObject>
-#include	<QSettings>
-#include	<QFrame>
-#include	<vector>
-#include	<atomic>
-#include	<mutex>
-#include	"dab-constants.h"
-#include	"ringbuffer.h"
-#include	"device-handler.h"
-#include	"ui_airspy-widget.h"
-#include	<QLibrary>
-#ifndef	__MINGW32__
-#include	"libairspy/airspy.h"
-#else
-#include	"libairspy/airspy.h"
-#endif
-#include	"fir-filters.h"
-
-#include	<QScopedPointer>
-#include	"xml-filewriter.h"
-class	errorLogger;
-
-extern "C" {
- typedef int (*pfn_airspy_init)();
- typedef int (*pfn_airspy_exit)();
- typedef int (*pfn_airspy_list_devices)(uint64_t *, int);
- typedef int (*pfn_airspy_open) (struct airspy_device**, uint64_t);
-// typedef int (*pfn_airspy_open) (struct airspy_device**);
- typedef int (*pfn_airspy_close) (struct airspy_device*);
- typedef int (*pfn_airspy_get_samplerates) (struct airspy_device* device,
-	 uint32_t* buffer,
-	 const uint32_t len);
- typedef int (*pfn_airspy_set_samplerate) (struct airspy_device* device,
-	 uint32_t samplerate);
- typedef int (*pfn_airspy_start_rx) (struct airspy_device* device,
-	 airspy_sample_block_cb_fn callback,
-	 void* rx_ctx);
- typedef int (*pfn_airspy_stop_rx) (struct airspy_device* device);
-
- typedef int (*pfn_airspy_set_sample_type) (struct airspy_device *,
-	 airspy_sample_type);
- typedef int (*pfn_airspy_set_freq) (struct airspy_device* device,
-	 const uint32_t freq_hz);
-
- typedef int (*pfn_airspy_set_lna_gain) (struct airspy_device* device,
-	 uint8_t value);
-
- typedef int (*pfn_airspy_set_mixer_gain) (struct airspy_device* device,
-	 uint8_t value);
-
- typedef int (*pfn_airspy_set_vga_gain) (struct airspy_device*
-	 device, uint8_t
-	 value);
- typedef int (*pfn_airspy_set_lna_agc) (struct airspy_device* device,
-	 uint8_t value);
- typedef int (*pfn_airspy_set_mixer_agc) (struct airspy_device* device,
-	 uint8_t value);
-
- typedef int (*pfn_airspy_set_rf_bias) (struct airspy_device* dev,
-	 uint8_t value);
-
- typedef const char* (*pfn_airspy_error_name) (enum airspy_error errcode);
- typedef int (*pfn_airspy_board_id_read) (struct airspy_device *,
-	 uint8_t *);
- typedef const char* (*pfn_airspy_board_id_name) (enum airspy_board_id board_id);
- typedef int (*pfn_airspy_board_partid_serialno_read)(struct airspy_device* device, airspy_read_partid_serialno_t* read_partid_serialno);
-
- typedef int (*pfn_airspy_set_linearity_gain) (struct airspy_device* device, uint8_t value);
- typedef int (*pfn_airspy_set_sensitivity_gain)(struct airspy_device* device, uint8_t value);
-}
-
-class airspy_2 final: // public QObject,
-	 public deviceHandler, public Ui_airspyWidget {
-Q_OBJECT
-public:
-			airspy_2		(QSettings *,
-	 const QString &,
-	 errorLogger *);
-			~airspy_2		();
-	int32_t		defaultFrequency	();
-	bool		restartReader		(int32_t, int samplesSkipped = 0);
-	void		stopReader		();
-	int32_t		getSamples		(std::complex<float> *v, int32_t size);
-	int32_t		Samples			();
-	void		resetBuffer		();
-	int16_t		bitDepth		();
-	int		getBufferSpace		();
-	QString		deviceName		();
-
-	void		startDump		();
-	void		stopDump		();
-	int16_t		currentTab;
-private:
-	RingBuffer<std::complex<float>> _I_Buffer;
-	errorLogger	*theErrorLogger;
-	QString		recorderVersion;
-	void		check_error		(bool, const std::string);
- QScopedPointer<xml_fileWriter>	xmlWriter;
- bool setup_xmlDump		(bool);
- void close_xmlDump ();
- std::atomic<bool> dumping;
-	void		record_gainSettings	(int, int);
-	void		restore_gainSliders	(int, int);
-	void		restore_gainSettings	(int);
-	QSettings	*airspySettings;
-	void		showStatus		(const QString);
-	QScopedPointer<LowPassFIR>	theFilter;
-	int		filterDepth;
-private slots:
-	void		set_linearity		(int value);
-	void		set_sensitivity		(int value);
-	void		set_lna_gain		(int value);
-	void		set_mixer_gain		(int value);
-	void		set_vga_gain		(int value);
-	void		set_lna_agc		(int);
-	void		set_mixer_agc		(int);
-	void		set_rf_bias		(int);
-	void		switch_tab		(int);
-	void		set_xmlDump		();
-signals:
-	void		new_tabSetting		(int);
-private:
-	bool		load_airspyFunctions	();
-//	The functions to be extracted from the dll/.so file
-	pfn_airspy_init		 my_airspy_init;
-	pfn_airspy_exit		 my_airspy_exit;
-	pfn_airspy_error_name	 my_airspy_error_name;
-	pfn_airspy_list_devices	 my_airspy_list_devices;
-	pfn_airspy_open		 my_airspy_open;
-	pfn_airspy_close	 my_airspy_close;
-	pfn_airspy_get_samplerates my_airspy_get_samplerates;
-	pfn_airspy_set_samplerate my_airspy_set_samplerate;
-	pfn_airspy_start_rx	 my_airspy_start_rx;
-	pfn_airspy_stop_rx	 my_airspy_stop_rx;
-	pfn_airspy_set_sample_type my_airspy_set_sample_type;
-	pfn_airspy_set_freq	 my_airspy_set_freq;
-	pfn_airspy_set_lna_gain	 my_airspy_set_lna_gain;
-	pfn_airspy_set_mixer_gain my_airspy_set_mixer_gain;
-	pfn_airspy_set_vga_gain	 my_airspy_set_vga_gain;
-	pfn_airspy_set_linearity_gain my_airspy_set_linearity_gain;
-	pfn_airspy_set_sensitivity_gain my_airspy_set_sensitivity_gain;
-	pfn_airspy_set_lna_agc	 my_airspy_set_lna_agc;
-	pfn_airspy_set_mixer_agc my_airspy_set_mixer_agc;
-	pfn_airspy_set_rf_bias	 my_airspy_set_rf_bias;
-	pfn_airspy_board_id_read my_airspy_board_id_read;
-	pfn_airspy_board_id_name my_airspy_board_id_name;
-	pfn_airspy_board_partid_serialno_read
-		 my_airspy_board_partid_serialno_read;
-//
-	QLibrary	*library_p;
-	bool		success;
-	std::atomic<bool>	running;
-	bool		lna_agc;
-	bool		mixer_agc;
-	bool		rf_bias;
-const	char*		board_id_name();
-
-	int16_t		vgaGain;
-	int16_t		mixerGain;
-	int16_t		lnaGain;
-	int32_t		selectedRate;
-	int16_t convBufferSize;
- int16_t convIndex;
- std::vector <std::complex<float> > convBuffer;
- int16_t mapTable_int 4 * 512;
- float mapTable_float 4 * 512;
-	int32_t		inputRate;
- int32_t inp;
-	struct airspy_device* device;
-	uint64_t 	serialNumber;
-	char		serial 128;
-static
-	int		callback(airspy_transfer_t *);
-	int		data_available (void *buf, int buf_size);
-const	char *		getSerial();
-	int		open();
-};
-
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/airspy-2/airspy-widget.ui Deleted

@@ -1,569 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>airspyWidget</class>
- <widget class="QWidget" name="airspyWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>410</width>
- <height>355</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>airspy</string>
- </property>
- <widget class="QTabWidget" name="tabWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>130</y>
- <width>381</width>
- <height>201</height>
- </rect>
- </property>
- <property name="currentIndex">
- <number>2</number>
- </property>
- <widget class="QWidget" name="tab_1">
- <attribute name="title">
- <string>sensitivity</string>
- </attribute>
- <widget class="QSlider" name="sensitivitySlider">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>251</width>
- <height>20</height>
- </rect>
- </property>
- <property name="maximum">
- <number>21</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="sensitivity_lnaDisplay">
- <property name="geometry">
- <rect>
- <x>220</x>
- <y>60</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::Shape::NoFrame</enum>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="sensitivity_mixerDisplay">
- <property name="geometry">
- <rect>
- <x>220</x>
- <y>80</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::Shape::NoFrame</enum>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="sensitivity_vgaDisplay">
- <property name="geometry">
- <rect>
- <x>220</x>
- <y>100</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::Shape::NoFrame</enum>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QLabel" name="label_5">
- <property name="geometry">
- <rect>
- <x>100</x>
- <y>60</y>
- <width>101</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>lna gain</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_6">
- <property name="geometry">
- <rect>
- <x>100</x>
- <y>80</y>
- <width>91</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>mixer gain</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_7">
- <property name="geometry">
- <rect>
- <x>100</x>
- <y>100</y>
- <width>81</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>vga gain</string>
- </property>
- </widget>
- <widget class="QLCDNumber" name="sensitivityDisplay">
- <property name="geometry">
- <rect>
- <x>280</x>
- <y>20</y>
- <width>41</width>
- <height>23</height>
- </rect>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- </widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>linearity</string>
- </attribute>
- <widget class="QSlider" name="linearitySlider">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>251</width>
- <height>20</height>
- </rect>
- </property>
- <property name="maximum">
- <number>21</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="linearityDisplay">
- <property name="geometry">
- <rect>
- <x>270</x>
- <y>20</y>
- <width>51</width>
- <height>23</height>
- </rect>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/airspy-2/libairspy Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/extio-handler Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-common Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-common/librtlsdr.dll.a Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-common/rtl-dongleselect.cpp Deleted

@@ -1,64 +0,0 @@
-#
-/*
- * Copyright (C) 2013 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include	"rtl-dongleselect.h"
-#include	<cstdio>
-#include	<QVBoxLayout>
-//
-//	Whenever there are two or more RT2832 based sticks connected
-//	to the computer, the user is asked to make a choice.
-
-	rtl_dongleSelect::rtl_dongleSelect() {
-	toptext		= new QLabel (this);
-	toptext		-> setText ("Select a dongle");
-	selectorDisplay	= new QListView (this);
-	QVBoxLayout	*layOut = new QVBoxLayout;
-	layOut		-> addWidget (selectorDisplay);
-	layOut		-> addWidget (toptext);
-	setWindowTitle (tr("dongle select"));
-	setLayout (layOut);
-
-	dongleList. setStringList (Dongles);
-	Dongles = QStringList();
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	connect (selectorDisplay, &QListView::clicked,
-	 this, rtl_dongleSelect::selectDongle);
-	selectedItem	= -1;
-}
-
-	rtl_dongleSelect::~rtl_dongleSelect() {
-}
-
-void	rtl_dongleSelect::addtoDongleList (const char *v) {
-QString s (v);
-
-	Dongles << s;
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	selectorDisplay	-> adjustSize();
-	adjustSize();
-}
-
-void	rtl_dongleSelect::selectDongle (QModelIndex s) {
-	QDialog::done (s. row());
-}
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-common/rtl-dongleselect.h Deleted

@@ -1,51 +0,0 @@
-#
-/*
- * Copyright (C) 2013 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB program
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#
-#ifndef	__DONGLE_SELECT__
-#define	__DONGLE_SELECT__
-#
-#include	<QDialog>
-#include	<QLabel>
-#include	<QListView>
-#include	<QStringListModel>
-#include	<QStringList>
-#include	<cstdint>
-
-class	rtl_dongleSelect: public QDialog {
-Q_OBJECT
-public:
-			rtl_dongleSelect();
-			~rtl_dongleSelect();
-	void		addtoDongleList		(const char *);
-private:
-	QLabel		*toptext;
-	QListView	*selectorDisplay;
-	QStringListModel	dongleList;
-	QStringList	Dongles;
-	int16_t		selectedItem;
-private slots:
-	void		selectDongle	(QModelIndex);
-};
-
-#endif
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-common/rtl-sdr_export.h Deleted

@@ -1,47 +0,0 @@
-/*
- * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
- * Copyright (C) 2012 by Hoernchen <la@tfc-server.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RTLSDR_EXPORT_H
-#define RTLSDR_EXPORT_H
-
-#if defined __GNUC__
-# if __GNUC__ >= 4
-# define __SDR_EXPORT __attribute__((visibility("default")))
-# define __SDR_IMPORT __attribute__((visibility("default")))
-# else
-# define __SDR_EXPORT
-# define __SDR_IMPORT
-# endif
-#elif _MSC_VER
-# define __SDR_EXPORT __declspec(dllexport)
-# define __SDR_IMPORT __declspec(dllimport)
-#else
-# define __SDR_EXPORT
-# define __SDR_IMPORT
-#endif
-
-#ifndef rtlsdr_STATIC
-#	ifdef rtlsdr_EXPORTS
-#	define RTLSDR_API __SDR_EXPORT
-#	else
-#	define RTLSDR_API __SDR_IMPORT
-#	endif
-#else
-#define RTLSDR_API
-#endif
-#endif /* RTLSDR_EXPORT_H */

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-common/rtlsdr-widget.ui Deleted

@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>dabstickWidget</class>
- <widget class="QWidget" name="dabstickWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>242</width>
- <height>345</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>RT2832 dabstick</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>ppm</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="ppm_correction">
- <property name="minimum">
- <number>-500</number>
- </property>
- <property name="maximum">
- <number>500</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QComboBox" name="gainControl">
- <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;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>gain</string>
- </property>
- </widget>
- </item>
- <item>
- <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>
- <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">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>dump to xml file</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="iq_dumpButton">
- <property name="text">
- <string>dump to raw file</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="overflowLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="product_display">
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="deviceVersion">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/dll-driver.cpp Deleted

@@ -1,56 +0,0 @@
-#
-/*
- * Copyright (C) 2013 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-SDR; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include	"dab-constants.h"
-#include	"dll-driver.h"
-#include	"rtlsdr-handler.h"
-
-#define READLEN_DEFAULT (4 * 8192)
-
-static
-void RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
-rtlsdrHandler *theStick = (rtlsdrHandler *)ctx;
- 
- if ((theStick == nullptr) || (len != READLEN_DEFAULT)) {
- fprintf (stderr, "%d \n", len);
- return;
- }
- 
- static_cast<rtlsdrHandler *>(ctx) -> processBuffer (buf, len);
-}
-
-	dll_driver::dll_driver (rtlsdrHandler *d) {
-	theStick	= d;
-	start();
-}
-
-	dll_driver::~dll_driver() {
-}
-
-void	dll_driver::run () {
-	(theStick -> rtlsdr_read_async) (theStick -> theDevice,
-	 (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
-	 (void *)theStick,
-	 0,
-	 READLEN_DEFAULT);
-}

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/dll-driver.h Deleted

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

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtl-dongleselect.cpp Deleted

@@ -1,64 +0,0 @@
-#
-/*
- * Copyright (C) 2013 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include	"rtl-dongleselect.h"
-#include	<cstdio>
-#include	<QVBoxLayout>
-//
-//	Whenever there are two or more RT2832 based sticks connected
-//	to the computer, the user is asked to make a choice.
-
-	rtl_dongleSelect::rtl_dongleSelect() {
-	toptext		= new QLabel (this);
-	toptext		-> setText ("Select a dongle");
-	selectorDisplay	= new QListView (this);
-	QVBoxLayout	*layOut = new QVBoxLayout;
-	layOut		-> addWidget (selectorDisplay);
-	layOut		-> addWidget (toptext);
-	setWindowTitle (tr("dongle select"));
-	setLayout (layOut);
-
-	dongleList. setStringList (Dongles);
-	Dongles = QStringList();
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	connect (selectorDisplay, &QListView::clicked,
-	 this, &rtl_dongleSelect::selectDongle);
-	selectedItem	= -1;
-}
-
-	rtl_dongleSelect::~rtl_dongleSelect() {
-}
-
-void	rtl_dongleSelect::addtoDongleList (const char *v) {
-QString s (v);
-
-	Dongles << s;
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	selectorDisplay	-> adjustSize();
-	adjustSize();
-}
-
-void	rtl_dongleSelect::selectDongle (QModelIndex s) {
-	QDialog::done (s. row());
-}
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtl-dongleselect.h Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtl-sdr.h Deleted

@@ -1,407 +0,0 @@
-/*
- * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
- * Copyright (C) 2012-2013 by Steve Markgraf <steve@steve-m.de>
- * Copyright (C) 2012 by Dimitri Stolnikov <horiz0n@gmx.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RTL_SDR_H
-#define __RTL_SDR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <rtl-sdr_export.h>
-
-typedef struct rtlsdr_dev rtlsdr_dev_t;
-
-RTLSDR_API uint32_t rtlsdr_get_device_count(void);
-
-RTLSDR_API const char* rtlsdr_get_device_name(uint32_t index);
-
-/*!
- * Get USB device strings.
- *
- * NOTE: The string arguments must provide space for up to 256 bytes.
- *
- * \param index the device index
- * \param manufact manufacturer name, may be NULL
- * \param product product name, may be NULL
- * \param serial serial number, may be NULL
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_get_device_usb_strings(uint32_t index,
-					 char *manufact,
-					 char *product,
-					 char *serial);
-
-/*!
- * Get device index by USB serial string descriptor.
- *
- * \param serial serial string of the device
- * \return device index of first device where the name matched
- * \return -1 if name is NULL
- * \return -2 if no devices were found at all
- * \return -3 if devices were found, but none with matching name
- */
-RTLSDR_API int rtlsdr_get_index_by_serial(const char *serial);
-
-RTLSDR_API int rtlsdr_open(rtlsdr_dev_t **dev, uint32_t index);
-
-RTLSDR_API int rtlsdr_close(rtlsdr_dev_t *dev);
-
-/* configuration functions */
-
-/*!
- * Set crystal oscillator frequencies used for the RTL2832 and the tuner IC.
- *
- * Usually both ICs use the same clock. Changing the clock may make sense if
- * you are applying an external clock to the tuner or to compensate the
- * frequency (and samplerate) error caused by the original (cheap) crystal.
- *
- * NOTE: Call this function only if you fully understand the implications.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param rtl_freq frequency value used to clock the RTL2832 in Hz
- * \param tuner_freq frequency value used to clock the tuner IC in Hz
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq,
-				 uint32_t tuner_freq);
-
-/*!
- * Get crystal oscillator frequencies used for the RTL2832 and the tuner IC.
- *
- * Usually both ICs use the same clock.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param rtl_freq frequency value used to clock the RTL2832 in Hz
- * \param tuner_freq frequency value used to clock the tuner IC in Hz
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq,
-				 uint32_t *tuner_freq);
-
-/*!
- * Get USB device strings.
- *
- * NOTE: The string arguments must provide space for up to 256 bytes.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param manufact manufacturer name, may be NULL
- * \param product product name, may be NULL
- * \param serial serial number, may be NULL
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact,
-				 char *product, char *serial);
-
-/*!
- * Write the device EEPROM
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param data buffer of data to be written
- * \param offset address where the data should be written
- * \param len length of the data
- * \return 0 on success
- * \return -1 if device handle is invalid
- * \return -2 if EEPROM size is exceeded
- * \return -3 if no EEPROM was found
- */
-
-RTLSDR_API int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
-				 uint8_t offset, uint16_t len);
-
-/*!
- * Read the device EEPROM
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param data buffer where the data should be written
- * \param offset address where the data should be read from
- * \param len length of the data
- * \return 0 on success
- * \return -1 if device handle is invalid
- * \return -2 if EEPROM size is exceeded
- * \return -3 if no EEPROM was found
- */
-
-RTLSDR_API int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
-				 uint8_t offset, uint16_t len);
-
-RTLSDR_API int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq);
-
-/*!
- * Get actual frequency the device is tuned to.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return 0 on error, frequency in Hz otherwise
- */
-RTLSDR_API uint32_t rtlsdr_get_center_freq(rtlsdr_dev_t *dev);
-
-/*!
- * Set the frequency correction value for the device.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param ppm correction value in parts per million (ppm)
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_freq_correction(rtlsdr_dev_t *dev, int ppm);
-
-/*!
- * Get actual frequency correction value of the device.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return correction value in parts per million (ppm)
- */
-RTLSDR_API int rtlsdr_get_freq_correction(rtlsdr_dev_t *dev);
-
-enum rtlsdr_tuner {
-	RTLSDR_TUNER_UNKNOWN = 0,
-	RTLSDR_TUNER_E4000,
-	RTLSDR_TUNER_FC0012,
-	RTLSDR_TUNER_FC0013,
-	RTLSDR_TUNER_FC2580,
-	RTLSDR_TUNER_R820T,
-	RTLSDR_TUNER_R828D
-};
-
-/*!
- * Get the tuner type.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return RTLSDR_TUNER_UNKNOWN on error, tuner type otherwise
- */
-RTLSDR_API enum rtlsdr_tuner rtlsdr_get_tuner_type(rtlsdr_dev_t *dev);
-
-/*!
- * Get a list of gains supported by the tuner.
- *
- * NOTE: The gains argument must be preallocated by the caller. If NULL is
- * being given instead, the number of available gain values will be returned.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param gains array of gain values. In tenths of a dB, 115 means 11.5 dB.
- * \return <= 0 on error, number of available (returned) gain values otherwise
- */

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtl-sdr_export.h Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-handler.cpp Deleted

@@ -1,859 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2025
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-SDR; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 	This particular driver is a very simple wrapper around the
- * 	librtlsdr. In order to keep things simple, we dynamically
- * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
- * 	are greatly acknowledged
- */
-
-#include	<QThread>
-#include	"dab-constants.h"
-#include	"rtlsdr-handler.h"
-#include	"position-handler.h"
-#include	"rtl-dongleselect.h"
-#include	"rtl-sdr.h"
-#include	"device-exceptions.h"
-#include	"errorlog.h"
-#include	"settings-handler.h"
-
-//
-//	Our wrapper is a simple classs
-	rtlsdrHandler::rtlsdrHandler (QSettings *s,
-	 const QString &recorderVersion,
-	 errorLogger	*theLogger):
-	 _I_Buffer (8 * 1024 * 1024),
-	 theFilter (5, 1560000 / 2, SAMPLERATE) {
-int16_t	deviceCount;
-int32_t	r;
-int16_t	deviceIndex;
-QString	temp;
-int	k;
-char	manufac 256, product 256, serial 256;
-
-	(void)theLogger;
-	rtlsdrSettings			= s;
-	this	-> recorderVersion	= recorderVersion;
-	this	-> theErrorLogger	= theLogger;
-	setupUi (&myFrame);
-//	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
-	myFrame. show ();
-	filtering			= false;
-
-	currentDepth	= value_i (rtlsdrSettings, "rtlsdrSettings",
-	 "filterDepth", 5);
-	filterDepth	-> setValue (currentDepth);
-	theFilter. resize (currentDepth);
-
-	isActive. store (false);
-#ifdef	__MINGW32__
-	const char *libraryString	= "librtlsdr.dll";
-#elif __linux__
-//	const char *libraryString	= "/usr/local/lib64/librtlsdr.so";
-	const char *libraryString	= "librtlsdr.so";
-#elif __APPLE__
-	const char *libraryString	= "librtlsdr.dylib";
-#endif
-	phandle = new QLibrary (libraryString);
-	phandle -> load ();
-
-	if (!phandle -> isLoaded ()) {
-	 throw (device_exception (std::string ("failed to open ") + std::string (libraryString)));
-	}
-
-	if (!load_rtlFunctions ()) {
-	 delete (phandle);
-	 throw (device_exception ("could not load one or more library functions"));
-	}
-
-//	Ok, from here we have the library functions accessible
-	deviceCount 		= this -> rtlsdr_get_device_count ();
-	if (deviceCount == 0) {
-	 delete (phandle);
-	 throw (device_exception ("No rtlsdr device found"));
-	}
-
-	deviceIndex = 0;	// default
-	if (deviceCount > 1) {
-	 rtl_dongleSelect dongleSelector;
-	 for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
-	 dongleSelector.
-	 addtoDongleList (rtlsdr_get_device_name (deviceIndex));
-	 }
-	 deviceIndex = dongleSelector. QDialog::exec();
-	}
-//
-//	OK, now open the hardware
-	r		= this -> rtlsdr_open (&theDevice, deviceIndex);
-	if (r < 0) {
-	 delete phandle;
-	 throw (device_exception ("Opening rtlsdr device failed"));
-	}
-
-	deviceModel	= rtlsdr_get_device_name (deviceIndex);
-	deviceVersion	-> setText (deviceModel);
-	QString tunerType	= get_tunerType (rtlsdr_get_tuner_type (theDevice));
-	product_display	-> setText (tunerType);
-
-	if (rtlsdr_get_version != nullptr) {
-	 uint32_t V = rtlsdr_get_version ();
-	 uint16_t major	= V >> 24;
-	 uint16_t minor	= (V & 0XFF0000) >> 16;
-	 uint8_t micro	= (V & 0xFF00) >> 8;
-	 uint8_t nano		= (V & 0XFF);
-	 libVersion	-> setText ("Library " + QString::number (major) + 
-	 ":" + QString::number (minor) +
-	 "-" + QString::number (micro) +
-	 ":" + QString::number (nano));;
-	}
-	else
-	 libVersion	-> setText ("No lib version known");
-
-	r = rtlsdr_set_sample_rate (theDevice, SAMPLERATE);
-	if (r < 0) {
-	 delete phandle;
-	 throw (device_exception ("Setting samplerate for rtlsdr failed"));
-	}
-
-	gainsCount = rtlsdr_get_tuner_gains (theDevice, nullptr);
-	fprintf (stderr, "Supported gain values (%d): ", gainsCount);
-	{ int gains gainsCount;
-	 gainsCount	= rtlsdr_get_tuner_gains (theDevice, gains);
-	 for (int i = gainsCount; i > 0; i--) {
-	 fprintf (stderr, "%.1f ", gains i - 1 / 10.0);
-	 gainControl -> addItem (QString::number (gains i - 1));
-	 }
-	 fprintf (stderr, "\n");
-	}
-
-	if (rtlsdr_set_tuner_bandwidth != nullptr) {
-	 r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (1750));
-	 if (r != 0) {
-	 QString t = QString ("cannot set frequency to 1750 KHz");
-	 theErrorLogger -> add ("RTLSDR", t);
-	 }
-	}
-//
-//	See what the saved values are and restore the GUI settings
-	temp = value_s (rtlsdrSettings, "rtlsdrSettings",
-	 "externalGain", "10");
-	k	= gainControl -> findText (temp);
-	gainControl	-> setCurrentIndex (k != -1 ? k : gainsCount / 2);
-
-	int agc	= value_i (rtlsdrSettings, "rtlsdrSettings",
-	 "agcMode", 1);
-	init_autogain (agc);
-
-	ppm_correction	-> 
-	 setValue (value_i (rtlsdrSettings, "rtlsdrSettings",
-	 "ppm_correction", 0));
-	save_gainSettings	=
-	 value_i (rtlsdrSettings, "rtlsdrSettings",
-	 "save_gainSettings", 1) != 0;
-
-	int res = this -> rtlsdr_set_center_freq (theDevice, 220000000);
-	if (res != 0) {
-	 QString t = QString ("cannot set frequency to ") +
-	 QString::number (220000000);
-	 theErrorLogger -> add ("RTLSDR", t);
-	}
-
-	rtlsdr_get_usb_strings (theDevice, manufac, product, serial);
-	fprintf (stderr, "%s %s %s\n",
-	 manufac, product, serial);
-
-//	all sliders/values are set to previous values, now do the settings
-//	based on these slider values
-
-	res = rtlsdr_set_tuner_gain	(theDevice, 
-	 gainControl -> currentText (). toInt ());
-	if (res != 0) {
-	 QString t = QString ("cannot set tuner gain to ") +
-	 gainControl -> currentText ();
-	 theErrorLogger -> add ("RTLSDR", t);
-	}
-	set_ppmCorrection	(ppm_correction -> value ());
-
-	for (int i = 0; i < 256; i ++)
-	 convTable i = (i - 127.38) / 128.0;
-
-//	and attach the buttons/sliders to the actions

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-handler.h Deleted

@@ -1,187 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Many of the ideas as implemented in Qt-DAB are derived from
- * other work, made available through the GNU general Public License. 
- * All copyrights of the original authors are recognized.
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#pragma once
-
-#include	<QObject>
-#include	<QSettings>
-#include	<QString>
-#include	<cstdio>
-#include	<atomic>
-#include	"dab-constants.h"
-#include	"fir-filters.h"
-#include	"device-handler.h"
-#include	"ringbuffer.h"
-#include	"ui_rtlsdr-widget.h"
-#include	<QLibrary>
-#include	<QScopedPointer>
-#include "xml-filewriter.h"
-
-#include	"dll-driver.h"
-
-class	errorLogger;
-//
-//	create typedefs for the library functions
-typedef	struct rtlsdr_dev rtlsdr_dev_t;
-extern "C" {
-typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
-typedef int (* pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
-typedef	int (* pfnrtlsdr_close) (rtlsdr_dev_t *);
-typedef int (* pfnrtlsdr_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
-typedef	int (* pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
-typedef	int (* pfnrtlsdr_set_tuner_bandwidth) (rtlsdr_dev_t *, uint32_t);
-typedef uint32_t (* pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
-typedef	int (* pfnrtlsdr_get_tuner_type) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_set_agc_mode) (rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
-typedef	int (* pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
-typedef int (* pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_read_async) (rtlsdr_dev_t *,
-	 rtlsdr_read_async_cb_t,
-	 void *,
-	 uint32_t,
-	 uint32_t);
-typedef	int (*	pfnrtlsdr_set_bias_tee) (rtlsdr_dev_t *, int);
-typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
-typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
-typedef uint32_t (* pfnrtlsdr_get_device_count)();
-typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_set_freq_correction_ppb)(rtlsdr_dev_t *, int);
-typedef	char *(* pfnrtlsdr_get_device_name)(int);
-typedef	int (* pfnrtlsdr_get_version)();
-}
-//	This class is a simple wrapper around the
-//	rtlsdr library, the relevant functions of it
-//	are read in from the dll (or .so file in linux)
-class	rtlsdrHandler final: 
-	 public deviceHandler, public Ui_dabstickWidget {
-Q_OBJECT
-public:
-			rtlsdrHandler	(QSettings *,
-	 const QString &,
-	 errorLogger *);
-			~rtlsdrHandler	();
-	bool		restartReader	(int32_t, int skipped = 0);
-	void		stopReader	();
-	int32_t		getSamples	(std::complex<float> *, int32_t);
-	int32_t		Samples		();
-	void		resetBuffer	();
-	int16_t		maxGain		();
-	int16_t		bitDepth	();
-	QString		deviceName	();
-
-	void		startDump	();
-	void		stopDump	();
-
-//	These need to be visible for the separate usb handling thread
-	pfnrtlsdr_read_async	rtlsdr_read_async;
-	struct rtlsdr_dev	*theDevice;
-	std::atomic<bool>	isActive;
-
-	void		processBuffer	(uint8_t *, uint32_t);
-private:
-	RingBuffer<std::complex<float>> _I_Buffer;
-	QSettings	*rtlsdrSettings;
-	errorLogger	*theErrorLogger;
-	int32_t		inputRate;
-	int32_t		deviceCount;
-	QLibrary*	phandle;
-	QScopedPointer<dll_driver>	workerHandle;
-	int32_t		lastFrequency;
-	int16_t		gainsCount;
-	QString		deviceModel;
-	QString		recorderVersion;
- QScopedPointer<xml_fileWriter> xmlWriter;
- bool setup_xmlDump		(bool);
- void close_xmlDump		();
- std::atomic<bool> xml_dumping;
-	FILE		*iqDumper;
- bool setup_iqDump		();
- void close_iqDump		();
- std::atomic<bool> iq_dumping;
-	void		record_gainSettings	(int);
-	void		update_gainSettings	(int);
-	bool		save_gainSettings;
-
-	QString		get_tunerType		(int);
-	bool		filtering;
-	LowPassFIR	theFilter;
-	int		currentDepth;
-
-	void		set_off_agc	();
-	void		set_hw_agc	();
-	void		set_sw_agc	();
-	void		init_autogain	(int);
-	float		convTable	256;
-	void		reportOverflow		(bool);
-	float		m_dcI;
-	float		m_dcQ;
-//	here we need to load functions from the dll
-	bool		load_rtlFunctions	();
-	pfnrtlsdr_open	rtlsdr_open;
-	pfnrtlsdr_close	rtlsdr_close;
-	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
-
-	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
-	pfnrtlsdr_set_tuner_bandwidth rtlsdr_set_tuner_bandwidth;
-	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
-	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
-	pfnrtlsdr_get_tuner_type rtlsdr_get_tuner_type;
-	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
-	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
-	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
-	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
-	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
-	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
-	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
-	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
-	pfnrtlsdr_set_bias_tee rtlsdr_set_bias_tee;
-	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
-	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
-	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
-	pfnrtlsdr_set_freq_correction_ppb rtlsdr_set_freq_correction_ppb;
-	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
-	pfnrtlsdr_get_version rtlsdr_get_version;
-	
-signals:
-	void		new_gainIndex		(int);
-	void		new_agcSetting		(bool);
-private slots:
-	void		set_ExternalGain	(const QString &);
-	void		set_autogain		(int);
-	void		set_ppmCorrection	(double);
-	void		set_xmlDump		();
-	void		set_iqDump		();
-	void		set_filter		(int);
-	void		set_biasControl		(int);
-};
-
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui Deleted

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>dabstickWidget</class>
- <widget class="QWidget" name="dabstickWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>240</width>
- <height>445</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>RT2832 dabstick</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="tunedFrequency">
- <property name="frameShape">
- <enum>QFrame::Shape::Panel</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>gain</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="gainControl">
- <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;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>AGC</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="agc_hw">
- <property name="text">
- <string>HW</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="agc_sw">
- <property name="text">
- <string>SW</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="agc_off">
- <property name="text">
- <string>Off</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QCheckBox" name="biasControl">
- <property name="text">
- <string>biasT</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <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>
- <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>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>ppm</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="ppm_correction"/>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Dump </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="xml_dumpButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>xml</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="iq_dumpButton">
- <property name="text">
- <string>raw </string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="overflowLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="product_display">
- <property name="frameShape">
- <enum>QFrame::Shape::Box</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="deviceVersion">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::Shape::Box</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="libVersion">
- <property name="frameShape">
- <enum>QFrame::Shape::Box</enum>
- </property>
- <property name="text">
- <string/>

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtl-dongleselect.h Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp Deleted

@@ -1,904 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2025
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-SDR; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 	This particular driver is a very simple wrapper around the
- * 	librtlsdr. In order to keep things simple, we dynamically
- * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
- * 	are greatly acknowledged
- */
-
-#include	<QThread>
-#include	"dab-constants.h"
-#include	"rtlsdr-handler-win.h"
-#include	"position-handler.h"
-#include	"rtl-dongleselect.h"
-#include	"rtl-sdr.h"
-#include	"device-exceptions.h"
-#include	"errorlog.h"
-#include	"settings-handler.h"
-
-#define	READLEN_DEFAULT	(4 * 8192)
-
-static clock_t time1	= 0;
-//
-//	For the callback, we do need some environment which
-//	is passed through the ctx parameter
-//
-//	This is the user-side call back function
-//	ctx is the calling task
-
-static
-void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
-rtlsdrHandler_win	*theStick	= (rtlsdrHandler_win *)ctx;
-
-	if ((theStick == nullptr) || (len != READLEN_DEFAULT)) {
-	 fprintf (stderr, "%d \n", len);
-	 return;
-	}
-
-	if (theStick -> isActive. load ()) 	
-	 static_cast<rtlsdrHandler_win *>(ctx) -> processBuffer (buf, len);
-}
-//
-//	for handling the events in libusb, we need a controlthread
-//	whose sole purpose is to process the rtlsdr_read_async function
-//	from the lib.
-class	dll_driver: public QThread {
-private:
-	rtlsdrHandler_win	*theStick;
-public:
-
-	dll_driver (rtlsdrHandler_win *d) {
-	theStick	= d;
-	start		();
-}
-
-	~dll_driver	() {
-}
-
-private:
-void	run () {
-	theStick -> rtlsdr_read_async (theStick -> theDevice,
-	 (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
-	 (void *)theStick,
-	 0,
-	 READLEN_DEFAULT);
-//	fprintf (stderr, "dll_task terminates\n");
-	}
-};
-
-//	Our wrapper is a simple classs
-	rtlsdrHandler_win::rtlsdrHandler_win (QSettings *s,
-	 const QString libraryString,
-	 const QString &recorderVersion,
-	 errorLogger	*theLogger):
-	 _I_Buffer (8 * 1024 * 1024),
-	 theFilter (5, 1560000 / 2, SAMPLERATE) {
-int16_t	deviceCount;
-int32_t	r;
-int16_t	deviceIndex;
-QString	temp;
-int	k;
-char	manufac 256, product 256, serial 256;
-
-	this	-> libraryString	= libraryString;
-	rtlsdrSettings			= s;
-	this	-> recorderVersion	= recorderVersion;
-	this	-> theErrorLogger	= theLogger;
-	(void)theLogger;
-	setupUi (&myFrame);
-//	setPositionAndSize (s, &myFrame, "rtlsdrSettings");
-	myFrame. show ();
-	filtering			= false;
-
-	currentDepth	= value_i (rtlsdrSettings, "rtlsdrSettings",
-	 "filterDepth", 5);
-	filterDepth	-> setValue (currentDepth);
-	theFilter. resize (currentDepth);
-
-	isActive. store (false);
-	phandle = new QLibrary (libraryString);
-	phandle -> load ();
-
-	if (!phandle -> isLoaded ()) {
-	 throw (device_exception (std::string ("failed to open ") + libraryString. toStdString ()));
-	}
-
-	if (!load_rtlFunctions ()) {
-	 delete (phandle);
-	 throw (device_exception ("could not load one or more library functions"));
-	}
-
-//	Ok, from here we have the library functions accessible
-	deviceCount 		= this -> rtlsdr_get_device_count ();
-	if (deviceCount == 0) {
-	 delete (phandle);
-	 throw (device_exception ("No rtlsdr device found"));
-	}
-
-	deviceIndex = 0;	// default
-	if (deviceCount > 1) {
-	 rtl_dongleSelect dongleSelector;
-	 for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
-	 dongleSelector.
-	 addtoDongleList (rtlsdr_get_device_name (deviceIndex));
-	 }
-	 deviceIndex = dongleSelector. QDialog::exec();
-	}
-//
-//	OK, now open the hardware
-	r		= this -> rtlsdr_open (&theDevice, deviceIndex);
-	if (r < 0) {
-	 delete phandle;
-	 throw (device_exception ("Opening rtlsdr device failed"));
-	}
-
-
-	if (rtlsdr_get_version != nullptr) {
- uint32_t V = rtlsdr_get_version ();
- uint16_t major = V >> 24;
- uint16_t minor = (V & 0XFF0000) >> 16;
- uint8_t micro = (V & 0xFF00) >> 8;
- uint8_t nano = (V & 0XFF);
-	 libVersion -> setText (QString ("Library ") +
-	 QString::number (major) +
- ":" + QString::number (minor) +
- "-" + QString::number (micro) +
- ":" + QString::number (nano) +
-	 ":" + libraryString);
- }
- else
-	 libVersion	-> setText (libraryString);
-
-	r = rtlsdr_set_sample_rate (theDevice, SAMPLERATE);
-	if (r < 0) {
-	 delete phandle;
-	 throw (device_exception ("Setting samplerate for rtlsdr failed"));
-	}
-
-	gainsCount = rtlsdr_get_tuner_gains (theDevice, nullptr);
-	fprintf (stderr, "Supported gain values (%d): ", gainsCount);
-	{ int gains gainsCount;
-	 gainsCount	= rtlsdr_get_tuner_gains (theDevice, gains);
-	 for (int i = gainsCount; i > 0; i--) {
-	 fprintf (stderr, "%.1f ", gains i - 1 / 10.0);
-	 gainControl -> addItem (QString::number (gains i - 1));
-	 }
-	 fprintf (stderr, "\n");
-	}
-
-	QString tunerType	= get_tunerType (rtlsdr_get_tuner_type (theDevice));
-	deviceModel	= rtlsdr_get_device_name (deviceIndex);
-	deviceVersion	-> setText (deviceModel);
-	product_display	-> setText (tunerType);
-
-	if (rtlsdr_set_tuner_bandwidth != nullptr) {
-	 r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (17500));
-	 if (r != 0) {
-	 QString t = QString ("cannot set frequency to 17500 KHz");
-	 theErrorLogger -> add ("RTLSDR", t);
-	 }

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h Deleted

@@ -1,190 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Many of the ideas as implemented in Qt-DAB are derived from
- * other work, made available through the GNU general Public License. 
- * All copyrights of the original authors are recognized.
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#pragma once
-
-#include	<QObject>
-#include	<QSettings>
-#include	<QString>
-#include	<cstdio>
-#include	<atomic>
-#include	"dab-constants.h"
-#include	"fir-filters.h"
-#include	"device-handler.h"
-#include	"ringbuffer.h"
-#include	"ui_rtlsdr-widget.h"
-#include	<QLibrary>
-#include	<QScopedPointer>
-#include "xml-filewriter.h"
-
-class	errorLogger;
-class	dll_driver;
-//
-//	create typedefs for the library functions
-typedef	struct rtlsdr_dev rtlsdr_dev_t;
-extern "C" {
-typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
-typedef int (* pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
-typedef	int (* pfnrtlsdr_close) (rtlsdr_dev_t *);
-typedef int (* pfnrtlsdr_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
-typedef	int (* pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
-typedef	int (* pfnrtlsdr_set_tuner_bandwidth) (rtlsdr_dev_t *, uint32_t);
-typedef uint32_t (* pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
-typedef	int (* pfnrtlsdr_get_tuner_type) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_set_agc_mode) (rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
-typedef	int (* pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
-typedef int (* pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
-typedef	int (* pfnrtlsdr_read_async) (rtlsdr_dev_t *,
-	 rtlsdr_read_async_cb_t,
-	 void *,
-	 uint32_t,
-	 uint32_t);
-typedef	int (*	pfnrtlsdr_set_bias_tee) (rtlsdr_dev_t *, int);
-typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
-typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
-typedef uint32_t (* pfnrtlsdr_get_device_count)();
-typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
-typedef	int (* pfnrtlsdr_set_freq_correction_ppb)(rtlsdr_dev_t *, int);
-typedef	char *(* pfnrtlsdr_get_device_name)(int);
-typedef	int (* pfnrtlsdr_get_version)();
-}
-//	This class is a simple wrapper around the
-//	rtlsdr library, the relevant functions of it
-//	are read in from the dll (or .so file in linux)
-
-class	rtlsdrHandler_win: 
-	 public deviceHandler, public Ui_dabstickWidget {
-Q_OBJECT
-public:
-			rtlsdrHandler_win	(QSettings *,
-	 const QString,
-	 	 const QString &,
-	 	 errorLogger *);
-			~rtlsdrHandler_win	();
-	bool		restartReader	(int32_t, int skipped = 0);
-	void		stopReader	();
-	int32_t		getSamples	(std::complex<float> *, int32_t);
-	int32_t		Samples		();
-	void		resetBuffer	();
-	int16_t		maxGain		();
-	int16_t		bitDepth	();
-	QString		deviceName	();
-
-	void		startDump	();
-	void		stopDump	();
-
-//	These need to be visible for the separate usb handling thread
-	pfnrtlsdr_read_async	rtlsdr_read_async;
-	struct rtlsdr_dev	*theDevice;
-	std::atomic<bool>	isActive;
-
-	void		processBuffer	(uint8_t *, uint32_t);
-private:
-	RingBuffer<std::complex<float>> _I_Buffer;
-	QSettings	*rtlsdrSettings;
-	errorLogger	*theErrorLogger;
-	int32_t		inputRate;
-	QString		libraryString;
-	int32_t		deviceCount;
-	QLibrary*	phandle;
-	dll_driver	*workerHandle;
-	int32_t		lastFrequency;
-	int16_t		gainsCount;
-	QString		deviceModel;
-	QString		recorderVersion;
- xml_fileWriter	*xmlWriter;
- bool setup_xmlDump		(bool);
- void close_xmlDump		();
- std::atomic<bool> xml_dumping;
-	FILE		*iqDumper;
- bool setup_iqDump		();
- void close_iqDump		();
- std::atomic<bool> iq_dumping;
-	void		record_gainSettings	(int);
-	void		update_gainSettings	(int);
-	bool		save_gainSettings;
-
-	QString		get_tunerType		(int);
-	bool		filtering;
-	LowPassFIR	theFilter;
-	int		currentDepth;
-
-	void		set_off_agc		();
-	void		set_hw_agc		();
-	void		set_sw_agc		();
-	void		init_autogain		(int);
-
-	float		convTable	256;
-	void		reportOverflow		(bool);
-	float		m_dcI;
-	float		m_dcQ;
-//	here we need to load functions from the dll
-	bool		load_rtlFunctions	();
-	pfnrtlsdr_open	rtlsdr_open;
-	pfnrtlsdr_close	rtlsdr_close;
-	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
-
-	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
-	pfnrtlsdr_set_tuner_bandwidth rtlsdr_set_tuner_bandwidth;
-	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
-	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
-	pfnrtlsdr_get_tuner_type rtlsdr_get_tuner_type;
-	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
-	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
-	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
-	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
-	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
-	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
-	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
-	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
-	pfnrtlsdr_set_bias_tee rtlsdr_set_bias_tee;
-	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
-	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
-	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
-	pfnrtlsdr_set_freq_correction_ppb rtlsdr_set_freq_correction_ppb;
-	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
-	pfnrtlsdr_get_version rtlsdr_get_version;
-	
-signals:
-	void		new_gainIndex		(int);
-	void		new_agcSetting		(bool);
-private slots:
-	void		set_ExternalGain	(const QString &);
-	void		set_autogain		(int);
-	void		set_ppmCorrection	(double);
-	void		set_xmlDump		();
-	void		set_iqDump		();
-	void		set_filter		(int);
-	void		set_biasControl		(int);
-};
-
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/devices/rtlsdr-handler-win/rtlsdr-widget.ui Deleted

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/aboutdialog.cpp Deleted

@@ -1,176 +0,0 @@
-#
-/*
- * Copyright (C) 2017 .. 2024
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB 
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include	<QDesktopServices>
-#include	"aboutdialog.h"
-#include	"ui_aboutdialog.h"
-#include	"dab-constants.h"
-#include	<QDateTime>
-#ifdef	__WITH_FDK_AAC__
-#include <aacdecoder_lib.h>
-#else
-#include "neaacdec.h"
-
-#endif
-	AboutDialog::AboutDialog (QWidget *parent) :
-	 QDialog(parent),
-	 ui (new Ui::AboutDialog) {
-
-	QString support;
-#ifdef	SSE_AVAILABLE	
-	support		= "(spiral + sse)";
-#elif	NO_SSE_AVAILABLE
-	support		= "(spiral scalar)";
-#elif	__AVX2__
-	support		= "(yang + avx2)";
-#elif	__SSE4_1__	
-	support		= "(yang + sse)";
-#else
-	support		= "(yang scalar)";
-#endif
-QString	aacSupport;
-#ifdef __WITH_FDK_AAC__
-	LIB_INFO libInfoFDK_MODULE_LAST;
-	FDKinitLibInfo(libInfo);
-	aacDecoder_GetLibInfo(libInfo);
-	
-	for (int i = 0; i < FDK_MODULE_LAST; i++) {
-	 if (libInfoi.module_id == FDK_AACDEC) {
-	 aacSupport = QString(libInfoi.title) + " " + QString(libInfoi.versionStr);
-	 break;
-	 }
-	}
-#else
-	aacSupport	= QString ("faad2 ") + QString (FAAD2_VERSION);
-#endif
-QString aacComment;
-#ifdef __WITH_FDK_AAC__
-	aacComment = "<li> " + aacSupport + " , <a href=\"https://github.com/mstorsjo/fdk-aac\">fdk-aac</a> Copyright © 1995 - 2018 Fraunhofer-Gesellschaft " +
- "zur Förderung der angewandten Forschung e.V.</li>";
-#else
-	aacComment = "<li>" + aacSupport + " <a href=\"https://github.com/knik0/faad2\">FAAD2</a> Copyright © 2003-2005 M. Bakker, Nero AG</li>";
-#endif
-
-	ui -> setupUi (this);
-	QPixmap p;
-	p. load (":res/pauze-slide.png", "png");
-	ui -> appIcon		-> setPixmap (p);
-	ui -> appName 		-> setText ("Qt-DAB");
-	ui -> author 		-> setText(tr("Developed by")+" Jan van Katwijk (<a href=\"mailto:J.vanKatwijk@gmail.com\">J.vanKatwijk@gmail.com</a>)");
-	ui -> author		-> setTextInteractionFlags (Qt::TextBrowserInteraction);
-	ui -> version		-> setText (QString("Version-6.%1").arg ("9.5"));
-	QString theDate		= QString (__DATE__) + " " + QString (__TIME__);
-	ui -> buildInfo ->	setText (QString ("Built on ") + theDate + QString (", Commit ") + QString (GITHASH) + " with " + support);
-	ui -> sourceLocation	-> setText ("Sources are at <a href=\"https://github.com/JvanKatwijk/qt-dab\">github> </a>");
-	ui -> sourceLocation	-> setOpenExternalLinks(true);
-	ui -> qtVersion		-> setText (QString(tr("Qt-DAB uses Qt %1")).arg(QT_VERSION_STR));
-
-	ui -> libraries -> setText (tr("Qt-DAB uses following libraries (and greatly acknowledges the copyright):")+
- "<ul>" +
-	 "<li>The excellent Qt framework by Qt, and the Qwt library (version 6.2) by Uwe Rathmann</li>" +
- "<li><a href=\"www.fftw.org\">FFTW</a> by Matteo Frigo and Steven G Johnsom</li>" +
- "<li><a href=\"https://github.com/Opendigitalradio/ka9q-fec\">Reed Solonon</a> by Phil Karn, KA9Q</li>" +
- "<li><a href=\"https://www.spiral.net/software/viterbi.html\">viterbi code generator</a> by the Spiral project</li>" +
- "<li><a href=\"https://github.com/williamyang98/ViterbiDecoderCpp\"> the excellent header only viterbi library</a> by William Yang, based on Phil Karn's library</li>" +
- "<li><a href=\"www.portaudio.com/\">Portaudio</a> by Ross Bencina, Phil Burke and many others</li>" +
- "<li>An MP2 decoder by Martin J Fiedler (martin.fiedler@gmx.net)</li>" +
-	 "<li>\"NewsService Journaline(R) Decoder\", CopyRight (c) 2003, 2001-2014 Fraunhofer IID, Erlangen, Germany</li>" +
-	 aacComment +
-				 "</ul>");
-	ui -> acknowledgementsLabel -> setText (tr("Special thanks to") +
- "<ul>"
-	 "<li> Herman Wijnants, for continuous suggestions and feedback</li>" +
-	 "<li> Andreas Mikula, for continuous support </li>" +
-	 "<li> Jarod Middelman, for continuous feedback</li>" +
-	 "<li> Stefan Poeschel, for providing code for saving AAC </li>" +
-	 "<li> Rolf Zerr, for an improved TII decoder and some other improvements </li>" +
-	 "</ul>");
-//	ui -> configuration -> setTextInteractionFlags (Qt::TextBrowserInteraction);
-	ui -> configuration -> setOpenExternalLinks(true);
-	ui -> configuration -> setText (tr("Qt-DAB is configured with:")+
- "<ul>"
-#if defined (HAVE_SDRPLAY_V3) || defined (HAVE_SDRPLAY_V2)
- "<li> All SDRplay RSP devices<a href=\"https://www.sdrplay.com/\">SDRplay/a></li>"
-#endif
-#if defined (HAVE_RTLSDR) || defined (HAVE_RTLSDR_V3) || defined ( HAVE_RTLSDR_V4)
- "<li> rtlsdr dabstick <a href=\"https://osmocom.org/projects/rtl-sdr/wiki/rtl-sdr\">rtlsdr</a>with improvements from \"olddab\" </li>"
-#endif
-#ifdef HAVE_AIRSPY_2
- "<li> Airspy devices <a href=\"https://github.com/airspy\">AirSpy</a></li>"
-#endif
-#ifdef	HAVE_HACKRF 
- "<li>Hackrf devices<a href=\"https://greatscottgadgets.com/hackrf/one\">Hackrf One</a>.</li>"
-#endif
-#ifdef	HAVE_LIME 
- "<li> Lime SDR devices<a href=\"https://limemicro.com/products/limesdr\">Lime sdr</a> by Lime micro systems</li>"
-#endif
-#ifdef	HAVE_PLUTO 
- "<li>Adalm Pluto device<a href=\"https://www.analog.com/\">Adalm Pluto One</a></li>"
-#endif
-#ifdef	HAVE_RTL_TCP
-			 "<li>Client for RTL_TCP</li>"
-#endif
-#ifdef HAVE_SOAPY
- "<li>Soapy interface<a href=\"https://github.com/pothosware/SoapySDR/wiki\">SoapySDR</a></li>"
-#endif
-#ifdef HAVE_SPYSERVER_16
- "<li>SpyServer interface<a href=\"https://airspy.com/download/\">spyserver</a></li>"
-#endif
- "<li> and has support for reading (and writing) files in different formats, including files (in xml and in RIFF/Raw64 format) with sizes larger than 4 Gb.</li>"
-	"</ul>");
-ui->disclaimer->setText("Copyright © 2016-2024 Jan van Katwijk"
- "Permission is hereby granted, free of charge, to any person obtaining a copy of this software "
- "and associated documentation files (the “Software”), to deal in the Software without restriction, "
- "including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, "
- "and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, "
- "subject to the following conditions: "
- "The above copyright notice and this permission notice shall be included in all copies or substantial "
- "portions of the Software."
- "THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING "
- "BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. "
- "IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, "
- "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH "
- "THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.");
-
- QObject::connect(
- ui->version, &QLabel::linkActivated,
- =( const QString & link ) { QDesktopServices::openUrl(QUrl::fromUserInput(link)); }
- );
-
- QObject::connect(
- ui->author, &QLabel::linkActivated,
- =( const QString & link ) { QDesktopServices::openUrl(QUrl::fromUserInput(link)); }
- );
- QObject::connect(
- ui->libraries, &QLabel::linkActivated,
- =( const QString & link ) { QDesktopServices::openUrl(QUrl::fromUserInput(link)); }
- );
-
- //resize(minimumSizeHint());
-}
-
-AboutDialog::~AboutDialog()
-{
- delete ui;
-}
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/techdata.cpp Deleted

@@ -1,384 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2023
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB 
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include	<QSettings>
-#include	"techdata.h"
-#include	"radio.h"
-#include	"audio-display.h"
-#include	"dab-tables.h"
-#include	<QColorDialog>
-
-#include	"settingNames.h"
-#include	"settings-handler.h"
-#include	"position-handler.h"
-
-#define	TECHDATA_SETTING	"techDataSettings"
-
-#define	DARK	"#00007f"
-#define	WHITE	"#ffffff"
-
-#define FRAMEDUMP_BUTTON QString ("framedumpButton") 
-#define AUDIODUMP_BUTTON QString ("audiodumpButton")
-
-		techData::techData	(RadioInterface *mr,
-	 QSettings	*s,
-	 RingBuffer<std::complex<int16_t>> *audioData):
-	 superFrame (nullptr) {
-	myRadioInterface	= mr;
-	dabSettings		= s;
-	this	-> audioData	= audioData;
-
- setupUi (this);
-	QString settingsHeader	= TECHDATA_SETTING;
-
-	setPositionAndSize (dabSettings, this, TECHDATA_SETTING);
-
-//	formLayout -> setLabelAlignment (Qt::AlignLeft);
-//
-//	we start being hidden, the radio decides whether we are visible
-//	or not
-	this	-> hide ();
-	timeTable_button	-> setEnabled (false);
-	theAudioDisplay	= new audioDisplay (mr, audio, dabSettings);
-
-	QString framedumpButton_color = 
- value_s (dabSettings, COLOR_SETTINGS, 
-	 FRAMEDUMP_BUTTON + "_color", DARK);
-	QString framedumpButton_font = 
- value_s (dabSettings, COLOR_SETTINGS,
-	 FRAMEDUMP_BUTTON + "_font", WHITE);
-	QString audiodumpButton_color = 
- value_s (dabSettings, COLOR_SETTINGS,
-	 AUDIODUMP_BUTTON + "_color", DARK);
-	QString audiodumpButton_font = 
- value_s (dabSettings, COLOR_SETTINGS,
-	 AUDIODUMP_BUTTON + "_font", WHITE);
-
-	QString temp = "QPushButton {background-color: %1; color: %2}";
-
-	framedumpButton ->
- setStyleSheet (temp. arg (framedumpButton_color,
- framedumpButton_font));
-
-	audiodumpButton ->
- setStyleSheet (temp. arg (audiodumpButton_color,
- audiodumpButton_font));
-
-	connect (framedumpButton, &smallPushButton::rightClicked,
- this, &techData::colorFramedumpButton);
- connect (audiodumpButton, &smallPushButton::rightClicked,
- this, &techData::colorAudiodumpButton); 
-
-	connect (audiodumpButton, &QPushButton::clicked,
-	 mr, &RadioInterface::handleAudiodumpButton);
-	connect	(framedumpButton, &QPushButton::clicked,
-	 mr, &RadioInterface::handleFramedumpButton);
-
-	connect (timeTable_button, &QPushButton::clicked,
-	 this, &techData::handleTimeTable);
-}
-
-		techData::~techData	() {
-	hide ();
-	delete theAudioDisplay;
-}
-
-void	techData::storePosition	() {
-	if (!isHidden ())
-	 storeWidgetPosition (dabSettings, this, TECHDATA_SETTING);
-}
-
-void	techData::cleanUp	() {
-	const QString ee ("-");
-	programName		-> setText (ee);
-	rsCorrections		-> display (0);
-	frameError_display	-> setValue (0);
-	rsError_display		-> setValue (0);
-	aacError_display	-> setValue (0);
-	startAddressDisplay	-> setText (QString::number (0));
-	lengthDisplay		-> setText (QString::number (0));
-	subChIdDisplay		-> setText (QString::number (0));
-	uepField		-> setText (ee);
-	codeRate		-> setText (ee);
-	ASCTy			-> setText (ee);
-	language		-> setText (ee);
-	timeTable_button	-> setEnabled (false);
-	audioRate		-> display (0);
-}
-
-void	techData::showServiceData	(audiodata *ad) {
-	showServiceName		(ad -> serviceName, ad -> shortName);
-	showServiceId		(ad -> SId);
-	showStartAddress	(ad -> startAddr);
-	showLength		(ad -> length);
-	showSubChId		(ad -> subchId);
-	showUep			(ad -> shortForm, ad -> protLevel);
-	showCodeRate		(ad -> shortForm, ad -> protLevel);
-	showLanguage		(ad -> language);
-	showFm			(ad -> fmFrequencies);
-	bitRateLabel		-> setText (QString::number (ad -> bitRate) + " kbits");
-}
-
-void	techData::showFrameErrors	(int e) {
-	QPalette p	= frameError_display -> palette();
-	if (100 - 4 * e < 80)
-	 p. setColor (QPalette::Highlight, Qt::red);
-	else
-	 p. setColor (QPalette::Highlight, Qt::green);
-
-	frameError_display	-> setPalette (p);
-	frameError_display	-> setValue (100 - 4 * e);
-}
-
-void	techData::showAacErrors	(int e) {
-	QPalette p = aacError_display -> palette();
- if (100 - 4 * e < 80)
- p. setColor (QPalette::Highlight, Qt::red);
- else
- p. setColor (QPalette::Highlight, Qt::green);
- aacError_display -> setPalette (p);
- aacError_display -> setValue (100 - 4 * e);
-}
-
-void	techData::showRsErrors		(int e) {
-	QPalette p	= rsError_display -> palette();
-	if (100 - 4 * e < 80)
-	 p. setColor (QPalette::Highlight, Qt::red);
-	else
-	 p. setColor (QPalette::Highlight, Qt::green);
-	rsError_display	-> setPalette (p);
-	rsError_display	-> setValue (100 - 4 * e);
-}
-
-void	techData::showRsCorrections	(int c, int ec) {
-	rsCorrections -> display (c);
-	ecCorrections -> display (ec);
-}
-
-void	techData::showTimetableButton	(bool b) {
-	if (b)
-	 timeTable_button	-> setEnabled (true);
-	else
-	 timeTable_button	-> setEnabled (false);
-}
-
-void	techData::updateFM		(std::vector<int> &fmFrequencies) {
-	if (fmFrequencies. size () == 0)
-	 return;
-	showFm		(fmFrequencies);
-}
-
-void	techData::showFrameDumpButton	(bool b) {
-	if (b)
-	 framedumpButton	-> show ();
-	else
-	 framedumpButton	-> hide ();
-}
-
-void	techData::showServiceName	(const QString &s1, const QString &s2) {
-	if ((s2 != "") && (s1 != s2))

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/main/techdata.h Deleted

@@ -1,98 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2023
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of Qt-DAB 
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-#pragma once
-
-#include	<QObject>
-#include	<QFrame>
-#include	"ui_technical_data.h"
-#include	"dab-constants.h"
-#include	"audio-display.h"
-#include	"ringbuffer.h"
-#include	"super-frame.h"
-
-class	RadioInterface;
-class	QSettings;
-
-
-class	techData: public superFrame, public Ui_technical_data {
-Q_OBJECT
-public:
-		techData	(RadioInterface *,
-	 QSettings *,
-	 RingBuffer<std::complex<int16_t>> *audioData);
-		~techData	();
-	void	storePosition		();
-	void	showServiceData		(audiodata *);
-	void	cleanUp			();
-	void	isDABPlus		(bool);
-	void	hideMissedLabel		();
-	void	showTimetableButton	(bool);
-	void	updateFM		(std::vector<int> &);
-private:
-	RadioInterface		*myRadioInterface;
-	QSettings		*dabSettings;
-	RingBuffer<std::complex<int16_t>>	*audioData;
-	audioDisplay		*theAudioDisplay;
-
-	void			setButtonColors	(QPushButton *,
-	 const QString &buttonName);
-
-public slots:
-	void		showFrameErrors		(int);
-	void		showAacErrors		(int);
-	void		showRsErrors		(int);
-	void		showRsCorrections	(int, int);
-	void		showFrameDumpButton	(bool);
-	void		showServiceName		(const QString &,
-	 const QString &);
-	void		showServiceId		(int);
-	void		showSubChId		(int);
-	void		showStartAddress	(int);
-	void		showLength		(int);
-	void		showLanguage		(int);
-	void		showUep			(int, int);
-	void		showCodeRate		(int, int);
-	void		showFm			(std::vector<int> &);
-	void		showRate		(int, bool, bool);
-	void		showStereo		(bool);
-
-	void		hideMissed		();
-	void		showMissed		(int);
-	void		audioDataAvailable	(int, int);
-
-	void		framedumpButton_text	(const QString &s, int);
-	void		audiodumpButton_text	(const QString &s, int);
-
-private slots:
-	void		colorFramedumpButton	();
-	void		colorAudiodumpButton	();
-
-signals:
-	void		handleTimeTable		();
-	void		handleAudioDumping	();
-	void		handleFrameDumping	();
-};
-
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/converter_48000.h Deleted

@@ -1,69 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2025
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB.
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#pragma once
-
-#include	<QObject>
-#include	"riffWriter.h"
-#include	"dab-constants.h"
-#include	<cstdio>
-#include	<mutex>
-#include	<QObject>
-#include	"ringbuffer.h"
-#include	"fir-filters.h"
-#include	<vector>
-#include	<complex>
-
-class	RadioInterface;
-
-class	converter_48000: public QObject {
-Q_OBJECT
-public:
-			converter_48000		(RadioInterface *);
-			~converter_48000	();
-	int		convert			(complex16*,
-	 int32_t, int, 
-	 std::vector<float> &);
-	 
-	void		start_audioDump		(const QString &);
-	void		stop_audioDump		();
-private:
-	int		convert_16000		(complex16 *,
-	 int, std::vector<float> &);
-	int		convert_24000		(complex16 *,
-	 int, std::vector<float> &);
-	int		convert_32000		(complex16 *,
-	 int, std::vector<float> &);
-	int		convert_48000		(complex16 *,
-	 int, std::vector<float> &);
-	riffWriter	theWriter;
-	std::vector<std::complex<float>>	buffer_32_96;
-	LowPassFIR	filter_16_48;
-	LowPassFIR	filter_24_48;
-	LowPassFIR	filter_32_96;
-	std::mutex	locker;
-	void		dump			(const float *, int);
-	void		dump			(const Complex *, int);
-	void		dump			(const complex16 *, int);
-};
-

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/dxDisplay.cpp Deleted

@@ -1,303 +0,0 @@
-#
-/*
- * Copyright (C) 2024 .. 2025
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include	"dxDisplay.h"
-#include	"radio.h"
-#include	"position-handler.h"
-#include	<QHeaderView>
-#include	<QHBoxLayout>
-#include	<qwt_compass.h>
-#include	<qlayout.h>
-#include	<qwt_compass_rose.h>
-#include	<qwt_dial_needle.h>
-#include	<QMap>
-
-static inline
-QString	convertNumber (uint16_t v) {
-uint16_t	firstDigit (v / 10);
-uint16_t	secondDigit (v % 10);
-	return QString::number (firstDigit) +
-	 QString::number (secondDigit);
-}
-
-	dxDisplay::dxDisplay (RadioInterface *mr, QSettings *s){
-	(void)mr;
-	dxSettings	= s;
-	myWidget	= new QScrollArea (nullptr);
-	myWidget	-> resize (220, 400);
-	myWidget	-> setWidgetResizable (true);
-
-	tableWidget 	= new QTableWidget (0, 13);
-	tableWidget	-> setColumnWidth (0, 30);	// mark
-	tableWidget	-> setColumnWidth (1, 45);	// pattern
-	tableWidget	-> setColumnWidth (2, 50);	// tii value
-	tableWidget	-> setColumnWidth (3, 50);	// phase
-	tableWidget	-> setColumnWidth (4, 60);	// strength
-	tableWidget	-> setColumnWidth (5, 70);	// azimuth
-	tableWidget	-> setColumnWidth (6, 70);	// power
-	tableWidget	-> setColumnWidth (7, 50);	// altitude
-	tableWidget	-> setColumnWidth (8, 60);	// height
-	tableWidget	-> setColumnWidth (9, 60);	// direction
-	tableWidget	-> setColumnWidth (10, 80);	// distamce
-	tableWidget	-> setColumnWidth (11, 80);	// delay
-	tableWidget	-> setColumnWidth (12, 250);	// transmitter
-
-	QHeaderView *headerView = tableWidget -> horizontalHeader ();
-	headerView	-> setSectionResizeMode (1, QHeaderView::Stretch);
-//	headerView	-> resizeSection (0, 50);
-	tableWidget 	-> setHorizontalHeaderLabels (
-	 QStringList () << tr ("x") << tr ("pat") <<
-	 tr ("tii") << tr ("phase") << tr ("strength") <<
-	 tr ("azimuth") << tr ("power") <<
-	 tr ("alt") << tr ("height") << tr ("dir") <<
-	 tr ("dist") << tr ("delay") << tr ("transmitter")); 
-
-	theDial		= new QwtCompass ();
-	theDial		-> setLineWidth (8);
-
-	QMap<double, QString> map;
-	map.insert(0.0, "N");
-	map.insert(90.0, "E");
-	map.insert(180.0, "S");
-	map.insert(270.0, "W");
-
-	QwtSimpleCompassRose *rose = new QwtSimpleCompassRose( 4, 1 );
- theDial->setRose( rose );
-	theDial -> setNeedle (
-	 new QwtCompassMagnetNeedle(QwtCompassMagnetNeedle::ThinStyle));
-	theDial -> setValue (220.0);
-
-	QHBoxLayout *l	= new QHBoxLayout ();
-	l -> addWidget (tableWidget);
-	l -> addWidget (theDial);
-	myWidget	-> setLayout (l);
-	myWidget	-> setWindowTitle ("dx display");
-	setPositionAndSize (s, myWidget, "DX_DISPLAY");
-	theChannel	= "";
-
-	connect (this, &superFrame::frameClosed,
-	 this, &dxDisplay::handle_frameClosed);
-}
-
-	dxDisplay::~dxDisplay () {
-	int16_t	rows	= tableWidget -> rowCount ();
-	for (int row = rows; row > 0; row --)
-	 tableWidget -> removeRow (row);
-	delete	tableWidget;
-	delete	myWidget;
-}
-
-void	dxDisplay::storePosition () {
-	return;
-	if (!myWidget -> isHidden ())
-	 storeWidgetPosition (dxSettings, myWidget, "DX_DISPLAY");
-	myWidget	-> hide ();
-}
-
-void	dxDisplay::setChannel (const QString &channel,
-	 const QString &ensemble) {
-	myWidget -> setWindowTitle ("TII data: channel " +channel + " ensemble: " + ensemble);
-	theChannel	= channel;
-}
-
-void	dxDisplay::cleanUp	() {
-	int16_t	rows	= tableWidget -> rowCount ();
-	for (int row = rows; row >= 0; row --)
-	 tableWidget -> removeRow (row);
-	myWidget -> setWindowTitle ("dx display");
-	theChannel	= "";
-}
-
-int	dxDisplay::nrRows	() {
-	return tableWidget -> rowCount ();
-}
-
-void	dxDisplay::show	() {
-	myWidget	-> show ();
-}
-
-void	dxDisplay::hide	() {
-	myWidget	-> hide ();
-}
-
-bool	dxDisplay::isHidden () {
-	return myWidget	-> isHidden ();
-}
-
-void	dxDisplay::addRow (transmitter &theTransmitter, bool isStrongest) {
-int16_t	row	= tableWidget -> rowCount ();
-
-	const QString &transmitterName = theTransmitter. transmitterName;	
-	uint16_t pattern	= theTransmitter. pattern;
-	int mainId		= theTransmitter. mainId;
-	int subId		= theTransmitter. subId;
-	bool	etsi		= theTransmitter. norm;
-	float	phase		= theTransmitter. phase;
-	float	strength	= 10 * log10 (theTransmitter. strength + 0.01);
-	float distance		= theTransmitter. distance;
-	float delay		= (distance * 1000) / 299792458.0 * 2048000;
-	float azimuth		= theTransmitter. azimuth;
-	float power		= theTransmitter. power;
-	int altitude		= theTransmitter. altitude;
-	int height		= theTransmitter. height;
-	const QString &dir	= theTransmitter. direction;
-	bool	b		= isStrongest;
-
-	tableWidget	-> insertRow (row);	// the mark
-	QTableWidgetItem *item0	= new QTableWidgetItem;
-	item0		-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 0, item0);
-
-	QTableWidgetItem *item1 = new QTableWidgetItem;	// pattern
-	item1		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 1, item1);
-
-	QTableWidgetItem *item2 = new QTableWidgetItem;	// tii data
-	item2		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 2, item2);
-
-	QTableWidgetItem *item3 = new QTableWidgetItem;	 // etsi
-	item3		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 3, item3);
-
-	QTableWidgetItem *item4 = new QTableWidgetItem;	 // strength
-	item4		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 4, item4);
-
-	QTableWidgetItem *item5 = new QTableWidgetItem;	// dist
-	item5		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 5, item5);
-
-	QTableWidgetItem *item6 = new QTableWidgetItem;	// azimuth
-	item6		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 6, item6);
-
-	QTableWidgetItem *item7 = new QTableWidgetItem;	// power
-	item7		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 7, item7);
-
-	QTableWidgetItem *item8 = new QTableWidgetItem;	// alt
-	item8		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 8, item8);

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/http-handler.cpp-ok Deleted

@@ -1,549 +0,0 @@
-#
-/*
- *	Copyright (C) 2016 .. 2023
- *	Jan van Katwijk (J.vanKatwijk@gmail.com)
- *	Lazy Chair Computing
- *
- *	This file is part of Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<unistd.h>
-#include	<sys/types.h>
-#ifndef	__MINGW32__
-#include	<sys/socket.h>
-#include	<fcntl.h>
-#include	<netinet/in.h>
-#include	<netdb.h>
-#include	<arpa/inet.h>
-#else
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#endif
-//#include	<err.h>
-#include	<cstring>
-
-#include	"http-handler.h"
-#include	"radio.h"
-
-#include	"converted_map.h"
-
-	httpHandler::httpHandler (RadioInterface *parent,
-	 const QString & mapPort,
-	 const QString &browserAddress,
-	 position	 homeAddress,
-	 const QString &saveName,
-	 bool autoBrowser_off) {
-	this	-> parent	= parent;
-	this	-> mapPort	= mapPort;
-	QString temp		= browserAddress + ":" + mapPort;
-	this	-> homeAddress	= homeAddress;
-	this	-> autoBrowser_off	= autoBrowser_off;
-#ifdef	__MINGW32__
-	this	-> browserAddress	= temp. toStdWString ();
-#else
-	this	-> browserAddress	= temp. toStdString ();
-#endif
-	this	-> running. store (false);
-
-	connect (this, SIGNAL (terminating ()),
-	 parent, SLOT (http_terminate ()));
-	saveFile	= fopen (saveName. toUtf8 (). data (), "w");
-	if (saveFile != nullptr) {
-	 fprintf (saveFile, "Home location; %f; %f\n\n", 
-	 homeAddress. latitude, homeAddress. longitude);
-	 fprintf (saveFile, "channel; latitude; longitude;transmitter;date and time; mainId; subId; distance; azimuth; power\n\n");
-	}
-
-	transmitterVector. resize (0);
-	start ();
-}
-
-	httpHandler::~httpHandler	() {
-	if (running. load ()) {
-	 running. store (false);
-	 threadHandle. join ();
-	}
-	if (saveFile != nullptr)
-	 fclose (saveFile);
-}
-
-void	httpHandler::start	() {
-	threadHandle = std::thread (&httpHandler::run, this);
-	if (autoBrowser_off)
-	 return;
-#ifdef	__MINGW32__
-	fprintf (stderr, "browser address %s\n", browserAddress. c_str ());
-	ShellExecute (nullptr, L"open", browserAddress. c_str (),
-	 nullptr, nullptr, SW_SHOWNORMAL);
-#else
-	std::string x = "xdg-open " + browserAddress;
-	(void)system (x. c_str ());
-#endif
-}
-
-void	httpHandler::stop	() {
-	if (running. load ()) {
-	 running. store (false);
-	 threadHandle. join ();
-	}
-}
-
-#ifndef	__MINGW32__
-void	httpHandler::run	() {
-char	buffer 4096;
-bool	keepalive;
-char	*url;
-int one = 1, ClientSocket, ListenSocket;
-struct sockaddr_in svr_addr, cli_addr;
-std::string	content;
-std::string	ctype;
-
-	running. store (true);
-	socklen_t sin_len = sizeof (cli_addr);
-	ListenSocket = socket (AF_INET, SOCK_STREAM, 0);
-	if (ListenSocket < 0) {
-	 running. store (false);
-	 terminating ();
-	 return;
-	}
-
-	int flags	= fcntl (ListenSocket, F_GETFL);
-	fcntl (ListenSocket, F_SETFL, flags | O_NONBLOCK);
-	setsockopt (ListenSocket, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int));
-	svr_addr.sin_family = AF_INET;
-	svr_addr.sin_addr.s_addr = INADDR_ANY;
-	svr_addr.sin_port = htons (mapPort. toInt ());
-
-	if (::bind (ListenSocket, (struct sockaddr *) &svr_addr,
-	 sizeof (svr_addr)) == -1) {
-	 close (ListenSocket);
-	 running. store (false);
-	 terminating ();
-	 return;
-	}
-//
-//	Now, we are listening to port XXXX, ready to accept a
-//	socket for anyone who needs us
-
-	::listen (ListenSocket, 5);
-	while (running. load ()) {
-	 ClientSocket = accept (ListenSocket,
-	 (struct sockaddr *) &cli_addr, &sin_len);
-	 if (ClientSocket == -1) {
-	 usleep (2000000);
-	 continue;
-	 }
-//
-//	someone needs us, let us see what (s)he wants
-	 while (running. load ()) {
-	 if (read (ClientSocket, buffer, 4096) < 0) {
-	 running. store (false);
-	 break;
-	 }
-
-//	 fprintf (stderr, "Buffer - %s\n", buffer);
-	 int httpver = (strstr (buffer, "HTTP/1.1") != nullptr) ? 11 : 10;
-	 if (httpver == 11)
-//	HTTP 1.1 defaults to keep-alive, unless close is specified.
-	 keepalive = strstr (buffer, "Connection: close") == nullptr;
-	 else // httpver == 10
-	 keepalive = strstr (buffer, "Connection: keep-alive") != nullptr;
-
-/*	Identify the URL. */
-	 char *p = strchr (buffer, ' ');
-	 if (p == nullptr)
-	 break;
-	 url = ++p; // Now this should point to the requested URL.
-	 p = strchr (p, ' ');
-	 if (p == nullptr)
-	 break;
-	 *p = '\0';
-
-//	Select the content to send, we have just two so far:
-//	 "/" -> Our google map application.
-//	 "/data.json" -> Our ajax request to update planes. */
-	 bool jsonUpdate	= false;
-	 if (strstr (url, "/data.json")) {
-	 content	= coordinatesToJson (transmitterList);
-	 if (content != "") {
-	 ctype	= "application/json;charset=utf-8";
-	 jsonUpdate	= true;
-	 }
-	 }
-	 else {
-	 content	= theMap (homeAddress);
-	 ctype		= "text/html;charset=utf-8";
-	 }
-
-//	Create the header
-	 char hdr 2048;
-	 sprintf (hdr,
-	 "HTTP/1.1 200 OK\r\n"
-	 "Server: qt-dab\r\n"

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/riffWriter.cpp Deleted

@@ -1,225 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2025
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB 
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-//
-//	The RIFF writer writes the input samples into a "wav" file
-//	with the samplerate of SAMPLERATE (2048000), as 16 bit int's, and a "chunk"
-//	(chunk Id "freq") is added that contains the frequency
-//
-//	The BW64 format is derived from Recommendation ITU-R BS.2088-1 (10/2019)
-//	Long-form file format for the international
-//	exchange of audio programme materials with metadata
-
-#include	"riffWriter.h"
-
-static
-const char	* riff	= "RIFF";
-static
-const char	* junk	= "JUNK";
-static
-const char	* bw64	= "BW64";
-static
-const char	* ds64	= "ds64";
-static
-const char	* wave	= "WAVE";
-static
-const char	* fmt	= "fmt ";
-static
-const char	* aux1	= "freq";
-static
-const char	* aux2	= "bits";
-static
-const char	* aux3	= "sys ";
-static
-const char	* data	= "data";
-
-	riffWriter::riffWriter	() {
-	isValid = false;
-}
-
-	riffWriter::~riffWriter	() {}
-//
-//	The riffWriter is used for 
-//	- dumping the source input, i.e. large file with samplerate 2049000
-//	- writing the audio output out
-//	The default values in the init are merely for the source dump
-bool	riffWriter::init	(const QString &fileName, const int sampleRate, 
-	 const int frequency, const int bitDepth,
-	 QString creatorText) {
-	isValid			= false;
-	filePointer		= fopen (fileName. toUtf8 (). data (), "wb");
-	if (filePointer == nullptr)
-	 return false;
-
-	fwrite (riff, 1, 4, filePointer);
-
-//	the ultimate filesize is written at location 4
-	fseek (filePointer, 4, SEEK_CUR);
-
-//	The default header:
-	locationCounter		= 8;
-	fwrite (wave, 1, 4, filePointer);
-	locationCounter		+= 4;
-//
-//	junk block
-	fwrite (junk, 1, 4, filePointer);
-	locationCounter		+= 4;
-	uint32_t junkSize	= 32;
-	fwrite (&junkSize, 1, 4, filePointer);
-	locationCounter		+= 4;
-	char junkNix 32	= {0};
-	fwrite (&junkNix, 1, 32, filePointer);
-	locationCounter		+= 32;
-
-	fwrite (fmt, 1, 4, filePointer);
-	locationCounter		+= 4;
-	uint32_t fmtSize	= 16;
-	fwrite (&fmtSize, 1, 4, filePointer);
-	locationCounter		+= 4;
-	uint16_t	formatTag	= 01;
-	fwrite (&formatTag, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-	uint16_t	nrChannels	= 2;
-	fwrite (&nrChannels, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-	uint32_t	samplingRate	= sampleRate;
-	fwrite (&samplingRate, 1, sizeof (uint32_t), filePointer);
-	locationCounter		+= 4;
-	uint32_t	bytesperSecond	= 4 * samplingRate;
-	fwrite (&bytesperSecond, 1, sizeof (uint32_t), filePointer);
-	locationCounter		+= 4;
-	uint16_t	bytesperBlock	= 4;
-	fwrite (&bytesperBlock, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-	uint16_t bitsperSample		= 16;
-	fwrite (&bitsperSample, 1, sizeof (uint16_t), filePointer);
-	locationCounter		+= 2;
-//
-//	the "freq" chunk
-	if (frequency > 0) {
-	 fwrite (aux1, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 int freqLen		= sizeof (int32_t);
-	 fwrite (&freqLen, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 fwrite (&frequency, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	}
-//
-//	the "bitdepth" chunk
-	if (bitDepth > 0) {
-	 fwrite (aux2, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 int bitDepthLen	= 4;
-	 fwrite (&bitDepthLen, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 fwrite (&bitDepth, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	}
-//	the "creator" chunk
-	if (bitDepth > 0) {
-	 fwrite (aux3, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 int size = strlen (creatorText. toLatin1 (). data ());
-	 locationCounter	+= 4;
-	 fwrite (&size, 1, 4, filePointer);
-	 locationCounter	+= 4;
-	 fwrite (creatorText. toLatin1 (). data (), 1, size, filePointer);
-	 locationCounter	+= size;
-	}
-//
-//	start of the "data" chunk
-	fwrite (data, 1, 4, filePointer);
-	locationCounter		+= 4;
-
-	nrElements	= 0;
-	isValid		= true;
-	return true;
-}
-
-void	riffWriter::close	() {
-	if (!isValid)
-	 return;
-	isValid		= false;
-	uint64_t nrBytes	= nrElements * 2 * sizeof (int16_t);
-
-	fprintf (stderr, "nrBytes = %ld\n", nrBytes);
-//	reset the fp to the location where the nr bytes in the
-//	data chunk should be written
-	fseek (filePointer, 0, SEEK_SET);
-	if (nrBytes < (uint64_t)0xFFFFFFFF) {
-//	 fwrite (bw64, 1, 4, filePointer);
-	 fseek (filePointer, locationCounter, SEEK_SET);
-	 fwrite (&nrBytes, 1, 4, filePointer);
-//
-//	compute the number if of to be recorded in the RIFF count
-	 fseek (filePointer, 0, SEEK_END);
-	 int riffSize	= ftell (filePointer) - 8;
-//
-//	and record the value at loc 4
-	 fseek (filePointer, 4, SEEK_SET);
-	 fwrite (&riffSize, 1, 4, filePointer);
-	 fseek (filePointer, 0, SEEK_END);
-	 fclose (filePointer);
-	 return;
-	}
-//	a large file, make it BW64
-	fprintf (stderr, "LARGE FILE\n");
-	uint32_t minusOne = 0xFFFFFFFF;
-	fwrite (bw64, 1, 4, filePointer);
-	fwrite (&minusOne, 1, 4, filePointer);
-	fseek (filePointer, locationCounter, SEEK_SET);
-	fwrite (&minusOne, 1, 4, filePointer);
-//	compute the number if of to be recorded in the RIFF count
-	fseek (filePointer, 0, SEEK_END);
-	uint64_t riffSize	= ftell (filePointer) - 8;
-//	just fill the ds64 struct
-	fseek (filePointer, 12, SEEK_SET);
-	fwrite (ds64, 1, 4, filePointer);
-	fseek (filePointer, 20, SEEK_SET);
-	uint64_t theSize	= riffSize;

qt-dab-Qt-DAB-6.9.6.tar.gz/sources/support/riffWriter.h Deleted

@@ -1,52 +0,0 @@
-#
-/*
- * Copyright (C) 2016 .. 2025
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB 
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-//
-//	This version of riffWriter starts assuming the filesize will remain
-//	below 4 G, if - when closing - it turns out the the file size exceeds
-//	the 4G border, the type is changed into BW64
-
-#pragma once
-
-#include	<QString>
-#include	<stdio.h>
-#include	<stdint.h>
-
-class riffWriter {
-public:
-		riffWriter	();
-		~riffWriter	();
-	bool	init		(const QString &, int,
-	 int bitDepth = 0,
-	 int frequency = 0,
-	 QString creator = "Qt-DAB-6.9.3");
-	void	write		(int16_t *buff, uint64_t samples);
-	void	close		();
-	bool	isActive	();
-private:
-	FILE		*filePointer;
-	uint64_t	nrElements;
-	std::fpos_t	dataPos;
-	bool		isValid;
-	uint64_t	locationCounter;
-};
-