Packman Build Service PMBS

dab-mini.changes Changed

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-2-installer.iss Deleted

@@ -1,70 +0,0 @@
-
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "dab-2"
-#define MyAppVersion "3.4"
-#define MyAppPublisher "Lazy Chair Computing"
-#define MyAppURL "https://github.com/JvanKatwijk/qt-dab/dab-2"
-#define MyAppExeName "dab-2.exe";
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{A534EB72-411B-49A7-9E9D-5B8A7E90536A}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableProgramGroupPage=yes
-LicenseFile=D:\sdr-j-development\windows-dab-2\COPYRIGHT.this_software
-InfoBeforeFile=D:\sdr-j-development\windows-dab-2\preamble.txt
-OutputBaseFilename=setup-dab-2
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "D:\sdr-j-development\windows-dab-2\dab-2.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "D:\sdr-j-development\windows-dab-2\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\JvanK\Downloads\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
-
-[Icons]
-Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-[code]
-procedure install_sdrplayApi;
-var
-    resultCode : Integer;
-    Names      : TArrayOfString;
-    I          : Integer;
-    found      : Boolean;
-
- begin
-
-    RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'SOFTWARE\MiricsSDR', Names);
-    for I := 0 to GetArrayLength(Names)-1 do
-       if Names [I] = 'API' then found := true;
-
-    if not found
-    then
-       begin
-          MsgBox ('Software\MiricsSDR\API not found', mbInformation, MB_OK);
-          Exec (ExpandConstant('{app}\SDRplay_RSP_API-Windows-2.13.1.exe'), '', '', SW_SHOWNORMAL,
-          ewWaitUntilTerminated, ResultCode);
-       end
-end;
-

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-scanner.png Deleted

_service:download_url:qt-dab-3.5.3.tar.gz/.travis.yml -> _service:download_url:qt-dab-3.6.tar.gz/.travis.yml Changed

@@ -24,15 +24,15 @@
   - # sed -i -e 's|CONFIG.*sdrplay||g' qt-dab.pro
   - # sed -i -e 's|CONFIG.*airspy||g' qt-dab.pro
   - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
-  -
+
   - cd dab-maxi
-  - cmake . -DRTLSDR=ON -DRTLTCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSDRPLAY_V3=ON -DLIMESDR=ON -DHACKRF=ON -DPLUTO=ON -DCMAKE_INSTALL_PREFIX=/usr
+  - cmake . -DRTLSDR=ON -DRTL_TCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSDRPLAY_V3=ON -DLIMESDR=ON -DHACKRF=ON -DPLUTO=ON -DCMAKE_INSTALL_PREFIX=/usr
   - make -j4
   - # sudo make DESTIDR=appdir install ; sudo chown -R $USER appdir ; find appdir/
   - ls -lh .
   - rm -rf *_autogen
   - mkdir -p appdir/usr/bin
-  - cp qt-dab-3.5  appdir/usr/bin/qt-dab
+  - cp qt-dab-3.6  appdir/usr/bin/qt-dab
  
   - mkdir -p appdir/usr/share/applications ; cp qt-dab.desktop appdir/usr/share/applications
   - cp qt-dab.png appdir/qt-dab.png
@@ -45,8 +45,13 @@
   - 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
+  - # Workaround for https://github.com/probonopd/linuxdeployqt/issues/31#issuecomment-289267637
   - ./linuxdeployqt*.AppImage --appimage-extract
   - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - # Workaround for https://github.com/JvanKatwijk/qt-dab/issues/34
+  - # find /usr/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
+  - find /usr/lib/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
   - chmod a+x appimage/* ; rm appdir/AppRun ; cp appimage/* appdir/
   - export PATH=squashfs-root/usr/bin/:$PATH # Make it pick up our private patched mksquashfs; https://github.com/plougher/squashfs-tools/pull/13/files
   - squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)

_service:download_url:qt-dab-3.5.3.tar.gz/README.md -> _service:download_url:qt-dab-3.6.tar.gz/README.md Changed

@@ -1,13 +1,12 @@
-# Qt-DAB-3.5 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-3.6 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.5 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini and the other brother dab-2, all built on the same set of sources.
+Qt-DAB-3.6 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini and brother dab-2 for experimenting, all built on the same set of sources.
 
 --------------------------------------------------------------------
-DISCLAIMER (for use on Windows)
+DISCLAIMER 
 --------------------------------------------------------------------
 
-While Windows is probably a very good OS, it seems that my way of programming
-and Windows are incompatible. I develop under Linux and 
+I develop my software under Linux and 
 cross-compile for windows. Linux development is simple: if something
 is wrong - and that happens from time to time - it is always relatively
 easy to detect what is wrong and fix it.
@@ -23,32 +22,62 @@
 So, while I keep on cross compiling the software for windows, do not
 always expect the smooth behaviour as it is under Linux.
 
----------------------------------------------------------------------
-Support for Adalm Pluto!
----------------------------------------------------------------------
-
-I just got the Pluto!! and could work on the support for the
-pluto on both the Qt-DAB and dabMini. Support for the pluto is
-now standard part of the appImages for qt-dab and dabMini  as well
-as for the Windows executables, packed into the Windows installer.
-
 ----------------------------------------------------------------------
-Differences 3.5.3 <-> 3.4
+New in 3.6
 -----------------------------------------------------------------------
 
-	a. Support for pluto devices,
-	b. saving gain settings for different channels when configured,
-	c. support for saving detailed output of the scan,
-	d. clock error counter and rs corrections counter
-	e. improved algorithm for frequency synchronization,
-	f. added a "mute" button (moved 2 buttons to technical data)
-	g. also for dabMini an appImage (x64) is availablce.
+Most of the differences between version 3.6 and previous versions are
+(hopefully) unnoticed by the user (some of them are cornerstones for
+future functional additions). However, one change is very visible:
+the "mute button" is on a different location, and the button on the 
+right bottom corner is now "config" button. The changes are large
+enough to justify a change in version number.
 
-Version 3.5.3. added - apart from a number of internal changes - color setting to the buttons and scopes.
+The rationale for a "config" button is that there is a need (well,
+I have a need) to change some of the settings, without having to
+edit the ".ini" file.
 
-------------------------------------------------------------------------
-README FIRST  === README FIRST === README FIRST === README FIRST
-------------------------------------------------------------------
+![configuration](/qt-dab-config.png?raw=true)
+
+The "config" button, when pressed, gives access to a widget with a few
+settings to set or alter values in the ".ini" (i.e. configuration) file.
+Currently, there are the following settings:
+
+	a. the *switchtime*, the maximum delay when selecting a service in a different channel;
+
+	b. the *mute* time, the time - in minutes - that audio mutes;
+
+	c. the *plotLength*, the length of the X-axis in the correlation display expressed in entities of 100 samples;
+
+	d. *full scan* selector, scan the while band once (default), continuously, or until a DABsignal is detected.
+
+	e. *mot slides* selector, show slides in a separate window when checked, otherwise as part of the technical data widget. 
+
+While most people will not be aware of it,
+there are different orderings possible for displaying the services in
+the service list. 
+One may choose between (Alfabetical, by service Identifier, or by the
+number of the subchannel).
+
+As an experiment - inspired by others - a simple ALARM timer is introduced.
+It happened a few times that I missed the news, transmitted on the hour,
+but on a different service than the one I was listening to.
+
+Now it is possible to specify a time on which a selected service on
+a selected channel can be started, regardless of the service and channel
+that we ar elistening to. The services that can be selected in
+the alarm selection are the ones in the currently selected channel
+and those in the presets.
+
+The GUI contains an indicator which shows when the alarm is set, when no
+alarm is set, the small label is not shown.
+
+Of course, the coloring, as implemented in 3.5.3 also applies to the config
+button.
+
+----------------------------------------------------------------------
+The contents of the qt-dab sourcetree
+----------------------------------------------------------------------
 
 The directory qt-dab is now the home of *THREE* related, but 
 different, versions of a DAB decoder:
@@ -103,16 +132,19 @@
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.5** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-3.6** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
 For DX purposes, a separate **dab-scanner** is implemented that allows
 for a continuous scanning of selected channels in a given band. Results are 
 written in a text file, formatted for use with *LibreOffice Calc* and
-comparable programs. Note that in **Qt-DAB-3.5** the scan function
+comparable programs. Note that in **Qt-DAB-3.6** the scan function
 is extended with an option to save detailed data in a text file,
 compatible with e.g. LibreOffice.
+For scanning purposes, a command line scanner exists, one where the channels
+that are to be scanned passed as command line parameter, and that dumps a specified number of seconds of the input of those channels with DAB data into a file.
 
-Derived programs, such as the **dab-scanner** and the Qt-free versions **dab-cmdline** have their own repository on Github.
+Derived programs, such as the **dab-scanner** and the command line based
+versions, **terminal-DAB**, **dab-cmdline**, **channelScanner** and **dab2fm* have their own repository on Github.
 
 Since the Qt-DAB program has to run on a headless RPI 2/3 using the home WiFi,
 the resulting PCM output can be sent - if so configured - to a TCP port (Sources for a small client are part of the source distribution).
@@ -161,6 +193,7 @@
   	- SDRplay ( RSP I, RSP II, RSP Duo and RSP Dx), with separate entries for v2 and v3 library
 	- limeSDR, 
 	- Soapy (experimental, Linux only), 
+	- ExtIO (expertimental, Windows only),
    	- prerecorded dump (*.raw, *.iq and *.sdr),
 	- xml format files, and
 	- rtl_tcp servers.
@@ -185,18 +218,19 @@
 Widgets and scopes for Qt-DAB
 ------------------------------------------------------------------
 
-The picture on top shows Qt-DAB's main window and the other 5 **optional**
+The picture on top shows Qt-DAB's main window and the other 6 **optional**
 widgets:
 
-  * a widget with controls for the attached device,
   * a widget showing the technical information of the *selected service* as well
 as some information on the quality of the decoding, 
   * a widget showing the spectrum of the received radio signal and the constellation of the decoded signal,
   * a widget showing the spectrum of the NULL period between successive DAB frames from which the TII is derived,
-  * and a widget showing the response(s) from different transmitters in the SFN,
+  * a widget showing the correlations response(s) from different transmitters in the SFN,
+  * a widget with controls for the attached device,
+  * a widget for additional configuration settings.
 
-Another - a sixth - widget shows when running a *scan*; the widget will show the contents of the ensembles found in the selected channel. In 3.5 the
-possibility is created to save a detailed description of the services
+Another - a seventh - widget shows when running a *scan*; the widget will show the contents of the ensembles found in the selected channel. In 3.5 the
+possibility was created to save a detailed description of the services
 in the different channels, in a format easily to process with LibreOffice
 or comparable programs.
 
@@ -237,7 +271,7 @@
 of the scan as shown in the picture. Note that what is shown is a *subset*
 of what will be recorded if a choice is made to save the output of the scan. 
 
-![Qt-DAB with xml input](/qt-dab-scanner.png?raw=true)
+![Qt-DAB with xml input](/qt-dab-scan-button.png?raw=true)
 
 Of course, different people have different tastes when it comes to
 colors on a scope.
@@ -301,7 +335,7 @@
 Maintaining History for Qt-DAB and dab-2
 ---------------------------------------------------------------------------
 
-Qt-DAB-3.5 and dab-2.1 save all service names found.
+Qt-DAB-3.6 and dab-2.1 save all service names found.
 Pairs "Channel:serviceName"
 will be made (in)visible when touching the appropriate button (the
 one labeled with "xx").
@@ -318,13 +352,12 @@
 Comment on some  configuration settings
 -------------------------------------------------------------------------------
 
-All three programs maintain a number of settings in an ".ini" file.
+All **three** programs maintain a number of settings in an ".ini" file.
 A typical setting is the channel/service combination at program termination,
 values, used to initialize the software at program start up.
 
 Next to this kind of settings, there is a myriad of possible settings
-that can be done by the user. As an example, the color or the various
-scopes can be set.
+that can be done by the user.
 A complete description of the settings can be found in the user's manual
 (in the subdirectory *docs*).
 
@@ -352,9 +385,9 @@
 Read carefully what I have said on Windows!
 
 For windows *two*  **installers** can be found in the releases section, https://github.com/JvanKatwijk/qt-dab/releases. The installer will install the executable as well as required libraries.
-bit versions for both qt-dab-3.5 and dabMini.
 
-The installer will also call the official installer for the dll implementing the api for getting access to the SDRplay devices.
+The installer will also call the official installer for the dll implementing

_service:download_url:qt-dab-3.5.3.tar.gz/correlation-viewer/correlation-viewer.cpp -> _service:download_url:qt-dab-3.6.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2-picture.png -> _service:download_url:qt-dab-3.6.tar.gz/dab-2-picture.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/CMakeLists.txt -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/CMakeLists.txt Changed

@@ -253,11 +253,14 @@
              ../includes/support/preset-handler.h
              ../includes/support/presetcombobox.h
              ../includes/support/smallqlistview.h
+	     ../includes/support/smallspinbox.h
              ../includes/support/smallpushbutton.h
              ../includes/support/verysmallpushbutton.h
              ../includes/support/smallcombobox.h
              ../includes/support/history-handler.h
              ../includes/support/scanner-table.h
+	     ../includes/support/color-selector.h
+	     ../includes/support/alarm-selector.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
@@ -330,9 +333,12 @@
 	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
              ../src/support/scanner-table.cpp
+	     ../src/support/color-selector.cpp
+	     ../src/support/alarm-selector.cpp
 	     ../src/support/preset-handler.cpp
              ../src/support/presetcombobox.cpp
              ../src/support/smallqlistview.cpp
+	     ../src/support/smallspinbox.cpp
              ../src/support/smallpushbutton.cpp
              ../src/support/verysmallpushbutton.cpp
              ../src/support/smallcombobox.cpp
@@ -381,12 +387,15 @@
 	     ../includes/backend/data/data-processor.h
 	     ../includes/support/preset-handler.h
              ../includes/support/presetcombobox.h
-             ../includes/support/smallqlistview.h
              ../includes/support/smallpushbutton.h
+             ../includes/support/smallqlistview.h
+	     ../includes/support/smallspinbox.h
              ../includes/support/verysmallpushbutton.h
              ../includes/support/smallcombobox.h
              ../includes/support/history-handler.h
              ../includes/support/scanner-table.h
+	     ../includes/support/color-selector.h
+	     ../includes/support/alarm-selector.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
@@ -397,6 +406,7 @@
 	        ${${objectName}_UIS}
 	     ../forms/dabradio.ui
 	     ../forms/technical_data.ui
+	     ../forms/config-helper.ui
 	     ../forms/audio-description.ui
 	     ../forms/data-description.ui
 	     ../spectrum-viewer/scopewidget.ui

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-2.pro -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/dab-2.pro Changed

@@ -10,11 +10,11 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
-#QMAKE_CFLAGS	+=  -flto -ffast-math
-#MAKE_CXXFLAGS	+=  -flto -ffast-math
-QMAKE_CFLAGS	+=  -g
-QMAKE_CXXFLAGS	+=  -g
-QMAKE_LFLAGS	+=  -g
+QMAKE_CFLAGS	+=  -O3 -ffast-math
+QMAKE_CXXFLAGS	+=  -O3 -ffast-math
+#QMAKE_CFLAGS	+=  -g
+#QMAKE_CXXFLAGS	+=  -g
+#QMAKE_LFLAGS	+=  -g
 QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
 RC_ICONS	=  dab-2.ico
 RESOURCES	+= resources.qrc
@@ -153,8 +153,11 @@
 	   ../includes/support/smallpushbutton.h \
 	   ../includes/support/verysmallpushbutton.h \
 	   ../includes/support/smallqlistview.h \
+	   ../includes/support/smallspinbox.h \
 	   ../includes/support/history-handler.h \
 	   ../includes/support/scanner-table.h \
+	   ../includes/support/color-selector.h \
+	   ../includes/support/alarm-selector.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../spectrum-viewer/spectrum-viewer.h \
@@ -172,6 +175,7 @@
 
 FORMS	+= ../forms/technical_data.ui
 FORMS	+= ../forms/dabradio.ui 
+FORMS	+= ../forms/config-helper.ui
 FORMS	+= ../forms/audio-description.ui
 FORMS	+= ../forms/data-description.ui
 FORMS	+= ../spectrum-viewer/scopewidget.ui
@@ -245,8 +249,11 @@
 	   ../src/support/smallpushbutton.cpp \
 	   ../src/support/verysmallpushbutton.cpp \
 	   ../src/support/smallqlistview.cpp \
+	   ../src/support/smallspinbox.cpp \
 	   ../src/support/history-handler.cpp \
 	   ../src/support/scanner-table.cpp \
+	   ../src/support/color-selector.cpp \
+	   ../src/support/alarm-selector.cpp \
 	   ../src/scopes-qwt6/iqdisplay.cpp \
 	   ../spectrum-viewer/spectrum-viewer.cpp \
 	   ../correlation-viewer/correlation-viewer.cpp \
@@ -289,6 +296,7 @@
 CONFIG		+= sdrplay-v2
 CONFIG		+= sdrplay-v3
 CONFIG		+= pluto
+#CONFIG		+= pluto-2
 CONFIG		+= rtlsdr
 CONFIG		+= rtl_tcp
 CONFIG		+= hackrf
@@ -326,7 +334,7 @@
 win32 {
 #DESTDIR	= ../../../dab-win
 #DESTDIR		=  ../../../windows-dab-2
-DESTDIR	= /usr/shared/sdr-j-development/windows-dab-2
+DESTDIR	= /usr/shared/sdr-j-development/w32-programs/windows-dab-2
 # includes in mingw differ from the includes in fedora linux
 
 exists ("./.git") {
@@ -371,9 +379,9 @@
 CONFIG		+= airspy
 #CONFIG		+= rtl_tcp
 CONFIG		+= rtlsdr
-CONFIG		+= pluto
+CONFIG		+= pluto-2
 CONFIG		+= sdrplay-v2
-#CONFIG		+= sdrplay-v3
+CONFIG		+= sdrplay-v3
 CONFIG		+= hackrf
 CONFIG		+= lime
 CONFIG		+= NO_SSE
@@ -452,8 +460,9 @@
 #
 #	pluto
 #
-hackrf {
+pluto {
 	DEFINES		+= HAVE_PLUTO
+	QT		+= network
 	DEPENDPATH	+= ./devices-dab-2/pluto-handler 
 	INCLUDEPATH	+= ./devices-dab-2/pluto-handler 
 	HEADERS		+= ./devices-dab-2/pluto-handler/pluto-handler.h 
@@ -462,6 +471,19 @@
 	LIBS		+= -liio -lad9361
 }
 #
+#	pluto
+#
+pluto-2 {
+	DEFINES		+= HAVE_PLUTO
+	QT		+= network
+	DEPENDPATH	+= ./devices-dab-2/pluto-handler-2 
+	INCLUDEPATH	+= ./devices-dab-2/pluto-handler-2
+	HEADERS		+= ./devices-dab-2/pluto-handler-2/dabFilter.h 
+	HEADERS		+= ./devices-dab-2/pluto-handler-2/pluto-handler.h 
+	SOURCES		+= ./devices-dab-2/pluto-handler-2/pluto-handler.cpp 
+	FORMS		+= ./devices-dab-2/pluto-handler-2/pluto-widget.ui
+}
+#
 # airspy support
 #
 airspy {

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-processor.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/dab-processor.cpp Changed

@@ -419,6 +419,7 @@
 	processorMode		= START;
 	nullCount		= 0;
 	correctionNeeded	= true;
+	transmitters. clear ();
 	my_ficHandler.  reset ();
 	my_mscHandler. reset_Channel ();
 }
@@ -520,11 +521,20 @@
 	if (wasSecond (my_ficHandler. get_CIFcount(), &params)) {
 	   my_TII_Detector. addBuffer (b);
 	   if (++tii_counter >= theParams -> tii_delay) {
-	      QByteArray secondaries =
-                                      my_TII_Detector. processNULL ();
-	      show_tii (secondaries);
-	      tii_counter = 0;
-	      my_TII_Detector. reset();
+	      uint16_t res = my_TII_Detector. processNULL ();
+	      if (res != 0) {
+	         uint8_t mainId   = res >> 8;
+	         uint8_t subId    = res & 0xFF;
+	         for (uint16_t k = 0; k < transmitters. size (); k += 2)
+	            if ((transmitters. at (k) == mainId) &&
+	                (transmitters. at (k + 1) == subId))
+	               res = 0;
+                 if (res != 0) {
+                    transmitters. append (mainId);
+                    transmitters. append (subId);
+                    show_tii (transmitters);
+                 }
+              }
 	   }
 	   tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
 	}

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/dab-processor.h -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/dab-processor.h Changed

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2 Added

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/dabFilter.h Added

@@ -0,0 +1,145 @@
+
+#
+//
+//	To avoid including the ad9361 library (just because in
+//	Ubuntu 16.04, used for generating an appImage, only
+//	an old version is available, the parameters of a filter
+//	
+//	Fpass     = 1536000 / 2;
+//	Fstop     = Fpass * 1.2;
+//	wnomTX    = 1.6 * Fstop;  // dummy here
+//	wnomRX    = 1536000; // RF bandwidth of analog filter
+//
+//	were extracted and the filter configuration is loaded
+
+//"BWRX 1536000\n"
+const char * dabFilter =
+"RX 3 GAIN -12 DEC 4\n"
+"-250\n"
+"296\n"
+"-324\n"
+"458\n"
+"100\n"
+"766\n"
+"652\n"
+"1100\n"
+"936\n"
+"1020\n"
+"618\n"
+"366\n"
+"-146\n"
+"-406\n"
+"-668\n"
+"-578\n"
+"-398\n"
+"26\n"
+"374\n"
+"688\n"
+"704\n"
+"530\n"
+"96\n"
+"-360\n"
+"-766\n"
+"-884\n"
+"-724\n"
+"-248\n"
+"334\n"
+"876\n"
+"1118\n"
+"990\n"
+"458\n"
+"-278\n"
+"-1006\n"
+"-1414\n"
+"-1352\n"
+"-758\n"
+"172\n"
+"1152\n"
+"1798\n"
+"1850\n"
+"1198\n"
+"24\n"
+"-1312\n"
+"-2312\n"
+"-2572\n"
+"-1880\n"
+"-380\n"
+"1490\n"
+"3068\n"
+"3724\n"
+"3038\n"
+"1044\n"
+"-1768\n"
+"-4490\n"
+"-6068\n"
+"-5578\n"
+"-2550\n"
+"2850\n"
+"9794\n"
+"16962\n"
+"22850\n"
+"26166\n"
+"26166\n"
+"22850\n"
+"16962\n"
+"9794\n"
+"2850\n"
+"-2550\n"
+"-5578\n"
+"-6068\n"
+"-4490\n"
+"-1768\n"
+"1044\n"
+"3038\n"
+"3724\n"
+"3068\n"
+"1490\n"
+"-380\n"
+"-1880\n"
+"-2572\n"
+"-2312\n"
+"-1312\n"
+"24\n"
+"1198\n"
+"1850\n"
+"1798\n"
+"1152\n"
+"172\n"
+"-758\n"
+"-1352\n"
+"-1414\n"
+"-1006\n"
+"-278\n"
+"458\n"
+"990\n"
+"1118\n"
+"876\n"
+"334\n"
+"-248\n"
+"-724\n"
+"-884\n"
+"-766\n"
+"-360\n"
+"96\n"
+"530\n"
+"704\n"
+"688\n"
+"374\n"
+"26\n"
+"-398\n"
+"-578\n"
+"-668\n"
+"-406\n"
+"-146\n"
+"366\n"
+"618\n"
+"1020\n"
+"936\n"
+"1100\n"
+"652\n"
+"766\n"
+"100\n"
+"458\n"
+"-324\n"
+"296\n"
+"-250\n";

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/functions Added

@@ -0,0 +1,25 @@
+__api __pure struct iio_channel * iio_device_find_channel(
+                const struct iio_device *dev, const char *name, bool output);
+__api struct iio_context * iio_create_default_context(void);
+__api struct iio_context * iio_create_local_context(void);
+__api struct iio_context * iio_create_network_context(const char *host);
+__api __pure const char * iio_context_get_name(const struct iio_context *ctx);
+__api __pure unsigned int iio_context_get_devices_count(
+                const struct iio_context *ctx);
+__api __pure struct iio_device * iio_context_find_device(
+                const struct iio_context *ctx, const char *name);
+__api ssize_t iio_channel_attr_write(const struct iio_channel *chn,
+                const char *attr, const char *src);
+__api int iio_device_attr_write_longlong(const struct iio_device *dev,
+                const char *attr, long long val);
+__api struct iio_buffer * iio_device_create_buffer(const struct iio_device *dev,
+                size_t samples_count, bool cyclic);
+__api int iio_buffer_set_blocking_mode(struct iio_buffer *buf, bool blocking);
+__api void iio_buffer_destroy (struct iio_buffer *buf);
+__api void iio_context_destroy(struct iio_context *ctx);
+__api ssize_t iio_buffer_refill(struct iio_buffer *buf);
+__api ptrdiff_t iio_buffer_step(const struct iio_buffer *buf);
+__api void * iio_buffer_end(const struct iio_buffer *buf);
+__api void * iio_buffer_first(const struct iio_buffer *buf,
+                const struct iio_channel *chn);
+

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/iio.h Added

@@ -0,0 +1,1777 @@
+/*
+ * libiio - Library for interfacing industrial I/O (IIO) devices
+ *
+ * Copyright (C) 2014 Analog Devices, Inc.
+ * Author: Paul Cercueil <paul.cercueil@analog.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * */
+
+/** @file iio.h
+ * @brief Public interface */
+
+#ifndef __IIO_H__
+#define __IIO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#if (defined(_WIN32) || defined(__MBED__))
+#ifndef _SSIZE_T_DEFINED
+typedef ptrdiff_t ssize_t;
+#define _SSIZE_T_DEFINED
+#endif
+#else
+#include <sys/types.h>
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER < 1800) && !defined(__BOOL_DEFINED)
+#undef bool
+#undef false
+#undef true
+#define bool char
+#define false 0
+#define true 1
+#else
+#include <stdbool.h>
+#endif
+
+#if defined(__GNUC__) && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+#ifndef __cnst
+#define __cnst __attribute__((const))
+#endif
+#ifndef __pure
+#define __pure __attribute__((pure))
+#endif
+#define __notused __attribute__((unused))
+#else
+#define __cnst
+#define __pure
+#define __notused
+#endif
+
+#ifdef _WIN32
+#   ifdef LIBIIO_EXPORTS
+#	define __api __declspec(dllexport)
+#   else
+#	define __api __declspec(dllimport)
+#   endif
+#elif __GNUC__ >= 4 && !defined(MATLAB_MEX_FILE) && !defined(MATLAB_LOADLIBRARY)
+#   define __api __attribute__((visibility ("default")))
+#else
+#   define __api
+#endif
+
+struct iio_context;
+struct iio_device;
+struct iio_channel;
+struct iio_buffer;
+
+struct iio_context_info;
+struct iio_scan_context;
+
+/**
+ * @enum iio_chan_type
+ * @brief IIO channel type
+ *
+ * A IIO channel has a type specifying the type of data associated with the
+ * channel.
+ */
+enum iio_chan_type {
+	IIO_VOLTAGE,
+	IIO_CURRENT,
+	IIO_POWER,
+	IIO_ACCEL,
+	IIO_ANGL_VEL,
+	IIO_MAGN,
+	IIO_LIGHT,
+	IIO_INTENSITY,
+	IIO_PROXIMITY,
+	IIO_TEMP,
+	IIO_INCLI,
+	IIO_ROT,
+	IIO_ANGL,
+	IIO_TIMESTAMP,
+	IIO_CAPACITANCE,
+	IIO_ALTVOLTAGE,
+	IIO_CCT,
+	IIO_PRESSURE,
+	IIO_HUMIDITYRELATIVE,
+	IIO_ACTIVITY,
+	IIO_STEPS,
+	IIO_ENERGY,
+	IIO_DISTANCE,
+	IIO_VELOCITY,
+	IIO_CONCENTRATION,
+	IIO_RESISTANCE,
+	IIO_PH,
+	IIO_UVINDEX,
+	IIO_ELECTRICALCONDUCTIVITY,
+	IIO_COUNT,
+	IIO_INDEX,
+	IIO_GRAVITY,
+	IIO_CHAN_TYPE_UNKNOWN = INT_MAX
+};
+
+/**
+ * @enum iio_modifier
+ * @brief IIO channel modifier
+ *
+ * In a addition to a type a IIO channel can optionally have a channel modifier
+ * further specifying the data type of of the channel.
+ */
+enum iio_modifier {
+	IIO_NO_MOD,
+	IIO_MOD_X,
+	IIO_MOD_Y,
+	IIO_MOD_Z,
+	IIO_MOD_X_AND_Y,
+	IIO_MOD_X_AND_Z,
+	IIO_MOD_Y_AND_Z,
+	IIO_MOD_X_AND_Y_AND_Z,
+	IIO_MOD_X_OR_Y,
+	IIO_MOD_X_OR_Z,
+	IIO_MOD_Y_OR_Z,
+	IIO_MOD_X_OR_Y_OR_Z,
+	IIO_MOD_LIGHT_BOTH,
+	IIO_MOD_LIGHT_IR,
+	IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+	IIO_MOD_SUM_SQUARED_X_Y_Z,
+	IIO_MOD_LIGHT_CLEAR,
+	IIO_MOD_LIGHT_RED,
+	IIO_MOD_LIGHT_GREEN,
+	IIO_MOD_LIGHT_BLUE,
+	IIO_MOD_QUATERNION,
+	IIO_MOD_TEMP_AMBIENT,
+	IIO_MOD_TEMP_OBJECT,
+	IIO_MOD_NORTH_MAGN,
+	IIO_MOD_NORTH_TRUE,
+	IIO_MOD_NORTH_MAGN_TILT_COMP,
+	IIO_MOD_NORTH_TRUE_TILT_COMP,
+	IIO_MOD_RUNNING,
+	IIO_MOD_JOGGING,
+	IIO_MOD_WALKING,
+	IIO_MOD_STILL,
+	IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
+	IIO_MOD_I,
+	IIO_MOD_Q,
+	IIO_MOD_CO2,
+	IIO_MOD_VOC,
+	IIO_MOD_LIGHT_UV,
+};
+
+/* ---------------------------------------------------------------------------*/
+/* ------------------------- Scan functions ----------------------------------*/
+/** @defgroup Scan Functions for scanning available contexts
+ * @{
+ * @struct iio_scan_context
+ * @brief The scanning context
+ *
+ * @struct iio_context_info
+ * @brief The information related to a discovered context
+ */
+
+
+/** @brief Create a scan context
+ * @param backend A NULL-terminated string containing the backend to use for
+ * scanning. If NULL, all the available backends are used.
+ * @param flags Unused for now. Set to 0.
+ * @return on success, a pointer to a iio_scan_context structure
+ * @return On failure, NULL is returned and errno is set appropriately */
+__api struct iio_scan_context * iio_create_scan_context(
+		const char *backend, unsigned int flags);
+
+

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/pluto-handler.cpp Added

