Request 6379 (accepted)

Overview

Request 6379 (accepted)

Update to 6.10

Created by wkazubski 16 days ago
In state accepted

Submit qt-dab

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

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 
+	   ./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/equalizer.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 
+	   ./sources/support/scheduler.h 
+	   ./sources/support/schedule-selector.h 
+	   ./sources/support/element-selector.h 
+	   ./sources/support/time-table.h 
+	   ./sources/support/findfilenames.h 
+	   ./sources/support/dl-cache.h 
+	   ./sources/support/content-table.h 
+	   ./sources/support/ITU_Region_1.h 
+	   ./sources/support/coordinates.h 
+	   ./sources/support/skin-handler.h 
+	   ./sources/support/mapport.h 
+	   ./sources/support/bandpass-filter.h 
+	   ./sources/support/fir-filters.h 
+	   ./sources/support/tii-mapper.h 
+	   ./sources/support/tii-reader.h 
+	   ./sources/support/uploader.h 
+	   ./sources/support/basic-print.h 
+	   ./sources/support/gui-elements/position-handler.h 
+	   ./sources/support/gui-elements/settings-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/support/gui-elements/qwt-2.h 
+	   ./sources/devices/riff-writer.h 
+	   ./sources/devices/device-handler.h 
+	   ./sources/devices/device-chooser.h 
+	   ./sources/devices/device-exceptions.h 
+	   ./sources/devices/xml-filewriter.h 
+	   ./sources/devices/filereaders/new-reader/newfiles.h 
+	   ./sources/devices/filereaders/new-reader/new-reader.h 
+	   ./sources/devices/filereaders/new-reader/riff-reader.h 
+	   ./sources/devices/filereaders/rawfiles-new/rawfiles.h 
+	   ./sources/devices/filereaders/rawfiles-new/raw-reader.h 
+	   ./sources/devices/filereaders/xml-filereader/element-reader.h 
+	   ./sources/devices/filereaders/xml-filereader/xml-filereader.h 
+	   ./sources/devices/filereaders/xml-filereader/xml-reader.h 
+	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.h 
 	)
 
 	set (${objectName}_SRCS
 	     ${${objectName}_SRCS}
-	     ./sources/main/main.cpp
-	     ./sources/main/radio.cpp
-	     ./sources/main/aboutdialog.cpp
-	     ./sources/main/config-handler.cpp
-	     ./sources/main/ensemble-handler.cpp
-	     ./sources/main/techdata.cpp
-	     ./sources/main/display-widget.cpp 
-             ./sources/main/scopes/correlation-scope.cpp 
-             ./sources/main/scopes/spectrum-scope.cpp 
-             ./sources/main/scopes/null-scope.cpp 
-             ./sources/main/scopes/channel-scope.cpp 
-	     ./sources/main/scopes/dev-scope.cpp
-             ./sources/main/scopes/waterfall-scope.cpp 
-             ./sources/main/scopes/iqdisplay.cpp 
-	     ./sources/main/scopes/audio-display.cpp
-	     ./sources/main/scopes/spectrogramdata.cpp
-	     ./sources/main/snr-viewer/snr-viewer.cpp
-	     ./sources/eti-handler/eti-generator.cpp
-	     ./sources/frontend/ofdm-handler.cpp
-             ./sources/frontend/sample-reader.cpp
-	     ./sources/frontend/correlator.cpp
-	     ./sources/frontend/estimator.cpp
-	     ./sources/frontend/freqsyncer.cpp
-	     ./sources/frontend/ofdm-decoder.cpp
-	     ./sources/frontend/phasetable.cpp
-	     ./sources/frontend/freq-interleaver.cpp
-	     ./sources/frontend/tii-detector.cpp
-	     ./sources/frontend/tii-detector-1.cpp
-	     ./sources/frontend/tii-detector-2.cpp
-	     ./sources/frontend/timesyncer.cpp
-	     ./sources/frontend/fic-handling/fic-handler.cpp
-	     ./sources/frontend/fic-handling/ensemble.cpp
-	     ./sources/frontend/fic-handling/fib-config.cpp
-	     ./sources/frontend/fic-handling/fib-decoder.cpp
-	     ./sources/protection/protTables.cpp
-	     ./sources/protection/protection.cpp
-	     ./sources/protection/uep-protection.cpp
-	     ./sources/protection/eep-protection.cpp
-	     ./sources/support/audiosystem-selector.cpp
-	     ./sources/support/basic-print.cpp
-	     ./sources/support/charsets.cpp
-	     ./sources/support/bandpass-filter.cpp
-	     ./sources/support/content-table.cpp
-	     ./sources/support/converter_48000.cpp
-	     ./sources/support/coordinates.cpp
-	     ./sources/support/crc-handlers.cpp
-	     ./sources/support/dab-params.cpp
-	     ./sources/support/dab-tables.cpp
-	     ./sources/support/distances.cpp
-	     ./sources/support/dxDisplay.cpp
-	     ./sources/support/element-selector.cpp
-	     ./sources/support/fft-handler.cpp
-	     ./sources/support/findfilenames.cpp
-	     ./sources/support/fir-filters.cpp
-	     ./sources/support/http-handler.cpp
-	     ./sources/support/ITU_Region_1.cpp
-	     ./sources/support/logger.cpp
-	     ./sources/support/errorlog.cpp
-	     ./sources/support/mapport.cpp
-	     ./sources/support/position-handler.cpp
-	     ./sources/support/scan-handler.cpp
-	     ./sources/support/scanlist-handler.cpp
-	     ./sources/support/scantable-handler.cpp
-	     ./sources/support/scheduler.cpp
-	     ./sources/support/schedule-selector.cpp
-	     ./sources/support/settings-handler.cpp
-	     ./sources/support/skin-handler.cpp
-	     ./sources/support/tii-mapper.cpp
-	     ./sources/support/tii-reader.cpp
-	     ./sources/support/time-converter.cpp
-	     ./sources/support/time-table.cpp
-	     ./sources/support/uploader.cpp
-	     ./sources/support/riffWriter.cpp
-	     ./sources/support/dl2-handler.cpp
-	     ./sources/support/gui-elements/presetcombobox.cpp
-	     ./sources/support/gui-elements/circular-button.cpp
-	     ./sources/support/gui-elements/clickable-label.cpp
-	     ./sources/support/gui-elements/color-selector.cpp
-	     ./sources/support/gui-elements/font-chooser.cpp 
-	     ./sources/support/gui-elements/icon-label.cpp 
-             ./sources/support/gui-elements/newpushbutton.cpp 
-             ./sources/support/gui-elements//normalpushbutton.cpp 
-	     ./sources/support/gui-elements/smallcombobox.cpp 
-             ./sources/support/gui-elements/smallpushbutton.cpp 
-             ./sources/support/gui-elements/smallqlistview.cpp 
-             ./sources/support/gui-elements/smallspinbox.cpp 
-             ./sources/support/gui-elements/super-frame.cpp 
-	     ./sources/support/gui-elements/verysmallpushbutton.cpp 
-	     ./sources/backend/backend.cpp
-	     ./sources/backend/backend-deconvolver.cpp
-	     ./sources/backend/backend-driver.cpp
-	     ./sources/backend/msc-handler.cpp
-	     ./sources/backend/reed-solomon/galois.cpp
-	     ./sources/backend/reed-solomon/reed-solomon.cpp
-	     ./sources/backend/audio/bitWriter.cpp
-	     ./sources/backend/audio/faad-decoder.cpp
-	     ./sources/backend/audio/firecode-checker.cpp
-	     ./sources/backend/audio/mp2processor.cpp
-	     ./sources/backend/audio/mp4processor.cpp
-	     ./sources/backend/data/adv-datahandler.cpp
-	     ./sources/backend/data/data-processor.cpp
-	     ./sources/backend/data/ip-datahandler.cpp
-	     ./sources/backend/data/journaline-controller.cpp
-	     ./sources/backend/data/journaline-datahandler.cpp
-	     ./sources/backend/data/journaline-screen.cpp
-	     ./sources/backend/data/pad-handler.cpp
-	     ./sources/backend/data/tdc-datahandler.cpp
-	     ./sources/backend/data/epg/epg-compiler.cpp
-	     ./sources/backend/data/epg/xml-extractor.cpp
-	     ./sources/backend/data/journaline/crc_8_16.c
-	     ./sources/backend/data/journaline/dabdgdec_impl.c
-	     ./sources/backend/data/journaline/log.c
-	     ./sources/backend/data/journaline/newsobject.cpp
-	     ./sources/backend/data/journaline/newssvcdec_impl.cpp
-	     ./sources/backend/data/journaline/NML.cpp
-	     ./sources/backend/data/journaline/Splitter.cpp
-	     ./sources/backend/data/mot/mot-dir.cpp
-	     ./sources/backend/data/mot/mot-handler.cpp
-	     ./sources/backend/data/mot/mot-object.cpp
-	     ./sources/output/audio-player.cpp
-	     ./sources/devices/device-handler.cpp
-	     ./sources/devices/xml-filewriter.cpp
+	   ./sources/main/main.cpp
+	   ./sources/main/radio.cpp 
+	   ./sources/main/display-widget.cpp 
+           ./sources/main/scopes/correlation-scope.cpp 
+           ./sources/main/scopes/spectrum-scope.cpp 
+           ./sources/main/scopes/null-scope.cpp 
+           ./sources/main/scopes/channel-scope.cpp 
+           ./sources/main/scopes/dev-scope.cpp 
+           ./sources/main/scopes/waterfall-scope.cpp 
+	   ./sources/main/scopes/iqdisplay.cpp 
+	   ./sources/main/scopes/audio-display.cpp 
+	   ./sources/main/scopes/spectrogramdata.cpp 
+	   ./sources/main/snr-viewer/snr-viewer.cpp 
+	   ./sources/main/copyrightLabel.cpp 
+	   ./sources/main/ensemble-handler.cpp 
+	   ./sources/main/tech-window.cpp 
+	   ./sources/main/config-handler.cpp 
+	   ./sources/main/dxDisplay.cpp 
+	   ./sources/eti-handler/eti-generator.cpp 
+	   ./sources/frontend/ofdm-handler.cpp 
+	   ./sources/frontend/timesyncer.cpp 
+	   ./sources/frontend/sample-reader.cpp 
+	   ./sources/frontend/ofdm-decoder.cpp 
+	   ./sources/frontend/correlator.cpp 
+	   ./sources/frontend/estimator.cpp 
+	   ./sources/frontend/freqsyncer.cpp 
+	   ./sources/frontend/phasetable.cpp 
+	   ./sources/frontend/freq-interleaver.cpp 
+	   ./sources/frontend/tii-detector-1.cpp 
+	   ./sources/frontend/fic-handling/fic-handler.cpp 
+	   ./sources/frontend/fic-handling/ensemble.cpp  
+	   ./sources/frontend/fic-handling/fib-config.cpp  
+	   ./sources/frontend/fic-handling/fib-decoder.cpp  
+	   ./sources/protection/protTables.cpp 
+	   ./sources/protection/protection.cpp 
+	   ./sources/protection/eep-protection.cpp 
+	   ./sources/protection/uep-protection.cpp 
+	   ./sources/backend/msc-handler.cpp 
+	   ./sources/backend/reed-solomon/galois.cpp 
+	   ./sources/backend/reed-solomon/reed-solomon.cpp 
+	   ./sources/backend/backend.cpp 
+           ./sources/backend/backend-driver.cpp 
+           ./sources/backend/backend-deconvolver.cpp 
+	   ./sources/backend/audio/firecode-checker.cpp 
+	   ./sources/backend/audio/mp2processor.cpp 
+	   ./sources/backend/audio/mp4processor.cpp 
+	   ./sources/backend/audio/bitWriter.cpp 
+	   ./sources/backend/data/pad-handler.cpp 
+	   ./sources/backend/data/data-processor.cpp 
+	   ./sources/backend/data/tdc-datahandler.cpp 
+	   ./sources/backend/data/ip-datahandler.cpp 
+	   ./sources/backend/data/adv-datahandler.cpp 
+	   ./sources/backend/data/mot/mot-handler.cpp 
+	   ./sources/backend/data/mot/mot-object.cpp 
+	   ./sources/backend/data/mot/mot-dir.cpp 
+	   ./sources/backend/data/journaline-controller.cpp 
+	   ./sources/backend/data/journaline-datahandler.cpp 
+	   ./sources/backend/data/journaline-screen.cpp 
+	   ./sources/backend/data/journaline/crc_8_16.c 
+	   ./sources/backend/data/journaline/log.c 
+	   ./sources/backend/data/journaline/newssvcdec_impl.cpp 
+	   ./sources/backend/data/journaline/Splitter.cpp 
+	   ./sources/backend/data/journaline/dabdgdec_impl.c 
+	   ./sources/backend/data/journaline/newsobject.cpp 
+	   ./sources/backend/data/journaline/NML.cpp 
+	   ./sources/backend/data/epg/epg-compiler.cpp 
+	   ./sources/backend/data/epg/xml-extractor.cpp 
+	   ./sources/output/converter_48000.cpp 
+	   ./sources/output/audio-player.cpp 
+	   ./sources/support/audiosystem-selector.cpp 
+	   ./sources/support/bandpass-filter.cpp 
+	   ./sources/support/basic-print.cpp 
+	   ./sources/support/charsets.cpp 
+	   ./sources/support/content-table.cpp 
+	   ./sources/support/coordinates.cpp 
+	   ./sources/support/crc-handlers.cpp 
+	   ./sources/support/dab-params.cpp 
+	   ./sources/support/dab-tables.cpp 
+	   ./sources/support/distances.cpp 
+	   ./sources/support/dl2-handler.cpp 
+	   ./sources/support/timetable-control.cpp 
+	   ./sources/support/element-selector.cpp 
+	   ./sources/support/errorlog.cpp 
+	   ./sources/support/fft-handler.cpp 
+	   ./sources/support/findfilenames.cpp 
+	   ./sources/support/fir-filters.cpp 
+	   ./sources/support/http-handler.cpp 
+	   ./sources/support/ITU_Region_1.cpp 
+	   ./sources/support/logger.cpp 
+	   ./sources/support/mapport.cpp 
+	   ./sources/support/scan-handler.cpp 
+	   ./sources/support/scanlist-handler.cpp 
+	   ./sources/support/scantable-handler.cpp 
+	   ./sources/support/scheduler.cpp 
+	   ./sources/support/schedule-selector.cpp 
+	   ./sources/support/skin-handler.cpp 
+	   ./sources/support/tii-mapper.cpp 
+	   ./sources/support/tii-reader.cpp 
+	   ./sources/support/time-converter.cpp 
+	   ./sources/support/time-table.cpp 
+	   ./sources/support/uploader.cpp 
+	   ./sources/support/gui-elements/settings-handler.cpp 
+	   ./sources/support/gui-elements/position-handler.cpp 
+	   ./sources/support/gui-elements/presetcombobox.cpp 
+	   ./sources/support/gui-elements/circular-button.cpp 
+	   ./sources/support/gui-elements/clickable-label.cpp 
+	   ./sources/support/gui-elements/color-selector.cpp 
+	   ./sources/support/gui-elements/font-chooser.cpp 
+	   ./sources/support/gui-elements/icon-label.cpp 
+	   ./sources/support/gui-elements/newpushbutton.cpp 
+	   ./sources/support/gui-elements/normalpushbutton.cpp 
+	   ./sources/support/gui-elements/smallcombobox.cpp 
+	   ./sources/support/gui-elements/smallpushbutton.cpp 
+	   ./sources/support/gui-elements/smallqlistview.cpp 
+	   ./sources/support/gui-elements/smallspinbox.cpp 
+	   ./sources/support/gui-elements/super-frame.cpp 
+	   ./sources/support/gui-elements/verysmallpushbutton.cpp 
+	   ./sources/devices/riff-writer.cpp 
+	   ./sources/devices/device-handler.cpp 
+	   ./sources/devices/device-chooser.cpp 
+	   ./sources/devices/xml-filewriter.cpp 
+	   ./sources/devices/filereaders/rawfiles-new/rawfiles.cpp 
+	   ./sources/devices/filereaders/rawfiles-new/raw-reader.cpp 
+           ./sources/devices/filereaders/new-reader/newfiles.cpp 
+           ./sources/devices/filereaders/new-reader/new-reader.cpp 
+           ./sources/devices/filereaders/new-reader/riff-reader.cpp 
+	   ./sources/devices/filereaders/xml-filereader/xml-filereader.cpp 
+	   ./sources/devices/filereaders/xml-filereader/xml-reader.cpp 
+	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.cpp 
 	)
 
 	set (${objectName}_MOCS
 	     ./sources/main/radio.h
 	     ./sources/main/ensemble-handler.h 
 	     ./sources/main/config-handler.h 
-	     ./sources/main/techdata.h
-	     ./sources/main/aboutdialog.h 
+	     ./sources/main/tech-window.h
+	     ./sources/main/copyrightLabel.h 
+	     ./sources/main/dxDisplay.h
 	     ./sources/main/display-widget.h 
 	     ./sources/main/scopes/correlation-scope.h 
 	     ./sources/main/scopes/spectrum-scope.h 
@@ -484,12 +497,11 @@
 	     ./sources/support/scan-handler.h 
 	     ./sources/support/scantable-handler.h 
 	     ./sources/support/audiosystem-selector.h
-	     ./sources/support/dxDisplay.h
-	     ./sources/support/converter_48000.h
 	     ./sources/support/scanlist-handler.h
 	     ./sources/support/scheduler.h
 	     ./sources/support/schedule-selector.h
 	     ./sources/support/element-selector.h
+	     ./sources/support/timetable-control.h
 	     ./sources/support/time-table.h
 	     ./sources/support/content-table.h
 	     ./sources/support/coordinates.h
@@ -515,6 +527,7 @@
 	     ./sources/backend/data/epg/epg-compiler.h
 	     ./sources/backend/data/epg/xml-extractor.h
 	     ./sources/output/audio-player.h
+	     ./sources/output/converter_48000.h
 	)
 
 	set (${objectName}_UIS

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;
  * touching the small icon to the right next, the folder/directory in which the slides, the tii log and the log file are written is shown;
- * touching the small **blue** icon causes the device list to be displayed.
+ * **NEW**: touching the small **blue** icon causes the device list to be displayed. Touching the icon again hides the icon. After selecting a device, the device list will be hidden as well.
 
 !6.9(/res/read_me/devicelist.png)
 
- * touching the icon showing a *speaker* controls **muting** the signal and shows
-whether or not a signal should be audible.
- * touching the *copyright symbol* shows (or, if visible, hides) a small widget with acknowledgements for using external libraries;
+ * touching the icon showing a **speaker** controls **muting** the signal and shows whether or not a signal should be audible.
+ * touching the **copyright symbol** shows (or, if visible, hides) a small **about** window with acknowledgements for using external libraries;
 
 !6.9(/res/read_me/mainwindow-buttons.png)
 
- * the button labeled *scan* controls the visibility of a the scan handler widget;
- * the button labeled *http* controls the http handler with which a map (with the transmitters) will be shown;
- * the button labeled *spectrum* controls the visibility of the spectrum widget, a widget that contains views on and information of the DAB signal itself;
- * the button labeled *controls* controls the visibility of the so-called *configuration and control widget*, a widget that contains numerous settings for this software;
- * the bottom line shows the transmitter name from which the data is received, and - in this case - that the avx2 instruction extension is used for some computations.
+At the bottom of the right half of the window, one sees the buttons shown above,
+from right to left:
+
+ * the button labeled **scan** controls the visibility of a the scan handler window;
+ * the button labeled **http* controls the **http handler** with which a browser is started that shows a map (with the transmitters displayed on their location).  **NEW** is that closing the http handler closes the browser as well (depending on a setting in the configuration window);
+ * the button labeled **spectrum** controls the visibility of the spectrum window, a window with options to select among different views on and information of the DAB signal itself;
+ * the button labeled **controls** controls the visibility of the so-called **configuration and control window**, a window that provides numerous settings for this software;
+
+The bottom line in the picture above shows the transmitter name from the transmitter with the  strongest data, and - in this case - that the **avx2** instruction extension is used for some computations. (Qt-DAB comes in two versions, one with support for the avx2 instructionset, and one without). **Clicking** on that bottom line controls the visibility of the  **dxDisplay** (see below).
+
+The picture below shows (part of) the left half of the main window. It shows a
+list of services, and - at the bottom - a few buttons and selectors.
 
 !6.9(/res/read_me/services.png)
 
  * the buttons labeled "+" and "-" can be used to scan through the list of services;
  * the up- and down arrow can be used to scan through the channels, a channel can be selected by touching an element of the combobox;
- * the button labeled *favourites* controls  whether the list of services
+ * the button labeled **favourites** controls whether the list of services
 from the currently selected channel or the list of favourites is shown,
- * the button labeled *scanlist* controls the visibility
-of the scan list, i.e the list of all services seen, shown below.
+ * the button labeled **scanlist** controls the visibility
+of the scan list, i.e  *the list of all services seen*, shown below.
 
 !6.9(/res/read_me/scanList.png)
 
 (Obviously, the colors of the buttons, as well as the *font*, the *font size* and the *font color* of the service list shown can be set by the user, just click with the right hand mouse button on a button).
 
-As mentioned, Qt-DAB supports **favorites**, i.e. a list of (channel, service pairs),
-the list is maintained between program invocations. 
-The *services list* on the main widget is shown in one of two modes, selectable by the button (in the picture labeled favourites). In *ensemble view* mode, the services in the current ensemble are shown, in the *favourites view* mode, the favourites are shown.
-In both views, selecting a service is just by clicking on the service name.
-Of course, when selecting a service in the list of favourites, it might take some time before the software has switched over to the appropriate channel, and has
+As mentioned, Qt-DAB supports **favorites**,
+i.e. a list of (channel, service pairs). The list is maintained between program invocations. 
+The **services widget** on the main window is shown in one of two modes, selectable by the button (in the picture labeled) **favourites**.
+In **ensemble view** mode, the services in the current ensemble are shown, in the **favourites view** mode, the favourites are shown.
+
+In both views, **selecting a service** is just by clicking on the service name.
+Of course, when selecting a service in the list of favourites, it might take a few seconds before the software has switched over to the appropriate channel, and has
 received sufficient information on the new ensemble carried in that channel before being able to select the service in that channel.
 
 **Adding** a service to the favourites is by clicking on the field in the right hand column, shown in the services list.
-If - in *ensemble mode* view - a service is also part of the favourites, the
-field in the right hand column is marked. Clicking on such a mark *removes* the
-service from the list, as does clicking on the field in the *favourites view*.
+If - in **ensemble mode** view - a service is also part of the favourites, the
+field in the right hand column shows a mark. Clicking on such a mark **removes** the service from the list, as does clicking on the field in the *favourites view**.
 
 !6.8(/res/read_me/technical-widget.png)
 
-The technical widget shows - as the name suggests - some technical details of
+The technical window shows - as the name suggests - technical details of
 the  selected audio service. If the audio of the service is also transmitted
-on FM, the FM frequency (frequencies) - derived from additional data in the DAB datastream -
-is shown as well.
+on FM, the FM frequency (frequencies) - derived from additional data in the DAB datastream - is shown as well.
 
-The buttons at the top of the widget control *dumping* the audio
+The buttons at the top of the window control **dumping** the audio
 (".wav" file) resp. the AAC or MP2 frames into a file. AAC amd MP2 encoded files can be processed by e.g. VLC.
 
 The **timeTable** button has only effect if on this channel (ensemble) an EPG 
@@ -192,30 +207,46 @@
 resp. detecting a DAB+ frame, the RS error repair and the AAC decoding.
 (For "old" DAB transmissions only a single quality indicator appears).
 
-Below the progress bars the *rsCorrections/100* indicator shows how the amount of corrections that was made by the Reed-Solomon detector in the last 100 AAC frames (only used for DAB+ services).
+Below the progress bars the **rsCorrections/100** indicator shows how the amount of corrections that was made by the Reed-Solomon detector in the last 100 AAC frames (only used for DAB+ services).
 Of course, the parity bits used by the RS decoding may contain bit errors themselves, which mot likely lead to CRC errors, the second indicator shows the amount of CRC errors detected after the correction by the RS decoding.
 
 The third indicator tells the percentage of the AAC (or MP2) data that was
 found to be OK.
 
-The "scope" at the bottom shows the spectrum of the audio.
+The **scope** at the bottom shows the spectrum of the audio.
+
+As mentioned above, a **spectrum window** can be made visible by clicking
+on a button on the main window.
+That window is equipped with a tab for selecting
+one of 6 views on the input signal.
 
 !6.8(/res/read_me/spectrum-scope.png)
 
-The widget for the *spectrum scope* is equipped with a tab for selecting
-one of 6 views on the input signal.
-In the view shown in the picture above, the spectrum of the incoming DAB signal is shown. To the right of this spectrum, one
-sees the **signal constellation**,
-i.e. the mapping from the complex signals onto their real
-and imaginary components. If the selector labeled
+In the view shown in the picture above, the spectrum of the incomin
+ DAB signal is shown. To the right of this spectrum, one sees the
+**signal constellation**, i.e. the mapping from the complex signals
+onto their real and imaginary components. If the selector labeled
 "ncp" is set, the centerpoints of the 4 lobs is shown. 
 
-On the right hand side the widget shows some quality indicators of the DAB signal. The topline specifies the channel and the selected frequency (in kHz).
-With the current input device, the computed frequency correction is just 4 Hz
-(on 227360 khz) after which a frequency error of 1.3 Hz seems to remain.
-The SNR is over 15 dB, and time, clock and dc offsets are too small to take in consideration.
-
-At the bottom quality information on the FIC handling is shown, the (here) green bar shows that everything with FIC decoding is fine, the BER tells that (on average) 4 out of each 1000 input bits were wrong and were corrected.
+Below this constellation widget,  some quality indicators of the DAB signal
+are shown.
+From top to bottom
+ * the channel and the frequency of the channel
+ * the **correction**, i.e. the **computed** correction on the frequency of the incoming signal that is applied to the signal;
+ * the **freq error**, i.e. the remaining frequency error (in Hz) after
+applying the correction;
+ * the **SNR**, i.e.  the Signal-Noise Ratio in dB;
+ * the **time offset**, the (relative) resulting error in sampling;
+ * the **clock offset**, telling the number of samples too much or too
+little in the duration of 10 DAB frames;
+ * the IQ unbalance, i.e. the (average) difference in strength between the I and the Q part of the DAB signal.
+
+At the bottom of the window from left to right
+ * a **sync** indicator, when green indicating that the software is synchronized with the incoming sample stream;
+ * a **FIC** indicator, telling the (average) successrate of decoding the FIC part of the DAB frames (i.e. the data that specifies the payload);
+ * a **BER**, Bit Error Rate, telling (on average) how many input bits were
+wrong (and were corrected), per 1000 input bits (here 1 per 100, lower is better);;
+ * a **MER**, Modulation Error Rate, indicating the quality of the input signal (higher is better);
 
 !6.8(/res/read_me/spectrum-ideal.png)
 
@@ -224,42 +255,47 @@
 
 !6.8(/res/read_me/qt-dab-correlation.png)
 
-The *correlation* scope shows the correlation between the incoming signal and
+The **correlation** scope shows the correlation between the incoming signal and
 predefined  data, i.e. the data as they should be.
-*Correlation* is used in identifying the input sample in the input stream
+**Correlation** is used to identify the input sample in the input stream
 where the (relevant) data of the frame  starts.
 The picture shows three larger peaks, i.e. the signal from
 more than one transmitter is received. 
 The software chooses either the largest one, or - if selected - the
 first one larger than a threshold.
 The picture shows an estimate of the TII numbers near the peaks, it shows
-that "(4, 5) Rotterdan/Celinex toren" (indeed the first and the strongest peak) is chosen by the software as signal source.
+that "(4, 21) Alphen aan den Rijn/Celinex toren" gives the strongest signal/
 
 !6.8(/res/read_me/qt-dab-null-period.png)
 
 A DAB signal is received as a sequence of samples, and can be thought to
-be built up from *frames* (DAB frames),  each frame consisting of 199608 consecutive samples.
-The amplitude of the first app. 2500 samples is (almost) zero, the *NULL*
-period.  The *NULL scope* shows the samples in the transition from the NULL period to
-the first samples *with* data of a DAB frame. It shows that samples 504 and up in the first data block are used.
+be built up from *frames* (DAB frames) where each frame consists of 199608 consecutive samples.
+The **amplitude** of the first app. 2500 samples is (almost) zero, the **NULL**
+period.  The **NULL scope** shows the samples in the transition from the
+**NULL** part to the first samples **with** data of a DAB frame.
+It shows that samples 504 and up in the first data block are used.
 
 !6.8(/res/read_me/qt-dab-tii-data.png)
 
-In reality the NULL period is - in most cases - not completely without signal,
-each second NULL period may contain an encoding of the TII data.
-The *TII scope* shows (part of) the spectrum of the data in the NULL period, the TII data is encoded as a 4 out of 8 code. Indeed, four larger (and four smaller) peaks can be seen in the picture. In this picture the pattern shown is 0x1e.
+In reality the **NULL** period is - in most cases - not completely
+without signal, each second  **NULL period ** may contain
+an encoding of the TII (Transmitter Identification Information) data.
+The **TII scope** shows a condensed form if the spectrum of the data
+in the  relevant **NULL** period, the TII data is encoded as a 4 out of 8 code. Indeed, four larger (and four smaller) peaks can be seen in the picture. In this picture the pattern shown is 0x1e.
 
-This TII data - when decoded leads to two 2 digit numbers -  is used to
-identify the transmitter of the signal received.
+The DAB definition provides tables to map the recognized patterm
+to a two 2 digit number, the latter is used to
+identify the transmitter in a database, available in Qt-DAB.
 
 !6.8(/res/read_me/qt-dab-channel.png)
 
-The picture shows the channel response on the amplitude, and the *red line*, i.e.  the channel effects on the phase of the samples. The picture clearly shows 
-two larger and a few smaller peaks, telling transmitters that are received.
+The picture shows the channel response on the amplitude, and
+the *red line*, i.e. the channel effects on the phase of the samples.
+The picture clearly shows two larger and a few smaller peaks.
 
 !6.8(/res/read_me/qt-dab-stddev.png)
 
-The *deviation scope* shows the mean deviation of the carriers
+The **deviation scope** shows the mean deviation of the carriers
 in the decoded signal, ideally their phase is (a multiple of) 90
 degrees. The phases are mapped upon (soft) bits, the larger the deviations,
 the less reliable these bits are.
@@ -267,15 +303,19 @@
 
 !8.8(/res/read_me/configuration-and-control.png)
 
-The *configuration and control* widget contains checkboxes, spinboxes and
+The **configuration and control** window contains checkboxes, spinboxes and
 buttons with which the configuration of the decoding process can be
 influenced.
 
-NEW is the selector **clear on exit**. If enabled, the scanlist is
+**NEW** is the selector **clear on exit**. If enabled, the scanlist is
 cleared on program exit.
 
-Also new is the selector **local DB**. If enabled on program startup Qt-DAB will
-load the embedded TII database, rather than trying to load a TII database from the user's home directory.
+Also  **new** is the selector **local DB**. If enabled on
+program startup Qt-DAB will load an embedded TII database,
+rather than trying to load a TII database from the user's home directory.
+
+Finally, also **new** is the selector **map close**.
+If enabled, closing the map as sketched before is enabled.
 
 !8.8(/res/read_me/service-and-titles.png)
 
@@ -286,6 +326,9 @@
 The selector labeled **save titles** controls this, the titles - see picture
 above - are stored in a file **DL2_titles.csv** in the Qt-DAB-files directory.
 
+Just as a gadget, the window contains an indicator for the CPU load.
+This load is the overall CPU load, not only the load from running
+Qt-DAB.
 Furthermore, the indicator, left of the CPU load text, here with value 1, tells how many backends are active simultaneously.
 
 For a detailed description of all selectors, see the manual (or read the tooltips).
@@ -293,39 +336,46 @@
 Devices and device support
 ======================================================================
 
-In the current set up, Qt-DAB supports 6 types of (physical) input devices:
+In the current set up, Qt-DAB supports 6 types of (physical) input devices,
+some network input, and file input:
 
-  * SDR DABsticks (RTL2838U or similar), with separate libraries for the V3 and V4 versions of the stick in the precompiled Windows versions, 
-  *  All SDRplay SDR models (RSP I,  RSP 1A and 1B, RSP II, RSP Duo, RSP Dx and RSPDxR2), with separate entries for the v2 and v3 library, New is extended support for the SDRPlay RspDuo. Tuner selection (and tuner 2 is connected to a port with biasT support) is now operational;
-  * HACKRF One, 
-  * Airspy, including Airspy mini (be aware that AirspyHF is **not** able to provide the samplerate required for DAB),
-  * LimeSDR, 
-  * Adalm Pluto,
-  * **untested** UHD (anyone wants to help testing?)
+  * DABsticks (RTL2838U or similar), with separate libraries for the V3 and V4 versions of the stick in the precompiled Windows versions;
+  *  **All** SDRplay SDR models (RSP I,  RSP 1A and 1B, RSP II, RSP Duo, RSP Dx and RSPDxR2), with separate entries for the v2 and v3 library. **New** is extended support for the SDRPlay RspDuo. Tuner selection (and tuner 2 is connected to a port with biasT support) is now operational;
+  * a special entry exists for the **SDRplay RSPDuo**, one for running both tuners simultaneously;
+  * HACKRF One; 
+  * Airspy, including Airspy mini (be aware that AirspyHF is **not** able to provide the samplerate required for DAB);
+  * LimeSDR; 
+  * Adalm Pluto;
+  * **untested** UHD (anyone wants to help testing?).
 
 !6.9(/res/read_me/rtlsdr-control.png?raw=true)
-!6.9(/res/read_me/sdrplay-control.png?raw=true)
+!6.9(/res/read_me/rsp-duocontrol.png?raw=true)
 
-Apart from the untested UHD device, support for these 6 devices is commonly
-included in the precompiled versions.
-It was noted by users that when using the support library for the V4 version of the RTLSDR (aka DABsticks)  devices  with V3 devices  the software was rather deaf.
-To accommodate that, there are **two** precompiled Windows versions,
-one with "built-in" support for the V4 versions, and one supporting the V3 versions of the DAB sticks.
+Apart from the untested UHD device, support for these 6 device types is
+commonly included in the precompiled versions.
+It was noted by users that when using the support library for the V4 version of the RTLSDR (aka DABsticks) devices  with V3 devices  the software seemed rather deaf.
+To accommodate that, there are **two** device entries, 
+one supporting the V3 versions of the DAB sticks, the other for the V4
+versions.
 
 In Qt-DAB the approach is to **dynamically** load the functions from the manufacturer's device library as soon as a device is selected (and not sooner).
-This approach allows  distributing versions that are configured with devices not installed on the user's system.
-(For the Windows version(s), the  device libraries for almost all configured devices are provided in the installer. The exception are the SDRplay and Pluto devices.
+This approach allows distributing versions that are configured with devices not installed on the user's system.
+
+For the Windows version(s), the device libraries for almost all configured devices are provided in the installer. The exception are the SDRplay and Pluto devices.
 For SDRplay devices the user has to install the drivers from the SDRplay site,
 for Pluto support one should see the instructions in "https://github.com/analogdevicesinc/plutosdr-m2k-drivers-win".
 For Linux users, Ubuntu provides the required libraries in a repository (i.e. libii0 and libad9361, for e.g. Fedora the support seems to stop at F33.
 
 Qt-DAB also supports input using a network:
   * an rtl_tcp server connected to an RTLSDR device.
-  * a **spyServer** (both 8 bit and a 16 bit version), i.e. from AIRSpy devices and RTLSDR devices. Note that the AIRspyHF cannot deliver samples at the required samplerate. (Be aware that Qt-DAB processes the input with 2048000 Samples/second. Using the 16 bit version - 4 bytes per sample - requires a bandwidth of at least 8 M. I am using it with a wired connection between two laptops using the 8 bit version, using the WiFi is not likely to be successful).
+  * a **spyServer** (both 8 bit and a 16 bit version), i.e. from AIRSpy devices and RTLSDR devices.
+
+Be aware that Qt-DAB processes the input with 2048000 Samples/second. Using the 16 bit version of the spyServer - 4 bytes per sample - requires a bandwidth of at least 8 M. I am the 8 bit version of the spyServer, as well as
+the rtl_tcp server using it with a wired connection between two laptops, using the WiFi is not very successful.
 
 !6.9(/res/read_me/spy-server16-control.png?raw=true)
 
-Note that - as the control suggests - it is possible to "dump" the unprocessed input to an xml type file (as can be seen on the control picture, the selected samplerate is 2500000).
+Note that - as the control window suggests - it is possible to "dump" the unprocessed input to an xml type file (as can be seen on the control picture, the selected samplerate is 2500000).
 
 Qt-DAB furthermore supports
   * Soapy (Linux only, not included in the AppImage), a renewed Soapy interface driver is even able to handle other samplerates than the required 2048000 (limited to the range 2000000 .. 4000000).
@@ -333,74 +383,43 @@
 !6.9(/res/read_me/soapy-control.png?raw=true)
 
 Qt-DAB obviously supports:
- * reading and writing ".sdr" type files from the input, where ".sdr" type is a form of ".wav" file with IQ samples with fixed inputrate 2048000. Qt-DAB generates such files.  NEW is the ability of Qt-DAB to generate this type of file with a size  **larger than 4 Gb**, their type is BW64. Obviously Qt-DAB has the ability to read such files back.
+ * reading (and writing) ".sdr" type files from the input, where ".sdr" type is a form of ".wav" file with IQ samples with fixed inputrate 2048000. Qt-DAB generates such files. 
+**NEW** is the ability of Qt-DAB to generate this type of file with a size  **larger than 4 Gb**, their type is BW64. Obviously Qt-DAB has the ability to read such files back.
 
 !6.8(/res/read_me/riff-reader-large.png?raw=true)
 !6.8(/res/read_me/riff-reader-small.png?raw=true)
 
-The device widget gives information the "type" of the file i.e. RIFF or BW64.
+The device window gives information on the "type" of the file i.e. RIFF or BW64.
 When reading input from an ".sdr" file that was **generated by Qt-DAB** 
 both the name of the SDR device as well as the channel frequency of the reception is displayed as shown in the pictures above.
 
  * reading prerecorded dump rtlsdr type "raw" (8 bits) files. The RTLSDR device handlers show a button "dump" for dumping the raw input into a ".raw" file.
 
- * reading and writing so-called "xml" files, i.e. a file format preserving the precise structure of the input samples. All device handlers show on their device widget a button to control dumping the unmodified input into an xml file.
+ * reading (and writing) so-called "xml" files, i.e. a file format preserving the precise structure of the input samples. All device handlers show on their device window a button to control dumping the unmodified input into an xml file (e.g. for the Airspy this means with a samplerate of 25000000 or 3000000).
 
 !6.8(/res/read_me/xml-reader.png?raw=true)
 
 
-Tuning accuracy
-=======================================================================
-
-DAB frequencies are in the range of app 175 to 225 MHz. Different devices
-have a different **tuning accurary** in this range. While the different SDRPlay
-and AIRspy devices show a negligible tuning offset (usually 0 to 30 Hz),
-especially the popular DABsticks show - in general - a  offsets in the kHz range.
-
-!6.8(/res/read_me/tuning-offset.png?raw=true)
-
-The picture shows that on selecting channel 12C (22730 kHz) the device
-used - a simple dabstick - shows an offset of 8446 Hz, i.e. well over 
-8 kHz.
-While Qt-DAB is - as the picture shows - capable of compensating for
-tuner offsets of up to app 35 Khz, the **quality of the signal**
-is better with no or a small tuning offset.
-
-The widgets for (most) of the various device handlers show
-a "ppm" correction setting, where "ppm" stands for "Parts per Million".
-Setting the corrector to 1 at a selected frequency of 22730 kHz,
-implies that the oscillator of the device tunes to a frequency
-that is (app) 227 Hz higher.
-
-In this particular care, an offset of app 8.5 kHz on a selected frequency
-of app 227 MHz means an error of 8500 / 227, which is slight more than 37.
-So, setting the **ppm** corrector to 37 in this case causes the device
-to change the frequency such that the frequency the device tuned to
-corresponds almost to the frequency it should be.
-
 Scan control
 =======================================================================
 
-A separate widget - visible under control of the *scan* button on the
-main widget - provides full control on scanning. Qt-DAB provides different scanning modes: scan to data, single scan and scan continuously.
+A separate window - visible under control of the **scan** button on the
+main window - provides full control on scanning. Qt-DAB provides different scanning modes: scan to data, single scan and scan continuously.
 
 !6.8(/res/read_me/scan-widget.png?raw=true)
 
- * With *single scan* a listing is produced of (the contents of) all ensembled encountered (see the picture above);
- * With *scan to data* scanning starts and continues until a channel is detected
-that carries DAB data (or scanning is stopped by touching the *stop* button).
- * With *scan continuously* a single line is shown for each ensemble
-encountered, and - as the name suggests - scanning goes on until stopped
-by the user.
+ * With **single scan**, i.e. a (single) scan over the channels of the band, a listing is produced of (the contents of) all ensembled encountered. In the scan window the channels where data was found, and the transmitters found for these channels, are given, as shown in the above picture.
+ * With **scan to data** scanning starts and continues until a channel is detected that carries DAB data (or scanning is stopped by touching the *stop* button).
+ * With *scan continuously*, i.e. scanning until stopped by the user, a single line is shown for each ensemble encountered, and - as the name suggests - scanning goes on until stopped by the user.
 
-To allow *skipping* given channels when scanning, Qt-DAB supports the notion of a *scantable*, in which channels can be marked for skipping.
+To allow **skipping** given channels when scanning, Qt-DAB supports the notion of a **scantable**, a table in which channels can be marked for skipping.
 Next to a default scantable - which is stored in the users ".ini" file,
 scantables can be created as separate files and read-in when required.
 
-The *show* button controls the visibility of the *scantable*, scantables
+The *show* button controls the visibility of the **scantable**, scantables
 can be loaded and stored in either the ".ini" file (use the "...default" buttons, or can be kept as xml file on a user defined place (the other load/store buttons).
 
-The table at the bottom of the widget is just for convenience, on scanning it displays the channel name being scanned currently, the ensemble name encountered and the number of services detected in the ensemble. Only for *scan single* the
+The table at the bottom of the window is just for convenience, on scanning it displays the channel name being scanned currently, the ensemble name encountered and the number of services detected in the ensemble. Only for *scan single* the
 transmitters that were identified are shown as well.
 
 Displaying TII data
@@ -408,61 +427,75 @@
 
 As mentioned, transmitters (usually) transmit some identifying data, the TII (Transmitter Identification Information) data. Qt-DAB uses a database (gratefully made available by "www.fmList.org") to map the decoded TII data to name and location of the transmitter.
 
-A copy of that database can be loaded by a small utility, a "db-loader",
-precompiled for Windows and Linux-x64.
-The db-loader installs the database, file ".txdata.ti" in the user's home directory, that is where Qt-DAB expects a database - with that name - to be found.
+In recent versions, a copy of that database is part of the precompiled
+versions. The **configuration and control** window contains selector
+that by default is set "on", meaning that on program startup that 
+database is used.
+A **fresh** copy of that database can be installed in the user's home directory
+by a small utility, a **db-loader**, precompiled for Windows and Linux-x64.
+The **db-loader** installs the database, file ".txdata.ti" in the user's home directory, that is where Qt-DAB expects a database - with that name - to be found.
+The **configuration and control** window contains a button to load the
+database from the user's home directory into the program.
 
 !6.9(/res/read_me/db-loader.png?raw=true)
 
-Alternatively (and for other computing environments) one can download a
- reasonably up to date copy of the database from the directory "helpers" in the Qt-DAB repository.
+Alternatively (and for other computing environments) one can **download** a
+ reasonably up to date copy of the database from the directory **helpers**
+in the Qt-DAB repository.
 Unpack the zipped file "tiiFile.zip" and name it ".txdata.tii" in the
 home directory.
 
-As was shown in the correlation view in the spectrum widget,
-one usually receives signals from more than one transmitter.
+As was shown earlier, one usually receives signals from more than
+one transmitter.
 While the line at the bottom on the right half of the Qt-DAB's main
-widget  always shows the currently selected transmitter,
-Qt-DAB can also show data of all identified transmitters on a small separate window (if selected).
+window  always shows the strongest transmitter,
+Qt-DAB can also show data of **all** identified transmitters on a
+small separate window (if selected), the **dxDisplay**.
 
 !6.9(/res/read_me/new-dxDisplay.png?raw=true)
 
 The picture shows that the ensemble, transmitted in channel 12C is "NPO",
-and it shows for each transmitter that was identified some data.
-The first column shows a mark for the strongest (and currently selected) transmitter, the pattern is shown as well as the TII values of the identified transmitters.
-Furthermore, the azimuth and the distance to my home location, the power
-of the transmitter, the altitude (we are in a low-lying part of the country), and the height of the transmitting antenna.
+and it shows for each of the identified transmitters some data.
+The first column shows a mark for the strongest transmitter, the pattern is shown as well as the **TII values** (the mainId, and the subId) of
+the identified transmitters.
+Furthermore, the **azimuth** from and the distance to my home location,
+the power of the transmitter, the altitude (we are in a low-laying part of the country), and the height of the transmitting antenna.
 
-The "compass" shows the direction of the signal from the selected transmitter.
+The **compass** shows the direction of the signal from the strongest
+transmitter.
 
 !6.8(/res/read_me/QTmap.png?raw=true)
 
-Qt-DAB has - on the main widget -  a button labeled *http*,
-when touched, a webserver is initiated that - when running - shows
-the position(s) of the transmitter(s) received on the map. 
-
-Note that two preconditions have to be met:
- * a "home" location has to be known (see the button *coordinates*);
- * a TII database is installed (see the **db-loader** mentioned above).
-
-New in the current version of Qt-DAB is the display - per  transmitter location - of the channels that contain data, together with the TII value (mainId, subId) transmitted from that location.
-Clicking on a transmitterlocation, displays the details of that location, i.e.
-the distance and some data of the transmitters on that location.
+Qt-DAB has as said - on the main window -  a button labeled **http**,
+when touched, a webserver is started  with on it a map centered around the
+home position, that - when running - shows the position(s) of the
+transmitter(s) received. 
+(Note that since recently, Qt-DAB contains a **default** home location -
+somewhere in Amsterdam - that - together with  default database - allows the
+software to handle TII data and show the result of decoding on a map).
+It is advised to update the user's home location, the **configuration
+and control** window contains a button **coordinates** that when touched,
+shows a small menu where latitude and longitude can be filled in).
 
 The picture shows the channels I receive with a simple whip next to my "lazy chair". Of course, using a more advanced antenna. more transmitters show, as seen on the picture below (courtesy of Herman Wijnants)
 
 !6.8(/res/read_me/good-antenna.png?raw=true)
 
 The  webbrowser listens to port 8080. By default, the "standard" browser
-on the system is activated. The *configuration and control* widget
-contains a selector for switching this off, such that one might choose
-one's own browser.
+on the system is activated. The *configuration and control* window
+contains selector changing the port as well as turning the automatic
+activation off.
+
+**NEW** is that on closing the http handler and if on the configuration window
+the checkbix **map close** is selected, the webbrowser closes.
+If one closes the webbrowser, the - the other way around - the http handler
+is closed.
 
 EPG Handling and time tables
 =================================================================
 
 While not here in the Netherlands, in many other countries an ensemble
-contains an *epg* or *spi* service.
+contains an **EPG** or **SPI** service.
 Such a service contains data for service logo's and for  **time tables**.
 If such a service is detected within a handful of seconds after the start of the channel, Qt-DAB will attempt to start the service as background task.
 If the EPG/SPI service was identified late, the service can be started manually and will also run as background task.
@@ -472,8 +505,8 @@
 !6.9(/res/read_me/bbc-3.png?raw=true)
 
 If sufficient data is read in that directory, the software **might** find a service logo and a time table for the selected service.
-The logo - if found - is shown on the main widget (picture above) next to the service name.
-The time table - if found - is made visible by touching the timeTable button on the technical widget.
+The logo - if found - is shown on the main window (picture above) next to the service name.
+The time table - if found - is made visible by touching the timeTable button on the technical window.
 
 !6.9(/res/read_me/timetable.png?raw=true)
 
@@ -481,28 +514,24 @@
 
 !6.9(/res/read_me/timeTable-notfound.png?raw=true)
 
-The timeTable window contains a "next" and "prev" button to scan through different dates. Older pages are not removed by default, selecting a page and touching the "remove" button will remove the currently selected page.
+The timeTable window contains a **next** and **prev** button to scan through different dates. Older pages are not removed by default, selecting a page and touching the "remove" button will remove the currently selected page.
 
 Journaline data
 ================================================================
 
 While not in the region where I live, in some countries (Germany) DAB services are sometimes augmented with Journaline data. This data is - at least in the examples I have - transmitted in a subservice as shown in the picture
-Qt-DAB uses the "NewsService Journaline (R) Decoder" software from Fruanhofer IIS Erlangen (in a slightly modified form (all rights gratefully acknowledged).
+Qt-DAB uses the *NewsService Journaline (R) Decoder* software from Fraunhofer IIS Erlangen in a slightly modified form (all rights gratefully acknowledged).
 
 !6.9(/res/read_me/journaline-1.png?raw=true)
-
-The picture shows that different secondary data services are available, all sharing the same subchannel (channel 14), the one that actually contains the journaline data.
-
-Since it is a secondary **data service**, Qt-DAB automatically activates it (and makes it visible) on starting up the primary service it belongs to.
-
 !6.9(/res/read_me/journaline-2.png?raw=true)
-!6.9(/res/read_me/journaline-3.png?raw=true)
+
+(Categorie names with an asterisks attatched show that new data is available)
 
 Logging errors
 =================================================================
 
-In the latest version, reporting of errors is now done in a systematic
-way. Especially errors with devices (I often get error messages when
+Reporting of errors is now done in a (more or less) systematic way.
+Especially errors with devices (I often get error messages when
 setting gain values in my SDRplay equipment), such as a device that
 does not start properly.
 
@@ -511,9 +540,9 @@
 the precompiled Windows versions is always switched off and
 error messages are "lost".
 
-In the current sources, a class is added to save error messages.
-These messages are written into a file "errorlog.txt" in the
-directory (folder if you wish) "Qt-DAB-files", in the user's home
+A class was added to save error messages. These messages are written
+into a file with the name *errorlog.txt*,  in the
+directory (folder if you wish) *Qt-DAB-files*, in the user's home
 directory.
 
 Error messages take the form 
@@ -526,7 +555,8 @@
 Documentation
 =================================================================
 
-Most selectors on the different windows have a **tool-tip**.
+Most selectors on the various windows have a **tool-tip** that explains
+theur function.
 
 An introductory text, covering the regular use
 is available and includes in the latest **release**.
@@ -534,52 +564,65 @@
 Installation on Windows
 =================================================================
 
-For Windows  *installer*s can be found in the releases section of this repository
+For Windows an  **installer** can be found in the releases section of this repository
  * https://github.com/JvanKatwijk/qt-dab/releases.
+
+Currently, there are two versions, one with the name ending in *-scalar*,
+the other one with the name ending in *-avx*. As mesntioned earlier,
+the suffix tells whether or not *avx2* instructions are used in
+some of the computations or not. Older CPU's do not support these
+instructions.
+
 The installer will install the executable as well as required libraries,
 although for both SDRplay devices (when used) or for the Adam Pluto (when
-used), one has to install libraries from the provider of the device.
-
-:information_source: Note that the device libraries for the SDRplay devices and the Adalm Pluto device library are **NOT** included in the installer, they require - if used - a separate installation. See below for details.
+used), one has to install libraries from the provider of the device (see below).
 
 Installation on Linux-x64
 =================================================================
 
-For Linux-x64 systems, an *appImage* can be found in the releases section of
+For Linux-x64 systems, an **appImage** can be found in the releases section of
 this repository
  * https://github.com/JvanKatwijk/qt-dab/releases.
 
-:information_source:
+As for Windows, two versions are available, one with and one without use of *avx2* instructions.
+
 The appImage contains next to the executable Qt-DAB program, the required interface libraries **but not the support libraries for the configured devices**. If you want to use a physical device - e.g. a DABstick, an SDRplay, or an AIRspy you need to install the driver libraries for the device as well.
 
-For using an SDRplay device one should download the - proprietary - driver software from the SDRplay site. Note that the "old" 2.13 library does not support
-the newer SDRPlay device model such as the SDRPlay 1B. the SDRplayDx
+
+Software for device support
+===========================================================================
+
+For using an **SDRplay** device one should download the - proprietary - driver software from the SDRplay site. Note that while Qt-DAB has a device entry for
+the "old" 2.13 library, that library does not support
+the newer SDRPlay device model such as the SDRPlay 1B, the SDRplayDx
 and the SDRPlay Dx-II. Use the 3.XX library instead.
 The libraries can be found on the website of SDRplay
  * www.sdrplay.com
 
-For using an AIRspy or a Hackrf device, the Ubuntu repository as well as the bullseye repository (for the RPI) provide a working library.
+For using an **AIRspy** or a **Hackrf device** the Windows Installers contain support libraries. For **Linux**, the Ubuntu (and bullseye repository for the RPI)
+the repository contains appropriate software. 
 
-For using an RTLSDR device (a DABstick), the Ubuntu (and bullseye) repositories
-provide a package. However, using that package one needs the
+For using an **RTLSDR device** the Windows Installers contain support libraries.
+For **Linux**, the Ubuntu (and bullseye) repositories do provide a package. However, using that package one needs the
 kernel module to be blacklisted, see e.g.
  * https://www.reddit.com/r/RTLSDR/wiki/blacklist_dvb_usb_rtl28xxu/
 
 Personally, I prefer to build a version of the library myself,  installation is easy, see:
  * "https://osmocom.org/projects/rtl-sdr/wiki".
 
-For using the LimeSDR device I went back to the sources and compiled the
+For using the **LimeSDR device** the Windows Installers contain support libraries.
+For **Linux** I went back to the sources and compiled the
 support library myself, see:
  * "https://wiki.myriadrf.org/Lime_Suite".
 
-For installing the support software for the Adalm Pluto I followed the instructions on
+For installing the support software for the Adalm Pluto for both Windows and
+Linux I followed the instructions on
 
  * "https://wiki.analog.com/university/tools/pluto/users"
 
 Note that Ubuntu releases provide libraries for supporting the Pluto.
 
 Building an executable for Qt-DAB: a few notes
-
 =====================================================================
 
 It is strongly advised to use qmake/make for the compilation process,
@@ -784,7 +827,7 @@
 
 and pass the file on program start-up with the `-A` command line switch. The channel name is just any identifier, the channel frequency is given in kHz. Your SDR device obviously has to support the frequencies for these channels.
 
-Copyright
+Copyright and acknowledgements
 =================================================================
 
 	Copyright (C)  2016 .. 2025
@@ -792,10 +835,20 @@
 	Lazy Chair Computing
 
 	Copyright of libraries used - Qt, qwt, fftw, portaudio,
-	libsamplerate, ;ibusb-1, libfaad, libfdk-aac,
-	- is gratefully acknowledged.
-	
-	Qt-DAB is distributed under e GPL V2 library,  in the hope that
+	libusb-1, libfaad, libfdk-aac, - is gratefully acknowledged.
+
+	In developing Qt-DAB many people have contributed, special thanks
+	to 
+	* Herman Wijnants,
+	* Andreas Mikula,
+	* and Jarod Middelman
+	for continuous feedback and suggestions, and
+
+	* Rolf Zerr (aka old-dab),
+	* Stefan Poeschel,
+	for important code contributions.
+
+	Qt-DAB is distributed under the GPL V2 library, 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

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 \
+	   ./sources/support/scheduler.h \
+	   ./sources/support/schedule-selector.h \
+	   ./sources/support/element-selector.h \
+	   ./sources/support/time-table.h \
+	   ./sources/support/findfilenames.h \
+	   ./sources/support/dl-cache.h \
+	   ./sources/support/content-table.h \
+	   ./sources/support/ITU_Region_1.h \
+	   ./sources/support/coordinates.h \
+	   ./sources/support/skin-handler.h \
+	   ./sources/support/mapport.h \
+	   ./sources/support/bandpass-filter.h \
+	   ./sources/support/fir-filters.h \
+	   ./sources/support/tii-mapper.h \
+	   ./sources/support/tii-reader.h \
+	   ./sources/support/uploader.h \
+	   ./sources/support/basic-print.h \
+	   ./sources/support/gui-elements/position-handler.h \
+	   ./sources/support/gui-elements/settings-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/support/gui-elements/qwt-2.h \
+	   ./sources/devices/riff-writer.h \
+	   ./sources/devices/device-handler.h \
+	   ./sources/devices/device-chooser.h \
+	   ./sources/devices/device-exceptions.h \
+	   ./sources/devices/xml-filewriter.h \
+	   ./sources/devices/filereaders/new-reader/newfiles.h \
+	   ./sources/devices/filereaders/new-reader/new-reader.h \
+	   ./sources/devices/filereaders/new-reader/riff-reader.h \
+	   ./sources/devices/filereaders/rawfiles-new/rawfiles.h \
+	   ./sources/devices/filereaders/rawfiles-new/raw-reader.h \
+	   ./sources/devices/filereaders/xml-filereader/element-reader.h \
+	   ./sources/devices/filereaders/xml-filereader/xml-filereader.h \
+	   ./sources/devices/filereaders/xml-filereader/xml-reader.h \
+	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.h 
+
+FORMS	+= ./sources/main/forms-v7/technical_data.ui
+FORMS	+= ./sources/main/forms-v7/dabradio-6.ui 
+FORMS	+= ./sources/main/forms-v7/config-helper.ui 
+#FORMS	+= ./sources/main/forms-v7/audio-description.ui
+#FORMS	+= ./sources/main/forms-v7/data-description.ui
+FORMS	+= ./sources/main/forms-v7/scopewidget.ui
+FORMS	+= ./sources/main/snr-viewer/snr-widget.ui
+#FORMS	+= ./sources/devices/filereaders/filereader-widget.ui 
+FORMS	+= ./sources/devices/filereaders/xml-filereader/xmlfiles.ui
+
+SOURCES += ./sources/main/main.cpp \
+	   ./sources/main/radio.cpp \
+	   ./sources/main/display-widget.cpp \
+           ./sources/main/scopes/correlation-scope.cpp \
+           ./sources/main/scopes/spectrum-scope.cpp \
+           ./sources/main/scopes/null-scope.cpp \
+           ./sources/main/scopes/channel-scope.cpp \
+           ./sources/main/scopes/dev-scope.cpp \
+           ./sources/main/scopes/waterfall-scope.cpp \
+	   ./sources/main/scopes/iqdisplay.cpp \
+	   ./sources/main/scopes/audio-display.cpp \
+	   ./sources/main/scopes/spectrogramdata.cpp \
+	   ./sources/main/snr-viewer/snr-viewer.cpp \
+	   ./sources/main/copyrightLabel.cpp \
+	   ./sources/main/ensemble-handler.cpp \
+	   ./sources/main/tech-window.cpp \
+	   ./sources/main/config-handler.cpp \
+	   ./sources/main/dxDisplay.cpp \
+	   ./sources/eti-handler/eti-generator.cpp \
+	   ./sources/frontend/ofdm-handler.cpp \
+	   ./sources/frontend/timesyncer.cpp \
+	   ./sources/frontend/sample-reader.cpp \
+	   ./sources/frontend/ofdm-decoder.cpp \
+	   ./sources/frontend/correlator.cpp \
+	   ./sources/frontend/estimator.cpp \
+	   ./sources/frontend/freqsyncer.cpp \
+	   ./sources/frontend/phasetable.cpp \
+	   ./sources/frontend/freq-interleaver.cpp \
+	   ./sources/frontend/tii-detector-1.cpp \
+	   ./sources/frontend/fic-handling/fic-handler.cpp \
+	   ./sources/frontend/fic-handling/ensemble.cpp  \
+	   ./sources/frontend/fic-handling/fib-config.cpp  \
+	   ./sources/frontend/fic-handling/fib-decoder.cpp  \
+	   ./sources/protection/protTables.cpp \
+	   ./sources/protection/protection.cpp \
+	   ./sources/protection/eep-protection.cpp \
+	   ./sources/protection/uep-protection.cpp \
+	   ./sources/backend/msc-handler.cpp \
+	   ./sources/backend/reed-solomon/galois.cpp \
+	   ./sources/backend/reed-solomon/reed-solomon.cpp \
+	   ./sources/backend/backend.cpp \
+           ./sources/backend/backend-driver.cpp \
+           ./sources/backend/backend-deconvolver.cpp \
+	   ./sources/backend/audio/firecode-checker.cpp \
+	   ./sources/backend/audio/mp2processor.cpp \
+	   ./sources/backend/audio/mp4processor.cpp \
+	   ./sources/backend/audio/bitWriter.cpp \
+	   ./sources/backend/data/pad-handler.cpp \
+	   ./sources/backend/data/data-processor.cpp \
+	   ./sources/backend/data/tdc-datahandler.cpp \
+	   ./sources/backend/data/ip-datahandler.cpp \
+	   ./sources/backend/data/adv-datahandler.cpp \
+	   ./sources/backend/data/mot/mot-handler.cpp \
+	   ./sources/backend/data/mot/mot-object.cpp \
+	   ./sources/backend/data/mot/mot-dir.cpp \
+	   ./sources/backend/data/journaline-controller.cpp \
+	   ./sources/backend/data/journaline-datahandler.cpp \
+	   ./sources/backend/data/journaline-screen.cpp \
+	   ./sources/backend/data/journaline/crc_8_16.c \
+	   ./sources/backend/data/journaline/log.c \
+	   ./sources/backend/data/journaline/newssvcdec_impl.cpp \
+	   ./sources/backend/data/journaline/Splitter.cpp \
+	   ./sources/backend/data/journaline/dabdgdec_impl.c \
+	   ./sources/backend/data/journaline/newsobject.cpp \
+	   ./sources/backend/data/journaline/NML.cpp \
+	   ./sources/backend/data/epg/epg-compiler.cpp \
+	   ./sources/backend/data/epg/xml-extractor.cpp \
+	   ./sources/output/converter_48000.cpp \
+	   ./sources/output/audio-player.cpp \
+	   ./sources/support/audiosystem-selector.cpp \
+	   ./sources/support/bandpass-filter.cpp \
+	   ./sources/support/basic-print.cpp \
+	   ./sources/support/charsets.cpp \
+	   ./sources/support/content-table.cpp \
+	   ./sources/support/coordinates.cpp \
+	   ./sources/support/crc-handlers.cpp \
+	   ./sources/support/dab-params.cpp \
+	   ./sources/support/dab-tables.cpp \
+	   ./sources/support/distances.cpp \
+	   ./sources/support/dl2-handler.cpp \
+	   ./sources/support/timetable-control.cpp \
+	   ./sources/support/element-selector.cpp \
+	   ./sources/support/errorlog.cpp \
+	   ./sources/support/fft-handler.cpp \
+	   ./sources/support/findfilenames.cpp \
+	   ./sources/support/fir-filters.cpp \
+	   ./sources/support/http-handler.cpp \
+	   ./sources/support/ITU_Region_1.cpp \
+	   ./sources/support/logger.cpp \
+	   ./sources/support/mapport.cpp \
+	   ./sources/support/scan-handler.cpp \
+	   ./sources/support/scanlist-handler.cpp \
+	   ./sources/support/scantable-handler.cpp \
+	   ./sources/support/scheduler.cpp \
+	   ./sources/support/schedule-selector.cpp \
+	   ./sources/support/skin-handler.cpp \
+	   ./sources/support/tii-mapper.cpp \
+	   ./sources/support/tii-reader.cpp \
+	   ./sources/support/time-converter.cpp \
+	   ./sources/support/time-table.cpp \
+	   ./sources/support/uploader.cpp \
+	   ./sources/support/gui-elements/settings-handler.cpp \
+	   ./sources/support/gui-elements/position-handler.cpp \
+	   ./sources/support/gui-elements/presetcombobox.cpp \
+	   ./sources/support/gui-elements/circular-button.cpp \
+	   ./sources/support/gui-elements/clickable-label.cpp \
+	   ./sources/support/gui-elements/color-selector.cpp \
+	   ./sources/support/gui-elements/font-chooser.cpp \
+	   ./sources/support/gui-elements/icon-label.cpp \
+	   ./sources/support/gui-elements/newpushbutton.cpp \
+	   ./sources/support/gui-elements/normalpushbutton.cpp \
+	   ./sources/support/gui-elements/smallcombobox.cpp \
+	   ./sources/support/gui-elements/smallpushbutton.cpp \
+	   ./sources/support/gui-elements/smallqlistview.cpp \
+	   ./sources/support/gui-elements/smallspinbox.cpp \
+	   ./sources/support/gui-elements/super-frame.cpp \
+	   ./sources/support/gui-elements/verysmallpushbutton.cpp \
+	   ./sources/devices/riff-writer.cpp \
+	   ./sources/devices/device-handler.cpp \
+	   ./sources/devices/device-chooser.cpp \
+	   ./sources/devices/xml-filewriter.cpp \
+	   ./sources/devices/filereaders/rawfiles-new/rawfiles.cpp \
+	   ./sources/devices/filereaders/rawfiles-new/raw-reader.cpp \
+           ./sources/devices/filereaders/new-reader/newfiles.cpp \
+           ./sources/devices/filereaders/new-reader/new-reader.cpp \
+           ./sources/devices/filereaders/new-reader/riff-reader.cpp \
+#	   ./sources/devices/filereaders/wavfiles-new/wavfiles.cpp \
+#	   ./sources/devices/filereaders/wavfiles-new/wav-reader.cpp \
+	   ./sources/devices/filereaders/xml-filereader/xml-filereader.cpp \
+	   ./sources/devices/filereaders/xml-filereader/xml-reader.cpp \
+	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.cpp 
+
+#
+unix {
+DESTDIR		= ./linux-bin
+exists ("./.git") {
+   GITHASHSTRING = $$system(git rev-parse --short HEAD)
+   !isEmpty(GITHASHSTRING) {
+       message("Current git hash = $$GITHASHSTRING")
+       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
+   }
+}
+isEmpty(GITHASHSTRING) {
+    DEFINES += GITHASH=\\\"------\\\"
+}
+mac {
+  DESTDIR      = ./mac-bin
+  PKG_CONFIG = /usr/local/bin/pkg-config
+  QT_CONFIG	-= no-pkg-config
+}
+
+CONFIG		+= link_pkgconfig
+PKGCONFIG	+= libusb-1.0
+!mac {
+LIBS      	+= -ldl
+}
+PKGCONFIG	+= portaudio-2.0
+PKGCONFIG	+= zlib
+#PKGCONFIG	+= sndfile
+#PKGCONFIG	+= samplerate
+INCLUDEPATH	+= /usr/local/include
+
+INCLUDEPATH	+= /usr/local/include
+#correct this for the correct path to the qwt6 library on your system
+#LIBS		+= -lqwt
+equals (QT_MAJOR_VERSION, 6) {
+	 LIBS		+= -lqwt-qt6
+	}else{  LIBS += -lqwt-qt
+	}
+equals (QT_MAJOR_VERSION, 5) {
+   TARGET               = qt-dab-qt5-6.10
+}
+else {
+   TARGET               = qt-dab-qt6-6.10
+}
+
+#mac {
+# Should be possible to make on non Macs as well.
+# qmake -set QMAKEFEATURES /usr/local/Cellar/qwt/6.2.0/features
+CONFIG		+= qwt
+#}
+#CONFIG		+= double
+CONFIG		+= single
+#
+# comment or uncomment for the devices you want to have support for
+# (you obviously have libraries installed for the selected ones)
+CONFIG		+= sdrplay-v2
+CONFIG		+= sdrplay-v3
+CONFIG		+= sdrplay-duo
+CONFIG		+= dabstick
+CONFIG		+= rtl_tcp
+CONFIG		+= airspy
+CONFIG		+= hackrf
+CONFIG		+= lime
+#CONFIG		+= soapy
+#CONFIG		+= pluto-rxtx
+CONFIG		+= pluto
+CONFIG		+= spyServer-16
+CONFIG		+= spyServer-8
+#CONFIG		+= uhd
+#CONFIG		+= faad
+CONFIG		+= fdk-aac
+#very experimental, simple server for connecting to a tdc handler
+#CONFIG		+= datastreamer
+#to handle output of embedded an IP data stream, uncomment
+#CONFIG		+= send_datagram
+
+#if you want to listen remote, uncomment
+#CONFIG		+= tcp-streamer		# use for remote listening
+#otherwise, if you want to use the default, uncomment
+CONFIG		+= local-audio
+
+#CONFIG		+= viterbi-scalar
+#CONFIG		+= viterbi-sse
+CONFIG		+= viterbi-avx2
+#CONFIG		+= spiral-sse
+#CONFIG		+= spiral-no-sse
+#DEFINES	+= SHOW_MISSING
+DEFINES		+= __LOGGING__
+DEFINES		+= __DUMP_SNR__		# for experiments only
+}
+
+# an attempt to have it run under W32 through cross compilation
+win32 {
+exists ("./.git") {
+   GITHASHSTRING = $$system(git rev-parse --short HEAD)
+   !isEmpty(GITHASHSTRING) {
+       message("Current git hash = $$GITHASHSTRING")
+       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
+   }
+}
+isEmpty(GITHASHSTRING) {
+    DEFINES += GITHASH=\\\"------\\\"
+}
+
+#for for 64 bit, only 6.9.6
+        TARGET          = qt6-dab64-6.10
+	DEFINES		+= __BITS64__
+	DESTDIR		=  /d/systems/qt-dab/linux-bin
+#	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
+#	INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt6/qwt
+	INCLUDEPATH	+= /mingw64/include/qwt-qt6
+	LIBS		+= -L/mingw64/lib
+	CONFIG		+= airspy
+	CONFIG		+= dabstick
+	CONFIG          += spyServer-16
+        CONFIG          += spyServer-8
+	CONFIG		+= rtl_tcp
+	CONFIG		+= sdrplay-v2
+	CONFIG		+= sdrplay-v3
+	CONFIG		+= pluto
+	CONFIG		+= hackrf
+	CONFIG		+= lime
+	CONFIG		+= viterbi-scalar
+#	CONFIG		+= spiral-sse
+#	CONFIG		+= spiral-no-sse
+#	CONFIG		+= viterbi-avx2
+#	CONFIG		+= spiral-sse
+	CONFIG		+= double
+#	CONFIG		+= single
+#
+	INCLUDEPATH	+= /usr/local/include
+	LIBS		+= -lportaudio
+	LIBS		+= -lole32
+	LIBS		+= -lwinpthread
+	LIBS		+= -lwinmm
+	LIBS 		+= -lstdc++
+	LIBS		+= -lws2_32
+	LIBS		+= -lusb-1.0
+	LIBS		+= -lz
+#correct this for the correct path to the qwt6 library on your system
+#mingw64 wants the first one, cross compiling mingw64-32 the second one
+#LIBS		+= -lqwt
+	LIBS		+= -lqwt-qt6
+	CONFIG		+= fdk-aac
+#	CONFIG		+= faad
+#
+#very experimental, simple server for connecting to a tdc handler
+#CONFIG		+= datastreamer
+
+#if you want to listen remote, uncomment
+#CONFIG		+= tcp-streamer		# use for remote listening
+#otherwise, if you want to use the default qt way of soud out
+CONFIG		+= local-audio
+#comment both out if you just want to use the "normal" way
+
+DEFINES	+= __DUMP_SNR__		# for experiments only
+}
+
+###	dabstick
+dabstick {
+	DEFINES		+= HAVE_RTLSDR
+	DEFINES		+= HAVE_RTLSDR_V3
+	DEFINES		+= HAVE_RTLSDR_V4
+	DEPENDPATH	+= ./sources/devices/rtlsdr-handler
+	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler
+	HEADERS		+= ./sources/devices/rtlsdr-handler/rtlsdr-handler.h \
+	                   ./sources/devices/rtlsdr-handler/rtl-dongleselect.h
+	SOURCES		+= ./sources/devices/rtlsdr-handler/rtlsdr-handler.cpp \
+	                   ./sources/devices/rtlsdr-handler/rtl-dongleselect.cpp
+	FORMS		+= ./sources/devices/rtlsdr-handler/rtlsdr-widget.ui
+}
+
+#
+#	the SDRplay
+#
+sdrplay-v2 {
+	DEFINES		+= HAVE_SDRPLAY_V2
+	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v2
+	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v2
+	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
+	HEADERS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h \ 
+	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.h 
+	SOURCES		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \ 
+	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.cpp 
+	FORMS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
+}
+#
+#	the SDRplay V3
+#
+sdrplay-v3 {
+	DEFINES		+= HAVE_SDRPLAY_V3
+	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v3
+	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v3 \
+	                   ./sources/devices/sdrplay-handler-v3/include
+        HEADERS         += ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
+                           ./sources/devices/sdrplay-handler-v3/sdrplay-commands.h \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.h \ 
+	                   ./sources/devices/sdrplay-handler-v3/Rsp-device.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.h \
+	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.h
+        SOURCES         += ./sources/devices/sdrplay-handler-v3/Rsp-device.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.cpp \ 
+	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.cpp \
+	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.cpp 
+	FORMS		+= ./sources/devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
+#	LIBS		+= -ldl
+}
+#
+sdrplay-duo {
+	DEFINES		+= HAVE_DUO
+	DEPENDPATH	+= ./sources/devices/sdrplay-handler-duo
+	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-duo \
+	                   ./sources/devices/sdrplay-handler-duo/include
+        HEADERS         += ./sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.h \
+                           ./sources/devices/sdrplay-handler-duo/duo-commands.h 
+        SOURCES         += ./sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.cpp 
+	FORMS		+= ./sources/devices/sdrplay-handler-duo/duo-widget.ui
+#	LIBS		+= -ldl
+}
+#
+#	limeSDR
+#
+lime  {
+	DEFINES		+= HAVE_LIME
+	INCLUDEPATH	+= ./sources/devices/lime-handler
+	DEPENDPATH	+= ./sources/devices/lime-handler
+        HEADERS         += ./sources/devices/lime-handler/lime-handler.h \	
+	                   ./sources/devices/lime-handler/lime-widget.h
+        SOURCES         += ./sources/devices/lime-handler/lime-handler.cpp 
+}
+#
+#	the hackrf
+#
+hackrf {
+	DEFINES		+= HAVE_HACKRF
+	DEPENDPATH	+= ./sources/devices/hackrf-handler 
+	INCLUDEPATH	+= ./sources/devices/hackrf-handler 
+	HEADERS		+= ./sources/devices/hackrf-handler/hackrf-handler.h 
+	SOURCES		+= ./sources/devices/hackrf-handler/hackrf-handler.cpp 
+	FORMS		+= ./sources/devices/hackrf-handler/hackrf-widget.ui
+}
+#
+#
+# airspy support
+#
+
+airspy {
+	DEFINES		+= HAVE_AIRSPY
+	DEPENDPATH	+= ./sources/devices/airspy-handler
+	INCLUDEPATH	+= ./sources/devices/airspy-handler \
+	                   ./sources/devices/airspy-handler/libairspy
+	HEADERS		+= ./sources/devices/airspy-handler/airspy-handler.h \
+	                   ./sources/devices/airspy-handler/airspyselect.h \
+	                   ./sources/devices/airspy-handler/libairspy/airspy.h
+	SOURCES		+= ./sources/devices/airspy-handler/airspy-handler.cpp \
+	                   ./sources/devices/airspy-handler/airspyselect.cpp
+	FORMS		+= ./sources/devices/airspy-handler/airspy-widget.ui
+}
+
+#
+rtl_tcp {
+	DEFINES		+= HAVE_RTL_TCP
+	QT		+= network
+	INCLUDEPATH	+= ./sources/devices/rtl_tcp
+	HEADERS		+= ./sources/devices/rtl_tcp/rtl_tcp_client.h
+	SOURCES		+= ./sources/devices/rtl_tcp/rtl_tcp_client.cpp
+	FORMS		+= ./sources/devices/rtl_tcp/rtl_tcp-widget.ui
+}
+
+soapy {
+	DEFINES		+= HAVE_SOAPY
+	DEPENDPATH	+= ./sources/devices/soapy
+	INCLUDEPATH     += ./sources/devices/soapy
+        HEADERS         += ./sources/devices/soapy/soapy-handler.h \
+	                   ./sources/devices/soapy/soapy-converter.h
+        SOURCES         += ./sources/devices/soapy/soapy-handler.cpp \
+	                   ./sources/devices/soapy/soapy-converter.cpp
+        FORMS           += ./sources/devices/soapy/soapy-widget.ui
+	LIBS		+= -lsamplerate
+	LIBS		+= -lSoapySDR -lm
+}
+
+pluto-rxtx	{
+	DEFINES		+= HAVE_PLUTO_RXTX
+	QT		+= network
+	INCLUDEPATH	+= ./sources/devices/pluto-rxtx
+	INCLUDEPATH	+= ./sources/devices/pluto-rxtx/dab-streamer
+	HEADERS		+= ./sources/devices/pluto-rxtx/dabFilter.h
+	HEADERS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.h 
+	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.h 
+	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.h
+	SOURCES		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.cpp 
+	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.cpp
+	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.cpp
+	FORMS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-widget.ui
+#	LIBS		+= -liio -lad9361
+}
+
+pluto	{
+	DEFINES		+= HAVE_PLUTO
+	QT		+= network
+	INCLUDEPATH	+= ./sources/devices/pluto-handler
+	HEADERS		+= ./sources/devices/pluto-handler/dabFilter.h
+	HEADERS		+= ./sources/devices/pluto-handler/pluto-handler.h
+	SOURCES		+= ./sources/devices/pluto-handler/pluto-handler.cpp
+	FORMS		+= ./sources/devices/pluto-handler/pluto-widget.ui
+}
+
+elad-device	{
+	DEFINES		+= HAVE_ELAD
+	DEPENDPATH	+= ./sources/devices/elad-s1-handler
+	INCLUDEPATH	+= ./sources/devices/elad-s1-handler
+	HEADERS		+= ./sources/devices/elad-s1-handler/elad-handler.h
+	HEADERS		+= ./sources/devices/elad-s1-handler/elad-loader.h
+	HEADERS		+= ./sources/devices/elad-s1-handler/elad-worker.h
+	SOURCES		+= ./sources/devices/elad-s1-handler/elad-handler.cpp
+	SOURCES		+= ./sources/devices/elad-s1-handler/elad-loader.cpp
+	SOURCES		+= ./sources/devices/elad-s1-handler/elad-worker.cpp
+	FORMS		+= ./sources/devices/elad-s1-handler/elad-widget.ui
+}
+
+spyServer-8  {
+	DEFINES		+= HAVE_SPYSERVER_8
+	DEPENDPATH	+= ./sources/devices/spy-server-8
+	INCLUDEPATH	+= ./sources/devices/spy-server-8
+	HEADERS		+= ./sources/devices/spy-server-8/spyserver-protocol.h 
+	HEADERS		+= ./sources/devices/spy-server-8/tcp-client-8.h 
+	HEADERS		+= ./sources/devices/spy-server-8/spy-handler-8.h 
+	HEADERS		+= ./sources/devices/spy-server-8/spyserver-client-8.h
+	SOURCES		+= ./sources/devices/spy-server-8/tcp-client-8.cpp 
+	SOURCES		+= ./sources/devices/spy-server-8/spy-handler-8.cpp 
+	SOURCES		+= ./sources/devices/spy-server-8/spyserver-client-8.cpp 
+	FORMS		+= ./sources/devices/spy-server-8/spyserver-widget-8.ui
+}
+	
+spyServer-16  {
+	DEFINES		+= HAVE_SPYSERVER_16
+	DEPENDPATH	+= ./sources/devices/spy-server-16
+	INCLUDEPATH	+= ./sources/devices/spy-server-16
+	HEADERS		+= ./sources/devices/spy-server-16/spyserver-protocol.h 
+	HEADERS		+= ./sources/devices/spy-server-16/tcp-client.h 
+	HEADERS		+= ./sources/devices/spy-server-16/spy-handler.h 
+	HEADERS		+= ./sources/devices/spy-server-16/spyserver-client.h
+	SOURCES		+= ./sources/devices/spy-server-16/tcp-client.cpp 
+	SOURCES		+= ./sources/devices/spy-server-16/spy-handler.cpp 
+	SOURCES		+= ./sources/devices/spy-server-16/spyserver-client.cpp 
+	FORMS		+= ./sources/devices/spy-server-16/spyserver-widget.ui
+}
+	
+uhd	{
+	DEFINES		+= HAVE_UHD
+	DEPENDPATH	+= ./sources/devices/uhd
+	INCLUDEPATH	+= ./sources/devices/uhd
+	HEADERS		+= ./sources/devices/uhd/uhd-handler.h
+	SOURCES		+= ./sources/devices/uhd/uhd-handler.cpp
+	FORMS		+= ./sources/devices/uhd/uhd-widget.ui
+	LIBS		+= -luhd
+}
+
+colibri	{
+	DEFINES		+= HAVE_COLIBRI
+	DEPENDPATH	+= ./sources/devices/colibri-handler
+	INCLUDEPATH	+= ./sources/devices/colibri-handler
+	HEADERS		+= ./sources/devices/colibri-handler/common.h
+	HEADERS		+= ./sources/devices/colibri-handler/LibLoader.h
+	HEADERS		+= ./sources/devices/colibri-handler/colibri-handler.h
+	SOURCES		+= ./sources/devices/colibri-handler/LibLoader.cpp
+	SOURCES		+= ./sources/devices/colibri-handler/colibri-handler.cpp
+	FORMS		+= ./sources/devices/colibri-handler/colibri-widget.ui
+}
+	
+send_datagram {
+	DEFINES		+= _SEND_DATAGRAM_
+	QT		+= network
+}
+
+tcp-streamer	{
+	DEFINES		+= TCP_STREAMER
+	QT		+= network
+	HEADERS		+= ./sources/output/tcp-streamer.h
+	SOURCES		+= ./sources/output/tcp-streamer.cpp
+}
+
+local-audio {
+	PKGCONFIG	+= portaudio-2.0
+	DEFINES		+= QT_AUDIO
+	QT		+= multimedia 
+
+	equals (QT_MAJOR_VERSION, 5) {
+	INCLUDEPATH	+= ./sources/output/Qt5
+	INCLUDEPATH	+= ./sources/output/portaudio
+	HEADERS		+= ./sources/output/Qt5/Qt-audio.h \	
+	                   ./sources/output/Qt5/Qt-audiodevice.h \
+	                   ./sources/output/portaudio/audiosink.h 
+	SOURCES		+= ./sources/output/Qt5/Qt-audio.cpp \
+	                   ./sources/output/Qt5/Qt-audiodevice.cpp \
+	                   ./sources/output/portaudio/audiosink.cpp 
+	LIBS		+= -lportaudio
+	} else {
+	INCLUDEPATH	+= ./sources/output/Qt6
+	INCLUDEPATH	+= ./sources/output/portaudio
+	HEADERS		+= ./sources/output/Qt6/Qt-audio.h \	
+	                   ./sources/output/Qt6/Qt-audiodevice.h \
+	                   ./sources/output/portaudio/audiosink.h 
+	SOURCES		+= ./sources/output/Qt6/Qt-audio.cpp \
+	                   ./sources/output/Qt6/Qt-audiodevice.cpp \
+	                   ./sources/output/portaudio/audiosink.cpp 
+	LIBS		+= -lportaudio
+	}
+}
+
+datastreamer	{
+	DEFINES		+= DATA_STREAMER
+	DEFINES		+= CLOCK_STREAMER
+	INCLUDEPATH	+= ./sources/server-thread
+	HEADERS		+= ./sources/server-thread/tcp-server.h
+	SOURCES		+= ./sources/server-thread/tcp-server.cpp
+}
+
+viterbi-scalar {
+	DEPENDPATH	+= ./sources/support/viterbi
+	INCLUDEPATH	+= ./sources/support/viterbi
+	HEADERS		+= ./sources/support/viterbi/viterbi.h 
+	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
+}
+
+viterbi-sse {
+	DEPENDPATH	+= ./sources/support/viterbi
+	QMAKE_CFLAGS    +=  -msse4
+	QMAKE_CXXFLAGS  +=  -msse4
+	QMAKE_CFLAGS    +=  -mavx2 
+	QMAKE_CXXFLAGS  +=  -mavx2
+	QMAKE_LFLAGS    +=  -mavx2
+	DEFINES		+= __SSE4_1__
+	DEFINES		+= __ARCH_X86__
+	#DEFINES	+= __ARCH_AARCH64__
+	INCLUDEPATH	+= ./sources/support/viterbi
+	HEADERS		+= ./sources/support/viterbi/viterbi.h 
+	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
+}
+
+viterbi-avx2 {
+	DEPENDPATH	+= ./sources/support/viterbi
+	QMAKE_CFLAGS    +=  -mavx2 
+	QMAKE_CXXFLAGS  +=  -mavx2
+	QMAKE_LFLAGS    +=  -mavx2
+	DEFINES		+= __AVX2__
+	DEFINES		+= __ARCH_X86__
+	#DEFINES	+= __ARCH_AARCH64__
+	INCLUDEPATH	+= ./sources/support/viterbi
+	HEADERS		+= ./sources/support/viterbi/viterbi.h 
+	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
+}
+
+spiral-sse	{
+	DEPENDPATH     +=  ./sources/support/viterbi-spiral 
+	INCLUDEPATH     +=  ./sources/support/viterbi-spiral 
+	DEFINES		+=  SSE_AVAILABLE
+	HEADERS		+= ./sources/support/viterbi-spiral/viterbi.h 
+	SOURCES		+= ./sources/support/viterbi-spiral/viterbi.cpp 
+	HEADERS		+= ./sources/support/viterbi-spiral/spiral-sse.h
+	SOURCES		+= ./sources/support/viterbi-spiral/spiral-sse.c
+}
+
+spiral-no-sse	{
+	DEPENDPATH     +=  ./sources/support/viterbi-spiral 
+	INCLUDEPATH     +=  ./sources/support/viterbi-spiral 
+	DEFINES		+= NO_SSE_AVAILABLE
+	HEADERS		+= ./sources/support/viterbi-spiral/viterbi.h 
+	SOURCES		+= ./sources/support/viterbi-spiral/viterbi.cpp 
+	HEADERS		+= ./sources/support/viterbi-spiral/spiral-no-sse.h
+	SOURCES		+= ./sources/support/viterbi-spiral/spiral-no-sse.c
+}
+
+faad	{
+	DEFINES		+= __WITH_FAAD__
+	HEADERS		+= ./sources/backend/audio/faad-decoder.h 
+	SOURCES		+= ./sources/backend/audio/faad-decoder.cpp 
+	LIBS		+= -lfaad
+}
+
+fdk-aac {
+        DEFINES         += __WITH_FDK_AAC__
+        INCLUDEPATH     += ./helpers/specials/fdk-aac
+        HEADERS         += ./sources/backend/audio/fdk-aac.h
+        SOURCES         += ./sources/backend/audio/fdk-aac.cpp
+unix {
+	LIBS		+= -lfdk-aac
+}
+win32 {
+	LIBS		+= -lfdk-aac-2
+}
+}
+
+mapserver {
+	DEFINES		+= __HAVE_MAP_SERVER__
+}
+
+double	{
+	DEFINES		+= __WITH_DOUBLES__
+	LIBS		+= -lfftw3
+}
+
+single	{
+	LIBS		+= -lfftw3f
+}

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)
+	 my_dataHandler -> add_mscDatagroup (series);
+	 }
+ }
+	 }
+	 series. resize (0);
 	 assembling = false;
 	 return;
 
@@ -242,7 +308,8 @@
 void	dataProcessor::handleRSPacket (const uint8_t *vec) {
 int32_t pLength		= (getBits_2 (vec, 0) + 1) * 24;
 uint16_t address	= getBits (vec, 6, 10);
-//
+
+//	fprintf (stderr, "handling RS\n");
 //	we differentiate between the "data" packets and the "RS" packets
 //
 //	the "order" is first RSDIMS * FRAMESIZE packet elements
@@ -397,3 +464,14 @@
 
 void	dataProcessor::stop	() {}
 
+void	dataProcessor::set_dataTracer	(bool b) {
+	if (b) {
+	 teller = 0;
+	 fouten = 0;
+	 tracer. resize (0);
+	 traceFlag	= true;
+	}
+	else
+	 traceFlag	= false;
+}
+

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;
@@ -188,19 +226,12 @@
 
 void	motObject::handleComplete	() {
 QByteArray result;
-
 	for (const auto &it : motMap)
 	 result. append (it. second);
-//	fprintf (stderr,
-//	"Handling complete %X %s, type %X, dirElement %d\n",
-//	 transportId, name. toLatin1 (). data (),
-//	 (int)contentType,
-//	 dirElement);
-//	if ((name == "") && !dirElement) 
-//	 name = QString::number (get_transportId (), 16);
+	if ((name == "") &!dirElement)
+	 name = QString::number (transportId, 16);
 	if (name != "")
-	 handle_motObject (result, name, (int)contentType,
-	 dirElement, backgroundFlag);
+	 handle_motObject (result, name, (int)contentType, dirElement, SId);
 }
 
 int	motObject::get_headerSize	() {

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,
+	 tabWidget, &QTabWidget::setCurrentIndex);
+//
+	displaySerial	-> setText (getSerial());
+	running. store (false);
+	my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
+
+	dumping. store (false);
+}
+
+	airspyHandler::~airspyHandler () {
+	stopReader ();
+	myFrame. hide ();
+	storeWidgetPosition (airspySettings, &myFrame, AIRSPY_SETTINGS);
+	store (airspySettings, AIRSPY_SETTINGS, TAB_SETTINGS,
+	 tabWidget -> currentIndex ());
+	if (device != nullptr) {
+	 int result = my_airspy_stop_rx (device);
+	 if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airspy_stop_rx() failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+	 }
+
+	 result = my_airspy_close (device);
+	 if (result != AIRSPY_SUCCESS) {
+	 printf ("airspy_close() failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+	 }
+	}
+	my_airspy_exit();
+	theFilter. reset ();
+	if (!xmlWriter. isNull ())
+	 xmlWriter. reset ();
+	delete library_p;
+}
+
+bool	airspyHandler::restartReader	(int32_t freq, int samplesSkipped) {
+int	result;
+//int32_t	bufSize	= EXTIO_NS * EXTIO_BASE_TYPE_SIZE * 2;
+
+	if (running. load())
+	 return true;
+
+	lastFrequency	= freq;
+	this	-> toSkip = samplesSkipped;
+	QString key	= QString (TAB_SETTINGS) + "-"
+	 + QString::number (freq / MHz (1));
+	int tab		= value_i (airspySettings, AIRSPY_SETTINGS, key, 0);
+	tabWidget -> blockSignals (true);
+ new_tabSetting (tab);
+ while (tabWidget -> currentIndex () != tab) 
+ usleep (1000);
+ tabWidget -> blockSignals (false);
+//
+//	sliders are now set,
+	result = my_airspy_set_freq (device, freq);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
+	}
+	result = my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
+	 return false;
+	}
+
+	result = my_airspy_start_rx (device,
+	 (airspy_sample_block_cb_fn)callback, this);
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name((airspy_error)result));
+	 return false;
+	}
+//
+//	Hier moeten we de tab en gain weer zetten
+	restore_gainSliders (freq / MHz (1), tab);
+	restore_gainSettings (tab);
+	showStatus (QString ("Restart at ") +
+	 QString::number (freq / 1000) + QString ("Khz"));
+	_I_Buffer. FlushRingBuffer ();
+//
+	running. store (true);
+	return true;
+}
+
+void	airspyHandler::stopReader() {
+int	result;
+
+	if (!running. load())
+	 return;
+
+	close_xmlDump ();
+	QString key = QString (TAB_SETTINGS) + "-" 
+	 + QString::number (lastFrequency / MHz (1));
+	store (airspySettings, AIRSPY_SETTINGS, key, tabWidget -> currentIndex ());
+	record_gainSettings (lastFrequency / MHz (1), 
+	 tabWidget -> currentIndex ());
+	result = my_airspy_stop_rx (device);
+
+	if (result != AIRSPY_SUCCESS ) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
+	}
+	running. store (false);
+	resetBuffer ();
+}
+//
+//	Directly copied from the airspy extio dll from Andrea Montefusco
+int airspyHandler::callback (airspy_transfer* transfer) {
+airspyHandler *p;
+
+	if (!transfer)
+	 return 0;		// should not happen
+	p = static_cast<airspyHandler *> (transfer -> ctx);
+
+// we read AIRSPY_SAMPLE_INT16_IQ:
+	int32_t bytes_to_write = transfer -> sample_count * sizeof (int16_t) * 2; 
+	uint8_t *pt_rx_buffer = (uint8_t *)transfer->samples;
+	p -> data_available (pt_rx_buffer, bytes_to_write);
+	return 0;
+}
+
+//	called from AIRSPY data callback
+//	2*2 = 4 bytes for sample, as per AirSpy USB data stream format
+//	Rate conversion is done using the samplerate library
+//	with a selectable "quality level"
+int 	airspyHandler::data_available (void *buf, int buf_size) {	
+int16_t	*sbuf	= (int16_t *)buf;
+int nSamples	= buf_size / (sizeof (int16_t) * 2);
+std::complex<float> temp SAMPLERATE / 1000;
+
+	if (dumping. load ())
+	 xmlWriter -> add ((std::complex<int16_t> *)sbuf, nSamples);
+	if (convQuality_setter -> value () != filterDepth) {
+	 filterDepth = convQuality_setter -> value ();
+	 theFilter -> resize (filterDepth);
+	 store (airspySettings, AIRSPY_SETTINGS,
+ CONV_QUALITY, filterDepth);
+	}
+
+	for (int i = 0; i < nSamples; i ++) {
+	 convBuffer convIndex ++ = theFilter -> Pass (
+ std::complex<float> (
+ sbuf 2 * i / (float)2048,
+ sbuf 2 * i + 1 / (float)2048));
+
+	 if (convIndex > convBufferSize) {
+	 for (int j = 0; j < SAMPLERATE / 1000; j ++) {
+	 int16_t inpBase = mapTable_int j;
+	 float inpRatio = mapTable_float j;
+	 temp j = convBuffer inpBase + 1 * inpRatio +
+	 convBuffer inpBase * (1 - inpRatio);
+	 }
+	 if (toSkip > 0)
+	 toSkip -= SAMPLERATE / 1000;
+	 else
+	 _I_Buffer. putDataIntoBuffer (temp, SAMPLERATE / 1000);
+//	shift the sample at the end to the beginning, it is needed
+//	as the starting sample for the next time
+	 convBuffer 0 = convBuffer convBufferSize;
+	 convIndex = 1;
+ }
+	}
+	return 0;
+}
+//
+const char *airspyHandler::getSerial () {
+airspy_read_partid_serialno_t read_partid_serialno;
+int result = my_airspy_board_partid_serialno_read (device,
+	 &read_partid_serialno);
+	if (result != AIRSPY_SUCCESS) {
+	 theErrorLogger-> add ("Airspy",
+	 my_airspy_error_name ((airspy_error)result));
+	 return "UNKNOWN";
+	} else {
+	 snprintf (serial, sizeof(serial), "%08X%08X", 
+	 read_partid_serialno. serial_no 2,
+	 read_partid_serialno. serial_no 3);
+	}
+	return serial;
+}
+//
+//	not used here
+int	airspyHandler::open() {
+	return 0;
+}
+
+//
+//	These functions are added for the SDR-J interface
+void	airspyHandler::resetBuffer	() {
+	_I_Buffer. FlushRingBuffer	();
+}
+
+int16_t	airspyHandler::bitDepth		() {
+	return 13;
+}
+
+int32_t	airspyHandler::getSamples (std::complex<float> *v, int32_t size) {
+	return _I_Buffer. getDataFromBuffer (v, size);
+}
+
+int32_t	airspyHandler::Samples		() {
+	return _I_Buffer. GetRingBufferReadAvailable();
+}
+//
+const char* airspyHandler::board_id_name() {
+uint8_t bid;
+
+	if (my_airspy_board_id_read (device, &bid) == AIRSPY_SUCCESS)
+	 return my_airspy_board_id_name ((airspy_board_id)bid);
+	else
+	 return "UNKNOWN";
+}
+//
+bool	airspyHandler::load_airspyFunctions() {
+//
+//	link the required procedures
+	my_airspy_init	= (pfn_airspy_init)
+	 library_p -> resolve ("airspy_init");
+	if (my_airspy_init == nullptr) {
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_init");
+	 return false;
+	}
+
+	my_airspy_exit	= (pfn_airspy_exit)
+	 library_p -> resolve ("airspy_exit");
+	if (my_airspy_exit == nullptr) {
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_exit");
+	 return false;
+	}
+
+	my_airspy_list_devices	= (pfn_airspy_list_devices)
+	 library_p -> resolve ("airspy_list_devices");
+	if (my_airspy_list_devices == nullptr) {
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_list_devices");
+	 return false;
+	}
+	
+	my_airspy_open	= (pfn_airspy_open)
+	 library_p -> resolve ("airspy_open");
+	if (my_airspy_open == nullptr) {
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_open");
+	 return false;
+	}
+
+	my_airspy_close	= (pfn_airspy_close)
+	 library_p -> resolve ("airspy_close");
+	if (my_airspy_close == nullptr) {
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_close");
+	 return false;
+	}
+
+	my_airspy_get_samplerates	= (pfn_airspy_get_samplerates)
+	 library_p -> resolve ("airspy_get_samplerates");
+	if (my_airspy_get_samplerates == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_get_samplerates");
+	 return false;
+	}
+
+	my_airspy_set_samplerate	= (pfn_airspy_set_samplerate)
+	 library_p -> resolve ("airspy_set_samplerate");
+	if (my_airspy_set_samplerate == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_set_samplerate");
+	 return false;
+	}
+
+	my_airspy_start_rx	= (pfn_airspy_start_rx)
+	 library_p -> resolve ("airspy_start_rx");
+	if (my_airspy_start_rx == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_start_rx");
+	 return false;
+	}
+
+	my_airspy_stop_rx	= (pfn_airspy_stop_rx)
+	 library_p -> resolve ("airspy_stop_rx");
+	if (my_airspy_stop_rx == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_stop_rx");
+	 return false;
+	}
+
+	my_airspy_set_sample_type	= (pfn_airspy_set_sample_type)
+	 library_p -> resolve ("airspy_set_sample_type");
+	if (my_airspy_set_sample_type == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_set_sample_type");
+	 return false;
+	}
+
+	my_airspy_set_freq	= (pfn_airspy_set_freq)
+	 library_p -> resolve ("airspy_set_freq");
+	if (my_airspy_set_freq == nullptr) {
+	 theErrorLogger -> add ("Airspy", "Could not find airspy_set_freq");
+	 return false;
+	}
+
+	my_airspy_set_lna_gain	= (pfn_airspy_set_lna_gain)
+	 library_p -> resolve ("airspy_set_lna_gain");
+	if (my_airspy_set_lna_gain == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_set_lna_gain");
+	 return false;
+	}
+
+	my_airspy_set_mixer_gain	= (pfn_airspy_set_mixer_gain)
+	 library_p -> resolve ("airspy_set_mixer_gain");
+	if (my_airspy_set_mixer_gain == nullptr) {
+	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_mixer_gain");
+	 return false;
+	}
+
+	my_airspy_set_vga_gain	= (pfn_airspy_set_vga_gain)
+	 library_p -> resolve ("airspy_set_vga_gain");
+	if (my_airspy_set_vga_gain == nullptr) {
+	 theErrorLogger -> add ("Airspy",
+	 "Could not find airspy_set_vga_gain");
+	 return false;
+	}
+	
+	my_airspy_set_linearity_gain = (pfn_airspy_set_linearity_gain)
+	 library_p -> resolve ("airspy_set_linearity_gain");
+	if (my_airspy_set_linearity_gain == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_set_linearity_gain"\
+	 "You probably did install an old library\n");
+	 return false;
+	}
+
+	my_airspy_set_sensitivity_gain = (pfn_airspy_set_sensitivity_gain)
+	 library_p -> resolve ("airspy_set_sensitivity_gain");
+	if (my_airspy_set_sensitivity_gain == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_set_sensitivity_gain"\
+	 "You probably did install an old library\n");
+	 return false;
+	}
+
+	my_airspy_set_lna_agc	= (pfn_airspy_set_lna_agc)
+	 library_p -> resolve ("airspy_set_lna_agc");
+	if (my_airspy_set_lna_agc == nullptr) {
+	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_lna_agc");
+	 return false;
+	}
+
+	my_airspy_set_mixer_agc	= (pfn_airspy_set_mixer_agc)
+	 library_p -> resolve ("airspy_set_mixer_agc");
+	if (my_airspy_set_mixer_agc == nullptr) {
+	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_mixer_agc");
+	 return false;
+	}
+
+	my_airspy_set_rf_bias	= (pfn_airspy_set_rf_bias)
+	 library_p -> resolve ("airspy_set_rf_bias");
+	if (my_airspy_set_rf_bias == nullptr) {
+	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_rf_bias");
+	 return false;
+	}
+
+	my_airspy_error_name	= (pfn_airspy_error_name)
+	 library_p -> resolve ("airspy_error_name");
+	if (my_airspy_error_name == nullptr) {
+	 theErrorLogger-> add ("Airspy", "Could not find airspy_error_name");
+	 return false;
+	}
+
+	my_airspy_board_id_read	= (pfn_airspy_board_id_read)
+	 library_p -> resolve ("airspy_board_id_read");
+	if (my_airspy_board_id_read == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_board_id_read");
+	 return false;
+	}
+
+	my_airspy_board_id_name	= (pfn_airspy_board_id_name)
+	 library_p -> resolve ("airspy_board_id_name");
+	if (my_airspy_board_id_name == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_board_id_name");
+	 return false;
+	}
+
+	my_airspy_board_partid_serialno_read	=
+	 (pfn_airspy_board_partid_serialno_read)
+	 library_p -> resolve ("airspy_board_partid_serialno_read");
+	if (my_airspy_board_partid_serialno_read == nullptr) {
+	 theErrorLogger-> add ("Airspy",
+	 "Could not find airspy_board_partid_serialno_read");
+	 return false;
+	}
+
+	return true;
+}
+
+//int	airspyHandler::getBufferSpace	() {
+//	return _I_Buffer. GetRingBufferWriteAvailable ();
+//}
+
+QString	airspyHandler::deviceName	() {
+	return QString ("AIRspy :") + QString (getSerial ());
+}
+
+void	airspyHandler::set_xmlDump () {
+	if (xmlWriter. isNull ()) {
+	 setup_xmlDump (false);
+	}
+	else {
+	 close_xmlDump ();
+	}
+}
+
+void	airspyHandler::startDump	() {
+	setup_xmlDump (true);
+}
+
+void	airspyHandler::stopDump	() {
+	close_xmlDump	();
+}
+
+bool	airspyHandler::setup_xmlDump (bool direct) {
+QString channel		= value_s (airspySettings, DAB_GENERAL,
+	 "channel", "xx");
+	try {
+	 xmlWriter. reset (new xml_fileWriter (airspySettings,
+	 channel,
+	 12,
+	 "int16",
+	 selectedRate,
+	 lastFrequency,
+	 -1,
+	 "Airspy",
+	 getSerial (),
+	 recorderVersion,
+	 direct));
+	} catch (...) {
+	 return false;
+	}
+	dumping. store (true);
+	dumpButton	-> setText ("writing");
+	return true;
+}
+
+void	airspyHandler::close_xmlDump () {
+	if (xmlWriter. isNull ())	// this can happen !!
+	 return;
+	dumping. store (false);
+	usleep (1000);
+	xmlWriter	-> computeHeader ();
+	dumping. store (false);
+	dumpButton	-> setText ("Dump");
+	xmlWriter. reset ();
+}
+//
+//	gain settings are maintained on a per-channel and per tab base,
+//	Values are recorded on both switching tabs and changing channels
+void	airspyHandler::record_gainSettings	(int freq, int tab) {
+QString	res;
+QString key;
+
+	key		= QString::number (freq) + "-"
+	 + QString::number (tab);
+	switch (tab) {
+	 case 0:	// sensitity screen is on
+	 res = QString::number (sensitivitySlider -> value ());
+	 break;
+	 case 1:	// linearity screen is on
+	 res = QString::number (linearitySlider -> value ());
+	 break;
+	 case 3:	// classic screen
+	 default:
+	 res = QString::number (vgaSlider -> value ());
+	 res = res + ":" + QString::number (mixerSlider -> value ());
+	 res = res + ":" + QString::number (lnaSlider -> value ());
+	 break;
+	}
+
+	res	= res + ":" + QString::number (lnaButton -> isChecked ());
+	res	= res + ":" + QString::number (mixerButton -> isChecked ());
+	res	= res + ":" + QString::number (biasButton -> isChecked ());
+
+	store (airspySettings, AIRSPY_SETTINGS, key, res);
+}
+//
+//	When starting a channel, the gain sliders from the previous
+//	time that channel was the current channel, are restored
+//	Note that the device settings are NOT yet updated
+void	airspyHandler::restore_gainSliders	(int freq, int tab) {
+int	lna	= 0;
+int	mixer	= 0;
+int	bias	= 0;
+QString key	= QString::number (freq) + "-" + QString::number (tab);
+QString	def	= "";
+
+	QString gainValues =
+	 value_s (airspySettings, AIRSPY_SETTINGS, key, def);
+	if (gainValues == "") { // we create default values
+	 if ((tab == 0) || (tab == 1)) {
+	 gainValues = "10:0:0:0";
+	 }
+	 else
+	 gainValues = "10:10:10:0:0:0";	
+	}
+	QStringList list = gainValues. split (":");
+	switch (tab) {
+	 case 0:
+	 disconnect (sensitivitySlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_sensitivity);
+	 sensitivitySlider -> setValue (list. at (0). toInt ());
+	 connect (sensitivitySlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_sensitivity);
+	 lna	= list. at (1). toInt ();
+	 mixer	= list. at (2). toInt ();
+	 bias	= list. at (3). toInt ();
+	 break;
+	 case 1:
+	 disconnect (linearitySlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_linearity);
+	 linearitySlider -> setValue (list. at (0). toInt ());
+	 connect (linearitySlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_linearity);
+	 lna	= list. at (1). toInt ();
+	 mixer	= list. at (2). toInt ();
+	 bias	= list. at (3). toInt ();
+	 break;
+
+	 default:	// classic view
+	 disconnect (vgaSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_vga_gain);
+	 disconnect (mixerSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_mixer_gain);
+	 disconnect (lnaSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_lna_gain);
+	 vgaSlider		-> setValue (list. at (0). toInt ());
+	 mixerSlider	-> setValue (list. at (1). toInt ());
+	 lnaSlider		-> setValue (list. at (2). toInt ());
+	 connect (vgaSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_vga_gain);
+	 connect (mixerSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_mixer_gain);
+	 connect (lnaSlider, &QSlider::valueChanged,
+	 this, &airspyHandler::set_lna_gain);
+	 lna	= list. at (3). toInt ();
+	 mixer	= list. at (4). toInt ();
+	 bias	= list. at (5). toInt ();
+	}
+//
+//	Now the agc settings
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	disconnect (lnaButton, &QCheckBox::checkStateChanged,
+#else
+	disconnect (lnaButton, &QCheckBox::stateChanged,
+#endif
+	 this, &airspyHandler::set_lna_agc);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	disconnect (mixerButton, &QCheckBox::checkStateChanged,
+#else
+	disconnect (mixerButton, &QCheckBox::stateChanged,
+#endif
+	 this, &airspyHandler::set_mixer_agc);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	disconnect (biasButton, &QCheckBox::checkStateChanged,
+#else
+	disconnect (biasButton, &QCheckBox::stateChanged,
+#endif
+	 this, &airspyHandler::set_rf_bias);
+	if (lna != 0)
+	 lnaButton	-> setChecked (true);
+	if (mixer != 0)
+	 mixerButton	-> setChecked (true);
+	if (bias != 0)
+	 biasButton	-> setChecked (true);
+#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);
+}
+
+void	airspyHandler::restore_gainSettings	(int tab) {
+	switch (tab) {
+	 case 0:	//sensitivity
+	 set_sensitivity (sensitivitySlider -> value ());
+	 break;
+	 case 1:	// linearity
+	 set_linearity (linearitySlider -> value ());
+	 break;
+	 case 2:	// classic view
+	 default:
+	 set_lna_gain	(lnaSlider	-> value ());
+	 set_mixer_gain	(mixerSlider	-> value ());
+	 set_vga_gain	(vgaSlider	-> value ());
+	 break;
+	}
+	if (lnaButton -> isChecked ()) 
+	 set_lna_agc (1);
+	if (mixerButton -> isChecked ())
+	 set_mixer_agc (1);
+	if (biasButton -> isChecked ())
+	 set_rf_bias (1);
+}
+
+void	airspyHandler::switch_tab (int t) {
+	record_gainSettings (lastFrequency / MHz (1),
+	 tabWidget -> currentIndex ());
+	tabWidget -> blockSignals (true);
+	new_tabSetting	(t);
+ while (tabWidget -> currentIndex () != t)
+ usleep (1000);
+ tabWidget -> blockSignals (false);
+	store (airspySettings, AIRSPY_SETTINGS, TAB_SETTINGS, t);
+	restore_gainSliders (lastFrequency / MHz (1), t);
+	restore_gainSettings (t);
+}
+
+#define GAIN_COUNT (22)
+
+uint8_t airspy_linearity_vga_gainsGAIN_COUNT = { 13, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 8, 7, 6, 5, 4 };
+uint8_t airspy_linearity_mixer_gainsGAIN_COUNT = { 12, 12, 11, 9, 8, 7, 6, 6, 5, 0, 0, 1, 0, 0, 2, 2, 1, 1, 1, 1, 0, 0 };
+uint8_t airspy_linearity_lna_gainsGAIN_COUNT = { 14, 14, 14, 13, 12, 10, 9, 9, 8, 9, 8, 6, 5, 3, 1, 0, 0, 0, 0, 0, 0, 0 };
+uint8_t airspy_sensitivity_vga_gainsGAIN_COUNT = { 13, 12, 11, 10, 9, 8, 7, 6, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4 };
+uint8_t airspy_sensitivity_mixer_gainsGAIN_COUNT = { 12, 12, 12, 12, 11, 10, 10, 9, 9, 8, 7, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0 };
+uint8_t airspy_sensitivity_lna_gainsGAIN_COUNT = { 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 12, 9, 9, 8, 7, 6, 5, 3, 2, 1, 0 };
+
+void	airspyHandler::set_linearity (int value) {
+int	result = my_airspy_set_linearity_gain (device, value);
+int	temp;
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_lna_gain() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	 return;
+	}
+	linearityDisplay	-> display (value);
+	temp	= airspy_linearity_lna_gains GAIN_COUNT - 1 - value;
+	linearity_lnaDisplay	-> display (temp);
+	temp	= airspy_linearity_mixer_gains GAIN_COUNT - 1 - value;
+	linearity_mixerDisplay	-> display (temp);
+	temp	= airspy_linearity_vga_gains GAIN_COUNT - 1 - value;
+	linearity_vgaDisplay	-> display (temp);
+}
+
+void	airspyHandler::set_sensitivity (int value) {
+int	result = my_airspy_set_sensitivity_gain (device, value);
+int	temp;
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	 return;
+	}
+	sensitivityDisplay	-> display (value);
+	temp	= airspy_sensitivity_lna_gains GAIN_COUNT - 1 - value;
+	sensitivity_lnaDisplay	-> display (temp);
+	temp	= airspy_sensitivity_mixer_gains GAIN_COUNT - 1 - value;
+	sensitivity_mixerDisplay	-> display (temp);
+	temp	= airspy_sensitivity_vga_gains GAIN_COUNT - 1 - value;
+	sensitivity_vgaDisplay	-> display (temp);
+}
+
+//	Original functions from the airspy extio dll
+/* Parameter value shall be between 0 and 15 */
+void	airspyHandler::set_lna_gain (int value) {
+int result = my_airspy_set_lna_gain (device, lnaGain = value);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_lna_gain() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	}
+	else
+	 lnaDisplay	-> display (value);
+}
+
+/* Parameter value shall be between 0 and 15 */
+void	airspyHandler::set_mixer_gain (int value) {
+int result = my_airspy_set_mixer_gain (device, mixerGain = value);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	}
+	else
+	 mixerDisplay	-> display (value);
+}
+
+/* Parameter value shall be between 0 and 15 */
+void	airspyHandler::set_vga_gain (int value) {
+int result = my_airspy_set_vga_gain (device, vgaGain = value);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_vga_gain() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	}
+	else
+	 vgaDisplay	-> display (value);
+}
+//
+//	agc's
+/* Parameter value:
+	0=Disable LNA Automatic Gain Control
+	1=Enable LNA Automatic Gain Control
+*/
+void	airspyHandler::set_lna_agc	(int dummy) {
+	(void)dummy;
+	lna_agc	= lnaButton	-> isChecked ();
+	int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_lna_agc() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	}
+}
+
+/* Parameter value:
+	0=Disable MIXER Automatic Gain Control
+	1=Enable MIXER Automatic Gain Control
+*/
+void	airspyHandler::set_mixer_agc	(int dummy) {
+	(void)dummy;
+	mixer_agc	= mixerButton -> isChecked ();
+
+int result = my_airspy_set_mixer_agc (device, mixer_agc ? 1 : 0);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf ("airspy_set_mixer_agc() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	}
+}
+
+/* Parameter value shall be 0=Disable BiasT or 1=Enable BiasT */
+void	airspyHandler::set_rf_bias (int dummy) {
+	(void)dummy;
+	rf_bias	= biasButton -> isChecked ();
+int result = my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
+
+	if (result != AIRSPY_SUCCESS) {
+	 showStatus (my_airspy_error_name ((airspy_error)result));
+	 printf("airspy_set_rf_bias() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+	}
+}
+
+void	airspyHandler::showStatus	(const QString s) {
+	statusLabel -> setText (s);
+}
+

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">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="linearity_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="linearity_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="linearity_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_8">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>60</y>
+ <width>91</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna gain</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_9">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>80</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mixer gain</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_10">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>100</y>
+ <width>71</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>vga gain</string>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>classic view</string>
+ </attribute>
+ <widget class="QSlider" name="lnaSlider">
+ <property name="geometry">
+ <rect>
+ <x>80</x>
+ <y>10</y>
+ <width>201</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>15</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>66</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="lnaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>290</x>
+ <y>10</y>
+ <width>51</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QSlider" name="mixerSlider">
+ <property name="geometry">
+ <rect>
+ <x>80</x>
+ <y>40</y>
+ <width>201</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>15</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="mixerDisplay">
+ <property name="geometry">
+ <rect>
+ <x>290</x>
+ <y>40</y>
+ <width>51</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>40</y>
+ <width>66</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mixer</string>
+ </property>
+ </widget>
+ <widget class="QSlider" name="vgaSlider">
+ <property name="geometry">
+ <rect>
+ <x>80</x>
+ <y>70</y>
+ <width>201</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>15</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_3">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>70</y>
+ <width>66</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>vga</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="vgaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>290</x>
+ <y>70</y>
+ <width>51</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="lnaButton">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>121</y>
+ <width>81</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="mixerButton">
+ <property name="geometry">
+ <rect>
+ <x>110</x>
+ <y>121</y>
+ <width>101</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mixer </string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="biasButton">
+ <property name="geometry">
+ <rect>
+ <x>200</x>
+ <y>121</y>
+ <width>101</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>bias</string>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ <widget class="QLabel" name="displaySerial">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>60</y>
+ <width>361</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_4">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>141</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>A I R S P Y handler</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="dumpButton">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>20</y>
+ <width>104</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the airspy 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>
+ <widget class="QSpinBox" name="convQuality_setter">
+ <property name="geometry">
+ <rect>
+ <x>300</x>
+ <y>20</y>
+ <width>91</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality level for samplerate conversion. Note that AN airSPY DEVICE emits either 2.5 Ms/s or 3 Ms/s and we need 2048000, so samplerate conversion is required.&lt;/p&gt;&lt;p&gt;For the Down sampling we use the &amp;quot;libsamplerate&amp;quot; library (all rights reserved) and that library provides a choice between 5 quality levels.&lt;/p&gt;&lt;p&gt;Level 0 - the default here - is merely a linear interpolation, level 4is based on sinc interpolation and pretty good. Of course, higher quality requires more computation. Levels 2 and 3 work fine, level 4 might require too much cpu cycles, resulting in data loss,&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>11</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ <widget class="QLabel" name="statusLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>201</width>
+ <height>18</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>statusLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="samplerateLabel">
+ <property name="geometry">
+ <rect>
+ <x>230</x>
+ <y>90</y>
+ <width>141</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>rate</string>
+ </property>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

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>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
 <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QLabel" name="modulationtypeLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="iqOrderLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="containerLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="byteOrderLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="typeofUnitLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="iqOrderLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
 </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>nrBits</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>nrElements</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>samplerate</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>frequency</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="deviceGainLabel">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
 </item>
 <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QLCDNumber" name="nrBitsDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of bits recorded&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLCDNumber" name="nrElementsDisplay">
- <property name="digitCount">
- <number>10</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLCDNumber" name="samplerateDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sampling rate in Hz (normally 2048000 Hz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="digitCount">
- <number>8</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLCDNumber" name="frequencyDisplay">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Initial frequency of the recorded ensemble (in kHz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="digitCount">
- <number>8</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- </item>
- </layout>
+ <spacer name="horizontalSpacer">
+ <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="label_5">
+ <property name="text">
+ <string>startpoint</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="startpoint">
+ <property name="text">
+ <string>start</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>nrBits</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="nrBitsDisplay">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>nrElements</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="nrElementsDisplay">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>samplerate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="samplerateDisplay">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>frequency</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="frequencyDisplay">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
 </item>
 </layout>
 </item>

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>
 </item>
 <item>
- <widget class="QLabel" name="statusLabel">
- <property name="text">
- <string>status</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="statusLabel">
+ <property name="text">
+ <string>status</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </widget>

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);
+	uint64_t theSize	= riffSize;
+	fprintf (stderr, "riffSize = %ld, bytes %ld\n", 
+	 riffSize, nrBytes);
+	uint32_t sizeLow	= theSize & 0xFFFFFFFF;
+	uint32_t sizeHigh	= (theSize >> 32) & 0xFFFFFFFF;
+	uint32_t nrBytesLow	= nrBytes & 0xFFFFFFFF;
+	uint32_t nrBytesHigh	= (nrBytes >> 32) & 0xFFFFFFFF;
+	fwrite (&sizeLow, 1, 4, filePointer);
+	fwrite (&sizeHigh, 1, 4, filePointer);
+	fwrite (&nrBytesLow, 1, 4, filePointer);
+	fwrite (&nrBytesHigh, 1, 4, filePointer);
+	fseek (filePointer, 0, SEEK_END);
+	
+	fclose (filePointer);
+}
+
+void	riffWriter::write (int16_t *buff, uint64_t samples) {
+	if (!isValid)
+	 return;
+	fwrite (buff, 2 * sizeof (int16_t), (size_t)samples, filePointer);
+	nrElements	+= samples;
+}
+
+bool	riffWriter::isActive	() {
+	return isValid;
+}
+

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 @@
 
 void	rtl_tcp_client::setBiasT (int biast) {
 	biasT = biasTSelector -> isChecked () ? 1 : 0;
+	store (remoteSettings, RTL_TCP_SETTINGS, "biasT", biasT);
 	sendCommand (0x0e, biast);
 }
 
@@ -322,11 +355,25 @@
 
 void	rtl_tcp_client::setPort (int port) {
 	basePort = port;
+	store (remoteSettings, RTL_TCP_SETTINGS, "basePort", basePort);
 }
 
 void	rtl_tcp_client::setAddress () {
-	addressSelector -> setInputMask ("000.000.000.000");
+//	addressSelector -> setInputMask ("000.000.000.000");
 	ipAddress = addressSelector -> text ();
+	fprintf (stderr, "ipAddress %s\n", ipAddress. toLatin1 (). data ());
+}
+
+void	rtl_tcp_client::set_agc_hw () {
+	setAgcMode (0);
+}
+
+void	rtl_tcp_client::set_agc_sw () {
+	setAgcMode (2);
+}
+
+void	rtl_tcp_client::set_agc_off () { 
+	setAgcMode (1);
 }
 
 void	rtl_tcp_client::setDisconnect () {
@@ -339,7 +386,7 @@
 	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, "AgcMode", agcMode);
 	store (remoteSettings, RTL_TCP_SETTINGS, "biasT", biasT);
 	toServer. close ();
 	connected = false;

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	=
+	 value_i (rtlsdrSettings, storageName, "bandwidth", 1750);
+	bandwidth_selector	-> setValue (currentBandWidth);
+	
+	if (rtlsdr_set_tuner_bandwidth != nullptr) {
+	 r = rtlsdr_set_tuner_bandwidth (theDevice, KHz (currentBandWidth));
+	 if (r != 0) {
+	 QString t = QString ("cannot set frequency ") +
+	 QString::number (currentBandWidth);
+	 theErrorLogger -> add ("RTLSDR", t);
+	 }
+	}
+//
+//	we use the tickSignal as time counter (to update some info)
+	connect (this, &rtlsdrHandler::tickSignal,
+	 this, &rtlsdrHandler::handle_tickSignal);
+//	See what the saved values are and restore the GUI settings
+	temp = value_s (rtlsdrSettings, storageName,
+	 "externalGain", "10");
+	k	= gainControl -> findText (temp);
+	gainControl	-> setCurrentIndex (k != -1 ? k : gainsCount / 2);
+
+	int agc = value_i (rtlsdrSettings, storageName, "agcMode", 1);
+ init_autogain (agc);
+	
+	ppm_correction	-> 
+	 setValue (value_i (rtlsdrSettings, storageName,
+	 "ppm_correction", 0));
+	save_gainSettings	=
+	 value_i (rtlsdrSettings, storageName,
+	 "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
+	connect (gainControl,
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
+	 qOverload<const QString &>(&QComboBox::textActivated),
+#else
+	 qOverload<const QString &>(&QComboBox::activated),
+#endif
+	 this, &rtlsdrHandler::set_ExternalGain);
+	connect (ppm_correction, qOverload<double>(&QDoubleSpinBox::valueChanged),
+	 this, &rtlsdrHandler::set_ppmCorrection);
+	connect (agc_hw, &QRadioButton::toggled,
+ this, &rtlsdrHandler::set_hw_agc);
+ connect (agc_sw, &QRadioButton::toggled,
+ this, &rtlsdrHandler::set_sw_agc);
+ connect (agc_off, &QRadioButton::toggled,
+ this, &rtlsdrHandler::set_off_agc);
+	connect (xml_dumpButton, &QPushButton::clicked,
+	 this, &rtlsdrHandler::set_xmlDump);
+	connect (iq_dumpButton, &QPushButton::clicked,
+	 this, &rtlsdrHandler::set_iqDump);
+#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
+	connect (biasControl, &QCheckBox::checkStateChanged,
+#else
+	connect (biasControl, &QCheckBox::stateChanged,
+#endif
+	 this, &rtlsdrHandler::set_biasControl);
+//
+//	and for saving/restoring the gain setting:
+	connect (this, &rtlsdrHandler::new_gainIndex,
+	 gainControl, &QComboBox::setCurrentIndex);
+	connect (bandwidth_selector, &QSpinBox::valueChanged,
+	 this, &rtlsdrHandler::set_bandWidth);
+	iqDumper	= nullptr;
+	xmlWriter	= nullptr;
+	iq_dumping. store (false);
+	xml_dumping. store (false);
+	workerHandle	= nullptr;
+}
+
+	rtlsdrHandler::~rtlsdrHandler () {
+	stopReader	();
+
+	if (workerHandle != nullptr) {
+	 rtlsdr_cancel_async (theDevice);
+	 while (!workerHandle -> isFinished ())
+	 usleep (200);
+	 _I_Buffer. FlushRingBuffer();
+ delete workerHandle;
+ workerHandle = nullptr;
+// rtlsdr_close (theDevice); // will crash if activated
+ }
+
+	storeWidgetPosition (rtlsdrSettings, &myFrame, storageName);
+	QString gainText	= gainControl -> currentText ();
+	store (rtlsdrSettings, storageName, "externalGain", gainText);
+	int agc = agc_off -> isChecked () ? 1 :
+ agc_sw -> isChecked () ? 2 : 0;
+ store (rtlsdrSettings, storageName, "agcMode", agc);
+	store (rtlsdrSettings, storageName,
+	 "ppm_correction", ppm_correction -> value());
+	rtlsdrSettings	-> sync ();
+	if (xmlWriter != nullptr) {
+	 delete xmlWriter;
+	 xmlWriter = nullptr;
+	}
+	myFrame. hide ();
+	usleep (1000);
+	rtlsdr_close (theDevice);
+	delete phandle;
+}
+
+//
+bool	rtlsdrHandler::restartReader	(int32_t freq, int skipped) {
+	int res = this -> rtlsdr_set_center_freq (theDevice, freq);
+	if (res != 0) {
+ QString t = QString ("Cannot set frequency to ") +
+ QString::number (freq);
+ theErrorLogger -> add ("RTLSDR", t);
+ return false;
+ }
+
+	if (save_gainSettings)
+	 update_gainSettings (freq / MHz (1));
+
+	lastFrequency	= freq;
+	this -> toSkip = skipped;
+	set_ExternalGain (gainControl -> currentText ());
+	tunedFrequency	-> setText ("Tuned to " + QString::number(freq / KHz (1)) + " kHz");
+	if (workerHandle == nullptr) {	// usualy it will be non zero
+//	reset endpoint
+	 (void)this -> rtlsdr_reset_buffer (theDevice);
+	 workerHandle	= new dll_driver (this);
+	}
+	_I_Buffer. FlushRingBuffer ();
+	isActive. store (true);
+	return true;
+}
+
+void	rtlsdrHandler::stopReader () {
+	isActive. store (false);
+ _I_Buffer.FlushRingBuffer ();
+ close_xmlDump();
+	if (save_gainSettings)
+	 record_gainSettings	((int32_t)(this -> rtlsdr_get_center_freq (theDevice)) / MHz (1));
+}
+//
+//	when selecting the gain from a table, use the table value
+void	rtlsdrHandler::set_ExternalGain	(const QString &gain) {
+	int res = rtlsdr_set_tuner_gain (theDevice, gain. toInt());
+	if (res != 0) {
+	 QString t = QString ("Cannot set gain to ") +
+	 QString::number (gain. toInt ());
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
+}
+//
+void	rtlsdrHandler::init_autogain	(int level) {
+	if (level == 1)
+ agc_off -> setChecked (true);
+ else
+ if (level == 2)
+ agc_sw -> setChecked (true);
+ else // level == 0
+ agc_hw -> setChecked (true);
+
+ set_autogain (level);
+}
+
+void	rtlsdrHandler::set_hw_agc	() {
+	set_autogain (0);
+}
+
+void	rtlsdrHandler::set_sw_agc	() {
+	set_autogain (2);
+}
+
+void	rtlsdrHandler::set_off_agc	() {
+	set_autogain (1);
+}
+
+void	rtlsdrHandler::set_autogain (int level) {
+	rtlsdr_set_agc_mode (theDevice, level == 0);
+	rtlsdr_set_tuner_gain_mode (theDevice, level);
+	if (level == 1) {
+	 gainControl -> setEnabled (true);
+	 set_ExternalGain (gainControl -> currentText ());
+	}
+	else
+	 gainControl -> setEnabled (false);
+}
+//
+void	rtlsdrHandler::set_biasControl	(int dummy) {
+	(void)dummy;
+	if (rtlsdr_set_bias_tee != nullptr) {
+	 int res = rtlsdr_set_bias_tee (theDevice,
+	 biasControl -> isChecked () ? 1 : 0);
+	 if (res != 0) {
+	 QString t = QString ("Cannot set bias tee to ") +
+	 (biasControl -> isChecked () ? "1" : "0");
+	 theErrorLogger -> add ("RTLSDR", t);
+	 }
+	}
+}
+//	correction is in Hz
+void	rtlsdrHandler::set_ppmCorrection	(double ppm) {
+int res;
+ if (rtlsdr_set_freq_correction_ppb != nullptr)
+ res = this -> rtlsdr_set_freq_correction_ppb (theDevice, ppm * 1000);
+ else
+ res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
+
+	if (res != 0) {
+	 QString t = QString ("Cannot set ppm to ") +
+	 QString::number (ppm);
+	 theErrorLogger -> add ("RTLSDR", t);
+	}
+}
+
+int32_t	rtlsdrHandler::getSamples (std::complex<float> *V, int32_t size) { 
+	if (!isActive. load ())
+	 return 0;
+	return _I_Buffer. getDataFromBuffer (V, size);
+}
+
+int32_t	rtlsdrHandler::Samples () {
+	if (!isActive. load ())
+	 return 0;
+	return _I_Buffer. GetRingBufferReadAvailable ();
+}
+//
+//
+bool	rtlsdrHandler::load_rtlFunctions() {
+//
+//	link the required procedures
+	rtlsdr_open	= (pfnrtlsdr_open) phandle -> resolve ("rtlsdr_open");
+	if (rtlsdr_open == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_open\n");
+	 return false;
+	}
+
+	rtlsdr_close	= (pfnrtlsdr_close) phandle -> resolve ("rtlsdr_close");
+	if (rtlsdr_close == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_close\n");
+	 return false;
+	}
+
+	rtlsdr_get_usb_strings =
+	 (pfnrtlsdr_get_usb_strings)
+	 phandle -> resolve ("rtlsdr_get_usb_strings");
+	if (rtlsdr_get_usb_strings == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_usb_strings\n");
+	 return false;
+	}
+
+	rtlsdr_set_sample_rate =
+	 (pfnrtlsdr_set_sample_rate)
+	 phandle -> resolve ("rtlsdr_set_sample_rate");
+	if (rtlsdr_set_sample_rate == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_set_sample_rate\n");
+	 return false;
+	}
+
+	rtlsdr_get_sample_rate	=
+	 (pfnrtlsdr_get_sample_rate)
+	 phandle -> resolve ("rtlsdr_get_sample_rate");
+	if (rtlsdr_get_sample_rate == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_sample_rate\n");
+	 return false;
+	}
+
+	rtlsdr_get_tuner_gains	=
+	 (pfnrtlsdr_get_tuner_gains)
+	 phandle -> resolve ("rtlsdr_get_tuner_gains");
+	if (rtlsdr_get_tuner_gains == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gains\n");
+	 return false;
+	}
+
+	rtlsdr_get_tuner_type	=
+	 (pfnrtlsdr_get_tuner_type)
+	 phandle -> resolve ("rtlsdr_get_tuner_type");
+	if (rtlsdr_get_tuner_type == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_tuner_type\n");
+	 return false;
+	}
+
+	rtlsdr_set_tuner_gain_mode	=
+	 (pfnrtlsdr_set_tuner_gain_mode)
+	 phandle -> resolve ("rtlsdr_set_tuner_gain_mode");
+	if (rtlsdr_set_tuner_gain_mode == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_set_tuner_gain_mode\n");
+	 return false;
+	}
+
+	rtlsdr_set_agc_mode	=
+	 (pfnrtlsdr_set_agc_mode)
+	 phandle -> resolve ("rtlsdr_set_agc_mode");
+	if (rtlsdr_set_agc_mode == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_set_agc_mode\n");
+	 return false;
+	}
+
+	rtlsdr_set_tuner_gain	=
+	 (pfnrtlsdr_set_tuner_gain)
+	 phandle -> resolve ("rtlsdr_set_tuner_gain");
+	if (rtlsdr_set_tuner_gain == nullptr) {
+	 fprintf (stderr, "Cound not find rtlsdr_set_tuner_gain\n");
+	 return false;
+	}
+
+	rtlsdr_get_tuner_gain	=
+	 (pfnrtlsdr_get_tuner_gain)
+	 phandle -> resolve ("rtlsdr_get_tuner_gain");
+	if (rtlsdr_get_tuner_gain == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gain\n");
+	 return false;
+	}
+
+	rtlsdr_set_center_freq	=
+	 (pfnrtlsdr_set_center_freq)
+	 phandle -> resolve ("rtlsdr_set_center_freq");
+	if (rtlsdr_set_center_freq == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_set_center_freq\n");
+	 return false;
+	}
+
+	rtlsdr_get_center_freq	=
+	 (pfnrtlsdr_get_center_freq)
+	 phandle -> resolve ("rtlsdr_get_center_freq");
+	if (rtlsdr_get_center_freq == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_center_freq\n");
+	 return false;
+	}
+
+	rtlsdr_reset_buffer	=
+	 (pfnrtlsdr_reset_buffer)
+	 phandle -> resolve ("rtlsdr_reset_buffer");
+	if (rtlsdr_reset_buffer == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_reset_buffer\n");
+	 return false;
+	}
+
+	rtlsdr_read_async	=
+	 (pfnrtlsdr_read_async)
+	 phandle -> resolve ("rtlsdr_read_async");
+	if (rtlsdr_read_async == nullptr) {
+	 fprintf (stderr, "Cound not find rtlsdr_read_async\n");
+	 return false;
+	}
+
+	rtlsdr_get_device_count	=
+	 (pfnrtlsdr_get_device_count)
+	 phandle -> resolve ("rtlsdr_get_device_count");
+	if (rtlsdr_get_device_count == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_device_count\n");
+	 return false;
+	}
+
+	rtlsdr_cancel_async	=
+	 (pfnrtlsdr_cancel_async)
+	 phandle -> resolve ("rtlsdr_cancel_async");
+	if (rtlsdr_cancel_async == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_cancel_async\n");
+	 return false;
+	}
+
+	rtlsdr_set_direct_sampling =
+	 (pfnrtlsdr_set_direct_sampling)
+	 phandle -> resolve ("rtlsdr_set_direct_sampling");
+	if (rtlsdr_set_direct_sampling == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_set_direct_sampling\n");
+	 return false;
+	}
+
+	rtlsdr_set_freq_correction =
+	 (pfnrtlsdr_set_freq_correction)
+	 phandle -> resolve ("rtlsdr_set_freq_correction");
+//	if (rtlsdr_set_freq_correction == nullptr) {
+//	 fprintf (stderr, "Could not find rtlsdr_set_freq_correction\n");
+//	 return false;
+//	}
+
+	rtlsdr_get_tuner_i2c_register =
+	 (pfnrtlsdr_get_tuner_i2c_register)
+	 phandle -> resolve ("rtlsdr_get_tuner_i2c_register");
+	if (rtlsdr_get_tuner_i2c_register == nullptr) {
+//	nullpointer - if function is not available - is handled
+	}
+	
+	rtlsdr_get_device_name =
+	 (pfnrtlsdr_get_device_name)
+	 phandle -> resolve ("rtlsdr_get_device_name");
+	if (rtlsdr_get_device_name == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_get_device_name\n");
+	 return false;
+	}
+
+//	Optional function, null pointer is handled
+	rtlsdr_set_tuner_bandwidth	=
+	 (pfnrtlsdr_set_tuner_bandwidth)
+	 phandle -> resolve ("rtlsdr_set_tuner_bandwidth");
+	if (rtlsdr_set_tuner_bandwidth == nullptr) {
+	 fprintf (stderr, "No tuner bandwidth selector\n");
+//	 nullpointer - if function is not available - is handled
+	}
+
+//	Optional function, null pointer is handled
+	rtlsdr_set_bias_tee =
+	 (pfnrtlsdr_set_bias_tee)
+	 phandle -> resolve ("rtlsdr_set_bias_tee");
+//	if (rtlsdr_set_bias_tee == nullptr)
+//	 fprintf (stderr, "biasControl will not work\n");
+//	nullpointer - if function is not available - is handled
+//
+	rtlsdr_set_freq_correction_ppb =
+	 (pfnrtlsdr_set_freq_correction_ppb)
+	 phandle -> resolve ("rtlsdr_set_freq_correction_ppb");
+
+//	Optional function, null pointer is handled
+	rtlsdr_get_version =
+	 (pfnrtlsdr_get_version)
+	 phandle -> resolve ("rtlsdr_get_version");
+
+	fprintf (stderr, "OK, functions seem to be loaded\n");
+	return true;
+}
+
+void	rtlsdrHandler::resetBuffer() {
+	_I_Buffer. FlushRingBuffer();
+}
+
+int16_t	rtlsdrHandler::maxGain() {
+	return gainsCount;
+}
+
+int16_t	rtlsdrHandler::bitDepth() {
+	return 8;
+}
+
+QString	rtlsdrHandler::deviceName	() {
+	return deviceModel;
+}
+
+void	rtlsdrHandler::set_iqDump	() {
+	if (xmlWriter != nullptr)
+	 return;
+	if (iqDumper == nullptr) {
+	 if (setup_iqDump ()) {
+	 xml_dumpButton	-> hide ();
+	 }
+	}
+	else {
+	 close_iqDump ();
+	 xml_dumpButton	-> show ();
+	}
+}
+
+bool	rtlsdrHandler::setup_iqDump () {
+	QString fileName = QFileDialog::getSaveFileName (nullptr,
+	 tr ("Save file ..."),
+	 QDir::homePath (),
+	 "raw (*.raw)");
+	fileName = QDir::toNativeSeparators (fileName);
+	iqDumper	= fopen (fileName. toUtf8 (). data (), "wb");
+	if (iqDumper == nullptr)
+	 return false;
+	iq_dumpButton	-> setText ("writing raw file");
+	iq_dumping. store (true);
+	return true;
+}
+
+void	rtlsdrHandler::close_iqDump () {
+	if (iqDumper == nullptr)	// this can happen !!
+	 return;
+	iq_dumping. store (false);
+	fclose (iqDumper);
+	iq_dumpButton	-> setText ("Dump to raw");
+	iqDumper	= nullptr;
+}
+	 
+void	rtlsdrHandler::set_xmlDump () {
+	if (iqDumper != nullptr)
+	 return;
+	if (!xml_dumping. load ()) {
+	 if (setup_xmlDump (false)) 
+	 iq_dumpButton	-> hide	();
+	}
+	else {
+	 close_xmlDump ();
+	 iq_dumpButton	-> show	();
+	}
+}
+
+void	rtlsdrHandler::startDump	() {
+	setup_xmlDump (true);
+	iq_dumpButton	-> hide ();
+}
+
+void	rtlsdrHandler::stopDump		() {
+	close_xmlDump	();
+	iq_dumpButton	-> show ();
+}
+
+bool	rtlsdrHandler::setup_xmlDump (bool direct) {
+QString channel		= value_s (rtlsdrSettings, "dab-general",
+	 "channel", "xx");
+
+	if (xmlWriter != nullptr)
+	 return false;
+	try {
+	 xmlWriter	= new xml_fileWriter (rtlsdrSettings,
+	 channel,
+	 8,
+	 "uint8",
+	 SAMPLERATE,
+	 lastFrequency,
+	 rtlsdr_get_tuner_gain (theDevice),
+	 "RTLSDR",
+	 deviceModel,
+	 recorderVersion,
+	 direct);
+	} catch (...) {
+	 return false;
+	}
+	xml_dumpButton	-> setText ("writing xml file");
+	xml_dumping. store (true);
+	return true;
+}
+	
+void	rtlsdrHandler::close_xmlDump () {
+	if (xmlWriter == nullptr)
+	 return;
+	usleep (1000);
+	xmlWriter	-> computeHeader ();
+	delete xmlWriter;
+	xmlWriter	= nullptr;
+	xml_dumpButton	-> setText ("Dump to xml");
+	xml_dumping. store (false);
+}
+
+////////////////////////////////////////////////////////////////////////
+//
+// the frequency (the MHz component) is used as key
+//
+void rtlsdrHandler::record_gainSettings (int freq) {
+QString	gain	= gainControl	-> currentText ();
+int agc = agc_off -> isChecked () ? 1 :
+ agc_sw -> isChecked () ? 2 : 0;
+QString theValue = gain + ":" + QString::number (agc);
+QString freqVal		= QString::number (freq);
+	store (rtlsdrSettings, storageName, freqVal, theValue);
+}
+
+void	rtlsdrHandler::update_gainSettings (int freq) {
+int	agc;
+QString	theValue	= "";
+QString freqVal		= QString::number (freq);
+	theValue	= value_s (rtlsdrSettings, storageName,
+	 freqVal, theValue);
+
+	if (theValue == QString (""))
+	 return;		// or set some defaults here
+
+	QStringList result	= theValue. split (":");
+	if (result. size () != 2) 	// should not happen
+	 return;
+
+	QString temp = result. at (0);
+	agc	= result. at (1). toInt ();
+
+	int k	= gainControl -> findText (temp);
+	if (k != -1) {
+	 gainControl	-> setEnabled (false);
+	 new_gainIndex (k);
+	 while (gainControl -> currentText () != temp)
+	 usleep (1000);
+	}
+	if (agc == 1) {
+	 gainControl -> setEnabled (true);
+	 agc_off	-> setEnabled (false);
+	 agc_off	-> setChecked (true);
+	 agc_off	-> setEnabled (true);
+	}
+	else
+	if (agc == 0) {
+	 agc_hw	-> setEnabled (false);
+	 agc_hw	-> setChecked (true);
+	 agc_hw	-> setEnabled (true);
+	}
+	else {	// agc == 2
+	 agc_sw	-> setEnabled (false);
+	 agc_sw	-> setChecked (true);
+	 agc_sw	-> setEnabled (true);
+	}
+}
+
+#define	IQ_BUFSIZE	4096
+void	rtlsdrHandler::processBuffer (uint8_t *buf, uint32_t len) {
+float	sumI	= 0;
+float	sumQ	= 0;
+int	nrSamples	= len / 2;
+auto	*tempBuf 	= dynVec (std::complex<float>, nrSamples);
+static uint8_t dumpBuffer 2 * IQ_BUFSIZE;
+static int iqTeller	= 0;
+static int teller	= 0;
+	if (!isActive. load ()) 
+	 return;
+
+	if (toSkip > 0) {
+	 toSkip -= len / 2;
+	 return;
+	}
+	if (xml_dumping. load ())
+	 xmlWriter -> add ((std::complex<uint8_t> *)buf, nrSamples);
+
+	if (iq_dumping. load ()) {
+	 for (int32_t i = 0; i < nrSamples; i ++) {
+	 dumpBuffer 2 * iqTeller	= buf 2 * i;
+	 dumpBuffer 2 * iqTeller + 1 = buf 2 * i + 1;
+	 iqTeller ++;
+	 if (iqTeller >= IQ_BUFSIZE) {
+	 fwrite (dumpBuffer, 2, IQ_BUFSIZE, iqDumper);
+	 iqTeller = 0;
+	 }
+	 }
+	}
+	for (int32_t i = 0; i < nrSamples; i ++) {
+	 teller ++;
+	 float tempI	= convTable buf 2 * i;
+	 float tempQ	= convTable buf 2 * i + 1;
+	 sumI		+= tempI;
+	 sumQ		+= tempQ;
+	 tempBuf i = std::complex<float> (tempI, tempQ);
+	}
+// calculate correction values for next input buffer
+	int ovf	= _I_Buffer. GetRingBufferWriteAvailable () - nrSamples;
+	if (ovf < 0)
+	 (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples + ovf);
+	else
+	 (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples);
+
+	if (++teller >= 2048000) {
+	 emit tickSignal (ovf < 0);
+	 teller = 0;
+	}
+}
+
+QString	rtlsdrHandler::get_tunerType	(int tunerType) {
+	switch (tunerType) {
+	 case RTLSDR_TUNER_E4000:
+	 return "E4000";
+	 case RTLSDR_TUNER_FC0012:
+	 return "FC0012";
+	 case RTLSDR_TUNER_FC0013:
+	 return "FC0013";
+	 case RTLSDR_TUNER_FC2580:
+	 return "FC2580";
+	 case RTLSDR_TUNER_R820T:
+	 return "R820T";
+	 break;
+	 case RTLSDR_TUNER_R828D:
+	 return "R828D";
+	 default:
+	 return "unknown";
+	}
+}
+
+void	rtlsdrHandler::handle_tickSignal (bool ovf) {
+	reportOverflow (ovf);
+	
+	if (rtlsdr_get_tuner_i2c_register == nullptr) 
+	 return;
+	reportGain ();
+}
+
+void	rtlsdrHandler::reportOverflow (bool ovf) {
+static bool theOvf	= true;
+	if (ovf && !theOvf){
+	 overflowLabel -> setText ("Overload");
+ overflowLabel -> setStyleSheet (
+	 "QLabel {background-color : red; color: white}");
+	 theOvf	= true;
+	}
+	else
+	if (!ovf && theOvf) {		
+	 overflowLabel -> setText (" ");
+	 overflowLabel -> setStyleSheet("QLabel {background-color : green; \
+ color: white}");
+	 theOvf	= false;
+	}
+	else
+	 theOvf = ovf;
+}
+
+void	rtlsdrHandler::reportGain () {
+	uint8_t data 192;
+	int32_t	reg_len;
+	int32_t tuner_gain;
+	int32_t result;
+
+	result = rtlsdr_get_tuner_i2c_register (theDevice, data,
+	 &reg_len, &tuner_gain);
+	if (result != 0) 
+	 return;
+
+	tuner_gain = (tuner_gain + 5) / 10;
+	if (previousGain != tuner_gain) {
+//	 if (agcControl)
+	 tunerGainLabel -> setText(QString::number(tuner_gain) + " dB");
+//	 else
+//	 tunerGain->setText("unknown");
+	 previousGain = tuner_gain;
+	}
+}
+
+void	rtlsdrHandler::set_bandWidth (int bW) { 
+	if (rtlsdr_set_tuner_bandwidth == nullptr)
+	 return;
+	store (rtlsdrSettings, storageName, "bandwidth", bW);
+	rtlsdr_set_tuner_bandwidth (theDevice, bW * 1000);
+} 
+

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>
+ </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/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

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;
-
-	 DABFLOAT rightBit	= - b2 * scaler;
-	 limit_symmetrically (rightBit, MAX_VITERBI);
-	 softbits carriers + i = (int16_t)rightBit;
-
-	 sum		+= abs (Complex (b1, b2));
-	 }
+//	map the fft output onto bits ("carrier" elements in, 2 * softbits out)
+	switch (this -> decoder) {
+	 case DECODER_1:
+	 sum	= decoder_12 (fft_buffer, softbits,
+	 snr, 1, clockError);
+	 break;
+	 case DECODER_2:
+	 sum	= decoder_12 (fft_buffer, softbits,
+	 snr, 2, clockError);
+	 break;
+	 default:
+	 case DECODER_3:
+	 sum	= decoder_3 (fft_buffer, softbits,
+	 snr, clockError);
+	 break;
+	 case DECODER_4:
+	 sum	= decoder_4 (fft_buffer, softbits, snr);
+	 break;
 	}
 
-//	avgBit		= compute_avg (avgBit, bitSum / carriers, 0.1);
 	meanValue	= compute_avg (meanValue, sum /carriers, 0.1);
 	
 //		end of decoding	, now for displaying things	//
@@ -508,4 +405,225 @@
 void	ofdmDecoder::handle_decoderSelector	(int decoder) {
 	this	-> decoder	= decoder;
 }
+//
+//	The various actual decoders
+static inline
+Complex toQ1	(const Complex f) {
+	return Complex (real (f) >= 0 ? real (f) : - real (f),
+	 imag (f) >= 0 ? imag (f) : - imag (f));
+}
+
+DABFLOAT ofdmDecoder::decoder_12 (const std::vector<Complex> &fft_buffer,
+	 std::vector<int16_t> &softbits,
+	 DABFLOAT	snr,
+	 int		decType,
+	 float		clockError) {
+DABFLOAT sum	= 0;
+DABFLOAT corrFact	= (decType == 1) ? 1.5 : 1.0;
+DABFLOAT levelFact	= (decType == 1) ? 140.0 : 100.0;
+
+//
+//	Note for the reader
+//	Some cheap datsticks show a - sometime pretty large - clock offset.
+//	indicating that the samplerate is slightly off.
+//	We show the samplerate offset already for a long time,
+//	old-dab suggested - in a version derived from Qt-DAB - to compensate
+//	for the error
+//	If the clockerror is N, then the relatieve error increase between
+//	two successive block is app N / 750, the phase of that error
+//	is computed. Of course higher frequencies suffer more than lower
+//	frequencies, so old-dab had a scheme where, depending the
+//	relative frequency of the bin, the correction was stronger
+
+	float phaseBase	= 2 * M_PI * clockError / 2048000.0 * params. get_T_s ();
+	for (int i = 0; i < carriers; i ++) {
+//	here we really start
+	 int16_t	carriers_2	= carriers / 2;
+	 int16_t	index	= myMapper. mapIn (i);
+	 int16_t	binIndex	= index;
+	 if (index < 0) {
+	 index += T_u;
+	 binIndex	+= carriers_2;
+	 }
+	 else
+	 binIndex	+= carriers_2 - 1;
+
+	 float phaseCorrector	= (carriers_2 - binIndex) / float (carriers_2);
+	 float phaseError	= phaseBase * phaseCorrector;
+	 Complex current	= fft_buffer index;
+	 Complex prevS	= phaseReference index;
+	 Complex fftBin	= current * normalize (conj (prevS));
+//
+//	correction on the fftBin value using the approach from
+//	old-dab, see text above
+
+	 fftBin		= fftBin * makeComplex (-phaseError);
+	 stdDevVector index	= phaseError;
+	 conjVector index	= fftBin;
+	 DABFLOAT binAbsLevel	= jan_abs (fftBin);
+//	updates
+
+	 Complex fftBin_at_1	= toQ1 (fftBin);
+
+	 meanLevelVector index =
+	 compute_avg (meanLevelVector index, binAbsLevel, ALPHA);
+
+	 DABFLOAT d_x		= real (fftBin_at_1) -
+	 meanLevelVector index / sqrt_2;
+	 DABFLOAT d_y		= 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);
+//
+	 DABFLOAT corrector	=
+	 corrFact * meanLevelVector index / sigmaSQ_Vector index;
+	 corrector		/= (1 / snr + 2);
+	 Complex R1	= corrector * normalize (fftBin) * 
+	 (DABFLOAT)(sqrt (binAbsLevel * jan_abs (prevS)));
+	 DABFLOAT scaler	= levelFact / 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);
+	}
+	return sum;
+}
+
+
+DABFLOAT ofdmDecoder::decoder_3 (const std::vector<Complex> &fft_buffer,
+	 std::vector<int16_t> &softbits,
+	 DABFLOAT	snr,
+	 float		clockError) {
+DABFLOAT	sum = 0;
+
+	float phaseBase	= 2 * M_PI * clockError / 2048000.0 * params. get_T_s ();
+	for (int i = 0; i < carriers; i ++) {
+//	here we really start
+	 int16_t	carriers_2	= carriers / 2;
+	 int16_t	index	= myMapper. mapIn (i);
+	 int16_t	binIndex	= index;
+	 if (index < 0) {
+	 index += T_u;
+	 binIndex	+= carriers_2;
+	 }
+	 else
+	 binIndex	+= carriers_2 - 1;
+
+	 float phaseCorrector	= (carriers_2 - binIndex) / float (carriers_2);
+	 float phaseError	= phaseBase * phaseCorrector;
+
+	 Complex current	= fft_buffer index;
+	 Complex prevS	= phaseReference index;
+	 Complex fftBin	= current * normalize (conj (prevS));
+	 fftBin		= fftBin * makeComplex (-phaseError);
+	 stdDevVector index	= phaseError;
+	 conjVector index	= fftBin;
+	 Complex fftBin_at_1	= toQ1 (fftBin);
+
+	 stdDevVector index	= phaseError;
+//
+	 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);
+	}
+	return sum;
+}
+
+DABFLOAT ofdmDecoder::decoder_4 (const std::vector<Complex> &fft_buffer,
+	 std::vector<int16_t> &softbits,
+	 DABFLOAT	snr) {
+DABFLOAT sum	= 0;
+
+	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);
+//
+	 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;
+
+	 DABFLOAT rightBit	= - b2 * scaler;
+	 limit_symmetrically (rightBit, MAX_VITERBI);
+	 softbits carriers + i = (int16_t)rightBit;
+	 sum		+= abs (Complex (b1, b2));
+	}
+	return sum;
+}
+
+void	ofdmDecoder::set_correctPhase (bool b) {
+	correctPhase	= b;
+}

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	=
-	 20 * log10 ((cLevel / cCount + 0.005) / (sum + 0.005));
-	 this -> snr = 0.9 * this -> snr + 0.1 * snrV;
-	 if (this -> snrBuffer_p != nullptr) 
-	 snrBuffer_p -> putDataIntoBuffer (&snr, 1);
-	 snrCount ++;
-	 if (snrCount >= 3) {
-	 snrCount = 0;
-	 showSnr (snr);
+	 else {	// compute SNR
+	 float sum	= 0;
+	 for (int i = 0; i < T_null; i ++)
+	 sum += jan_abs (ofdmBuffer i);
+	 sum /= T_null;
+	 float snrV	=
+	 20 * log10 ((cLevel / cCount + 0.005) / (sum + 0.005));
+	 this -> snr = 0.9 * this -> snr + 0.1 * snrV;
+	 if (this -> snrBuffer_p != nullptr) 
+	 snrBuffer_p -> putDataIntoBuffer (&snr, 1);
+	 snrCount ++;
+	 if (snrCount >= 3) {
+	 snrCount = 0;
+	 showSnr (snr);
+	 }
 	 }
 	 }
 /**
@@ -704,13 +691,6 @@
 	dxMode	= b;
 }
 
-void	ofdmHandler::selectTII		(uint8_t a) {
-	if (a == 0)
-	 selectedTII = TII_OLD;
-	else
-	 selectedTII = TII_NEW;
-}
-
 void	ofdmHandler::setSpeedUp	(bool b) {
 	freqSpeedUp	= b;
 	store (settings_p, CONFIG_HANDLER, "SPEED_UP", b ? 1 : 0);
@@ -747,3 +727,11 @@
 	theReader. set_dcRemoval (b);
 }
 
+void	ofdmHandler::set_dataTracer	(bool b) {
+	theMscHandler. set_dataTracer (b);
+}
+
+std::vector<basicService> ofdmHandler::getServices	() {
+	return theFicHandler. getServices ();
+}
+

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;
+	int nrSections	= 4;
 //	a single carrier cannot be a TII carrier.
 	if (carrierDelete) {
 	 for (int i = 0; i < SECTION_SIZE; i++) {
@@ -89,16 +227,15 @@
 	 for (int j = 0; j < nrSections; j++) {
 	 Complex x = buffer i + j * SECTION_SIZE;
 	 etsiVec i += x;
-	 nonetsiVec i += x * conj (table_2 i + j * SECTION_SIZE);
+	 nonetsiVec i += rotate (x,
+	 rotationTable i + j * SECTION_SIZE);
 	 }
 	}
 }
 
-//	We determine first the offset of the "best fit",
-//	the offset indicates the subId
 static uint8_t bits = {0x80, 0x40, 0x20, 0x10 , 0x08, 0x04, 0x02, 0x01};
 
-// Sort the elemtnts accordibg to their strength
+// Sort the elements according to their strength
 static
 int	fcmp (const void *a, const void *b) {
 	tiiData *element1 = (tiiData *)a;
@@ -112,9 +249,8 @@
 	 return 0;
 }
 
-QVector<tiiData> TII_Detector_A::processNULL (int16_t threshold_db, 
-	 uint8_t selected_subId,
-	 bool tiiFilter) {
+QVector<tiiData> TII_Detector::processNULL (int16_t threshold_db, 
+	 uint8_t selected_subId) {
 //	collapsed ETSI float values
 float	etsi_floatTable NUM_GROUPS * GROUPSIZE;	
 //	collapsed non-ETSI float values
@@ -140,7 +276,7 @@
 	 nullSymbolBuffer fftIdx * conj (nullSymbolBuffer fftIdx + 1);
 	}
 
-	collapse (decodedBuffer, etsiTable, nonetsiTable, tiiFilter);
+	collapse (decodedBuffer, etsiTable, nonetsiTable);
 
 
 // fill the float tables, determine the abs value of the strongest carrier
@@ -165,6 +301,7 @@
 	 avg_etsi group /= GROUPSIZE;
 	 avg_nonetsi group /= GROUPSIZE;
 	}
+
 //	determine the noise level by taking the level of the lowest group
 	for (int subId = 0; subId < GROUPSIZE; subId++) {
 	 float avg = 0;
@@ -192,16 +329,14 @@
 	 float *float_ptr	= nullptr;
 //	The number of times the limit is reached in the group is counted
 	 for (int i = 0; i < NUM_GROUPS; i++) {
-	 float etsi_noiseLevel = tiiFilter ? avg_etsi i : noise;
-	 float nonetsi_noiseLevel = tiiFilter ? avg_nonetsi i : noise;
-	 if (etsi_floatTable subId + i * GROUPSIZE >
-	 etsi_noiseLevel * threshold) {
+	 float thresholdLevel = 
+	 noise * std::pow (10.0f, threshold_db / 10.0f);
+	 if (etsi_floatTable subId + i * GROUPSIZE > thresholdLevel) {
 	 etsi_count++;
 	 etsi_pattern	|= bits i;
 	 etsi_sum	+= etsiTable subId + GROUPSIZE * i; 
 	 }
-	 if (nonetsi_floatTable subId + i * GROUPSIZE >
-	 nonetsi_noiseLevel * threshold) {
+	 if (nonetsi_floatTable subId + i * GROUPSIZE > thresholdLevel) {
 	 nonetsi_count++;
 	 nonetsi_pattern |= bits i;
 	 nonetsi_sum += nonetsiTable subId + GROUPSIZE * i;
@@ -229,7 +364,7 @@
 //	Find the Main Id that matches the pattern
 	 if (count == 4) {
 	 for (; mainId < (int)nrPatterns (); mainId++)
-	 if (getPattern (mainId) == pattern)
+	 if (patternTable mainId == pattern)
 	 break;
 	 }
 
@@ -240,7 +375,7 @@
 	 for (int k = 0; k < (int)nrPatterns (); k++) {
 	 Complex val = Complex (0, 0);
 	 for (int i = 0; i < NUM_GROUPS; i++) {
-	 if (getPattern (k) & bits i) {
+	 if (patternTable k & bits i) {
 	 val += cmplx_ptr subId + GROUPSIZE * i;
 	 }
 	 }
@@ -256,21 +391,21 @@
 	 if (count >= 4) {
 	 element. mainId	= mainId;
 	 element. subId	= subId;
-	 element. strength = jan_abs (sum) / max / (tiiFilter ? 2 : 4);
+	 element. strength = jan_abs (sum) / max / 4;
 	 element. phase	= arg (sum) * F_DEG_PER_RAD;
 	 element. norm	= norm;
 	 element. collision	= false;
-	 element. pattern	= getPattern (mainId);
+	 element. pattern	= patternTable mainId;
 	 theResult. push_back (element);
 	 }
 //
 //	Collisions still to be done
-	 if ((count > 4) && (selected_subId != 0)) {
+	 if ((count > 4) && (selected_subId > 0)) {
 	 sum = Complex (0,0);
 
 //	Calculate the level of the second main ID
 	 for (int i = 0; i < NUM_GROUPS; i++) {
-	 if ((getPattern (mainId) & bits i) == 0) {
+	 if ((patternTable mainId & bits i) == 0) {
 	 int index = subId + GROUPSIZE * i;
 	 if (float_ptr index > noise * threshold)
 	 sum += cmplx_ptr index;
@@ -279,7 +414,7 @@
 
 	 if (subId == selected_subId) { // List all possible main IDs
 	 for (int k = 0; k < (int)nrPatterns (); k++) {
-	 int pattern2 = getPattern (k) & pattern;
+	 int pattern2 = patternTable k & pattern;
 	 int count2 = 0;
 	 for (int i = 0; i < NUM_GROUPS; i++)
 	 if (pattern2 & bits i)
@@ -291,7 +426,7 @@
 	 element. phase		= arg(sum) * F_DEG_PER_RAD;
 	 element. norm		= norm;
 	 element. collision	= true;
-	 element. pattern		= getPattern (mainId);
+	 element. pattern		= patternTable mainId;
 	 theResult. push_back (element);
 	 }
 	 }
@@ -307,7 +442,6 @@
 	}
 //	fprintf(stderr, "max =%.0f, noise = %.1fdB\n", max, 10 * log10(noise/max));
 	if (max > 4000)
-//	if (max > 4000000)
 	 for (int i = 0; i < carriers / 2; i++)
 	 decodedBuffer i *= 0.9;
 	resetBuffer();

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;
-}
-
 int	configHandler::muteValue		() {
 	return muteTimeSetting -> value ();
 }
@@ -964,25 +959,6 @@
 	process_tiiCollisions (value);
 }
 
-void	configHandler::handle_tiiFilter (int state) {
-bool x = tiiFilter -> isChecked ();
- (void)state;
- store (dabSettings, CONFIG_HANDLER, TII_FILTER, x ? 1 : 0);
-	process_tiiFilter (x);
-}
-
-void	configHandler::handle_tiiSelector	(int state) {
-bool	x 	= tiiSelector	-> isChecked ();
-	(void)state;
-	store (dabSettings, CONFIG_HANDLER, TII_DETECTOR_SETTING, x ? 1 : 0);
-	tiiCollisions -> setEnabled (x);
-	if (x) 
-	 tiiThreshold_setter -> setMinimum (6);
-	else
-	 tiiThreshold_setter -> setMinimum (4);
-	process_tiiSelector (x);
-}
-
 void	configHandler::handle_mouseClicked () {
 //QString tempPath = QDir::homePath () + "/Qt-DAB-files/";
 // tempPath =
@@ -999,6 +975,16 @@
 	activeServices	-> setText (QString::number (activeS));
 }
 
+void	configHandler::handle_close_mapSelector (int h) {
+	(void)h;
+	bool b = this -> close_mapSelector -> isChecked ();
+	store (dabSettings, CONFIG_HANDLER, "close_map", b ? 1 : 0);
+}
+
+bool	configHandler::get_close_mapSelector	() {
+	return close_mapSelector	-> isChecked ();
+}
+
 void	configHandler::handle_dcRemoval		(int h) {
 	(void)h;
 	bool b = this -> dcRemoval -> isChecked ();
@@ -1021,5 +1007,19 @@
 bool	configHandler::get_clearScanList () {
 	return clearScanList_selector	-> isChecked ();
 }
+//
+void	configHandler::handle_tracerButton	() {
+	traceOn	= !traceOn;
+	if (traceOn)
+	 tracerButton	-> setText ("trace on");
+	else
+	 tracerButton	-> setText ("");
+	emit signal_dataTracer	(traceOn);
+}
 
+void	configHandler::handle_mapViewSelector	(int k) {
+	(void)k;
+	bool b = this -> mapViewSelector -> isChecked ();
+	store (dabSettings, CONFIG_HANDLER, "DAVE_HTTP", b ? 1 : 0);
+}

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);
+	theLayout	-> addWidget (disclaimerLabel);
+	this	-> setLayout (theLayout);
+	show ();
+}
+
+	copyrightText::~copyrightText () {
+	hide ();
+}
+
+

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);
+
+	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);
+
+	QTableWidgetItem *item9 = new QTableWidgetItem;	// height
+	item9		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 9, item9);
+
+	QTableWidgetItem *item10 = new QTableWidgetItem; // direction
+	item10		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 10, item10);
+
+	QTableWidgetItem *item11 = new QTableWidgetItem; // delay
+	item11		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 11, item11);
+
+	QTableWidgetItem *item12 = new QTableWidgetItem;	// transmitter
+	item12		-> setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 12, item12);
+
+	tableWidget	-> setCurrentItem (item0);
+	QString aa	= QString ("0x") + QString::number (pattern, 16);
+	tableWidget	-> item (row, 1) -> setText (aa);
+	QString tii	= convertNumber (mainId) + "-" +
+	 convertNumber (subId);
+	if (theTransmitter. collision)
+	 tii += "!";
+	tableWidget	-> item (row, 2) -> setText (tii);
+	QString ss	= QString::number (phase, 'f', 1) + 
+	 (etsi ? " *" : "");
+	tableWidget	-> item (row, 3) -> setText (ss);
+	tableWidget	-> item (row, 4) -> setText (QString::number (strength, 'f', 1) );
+	tableWidget	-> item (row, 5) -> setText (QString::number (azimuth, 'f', 1) + QString::fromLatin1 (" \xb0 "));
+	tableWidget	-> item (row, 6) -> setText (QString::number (distance, 'f', 1) + " km");
+	tableWidget	-> item (row, 7) -> setText (QString::number (power, 'f', 1) + " KW ");
+	tableWidget	-> item (row, 8) -> setText (QString::number (altitude) + " m");
+	tableWidget	-> item (row, 9) -> setText (QString::number (height) + " m");
+	tableWidget	-> item (row, 10) -> setText (dir);
+	tableWidget	-> item (row, 11) -> setText (QString::number (delay, 'f', 1) + " samples");
+	tableWidget	-> item (row, 12) -> setText (transmitterName);
+	tableWidget	-> item (row, 0) -> setText (b ? "***" : "");
+	if (b)
+	 theDial -> setValue (azimuth);
+}
+
+void	dxDisplay::addRow (uint8_t mainId, uint8_t subId,
+	 const QString &channel) {
+int16_t	row	= tableWidget -> rowCount ();
+	tableWidget	-> insertRow (row);
+	QTableWidgetItem *item0	= new QTableWidgetItem;
+	item0		-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 0, item0);
+
+	QTableWidgetItem *item1 = new QTableWidgetItem;
+	item1		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 1, item1);
+
+	QTableWidgetItem *item2 = new QTableWidgetItem;
+	item2		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 2, item2);
+
+	QTableWidgetItem *item3 = new QTableWidgetItem;
+	item3		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 3, item3);
+
+	QTableWidgetItem *item4 = new QTableWidgetItem;
+	item4		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 4, item4);
+
+	QTableWidgetItem *item5 = new QTableWidgetItem;
+	item5		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 5, item5);
+
+	QTableWidgetItem *item6 = new QTableWidgetItem;
+	item6		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 6, item6);
+
+	QTableWidgetItem *item7 = new QTableWidgetItem;
+	item7		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 7, item7);
+
+	QTableWidgetItem *item8 = new QTableWidgetItem;
+	item8		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 8, item8);
+
+	QTableWidgetItem *item9 = new QTableWidgetItem;
+	item9		-> setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+	tableWidget	-> setItem (row, 9, item9);
+
+	tableWidget	-> setCurrentItem (item0);
+	fprintf (stderr, "Row %d bij dxDisplay\n", row);
+	tableWidget	-> item (row, 1) -> setText (QString::number (mainId));
+	tableWidget	-> item (row, 2) -> setText (QString::number (subId));
+	tableWidget	-> item (row, 3) -> setText (channel);
+	tableWidget	-> item (row, 4) -> setText ("??");
+	tableWidget	-> item (row, 5) -> setText ("??");
+	tableWidget	-> item (row, 6) -> setText ("??");
+	tableWidget	-> item (row, 7) -> setText ("??");
+	tableWidget	-> item (row, 8) -> setText ("??");
+	tableWidget	-> item (row, 9) -> setText ("??");
+	tableWidget	-> item (row, 0) -> setText ( "");
+}
+
+void	dxDisplay::handle_frameClosed	() {
+	hide ();
+}
+

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">
+ <widget class="QCheckBox" name="clearScanList_selector">
+ <property name="text">
+ <string>clear on exit</string>
+ </property>
+ </widget>
+ </item>
 <item row="1" column="0">
 <widget class="QCheckBox" name="closeDirect_selector">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you are bored with the explicit request to stop, touch this one, and stopping is direct&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>close without asking</string>
+ <string>close, no asking</string>
 </property>
 </widget>
 </item>
@@ -516,7 +504,17 @@
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration whether or not the main widget should ALWAYS be op top. Note that setting will be applied the next time the program will start.&lt;/p&gt;&lt;p&gt;Note further that in Windows a problem may occur: a warning message might be invisible, hidden by the main widget op top.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>main widget on top</string>
+ <string>main on top</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QCheckBox" name="close_mapSelector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this selector is set, then at stopping the map handler, a request is issued to close the map.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>close map</string>
 </property>
 </widget>
 </item>
@@ -541,12 +539,19 @@
 </widget>
 </item>
 <item row="2" column="2">
- <widget class="QCheckBox" name="localBrowserSelector">
+ <widget class="QCheckBox" name="logger_selector">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that on starting the http service a browser will have to be started manually. By default browser starts automaticall when the http button is set. Effective immediately&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;If set, a log file is maintained (as usual for windows in the folder in the home folder and for Linux in the directory /tmp in a folder/directory Qt-DAB-files) in a txt file :logFile.txt, in which activities such as selecting a device, channel, service, dump are written, preceded by the time of the activity.&lt;/p&gt;&lt;p&gt;The setting of the selector is maintained between program invocations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string> logger</string>
 </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QCheckBox" name="saveTitlesSelector">
 <property name="text">
- <string>start browser manually</string>
+ <string>save titles</string>
 </property>
 </widget>
 </item>
@@ -576,34 +581,17 @@
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many ensembles contain both audio and data services (e.g. TPEG, EPG). If selected here, only audio services and the EPG service if part of the ensemble will be shown in the services list&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>audio services only</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QCheckBox" name="logger_selector">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If set, a log file is maintained (as usual for windows in the folder in the home folder and for Linux in the directory /tmp in a folder/directory Qt-DAB-files) in a txt file :logFile.txt, in which activities such as selecting a device, channel, service, dump are written, preceded by the time of the activity.&lt;/p&gt;&lt;p&gt;The setting of the selector is maintained between program invocations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string> logger</string>
+ <string>audio only</string>
 </property>
 </widget>
 </item>
- <item row="4" column="1">
+ <item row="3" column="3">
 <widget class="QCheckBox" name="dcRemoval">
 <property name="text">
 <string>dc removal</string>
 </property>
 </widget>
 </item>
- <item row="4" column="2">
- <widget class="QCheckBox" name="saveTitlesSelector">
- <property name="text">
- <string>save titles</string>
- </property>
- </widget>
- </item>
 </layout>
 </item>
 <item>
@@ -613,6 +601,12 @@
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If setting a subId value different from 0, the software searches for ALL mainIds, associated with that subId.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
+ <property name="minimum">
+ <number>-1</number>
+ </property>
+ <property name="maximum">
+ <number>24</number>
+ </property>
 </widget>
 </item>
 <item>
@@ -636,9 +630,12 @@
 </widget>
 </item>
 <item>
- <widget class="QCheckBox" name="clearScanList_selector">
+ <widget class="QCheckBox" name="localBrowserSelector">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that on starting the http service a browser will have to be started manually. By default browser starts automaticall when the http button is set. Effective immediately&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
- <string>clear on exit</string>
+ <string> browser manually</string>
 </property>
 </widget>
 </item>

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>
+ <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>
+ </item>
+ </layout>
 </item>
 </layout>
 </item>
@@ -496,13 +507,25 @@
 <layout class="QHBoxLayout" name="horizontalLayout_11">
 <item>
 <widget class="QLabel" name="cpuLabel">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This label - if shown - shows the CPU support instructions used in the deconvolution.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string>TextLabel</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="distanceLabel">
+ <widget class="clickablelabel" name="distanceLabel">
+ <property name="minimumSize">
+ <size>
+ <width>141</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Clicking on this label shows - or hides - the dxDisplay&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string>TextLabel</string>
 </property>
@@ -515,19 +538,12 @@
 </property>
 <property name="sizeHint" stdset="0">
 <size>
- <width>168</width>
+ <width>108</width>
 <height>20</height>
 </size>
 </property>
 </spacer>
 </item>
- <item>
- <widget class="smallPushButton" name="tiiButton">
- <property name="text">
- <string>tii local</string>
- </property>
- </widget>
- </item>
 </layout>
 </item>
 </layout>

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>
+ <enum>QFrame::Shape::NoFrame</enum>
 </property>
 <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
 </property>
 </widget>
 </item>
 <item row="1" column="0">
 <widget class="QLabel" name="label_11">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The RS procedure will try to fix errors. However, if the parity bits are erroneous then there might be a problem. That is why - after the RS procedure a CRC check is performed on the data. The number of remaining errors is shown here&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The RS procedure will try to fix errors. However, if the parity bits are erroneous then there might be a problem. That is why - after the RS procedure a CRC check is performed on the data. The number of remaining errors is sjpwn here&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>ec errors </string>
@@ -409,17 +347,17 @@
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RS decoding/recovery uses parity bits. If, however, a parity bit is faulty, recovery of errors may lead to introducing errors. The crc check following the recovery should reveal that.&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="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
 </property>
 </widget>
 </item>
 <item row="2" column="0">
 <widget class="QLabel" name="missedLabel">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The output handler expects 48000 two-channel samples per second. If - for whatever reason - the amount actually delivered is less, the missing samples will be compensated for by NULL samples, and the percentage will be lower than 100&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The output hanfler expects 48000 two channel samples per second. If - for whatever reason - the amount actually delivered is less, the missing samples will be compensated for by NULL samples, and the percentage will be lower than 100&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>audio % OK</string>
@@ -429,13 +367,13 @@
 <item row="2" column="1">
 <widget class="QLCDNumber" name="missedSamples">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The audiohandler runs with its own clock. If less than the requested number of audiosamples is passed on, the percentage - shown here - will drop accordingly.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The audiohandler runs with its own clock. If less than the requested number of&lt;/p&gt;&lt;p&gt;audiosamples is passed on, the percentage = shown here - will drop accordingly.&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="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
+ <enum>QLCDNumber::SegmentStyle::Flat</enum>
 </property>
 </widget>
 </item>
@@ -451,36 +389,62 @@
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="bitRateLabel">
+ <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::Shape::NoFrame</enum>
+ </property>
 <property name="text">
- <string>bitRate</string>
+ <string>uep</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="psLabel">
+ <widget class="QLabel" name="codeRate">
 <property name="text">
- <string>ps</string>
+ <string>cr</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLabel" name="sbrLabel">
+ <widget class="QLabel" name="bitRateLabel">
 <property name="text">
- <string>sbr</string>
+ <string>bitRate</string>
 </property>
 </widget>
 </item>
 <item>
- <widget class="QLCDNumber" name="audioRate">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
+ <widget class="QLabel" name="audiorateLabel">
+ <property name="text">
+ <string>48000</string>
 </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="psLabel">
+ <property name="text">
+ <string>ps</string>
 </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="sbrLabel">
+ <property name="text">
+ <string>sbr</string>
 </property>
 </widget>
 </item>

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);
 
-	if (value_i (dabSettings_p, DAB_GENERAL, NEW_DISPLAY_VISIBLE, 0) != 0)
+	if (value_i (theQSettings, DAB_GENERAL, NEW_DISPLAY_VISIBLE, 0) != 0)
 	 theNewDisplay. show ();
 	else
 	 theNewDisplay. hide ();
 
+	theControl	= nullptr;
+
 	journalineHandler = nullptr;
 	peakLeftDamped	= 0;
 	peakRightDamped = 0;
 	audioTeller	= 0;	// counting audio frames
 	pauzeSlideTeller	= 0; // counting pause slides
-	labelStyle	= value_s (dabSettings_p, DAB_GENERAL, LABEL_COLOR,
+	labelStyle	= value_s (theQSettings, DAB_GENERAL, LABEL_COLOR,
 	 LABEL_STYLE);
 	QFont font	= serviceLabel -> font ();
 	font. setPointSize (16);
@@ -374,32 +373,32 @@
 	ensembleId -> setFont (font);
 	channel. cleanChannel ();
 	localPos. latitude 		=
-	 value_f (dabSettings_p, MAP_HANDLING, HOME_LATITUDE, 0.0);
+	 value_f (theQSettings, MAP_HANDLING, HOME_LATITUDE, 0.0);
 	localPos. longitude 		=
-	 value_f (dabSettings_p, MAP_HANDLING, HOME_LONGITUDE, 0.0);
+	 value_f (theQSettings, MAP_HANDLING, HOME_LONGITUDE, 0.0);
 	if (localPos. latitude == 0)
 	 localPos. latitude = 52.22;
 	if (localPos. longitude == 0)
 	 localPos. longitude = 4.54;
 
-	techWindow_p 		-> hide ();	// until shown otherwise
+	theTechWindow 		-> hide ();	// until shown otherwise
 	stillMuting		-> hide ();
 
 #ifdef	DATA_STREAMER
-	dataStreamer_p		= new tcpServer (dataPort);
+	theDataStreamer		= new tcpServer (dataPort);
 #else
 	(void)dataPort;
 #endif
 #ifdef	CLOCK_STREAMER
-	clockStreamer_p		= new tcpServer (clockPort);
+	theClockStreamer		= new tcpServer (clockPort);
 #else
 	(void)clockPort;
 #endif
 	volumeSlider	-> hide ();
 //	Where do we leave the audio out?
-	configHandler_p	-> show_streamSelector (false);
-	int latency	= value_i (dabSettings_p, SOUND_HANDLING, "latency", 5);
-	soundOut_p		= nullptr;
+	theConfigHandler	-> show_streamSelector (false);
+	int latency	= value_i (theQSettings, SOUND_HANDLING, "latency", 5);
+	theAudioPlayer		= nullptr;
 //
 //	If we do not have a TCP streamer, we go for one of the
 //	Portaudio and the Qt_audio alternatives.
@@ -407,64 +406,65 @@
 #ifndef	TCP_STREAMER
 	QStringList streams;
 	QString	temp;
-	
-	QString s = value_s (dabSettings_p, SOUND_HANDLING, SOUND_HANDLER,
+//
+	QString s = value_s (theQSettings, SOUND_HANDLING, SOUND_HANDLER,
 	 S_PORT_AUDIO);
+//	
 	if (s != S_PORT_AUDIO) {	// try Qt_Audio
 	 try {
-	 soundOut_p	= new Qt_Audio (this, dabSettings_p);
-	 streams		= ((Qt_Audio *)soundOut_p) -> streams ();
+	 theAudioPlayer	= new Qt_Audio (this, theQSettings);
+	 streams		= ((Qt_Audio *)theAudioPlayer) -> streams ();
 	 temp		=
-	 value_s (dabSettings_p, SOUND_HANDLING,
+	 value_s (theQSettings, SOUND_HANDLING,
 	 AUDIO_STREAM_NAME, "default");
 	 volumeSlider	-> show ();
 	 audioVolume	=
-	 value_i (dabSettings_p, SOUND_HANDLING, QT_AUDIO_VOLUME, 50);
+	 value_i (theQSettings, SOUND_HANDLING, QT_AUDIO_VOLUME, 50);
 	 volumeSlider		-> setValue (audioVolume);
-	 ((Qt_Audio *)soundOut_p)	-> setVolume (audioVolume);
+	 ((Qt_Audio *)theAudioPlayer)	-> setVolume (audioVolume);
 	 connect (volumeSlider, &QSlider::valueChanged,
 	 this, &RadioInterface::setVolume);
 	 } catch (...) {
-	 soundOut_p = nullptr;
+	 theAudioPlayer = nullptr;
 	 }
 	}
 
-	inputDevice_p	= nullptr;
 //	we end up here if selection was PORT_AUDIO or using Qt_Audio failed
 //	as it does on U20
-	if (soundOut_p == nullptr) {
-	 soundOut_p	= new audioSink	(latency);
-	 streams	= ((audioSink *)soundOut_p) -> streams ();
+	if (theAudioPlayer == nullptr) {
+	 theAudioPlayer	= new audioSink	(latency);
+	 streams	= ((audioSink *)theAudioPlayer) -> streams ();
 	 temp		=
-	 value_s (dabSettings_p, SOUND_HANDLING,
+	 value_s (theQSettings, SOUND_HANDLING,
 	 AUDIO_STREAM_NAME, "default");
 	}
 
 	if (streams. size () > 0) {
-	 configHandler_p -> fill_streamTable (streams);
-	 configHandler_p -> show_streamSelector (true);
-	 k	= configHandler_p -> init_streamTable (temp);
+	 theConfigHandler -> fill_streamTable (streams);
+	 theConfigHandler -> show_streamSelector (true);
+	 k	= theConfigHandler -> init_streamTable (temp);
 	 if (k >= 0) {
-	 QString str = configHandler_p -> currentStream ();
-	 soundOut_p -> selectDevice (k, str);
+	 QString str = theConfigHandler -> currentStream ();
+	 theAudioPlayer -> selectDevice (k, str);
 	 }
-	 configHandler_p	-> connect_streamTable	();
+	 theConfigHandler	-> connect_streamTable	();
 	}
 	else {
-	 delete soundOut_p;
-	 soundOut_p = new audioPlayer ();
+	 delete theAudioPlayer;
+	 theAudioPlayer = new audioPlayer ();
 	}
-	if (!soundOut_p -> hasMissed ())
-	 techWindow_p -> hideMissed ();
+	if (!theAudioPlayer -> hasMissed ())
+	 theTechWindow -> hideMissed ();
 #else
-	soundOut_p		= new tcpStreamer	(20040);
-	techWindow_p		-> hide		();
+	theAudioPlayer		= new tcpStreamer	(20040);
+	theTechWindow		-> hide		();
 #endif
 //
+	theDeviceHandler		= nullptr;
 //	some MOT, text and other data is stored in the Qt-DAB-files directory
 	QString tempPath	= theFilenameFinder. basicPath ();	
 	path_for_files		=
-	 value_s (dabSettings_p, DAB_GENERAL,
+	 value_s (theQSettings, DAB_GENERAL,
 	 S_FILE_PATH, tempPath);
 	if (path_for_files != "")
 	 path_for_files		= checkDir (path_for_files);
@@ -472,10 +472,6 @@
 	pauzeTimer. setSingleShot (true);
 	connect (&pauzeTimer, &QTimer::timeout,
 	 this, &RadioInterface::show_pauzeSlide);
-	stressTimer. setSingleShot (true);
-	connect (&stressTimer, &QTimer::timeout,
-	 this, &RadioInterface::handle_nextServiceButton);
-	myTimeTable. hide ();
 
 	connect (&theScanlistHandler, &scanListHandler::handleScanListSelect,
 	 this, &RadioInterface::handleScanListSelect);
@@ -507,8 +503,6 @@
 	 this, &RadioInterface::color_configButton);
 	connect (httpButton, &smallPushButton::rightClicked,
 	 this, &RadioInterface::color_httpButton);
-	connect (tiiButton, &smallPushButton::rightClicked,
-	 this, &RadioInterface::color_tiiButton);
 	connect (prevServiceButton, &smallPushButton::rightClicked,
 	 this, &RadioInterface::color_prevServiceButton);
 	connect (nextServiceButton, &smallPushButton::rightClicked,
@@ -517,8 +511,6 @@
 	 this, &RadioInterface::color_spectrumButton);
 //
 //	
-	connect (techWindow_p, &techData::handleTimeTable,
-	 this, &RadioInterface::handle_timeTable);
 	connect (&theNewDisplay, &displayWidget::mouseClick,
 	 this, &RadioInterface::handle_iqSelector);
 
@@ -530,10 +522,10 @@
 	connect (deviceSelectorLabel, &clickablelabel::clicked,
 	 this, &RadioInterface::devSL_visibility);
 
-	aboutLabel -> setText (" © V6.9.5");
+	aboutLabel -> setText (" © V6.9.6");
 	aboutLabel -> setToolTip ("Click to see the acknowledgements");
 	connect (aboutLabel, &clickablelabel::clicked,
-	 this, &RadioInterface::handle_aboutLabel);
+	 this, &RadioInterface::handle_copyrightLabel);
 
 	connect (soundLabel, &clickablelabel::clicked,
 	 this, &RadioInterface::handle_muteButton);
@@ -546,6 +538,8 @@
 	epgLabel	-> setPixmap (epgP. scaled (30, 30,
 	 Qt::KeepAspectRatio));
 	epgLabel	-> setToolTip ("this icon is visible when the EPG processor is active, the service will always run in the background");
+	connect (epgLabel, &clickablelabel::clicked,
+	 this, &RadioInterface::handle_startTimeTable);
 	epgLabel	-> hide ();
 	show_pauzeSlide ();
 
@@ -575,11 +569,11 @@
 //
 //	do we have a known device from previous invocations?
 	h =
-	 value_s (dabSettings_p, DAB_GENERAL, 
+	 value_s (theQSettings, DAB_GENERAL, 
 	 SELECTED_DEVICE, "no device");
 
-	if (theDeviceChoser. getDeviceIndex (h) >= 0)
-	 inputDevice_p	= createDevice (h, &theLogger);
+	if (theDeviceChooser. getDeviceIndex (h) >= 0)
+	 theDeviceHandler	= createDevice (h, &theLogger);
 //
 	peakLeftDamped = -100;
 	peakRightDamped = -100;
@@ -600,24 +594,28 @@
 	mapRight -> addColorStop (0.75, QColor (100, 50, 0)); 
 	mapRight -> addColorStop (0.4, QColor (0, 200, 50)); 
 	rightAudio -> setColorMap (mapRight);
+//
+	audiorateLabel	-> setStyleSheet ("color:cyan");
+	psLabel		-> setStyleSheet ("color:cyan"); 
+	sbrLabel	-> setStyleSheet ("color:cyan");
 
 	journalineKey		= -1;
 //	do we show controls?
 	bool visible	=
-	 value_i (dabSettings_p, DAB_GENERAL, 
+	 value_i (theQSettings, DAB_GENERAL, 
 	 CONFIG_WIDGET_VISIBLE, 0) != 0;
 	if (visible) {
-	 configHandler_p	-> show ();
+	 theConfigHandler	-> show ();
 	}
 	connect (configButton, &QPushButton::clicked,
 	 this, &RadioInterface::handle_configButton);
 
-	if (value_i (dabSettings_p, DAB_GENERAL, SNR_WIDGET_VISIBLE, 0) != 0)
+	if (value_i (theQSettings, DAB_GENERAL, SNR_WIDGET_VISIBLE, 0) != 0)
 	 theSNRViewer. show ();
 	else
 	 theSNRViewer. hide ();
-	if (value_i (dabSettings_p, DAB_GENERAL, TECHDATA_VISIBLE, 0) != 0)
-	 techWindow_p -> show ();
+	if (value_i (theQSettings, DAB_GENERAL, TECHDATA_VISIBLE, 0) != 0)
+	 theTechWindow -> show ();
 
 	dynamicLabel	-> setTextInteractionFlags(Qt::TextSelectableByMouse);
 	dynamicLabel -> setToolTip ("The text (or parts of it) of the dynamic label can be copied. Selecting the text with the mouse and clicking the right hand mouse button shows a small menu with which the text can be put into the clipboard");
@@ -641,28 +639,28 @@
 #endif
 //	Just check whether the ini file is used before
 	bool iniExists	=
-	 value_i (dabSettings_p, DAB_GENERAL, "EXISTS", 0) != 0;
+	 value_i (theQSettings, DAB_GENERAL, "EXISTS", 0) != 0;
 	if (!iniExists) {
-	 store (dabSettings_p, DAB_GENERAL, "EXISTS", 1);
+	 store (theQSettings, DAB_GENERAL, "EXISTS", 1);
 	 QMessageBox::warning (this, tr ("Warning"),
 	 tr ("The ini file is new and no home location is known yet"));
 	}
 
-	if (inputDevice_p != nullptr) {
-	 connect (&theDeviceChoser, &deviceChooser::deviceSelected,
+	if (theDeviceHandler != nullptr) {
+	 connect (&theDeviceChooser, &deviceChooser::deviceSelected,
 	 this, &RadioInterface::newDevice);
-	 if (inputDevice_p -> isFileInput ())
+	 if (theDeviceHandler -> isFileInput ())
 	 scanListButton -> setEnabled (false);
-	 theDeviceChoser. hide ();
+	 theDeviceChooser. hide ();
 	 startDirect ();
 	 qApp	-> installEventFilter (this);
 	 return;
 	}
 //	What we want here is that we start up after a device
 //	is selected
-	connect (&theDeviceChoser, &deviceChooser::deviceSelected,
+	connect (&theDeviceChooser, &deviceChooser::deviceSelected,
 	 this, &RadioInterface::doStart);
-	theDeviceChoser. show ();
+	theDeviceChooser. show ();
 	qApp	-> installEventFilter (this);
 }
 //
@@ -670,23 +668,20 @@
 //	was registered to be used, and the user presses the
 //	selectDevice comboBox
 void	RadioInterface::doStart (const QString &dev) {
-	if (inputDevice_p != nullptr)
-	 delete inputDevice_p;
-//	inputDevice_p	= nullptr;
-	inputDevice_p	= createDevice	(dev, &theLogger);
+	if (theDeviceHandler != nullptr)
+	 delete theDeviceHandler;
+//	theDeviceHandler	= nullptr;
+	theDeviceHandler	= createDevice	(dev, &theLogger);
 //	Some buttons should not be touched before we have a device
-	if (inputDevice_p == nullptr) {
+	if (theDeviceHandler == nullptr) {
 	 return;
 	}
-	disconnect (&theDeviceChoser, &deviceChooser::deviceSelected,
+	disconnect (&theDeviceChooser, &deviceChooser::deviceSelected,
 	 this, &RadioInterface::doStart);
-	connect (&theDeviceChoser, &deviceChooser::deviceSelected,
+	connect (&theDeviceChooser, &deviceChooser::deviceSelected,
 	 this, &RadioInterface::newDevice);
-	if (inputDevice_p -> isFileInput ())
-	 scanListButton -> setEnabled (false);
-	else
-	 scanListButton -> setEnabled (true);
-	theDeviceChoser. hide ();
+	scanListButton -> setEnabled (!theDeviceHandler -> isFileInput ());
+	theDeviceChooser. hide ();
 	startDirect ();
 }
 //
@@ -701,7 +696,7 @@
 #endif
 	 this, &RadioInterface::handle_channelSelector);
 	QString startingChannel = 
-	 value_s (dabSettings_p, DAB_GENERAL, CHANNEL_NAME, "5A");
+	 value_s (theQSettings, DAB_GENERAL, CHANNEL_NAME, "5A");
 	int k = channelSelector -> findText (startingChannel);
 	if (k != -1) 	
 	 channelSelector -> setCurrentIndex (k);
@@ -717,25 +712,25 @@
 	cpuLabel -> setText ("");
 #endif
 	theLogger. log (logger::LOG_RADIO_STARTS,
-	 inputDevice_p -> deviceName (),
+	 theDeviceHandler -> deviceName (),
 	 channelSelector -> currentText ());
-	theOFDMHandler	= new ofdmHandler (this,
-	 inputDevice_p,
-	 &globals, dabSettings_p,
+	theOfdmHandler	= new ofdmHandler (this,
+	 theDeviceHandler,
+	 &globals, theQSettings,
 	 &theLogger, this -> cpuSupport);
-	if (theOFDMHandler == nullptr) {
+	if (theOfdmHandler == nullptr) {
 	 QMessageBox::warning (this, tr ("Warning"),
 tr ("Fatal error, call expert 11"));
 	 abort ();
 	}
 
-	theOFDMHandler	-> set_dcRemoval (configHandler_p -> get_dcRemoval ());
-	theNewDisplay. set_dcRemoval (configHandler_p -> get_dcRemoval ());
+	theOfdmHandler	-> set_dcRemoval (theConfigHandler -> get_dcRemoval ());
+	theNewDisplay. set_dcRemoval (theConfigHandler -> get_dcRemoval ());
 	channel. cleanChannel ();
 //
 //	Note: this is NOT "theEnsembleHandler. reset ()" !!!!
 	theEnsembleHandler	-> reset	();
-	theEnsembleHandler	-> setMode (!inputDevice_p -> isFileInput ());
+	theEnsembleHandler	-> setMode (!theDeviceHandler -> isFileInput ());
 
 //	Just to be sure we disconnect here.
 //	It would have been helpful to have a function
@@ -752,13 +747,13 @@
 
 
 	startChannel (channelSelector -> currentText ());
-	int auto_http	= value_i (dabSettings_p, CONFIG_HANDLER,
+	int auto_http	= value_i (theQSettings, CONFIG_HANDLER,
 	 AUTO_HTTP, 0);
 	if ((auto_http != 0) && (localPos. latitude != 0)) {
 	 bool succ = autoStart_http ();
 	 if (succ)
 	 httpButton	-> setText ("http-on");
-	} 
+	}
 	running. store (true);
 }
 
@@ -789,15 +784,15 @@
 	if (theEnsembleHandler -> alreadyIn (ed))
 	 return;
 
-	if (((SId & 0xFFFF0000) == 0) && !inputDevice_p -> isFileInput ())
+	if (((SId & 0xFFFF0000) == 0) && !theDeviceHandler -> isFileInput ())
 	 theScanlistHandler. addElement (channel. channelName, serviceName);
 
-	if (!theSCANHandler. active () && theOFDMHandler -> is_SPI (SId)) {
+	if (!theSCANHandler. active () && theOfdmHandler -> is_SPI (SId)) {
 	 packetdata pd;
-	 int index = theOFDMHandler -> getServiceComp (serviceName);
+	 int index = theOfdmHandler -> getServiceComp (serviceName);
 	 if (index < 0)	// cannot happen
 	 return;
-	 theOFDMHandler -> packetData (index, pd);
+	 theOfdmHandler -> packetData (index, pd);
 	 if (!pd. defined)	// cannot happen
 	 return;
 	 start_epgService (pd);
@@ -806,8 +801,8 @@
 //
 //	adding the service to the list (or not)
 	if (((SId & 0xFFFF0000) == 0) ||
-	 (!configHandler_p -> get_audioServices_only ()) ||
-	 ((SId & 0xFFFF0000) && theOFDMHandler -> is_SPI (SId))) {
+	 (!theConfigHandler -> get_audioServices_only ()) ||
+	 ((SId & 0xFFFF0000) && theOfdmHandler -> is_SPI (SId))) {
 	 if (theEnsembleHandler -> addToEnsemble (ed)) {
 	 if (theSCANHandler. active ())
 	 theSCANHandler. addService (channel. channelName);
@@ -859,10 +854,10 @@
 	 theSCANHandler.
 	 addEnsemble (channelSelector -> currentText (), v);
 	 channelTimer. stop ();
-	 int switchStay		=
-	 configHandler_p -> switchStayValue ();
+	 int switchStay		= 
+	 theSCANHandler. switchStayValue ();
 	 if (theSCANHandler. dumpInFile ()) {
-	 inputDevice_p	-> startDump	();
+	 theDeviceHandler	-> startDump	();
 	 }
 	 channelTimer. start (switchStay);
 	 }
@@ -881,32 +876,32 @@
 
 void	RadioInterface::handle_contentButton	() {
 basicPrint thePrinter;
-QStringList s	= thePrinter. print (theOFDMHandler -> contentPrint ());
+QStringList s	= thePrinter. print (theOfdmHandler -> contentPrint ());
 
-	if (contentTable_p != nullptr) {
-	 contentTable_p -> hide ();
-	 delete contentTable_p;
-	 contentTable_p = nullptr;
+	if (theContentTable != nullptr) {
+	 theContentTable -> hide ();
+	 delete theContentTable;
+	 theContentTable = nullptr;
 	 return;
 	}
 	QString headLine	= build_kop ();
 	
-	contentTable_p		= new contentTable (this, dabSettings_p,
+	theContentTable		= new contentTable (this, theQSettings,
 	 channel. channelName,
 	 thePrinter. scanWidth ());
-	connect (contentTable_p, &contentTable::goService,
+	connect (theContentTable, &contentTable::goService,
 	 this, &RadioInterface::handle_contentSelector);
 
-	contentTable_p		-> addLine (headLine);
+	theContentTable		-> addLine (headLine);
 	for (auto &tr : channel. transmitters) {
 	 QString transmitterLine = build_transmitterLine (tr);
-	 contentTable_p	-> addLine (transmitterLine);
+	 theContentTable	-> addLine (transmitterLine);
 	}
 
 	for (auto &ss : s)
-	 contentTable_p -> addLine (ss);
-	contentTable_p -> show ();
-	if (configHandler_p -> upload_selector_active ()) {
+	 theContentTable -> addLine (ss);
+	theContentTable -> show ();
+	if (theConfigHandler -> upload_selector_active ()) {
 	 try {
 	 uploader the_uploader;
 	 QMessageBox::StandardButton reply =
@@ -917,7 +912,7 @@
 	 the_uploader. loadUp (channel. ensembleName,
 	 channel. Eid,
 	 channel. channelName, 
-	 contentTable_p -> upload ());
+	 theContentTable -> upload ());
 	 } catch (...) {}
 	}
 }
@@ -933,14 +928,22 @@
 	QDir (). mkpath (dir);
 	return dir;
 }
-
+//
+//	to avoid confusions, each mot object arriving here carrier
+//	the SId of the service it belongs to.
+//	Data for background services other than the SPI servides,
+//	is basically ignored.
 void	RadioInterface::handle_motObject (QByteArray result,
-	 QString objectName,
-	 int contentType,
-	 bool dirElement,
-	 bool backgroundFlag) {
+	 QString	objectName,
+	 int		contentType,
+	 bool		dirElement,
+	 uint32_t	SId) {
 QString realName;
 
+	if (!theOfdmHandler	-> is_SPI (SId) &&
+	 (channel. currentService. SId != SId))
+	 return;
+
 	switch (getContentBaseType ((MOTContentType)contentType)) {
 	 case MOTBaseTypeGeneralData:
 	 break;
@@ -951,7 +954,7 @@
 
 	 case MOTBaseTypeImage: 
 	 showMOTlabel (result, contentType,
-	 objectName, dirElement, backgroundFlag);
+	 objectName, dirElement, SId);
 	 break;
 
 	 case MOTBaseTypeAudio:
@@ -961,7 +964,7 @@
 	 break;
 
 	 case MOTBaseTypeTransport:
-	 saveMOTObject (result, objectName);
+	 saveMOTObject (result, contentType, objectName);
 	 break;
 
 	 case MOTBaseTypeSystem:
@@ -970,36 +973,9 @@
 	 case MOTBaseTypeApplication: { 	// epg data
 	 if ((path_for_files == "") || (theSCANHandler. active ()))
 	 return;
-
 	 if (objectName == QString (""))
-	 objectName = "epg file";
-	 std::vector<uint8_t> epgData (result. begin(), result. end());
-	 QDomDocument epgDocument;
-	 uint8_t docType = epgVertaler. process_epg (epgDocument,
-	 epgData, channel.lto);
-	 if (docType == noType)		// should not happen
-	 break;
-
-	 if (docType == serviceInformationType) {
-	 extractServiceInformation (epgDocument, channel. Eid, true);
-	 return;
-	 }
-	 
-	 QString theName = extractName (objectName);
-	 if (theName == "") 
-	 return;
-	
-	 QString temp = path_for_files +
-	 QString::number (channel. Eid, 16). toUpper () + "/";
-	 if (!QDir (temp). exists ())
-	 QDir (). mkpath (temp);	
-	 theName = temp + theName;
-	 QFile file (QDir::toNativeSeparators (theName));
-	 if (file. open (QIODevice::WriteOnly | QIODevice::Text)) { 
-	 QTextStream stream (&file);
-	 stream << epgDocument. toString ();
-	 file. close ();
-	 }
+	 objectName	= "epgFile";	// should not happen
+	 process_epgData (objectName, result);
 	 }
 	 return;
 
@@ -1007,6 +983,43 @@
 	 break;
 	}
 }
+
+
+void	RadioInterface::process_epgData (const QString &objectName,	
+	 const QByteArray &result) {
+
+std::vector<uint8_t> epgData (result. begin(), result. end());
+QDomDocument epgDocument;
+uint8_t docType = theEpgCompiler. process_epg (epgDocument,
+	 epgData, channel.lto);
+
+	if (docType == noType)		// should not happen
+	 return;
+
+	if (docType == serviceInformationType) {
+	 extractServiceInformation (epgDocument, channel. Eid, true);
+	 return;
+	}
+
+	QString theName = extractName (objectName);
+	if (theName == "") 
+	 return;
+	
+	QString temp = path_for_files +
+	 QString::number (channel. Eid, 16). toUpper () + "/";
+	temp = QDir::toNativeSeparators (temp);
+	theName = temp + theName;
+	if (!QDir (temp). exists ())
+	 QDir (). mkpath (temp);	
+
+	QFile file (QDir::toNativeSeparators (theName));
+	if (file. open (QIODevice::WriteOnly | QIODevice::Text)) { 
+	 QTextStream stream (&file);
+	 stream << epgDocument. toString ();
+	 file. close ();
+	}
+}
+
 //
 //	In the MOT name, we look for a sequence of 8 digits with
 //	some constraints, and then for a sequence of 4 characters
@@ -1063,7 +1076,12 @@
 	if (path_for_files == "")
 	 return;
 
-	QString textName = QDir::toNativeSeparators (path_for_files + name);
+	QString path = path_for_files +
+	 QString::number (channel. Eid, 16). toUpper ();
+	path	+= "/";
+	path	= QDir::toNativeSeparators (path);
+	path	= checkDir (path);
+	QString textName = path + name;
 
 	FILE *x = fopen (textName. toUtf8 (). data (), "w+b");
 	if (x == nullptr) {
@@ -1077,7 +1095,8 @@
 }
 
 void	RadioInterface::saveMOTObject (QByteArray &result,
-	 QString &name) {
+	 int contentType,
+	 QString &name) {
 	if (path_for_files == "")
 	 return;
 
@@ -1086,16 +1105,17 @@
 	 name = "motObject_" + QString::number (counter);
 	 counter ++;
 	}
-	saveMOTtext (result, 5, name);
+	saveMOTtext (result, contentType, name);
 }
 
 //	MOT slide, to show
 void	RadioInterface::showMOTlabel	(QByteArray &data,
-	 int contentType,
+	 int		contentType,
 	 const QString &pictureName,
-	 int dirs,
-	 bool backgroundFlag) {
+	 int		dirs,
+	 uint32_t	SId) {
 const char *type;
+
 	if (!running. load () || (pictureName == QString ("")))
 	 return;
 
@@ -1120,33 +1140,40 @@
 	 return;
 	}
 
-	if (dirs || ((value_i (dabSettings_p, CONFIG_HANDLER,
+	if (theOfdmHandler	-> is_SPI (SId)) {
+	 QString path		= slidePath (true, SId, pictureName);
+	 FILE *x = fopen (path. toUtf8 (). data (), "w+b");
+	 if (x != nullptr) {
+	 theLogger. log (logger::LOG_SLIDE_WRITTEN, pictureName);
+	 (void)fwrite (data. data(), 1, data.length (), x);
+	 fclose (x);
+	 }
+	 return;
+	}
+
+	if (channel. currentService. SId != SId) // current service
+	 return;		// cannot happen
+//
+//	handle slides for current service
+	if (dirs || ((value_i (theQSettings, CONFIG_HANDLER,
 	 SAVE_SLIDES_SETTING, 0) != 0) &&
 	 (path_for_files != ""))) {
-	 QString pict;
-	 if (!dirs) 
-	 pict = path_for_files + pictureName;
-	 else
-	 pict = path_for_files + QString::number (channel. Eid, 16). toUpper () + "/" + pictureName;
-	 QString temp = pict;
-	 temp = temp. left (temp. lastIndexOf (QChar ('/')));
-	 if (!QDir (temp). exists())
-	 QDir (). mkpath (temp);	
-	 pict	= QDir::toNativeSeparators (pict);
+	 QString thePath	= slidePath (dirs, SId, pictureName);
+	 QString pict		= thePath + pictureName;
 	 FILE *x = fopen (pict. toUtf8 (). data (), "w+b");
-	 if (x == nullptr) {
-	 QString t = QString ("Problem opening picture file (writing) ") +
-	 pict;
-	 theErrorLogger. add ("main", t);
-	 }
-	 else {
+	 if (x != nullptr) {
 	 theLogger. log (logger::LOG_SLIDE_WRITTEN, pict);
 	 (void)fwrite (data. data(), 1, data.length(), x);
 	 fclose (x);
 	 }
+	 else {
+	 QString t = QString ("Problem opening picture file (writing) ") +
+	 pict;
+	 theErrorLogger. add ("main", t);
+	 }
 	}
 
-	if (backgroundFlag || dirs)
+	if (dirs)
 	 return;
 
 	QPixmap p;
@@ -1154,6 +1181,31 @@
 	 displaySlide (p);
 }
 //
+//	SPI files are stored in a directory, with as name the EId
+//	of the ensemble. Regular slides are saved (obviously if
+//	the saving is set in the configuration window) in a
+//	directory with the name of the service, that is contained
+//	in a directory with the word "slides-" followed by the Eid
+QString	RadioInterface::slidePath	(bool kort, uint32_t SId,
+	 const QString &pictureName) {
+QString thePath;
+
+	(void)SId;
+	QString theEId = QString::number (channel. Eid, 16). toUpper ();
+	
+	if (kort)
+	 thePath = path_for_files + theEId + "/";
+	else {
+	 thePath = path_for_files + "slides-" +"(" + theEId + ")" + "/";
+	 thePath += channel. currentService. serviceName. trimmed () + "/";
+	}
+	thePath	= QDir::toNativeSeparators (thePath);
+	if (!QDir (thePath). exists ())
+	 QDir (). mkpath (thePath);	
+	return thePath + pictureName;
+}
+
+//
 //	sendDatagram is triggered by the ip handler,
 void	RadioInterface::sendDatagram	(int length) {
 uint8_t *localBuffer = dynVec (uint8_t, length);
@@ -1198,7 +1250,7 @@
 	localBuffer 6 = 0x00;
 	localBuffer 7 = frametype == 0 ? 0 : 0xFF;
 	if (running. load())
-	 dataStreamer_p -> sendData (localBuffer, length + 8);
+	 theDataStreamer -> sendData (localBuffer, length + 8);
 #endif
 }
 /**
@@ -1226,19 +1278,17 @@
 	stopMuting	();
 	setSoundLabel (false);
 	if (channel. etiActive)
-	 theOFDMHandler -> resetEtiGenerator ();
-	myTimeTable. clear ();
-	myTimeTable. hide ();
+	 theOfdmHandler -> resetEtiGenerator ();
 //	and stop the service
 	for (auto &serv :channel. runningTasks) 
 	 stopService (serv);
 //	fprintf (stderr, "All services are halted, now start rebuilding\n");
-	techWindow_p	-> cleanUp ();
+	theTechWindow	-> cleanUp ();
 	for (auto &serv : taskCopy) {
-	 int index = theOFDMHandler -> getServiceComp (serv. serviceName);
+	 int index = theOfdmHandler -> getServiceComp (serv. serviceName);
 	 if (index < 0)
 	 theEnsembleHandler -> remove (serv. serviceName);
-	// hier moet de ensemlelist nog worden aangepast
+	// hier moet de ensemblelist nog worden aangepast
 	 continue;
 	 if (serv. runsBackground)
 	 handle_backgroundTask (serv. serviceName);
@@ -1246,7 +1296,6 @@
 	 startService (serv, index);
 	}
 }
-
 //
 //	In order to not overload with an enormous amount of
 //	signals, we trigger this function at most 10 times a second
@@ -1256,43 +1305,44 @@
 	 return;
 
 	audioTeller ++;
-	if (audioTeller > 10) {
+	if (audioTeller > 20) {
 	 audioTeller = 0;
-	 if (!techWindow_p -> isHidden ())
-	 techWindow_p	-> showRate (rate, ps, sbr);
-	 audiorateLabel	-> setStyleSheet ("color:cyan");
+	 if (!theTechWindow -> isHidden ())
+	 theTechWindow	-> showRate (rate, ps, sbr);
 	 audiorateLabel	-> setText (QString::number (rate));
 	 if (!ps)
 	 psLabel -> setText (" ");
 	 else {
-	 psLabel -> setStyleSheet ("color:cyan"); 
 	 psLabel -> setText ("ps");
 	 }
 	 if (!sbr)
 	 sbrLabel -> setText (" "); 
 	 else {
-	 sbrLabel -> setStyleSheet ("color:cyan");
 	 sbrLabel -> setText ("sbr");
 	 }
 	}
+
 	std::complex<int16_t> vec amount;
-	while (theAudioBuffer. GetRingBufferReadAvailable () > amount) {
+	while (theAudioBuffer. GetRingBufferReadAvailable () >= amount) {
 	 theAudioBuffer. getDataFromBuffer (vec, amount);
+	 if (!theTechWindow -> isHidden ()) {
+	 theTechData. putDataIntoBuffer (vec, amount);
+	 theTechWindow	-> audioDataAvailable (amount, rate);
+	 }
 #ifdef	HAVE_PLUTO_RXTX
-	 if (streamerOut_p != nullptr)
-	 streamerOut_p	-> audioOut (vec, amount, rate);
+	 if (theDabStreamer != nullptr)
+	 theDabStreamer	-> audioOut (vec, amount, rate);
 #endif
 //
 	 std::vector<float> tmpBuffer;
 	 int size = theAudioConverter. convert (vec, amount, rate, tmpBuffer);
 	 if (!muteTimer. isActive ())
-	 soundOut_p -> audioOutput (tmpBuffer. data (), size);
-
-	 if (!techWindow_p -> isHidden ()) {
-	 theTechData. putDataIntoBuffer (vec, amount);
-	 techWindow_p	-> audioDataAvailable (amount, rate);
+	 theAudioPlayer -> audioOutput (tmpBuffer. data (), size);
+	static int ttt = 0;
+	 if (++ ttt > 3) {
+	 setPeakLevel (tmpBuffer);
+	 ttt = 0;
 	 }
-	 setPeakLevel (tmpBuffer);
 	}
 }
 
@@ -1339,6 +1389,15 @@
 	stopScanning ();
 	while (theSCANHandler. active ())
 	 usleep (1000);
+	mapHandler_locker. lock ();
+	if (mapViewer != nullptr) {
+	 delete mapViewer;
+	 mapViewer = nullptr;
+	}
+	if (theControl != nullptr)
+	 delete theControl;
+	theControl		= nullptr;
+	mapHandler_locker. unlock ();
 	theSCANHandler. hide ();
 	channelTimer.	stop	();
 //
@@ -1350,25 +1409,25 @@
 	 stop_etiHandler (); // probably done by stopChannel
 //
 //	after a scan is topped, the scanTable is of no further use
-	if (scanTable_p != nullptr) {
-	 scanTable_p	-> clearTable ();
-	 scanTable_p	-> hide ();
-	 delete scanTable_p;
+	if (theScanTable != nullptr) {
+	 theScanTable	-> clearTable ();
+	 theScanTable	-> hide ();
+	 delete theScanTable;
 	}
 //
 //	handling the aboutLabel
-	if (the_aboutLabel != nullptr) {
-	 the_aboutLabel -> hide ();
-	 delete the_aboutLabel;
+	if (thecopyrightLabel != nullptr) {
+	 thecopyrightLabel -> hide ();
+	 delete thecopyrightLabel;
 	}
 //
-	if (mapHandler != nullptr) {
-	 mapHandler -> stop ();
-	 delete mapHandler;
+	if (mapViewer != nullptr) {
+//	 mapViewer -> stop ();
+	 delete mapViewer;
 	}
 
 //	handling the scanlist
-	if (configHandler_p -> get_clearScanList ())
+	if (theConfigHandler -> get_clearScanList ())
 	 theScanlistHandler. clearScanList ();
 	theScanlistHandler. dump ();
 	theScanlistHandler. hide ();
@@ -1377,62 +1436,54 @@
 //	using a protected pointer
 	theEnsembleHandler	-> hide ();
 
-//	stopChannel will handle the contentTable and timetable
-//	if (contentTable_p != nullptr) {
-//	 contentTable_p -> clearTable ();
-//	 contentTable_p -> hide ();
-//	 delete contentTable_p;
-//	}
-//	myTimeTable.	hide ();
-
 //	should be hidden to ensure the parent can be killed
 	theSNRViewer.	hide ();	
 	theScheduler.	hide ();
 //
 //	store positions of the relevant windows
-	storeWidgetPosition	(dabSettings_p, this, S_MAIN_WIDGET);
+	storeWidgetPosition	(theQSettings, this, S_MAIN_WIDGET);
 	theNewDisplay.		storePosition ();
 	theNewDisplay. hide ();
 	theDXDisplay.		storePosition ();
 	theDXDisplay. hide ();
-	configHandler_p ->	storePosition ();
-	configHandler_p	->	hide ();
-	techWindow_p	->	storePosition ();	
-	techWindow_p 	->	 hide ();
+	theConfigHandler ->	storePosition ();
+	theConfigHandler	->	hide ();
+	theTechWindow	->	storePosition ();	
+	theTechWindow 	->	 hide ();
 	hideButtons	();
 //
 #ifdef	DATA_STREAMER
 	fprintf (stderr, "going to close the dataStreamer\n");
-	delete		dataStreamer_p;
+	delete		theDataStreamer;
 #endif
 #ifdef	CLOCK_STREAMER
 	fprintf (stderr, "going to close the clockstreamer\n");
-	delete	clockStreamer_p;
+	delete	theClockStreamer;
 #endif
 	if (dlTextFile != nullptr)
 	 fclose (dlTextFile);
 #ifdef	HAVE_PLUTO_RXTX
-	if (streamerOut_p != nullptr)
-	 streamerOut_p	-> stop ();
+	if (theDabStreamer != nullptr)
+	 theDabStreamer	-> stop ();
 #endif
-	if (theOFDMHandler != nullptr)	// hould always happen
-	 theOFDMHandler		-> stop ();
-	if (inputDevice_p != nullptr)
-	 delete inputDevice_p;
-	if (soundOut_p != nullptr)
-	 delete soundOut_p;
+	if (theOfdmHandler != nullptr)	// hould always happen
+	 theOfdmHandler		-> stop ();
+	if (theDeviceHandler != nullptr)
+	 delete theDeviceHandler;
+	if (theAudioPlayer != nullptr)
+	 delete theAudioPlayer;
 //	journaline could have been stopped by stopChannel,
 	if (journalineHandler != nullptr) {
 	 delete journalineHandler;
 	 journalineHandler = nullptr;
 	}
 	theLogger. log (logger::LOG_RADIO_STOPS);
-	dabSettings_p	-> sync ();
+	theQSettings	-> sync ();
 	usleep (1000);		// pending signals
 //	everything should be halted by now, start deleting
-	delete		techWindow_p;
-	delete		configHandler_p;
-	delete		theOFDMHandler;
+	delete		theTechWindow;
+	delete		theConfigHandler;
+	delete		theOfdmHandler;
 	hide ();
 	close ();
 	fprintf (stderr, ".. end the radio silences\n");
@@ -1457,28 +1508,31 @@
 	 const float total_time_delta =
 	 static_cast<float> (total_time - previous_total_time);
 	 const float utilization = 100.0 * (1.0 - idle_time_delta / total_time_delta);
-	 configHandler_p -> showLoad (utilization);
+	 theConfigHandler -> showLoad (utilization);
 	 previous_idle_time = idle_time;
 	 previous_total_time = total_time;
 	}
 //
 //	The timer runs autonomously, so it might happen
 //	that it rings when there is no processor running
-	if (!techWindow_p -> isHidden () && soundOut_p -> hasMissed ()) {
+	if (!theTechWindow -> isHidden () && theAudioPlayer -> hasMissed ()) {
 	 int totalSamples	= 0;
 	 int totalMissed	= 0;
-	 soundOut_p -> samplesMissed (totalSamples, totalMissed);
+	 theAudioPlayer -> samplesMissed (totalSamples, totalMissed);
 	 if (totalSamples != 0) {
 	 float correct = (totalSamples - totalMissed) * 100 / totalSamples;
-	 techWindow_p -> showMissed (correct);
+	 theTechWindow -> showMissed (correct);
 	 }
 	}
 }
 //
-//	precondition: everything is quiet
+////////////////////////////////////////////////////////////////////////
+//	selecting and allocating a device
+////////////////////////////////////////////////////////////////////////
+
 deviceHandler	*RadioInterface::createDevice (const QString &s,
 	 logger *theLogger) {
-deviceHandler	*inputDevice = theDeviceChoser.
+deviceHandler	*inputDevice = theDeviceChooser.
 	 createDevice (s, version);
 	
 	(void)theLogger;		// for now
@@ -1494,7 +1548,7 @@
 	connect (inputDevice, &deviceHandler::frameClosed,
 	 this, &RadioInterface::handle_deviceFrame_closed);
 	QString ss = s;
-	store (dabSettings_p, DAB_GENERAL, SELECTED_DEVICE, ss);
+	store (theQSettings, DAB_GENERAL, SELECTED_DEVICE, ss);
 	inputDevice -> setVisibility (true);
 	theNewDisplay. setBitDepth (inputDevice -> bitDepth ());
 	return inputDevice;
@@ -1507,28 +1561,31 @@
 	running. store (false);
 	stopScanning	();
 	stopChannel	();
-	soundOut_p	-> stop ();
-//	soundOut_p	-> suspend ();
-	fprintf (stderr, "disconnecting\n");
-	if (inputDevice_p != nullptr) {
-	 inputDevice_p	-> stopReader	();
-	 inputDevice_p	-> stopDump	();
-	 delete inputDevice_p;
-	 inputDevice_p = nullptr;
+	theAudioPlayer	-> stop ();
+//	theAudioPlayer	-> suspend ();
+//	fprintf (stderr, "disconnecting\n");
+	if (theDeviceHandler != nullptr) {
+	 theDeviceHandler	-> stopReader	();
+	 theDeviceHandler	-> stopDump	();
+	 delete theDeviceHandler;
+	 theDeviceHandler = nullptr;
 	}
 
 	theLogger. log (logger::LOG_NEWDEVICE, deviceName, 
 	 channelSelector -> currentText ());
-	inputDevice_p = createDevice (deviceName, &theLogger);
-	if (inputDevice_p == nullptr) {
-	 inputDevice_p = new deviceHandler ();
+	theDeviceHandler = createDevice (deviceName, &theLogger);
+	if (theDeviceHandler == nullptr) {
+	 theDeviceHandler = new deviceHandler ();
 	 return;		// nothing will happen
 	}
-	theDeviceChoser. hide ();
-	soundOut_p	-> restart ();
+	theDeviceChooser. hide ();
+	theAudioPlayer	-> restart ();
 	startDirect ();		// will set running
 }
 
+///////////////////////////////////////////////////////////////////////
+//	handling time
+////////////////////////////////////////////////////////////////////////
 static
 const char *monthTable = {
 	"jan", "feb", "mar", "apr", "may", "jun",
@@ -1561,7 +1618,7 @@
 	localBuffer 8 = minutes;
 	localBuffer 9 = seconds;
 	if (running. load())
-	 clockStreamer_p -> sendData (localBuffer, 10);
+	 theClockStreamer -> sendData (localBuffer, 10);
 #endif
 	this	-> UTC. year		= year;
 	this	-> UTC. month		= month;
@@ -1569,7 +1626,7 @@
 	this	-> UTC. hour		= h2;
 	this	-> UTC. minute		= m2;
 	QString result;
-	if (configHandler_p -> utcSelector_active ())
+	if (theConfigHandler -> utcSelector_active ())
 	 result	= convertTime (year, month, day, h2, m2);
 	else
 	 result	= convertTime (year, month, day,
@@ -1577,7 +1634,7 @@
 	QDate theDate (year, month, day);
 	channel. theDate = theDate;
 
-	QFont font	= serviceLabel -> font ();
+	QFont font		= serviceLabel -> font ();
 	font. setPointSize (16);
 	font. setBold (true);
 	localTimeDisplay	-> setStyleSheet (labelStyle);
@@ -1605,29 +1662,30 @@
 QString	RadioInterface::convertTime (struct theTime &t) {
 	return convertTime (t. year, t. month, t. day, t. hour, t. minute);
 }
-//
+////////////////////////////////////////////////////////////////////////////
+//	reporting errors
 //	called from the MP4 decoder
 void	RadioInterface::show_frameErrors (int s) {
 	if (!running. load ()) 
 	 return;
-	if (!techWindow_p -> isHidden ())
-	 techWindow_p -> showFrameErrors (s);
+	if (!theTechWindow -> isHidden ())
+	 theTechWindow -> showFrameErrors (s);
 }
 //
 //	called from the MP4 decoder
 void	RadioInterface::show_rsErrors (int s) {
 	if (!running. load ())		// should not happen
 	 return;
-	if (!techWindow_p -> isHidden ())
-	 techWindow_p	-> showRsErrors (s);
+	if (!theTechWindow -> isHidden ())
+	 theTechWindow	-> showRsErrors (s);
 }
 //
-//	called from the NP4 decoder
+//	called from the MP4 decoder
 void	RadioInterface::show_aacErrors (int s) {
 	if (!running. load ())
 	 return;
-	if (!techWindow_p -> isHidden ())
-	 techWindow_p	-> showAacErrors (s);
+	if (!theTechWindow -> isHidden ())
+	 theTechWindow	-> showAacErrors (s);
 }
 //
 //	called from the ficHandler
@@ -1651,7 +1709,7 @@
 	if (!theNewDisplay. isHidden ())
 	 theNewDisplay. showFICBER (ber);
 }
-//
+//////////////////////////////////////////////////////////////////////
 //	called from the PAD handler
 void	RadioInterface::show_mothandling (bool b) {
 static bool old_mot = false;
@@ -1671,19 +1729,18 @@
 }
 //
 //	called from the PAD handler
-
-
 void	RadioInterface::showLabel	(const QString &s, int charset) {
 	(void)charset;
 #ifdef	HAVE_PLUTO_RXTX
-	if ((streamerOut_p != nullptr) && (s != ""))
-	 streamerOut_p -> addRds (std::string (s. toUtf8 (). data ()));
+	if ((theDabStreamer != nullptr) && (s != ""))
+	 theDabStreamer -> addRds (std::string (s. toUtf8 (). data ()));
 #endif
 	
 	if (running. load()) {
 	 dynamicLabel	-> setStyleSheet (labelStyle);
 	 dynamicLabel	-> setText (s);
 	}
+
 	if ((s == "") || (dlTextFile == nullptr) ||
 	 (theDLCache. addifNew (s)))
 	 return;
@@ -1712,19 +1769,19 @@
 	}
 	else
 	 stereoLabel	-> setText (" ");
-	techWindow_p	-> showStereo (b);
+	theTechWindow	-> showStereo (b);
 	stereoSetting = b;
 }
 
 void	RadioInterface::handle_detailButton	() {
 	if (!running. load ())
 	 return;
-	if (techWindow_p -> isHidden ())
-	 techWindow_p -> show ();
+	if (theTechWindow -> isHidden ())
+	 theTechWindow -> show ();
 	else
-	 techWindow_p -> hide ();
-	store (dabSettings_p, DAB_GENERAL, TECHDATA_VISIBLE,
-	 techWindow_p -> isHidden () ? 0 : 1);
+	 theTechWindow -> hide ();
+	store (theQSettings, DAB_GENERAL, TECHDATA_VISIBLE,
+	 theTechWindow -> isHidden () ? 0 : 1);
 }
 //
 //	Whenever the input device is a file, some functions,
@@ -1779,7 +1836,7 @@
 	theLogger. log (logger::LOG_AUDIODUMP_STOPS);
 	theAudioConverter. stop_audioDump ();
 	audioDumping	= false;
-	techWindow_p	-> audiodumpButton_text ("audio dump", 10);
+	theTechWindow	-> audiodumpButton_text ("audio dump", 10);
 }
 
 void	RadioInterface::startAudioDumping () {
@@ -1796,7 +1853,7 @@
 	 channelSelector -> currentText (),
 	 channel. currentService. serviceName);
 	
-	techWindow_p	-> audiodumpButton_text ("writing", 12);
+	theTechWindow	-> audiodumpButton_text ("writing", 12);
 	theAudioConverter. start_audioDump (audioDumpName);
 	audioDumping	= true;
 }
@@ -1805,7 +1862,7 @@
 	if (audioDumping) {
 	 theAudioConverter. stop_audioDump	();
 	 audioDumping		= false;
-	 techWindow_p	-> audiodumpButton_text ("audio dump", 10);
+	 theTechWindow	-> audiodumpButton_text ("audio dump", 10);
 	 return;
 	}
 
@@ -1815,7 +1872,7 @@
 	if (audioDumpName == "")
 	 return;
 
-	techWindow_p	-> audiodumpButton_text ("writing", 12);
+	theTechWindow	-> audiodumpButton_text ("writing", 12);
 	theAudioConverter. start_audioDump (audioDumpName);
 	audioDumping		= true;
 }
@@ -1836,7 +1893,7 @@
 
 	theLogger. log (logger::LOG_FRAMEDUMP_STOPS);
 	fclose (channel. currentService. frameDumper);
-	techWindow_p -> framedumpButton_text ("save AAC/MP2", 10);
+	theTechWindow -> framedumpButton_text ("save AAC/MP2", 10);
 	channel. currentService. frameDumper	= nullptr;
 }
 
@@ -1854,22 +1911,22 @@
 	 channel. currentService. serviceName);
 	QString mode = channel. currentService. ASCTy == DAB_PLUS ?
 	 "recording aac" : "recording mp2";
-	techWindow_p -> framedumpButton_text (mode, 12);
+	theTechWindow -> framedumpButton_text (mode, 12);
 }
 
 void	RadioInterface::scheduled_frameDumping (const QString &s) {
 	if (channel. currentService. frameDumper != nullptr) {
 	 fclose (channel. currentService. frameDumper);
-	 techWindow_p -> framedumpButton_text ("frame dump", 10);
+	 theTechWindow -> framedumpButton_text ("frame dump", 10);
 	 channel. currentService. frameDumper	= nullptr;
 	 return;
 	}
 	audiodata ad;
-	int index = theOFDMHandler -> getServiceComp (s);
+	int index = theOfdmHandler -> getServiceComp (s);
 if (index < 0) 
 return;
 	
-	theOFDMHandler -> audioData (index, ad);
+	theOfdmHandler -> audioData (index, ad);
 	if (!ad. defined)
 	 return;
 	
@@ -1877,11 +1934,8 @@
 	 theFilenameFinder. findFrameDump_fileName (s, ad. ASCTy, false);
 	if (channel. currentService. frameDumper == nullptr)
 	 return;
-	techWindow_p -> framedumpButton_text ("recording", 12);
+	theTechWindow -> framedumpButton_text ("recording", 12);
 }
-//----------------------------------------------------------------------
-//	End of section on dumping
-//----------------------------------------------------------------------
 //
 //	called from the mp4 handler, using a signal
 void	RadioInterface::newFrame (int amount) {
@@ -1900,6 +1954,10 @@
 	}
 }
 
+//----------------------------------------------------------------------
+//	End of section on dumping
+//----------------------------------------------------------------------
+
 void	RadioInterface::handle_spectrumButton	() {
 	if (!running. load ())
 	 return;
@@ -1907,7 +1965,7 @@
 	 theNewDisplay. show ();
 	else
 	 theNewDisplay. hide ();
-	store (dabSettings_p, DAB_GENERAL, NEW_DISPLAY_VISIBLE,
+	store (theQSettings, DAB_GENERAL, NEW_DISPLAY_VISIBLE,
 	 theNewDisplay. isHidden () ? 0 : 1);
 }
 
@@ -1959,9 +2017,9 @@
 	 this, &RadioInterface::handle_scanButton);
 //
 ////	and for the techWindow
-//	connect (techWindow_p. data (), &techData::handleAudioDumping,
+//	connect (theTechWindow. data (), &techWindow::handleAudioDumping,
 //	 this, &RadioInterface::handleAudiodumpButton);
-//	connect (techWindow_p. data (), &techData::handleFrameDumping,
+//	connect (theTechWindow. data (), &techWindow::handleFrameDumping,
 //	 this, &RadioInterface::handleFramedumpButton);
 }
 
@@ -1971,8 +2029,8 @@
 #include <QCloseEvent>
 void RadioInterface::closeEvent (QCloseEvent *event) {
 	
-	int x = configHandler_p -> closeDirect_active ();
-	store (dabSettings_p, CONFIG_HANDLER, CLOSE_DIRECT_SETTING, x);
+	int x = theConfigHandler -> closeDirect_active ();
+	store (theQSettings, CONFIG_HANDLER, CLOSE_DIRECT_SETTING, x);
 	if (x != 0) {
 	 TerminateProcess ();
 	 event -> accept ();
@@ -2104,25 +2162,25 @@
 //	selecting from the preset list and handling delayed services
 void	RadioInterface::handle_presetSelect (const QString &channel,
 	 const QString &service) {
-	if (!inputDevice_p -> isFileInput ())
-	 localSelect_SS (service, channel);
-	else
+	if (theDeviceHandler -> isFileInput ())
 	 QMessageBox::warning (this, tr ("Warning"),
 	 tr ("Selection not possible"));
+	else
+	 localSelect_SS (service, channel);
 }
 //
 //	selecting from the scan list, which is essential
 //	the same as handling form the preset list
 void	RadioInterface::handleScanListSelect (const QString &s) {
-	if (!inputDevice_p -> isFileInput ()) {
-	 QStringList list = splitter (s);
-	 if (list. length () != 2)
-	 return;
-	 localSelect_SS (list. at (1), list. at (0));
-	}
-	else
+	if (!theDeviceHandler -> isFileInput ()) {
 	 QMessageBox::warning (this, tr ("Warning"),
 	 tr ("Selection not possible"));
+	 return;
+	}
+	QStringList list = splitter (s);
+	if (list. length () != 2)
+	 return;
+	localSelect_SS (list. at (1), list. at (0));
 }
 //
 //	selecting from a content description
@@ -2138,9 +2196,9 @@
 	if (list. length () != 2)
 	 return;
 	presetTimer. stop ();
-	fprintf (stderr, "we found %s %s\n",
-	 list. at (1). toLatin1 (). data (),
-	 list. at (0). toLatin1 (). data ());
+//	fprintf (stderr, "we found %s %s\n",
+//	 list. at (1). toLatin1 (). data (),
+//	 list. at (0). toLatin1 (). data ());
 	localSelect_SS (list. at (1), list. at (0));
 }
 //
@@ -2157,16 +2215,16 @@
 	for (int i = service. size (); i < 16; i ++)
 	 serviceName. push_back (' ');
 
-	if (!inputDevice_p -> isFileInput ()) {
+	if (!theDeviceHandler -> isFileInput ()) {
 	 QString theService = service;
 	 QString channelName = theChannel;
-	 store (dabSettings_p, "channelPresets", channelName, theService);
+	 store (theQSettings, "channelPresets", channelName, theService);
 	}
 
 	if (theChannel == channel. channelName) {
 	 channel. currentService. isValid = false;
 	 dabService s;
-	 int index = theOFDMHandler -> getServiceComp (service);
+	 int index = theOfdmHandler -> getServiceComp (service);
 	 if (index < 0) {
 	 dynamicLabel -> setText ("cannot run " + s. serviceName + " yet");
 	 return;
@@ -2191,7 +2249,6 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-//void	RadioInterface::stopService	(dabService s) {
 void	RadioInterface::stopService	(dabService &s) {
 	if (!s. isValid)
 	 return;
@@ -2203,15 +2260,14 @@
 
 	announcement_stop (s. SId);
 	if (s. isAudio) {
-	 soundOut_p -> suspend ();
+	 theAudioPlayer -> suspend ();
 	 stopAudioDumping ();
 	 stopFrameDumping ();
-	 myTimeTable. clear ();
 
 //	and clean up the technical widget
-	 techWindow_p	-> cleanUp ();
+	 theTechWindow	-> cleanUp ();
 //	and stop the service and erase it from the task list
-	 theOFDMHandler -> stopService (s. serviceName,
+	 theOfdmHandler -> stopService (s. serviceName,
 	 s. subChId, FORE_GROUND);
 	 for (int i = 0; i < (int)channel. runningTasks. size (); i ++) {
 	 if (channel. runningTasks i. serviceName == s. serviceName)
@@ -2224,17 +2280,17 @@
 //	stop "secondary services" - if any - as well
 //	Note: they are not recorded on the tasklist
 int nrComps =
- theOFDMHandler -> getNrComps (s. SId);
+ theOfdmHandler -> getNrComps (s. SId);
 	 for (int i = 1; i < nrComps; i ++) {
 	 int index =
- theOFDMHandler -> getServiceComp (s. SId, i);
+ theOfdmHandler -> getServiceComp (s. SId, i);
 if ((index < 0) ||
- (theOFDMHandler -> serviceType (index) != PACKET_SERVICE))
+ (theOfdmHandler -> serviceType (index) != PACKET_SERVICE))
 continue;
 	 packetdata pd;
-	 theOFDMHandler -> packetData (index, pd);
+	 theOfdmHandler -> packetData (index, pd);
 	 if (pd. defined) {
-	 theOFDMHandler -> stopService (pd. serviceName,
+	 theOfdmHandler -> stopService (pd. serviceName,
 	 pd. subchId, BACK_GROUND);
 	 }
 	 }
@@ -2247,7 +2303,7 @@
 //	whether or not the epgService is triggered automatically or manually,
 //	it will run in the background
 void	RadioInterface::start_epgService (packetdata &pd) {
-	theOFDMHandler -> setDataChannel (pd, &theDataBuffer, BACK_GROUND);
+	theOfdmHandler -> setDataChannel (pd, &theDataBuffer, BACK_GROUND);
 	dabService s;
 	s. channel = pd. channel;
 	s. serviceName = pd. serviceName;
@@ -2261,7 +2317,7 @@
 //
 void	RadioInterface::startService (dabService &s, int index) {
 QString serviceName	= s. serviceName;
-	s. SId		= theOFDMHandler -> getSId (index);
+	s. SId		= theOfdmHandler -> getSId (index);
 //	if the service is already running, ignore the call
 	for (auto &serv : channel. runningTasks) {
 	 if (serv. serviceName == serviceName) {
@@ -2275,16 +2331,15 @@
 //	mark the selected service in the service list
 //	and display the servicename on the serviceLabel
 	theEnsembleHandler -> reportStart (serviceName);
-	if (theOFDMHandler -> serviceType (index) == AUDIO_SERVICE) {
+	if (theOfdmHandler -> serviceType (index) == AUDIO_SERVICE) {
 	 audiodata ad;
-	 theOFDMHandler -> audioData (index, ad);
+	 theOfdmHandler -> audioData (index, ad);
 	 ad. channel = channel. channelName;
 	 if (ad. defined) {
 	 channel. currentService. isValid	= true;
 	 channel. currentService. isAudio	= true;
 	 channel. currentService. ASCTy	= ad. ASCTy;
 	 channel. currentService. subChId	= ad. subchId;
-	 techWindow_p -> showTimetableButton (true);
 	 startAudioservice (ad);
 //	 serviceLabel	-> setText (serviceName + "(" + ad. shortName + ")");
 	 serviceLabel	-> setText (serviceName);
@@ -2299,26 +2354,19 @@
 	 }
 	 else
 	 iconLabel -> setText (ad. shortName);
-	 if (myTimeTable. isVisible ()) {
-	 myTimeTable. setUp (channel. theDate, channel. Eid,
-	 channel. currentService. SId,
-	 serviceName);
-	 if (hasIcon)
-	 myTimeTable. addLogo (p);
-	 }
-	 techWindow_p	-> isDABPlus (ad. ASCTy == DAB_PLUS);
 	 }
+	 theTechWindow	-> isDABPlus (ad. ASCTy == DAB_PLUS);
 	}
 	else 
-	if (theOFDMHandler -> serviceType (index) == PACKET_SERVICE) {
+	if (theOfdmHandler -> serviceType (index) == PACKET_SERVICE) {
 	 packetdata pd;
-	 theOFDMHandler -> packetData (index, pd);
+	 theOfdmHandler -> packetData (index, pd);
 	 pd. channel = channel. channelName;
 	 if (!pd. defined) {
 	 QMessageBox::warning (this, tr ("Warning"),
 	 tr ("insufficient data for this program\n"));
 	 QString s = "";
-	 store (dabSettings_p, DAB_GENERAL, PRESET_NAME, s);
+	 store (theQSettings, DAB_GENERAL, PRESET_NAME, s);
 	 return;;
 	 }
 	 if (pd. appType == 7) {
@@ -2334,9 +2382,9 @@
 }
 //
 void	RadioInterface::startAudioservice (audiodata &ad) {
-	(void)theOFDMHandler -> setAudioChannel (ad, &theAudioBuffer,
+	(void)theOfdmHandler -> setAudioChannel (ad, &theAudioBuffer,
 	 nullptr, FORE_GROUND);
-	uint16_t flags	= theOFDMHandler	-> getAnnouncing (ad. SId);
+	uint16_t flags	= theOfdmHandler	-> getAnnouncing (ad. SId);
 	if (flags != 0)
 	 announcement_start (ad. SId, flags);
 	else	
@@ -2351,32 +2399,40 @@
 	channel. runningTasks. push_back (s);
 //
 //	check the other components for this service (if any)
-	if (theOFDMHandler -> isPrimary (ad. serviceName)) {
+	if (theOfdmHandler -> isPrimary (ad. serviceName)) {
 	 int nrComps	=
-	 theOFDMHandler -> getNrComps (ad. SId);
+	 theOfdmHandler -> getNrComps (ad. SId);
 	 for (int i = 1; i < nrComps; i ++) {
 	 int index =
-	 theOFDMHandler -> getServiceComp (ad. SId, i);
+	 theOfdmHandler -> getServiceComp (ad. SId, i);
 	 if ((index < 0) ||
-	 (theOFDMHandler -> serviceType (index) != PACKET_SERVICE))
+	 (theOfdmHandler -> serviceType (index) != PACKET_SERVICE))
 	 continue;
 	 packetdata pd;
-	 theOFDMHandler -> packetData (index, pd);
+	 theOfdmHandler -> packetData (index, pd);
 	 if (pd. defined) {
-	 theOFDMHandler -> setDataChannel (pd, &theDataBuffer,
+	 theOfdmHandler -> setDataChannel (pd, &theDataBuffer,
 	 BACK_GROUND);
 	 }
 	 }
 	}
 //	activate sound
-	soundOut_p		-> resume ();
+	theAudioPlayer		-> resume ();
 	channel. audioActive	= true;
 	setSoundLabel (true);
 	programTypeLabel	-> setText (getProgramType (ad. programType));
 	rateLabel		-> setStyleSheet ("color:magenta");
 	rateLabel		-> setText (QString::number (ad. bitRate) + "kbit");
+	QString protL	= getProtectionLevel (ad. shortForm, ad. protLevel);
+	QString crL	= getCodeRate (ad. shortForm, ad. protLevel);
+	protectionLabel		-> setStyleSheet ("color:red");
+	QFont font		= protectionLabel -> font ();
+	font. setPointSize (9);
+	protectionLabel		-> setFont (font);
+	protectionLabel		-> setText (protL+ " " + crL);
+
 //	show service related data
-	techWindow_p	-> showServiceData 	(&ad);
+	theTechWindow	-> showServiceData 	(&ad);
 }
 
 void	RadioInterface::startPacketservice (packetdata &pd) {
@@ -2386,7 +2442,7 @@
 	 return;
 	}
 
-	if (!theOFDMHandler -> setDataChannel (pd, &theDataBuffer,
+	if (!theOfdmHandler -> setDataChannel (pd, &theDataBuffer,
 	 FORE_GROUND)) {
 	 QMessageBox::warning (this, tr ("sdr"),
 	 tr ("could not start this service\n"));
@@ -2434,10 +2490,11 @@
 	sbrLabel			-> setText ("");
 	audiorateLabel			-> setText ("");
 	rateLabel			-> setText ("");
+	protectionLabel			-> setText ("");
 
 	stereoSetting			= false;
 	setStereo	(false);
-	techWindow_p			-> cleanUp ();
+	theTechWindow			-> cleanUp ();
 	motLabel			-> setStyleSheet ("QLabel {color : red}");
 	distanceLabel			-> setText ("");
 	transmitter_country		-> setText ("");
@@ -2452,8 +2509,6 @@
 
 void	RadioInterface::handle_nextServiceButton () {
 	theEnsembleHandler -> selectNextService ();
-//	stressTimer. setSingleShot (true);
-//	stressTimer. start (1000);
 }
 //
 //	The user(s)
@@ -2467,7 +2522,7 @@
 	 return;
 	presetTimer. stop ();
 
-	if (inputDevice_p -> isFileInput ())
+	if (theDeviceHandler -> isFileInput ())
 	 return;
 
 	if (nextService. channel != channel. channelName)
@@ -2482,7 +2537,7 @@
 	for (int i = presetName. length (); i < 16; i ++)
 	 presetName. push_back (' ');
 	dabService s = nextService;
-	int index = theOFDMHandler	-> getServiceComp (presetName);
+	int index = theOfdmHandler	-> getServiceComp (presetName);
 	if (index < 0) {
 	 dynamicLabel -> setText (QString ("not all data for ") +
 	 s. serviceName + " on board");
@@ -2507,23 +2562,23 @@
 	theEnsembleHandler	-> reset ();
 	theNewDisplay. showFrequency (theChannel, tunedFrequency);
 	presetTimer. stop	();		// should not run
-	inputDevice_p		-> restartReader (tunedFrequency, 
+	theDeviceHandler		-> restartReader (tunedFrequency, 
 	 SAMPLERATE / 10);
 	channel. cleanChannel	();
 	channel. channelName	= theChannel;
 	channel. tunedFrequency	= tunedFrequency;
 	channel. countryName	= "";
 	theLogger. log (logger::LOG_NEW_CHANNEL, theChannel, channel. snr);
-	channel. realChannel	= !inputDevice_p -> isFileInput ();
+	channel. realChannel	= !theDeviceHandler -> isFileInput ();
 	if (channel. realChannel) {
-	 store (dabSettings_p, DAB_GENERAL, CHANNEL_NAME, theChannel);
+	 store (theQSettings, DAB_GENERAL, CHANNEL_NAME, theChannel);
 	}
 
 //	The ".sdr" and ".uff" files - when built by us - carry
 //	the channel frequency in their data
-	if (inputDevice_p -> isFileInput ()) {
+	if (theDeviceHandler -> isFileInput ()) {
 	 channelSelector		-> setEnabled (false);
-	 int freq			= inputDevice_p -> getVFOFrequency ();
+	 int freq			= theDeviceHandler -> getVFOFrequency ();
 	 QString realChannel = theSCANHandler. getChannel (freq);
 	 if (realChannel != "") {
 	 int k = channelSelector -> findText (realChannel);
@@ -2543,25 +2598,27 @@
 	theDXDisplay. setChannel (channel. channelName, channel. ensembleName);
 	theNewDisplay. 		cleanTII	();
 	theNewDisplay. 		showTransmitters (channel. transmitters);
-	if (mapHandler != nullptr)
-	 mapHandler -> putData (MAP_FRAME, position {-1, -1});
+	mapHandler_locker. lock ();
+	if (mapViewer != nullptr) 
+	 mapViewer -> putData (MAP_FRAME);
+	mapHandler_locker. unlock ();
 
 	if (theSCANHandler. active ()) {
-	 theOFDMHandler	-> start ();
+	 theOfdmHandler	-> start ();
 	 return;
 	}
 //
 //	If we are scanning, we do not do delayed service start
 	int switchDelay		=
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 //	if no preset is started, we look in the tables what the servicename
 //	was the last time the channel was active
-	if (!inputDevice_p -> isFileInput () &&
+	if (!theDeviceHandler -> isFileInput () &&
 	 !theSCANHandler. active ()) {
 
 	 if (firstService == "") 	// no preset specified
 	 firstService =
-	 value_s (dabSettings_p, "channelPresets", theChannel, "");
+	 value_s (theQSettings, "channelPresets", theChannel, "");
 //	at this point we do not know whether or not a preset is 
 //	set, so if this mode is "on" and there is a service name
 //	associated with the channel, we set the preset handling on
@@ -2577,7 +2634,7 @@
 	 }
 	}
 //	all set, go for it
-	theOFDMHandler		-> start ();
+	theOfdmHandler		-> start ();
 }
 //
 //	apart from stopping the reader, a lot of administration
@@ -2586,13 +2643,12 @@
 	epgLabel	-> hide ();
 	presetTimer. stop 	();		// if running
 	channelTimer. stop	();		// if running
-	if (myTimeTable. isVisible ()) { 
-	 myTimeTable. clear ();
-	 myTimeTable. hide ();
-	}
+	if (theControl != nullptr)
+	 delete theControl;
+	theControl = nullptr;
 
-	inputDevice_p		-> stopReader	();
-	inputDevice_p		-> stopDump	();
+	theDeviceHandler		-> stopReader	();
+	theDeviceHandler		-> stopDump	();
 	disconnect (ensembleId, &clickablelabel::clicked,
 	 this, &RadioInterface::handle_contentButton);
 	ensembleId	-> setText ("");
@@ -2605,10 +2661,10 @@
 //
 	for (auto &serv : channel. runningTasks) {
 	 if (!serv. runsBackground) 
-	 theOFDMHandler -> stopService (serv. serviceName,
+	 theOfdmHandler -> stopService (serv. serviceName,
 	 serv. subChId, FORE_GROUND);
 	 else
-	 theOFDMHandler -> stopService (serv. serviceName,
+	 theOfdmHandler -> stopService (serv. serviceName,
 	 serv. subChId, BACK_GROUND);
 	
 	 if (serv. fd != nullptr)
@@ -2616,19 +2672,19 @@
 	}
 	channel. runningTasks. resize (0);
 
-	if (contentTable_p != nullptr) {
-	 contentTable_p -> hide ();
-	 delete contentTable_p;
-	 contentTable_p = nullptr;
+	if (theContentTable != nullptr) {
+	 theContentTable -> hide ();
+	 delete theContentTable;
+	 theContentTable = nullptr;
 	}
 
 //	note framedumping - if any - was already stopped
 //	ficDumping - if on - is stopped here
-	theOFDMHandler -> stopFicDump ();	// just in case ...
-	theOFDMHandler		-> stop ();
+	theOfdmHandler -> stopFicDump ();	// just in case ...
+	theOfdmHandler		-> stop ();
 	theDXDisplay. cleanUp ();
 	usleep (1000);
-	techWindow_p	-> cleanUp ();
+	theTechWindow	-> cleanUp ();
 
 	show_pauzeSlide ();
 	channel. cleanChannel	();
@@ -2694,7 +2750,7 @@
 }
 
 void	RadioInterface::startScanning	() {
-	if (inputDevice_p -> isFileInput ()) {
+	if (theDeviceHandler -> isFileInput ()) {
 	 QMessageBox::warning (this, tr ("Warning"),
 	 tr ("Scanning not useful with file input"));
 	 return;
@@ -2704,11 +2760,11 @@
 	presetButton		-> setText ("not in use");
 	presetButton		-> setEnabled (false);
 //	scanning and showing the techWindows does not make much sense
-	techWindow_p 		-> hide ();	// until shown otherwise
- store (dabSettings_p, DAB_GENERAL, TECHDATA_VISIBLE, false);
+	theTechWindow 		-> hide ();	// until shown otherwise
+ store (theQSettings, DAB_GENERAL, TECHDATA_VISIBLE, false);
 	presetTimer. stop ();
 	channelTimer. stop ();
-	connect (theOFDMHandler, &ofdmHandler::noSignalFound,
+	connect (theOfdmHandler, &ofdmHandler::noSignalFound,
 	 this, &RadioInterface::no_signal_found);
 
 	if (theSCANHandler. scan_to_data ())
@@ -2730,9 +2786,9 @@
 //	theSCANHandler. addText (" scanning channel " +
 //	 channelSelector -> currentText ());
 	int switchDelay		=
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 	channelTimer. start (switchDelay);
-	theOFDMHandler	-> setScanMode (true);
+	theOfdmHandler	-> setScanMode (true);
 	startChannel (channelSelector -> currentText ());
 }
 
@@ -2740,11 +2796,11 @@
 basicPrint thePrinter;
 //	theScanlistHandler. clearScanList ();
 	
-	if (scanTable_p == nullptr) 
-	 scanTable_p = new contentTable (this, dabSettings_p, "scan", 
+	if (theScanTable == nullptr) 
+	 theScanTable = new contentTable (this, theQSettings, "scan", 
 	 thePrinter. scanWidth ());
 	else					// should not happen
-	 scanTable_p -> clearTable ();
+	 theScanTable -> clearTable ();
 
 	QString topLine = QString ("ensemble") + ";" +
 	 "channelName" + ";" +
@@ -2754,10 +2810,10 @@
 	 "SNR" + ";" +
 	 "nr services" + ";" ;
 	 
-	scanTable_p	-> addLine (topLine);
-	scanTable_p	-> addLine ("\n");
+	theScanTable	-> addLine (topLine);
+	theScanTable	-> addLine ("\n");
 
-	theOFDMHandler	-> setScanMode (true);
+	theOfdmHandler	-> setScanMode (true);
 	QString fs	= theSCANHandler. getFirstChannel ();
 	int k = channelSelector -> findText (fs);
 	if (k != -1)
@@ -2765,18 +2821,18 @@
 	theSCANHandler. addText (" scanning channel " +
 	 channelSelector -> currentText ());
 	int switchDelay		=
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 	channelTimer. start (switchDelay);
 	startChannel (channelSelector -> currentText ());
 }
 
 void	RadioInterface::startScan_continuous () {
 basicPrint thePrinter;
-	if (scanTable_p == nullptr) 
-	 scanTable_p = new contentTable (this, dabSettings_p, "scan", 
+	if (theScanTable == nullptr) 
+	 theScanTable = new contentTable (this, theQSettings, "scan", 
 	 thePrinter.scanWidth ());
 	else					// should not happen
-	 scanTable_p -> clearTable ();
+	 theScanTable -> clearTable ();
 
 	QString topLine = QString ("ensemble") + ";" +
 	 "channelName" + ";" +
@@ -2790,16 +2846,16 @@
 	 "distance;" +
 	 "azimuth;" +
 	 "height";
-	scanTable_p -> addLine (topLine);
-	scanTable_p	-> addLine ("\n");
+	theScanTable -> addLine (topLine);
+	theScanTable	-> addLine ("\n");
 
-	theOFDMHandler	-> setScanMode (true);
+	theOfdmHandler	-> setScanMode (true);
 // To avoid reaction of the system on setting a different value:
 	QString fs = theSCANHandler. getFirstChannel ();
 	int k = channelSelector -> findText (fs);
 	newChannelIndex (k);
 	int switchDelay		=
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 	channelTimer. start (2 * switchDelay);
 	startChannel (channelSelector -> currentText ());
 }
@@ -2813,7 +2869,7 @@
 	if (!theSCANHandler. active ())
 	 return;
 //	fprintf (stderr, "De scan wordt gestopt\n");
-	disconnect (theOFDMHandler, &ofdmHandler::noSignalFound,
+	disconnect (theOfdmHandler, &ofdmHandler::noSignalFound,
 	 this, &RadioInterface::no_signal_found);
 	presetButton	-> setText ("favorites");
 	presetButton	-> setEnabled (true);
@@ -2832,18 +2888,18 @@
 }
 
 void	RadioInterface::stopScan_to_data () {
-	theOFDMHandler	-> setScanMode (false);
+	theOfdmHandler	-> setScanMode (false);
 	channelTimer. stop ();
 }
 
 void	RadioInterface::stopScan_single () {
-	theOFDMHandler	-> setScanMode (false);
+	theOfdmHandler	-> setScanMode (false);
 	channelTimer. stop ();
 
-	if (scanTable_p == nullptr)
+	if (theScanTable == nullptr)
 	 return;		// should not happen
 
-	if (configHandler_p -> upload_selector_active ()) {
+	if (theConfigHandler -> upload_selector_active ()) {
 	 try {
 	 uploader the_uploader;
 	 QMessageBox::StandardButton reply =
@@ -2854,36 +2910,36 @@
 	 the_uploader. loadUp ("Scan",
 	 0,
 	 "result table",
-	 scanTable_p -> upload ());
+	 theScanTable -> upload ());
 	 }
 	 } catch (...) {}
 	}
 
 	FILE *scanDumper_p	= theSCANHandler. askFileName ();
 	if (scanDumper_p != nullptr) {
-	 scanTable_p -> dump (scanDumper_p);
+	 theScanTable -> dump (scanDumper_p);
 	 fclose (scanDumper_p);
 	 scanDumper_p = nullptr;
 	}
-//	delete scanTable_p;
-//	scanTable_p	= nullptr;
+//	delete theScanTable;
+//	theScanTable	= nullptr;
 }
 
 void	RadioInterface::stopScan_continuous () {
-	theOFDMHandler	-> setScanMode (false);
+	theOfdmHandler	-> setScanMode (false);
 	channelTimer. stop ();
 
-	if (scanTable_p == nullptr)
+	if (theScanTable == nullptr)
 	 return;		// should not happen
 
 	FILE *scanDumper_p	= theSCANHandler. askFileName ();
 	if (scanDumper_p != nullptr) {
-	 scanTable_p -> dump (scanDumper_p);
+	 theScanTable -> dump (scanDumper_p);
 	 fclose (scanDumper_p);
 	 scanDumper_p = nullptr;
 	}
-//	delete scanTable_p;
-//	scanTable_p	= nullptr;
+//	delete theScanTable;
+//	theScanTable	= nullptr;
 }
 
 //	If the ofdm processor has waited - without success -
@@ -2931,7 +2987,7 @@
 	theSCANHandler. addText ("scanning channel " +
 	 channelSelector -> currentText ());
 	int switchDelay	= 
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 	channelTimer. start (switchDelay);
 	startChannel (channelSelector -> currentText ());
 }
@@ -2952,7 +3008,7 @@
 	theSCANHandler. addText ("scanning channel " +
 	 channelSelector -> currentText ());
 	int switchDelay	= 
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 	channelTimer. start (switchDelay);
 	startChannel (channelSelector -> currentText ());
 }
@@ -2966,12 +3022,14 @@
 	int cc	= channelSelector -> findText (cs);
 	newChannelIndex (cc);
 	int switchDelay	= 
-	 configHandler_p -> switchDelayValue ();
+	 theConfigHandler -> switchDelayValue ();
 	channelTimer. start (2 * switchDelay);
 	startChannel (channelSelector -> currentText ());
 }
 
 ////////////////////////////////////////////////////////////////////////////
+//	preparing texts for csv file
+///////////////////////////////////////////////////////////////////////////
 QString RadioInterface::buildHeadLine () {
 QString SNR 		= "SNR " + QString::number (channel. snr);
 QString	tii;
@@ -2985,8 +3043,8 @@
 	 channel. subId);
 	else
 	 tii		= "???";
-	if (channel. transmitterName != "")
-	 theName	= channel. transmitterName;
+	if (channel. strongestTransmitter != "")
+	 theName	= channel. strongestTransmitter;
 	else
 	 theName 	= " ";
 	if (channel. distance > 0) {
@@ -3026,7 +3084,7 @@
 	QString utcTime	= convertTime (UTC. year, UTC.month,
 	 UTC. day, UTC. hour, 
 	 UTC. minute);
-	int	freeSpace	= theOFDMHandler -> freeSpace ();
+	int	freeSpace	= theOfdmHandler -> freeSpace ();
 	QString headLine = channel. ensembleName + ";" +
 	 channel. channelName + ";" +
 	 QString::number (channel. tunedFrequency) + ";" +
@@ -3055,33 +3113,33 @@
 
 void	RadioInterface::show_for_single_scan () {
 QString	headLine = build_kop ();
-	scanTable_p -> addLine (headLine);
-	scanTable_p -> addLine ("\n");
+	theScanTable -> addLine (headLine);
+	theScanTable -> addLine ("\n");
 	for (const auto &tr : channel. transmitters) {
 	 QString transmitterLine = build_transmitterLine (tr);
- scanTable_p	-> addLine (transmitterLine);
+ theScanTable	-> addLine (transmitterLine);
 }
 	basicPrint thePrinter;
-	QStringList s = thePrinter. print (theOFDMHandler -> contentPrint ());
+	QStringList s = thePrinter. print (theOfdmHandler -> contentPrint ());
 	for (const auto &l : s)
-	 scanTable_p -> addLine (l);
-	scanTable_p -> addLine ("\n;\n;\n");
-	scanTable_p -> show ();
+	 theScanTable -> addLine (l);
+	theScanTable -> addLine ("\n;\n;\n");
+	theScanTable -> show ();
 }
 
 void	RadioInterface::show_for_continuous () {
 	QString headLine = buildHeadLine ();
-	scanTable_p -> addLine (headLine);
+	theScanTable -> addLine (headLine);
 
 	for (auto &tr: channel. transmitters) {
 	 if (!tr. isStrongest) {
 	 QString line = build_cont_addLine (tr);
 	 if (line == "")
 	 continue;
-	 scanTable_p -> addLine (line);
+	 theScanTable -> addLine (line);
 	 }
 	}
-	scanTable_p -> show ();
+	theScanTable -> show ();
 }
 
 QString RadioInterface::build_cont_addLine (const transmitter &tr) {
@@ -3128,7 +3186,7 @@
 void	RadioInterface::handle_muteButton	() {
 //	do not activate mute timer if volume == 0
 //	but Volume is only defined with Qt_Audio
-	if ((soundOut_p -> is_QtAudio () && audioVolume == 0) &&
+	if ((theAudioPlayer -> is_QtAudio () && audioVolume == 0) &&
 	 !muteTimer. isActive ())
 	 return;
 	if (muteTimer. isActive ()) {
@@ -3140,7 +3198,7 @@
 	setSoundLabel (false);
 	connect (&muteTimer, &QTimer::timeout,
 	 this, &RadioInterface::muteButton_timeOut);
-	muteDelay	= configHandler_p -> muteValue ();
+	muteDelay	= theConfigHandler -> muteValue ();
 	muteDelay	*= 60;	// seconds
 	muteTimer. start (1000);
 	stillMuting	-> show ();
@@ -3193,62 +3251,56 @@
 //	
 void	RadioInterface::set_Colors () {
 QString scanButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, SCAN_BUTTON + "_color",
+	 value_s (theQSettings, COLOR_SETTINGS, SCAN_BUTTON + "_color",
 	 GREEN);
 QString scanButton_font =
-	 value_s (dabSettings_p, COLOR_SETTINGS, SCAN_BUTTON + "_font",
+	 value_s (theQSettings, COLOR_SETTINGS, SCAN_BUTTON + "_font",
 	 BLACK);
 
 QString spectrumButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, SPECTRUM_BUTTON + "_color",
+	 value_s (theQSettings, COLOR_SETTINGS, SPECTRUM_BUTTON + "_color",
 	 BLUE);
 QString spectrumButton_font =
-	 value_s (dabSettings_p, COLOR_SETTINGS, SPECTRUM_BUTTON + "_font",
+	 value_s (theQSettings, COLOR_SETTINGS, SPECTRUM_BUTTON + "_font",
 	 BLACK);
 QString scanListButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, SCANLIST_BUTTON + "_color",
+	 value_s (theQSettings, COLOR_SETTINGS, SCANLIST_BUTTON + "_color",
 	 GREEN);
 QString scanListButton_font =
-	 value_s (dabSettings_p, COLOR_SETTINGS, SCANLIST_BUTTON + "_font",
+	 value_s (theQSettings, COLOR_SETTINGS, SCANLIST_BUTTON + "_font",
 	 BLACK);
 QString presetButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, PRESET_BUTTON + "_color",
+	 value_s (theQSettings, COLOR_SETTINGS, PRESET_BUTTON + "_color",
 	 GREEN);
 QString presetButton_font =
-	 value_s (dabSettings_p, COLOR_SETTINGS, PRESET_BUTTON + "_font",
+	 value_s (theQSettings, COLOR_SETTINGS, PRESET_BUTTON + "_font",
 	 BLACK);
 QString prevServiceButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS,
+	 value_s (theQSettings, COLOR_SETTINGS,
 	 PREVSERVICE_BUTTON + "_color", YELLOW);
 QString prevServiceButton_font =
-	 value_s (dabSettings_p, COLOR_SETTINGS,
+	 value_s (theQSettings, COLOR_SETTINGS,
 	 PREVSERVICE_BUTTON + "_font", BLACK);
 QString nextServiceButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS,
+	 value_s (theQSettings, COLOR_SETTINGS,
 	 NEXTSERVICE_BUTTON + "_color", YELLOW);
 QString nextServiceButton_font =
-	 value_s (dabSettings_p, COLOR_SETTINGS,
+	 value_s (theQSettings, COLOR_SETTINGS,
 	 NEXTSERVICE_BUTTON + "_font", BLACK);
 
 QString	configButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, CONFIG_BUTTON + "_color",
+	 value_s (theQSettings, COLOR_SETTINGS, CONFIG_BUTTON + "_color",
 	 YELLOW);
 QString configButton_font	=
-	 value_s (dabSettings_p, COLOR_SETTINGS, CONFIG_BUTTON + "_font",
+	 value_s (theQSettings, COLOR_SETTINGS, CONFIG_BUTTON + "_font",
 	 BLACK);
 QString	httpButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, HTTP_BUTTON + "_color",
+	 value_s (theQSettings, COLOR_SETTINGS, HTTP_BUTTON + "_color",
 	 YELLOW);
 QString httpButton_font	=
-	 value_s (dabSettings_p, COLOR_SETTINGS, HTTP_BUTTON + "_font",
+	 value_s (theQSettings, COLOR_SETTINGS, HTTP_BUTTON + "_font",
 	 BLACK);
 
-QString	tiiButton_color =
-	 value_s (dabSettings_p, COLOR_SETTINGS, TII_BUTTON + "_color",
-	 YELLOW);
-QString tiiButton_font	=
-	 value_s (dabSettings_p, COLOR_SETTINGS, TII_BUTTON + "_font",
-	 BLACK);
 
 	QString temp = "QPushButton {background-color: %1; color: %2}";
 	spectrumButton ->
@@ -3269,9 +3321,6 @@
 	httpButton	->
 	 setStyleSheet (temp. arg (httpButton_color,
 	 httpButton_font));
-	tiiButton	->
-	 setStyleSheet (temp. arg (tiiButton_color,
-	 tiiButton_font));
 	prevServiceButton ->
 	 setStyleSheet (temp. arg (prevServiceButton_color,
 	 prevServiceButton_font));
@@ -3312,10 +3361,6 @@
 	setButtonColors (httpButton, HTTP_BUTTON);
 }
 
-void	RadioInterface::color_tiiButton	() 	{
-	setButtonColors (tiiButton, TII_BUTTON);
-}
-
 void	RadioInterface::setButtonColors	(QPushButton *b,
 	 const QString &buttonName) {
 QColor	baseColor, textColor;
@@ -3336,8 +3381,8 @@
 	QString buttonFont	= buttonName + "_font";
 	QString baseColor_name	= baseColor. name ();
 	QString textColor_name	= textColor. name ();
-	store (dabSettings_p, COLOR_SETTINGS, buttonColor, baseColor_name);
-	store (dabSettings_p, COLOR_SETTINGS, buttonFont, textColor_name);
+	store (theQSettings, COLOR_SETTINGS, buttonColor, baseColor_name);
+	store (theQSettings, COLOR_SETTINGS, buttonFont, textColor_name);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -3388,7 +3433,7 @@
 	 return;
 
 	if (s == "exit") {
-	 configHandler_p -> set_closeDirect (true);
+	 theConfigHandler -> set_closeDirect (true);
 	 QWidget::close ();
 	 return;
 	}
@@ -3419,8 +3464,8 @@
 }
 
 void	RadioInterface::scheduledFICDumping () {
-	if (theOFDMHandler -> ficDumping_on ()) {
-	 theOFDMHandler	-> stopFicDump ();
+	if (theOfdmHandler -> ficDumping_on ()) {
+	 theOfdmHandler	-> stopFicDump ();
 	 return;
 	}
 
@@ -3428,25 +3473,7 @@
 	 theFilenameFinder. find_ficDump_file (channel. channelName);
 	if (ficDumpFileName == "")
 	 return;
-	theOFDMHandler -> startFicDump (ficDumpFileName);
-}
-
-void	RadioInterface::handle_timeTable	() {
-	if (myTimeTable. isVisible ()) {
-	 myTimeTable. clear ();
-	 myTimeTable. hide ();
-	 return;
-	}
-	if (!channel. currentService. isValid ||
-	 !channel. currentService. isAudio)
-	 return;
-
-	myTimeTable. setUp (channel. theDate, channel. Eid,
-	 channel. currentService. SId,
-	 channel. currentService. serviceName);
-	QPixmap p;
-	if (get_serviceLogo (p, channel. currentService. SId)) // this may be
-	 myTimeTable. addLogo (p);
+	theOfdmHandler -> startFicDump (ficDumpFileName);
 }
 
 //----------------------------------------------------------------------
@@ -3455,7 +3482,7 @@
 	if (dlTextFile != nullptr) {
 	 fclose (dlTextFile);
 	 dlTextFile = nullptr;
-	 configHandler_p	-> mark_dlTextButton (false);
+	 theConfigHandler	-> mark_dlTextButton (false);
 	 return;
 	}
 
@@ -3463,28 +3490,28 @@
 	dlTextFile	= fopen (fileName. toUtf8 (). data (), "w+");
 	if (dlTextFile == nullptr)
 	 return;
-	configHandler_p -> mark_dlTextButton (true);
+	theConfigHandler -> mark_dlTextButton (true);
 }
 //
 //---------------------------------------------------------------------
 //
 void	RadioInterface::handle_configButton	() {
-	if (!configHandler_p -> isHidden ()) {
-	 configHandler_p -> hide ();	
-	 store (dabSettings_p, DAB_GENERAL, CONFIG_WIDGET_VISIBLE, 0);
+	if (!theConfigHandler -> isHidden ()) {
+	 theConfigHandler -> hide ();	
+	 store (theQSettings, DAB_GENERAL, CONFIG_WIDGET_VISIBLE, 0);
 	}
 	else {
-	 configHandler_p -> show ();
-	 store (dabSettings_p, DAB_GENERAL, CONFIG_WIDGET_VISIBLE, 1);
+	 theConfigHandler -> show ();
+	 store (theQSettings, DAB_GENERAL, CONFIG_WIDGET_VISIBLE, 1);
 	}
 }
 
 void	RadioInterface::handle_devicewidgetButton	() {
-	if (inputDevice_p == nullptr)
+	if (theDeviceHandler == nullptr)
 	 return;
-	int currentVisibility = inputDevice_p -> getVisibility ();
-	inputDevice_p	-> setVisibility (!currentVisibility);
-	store (dabSettings_p, DAB_GENERAL, DEVICE_WIDGET_VISIBLE,
+	int currentVisibility = theDeviceHandler -> getVisibility ();
+	theDeviceHandler	-> setVisibility (!currentVisibility);
+	store (theQSettings, DAB_GENERAL, DEVICE_WIDGET_VISIBLE,
 	 !currentVisibility);
 }
 //
@@ -3493,7 +3520,7 @@
 	if (dlTextFile != nullptr) {
 	 fclose (dlTextFile);
 	 dlTextFile = nullptr;
-	 configHandler_p	-> mark_dlTextButton (false);
+	 theConfigHandler	-> mark_dlTextButton (false);
 	 return;
 	}
 
@@ -3501,7 +3528,7 @@
 	dlTextFile	= fopen (fileName. toUtf8 (). data (), "w+");
 	if (dlTextFile	== nullptr)
 	 return;
-	configHandler_p	-> mark_dlTextButton (true);
+	theConfigHandler	-> mark_dlTextButton (true);
 }
 //
 //	called from the config handler
@@ -3523,18 +3550,18 @@
 	 theSNRViewer. show ();
 	else
 	 theSNRViewer. hide ();
-	store (dabSettings_p, DAB_GENERAL, SNR_WIDGET_VISIBLE,
+	store (theQSettings, DAB_GENERAL, SNR_WIDGET_VISIBLE,
 	 theSNRViewer. isHidden () ? 0 : 1);
 }
 //
 //	called from the configHandler
 void	RadioInterface::handle_set_coordinatesButton	() {
-coordinates theCoordinator (dabSettings_p);
+coordinates theCoordinator (theQSettings);
 	(void)theCoordinator. QDialog::exec();
 	localPos. latitude		=
-	 value_f (dabSettings_p, MAP_HANDLING, HOME_LATITUDE, 0);
+	 value_f (theQSettings, MAP_HANDLING, HOME_LATITUDE, 0);
 	localPos. longitude		=
-	 value_f (dabSettings_p, MAP_HANDLING, HOME_LONGITUDE, 0);
+	 value_f (theQSettings, MAP_HANDLING, HOME_LONGITUDE, 0);
 }
 //
 //	called from the configHandler
@@ -3551,14 +3578,14 @@
 	if (!sourceDumping)
 	 return;
 	theLogger. log (logger::LOG_SOURCEDUMP_STOPS);
-	theOFDMHandler	-> stopDumping();
+	theOfdmHandler	-> stopDumping();
 	sourceDumping	= false;
-	configHandler_p	-> mark_dumpButton (false);
+	theConfigHandler	-> mark_dumpButton (false);
 }
 
 void	RadioInterface::startSourceDumping () {
-QString deviceName	= inputDevice_p -> deviceName	();
-int	bitDepth	= inputDevice_p	-> bitDepth	();
+QString deviceName	= theDeviceHandler -> deviceName	();
+int	bitDepth	= theDeviceHandler	-> bitDepth	();
 QString channelName	= channel. channelName;
 	if (theSCANHandler. active ())
 	 return;
@@ -3570,11 +3597,11 @@
 
 	theLogger. log (logger::LOG_SOURCEDUMP_STARTS,
 	 deviceName, channelName);
-	configHandler_p	-> mark_dumpButton (true);
-	theOFDMHandler -> startDumping (rawDumpName,
+	theConfigHandler	-> mark_dumpButton (true);
+	theOfdmHandler -> startDumping (rawDumpName,
 	 channel. tunedFrequency, 
 	 bitDepth,
-	 inputDevice_p -> deviceName ());
+	 theDeviceHandler -> deviceName ());
 	sourceDumping = true;
 }
 
@@ -3589,33 +3616,37 @@
 
 void	RadioInterface::handle_LoggerButton (int s) {
 	(void)s;
-	if (configHandler_p -> logger_active ()) {
+	if (theConfigHandler -> logger_active ()) {
 	 theLogger. logging_starts ();
-	 store (dabSettings_p, DAB_GENERAL, LOG_MODE, 1);
+	 store (theQSettings, DAB_GENERAL, LOG_MODE, 1);
 	}
 	else {
 	 theLogger. logging_stops ();
-	 store (dabSettings_p, DAB_GENERAL, LOG_MODE, 0);
+	 store (theQSettings, DAB_GENERAL, LOG_MODE, 0);
 	}
 }
 
 void	RadioInterface::set_transmitters_local (bool isChecked) {
 	channel. targetPos	= position {0, 0};
-	if ((isChecked) && (mapHandler != nullptr))
-	 mapHandler -> putData (MAP_RESET, channel. targetPos);
+	if (isChecked) {
+	 mapHandler_locker. lock ();
+	 if (mapViewer != nullptr)
+	 mapViewer -> putData (MAP_RESET);
+	 mapHandler_locker. unlock ();
+	}
 }
 
 void	RadioInterface::selectDecoder (int decoder) {
-	if (theOFDMHandler != nullptr)
-	 theOFDMHandler	-> handleDecoderSelector (decoder);
+	if (theOfdmHandler != nullptr)
+	 theOfdmHandler	-> handleDecoderSelector (decoder);
 }
 
 void	RadioInterface:: set_streamSelector (int k) {
 	if (!running. load ())
 	 return;
-	QString str = configHandler_p -> currentStream ();
-	((audioSink *)(soundOut_p)) -> selectDevice (k, str);
-	store (dabSettings_p, SOUND_HANDLING, AUDIO_STREAM_NAME, str);
+	QString str = theConfigHandler -> currentStream ();
+	((audioSink *)(theAudioPlayer)) -> selectDevice (k, str);
+	store (theQSettings, SOUND_HANDLING, AUDIO_STREAM_NAME, str);
 }
 //
 //////////////////////////////////////////////////////////////////////////
@@ -3629,16 +3660,38 @@
 bool	RadioInterface::autoStart_http () {
 	if (localPos. latitude == 0) 
 	 return false;
-	if (mapHandler != nullptr) 
+	if (mapViewer != nullptr) 
 	 return false;
 
-	mapHandler = new httpHandler (this,
-	 localPos,
-	 "",
-	 configHandler_p -> localBrowserSelector_active (),	 dabSettings_p);
-	return mapHandler != nullptr;
+	try {
+	 mapViewer = new httpHandler (this,
+	 ":res/qt-map-69.html",
+	 localPos,
+	 theConfigHandler -> localBrowserSelector_active (),
+	 	 theConfigHandler -> get_close_mapSelector (),	
+	 "",
+	 theQSettings);
+	} catch (int e) {}
+	return mapViewer != nullptr;
 }
-
+//
+//
+//	handling the httpButton has some interesting aspects
+//	while it is obvious to start not only a server, but also
+//	a browser with the web, killing both is less obvious.
+//	If the "user" kills the broweser containing the map,
+//	a simple timeout is sufficient to handle the killing of
+//	the server.
+//	If, however, the user touches the httpButton to stop the
+//	webbrowsing, a special "token" is sent to the browser which
+//	is understood by the javascript code (we hope).
+//	The response is - at least in most cases - an error, caught
+//	by the httphandler, telling to inform the "radio" to stop
+//	the http server. It turned out that just killing the http server
+//	from within the signal code caused - sometimes - a crash
+//	That is why an indirection is added, the radio code will wait 
+//	for a number of seconds for a signal to arrive to kill the http handler
+static int teller = 0;
 //	ensure that we only get a handler if we have a start location
 void	RadioInterface::handle_httpButton	() {
 	if (localPos. latitude == 0) {
@@ -3647,32 +3700,80 @@
 	 return;
 	}
 
-	if (mapHandler == nullptr) {
-	 mapHandler = new httpHandler (this,
-	 localPos,
-	 QString (""),
-	 configHandler_p -> localBrowserSelector_active (),
-	 dabSettings_p);
-	 if (mapHandler != nullptr)
+	if (mapViewer == nullptr) {
+	 try {
+	 bool sf = value_i (theQSettings, CONFIG_HANDLER, SAVE_HTTP, 0);
+	 QString saveName;
+	 if (sf)
+	 saveName =
+	 theFilenameFinder.
+	 find_mapdumpName (theDeviceHandler -> deviceName ());
+	 mapViewer = new httpHandler (this,
+	 ":res/qt-map-69.html",
+	 localPos,
+	 theConfigHandler -> localBrowserSelector_active (),
+	 	 theConfigHandler -> get_close_mapSelector (),
+	 saveName,
+	 theQSettings);
+	 } catch (int e) {}
+	 if (mapViewer != nullptr)
 	 httpButton -> setText ("http-on");
 	}
-	else {
-	 locker. lock ();
-	 delete mapHandler;
-	 mapHandler = nullptr;
-	 locker. unlock ();
-	 httpButton	-> setText ("http");
+	else {		// forced stop
+//	Two options. If the server is running, issue a mapClose
+//	request. If the server is running without a map just delete
+	 if (mapViewer == nullptr) 	// nothing to do
+	 return;
+	 int auto_http = value_i (theQSettings, CONFIG_HANDLER,
+ AUTO_HTTP, 0);
+	 if ((auto_http != 0) ||
+	 !theConfigHandler -> get_close_mapSelector () ||
+	 !mapViewer -> isConnected ()) {
+	 cleanUp_mapHandler ();
+	 return;
+	 }
+//	handler is running and we want the map closed
+//	we send a signal, and "poll" for the result
+	 mapHandler_locker. lock ();
+	 mapViewer -> putData (MAP_CLOSE);
+	 mapHandler_locker. unlock ();
+	 teller	= 0;
+	 stillWaiting	= true;
+	 connect (&theTimer, &QTimer::timeout,
+	 this, &RadioInterface::waitingToDelete);
+	 theTimer. start (1000);
 	}
 }
 
-void	RadioInterface::http_terminate	() {
+void	RadioInterface::waitingToDelete () {
+	teller ++;
+	if ((teller < 10) && stillWaiting) {
+	 theTimer. start (1000);
+	 return;
+	}
+	disconnect (&theTimer, &QTimer::timeout,
+ this, &RadioInterface::waitingToDelete);
+	cleanUp_mapHandler ();
+}
+
+void	RadioInterface::cleanUp_mapHandler () {
+	disconnect (mapViewer, &httpHandler::mapClose_processed,
+	 this, &RadioInterface::http_terminate);
+//	fprintf (stderr, "Going to delete mapserver\n");
 	locker. lock ();
-	if (mapHandler != nullptr) {
-	 delete mapHandler;
-	 mapHandler = nullptr;
+	if (mapViewer != nullptr) {
+	 mapViewer -> close ();
+	 delete mapViewer;
+	 mapViewer	= nullptr;
 	}
 	locker. unlock ();
 	httpButton -> setText ("http");
+//	fprintf (stderr, "mapViewer is gone\n");
+}
+//
+//	
+void	RadioInterface::http_terminate	() {
+	stillWaiting = false;
 }
 
 void	RadioInterface::displaySlide	(const QPixmap &p, const QString &t) {
@@ -3698,7 +3799,7 @@
 //	int nr		= rand () % 11;
 	slideName	= slideName. arg (pauzeSlideTeller);
 	if (p. load (slideName, "png")) {
-	QString tooltipText;
+	QString tooltipText = "";
 	 switch (pauzeSlideTeller) {
 	 case 2:
 	 tooltipText = "homebrew 60-ies";
@@ -3754,7 +3855,7 @@
 	 return;
 
 	theLogger. log (logger::LOG_ETI_STOPS);
-	theOFDMHandler -> stopEtiGenerator ();
+	theOfdmHandler -> stopEtiGenerator ();
 	channel. etiActive = false;
 	scanButton	-> setText ("eti");
 }
@@ -3769,15 +3870,15 @@
 	 return;
 
 	theLogger. log (logger::LOG_ETI_STARTS, 
-	 inputDevice_p -> deviceName (),
+	 theDeviceHandler -> deviceName (),
 	 channel. channelName);
-	channel. etiActive = theOFDMHandler -> startEtiGenerator (etiFile);
+	channel. etiActive = theOfdmHandler -> startEtiGenerator (etiFile);
 	if (channel. etiActive) 
 	 scanButton -> setText ("eti runs");
 }
 
 void	RadioInterface::handle_eti_activeSelector (int k) {
-bool setting	= configHandler_p -> eti_active ();
+bool setting	= theConfigHandler -> eti_active ();
 	(void)k;
 	if (setting) {
 	 stopScanning ();
@@ -3787,7 +3888,7 @@
 	 this, &RadioInterface::handle_etiHandler);
 	 scanButton -> setEnabled (true);
 	 scanButton	-> setText ("eti");
-//	 if (!inputDevice_p -> isFileInput ())// restore the button' visibility
+//	 if (!theDeviceHandler -> isFileInput ())// restore the button' visibility
 	 scanButton -> show ();
 	 return;
 	}
@@ -3799,7 +3900,7 @@
 	connect (scanButton, &QPushButton::clicked,
 	 this, &RadioInterface::handle_scanButton);
 	scanButton -> setText ("scan");
-	if (inputDevice_p -> isFileInput ())	// hide the button now
+	if (theDeviceHandler -> isFileInput ())	// hide the button now
 	 scanButton -> hide ();
 }
 
@@ -3818,8 +3919,8 @@
 }
 
 void	RadioInterface::handle_tiiThreshold	(int v) {
-	store (dabSettings_p, CONFIG_HANDLER, TII_THRESHOLD, v);
-	theOFDMHandler -> setTIIThreshold (v);
+	store (theQSettings, CONFIG_HANDLER, TII_THRESHOLD, v);
+	theOfdmHandler -> setTIIThreshold (v);
 }
 
 void	RadioInterface::show_tii_spectrum	() {
@@ -3827,16 +3928,16 @@
 
 	if (theTIIBuffer. GetRingBufferReadAvailable () < SAMPLERATE / 1000)
 	 return;
+	
 	theTIIBuffer. getDataFromBuffer (inBuffer. data (), SAMPLERATE / 1000);
 	theTIIBuffer. FlushRingBuffer ();
 	if (!theNewDisplay. isHidden () &&
 	 (theNewDisplay. getTab () == SHOW_TII)) {
 	 if (channel. subId != 0)
 	 theNewDisplay. showTII (inBuffer,
-	 channel. tunedFrequency, channel. subId);
+	 channel. tunedFrequency, channel. subId);
 	 else
-	 theNewDisplay. showTII (inBuffer,
-	 channel. tunedFrequency, -1);
+	 theNewDisplay. showTII (inBuffer, channel. tunedFrequency, -1);
 	}
 }
 
@@ -3849,9 +3950,9 @@
 	if (!theNewDisplay. isHidden ()) {
 	 if (theNewDisplay. getTab () == SHOW_CORRELATION)
 	 theNewDisplay. showCorrelation (inBuffer,
-	 maxVals,
-	 g,
-	 channel. transmitters);
+	 maxVals,
+	 g,
+	 channel. transmitters);
 	}
 }
 
@@ -3909,7 +4010,7 @@
 	 QString country	= find_ITU_code (channel. eccByte,
 	 (channel. Eid >> 12) &0xF);
 	 channel. countryName	= country;
-	 channel. transmitterName = "";
+	 channel. strongestTransmitter = "";
 	 transmitter_country	-> setText (country);
 	}
 
@@ -3948,7 +4049,7 @@
 	 transmitter theTransmitter (tr);
 //
 	 if (!tr -> valid) {		// nothing found
-	 if (!configHandler_p -> get_allTIISelector ())
+	 if (!theConfigHandler -> get_allTIISelector ())
 	 continue;
 	 theTransmitter. valid	= false;
 	 theTransmitter. ensemble	= channel. ensembleName;
@@ -3967,8 +4068,17 @@
 	 }
 	 else {
 //	first copy the db data, theTransmitter is properly initalized
-//	with the db Calues, now the dynamics
-	 theTransmitter. valid	= true;
+//	with the db Values, now the dynamics
+//	we could just check on the ensemblename, however,
+//	the name in the database is not always equal to the ensemblename
+//	 if (!theConfigHandler -> get_allTIISelector () &&
+//	 (theTransmitter. ensemble. trimmed () !=
+//	 channel. ensembleName. trimmed ()))
+//	 continue;	
+//	 else
+//	 theTransmitter. valid	=
+//	 theTransmitter. ensemble. trimmed () ==
+//	 channel. ensembleName. trimmed ();
 	 position thePosition;
 	 thePosition. latitude = theTransmitter. latitude;
 	 thePosition. longitude = theTransmitter. longitude;
@@ -3980,15 +4090,13 @@
 	 theTransmitter. collision	= r i. collision;
 	 theTransmitter. pattern	= r i. pattern;
 	 theTransmitter. isStrongest	= false;
+	 theTransmitter. valid	= true;
 	 channel. transmitters. push_back (theTransmitter);	
-//	 transmitterDesc t = {true, false, theTransmitter};
-//	 channel. transmitters. push_back (t);	
 	 }
 	 if (dxMode)
 	 addtoLogFile (&theTransmitter);
 //	 need_to_print = true;
 	}
-
 //
 	int	bestIndex = -1;
 	float Strength	= -100;
@@ -4004,7 +4112,6 @@
 	 teller ++;
 	}
 
-
 	if (bestIndex >= 0) {
 	 channel. transmitters bestIndex. isStrongest = true;
 	}
@@ -4015,12 +4122,27 @@
 	 transmitter *ce = &channel. transmitters bestIndex;	
 	 channel. mainId		= ce -> mainId;
 	 channel. subId		= ce -> subId;
-	 channel. transmitterName	= ce -> transmitterName;
+	 channel. strongestTransmitter	= ce -> transmitterName;
 	 channel. height		= ce -> height;
 	 channel. distance		= ce -> distance;
 	 channel. azimuth		= ce -> azimuth; 
 	}
 
+	// just show on the main widget the strongest
+	for (auto &theTr: channel. transmitters) {
+	 if (theTr. distance < 0)
+	 continue;
+	 if (theTr. isStrongest) {
+	 QString labelText = createTIILabel (theTr);
+	 
+	 QFont font	= distanceLabel -> font ();
+	 font. setPointSize (9);
+	 distanceLabel	-> setFont (font);
+	 distanceLabel	-> setText (labelText);
+	 break;
+	 }
+	}
+
 //	if the list has somehow changed, rewrite it
 	if (dxMode) {
 	 theDXDisplay. cleanUp ();
@@ -4029,7 +4151,7 @@
 	 channel. ensembleName);
 	 int teller = 0;
 	 for (auto &theTr : channel. transmitters) {
-	 if (!configHandler_p -> get_allTIISelector ()) {
+	 if (!theConfigHandler -> get_allTIISelector ()) {
 	 if (theTr. distance < 0) {
 	 continue;
 	 }
@@ -4044,40 +4166,22 @@
 	 teller ++;
 	 }
 	}
-	else {	// just show on the main widget the strongest
-	 for (auto &theTr: channel. transmitters) {
-	 if (theTr. distance < 0)
-	 continue;
-	 if (theTr. isStrongest) {
-	 QString labelText = createTIILabel (theTr);
-	 
-	 QFont font	= distanceLabel -> font ();
-	 font. setPointSize (9);
-	 distanceLabel	-> setFont (font);
-	 distanceLabel	-> setText (labelText);
-	 break;
-	 }
-	 }
-	}
 //
-	if (mapHandler == nullptr)
+	if (mapViewer == nullptr)
 	 return;
 //
 	for (auto &theTr : channel. transmitters) {
 	 if (theTr. transmitterName == "not in database")
 	 continue;
 
-	 uint8_t key = configHandler_p -> showAll_Selector_active () ?
+	 uint8_t key = theConfigHandler -> showAll_Selector_active () ?
 	 SHOW_ALL: SHOW_SINGLE;
 	 
-	 QDateTime theTime = 
-	 configHandler_p -> utcSelector_active () ?
-	 QDateTime::currentDateTimeUtc () :
-	 QDateTime::currentDateTime ();
-
-	 mapHandler -> putData (key,
-	 theTr,
-	 theTime. toString (Qt::TextDate));
+	 bool utc		= theConfigHandler -> utcSelector_active ();
+	 mapHandler_locker. lock ();
+	 if (mapViewer != nullptr)
+	 mapViewer -> putData (key, theTr, utc);
+	 mapHandler_locker. unlock ();
 	}
 }
 
@@ -4148,8 +4252,8 @@
 void	RadioInterface::show_rsCorrections	(int c, int ec) {
 	if (!running)
 	 return;
-	if (!techWindow_p -> isHidden ())
-	 techWindow_p -> showRsCorrections (c, ec);
+	if (!theTechWindow -> isHidden ())
+	 theTechWindow -> showRsCorrections (c, ec);
 }
 //
 //	called from the ofdm handler
@@ -4181,7 +4285,7 @@
 }
 
 void	RadioInterface::handle_iqSelector () {
-	theOFDMHandler -> handleIQSelector ();
+	theOfdmHandler -> handleIQSelector ();
 }
 
 void	RadioInterface::showPeakLevel (float iPeakLeft, float iPeakRight) {
@@ -4198,7 +4302,7 @@
 
 void RadioInterface::handle_presetButton () { 
 	int mode = theEnsembleHandler -> getShowMode ();
-	if (inputDevice_p -> isFileInput ()) {
+	if (theDeviceHandler -> isFileInput ()) {
 	 mode = SHOW_ENSEMBLE;
 	 presetButton -> setText ("favorites");
 	 theEnsembleHandler -> setShowMode (mode);
@@ -4220,33 +4324,38 @@
 	 setPixmap (p. scaled (30, 30, Qt::KeepAspectRatio));
 }
 	
-void	RadioInterface::handle_aboutLabel () { 
-	if (the_aboutLabel == nullptr) {
-	 the_aboutLabel = new AboutDialog (nullptr);
-	 the_aboutLabel -> show ();
+void	RadioInterface::handle_copyrightLabel () { 
+	if (thecopyrightLabel == nullptr) {
+	 thecopyrightLabel	= new copyrightText (this, ".9.6");
+	 thecopyrightLabel -> show ();
 	 return;
 	}
-	delete the_aboutLabel;
-	the_aboutLabel	= nullptr;
+	copyrightText_closed ();
+}
+//
+//	killing the window generates a signal
+void	RadioInterface::copyrightText_closed	() {
+	delete thecopyrightLabel;
+	thecopyrightLabel	= nullptr;
 }
 //
 //	Starting a background task is by clicking with the right mouse button
 //	on the servicename, swrvice is known to be in current ensemble
 void	RadioInterface::handle_backgroundTask (const QString &service) {
 audiodata ad;
-	int index = theOFDMHandler -> getServiceComp (service);
+	int index = theOfdmHandler -> getServiceComp (service);
 	if (index < 0)
 	 return;
-	if (theOFDMHandler -> serviceType (index) != AUDIO_SERVICE)
+	if (theOfdmHandler -> serviceType (index) != AUDIO_SERVICE)
 	 return;
-	theOFDMHandler -> audioData (index, ad);
+	theOfdmHandler -> audioData (index, ad);
 	if (!ad. defined)
 	 return;
 	
 	int teller	= 0;
 	for (auto &task: channel. runningTasks) {
 	 if (task. serviceName == service) {
-	 theOFDMHandler -> stopService (service, ad. subchId, BACK_GROUND);
+	 theOfdmHandler -> stopService (service, ad. subchId, BACK_GROUND);
 	 if (task. fd != nullptr)
 	 fclose (task. fd);
 	 channel. runningTasks. erase
@@ -4261,7 +4370,7 @@
 	if (f == nullptr)
 	 return;
 
-	(void)theOFDMHandler ->
+	(void)theOfdmHandler ->
 	 setAudioChannel (ad, &theAudioBuffer, f, BACK_GROUND);
 	dabService s;
 	s. channel	= ad. channel;
@@ -4281,7 +4390,7 @@
 	if (!color. isValid ())
 	 return;
 	labelStyle		= "color:" + color. name ();
-	store (dabSettings_p, COLOR_SETTINGS, LABEL_COLOR, labelStyle);
+	store (theQSettings, COLOR_SETTINGS, LABEL_COLOR, labelStyle);
 	QFont font	= serviceLabel -> font ();
 	font. setPointSize (16);
 	font. setBold (true);
@@ -4295,19 +4404,19 @@
 }
 
 void	RadioInterface::handle_techFrame_closed () {
-	store (dabSettings_p, DAB_GENERAL, TECHDATA_VISIBLE, 0);
+	store (theQSettings, DAB_GENERAL, TECHDATA_VISIBLE, 0);
 }
 
 void	RadioInterface::handle_configFrame_closed () {
-	store (dabSettings_p, DAB_GENERAL, CONFIG_WIDGET_VISIBLE, 0);
+	store (theQSettings, DAB_GENERAL, CONFIG_WIDGET_VISIBLE, 0);
 }
 
 void	RadioInterface::handle_deviceFrame_closed () {
-	store (dabSettings_p, DAB_GENERAL, DEVICE_WIDGET_VISIBLE, 0);
+	store (theQSettings, DAB_GENERAL, DEVICE_WIDGET_VISIBLE, 0);
 }
 
 void	RadioInterface::handle_newDisplayFrame_closed () {
-	store (dabSettings_p, DAB_GENERAL, NEW_DISPLAY_VISIBLE, 0);
+	store (theQSettings, DAB_GENERAL, NEW_DISPLAY_VISIBLE, 0);
 }
 
 void	RadioInterface::setVolume	(int n) {
@@ -4323,8 +4432,8 @@
 	 }
 	 if (channel. audioActive)
 	 setSoundLabel (true);
-	 ((Qt_Audio *)soundOut_p) -> setVolume (n);
-	 store (dabSettings_p, SOUND_HANDLING, QT_AUDIO_VOLUME, audioVolume);
+	 ((Qt_Audio *)theAudioPlayer) -> setVolume (n);
+	 store (theQSettings, SOUND_HANDLING, QT_AUDIO_VOLUME, audioVolume);
 	}
 }
 
@@ -4338,9 +4447,9 @@
 
 void	RadioInterface::handle_correlationSelector	(int d) {
 	(void)d;
-	bool b = configHandler_p -> get_correlationSelector ();
-	store (dabSettings_p, CONFIG_HANDLER, S_CORRELATION_ORDER, b ? 1 : 0);
-	theOFDMHandler -> setCorrelationOrder (b);
+	bool b = theConfigHandler -> get_correlationSelector ();
+	store (theQSettings, CONFIG_HANDLER, S_CORRELATION_ORDER, b ? 1 : 0);
+	theOfdmHandler -> setCorrelationOrder (b);
 }
 
 void	RadioInterface::channelSignal (const QString &channel) {
@@ -4369,15 +4478,11 @@
 }
 
 void	RadioInterface::handle_folderButton	() {
-	QString tempPath	= theFilenameFinder. basicPath ();
-#ifdef __MINGW32__
-	LPCWSTR temp = (const wchar_t *)tempPath. utf16 ();
-	ShellExecute (nullptr, L"open", temp,
-	 nullptr, nullptr, SW_SHOWDEFAULT);
-#else
-	std::string x = "xdg-open " + tempPath. toStdString ();
-	(void)system (x. c_str ());
-#endif
+QString Qt_files	= theFilenameFinder. basicPath ();
+	Qt_files	= checkDir (Qt_files);
+//
+//	we never know whether or not all spaces are removed
+	QDesktopServices::openUrl (QUrl (Qt_files, QUrl::TolerantMode));
 }
 
 const char *directionTable = {
@@ -4458,39 +4563,32 @@
 	fclose (theFile);
 }
 
-void	RadioInterface::handle_tiiButton () {
+void	RadioInterface::handle_distanceLabel () {
 	dxMode	= !dxMode;
-	store (dabSettings_p, CONFIG_HANDLER, S_DX_MODE, dxMode ? 1 : 0);
+	store (theQSettings, CONFIG_HANDLER, S_DX_MODE, dxMode ? 1 : 0);
 	theDXDisplay. cleanUp ();
 	if (!dxMode) {
 	 theDXDisplay. hide ();
-	 tiiButton	-> setText ("dx display");
 	}
 	if (dxMode) {
-	 distanceLabel	-> setText ("");
 	 theDXDisplay. show ();
-	 tiiButton	-> setText ("tii local");
 	}
-	theOFDMHandler -> setDXMode (dxMode);
+	theOfdmHandler -> setDXMode (dxMode);
 }
 
 void	RadioInterface::handle_tiiCollisions (int b) {
-	theOFDMHandler	-> setTIICollisions (b);
-}
-
-void	RadioInterface::handle_tiiFilter (bool b) {
-	theOFDMHandler	-> setTIIFilter	(b);
+	theOfdmHandler	-> setTIICollisions (b);
 }
 
-void	RadioInterface::process_tiiSelector	(bool b) {
-	theOFDMHandler	-> selectTII (b ? 1 : 0);
-}
+//void	RadioInterface::handle_tiiFilter (bool b) {
+//	theOfdmHandler	-> setTIIFilter	(b);
+//}
 
 void	RadioInterface::deviceListChanged	() {
 #ifndef	TCP_STREAMER
-QStringList streams	= ((Qt_Audio *)soundOut_p) -> streams ();
-	configHandler_p -> fill_streamTable (streams);
-	configHandler_p -> show_streamSelector (true);
+QStringList streams	= ((Qt_Audio *)theAudioPlayer) -> streams ();
+	theConfigHandler -> fill_streamTable (streams);
+	theConfigHandler -> show_streamSelector (true);
 #endif
 }
 
@@ -4566,14 +4664,14 @@
 int	RadioInterface::processService (const QDomElement &service) {
 mmDescriptor pictures;
 	uint32_t serviceId =
-	 xmlHandler. serviceSid (service);
+	 theXmlExtractor. serviceSid (service);
 	pictures. serviceId = serviceId;
 	QDomElement mediaDescription =
 	 service. firstChildElement ("mediaDescription");
 	while (!mediaDescription. isNull ()) {
 	 QDomElement multimedia = 
 	 mediaDescription. firstChildElement ("multimedia");
-	 multimediaElement mE = xmlHandler. extract_multimedia (multimedia);
+	 multimediaElement mE = theXmlExtractor. extract_multimedia (multimedia);
 	 if (mE. valid) {
 	 pictures. elements. push_back (mE);
 	 }
@@ -4659,16 +4757,16 @@
 
 void	RadioInterface::setFreqList	() {
 	std::vector<int> freqList =
-	 theOFDMHandler -> getFrequency (channel.
+	 theOfdmHandler -> getFrequency (channel.
 	 currentService. serviceName);
 	if (freqList. size () == 0)
 	 return;
 	channel. currentService. fmFrequencies = freqList;
-	techWindow_p	-> updateFM (freqList);
+	theTechWindow	-> updateFM (freqList);
 }
 
 void	RadioInterface::handle_dcRemoval	(bool b) {
-	theOFDMHandler	-> set_dcRemoval (b);
+	theOfdmHandler	-> set_dcRemoval (b);
 	theNewDisplay. set_dcRemoval (b);
 }
 //
@@ -4676,12 +4774,12 @@
 
 void	RadioInterface::show_dl2	(uint8_t ct, uint8_t IT,
 	 const QString &s) {
-	if (!configHandler_p -> get_saveTitles ())
+	if (!theConfigHandler -> get_saveTitles ())
 	 return;
 	dl2_handler theHandler (channel. channelName,
 	 channel. ensembleName,
 	 channel. currentService. serviceName,
-	 dabSettings_p);
+	 theQSettings);
 	theHandler. show_dl2 (ct, IT, s);
 }
 
@@ -4690,14 +4788,14 @@
 //	work in progress
 //
 void	RadioInterface::nrActiveServices	(int n) {
-	configHandler_p -> set_activeServices (n);
+	theConfigHandler -> set_activeServices (n);
 }
 
 void	RadioInterface::handle_activeServices () {
-QList<contentType> serviceData = theOFDMHandler -> contentPrint ();
+QList<contentType> serviceData = theOfdmHandler -> contentPrint ();
 bool	serviceAvailable	= false;
 	for (auto &ct : serviceData) {
-	 if (theOFDMHandler -> serviceRuns (ct. SId, ct. subChId)) {
+	 if (theOfdmHandler -> serviceRuns (ct. SId, ct. subChId)) {
 	 serviceAvailable = true;
 //	 fprintf (stderr, "Service %s (%X, %d) runs\n",
 //	 ct. serviceName. toLatin1 (). data (),
@@ -4759,18 +4857,18 @@
 	}
 	else
 	if (this -> hasFocus ()) {
-	 configHandler_p -> activateWindow ();
- configHandler_p -> setFocus ();
+	 theConfigHandler -> activateWindow ();
+ theConfigHandler -> setFocus ();
 return true;
 	}
 	else 
-	if (configHandler_p -> hasFocus ()) {
-	 techWindow_p -> activateWindow ();
-	 techWindow_p -> setFocus ();
+	if (theConfigHandler -> hasFocus ()) {
+	 theTechWindow -> activateWindow ();
+	 theTechWindow -> setFocus ();
 	 return true;
 	}
 	else
-	if (techWindow_p -> hasFocus ()) {
+	if (theTechWindow -> hasFocus ()) {
 	 theEnsembleHandler	-> activateWindow ();
 	 theEnsembleHandler	-> setFocus ();
 	 return true;
@@ -4779,14 +4877,45 @@
 }
 
 void	RadioInterface::devSL_visibility	() {
-	if (theDeviceChoser. isVisible ())
-	 theDeviceChoser. hide ();
+	if (theDeviceChooser. isVisible ())
+	 theDeviceChooser. hide ();
 	else
-	 theDeviceChoser. show ();
+	 theDeviceChooser. show ();
 }
 
-void	RadioInterface::tell_programType	(int SId, int programType) {
+void	RadioInterface::tell_programType	(uint32_t SId,
+	 int programType) {
 	if (channel. currentService. SId == SId)
 	 programTypeLabel	-> setText (getProgramType (programType));
 }
 
+void	RadioInterface::signal_dataTracer	(bool b) {
+	if (theOfdmHandler != nullptr)
+	 theOfdmHandler -> set_dataTracer (b);
+}
+
+void	RadioInterface::handle_startTimeTable	() {
+	if (theControl != nullptr) {
+	 delete theControl;
+	 theControl	= nullptr;
+	 return;
+	}
+	 
+	std::vector<basicService> theServices = 
+	 theOfdmHandler	-> getServices ();
+	theControl = new timeTableControl (channel. ensembleName,
+	 channel. Eid,
+	 theServices,
+	 channel. theDate,
+	 theQSettings);
+	connect (theControl, &superFrame::frameClosed,
+	 this, &RadioInterface::timeTableFrame_closed);
+}
+
+void	RadioInterface::timeTableFrame_closed	(){
+	if (theControl != nullptr) {	// it better be
+	 delete theControl;
+	 theControl	= nullptr;
+	}
+}
+

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;
-	QString			path_for_files;
-#ifdef	_SEND_DATAGRAM_
-	QUdpSocket		dataOut_socket;
-	QString			ipAddress;
-	int32_t			port;
-#endif
-	bool			sourceDumping;
-	bool			audioDumping;
-	void			set_Colors		();
-	void			setChannelButton	(int);
-
-	void			displaySlide	(const QPixmap &,	
-	 const QString &t = "");
-	QTimer			displayTimer;
-	QTimer			channelTimer;
-	QTimer			presetTimer;
-	void			write_servicePictures	(uint32_t);
-	QTimer			muteTimer;
-	int			muteDelay;
-	int32_t			numberofSeconds;
+//
 	void			connectGUI		();
 	void			disconnectGUI		();
-
-	struct theTime		localTime;
-	struct theTime		UTC;
-
-	int			audioVolume;
-	size_t			previous_idle_time;
-	size_t			previous_total_time;
-
-	float			peakLeftDamped;
-	float			peakRightDamped;
-	int			audioTeller;
-	int			pauzeSlideTeller;
-	QPixmap			fetchAnnouncement (int id);
-
-	QString			convertTime		(int, int, int, int, int);
-	QString			convertTime		(struct theTime &);
-	void			setButtonColors		(QPushButton *,
-	 const QString &);
-	QString			footText		();
-	QString			presetText		();
 	void			cleanScreen		();
 	void			hideButtons		();
 	void			showButtons		();
+	void			setChannelButton	(int);
+	void			set_Colors		();
+	void			setButtonColors		(QPushButton *,
+	 const QString &);
+	void			displaySlide		(const QPixmap &,	
+	 const QString &t = "");
 	deviceHandler		*createDevice		(const QString &,
 	 logger *);
 
+	QString			convertTime		(int, int, int,
+	 int, int);
+	QString			convertTime		(struct theTime &);
+
+//
+	bool			autoStart_http		();
 	void			start_etiHandler	();
 	void			stop_etiHandler		();
-	QString			checkDir		(const QString &);
-//
 	void			startAudioservice	(audiodata &);
 	void			startPacketservice	(packetdata &);
 	void			startAudioDumping	();
@@ -388,8 +329,6 @@
 	void			scheduledAudioDumping	();
 	void			scheduledDLTextDumping	();
 	void			scheduledFICDumping	();
-	FILE			*ficDumpPointer;
-
 	void			startSourceDumping	();
 	void			stopSourceDumping	();
 	void			startFrameDumping	();
@@ -401,32 +340,31 @@
 	void			stopService		(dabService &);
 	void			startService		(dabService &, int);
 	void			start_epgService	(packetdata &);
-	void			localSelect		(const QString &c,
-	 const QString &s);
 	void			scheduleSelect		(const QString &s);
 
-	QString			buildHeadLine		();
-	QString			build_kop		();
-	QString			build_cont_addLine	(const transmitter &);
-	QString		 build_transmitterLine	(const transmitter &);
 
-	void			show_for_single_scan	();
-	void			show_for_continuous	();
-
-	void			startDirect		();
+	QString			checkDir		(const QString &);
 	void			saveMOTObject		(QByteArray &,
+	 int,
 	 QString &);
-
 	void			saveMOTtext		(QByteArray &, int,
 	 const QString &);
 	void			showMOTlabel		(QByteArray &, int,
 	 const QString &,
-	 int, bool);
+	 int,
+	 uint32_t);
+	QString			slidePath		(bool, uint32_t,
+	 const QString &);
 	void			stopMuting		();
+	void			setPeakLevel	(const std::vector<float> &);
+	QString			createTIILabel	(const transmitter &);
+	void			addtoLogFile	(const transmitter &);
+	void			removeFromList	(uint8_t, uint8_t);
+	transmitter		*inList		(uint8_t, uint8_t);
+
 //	short hands
 	void newChannelIndex (int);
-	std::mutex		locker;
-	void			setSoundLabel		(bool);
+
 //	scan functions
 	void			startScan_to_data	();
 	void			startScan_single	();
@@ -437,173 +375,314 @@
 	void			stopScan_to_data	();
 	void			stopScan_single	();
 	void			stopScan_continuous	();
+	QString			buildHeadLine		();
+	QString			build_kop		();
+	QString			build_cont_addLine	(const transmitter &);
+	QString		 build_transmitterLine	(const transmitter &);
 
-	void			setPeakLevel	(const std::vector<float> &);
-	QString			createTIILabel	(const transmitter &);
-	void			addtoLogFile	(const transmitter &);
-	void			removeFromList	(uint8_t, uint8_t);
-	transmitter		*inList		(uint8_t, uint8_t);
+	void			show_for_single_scan	();
+	void			show_for_continuous	();
 
 //	EPG extraction
+	void			process_epgData 	(const QString &,
+ 	const QByteArray &);
+
 	void			extractServiceInformation (const QDomDocument &,
 	 uint32_t, bool);
-	void			saveServiceInfo	(const QDomDocument &, 
+	void			saveServiceInfo		(const QDomDocument &, 
 	 uint32_t);
-	bool			process_ensemble (const QDomElement &, uint32_t);
-	int			processService	(const QDomElement &);
+	bool			process_ensemble 	(const QDomElement &,	 uint32_t);
+	int			processService		(const QDomElement &);
 
 	void			read_pictureMappings	(uint32_t);
 	bool			get_serviceLogo		(QPixmap &, uint32_t);
-	QString			extractName	(const QString &);
+
+	QString			extractName		(const QString &);
 
 //
 //	announcements
+	QPixmap			fetchAnnouncement 	(int id);
 	void			announcement_start	(uint16_t, uint16_t);	
 	void			announcement_stop	(uint16_t);
 //
 //	key events for setting focus to windows
 	bool			handle_keyEvent		(int);
+
+	int			journalineKey;
+
+	timeTableControl	*theControl;
+
+	std::atomic<bool>	running;
+//	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;
+	processParams		globals;
+	QString			SystemVersion;
+	QString			version;
+	bool			error_report;
+	int			fmFrequency;
+	channelDescriptor	channel;
+	int16_t			tii_delay;
+	int32_t			dataPort;
+	bool			stereoSetting;
+	bool			dxMode;
+//
+	QString			labelStyle;
+	QTimer			pauzeTimer;
+	QTimer			theTimer;
+	QTimer			startTimer;
+	bool			stillWaiting;
+	QString			path_for_files;
+#ifdef	_SEND_DATAGRAM_
+	QUdpSocket		dataOut_socket;
+	QString			ipAddress;
+	int32_t			port;
+#endif
+	bool			sourceDumping;
+	bool			audioDumping;
+
+	QTimer			displayTimer;
+	QTimer			channelTimer;
+	QTimer			presetTimer;
+	QTimer			muteTimer;
+//	void			write_servicePictures	(uint32_t);
+	int			muteDelay;
+	int32_t			numberofSeconds;
+
+	struct theTime		localTime;
+	struct theTime		UTC;
+
+	int			audioVolume;
+	size_t			previous_idle_time;
+	size_t			previous_total_time;
+
+	float			peakLeftDamped;
+	float			peakRightDamped;
+	int			audioTeller;
+	int			pauzeSlideTeller;
+
+	FILE			*ficDumpPointer;
+
+	std::mutex		locker;
+	std::mutex		mapHandler_locker;
+	void			setSoundLabel		(bool);
+
+	void			localSelect_SS		(const QString &,
+	 const QString &);
 //
 signals:
-	void			select_ensemble_font	();
+	void			select_ensemble_font		();
 	void			select_ensemble_fontSize	();
 	void			select_ensemble_fontColor	();
-
 	void			call_scanButton		();
+
 public slots:
-	void			lto_ecc			(int, int);
-	void			setFreqList		();
-	void			channelSignal		(const QString &);
-	void			show_dcOffset		(float);
-	void			startScanning		();
-	void			stopScanning		();
-	void			show_quality		(float, float, float);
-	void			show_rsCorrections	(int, int);
-	void			show_clock_error	(int);
+//	signals from the configuration window
+	void			startDirect		();
 
+	void			copyrightText_closed		();
+	void			handle_tiiThreshold	(int);
+	void			handle_tiiCollisions		(int);
+	void			handle_activeServices		();
+	void			handle_dcRemoval		(bool);
+	void			selectDecoder			(int);
+	void			set_transmitters_local		(bool);
+	void			handle_scheduleButton	();
+	void			handle_devicewidgetButton	();
+	void			handle_dlTextButton		();
+	void			handle_resetButton	();
+	void			handle_snrButton	();
+	void			handle_set_coordinatesButton	();
+	void			handle_loadTable		();
+	void			handle_sourcedumpButton	();
+	void			handle_correlationSelector	(int);
+	void			handle_LoggerButton		(int);
+	void			handle_eti_activeSelector	(int);
+	void			set_streamSelector		(int);
+//	connected in the Radio, coming from the config handler
+	void			handle_configFrame_closed	();
+	void			signal_dataTracer (bool);
+	void			timeTableFrame_closed	();
+
+//	signals from ensemblehandler
+	void			localSelect		(const QString &c,
+	 const QString &s);
+	void			handle_backgroundTask	(const QString &);
+//
+//	signals from ofdmHandler
+	void			set_synced		(bool);
+	void			set_sync_lost		();
+	void			show_tiiData		(QVector<tiiData>,
+	 int);
+	void			show_tii_spectrum ();
+	void			show_snr		(float);
+	void			show_clock_error	(int);
+	void			show_null		(int, int);
+	void			show_channel		(int);
 	void			show_Corrector		(int, float);
-	void			addToEnsemble		(const QString &,
-	 int, int);
+//
+//	signals from ofdmDecoder
+	void			showIQ			(int);
+	void			show_quality		(float, float, float);
+	void			show_stdDev		(int);
+//
+//	signals from fib-config
+	void			announcement		(int, int);
+
+//	signals from fic-handler
+	void			show_ficQuality		(int, int);
+	void			show_ficBER		(float);
+
+//	signals from fib-decoder
 	void			ensembleName		(int, const QString &);
+	void			clockTime		(int, int, int,
+	 int, int,
+	 int, int, int, int);
+	void			changeinConfiguration	();
 	void			nrServices		(int);
+	void			lto_ecc			(int, int);
+	void			setFreqList		();
+	void			tell_programType		(uint32_t, int);
+	void			addToEnsemble		(const QString &,
+	 int, int);
+
+//	signals from the techWindow
+	void			handleAudiodumpButton 	();
+	void			handleFramedumpButton	();
+	void			handle_techFrame_closed		();
+
+//	signals from theNewDisplay
+	void			handle_iqSelector	();
+	void			handle_newDisplayFrame_closed	();
+	
+//	signals from correlator
+	void			showCorrelation		(int, int,
+	 QVector<int>);
+//
+//	signals from samplereader
+	void			show_spectrum		(int);
+	void			show_dcOffset		(float);
+
+//	signals	from mscHandler
+	void			nrActiveServices		(int);
+
+//	signals from faad decoder/fdk-aac/mp2Processor
+	void			newAudio		(int, int, bool, bool);
+
+//	signals from mp2Processor/ mp4 processor
 	void			show_frameErrors	(int);
+	void			setStereo		(bool);
+	void			newFrame		(int);
+
+//	signals from mp4Processor
 	void			show_rsErrors		(int);
 	void			show_aacErrors		(int);
-	void			show_ficQuality		(int, int);
-	void			show_ficBER		(float);
-	void			set_synced		(bool);
+	void			show_rsCorrections	(int, int);
+
+//	signals from data-processor
+
+//	signals from ip-datahandler
+	void			sendDatagram		(int);
+
+//	signals from journaline-controller
+	void			startJournaline		(int);
+	void			stopJournaline		(int);
+	void			journalineData		(QByteArray, int);
+
+//	signals from padHandler
 	void			showLabel		(const QString &, int);
+	void			show_mothandling	(bool);
+	void			show_dl2			(uint8_t,
+	 uint8_t,
+	 const QString &);
+
+//	signals from MOTObject
 	void			handle_motObject	(QByteArray,
 	 QString,
-	 int, bool, bool);
-	void			sendDatagram		(int);
+	 int, bool,
+	 uint32_t);
+
+//	signals from tdc-dataHandler
 	void			handle_tdcdata		(int, int);
-	void			changeinConfiguration	();
-	void			newAudio		(int, int, bool, bool);
 
-	void			localSelect_SS		(const QString &,
-	 const QString &);
+//	signals from httpHandler
+	void			channelSignal		(const QString &);
+	void			cleanUp_mapHandler	();
+	void			http_terminate		();
+
+//
+//	signals from contentTable
+	void			handle_contentSelector	(const QString &);
+
+//	signals from Qt_Audio
+	void			deviceListChanged		();
+
+//	signals	from scanHandler
+	void			startScanning		();
+	void			stopScanning		();
+
+//	signals from scanListHandler
+	void			handleScanListSelect	(const QString &);
+
+//	signals	from scheduler
+	void			scheduler_timeOut	(const QString &);
+
+//	Local signals
+
 	
-	void			setStereo		(bool);
-	void			set_streamSelector	(int);
 	void			no_signal_found		();
-	void			show_mothandling	(bool);
-	void			set_sync_lost		();
 	void			closeEvent		(QCloseEvent *event);
-	void			clockTime		(int, int, int,
-	 int, int,
-	 int, int, int, int);
-	void			announcement		(int, int);
-	void			newFrame		(int);
 
 	void			handle_presetSelect	(const QString &,
 	 const QString &);
-	void			handle_contentSelector	(const QString &);
 	
-	void			http_terminate		();
-	void			show_channel		(int);
 
-	void			handle_iqSelector	();
-
-	void			show_spectrum		(int);
-	void			handle_tiiThreshold	(int);
-	void			show_tiiData		(QVector<tiiData>,
-	 int);
-	void			show_tii_spectrum ();
-	void			show_snr		(float);
-	void			show_null		(int, int);
-	void			showIQ			(int);
-	void			showCorrelation		(int, int,
-	 QVector<int>);
-	void			show_stdDev		(int);
 	void			showPeakLevel		(float, float);
 
-	void			handle_techFrame_closed		();
-	void			handle_configFrame_closed	();
 	void			handle_deviceFrame_closed	();
-	void			handle_newDisplayFrame_closed	();
 
 	void			doStart			(const QString &);
 	void			newDevice		(const QString &);
-	void			handle_scheduleButton	();
-	void			handle_devicewidgetButton	();
-	void			handle_resetButton	();
-	void			handle_dlTextButton		();
-	void			handle_snrButton	();
-	void			handle_sourcedumpButton	();
-	void			scheduler_timeOut	(const QString &);
 	void			show_changeLabel (const QStringList notInOld,
 	 const QStringList notInNew);
-
-	void			process_tiiSelector	(bool);
 //
-//	triggered from the techdata
-	void			handleFramedumpButton	();
-	void			handleAudiodumpButton 	();
-
-	void			startJournaline			(int);
-	void			stopJournaline			(int);
-	void			journalineData			(QByteArray,
-	 int);
-//	Somehow, these must be connected to the GUI
 private slots:
-	void			handle_aboutLabel	();
-	void			show_pauzeSlide		();
-	void			handle_timeTable	();
+//	button and selectorhandlers
+	void			handle_configButton	();
+	void			handle_httpButton	();
+	void			handle_copyrightLabel	();
 	void			handle_contentButton	();
 	void			handle_detailButton	();
 	void			handle_scanButton	();
 	void			handle_etiHandler	();
-
 	void			handle_spectrumButton	();
-
 	void			handle_scanListButton	();
 	void			handle_presetButton	();
 	void			handle_prevServiceButton ();
 	void			handle_nextServiceButton ();
-
-	void			handle_channelSelector		(const QString &);
 	void			handle_nextChannelButton	();
 	void			handle_prevChannelButton	();
+	void			handle_muteButton	();
+	void			handle_folderButton	();
+	void			devSL_visibility	();
 
-	void			handle_muteButton		();
-	void			handle_folderButton		();
+	void			handle_channelSelector	(const QString &);
+	void			setVolume		(int);
+	void			handle_snrLabel		();
+	void			handle_distanceLabel	();
 
-	void			handleScanListSelect	(const QString &);
+	void			handle_startTimeTable	();
+//
+//
 	void			TerminateProcess	();
 	void			updateTimeDisplay	();
 	void			channel_timeOut		();
-
-	void			handle_backgroundTask	(const QString &);
-
 	void			setPresetService	();
 	void			muteButton_timeOut	();
-
-	void			handle_configButton	();
-	void			handle_httpButton	();
-	void			setVolume		(int);
-	void			handle_snrLabel		();
-	void			handle_tiiButton	();
+	void			waitingToDelete		();
+	void			show_pauzeSlide		();
 //
 //	color handlers
 	void			handle_labelColor	();
@@ -615,32 +694,5 @@
 	void			color_nextServiceButton ();
 	void			color_configButton	();
 	void			color_httpButton	();
-	void			color_tiiButton		();
-
-	void			devSL_visibility	();
 
-//
-//	config handlers
-public slots:
-	void			selectDecoder			(int);
-	void			set_transmitters_local		(bool);
-	void			handle_correlationSelector	(int);
-	void			handle_LoggerButton		(int);
-	void			handle_set_coordinatesButton	();
-//	void			handle_transmSelector		(int);
-	void			handle_eti_activeSelector	(int);
-	void			handle_dcRemoval		(bool);
-	void			handle_loadTable		();
-	void			handle_tiiCollisions		(int);
-	void			handle_tiiFilter		(bool);
-
-	void			deviceListChanged		();
-	void			show_dl2			(uint8_t,
-	 uint8_t,
-	 const QString &);
-	void			nrActiveServices		(int);
-	void			handle_activeServices		();
-//
-//	and from the fib handler
-	void			tell_programType		(int, int);
 };

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) {
+QString res;
+ for (int i = 0; i < 4; i ++) {
+ uint8_t t = (v & 0xF000) >> 12;
+ QChar c = t <= 9 ? (char)('0' + t) : (char) ('A' + t - 10);
+ res. append (c); 
+ v <<= 4;
+ }
+ return res;
+}
+
+void	techWindow::showServiceId		(int SId) {
+QString text	= hextoString (SId);
+	serviceIdDisplay -> setText (text);
+}
+
+void	techWindow::showStartAddress	(int sa) {
+	startAddressDisplay	-> setText (QString::number (sa));
+}
+
+void	techWindow::showLength		(int l) {
+	lengthDisplay		-> setText (QString::number (l));
+}
+
+void	techWindow::showSubChId		(int subChId) {
+	subChIdDisplay		-> setText (QString::number (subChId));
+}
+
+void	techWindow::showLanguage		(int l) {
+	language	-> setAlignment (Qt::AlignRight);
+	language	-> setText (getLanguage (l));
+}
+
+void	techWindow::showUep		(int shortForm, int protLevel) {
+	QString protL = getProtectionLevel (shortForm, protLevel);
+	uepField	-> setText (protL);
+}
+
+void	techWindow::showCodeRate		(int shortForm, int protLevel) {
+	codeRate -> setText (getCodeRate (shortForm, protLevel));
+}
+
+void	techWindow::showFm		(std::vector<int> &v) {
+	if (v. size () == 0) {
+	 fmFrequency	-> hide ();
+	 fmLabel	-> hide ();
+	}
+	else {
+	 fmLabel -> show ();
+ fmFrequency -> show ();	
+	 QString f;
+	 int teller	= 0;
+//	for now there is room for up to 2 freqyencies
+	 for (auto freq: v) {
+	 if (++teller > 2)
+	 break;			// for now
+ f. append (QString::number (freq) + " ");
+	 }
+ f. append (" Khz");
+ fmFrequency -> setText (f);
+	}
+}
+
+void	techWindow::audioDataAvailable	(int amount, int rate) {
+std::complex<int16_t> buffer 1024;
+
+	if (isHidden ()) {
+	 audioData -> FlushRingBuffer ();
+	 return;
+	}
+
+	while (audioData -> GetRingBufferReadAvailable () >= 1024) {
+	 audioData -> getDataFromBuffer (buffer, 1024);
+	 theAudioDisplay -> createSpectrum (buffer, 1024, rate);
+	}
+}
+
+void techWindow::colorFramedumpButton () {
+ setButtonColors (framedumpButton, FRAMEDUMP_BUTTON);
+}
+
+void techWindow::colorAudiodumpButton () {
+ setButtonColors (audiodumpButton, AUDIODUMP_BUTTON);
+}
+
+void	techWindow::setButtonColors	(QPushButton *b,
+	 const QString &buttonName) {
+QColor	baseColor;
+QColor	textColor;
+QColor	color;
+
+	color = QColorDialog::getColor (baseColor, nullptr, "baseColor");
+	if (!color. isValid ())
+	 return;
+	baseColor	= color;
+	color = QColorDialog::getColor (textColor, nullptr, "textColor");
+	if (!color. isValid ())
+	 return;
+	textColor	= color;
+	QString temp = "QPushButton {background-color: %1; color: %2}";
+	b	-> setStyleSheet (temp. arg (baseColor. name (),
+	 textColor. name ()));
+
+	QString buttonColor	= buttonName + "_color";
+	QString buttonFont	= buttonName + "_font";
+	QString	baseColor_name	= baseColor. name ();
+	QString textColor_name	= textColor. name ();
+	store (dabSettings, COLOR_SETTINGS, buttonColor, baseColor_name);
+	store (dabSettings, COLOR_SETTINGS, buttonFont, textColor_name);
+}
+
+void	techWindow::framedumpButton_text	(const QString &text, int size) {
+	QFont font	= framedumpButton -> font ();
+	font. setPointSize (size);
+	framedumpButton	-> setFont (font);
+	framedumpButton	-> setText (text);
+	framedumpButton	-> update ();
+}
+
+void	techWindow::audiodumpButton_text	(const QString &text, int size) {
+	QFont font	= audiodumpButton -> font ();
+	font. setPointSize (size);
+	audiodumpButton	-> setFont (font);
+	audiodumpButton	-> setText (text);
+	audiodumpButton	-> update ();
+}
+
+void	techWindow::showRate	(int rate, bool ps, bool sbr) {
+	if (!ps)
+	 psLabel -> setText (" ");
+	else {
+	 psLabel -> setText ("ps");
+	}
+	if (!sbr)
+	 sbrLabel -> setText (" ");
+	else {
+	 sbrLabel -> setText ("sbr");
+	}
+	audiorateLabel	-> setText (QString::number (rate));
+}
+
+void	techWindow::showStereo	(bool b) {
+	 if (b) {
+	 stereoLabel	-> setStyleSheet ("QLabel {color : green}");
+ stereoLabel -> setText ("stereo");
+ }
+ else {
+	 stereoLabel	-> setStyleSheet ("QLabel {color : white}");
+ stereoLabel -> setText (" ");
+	}
+}
+
+void	techWindow::showMissed	(int missed) {
+	missedSamples	-> display (missed);
+}
+
+void	techWindow::hideMissed	() {
+	missedLabel	-> hide ();
+	missedSamples	-> hide ();
+}
+
+void	techWindow::isDABPlus	(bool b) {
+	if (b) {	// yes it is DAB+
+
+	 ASCTy	-> setText ("DAB+");
+	 rsErrorLabel		-> show ();
+	 aacErrorLabel	-> show ();
+	 rsError_display	-> show ();
+	 aacError_display	-> show ();
+	}
+	else {
+	 ASCTy	-> setText ("DAB");
+	 rsErrorLabel		-> hide ();
+	 aacErrorLabel	-> hide ();
+	 rsError_display	-> hide ();
+	 aacError_display	-> hide ();
+	}
+}
+
+void	techWindow::hideMissedLabel	() {
+	missedLabel	-> hide ();
+	missedSamples	-> hide ();
+}

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);
-	while (running. load ()) {
-	 ClientSocket = accept (ListenSocket,
-	 (struct sockaddr *) &cli_addr, &sin_len);
-	 if (ClientSocket == -1) {
-	 usleep (2000000);
-	 continue;
-	 }
+void	httpHandler::discardSocket () {
+QTcpSocket *socket = reinterpret_cast<QTcpSocket*>(sender());
+	socket -> deleteLater ();
+}
 //
-//	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.
-//	"/channelSelector::XX for a channel select
-//	 "/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 
-	 if (strstr (url, "/channelSelector::")) {
-	 std::string channel = strstr (url, "::");
-	 std::size_t pos = channel. find ("::");
-	 channel = channel. substr (pos + 2);
-	 setChannel (QString::fromStdString (channel));
-//	 continue;	
-	 }
-	 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"
-	 "Content-Type: %s\r\n"
-	 "Connection: %s\r\n"
-	 "Content-Length: %d\r\n"
-//	 "Access-Control-Allow-Origin: *\r\n"
-	 "\r\n",
-	 ctype. c_str (),
-	 keepalive ? "keep-alive" : "close",
-	 (int)(strlen (content. c_str ())));
-	 int hdrlen = strlen (hdr);
-//	 fprintf (stderr, "reply header %s \n", hdr);
-	 if (jsonUpdate) {
-//	 fprintf (stderr, "Json update requested\n");
-//	 fprintf (stderr, "%s\n", content. c_str ());
-	 }
-//	and send the reply
-	 if (write (ClientSocket, hdr, hdrlen) != hdrlen ||
-	 write (ClientSocket, content. c_str (),
-	 content. size ()) != (int)(content. size ())) {
-//	 fprintf (stderr, "WRITE PROBLEM\n");
-//	 break;
-	 }
+//	If "closingInProgress" is true, the user has indicated that the
+//	http driver is to be stopped, with as secondary effect that the
+//	browser stops displaying the map and issues an error 1
+//	Otherwise, the user killed the browser and the
+//	http Handler is killed if the close_map_on_exit is true
+//	Note that the function is a "slot", issuing a signal
+//	that directly kills the httpHandler will crash the system
+void	httpHandler::onSocketError (QAbstractSocket::SocketError socketerror) {
+//QTcpSocket *socket = reinterpret_cast<QTcpSocket*>(sender());
+	if (socketerror == QAbstractSocket::RemoteHostClosedError) {
+	 if (closingInProgress. load ()) {	// reacting on button switch
+	 connect (this, &httpHandler::mapClose_processed,
+	 theRadio, &RadioInterface::http_terminate);
+//	 fprintf (stderr, "Going to close a map\n");
+	 emit mapClose_processed ( );
+	 }
+	 else {	// 
+//	 fprintf (stderr, "de http handler zou moeten sluiten\n");
+	 if (close_map_on_exit)
+	 if (!delayTimer. isActive ())
+	 delayTimer. start (1000);
 	 }
 	}
-	fprintf (stderr, "mapServer quits\n");
-	close (ListenSocket);
-	close (ClientSocket);
-	emit terminating ();
 }
-#else
 //
-//	windows version
-//
-void	httpHandler::run	() {
-char	buffer 4096;
-bool	keepalive;
-char	*url;
-std::string	content;
-std::string	ctype;
-WSADATA	wsa;
-int	iResult;
-SOCKET	ListenSocket	= INVALID_SOCKET;
-SOCKET	ClientSocket	= INVALID_SOCKET;
-
-struct addrinfo *result = nullptr;
-struct addrinfo hints;
-
-	if (WSAStartup (MAKEWORD (2, 2), &wsa) != 0) {
-	 terminating ();
-	 return;
-	}
-
-	ZeroMemory (&hints, sizeof(hints));
-	hints.ai_family		= AF_INET;
-	hints.ai_socktype	= SOCK_STREAM;
-	hints.ai_protocol	= IPPROTO_TCP;
-	hints.ai_flags		= AI_PASSIVE;
-
-//	Resolve the server address and port
+bool	httpHandler::isConnected () {
+	return !connection_stopped;
+}
 
-	iResult = getaddrinfo (nullptr, mapPort. toLatin1 (). data (),
-	 &hints, &result);
-	if (iResult != 0 ) {
-	 WSACleanup();
-	 terminating ();
+void	httpHandler::readSocket () {
+QTcpSocket *worker = qobject_cast<QTcpSocket *> (sender ());
+	if (worker == nullptr)
 	 return;
-	}
-
-// Create a SOCKET for connecting to server
-	ListenSocket = socket (result -> ai_family,
-	 result -> ai_socktype, result -> ai_protocol);
-	if (ListenSocket == INVALID_SOCKET) {
-	 freeaddrinfo(result);
-	 WSACleanup ();
-	 terminating ();
+	delayTimer. stop ();	// it seems we are reconnected
+	if (closingInProgress. load ())
 	 return;
-	}
-	unsigned long mode = 1;
-	ioctlsocket (ListenSocket, FIONBIO, &mode);
-
-// Setup the TCP listening socket
-	iResult = bind (ListenSocket, result -> ai_addr,
-	 (int)result->ai_addrlen);
-	if (iResult == SOCKET_ERROR) {
-	 freeaddrinfo (result);
-	 closesocket (ListenSocket);
-	 WSACleanup ();
-	 terminating ();
+//	closingInProgress. store (false);
+	QByteArray data		= worker -> readAll ();
+	QString request		= QString (data);
+	int version		= request. contains ("HTTP/1.1") ? 11 : 10;
+	bool keepAlive	= (version == 11) ? 
+	 !request. contains ("Connection: close"):
+	 request. contains ("Connection: keep-alive");
+//	Identify the URL
+	QStringList list	= request. split (" ");
+	if (list. size () < 2) 
 	 return;
-	}
-
-	freeaddrinfo (result);
-
-	running. store (true);
-
-	listen (ListenSocket, 5);
-	while (running. load ()) {
-	 ClientSocket = accept (ListenSocket, nullptr, nullptr);
-	 if (ClientSocket == -1) {
-	 usleep (2000000);
-	 continue;
-	 }
-
-	 while (running. load ()) {
-	 int xx;
-L1:	 if ((xx = recv (ClientSocket, buffer, 4096, 0)) < 0) {
-// shutdown the connection since we're done
-	 iResult = shutdown (ClientSocket, SD_SEND);
-	 if (iResult == SOCKET_ERROR) {
-	 closesocket (ClientSocket);
-	 closesocket (ListenSocket);
-	 WSACleanup ();
-	 running.store (false);
-	 terminating ();
-	 return;
-	 }
-	 break;
-	 }
-	 if (xx == 0) {
-	 if (!running. load ()) {
-	 closesocket (ClientSocket);
-	 closesocket (ListenSocket);
-	 WSACleanup ();
-	 terminating ();
-	 return;
-	 }
-	 Sleep (1);
-	 goto L1;
+	QString askingFor	= list 1;
+	QString content;
+	QString ctype;
+	if (askingFor == "/data.json") {
+	 locker. lock ();
+	 if (transmitterList. size () > 0) { 
+	 transmitter t	= transmitterList 0;
+	 content		= transmitterToJsonObject (t);
+	 transmitterList. erase (transmitterList. begin ());
+	 if (t. type == MAP_CLOSE) {
+	 closingInProgress. store (true);
 	 }
+	 }
+	 locker. unlock ();
+	 if (content != "") {
+	 ctype = "application/json;charset=utf-8";
+	 }
+	}
+	else	
+	if (askingFor. startsWith ("/channelSelector::")) {
+	 QStringList s = askingFor. split ("::");
+	 if (s. size () > 1)
+ setChannel (s 1);
+ }
+ else {
+ content	= theMap (nameOfMap, homeAddress);
+ ctype	= "text/html;charset=utf-8";
+ }
+	QByteArray theContents = content. toUtf8 ();
 
-	 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 transmitters. */
-	 bool jsonUpdate	= false;
-	 if (strstr (url, "/data.json")) {
-	 content	= coordinatesToJson (transmitterList);
-	 if (content != "") {
-	 ctype	= "application/json;charset=utf-8";
-	 jsonUpdate	= true;
-//	 fprintf (stderr, "%s will be sent\n", content. c_str ());
-	 }
-	 }
-	 else 
-	 if (strstr (url, "/channelSelector::")) {
-	 std::string channel = strstr (url, "::");
-	 std::size_t pos = channel. find ("::");
-	 channel = channel. substr (pos + 2);
-	 setChannel (QString::fromStdString (channel));
-//	 continue;	
-	 }
-	 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"
-	 "Content-Type: %s\r\n"
-	 "Connection: %s\r\n"
-	 "Content-Length: %d\r\n"
-//	 "Access-Control-Allow-Origin: *\r\n"
-	 "\r\n",
-	 ctype. c_str (),
-	 keepalive ? "keep-alive" : "close",
-	 (int)(strlen (content. c_str ())));
-	 int hdrlen = strlen (hdr);
-//	 if (jsonUpdate) {
-//	 parent -> show_text (std::string ("Json update requested\n"));
-//	 parent -> show_text (content);
-//	 }
-//	and send the reply
-	 if ((send (ClientSocket, hdr, hdrlen, 0) == SOCKET_ERROR) ||
-	 (send (ClientSocket, content. c_str (),
-	 content. size (), 0) == SOCKET_ERROR)) {
-	 fprintf (stderr, "WRITE PROBLEM\n");
-	 break;
-	 }
-	 }
+	char hdr 2048;
+	sprintf (hdr,
+	 "HTTP/1.1 200 OK\r\n"
+	 "Server: qt-dab\r\n"
+	 "Content-Type: %s\r\n"
+	 "Connection: %s\r\n"
+	 "Content-Length: %d\r\n"
+	 "\r\n",
+	 ctype. toLatin1 (). data (),
+	 keepAlive ? "keep-alive" : "close",
+	 (int)(theContents. size ()));
+	QByteArray theData = hdr;
+	(void)worker -> write (theData);
+	(void)worker -> write (theContents);
+//
+//	In case we have sent a close signal
+	if (closingInProgress. load ()) {
+	 worker -> waitForBytesWritten ();
 	}
-// cleanup
-	closesocket(ClientSocket);
-	closesocket(ListenSocket);
-	WSACleanup();
-	running. store (false);
-	emit	terminating ();
+	delayTimer. start (4000);
+}
+//
+//	This timeout is initiated after a (potential) disconnect
+//	Under normal circumstances, after pushing the httpButton,
+//	an error is signalled and the error function takes
+//	care 
+void	httpHandler::handle_timeOut () {
+	if (!close_map_on_exit)
+	 return;
+	connection_stopped	= true;
+	if (closingInProgress. load ())
+	 connect (this, &httpHandler::mapClose_processed,
+	 theRadio, &RadioInterface::http_terminate);
+	else
+	 connect (this, &httpHandler::mapClose_processed,
+	 theRadio, &RadioInterface::cleanUp_mapHandler);
+	emit mapClose_processed ();
 }
-#endif
 
-std::string	httpHandler::theMap (position homeAddress) {
-std::string res;
+QString	httpHandler::theMap (const QString &nameOfMap, position homeAddress) {
 int	bodySize;
 char	*body;
 std::string latitude	= std::to_string (homeAddress. latitude);
@@ -437,9 +241,8 @@
 int teller	= 0;
 int params	= 0;
 
-	
 // read map file from resource file
-	QFile file (":res/qt-map-69.html");
+	QFile file (nameOfMap);
 	if (file. open (QFile::ReadOnly)) {
 	 QByteArray record_data (1, 0);
 	 QDataStream in (&file);
@@ -473,6 +276,7 @@
 	 body teller ++ = (char)cc;
 	 index ++;
 	 }
+	 body teller ++ = 0;
 	}
 	else {
 	 fprintf (stderr, "cannot open file\n");
@@ -480,7 +284,7 @@
 	}
 
 	body teller ++ = 0;
-	res	= std::string (body);
+	QString	res	= QString (body);
 //	fprintf (stderr, "The map :\n%s\n", res. c_str ());
 	file. close ();
 	free (body);
@@ -499,79 +303,50 @@
 	return std::string (temp);
 }
 //
-std::string httpHandler::coordinatesToJson (std::vector<transmitter> &t) {
+QString httpHandler::transmitterToJsonObject (transmitter &t) { 
 char buf 512;
 QString Jsontxt;
 
-	if (t. size () == 0)
-	 return "";
 	Jsontxt += "\n";
-	locker. lock ();
-	QString direction	= t 0. direction;
+	QString direction	= t. direction;
 	if (direction. size () < 3)
 	 direction = "??";
-	QString polarization	= t 0. polarization;
+	QString polarization	= t. polarization;
 	if (polarization. size () == 0)
 	 polarization = "??";
 //	the Target
 	snprintf (buf, 512,
 	 "{\"type\":%d, \"ensemble\":\"%s\", \"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dateTime\":\"%s\", \"tiiValue\":%d, \"snr\":%f, \"dist\":%d, \"azimuth\":%d, \"power\":%d,\"altitude\":%d, \"height\":%d, \"direction\":\"%s\", \"polarisation\":\"%s\"}",
-	 t 0. type,
-	 t 0. ensemble. toUtf8 (). data (),
-	 dotNumber (t 0. latitude). c_str (),
-	 dotNumber (t 0. longitude). c_str (),
-	 t 0. transmitterName. toUtf8 (). data (),
-	 t 0. channel. toUtf8 (). data (),
-	 t 0. dateTime. toUtf8 (). data (),
-	 (t 0. mainId << 8) | (t 0. subId),
-	 10 * log10 (t 0. strength + 0.01),
-	 (int)(t 0. distance),
-	 (int)(t 0. azimuth),
-	 (int)(t 0. power * 100),
-	 (int)(t 0. altitude),
-	 (int)(t 0. height),
+	 t. type,
+	 t. ensemble. toUtf8 (). data (),
+	 dotNumber (t. latitude). c_str (),
+	 dotNumber (t. longitude). c_str (),
+	 t. transmitterName. toUtf8 (). data (),
+	 t. channel. toUtf8 (). data (),
+	 t. dateTime. toUtf8 (). data (),
+	 (t. mainId << 8) | (t. subId),
+	 10 * log10 (t. strength + 0.01),
+	 (int)(t. distance),
+	 (int)(t. azimuth),
+	 (int)(t. power * 100),
+	 (int)(t. altitude),
+	 (int)(t. height),
 	 direction. toUtf8 (). data (),
 	 polarization. toUtf8 (). data ());
 
 	Jsontxt += QString (buf);
-//
-	transmitterList. erase (transmitterList. begin());
-	locker. unlock ();
 	Jsontxt += "\n\n";
-//	fprintf (stderr, "Json = %s\n", Jsontxt. toLatin1 (). data ());
-	return Jsontxt. toStdString ();
+	return Jsontxt;
 }
+//
+//	For "special" keys we use 
+void	httpHandler::putData	(uint8_t type) {
 
-void	httpHandler::putData	(uint8_t type,
-	 position target) {
-	for (unsigned long i = 0; i < transmitterList. size (); i ++)
-	 if ((transmitterList i. latitude == target. latitude) &&
-	 (transmitterList i. longitude == target. longitude))
-	 return;
-	 
 	transmitter t;
 	t. type			= type;
-	t. country		= "unknown";
-	t. channel		= "unknown";
-	t. ensemble		= "unknown";
-	t. Eid			= 0;
-	t. mainId		= 0;
-	t. subId		= 0;
-	t. transmitterName	= "not in database";
-	t. altitude		= 0;
-	t. height		= 0;
-	t. latitude		= target. latitude;
-	t. longitude		= target. longitude;
-	t. polarization		= "";
-	t. power		= 0;
-	t. direction		= "";
-
-	t. strength		= 0;
-	t. distance		= 0;
-	t. azimuth		= 0;
 	t. dateTime		= "";
 	locker. lock ();
-	if (type == MAP_RESET)
+	if ((type == MAP_RESET) || (type == MAP_CLOSE))
 	 transmitterList. resize (0);
 	transmitterList. push_back (t);
 	locker. unlock ();
@@ -579,54 +354,92 @@
 
 void	httpHandler::putData	(uint8_t	type,
 	 transmitter	&theTr,
-	 const QString	&theTime) {
-//	 const QString	&channelName,
-//	 float	 snr) {
+	 bool		utc) {
 	float latitude	= theTr. latitude;
 	float longitude	= theTr. longitude;
+	locker. lock ();
 	for (unsigned long i = 0; i < transmitterList. size (); i ++)
 	 if ((transmitterList i. latitude == latitude) &&
 	 (transmitterList i. longitude == longitude ) &&
-	 (transmitterList i. type == type))
+	 (transmitterList i. type == type)) {
+	 locker. unlock ();
 	 return;
+	 }
 
 	theTr. type		= type;
-	theTr. dateTime		= theTime;
-//	theTr. strength		= snr;
+	QDateTime theTime	= utc ? QDateTime::currentDateTimeUtc () :
+ QDateTime::currentDateTime ();
 
-	locker. lock ();
+	theTr. dateTime		= theTime. toString (Qt::TextDate);
 	transmitterList. push_back (theTr);
-//	transmitterList. push_back (t);
 	locker. unlock ();
+	if (saveName != "") 
+	 if (!seenAlready (theTr))
+	 saveStack. push_back (theTr);
+}
 
-	for (int i = 0; i < (int)(transmitterVector. size ()); i ++) {
-	 if ((transmitterVector. at (i). transmitterName ==
-	 theTr. transmitterName) &&
-	 (transmitterVector. at (i). channel ==
-	 theTr. channel) &&
-	 (transmitterVector. at (i). type ==
-	 theTr. type)) {
-	 return;
-	 }
-	}
-	
-	if ((saveFile != nullptr) &&
-	 ((type != MAP_RESET) && (type != MAP_FRAME))) {
-	 fprintf (saveFile, "%s; %f; %f; %s; %s; %d; %d; %d; %d; %f, %d, %d, %s\n",
-	 theTr. channel. toUtf8 (). data (),
-	 theTr. latitude,
-	 theTr. longitude,
-	 theTr. transmitterName. toUtf8 (). data (),
-	 theTr. dateTime. toUtf8 (). data (),
-	 theTr. mainId,
-	 theTr. subId,
-	 (int)(theTr. distance),
-	 (int)(theTr. azimuth),
-	 theTr. power,
-	 (int)(theTr. altitude),
-	 (int)(theTr. height),
-	 theTr. direction. toUtf8 (). data ());
-	 transmitterVector. push_back (theTr);
+bool	httpHandler::seenAlready (const transmitter &tr) {
+	for (auto &member: saveStack) 
+	 if ((member. channel == tr. channel) &&
+	 (member. transmitterName == tr. transmitterName))
+	 return true;
+	return false;
+}
+
+void	httpHandler::saveMap	() {
+QDomDocument theDocument;
+	QDomElement root	= theDocument. createElement ("mapView");
+	QDateTime theTime		= QDateTime::currentDateTime ();
+	theDocument. appendChild (root);
+	QDomElement element = theDocument. createElement ("Creator");
+	element. setAttribute ("generator", "Qt-DAB");
+
+	QString keyText = theTime. toString (Qt::TextDate);
+ uint16_t key = 0;
+ for (int i = 0; keyText. toLatin1 (). data () i != 0; i ++)
+ key += keyText. toLatin1 (). data () i;
+ element. setAttribute ("key", key & 0xFF);
+
+	element. setAttribute ("dateTime", keyText);
+	element. setAttribute ("home-X", homeAddress. latitude);
+	element. setAttribute ("home-Y", homeAddress. longitude);
+	root. appendChild (element);
+
+	for (auto &tr: saveStack) {
+	 QDomElement transm = getTransmitter (theDocument, tr);
+	 element. appendChild (transm);
 	}
+
+	QFile file (this -> saveName);
+ if (!file. open (QIODevice::WriteOnly | QIODevice::Text))
+ return;
+
+ QTextStream stream (&file);
+ stream << theDocument. toString ();
+ file. close ();
 }
 
+QDomElement httpHandler::getTransmitter (QDomDocument &doc,
+	 const transmitter &tr) {
+QDomElement element = doc. createElement ("Transmitter");
+
+	element. setAttribute ("country", tr. country);
+	element. setAttribute ("tiiPattern", QString::number (tr. pattern, 8));
+	element. setAttribute ("channel", tr. channel);
+	element. setAttribute ("ensemble", tr. ensemble);
+	element. setAttribute ("transmitterName", tr. transmitterName);
+	element. setAttribute ("Eid", QString::number (tr. Eid, 16));
+	element. setAttribute ("mainId", tr. mainId);
+	element. setAttribute ("subId", tr. subId);
+	element. setAttribute ("latitude", tr. latitude);
+	element. setAttribute ("longitude", tr. longitude);
+	element. setAttribute ("power", tr. power);
+	element. setAttribute ("height", tr. height);
+	element. setAttribute ("altitude", tr. altitude);
+	element. setAttribute ("polarization", tr. polarization);
+	element. setAttribute ("direction", tr. direction);
+	element. setAttribute ("strength", tr. strength);
+	return element;
+}
+
+

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 \
-	   ./sources/support/settings-handler.h \
-	   ./sources/support/position-handler.h \
-	   ./sources/support/db-element.h \
-	   ./sources/support/settingNames.h \
-	   ./sources/support/fft-handler.h \
-	   ./sources/support/riffWriter.h \
-	   ./sources/support/converter_48000.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 \
-	   ./sources/support/scheduler.h \
-	   ./sources/support/schedule-selector.h \
-	   ./sources/support/element-selector.h \
-	   ./sources/support/time-table.h \
-	   ./sources/support/findfilenames.h \
-	   ./sources/support/dl-cache.h \
-	   ./sources/support/content-table.h \
-	   ./sources/support/ITU_Region_1.h \
-	   ./sources/support/coordinates.h \
-	   ./sources/support/skin-handler.h \
-	   ./sources/support/mapport.h \
-	   ./sources/support/bandpass-filter.h \
-	   ./sources/support/fir-filters.h \
-	   ./sources/support/tii-mapper.h \
-	   ./sources/support/tii-reader.h \
-	   ./sources/support/uploader.h \
-	   ./sources/support/basic-print.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/devices/device-handler.h \
-	   ./sources/devices/device-chooser.h \
-	   ./sources/devices/device-exceptions.h \
-	   ./sources/devices/xml-filewriter.h \
-	   ./sources/devices/filereaders/new-reader/newfiles.h \
-	   ./sources/devices/filereaders/new-reader/new-reader.h \
-	   ./sources/devices/filereaders/new-reader/riff-reader.h \
-	   ./sources/devices/filereaders/rawfiles-new/rawfiles.h \
-	   ./sources/devices/filereaders/rawfiles-new/raw-reader.h \
-	   ./sources/devices/filereaders/xml-filereader/element-reader.h \
-	   ./sources/devices/filereaders/xml-filereader/xml-filereader.h \
-	   ./sources/devices/filereaders/xml-filereader/xml-reader.h \
-	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.h 
-
-FORMS	+= ./sources/main/forms-v7/technical_data.ui
-FORMS	+= ./sources/main/forms-v7/dabradio-6.ui 
-FORMS	+= ./sources/main/forms-v7/config-helper.ui 
-#FORMS	+= ./sources/main/forms-v7/audio-description.ui
-#FORMS	+= ./sources/main/forms-v7/data-description.ui
-FORMS	+= ./sources/main/forms-v7/scopewidget.ui
-FORMS	+= ./sources/main/forms-v7/aboutdialog.ui
-FORMS	+= ./sources/main/snr-viewer/snr-widget.ui
-#FORMS	+= ./sources/devices/filereaders/filereader-widget.ui 
-FORMS	+= ./sources/devices/filereaders/xml-filereader/xmlfiles.ui
-
-SOURCES += ./sources/main/main.cpp \
-	   ./sources/main/radio.cpp \
-	   ./sources/main/display-widget.cpp \
-           ./sources/main/scopes/correlation-scope.cpp \
-           ./sources/main/scopes/spectrum-scope.cpp \
-           ./sources/main/scopes/null-scope.cpp \
-           ./sources/main/scopes/channel-scope.cpp \
-           ./sources/main/scopes/dev-scope.cpp \
-           ./sources/main/scopes/waterfall-scope.cpp \
-	   ./sources/main/scopes/iqdisplay.cpp \
-	   ./sources/main/scopes/audio-display.cpp \
-	   ./sources/main/scopes/spectrogramdata.cpp \
-	   ./sources/main/snr-viewer/snr-viewer.cpp \
-	   ./sources/main/aboutdialog.cpp \
-	   ./sources/main/ensemble-handler.cpp \
-	   ./sources/main/techdata.cpp \
-	   ./sources/main/config-handler.cpp \
-	   ./sources/support/scan-handler.cpp \
-	   ./sources/support/scantable-handler.cpp \
-	   ./sources/support/audiosystem-selector.cpp \
-	   ./sources/support/dxDisplay.cpp \
-	   ./sources/support/dl2-handler.cpp \
-	   ./sources/support/http-handler.cpp \
-	   ./sources/eti-handler/eti-generator.cpp \
-	   ./sources/frontend/ofdm-handler.cpp \
-	   ./sources/frontend/timesyncer.cpp \
-	   ./sources/frontend/sample-reader.cpp \
-	   ./sources/frontend/ofdm-decoder.cpp \
-	   ./sources/frontend/correlator.cpp \
-	   ./sources/frontend/estimator.cpp \
-	   ./sources/frontend/freqsyncer.cpp \
-	   ./sources/frontend/phasetable.cpp \
-	   ./sources/frontend/freq-interleaver.cpp \
-	   ./sources/frontend/tii-detector.cpp \
-	   ./sources/frontend/tii-detector-1.cpp \
-	   ./sources/frontend/tii-detector-2.cpp \
-	   ./sources/frontend/fic-handling/fic-handler.cpp \
-	   ./sources/frontend/fic-handling/ensemble.cpp  \
-	   ./sources/frontend/fic-handling/fib-config.cpp  \
-	   ./sources/frontend/fic-handling/fib-decoder.cpp  \
-	   ./sources/protection/protTables.cpp \
-	   ./sources/protection/protection.cpp \
-	   ./sources/protection/eep-protection.cpp \
-	   ./sources/protection/uep-protection.cpp \
-	   ./sources/backend/msc-handler.cpp \
-	   ./sources/backend/reed-solomon/galois.cpp \
-	   ./sources/backend/reed-solomon/reed-solomon.cpp \
-	   ./sources/backend/backend.cpp \
-           ./sources/backend/backend-driver.cpp \
-           ./sources/backend/backend-deconvolver.cpp \
-	   ./sources/backend/audio/firecode-checker.cpp \
-	   ./sources/backend/audio/mp2processor.cpp \
-	   ./sources/backend/audio/mp4processor.cpp \
-	   ./sources/backend/audio/bitWriter.cpp \
-	   ./sources/backend/data/pad-handler.cpp \
-	   ./sources/backend/data/data-processor.cpp \
-	   ./sources/backend/data/tdc-datahandler.cpp \
-	   ./sources/backend/data/ip-datahandler.cpp \
-	   ./sources/backend/data/adv-datahandler.cpp \
-	   ./sources/backend/data/mot/mot-handler.cpp \
-	   ./sources/backend/data/mot/mot-object.cpp \
-	   ./sources/backend/data/mot/mot-dir.cpp \
-	   ./sources/backend/data/journaline-controller.cpp \
-	   ./sources/backend/data/journaline-datahandler.cpp \
-	   ./sources/backend/data/journaline-screen.cpp \
-	   ./sources/backend/data/journaline/crc_8_16.c \
-	   ./sources/backend/data/journaline/log.c \
-	   ./sources/backend/data/journaline/newssvcdec_impl.cpp \
-	   ./sources/backend/data/journaline/Splitter.cpp \
-	   ./sources/backend/data/journaline/dabdgdec_impl.c \
-	   ./sources/backend/data/journaline/newsobject.cpp \
-	   ./sources/backend/data/journaline/NML.cpp \
-	   ./sources/backend/data/epg/epg-compiler.cpp \
-	   ./sources/backend/data/epg/xml-extractor.cpp \
-	   ./sources/output/audio-player.cpp \
-	   ./sources/support/crc-handlers.cpp \
-	   ./sources/support/charsets.cpp \
-	   ./sources/support/distances.cpp \
-	   ./sources/support/time-converter.cpp \
-	   ./sources/support/logger.cpp \
-	   ./sources/support/errorlog.cpp \
-	   ./sources/support/settings-handler.cpp \
-	   ./sources/support/position-handler.cpp \
-	   ./sources/support/riffWriter.cpp \
-	   ./sources/support/converter_48000.cpp \
-	   ./sources/support/fft-handler.cpp \
-	   ./sources/support/dab-params.cpp \
-	   ./sources/support/dab-tables.cpp \
-	   ./sources/support/scanlist-handler.cpp \
-	   ./sources/support/scheduler.cpp \
-	   ./sources/support/schedule-selector.cpp \
-	   ./sources/support/element-selector.cpp \
-	   ./sources/support/time-table.cpp \
-	   ./sources/support/findfilenames.cpp \
-	   ./sources/support/content-table.cpp \
-	   ./sources/support/ITU_Region_1.cpp \
-	   ./sources/support/coordinates.cpp \
-	   ./sources/support/skin-handler.cpp \
-	   ./sources/support/mapport.cpp \
-	   ./sources/support/bandpass-filter.cpp \
-	   ./sources/support/fir-filters.cpp \
-	   ./sources/support/tii-mapper.cpp \
-	   ./sources/support/tii-reader.cpp \
-	   ./sources/support/uploader.cpp \
-	   ./sources/support/basic-print.cpp \
-	   ./sources/support/gui-elements/presetcombobox.cpp \
-	   ./sources/support/gui-elements/circular-button.cpp \
-	   ./sources/support/gui-elements/clickable-label.cpp \
-	   ./sources/support/gui-elements/color-selector.cpp \
-	   ./sources/support/gui-elements/font-chooser.cpp \
-	   ./sources/support/gui-elements/icon-label.cpp \
-	   ./sources/support/gui-elements/newpushbutton.cpp \
-	   ./sources/support/gui-elements/normalpushbutton.cpp \
-	   ./sources/support/gui-elements/smallcombobox.cpp \
-	   ./sources/support/gui-elements/smallpushbutton.cpp \
-	   ./sources/support/gui-elements/smallqlistview.cpp \
-	   ./sources/support/gui-elements/smallspinbox.cpp \
-	   ./sources/support/gui-elements/super-frame.cpp \
-	   ./sources/support/gui-elements/verysmallpushbutton.cpp \
-	   ./sources/devices/device-handler.cpp \
-	   ./sources/devices/device-chooser.cpp \
-	   ./sources/devices/xml-filewriter.cpp \
-	   ./sources/devices/filereaders/rawfiles-new/rawfiles.cpp \
-	   ./sources/devices/filereaders/rawfiles-new/raw-reader.cpp \
-           ./sources/devices/filereaders/new-reader/newfiles.cpp \
-           ./sources/devices/filereaders/new-reader/new-reader.cpp \
-           ./sources/devices/filereaders/new-reader/riff-reader.cpp \
-#	   ./sources/devices/filereaders/wavfiles-new/wavfiles.cpp \
-#	   ./sources/devices/filereaders/wavfiles-new/wav-reader.cpp \
-	   ./sources/devices/filereaders/xml-filereader/xml-filereader.cpp \
-	   ./sources/devices/filereaders/xml-filereader/xml-reader.cpp \
-	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.cpp 
-
-#
-unix {
-DESTDIR		= ./linux-bin
-exists ("./.git") {
-   GITHASHSTRING = $$system(git rev-parse --short HEAD)
-   !isEmpty(GITHASHSTRING) {
-       message("Current git hash = $$GITHASHSTRING")
-       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
-   }
-}
-isEmpty(GITHASHSTRING) {
-    DEFINES += GITHASH=\\\"------\\\"
-}
-mac {
-  DESTDIR      = ./mac-bin
-  PKG_CONFIG = /usr/local/bin/pkg-config
-  QT_CONFIG	-= no-pkg-config
-}
-
-CONFIG		+= link_pkgconfig
-PKGCONFIG	+= libusb-1.0
-!mac {
-LIBS      	+= -ldl
-}
-PKGCONFIG	+= portaudio-2.0
-PKGCONFIG	+= zlib
-#PKGCONFIG	+= sndfile
-#PKGCONFIG	+= samplerate
-INCLUDEPATH	+= /usr/local/include
-
-INCLUDEPATH	+= /usr/local/include
-#correct this for the correct path to the qwt6 library on your system
-#LIBS		+= -lqwt
-equals (QT_MAJOR_VERSION, 6) {
-	 LIBS		+= -lqwt-qt6
-	}else{  LIBS += -lqwt-qt5
-	}
-equals (QT_MAJOR_VERSION, 5) {
-   TARGET               = qt-dab-qt5-6.9.5
-}
-else {
-   TARGET               = qt-dab-qt6-6.9.5
-}
-
-#mac {
-# Should be possible to make on non Macs as well.
-# qmake -set QMAKEFEATURES /usr/local/Cellar/qwt/6.2.0/features
-CONFIG		+= qwt
-#}
-CONFIG		+= double
-#CONFIG		+= single
-#
-# comment or uncomment for the devices you want to have support for
-# (you obviously have libraries installed for the selected ones)
-CONFIG		+= sdrplay-v2
-CONFIG		+= sdrplay-v3
-CONFIG		+= sdrplay-duo
-CONFIG		+= dabstick-linux
-CONFIG		+= rtl_tcp
-CONFIG		+= airspy-2
-CONFIG		+= hackrf
-CONFIG		+= lime
-#CONFIG		+= soapy
-#CONFIG		+= pluto-rxtx
-CONFIG		+= pluto
-CONFIG		+= spyServer-16
-CONFIG		+= spyServer-8
-#CONFIG		+= uhd
-#CONFIG		+= faad
-CONFIG		+= fdk-aac
-#very experimental, simple server for connecting to a tdc handler
-#CONFIG		+= datastreamer
-#to handle output of embedded an IP data stream, uncomment
-#CONFIG		+= send_datagram
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default, uncomment
-CONFIG		+= local-audio
-
-#CONFIG		+= viterbi-scalar
-#CONFIG		+= viterbi-sse
-CONFIG		+= viterbi-avx2
-#CONFIG		+= spiral-sse
-#CONFIG		+= spiral-no-sse
-#DEFINES	+= SHOW_MISSING
-DEFINES		+= __LOGGING__
-DEFINES		+= __DUMP_SNR__		# for experiments only
-}
-
-# an attempt to have it run under W32 through cross compilation
-win32 {
-exists ("./.git") {
-   GITHASHSTRING = $$system(git rev-parse --short HEAD)
-   !isEmpty(GITHASHSTRING) {
-       message("Current git hash = $$GITHASHSTRING")
-       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
-   }
-}
-isEmpty(GITHASHSTRING) {
-    DEFINES += GITHASH=\\\"------\\\"
-}
-
-#for for 64 bit
-	equals (QT_MAJOR_VERSION, 5) {
-        TARGET          = qt5-dab64-6.9.5
-        }
-        else {  
-        TARGET          = qt6-dab64-6.9.5
-        }
-##for for 64 bit
-	DEFINES		+= __BITS64__
-	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
-	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
-	equals (QT_MAJOR_VERSION, 6) {
-        INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt6/qwt
-        } else {
-        INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
-        }
-
-	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
-	CONFIG		+= dabstick-win
-	CONFIG		+= airspy-2
-	CONFIG          += spyServer-16
-        CONFIG          += spyServer-8
-	CONFIG		+= rtl_tcp
-	CONFIG		+= sdrplay-v2
-	CONFIG		+= sdrplay-v3
-	CONFIG		+= pluto
-	CONFIG		+= hackrf
-	CONFIG		+= lime
-#	CONFIG		+= viterbi-scalar
-#	CONFIG		+= spiral-sse
-#	CONFIG		+= spiral-no-sse
-	CONFIG		+= viterbi-avx2
-#	CONFIG		+= spiral-sse
-	CONFIG		+= double
-#	CONFIG		+= single
-#
-	INCLUDEPATH	+= /usr/local/include
-	LIBS		+= -lportaudio
-	LIBS		+= -lole32
-	LIBS		+= -lwinpthread
-	LIBS		+= -lwinmm
-	LIBS 		+= -lstdc++
-	LIBS		+= -lws2_32
-	LIBS		+= -lusb-1.0
-	LIBS		+= -lz
-#correct this for the correct path to the qwt6 library on your system
-#mingw64 wants the first one, cross compiling mingw64-32 the second one
-#LIBS		+= -lqwt
-	equals (QT_MAJOR_VERSION, 6) {
-	        LIBS		+= -lqwt-qt6
-	}
-	else {
-	        LIBS		+= -lqwt-qt5
-	}
-	CONFIG		+= fdk-aac
-#	CONFIG		+= faad
-#
-#very experimental, simple server for connecting to a tdc handler
-#CONFIG		+= datastreamer
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default qt way of soud out
-CONFIG		+= local-audio
-#comment both out if you just want to use the "normal" way
-
-DEFINES	+= __DUMP_SNR__		# for experiments only
-}
-
-###	dabstick
-#	Note: the windows version is bound to the dll, the
-#	linux version loads the function from the so
-dabstick-linux {
-	DEFINES		+= HAVE_RTLSDR
-	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-linux 
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-linux 
-	HEADERS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-handler.h \
-	                   ./sources/devices/rtlsdr-handler-linux/dll-driver.h \
-	                   ./sources/devices/rtlsdr-handler-linux/rtl-dongleselect.h
-	SOURCES		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-handler.cpp \
-	                   ./sources/devices/rtlsdr-handler-linux/dll-driver.cpp \
-	                   ./sources/devices/rtlsdr-handler-linux/rtl-dongleselect.cpp
-	FORMS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui
-}
-
-dabstick-win {
-	DEFINES		+= HAVE_RTLSDR_V3
-	DEFINES		+= HAVE_RTLSDR_V4
-	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-win
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-win 
-#	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
-	HEADERS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.h \
-	                   ./sources/devices/rtlsdr-handler-win/rtl-sdr.h
-	SOURCES		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.cpp 
-	FORMS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-widget.ui
-}
-
-#
-#	the SDRplay
-#
-sdrplay-v2 {
-	DEFINES		+= HAVE_SDRPLAY_V2
-	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
-	HEADERS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h \ 
-	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.h 
-	SOURCES		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \ 
-	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.cpp 
-	FORMS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
-}
-#
-#	the SDRplay V3
-#
-sdrplay-v3 {
-	DEFINES		+= HAVE_SDRPLAY_V3
-	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v3
-	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v3 \
-	                   ./sources/devices/sdrplay-handler-v3/include
-        HEADERS         += ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
-                           ./sources/devices/sdrplay-handler-v3/sdrplay-commands.h \
-	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.h \ 
-	                   ./sources/devices/sdrplay-handler-v3/Rsp-device.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.h
-        SOURCES         += ./sources/devices/sdrplay-handler-v3/Rsp-device.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.cpp \ 
-	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.cpp 
-	FORMS		+= ./sources/devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
-#	LIBS		+= -ldl
-}
-#
-sdrplay-duo {
-	DEFINES		+= HAVE_DUO
-	DEPENDPATH	+= ./sources/devices/sdrplay-handler-duo
-	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-duo \
-	                   ./sources/devices/sdrplay-handler-duo/include
-        HEADERS         += ./sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.h \
-                           ./sources/devices/sdrplay-handler-duo/duo-commands.h 
-        SOURCES         += ./sources/devices/sdrplay-handler-duo/sdrplay-handler-duo.cpp 
-	FORMS		+= ./sources/devices/sdrplay-handler-duo/duo-widget.ui
-#	LIBS		+= -ldl
-}
-#
-#	limeSDR
-#
-lime  {
-	DEFINES		+= HAVE_LIME
-	INCLUDEPATH	+= ./sources/devices/lime-handler
-	DEPENDPATH	+= ./sources/devices/lime-handler
-        HEADERS         += ./sources/devices/lime-handler/lime-handler.h \	
-	                   ./sources/devices/lime-handler/lime-widget.h
-        SOURCES         += ./sources/devices/lime-handler/lime-handler.cpp 
-}
-#
-#	the hackrf
-#
-hackrf {
-	DEFINES		+= HAVE_HACKRF
-	DEPENDPATH	+= ./sources/devices/hackrf-handler 
-	INCLUDEPATH	+= ./sources/devices/hackrf-handler 
-	HEADERS		+= ./sources/devices/hackrf-handler/hackrf-handler.h 
-	SOURCES		+= ./sources/devices/hackrf-handler/hackrf-handler.cpp 
-	FORMS		+= ./sources/devices/hackrf-handler/hackrf-widget.ui
-}
-#
-#
-# airspy support
-#
-airspy {
-	DEFINES		+= HAVE_AIRSPY
-	DEPENDPATH	+= ./sources/devices/airspy 
-	INCLUDEPATH	+= ./sources/devices/airspy-handler \
-	                   ./sources/devices/airspy-handler/libairspy
-	HEADERS		+= ./sources/devices/airspy-handler/airspy-handler.h \
-	                   ./sources/devices/airspy-handler/airspyselect.h \
-	                   ./sources/devices/airspy-handler/libairspy/airspy.h
-	SOURCES		+= ./sources/devices/airspy-handler/airspy-handler.cpp \
-	                   ./sources/devices/airspy-handler/airspyselect.cpp
-	FORMS		+= ./sources/devices/airspy-handler/airspy-widget.ui
-}
-
-airspy-2 {
-	DEFINES		+= HAVE_AIRSPY_2
-	DEPENDPATH	+= ./sources/devices/airspy-2 
-	INCLUDEPATH	+= ./sources/devices/airspy-2 \
-	                   ./sources/devices/airspy-2/libairspy
-	HEADERS		+= ./sources/devices/airspy-2/airspy-2.h \
-	                   ./sources/devices/airspy-2/airspyselect.h \
-	                   ./sources/devices/airspy-2/libairspy/airspy.h
-	SOURCES		+= ./sources/devices/airspy-2/airspy-2.cpp \
-	                   ./sources/devices/airspy-2/airspyselect.cpp
-	FORMS		+= ./sources/devices/airspy-2/airspy-widget.ui
-}
-
-#	extio dependencies, windows only
-#
-extio {
-	DEFINES		+= HAVE_EXTIO
-	INCLUDEPATH	+= ./sources/devices/extio-handler
-	HEADERS		+= ./sources/devices/extio-handler/extio-handler.h \
-	                   ./sources/devices/extio-handler/common-readers.h \
-	                   ./sources/devices/extio-handler/virtual-reader.h
-	SOURCES		+= ./sources/devices/extio-handler/extio-handler.cpp \
-	                   ./sources/devices/extio-handler/common-readers.cpp \
-	                   ./sources/devices/extio-handler/virtual-reader.cpp
-}
-
-#
-rtl_tcp {
-	DEFINES		+= HAVE_RTL_TCP
-	QT		+= network
-	INCLUDEPATH	+= ./sources/devices/rtl_tcp
-	HEADERS		+= ./sources/devices/rtl_tcp/rtl_tcp_client.h
-	SOURCES		+= ./sources/devices/rtl_tcp/rtl_tcp_client.cpp
-	FORMS		+= ./sources/devices/rtl_tcp/rtl_tcp-widget.ui
-}
-
-soapy {
-	DEFINES		+= HAVE_SOAPY
-	DEPENDPATH	+= ./sources/devices/soapy
-	INCLUDEPATH     += ./sources/devices/soapy
-        HEADERS         += ./sources/devices/soapy/soapy-handler.h \
-	                   ./sources/devices/soapy/soapy-converter.h
-        SOURCES         += ./sources/devices/soapy/soapy-handler.cpp \
-	                   ./sources/devices/soapy/soapy-converter.cpp
-        FORMS           += ./sources/devices/soapy/soapy-widget.ui
-	LIBS		+= -lsamplerate
-	LIBS		+= -lSoapySDR -lm
-}
-
-pluto-rxtx	{
-	DEFINES		+= HAVE_PLUTO_RXTX
-	QT		+= network
-	INCLUDEPATH	+= ./sources/devices/pluto-rxtx
-	INCLUDEPATH	+= ./sources/devices/pluto-rxtx/dab-streamer
-	HEADERS		+= ./sources/devices/pluto-rxtx/dabFilter.h
-	HEADERS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.h 
-	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.h 
-	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.h
-	SOURCES		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.cpp 
-	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.cpp
-	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.cpp
-	FORMS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-widget.ui
-#	LIBS		+= -liio -lad9361
-}
-
-pluto	{
-	DEFINES		+= HAVE_PLUTO
-	QT		+= network
-	INCLUDEPATH	+= ./sources/devices/pluto-handler
-	HEADERS		+= ./sources/devices/pluto-handler/dabFilter.h
-	HEADERS		+= ./sources/devices/pluto-handler/pluto-handler.h
-	SOURCES		+= ./sources/devices/pluto-handler/pluto-handler.cpp
-	FORMS		+= ./sources/devices/pluto-handler/pluto-widget.ui
-}
-
-elad-device	{
-	DEFINES		+= HAVE_ELAD
-	DEPENDPATH	+= ./sources/devices/elad-s1-handler
-	INCLUDEPATH	+= ./sources/devices/elad-s1-handler
-	HEADERS		+= ./sources/devices/elad-s1-handler/elad-handler.h
-	HEADERS		+= ./sources/devices/elad-s1-handler/elad-loader.h
-	HEADERS		+= ./sources/devices/elad-s1-handler/elad-worker.h
-	SOURCES		+= ./sources/devices/elad-s1-handler/elad-handler.cpp
-	SOURCES		+= ./sources/devices/elad-s1-handler/elad-loader.cpp
-	SOURCES		+= ./sources/devices/elad-s1-handler/elad-worker.cpp
-	FORMS		+= ./sources/devices/elad-s1-handler/elad-widget.ui
-}
-
-spyServer-8  {
-	DEFINES		+= HAVE_SPYSERVER_8
-	DEPENDPATH	+= ./sources/devices/spy-server-8
-	INCLUDEPATH	+= ./sources/devices/spy-server-8
-	HEADERS		+= ./sources/devices/spy-server-8/spyserver-protocol.h 
-	HEADERS		+= ./sources/devices/spy-server-8/tcp-client-8.h 
-	HEADERS		+= ./sources/devices/spy-server-8/spy-handler-8.h 
-	HEADERS		+= ./sources/devices/spy-server-8/spyserver-client-8.h
-	SOURCES		+= ./sources/devices/spy-server-8/tcp-client-8.cpp 
-	SOURCES		+= ./sources/devices/spy-server-8/spy-handler-8.cpp 
-	SOURCES		+= ./sources/devices/spy-server-8/spyserver-client-8.cpp 
-	FORMS		+= ./sources/devices/spy-server-8/spyserver-widget-8.ui
-}
-	
-spyServer-16  {
-	DEFINES		+= HAVE_SPYSERVER_16
-	DEPENDPATH	+= ./sources/devices/spy-server-16
-	INCLUDEPATH	+= ./sources/devices/spy-server-16
-	HEADERS		+= ./sources/devices/spy-server-16/spyserver-protocol.h 
-	HEADERS		+= ./sources/devices/spy-server-16/tcp-client.h 
-	HEADERS		+= ./sources/devices/spy-server-16/spy-handler.h 
-	HEADERS		+= ./sources/devices/spy-server-16/spyserver-client.h
-	SOURCES		+= ./sources/devices/spy-server-16/tcp-client.cpp 
-	SOURCES		+= ./sources/devices/spy-server-16/spy-handler.cpp 
-	SOURCES		+= ./sources/devices/spy-server-16/spyserver-client.cpp 
-	FORMS		+= ./sources/devices/spy-server-16/spyserver-widget.ui
-}
-	
-uhd	{
-	DEFINES		+= HAVE_UHD
-	DEPENDPATH	+= ./sources/devices/uhd
-	INCLUDEPATH	+= ./sources/devices/uhd
-	HEADERS		+= ./sources/devices/uhd/uhd-handler.h
-	SOURCES		+= ./sources/devices/uhd/uhd-handler.cpp
-	FORMS		+= ./sources/devices/uhd/uhd-widget.ui
-	LIBS		+= -luhd
-}
-
-colibri	{
-	DEFINES		+= HAVE_COLIBRI
-	DEPENDPATH	+= ./sources/devices/colibri-handler
-	INCLUDEPATH	+= ./sources/devices/colibri-handler
-	HEADERS		+= ./sources/devices/colibri-handler/common.h
-	HEADERS		+= ./sources/devices/colibri-handler/LibLoader.h
-	HEADERS		+= ./sources/devices/colibri-handler/colibri-handler.h
-	SOURCES		+= ./sources/devices/colibri-handler/LibLoader.cpp
-	SOURCES		+= ./sources/devices/colibri-handler/colibri-handler.cpp
-	FORMS		+= ./sources/devices/colibri-handler/colibri-widget.ui
-}
-	
-send_datagram {
-	DEFINES		+= _SEND_DATAGRAM_
-	QT		+= network
-}
-
-tcp-streamer	{
-	DEFINES		+= TCP_STREAMER
-	QT		+= network
-	HEADERS		+= ./sources/output/tcp-streamer.h
-	SOURCES		+= ./sources/output/tcp-streamer.cpp
-}
-
-local-audio {
-	PKGCONFIG	+= portaudio-2.0
-	DEFINES		+= QT_AUDIO
-	QT		+= multimedia 
-
-	equals (QT_MAJOR_VERSION, 5) {
-	INCLUDEPATH	+= ./sources/output/Qt5
-	INCLUDEPATH	+= ./sources/output/portaudio
-	HEADERS		+= ./sources/output/Qt5/Qt-audio.h \	
-	                   ./sources/output/Qt5/Qt-audiodevice.h \
-	                   ./sources/output/portaudio/audiosink.h 
-	SOURCES		+= ./sources/output/Qt5/Qt-audio.cpp \
-	                   ./sources/output/Qt5/Qt-audiodevice.cpp \
-	                   ./sources/output/portaudio/audiosink.cpp 
-	LIBS		+= -lportaudio
-	} else {
-	INCLUDEPATH	+= ./sources/output/Qt6
-	INCLUDEPATH	+= ./sources/output/portaudio
-	HEADERS		+= ./sources/output/Qt6/Qt-audio.h \	
-	                   ./sources/output/Qt6/Qt-audiodevice.h \
-	                   ./sources/output/portaudio/audiosink.h 
-	SOURCES		+= ./sources/output/Qt6/Qt-audio.cpp \
-	                   ./sources/output/Qt6/Qt-audiodevice.cpp \
-	                   ./sources/output/portaudio/audiosink.cpp 
-	LIBS		+= -lportaudio
-	}
-}
-
-datastreamer	{
-	DEFINES		+= DATA_STREAMER
-	DEFINES		+= CLOCK_STREAMER
-	INCLUDEPATH	+= ./sources/server-thread
-	HEADERS		+= ./sources/server-thread/tcp-server.h
-	SOURCES		+= ./sources/server-thread/tcp-server.cpp
-}
-
-viterbi-scalar {
-	DEPENDPATH	+= ./sources/support/viterbi
-	INCLUDEPATH	+= ./sources/support/viterbi
-	HEADERS		+= ./sources/support/viterbi/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
-}
-
-viterbi-sse {
-	DEPENDPATH	+= ./sources/support/viterbi
-	QMAKE_CFLAGS    +=  -msse4
-	QMAKE_CXXFLAGS  +=  -msse4
-	QMAKE_CFLAGS    +=  -mavx2 
-	QMAKE_CXXFLAGS  +=  -mavx2
-	QMAKE_LFLAGS    +=  -mavx2
-	DEFINES		+= __SSE4_1__
-	DEFINES		+= __ARCH_X86__
-	#DEFINES	+= __ARCH_AARCH64__
-	INCLUDEPATH	+= ./sources/support/viterbi
-	HEADERS		+= ./sources/support/viterbi/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
-}
-
-viterbi-avx2 {
-	DEPENDPATH	+= ./sources/support/viterbi
-	QMAKE_CFLAGS    +=  -mavx2 
-	QMAKE_CXXFLAGS  +=  -mavx2
-	QMAKE_LFLAGS    +=  -mavx2
-	DEFINES		+= __AVX2__
-	DEFINES		+= __ARCH_X86__
-	#DEFINES	+= __ARCH_AARCH64__
-	INCLUDEPATH	+= ./sources/support/viterbi
-	HEADERS		+= ./sources/support/viterbi/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
-}
-
-spiral-sse	{
-	DEPENDPATH     +=  ./sources/support/viterbi-spiral 
-	INCLUDEPATH     +=  ./sources/support/viterbi-spiral 
-	DEFINES		+=  SSE_AVAILABLE
-	HEADERS		+= ./sources/support/viterbi-spiral/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi-spiral/viterbi.cpp 
-	HEADERS		+= ./sources/support/viterbi-spiral/spiral-sse.h
-	SOURCES		+= ./sources/support/viterbi-spiral/spiral-sse.c
-}
-
-spiral-no-sse	{
-	DEPENDPATH     +=  ./sources/support/viterbi-spiral 
-	INCLUDEPATH     +=  ./sources/support/viterbi-spiral 
-	DEFINES		+= NO_SSE_AVAILABLE
-	HEADERS		+= ./sources/support/viterbi-spiral/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi-spiral/viterbi.cpp 
-	HEADERS		+= ./sources/support/viterbi-spiral/spiral-no-sse.h
-	SOURCES		+= ./sources/support/viterbi-spiral/spiral-no-sse.c
-}
-
-faad	{
-	DEFINES		+= __WITH_FAAD__
-	HEADERS		+= ./sources/backend/audio/faad-decoder.h 
-	SOURCES		+= ./sources/backend/audio/faad-decoder.cpp 
-	LIBS		+= -lfaad
-}
-
-fdk-aac {
-        DEFINES         += __WITH_FDK_AAC__
-        INCLUDEPATH     += ./helpers/specials/fdk-aac
-        HEADERS         += ./sources/backend/audio/fdk-aac.h
-        SOURCES         += ./sources/backend/audio/fdk-aac.cpp
-unix {
-	LIBS		+= -lfdk-aac
-}
-win32 {
-	LIBS		+= -lfdk-aac-2
-}
-}
-
-mapserver {
-	DEFINES		+= __HAVE_MAP_SERVER__
-}
-
-double	{
-	DEFINES		+= __WITH_DOUBLES__
-	LIBS		+= -lfftw3
-}
-
-single	{
-	LIBS		+= -lfftw3f
-}

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 \
-	   ./sources/support/position-handler.h \
-	   ./sources/support/db-element.h \
-	   ./sources/support/settingNames.h \
-	   ./sources/support/fft-handler.h \
-	   ./sources/support/riffWriter.h \
-	   ./sources/support/converter_48000.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 \
-	   ./sources/support/scheduler.h \
-	   ./sources/support/schedule-selector.h \
-	   ./sources/support/element-selector.h \
-	   ./sources/support/time-table.h \
-	   ./sources/support/findfilenames.h \
-	   ./sources/support/dl-cache.h \
-	   ./sources/support/content-table.h \
-	   ./sources/support/ITU_Region_1.h \
-	   ./sources/support/coordinates.h \
-	   ./sources/support/skin-handler.h \
-	   ./sources/support/mapport.h \
-	   ./sources/support/bandpass-filter.h \
-	   ./sources/support/fir-filters.h \
-	   ./sources/support/tii-mapper.h \
-	   ./sources/support/tii-reader.h \
-	   ./sources/support/uploader.h \
-	   ./sources/support/basic-print.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/devices/device-handler.h \
-	   ./sources/devices/device-chooser.h \
-	   ./sources/devices/device-exceptions.h \
-	   ./sources/devices/xml-filewriter.h \
-	   ./sources/devices/filereaders/new-reader/newfiles.h \
-	   ./sources/devices/filereaders/new-reader/new-reader.h \
-	   ./sources/devices/filereaders/new-reader/riff-reader.h \
-	   ./sources/devices/filereaders/rawfiles-new/rawfiles.h \
-	   ./sources/devices/filereaders/rawfiles-new/raw-reader.h \
-	   ./sources/devices/filereaders/xml-filereader/element-reader.h \
-	   ./sources/devices/filereaders/xml-filereader/xml-filereader.h \
-	   ./sources/devices/filereaders/xml-filereader/xml-reader.h \
-	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.h 
-
-FORMS	+= ./sources/main/forms-v7/technical_data.ui
-FORMS	+= ./sources/main/forms-v7/dabradio-6.ui 
-FORMS	+= ./sources/main/forms-v7/config-helper.ui 
-#FORMS	+= ./sources/main/forms-v7/audio-description.ui
-#FORMS	+= ./sources/main/forms-v7/data-description.ui
-FORMS	+= ./sources/main/forms-v7/scopewidget.ui
-FORMS	+= ./sources/main/forms-v7/aboutdialog.ui
-FORMS	+= ./sources/main/snr-viewer/snr-widget.ui
-#FORMS	+= ./sources/devices/filereaders/filereader-widget.ui 
-FORMS	+= ./sources/devices/filereaders/xml-filereader/xmlfiles.ui
-
-SOURCES += ./sources/main/main.cpp \
-	   ./sources/main/radio.cpp \
-	   ./sources/main/display-widget.cpp \
-           ./sources/main/scopes/correlation-scope.cpp \
-           ./sources/main/scopes/spectrum-scope.cpp \
-           ./sources/main/scopes/null-scope.cpp \
-           ./sources/main/scopes/channel-scope.cpp \
-           ./sources/main/scopes/dev-scope.cpp \
-           ./sources/main/scopes/waterfall-scope.cpp \
-	   ./sources/main/scopes/iqdisplay.cpp \
-	   ./sources/main/scopes/audio-display.cpp \
-	   ./sources/main/scopes/spectrogramdata.cpp \
-	   ./sources/main/snr-viewer/snr-viewer.cpp \
-	   ./sources/main/aboutdialog.cpp \
-	   ./sources/main/ensemble-handler.cpp \
-	   ./sources/main/techdata.cpp \
-	   ./sources/main/config-handler.cpp \
-	   ./sources/support/scan-handler.cpp \
-	   ./sources/support/scantable-handler.cpp \
-	   ./sources/support/audiosystem-selector.cpp \
-	   ./sources/support/dxDisplay.cpp \
-	   ./sources/support/dl2-handler.cpp \
-	   ./sources/eti-handler/eti-generator.cpp \
-	   ./sources/frontend/ofdm-handler.cpp \
-	   ./sources/frontend/timesyncer.cpp \
-	   ./sources/frontend/sample-reader.cpp \
-	   ./sources/frontend/ofdm-decoder.cpp \
-	   ./sources/frontend/correlator.cpp \
-	   ./sources/frontend/estimator.cpp \
-	   ./sources/frontend/freqsyncer.cpp \
-	   ./sources/frontend/phasetable.cpp \
-	   ./sources/frontend/freq-interleaver.cpp \
-	   ./sources/frontend/tii-detector.cpp \
-	   ./sources/frontend/tii-detector-1.cpp \
-	   ./sources/frontend/tii-detector-2.cpp \
-	   ./sources/frontend/fic-handling/fic-handler.cpp \
-	   ./sources/frontend/fic-handling/ensemble.cpp  \
-	   ./sources/frontend/fic-handling/fib-config.cpp  \
-	   ./sources/frontend/fic-handling/fib-decoder.cpp  \
-	   ./sources/protection/protTables.cpp \
-	   ./sources/protection/protection.cpp \
-	   ./sources/protection/eep-protection.cpp \
-	   ./sources/protection/uep-protection.cpp \
-	   ./sources/backend/msc-handler.cpp \
-	   ./sources/backend/reed-solomon/galois.cpp \
-	   ./sources/backend/reed-solomon/reed-solomon.cpp \
-	   ./sources/backend/backend.cpp \
-           ./sources/backend/backend-driver.cpp \
-           ./sources/backend/backend-deconvolver.cpp \
-	   ./sources/backend/audio/firecode-checker.cpp \
-	   ./sources/backend/audio/mp2processor.cpp \
-	   ./sources/backend/audio/mp4processor.cpp \
-	   ./sources/backend/audio/bitWriter.cpp \
-	   ./sources/backend/data/pad-handler.cpp \
-	   ./sources/backend/data/data-processor.cpp \
-	   ./sources/backend/data/tdc-datahandler.cpp \
-	   ./sources/backend/data/ip-datahandler.cpp \
-	   ./sources/backend/data/adv-datahandler.cpp \
-	   ./sources/backend/data/mot/mot-handler.cpp \
-	   ./sources/backend/data/mot/mot-object.cpp \
-	   ./sources/backend/data/mot/mot-dir.cpp \
-	   ./sources/backend/data/journaline-controller.cpp \
-	   ./sources/backend/data/journaline-datahandler.cpp \
-	   ./sources/backend/data/journaline-screen.cpp \
-	   ./sources/backend/data/journaline/crc_8_16.c \
-	   ./sources/backend/data/journaline/log.c \
-	   ./sources/backend/data/journaline/newssvcdec_impl.cpp \
-	   ./sources/backend/data/journaline/Splitter.cpp \
-	   ./sources/backend/data/journaline/dabdgdec_impl.c \
-	   ./sources/backend/data/journaline/newsobject.cpp \
-	   ./sources/backend/data/journaline/NML.cpp \
-	   ./sources/backend/data/epg/epg-compiler.cpp \
-	   ./sources/backend/data/epg/xml-extractor.cpp \
-	   ./sources/output/audio-player.cpp \
-	   ./sources/support/crc-handlers.cpp \
-	   ./sources/support/charsets.cpp \
-	   ./sources/support/distances.cpp \
-	   ./sources/support/time-converter.cpp \
-	   ./sources/support/logger.cpp \
-	   ./sources/support/errorlog.cpp \
-	   ./sources/support/settings-handler.cpp \
-	   ./sources/support/position-handler.cpp \
-	   ./sources/support/riffWriter.cpp \
-	   ./sources/support/converter_48000.cpp \
-	   ./sources/support/fft-handler.cpp \
-	   ./sources/support/dab-params.cpp \
-	   ./sources/support/dab-tables.cpp \
-	   ./sources/support/scanlist-handler.cpp \
-	   ./sources/support/scheduler.cpp \
-	   ./sources/support/schedule-selector.cpp \
-	   ./sources/support/element-selector.cpp \
-	   ./sources/support/time-table.cpp \
-	   ./sources/support/findfilenames.cpp \
-	   ./sources/support/content-table.cpp \
-	   ./sources/support/ITU_Region_1.cpp \
-	   ./sources/support/coordinates.cpp \
-	   ./sources/support/skin-handler.cpp \
-	   ./sources/support/mapport.cpp \
-	   ./sources/support/bandpass-filter.cpp \
-	   ./sources/support/fir-filters.cpp \
-	   ./sources/support/tii-mapper.cpp \
-	   ./sources/support/tii-reader.cpp \
-	   ./sources/support/uploader.cpp \
-	   ./sources/support/basic-print.cpp \
-	   ./sources/support/gui-elements/presetcombobox.cpp \
-	   ./sources/support/gui-elements/circular-button.cpp \
-	   ./sources/support/gui-elements/clickable-label.cpp \
-	   ./sources/support/gui-elements/color-selector.cpp \
-	   ./sources/support/gui-elements/font-chooser.cpp \
-	   ./sources/support/gui-elements/icon-label.cpp \
-	   ./sources/support/gui-elements/newpushbutton.cpp \
-	   ./sources/support/gui-elements/normalpushbutton.cpp \
-	   ./sources/support/gui-elements/smallcombobox.cpp \
-	   ./sources/support/gui-elements/smallpushbutton.cpp \
-	   ./sources/support/gui-elements/smallqlistview.cpp \
-	   ./sources/support/gui-elements/smallspinbox.cpp \
-	   ./sources/support/gui-elements/super-frame.cpp \
-	   ./sources/support/gui-elements/verysmallpushbutton.cpp \
-	   ./sources/devices/device-handler.cpp \
-	   ./sources/devices/device-chooser.cpp \
-	   ./sources/devices/xml-filewriter.cpp \
-	   ./sources/devices/filereaders/rawfiles-new/rawfiles.cpp \
-	   ./sources/devices/filereaders/rawfiles-new/raw-reader.cpp \
-           ./sources/devices/filereaders/new-reader/newfiles.cpp \
-           ./sources/devices/filereaders/new-reader/new-reader.cpp \
-           ./sources/devices/filereaders/new-reader/riff-reader.cpp \
-#	   ./sources/devices/filereaders/wavfiles-new/wavfiles.cpp \
-#	   ./sources/devices/filereaders/wavfiles-new/wav-reader.cpp \
-	   ./sources/devices/filereaders/xml-filereader/xml-filereader.cpp \
-	   ./sources/devices/filereaders/xml-filereader/xml-reader.cpp \
-	   ./sources/devices/filereaders/xml-filereader/xml-descriptor.cpp 
-
-#
-unix {
-DESTDIR		= ./linux-bin
-exists ("./.git") {
-   GITHASHSTRING = $$system(git rev-parse --short HEAD)
-   !isEmpty(GITHASHSTRING) {
-       message("Current git hash = $$GITHASHSTRING")
-       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
-   }
-}
-isEmpty(GITHASHSTRING) {
-    DEFINES += GITHASH=\\\"------\\\"
-}
-
-equals (QT_MAJOR_VERSION, 5) {
-   TARGET		= qt-dab-qt5-6.9.5
-}
-else {
-   TARGET		= qt-dab-qt6-6.9.5
-}
-
-mac {
-  DESTDIR      = ./mac-bin
-  PKG_CONFIG = /usr/local/bin/pkg-config
-  QT_CONFIG	-= no-pkg-config
-}
-
-CONFIG		+= link_pkgconfig
-#PKGCONFIG	+= sndfile
-#PKGCONFIG	+= samplerate
-PKGCONFIG	+= libusb-1.0
-CONFIG		+= mapserver
-!mac {
-LIBS      	+= -ldl
-}
-PKGCONFIG	+= portaudio-2.0
-PKGCONFIG	+= zlib
-#PKGCONFIG	+= sndfile
-#PKGCONFIG	+= samplerate
-INCLUDEPATH	+= /usr/local/include
-!mac {
-INCLUDEPATH	+= /usr/local/include
-#correct this for the correct path to the qwt6 library on your system
-#LIBS		+= -lqwt
-equals (QT_MAJOR_VERSION, 6) {
-	 LIBS		+= -lqwt-qt6
-	}else{  LIBS += -lqwt-qt5
-	}
-}
-
-#mac {
-# Should be possible to make on non Macs as well.
-# qmake -set QMAKEFEATURES /usr/local/Cellar/qwt/6.2.0/features
-CONFIG		+= qwt
-#}
-CONFIG		+= double
-#CONFIG		+= single
-#
-# comment or uncomment for the devices you want to have support for
-# (you obviously have libraries installed for the selected ones)
-CONFIG		+= sdrplay-v2
-CONFIG		+= sdrplay-v3
-CONFIG		+= dabstick-linux
-CONFIG		+= rtl_tcp
-CONFIG		+= airspy-2
-CONFIG		+= hackrf
-CONFIG		+= lime
-#CONFIG		+= soapy
-#CONFIG		+= pluto-rxtx
-CONFIG		+= pluto
-CONFIG		+= spyServer-16
-CONFIG		+= spyServer-8
-#CONFIG		+= uhd
-#CONFIG		+= colibri
-#CONFIG		+= elad-device
-#CONFIG		+= faad
-CONFIG		+= fdk-aac
-#very experimental, simple server for connecting to a tdc handler
-CONFIG		+= datastreamer
-#to handle output of embedded an IP data stream, uncomment
-#CONFIG		+= send_datagram
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default, uncomment
-CONFIG		+= local-audio
-
-#CONFIG		+= viterbi-scalar
-#CONFIG		+= viterbi-sse
-CONFIG		+= viterbi-avx2
-#CONFIG		+= spiral-sse
-#CONFIG		+= spiral-no-sse
-#DEFINES	+= SHOW_MISSING
-DEFINES		+= __LOGGING__
-DEFINES		+= __DUMP_SNR__		# for experiments only
-}
-
-# an attempt to have it run under W32 through cross compilation
-win32 {
-exists ("./.git") {
-   GITHASHSTRING = $$system(git rev-parse --short HEAD)
-   !isEmpty(GITHASHSTRING) {
-       message("Current git hash = $$GITHASHSTRING")
-       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
-   }
-}
-isEmpty(GITHASHSTRING) {
-    DEFINES += GITHASH=\\\"------\\\"
-}
-
-##for for 64 bit
-#	TARGET		= qt-dab64-9.5
-#	DEFINES		+= __BITS64__
-#	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
-#	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
-#	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
-#	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
-##	LIBS		+= -liio
-##	#CONFIG		+= extio
-#	CONFIG		+= airspy-2
-#	CONFIG		+= rtl_tcp
-#	CONFIG		+= dabstick
-#	CONFIG		+= sdrplay-v2
-#	CONFIG		+= pluto
-#	CONFIG		+= sdrplay-v3
-##	CONFIG		+= hackrf
-##	CONFIG		+= lime
-#	CONFIG		+= viterbi-scalar
-#	CONFIG		+= spiral-sse
-#	CONFIG		+= spiral-no-sse
-#	DEFINES		+= __THREADED_BACKEND
-#
-#for win32, comment out the lines above
-#	equals (QT_MAJOR_VERSION, 5) {
-#	   TARGET		= qt-dab32-qt5-6.9V3.5
-#	}
-#	else {
-#	   TARGET		= qt-dab32-qt6-6.9V3.5
-#	}
-#	CONFIG		+= dabstick-win-v3
-	equals (QT_MAJOR_VERSION, 5) {
-	   TARGET		= qt-dab32-qt5-6.9.5
-	}
-	else {
-	   TARGET		= qt-dab32-qt6-6.9.5
-	}
-	CONFIG		+= dabstick-win
-	CONFIG		+= airspy-2
-	CONFIG		+= spyServer-16
-	CONFIG		+= spyServer-8
-	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
-	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
-	equals (QT_MAJOR_VERSION, 6) {
-	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt6/qwt
-	} else {
-	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
-	}
-	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
-	CONFIG		+= double
-	#CONFIG		+= single
-	CONFIG		+= mapserver
-	CONFIG		+= extio
-	CONFIG		+= rtl_tcp
-	CONFIG		+= sdrplay-v2
-	CONFIG		+= sdrplay-v3
-	CONFIG		+= hackrf
-	CONFIG		+= lime
-	CONFIG		+= pluto
-#	CONFIG		+= viterbi-scalar
-#	CONFIG		+= viterbi-sse
-	CONFIG		+= viterbi-avx2
-#	CONFIG		+= spiral-sse
-#	CONFIG		+= spiral-no-sse
-#
-#	end of 32/64 specifics
-INCLUDEPATH	+= /usr/local/include
-LIBS		+= -lportaudio
-#LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/libsndfile-1.dll
-#LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/libsamplerate-0.dll
-LIBS		+= -lole32
-LIBS		+= -lwinpthread
-LIBS		+= -lwinmm
-LIBS 		+= -lstdc++
-LIBS		+= -lws2_32
-LIBS		+= -lusb-1.0
-LIBS		+= -lz
-#correct this for the correct path to the qwt6 library on your system
-#mingw64 wants the first one, cross compiling mingw64-32 the second one
-#LIBS		+= -lqwt
-	equals (QT_MAJOR_VERSION, 6) {
-	        LIBS		+= -lqwt-qt6
-	}
-	else {
-	        LIBS		+= -lqwt-qt5
-	}
-CONFIG		+= faad
-#
-#very experimental, simple server for connecting to a tdc handler
-#CONFIG		+= datastreamer
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default qt way of soud out
-CONFIG		+= local-audio
-#comment both out if you just want to use the "normal" way
-
-DEFINES	+= __DUMP_SNR__		# for experiments only
-}
-
-###	dabstick
-#	Note: the windows version is bound to the dll, the
-#	linux version loads the function from the so
-dabstick-linux {
-	DEFINES		+= HAVE_RTLSDR
-	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-linux 
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-linux 
-	HEADERS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-handler.h \
-	                   ./sources/devices/rtlsdr-handler-linux/dll-driver.h \
-	                   ./sources/devices/rtlsdr-handler-linux/rtl-dongleselect.h
-	SOURCES		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-handler.cpp \
-	                   ./sources/devices/rtlsdr-handler-linux/dll-driver.cpp \
-	                   ./sources/devices/rtlsdr-handler-linux/rtl-dongleselect.cpp
-	FORMS		+= ./sources/devices/rtlsdr-handler-linux/rtlsdr-widget.ui
-}
-
-dabstick-win {
-	DEFINES		+= HAVE_RTLSDR_V3
-	DEFINES		+= HAVE_RTLSDR_V4
-	DEPENDPATH	+= ./sources/devices/rtlsdr-handler-win
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-win 
-#	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
-	HEADERS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.h \
-	                   ./sources/devices/rtlsdr-handler-win/rtl-sdr.h
-	SOURCES		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ./sources/devices/rtlsdr-handler-win/rtl-dongleselect.cpp 
-	FORMS		+= ./sources/devices/rtlsdr-handler-win/rtlsdr-widget.ui
-}
-
-#
-#	the SDRplay
-#
-sdrplay-v2 {
-	DEFINES		+= HAVE_SDRPLAY_V2
-	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ./sources/devices/rtlsdr-handler-common
-	HEADERS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.h \ 
-	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.h 
-	SOURCES		+= ./sources/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \ 
-	                   ./sources/devices/sdrplay-handler-v2/sdrplayselect-v2.cpp 
-	FORMS		+= ./sources/devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
-}
-#
-#	the SDRplay
-#
-sdrplay-v3 {
-	DEFINES		+= HAVE_SDRPLAY_V3
-	DEPENDPATH	+= ./sources/devices/sdrplay-handler-v3
-	INCLUDEPATH	+= ./sources/devices/sdrplay-handler-v3 \
-	                   ./sources/devices/sdrplay-handler-v3/include
-        HEADERS         += ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
-                           ./sources/devices/sdrplay-handler-v3/sdrplay-commands.h \
-	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.h \ 
-	                   ./sources/devices/sdrplay-handler-v3/Rsp-device.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.h \
-	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.h
-        SOURCES         += ./sources/devices/sdrplay-handler-v3/Rsp-device.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/sdrplayselect-v3.cpp \ 
-	                   ./sources/devices/sdrplay-handler-v3/RspI-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/RspII-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/RspDuo-handler.cpp \
-	                   ./sources/devices/sdrplay-handler-v3/RspDx-handler.cpp 
-	FORMS		+= ./sources/devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
-#	LIBS		+= -ldl
-}
-#
-#	limeSDR
-#
-lime  {
-	DEFINES		+= HAVE_LIME
-	INCLUDEPATH	+= ./sources/devices/lime-handler
-	DEPENDPATH	+= ./sources/devices/lime-handler
-        HEADERS         += ./sources/devices/lime-handler/lime-handler.h \	
-	                   ./sources/devices/lime-handler/lime-widget.h
-        SOURCES         += ./sources/devices/lime-handler/lime-handler.cpp 
-}
-#
-#	the hackrf
-#
-hackrf {
-	DEFINES		+= HAVE_HACKRF
-	DEPENDPATH	+= ./sources/devices/hackrf-handler 
-	INCLUDEPATH	+= ./sources/devices/hackrf-handler 
-	HEADERS		+= ./sources/devices/hackrf-handler/hackrf-handler.h 
-	SOURCES		+= ./sources/devices/hackrf-handler/hackrf-handler.cpp 
-	FORMS		+= ./sources/devices/hackrf-handler/hackrf-widget.ui
-}
-#
-#
-# airspy support
-#
-airspy {
-	DEFINES		+= HAVE_AIRSPY
-	DEPENDPATH	+= ./sources/devices/airspy 
-	INCLUDEPATH	+= ./sources/devices/airspy-handler \
-	                   ./sources/devices/airspy-handler/libairspy
-	HEADERS		+= ./sources/devices/airspy-handler/airspy-handler.h \
-	                   ./sources/devices/airspy-handler/airspyselect.h \
-	                   ./sources/devices/airspy-handler/libairspy/airspy.h
-	SOURCES		+= ./sources/devices/airspy-handler/airspy-handler.cpp \
-	                   ./sources/devices/airspy-handler/airspyselect.cpp
-	FORMS		+= ./sources/devices/airspy-handler/airspy-widget.ui
-}
-
-airspy-2 {
-	DEFINES		+= HAVE_AIRSPY_2
-	DEPENDPATH	+= ./sources/devices/airspy-2 
-	INCLUDEPATH	+= ./sources/devices/airspy-2 \
-	                   ./sources/devices/airspy-2/libairspy
-	HEADERS		+= ./sources/devices/airspy-2/airspy-2.h \
-	                   ./sources/devices/airspy-2/airspyselect.h \
-	                   ./sources/devices/airspy-2/libairspy/airspy.h
-	SOURCES		+= ./sources/devices/airspy-2/airspy-2.cpp \
-	                   ./sources/devices/airspy-2/airspyselect.cpp
-	FORMS		+= ./sources/devices/airspy-2/airspy-widget.ui
-}
-
-#	extio dependencies, windows only
-#
-extio {
-	DEFINES		+= HAVE_EXTIO
-	INCLUDEPATH	+= ./sources/devices/extio-handler
-	HEADERS		+= ./sources/devices/extio-handler/extio-handler.h \
-	                   ./sources/devices/extio-handler/common-readers.h \
-	                   ./sources/devices/extio-handler/virtual-reader.h
-	SOURCES		+= ./sources/devices/extio-handler/extio-handler.cpp \
-	                   ./sources/devices/extio-handler/common-readers.cpp \
-	                   ./sources/devices/extio-handler/virtual-reader.cpp
-}
-
-#
-rtl_tcp {
-	DEFINES		+= HAVE_RTL_TCP
-	QT		+= network
-	INCLUDEPATH	+= ./sources/devices/rtl_tcp
-	HEADERS		+= ./sources/devices/rtl_tcp/rtl_tcp_client.h
-	SOURCES		+= ./sources/devices/rtl_tcp/rtl_tcp_client.cpp
-	FORMS		+= ./sources/devices/rtl_tcp/rtl_tcp-widget.ui
-}
-
-soapy {
-	DEFINES		+= HAVE_SOAPY
-	DEPENDPATH	+= ./sources/devices/soapy
-	INCLUDEPATH     += ./sources/devices/soapy
-        HEADERS         += ./sources/devices/soapy/soapy-handler.h \
-	                   ./sources/devices/soapy/soapy-converter.h
-        SOURCES         += ./sources/devices/soapy/soapy-handler.cpp \
-	                   ./sources/devices/soapy/soapy-converter.cpp
-        FORMS           += ./sources/devices/soapy/soapy-widget.ui
-	LIBS		+= -lsamplerate
-	LIBS		+= -lSoapySDR -lm
-}
-
-pluto-rxtx	{
-	DEFINES		+= HAVE_PLUTO_RXTX
-	QT		+= network
-	INCLUDEPATH	+= ./sources/devices/pluto-rxtx
-	INCLUDEPATH	+= ./sources/devices/pluto-rxtx/dab-streamer
-	HEADERS		+= ./sources/devices/pluto-rxtx/dabFilter.h
-	HEADERS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.h 
-	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.h 
-	HEADERS		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.h
-	SOURCES		+= ./sources/devices/pluto-rxtx/pluto-rxtx-handler.cpp 
-	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/dab-streamer.cpp
-	SOURCES		+= ./sources/devices/pluto-rxtx/dab-streamer/up-filter.cpp
-	FORMS		+= ./sources/devices/pluto-rxtx/pluto-rxtx-widget.ui
-#	LIBS		+= -liio -lad9361
-}
-
-pluto	{
-	DEFINES		+= HAVE_PLUTO
-	QT		+= network
-	INCLUDEPATH	+= ./sources/devices/pluto-handler
-	HEADERS		+= ./sources/devices/pluto-handler/dabFilter.h
-	HEADERS		+= ./sources/devices/pluto-handler/pluto-handler.h
-	SOURCES		+= ./sources/devices/pluto-handler/pluto-handler.cpp
-	FORMS		+= ./sources/devices/pluto-handler/pluto-widget.ui
-}
-
-elad-device	{
-	DEFINES		+= HAVE_ELAD
-	DEPENDPATH	+= ./sources/devices/elad-s1-handler
-	INCLUDEPATH	+= ./sources/devices/elad-s1-handler
-	HEADERS		+= ./sources/devices/elad-s1-handler/elad-handler.h
-	HEADERS		+= ./sources/devices/elad-s1-handler/elad-loader.h
-	HEADERS		+= ./sources/devices/elad-s1-handler/elad-worker.h
-	SOURCES		+= ./sources/devices/elad-s1-handler/elad-handler.cpp
-	SOURCES		+= ./sources/devices/elad-s1-handler/elad-loader.cpp
-	SOURCES		+= ./sources/devices/elad-s1-handler/elad-worker.cpp
-	FORMS		+= ./sources/devices/elad-s1-handler/elad-widget.ui
-}
-
-spyServer-8  {
-	DEFINES		+= HAVE_SPYSERVER_8
-	DEPENDPATH	+= ./sources/devices/spy-server-8
-	INCLUDEPATH	+= ./sources/devices/spy-server-8
-	HEADERS		+= ./sources/devices/spy-server-8/spyserver-protocol.h 
-	HEADERS		+= ./sources/devices/spy-server-8/tcp-client-8.h 
-	HEADERS		+= ./sources/devices/spy-server-8/spy-handler-8.h 
-	HEADERS		+= ./sources/devices/spy-server-8/spyserver-client-8.h
-	SOURCES		+= ./sources/devices/spy-server-8/tcp-client-8.cpp 
-	SOURCES		+= ./sources/devices/spy-server-8/spy-handler-8.cpp 
-	SOURCES		+= ./sources/devices/spy-server-8/spyserver-client-8.cpp 
-	FORMS		+= ./sources/devices/spy-server-8/spyserver-widget-8.ui
-}
-	
-spyServer-16  {
-	DEFINES		+= HAVE_SPYSERVER_16
-	DEPENDPATH	+= ./sources/devices/spy-server-16
-	INCLUDEPATH	+= ./sources/devices/spy-server-16
-	HEADERS		+= ./sources/devices/spy-server-16/spyserver-protocol.h 
-	HEADERS		+= ./sources/devices/spy-server-16/tcp-client.h 
-	HEADERS		+= ./sources/devices/spy-server-16/spy-handler.h 
-	HEADERS		+= ./sources/devices/spy-server-16/spyserver-client.h
-	SOURCES		+= ./sources/devices/spy-server-16/tcp-client.cpp 
-	SOURCES		+= ./sources/devices/spy-server-16/spy-handler.cpp 
-	SOURCES		+= ./sources/devices/spy-server-16/spyserver-client.cpp 
-	FORMS		+= ./sources/devices/spy-server-16/spyserver-widget.ui
-}
-	
-uhd	{
-	DEFINES		+= HAVE_UHD
-	DEPENDPATH	+= ./sources/devices/uhd
-	INCLUDEPATH	+= ./sources/devices/uhd
-	HEADERS		+= ./sources/devices/uhd/uhd-handler.h
-	SOURCES		+= ./sources/devices/uhd/uhd-handler.cpp
-	FORMS		+= ./sources/devices/uhd/uhd-widget.ui
-	LIBS		+= -luhd
-}
-
-colibri	{
-	DEFINES		+= HAVE_COLIBRI
-	DEPENDPATH	+= ./sources/devices/colibri-handler
-	INCLUDEPATH	+= ./sources/devices/colibri-handler
-	HEADERS		+= ./sources/devices/colibri-handler/common.h
-	HEADERS		+= ./sources/devices/colibri-handler/LibLoader.h
-	HEADERS		+= ./sources/devices/colibri-handler/colibri-handler.h
-	SOURCES		+= ./sources/devices/colibri-handler/LibLoader.cpp
-	SOURCES		+= ./sources/devices/colibri-handler/colibri-handler.cpp
-	FORMS		+= ./sources/devices/colibri-handler/colibri-widget.ui
-}
-	
-send_datagram {
-	DEFINES		+= _SEND_DATAGRAM_
-	QT		+= network
-}
-
-tcp-streamer	{
-	DEFINES		+= TCP_STREAMER
-	QT		+= network
-	HEADERS		+= ./sources/output/tcp-streamer.h
-	SOURCES		+= ./sources/output/tcp-streamer.cpp
-}
-
-local-audio {
-	PKGCONFIG	+= portaudio-2.0
-	DEFINES		+= QT_AUDIO
-	QT		+= multimedia 
-
-	equals (QT_MAJOR_VERSION, 5) {
-	INCLUDEPATH	+= ./sources/output/Qt5
-	INCLUDEPATH	+= ./sources/output/portaudio
-	HEADERS		+= ./sources/output/Qt5/Qt-audio.h \	
-	                   ./sources/output/Qt5/Qt-audiodevice.h \
-	                   ./sources/output/portaudio/audiosink.h 
-	SOURCES		+= ./sources/output/Qt5/Qt-audio.cpp \
-	                   ./sources/output/Qt5/Qt-audiodevice.cpp \
-	                   ./sources/output/portaudio/audiosink.cpp 
-	LIBS		+= -lportaudio
-	} else {
-	INCLUDEPATH	+= ./sources/output/Qt6
-	INCLUDEPATH	+= ./sources/output/portaudio
-	HEADERS		+= ./sources/output/Qt6/Qt-audio.h \	
-	                   ./sources/output/Qt6/Qt-audiodevice.h \
-	                   ./sources/output/portaudio/audiosink.h 
-	SOURCES		+= ./sources/output/Qt6/Qt-audio.cpp \
-	                   ./sources/output/Qt6/Qt-audiodevice.cpp \
-	                   ./sources/output/portaudio/audiosink.cpp 
-	LIBS		+= -lportaudio
-	}
-}
-
-datastreamer	{
-	DEFINES		+= DATA_STREAMER
-	DEFINES		+= CLOCK_STREAMER
-	INCLUDEPATH	+= ./sources/server-thread
-	HEADERS		+= ./sources/server-thread/tcp-server.h
-	SOURCES		+= ./sources/server-thread/tcp-server.cpp
-}
-
-viterbi-scalar {
-	DEPENDPATH	+= ./sources/support/viterbi
-	INCLUDEPATH	+= ./sources/support/viterbi
-	HEADERS		+= ./sources/support/viterbi/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
-}
-
-viterbi-sse {
-	DEPENDPATH	+= ./sources/support/viterbi
-	QMAKE_CFLAGS    +=  -msse4
-	QMAKE_CXXFLAGS  +=  -msse4
-	QMAKE_CFLAGS    +=  -mavx2 
-	QMAKE_CXXFLAGS  +=  -mavx2
-	QMAKE_LFLAGS    +=  -mavx2
-	DEFINES		+= __SSE4_1__
-	DEFINES		+= __ARCH_X86__
-	#DEFINES	+= __ARCH_AARCH64__
-	INCLUDEPATH	+= ./sources/support/viterbi
-	HEADERS		+= ./sources/support/viterbi/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
-}
-
-viterbi-avx2 {
-	DEPENDPATH	+= ./sources/support/viterbi
-	QMAKE_CFLAGS    +=  -mavx2 
-	QMAKE_CXXFLAGS  +=  -mavx2
-	QMAKE_LFLAGS    +=  -mavx2
-	DEFINES		+= __AVX2__
-	DEFINES		+= __ARCH_X86__
-	#DEFINES	+= __ARCH_AARCH64__
-	INCLUDEPATH	+= ./sources/support/viterbi
-	HEADERS		+= ./sources/support/viterbi/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi/viterbi.cpp 
-}
-
-spiral-sse	{
-	DEPENDPATH     +=  ./sources/support/viterbi-spiral 
-	INCLUDEPATH     +=  ./sources/support/viterbi-spiral 
-	DEFINES		+=  SSE_AVAILABLE
-	HEADERS		+= ./sources/support/viterbi-spiral/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi-spiral/viterbi.cpp 
-	HEADERS		+= ./sources/support/viterbi-spiral/spiral-sse.h
-	SOURCES		+= ./sources/support/viterbi-spiral/spiral-sse.c
-}
-
-spiral-no-sse	{
-	DEPENDPATH     +=  ./sources/support/viterbi-spiral 
-	INCLUDEPATH     +=  ./sources/support/viterbi-spiral 
-	DEFINES		+= NO_SSE_AVAILABLE
-	HEADERS		+= ./sources/support/viterbi-spiral/viterbi.h 
-	SOURCES		+= ./sources/support/viterbi-spiral/viterbi.cpp 
-	HEADERS		+= ./sources/support/viterbi-spiral/spiral-no-sse.h
-	SOURCES		+= ./sources/support/viterbi-spiral/spiral-no-sse.c
-}
-
-faad	{
-	DEFINES		+= __WITH_FAAD__
-	HEADERS		+= ./sources/backend/audio/faad-decoder.h 
-	SOURCES		+= ./sources/backend/audio/faad-decoder.cpp 
-	LIBS		+= -lfaad
-}
-
-fdk-aac {
-        DEFINES         += __WITH_FDK_AAC__
-        INCLUDEPATH     += ./helpers/specials/fdk-aac
-        HEADERS         += ./sources/backend/audio/fdk-aac.h
-        SOURCES         += ./sources/backend/audio/fdk-aac.cpp
-        PKGCONFIG       += fdk-aac
-}
-
-mapserver {
-	DEFINES		+= __HAVE_MAP_SERVER__
-	HEADERS		+= ./sources/support/http-handler.h
-	SOURCES		+= ./sources/support/http-handler.cpp
-}
-
-double	{
-	DEFINES		+= __WITH_DOUBLES__
-	LIBS		+= -lfftw3
-}
-
-single	{
-	LIBS		+= -lfftw3f
-}

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 \
-	   ../includes/support/distances.h \
-	   ../includes/support/logger.h \
-	   ../includes/support/position-handler.h \
-           ../includes/support/cacheElement.h \
-	   ../includes/support/settingNames.h \
-	   ../includes/support/settings-handler.h \
-	   ../includes/support/fft-handler.h \
-	   ../includes/support/wavWriter.h \
-	   ../includes/support/converter_48000.h \
-	   ../includes/support/process-params.h \
-	   ../includes/support/ringbuffer.h \
-	   ../includes/support/dab-params.h \
-	   ../includes/support/dab-tables.h \
-	   ../includes/support/preset-handler.h \
-	   ../includes/support/presetcombobox.h \
-	   ../includes/support/scanlist-handler.h \
-	   ../includes/support/scheduler.h \
-	   ../includes/support/schedule-selector.h \
-	   ../includes/support/element-selector.h \
-	   ../includes/support/time-table.h \
-	   ../includes/support/findfilenames.h \
-	   ../includes/support/dl-cache.h \
-	   ../includes/support/content-table.h \
-	   ../includes/support/ITU_Region_1.h \
-	   ../includes/support/coordinates.h \
-	   ../includes/support/skin-handler.h \
-	   ../includes/support/mapport.h \
-	   ../includes/support/bandpass-filter.h \
-	   ../includes/support/fir-filters.h \
-	   ../includes/support/font-chooser.h \
-	   ../src/support/tii-library/tii-mapper.h \
-	   ../src/support/tii-library/tii-reader.h \
-	   ../src/support/tii-library/uploader.h \
-	   ../includes/support/buttons/smallcombobox.h \
-	   ../includes/support/buttons/newpushbutton.h \
-	   ../includes/support/buttons/normalpushbutton.h \
-	   ../includes/support/buttons/smallpushbutton.h \
-	   ../includes/support/buttons/verysmallpushbutton.h \
-	   ../includes/support/buttons/smallqlistview.h \
-	   ../includes/support/buttons/smallspinbox.h \
-	   ../qt-devices/device-handler.h \
-	   ../qt-devices/device-chooser.h \
-	   ../qt-devices/device-exceptions.h \
-	   ../qt-devices/xml-filewriter.h \
-	   ../qt-devices/filereaders/new-reader/newfiles.h \
-           ../qt-devices/filereaders/new-reader/new-reader.h \
-           ../qt-devices/filereaders/new-reader/riff-reader.h \
-	   ../qt-devices/filereaders/rawfiles-new/rawfiles.h \
-	   ../qt-devices/filereaders/rawfiles-new/raw-reader.h \
-	   ../qt-devices/filereaders/xml-filereader/element-reader.h \
-	   ../qt-devices/filereaders/xml-filereader/xml-filereader.h \
-	   ../qt-devices/filereaders/xml-filereader/xml-reader.h \
-	   ../qt-devices/filereaders/xml-filereader/xml-descriptor.h 
-
-FORMS	+= ./forms-v7/technical_data.ui
-FORMS	+= ./forms-v7/dabradio-6.ui 
-FORMS	+= ./forms-v7/config-helper.ui 
-FORMS	+= ./forms-v7/audio-description.ui
-FORMS	+= ./forms-v7/data-description.ui
-FORMS	+= ./forms-v7/new-display/scopewidget.ui
-FORMS	+= ./forms-v7/snr-viewer/snr-widget.ui
-FORMS	+= ./support/aboutdialog.ui
-#FORMS	+= ../qt-devices/filereaders/filereader-widget.ui 
-FORMS	+= ../qt-devices/filereaders/xml-filereader/xmlfiles.ui
-
-SOURCES += ./main.cpp \
-	   ./radio.cpp \
-	   ./support/super-frame.cpp \
-	   ./support/techdata.cpp \
-           ./support/clickable-label.cpp \
-           ./support/icon-label.cpp \
-	   ./support/scan-handler.cpp \
-	   ./support/scantable-handler.cpp \
-	   ./support/aboutdialog.cpp \
-	   ./support/ensemble-handler.cpp \
-	   ./support/config-handler.cpp \
-           ./support/audiosystem-selector.cpp \
-           ./support/dxDisplay.cpp \
-	   ./forms-v7/new-display/display-widget.cpp \
-           ./forms-v7/new-display/scopes/correlation-scope.cpp \
-           ./forms-v7/new-display/scopes/spectrum-scope.cpp \
-           ./forms-v7/new-display/scopes/null-scope.cpp \
-           ./forms-v7/new-display/scopes/channel-scope.cpp \
-           ./forms-v7/new-display/scopes/dev-scope.cpp \
-           ./forms-v7/new-display/scopes/waterfall-scope.cpp \
-	   ./forms-v7/new-display/scopes/iqdisplay.cpp \
-	   ./forms-v7/new-display/scopes/audio-display.cpp \
-	   ./forms-v7/new-display/scopes/spectrogramdata.cpp \
-	   ./forms-v7/snr-viewer/snr-viewer.cpp \
-	   ../ofdm-handler.cpp \
-	   ../eti-handler/eti-generator.cpp \
-	   ../src/ofdm/timesyncer.cpp \
-	   ../src/ofdm/sample-reader.cpp \
-	   ../src/ofdm/ofdm-decoder.cpp \
-	   ../src/ofdm/correlator.cpp \
-	   ../src/ofdm/freqsyncer.cpp \
-	   ../src/ofdm/phasetable.cpp \
-	   ../src/ofdm/freq-interleaver.cpp \
-	   ../src/ofdm/tii-detector.cpp \
-	   ../src/ofdm/tii-detector-1.cpp \
-	   ../src/ofdm/tii-detector-2.cpp \
-	   ../src/ofdm/fic-handler.cpp \
-	   ../src/ofdm/ensemble.cpp  \
-           ../src/ofdm/fib-config.cpp  \
-           ../src/ofdm/fib-printer.cpp  \
-	   ../src/ofdm/fib-decoder.cpp  \
-	   ../src/ofdm/estimator.cpp \
-	   ../src/protection/protTables.cpp \
-	   ../src/protection/protection.cpp \
-	   ../src/protection/eep-protection.cpp \
-	   ../src/protection/uep-protection.cpp \
-	   ../src/backend/msc-handler.cpp \
-	   ../src/backend/galois.cpp \
-	   ../src/backend/reed-solomon.cpp \
-	   ../src/backend/charsets.cpp \
-	   ../src/backend/backend.cpp \
-           ../src/backend/backend-driver.cpp \
-           ../src/backend/backend-deconvolver.cpp \
-	   ../src/backend/firecode-checker.cpp \
-	   ../src/backend/audio/mp2processor.cpp \
-	   ../src/backend/audio/mp4processor.cpp \
-	   ../src/backend/audio/bitWriter.cpp \
-	   ../src/backend/data/pad-handler.cpp \
-	   ../src/backend/data/data-processor.cpp \
-	   ../src/backend/data/tdc-datahandler.cpp \
-	   ../src/backend/data/ip-datahandler.cpp \
-	   ../src/backend/data/adv-datahandler.cpp \
-	   ../src/backend/data/mot/mot-handler.cpp \
-	   ../src/backend/data/mot/mot-object.cpp \
-	   ../src/backend/data/mot/mot-dir.cpp \
-	   ../src/backend/data/journaline-datahandler.cpp \
-	   ../src/backend/data/journaline-screen.cpp \
-	   ../src/backend/data/journaline/crc_8_16.c \
-	   ../src/backend/data/journaline/log.c \
-	   ../src/backend/data/journaline/newssvcdec_impl.cpp \
-	   ../src/backend/data/journaline/Splitter.cpp \
-	   ../src/backend/data/journaline/dabdgdec_impl.c \
-	   ../src/backend/data/journaline/newsobject.cpp \
-	   ../src/backend/data/journaline/NML.cpp \
-	   ../src/backend/data/epg/epg-compiler.cpp \
-	   ../src/backend/data/epg/xml-extractor.cpp \
-	   ../src/output/audio-player.cpp \
-	   ../src/support/distances.cpp \
-	   ../src/support/logger.cpp \
-	   ../src/support/position-handler.cpp \
-	   ../src/support/settings-handler.cpp \
-	   ../src/support/fft-handler.cpp \
-	   ../src/support/wavWriter.cpp \
-	   ../src/support/converter_48000.cpp \
-	   ../src/support/dab-params.cpp \
-#	   ../src/support/band-handler.cpp \
-	   ../src/support/dab-tables.cpp \
-	   ../src/support/preset-handler.cpp \
-	   ../src/support/presetcombobox.cpp \
-	   ../src/support/scanlist-handler.cpp \
-	   ../src/support/scheduler.cpp \
-	   ../src/support/schedule-selector.cpp \
-	   ../src/support/element-selector.cpp \
-	   ../src/support/time-table.cpp \
-	   ../src/support/findfilenames.cpp \
-	   ../src/support/content-table.cpp \
-	   ../src/support/ITU_Region_1.cpp \
-	   ../src/support/coordinates.cpp \
-	   ../src/support/skin-handler.cpp \
-	   ../src/support/mapport.cpp \
-	   ../src/support/bandpass-filter.cpp \
-	   ../src/support/fir-filters.cpp \
-	   ../src/support/font-chooser.cpp \
-	   ../src/support/tii-library/tii-mapper.cpp \
-	   ../src/support/tii-library/tii-reader.cpp \
-	   ../src/support/tii-library/uploader.cpp \
-	   ../src/support/buttons/smallcombobox.cpp \
-	   ../src/support/buttons/newpushbutton.cpp \
-	   ../src/support/buttons/normalpushbutton.cpp \
-	   ../src/support/buttons/smallpushbutton.cpp \
-	   ../src/support/buttons/verysmallpushbutton.cpp \
-	   ../src/support/buttons/smallqlistview.cpp \
-	   ../src/support/buttons/smallspinbox.cpp \
-	   ../qt-devices/device-handler.cpp \
-	   ../qt-devices/device-chooser.cpp \
-	   ../qt-devices/xml-filewriter.cpp \
-	   ../qt-devices/filereaders/rawfiles-new/rawfiles.cpp \
-	   ../qt-devices/filereaders/rawfiles-new/raw-reader.cpp \
-	   ../qt-devices/filereaders/new-reader/newfiles.cpp \
-           ../qt-devices/filereaders/new-reader/new-reader.cpp \
-           ../qt-devices/filereaders/new-reader/riff-reader.cpp \
-	   ../qt-devices/filereaders/xml-filereader/xml-filereader.cpp \
-	   ../qt-devices/filereaders/xml-filereader/xml-reader.cpp \
-	   ../qt-devices/filereaders/xml-filereader/xml-descriptor.cpp 
-
-#
-unix {
-DESTDIR		= ./linux-bin
-	equals (QT_MAJOR_VERSION, 5) {
-        TARGET          = qt-dab-qt5-6.9.1
-        }
-        else {  
-        TARGET          = qt-dab-qt6-6.9.1
-        }
-exists ("../.git") {
-   GITHASHSTRING = $$system(git rev-parse --short HEAD)
-   !isEmpty(GITHASHSTRING) {
-       message("Current git hash = $$GITHASHSTRING")
-       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
-   }
-}
-isEmpty(GITHASHSTRING) {
-    DEFINES += GITHASH=\\\"------\\\"
-}
-
-mac {
-  DESTDIR      = ./mac-bin
-  PKG_CONFIG = /usr/local/bin/pkg-config
-  QT_CONFIG	-= no-pkg-config
-}
-
-CONFIG		+= link_pkgconfig
-#PKGCONFIG	+= samplerate
-PKGCONFIG	+= libusb-1.0
-CONFIG		+= mapserver
-!mac {
-LIBS      	+= -ldl
-}
-PKGCONFIG	+= zlib
-#PKGCONFIG	+= samplerate
-INCLUDEPATH	+= /usr/local/include
-!mac {
-INCLUDEPATH	+= /usr/local/include
-#correct this for the correct path to the qwt6 library on your system
-#LIBS		+= -lqwt
-#LIBS           += -lqwt-qt5
-}
-
-#mac {
-# Should be possible to make on non Macs as well.
-# qmake -set QMAKEFEATURES /usr/local/Cellar/qwt/6.2.0/features
-CONFIG		+= qwt
-#}
-CONFIG		+= double
-#CONFIG		+= single
-#
-# comment or uncomment for the devices you want to have support for
-# (you obviously have libraries installed for the selected ones)
-CONFIG		+= sdrplay-v2
-CONFIG		+= sdrplay-v3
-CONFIG		+= dabstick-linux
-CONFIG		+= rtl_tcp
-CONFIG		+= airspy-2
-CONFIG		+= hackrf
-CONFIG		+= lime
-CONFIG		+= soapy
-#CONFIG		+= pluto-rxtx
-CONFIG		+= pluto
-CONFIG		+= spyServer-16
-CONFIG		+= spyServer-8
-#CONFIG		+= uhd
-#CONFIG		+= colibri
-#CONFIG		+= elad-device
-#CONFIG		+= faad
-CONFIG		+= fdk-aac
-#very experimental, simple server for connecting to a tdc handler
-#CONFIG		+= datastreamer
-#to handle output of embedded an IP data stream, uncomment
-#CONFIG		+= send_datagram
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default qt way of sound out
-CONFIG		+= local-audio
-
-CONFIG          += viterbi-scalar
-CONFIG          += viterbi-sse
-CONFIG          += viterbi-avx2
-#CONFIG         += spiral-sse
-#CONFIG         += spiral-no-sse
-#DEFINES	+= SHOW_MISSING
-DEFINES		+= __LOGGING__
-DEFINES		+= __DUMP_SNR__		# for experiments only
-}
-
-# an attempt to have it run under W32 through cross compilation
-win32 {
-exists ("../.git") {
-   GITHASHSTRING = $$system(git rev-parse --short HEAD)
-   !isEmpty(GITHASHSTRING) {
-       message("Current git hash = $$GITHASHSTRING")
-       DEFINES += GITHASH=\\\"$$GITHASHSTRING\\\"
-   }
-}
-isEmpty(GITHASHSTRING) {
-    DEFINES += GITHASH=\\\"------\\\"
-}
-
-#for for 64 bit
-	equals (QT_MAJOR_VERSION, 5) {
-        TARGET          = qt-dab64-qt5-6.9.1
-        }
-        else {  
-        TARGET          = qt-dab64-qt6-6.9.1
-        }
-
-	DEFINES		+= __BITS64__
-	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
-	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
-	equals (QT_MAJOR_VERSION, 6) {
-        INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt6/qwt
-        } else {
-        INCLUDEPATH     += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
-        }
-	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
-##	LIBS		+= -liio
-	CONFIG		+= airspy-2
-	CONFIG          += spyServer-16
-	CONFIG          += spyServer-8
-	CONFIG		+= rtl_tcp
-	CONFIG		+= dabstick-win64
-	CONFIG		+= sdrplay-v2
-	CONFIG		+= sdrplay
-	CONFIG		+= pluto
-	CONFIG		+= sdrplay-v3
-	CONFIG		+= hackrf
-	CONFIG		+= lime
-	CONFIG		+= viterbi-scalar
-	DEFINES		+= __THREADED_BACKEND
-	CONFIG		+= local-audio
-	CONFIG		+= double
-	#CONFIG		+= single
-	CONFIG		+= mapserver
-	LIBS		+= /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libcurl-4.dll 
-	LIBS		+= -lportaudio
-	LIBS		+= -lstdc++
-#
-	INCLUDEPATH	+= /usr/local/include
-	LIBS		+= -lportaudio
-	#LIBS		+= -lole32
-	LIBS		+= -lwinpthread
-	LIBS		+= -lwinmm
-	LIBS 		+= -lstdc++
-	LIBS		+= -lws2_32
-	LIBS		+= -lusb-1.0
-	LIBS		+= -lz
-#correct this for the correct path to the qwt6 library on your system
-#mingw64 wants the first one, cross compiling mingw64-32 the second one
-	#LIBS		+= -lqwt
-	equals (QT_MAJOR_VERSION, 6) {
-	LIBS		+= -lqwt-qt6
-	}
-	else {
-	LIBS		+= -lqwt-qt5
-	}
-	CONFIG		+= faad
-#
-#very experimental, simple server for connecting to a tdc handler
-#	CONFIG		+= datastreamer
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default qt way of soud out
-#comment both out if you just want to use the "normal" way
-
-DEFINES	+= __DUMP_SNR__		# for experiments only
-}
-
-#	dabstick
-#	Note: the windows version is bound to the dll, the
-#	linux version loads the function from the so
-dabstick-linux {
-	DEFINES		+= HAVE_RTLSDR
-	DEPENDPATH	+= ../qt-devices/rtlsdr-handler-linux
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-linux
-	HEADERS		+= ../qt-devices/rtlsdr-handler-linux/rtlsdr-handler.h \
-	                   ../qt-devices/rtlsdr-handler-linux/rtl-dongleselect.h
-	SOURCES		+= ../qt-devices/rtlsdr-handler-linux/rtlsdr-handler.cpp \
-	                   ../qt-devices/rtlsdr-handler-linux/rtl-dongleselect.cpp
-	FORMS		+= ../qt-devices/rtlsdr-handler-linux/rtlsdr-widget.ui
-}
-
-dabstick-win-v4 {
-	DEFINES		+= HAVE_RTLSDR_V4
-	DEPENDPATH	+= ../qt-devices/rtlsdr-handler-win-v4
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-win-v4
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-common
-	HEADERS		+= ../qt-devices/rtlsdr-handler-win-v4/rtlsdr-handler-v4.h \
-	                   ../qt-devices/rtlsdr-handler-common/rtl-dongleselect.h
-	SOURCES		+= ../qt-devices/rtlsdr-handler-win-v4/rtlsdr-handler-v4.cpp \
-	                   ../qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ../qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
-#	LIBS		+= /usr/i686-s64-mingw32/sys-root/mingw/bin/librtlsdr.dll
-	LIBS		+= /usr/shared/drivers/rtlsdr-drivers-windows/x86/librtlsdr.dll
-}
-
-dabstick-win64 {
-	DEFINES		+= HAVE_RTLSDR_V4
-	DEPENDPATH	+= ../qt-devices/rtlsdr-handler-win
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-win
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-common
-	HEADERS		+= ../qt-devices/rtlsdr-handler-win/rtlsdr-handler-win.h \
-	                   ../qt-devices/rtlsdr-handler-common/rtl-dongleselect.h
-	SOURCES		+= ../qt-devices/rtlsdr-handler-win/rtlsdr-handler-win.cpp \
-	                   ../qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ../qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
-	LIBS		+= /usr/shared/drivers/rtlsdrWindowsV4/x64/rtlsdr.a
-}
-
-dabstick-win-v3 {
-	DEFINES		+= HAVE_RTLSDR_V3
-	DEPENDPATH	+= ../qt-devices/rtlsdr-handler-win-v3
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-win-v3
-	INCLUDEPATH	+= ../qt-devices/rtlsdr-handler-common
-	HEADERS		+= ../qt-devices/rtlsdr-handler-win-v3/rtlsdr-handler-v3.h \
-	                   ../qt-devices/rtlsdr-handler-common/rtl-dongleselect.h
-	SOURCES		+= ../qt-devices/rtlsdr-handler-win-v3/rtlsdr-handler-v3.cpp \
-	                   ../qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
-	FORMS		+= ../qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
-#	LIBS		+= /usr/i686-s64-mingw32/sys-root/mingw/bin/librtlsdr.dll
-	LIBS		+= /usr/i686-w64-mingw32/sys-root/mingw/bin/librtlsdr.dll
-}
-
-#
-#	the SDRplay
-#
-sdrplay-v2 {
-	DEFINES		+= HAVE_SDRPLAY_V2
-	DEPENDPATH	+= ../qt-devices/sdrplay-handler-v2
-	INCLUDEPATH	+= ../qt-devices/sdrplay-handler-v2
-	HEADERS		+= ../qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h \
-	                   ../qt-devices/sdrplay-handler-v2/sdrplayselect.h 
-	SOURCES		+= ../qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp \
-	                   ../qt-devices/sdrplay-handler-v2/sdrplayselect.cpp 
-	FORMS		+= ../qt-devices/sdrplay-handler-v2/sdrplay-widget-v2.ui
-}
-#
-#	the SDRplay
-#
-sdrplay-v3 {
-	DEFINES		+= HAVE_SDRPLAY_V3
-	DEPENDPATH	+= ../qt-devices/sdrplay-handler-v3
-	INCLUDEPATH	+= ../qt-devices/sdrplay-handler-v3 \
-	                   ../qt-devices/sdrplay-handler-v3/include
-        HEADERS         += ../qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
-                           ../qt-devices/sdrplay-handler-v3/sdrplay-commands.h \
-	                   ../qt-devices/sdrplay-handler-v3/Rsp-device.h \
-	                   ../qt-devices/sdrplay-handler-v3/RspI-handler.h \
-	                   ../qt-devices/sdrplay-handler-v3/Rsp1A-handler.h \
-	                   ../qt-devices/sdrplay-handler-v3/RspII-handler.h \
-	                   ../qt-devices/sdrplay-handler-v3/RspDuo-handler.h \
-	                   ../qt-devices/sdrplay-handler-v3/RspDx-handler.h
-        SOURCES         += ../qt-devices/sdrplay-handler-v3/Rsp-device.cpp \
-	                   ../qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
-	                   ../qt-devices/sdrplay-handler-v3/RspI-handler.cpp \
-	                   ../qt-devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
-	                   ../qt-devices/sdrplay-handler-v3/RspII-handler.cpp \
-	                   ../qt-devices/sdrplay-handler-v3/RspDuo-handler.cpp \
-	                   ../qt-devices/sdrplay-handler-v3/RspDx-handler.cpp 
-	FORMS		+= ../qt-devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
-#	LIBS		+= -ldl
-}
-#
-#	limeSDR
-#
-lime  {
-	DEFINES		+= HAVE_LIME
-	INCLUDEPATH	+= ../qt-devices/lime-handler
-	DEPENDPATH	+= ../qt-devices/lime-handler
-        HEADERS         += ../qt-devices/lime-handler/lime-handler.h \	
-	                   ../qt-devices/lime-handler/lime-widget.h
-        SOURCES         += ../qt-devices/lime-handler/lime-handler.cpp 
-}
-#
-#	the hackrf
-#
-hackrf {
-	DEFINES		+= HAVE_HACKRF
-	DEPENDPATH	+= ../qt-devices/hackrf-handler 
-	INCLUDEPATH	+= ../qt-devices/hackrf-handler 
-	HEADERS		+= ../qt-devices/hackrf-handler/hackrf-handler.h 
-	SOURCES		+= ../qt-devices/hackrf-handler/hackrf-handler.cpp 
-	FORMS		+= ../qt-devices/hackrf-handler/hackrf-widget.ui
-}
-#
-#
-# airspy support
-#
-airspy {
-	DEFINES		+= HAVE_AIRSPY
-	DEPENDPATH	+= ../qt-devices/airspy 
-	INCLUDEPATH	+= ../qt-devices/airspy-handler \
-	                   ../qt-devices/airspy-handler/libairspy
-	HEADERS		+= ../qt-devices/airspy-handler/airspy-handler.h \
-	                   ../qt-devices/airspy-handler/airspyselect.h \
-	                   ../qt-devices/airspy-handler/libairspy/airspy.h
-	SOURCES		+= ../qt-devices/airspy-handler/airspy-handler.cpp \
-	                   ../qt-devices/airspy-handler/airspyselect.cpp
-	FORMS		+= ../qt-devices/airspy-handler/airspy-widget.ui
-}
-
-airspy-2 {
-	DEFINES		+= HAVE_AIRSPY_2
-	DEPENDPATH	+= ../qt-devices/airspy-2 
-	INCLUDEPATH	+= ../qt-devices/airspy-2 \
-	                   ../qt-devices/airspy-2/libairspy
-	HEADERS		+= ../qt-devices/airspy-2/airspy-2.h \
-	                   ../qt-devices/airspy-2/airspyselect.h \
-	                   ../qt-devices/airspy-2/libairspy/airspy.h
-	SOURCES		+= ../qt-devices/airspy-2/airspy-2.cpp \
-	                   ../qt-devices/airspy-2/airspyselect.cpp
-	FORMS		+= ../qt-devices/airspy-2/airspy-widget.ui
-}
-#	extio dependencies, windows only
-#
-extio {
-	DEFINES		+= HAVE_EXTIO
-	INCLUDEPATH	+= ../qt-devices/extio-handler
-	HEADERS		+= ../qt-devices/extio-handler/extio-handler.h \
-	                   ../qt-devices/extio-handler/common-readers.h \
-	                   ../qt-devices/extio-handler/virtual-reader.h
-	SOURCES		+= ../qt-devices/extio-handler/extio-handler.cpp \
-	                   ../qt-devices/extio-handler/common-readers.cpp \
-	                   ../qt-devices/extio-handler/virtual-reader.cpp
-}
-
-#
-rtl_tcp {
-	DEFINES		+= HAVE_RTL_TCP
-	QT		+= network
-	INCLUDEPATH	+= ../qt-devices/rtl_tcp
-	HEADERS		+= ../qt-devices/rtl_tcp/rtl_tcp_client.h
-	SOURCES		+= ../qt-devices/rtl_tcp/rtl_tcp_client.cpp
-	FORMS		+= ../qt-devices/rtl_tcp/rtl_tcp-widget.ui
-}
-
-soapy {
-	DEFINES		+= HAVE_SOAPY
-	DEPENDPATH	+= ../qt-devices/soapy
-	INCLUDEPATH     += ../qt-devices/soapy
-        HEADERS         += ../qt-devices/soapy/soapy-handler.h \
-	                   ../qt-devices/soapy/soapy-converter.h
-        SOURCES         += ../qt-devices/soapy/soapy-handler.cpp \
-	                   ../qt-devices/soapy/soapy-converter.cpp
-        FORMS           += ../qt-devices/soapy/soapy-widget.ui
-	LIBS		+= -lSoapySDR -lm
-}
-
-pluto-rxtx	{
-	DEFINES		+= HAVE_PLUTO_RXTX
-	QT		+= network
-	INCLUDEPATH	+= ../qt-devices/pluto-rxtx
-	INCLUDEPATH	+= ../qt-devices/pluto-rxtx/dab-streamer
-	HEADERS		+= ../qt-devices/pluto-rxtx/dabFilter.h
-	HEADERS		+= ../qt-devices/pluto-rxtx/pluto-rxtx-handler.h 
-	HEADERS		+= ../qt-devices/pluto-rxtx/dab-streamer/dab-streamer.h 
-	HEADERS		+= ../qt-devices/pluto-rxtx/dab-streamer/up-filter.h
-	SOURCES		+= ../qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp 
-	SOURCES		+= ../qt-devices/pluto-rxtx/dab-streamer/dab-streamer.cpp
-	SOURCES		+= ../qt-devices/pluto-rxtx/dab-streamer/up-filter.cpp
-	FORMS		+= ../qt-devices/pluto-rxtx/pluto-rxtx-widget.ui
-#	LIBS		+= -liio -lad9361
-}
-
-pluto	{
-	DEFINES		+= HAVE_PLUTO
-	QT		+= network
-	INCLUDEPATH	+= ../qt-devices/pluto-handler
-	HEADERS		+= ../qt-devices/pluto-handler/dabFilter.h
-	HEADERS		+= ../qt-devices/pluto-handler/pluto-handler.h
-	SOURCES		+= ../qt-devices/pluto-handler/pluto-handler.cpp
-	FORMS		+= ../qt-devices/pluto-handler/pluto-widget.ui
-}
-
-elad-device	{
-	DEFINES		+= HAVE_ELAD
-	DEPENDPATH	+= ../qt-devices/elad-s1-handler
-	INCLUDEPATH	+= ../qt-devices/elad-s1-handler
-	HEADERS		+= ../qt-devices/elad-s1-handler/elad-handler.h
-	HEADERS		+= ../qt-devices/elad-s1-handler/elad-loader.h
-	HEADERS		+= ../qt-devices/elad-s1-handler/elad-worker.h
-	SOURCES		+= ../qt-devices/elad-s1-handler/elad-handler.cpp
-	SOURCES		+= ../qt-devices/elad-s1-handler/elad-loader.cpp
-	SOURCES		+= ../qt-devices/elad-s1-handler/elad-worker.cpp
-	FORMS		+= ../qt-devices/elad-s1-handler/elad-widget.ui
-}
-
-spyServer-8  {
-	DEFINES		+= HAVE_SPYSERVER_8
-	DEPENDPATH	+= ../qt-devices/spy-server-8
-	INCLUDEPATH	+= ../qt-devices/spy-server-8
-	HEADERS		+= ../qt-devices/spy-server-8/spyserver-protocol.h 
-	HEADERS		+= ../qt-devices/spy-server-8/tcp-client-8.h 
-	HEADERS		+= ../qt-devices/spy-server-8/spy-handler-8.h 
-	HEADERS		+= ../qt-devices/spy-server-8/spyserver-client-8.h
-	SOURCES		+= ../qt-devices/spy-server-8/tcp-client-8.cpp 
-	SOURCES		+= ../qt-devices/spy-server-8/spy-handler-8.cpp 
-	SOURCES		+= ../qt-devices/spy-server-8/spyserver-client-8.cpp 
-	FORMS		+= ../qt-devices/spy-server-8/spyserver-widget-8.ui
-}
-	
-spyServer-16  {
-	DEFINES		+= HAVE_SPYSERVER_16
-	DEPENDPATH	+= ../qt-devices/spy-server-16
-	INCLUDEPATH	+= ../qt-devices/spy-server-16
-	HEADERS		+= ../qt-devices/spy-server-16/spyserver-protocol.h 
-	HEADERS		+= ../qt-devices/spy-server-16/tcp-client.h 
-	HEADERS		+= ../qt-devices/spy-server-16/spy-handler.h 
-	HEADERS		+= ../qt-devices/spy-server-16/spyserver-client.h
-	SOURCES		+= ../qt-devices/spy-server-16/tcp-client.cpp 
-	SOURCES		+= ../qt-devices/spy-server-16/spy-handler.cpp 
-	SOURCES		+= ../qt-devices/spy-server-16/spyserver-client.cpp 
-	FORMS		+= ../qt-devices/spy-server-16/spyserver-widget.ui
-}
-	
-uhd	{
-	DEFINES		+= HAVE_UHD
-	DEPENDPATH	+= ../qt-devices/uhd
-	INCLUDEPATH	+= ../qt-devices/uhd
-	HEADERS		+= ../qt-devices/uhd/uhd-handler.h
-	SOURCES		+= ../qt-devices/uhd/uhd-handler.cpp
-	FORMS		+= ../qt-devices/uhd/uhd-widget.ui
-	LIBS		+= -luhd
-}
-
-colibri	{
-	DEFINES		+= HAVE_COLIBRI
-	DEPENDPATH	+= ../qt-devices/colibri-handler
-	INCLUDEPATH	+= ../qt-devices/colibri-handler
-	HEADERS		+= ../qt-devices/colibri-handler/common.h
-	HEADERS		+= ../qt-devices/colibri-handler/LibLoader.h
-	HEADERS		+= ../qt-devices/colibri-handler/colibri-handler.h
-	SOURCES		+= ../qt-devices/colibri-handler/LibLoader.cpp
-	SOURCES		+= ../qt-devices/colibri-handler/colibri-handler.cpp
-	FORMS		+= ../qt-devices/colibri-handler/colibri-widget.ui
-}
-	
-send_datagram {
-	DEFINES		+= _SEND_DATAGRAM_
-	QT		+= network
-}
-
-tcp-streamer	{
-	DEFINES		+= TCP_STREAMER
-	QT		+= network
-	HEADERS		+= ../includes/output/tcp-streamer.h
-	SOURCES		+= ../src/output/tcp-streamer.cpp
-}
-
-local-audio	{
-	PKGCONFIG       += portaudio-2.0
-        DEFINES         += QT_AUDIO
-        QT              += multimedia
-	equals (QT_MAJOR_VERSION, 5) {
-	INCLUDEPATH	+= ../includes/output/Qt5
-	HEADERS		+= ../includes/output/Qt5/Qt-audio.h \	
-	                   ../includes/output/Qt5/Qt-audiodevice.h \
-	                   ../includes/output/audiosink.h 
-	SOURCES		+= ../src/output/Qt5/Qt-audio.cpp \
-	                   ../src/output/Qt5/Qt-audiodevice.cpp \
-	                   ../src/output/audiosink.cpp 
-	LIBS		+= -lportaudio
-	} else {
-	INCLUDEPATH	+= ../includes/output/Qt6
-	HEADERS		+= ../includes/output/Qt6/Qt-audio.h \	
-	                   ../includes/output/Qt6/Qt-audiodevice.h \
-	                   ../includes/output/audiosink.h 
-	SOURCES		+= ../src/output/Qt6/Qt-audio.cpp \
-	                   ../src/output/Qt6/Qt-audiodevice.cpp \
-	                   ../src/output/audiosink.cpp 
-	LIBS		+= -lportaudio
-	}
-}
-
-datastreamer	{
-	DEFINES		+= DATA_STREAMER
-	DEFINES		+= CLOCK_STREAMER
-	INCLUDEPATH	+= ../server-thread
-	HEADERS		+= ../server-thread/tcp-server.h
-	SOURCES		+= ../server-thread/tcp-server.cpp
-}
-
-viterbi-scalar {
-	DEPENDPATH	+= ../src/support/viterbi
-	INCLUDEPATH	+= ../src/support/viterbi
-	HEADERS		+= ../src/support/viterbi/viterbi.h 
-	SOURCES		+= ../src/support/viterbi/viterbi.cpp 
-}
-
-viterbi-avx2 {
-	DEPENDPATH	+= ../src/support/viterbi
-	QMAKE_CFLAGS    +=  -msse4 -mavx2
-        QMAKE_CXXFLAGS  +=  -msse4 -mavx2
-        QMAKE_LFLAGS    +=  -msse4 -mavx2
-	DEFINES		+= __ARCH_X86__
-	DEFINES		+= __AVX2__
-	#DEFINES	+= __ARCH_AARCH64__
-	INCLUDEPATH	+= ../src/support/viterbi
-	HEADERS		+= ../src/support/viterbi/viterbi.h 
-	SOURCES		+= ../src/support/viterbi/viterbi.cpp 
-}
-
-viterbi-sse {
-	DEPENDPATH	+= ../src/support/viterbi
-	QMAKE_CFLAGS    +=  -msse4 -mavx2
-        QMAKE_CXXFLAGS  +=  -msse4 -mavx2
-        QMAKE_LFLAGS    +=  -msse4 -mavx2
-	DEFINES		+= __ARCH_X86__
-	#DEFINES	+= __SSE4_1__
-	#DEFINES	+= __ARCH_AARCH64__
-	INCLUDEPATH	+= ../src/support/viterbi
-	HEADERS		+= ../src/support/viterbi/viterbi.h 
-	SOURCES		+= ../src/support/viterbi/viterbi.cpp 
-}
-
-spiral-sse	{
-	DEPENDPATH     +=  ../src/support/viterbi-spiral 
-	INCLUDEPATH     +=  ../src/support/viterbi-spiral 
-	DEFINES		+= SSE_AVAILABLE
-	HEADERS		+= ../src/support/viterbi-spiral/viterbi.h 
-	SOURCES		+= ../src/support/viterbi-spiral/viterbi.cpp 
-	HEADERS		+= ../src/support/viterbi-spiral/spiral-sse.h
-	SOURCES		+= ../src/support/viterbi-spiral/spiral-sse.c
-}
-
-siral-no-sse	{
-	DEPENDPATH     +=  ../src/support/viterbi-spiral 
-	INCLUDEPATH     +=  ../src/support/viterbi-spiral 
-	HEADERS		+= ../src/support/viterbi-spiral/viterbi.h 
-	SOURCES		+= ../src/support/viterbi-spiral/viterbi.cpp 
-	HEADERS		+= ../src/support/viterbi-spiral/spiral-no-sse.h
-	SOURCES		+= ../src/support/viterbi-spiral/spiral-no-sse.c
-}
-
-faad	{
-	DEFINES		+= __WITH_FAAD__
-	HEADERS		+= ../includes/backend/audio/faad-decoder.h 
-	SOURCES		+= ../src/backend/audio/faad-decoder.cpp 
-	LIBS		+= -lfaad
-}
-
-fdk-aac {
-        DEFINES         += __WITH_FDK_AAC__
-        INCLUDEPATH     += ../helpers/specials/fdk-aac
-        HEADERS         += ../includes/backend/audio/fdk-aac.h
-        SOURCES         += ../src/backend/audio/fdk-aac.cpp
-        PKGCONFIG       += fdk-aac
-}
-
-mapserver {
-	DEFINES		+= __HAVE_MAP_SERVER__
-	HEADERS		+= ../includes/support/http-handler.h
-	SOURCES		+= ../src/support/http-handler.cpp
-}
-
-double	{
-	DEFINES		+= __WITH_DOUBLES__
-	DEFINES		+= __FFTW3__
-	LIBS		+= -lfftw3
-}
-
-single	{
-	DEFINES		+= __FFTW3__
-	LIBS		+= -lfftw3f
-}

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,
-	 tabWidget, &QTabWidget::setCurrentIndex);
-//
-	displaySerial	-> setText (getSerial());
-	running. store (false);
-	my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
-
-	dumping. store (false);
-}
-
-	airspy_2::~airspy_2 () {
-	stopReader ();
-	myFrame. hide ();
-	storeWidgetPosition (airspySettings, &myFrame, AIRSPY_SETTINGS);
-	store (airspySettings, AIRSPY_SETTINGS, TAB_SETTINGS,
-	 tabWidget -> currentIndex ());
-	if (device != nullptr) {
-	 int result = my_airspy_stop_rx (device);
-	 if (result != AIRSPY_SUCCESS) {
-	 printf ("my_airspy_stop_rx() failed: %s (%d)\n",
-	 my_airspy_error_name((airspy_error)result), result);
-	 }
-
-	 result = my_airspy_close (device);
-	 if (result != AIRSPY_SUCCESS) {
-	 printf ("airspy_close() failed: %s (%d)\n",
-	 my_airspy_error_name((airspy_error)result), result);
-	 }
-	}
-	my_airspy_exit();
-	theFilter. reset ();
-	if (!xmlWriter. isNull ())
-	 xmlWriter. reset ();
-	delete library_p;
-}
-
-bool	airspy_2::restartReader	(int32_t freq, int samplesSkipped) {
-int	result;
-//int32_t	bufSize	= EXTIO_NS * EXTIO_BASE_TYPE_SIZE * 2;
-
-	if (running. load())
-	 return true;
-
-	lastFrequency	= freq;
-	this	-> toSkip = samplesSkipped;
-	QString key	= QString (TAB_SETTINGS) + "-"
-	 + QString::number (freq / MHz (1));
-	int tab		= value_i (airspySettings, AIRSPY_SETTINGS, key, 0);
-	tabWidget -> blockSignals (true);
- new_tabSetting (tab);
- while (tabWidget -> currentIndex () != tab) 
- usleep (1000);
- tabWidget -> blockSignals (false);
-//
-//	sliders are now set,
-	result = my_airspy_set_freq (device, freq);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 theErrorLogger-> add ("Airspy",
-	 my_airspy_error_name ((airspy_error)result));
-	}
-	result = my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 theErrorLogger-> add ("Airspy",
-	 my_airspy_error_name ((airspy_error)result));
-	 return false;
-	}
-
-	result = my_airspy_start_rx (device,
-	 (airspy_sample_block_cb_fn)callback, this);
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 theErrorLogger-> add ("Airspy",
-	 my_airspy_error_name((airspy_error)result));
-	 return false;
-	}
-//
-//	Hier moeten we de tab en gain weer zetten
-	restore_gainSliders (freq / MHz (1), tab);
-	restore_gainSettings (tab);
-	showStatus (QString ("Restart at ") +
-	 QString::number (freq / 1000) + QString ("Khz"));
-	_I_Buffer. FlushRingBuffer ();
-//
-	running. store (true);
-	return true;
-}
-
-void	airspy_2::stopReader() {
-int	result;
-
-	if (!running. load())
-	 return;
-
-	close_xmlDump ();
-	QString key = QString (TAB_SETTINGS) + "-" 
-	 + QString::number (lastFrequency / MHz (1));
-	store (airspySettings, AIRSPY_SETTINGS, key, tabWidget -> currentIndex ());
-	record_gainSettings (lastFrequency / MHz (1), 
-	 tabWidget -> currentIndex ());
-	result = my_airspy_stop_rx (device);
-
-	if (result != AIRSPY_SUCCESS ) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 theErrorLogger-> add ("Airspy",
-	 my_airspy_error_name ((airspy_error)result));
-	}
-	running. store (false);
-	resetBuffer ();
-}
-//
-//	Directly copied from the airspy extio dll from Andrea Montefusco
-int airspy_2::callback (airspy_transfer* transfer) {
-airspy_2 *p;
-
-	if (!transfer)
-	 return 0;		// should not happen
-	p = static_cast<airspy_2 *> (transfer -> ctx);
-
-// we read AIRSPY_SAMPLE_INT16_IQ:
-	int32_t bytes_to_write = transfer -> sample_count * sizeof (int16_t) * 2; 
-	uint8_t *pt_rx_buffer = (uint8_t *)transfer->samples;
-	p -> data_available (pt_rx_buffer, bytes_to_write);
-	return 0;
-}
-
-//	called from AIRSPY data callback
-//	2*2 = 4 bytes for sample, as per AirSpy USB data stream format
-//	Rate conversion is done using the samplerate library
-//	with a selectable "quality level"
-int 	airspy_2::data_available (void *buf, int buf_size) {	
-int16_t	*sbuf	= (int16_t *)buf;
-int nSamples	= buf_size / (sizeof (int16_t) * 2);
-std::complex<float> temp SAMPLERATE / 1000;
-
-	if (dumping. load ())
-	 xmlWriter -> add ((std::complex<int16_t> *)sbuf, nSamples);
-	if (convQuality_setter -> value () != filterDepth) {
-	 filterDepth = convQuality_setter -> value ();
-	 theFilter -> resize (filterDepth);
-	 store (airspySettings, AIRSPY_SETTINGS,
- CONV_QUALITY, filterDepth);
-	}
-
-	for (int i = 0; i < nSamples; i ++) {
-	 convBuffer convIndex ++ = theFilter -> Pass (
- std::complex<float> (
- sbuf 2 * i / (float)2048,
- sbuf 2 * i + 1 / (float)2048));
-
-	 if (convIndex > convBufferSize) {
-	 for (int j = 0; j < SAMPLERATE / 1000; j ++) {
-	 int16_t inpBase = mapTable_int j;
-	 float inpRatio = mapTable_float j;
-	 temp j = convBuffer inpBase + 1 * inpRatio +
-	 convBuffer inpBase * (1 - inpRatio);
-	 }
-	 if (toSkip > 0)
-	 toSkip -= SAMPLERATE / 1000;
-	 else
-	 _I_Buffer. putDataIntoBuffer (temp, SAMPLERATE / 1000);
-//	shift the sample at the end to the beginning, it is needed
-//	as the starting sample for the next time
-	 convBuffer 0 = convBuffer convBufferSize;
-	 convIndex = 1;
- }
-	}
-	return 0;
-}
-//
-const char *airspy_2::getSerial () {
-airspy_read_partid_serialno_t read_partid_serialno;
-int result = my_airspy_board_partid_serialno_read (device,
-	 &read_partid_serialno);
-	if (result != AIRSPY_SUCCESS) {
-	 theErrorLogger-> add ("Airspy",
-	 my_airspy_error_name ((airspy_error)result));
-	 return "UNKNOWN";
-	} else {
-	 snprintf (serial, sizeof(serial), "%08X%08X", 
-	 read_partid_serialno. serial_no 2,
-	 read_partid_serialno. serial_no 3);
-	}
-	return serial;
-}
-//
-//	not used here
-int	airspy_2::open() {
-	return 0;
-}
-
-//
-//	These functions are added for the SDR-J interface
-void	airspy_2::resetBuffer	() {
-	_I_Buffer. FlushRingBuffer	();
-}
-
-int16_t	airspy_2::bitDepth		() {
-	return 13;
-}
-
-int32_t	airspy_2::getSamples (std::complex<float> *v, int32_t size) {
-	return _I_Buffer. getDataFromBuffer (v, size);
-}
-
-int32_t	airspy_2::Samples		() {
-	return _I_Buffer. GetRingBufferReadAvailable();
-}
-//
-const char* airspy_2::board_id_name() {
-uint8_t bid;
-
-	if (my_airspy_board_id_read (device, &bid) == AIRSPY_SUCCESS)
-	 return my_airspy_board_id_name ((airspy_board_id)bid);
-	else
-	 return "UNKNOWN";
-}
-//
-bool	airspy_2::load_airspyFunctions() {
-//
-//	link the required procedures
-	my_airspy_init	= (pfn_airspy_init)
-	 library_p -> resolve ("airspy_init");
-	if (my_airspy_init == nullptr) {
-	 theErrorLogger -> add ("Airspy", "Could not find airspy_init");
-	 return false;
-	}
-
-	my_airspy_exit	= (pfn_airspy_exit)
-	 library_p -> resolve ("airspy_exit");
-	if (my_airspy_exit == nullptr) {
-	 theErrorLogger -> add ("Airspy", "Could not find airspy_exit");
-	 return false;
-	}
-
-	my_airspy_list_devices	= (pfn_airspy_list_devices)
-	 library_p -> resolve ("airspy_list_devices");
-	if (my_airspy_list_devices == nullptr) {
-	 theErrorLogger -> add ("Airspy", "Could not find airspy_list_devices");
-	 return false;
-	}
-	
-	my_airspy_open	= (pfn_airspy_open)
-	 library_p -> resolve ("airspy_open");
-	if (my_airspy_open == nullptr) {
-	 theErrorLogger -> add ("Airspy", "Could not find airspy_open");
-	 return false;
-	}
-
-	my_airspy_close	= (pfn_airspy_close)
-	 library_p -> resolve ("airspy_close");
-	if (my_airspy_close == nullptr) {
-	 theErrorLogger -> add ("Airspy", "Could not find airspy_close");
-	 return false;
-	}
-
-	my_airspy_get_samplerates	= (pfn_airspy_get_samplerates)
-	 library_p -> resolve ("airspy_get_samplerates");
-	if (my_airspy_get_samplerates == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_get_samplerates");
-	 return false;
-	}
-
-	my_airspy_set_samplerate	= (pfn_airspy_set_samplerate)
-	 library_p -> resolve ("airspy_set_samplerate");
-	if (my_airspy_set_samplerate == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_set_samplerate");
-	 return false;
-	}
-
-	my_airspy_start_rx	= (pfn_airspy_start_rx)
-	 library_p -> resolve ("airspy_start_rx");
-	if (my_airspy_start_rx == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_start_rx");
-	 return false;
-	}
-
-	my_airspy_stop_rx	= (pfn_airspy_stop_rx)
-	 library_p -> resolve ("airspy_stop_rx");
-	if (my_airspy_stop_rx == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_stop_rx");
-	 return false;
-	}
-
-	my_airspy_set_sample_type	= (pfn_airspy_set_sample_type)
-	 library_p -> resolve ("airspy_set_sample_type");
-	if (my_airspy_set_sample_type == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_set_sample_type");
-	 return false;
-	}
-
-	my_airspy_set_freq	= (pfn_airspy_set_freq)
-	 library_p -> resolve ("airspy_set_freq");
-	if (my_airspy_set_freq == nullptr) {
-	 theErrorLogger -> add ("Airspy", "Could not find airspy_set_freq");
-	 return false;
-	}
-
-	my_airspy_set_lna_gain	= (pfn_airspy_set_lna_gain)
-	 library_p -> resolve ("airspy_set_lna_gain");
-	if (my_airspy_set_lna_gain == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_set_lna_gain");
-	 return false;
-	}
-
-	my_airspy_set_mixer_gain	= (pfn_airspy_set_mixer_gain)
-	 library_p -> resolve ("airspy_set_mixer_gain");
-	if (my_airspy_set_mixer_gain == nullptr) {
-	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_mixer_gain");
-	 return false;
-	}
-
-	my_airspy_set_vga_gain	= (pfn_airspy_set_vga_gain)
-	 library_p -> resolve ("airspy_set_vga_gain");
-	if (my_airspy_set_vga_gain == nullptr) {
-	 theErrorLogger -> add ("Airspy",
-	 "Could not find airspy_set_vga_gain");
-	 return false;
-	}
-	
-	my_airspy_set_linearity_gain = (pfn_airspy_set_linearity_gain)
-	 library_p -> resolve ("airspy_set_linearity_gain");
-	if (my_airspy_set_linearity_gain == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_set_linearity_gain"\
-	 "You probably did install an old library\n");
-	 return false;
-	}
-
-	my_airspy_set_sensitivity_gain = (pfn_airspy_set_sensitivity_gain)
-	 library_p -> resolve ("airspy_set_sensitivity_gain");
-	if (my_airspy_set_sensitivity_gain == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_set_sensitivity_gain"\
-	 "You probably did install an old library\n");
-	 return false;
-	}
-
-	my_airspy_set_lna_agc	= (pfn_airspy_set_lna_agc)
-	 library_p -> resolve ("airspy_set_lna_agc");
-	if (my_airspy_set_lna_agc == nullptr) {
-	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_lna_agc");
-	 return false;
-	}
-
-	my_airspy_set_mixer_agc	= (pfn_airspy_set_mixer_agc)
-	 library_p -> resolve ("airspy_set_mixer_agc");
-	if (my_airspy_set_mixer_agc == nullptr) {
-	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_mixer_agc");
-	 return false;
-	}
-
-	my_airspy_set_rf_bias	= (pfn_airspy_set_rf_bias)
-	 library_p -> resolve ("airspy_set_rf_bias");
-	if (my_airspy_set_rf_bias == nullptr) {
-	 theErrorLogger-> add ("Airspy", "Could not find airspy_set_rf_bias");
-	 return false;
-	}
-
-	my_airspy_error_name	= (pfn_airspy_error_name)
-	 library_p -> resolve ("airspy_error_name");
-	if (my_airspy_error_name == nullptr) {
-	 theErrorLogger-> add ("Airspy", "Could not find airspy_error_name");
-	 return false;
-	}
-
-	my_airspy_board_id_read	= (pfn_airspy_board_id_read)
-	 library_p -> resolve ("airspy_board_id_read");
-	if (my_airspy_board_id_read == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_board_id_read");
-	 return false;
-	}
-
-	my_airspy_board_id_name	= (pfn_airspy_board_id_name)
-	 library_p -> resolve ("airspy_board_id_name");
-	if (my_airspy_board_id_name == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_board_id_name");
-	 return false;
-	}
-
-	my_airspy_board_partid_serialno_read	=
-	 (pfn_airspy_board_partid_serialno_read)
-	 library_p -> resolve ("airspy_board_partid_serialno_read");
-	if (my_airspy_board_partid_serialno_read == nullptr) {
-	 theErrorLogger-> add ("Airspy",
-	 "Could not find airspy_board_partid_serialno_read");
-	 return false;
-	}
-
-	return true;
-}
-
-int	airspy_2::getBufferSpace	() {
-	return _I_Buffer. GetRingBufferWriteAvailable ();
-}
-
-QString	airspy_2::deviceName	() {
-	return QString ("AIRspy :") + QString (getSerial ());
-}
-
-void	airspy_2::set_xmlDump () {
-	if (xmlWriter. isNull ()) {
-	 setup_xmlDump (false);
-	}
-	else {
-	 close_xmlDump ();
-	}
-}
-
-void	airspy_2::startDump	() {
-	setup_xmlDump (true);
-}
-
-void	airspy_2::stopDump	() {
-	close_xmlDump	();
-}
-
-bool	airspy_2::setup_xmlDump (bool direct) {
-QString channel		= value_s (airspySettings, DAB_GENERAL,
-	 "channel", "xx");
-	try {
-	 xmlWriter. reset (new xml_fileWriter (airspySettings,
-	 channel,
-	 12,
-	 "int16",
-	 selectedRate,
-	 lastFrequency,
-	 -1,
-	 "Airspy",
-	 getSerial (),
-	 recorderVersion,
-	 direct));
-	} catch (...) {
-	 return false;
-	}
-	dumping. store (true);
-	dumpButton	-> setText ("writing");
-	return true;
-}
-
-void	airspy_2::close_xmlDump () {
-	if (xmlWriter. isNull ())	// this can happen !!
-	 return;
-	dumping. store (false);
-	usleep (1000);
-	xmlWriter	-> computeHeader ();
-	dumping. store (false);
-	dumpButton	-> setText ("Dump");
-	xmlWriter. reset ();
-}
-//
-//	gain settings are maintained on a per-channel and per tab base,
-//	Values are recorded on both switching tabs and changing channels
-void	airspy_2::record_gainSettings	(int freq, int tab) {
-QString	res;
-QString key;
-
-	key		= QString::number (freq) + "-"
-	 + QString::number (tab);
-	switch (tab) {
-	 case 0:	// sensitity screen is on
-	 res = QString::number (sensitivitySlider -> value ());
-	 break;
-	 case 1:	// linearity screen is on
-	 res = QString::number (linearitySlider -> value ());
-	 break;
-	 case 3:	// classic screen
-	 default:
-	 res = QString::number (vgaSlider -> value ());
-	 res = res + ":" + QString::number (mixerSlider -> value ());
-	 res = res + ":" + QString::number (lnaSlider -> value ());
-	 break;
-	}
-
-	res	= res + ":" + QString::number (lnaButton -> isChecked ());
-	res	= res + ":" + QString::number (mixerButton -> isChecked ());
-	res	= res + ":" + QString::number (biasButton -> isChecked ());
-
-	store (airspySettings, AIRSPY_SETTINGS, key, res);
-}
-//
-//	When starting a channel, the gain sliders from the previous
-//	time that channel was the current channel, are restored
-//	Note that the device settings are NOT yet updated
-void	airspy_2::restore_gainSliders	(int freq, int tab) {
-int	lna	= 0;
-int	mixer	= 0;
-int	bias	= 0;
-QString key	= QString::number (freq) + "-" + QString::number (tab);
-QString	def	= "";
-
-	QString gainValues =
-	 value_s (airspySettings, AIRSPY_SETTINGS, key, def);
-	if (gainValues == "") { // we create default values
-	 if ((tab == 0) || (tab == 1)) {
-	 gainValues = "10:0:0:0";
-	 }
-	 else
-	 gainValues = "10:10:10:0:0:0";	
-	}
-	QStringList list = gainValues. split (":");
-	switch (tab) {
-	 case 0:
-	 disconnect (sensitivitySlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_sensitivity);
-	 sensitivitySlider -> setValue (list. at (0). toInt ());
-	 connect (sensitivitySlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_sensitivity);
-	 lna	= list. at (1). toInt ();
-	 mixer	= list. at (2). toInt ();
-	 bias	= list. at (3). toInt ();
-	 break;
-	 case 1:
-	 disconnect (linearitySlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_linearity);
-	 linearitySlider -> setValue (list. at (0). toInt ());
-	 connect (linearitySlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_linearity);
-	 lna	= list. at (1). toInt ();
-	 mixer	= list. at (2). toInt ();
-	 bias	= list. at (3). toInt ();
-	 break;
-
-	 default:	// classic view
-	 disconnect (vgaSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_vga_gain);
-	 disconnect (mixerSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_mixer_gain);
-	 disconnect (lnaSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_lna_gain);
-	 vgaSlider		-> setValue (list. at (0). toInt ());
-	 mixerSlider	-> setValue (list. at (1). toInt ());
-	 lnaSlider		-> setValue (list. at (2). toInt ());
-	 connect (vgaSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_vga_gain);
-	 connect (mixerSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_mixer_gain);
-	 connect (lnaSlider, &QSlider::valueChanged,
-	 this, &airspy_2::set_lna_gain);
-	 lna	= list. at (3). toInt ();
-	 mixer	= list. at (4). toInt ();
-	 bias	= list. at (5). toInt ();
-	}
-//
-//	Now the agc settings
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	disconnect (lnaButton, &QCheckBox::checkStateChanged,
-#else
-	disconnect (lnaButton, &QCheckBox::stateChanged,
-#endif
-	 this, &airspy_2::set_lna_agc);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	disconnect (mixerButton, &QCheckBox::checkStateChanged,
-#else
-	disconnect (mixerButton, &QCheckBox::stateChanged,
-#endif
-	 this, &airspy_2::set_mixer_agc);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	disconnect (biasButton, &QCheckBox::checkStateChanged,
-#else
-	disconnect (biasButton, &QCheckBox::stateChanged,
-#endif
-	 this, &airspy_2::set_rf_bias);
-	if (lna != 0)
-	 lnaButton	-> setChecked (true);
-	if (mixer != 0)
-	 mixerButton	-> setChecked (true);
-	if (bias != 0)
-	 biasButton	-> setChecked (true);
-#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);
-}
-
-void	airspy_2::restore_gainSettings	(int tab) {
-	switch (tab) {
-	 case 0:	//sensitivity
-	 set_sensitivity (sensitivitySlider -> value ());
-	 break;
-	 case 1:	// linearity
-	 set_linearity (linearitySlider -> value ());
-	 break;
-	 case 2:	// classic view
-	 default:
-	 set_lna_gain	(lnaSlider	-> value ());
-	 set_mixer_gain	(mixerSlider	-> value ());
-	 set_vga_gain	(vgaSlider	-> value ());
-	 break;
-	}
-	if (lnaButton -> isChecked ()) 
-	 set_lna_agc (1);
-	if (mixerButton -> isChecked ())
-	 set_mixer_agc (1);
-	if (biasButton -> isChecked ())
-	 set_rf_bias (1);
-}
-
-void	airspy_2::switch_tab (int t) {
-	record_gainSettings (lastFrequency / MHz (1),
-	 tabWidget -> currentIndex ());
-	tabWidget -> blockSignals (true);
-	new_tabSetting	(t);
- while (tabWidget -> currentIndex () != t)
- usleep (1000);
- tabWidget -> blockSignals (false);
-	store (airspySettings, AIRSPY_SETTINGS, TAB_SETTINGS, t);
-	restore_gainSliders (lastFrequency / MHz (1), t);
-	restore_gainSettings (t);
-}
-
-#define GAIN_COUNT (22)
-
-uint8_t airspy_linearity_vga_gainsGAIN_COUNT = { 13, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 8, 7, 6, 5, 4 };
-uint8_t airspy_linearity_mixer_gainsGAIN_COUNT = { 12, 12, 11, 9, 8, 7, 6, 6, 5, 0, 0, 1, 0, 0, 2, 2, 1, 1, 1, 1, 0, 0 };
-uint8_t airspy_linearity_lna_gainsGAIN_COUNT = { 14, 14, 14, 13, 12, 10, 9, 9, 8, 9, 8, 6, 5, 3, 1, 0, 0, 0, 0, 0, 0, 0 };
-uint8_t airspy_sensitivity_vga_gainsGAIN_COUNT = { 13, 12, 11, 10, 9, 8, 7, 6, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4 };
-uint8_t airspy_sensitivity_mixer_gainsGAIN_COUNT = { 12, 12, 12, 12, 11, 10, 10, 9, 9, 8, 7, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0 };
-uint8_t airspy_sensitivity_lna_gainsGAIN_COUNT = { 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 12, 9, 9, 8, 7, 6, 5, 3, 2, 1, 0 };
-
-void	airspy_2::set_linearity (int value) {
-int	result = my_airspy_set_linearity_gain (device, value);
-int	temp;
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_lna_gain() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	 return;
-	}
-	linearityDisplay	-> display (value);
-	temp	= airspy_linearity_lna_gains GAIN_COUNT - 1 - value;
-	linearity_lnaDisplay	-> display (temp);
-	temp	= airspy_linearity_mixer_gains GAIN_COUNT - 1 - value;
-	linearity_mixerDisplay	-> display (temp);
-	temp	= airspy_linearity_vga_gains GAIN_COUNT - 1 - value;
-	linearity_vgaDisplay	-> display (temp);
-}
-
-void	airspy_2::set_sensitivity (int value) {
-int	result = my_airspy_set_sensitivity_gain (device, value);
-int	temp;
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	 return;
-	}
-	sensitivityDisplay	-> display (value);
-	temp	= airspy_sensitivity_lna_gains GAIN_COUNT - 1 - value;
-	sensitivity_lnaDisplay	-> display (temp);
-	temp	= airspy_sensitivity_mixer_gains GAIN_COUNT - 1 - value;
-	sensitivity_mixerDisplay	-> display (temp);
-	temp	= airspy_sensitivity_vga_gains GAIN_COUNT - 1 - value;
-	sensitivity_vgaDisplay	-> display (temp);
-}
-
-//	Original functions from the airspy extio dll
-/* Parameter value shall be between 0 and 15 */
-void	airspy_2::set_lna_gain (int value) {
-int result = my_airspy_set_lna_gain (device, lnaGain = value);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_lna_gain() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	}
-	else
-	 lnaDisplay	-> display (value);
-}
-
-/* Parameter value shall be between 0 and 15 */
-void	airspy_2::set_mixer_gain (int value) {
-int result = my_airspy_set_mixer_gain (device, mixerGain = value);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_mixer_gain() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	}
-	else
-	 mixerDisplay	-> display (value);
-}
-
-/* Parameter value shall be between 0 and 15 */
-void	airspy_2::set_vga_gain (int value) {
-int result = my_airspy_set_vga_gain (device, vgaGain = value);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_vga_gain() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	}
-	else
-	 vgaDisplay	-> display (value);
-}
-//
-//	agc's
-/* Parameter value:
-	0=Disable LNA Automatic Gain Control
-	1=Enable LNA Automatic Gain Control
-*/
-void	airspy_2::set_lna_agc	(int dummy) {
-	(void)dummy;
-	lna_agc	= lnaButton	-> isChecked ();
-	int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_lna_agc() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	}
-}
-
-/* Parameter value:
-	0=Disable MIXER Automatic Gain Control
-	1=Enable MIXER Automatic Gain Control
-*/
-void	airspy_2::set_mixer_agc	(int dummy) {
-	(void)dummy;
-	mixer_agc	= mixerButton -> isChecked ();
-
-int result = my_airspy_set_mixer_agc (device, mixer_agc ? 1 : 0);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf ("airspy_set_mixer_agc() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	}
-}
-
-/* Parameter value shall be 0=Disable BiasT or 1=Enable BiasT */
-void	airspy_2::set_rf_bias (int dummy) {
-	(void)dummy;
-	rf_bias	= biasButton -> isChecked ();
-int result = my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
-
-	if (result != AIRSPY_SUCCESS) {
-	 showStatus (my_airspy_error_name ((airspy_error)result));
-	 printf("airspy_set_rf_bias() failed: %s (%d)\n",
-	 my_airspy_error_name ((airspy_error)result), result);
-	}
-}
-
-void	airspy_2::showStatus	(const QString s) {
-	statusLabel -> setText (s);
-}
-

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">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="linearity_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="linearity_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="linearity_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_8">
- <property name="geometry">
- <rect>
- <x>100</x>
- <y>60</y>
- <width>91</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>lna gain</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_9">
- <property name="geometry">
- <rect>
- <x>100</x>
- <y>80</y>
- <width>101</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>mixer gain</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_10">
- <property name="geometry">
- <rect>
- <x>100</x>
- <y>100</y>
- <width>71</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>vga gain</string>
- </property>
- </widget>
- </widget>
- <widget class="QWidget" name="tab_3">
- <attribute name="title">
- <string>classic view</string>
- </attribute>
- <widget class="QSlider" name="lnaSlider">
- <property name="geometry">
- <rect>
- <x>80</x>
- <y>10</y>
- <width>201</width>
- <height>20</height>
- </rect>
- </property>
- <property name="maximum">
- <number>15</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
- </property>
- </widget>
- <widget class="QLabel" name="label">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>66</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>lna</string>
- </property>
- </widget>
- <widget class="QLCDNumber" name="lnaDisplay">
- <property name="geometry">
- <rect>
- <x>290</x>
- <y>10</y>
- <width>51</width>
- <height>23</height>
- </rect>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QSlider" name="mixerSlider">
- <property name="geometry">
- <rect>
- <x>80</x>
- <y>40</y>
- <width>201</width>
- <height>20</height>
- </rect>
- </property>
- <property name="maximum">
- <number>15</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="mixerDisplay">
- <property name="geometry">
- <rect>
- <x>290</x>
- <y>40</y>
- <width>51</width>
- <height>23</height>
- </rect>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QLabel" name="label_2">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>40</y>
- <width>66</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>mixer</string>
- </property>
- </widget>
- <widget class="QSlider" name="vgaSlider">
- <property name="geometry">
- <rect>
- <x>80</x>
- <y>70</y>
- <width>201</width>
- <height>20</height>
- </rect>
- </property>
- <property name="maximum">
- <number>15</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
- </property>
- </widget>
- <widget class="QLabel" name="label_3">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>70</y>
- <width>66</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>vga</string>
- </property>
- </widget>
- <widget class="QLCDNumber" name="vgaDisplay">
- <property name="geometry">
- <rect>
- <x>290</x>
- <y>70</y>
- <width>51</width>
- <height>23</height>
- </rect>
- </property>
- <property name="digitCount">
- <number>2</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::SegmentStyle::Flat</enum>
- </property>
- </widget>
- <widget class="QCheckBox" name="lnaButton">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>121</y>
- <width>81</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>lna</string>
- </property>
- </widget>
- <widget class="QCheckBox" name="mixerButton">
- <property name="geometry">
- <rect>
- <x>110</x>
- <y>121</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>mixer </string>
- </property>
- </widget>
- <widget class="QCheckBox" name="biasButton">
- <property name="geometry">
- <rect>
- <x>200</x>
- <y>121</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>bias</string>
- </property>
- </widget>
- </widget>
- </widget>
- <widget class="QLabel" name="displaySerial">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>60</y>
- <width>361</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- <widget class="QLabel" name="label_4">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>141</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>A I R S P Y handler</string>
- </property>
- </widget>
- <widget class="QPushButton" name="dumpButton">
- <property name="geometry">
- <rect>
- <x>150</x>
- <y>20</y>
- <width>104</width>
- <height>31</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the airspy 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>
- <widget class="QSpinBox" name="convQuality_setter">
- <property name="geometry">
- <rect>
- <x>300</x>
- <y>20</y>
- <width>91</width>
- <height>31</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality level for samplerate conversion. Note that AN airSPY DEVICE emits either 2.5 Ms/s or 3 Ms/s and we need 2048000, so samplerate conversion is required.&lt;/p&gt;&lt;p&gt;For the Down sampling we use the &amp;quot;libsamplerate&amp;quot; library (all rights reserved) and that library provides a choice between 5 quality levels.&lt;/p&gt;&lt;p&gt;Level 0 - the default here - is merely a linear interpolation, level 4is based on sinc interpolation and pretty good. Of course, higher quality requires more computation. Levels 2 and 3 work fine, level 4 might require too much cpu cycles, resulting in data loss,&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>11</number>
- </property>
- <property name="value">
- <number>4</number>
- </property>
- </widget>
- <widget class="QLabel" name="statusLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>90</y>
- <width>371</width>
- <height>18</height>
- </rect>
- </property>
- <property name="text">
- <string>statusLabel</string>
- </property>
- </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>

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
- */
-RTLSDR_API int rtlsdr_get_tuner_gains(rtlsdr_dev_t *dev, int *gains);
-
-/*!
- * Set the gain for the device.
- * Manual gain mode must be enabled for this to work.
- *
- * Valid gain values (in tenths of a dB) for the E4000 tuner:
- * -10, 15, 40, 65, 90, 115, 140, 165, 190,
- * 215, 240, 290, 340, 420, 430, 450, 470, 490
- *
- * Valid gain values may be queried with \ref rtlsdr_get_tuner_gains function.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param gain in tenths of a dB, 115 means 11.5 dB.
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_tuner_gain(rtlsdr_dev_t *dev, int gain);
-
-/*!
- * Set the bandwidth for the device.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param bw bandwidth in Hz. Zero means automatic BW selection.
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw);
-
-/*!
- * Get actual gain the device is configured to.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return 0 on error, gain in tenths of a dB, 115 means 11.5 dB.
- */
-RTLSDR_API int rtlsdr_get_tuner_gain(rtlsdr_dev_t *dev);
-
-/*!
- * Set the intermediate frequency gain for the device.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param stage intermediate frequency gain stage number (1 to 6 for E4000)
- * \param gain in tenths of a dB, -30 means -3.0 dB.
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_tuner_if_gain(rtlsdr_dev_t *dev, int stage, int gain);
-
-/*!
- * Set the gain mode (automatic/manual) for the device.
- * Manual gain mode must be enabled for the gain setter function to work.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param manual gain mode, 1 means manual gain mode shall be enabled.
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int manual);
-
-/*!
- * Set the sample rate for the device, also selects the baseband filters
- * according to the requested sample rate for tuners where this is possible.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param samp_rate the sample rate to be set, possible values are:
- * 		 225001 - 300000 Hz
- * 		 900001 - 3200000 Hz
- * 		 sample loss is to be expected for rates > 2400000
- * \return 0 on success, -EINVAL on invalid rate
- */
-RTLSDR_API int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t rate);
-
-/*!
- * Get actual sample rate the device is configured to.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return 0 on error, sample rate in Hz otherwise
- */
-RTLSDR_API uint32_t rtlsdr_get_sample_rate(rtlsdr_dev_t *dev);
-
-/*!
- * Enable test mode that returns an 8 bit counter instead of the samples.
- * The counter is generated inside the RTL2832.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param test mode, 1 means enabled, 0 disabled
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_testmode(rtlsdr_dev_t *dev, int on);
-
-/*!
- * Enable or disable the internal digital AGC of the RTL2832.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param digital AGC mode, 1 means enabled, 0 disabled
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_agc_mode(rtlsdr_dev_t *dev, int on);
-
-/*!
- * Enable or disable the direct sampling mode. When enabled, the IF mode
- * of the RTL2832 is activated, and rtlsdr_set_center_freq() will control
- * the IF-frequency of the DDC, which can be used to tune from 0 to 28.8 MHz
- * (xtal frequency of the RTL2832).
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param on 0 means disabled, 1 I-ADC input enabled, 2 Q-ADC input enabled
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_direct_sampling(rtlsdr_dev_t *dev, int on);
-
-/*!
- * Get state of the direct sampling mode
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return -1 on error, 0 means disabled, 1 I-ADC input enabled
- *	 2 Q-ADC input enabled
- */
-RTLSDR_API int rtlsdr_get_direct_sampling(rtlsdr_dev_t *dev);
-
-/*!
- * Enable or disable offset tuning for zero-IF tuners, which allows to avoid
- * problems caused by the DC offset of the ADCs and 1/f noise.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param on 0 means disabled, 1 enabled
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on);
-
-/*!
- * Get state of the offset tuning mode
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return -1 on error, 0 means disabled, 1 enabled
- */
-RTLSDR_API int rtlsdr_get_offset_tuning(rtlsdr_dev_t *dev);
-
-/* streaming functions */
-
-RTLSDR_API int rtlsdr_reset_buffer(rtlsdr_dev_t *dev);
-
-RTLSDR_API int rtlsdr_read_sync(rtlsdr_dev_t *dev, void *buf, int len, int *n_read);
-
-typedef void(*rtlsdr_read_async_cb_t)(unsigned char *buf, uint32_t len, void *ctx);
-
-/*!
- * Read samples from the device asynchronously. This function will block until
- * it is being canceled using rtlsdr_cancel_async()
- *
- * NOTE: This function is deprecated and is subject for removal.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param cb callback function to return received samples
- * \param ctx user specific context to pass via the callback function
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_wait_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx);
-
-/*!
- * Read samples from the device asynchronously. This function will block until
- * it is being canceled using rtlsdr_cancel_async()
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param cb callback function to return received samples
- * \param ctx user specific context to pass via the callback function
- * \param buf_num optional buffer count, buf_num * buf_len = overall buffer size
- *		 set to 0 for default buffer count (15)
- * \param buf_len optional buffer length, must be multiple of 512,
- *		 should be a multiple of 16384 (URB size), set to 0
- *		 for default buffer length (16 * 32 * 512)
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_read_async(rtlsdr_dev_t *dev,
-				 rtlsdr_read_async_cb_t cb,
-				 void *ctx,
-				 uint32_t buf_num,
-				 uint32_t buf_len);
-
-/*!
- * Cancel all pending asynchronous operations on the device.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \return 0 on success
- */
-RTLSDR_API int rtlsdr_cancel_async(rtlsdr_dev_t *dev);
-
-/*!
- * Enable or disable the bias tee on GPIO PIN 0.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param on 1 for Bias T on. 0 for Bias T off.
- * \return -1 if device is not initialized. 0 otherwise.
- */
-RTLSDR_API int rtlsdr_set_bias_tee(rtlsdr_dev_t *dev, int on);
-
-/*!
- * Enable or disable the bias tee on the given GPIO pin.
- *
- * \param dev the device handle given by rtlsdr_open()
- * \param gpio the gpio pin to configure as a Bias T control.
- * \param on 1 for Bias T on. 0 for Bias T off.
- * \return -1 if device is not initialized. 0 otherwise.
- */
-RTLSDR_API int rtlsdr_set_bias_tee_gpio(rtlsdr_dev_t *dev, int gpio, int on);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __RTL_SDR_H */

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
-	connect (gainControl,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
-	 qOverload<const QString &>(&QComboBox::textActivated),
-#else
-	 qOverload<const QString &>(&QComboBox::activated),
-#endif
-	 this, &rtlsdrHandler::set_ExternalGain);
-	
-	connect (ppm_correction, qOverload<double>(&QDoubleSpinBox::valueChanged),
-	 this, &rtlsdrHandler::set_ppmCorrection);
-	connect (agc_hw, &QRadioButton::toggled,
-	 this, &rtlsdrHandler::set_hw_agc);
-	connect (agc_sw, &QRadioButton::toggled,
-	 this, &rtlsdrHandler::set_sw_agc);
-	connect (agc_off, &QRadioButton::toggled,
-	 this, &rtlsdrHandler::set_off_agc);
-	connect (xml_dumpButton, &QPushButton::clicked,
-	 this, &rtlsdrHandler::set_xmlDump);
-	connect (iq_dumpButton, &QPushButton::clicked,
-	 this, &rtlsdrHandler::set_iqDump);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (biasControl, &QCheckBox::checkStateChanged,
-#else
-	connect (biasControl, &QCheckBox::stateChanged,
-#endif
-	 this, &rtlsdrHandler::set_biasControl);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (filterSelector, &QCheckBox::checkStateChanged,
-#else
-	connect (filterSelector, &QCheckBox::stateChanged,
-#endif
-	 this, &rtlsdrHandler::set_filter);
-//
-//	and for saving/restoring the gain setting:
-	connect (this, &rtlsdrHandler::new_gainIndex,
-	 gainControl, &QComboBox::setCurrentIndex);
-	iqDumper	= nullptr;
-	iq_dumping. store (false);
-	xml_dumping. store (false);
-	xmlWriter. reset ();
-	workerHandle. reset ();
-}
-
-	rtlsdrHandler::~rtlsdrHandler () {
-	stopReader	();
-	if (!workerHandle. isNull ()) {
-	 rtlsdr_cancel_async (theDevice);
-	 while (!workerHandle -> isFinished())
-	 usleep (200); 
-	 _I_Buffer. FlushRingBuffer();
-	 workerHandle. reset ();
-	}
-	storeWidgetPosition (rtlsdrSettings, &myFrame, "rtlsdrSettings");
-	QString gainText	= gainControl -> currentText ();
-	store (rtlsdrSettings, "rtlsdrSettings",
-	 "externalGain", gainText);
-	int agc = agc_off -> isChecked () ? 1 :
- agc_sw -> isChecked () ? 2 : 0;
-	store (rtlsdrSettings, "rtlsdrSettings", "agcMode", agc);
-
-	store (rtlsdrSettings, "rtlsdrSettings",
-	 "ppm_correction", ppm_correction -> value());
-	store (rtlsdrSettings, "rtlsdrSettings",
-	 "filterDepth", filterDepth -> value ());
-	rtlsdrSettings	-> sync ();
-	if (!xmlWriter. isNull ())
-	 xmlWriter. reset ();
-	myFrame. hide ();
-	usleep (1000);
-	rtlsdr_close (theDevice);
-	delete phandle;
-}
-
-//
-void	rtlsdrHandler::set_filter	(int c) {
-	(void)c;
-	filtering = filterSelector -> isChecked ();
-}
-
-bool	rtlsdrHandler::restartReader	(int32_t freq, int skipped) {
-	int res = this -> rtlsdr_set_center_freq (theDevice, freq);
-	if (res != 0) {
-	 QString t = QString ("Cannot set frequency to ") +
-	 QString::number (freq);
-	 theErrorLogger -> add ("RTLSDR", t);
-	 return false;
-	}
-	if (save_gainSettings)
-	 update_gainSettings (freq / MHz (1));
-
-	lastFrequency	= freq;
-	this -> toSkip = skipped;
-	tunedFrequency -> setText (QString::number (freq / 1000) + "kHz");
-	set_ExternalGain (gainControl -> currentText ());
-	if (workerHandle. isNull ()) {
-//	reset endpoint
-	 (void)this -> rtlsdr_reset_buffer (theDevice);
-	 workerHandle. reset (new dll_driver (this));
-	}
-	_I_Buffer. FlushRingBuffer();
-	isActive. store (true);
-	return true;
-}
-
-void	rtlsdrHandler::stopReader () {
-	if (workerHandle. isNull ())
-	 return;
-	isActive. store (false);
-	this -> rtlsdr_cancel_async (theDevice);
- this -> rtlsdr_reset_buffer (theDevice);
- if (!workerHandle. isNull ()) {
- while (!workerHandle -> isFinished())
- usleep(100);
- _I_Buffer.FlushRingBuffer ();
- workerHandle. reset ();
- }
-	close_xmlDump ();
-	if (save_gainSettings)
-	 record_gainSettings	((int32_t)(this -> rtlsdr_get_center_freq (theDevice)) / MHz (1));
-}
-//
-//	when selecting the gain from a table, use the table value
-void	rtlsdrHandler::set_ExternalGain	(const QString &gain) {
-	int res = rtlsdr_set_tuner_gain (theDevice, gain. toInt());
-	if (res != 0) {
-	 QString t = QString ("Cannot set gain to ") +
-	 QString::number (gain. toInt ());
-	 theErrorLogger -> add ("RTLSDR", t);
-	}
-}
-//
-void	rtlsdrHandler::init_autogain	(int level) {
-	if (level == 1)
-	 agc_off	-> setChecked (true);
-	else
-	if (level == 2)
-	 agc_sw	-> setChecked (true);
-	else	// level == 0
-	 agc_hw	-> setChecked (true);
-
-	set_autogain (level);
-}
-
-
-void	rtlsdrHandler::set_hw_agc	() {
-	set_autogain (0);
-}
-
-void	rtlsdrHandler::set_sw_agc	() {
-	set_autogain (2);
-}
-
-void	rtlsdrHandler::set_off_agc	() {
-	set_autogain (1);
-}
-
-void	rtlsdrHandler::set_autogain (int level) {
-	rtlsdr_set_agc_mode (theDevice, level == 0);
-	rtlsdr_set_tuner_gain_mode (theDevice, level);
-	if (level == 1) {
-	 gainControl -> setEnabled (true);
-	 set_ExternalGain (gainControl -> currentText ());
-	}
-	else
-	 gainControl -> setEnabled (false);
-}
-//
-void	rtlsdrHandler::set_biasControl	(int dummy) {
-	(void)dummy;
-	if (rtlsdr_set_bias_tee != nullptr) {
-	 int res = rtlsdr_set_bias_tee (theDevice,
-	 biasControl -> isChecked () ? 1 : 0);
-	 if (res != 0) {
-	 QString t = QString ("Cannot set bias tee to ") +
-	 (biasControl -> isChecked () ? "1" : "0");
-	 theErrorLogger -> add ("RTLSDR", t);
-	 }
-	}
-}
-//	correction is in Hz
-void	rtlsdrHandler::set_ppmCorrection	(double ppm) {
-int res;
-	if (rtlsdr_set_freq_correction_ppb != nullptr) 
-	 res = this -> rtlsdr_set_freq_correction_ppb (theDevice, ppm * 1000);
-	else
-	 res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
-	if (res != 0) {
-	 QString t = QString ("Cannot set ppm to ") +
-	 QString::number (ppm);
-	 theErrorLogger -> add ("RTLSDR", t);
-	}
-}
-
-int32_t	rtlsdrHandler::getSamples (std::complex<float> *V, int32_t size) { 
-	if (!isActive. load ())
-	 return 0;
-	return _I_Buffer. getDataFromBuffer (V, size);
-}
-
-int32_t	rtlsdrHandler::Samples () {
-	if (!isActive. load ())
-	 return 0;
-	return _I_Buffer. GetRingBufferReadAvailable ();
-}
-//
-bool	rtlsdrHandler::load_rtlFunctions() {
-//
-//	link the required procedures
-	rtlsdr_open	= (pfnrtlsdr_open) phandle -> resolve ("rtlsdr_open");
-	if (rtlsdr_open == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_open\n");
-	 return false;
-	}
-
-	rtlsdr_close	= (pfnrtlsdr_close) phandle -> resolve ("rtlsdr_close");
-	if (rtlsdr_close == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_close\n");
-	 return false;
-	}
-
-	rtlsdr_get_usb_strings =
-	 (pfnrtlsdr_get_usb_strings)
-	 phandle -> resolve ("rtlsdr_get_usb_strings");
-	if (rtlsdr_get_usb_strings == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_usb_strings\n");
-	 return false;
-	}
-
-	rtlsdr_set_sample_rate =
-	 (pfnrtlsdr_set_sample_rate)
-	 phandle -> resolve ("rtlsdr_set_sample_rate");
-	if (rtlsdr_set_sample_rate == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_sample_rate\n");
-	 return false;
-	}
-
-	rtlsdr_get_sample_rate	=
-	 (pfnrtlsdr_get_sample_rate)
-	 phandle -> resolve ("rtlsdr_get_sample_rate");
-	if (rtlsdr_get_sample_rate == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_sample_rate\n");
-	 return false;
-	}
-
-	rtlsdr_get_tuner_gains	=
-	 (pfnrtlsdr_get_tuner_gains)
-	 phandle -> resolve ("rtlsdr_get_tuner_gains");
-	if (rtlsdr_get_tuner_gains == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gains\n");
-	 return false;
-	}
-
-	rtlsdr_get_tuner_type	=
-	 (pfnrtlsdr_get_tuner_type)
-	 phandle -> resolve ("rtlsdr_get_tuner_type");
-	if (rtlsdr_get_tuner_type == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_tuner_type\n");
-	 return false;
-	}
-
-	rtlsdr_set_tuner_gain_mode	=
-	 (pfnrtlsdr_set_tuner_gain_mode)
-	 phandle -> resolve ("rtlsdr_set_tuner_gain_mode");
-	if (rtlsdr_set_tuner_gain_mode == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_tuner_gain_mode\n");
-	 return false;
-	}
-
-	rtlsdr_set_agc_mode	=
-	 (pfnrtlsdr_set_agc_mode)
-	 phandle -> resolve ("rtlsdr_set_agc_mode");
-	if (rtlsdr_set_agc_mode == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_agc_mode\n");
-	 return false;
-	}
-
-	rtlsdr_set_tuner_gain	=
-	 (pfnrtlsdr_set_tuner_gain)
-	 phandle -> resolve ("rtlsdr_set_tuner_gain");
-	if (rtlsdr_set_tuner_gain == nullptr) {
-	 fprintf (stderr, "Cound not find rtlsdr_set_tuner_gain\n");
-	 return false;
-	}
-
-	rtlsdr_get_tuner_gain	=
-	 (pfnrtlsdr_get_tuner_gain)
-	 phandle -> resolve ("rtlsdr_get_tuner_gain");
-	if (rtlsdr_get_tuner_gain == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gain\n");
-	 return false;
-	}
-
-	rtlsdr_set_center_freq	=
-	 (pfnrtlsdr_set_center_freq)
-	 phandle -> resolve ("rtlsdr_set_center_freq");
-	if (rtlsdr_set_center_freq == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_center_freq\n");
-	 return false;
-	}
-
-	rtlsdr_get_center_freq	=
-	 (pfnrtlsdr_get_center_freq)
-	 phandle -> resolve ("rtlsdr_get_center_freq");
-	if (rtlsdr_get_center_freq == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_center_freq\n");
-	 return false;
-	}
-
-	rtlsdr_reset_buffer	=
-	 (pfnrtlsdr_reset_buffer)
-	 phandle -> resolve ("rtlsdr_reset_buffer");
-	if (rtlsdr_reset_buffer == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_reset_buffer\n");
-	 return false;
-	}
-
-	rtlsdr_read_async	=
-	 (pfnrtlsdr_read_async)
-	 phandle -> resolve ("rtlsdr_read_async");
-	if (rtlsdr_read_async == nullptr) {
-	 fprintf (stderr, "Cound not find rtlsdr_read_async\n");
-	 return false;
-	}
-
-	rtlsdr_get_device_count	=
-	 (pfnrtlsdr_get_device_count)
-	 phandle -> resolve ("rtlsdr_get_device_count");
-	if (rtlsdr_get_device_count == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_device_count\n");
-	 return false;
-	}
-
-	rtlsdr_cancel_async	=
-	 (pfnrtlsdr_cancel_async)
-	 phandle -> resolve ("rtlsdr_cancel_async");
-	if (rtlsdr_cancel_async == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_cancel_async\n");
-	 return false;
-	}
-
-	rtlsdr_set_direct_sampling =
-	 (pfnrtlsdr_set_direct_sampling)
-	 phandle -> resolve ("rtlsdr_set_direct_sampling");
-	if (rtlsdr_set_direct_sampling == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_direct_sampling\n");
-	 return false;
-	}
-
-	rtlsdr_set_freq_correction =
-	 (pfnrtlsdr_set_freq_correction)
-	 phandle -> resolve ("rtlsdr_set_freq_correction");
-	if (rtlsdr_set_freq_correction == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_freq_correction\n");
-	 return false;
-	}
-
-	rtlsdr_get_device_name =
-	 (pfnrtlsdr_get_device_name)
-	 phandle -> resolve ("rtlsdr_get_device_name");
-	if (rtlsdr_get_device_name == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_device_name\n");
-	 return false;
-	}
-
-	rtlsdr_set_tuner_bandwidth	=
-	 (pfnrtlsdr_set_center_freq)
-	 phandle -> resolve ("rtlsdr_set_tuner_bandwidth");
-	if (rtlsdr_set_tuner_bandwidth == nullptr) {
-	 fprintf (stderr, "no support for tuner bandwidth\n");
-//	 nullpointer - if function is not available - is handled
-	}
-
-	rtlsdr_set_bias_tee =
-	 (pfnrtlsdr_set_bias_tee)
-	 phandle -> resolve ("rtlsdr_set_bias_tee");
-	if (rtlsdr_set_bias_tee == nullptr)
-	 fprintf (stderr, "biasControl will not work\n");
-//	nullpointer - if function is not available - is handled
-//
-//	Optional function, null pointer is handled
-	rtlsdr_set_freq_correction_ppb =
-	 (pfnrtlsdr_set_freq_correction_ppb)
-	 phandle -> resolve ("rtlsdr_set_freq_correction_ppb");
-
-//	Optional function, null pointer is handled
-	rtlsdr_get_version =
-	 (pfnrtlsdr_get_version)
-	 phandle -> resolve ("rtlsdr_get_version");
-
-	fprintf (stderr, "OK, functions seem to be loaded\n");
-	return true;
-}
-
-void	rtlsdrHandler::resetBuffer() {
-	_I_Buffer. FlushRingBuffer();
-}
-
-int16_t	rtlsdrHandler::maxGain() {
-	return gainsCount;
-}
-
-int16_t	rtlsdrHandler::bitDepth() {
-	return 8;
-}
-
-QString	rtlsdrHandler::deviceName	() {
-	return deviceModel;
-}
-
-void	rtlsdrHandler::set_iqDump	() {
-	if (xmlWriter != nullptr)
-	 return;
-	if (iqDumper == nullptr) {
-	 if (setup_iqDump ()) {
-	 xml_dumpButton	-> hide ();
-	 }
-	}
-	else {
-	 close_iqDump ();
-	 xml_dumpButton	-> show ();
-	}
-}
-
-bool	rtlsdrHandler::setup_iqDump () {
-	QString fileName = QFileDialog::getSaveFileName (nullptr,
-	 tr ("Save file ..."),
-	 QDir::homePath(),
-	fileName = QDir::toNativeSeparators (fileName));
-	iqDumper	= fopen (fileName. toUtf8 (). data (), "wb");
-	if (iqDumper == nullptr)
-	 return false;
-	iq_dumpButton	-> setText ("writing raw file");
-	iq_dumping. store (true);
-	return true;
-}
-
-void	rtlsdrHandler::close_iqDump () {
-	if (iqDumper == nullptr)	// this can happen !!
-	 return;
-	iq_dumping. store (false);
-	fclose (iqDumper);
-	iq_dumpButton	-> setText ("Dump to raw");
-	iqDumper	= nullptr;
-}
-	 
-void	rtlsdrHandler::set_xmlDump () {
-	if (iqDumper != nullptr)
-	 return;
-	if (!xml_dumping. load ()) {
-	 if (setup_xmlDump (false)) 
-	 iq_dumpButton	-> hide	();
-	}
-	else {
-	 close_xmlDump ();
-	 iq_dumpButton	-> show	();
-	}
-}
-
-void	rtlsdrHandler::startDump	() {
-	setup_xmlDump (true);
-	iq_dumpButton	-> hide ();
-}
-
-void	rtlsdrHandler::stopDump		() {
-	close_xmlDump	();
-	iq_dumpButton	-> show ();
-}
-
-static inline
-bool	isValid (QChar c) {
-	return c. isLetterOrNumber () || (c == '-');
-}
-
-bool	rtlsdrHandler::setup_xmlDump (bool direct) {
-QString channel		= rtlsdrSettings -> value ("channel", "xx").
-	 toString ();
-	try {
-	 xmlWriter. reset (new xml_fileWriter (rtlsdrSettings,
-	 channel,
-	 8,
-	 "uint8",
-	 SAMPLERATE,
-	 lastFrequency,
-	 rtlsdr_get_tuner_gain (theDevice),
-	 "RTLSDR",
-	 deviceModel,
-	 recorderVersion,
-	 direct));
-	} catch (...) {
-	 return false;
-	}
-	xml_dumpButton	-> setText ("writing xml file");
-	xml_dumping. store (true);
-	return true;
-}
-	
-void	rtlsdrHandler::close_xmlDump () {
-	if (xmlWriter == nullptr)
-	 return;
-	usleep (1000);
-	xmlWriter	-> computeHeader ();
-	xmlWriter. reset ();
-	xml_dumpButton	-> setText ("Dump to xml");
-	xml_dumping. store (false);
-}
-
-////////////////////////////////////////////////////////////////////////
-//
-// the frequency (the MHz component) is used as key
-//
-void rtlsdrHandler::record_gainSettings (int freq) {
-QString	gain	= gainControl	-> currentText ();
-int	agc	= agc_off -> isChecked () ? 1 :
-	 agc_sw -> isChecked () ? 2 : 0;
-QString theValue	= gain + ":" + QString::number (agc);
-QString freqVal		= QString::number (freq);
-	store (rtlsdrSettings, "rtlsdrSettings", freqVal, theValue);
-}
-
-void	rtlsdrHandler::update_gainSettings (int freq) {
-int	agc;
-QString	theValue	= "";
-QString freqVal		= QString::number (freq);
-	theValue	= value_s (rtlsdrSettings, "rtlsdrSettings",
-	 freqVal, theValue);
-
-	if (theValue == QString (""))
-	 return;		// or set some defaults here
-
-	QStringList result	= theValue. split (":");
-	if (result. size () != 2) 	// should not happen
-	 return;
-
-	QString temp = result. at (0);
-	agc	= result. at (1). toInt ();
-
-	int k	= gainControl -> findText (temp);
-	if (k != -1) {
-	 gainControl	-> setEnabled (false);
-	 new_gainIndex (k);
-	 while (gainControl -> currentText () != temp)
-	 usleep (1000);
-	}
-	if (agc == 1) {
-	 gainControl -> setEnabled (true);
-	 agc_off	-> setEnabled (false);
-	 agc_off	-> setChecked (true);
-	 agc_off	-> setEnabled (true);
-	}
-	else
-	if (agc == 0) {
-	 agc_hw	-> setEnabled (false);
-	 agc_hw	-> setChecked (true);
-	 agc_hw	-> setEnabled (true);
-	}
-	else {	// agc == 2
-	 agc_sw	-> setEnabled (false);
-	 agc_sw	-> setChecked (true);
-	 agc_sw	-> setEnabled (true);
-	}
-}
-
-#define	IQ_BUFSIZE	4096
-void	rtlsdrHandler::processBuffer (uint8_t *buf, uint32_t len) {
-float	sumI	= 0;
-float	sumQ	= 0;
-int	nrSamples	= len / 2;
-auto	*tempBuf 	= dynVec (std::complex<float>, nrSamples);
-static uint8_t dumpBuffer 2 * IQ_BUFSIZE;
-static int iqTeller	= 0;
-static int teller	= 0;
-	if (!isActive. load ()) 
-	 return;
-
-	if (toSkip > 0) {
-	 toSkip -= len / 2;
-	 return;
-	}
-	if (xml_dumping. load ())
-	 xmlWriter -> add ((std::complex<uint8_t> *)buf, nrSamples);
-
-	if (iq_dumping. load ()) {
-	 for (int32_t i = 0; i < nrSamples; i ++) {
-	 dumpBuffer 2 * iqTeller	= buf 2 * i;
-	 dumpBuffer 2 * iqTeller + 1 = buf 2 * i + 1;
-	 iqTeller ++;
-	 if (iqTeller >= IQ_BUFSIZE) {
-	 fwrite (dumpBuffer, 2, IQ_BUFSIZE, iqDumper);
-	 iqTeller = 0;
-	 }
-	 }
-	}
-	if ((filtering) && (filterDepth -> value () != currentDepth)) {
-	 currentDepth = filterDepth -> value ();
-	 theFilter. resize (currentDepth);
-	}
-
-	for (int32_t i = 0; i < nrSamples; i ++) {
-	 teller ++;
-	 float tempI	= convTable buf 2 * i;
-	 float tempQ	= convTable buf 2 * i + 1;
-	 sumI		+= tempI;
-	 sumQ		+= tempQ;
-	 tempBuf i = std::complex<float> (tempI, tempQ);
-	 if (filtering)
-	 tempBuf i = theFilter. Pass (tempBuf i);
-	}
-// calculate correction values for next input buffer
-	int ovf	= _I_Buffer. GetRingBufferWriteAvailable () - nrSamples;
-	if (ovf < 0)
-	 (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples + ovf);
-	else
-	 (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples);
-	reportOverflow (ovf < 0);
-	if (++teller > 4 * 2048000) {
-//	 fprintf (stderr, "%f %f (%f)\n", sumI / teller, sumQ / teller,
-//	 sumI / sumQ);
-	 teller = 0;
-	}
-}
-
-QString	rtlsdrHandler::get_tunerType	(int tunerType) {
-	switch (tunerType) {
-	 case RTLSDR_TUNER_E4000:
-	 return "E4000";
-	 case RTLSDR_TUNER_FC0012:
-	 return "FC0012";
-	 case RTLSDR_TUNER_FC0013:
-	 return "FC0013";
-	 case RTLSDR_TUNER_FC2580:
-	 return "FC2580";
-	 case RTLSDR_TUNER_R820T:
-	 return "R820T";
-	 break;
-	 case RTLSDR_TUNER_R828D:
-	 return "R828D";
-	 default:
-	 return "unknown";
-	}
-}
-
-void	rtlsdrHandler::reportOverflow (bool ovf) {
-static bool theOvf	= true;
-	if (ovf && !theOvf){
-	 overflowLabel -> setText ("Overload");
- overflowLabel -> setStyleSheet ("QLabel {background-color : red; \
- color: white}");
-	 theOvf	= true;
-	}
-	else
-	if (!ovf && theOvf) {		// space in the buffer is sufficient
-	 overflowLabel -> setStyleSheet("QLabel {background-color : green; \
- color: white}");
-	 theOvf	= false;
-	}
-	else
-	 theOvf = ovf;
-}
-
-

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/>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

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);
-	 }
-	}
-//
-//	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
-	connect (gainControl,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 2)
-	 qOverload<const QString &>(&QComboBox::textActivated),
-#else
-	 qOverload<const QString &>(&QComboBox::activated),
-#endif
-	 this, &rtlsdrHandler_win::set_ExternalGain);
-	connect (ppm_correction, qOverload<double>(&QDoubleSpinBox::valueChanged),
-	 this, &rtlsdrHandler_win::set_ppmCorrection);
-	connect (agc_hw, &QRadioButton::toggled,
- this, &rtlsdrHandler_win::set_hw_agc);
- connect (agc_sw, &QRadioButton::toggled,
- this, &rtlsdrHandler_win::set_sw_agc);
- connect (agc_off, &QRadioButton::toggled,
- this, &rtlsdrHandler_win::set_off_agc);
-	connect (xml_dumpButton, &QPushButton::clicked,
-	 this, &rtlsdrHandler_win::set_xmlDump);
-	connect (iq_dumpButton, &QPushButton::clicked,
-	 this, &rtlsdrHandler_win::set_iqDump);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (biasControl, &QCheckBox::checkStateChanged,
-#else
-	connect (biasControl, &QCheckBox::stateChanged,
-#endif
-	 this, &rtlsdrHandler_win::set_biasControl);
-#if QT_VERSION >= QT_VERSION_CHECK (6, 7, 0)
-	connect (filterSelector, &QCheckBox::checkStateChanged,
-#else
-	connect (filterSelector, &QCheckBox::stateChanged,
-#endif
-	 this, &rtlsdrHandler_win::set_filter);
-//
-//	and for saving/restoring the gain setting:
-	connect (this, &rtlsdrHandler_win::new_gainIndex,
-	 gainControl, &QComboBox::setCurrentIndex);
-	iqDumper	= nullptr;
-	xmlWriter	= nullptr;
-	iq_dumping. store (false);
-	xml_dumping. store (false);
-	workerHandle	= nullptr;
-}
-
-	rtlsdrHandler_win::~rtlsdrHandler_win () {
-	stopReader	();
-
-	if (workerHandle != nullptr) {
-	 rtlsdr_cancel_async (theDevice);
-	 while (!workerHandle -> isFinished ())
-	 usleep (200);
-	 _I_Buffer. FlushRingBuffer();
- delete workerHandle;
- workerHandle = nullptr;
-// rtlsdr_close (theDevice); // will crash if activated
- }
-
-	storeWidgetPosition (rtlsdrSettings, &myFrame, "rtlsdrSettings");
-	QString gainText	= gainControl -> currentText ();
-	store (rtlsdrSettings, "rtlsdrSettings",
-	 "externalGain", gainText);
-	int agc = agc_off -> isChecked () ? 1 :
- agc_sw -> isChecked () ? 2 : 0;
- store (rtlsdrSettings, "rtlsdrSettings", "agcMode", agc);
-	store (rtlsdrSettings, "rtlsdrSettings",
-	 "ppm_correction", ppm_correction -> value());
-	store (rtlsdrSettings, "rtlsdrSettings",
-	 "filterDepth", filterDepth -> value ());
-	rtlsdrSettings	-> sync ();
-	if (xmlWriter != nullptr) {
-	 delete xmlWriter;
-	 xmlWriter = nullptr;
-	}
-	myFrame. hide ();
-	usleep (1000);
-	rtlsdr_close (theDevice);
-	delete phandle;
-}
-
-//
-void	rtlsdrHandler_win::set_filter	(int c) {
-	(void)c;
-	filtering = filterSelector -> isChecked ();
-}
-
-bool	rtlsdrHandler_win::restartReader	(int32_t freq, int skipped) {
-	int res = this -> rtlsdr_set_center_freq (theDevice, freq);
-	if (res != 0) {
- QString t = QString ("Cannot set frequency to ") +
- QString::number (freq);
- theErrorLogger -> add ("RTLSDR", t);
- return false;
- }
-
-	if (save_gainSettings)
-	 update_gainSettings (freq / MHz (1));
-
-	lastFrequency	= freq;
-	this -> toSkip = skipped;
-	set_ExternalGain (gainControl -> currentText ());
-	tunedFrequency	-> setText (QString::number(freq / KHz (1)) + " kHz");
-	if (workerHandle == nullptr) {	// usualy it will be non zero
-//	reset endpoint
-	 (void)this -> rtlsdr_reset_buffer (theDevice);
-	 workerHandle	= new dll_driver (this);
-	}
-	_I_Buffer. FlushRingBuffer ();
-	isActive. store (true);
-	return true;
-}
-
-void	rtlsdrHandler_win::stopReader () {
-	isActive. store (false);
- _I_Buffer.FlushRingBuffer ();
- close_xmlDump();
-	if (save_gainSettings)
-	 record_gainSettings	((int32_t)(this -> rtlsdr_get_center_freq (theDevice)) / MHz (1));
-}
-//
-//	when selecting the gain from a table, use the table value
-void	rtlsdrHandler_win::set_ExternalGain	(const QString &gain) {
-	int res = rtlsdr_set_tuner_gain (theDevice, gain. toInt());
-	if (res != 0) {
-	 QString t = QString ("Cannot set gain to ") +
-	 QString::number (gain. toInt ());
-	 theErrorLogger -> add ("RTLSDR", t);
-	}
-}
-//
-void	rtlsdrHandler_win::init_autogain	(int level) {
-	if (level == 1)
- agc_off -> setChecked (true);
- else
- if (level == 2)
- agc_sw -> setChecked (true);
- else // level == 0
- agc_hw -> setChecked (true);
-
- set_autogain (level);
-}
-
-void	rtlsdrHandler_win::set_hw_agc	() {
-	set_autogain (0);
-}
-
-void	rtlsdrHandler_win::set_sw_agc	() {
-	set_autogain (2);
-}
-
-void	rtlsdrHandler_win::set_off_agc	() {
-	set_autogain (1);
-}
-
-void	rtlsdrHandler_win::set_autogain (int level) {
-	rtlsdr_set_agc_mode (theDevice, level == 0);
-	rtlsdr_set_tuner_gain_mode (theDevice, level);
-	if (level == 1) {
-	 gainControl -> setEnabled (true);
-	 set_ExternalGain (gainControl -> currentText ());
-	}
-	else
-	 gainControl -> setEnabled (false);
-}
-//
-void	rtlsdrHandler_win::set_biasControl	(int dummy) {
-	(void)dummy;
-	if (rtlsdr_set_bias_tee != nullptr) {
-	 int res = rtlsdr_set_bias_tee (theDevice,
-	 biasControl -> isChecked () ? 1 : 0);
-	 if (res != 0) {
-	 QString t = QString ("Cannot set bias tee to ") +
-	 (biasControl -> isChecked () ? "1" : "0");
-	 theErrorLogger -> add ("RTLSDR", t);
-	 }
-	}
-}
-//	correction is in Hz
-void	rtlsdrHandler_win::set_ppmCorrection	(double ppm) {
-int res;
- if (rtlsdr_set_freq_correction_ppb != nullptr)
- res = this -> rtlsdr_set_freq_correction_ppb (theDevice, ppm * 1000);
- else
- res = this -> rtlsdr_set_freq_correction (theDevice, ppm);
-
-	if (res != 0) {
-	 QString t = QString ("Cannot set ppm to ") +
-	 QString::number (ppm);
-	 theErrorLogger -> add ("RTLSDR", t);
-	}
-}
-
-int32_t	rtlsdrHandler_win::getSamples (std::complex<float> *V, int32_t size) { 
-	if (!isActive. load ())
-	 return 0;
-	return _I_Buffer. getDataFromBuffer (V, size);
-}
-
-int32_t	rtlsdrHandler_win::Samples () {
-	if (!isActive. load ())
-	 return 0;
-	return _I_Buffer. GetRingBufferReadAvailable ();
-}
-//
-//
-bool	rtlsdrHandler_win::load_rtlFunctions() {
-//
-//	link the required procedures
-	rtlsdr_open	= (pfnrtlsdr_open) phandle -> resolve ("rtlsdr_open");
-	if (rtlsdr_open == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_open\n");
-	 return false;
-	}
-
-	rtlsdr_close	= (pfnrtlsdr_close) phandle -> resolve ("rtlsdr_close");
-	if (rtlsdr_close == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_close\n");
-	 return false;
-	}
-
-	rtlsdr_get_usb_strings =
-	 (pfnrtlsdr_get_usb_strings)
-	 phandle -> resolve ("rtlsdr_get_usb_strings");
-	if (rtlsdr_get_usb_strings == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_usb_strings\n");
-	 return false;
-	}
-
-	rtlsdr_set_sample_rate =
-	 (pfnrtlsdr_set_sample_rate)
-	 phandle -> resolve ("rtlsdr_set_sample_rate");
-	if (rtlsdr_set_sample_rate == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_sample_rate\n");
-	 return false;
-	}
-
-	rtlsdr_get_sample_rate	=
-	 (pfnrtlsdr_get_sample_rate)
-	 phandle -> resolve ("rtlsdr_get_sample_rate");
-	if (rtlsdr_get_sample_rate == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_sample_rate\n");
-	 return false;
-	}
-
-	rtlsdr_get_tuner_gains	=
-	 (pfnrtlsdr_get_tuner_gains)
-	 phandle -> resolve ("rtlsdr_get_tuner_gains");
-	if (rtlsdr_get_tuner_gains == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gains\n");
-	 return false;
-	}
-
-	rtlsdr_get_tuner_type	=
-	 (pfnrtlsdr_get_tuner_type)
-	 phandle -> resolve ("rtlsdr_get_tuner_type");
-	if (rtlsdr_get_tuner_type == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_tuner_type\n");
-	 return false;
-	}
-
-	rtlsdr_set_tuner_gain_mode	=
-	 (pfnrtlsdr_set_tuner_gain_mode)
-	 phandle -> resolve ("rtlsdr_set_tuner_gain_mode");
-	if (rtlsdr_set_tuner_gain_mode == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_tuner_gain_mode\n");
-	 return false;
-	}
-
-	rtlsdr_set_agc_mode	=
-	 (pfnrtlsdr_set_agc_mode)
-	 phandle -> resolve ("rtlsdr_set_agc_mode");
-	if (rtlsdr_set_agc_mode == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_agc_mode\n");
-	 return false;
-	}
-
-	rtlsdr_set_tuner_gain	=
-	 (pfnrtlsdr_set_tuner_gain)
-	 phandle -> resolve ("rtlsdr_set_tuner_gain");
-	if (rtlsdr_set_tuner_gain == nullptr) {
-	 fprintf (stderr, "Cound not find rtlsdr_set_tuner_gain\n");
-	 return false;
-	}
-
-	rtlsdr_get_tuner_gain	=
-	 (pfnrtlsdr_get_tuner_gain)
-	 phandle -> resolve ("rtlsdr_get_tuner_gain");
-	if (rtlsdr_get_tuner_gain == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gain\n");
-	 return false;
-	}
-
-	rtlsdr_set_center_freq	=
-	 (pfnrtlsdr_set_center_freq)
-	 phandle -> resolve ("rtlsdr_set_center_freq");
-	if (rtlsdr_set_center_freq == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_center_freq\n");
-	 return false;
-	}
-
-	rtlsdr_get_center_freq	=
-	 (pfnrtlsdr_get_center_freq)
-	 phandle -> resolve ("rtlsdr_get_center_freq");
-	if (rtlsdr_get_center_freq == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_center_freq\n");
-	 return false;
-	}
-
-	rtlsdr_reset_buffer	=
-	 (pfnrtlsdr_reset_buffer)
-	 phandle -> resolve ("rtlsdr_reset_buffer");
-	if (rtlsdr_reset_buffer == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_reset_buffer\n");
-	 return false;
-	}
-
-	rtlsdr_read_async	=
-	 (pfnrtlsdr_read_async)
-	 phandle -> resolve ("rtlsdr_read_async");
-	if (rtlsdr_read_async == nullptr) {
-	 fprintf (stderr, "Cound not find rtlsdr_read_async\n");
-	 return false;
-	}
-
-	rtlsdr_get_device_count	=
-	 (pfnrtlsdr_get_device_count)
-	 phandle -> resolve ("rtlsdr_get_device_count");
-	if (rtlsdr_get_device_count == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_device_count\n");
-	 return false;
-	}
-
-	rtlsdr_cancel_async	=
-	 (pfnrtlsdr_cancel_async)
-	 phandle -> resolve ("rtlsdr_cancel_async");
-	if (rtlsdr_cancel_async == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_cancel_async\n");
-	 return false;
-	}
-
-	rtlsdr_set_direct_sampling =
-	 (pfnrtlsdr_set_direct_sampling)
-	 phandle -> resolve ("rtlsdr_set_direct_sampling");
-	if (rtlsdr_set_direct_sampling == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_set_direct_sampling\n");
-	 return false;
-	}
-
-	rtlsdr_set_freq_correction =
-	 (pfnrtlsdr_set_freq_correction)
-	 phandle -> resolve ("rtlsdr_set_freq_correction");
-//	if (rtlsdr_set_freq_correction == nullptr) {
-//	 fprintf (stderr, "Could not find rtlsdr_set_freq_correction\n");
-//	 return false;
-//	}
-	
-	rtlsdr_get_device_name =
-	 (pfnrtlsdr_get_device_name)
-	 phandle -> resolve ("rtlsdr_get_device_name");
-	if (rtlsdr_get_device_name == nullptr) {
-	 fprintf (stderr, "Could not find rtlsdr_get_device_name\n");
-	 return false;
-	}
-
-	rtlsdr_set_tuner_bandwidth	=
-	 (pfnrtlsdr_set_center_freq)
-	 phandle -> resolve ("rtlsdr_set_tuner_bandwidth");
-	if (rtlsdr_set_tuner_bandwidth == nullptr) {
-	 fprintf (stderr, "no support for tuner bandwidth\n");
-//	 nullpointer - if function is not available - is handled
-	}
-
-	rtlsdr_set_bias_tee =
-	 (pfnrtlsdr_set_bias_tee)
-	 phandle -> resolve ("rtlsdr_set_bias_tee");
-	if (rtlsdr_set_bias_tee == nullptr)
-	 fprintf (stderr, "biasControl will not work\n");
-//	nullpointer - if function is not available - is handled
-//
-//	Optional function, null pointer is handled
-	rtlsdr_set_freq_correction_ppb =
-	 (pfnrtlsdr_set_freq_correction_ppb)
-	 phandle -> resolve ("rtlsdr_set_freq_correction_ppb");
-
-//	Optional function, null pointer is handled
-	rtlsdr_get_version =
-	 (pfnrtlsdr_get_version)
-	 phandle -> resolve ("rtlsdr_get_version");
-	fprintf (stderr, "OK, functions seem to be loaded\n");
-	return true;
-}
-
-void	rtlsdrHandler_win::resetBuffer() {
-	_I_Buffer. FlushRingBuffer();
-}
-
-int16_t	rtlsdrHandler_win::maxGain() {
-	return gainsCount;
-}
-
-int16_t	rtlsdrHandler_win::bitDepth() {
-	return 8;
-}
-
-QString	rtlsdrHandler_win::deviceName	() {
-	return deviceModel;
-}
-
-void	rtlsdrHandler_win::set_iqDump	() {
-	if (xmlWriter != nullptr)
-	 return;
-	if (iqDumper == nullptr) {
-	 if (setup_iqDump ()) {
-	 xml_dumpButton	-> hide ();
-	 }
-	}
-	else {
-	 close_iqDump ();
-	 xml_dumpButton	-> show ();
-	}
-}
-
-bool	rtlsdrHandler_win::setup_iqDump () {
-	QString fileName = QFileDialog::getSaveFileName (nullptr,
-	 tr ("Save file ..."),
-	 QDir::homePath(),
-	fileName = QDir::toNativeSeparators (fileName));
-	iqDumper	= fopen (fileName. toUtf8 (). data (), "wb");
-	if (iqDumper == nullptr)
-	 return false;
-	iq_dumpButton	-> setText ("writing raw file");
-	iq_dumping. store (true);
-	return true;
-}
-
-void	rtlsdrHandler_win::close_iqDump () {
-	if (iqDumper == nullptr)	// this can happen !!
-	 return;
-	iq_dumping. store (false);
-	fclose (iqDumper);
-	iq_dumpButton	-> setText ("Dump to raw");
-	iqDumper	= nullptr;
-}
-	 
-void	rtlsdrHandler_win::set_xmlDump () {
-	if (iqDumper != nullptr)
-	 return;
-	if (!xml_dumping. load ()) {
-	 if (setup_xmlDump (false)) 
-	 iq_dumpButton	-> hide	();
-	}
-	else {
-	 close_xmlDump ();
-	 iq_dumpButton	-> show	();
-	}
-}
-
-void	rtlsdrHandler_win::startDump	() {
-	setup_xmlDump (true);
-	iq_dumpButton	-> hide ();
-}
-
-void	rtlsdrHandler_win::stopDump		() {
-	close_xmlDump	();
-	iq_dumpButton	-> show ();
-}
-
-static inline
-bool	isValid (QChar c) {
-	return c. isLetterOrNumber () || (c == '-');
-}
-
-bool	rtlsdrHandler_win::setup_xmlDump (bool direct) {
-QString channel		= rtlsdrSettings -> value ("channel", "xx"). toString ();
-
-	if (xmlWriter != nullptr)
-	 return false;
-	try {
-	 xmlWriter	= new xml_fileWriter (rtlsdrSettings,
-	 channel,
-	 8,
-	 "uint8",
-	 SAMPLERATE,
-	 lastFrequency,
-	 rtlsdr_get_tuner_gain (theDevice),
-	 "RTLSDR",
-	 deviceModel,
-	 recorderVersion,
-	 direct);
-	} catch (...) {
-	 return false;
-	}
-	xml_dumpButton	-> setText ("writing xml file");
-	xml_dumping. store (true);
-	return true;
-}
-	
-void	rtlsdrHandler_win::close_xmlDump () {
-	if (xmlWriter == nullptr)
-	 return;
-	usleep (1000);
-	xmlWriter	-> computeHeader ();
-	delete xmlWriter;
-	xmlWriter	= nullptr;
-	xml_dumpButton	-> setText ("Dump to xml");
-	xml_dumping. store (false);
-}
-
-////////////////////////////////////////////////////////////////////////
-//
-// the frequency (the MHz component) is used as key
-//
-void rtlsdrHandler_win::record_gainSettings (int freq) {
-QString	gain	= gainControl	-> currentText ();
-int agc = agc_off -> isChecked () ? 1 :
- agc_sw -> isChecked () ? 2 : 0;
-QString theValue = gain + ":" + QString::number (agc);
-QString freqVal		= QString::number (freq);
-	store (rtlsdrSettings, "rtlsdrSettings", freqVal, theValue);
-}
-
-void	rtlsdrHandler_win::update_gainSettings (int freq) {
-int	agc;
-QString	theValue	= "";
-QString freqVal		= QString::number (freq);
-	theValue	= value_s (rtlsdrSettings, "rtlsdrSettings",
-	 freqVal, theValue);
-
-	if (theValue == QString (""))
-	 return;		// or set some defaults here
-
-	QStringList result	= theValue. split (":");
-	if (result. size () != 2) 	// should not happen
-	 return;
-
-	QString temp = result. at (0);
-	agc	= result. at (1). toInt ();
-
-	int k	= gainControl -> findText (temp);
-	if (k != -1) {
-	 gainControl	-> setEnabled (false);
-	 new_gainIndex (k);
-	 while (gainControl -> currentText () != temp)
-	 usleep (1000);
-	}
-	if (agc == 1) {
-	 gainControl -> setEnabled (true);
-	 agc_off	-> setEnabled (false);
-	 agc_off	-> setChecked (true);
-	 agc_off	-> setEnabled (true);
-	}
-	else
-	if (agc == 0) {
-	 agc_hw	-> setEnabled (false);
-	 agc_hw	-> setChecked (true);
-	 agc_hw	-> setEnabled (true);
-	}
-	else {	// agc == 2
-	 agc_sw	-> setEnabled (false);
-	 agc_sw	-> setChecked (true);
-	 agc_sw	-> setEnabled (true);
-	}
-}
-
-#define	IQ_BUFSIZE	4096
-void	rtlsdrHandler_win::processBuffer (uint8_t *buf, uint32_t len) {
-float	sumI	= 0;
-float	sumQ	= 0;
-int	nrSamples	= len / 2;
-auto	*tempBuf 	= dynVec (std::complex<float>, nrSamples);
-static uint8_t dumpBuffer 2 * IQ_BUFSIZE;
-static int iqTeller	= 0;
-static int teller	= 0;
-	if (!isActive. load ()) 
-	 return;
-
-	if (toSkip > 0) {
-	 toSkip -= len / 2;
-	 return;
-	}
-	if (xml_dumping. load ())
-	 xmlWriter -> add ((std::complex<uint8_t> *)buf, nrSamples);
-
-	if (iq_dumping. load ()) {
-	 for (int32_t i = 0; i < nrSamples; i ++) {
-	 dumpBuffer 2 * iqTeller	= buf 2 * i;
-	 dumpBuffer 2 * iqTeller + 1 = buf 2 * i + 1;
-	 iqTeller ++;
-	 if (iqTeller >= IQ_BUFSIZE) {
-	 fwrite (dumpBuffer, 2, IQ_BUFSIZE, iqDumper);
-	 iqTeller = 0;
-	 }
-	 }
-	}
-	if ((filtering) && (filterDepth -> value () != currentDepth)) {
-	 currentDepth = filterDepth -> value ();
-	 theFilter. resize (currentDepth);
-	}
-
-	for (int32_t i = 0; i < nrSamples; i ++) {
-	 teller ++;
-	 float tempI	= convTable buf 2 * i;
-	 float tempQ	= convTable buf 2 * i + 1;
-	 sumI		+= tempI;
-	 sumQ		+= tempQ;
-	 tempBuf i = std::complex<float> (tempI, tempQ);
-	 if (filtering)
-	 tempBuf i = theFilter. Pass (tempBuf i);
-	}
-// calculate correction values for next input buffer
-	int ovf	= _I_Buffer. GetRingBufferWriteAvailable () - nrSamples;
-	if (ovf < 0)
-	 (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples + ovf);
-	else
-	 (void)_I_Buffer. putDataIntoBuffer (tempBuf, nrSamples);
-	reportOverflow (ovf < 0);
-	if (++teller > 4 * 2048000) {
-//	 fprintf (stderr, "%f %f (%f)\n", sumI / teller, sumQ / teller,
-//	 sumI / sumQ);
-	 teller = 0;
-	}
-}
-
-QString	rtlsdrHandler_win::get_tunerType	(int tunerType) {
-	switch (tunerType) {
-	 case RTLSDR_TUNER_E4000:
-	 return "E4000";
-	 case RTLSDR_TUNER_FC0012:
-	 return "FC0012";
-	 case RTLSDR_TUNER_FC0013:
-	 return "FC0013";
-	 case RTLSDR_TUNER_FC2580:
-	 return "FC2580";
-	 case RTLSDR_TUNER_R820T:
-	 return "R820T";
-	 break;
-	 case RTLSDR_TUNER_R828D:
-	 return "R828D";
-	 default:
-	 return "unknown";
-	}
-}
-
-void	rtlsdrHandler_win::reportOverflow (bool ovf) {
-static bool theOvf	= true;
-	if (ovf && !theOvf){
-	 overflowLabel -> setText ("Overload");
- overflowLabel -> setStyleSheet ("QLabel {background-color : red; \
- color: white}");
-	 theOvf	= true;
-	}
-	else
-	if (!ovf && theOvf) {		// space in the buffer is sufficient
-	 overflowLabel -> setStyleSheet("QLabel {background-color : green; \
- color: white}");
-	 theOvf	= false;
-	}
-	else
-	 theOvf = ovf;
-}
-
-

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)) 
-	 programName	-> setText (s1 + "(" + s2 + ")");
-	else
-	 programName -> setText (s1);
-}
-
-static
-QString hextoString (int v) {
-QString res;
- for (int i = 0; i < 4; i ++) {
- uint8_t t = (v & 0xF000) >> 12;
- QChar c = t <= 9 ? (char)('0' + t) : (char) ('A' + t - 10);
- res. append (c); 
- v <<= 4;
- }
- return res;
-}
-
-void	techData::showServiceId		(int SId) {
-QString text	= hextoString (SId);
-	serviceIdDisplay -> setText (text);
-}
-
-void	techData::showStartAddress	(int sa) {
-	startAddressDisplay	-> setText (QString::number (sa));
-}
-
-void	techData::showLength		(int l) {
-	lengthDisplay		-> setText (QString::number (l));
-}
-
-void	techData::showSubChId		(int subChId) {
-	subChIdDisplay		-> setText (QString::number (subChId));
-}
-
-void	techData::showLanguage		(int l) {
-	language	-> setAlignment (Qt::AlignRight);
-	language	-> setText (getLanguage (l));
-}
-
-void	techData::showUep		(int shortForm, int protLevel) {
-	QString protL = getProtectionLevel (shortForm, protLevel);
-	uepField	-> setText (protL);
-}
-
-void	techData::showCodeRate		(int shortForm, int protLevel) {
-	codeRate -> setText (getCodeRate (shortForm, protLevel));
-}
-
-void	techData::showFm		(std::vector<int> &v) {
-	if (v. size () == 0) {
-	 fmFrequency	-> hide ();
-	 fmLabel	-> hide ();
-	}
-	else {
-	 fmLabel -> show ();
- fmFrequency -> show ();	
-	 QString f;
-	 int teller	= 0;
-//	for now there is room for up to 2 freqyencies
-	 for (auto freq: v) {
-	 if (++teller > 2)
-	 break;			// for now
- f. append (QString::number (freq) + " ");
-	 }
- f. append (" Khz");
- fmFrequency -> setText (f);
-	}
-}
-
-void	techData::audioDataAvailable	(int amount, int rate) {
-std::complex<int16_t> buffer amount;
-
-	audioData -> getDataFromBuffer (buffer, amount);
-	if (isHidden ())
-	 return;
-	theAudioDisplay -> createSpectrum (buffer, amount, rate);
-	
-}
-
-void techData::colorFramedumpButton () {
- setButtonColors (framedumpButton, FRAMEDUMP_BUTTON);
-}
-
-void techData::colorAudiodumpButton () {
- setButtonColors (audiodumpButton, AUDIODUMP_BUTTON);
-}
-
-void	techData::setButtonColors	(QPushButton *b,
-	 const QString &buttonName) {
-QColor	baseColor;
-QColor	textColor;
-QColor	color;
-
-	color = QColorDialog::getColor (baseColor, nullptr, "baseColor");
-	if (!color. isValid ())
-	 return;
-	baseColor	= color;
-	color = QColorDialog::getColor (textColor, nullptr, "textColor");
-	if (!color. isValid ())
-	 return;
-	textColor	= color;
-	QString temp = "QPushButton {background-color: %1; color: %2}";
-	b	-> setStyleSheet (temp. arg (baseColor. name (),
-	 textColor. name ()));
-
-	QString buttonColor	= buttonName + "_color";
-	QString buttonFont	= buttonName + "_font";
-	QString	baseColor_name	= baseColor. name ();
-	QString textColor_name	= textColor. name ();
-	store (dabSettings, COLOR_SETTINGS, buttonColor, baseColor_name);
-	store (dabSettings, COLOR_SETTINGS, buttonFont, textColor_name);
-}
-
-void	techData::framedumpButton_text	(const QString &text, int size) {
-	QFont font	= framedumpButton -> font ();
-	font. setPointSize (size);
-	framedumpButton	-> setFont (font);
-	framedumpButton	-> setText (text);
-	framedumpButton	-> update ();
-}
-
-void	techData::audiodumpButton_text	(const QString &text, int size) {
-	QFont font	= audiodumpButton -> font ();
-	font. setPointSize (size);
-	audiodumpButton	-> setFont (font);
-	audiodumpButton	-> setText (text);
-	audiodumpButton	-> update ();
-}
-
-void	techData::showRate	(int rate, bool ps, bool sbr) {
-	if (!ps)
-	 psLabel -> setText (" ");
-	else {
-	 psLabel -> setStyleSheet ("QLabel {color : white}");
-	 psLabel -> setText ("ps");
-	}
-	if (!sbr)
-	 sbrLabel -> setText (" ");
-	else {
-	 sbrLabel -> setStyleSheet ("QLabel {color : white}");
-	 sbrLabel -> setText ("sbr");
-	}
-	audioRate	-> display (rate);
-}
-
-void	techData::showStereo	(bool b) {
-	 if (b) {
-	 stereoLabel	-> setStyleSheet ("QLabel {color : white}");
- stereoLabel -> setText ("stereo");
- }
- else
- stereoLabel -> setText (" ");
-}
-
-void	techData::showMissed	(int missed) {
-	missedSamples	-> display (missed);
-}
-
-void	techData::hideMissed	() {
-	missedLabel	-> hide ();
-	missedSamples	-> hide ();
-}
-
-void	techData::isDABPlus	(bool b) {
-	if (b) {	// yes it is DAB+
-
-	 ASCTy	-> setText ("DAB+");
-	 rsErrorLabel		-> show ();
-	 aacErrorLabel	-> show ();
-	 rsError_display	-> show ();
-	 aacError_display	-> show ();
-	}
-	else {
-	 ASCTy	-> setText ("DAB");
-	 rsErrorLabel		-> hide ();
-	 aacErrorLabel	-> hide ();
-	 rsError_display	-> hide ();
-	 aacError_display	-> hide ();
-	}
-}
-
-void	techData::hideMissedLabel	() {
-	missedLabel	-> hide ();
-	missedSamples	-> hide ();
-}

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);
-
-	QTableWidgetItem *item9 = new QTableWidgetItem;	// height
-	item9		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 9, item9);
-
-	QTableWidgetItem *item10 = new QTableWidgetItem;	// direction
-	item10		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 10, item10);
-
-	QTableWidgetItem *item11 = new QTableWidgetItem;	// delayr
-	item11		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 11, item11);
-
-	QTableWidgetItem *item12 = new QTableWidgetItem;	// transmitter
-	item12		-> setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 12, item12);
-
-	tableWidget	-> setCurrentItem (item0);
-	QString aa	= QString ("0x") + QString::number (pattern, 16);
-	tableWidget	-> item (row, 1) -> setText (aa);
-	QString tii	= convertNumber (mainId) + "-" +
-	 convertNumber (subId);
-	if (theTransmitter. collision)
-	 tii += "!";
-	tableWidget	-> item (row, 2) -> setText (tii);
-	QString ss	= QString::number (phase, 'f', 1) + 
-	 (etsi ? " *" : "");
-	tableWidget	-> item (row, 3) -> setText (ss);
-	tableWidget	-> item (row, 4) -> setText (QString::number (strength, 'f', 1) );
-	tableWidget	-> item (row, 5) -> setText (QString::number (azimuth, 'f', 1) + QString::fromLatin1 (" \xb0 "));
-	tableWidget	-> item (row, 6) -> setText (QString::number (power, 'f', 1) + " KW ");
-	tableWidget	-> item (row, 7) -> setText (QString::number (altitude) + " m");
-	tableWidget	-> item (row, 8) -> setText (QString::number (height) + " m");
-	tableWidget	-> item (row, 9) -> setText (dir);
-	tableWidget	-> item (row, 10) -> setText (QString::number (distance, 'f', 1) + " km");
-	tableWidget	-> item (row, 11) -> setText (QString::number (delay, 'f', 1) + " samples");
-	tableWidget	-> item (row, 12) -> setText (transmitterName);
-	tableWidget	-> item (row, 0) -> setText (b ? "***" : "");
-	if (b)
-	 theDial -> setValue (azimuth);
-}
-
-void	dxDisplay::addRow (uint8_t mainId, uint8_t subId,
-	 const QString &channel) {
-int16_t	row	= tableWidget -> rowCount ();
-
-	tableWidget	-> insertRow (row);
-	QTableWidgetItem *item0	= new QTableWidgetItem;
-	item0		-> setTextAlignment (Qt::AlignRight |Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 0, item0);
-
-	QTableWidgetItem *item1 = new QTableWidgetItem;
-	item1		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 1, item1);
-
-	QTableWidgetItem *item2 = new QTableWidgetItem;
-	item2		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 2, item2);
-
-	QTableWidgetItem *item3 = new QTableWidgetItem;
-	item3		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 3, item3);
-
-	QTableWidgetItem *item4 = new QTableWidgetItem;
-	item4		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 4, item4);
-
-	QTableWidgetItem *item5 = new QTableWidgetItem;
-	item5		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 5, item5);
-
-	QTableWidgetItem *item6 = new QTableWidgetItem;
-	item6		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 6, item6);
-
-	QTableWidgetItem *item7 = new QTableWidgetItem;
-	item7		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 7, item7);
-
-	QTableWidgetItem *item8 = new QTableWidgetItem;
-	item8		-> setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 8, item8);
-
-	QTableWidgetItem *item9 = new QTableWidgetItem;
-	item9		-> setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-	tableWidget	-> setItem (row, 9, item9);
-
-	tableWidget	-> setCurrentItem (item0);
-	tableWidget	-> item (row, 1) -> setText (QString::number (mainId));
-	tableWidget	-> item (row, 2) -> setText (QString::number (subId));
-	tableWidget	-> item (row, 3) -> setText (channel);
-	tableWidget	-> item (row, 4) -> setText ("??");
-	tableWidget	-> item (row, 5) -> setText ("??");
-	tableWidget	-> item (row, 6) -> setText ("??");
-	tableWidget	-> item (row, 7) -> setText ("??");
-	tableWidget	-> item (row, 8) -> setText ("??");
-	tableWidget	-> item (row, 9) -> setText ("??");
-	tableWidget	-> item (row, 0) -> setText ( "");
-}
-
-void	dxDisplay::handle_frameClosed	() {
-	hide ();
-}
-

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"
-	 "Content-Type: %s\r\n"
-	 "Connection: %s\r\n"
-	 "Content-Length: %d\r\n"
-//	 "Access-Control-Allow-Origin: *\r\n"
-	 "\r\n",
-	 ctype. c_str (),
-	 keepalive ? "keep-alive" : "close",
-	 (int)(strlen (content. c_str ())));
-	 int hdrlen = strlen (hdr);
-//	 fprintf (stderr, "reply header %s \n", hdr);
-	 if (jsonUpdate) {
-//	 fprintf (stderr, "Json update requested\n");
-//	 fprintf (stderr, "%s\n", content. c_str ());
-	 }
-//	and send the reply
-	 if (write (ClientSocket, hdr, hdrlen) != hdrlen ||
-	 write (ClientSocket, content. c_str (),
-	 content. size ()) != (int)(content. size ())) {
-//	 fprintf (stderr, "WRITE PROBLEM\n");
-//	 break;
-	 }
-	 }
-	}
-	fprintf (stderr, "mapServer quits\n");
-	close (ListenSocket);
-	close (ClientSocket);
-	emit terminating ();
-}
-#else
-//
-//	windows version
-//
-void	httpHandler::run	() {
-char	buffer 4096;
-bool	keepalive;
-char	*url;
-std::string	content;
-std::string	ctype;
-WSADATA	wsa;
-int	iResult;
-SOCKET	ListenSocket	= INVALID_SOCKET;
-SOCKET	ClientSocket	= INVALID_SOCKET;
-
-struct addrinfo *result = nullptr;
-struct addrinfo hints;
-
-	if (WSAStartup (MAKEWORD (2, 2), &wsa) != 0) {
-	 terminating ();
-	 return;
-	}
-
-	ZeroMemory (&hints, sizeof(hints));
-	hints.ai_family		= AF_INET;
-	hints.ai_socktype	= SOCK_STREAM;
-	hints.ai_protocol	= IPPROTO_TCP;
-	hints.ai_flags		= AI_PASSIVE;
-
-//	Resolve the server address and port
-
-	iResult = getaddrinfo (nullptr, mapPort. toLatin1 (). data (),
-	 &hints, &result);
-	if (iResult != 0 ) {
-	 WSACleanup();
-	 terminating ();
-	 return;
-	}
-
-// Create a SOCKET for connecting to server
-	ListenSocket = socket (result -> ai_family,
-	 result -> ai_socktype, result -> ai_protocol);
-	if (ListenSocket == INVALID_SOCKET) {
-	 freeaddrinfo(result);
-	 WSACleanup ();
-	 terminating ();
-	 return;
-	}
-	unsigned long mode = 1;
-	ioctlsocket (ListenSocket, FIONBIO, &mode);
-
-// Setup the TCP listening socket
-	iResult = bind (ListenSocket, result -> ai_addr,
-	 (int)result->ai_addrlen);
-	if (iResult == SOCKET_ERROR) {
-	 freeaddrinfo (result);
-	 closesocket (ListenSocket);
-	 WSACleanup ();
-	 terminating ();
-	 return;
-	}
-
-	freeaddrinfo (result);
-
-	running. store (true);
-
-	listen (ListenSocket, 5);
-	while (running. load ()) {
-	 ClientSocket = accept (ListenSocket, nullptr, nullptr);
-	 if (ClientSocket == -1) {
-	 usleep (2000000);
-	 continue;
-	 }
-
-	 while (running. load ()) {
-	 int xx;
-L1:	 if ((xx = recv (ClientSocket, buffer, 4096, 0)) < 0) {
-// shutdown the connection since we're done
-	 iResult = shutdown (ClientSocket, SD_SEND);
-	 if (iResult == SOCKET_ERROR) {
-	 closesocket (ClientSocket);
-	 closesocket (ListenSocket);
-	 WSACleanup ();
-	 running.store (false);
-	 terminating ();
-	 return;
-	 }
-	 break;
-	 }
-	 if (xx == 0) {
-	 if (!running. load ()) {
-	 closesocket (ClientSocket);
-	 closesocket(ListenSocket);
-	 WSACleanup ();
-	 terminating ();
-	 return;
-	 }
-	 Sleep (1);
-	 goto L1;
-	 }
-
-	 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 transmitters. */
-	 bool jsonUpdate	= false;
-	 if (strstr (url, "/data.json")) {
-	 content	= coordinatesToJson (transmitterList);
-	 if (content != "") {
-	 ctype	= "application/json;charset=utf-8";
-	 jsonUpdate	= true;
-//	 fprintf (stderr, "%s will be sent\n", content. c_str ());
-	 }
-	 }
-	 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: SDRunoPlugin_1090\r\n"
-	 "Content-Type: %s\r\n"
-	 "Connection: %s\r\n"
-	 "Content-Length: %d\r\n"
-//	 "Access-Control-Allow-Origin: *\r\n"
-	 "\r\n",
-	 ctype. c_str (),
-	 keepalive ? "keep-alive" : "close",
-	 (int)(strlen (content. c_str ())));
-	 int hdrlen = strlen (hdr);
-//	 if (jsonUpdate) {
-//	 parent -> show_text (std::string ("Json update requested\n"));
-//	 parent -> show_text (content);
-//	 }
-//	and send the reply
-	 if ((send (ClientSocket, hdr, hdrlen, 0) == SOCKET_ERROR) ||
-	 (send (ClientSocket, content. c_str (),
-	 content. size (), 0) == SOCKET_ERROR)) {
-	 fprintf (stderr, "WRITE PROBLEM\n");
-	 break;
-	 }
-	 }
-	}
-// cleanup
-	closesocket(ClientSocket);
-	closesocket(ListenSocket);
-	WSACleanup();
-	running. store (false);
-	emit	terminating ();
-}
-#endif
-
-std::string	httpHandler::theMap (position homeAddress) {
-std::string res;
-int	bodySize;
-char	*body;
-std::string latitude	= std::to_string (homeAddress. latitude);
-std::string longitude	= std::to_string (homeAddress. longitude);
-int	index		= 0;
-int	cc;
-int teller	= 0;
-int params	= 0;
-
-	bodySize	= sizeof (qt_map);
-	body		= (char *)malloc (bodySize + 40);
-	while (qt_map index != 0) {
-	 cc = (char)(qt_map index);
-	 if (cc == '$') {
-	 if (params == 0) {
-	 for (int i = 0; latitude. c_str () i != 0; i ++)
-	 if (latitude. c_str () i == ',')
-	 body teller ++ = '.';
-	 else
-	 body teller ++ = latitude. c_str () i;
-	 params ++;
-	 }
-	 else
-	 if (params == 1) {
-	 for (int i = 0; longitude. c_str () i != 0; i ++)
-	 if (longitude. c_str () i == ',')
-	 body teller ++ = '.';
-	 else
-	 body teller ++ = longitude. c_str () i;
-	 params ++;
-	 }
-	 else
-	 body teller ++ = (char)cc;
-	 }
-	 else
-	 body teller ++ = (char)cc;
-	 index ++;
-	}
-	body teller ++ = 0;
-	res	= std::string (body);
-//	fprintf (stderr, "The map :\n%s\n", res. c_str ());
-	free (body);
-	return res;
-}
-
-std::string dotNumber (float f) {
-char temp 256;
-std::string s = std::to_string (f);
-	for (int i = 0; i < (int)(s. size ()); i ++)
-	 if (s. c_str () i == ',')
-	 temp i = '.';
-	 else
-	 temp i = s. c_str () i;
-	temp s. size () = 0;
-	return std::string (temp);
-}
-//
-std::string httpHandler::coordinatesToJson (std::vector<httpData> &t) {
-char buf 512;
-QString Jsontxt;
-
-	if (t. size () == 0)
-	 return "";
-	Jsontxt += "\n";
-	locker. lock ();
-//	the Target
-	snprintf (buf, 512,
-	 "{\"type\":%d, \"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dateTime\":\"%s\", \"dist\":%d, \"azimuth\":%d, \"power\":%d}",
-	 t 0. type,
-	 dotNumber (t 0. coords. latitude). c_str (),
-	 dotNumber (t 0. coords. longitude). c_str (),
-	 t 0. transmitterName. toUtf8 (). data (),
-	 t 0. channelName. toUtf8 (). data (),
-	 t 0. dateTime. toUtf8 (). data (),
-	 t 0. distance,
-	 t 0. azimuth,
-	 (int)(t 0. power * 100));
-	Jsontxt += QString (buf);
-//
-//
-	for (unsigned long i = 1; i < t. size (); i ++) {
-	 snprintf (buf, 512,
-	 ",\n{\"type\":%d, \"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dateTime\":\"%s\", \"dist\":%d, \"azimuth\":%d, \"power\":%d, }",
-	 t i. type,
-	 dotNumber (t i. coords. latitude). c_str (),
-	 dotNumber (t i. coords. longitude). c_str (),
-	 t i. transmitterName. toUtf8 (). data (),
-	 t i. channelName. toUtf8 (). data (),
-	 t i. dateTime. toUtf8 (). data (),
-	 t i. distance,
-	 t i. azimuth,
-	 (int)(t i. power * 100));
-	 Jsontxt += QString (buf);
-	}
-	t. resize (0);
-	locker. unlock ();
-	Jsontxt += "\n\n";
-//	fprintf (stderr, "Json = %s\n", Jsontxt. toLatin1 (). data ());
-	return Jsontxt. toStdString ();
-}
-
-void	httpHandler::putData	(uint8_t	type,
-	 position	target,
-	 QString transmitterName,
-	 QString channelName,
-	 QString dateTime,
-	 int ttiId,
-	 int distance,
-	 int azimuth,
-	 float power) {
-	for (unsigned long i = 0; i < transmitterList. size (); i ++)
-	 if ((transmitterList i. coords. latitude == target. latitude) &&
-	 (transmitterList i. coords. longitude == target. longitude))
-	 return;
-
-	 
-	httpData t;
-	t. type			= type;
-	t. coords		= target;
-	t. transmitterName	= transmitterName;
-	t. channelName		= channelName;
-	t. dateTime		= dateTime;
-	t. ttiId		= ttiId;
-	t. distance		= distance;
-	t. azimuth		= azimuth;
-	t. power		= power;
-
-	locker. lock ();
-	transmitterList. push_back (t);
-	locker. unlock ();
-
-	for (int i = 0; i < (int)(transmitterVector. size ()); i ++) {
-	 if ((transmitterVector. at (i). transmitterName == transmitterName) &&
-	 (transmitterVector. at (i). channelName == channelName))
-	 return;
-	}
-	
-	if ((saveFile != nullptr) &&
-	 ((type != MAP_RESET) && (type != MAP_FRAME))) {
-	 fprintf (saveFile, "%s; %f; %f; %s; %s; %d; %d; %d; %d; %f\n",
-	 channelName. toUtf8 (). data (),
-	 target. latitude, target. longitude,
-	 transmitterName. toUtf8 (). data (),
-	 t. dateTime. toUtf8 (). data (),
-	 ttiId / 100, ttiId % 100,
-	 distance, azimuth, power);
-	 transmitterVector. push_back (t);
-	}
-}
-

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;
-	fprintf (stderr, "riffSize = %ld, bytes %ld\n", 
-	 riffSize, nrBytes);
-	uint32_t sizeLow	= theSize & 0xFFFFFFFF;
-	uint32_t sizeHigh	= (theSize >> 32) & 0xFFFFFFFF;
-	uint32_t nrBytesLow	= nrBytes & 0xFFFFFFFF;
-	uint32_t nrBytesHigh	= (nrBytes >> 32) & 0xFFFFFFFF;
-	fwrite (&sizeLow, 1, 4, filePointer);
-	fwrite (&sizeHigh, 1, 4, filePointer);
-	fwrite (&nrBytesLow, 1, 4, filePointer);
-	fwrite (&nrBytesHigh, 1, 4, filePointer);
-	fseek (filePointer, 0, SEEK_END);
-	
-	fclose (filePointer);
-}
-
-void	riffWriter::write (int16_t *buff, uint64_t samples) {
-	if (!isValid)
-	 return;
-	fwrite (buff, 2 * sizeof (int16_t), (size_t)samples, filePointer);
-	nrElements	+= samples;
-}
-
-bool	riffWriter::isActive	() {
-	return isValid;
-}
-

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;
-};
-

Build Results
RPM Lint

Refresh

Comments for request 6379 0

Request History

wkazubski created request 16 days ago

Update to 6.10

wkazubski accepted request 16 days ago