@@ -0,0 +1,882 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of dab-2
+ *
+ *    dab-2 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 version 2 of the License.
+ *
+ *    dab-2 is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-2 if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	<QLabel>
+#include	<QDebug>
+#include	<QFileDialog>
+#include	"pluto-handler.h"
+#include	"xml-filewriter.h"
+#include	"radio.h"
+#include	"dab-processor.h"
+//
+//	Description for the fir-filter is here:
+#include	"dabFilter.h"
+
+/* static scratch mem for strings */
+static char tmpstr[64];
+
+/* helper function generating channel names */
+static
+char*	get_ch_name (const char* type, int id) {
+        snprintf (tmpstr, sizeof(tmpstr), "%s%d", type, id);
+        return tmpstr;
+}
+
+int	plutoHandler::
+	ad9361_set_trx_fir_enable (struct iio_device *dev, int enable) {
+int ret = iio_device_attr_write_bool (dev,
+	                              "in_out_voltage_filter_fir_en",
+	                              !!enable);
+	if (ret < 0)
+	   ret = iio_channel_attr_write_bool (
+	                        iio_device_find_channel(dev, "out", false),
+	                        "voltage_filter_fir_en", !!enable);
+	return ret;
+}
+
+int	plutoHandler::
+	ad9361_get_trx_fir_enable (struct iio_device *dev, int *enable) {
+bool value;
+
+	int ret = iio_device_attr_read_bool (dev,
+	                                     "in_out_voltage_filter_fir_en",
+	                                     &value);
+
+	if (ret < 0)
+	   ret = iio_channel_attr_read_bool (
+	                        iio_device_find_channel (dev, "out", false),
+	                        "voltage_filter_fir_en", &value);
+	if (!ret)
+	   *enable	= value;
+
+	return ret;
+}
+
+/* returns ad9361 phy device */
+struct iio_device* plutoHandler::get_ad9361_phy (struct iio_context *ctx) {
+struct iio_device *dev = iio_context_find_device (ctx, "ad9361-phy");
+	return dev;
+}
+
+/* finds AD9361 streaming IIO devices */
+bool 	plutoHandler::get_ad9361_stream_dev (struct iio_context *ctx,
+	                    enum iodev d, struct iio_device **dev) {
+	switch (d) {
+	case TX:
+	   *dev = iio_context_find_device (ctx, "cf-ad9361-dds-core-lpc");
+	   return *dev != NULL;
+
+	case RX:
+	   *dev = iio_context_find_device (ctx, "cf-ad9361-lpc");
+	   return *dev != NULL;
+
+	default: 
+	   return false;
+	}
+}
+
+/* finds AD9361 streaming IIO channels */
+bool	plutoHandler::get_ad9361_stream_ch (__notused struct iio_context *ctx,
+	                                    enum iodev d,
+	                                    struct iio_device *dev,
+	                                    int chid,
+	                                    struct iio_channel **chn) {
+	*chn = iio_device_find_channel (dev,
+	                                get_ch_name ("voltage", chid),
+	                                d == TX);
+	if (!*chn)
+	   *chn = iio_device_find_channel (dev,
+	                                   get_ch_name ("altvoltage", chid),
+	                                   d == TX);
+	return *chn != NULL;
+}
+
+/* finds AD9361 phy IIO configuration channel with id chid */
+bool	plutoHandler::get_phy_chan (struct iio_context *ctx,
+	              enum iodev d, int chid, struct iio_channel **chn) {
+	switch (d) {
+	   case RX:
+	      *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	                                      get_ch_name ("voltage", chid),
+	                                      false);
+	      return *chn != NULL;
+
+	   case TX:
+	      *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	                                      get_ch_name ("voltage", chid),
+	                                      true);
+	      return *chn != NULL;
+
+	   default: 
+	      return false;
+	}
+}
+
+/* finds AD9361 local oscillator IIO configuration channels */
+bool	plutoHandler::get_lo_chan (struct iio_context *ctx,
+	             enum iodev d, struct iio_channel **chn) {
+// LO chan is always output, i.e. true
+	switch (d) {
+	   case RX:
+	      *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	                                      get_ch_name ("altvoltage", 0),
+	                                      true);
+	      return *chn != NULL;
+
+	   case TX:
+	      *chn = iio_device_find_channel (get_ad9361_phy (ctx),
+	                                      get_ch_name ("altvoltage", 1),
+	                                      true);
+	      return *chn != NULL;
+
+	   default: 
+	      return false;
+	}
+}
+
+/* applies streaming configuration through IIO */
+bool	plutoHandler::cfg_ad9361_streaming_ch (struct iio_context *ctx,
+	                                       struct stream_cfg *cfg,
+	                                       enum iodev type, int chid) {
+struct iio_channel *chn = NULL;
+int	ret;
+
+// Configure phy and lo channels
+	printf("* Acquiring AD9361 phy channel %d\n", chid);
+	if (!get_phy_chan (ctx, type, chid, &chn)) {
+	   return false;
+	}
+	ret = iio_channel_attr_write (chn,
+	                              "rf_port_select", cfg -> rfport);
+	if (ret < 0)
+	   return false;
+	ret = iio_channel_attr_write_longlong (chn,
+	                                       "rf_bandwidth", cfg -> bw_hz);
+	ret = iio_channel_attr_write_longlong (chn,
+	                                       "sampling_frequency",
+	                                       cfg -> fs_hz);
+
+// Configure LO channel
+	printf("* Acquiring AD9361 %s lo channel\n", type == TX ? "TX" : "RX");
+	if (!get_lo_chan (ctx, type, &chn)) {
+	   return false;
+	}
+	ret = iio_channel_attr_write_longlong (chn,
+	                                       "frequency", cfg -> lo_hz);
+	return true;
+}
+
+	plutoHandler::plutoHandler  (RadioInterface	*mr,
+	                             QSettings		*s,
+	                             dabProcessor	*base,
+	                             QString &recorderVersion):
+	                                  myFrame (nullptr) {
+
+	this		-> base		= base;

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/pluto-handler.h Added

@@ -0,0 +1,266 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of dab-2
+ *
+ *    dab-2 is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    dab-2 is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-2; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __PLUTO_HANDLER__
+#define	__PLUTO_HANDLER__
+
+#include	<QtNetwork>
+#include        <QMessageBox>
+#include        <QByteArray>
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<atomic>
+#include	<iio.h>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"ui_pluto-widget.h"
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS  GetProcAddress
+#else
+#define GETPROCADDRESS  dlsym
+#endif
+
+class	xml_fileWriter;
+class	RadioInterface;
+class	dabProcessor;
+
+#ifndef	PLUTO_RATE
+#define	PLUTO_RATE	2100000
+#define	DAB_RATE	2048000
+#define	DIVIDER		1000
+#define	CONV_SIZE	(PLUTO_RATE / DIVIDER)
+#endif
+
+enum iodev { RX, TX };
+
+//	Dll and ".so" function prototypes
+
+typedef struct iio_channel * (*pfn_iio_device_find_channel)(
+                                   const struct iio_device *dev,
+	                           const char *name, bool output);
+typedef struct iio_context * (*pfn_iio_create_default_context)(void);
+typedef struct iio_context * (*pfn_iio_create_local_context) (void);
+typedef struct iio_context * (*pfn_iio_create_network_context)(const char *host);
+typedef const char * (*pfn_iio_context_get_name)(const struct iio_context *ctx);
+typedef unsigned int (*pfn_iio_context_get_devices_count)(
+                                   const struct iio_context *ctx);
+typedef struct iio_device * (*pfn_iio_context_find_device)(
+                                   const struct iio_context *ctx,
+	                           const char *name);
+typedef void (*pfn_iio_channel_enable)(struct iio_channel *chn);
+
+typedef int (*pfn_iio_device_attr_write_bool)(const struct iio_device *dev,
+                                          const char *attr, bool val);
+typedef int (*pfn_iio_device_attr_read_bool)(const struct iio_device *dev,
+                                         const char *attr, bool *val);
+
+typedef int (*pfn_iio_channel_attr_read_bool)(
+	                                 const struct iio_channel *chn,
+                                         const char *attr, bool *val);
+typedef int (*pfn_iio_channel_attr_write_bool)(
+	                                 const struct iio_channel *chn,
+                                         const char *attr, bool val);
+
+typedef ssize_t (*pfn_iio_channel_attr_write)(
+	                                 const struct iio_channel *chn,
+                                         const char *attr,
+	                                 const char *src);
+typedef int (*pfn_iio_channel_attr_write_longlong)(
+	                                 const struct iio_channel *chn,
+                                         const char *attr,
+	                                 long long val);
+typedef int (*pfn_iio_device_attr_write_longlong)(
+	                                 const struct iio_device *dev,
+                                         const char *attr,
+	                                 long long val);
+typedef ssize_t (*pfn_iio_device_attr_write_raw)(
+	                                 const struct iio_device *dev,
+                                         const char *attr,
+	                                 const void *src, size_t len);
+
+typedef struct iio_buffer * (*pfn_iio_device_create_buffer)(const struct iio_device *dev,
+                                   size_t samples_count, bool cyclic);
+typedef int  (*pfn_iio_buffer_set_blocking_mode)(struct iio_buffer *buf,
+	                           bool blocking);
+typedef void (*pfn_iio_buffer_destroy) (struct iio_buffer *buf);
+typedef void (*pfn_iio_context_destroy) (struct iio_context *ctx);
+typedef ssize_t (*pfn_iio_buffer_refill) (struct iio_buffer *buf);
+typedef ptrdiff_t (*pfn_iio_buffer_step) (const struct iio_buffer *buf);
+typedef void * (*pfn_iio_buffer_end)(const struct iio_buffer *buf);
+typedef void * (*pfn_iio_buffer_first)(const struct iio_buffer *buf,
+                                   const struct iio_channel *chn);
+
+struct stream_cfg {
+        long long bw_hz;
+        long long fs_hz;
+        long long lo_hz;
+        const char *rfport;
+};
+
+class	plutoHandler: public deviceHandler, public Ui_plutoWidget {
+Q_OBJECT
+public:
+			plutoHandler		(RadioInterface *,
+	                                         QSettings *,
+	                                         dabProcessor	*,
+	                                         QString &);
+            		~plutoHandler		();
+	bool		restartReader		(int32_t);
+	void		stopReader		();
+	int32_t		getVFOFrequency		();
+	void		resetBuffer		();
+	int16_t		bitDepth		();
+	void		show			();
+	void		hide			();
+	bool		isHidden		();
+	QString		deviceName		();
+	dabProcessor	*base;
+private:
+	bool			loadFunctions	();
+	HINSTANCE		Handle;
+	QFrame			myFrame;
+	QSettings		*plutoSettings;
+	QString			recorderVersion;
+	FILE			*xmlDumper;
+	xml_fileWriter		*xmlWriter;
+	bool			setup_xmlDump	();
+	void			close_xmlDump	();
+	void			handle_Value	(int, float, float);
+	int			totalOffset;
+	std::atomic<bool>	dumping;
+	void			run		();
+	int32_t			inputRate;
+	int32_t			vfoFrequency;
+	std::atomic<bool>	running;
+	bool			debugFlag;
+//      configuration items
+        struct  iio_channel     *lo_channel;
+        struct  iio_channel     *gain_channel;
+	struct	iio_device	*rx;
+	struct	iio_context	*ctx;
+	struct	iio_channel	*rx0_i;
+	struct	iio_channel	*rx0_q;
+	struct	iio_buffer	*rxbuf;
+	struct stream_cfg	rx_cfg;
+
+	bool			connected;
+	std::complex<float>	convBuffer	[CONV_SIZE + 1];
+	int			convIndex;
+	int16_t			mapTable_int	[DAB_RATE / DIVIDER];
+	float			mapTable_float	[DAB_RATE / DIVIDER];
+
+	int			ad9361_set_trx_fir_enable (
+                                                 struct iio_device *dev,
+	                                         int enable);
+	int			ad9361_get_trx_fir_enable (
+	                                         struct iio_device *dev,
+	                                         int *enable);
+	struct iio_device* 	get_ad9361_phy (struct iio_context *ctx);
+	bool			get_ad9361_stream_dev (
+	                                        struct iio_context *ctx,
+                                                enum iodev d,
+	                                        struct iio_device **dev);
+	bool			get_ad9361_stream_ch (
+	                                 __notused struct iio_context *ctx,
+                                         enum iodev d,
+                                         struct iio_device *dev,
+                                         int chid,
+                                         struct iio_channel **chn);
+	bool			get_phy_chan (struct iio_context *ctx,
+                                              enum iodev d,
+	                                      int chid,
+	                                      struct iio_channel **chn);
+	bool			get_lo_chan (struct iio_context *ctx,
+                                             enum iodev d,
+	                                     struct iio_channel **chn);
+	bool		        cfg_ad9361_streaming_ch (

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/pluto-widget.ui Added

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>plutoWidget</class>
+ <widget class="QWidget" name="plutoWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>324</width>
+    <height>224</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Pluto control</string>
+  </property>
+  <property name="toolTip">
+   <string>Pluto support is experimental. I do not have one so testing was limited.</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QCheckBox" name="agcControl">
+       <property name="text">
+        <string>agc</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="gainControl">
+       <property name="maximum">
+        <number>73</number>
+       </property>
+       <property name="value">
+        <number>33</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="state">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="toolTip">
+      <string>Experimental interface for Adalm Pluto. No garantees!!</string>
+     </property>
+     <property name="text">
+      <string>Pluto interface</string>
+     </property>
+    </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</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLCDNumber" name="offsetDisplay"/>
+     </item>
+     <item>
+      <widget class="QPushButton" name="debugButton">
+       <property name="text">
+        <string>debug off</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="dumpButton">
+       <property name="text">
+        <string>dump</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="serial_number_display">
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/pluto-handler-2/xx Added

@@ -0,0 +1,129 @@
+"RX 3 GAIN -12 DEC 4\n"
+"-250\n"
+"296\n"
+"-324\n"
+"458\n"
+"100\n"
+"766\n"
+"652\n"
+"1100\n"
+"936\n"
+"1020\n"
+"618\n"
+"366\n"
+"-146\n"
+"-406\n"
+"-668\n"
+"-578\n"
+"-398\n"
+"26\n"
+"374\n"
+"688\n"
+"704\n"
+"530\n"
+"96\n"
+"-360\n"
+"-766\n"
+"-884\n"
+"-724\n"
+"-248\n"
+"334\n"
+"876\n"
+"1118\n"
+"990\n"
+"458\n"
+"-278\n"
+"-1006\n"
+"-1414\n"
+"-1352\n"
+"-758\n"
+"172\n"
+"1152\n"
+"1798\n"
+"1850\n"
+"1198\n"
+"24\n"
+"-1312\n"
+"-2312\n"
+"-2572\n"
+"-1880\n"
+"-380\n"
+"1490\n"
+"3068\n"
+"3724\n"
+"3038\n"
+"1044\n"
+"-1768\n"
+"-4490\n"
+"-6068\n"
+"-5578\n"
+"-2550\n"
+"2850\n"
+"9794\n"
+"16962\n"
+"22850\n"
+"26166\n"
+"26166\n"
+"22850\n"
+"16962\n"
+"9794\n"
+"2850\n"
+"-2550\n"
+"-5578\n"
+"-6068\n"
+"-4490\n"
+"-1768\n"
+"1044\n"
+"3038\n"
+"3724\n"
+"3068\n"
+"1490\n"
+"-380\n"
+"-1880\n"
+"-2572\n"
+"-2312\n"
+"-1312\n"
+"24\n"
+"1198\n"
+"1850\n"
+"1798\n"
+"1152\n"
+"172\n"
+"-758\n"
+"-1352\n"
+"-1414\n"
+"-1006\n"
+"-278\n"
+"458\n"
+"990\n"
+"1118\n"
+"876\n"
+"334\n"
+"-248\n"
+"-724\n"
+"-884\n"
+"-766\n"
+"-360\n"
+"96\n"
+"530\n"
+"704\n"
+"688\n"
+"374\n"
+"26\n"
+"-398\n"
+"-578\n"
+"-668\n"
+"-406\n"
+"-146\n"
+"366\n"
+"618\n"
+"1020\n"
+"936\n"
+"1100\n"
+"652\n"
+"766\n"
+"100\n"
+"458\n"
+"-324\n"
+"296\n"
+"-250\n";

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/devices-dab-2/rtlsdr-handler/rtlsdr-handler.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/devices-dab-2/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -78,7 +78,7 @@
 	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
 	   return;
 
-	if (!theStick -> xmlDumping. load ())
+	if (theStick -> xmlDumping. load ())
 	   theStick -> xmlWriter -> add ((std::complex<uint8_t>*)buf, len / 2);
 
 	for (uint32_t i = 0; i < len / 2; i ++) 
@@ -221,10 +221,10 @@
 	{  int  gains [gainsCount];
 	   gainsCount	= rtlsdr_get_tuner_gains (device, gains);
 	   for (i = gainsCount; i > 0; i--) {
-	      fprintf(stderr, "%.1f ", gains [i - 1] / 10.0);
+	      fprintf (stderr, "%.1f ", gains [i - 1] / 10.0);
 	      combo_gain -> addItem (QString::number (gains [i - 1]));
 	   }
-	   fprintf(stderr, "\n");
+	   fprintf (stderr, "\n");
 
 	   rtlsdr_set_tuner_gain_mode (device, 1);
 	   rtlsdr_set_agc_mode (device, 0);
@@ -307,7 +307,8 @@
 	   delete[] gains;
 }
 
-void	rtlsdrHandler::handle_Value	(int offset, float lowVal, float highVal) {
+void	rtlsdrHandler::handle_Value	(int offset,
+	                                 float lowVal, float highVal) {
 int	newFrequency	= this -> rtlsdr_get_center_freq (device) + offset;
 
 	totalOffset	+= offset;

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/radio.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/radio.cpp Changed

@@ -46,6 +46,8 @@
 #include	"wavfiles.h"
 #include	"rawfiles.h"
 #include	"xml-filereader.h"
+#include	"color-selector.h"
+#include	"alarm-selector.h"
 #include	"dab-tables.h"
 #ifdef	TCP_STREAMER
 #include	"tcp-streamer.h"
@@ -131,6 +133,40 @@
 	return true;
 }
 #endif
+#define SINGLE_SCAN		0
+#define SCAN_TO_DATA		1
+#define SCAN_CONTINUOUSLY	2
+
+static inline
+QString scanmodeText (int e) {
+        if (e == SINGLE_SCAN)
+           return QString ("single scan");
+        if (e == SCAN_TO_DATA)
+           return QString ("scan to data");
+        if (e == SCAN_CONTINUOUSLY)
+           return QString ("scan continuously");
+        return QString ("???");
+}
+
+
+#define	CONTENT_BUTTON		QString ("contentButton")
+#define DETAIL_BUTTON		QString ("detailButton")
+#define	RESET_BUTTON		QString ("resetButton")
+#define SCAN_BUTTON		QString ("scanButton")
+#define	TII_BUTTON		QString ("tiiButton")
+#define	CORRELATION_BUTTON	QString ("correlationButton")
+#define	SPECTRUM_BUTTON		QString ("spectrumButton")
+#define	DEVICEWIDGET_BUTTON	QString ("devicewidgetButton")
+#define	HISTORY_BUTTON		QString ("historyButton")
+#define	DUMP_BUTTON		QString ("dumpButton")
+#define	MUTE_BUTTON		QString ("muteButton")
+#define PREVCHANNEL_BUTTON	QString ("prevChannelButton")
+#define NEXTCHANNEL_BUTTON	QString ("nextChannelButton")
+#define PREVSERVICE_BUTTON	QString ("prevServiceButton")
+#define NEXTSERVICE_BUTTON	QString ("nextServiceButton")
+#define	FRAMEDUMP_BUTTON	QString ("framedumpButton")
+#define	AUDIODUMP_BUTTON	QString ("audiodumpButton")
+#define	CONFIG_BUTTON		QString ("configButton")
 
 static
 uint8_t convert (QString s) {
@@ -190,8 +226,6 @@
 	globals. responseBuffer		= &responseBuffer;
 	globals. tiiBuffer		= &tiiBuffer;
 	globals. frameBuffer		= &frameBuffer;
-	switchTime		=
-	                  dabSettings -> value ("switchTime", 8000). toInt ();
 	latency			=
 	                  dabSettings -> value ("latency", 5). toInt();
 
@@ -240,35 +274,56 @@
 	   epgPath = epgPath + "/";
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	   filePath = filePath + "/";
-
 /*
  * Experimental:
  *	lots of people seem to want the scan to continue, rather than
  *	stop whever a channel with data is found.
  */
-
-	serviceOrder	=
-	             dabSettings -> value ("serviceOrder", 0). toInt ();
-	normalScan	=
-	             dabSettings -> value ("normalScan", 0). toInt () == 1;
-
-//	The settings are done, now creation of the GUI parts
 	setupUi (this);
 
 	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (dataDisplay);
 
-	bool    b       =
-	            dabSettings -> value ("motSlides", 0). toInt () == 1;
-	motSlides       = b ? new QLabel () : nullptr;
-	if (motSlides != nullptr)
-	   motSlides            -> hide ();
+	configDisplay	= new QFrame (nullptr);
+	configWidget. setupUi (configDisplay);
 
-	dataDisplay		->  hide();
+	int x = dabSettings -> value ("switchDelay", 8). toInt ();
+	configWidget. switchDelaySetting -> setValue (x);
+
+	x = dabSettings -> value ("muteTime", 2). toInt ();
+	configWidget. muteTimeSetting -> setValue (x);
+
+	x = dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
+	if (x == ALPHA_BASED)
+	   configWidget. orderAlfabetical -> setChecked (true);
+	else
+	if (x == ID_BASED)
+	   configWidget. orderServiceIds -> setChecked (true);
+	else
+	   configWidget. ordersubChannelIds -> setChecked (true);
+	motSlides		= nullptr;
+	dataDisplay		-> hide ();
+	stillMuting		-> hide ();
 	serviceList. clear ();
 	model . clear ();
 	ensembleDisplay         -> setModel (&model);
 
+	alarmLabel		->
+                           setStyleSheet ("QLabel {background-color : red}");
+	alarmLabel		-> setText ("Alarm");
+	alarmLabel		-> hide ();
+/*
+ */
+//	scanMode is - unfortunately - global
+        scanMode        =
+                   dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
+        configWidget. scanmodeSelector -> setCurrentIndex (scanMode);
+
+	bool motselectionMode =
+	           dabSettings -> value ("motSlides", 0). toInt () == 1;
+	if (motselectionMode)
+	   configWidget. motslideSelector -> setChecked (true);
+
 	bool showWidget         =
 	                 dabSettings -> value ("showDeviceWidget", 0).
 	                                                      toInt () != 0;
@@ -310,6 +365,7 @@
 	historyFile             = QDir::toNativeSeparators (historyFile);
 	my_history              = new historyHandler (this, historyFile);
 
+	set_Colors ();
 	connect (my_history, SIGNAL (handle_historySelect (const QString &)),
 	         this, SLOT (handle_historySelect (const QString &)));
 	connect (historyButton, SIGNAL (clicked ()),
@@ -354,6 +410,45 @@
 	         this,  SLOT (set_streamSelector (int)));
 	my_presetHandler. loadPresets (presetFile, presetSelector);
 //	
+//	Connect the buttons for the color_settings
+	connect (contentButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_contentButton (void)));
+	connect (detailButton, SIGNAL (rightClicked ()),
+	         this, SLOT (color_detailButton ()));
+	connect (resetButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_resetButton (void)));
+	connect	(scanButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_scanButton (void)));
+	connect (show_tiiButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_tiiButton (void)));
+	connect (show_correlationButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_correlationButton (void)));
+	connect (show_spectrumButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_spectrumButton (void)));
+        connect (devicewidgetButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_devicewidgetButton ()));
+        connect (historyButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_historyButton ()));
+//	connect (dumpButton, SIGNAL (rightClicked (void)),
+//	         this, SLOT (color_sourcedumpButton (void)));
+	connect (muteButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_muteButton (void)));
+	connect (configButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_configButton (void)));
+
+	connect	(prevChannelButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_prevChannelButton (void)));
+	connect (nextChannelButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_nextChannelButton (void)));
+	connect (prevServiceButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_prevServiceButton ()));
+        connect (nextServiceButton, SIGNAL (rightClicked ()),
+                 this, SLOT (color_nextServiceButton ()));
+
+	connect (techData. framedumpButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_framedumpButton (void)));
+	connect (techData. audiodumpButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_audiodumpButton (void)));
 //	display the version
 	copyrightLabel	-> setToolTip (footText ());
 
@@ -374,14 +469,16 @@
 //
 //	presetTimer
 	presetTimer. setSingleShot (true);
-	presetTimer. setInterval (switchTime);
 	connect (&presetTimer, SIGNAL (timeout (void)),
 	         this, SLOT (setPresetStation (void)));
 
 //      timer for muting
 	muteTimer. setSingleShot (true);
 	muting          = false;
-	muteDelay       = dabSettings -> value ("muteTime", 2). toInt ();
+
+	alarmTimer. setSingleShot       (true);
+        connect (&alarmTimer, SIGNAL (timeout ()),
+                 this, SLOT (alarmTimer_timeOut ()));

_service:download_url:qt-dab-3.5.3.tar.gz/dab-2/radio.h -> _service:download_url:qt-dab-3.6.tar.gz/dab-2/radio.h Changed

@@ -62,7 +62,7 @@
 class	historyHandler;
 
 #include	"ui_technical_data.h"
-
+#include	"ui_config-helper.h"
 /*
  *	The main gui object. It inherits from
  *	QWidget and the generated form
@@ -107,11 +107,12 @@
 	scannerTable		theTable;
 	Ui_technical_data	techData;
 	QFrame			*dataDisplay;
+	Ui_configWidget		configWidget;
+	QFrame			*configDisplay;
 	QSettings		*dabSettings;
 	dabService		currentService;
 	dabService		nextService;
 	bool			stereoSetting;
-	bool			normalScan;
 	int16_t			tii_delay;
 	int32_t			dataPort;
 	serviceDescriptor	*currentServiceDescriptor;
@@ -142,6 +143,9 @@
 #endif
         FILE                    *frameDumper;
         SNDFILE                 *audioDumper;
+	int			scanMode;
+	void			set_Colors		();
+	void			set_channelButton	(int);
 
 	QStandardItemModel	model;
 	std::vector<serviceId>	serviceList;
@@ -155,13 +159,16 @@
 	QTimer			presetTimer;
 	QTimer			startTimer;
 	QTimer			muteTimer;
-	int32_t			numberofSeconds;
+	QTimer			alarmTimer;
 	int			muteDelay;
+	int32_t			numberofSeconds;
 	bool			muting;
 	int16_t			ficBlocks;
 	int16_t			ficSuccess;
 	void			connectGUI		();
 	void			disconnectGUI		();
+	void			set_buttonColors	(QPushButton *,
+	                                                 const QString &);
 
 	QString			footText		();
 	void			cleanScreen		();
@@ -175,6 +182,11 @@
 	void			start_audioService	(const QString &);
 	void			start_packetService	(const QString &);
 	void			startScanning		();
+	FILE			*findContentDump_fileName	(const QString &);
+	FILE			*findFrameDump_fileName	(const QString &,
+	                                                 const QString &);
+	SNDFILE			*findAudioDump_fileName	(const QString &,
+	                                                 const QString &);
 	FILE                    *findScanDump_FileName  ();
         FILE                    *scanDumpFile;
 	void			stopScanning		(bool);
@@ -275,6 +287,41 @@
 	void			selectService		(QModelIndex);
 	void			setPresetStation	();
 	void			handle_muteButton	();
+	void			muteButton_timeOut	();
+	void			alarmTimer_timeOut	();
+//
+//	color handlers
+	void			color_contentButton	();
+	void			color_detailButton	();
+	void			color_resetButton	();
+	void			color_scanButton	();
+	void			color_tiiButton		();
+	void			color_correlationButton	();
+	void			color_spectrumButton	();
+	void			color_devicewidgetButton	();
+	void			color_historyButton	();
+	void			color_sourcedumpButton	();
+	void			color_muteButton	();
+	void			color_prevChannelButton	();
+	void			color_nextChannelButton	();
+	void			color_prevServiceButton	();
+	void			color_nextServiceButton	();
+	void			color_framedumpButton	();
+	void			color_audiodumpButton	();
+	void			color_configButton	();
+//
+//	config handlers
+	void			handle_configSetting	();
+	void			handle_muteTimeSetting	(int);
+	void			handle_switchDelaySetting (int);
+	void			handle_orderAlfabetical	();
+	void			handle_orderServiceIds	();
+	void			handle_ordersubChannelIds	();
+	void			handle_alarmSelector	(const QString &);
+	void			handle_setTime_button	();
+	void			handle_plotLengthSetting	(int);
+	void			handle_scanmodeSelector	(int);
+	void			handle_motslideSelector	(int);
 };
 #endif

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/CMakeLists.txt -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-3.5)
+set (objectName qt-dab-3.6)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -210,7 +210,7 @@
 
 	set (${objectName}_HDRS
 	     ./radio.h
-	     ./color-selector.h
+	     ./si-processor.h
 	     ../dab-processor.h
 	     ../service-description/service-descriptor.h 
 	     ../service-description/audio-descriptor.h 
@@ -279,10 +279,13 @@
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
 	     ../includes/support/smallpushbutton.h
+	     ../includes/support/smallspinbox.h
 	     ../includes/support/verysmallpushbutton.h
 	     ../includes/support/smallcombobox.h
 	     ../includes/support/history-handler.h
 	     ../includes/support/scanner-table.h
+	     ../includes/support/color-selector.h
+	     ../includes/support/alarm-selector.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
@@ -303,7 +306,7 @@
 	     ${${objectName}_SRCS}
 	     ./main.cpp
 	     ./radio.cpp
-	     ./color-selector.cpp
+	     ./si-processor.cpp
 	     ../dab-processor.cpp
 	     ../service-description/audio-descriptor.cpp
 	     ../service-description/data-descriptor.cpp
@@ -359,6 +362,7 @@
 	     ../src/support/preset-handler.cpp
 	     ../src/support/presetcombobox.cpp
 	     ../src/support/smallqlistview.cpp
+	     ../src/support/smallspinbox.cpp
 	     ../src/support/smallpushbutton.cpp
 	     ../src/support/verysmallpushbutton.cpp
 	     ../src/support/smallcombobox.cpp
@@ -366,6 +370,8 @@
 	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
 	     ../src/support/scanner-table.cpp
+	     ../src/support/color-selector.cpp
+	     ../src/support/alarm-selector.cpp
 	     ../src/scopes-qwt6/iqdisplay.cpp 
 	     ../spectrum-viewer/spectrum-viewer.cpp 
 	     ../correlation-viewer/correlation-viewer.cpp 
@@ -383,7 +389,7 @@
 
 	set (${objectName}_MOCS
 	     ./radio.h
-	     ./color-selector.h
+	     ./si-processor.h
 	     ../dab-processor.h
 	     ../includes/output/audio-base.h
 	     ../includes/output/audiosink.h
@@ -409,11 +415,14 @@
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
+	     ../includes/support/smallspinbox.h
 	     ../includes/support/smallpushbutton.h
 	     ../includes/support/verysmallpushbutton.h
 	     ../includes/support/smallcombobox.h
 	     ../includes/support/history-handler.h
 	     ../includes/support/scanner-table.h
+	     ../includes/support/color-selector.h
+	     ../includes/support/alarm-selector.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
@@ -430,6 +439,7 @@
 	        ${${objectName}_UIS}
 	     ../forms/dabradio.ui
 	     ../forms/technical_data.ui
+	     ../forms/config-helper.ui
 	     ../forms/audio-description.ui
 	     ../forms/data-description.ui
 	     ../spectrum-viewer/scopewidget.ui
@@ -479,7 +489,7 @@
 	        ../includes/backend/audio/faad-decoder.h
 	   )
 	   add_definitions (-D__WITH_FAAD__)
-	endif (FDK-AAC)
+	endif (FDK_AAC)
 
 #	the viterbi decoder
 #
@@ -809,7 +819,7 @@
 
 	   set (RTLTCP_lib Qt5::Network)
 	   add_definitions (-DHAVE_RTL_TCP)
-	endif (RTLTCP)
+	endif (RTL_TCP)
 
 	if (TRY_EPG)

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/main.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/main.cpp Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-dab.pro -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-dab.pro Changed

@@ -9,8 +9,8 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++14
-QMAKE_CFLAGS	+=  -flto -ffast-math
-MAKE_CXXFLAGS	+=  -flto -ffast-math
+QMAKE_CFLAGS	+=  -O3 -ffast-math
+QMAKE_CXXFLAGS	+=  -O3 -ffast-math
 #QMAKE_CFLAGS	+=  -g
 #QMAKE_CXXFLAGS	+=  -g
 #QMAKE_LFLAGS	+=  -g
@@ -80,7 +80,6 @@
 
 # Input
 HEADERS += ./radio.h \
-	   ./color-selector.h \
 	   ../dab-processor.h \
 	   ../service-description/service-descriptor.h \
 	   ../service-description/audio-descriptor.h \
@@ -155,8 +154,11 @@
 	   ../includes/support/smallpushbutton.h \
 	   ../includes/support/verysmallpushbutton.h \
 	   ../includes/support/smallqlistview.h \
+	   ../includes/support/smallspinbox.h \
 	   ../includes/support/history-handler.h \
 	   ../includes/support/scanner-table.h \
+	   ../includes/support/color-selector.h \
+	   ../includes/support/alarm-selector.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../spectrum-viewer/spectrum-viewer.h \
@@ -176,6 +178,7 @@
 
 FORMS	+= ../forms/technical_data.ui
 FORMS	+= ../forms/dabradio.ui 
+FORMS	+= ../forms/config-helper.ui 
 FORMS	+= ../forms/audio-description.ui
 FORMS	+= ../forms/data-description.ui
 FORMS	+= ../spectrum-viewer/scopewidget.ui
@@ -186,7 +189,6 @@
 
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
-	   ./color-selector.cpp \
 	   ../dab-processor.cpp \
 	   ../service-description/audio-descriptor.cpp \
 	   ../service-description/data-descriptor.cpp \
@@ -251,8 +253,11 @@
 	   ../src/support/smallpushbutton.cpp \
 	   ../src/support/verysmallpushbutton.cpp \
 	   ../src/support/smallqlistview.cpp \
+	   ../src/support/smallspinbox.cpp \
 	   ../src/support/history-handler.cpp \
 	   ../src/support/scanner-table.cpp \
+	   ../src/support/color-selector.cpp \
+	   ../src/support/alarm-selector.cpp \
 	   ../src/scopes-qwt6/iqdisplay.cpp \
 	   ../spectrum-viewer/spectrum-viewer.cpp \
 	   ../correlation-viewer/correlation-viewer.cpp \
@@ -270,7 +275,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-3.5
+TARGET		= qt-dab-3.6
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -282,13 +287,15 @@
     DEFINES += GITHASH=\\\"------\\\"
 }
 
+CONFIG		+= link_pkgconfig
+PKGCONFIG	+= fftw3f 
+PKGCONFIG	+= sndfile
+PKGCONFIG	+= samplerate
+PKGCONFIG	+= libusb-1.0
 INCLUDEPATH	+= /usr/local/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		+= -lfftw3f  -lfftw3 -lusb-1.0 -ldl  #
 LIBS		+= -lportaudio
-LIBS		+= -lz
-LIBS		+= -lsndfile
-LIBS		+= -lsamplerate
+LIBS		+= -lz -ldl
 #correct this for the correct path to the qwt6 library on your system
 #LIBS		+= -lqwt
 LIBS		+= -lqwt-qt5
@@ -319,7 +326,7 @@
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
-CONFIG		+= try-epg		# do not use
+#CONFIG		+= try-epg		# do not use
 CONFIG		+= PC
 #CONFIG		+= RPI
 #DEFINES	+= SHOW_MISSING
@@ -342,29 +349,30 @@
     DEFINES += GITHASH=\\\"------\\\"
 }
 
-#for for 64 bit
-#	TARGET		= qt-dab64-3.5
+##for for 64 bit
+#	TARGET		= qt-dab64-3.6
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/sdr-j-development/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
 #	CONFIG		+= rtl_tcp
 #	CONFIG		+= dabstick
 #	CONFIG		+= sdrplay-v2
-#	CONFIG		+= pluto
+#	CONFIG		+= pluto-2
 ##	CONFIG		+= sdrplay-v3
 ##	CONFIG		+= hackrf
 ##	CONFIG		+= lime
 #	CONFIG		+= NO_SSE
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-3.5
+	TARGET		= qt-dab32-3.6
 	DESTDIR		= /usr/shared/sdr-j-development/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-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/
+	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
 	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
 	CONFIG		+= extio
 	CONFIG		+= airspy
@@ -558,8 +566,10 @@
 	DEPENDPATH	+= ../src/backend/data/epg \
 	                   ../includes/backend/data/epg 
 	INCLUDEPATH	+= ../includes/backend/data/epg 
-	HEADERS		+= ../includes/backend/data/epg/epgdec.h 
-	SOURCES		+= ../src/backend/data/epg/epgdec.cpp 
+	HEADERS		+= ../includes/backend/data/epg/epgdec.h \
+	                   ./si-processor.h
+	SOURCES		+= ../src/backend/data/epg/epgdec.cpp \
+	                   ./si-processor.cpp
 }
 
 tcp-streamer	{

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/extio-handler/extio-handler.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/extio-handler/extio-handler.cpp Changed

@@ -163,7 +163,12 @@
 //	apparently, the library is open, so record that
 	dll_open	= true;
 	myContext	= (extioHandler *)this;
-//	
+
+	if (DllMain != nullptr) {
+	   fprintf (stderr, "we have a main\n");
+	   fflush (stderr);
+	   DllMain (nullptr, DLL_PROCESS_ATTACH, nullptr);
+	}
 //	and start the rig
 	rigName		= new char [128];
 	rigModel	= new char [128];
@@ -182,14 +187,24 @@
 	   throw (24);
 	}
 
+	ShowGUI();
 	bool	OK = false;
 	while (!OK) {
 	   inputRate	= GetHWSR();
 	   fprintf (stderr, "inputRate = %d\n", inputRate);
-	   if (inputRate < Khz (2000) ||
-	       (1000 * (inputRate / 1000) != inputRate)) 
-	      QMessageBox::warning (NULL, tr ("sdr"),
-	                               tr ("please select an inputrate 2048000"));
+	   if ((inputRate < Khz (2000)) || (inputRate > Khz (4000)) ||
+	       (1000 * (inputRate / 1000) != inputRate)) {
+	       QMessageBox::StandardButton resultButton =
+                        QMessageBox::question (nullptr, "extio",
+                                               tr ("cannot handle this rate\n\
+	                                            give up?\n"),
+                                               QMessageBox::No | QMessageBox::Yes,
+                                               QMessageBox::Yes);
+              if (resultButton == QMessageBox::Yes) {
+	         HideGUI ();
+	         throw (25);
+	      }
+	   }
 	   else
 	      OK = true;
 	}
@@ -221,7 +236,6 @@
 	      break;
 	}
 
-	ShowGUI();
 	fprintf (stderr, "Hw open successful\n");
 }
 
@@ -241,6 +255,9 @@
 
 bool	extioHandler::loadFunctions (void) {
 //	start binding addresses, 
+	DllMain		= nullptr;
+	DllMain		= (pfnDllMain)GETPROCADDRESS (Handle, "DllMain");
+	
 	InitHW		= (pfnInitHW)GETPROCADDRESS (Handle, "InitHW");
 	if (InitHW == NULL) {
 	   fprintf (stderr, "Failed to load InitHW\n");

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/extio-handler/extio-handler.h -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/extio-handler/extio-handler.h Changed

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

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/pluto-handler/pluto-handler.cpp Changed

@@ -543,7 +543,7 @@
 int	p_inc;
 int	nbytes_rx;
 std::complex<float> localBuf [DAB_RATE / DIVIDER];
-std::complex<int16_t> dumpBuf [DAB_RATE / DIVIDER];
+std::complex<int16_t> dumpBuf [CONV_SIZE + 1];
 
 	state -> setText ("running");
 	running. store (true);
@@ -556,14 +556,13 @@
 	        p_dat < p_end; p_dat += p_inc) {
 	      const int16_t i_p = ((int16_t *)p_dat) [0];
 	      const int16_t q_p = ((int16_t *)p_dat) [1];
-	      std::complex<int16_t>dumpS = std::complex<int16_t> (i_p, q_p);
-	      dumpBuf [convIndex] = dumpS;
+	      dumpBuf [convIndex] = std::complex<int16_t> (i_p, q_p);
 	      std::complex<float>sample = std::complex<float> (i_p / 2048.0,
 	                                                       q_p / 2048.0);
 	      convBuffer [convIndex ++] = sample;
 	      if (convIndex > CONV_SIZE) {
 	         if (dumping. load ())
-	            xmlWriter -> add (dumpBuf, CONV_SIZE);
+	            xmlWriter -> add (&dumpBuf [1], CONV_SIZE);
 	         for (int j = 0; j < DAB_RATE / DIVIDER; j ++) {
 	            int16_t inpBase	= mapTable_int [j];
 	            float   inpRatio	= mapTable_float [j];

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old Added

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-dongleselect.cpp Added

@@ -0,0 +1,64 @@
+#
+/*
+ *    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, SIGNAL (clicked (QModelIndex)),
+	         this, SLOT (selectDongle (QModelIndex)));
+	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());
+}
+

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-dongleselect.h Added

@@ -0,0 +1,51 @@
+#
+/*
+ *    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
+

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-sdr.h Added

@@ -0,0 +1,368 @@
+#
+/*
+ * 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 <cstdint>
+#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

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-sdr_export.h Added

@@ -0,0 +1,47 @@
+/*
+ * 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 */

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtlsdr-handler.cpp Added

@@ -0,0 +1,683 @@
+#
+/*
+ *    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
+ *
+ * 	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	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	<QDir>
+#include	"rtlsdr-handler.h"
+#include	"rtl-dongleselect.h"
+#include	"rtl-sdr.h"
+#include	"xml-filewriter.h"
+
+#ifdef	__MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+#define	READLEN_DEFAULT	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 
+float mapTable [] = {
+ -128 / 128.0 , -127 / 128.0 , -126 / 128.0 , -125 / 128.0 , -124 / 128.0 , -123 / 128.0 , -122 / 128.0 , -121 / 128.0 , -120 / 128.0 , -119 / 128.0 , -118 / 128.0 , -117 / 128.0 , -116 / 128.0 , -115 / 128.0 , -114 / 128.0 , -113 / 128.0 
+, -112 / 128.0 , -111 / 128.0 , -110 / 128.0 , -109 / 128.0 , -108 / 128.0 , -107 / 128.0 , -106 / 128.0 , -105 / 128.0 , -104 / 128.0 , -103 / 128.0 , -102 / 128.0 , -101 / 128.0 , -100 / 128.0 , -99 / 128.0 , -98 / 128.0 , -97 / 128.0 
+, -96 / 128.0 , -95 / 128.0 , -94 / 128.0 , -93 / 128.0 , -92 / 128.0 , -91 / 128.0 , -90 / 128.0 , -89 / 128.0 , -88 / 128.0 , -87 / 128.0 , -86 / 128.0 , -85 / 128.0 , -84 / 128.0 , -83 / 128.0 , -82 / 128.0 , -81 / 128.0 
+, -80 / 128.0 , -79 / 128.0 , -78 / 128.0 , -77 / 128.0 , -76 / 128.0 , -75 / 128.0 , -74 / 128.0 , -73 / 128.0 , -72 / 128.0 , -71 / 128.0 , -70 / 128.0 , -69 / 128.0 , -68 / 128.0 , -67 / 128.0 , -66 / 128.0 , -65 / 128.0 
+, -64 / 128.0 , -63 / 128.0 , -62 / 128.0 , -61 / 128.0 , -60 / 128.0 , -59 / 128.0 , -58 / 128.0 , -57 / 128.0 , -56 / 128.0 , -55 / 128.0 , -54 / 128.0 , -53 / 128.0 , -52 / 128.0 , -51 / 128.0 , -50 / 128.0 , -49 / 128.0 
+, -48 / 128.0 , -47 / 128.0 , -46 / 128.0 , -45 / 128.0 , -44 / 128.0 , -43 / 128.0 , -42 / 128.0 , -41 / 128.0 , -40 / 128.0 , -39 / 128.0 , -38 / 128.0 , -37 / 128.0 , -36 / 128.0 , -35 / 128.0 , -34 / 128.0 , -33 / 128.0 
+, -32 / 128.0 , -31 / 128.0 , -30 / 128.0 , -29 / 128.0 , -28 / 128.0 , -27 / 128.0 , -26 / 128.0 , -25 / 128.0 , -24 / 128.0 , -23 / 128.0 , -22 / 128.0 , -21 / 128.0 , -20 / 128.0 , -19 / 128.0 , -18 / 128.0 , -17 / 128.0 
+, -16 / 128.0 , -15 / 128.0 , -14 / 128.0 , -13 / 128.0 , -12 / 128.0 , -11 / 128.0 , -10 / 128.0 , -9 / 128.0 , -8 / 128.0 , -7 / 128.0 , -6 / 128.0 , -5 / 128.0 , -4 / 128.0 , -3 / 128.0 , -2 / 128.0 , -1 / 128.0 
+, 0 / 128.0 , 1 / 128.0 , 2 / 128.0 , 3 / 128.0 , 4 / 128.0 , 5 / 128.0 , 6 / 128.0 , 7 / 128.0 , 8 / 128.0 , 9 / 128.0 , 10 / 128.0 , 11 / 128.0 , 12 / 128.0 , 13 / 128.0 , 14 / 128.0 , 15 / 128.0 
+, 16 / 128.0 , 17 / 128.0 , 18 / 128.0 , 19 / 128.0 , 20 / 128.0 , 21 / 128.0 , 22 / 128.0 , 23 / 128.0 , 24 / 128.0 , 25 / 128.0 , 26 / 128.0 , 27 / 128.0 , 28 / 128.0 , 29 / 128.0 , 30 / 128.0 , 31 / 128.0 
+, 32 / 128.0 , 33 / 128.0 , 34 / 128.0 , 35 / 128.0 , 36 / 128.0 , 37 / 128.0 , 38 / 128.0 , 39 / 128.0 , 40 / 128.0 , 41 / 128.0 , 42 / 128.0 , 43 / 128.0 , 44 / 128.0 , 45 / 128.0 , 46 / 128.0 , 47 / 128.0 
+, 48 / 128.0 , 49 / 128.0 , 50 / 128.0 , 51 / 128.0 , 52 / 128.0 , 53 / 128.0 , 54 / 128.0 , 55 / 128.0 , 56 / 128.0 , 57 / 128.0 , 58 / 128.0 , 59 / 128.0 , 60 / 128.0 , 61 / 128.0 , 62 / 128.0 , 63 / 128.0 
+, 64 / 128.0 , 65 / 128.0 , 66 / 128.0 , 67 / 128.0 , 68 / 128.0 , 69 / 128.0 , 70 / 128.0 , 71 / 128.0 , 72 / 128.0 , 73 / 128.0 , 74 / 128.0 , 75 / 128.0 , 76 / 128.0 , 77 / 128.0 , 78 / 128.0 , 79 / 128.0 
+, 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
+, 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
+, 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
+
+static
+void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
+rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
+std::complex<float> localBuffer [READLEN_DEFAULT / 2];
+
+	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
+	   return;
+
+	(void)theStick -> _I_Buffer ->
+	             putDataIntoBuffer ((std::complex<uint8_t> *)buf, len / 2);
+}
+//
+//	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:
+virtual void	run () {
+	(theStick -> rtlsdr_read_async) (theStick -> device,
+	                          (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
+	                          (void *)theStick,
+	                          0,
+	                          READLEN_DEFAULT);
+	}
+};
+//
+//	Our wrapper is a simple classs
+	rtlsdrHandler::rtlsdrHandler (QSettings *s,
+	                              QString &recorderVersion):
+	                                     myFrame (nullptr) {
+int16_t	deviceCount;
+int32_t	r;
+int16_t	deviceIndex;
+int16_t	i;
+QString	temp;
+int	k;
+char	manufac [256], product [256], serial [256];
+
+	rtlsdrSettings			= s;
+	this	-> recorderVersion	= recorderVersion;
+	setupUi (&myFrame);
+	myFrame. show ();
+	inputRate			= 2048000;
+	libraryLoaded			= false;
+	open			= false;
+	_I_Buffer		= nullptr;
+	workerHandle		= nullptr;
+	lastFrequency		= KHz (22000);	// just a dummy
+	gains			= nullptr;
+
+#ifdef	__MINGW32__
+	const char *libraryString = "rtlsdr.dll";
+	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
+	if (Handle == nullptr) {
+	   fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
+	   throw (20);
+	}
+#else
+	const char *libraryString = "librtlsdr.so";
+	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
+
+	if (Handle == nullptr) {
+	   fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
+	   throw (20);
+	}
+#endif
+	libraryLoaded	= true;
+	if (!load_rtlFunctions()) {
+#ifdef __MINGW32__
+	   FreeLibrary (Handle);
+#else
+	   dlclose (Handle);
+#endif
+	   throw (21);
+	}
+//
+//	Ok, from here we have the library functions accessible
+	deviceCount 		= this -> rtlsdr_get_device_count();
+	if (deviceCount == 0) {
+	   fprintf (stderr, "No devices found\n");
+#ifdef __MINGW32__
+	   FreeLibrary (Handle);
+#else
+	   dlclose (Handle);
+#endif
+	   throw (22);
+	}
+
+	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 (&device, deviceIndex);
+	if (r < 0) {
+	   fprintf (stderr, "Opening rtlsdr device failed\n");
+#ifdef __MINGW32__
+	   FreeLibrary (Handle);
+#else
+	   dlclose (Handle);
+#endif
+	   throw (23);
+	}
+	deviceModel	= rtlsdr_get_device_name (deviceIndex);
+	deviceVersion	-> setText (deviceModel);
+
+	open			= true;
+	r			= this -> rtlsdr_set_sample_rate (device,
+	                                                          inputRate);
+	if (r < 0) {

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtlsdr-handler.h Added

@@ -0,0 +1,149 @@
+#
+/*
+ *    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
+ *
+ */
+
+#ifndef __RTLSDR_HANDLER__
+#define	__RTLSDR_HANDLER__
+
+#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"
+class	dll_driver;
+class	xml_fileWriter;
+//
+//	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 uint32_t (*  pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
+typedef	int (*  pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
+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_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	char *(* pfnrtlsdr_get_device_name)(int);
+}
+//	This class is a simple wrapper around the
+//	rtlsdr library that is read in  as dll (or .so file in linux)
+//	It does not do any processing
+class	rtlsdrHandler: public deviceHandler, public  Ui_dabstickWidget {
+Q_OBJECT
+public:
+			rtlsdrHandler	(QSettings *, QString &);
+			~rtlsdrHandler();
+	void		setVFOFrequency	(int32_t);
+	int32_t		getVFOFrequency	();
+//	interface to the reader
+	bool		restartReader	(int32_t);
+	void		stopReader	();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples		();
+	void		resetBuffer	();
+	int16_t		maxGain		();
+	int16_t		bitDepth	();
+	QString		deviceName	();
+//
+//	These need to be visible for the separate usb handling thread
+	RingBuffer<std::complex<uint8_t>>	*_I_Buffer;
+	pfnrtlsdr_read_async	rtlsdr_read_async;
+	struct rtlsdr_dev	*device;
+private:
+	QSettings	*rtlsdrSettings;
+	QString		recorderVersion;
+	QFrame		myFrame;
+	int32_t		inputRate;
+	int32_t		deviceCount;
+	HINSTANCE	Handle;
+	dll_driver	*workerHandle;
+	int32_t		lastFrequency;
+	bool		libraryLoaded;
+	bool		open;
+	int		*gains;
+	int16_t		gainsCount;
+	QString		deviceModel;
+	FILE            *xmlDumper;
+        xml_fileWriter  *xmlWriter;
+        bool            setup_xmlDump		();
+        void            close_xmlDump		();
+        std::atomic<bool> xml_dumping;
+	FILE		*iqDumper;
+        bool            setup_iqDump		();
+        void            close_iqDump		();
+        std::atomic<bool> iq_dumping;
+
+//	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_get_center_freq rtlsdr_get_center_freq;
+	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
+	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_direct_sampling	rtlsdr_set_direct_sampling;
+	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
+	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+private slots:
+	void		set_ExternalGain	(const QString &);
+	void		set_autogain		(const QString &);
+	void		set_ppmCorrection	(int);
+	void		set_xmlDump		();
+	void		set_iqDump		();
+};
+#endif
+

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtlsdr-widget.ui Added

@@ -0,0 +1,133 @@
+<?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>203</width>
+    <height>330</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="combo_gain">
+       <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>
+    <widget class="QComboBox" name="combo_autogain">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <item>
+      <property name="text">
+       <string>autogain_off</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>autogain_on</string>
+      </property>
+     </item>
+    </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>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="label">
+     <property name="text">
+      <string>dabstick</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>

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

@@ -125,17 +125,18 @@
 	setupUi (&myFrame);
 	myFrame. show();
 	inputRate			= 2048000;
-	workerHandle		= nullptr;
-	const char *libraryString = "rtlsdr.dll";
+	workerHandle			= nullptr;
 	isActive		= false;
 #ifdef	__MINGW32__
+	const char *libraryString	= "rtlsdr.dll";
 	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
 	if (Handle == nullptr) {
 	   fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
 	   throw (20);
 	}
 #else
-	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
+	const char *libraryString	= "librtlsdr.so";
+	Handle			= dlopen ("librtlsdr.so", RTLD_NOW);
 
 	if (Handle == nullptr) {
 	   fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
@@ -150,9 +151,8 @@
 #endif
 	   throw (21);
 	}
-//
 //	Ok, from here we have the library functions accessible
-	deviceCount 		= this -> rtlsdr_get_device_count();
+	deviceCount 		= this -> rtlsdr_get_device_count ();
 	if (deviceCount == 0) {
 	   fprintf (stderr, "No devices found\n");
 #ifdef __MINGW32__

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/xml-filereader/xml-descriptor.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/xml-filereader/xml-descriptor.cpp Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/qt-devices/xml-filewriter.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/xml-filewriter.cpp Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/radio.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/radio.cpp Changed

@@ -47,6 +47,7 @@
 #include	"wavfiles.h"
 #include	"xml-filereader.h"
 #include	"color-selector.h"
+#include	"alarm-selector.h"
 #include	"dab-tables.h"
 #ifdef	TCP_STREAMER
 #include	"tcp-streamer.h"
@@ -87,7 +88,6 @@
 #ifdef	HAVE_PLUTO
 #include	"pluto-handler.h"
 #endif
-#include	"ui_technical_data.h"
 #include	"spectrum-viewer.h"
 #include	"correlation-viewer.h"
 #include	"tii-viewer.h"
@@ -136,6 +136,21 @@
 }
 #endif
 
+#define	SINGLE_SCAN		0
+#define	SCAN_TO_DATA		1
+#define	SCAN_CONTINUOUSLY	2
+
+static inline
+QString scanmodeText (int e) {
+	if (e == SINGLE_SCAN)
+	   return QString ("single scan");
+	if (e == SCAN_TO_DATA)
+	   return QString ("scan to data");
+	if (e == SCAN_CONTINUOUSLY)
+	   return QString ("scan continuously");
+	return QString ("???");
+}
+
 #define	CONTENT_BUTTON		QString ("contentButton")
 #define DETAIL_BUTTON		QString ("detailButton")
 #define	RESET_BUTTON		QString ("resetButton")
@@ -153,16 +168,7 @@
 #define NEXTSERVICE_BUTTON	QString ("nextServiceButton")
 #define	FRAMEDUMP_BUTTON	QString ("framedumpButton")
 #define	AUDIODUMP_BUTTON	QString ("audiodumpButton")
-static
-void	colorButton (QPushButton *pb, QColor c, int p) {
-QPalette pal = pb	-> palette ();
-	pal. setColor (QPalette::Button, c);
-	pb		-> setAutoFillBackground (true);
-	pb		-> setPalette (pal);
-	QFont font	= pb -> font ();
-	font. setPointSize (p);
-	pb		-> setFont (font);
-}
+#define	CONFIG_BUTTON		QString	("configButton")
 
 static
 uint8_t convert (QString s) {
@@ -220,31 +226,29 @@
 //
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
-	globals. spectrumBuffer          = &spectrumBuffer;
-	globals. iqBuffer		= &iqBuffer;
-	globals. responseBuffer		= &responseBuffer;
-	globals. tiiBuffer		= &tiiBuffer;
-	globals. frameBuffer		= &frameBuffer;
-	switchTime		=
-	                  dabSettings -> value ("switchTime", 8000). toInt ();
+	globals. spectrumBuffer	= &spectrumBuffer;
+	globals. iqBuffer	= &iqBuffer;
+	globals. responseBuffer	= &responseBuffer;
+	globals. tiiBuffer	= &tiiBuffer;
+	globals. frameBuffer	= &frameBuffer;
 	latency			=
 	                  dabSettings -> value ("latency", 5). toInt();
 
 	QString dabMode         =
-	               dabSettings   -> value ("dabMode", "Mode 1"). toString();
+	          dabSettings   -> value ("dabMode", "Mode 1"). toString();
 	globals. dabMode	= convert (dabMode);
 	globals. threshold		=
-	                  dabSettings -> value ("threshold", 3). toInt();
+	          dabSettings -> value ("threshold", 3). toInt();
 	globals. diff_length	=
-	           dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt();
+	          dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt();
 	globals. tii_delay   =
-	           dabSettings  -> value ("tii_delay", 5). toInt();
-	if (globals. tii_delay < 5)
-	   globals. tii_delay = 5;
-	globals. tii_depth       =
-	               dabSettings -> value ("tii_depth", 1). toInt();
-	globals. echo_depth      =
-	               dabSettings -> value ("echo_depth", 1). toInt();
+	          dabSettings  -> value ("tii_delay", 2). toInt();
+	if (globals. tii_delay < 2)
+	   globals. tii_delay	= 2;
+	globals. tii_depth      =
+	          dabSettings -> value ("tii_depth", 4). toInt();
+	globals. echo_depth     =
+	          dabSettings -> value ("echo_depth", 1). toInt();
 
 	currentService. valid	= false;
 	nextService. valid	= false;
@@ -275,15 +279,6 @@
 	   epgPath = epgPath + "/";
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	   filePath = filePath + "/";
-/*
- * Experimental:
- *	lots of people seem to want the scan to continue, rather than
- *	stop whever a channel with data is found.
- */
-	serviceOrder	=
-	           dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
-	normalScan	=
-	           dabSettings -> value ("normalScan", 0). toInt () == 1;
 
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
@@ -291,21 +286,45 @@
 	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (dataDisplay);
 
-	bool	b	=
-	            dabSettings -> value ("motSlides", 0). toInt () == 1;
-	motSlides	= b ? new QLabel () : nullptr;
-	if (motSlides != nullptr)
-	   motSlides		-> hide ();
-	dataDisplay		-> hide();
+	configDisplay	= new QFrame (nullptr);
+	configWidget. setupUi (configDisplay);
+
+	int x = dabSettings -> value ("muteTime", 2). toInt ();
+	configWidget. muteTimeSetting -> setValue (x);
+
+	x = dabSettings -> value ("switchDelay", 8). toInt ();
+	configWidget. switchDelaySetting -> setValue (x);
+//
+//	scanMode is - unfortunately - global
+	scanMode	=
+	           dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
+	configWidget. scanmodeSelector -> setCurrentIndex (scanMode);
+
+	bool motselectionMode =
+	           dabSettings -> value ("motSlides", 0). toInt () == 1;
+	if (motselectionMode)
+	   configWidget. motslideSelector -> setChecked (true);
+
+	x = dabSettings -> value ("serviceOrder", ALPHA_BASED). toInt ();
+	if (x == ALPHA_BASED)
+	   configWidget. orderAlfabetical -> setChecked (true);
+	else
+	if (x == ID_BASED)
+	   configWidget. orderServiceIds -> setChecked (true);
+	else
+	   configWidget. ordersubChannelIds -> setChecked (true);
+	motSlides		= nullptr;
+	dataDisplay		-> hide ();
+	stillMuting		-> hide ();
 	serviceList. clear ();
         model . clear ();
         ensembleDisplay         -> setModel (&model);
-
-	bool showWidget         =
-	                 dabSettings -> value ("showDeviceWidget", 0).
-                                                              toInt () != 0;
-	devicewidgetButton	-> setText (showWidget ? "show" : "hide");
-
+	alarmLabel		->
+                         setStyleSheet ("QLabel {background-color : red}");
+	alarmLabel		-> setText ("Alarm");
+	alarmLabel		-> hide ();
+/*
+ */
 #ifdef	DATA_STREAMER
 	dataStreamer		= new tcpServer (dataPort);
 #else
@@ -384,7 +403,6 @@
 	        setStyleSheet ("QLabel {background-color : red; color: white}");
 	techData. stereoLabel		->
 	        setStyleSheet ("QLabel {background-color : red}");
-
 //
 	connect (streamoutSelector, SIGNAL (activated (int)),
 	         this,  SLOT (set_streamSelector (int)));
@@ -413,6 +431,8 @@
 	         this, SLOT (color_sourcedumpButton (void)));
 	connect (muteButton, SIGNAL (rightClicked (void)),
 	         this, SLOT (color_muteButton (void)));
+	connect (configButton, SIGNAL (rightClicked (void)),
+	         this, SLOT (color_configButton (void)));
 
 	connect	(prevChannelButton, SIGNAL (rightClicked (void)),
 	         this, SLOT (color_prevChannelButton (void)));
@@ -427,6 +447,7 @@
 	         this, SLOT (color_framedumpButton (void)));
 	connect (techData. audiodumpButton, SIGNAL (rightClicked (void)),
 	         this, SLOT (color_audiodumpButton (void)));
+
 //	display the version

_service:download_url:qt-dab-3.5.3.tar.gz/dab-maxi/radio.h -> _service:download_url:qt-dab-3.6.tar.gz/dab-maxi/radio.h Changed

@@ -50,6 +50,7 @@
 #include	"scanner-table.h"
 #ifdef	TRY_EPG
 #include	"epgdec.h"
+#include	"si-processor.h"
 #endif
 
 #include	"spectrum-viewer.h"
@@ -64,6 +65,7 @@
 class	historyHandler;
 
 #include	"ui_technical_data.h"
+#include	"ui_config-helper.h"
 
 /*
  *	The main gui object. It inherits from
@@ -112,11 +114,13 @@
 	scannerTable		theTable;
 	Ui_technical_data	techData;
 	QFrame			*dataDisplay;
+	Ui_configWidget		configWidget;
+	QFrame			*configDisplay;
 	QSettings		*dabSettings;
 	dabService		currentService;
 	dabService		nextService;
 
-	bool			normalScan;
+	QByteArray		transmitters;
 	int16_t			tii_delay;
 	int32_t			dataPort;
 	serviceDescriptor	*currentServiceDescriptor;
@@ -135,12 +139,12 @@
 #endif
 #ifdef	TRY_EPG
 	CEPGDecoder		epgHandler;
+	siProcessor		siHandler;
 #endif
 	bool			saveSlides;
 	QString			picturesPath;
 	QString			epgPath;
 	QString			filePath;
-	int			switchTime;
 #ifdef	_SEND_DATAGRAM_
 	QUdpSocket		dataOut_socket;
 	QString			ipAddress;
@@ -149,7 +153,7 @@
 	SNDFILE                 *rawDumper;
         FILE                    *frameDumper;
         SNDFILE                 *audioDumper;
-
+	int			scanMode;
 	void			set_Colors		();
 	void			set_channelButton	(int);
 	QStandardItemModel	model;
@@ -165,8 +169,10 @@
 	QTimer			presetTimer;
 	QTimer			startTimer;
 	QTimer			muteTimer;
+	QTimer			epgTimer;
+	QTimer			alarmTimer;
+	int			muteDelay;
 	int32_t			numberofSeconds;
-	int32_t			muteDelay;
 	bool			muting;
 	int16_t			ficBlocks;
 	int16_t			ficSuccess;
@@ -185,10 +191,18 @@
 	void			showButtons		();
 	deviceHandler		*setDevice		(const QString &);
 	historyHandler		*my_history;
+	historyHandler		*my_presets;
 //
 	void			start_audioService	(audiodata *);
 	void			start_packetService	(const QString &);
 	void			startScanning		();
+	FILE			*findContentDump_fileName	(const QString &);
+	FILE			*findFrameDump_fileName	(const QString &,
+	                                                 const QString &);
+	SNDFILE			*findAudioDump_fileName	(const QString &,
+	                                                 const QString &);
+	SNDFILE			*findRawDump_fileName	(const QString &,
+	                                                 const QString &);
 	FILE			*findScanDump_FileName	();
 	FILE			*scanDumpFile;
 	void			stopScanning		(bool);
@@ -255,7 +269,7 @@
 	void			showIQ			(int);
 	void			showQuality		(float);
 	void			show_rsCorrections	(int);
-	void			show_tii		(QByteArray);
+	void			show_tii		(int, int);
 	void			closeEvent		(QCloseEvent *event);
 	void			showTime		(const QString &);
 	void			startAnnouncement	(const QString &, int);
@@ -299,7 +313,9 @@
 	void			selectService		(QModelIndex);
 	void			setPresetStation	();
 	void			handle_muteButton	();
-
+	void			muteButton_timeOut	();
+	void			epgTimer_timeOut	();
+	void			alarmTimer_timeOut	();
 //
 //	color handlers
 	void			color_contentButton	();
@@ -319,6 +335,19 @@
 	void			color_nextServiceButton	();
 	void			color_framedumpButton	();
 	void			color_audiodumpButton	();
+	void			color_configButton	();
+//
+//	config handlers
+	void			handle_configSetting	();
+	void			handle_muteTimeSetting	(int);
+	void			handle_switchDelaySetting (int);
+	void			handle_orderAlfabetical	();
+	void			handle_orderServiceIds	();
+	void			handle_ordersubChannelIds	();
+	void			handle_alarmSelector	(const QString &);
+	void			handle_setTime_button	();
+	void			handle_plotLengthSetting	(int);
+	void			handle_scanmodeSelector	(int);
+	void			handle_motslideSelector	(int);
 };
 #endif
-

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/si-processor.cpp Added

@@ -0,0 +1,304 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	"si-processor.h"
+
+class	serviceInfo {
+public:
+	uint32_t	serviceId;
+	QString		serviceName;
+	QString		description;
+	QString		keywords;
+};
+
+class	ensembleInfo {
+public:
+	uint32_t	ensembleId;
+	std::vector<serviceInfo> services;
+};
+
+static
+uint8_t	bitTable [] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+
+static
+int	getBit (uint8_t *v, int bitnr) {
+int bytenr	= bitnr / 8;
+
+	bitnr 	= bitnr % 8;
+	return (v [bytenr] & bitTable [bitnr]) != 0 ? 1 : 0;
+}
+
+static
+uint32_t getBits (uint8_t *v, int bitnr, int length) {
+uint16_t res	= 0;
+	for (int i = 0; i < length; i ++) {
+	   res <<= 1;
+	   res |= getBit (v, bitnr + i);
+	}
+	return res;
+}
+
+#define	STRING		0x01
+#define	SI		0x03
+#define	STRING_TABLE	0x04
+#define	LONG_NAME	0x12
+#define	MEDIA_DESCRIPTION	0x13
+#define	KEYWORDS	0x16
+#define	ENSEMBLE	0x26
+#define	SERVICE		0x28
+#define	BEARER		0x29
+
+
+		siProcessor::siProcessor	() {}
+
+		siProcessor::~siProcessor	() {}
+
+ensembleInfo *siProcessor::process_SI (uint8_t *data, int length) {
+int	pos	= 0;
+uint8_t c	= data [pos];		// 
+ensembleInfo	*res	= nullptr;
+int	ilength;
+
+	this	-> data		= data;
+	this	-> length	= length;
+	ilength	= header (&pos);
+
+	if (c != SI) {
+	   pos += length;
+	   return nullptr;
+	}
+
+	int lpos	= pos;
+	while (lpos < pos + ilength) {
+//	   fprintf (stderr, "current key %x\n", data [lpos]);
+	   if (data [lpos] == STRING_TABLE) { // create a token table
+	      int llength = header (&lpos);
+	      lpos += llength;
+	   }
+	   else
+	   if (data [lpos] == ENSEMBLE) {
+	      res = process_ensemble (&lpos);
+	   }
+	   else {		// creation time, ignore
+//	      int llpos = lpos;
+	      int llength = header (&lpos);
+//	      fprintf (stderr, "key %x met lengte %d\n",
+//	                         data [llpos], llength);
+	      lpos += llength;
+	   }
+	   
+	}
+	return res;
+}
+
+ensembleInfo	*siProcessor::process_ensemble (int *pos) {
+int	lpos	= *pos;
+int	length	= header (&lpos);
+int	eoFrame	= lpos + length;
+int	res	= 0;
+int	llength	= 0;
+
+ensembleInfo *ensemble	= new ensembleInfo;
+	ensemble -> ensembleId = 0;
+	while (lpos < eoFrame) {
+	   res		= 0;
+	   int tag	= data [lpos];
+	   llength	= header (&lpos);
+	   switch (tag) {
+	      case 0x80:
+	         res = (data [lpos] << 16) |
+	               (data [lpos + 1] << 8) |
+	                data [lpos + 2];
+	         ensemble -> ensembleId = res;
+	         lpos += llength;
+	         break;
+
+	      case SERVICE:
+	         { int llpos = lpos;
+	           ensemble ->services.
+	                  push_back (process_service (&llpos, llength));
+	           lpos += llength;
+	         }
+	         break;
+
+	      default:
+	         fprintf (stderr, "tag %x with length %d\n",
+	                             tag, llength);
+	         lpos += llength;
+	         break;
+	   }
+	}
+	*pos += length;
+	fprintf (stderr, "ensemble info\n");
+	if (ensemble -> ensembleId != 0)
+	   fprintf (stderr, "ensembleId = %X\n\n", ensemble -> ensembleId);
+	for (uint i = 0; i < ensemble -> services. size (); i ++) {
+	   fprintf (stderr, "\nservice: %s, %x\n",
+	                    ensemble -> services. at (i). serviceName. toLatin1 (). data (),
+	                    ensemble -> services. at (i). serviceId);
+	   fprintf (stderr, "description: %s\n",
+	                    ensemble -> services. at (i). description. toLatin1 (). data ());
+	   if (ensemble -> services. at (i). keywords != "")
+	      fprintf (stderr, "keywords: %s\n",
+	                    ensemble -> services. at (i). keywords. toLatin1 (). data ());
+	}
+	return ensemble;
+}
+
+serviceInfo siProcessor::process_service (int *pos, int length) {
+int	lpos	= *pos;
+int	eoFrame	= lpos + length;
+serviceInfo	res;
+
+	while (lpos < eoFrame) {
+	   int tag	= data [lpos];
+	   int llength	= header (&lpos);
+	   switch (tag) {
+	      case BEARER:
+	         res. serviceId		= process_serviceId (lpos);
+	         break;
+	      case LONG_NAME:
+	         res. serviceName	= process_serviceName (lpos);
+	         break;
+	      case MEDIA_DESCRIPTION: {
+	         QString h 		= process_mediaDescription (lpos);
+	         if (h != "")
+	            res. description	= h;
+	         break;
+	      }
+	      case KEYWORDS:
+	         res. keywords	= process_keywords (lpos);
+	         break;
+
+	      default:
+	         break;
+	   }
+	   lpos += llength;
+	}
+	*pos = eoFrame;
+	return res;
+}

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/si-processor.h Added

@@ -0,0 +1,57 @@
+#
+/*
+ *    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	__SI_PROCESSOR__
+#define	__SI_PROCESSOR__
+
+#include	<QString>
+#include	<stdio.h>
+#include	<stdint.h>
+#include	<stdlib.h>
+#include	<vector>
+
+class	ensembleInfo;
+class	serviceInfo;
+
+class	siProcessor {
+public:
+		siProcessor		();
+		~siProcessor		();
+ensembleInfo	*process_SI		(uint8_t *, int);
+private:
+int		header			(int *pos);
+ensembleInfo	*process_ensemble	(int *pos);
+serviceInfo	process_service		(int *pos, int length);
+
+int		process_serviceId	(int pos);
+QString		process_serviceName	(int pos);
+QString		process_mediaDescription (int pos);
+QString		process_keywords	(int pos);
+QString		longDescription		(int pos);
+
+QString stringTable [30];
+uint8_t	*data;
+int	length;
+};
+
+#endif
+

_service:download_url:qt-dab-3.5.3.tar.gz/dab-mini/CMakeLists.txt -> _service:download_url:qt-dab-3.6.tar.gz/dab-mini/CMakeLists.txt Changed

_service:download_url:qt-dab-3.5.3.tar.gz/dab-mini/dab-mini.pro -> _service:download_url:qt-dab-3.6.tar.gz/dab-mini/dab-mini.pro Changed

@@ -265,16 +265,16 @@
 }
 
 #for 64 bit
-	TARGET		= dabMini-64-1.0
-	DEFINES		+= __BITS64__
-	DESTDIR		= /usr/shared/sdr-j-development/w64-programs/windows-dab64-mini
-	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
-	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
+#	TARGET		= dabMini-64-1.0
+#	DEFINES		+= __BITS64__
+#	DESTDIR		= /usr/shared/sdr-j-development/w64-programs/windows-dab64-mini
+#	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
+#	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
 #for 32 bit
-#	TARGET		= dabMini-32-1.0
-#	DESTDIR		= /usr/shared/sdr-j-development/w32-programs/windows-dab32-mini
-#	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
-#	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
+	TARGET		= dabMini-32-2.0
+	DESTDIR		= /usr/shared/sdr-j-development/w32-programs/windows-dab32-mini
+	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
+	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
 
 #	common:
 INCLUDEPATH	+= /usr/local/include
@@ -293,9 +293,6 @@
 CONFIG		+= airspy
 CONFIG		+= dabstick
 CONFIG		+= sdrplay
-CONFIG		+= hackrf
-CONFIG		+= pluto
-CONFIG		+= lime
 
 #CONFIG		+= PC
 CONFIG		+= NO_SSE

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/dabMini-32-2.0_resource.rc Added

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/dabMini-64-1.0_resource.rc Added

_service:download_url:qt-dab-3.5.3.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-3.6.tar.gz/dab-processor.cpp Changed

@@ -89,8 +89,8 @@
 	         myRadioInterface, SLOT (setSyncLost (void)));
 	connect (this, SIGNAL (show_Spectrum (int)),
 	         myRadioInterface, SLOT (showSpectrum (int)));
-	connect (this, SIGNAL (show_tii (QByteArray)),
-	         myRadioInterface, SLOT (show_tii (QByteArray)));
+	connect (this, SIGNAL (show_tii (int, int)),
+	         myRadioInterface, SLOT (show_tii (int, int)));
 	connect (this, SIGNAL (show_snr (int)),
 	         mr, SLOT (show_snr (int)));
 	connect (this, SIGNAL (show_clockErr (int)),
@@ -113,6 +113,7 @@
 void	dabProcessor::start (int frequency) {
 	this	-> frequency	= frequency;
 	my_ficHandler. reset	();
+	transmitters. clear ();
 	if (!scanMode)
 	   my_mscHandler. reset_Channel ();
 	QThread::start ();
@@ -133,7 +134,7 @@
    *	Finally, estimating the small freqency error
    */
 void	dabProcessor::run	() {
-int32_t startIndex;
+int32_t		startIndex;
 int32_t		i;
 std::complex<float>	FreqCorr;
 timeSyncer	myTimeSyncer (&myReader);
@@ -325,13 +326,16 @@
 	     if (wasSecond (my_ficHandler. get_CIFcount(), &params)) {
 	         my_TII_Detector. addBuffer (ofdmBuffer);
 	         if (++tii_counter >= tii_delay) {
-	            QByteArray secondaries =
-	                              my_TII_Detector. processNULL ();
-	            show_tii (secondaries);
+	            uint16_t res = my_TII_Detector. processNULL ();
+	            if (res != 0) {
+	               uint8_t mainId	= res >> 8;
+	               uint8_t subId	= res & 0xFF;
+	               show_tii (mainId, subId);
+	            }
 	            tii_counter = 0;
 	            my_TII_Detector. reset();
 	         }
-	        tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
+	         tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
 	      }
 	   }
 /**
@@ -375,9 +379,9 @@
 void	dabProcessor::getFrameQuality	(int	*totalFrames,
 	                                 int	*goodFrames,
 	                                 int	*badFrames) {
-	*totalFrames	= this	-> totalFrames;
-	*goodFrames	= this	-> goodFrames;
-	*badFrames	= this	-> badFrames;
+	*totalFrames		= this	-> totalFrames;
+	*goodFrames		= this	-> goodFrames;
+	*badFrames		= this	-> badFrames;
 	this	-> totalFrames	= 0;
 	this	-> goodFrames	= 0;
 	this	-> badFrames	= 0;

_service:download_url:qt-dab-3.5.3.tar.gz/dab-processor.h -> _service:download_url:qt-dab-3.6.tar.gz/dab-processor.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/docs/qt-dab.pdf -> _service:download_url:qt-dab-3.6.tar.gz/docs/qt-dab.pdf Changed

_service:download_url:qt-dab-3.6.tar.gz/forms/config-helper.ui Added

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>configWidget</class>
+ <widget class="QWidget" name="configWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>373</width>
+    <height>415</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Configuration</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>mute time (in minutes)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="smallSpinBox" name="muteTimeSetting">
+     <property name="toolTip">
+      <string>Set here the mute time in minutes</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>switch time (in seconds)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="4">
+    <widget class="smallSpinBox" name="switchDelaySetting">
+     <property name="toolTip">
+      <string>Set here the delay, when searching for data in a channel, in seconds</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string> PlotLength (unit 100)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="4" rowspan="2">
+    <widget class="smallSpinBox" name="plotLengthSetting">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>10</number>
+     </property>
+     <property name="value">
+      <number>5</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QComboBox" name="scanmodeSelector">
+     <item>
+      <property name="text">
+       <string>single scan</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>scan to data</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>continuous</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="5">
+    <widget class="QCheckBox" name="motslideSelector">
+     <property name="text">
+      <string>    mot slides on separate widget</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="3" colspan="2">
+    <widget class="QRadioButton" name="orderAlfabetical">
+     <property name="text">
+      <string>Alfabetically</string>
+     </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string> service order in list</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3" colspan="2">
+    <widget class="QRadioButton" name="orderServiceIds">
+     <property name="text">
+      <string>serviceIds</string>
+     </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
+    </widget>
+   </item>
+   <item row="7" column="3" colspan="2">
+    <widget class="QRadioButton" name="ordersubChannelIds">
+     <property name="text">
+      <string>subchannelIds</string>
+     </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>alarm</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="3">
+    <widget class="smallSpinBox" name="alarm_hours">
+     <property name="maximum">
+      <number>23</number>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="4">
+    <widget class="smallSpinBox" name="alarm_minutes">
+     <property name="maximum">
+      <number>59</number>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="2">
+    <widget class="smallPushButton" name="setTime_button">
+     <property name="text">
+      <string>set Time</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="2" colspan="3">
+    <widget class="QComboBox" name="alarmSelector">
+     <property name="toolTip">
+      <string>An alarm can be set. If the alarm time is reached, the selected service will be chosen.</string>
+     </property>
+     <item>
+      <property name="text">
+       <string>set alarm</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>remove alarm</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>smallSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header location="global">smallspinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>smallPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">smallpushbutton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="buttonGroup"/>
+ </buttongroups>
+</ui>

_service:download_url:qt-dab-3.5.3.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-3.6.tar.gz/forms/dabradio.ui Changed

@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Qt-DAB-3.5.3</string>
+   <string>Qt-DAB-3.6</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_3">
    <item>
@@ -147,6 +147,9 @@
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_6">
           <item>
+           <widget class="QLCDNumber" name="stillMuting"/>
+          </item>
+          <item>
            <layout class="QHBoxLayout" name="horizontalLayout_9">
             <item>
              <widget class="QLabel" name="runtimeDisplay">
@@ -401,13 +404,6 @@
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>FIC </string>
-            </property>
-           </widget>
-          </item>
-          <item>
            <widget class="QProgressBar" name="ficError_display">
             <property name="maximumSize">
              <size>
@@ -420,6 +416,20 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>FIC </string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="alarmLabel">
+            <property name="text">
+             <string>Alarm</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>
@@ -517,10 +527,10 @@
       </item>
       <item>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="2" colspan="3">
-         <widget class="smallPushButton" name="detailButton">
+        <item row="2" column="0" colspan="4">
+         <widget class="smallComboBox" name="streamoutSelector">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <sizepolicy hsizetype="Ignored" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -532,15 +542,27 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for further technical information about the selected program&lt;/p&gt;&lt;p&gt;Push again for closing the pop-up-window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a device (channel) for the audio output. On program start up a default is chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <item>
+           <property name="text">
+            <string>Audio Device</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="smallPushButton" name="historyButton">
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;history feature. The software maintains a list of all services encountered. Touching this button will show (hide) the list. By clicking with the left mouse button the software will try to select the service pointed to, by clicking with the ruight mouse button the lit will be deleted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>Detail</string>
+           <string>list</string>
           </property>
          </widget>
         </item>
         <item row="0" column="5">
-         <widget class="smallPushButton" name="resetButton">
+         <widget class="verySmallPushButton" name="resetButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -555,8 +577,8 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="6" colspan="2">
-         <widget class="smallPushButton" name="scanButton">
+        <item row="1" column="2" colspan="3">
+         <widget class="verySmallPushButton" name="show_correlationButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -570,40 +592,28 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>Touching the scan button will cause the software to make a single scan over all channels in the selected band. Ensembles (and their services) found will be displayed in a separate window.
-The windows will be visible as long as the scanning mode is on (note that after completing the
-scan, i.e. the cycle from (in Mode I) channel 5A to 13F, the software will wait until the scanner
-is officlally stopped).</string>
+           <string>Touching this button will show (or hide) the resulting correlation of the first datablock of the DAB
+ensemble with the values as they should be. The &quot;peaks&quot; (if any) show the samples where
+the correlation is strongest. More than one peak shows more than one transmitter within
+the reach of this receiver.</string>
           </property>
           <property name="text">
-           <string>Scan</string>
+           <string>corr-result</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" colspan="2">
-         <widget class="smallPushButton" name="show_tiiButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="font">
-           <font>
-            <family>DejaVu Sans</family>
-            <pointsize>10</pointsize>
-           </font>
-          </property>
+        <item row="1" column="7">
+         <widget class="verySmallPushButton" name="devicewidgetButton">
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If configured - pushing this button will switch the spectrum display between &amp;quot;regular&amp;quot; and a spectrum showing the &amp;quot;null symbol&amp;quot; period. In the console window the pattern, main ID and sub ID of the TII will be displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>Hide or show the widget for device control.</string>
           </property>
           <property name="text">
-           <string>TII</string>
+           <string>show</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="2" colspan="3">
-         <widget class="smallPushButton" name="show_correlationButton">
+        <item row="3" column="1" colspan="3">
+         <widget class="verySmallPushButton" name="dumpButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -617,18 +627,15 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>Touching this button will show (or hide) the resulting correlation of the first datablock of the DAB
-ensemble with the values as they should be. The &quot;peaks&quot; (if any) show the samples where
-the correlation is strongest. More than one peak shows more than one transmitter within
-the reach of this receiver.</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save the raw input. Pushing will cause a menu to appear where a filename can be selected. Please note the big filesizes!&lt;/p&gt;&lt;p&gt;Push again to stop recording. You can reload it by using the file input (*.sdr) option. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>corr-result</string>
+           <string>Raw dump</string>
           </property>
          </widget>
         </item>
         <item row="1" column="5" colspan="2">
-         <widget class="smallPushButton" name="show_spectrumButton">
+         <widget class="verySmallPushButton" name="show_spectrumButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -649,20 +656,10 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="7">
-         <widget class="smallPushButton" name="devicewidgetButton">
-          <property name="toolTip">
-           <string>Hide or show the widget for device control.</string>
-          </property>
-          <property name="text">
-           <string>show</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0" colspan="4">
-         <widget class="smallComboBox" name="streamoutSelector">

_service:download_url:qt-dab-3.5.3.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-3.6.tar.gz/includes/dab-constants.h Changed

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

_service:download_url:qt-dab-3.6.tar.gz/includes/support/alarm-selector.h Added

_service:download_url:qt-dab-3.6.tar.gz/includes/support/color-selector.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/includes/support/ensemble-printer.h -> _service:download_url:qt-dab-3.6.tar.gz/includes/support/ensemble-printer.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/includes/support/presetcombobox.h -> _service:download_url:qt-dab-3.6.tar.gz/includes/support/presetcombobox.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/includes/support/scanner-table.h -> _service:download_url:qt-dab-3.6.tar.gz/includes/support/scanner-table.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-1.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-dab-1.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-2.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-dab-2.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-buttons.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-dab-buttons.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-colors.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-dab-colors.png Changed

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

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-history.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-dab-history.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/qt-dab-presets.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-dab-presets.png Changed

_service:download_url:qt-dab-3.6.tar.gz/qt-dab-scan-button.png Added

_service:download_url:qt-dab-3.5.3.tar.gz/qt-usersguide.png -> _service:download_url:qt-dab-3.6.tar.gz/qt-usersguide.png Changed

_service:download_url:qt-dab-3.5.3.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-3.6.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

@@ -41,17 +41,17 @@
 	this	-> iqBuffer		= ibuffer;
 
 	dabSettings	-> beginGroup ("spectrumViewer");
-	colorString		= dabSettings -> value ("displayColor",
+	colorString	= dabSettings -> value ("displayColor",
 	                                           "black"). toString();
-	displayColor		= QColor (colorString);
-	colorString		= dabSettings -> value ("gridColor",
+	displayColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("gridColor",
 	                                           "white"). toString();
-	gridColor		= QColor (colorString);
-	colorString		= dabSettings -> value ("curveColor",
+	gridColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("curveColor",
 	                                            "white"). toString();
-	curveColor		= QColor (colorString);
-	brush			= dabSettings -> value ("brush", 0). toInt () == 1;
-	displaySize		= dabSettings -> value ("displaySize", 1024).toInt();
+	curveColor	= QColor (colorString);
+	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
+	displaySize	= dabSettings -> value ("displaySize", 1024).toInt();
 	dabSettings	-> endGroup ();
 	if ((displaySize & (displaySize - 1)) != 0)
 	   displaySize = 1024;
@@ -312,6 +312,7 @@
 	dabSettings	-> setValue ("gridColor", gridColor);
 	dabSettings	-> setValue ("curveColor", curveColor);
 	dabSettings	-> endGroup ();
+
 	this		-> displayColor	= QColor (displayColor);
 	this		-> gridColor	= QColor (gridColor);
 	this		-> curveColor	= QColor (curveColor);

_service:download_url:qt-dab-3.5.3.tar.gz/src/backend/data/epg/epgdec.cpp -> _service:download_url:qt-dab-3.6.tar.gz/src/backend/data/epg/epgdec.cpp Changed

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

@@ -148,22 +148,21 @@
 	my_fftHandler. do_FFT();
 
 	for (i = 0; i < T_u; i ++)
-	    theBuffer [i] = cmul (theBuffer [i], 0.9) +
-	                    cmul (fft_buffer [i], 0.1);
+//	   theBuffer [i] = cmul (theBuffer [i], 0.9) +
+//	                   cmul (fft_buffer [i], 0.1);
+	   theBuffer [i] += fft_buffer [i];
 }
-
+//
+//	Note that the input is fft output, not yet reodered
 void	TII_Detector::collapse (std::complex<float> *inVec, float *outVec) {
 int	i;
-
-	for (i = 0; i < carriers / 8; i ++) {
+	for (i = 0; i < carriers / 8; i ++) {	
 	   int carr = - carriers / 2 + 2 * i;
 	   outVec [i] = abs (real (inVec [(T_u + carr) % T_u] *
 	                            conj (inVec [(T_u + carr + 1) % T_u])));
-
 	   carr	= - carriers / 2 + 1 * carriers / 4 + 2 * i;
 	   outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
 	                            conj (inVec [(T_u + carr + 1) % T_u])));
-
 	   carr	= - carriers / 2 + 2 * carriers / 4 + 2 * i + 1;
 	   outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
 	                            conj (inVec [(T_u + carr + 1) % T_u])));
@@ -179,14 +178,12 @@
 
 #define	NUM_GROUPS	8
 #define	GROUPSIZE	24
-QByteArray	TII_Detector::processNULL () {
+uint16_t	TII_Detector::processNULL () {
 int i, j;
-float	hulpTable	[NUM_GROUPS * GROUPSIZE];
+float	hulpTable	[NUM_GROUPS * GROUPSIZE]; // collapses values
 float	C_table		[GROUPSIZE];	// contains the values
 int	D_table		[GROUPSIZE];	// count of indices in C_table with data
 float	avgTable	[NUM_GROUPS];
-float	minTable	[NUM_GROUPS];
-QByteArray results;
 
 //	we map the "carriers" carriers (complex values) onto
 //	a collapsed vector of "carriers / 8" length, 
@@ -202,16 +199,13 @@
 
 	memset (avgTable, 0, NUM_GROUPS * sizeof (float));
 	for (i = 0; i < NUM_GROUPS; i ++) {
-	   minTable [i] = hulpTable [i * GROUPSIZE + 0];
 	   avgTable [i] = 0;
-	   for (j = 0; j < GROUPSIZE; j ++) {
+	   for (j = 0; j < GROUPSIZE; j ++) 
 	      avgTable [i] += hulpTable [i * GROUPSIZE + j];
-	      if (hulpTable [i * GROUPSIZE + j] < minTable [i])
-	         minTable [i] = hulpTable [i * GROUPSIZE + j];
-	   }
+
 	   avgTable [i] /= GROUPSIZE;
 	}
-//	
+//
 //	Determining the offset is then easy, look at the corresponding
 //	elements in the NUM_GROUPS sections and mark the highest ones.
 //	The summation of the high values are stored in the C_table,
@@ -220,7 +214,7 @@
 //
 //	So, basically we look into GROUPSIZE colums of NUMGROUPS
 //	values and look for the maximum
-//	Threshold 4 * avgTable is 6dB, we consider that a minimum
+//	Threshold 4 * avgTable is 6 dB, we consider that a minimum
 //	measurement shows that that is a reasonable value,
 //	alternatively, we could take the "minValue" as reference
 //	and "raise" the threshold. However, that might be
@@ -228,13 +222,11 @@
 	memset (D_table, 0, GROUPSIZE * sizeof (int));
 	memset (C_table, 0, GROUPSIZE * sizeof (float));
 //
-	for (j = 0; j < NUM_GROUPS; j ++) {
-	   for (i = 0; i < GROUPSIZE; i ++) {
+//	We gebruiken C en D table alleen maar om de begin offset
+//	te kunnen vinden
+	for (i = 0; i < GROUPSIZE; i ++) {
+	   for (j = 0; j < NUM_GROUPS; j ++) {
 	      if (hulpTable [j * GROUPSIZE + i] > 4 * avgTable [j]) {
-//	         fprintf (stderr, "index (%d, %d) -> %f (%f)\n",
-//	                           i, j,
-//	             20 * log10 (hulpTable [j * GROUPSIZE + i] / avgTable [j]),
-//	             20 * log10 (hulpTable [j * GROUPSIZE + i] / minTable [j]));
 	         C_table [i] += hulpTable [j * GROUPSIZE + i];
 	         D_table [i] ++;
 	      }
@@ -243,58 +235,46 @@
 
 //	we extract from this result the highest values that
 //	meet the constraint of 4 values being sufficiently high
-//	up to "depth"  values.
-	float	maxTable [depth];
-	int	maxIndex [depth];
-	uint16_t pattern [depth];
+	float	maxTable	= 0;
+	int	maxIndex	= -1;
 	
-	for (int k = 0; k < depth; k ++) {
-	   maxTable [k] = 0;
-	   maxIndex [k] = -1;
-	   pattern  [k] = 0;
-	   for (j = 0; j < GROUPSIZE; j ++) {
-	      if ((D_table [j] >= 4) && (C_table [j] > maxTable [k])) {
-	         maxTable [k] = C_table [j];
-	         maxIndex [k] = j;
-	      }
-	   }
-	   if (maxIndex [k] >= 0) {
-	      D_table [maxIndex [k]] = 0;
-	   }
-	   else
+	for (j = 0; j < GROUPSIZE; j ++) {
+	   if ((D_table [j] >= 4) && (C_table [j] > maxTable)) {
+	      maxTable = C_table [j];
+	      maxIndex = j;
 	      break;
+	   }
 	}
-
 //
+	if (maxIndex < 0)
+	   return 0;
+
 //	The - almost - final step is then to figure out which
-//	groups contributed, obviously only where maxIndex [k] > 0
+//	groups contributed, obviously only where maxIndex  > 0
 //	we start with collecting the values of the correct
 //	elements of the NUM_GROUPS groups
+
+	float x [NUM_GROUPS];
+	for (i = 0; i < NUM_GROUPS; i ++) 
+	   x [i] = hulpTable [maxIndex + GROUPSIZE * i];
 //
-	for (j = 0; (j < depth) && (maxIndex [j] >= 0); j ++) {
-	   float x [NUM_GROUPS];
-	   for (i = 0; i < NUM_GROUPS; i ++) {
-	      x [i] = hulpTable [maxIndex [j] + GROUPSIZE * i];
-	   }
-//
-//	we extract the four max values (it is known that they exist)
-	   for (i = 0; i < 4; i ++) {
-	      float	mmax	= 0;
-	      int ind	= -1;
-	      for (int k = 0; k < NUM_GROUPS; k ++) {
-	         if (x [k] > mmax) {
-	            mmax = x [k];
-	            ind  = k;
-	         }
-	      }
-	      if (ind != -1) {
-	         x [ind] = 0;
-	         pattern [j] |= bits [ind];
+//	we extract the four max values as bits
+	uint16_t pattern	= 0;
+	for (i = 0; i < 4; i ++) {
+	   float mmax	= 0;
+	   int ind		= -1;
+	   for (int k = 0; k < NUM_GROUPS; k ++) {
+	      if (x [k] > mmax) {
+	         mmax = x [k];
+	         ind  = k;
 	      }
 	   }
-	   results. append (invTable [pattern [j]]);
-	   results. append (maxIndex [j]);
+
+	   if (ind != -1) {
+	      x [ind] = 0;
+	      pattern |= bits [ind];
+	   }
 	}
-	return results;
+	return  maxIndex + (invTable [pattern]) * 256;
 }

_service:download_url:qt-dab-3.6.tar.gz/src/ofdm/tii_detector.cpp-old Added

@@ -0,0 +1,291 @@
+#
+/*
+ *    Copyright (C) 2014 .. 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
+ */
+
+#include	"tii_detector.h"
+#include	<cstdio>
+#include	<cinttypes>
+//
+
+static
+uint8_t table [] = {
+	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
+};
+
+
+		TII_Detector::TII_Detector (uint8_t dabMode, int16_t depth):
+	                                    params (dabMode),
+	                                    my_fftHandler (dabMode) {
+int16_t	i;
+
+	this	-> depth	= depth;
+	this	-> T_u		= params. get_T_u();
+	carriers		= params. get_carriers();
+	theBuffer. resize	(T_u);
+	fft_buffer		= my_fftHandler. getVector();	
+	window. resize 		(T_u);
+	for (i = 0; i < T_u; i ++)
+	   window [i]  = (0.42 -
+	            0.5 * cos (2 * M_PI * (float)i / T_u) +
+	            0.08 * cos (4 * M_PI * (float)i / T_u));
+
+	for (i = 0; i < 256; ++i)
+	    invTable [i] =  -1;
+	for (i = 0; i < 70; ++i) 
+	    invTable [table [i]] = i;
+}
+
+		TII_Detector::~TII_Detector() {
+}
+
+
+void	TII_Detector::reset() {
+	for (int i = 0; i < T_u; i ++)
+	   theBuffer [i] = std::complex<float> (0, 0);
+}
+
+//	To eliminate (reduce?) noise in the input signal, we might
+//	add a few spectra before computing (up to the user)
+void	TII_Detector::addBuffer (std::vector<std::complex<float>> v) {
+int	i;
+
+	for (i = 0; i < T_u; i ++)
+	   fft_buffer [i] = cmul (v [i], window [i]);
+	my_fftHandler. do_FFT();
+
+	for (i = 0; i < T_u; i ++)
+//	   theBuffer [i] = cmul (theBuffer [i], 0.9) +
+//	                   cmul (fft_buffer [i], 0.1);
+	   theBuffer [i] += fft_buffer [i];
+}
+//
+//	Note that the input is fft output, not yet reodered
+void	TII_Detector::collapse (std::complex<float> *inVec, float *outVec) {
+int	i;
+	for (i = 0; i < carriers / 8; i ++) {	
+	   int carr = - carriers / 2 + 2 * i;
+	   outVec [i] = abs (real (inVec [(T_u + carr) % T_u] *
+	                            conj (inVec [(T_u + carr + 1) % T_u])));
+	   carr	= - carriers / 2 + 1 * carriers / 4 + 2 * i;
+	   outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
+	                            conj (inVec [(T_u + carr + 1) % T_u])));
+	   carr	= - carriers / 2 + 2 * carriers / 4 + 2 * i + 1;
+	   outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
+	                            conj (inVec [(T_u + carr + 1) % T_u])));
+
+	   carr	= - carriers / 2 + 3 * carriers / 4 + 2 * i + 1;
+	   outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
+	                            conj (inVec [(T_u + carr + 1) % T_u])));
+	}
+}
+
+static
+uint8_t bits [] = {0x80, 0x40, 0x20, 0x10 , 0x08, 0x04, 0x02, 0x01};
+
+#define	NUM_GROUPS	8
+#define	GROUPSIZE	24
+QByteArray	TII_Detector::processNULL () {
+int i, j;
+float	hulpTable	[NUM_GROUPS * GROUPSIZE]; // collapses values
+float	C_table		[GROUPSIZE];	// contains the values
+int	D_table		[GROUPSIZE];	// count of indices in C_table with data
+float	avgTable	[NUM_GROUPS];
+QByteArray results;
+
+//	we map the "carriers" carriers (complex values) onto
+//	a collapsed vector of "carriers / 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
+
+	collapse (theBuffer. data(), hulpTable);
+//
+//	since the "energy levels" in the different GROUPSIZE'd values
+//	may differ, we compute an average for each of the
+//	NUM_GROUPS GROUPSIZE - value groups.

_service:download_url:qt-dab-3.6.tar.gz/src/support/alarm-selector.cpp Added

@@ -0,0 +1,59 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    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	"alarm-selector.h"
+#include	<cstdio>
+#include	<QVBoxLayout>
+//
+	alarmSelector::alarmSelector () {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select a service");
+	servicesDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (servicesDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("dongle select"));
+	setLayout (layOut);
+
+	services = QStringList();
+	serviceList. setStringList (services);
+	servicesDisplay	-> setModel (&serviceList);
+	connect (servicesDisplay, SIGNAL (clicked (QModelIndex)),
+	         this, SLOT (selectService (QModelIndex)));
+	selectedItem	= -1;
+}
+
+	alarmSelector::~alarmSelector () {
+}
+
+void	alarmSelector::addtoList (const QString &s) {
+	services << s;
+	serviceList. setStringList (services);
+	servicesDisplay	-> setModel (&serviceList);
+	servicesDisplay	-> adjustSize();
+	adjustSize();
+}
+
+void	alarmSelector::selectService (QModelIndex ind) {
+	QDialog::done (ind. row ());
+}
+

_service:download_url:qt-dab-3.6.tar.gz/src/support/color-selector.cpp Changed

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

@@ -55,10 +55,23 @@
 	return QString ("          ");
 }
 
+static
+QString textfor (QByteArray transmitters) {
+QString s;
+	fprintf (stderr, "in textfor: transmitters. size = %d\n", transmitters. size ());
+	if (transmitters. size () == 0)
+	   return " ";
+	for (int i = 0; i < transmitters. size (); i += 2)
+	   s = s + " (" + QString::number (transmitters. at (i)) +
+	           "+" + QString::number (transmitters. at (i + 1)) + ")";
+	return s;
+}
+
 void	ensemblePrinter::showEnsembleData (QString	channel,
 	                                   int32_t	freq,
 	                                   QString	theTime,
-	                                   std::vector<serviceId>	Services,
+	                                   QByteArray	transmitters,
+	                                   std::vector<serviceId> Services,
 	                                   dabProcessor *my_dabProcessor,
 	                                   FILE		*file_P) {
 uint8_t	countryId;
@@ -75,12 +88,13 @@
 	   return;
 
 	fprintf (file_P, "\n\n\n");
-	fprintf (file_P, "%s; ensembleId %X; channel %s; frequency %d; time of recording  %s\n\n",
+	fprintf (file_P, "%s; ensembleId %X; channel %s; frequency %d; time of recording  %s; tii %s\n\n",
 	                  ensembleLabel. toUtf8(). data(),
 	                  ensembleId,
 	                  currentChannel. toUtf8(). data(),
 	                  frequency / 1000,
-	                  theTime. toUtf8(). data ());
+	                  theTime. toUtf8(). data (),
+	                  textfor (transmitters). toLatin1 (). data ());
 	                
 	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");

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

_service:download_url:qt-dab-3.5.3.tar.gz/src/support/presetcombobox.cpp -> _service:download_url:qt-dab-3.6.tar.gz/src/support/presetcombobox.cpp Changed

@@ -25,7 +25,7 @@
 #include <QAbstractItemView>
 
 bool KHBoxEventFilter::eventFilter (QObject *obj, QEvent *event) {
-	if (event -> type() == QEvent::KeyPress) {
+	if (event -> type () == QEvent::KeyPress) {
 	   auto keyEvent = static_cast<QKeyEvent *>(event);
 	   if ((keyEvent->modifiers() == Qt::ShiftModifier) &&
 	       (keyEvent->key() == Qt::Key::Key_Delete)) {
@@ -43,8 +43,8 @@
 	return QObject::eventFilter(obj, event);
 }
 
-bool KHBoxListEventFilter::eventFilter (QObject *obj, QEvent *event) {
-	if (event -> type() == QEvent::KeyPress) {
+bool	KHBoxListEventFilter::eventFilter (QObject *obj, QEvent *event) {
+	if (event -> type () == QEvent::KeyPress) {
 	   auto keyEvent = static_cast<QKeyEvent *>(event);
 	   if ((keyEvent->modifiers() == Qt::ShiftModifier) &&
 	       (keyEvent->key() == Qt::Key::Key_Delete)) {
@@ -73,3 +73,7 @@
         return QSize (temp. rwidth () / 6, temp. rheight () / 4);
 }
 
+void	presetComboBox::mouseDoubleClickEvent (QMouseEvent *e) {
+	fprintf (stderr, "double mouse click\n");
+}
+

_service:download_url:qt-dab-3.5.3.tar.gz/src/support/scanner-table.cpp -> _service:download_url:qt-dab-3.6.tar.gz/src/support/scanner-table.cpp Changed

@@ -113,20 +113,30 @@
 	return row;
 }
 
+static
+QString textfor (QByteArray transmitters) {
+QString res;
+	if (transmitters. size () == 0)
+	   return " ";
+	for (int i = 0; i < transmitters. size (); i += 2)
+	   res = res + " (" + QString::number (transmitters. at (i)) +
+	               "+" + QString::number (transmitters. at (i + 1)) + ")";
+	return res;
+}
+	
 void	scannerTable::newEnsemble	(QString currentChannel,
 	                                 QString ensembleName,
 	                                 QString ensembleId,
 	                                 QString freq,
 	                                 QString snr,
-	                                 QString transmitters) {
+	                                 QByteArray transmitters) {
 int16_t row	= addRow ();
-
 	outputWidget	-> item (row, 0) -> setText (currentChannel);
 	outputWidget	-> item (row, 1) -> setText (ensembleName);
 	outputWidget	-> item (row, 2) -> setText (ensembleId);
 	outputWidget	-> item (row, 3) -> setText (freq);
 	outputWidget	-> item (row, 4) -> setText (snr);
-	outputWidget	-> item (row, 5) -> setText (transmitters);
+	outputWidget	-> item (row, 5) -> setText (textfor (transmitters));
 
 	row	= addRow ();
 	outputWidget	-> item (row, 0) -> setText ("serviceName");

_service:download_url:qt-dab-3.5.3.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-3.6.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -131,26 +131,26 @@
 }
 
 void	tiiViewer::clear() {
-	secondariesDisplay	-> setText (" ");
+	transmitterDisplay	-> setText (" ");
 }
 
-void	tiiViewer::showSecondaries	(QByteArray data) {
+void	tiiViewer::showTransmitters	(QByteArray transmitters) {
 	if (myFrame	-> isHidden())
 	   return;
 
-	if (data. size () == 0) {
-	   secondariesDisplay	-> setText (" ");
+	if (transmitters. size () == 0) {
+	   transmitterDisplay	-> setText (" ");
 	   return;
 	}
 
 	QString t	= "transmitter IDs ";
-	for (int i = 0; i < data. size () / 2; i ++) {
-	   int mainId	= data. at (2 * i);
-	   int subId	= data. at (2 * i + 1);
-	   t . append (QString::number (mainId) +
-                                " " + QString::number (subId) + " ");
+	for (int i = 0; i < transmitters. size (); i += 2) {
+	   uint8_t mainId	= transmitters. at (i);
+	   uint8_t subId	= transmitters. at (i + 1);
+	   t = t + " (" + QString::number (mainId) +
+                    "+" + QString::number (subId) + ")";
         }
-	secondariesDisplay	-> setText (t);
+	transmitterDisplay	-> setText (t);
 }
 
 void	tiiViewer::showSpectrum	(int32_t amount) {

_service:download_url:qt-dab-3.5.3.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-3.6.tar.gz/tii-viewer/tii-viewer.h Changed

_service:download_url:qt-dab-3.5.3.tar.gz/tii-viewer/tii-widget.ui -> _service:download_url:qt-dab-3.6.tar.gz/tii-viewer/tii-widget.ui Changed

_service:download_url:qt-dab-3.5.3.tar.gz/travis.yml-copy -> _service:download_url:qt-dab-3.6.tar.gz/travis.yml-copy Changed

Changes of Revision 31