Packman Build Service PMBS

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

qt-dab-4.1.tar.gz/.travis.yml -> qt-dab-4.1.1.tar.gz/.travis.yml Changed

@@ -8,7 +8,7 @@
     - sudo apt-get update -qq
     
 install: 
-    - sudo apt-get -y install qt5-qmake qt5-default libqt5opengl5-dev qtbase5-dev libqwt-qt5-dev libsndfile1-dev librtlsdr-dev librtlsdr0 libfftw3-dev portaudio19-dev libfaad-dev zlib1g-dev rtl-sdr libusb-1.0-0-dev mesa-common-dev libgl1-mesa-dev libsamplerate-dev 
+    - sudo apt-get -y install qt5-qmake qt5-default libqt5opengl5-dev qtbase5-dev libqwt-qt5-dev libsndfile1-dev libfftw3-dev portaudio19-dev libfaad-dev zlib1g-dev rtl-sdr libusb-1.0-0-dev mesa-common-dev libgl1-mesa-dev libsamplerate-dev 
     - sudo apt-get -y install libiio-dev
     - # source /opt/qt5/bin/qt5-env.sh
     - # QWT for Qt 5, see https://github.com/arkottke/strata/blob/master/.travis.yml
@@ -26,13 +26,14 @@
   - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
 
   - cd dab-maxi
-  - cmake . -DTRY_EPG=ON -DRTLSDR=ON -DRTL_TCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSDRPLAY_V3=ON -DLIMESDR=ON -DHACKRF=ON -DPLUTO=ON -DCMAKE_INSTALL_PREFIX=/usr
+  - qmake
+  - # cmake . -DTRY_EPG=ON -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-*  appdir/usr/bin/qt-dab
+  - cp linux-bin/qt-dab-*  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
@@ -51,7 +52,7 @@
   - ./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 \;
+  - # 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/)

qt-dab-4.1.tar.gz/README.md -> qt-dab-4.1.1.tar.gz/README.md Changed

@@ -1,74 +1,34 @@
-# Qt-DAB-4/0 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)
+# Qt-DAB-4.11 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)
 
-Qt-DAB-4.0 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
+Qt-DAB-4.11 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
 
-Since the original 3.71 version there were quite many changes, both visible
-and invisible. So, it was time for a new version number
-
-![overview](/qt-dab-screen.png?raw=true)
-
-------------------------------------------------------------------
-Most recent addition: adding a scheduler
-------------------------------------------------------------------
-
-The "alarm" function is replaced by a more complete **scheduler**,
-allowing a whole list of  schedule elements, i.e. services with
-time when to start.
-
-The schedule list contains some predefined functions to allow
-timed recordings, either frame dumps or audio dumps, or closing the
-program.
-
-Selecting a framedump or audiodump on a specific time will start
-the frame or audiodump of the then active audio service.
-The filename of the dump is generated, using the name
-of the service and the time of the recording.
-
-Selecting any service (or selecting exit) when dumping is is progress
-will stop the dumping.
-
-![overview](/schedule.png?raw=true)
-
-In this example, Radio 4 will be selected at 15:35, an audiodump
-starts on 15:36, a framedump 15:37, and on 16:00 both dumps
-will stop and Radio 4 is selected again and on 17:00 the program
-will terminate.
-
-There is a possibility of passing a schedule list as parameter
-to the Qt-DAB program. This is especially useful for **unattended**
-operation, e.g. when you want a recording of the AAC data or the audio 
-data to be made on some future time when you are not around,
-of course assuming the computer is on.
-Using the "at" command in Linux, executing a simple script on the
-specified time, a script invoking Qt-DAB and passing a predefined
-schedule list to the program, this can be accomplished.
-
-The source tree contains a working example script (well, working for me),
-together with a small schedule list.
+![overview](/screen-4.11-2.png?raw=true)
+![4.11](/screen-4.11-1.png?raw=true)
 
 ------------------------------------------------------------------
 Table of Contents
 ------------------------------------------------------------------
 
-* [Introduction](#introduction)
+* [Introduction](#Introduction)
 * [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes-for-qt-dab)
-* [dabMini](#dabMini)
+* [dabMini and duoreceiver](#dabMini-and-duoreceiver)
 * [Documentation](#documentation)
-* [Presets](#presets-for-qt-dab)
+* [Presets](#presets-for-qt-dab-and-dab-mini)
+* [Saving gain settings](#saving-gain-settings)-
 * [Colors](#colors-for-qt-dab)
-* [Maintaining History](#maintaining-history)
-* [Comment on some config settings](#comment-on-some--configuration-settings)
-* [Obsolete properties](#obsolete-properties)
+* [configuration settings](#Configuration-settings)
+* [Scanning and the skip table](#scanning-and-the-skip-table)
+* [Saving synamic label texts](#Saving-dynamic-label-texts)
+* [Scheduling option](#Scheduling-option)
+* [Obsolete properties](#Obsolete-properties)
 * [Installation on Windows](#installation-on-windows)
 * [Installation on Linux x64](#installation-on-linux-x64)
-* [Configuring](#configuring)
-* [Interfacing to another device](#interfacing-to-another-device)
-* [Using other bands than Band III or L Band](#using-other-bands-than-band-iii-or-l-band)
+* [Interfacing to another device](#Interfacing-to-another-device)
+* [Using user-specified bands](#Using-user-specified-bands)
 * [xml-files and support](#xml-files-and-support)
 * [EPG-Handling](#epg-handling)
 * [Recording the SNR](#recording-the-snr)
-* [Scanning and the skip table](#scanning-and-the-skip-table)
 * [Pluto device and fm transmission](#pluto-device-and-fm-transmission)
 * [Copyright](#copyright)
 
@@ -76,28 +36,27 @@
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-4.0** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-4.11** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI 2 and up.
 
 It provides an abundant amount of selectors and displays, most of
-which can be switched off, but are of interest for those who want to see aspects of the DAB signal.
+which can be switched off, but are of interest for those who want to see aspects of the DAB signal and want to be in control.
 
 While it is not very complicated to generate an executable for either
-Qt-DAB or dabMini, for Linux-x64 appImages exist  for both Qt-DAB and dabMini.
-For Windows an installer is available.
+Qt-DAB or dabMini, for Linux-x64 appImages exist for both Qt-DAB and dabMini.
+For Windows installers  are available.
 
 Qt-DAB makes extensive use of a GUI. Personally, grown up in the time of
-ASR-33 terminals and "command lines", I often prefer a simple command line
+ASR-33 terminals and "command lines", I sometimes prefer a simple command line
 over a GUI.
 Therefore, a **terminal-DAB-xxx** version was developed, a
-simpler version, just for listening to a DAB service, making use of 
-command line
+simpler version, just for listening to a DAB service, making use of the
+command line and curses library.
 
-![Qt-DAB terminal DAB](/qt-dab-terminal-dab.png?raw=true)
-
-For those who are nostalgic to the era of nice wooden radios with glowing tubes,
+For those who are nostalgic to the era and the sound
+of nice wooden radios with glowing tubes,
 Qt-DAB can be configured such that - using the Adalm Pluto as device -
-the audio of a selected service is transmitted on a user specified frequency
- in FM stereo with the "dynamic label" sent as RDS.
+the audio of audio services is transmitted in FM stereo on a
+user specified frequency with the "dynamic label" sent as RDS.
 
 ------------------------------------------------------------------
 Features
@@ -105,22 +64,22 @@
 
   * DAB (mp2) and DAB+ (HE-AAC v1, HE-AAC v2 and LC-AAC) decoding
   * MOT SlideShow (SLS)
-  * Dynamic Label (DLS) 
-  * Both DAB bands supported): 
+  * Dynamic Label (DLS) and the possibility of saving dynamic Labels - augmented with channel and time info - in a file,
+  * Both DAB bands (and user defined bands) are supported: 
   	* VHF Band III (default),
    	* L-Band (obsolete now),
 	* a user defined Band
-  * Modes I, II and IV (Mode I default, Modes II and IV obsolete, but can be set in the ".ini" file)m
-  * Views on the signal: spectrum view incl. constellation diagram, correlation result, TII spectrum and the SNR over time.
-  * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, alternative FM frequency if available, 4 quality bars),
-  * Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type),
+  * Modes I, II and IV (Mode I default, Modes II and IV obsolete, but can be set in the ".ini" file,
+  * Views on the signal: spectrum view incl. constellation diagram, correlation result, TII spectrum and the SNR over time,
+  * Detailed information on reception and selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, alternative FM frequency if available, 4 quality bars),
+  * Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type) in the service list,
   * Automatic display of TII (Transmitter Identification Information) data when transmitted,
   * *Presets* for easy switching of programs in different ensembles (see section *Presets*),
-  * Dumping of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files or xml file formats and playing them again later (see section on xml format),
+  * *Dumping* of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files or xml file formats and playing them again later (see section on xml format),
   * Saving audio as uncompressed wave files,
   * Saving aac frames from DAB+ services for processing by e.g. VLC,
   * Saving the ensemble content description: audio and data streams, including almost all technical data) into a text file readable by e.g *LibreOfficeCalc*
-  * Scanning function (scan the band, show the results on the screen and save a detailed description of the services found in a file),
+  * Advanced scanning function (scan the band, show the results on the screen and save a detailed description of the services found in a file),
   * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888),
   * TPEG output: when configured the data is sent to a specified ip address,
   * EPG detection and building up a time table,
@@ -134,10 +93,11 @@
 	- Soapy (experimental, Linux only), 
 	- ExtIO (expertimental, Windows only),
 	- rtl_tcp servers.
-  *Always supported input from:
+  * Always supported input from:
    	- prerecorded dump (*.raw, *.iq and *.sdr),
 	- xml format files.
-  * Clean interface to add other devices, see below.
+  * Clean device interface, easy to add other devices, see below.
+  * Scheduling the start of channel:service pairs or operations as frame dump or audio dump, even for unattented operation.
 
 Not yet or partly implemented:
 
@@ -148,61 +108,47 @@
 
 Note:
 While the 2.13 support for SDRplay devices is able to handle
-the RSP 1, RSP II, RSP Ia and RSP duo, for handling the RSP-Dx one
-needs 3.0X support
+the RSP 1, RSP II, RSP Ia and RSP duo,
+the 3.0X support handles all SDRplay RSP's.
+It is recommended to use the 3.0X support library.
 
 ------------------------------------------------------------------
 Widgets and scopes for Qt-DAB
 ------------------------------------------------------------------
 
 Qt-DAB always shows a main widget; a number of  **optional**
-widgets is visible or invisible under user's control
-
-  * a widget with controls for the attached device,
-  * a widget for additional configuration settings,
-  * a widget 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, the constellation of the decoded signal and some quality parameters,,
-  * a widget showing the spectrum of the NULL period between successive DAB frames from which the TII is derived,
-  * a widget showing the correlations response(s) from different transmitters in the SFN,
-  * a widget showing the development - over time - of the SNR,

qt-dab-4.1.tar.gz/correlation-viewer/correlation-viewer.cpp -> qt-dab-4.1.1.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

qt-dab-4.1.tar.gz/correlation-viewer/correlation-viewer.h -> qt-dab-4.1.1.tar.gz/correlation-viewer/correlation-viewer.h Changed

qt-dab-4.1.tar.gz/dab-2/devices-dab-2/airspy-handler/airspy-handler.cpp -> qt-dab-4.1.1.tar.gz/dab-2/devices-dab-2/airspy-handler/airspy-handler.cpp Changed

@@ -86,6 +86,8 @@
 #else
 	const char *libraryString = "libairspy.so";
 	Handle		= dlopen ("libairspy.so", RTLD_LAZY);
+	if (Handle == nullptr)
+           Handle       = dlopen ("libairspy.so.0", RTLD_LAZY);
 #endif
 
 	if (Handle == nullptr) {
@@ -121,7 +123,17 @@
 	   throw (21);
 	}
 
-	result = my_airspy_open (&device);
+	uint64_t deviceList [4];
+	int	deviceIndex;
+	int numofDevs = my_airspy_list_devices (deviceList, 4);
+	fprintf (stderr, "we have %d devices\n", numofDevs);
+	if (numofDevs == 0) {
+	   fprintf (stderr, "No devices found\n");
+	   throw (22);
+	}
+	deviceIndex = 0;
+	
+	result = my_airspy_open (&device, deviceList [deviceIndex]);
 	if (result != AIRSPY_SUCCESS) {
 	   printf ("my_airpsy_open() failed: %s (%d)\n",
 	             my_airspy_error_name ((airspy_error)result), result);
@@ -424,15 +436,16 @@
 //
 //	not used here
 int	airspyHandler::open() {
-int result = my_airspy_open (&device);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_open() failed: %s (%d)\n",
-	          my_airspy_error_name((airspy_error)result), result);
-	   return -1;
-	} else {
-	   return 0;
-	}
+//int result = my_airspy_open (&device);
+//
+//	if (result != AIRSPY_SUCCESS) {
+//	   printf ("airspy_open() failed: %s (%d)\n",
+//	          my_airspy_error_name((airspy_error)result), result);
+//	   return -1;
+//	} else {
+//	   return 0;
+//	}
+	return 0;
 }
 
 //
@@ -605,6 +618,13 @@
 	   return false;
 	}
 
+	my_airspy_list_devices  = (pfn_airspy_list_devices)
+                               GETPROCADDRESS (Handle, "airspy_list_devices");
+        if (my_airspy_list_devices == nullptr) {
+           fprintf (stderr, "Could not find airspy_list_devices\n");
+           return false;
+        }
+
 	my_airspy_open	= (pfn_airspy_open)
 	                       GETPROCADDRESS (Handle, "airspy_open");
 	if (my_airspy_open == nullptr) {

qt-dab-4.1.tar.gz/dab-2/devices-dab-2/airspy-handler/airspy-handler.h -> qt-dab-4.1.1.tar.gz/dab-2/devices-dab-2/airspy-handler/airspy-handler.h Changed

qt-dab-4.1.tar.gz/dab-2/radio.cpp -> qt-dab-4.1.1.tar.gz/dab-2/radio.cpp Changed

qt-dab-4.1.1.tar.gz/dab-content.png Added

qt-dab-4.1.tar.gz/dab-maxi/CMakeLists.txt -> qt-dab-4.1.1.tar.gz/dab-maxi/CMakeLists.txt Changed

@@ -1,6 +1,6 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-4.1)
-set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
+set (objectName qt-dab-4.11)
+set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
 set(CMAKE_AUTORCC ON)
@@ -278,6 +278,7 @@
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
+	     ../includes/support/normalpushbutton.h
 	     ../includes/support/smallpushbutton.h
 	     ../includes/support/smallspinbox.h
 	     ../includes/support/verysmallpushbutton.h
@@ -368,6 +369,7 @@
 	     ../src/support/presetcombobox.cpp
 	     ../src/support/smallqlistview.cpp
 	     ../src/support/smallspinbox.cpp
+	     ../src/support/normalpushbutton.cpp
 	     ../src/support/smallpushbutton.cpp
 	     ../src/support/verysmallpushbutton.cpp
 	     ../src/support/smallcombobox.cpp
@@ -425,6 +427,7 @@
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
 	     ../includes/support/smallspinbox.h
+	     ../includes/support/normalpushbutton.h
 	     ../includes/support/smallpushbutton.h
 	     ../includes/support/verysmallpushbutton.h
 	     ../includes/support/smallcombobox.h

qt-dab-4.1.tar.gz/dab-maxi/i18n/de_DE.qm -> qt-dab-4.1.1.tar.gz/dab-maxi/i18n/de_DE.qm Changed

qt-dab-4.1.tar.gz/dab-maxi/i18n/de_DE.ts -> qt-dab-4.1.1.tar.gz/dab-maxi/i18n/de_DE.ts Changed

@@ -4,183 +4,206 @@
 <context>
 <name>RadioInterface</name>
 <message>
- <location filename="../radio.cpp" line="1155"/>
- <location filename="../radio.cpp" line="1322"/>
- <location filename="../radio.cpp" line="1336"/>
- <location filename="../radio.cpp" line="1350"/>
- <location filename="../radio.cpp" line="1365"/>
- <location filename="../radio.cpp" line="1379"/>
- <location filename="../radio.cpp" line="1393"/>
- <location filename="../radio.cpp" line="1407"/>
- <location filename="../radio.cpp" line="1426"/>
- <location filename="../radio.cpp" line="1440"/>
- <location filename="../radio.cpp" line="1455"/>
- <location filename="../radio.cpp" line="1469"/>
- <location filename="../radio.cpp" line="1483"/>
+ <location filename="../radio.cpp" line="1192"/>
+ <location filename="../radio.cpp" line="1366"/>
+ <location filename="../radio.cpp" line="1380"/>
+ <location filename="../radio.cpp" line="1394"/>
+ <location filename="../radio.cpp" line="1409"/>
+ <location filename="../radio.cpp" line="1423"/>
+ <location filename="../radio.cpp" line="1437"/>
+ <location filename="../radio.cpp" line="1461"/>
+ <location filename="../radio.cpp" line="1465"/>
+ <location filename="../radio.cpp" line="1485"/>
 <location filename="../radio.cpp" line="1499"/>
- <location filename="../radio.cpp" line="1519"/>
- <location filename="../radio.cpp" line="1544"/>
- <location filename="../radio.cpp" line="1564"/>
- <location filename="../radio.cpp" line="2478"/>
- <location filename="../radio.cpp" line="2497"/>
- <location filename="../radio.cpp" line="2588"/>
- <location filename="../radio.cpp" line="2683"/>
- <location filename="../radio.cpp" line="2850"/>
- <location filename="../radio.cpp" line="2872"/>
- <location filename="../radio.cpp" line="2889"/>
- <location filename="../radio.cpp" line="3788"/>
+ <location filename="../radio.cpp" line="1514"/>
+ <location filename="../radio.cpp" line="1528"/>
+ <location filename="../radio.cpp" line="1542"/>
+ <location filename="../radio.cpp" line="1558"/>
+ <location filename="../radio.cpp" line="1578"/>
+ <location filename="../radio.cpp" line="1603"/>
+ <location filename="../radio.cpp" line="1623"/>
+ <location filename="../radio.cpp" line="2631"/>
+ <location filename="../radio.cpp" line="2650"/>
+ <location filename="../radio.cpp" line="2747"/>
+ <location filename="../radio.cpp" line="2845"/>
+ <location filename="../radio.cpp" line="3012"/>
+ <location filename="../radio.cpp" line="3034"/>
+ <location filename="../radio.cpp" line="3051"/>
 <source>Warning</source>
 <translation>Warnung</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1366"/>
+ <location filename="../radio.cpp" line="1410"/>
 <source>Airspy or Airspy mini not found
 </source>
 <translation>Airspy oder Airspy mini nicht gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1380"/>
+ <location filename="../radio.cpp" line="1424"/>
 <source>hackrf not found
 </source>
 <translation>hackrf nicht gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1441"/>
+ <location filename="../radio.cpp" line="1453"/>
+ <location filename="../radio.cpp" line="1457"/>
+ <source>warning</source>
+ <translation>Warnung</translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1454"/>
+ <source>failed to open libiio.dll
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1458"/>
+ <source>error in loading functions
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1466"/>
+ <source>some else with pluto
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1500"/>
 <source>no colibri device found
 </source>
 <translation>kein colibri Gerät gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1470"/>
+ <location filename="../radio.cpp" line="1529"/>
 <source>no elad device found
 </source>
 <translation>kein elad Gerät gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1484"/>
+ <location filename="../radio.cpp" line="1543"/>
 <source>no soapy device found
 </source>
 <translation>kein soapy Gerät gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="2765"/>
+ <location filename="../radio.cpp" line="2927"/>
 <source>could not start this service
 </source>
 <translation>konnte diesen Service nicht starten
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="3789"/>
 <source>cannot set alarm in the past
 </source>
- <translation>kann Alarm nicht in die Vergangenheit setzen
+ <translation type="vanished">kann Alarm nicht in die Vergangenheit setzen
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1394"/>
+ <location filename="../radio.cpp" line="1438"/>
 <source>no lime device found
 </source>
 <translation>kein lime Gerät gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1408"/>
- <location filename="../radio.cpp" line="1427"/>
+ <location filename="../radio.cpp" line="1462"/>
+ <location filename="../radio.cpp" line="1486"/>
 <source>no pluto device found
 </source>
 <translation>kein pluto Gerät gefunden
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1500"/>
+ <location filename="../radio.cpp" line="1559"/>
 <source>extio: no luck
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1456"/>
+ <location filename="../radio.cpp" line="1515"/>
 <source>rtl_tcp: no luck
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1323"/>
- <location filename="../radio.cpp" line="1337"/>
+ <location filename="../radio.cpp" line="1367"/>
+ <location filename="../radio.cpp" line="1381"/>
 <source>SDRplay: no library or device
 </source>
 <translation>SDRplay: keine Bibliothek oder Gerät
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1351"/>
+ <location filename="../radio.cpp" line="1395"/>
 <source>DAB stick not found! Please use one with RTL2832U or similar chipset!
 </source>
 <translation>DAB-Stick nicht gefunden! Bitte einen mit RTL2832U oder ähnlichem Chipsatz verwenden!
 </translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1508"/>
- <location filename="../radio.cpp" line="1533"/>
- <location filename="../radio.cpp" line="1552"/>
+ <location filename="../radio.cpp" line="1567"/>
+ <location filename="../radio.cpp" line="1592"/>
+ <location filename="../radio.cpp" line="1611"/>
 <source>Open file ...</source>
 <translation>Datei öffnen ...</translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1510"/>
+ <location filename="../radio.cpp" line="1569"/>
 <source>xml data (*.*)</source>

qt-dab-4.1.tar.gz/dab-maxi/main.cpp -> qt-dab-4.1.1.tar.gz/dab-maxi/main.cpp Changed

qt-dab-4.1.tar.gz/dab-maxi/qt-dab.pro -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-dab.pro Changed

@@ -9,11 +9,15 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++14
-QMAKE_CFLAGS	+=  -O4 -ffast-math
-QMAKE_CXXFLAGS	+=  -O4 -ffast-math
+#QMAKE_CFLAGS	+=  -O4 -ffast-math
+#QMAKE_CXXFLAGS	+=  -O4 -ffast-math
 QMAKE_CXXFLAGS	+=  -ffast-math -flto
 QMAKE_CFLAGS	+=  -ffast-math -flto
 QMAKE_LFLAGS	+=  -ffast-math -flto
+
+#QMAKE_CFLAGS	+=  -pg
+#QMAKE_CXXFLAGS	+=  -pg
+#QMAKE_LFLAGS	+=  -pg
 #QMAKE_CFLAGS	+=  -g -fsanitize=address
 #QMAKE_CXXFLAGS	+=  -g -fsanitize=address
 #QMAKE_LFLAGS	+=  -g -fsanitize=address
@@ -111,7 +115,7 @@
 	   ../includes/backend/msc-handler.h \
 	   ../includes/backend/galois.h \
 	   ../includes/backend/reed-solomon.h \
-	   ../includes/backend/rscodec.h \
+#	   ../includes/backend/rscodec.h \
 	   ../includes/backend/charsets.h \
 	   ../includes/backend/firecode-checker.h \
 	   ../includes/backend/frame-processor.h \
@@ -156,6 +160,7 @@
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/presetcombobox.h \
 	   ../includes/support/smallcombobox.h \
+	   ../includes/support/normalpushbutton.h \
 	   ../includes/support/smallpushbutton.h \
 	   ../includes/support/verysmallpushbutton.h \
 	   ../includes/support/smallqlistview.h \
@@ -221,7 +226,7 @@
 	   ../src/backend/msc-handler.cpp \
 	   ../src/backend/galois.cpp \
 	   ../src/backend/reed-solomon.cpp \
-	   ../src/backend/rscodec.cpp \
+#	   ../src/backend/rscodec.cpp \
 	   ../src/backend/charsets.cpp \
 	   ../src/backend/firecode-checker.cpp \
 #	   ../src/backend/frame-processor.cpp \
@@ -263,6 +268,7 @@
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
 	   ../src/support/smallcombobox.cpp \
+	   ../src/support/normalpushbutton.cpp \
 	   ../src/support/smallpushbutton.cpp \
 	   ../src/support/verysmallpushbutton.cpp \
 	   ../src/support/smallqlistview.cpp \
@@ -293,7 +299,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-4.1
+TARGET		= qt-dab-4.11
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -327,9 +333,9 @@
 CONFIG		+= airspy
 CONFIG		+= hackrf
 CONFIG		+= lime
-CONFIG		+= soapy
+#CONFIG		+= soapy
 #CONFIG		+= pluto-rxtx
-CONFIG		+= pluto
+#CONFIG		+= pluto
 #CONFIG		+= elad-device
 #CONFIG		+= colibri
 CONFIG		+= faad
@@ -368,7 +374,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-4.1
+#	TARGET		= qt-dab64-4.11
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -388,7 +394,7 @@
 #	DEFINES		+= __THREADED_BACKEND
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-4.1
+	TARGET		= qt-dab32-4.11
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt

qt-dab-4.1.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp Changed

qt-dab-4.1.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.cpp -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -133,13 +133,13 @@
 	filtering			= false;
 
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
-	currentDepth		= rtlsdrSettings -> value ("filterDepth", 5). toInt ();
+	currentDepth	= rtlsdrSettings -> value ("filterDepth", 5). toInt ();
 	rtlsdrSettings	-> endGroup ();
 	filterDepth	-> setValue (currentDepth);
 	theFilter. resize (currentDepth);
 
-	inputRate			= 2048000;
-	workerHandle			= nullptr;
+	inputRate		= 2048000;
+	workerHandle		= nullptr;
 	isActive		= false;
 #ifdef	__MINGW32__
 	const char *libraryString	= "librtlsdr.dll";
@@ -167,6 +167,7 @@
 #endif
 	 throw (21);
 	}
+
 //	Ok, from here we have the library functions accessible
 	deviceCount 		= this -> rtlsdr_get_device_count ();
 	if (deviceCount == 0) {
@@ -190,7 +191,7 @@
 	}
 //
 //	OK, now open the hardware
-	r			= this -> rtlsdr_open (&device, deviceIndex);
+	r		= this -> rtlsdr_open (&device, deviceIndex);
 	if (r < 0) {
 	 fprintf (stderr, "Opening rtlsdr device failed\n");
 #ifdef __MINGW32__
@@ -216,19 +217,19 @@
 	}
 
 	gainsCount = rtlsdr_get_tuner_gains (device, nullptr);
-	fprintf(stderr, "Supported gain values (%d): ", gainsCount);
+	fprintf (stderr, "Supported gain values (%d): ", gainsCount);
 	{ 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);
 	 gainControl -> 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);
 
+	rtlsdr_set_tuner_bandwidth (device, KHz (1536));
+	rtlsdr_set_tuner_gain_mode (device, 1);
 //
 //	See what the saved values are and restore the GUI settings
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
@@ -240,9 +241,10 @@
 	 "autogain_on"). toString();
 	agcControl	-> setChecked (temp == "autogain_on");
 	
-	ppm_correction	-> setValue (rtlsdrSettings -> value ("ppm_correction", 0). toInt());
+	ppm_correction	->
+	 setValue (rtlsdrSettings -> value ("ppm_correction", 0). toInt());
 	save_gainSettings	=
-		rtlsdrSettings -> value ("save_gainSettings", 1). toInt () != 0;
+	 rtlsdrSettings -> value ("save_gainSettings", 1). toInt () != 0;
 	rtlsdrSettings	-> endGroup();
 
 	rtlsdr_get_usb_strings (device, manufac, product, serial);
@@ -251,8 +253,6 @@
 
 //	all sliders/values are set to previous values, now do the settings
 //	based on these slider values
-	rtlsdr_set_tuner_gain_mode (device,
-	 agcControl -> isChecked ()? 1 : 0);
 	if (agcControl -> isChecked ())
 	 rtlsdr_set_agc_mode (device, 1);
 	else
@@ -392,9 +392,9 @@
 	 theFilter. resize (currentDepth);
 	 }
 	 for (int i = 0; i < amount; i ++) 
-	 V [i] =theFilter. Pass (
- std::complex<float> (mapTable [real (temp [i]) & 0xFF],
-	 mapTable [imag (temp [i]) & 0xFF]));
+	 V [i] = theFilter. Pass (
+ std::complex<float> (mapTable [real (temp [i]) & 0xFF],
+	 mapTable [imag (temp [i]) & 0xFF]));
 	}
 	else
 	 for (int i = 0; i < amount; i ++) 
@@ -496,6 +496,7 @@
 	 fprintf (stderr, "Could not find rtlsdr_get_tuner_gain\n");
 	 return false;
 	}
+
 	rtlsdr_set_center_freq	= (pfnrtlsdr_set_center_freq)
 	 GETPROCADDRESS (Handle, "rtlsdr_set_center_freq");
 	if (rtlsdr_set_center_freq == nullptr) {
@@ -503,6 +504,13 @@
 	 return false;
 	}
 
+	rtlsdr_set_tuner_bandwidth	= (pfnrtlsdr_set_center_freq)
+	 GETPROCADDRESS (Handle, "rtlsdr_set_tuner_bandwidth");
+	if (rtlsdr_set_tuner_bandwidth == nullptr) {
+	 fprintf (stderr, "Could not find rtlsdr_set_tuner_bandwidth\n");
+	 return false;
+	}
+
 	rtlsdr_get_center_freq	= (pfnrtlsdr_get_center_freq)
 	 GETPROCADDRESS (Handle, "rtlsdr_get_center_freq");
 	if (rtlsdr_get_center_freq == nullptr) {

qt-dab-4.1.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.h -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtlsdr-handler.h Changed

qt-dab-4.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

@@ -106,17 +106,15 @@
 
 	connect (this, SIGNAL (new_GRdBValue (int)),
 	 GRdBSelector, SLOT (setValue (int)));
-	connect (this, SIGNAL (new_lnaValue (int)),
-	 lnaGainSetting, SLOT (setValue (int)));
 	connect (this, SIGNAL (new_agcSetting (bool)),
 	 agcControl, SLOT (setChecked (bool)));
+
 	sdrplaySettings		-> beginGroup ("sdrplaySettings");
-	coarseOffset	=
-	 sdrplaySettings -> value ("sdrplayOffset", 0). toInt();
-	new_GRdBValue (
-	 sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt());
-	new_lnaValue (
-	 sdrplaySettings -> value ("sdrplay-lnastate", 0). toInt());
+	int val		=
+	 sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt();
+	if (20 <= val && val <= 59)
+	 new_GRdBValue (val);
+
 
 	ppmControl		-> setValue (
 	 sdrplaySettings -> value ("sdrplay-ppm", 0). toInt());
@@ -151,18 +149,17 @@
 	}
 
 	if (numofDevs > 1) {
- sdrplaySelector = new sdrplaySelect();
+ sdrplaySelect sdrplaySelector;
 for (deviceIndex = 0; deviceIndex < (int)numofDevs; deviceIndex ++) {
 #ifndef	__MINGW32__
- sdrplaySelector ->
+ sdrplaySelector.
 addtoList (devDesc [deviceIndex]. DevNm);
 #else
- sdrplaySelector ->
+ sdrplaySelector.
 addtoList (devDesc [deviceIndex]. SerNo);
 #endif
 }
- deviceIndex = sdrplaySelector -> QDialog::exec();
- delete sdrplaySelector;
+ deviceIndex = sdrplaySelector. QDialog::exec();
 }
 	else
 	 deviceIndex = 0;
@@ -190,6 +187,7 @@
 	 deviceModel	= "RSP-I";
 	 nrBits		= 12;
 	 denominator	= 2048;
+	 lnaMax		= 3;
 	 break;
 	 case 2:
 	 lnaGainSetting	-> setRange (0, 8);
@@ -197,11 +195,15 @@
 	 nrBits		= 14;
 	 denominator	= 8192;
 	 antennaSelector -> show();
+	 my_mir_sdr_RSPII_RfNotchEnable (1);
+	 if (err != mir_sdr_Success) 
+	 fprintf (stderr, "error %d in setting rfNotch\n", err);
 	 err = my_mir_sdr_RSPII_AntennaControl (mir_sdr_RSPII_ANTENNA_A);
 	 if (err != mir_sdr_Success) 
 	 fprintf (stderr, "error %d in setting antenna\n", err);
 	 connect (antennaSelector, SIGNAL (activated (const QString &)),
 	 this, SLOT (set_antennaSelect (const QString &)));
+	 lnaMax		= 8;
 	 break;
 	 case 3:	
 	 lnaGainSetting	-> setRange (0, 9);
@@ -214,15 +216,27 @@
 	 fprintf (stderr, "error %d in setting of rspDuo\n", err);
 	 connect (tunerSelector, SIGNAL (activated (const QString &)),
 	 this, SLOT (set_tunerSelect (const QString &)));
+	 lnaMax		= 9;
 	 break;
 	 default:
 	 lnaGainSetting	-> setRange (0, 9);
 	 deviceModel	= "RSP-Ia";
 	 nrBits		= 14;
 	 denominator	= 8192;
+	 lnaMax		= 9;
 	 break;
 	}
 
+	val	= sdrplaySettings -> value ("sdrplay-lnastate", 0). toInt();
+	if (val < 0)
+	 val = 0;
+	if (val > lnaMax)
+	 val = lnaMax;
+	fprintf (stderr, "val = %d, max = %d\n", val, lnaMax);
+	lnaGainSetting	-> setValue (val);
+	connect (this, SIGNAL (new_lnaValue (int)),
+ lnaGainSetting, SLOT (setValue (int)));
+	
 	deviceLabel	-> setText (deviceModel);
 //	and be prepared for future changes in the settings
 	connect (debugControl, SIGNAL (stateChanged (int)),
@@ -242,7 +256,6 @@
 	stopReader();
 	myFrame. hide ();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings");
-	sdrplaySettings	-> setValue ("sdrplayOffset", coarseOffset);
 	sdrplaySettings -> setValue ("sdrplay-ppm", ppmControl -> value());
 	sdrplaySettings -> setValue ("sdrplay-ifgrdb",
 	 GRdBSelector -> value());
@@ -734,6 +747,14 @@
 	 return false;
 	}
 
+	my_mir_sdr_RSPII_RfNotchEnable	=
+	 (pfn_mir_sdr_RSPII_RfNotchEnable)
+	 GETPROCADDRESS (Handle, "mir_sdr_RSPII_RfNotchEnable");
+	if (my_mir_sdr_RSPII_RfNotchEnable == nullptr) {
+	 fprintf (stderr, "Could not find mir_sdr_RSPII_RfNotchEnable\n");
+	 return false;
+	}
+
 	return true;
 }
 
@@ -963,6 +984,8 @@
 	lnaState	= result. at (1). toInt ();
 	agc		= result. at (2). toInt ();
 
+	if (lnaState > lnaMax)
+	 lnaMax;
 	GRdBSelector	-> blockSignals (true);
 	new_GRdBValue (GRdB);
 	while (GRdBSelector -> value () != GRdB)

qt-dab-4.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h Changed

qt-dab-4.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> qt-dab-4.1.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

@@ -600,6 +600,7 @@
 //
 	serial		= devs [0]. SerNo;
 	hwVersion	= devs [0]. hwVer;
+	sdrplay_api_ReasonForUpdateT notcher;
 	switch (hwVersion) {
 	   case 1:		// old RSP
 	      lna_upperBound	= 3;
@@ -607,6 +608,7 @@
 	      denominator	= 2048;
 	      nrBits		= 12;
 	      has_antennaSelect	= false;
+	      notcher		= sdrplay_api_Update_None;
 	      break;
 	   case 2:		// RSP II
 	      lna_upperBound	= 8;
@@ -614,6 +616,8 @@
 	      denominator	= 2048;
 	      nrBits		= 14;
 	      has_antennaSelect	= true;
+	      notcher		= sdrplay_api_Update_Rsp2_RfNotchControl;
+	      deviceParams    -> rxChannelA -> rsp2TunerParams.  rfNotchEnable = 1;
 	      break;
 	   case 3:		// RSP-DUO
 	      lna_upperBound	= 9;
@@ -621,6 +625,8 @@
 	      denominator	= 2048;
 	      nrBits		= 12;
 	      has_antennaSelect	= false;
+	      notcher		= sdrplay_api_Update_RspDuo_RfNotchControl;
+	      deviceParams    -> rxChannelA -> rspDuoTunerParams.  rfNotchEnable = 1;
 	      break;
 	   case 4:		// RSPDx
 	      lna_upperBound	= 26;
@@ -636,9 +642,18 @@
 	      denominator	= 8192;
 	      nrBits		= 14;
 	      has_antennaSelect	= false;
+	      notcher		= sdrplay_api_Update_Rsp1a_RfNotchControl;
+	      deviceParams    -> devParams -> rsp1aParams. rfNotchEnable = 1;
 	      break;
 	}
 
+	err = sdrplay_api_Update (chosenDevice -> dev,
+                                  chosenDevice -> tuner,
+	                          notcher,
+                                  sdrplay_api_Update_Ext1_None);
+
+	if (err != sdrplay_api_Success) 
+	   fprintf (stderr, "setting the notch failed\n");
 	set_lnabounds_signal	(0, lna_upperBound);
 	set_deviceName_signal	(deviceModel);
 	set_serial_signal	(serial);

qt-dab-4.1.tar.gz/dab-maxi/radio.cpp -> qt-dab-4.1.1.tar.gz/dab-maxi/radio.cpp Changed

@@ -185,6 +185,8 @@
 #define	AUDIODUMP_BUTTON	QString ("audiodumpButton")
 #define	CONFIG_BUTTON		QString	("configButton")
 #define	DLTEXT_BUTTON		QString	("dlTextButton")
+#define	HIDE_BUTTON		QString ("hideButton")
+#define	SCHEDULE_BUTTON		QString ("scheduleButton")
 
 static
 uint8_t convert (QString s) {
@@ -267,6 +269,7 @@
 	my_dabProcessor		= nullptr;
 	isSynced		= false;
 	stereoSetting		= false;
+	serviceCount		= -1;
 //
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
@@ -460,6 +463,8 @@
 	 channelSelector, SLOT (setCurrentIndex (int)));
 	connect (this, SIGNAL (set_newPresetIndex (int)),
 	 presetSelector, SLOT (setCurrentIndex (int)));
+	connect (configWidget. dlTextButton, SIGNAL (clicked ()),
+	 this, SLOT (handle_dlTextButton ()));
 
 //	restore some settings from previous incarnations
 	QString t =
@@ -529,9 +534,12 @@
 	 this, SLOT (color_sourcedumpButton (void)));
 	connect (configButton, SIGNAL (rightClicked (void)),
 	 this, SLOT (color_configButton (void)));
-	connect (dlTextButton, SIGNAL (rightClicked (void)),
+	connect (configWidget. dlTextButton, SIGNAL (rightClicked (void)),
 	 this, SLOT (color_dlTextButton (void)));
-
+	connect (hideButton, SIGNAL (rightClicked (void)),
+	 this, SLOT (color_hideButton (void)));
+	connect (scheduleButton, SIGNAL (rightClicked ()),
+	 this, SLOT (color_scheduleButton ()));
 	connect	(prevChannelButton, SIGNAL (rightClicked (void)),
 	 this, SLOT (color_prevChannelButton (void)));
 	connect (nextChannelButton, SIGNAL (rightClicked (void)),
@@ -551,8 +559,6 @@
 //	 this, SLOT (color_muteButton (void)));
 	connect (muteButton, SIGNAL (rightClicked ()),
 	 this, SLOT (color_muteButton ()));
-	connect (dlTextButton, SIGNAL (clicked ()),	
-	 this, SLOT (handle_dlTextButton ()));
 //	display the version
 	copyrightLabel	-> setToolTip (footText ());
 
@@ -568,13 +574,13 @@
 //	timer for scanning
 	channelTimer. setSingleShot (true);
 	channelTimer. setInterval (10000);
-	connect (&channelTimer, SIGNAL (timeout (void)),
-	 this, SLOT (channel_timeOut (void)));
+	connect (&channelTimer, SIGNAL (timeout ()),
+	 this, SLOT (channel_timeOut ()));
 //
 //	presetTimer
 	presetTimer. setSingleShot (true);
-	connect (&presetTimer, SIGNAL (timeout (void)),
-	 this, SLOT (setPresetStation (void)));
+	connect (&presetTimer, SIGNAL (timeout ()),
+	 this, SLOT (setPresetStation ()));
 //
 //	timer for muting
 	muteTimer. setSingleShot (true);
@@ -651,6 +657,15 @@
 	 inputDevice	= setDevice (deviceSelector -> currentText());
 	}
 
+	bool hidden	=
+	 dabSettings	-> value ("hidden", 0). toInt () != 0;
+	if (hidden) {
+	 hideButton	-> setText ("show controls");
+	 controlWidget -> hide ();	
+	}
+	connect (hideButton, SIGNAL (clicked ()),
+	 this, SLOT (handle_hideButton ()));
+
 	if (inputDevice != nullptr) {
 	 if (dabSettings -> value ("deviceVisible", 1). toInt () != 0)
 	 inputDevice -> show ();
@@ -844,14 +859,17 @@
 	my_history -> addElement (channelSelector -> currentText (),
 	 serviceName);
 	model. clear ();
-	for (const auto serv : serviceList)
+	for (const auto serv : serviceList) {
 	 model. appendRow (new QStandardItem (serv. name));
+	}
 	for (int i = 0; i < model. rowCount (); i ++) {
 	 model. setData (model. index (i, 0),
 	 QFont (theFont, fontSize), Qt::FontRole);
 	}
 
 	ensembleDisplay -> setModel (&model);
+	if (serviceCount == model.rowCount ())
+	 setPresetStation ();
 }
 //
 //	The ensembleId is written as hexadecimal, however, the 
@@ -874,6 +892,11 @@
 	if (!running. load())
 	 return;
 
+	
+	QFont font	= ensembleId -> font ();
+	font. setPointSize (13);
+	font. setBold (true);
+	ensembleId	-> setFont (font);
 	ensembleId	-> setAlignment(Qt::AlignCenter);
 	ensembleId	-> setText (v + QString (":") + hextoString (id));
 	if (configWidget. scanmodeSelector -> currentIndex () == SCAN_TO_DATA)
@@ -943,8 +966,7 @@
 	 break;
 
 	 case MOTBaseTypeImage:
-	 if (dirElement == 0)
-	 show_MOTlabel (result, contentType, name, dirElement);
+	 show_MOTlabel (result, contentType, name, dirElement);
 	 break;
 
 	 case MOTBaseTypeAudio:
@@ -1048,7 +1070,6 @@
 	 return;
 	}
 
-
 	if (saveSlides) {
 	 QString pict = QDir::toNativeSeparators (picturesPath + pictureName);
 	 checkDir (pict);
@@ -1095,10 +1116,12 @@
 //	sendDatagram is triggered by the ip handler,
 void	RadioInterface::sendDatagram	(int length) {
 uint8_t localBuffer [length];
+
 	if (dataBuffer. GetRingBufferReadAvailable() < length) {
 	 fprintf (stderr, "Something went wrong\n");
 	 return;
 	}
+
 	dataBuffer. getDataFromBuffer (localBuffer, length);
 #ifdef	_SEND_DATAGRAM_
 	if (running. load()) {
@@ -1261,7 +1284,7 @@
 	theBand. hide		();
 	theScheduler. hide	();
 	configDisplay. hide	();
-	dataDisplay. hide();
+	dataDisplay. hide	();
 	if (motSlides != nullptr)
 	 motSlides	-> hide ();
 	LOG ("terminating ", "");
@@ -1863,8 +1886,10 @@
 	if (streamerOut != nullptr)
 	 streamerOut -> addRds (std::string (s. toUtf8 (). data ()));
 #endif
-	if (running. load())
+	if (running. load()) {
+	 dynamicLabel -> setWordWrap (true);
 	 dynamicLabel	-> setText (s);
+	}
 	if (dlTextFile == nullptr)
 	 return;
 //	if (the_dlCache. isMember (s))
@@ -1980,10 +2005,13 @@
 }
 //
 //	called from the phasesynchronizer
-void	RadioInterface::showCorrelation	(int amount, int marker) {
+void	RadioInterface::showCorrelation	(int amount, int marker,
+	 QVector<int> v) {
 	if (!running. load())
 	 return;
-	my_correlationViewer. showCorrelation (amount, marker);
+	my_correlationViewer. showCorrelation (amount, marker, v);
+	QString t = "Transm " + QString::number (v. size ());
+	nrTransmitters	-> setText (t);
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -2322,6 +2350,8 @@
 //	 this, SLOT (handle_muteButton (void)));
 	connect (muteButton, SIGNAL (clicked ()),
 	 this, SLOT (handle_muteButton ()));
+	connect (scheduleButton, SIGNAL (clicked ()),
+	 this, SLOT (handle_scheduleButton ()));
 
 	connect (ensembleDisplay, SIGNAL (clicked (QModelIndex)),
 	 this, SLOT (selectService (QModelIndex)));
@@ -2341,8 +2371,6 @@
 	 this, SLOT (handle_orderServiceIds ()));
 	connect (configWidget. ordersubChannelIds, SIGNAL (clicked ()),
 	 this, SLOT (handle_ordersubChannelIds ()));
-	connect (configWidget. scheduleSelector, SIGNAL (clicked ()),
-	 this, SLOT (handle_scheduleSelector ()));
 	connect (configWidget. plotLengthSetting, SIGNAL (valueChanged (int)),
 	 this, SLOT (handle_plotLengthSetting (int)));

qt-dab-4.1.tar.gz/dab-maxi/radio.h -> qt-dab-4.1.1.tar.gz/dab-maxi/radio.h Changed

@@ -31,6 +31,7 @@
 #ifdef	_SEND_DATAGRAM_
 #include	<QUdpSocket>
 #endif
+#include	<QVector>
 #include	<QComboBox>
 #include	<QByteArray>
 #include	<QLabel>
@@ -229,6 +230,7 @@
 	void			connectGUI		();
 	void			disconnectGUI		();
 
+	int			serviceCount;
 	struct theTime		localTime;
 	struct theTime		UTC;
 	QString			convertTime		(int, int, int, int, int);
@@ -314,7 +316,8 @@
 	void			No_Signal_Found		();
 	void			show_motHandling	(bool);
 	void			setSyncLost		();
-	void			showCorrelation		(int, int);
+	void			showCorrelation		(int, int,
+	 QVector<int>);
 	void			showSpectrum		(int);
 	void			showIQ			(int);
 	void			showQuality		(float);
@@ -336,6 +339,7 @@
 	void			epgTimer_timeOut	();
 #endif
 	void			switchVisibility	(QWidget *);
+	void			nrServices		(int);
 
 //	Somehow, these must be connected to the GUI
 private slots:
@@ -378,6 +382,9 @@
 	void			scheduler_timeOut	(const QString &);
 	void			handle_dlTextButton ();
 
+	void			handle_hideButton	();
+	void			handle_scheduleButton		();
+
 //
 //	color handlers
 	void			color_contentButton	();
@@ -400,6 +407,8 @@
 	void			color_audiodumpButton	();
 	void			color_configButton	();
 	void			color_dlTextButton	();
+	void			color_hideButton	();
+	void			color_scheduleButton	();
 //
 //	config handlers
 	void			handle_configSetting		();
@@ -408,7 +417,6 @@
 	void			handle_orderAlfabetical		();
 	void			handle_orderServiceIds		();
 	void			handle_ordersubChannelIds	();
-	void			handle_scheduleSelector		();
 	void			handle_plotLengthSetting	(int);
 	void			handle_scanmodeSelector		(int);
 	void			handle_motslideSelector		(int);

qt-dab-4.1.tar.gz/dab-mini.png -> qt-dab-4.1.1.tar.gz/dab-mini.png Changed

qt-dab-4.1.tar.gz/dab-mini/CMakeLists.txt -> qt-dab-4.1.1.tar.gz/dab-mini/CMakeLists.txt Changed

@@ -145,7 +145,7 @@
 	           ../includes/backend/data/journaline
 	           ../includes/backend/data/mot
 	           ../includes/support
-	           ../includes/support/viterbi-jan
+#	           ../includes/support/viterbi-jan
 	           ../includes/support/viterbi-spiral
 	           ../includes/output
 	           ../includes/scopes-qwt6
@@ -212,7 +212,7 @@
 	     ../includes/support/band-handler.h
 	     ../includes/support/text-mapper.h
 	     ../includes/support/dab-tables.h
-	     ../includes/support/viterbi-jan/viterbi-handler.h
+#	     ../includes/support/viterbi-jan/viterbi-handler.h
 	     ../includes/support/viterbi-spiral/viterbi-spiral.h
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
@@ -221,6 +221,11 @@
 	     ../includes/support/verysmallpushbutton.h
 	     ../includes/support/smallcombobox.h
 	     ../include/support/smallspinbox.h
+	     ../includes/support/findfilenames.h 
+             ../includes/support/scheduler.h 
+             ../includes/support/schedule-selector.h 
+             ../includes/support/element-selector.h 
+	     ../includes/support/dl-cache.h
 	     ./devices-dab-mini/device-handler.h
 	)
 
@@ -283,8 +288,12 @@
 	     ../src/support/verysmallpushbutton.cpp
 	     ../src/support/smallcombobox.cpp
 	     ../src/support/smallspinbox.cpp
-	     ../src/support/viterbi-jan/viterbi-handler.cpp
+#	     ../src/support/viterbi-jan/viterbi-handler.cpp
 	     ../src/support/viterbi-spiral/viterbi-spiral.cpp
+	     ../src/support/scheduler.cpp 
+             ../src/support/schedule-selector.cpp 
+             ../src/support/element-selector.cpp 
+             ../src/support/findfilenames.cpp 
 	     ./devices-dab-mini/device-handler.cpp
 	)
 
@@ -319,6 +328,9 @@
 	     ../includes/support/smallcombobox.h
 	     ../includes/support/smallspinbox.h
 	     ../includes/support/band-handler.h
+	     ../includes/support/scheduler.h
+             ../includes/support/schedule-selector.h
+             ../includes/support/element-selector.h
 	)
 
 	set (${objectName}_UIS

qt-dab-4.1.tar.gz/dab-mini/dab-mini.pro -> qt-dab-4.1.1.tar.gz/dab-mini/dab-mini.pro Changed

qt-dab-4.1.tar.gz/dab-mini/dab-mini.ui -> qt-dab-4.1.1.tar.gz/dab-mini/dab-mini.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>353</width>
- <height>424</height>
+ <width>266</width>
+ <height>426</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -15,7 +15,7 @@
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_3">
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
 <item>
 <layout class="QVBoxLayout" name="verticalLayout">
 <item>
@@ -92,13 +92,6 @@
 </property>
 </widget>
 </item>
- <item>
- <widget class="QLabel" name="stereoLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
 </layout>
 </item>
 <item>
@@ -117,6 +110,19 @@
 </widget>
 </item>
 <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
 <widget class="smallSpinBox" name="lnaSelector">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
@@ -130,28 +136,17 @@
 </widget>
 </item>
 <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="smallComboBox" name="channelSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Channel selector. </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="verySmallPushButton" name="muteButton">
- <property name="text">
- <string>mute</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="smallComboBox" name="channelSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Channel selector. </string>
+ </property>
+ </widget>
 </item>
 <item>
 <layout class="QGridLayout" name="gridLayout">
@@ -198,33 +193,73 @@
 </layout>
 </item>
 <item>
- <widget class="smallComboBox" name="streamoutSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="verySmallPushButton" name="muteButton">
+ <property name="text">
+ <string>mute</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="verySmallPushButton" name="scheduleButton">
+ <property name="text">
+ <string>schedule</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 </layout>
 </item>
 </layout>
 </item>
 <item>
- <widget class="presetComboBox" name="presetSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="presetComboBox" name="presetSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>Presets</string>
+ </property>
+ </item>
+ </widget>
+ </item>
 <item>
- <property name="text">
- <string>Presets</string>
- </property>
+ <widget class="QLabel" name="stereoLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
 </item>
- </widget>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="smallComboBox" name="streamoutSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="dlTextButton">
+ <property name="text">
+ <string>dlText</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
 <widget class="QLabel" name="dynamicLabel">

qt-dab-4.1.1.tar.gz/dab-mini/dab-mini.ui-xx Added

@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dab_mini</class>
+ <widget class="QWidget" name="dab_mini">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>262</width>
+ <height>422</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>dabMini</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="timeDisplay">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="serviceLabel">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="ensembleId">
+ <property name="font">
+ 
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallQListView" name="ensembleDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="ficLabel">
+ <property name="text">
+ <string>FIC</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="copyrightLabel">
+ <property name="text">
+ <string>©</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="smallSpinBox" name="gainSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>gain(reduction).
+For the SDRplay: it is gain reduction in the range 20 .. 59
+For the RTLSDR is is gain, range depending on the device</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="smallSpinBox" name="lnaSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>LNA state for the sdrplay, the range of values depends on the model of the RSP</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="smallComboBox" name="channelSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Channel selector. </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="verySmallPushButton" name="prevchannelButton">
+ <property name="toolTip">
+ <string>Select the previous channel.</string>
+ </property>
+ <property name="text">
+ <string>&lt;</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="verySmallPushButton" name="nextchannelButton">
+ <property name="toolTip">
+ <string>Select the next channel.</string>
+ </property>
+ <property name="text">
+ <string>&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="verySmallPushButton" name="prev_serviceButton">
+ <property name="toolTip">
+ <string>Select the previous service in the displayed list of services.</string>
+ </property>
+ <property name="text">
+ <string>&lt;</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="verySmallPushButton" name="next_serviceButton">
+ <property name="toolTip">
+ <string>Select the next service in the list of displayed services.</string>
+ </property>
+ <property name="text">
+ <string>&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="verySmallPushButton" name="muteButton">
+ <property name="text">
+ <string>mute</string>
+ </property>

qt-dab-4.1.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-handler.cpp -> qt-dab-4.1.1.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-handler.cpp Changed

@@ -60,6 +60,8 @@
 #else
 	const char *libraryString = "libairspy.so";
 	Handle		= dlopen ("libairspy.so", RTLD_LAZY);
+	if (Handle == nullptr)
+           Handle       = dlopen ("libairspy.so.0", RTLD_LAZY);
 #endif
 
 	if (Handle == NULL) {
@@ -95,7 +97,17 @@
 	   throw (21);
 	}
 
-	result = my_airspy_open (&device);
+	uint64_t deviceList [4];
+	int	deviceIndex;
+	int numofDevs = my_airspy_list_devices (deviceList, 4);
+	fprintf (stderr, "we have %d devices\n", numofDevs);
+	if (numofDevs == 0) {
+	   fprintf (stderr, "No devices found\n");
+	   throw (22);
+	}
+	deviceIndex = 0;
+	
+	result = my_airspy_open (&device, deviceList [deviceIndex]);
 	if (result != AIRSPY_SUCCESS) {
 	   printf ("my_airpsy_open () failed: %s (%d)\n",
 	             my_airspy_error_name ((airspy_error)result), result);
@@ -361,17 +373,17 @@
 }
 //
 //	not used here
-int	airspyHandler::open (void) {
-int result = my_airspy_open (&device);
-
-	if (result != AIRSPY_SUCCESS) {
-	   printf ("airspy_open() failed: %s (%d)\n",
-	          my_airspy_error_name((airspy_error)result), result);
-	   return -1;
-	} else {
-	   return 0;
-	}
-}
+//int	airspyHandler::open (void) {
+//int result = my_airspy_open (&device);
+//
+//	if (result != AIRSPY_SUCCESS) {
+//	   printf ("airspy_open() failed: %s (%d)\n",
+//	          my_airspy_error_name((airspy_error)result), result);
+//	   return -1;
+//	} else {
+//	   return 0;
+//	}
+//}
 
 void	airspyHandler::resetBuffer (void) {
 	theBuffer	-> FlushRingBuffer ();
@@ -441,6 +453,13 @@
 	   return false;
 	}
 
+	my_airspy_list_devices  = (pfn_airspy_list_devices)
+                               GETPROCADDRESS (Handle, "airspy_list_devices");
+        if (my_airspy_list_devices == nullptr) {
+           fprintf (stderr, "Could not find airspy_list_devices\n");
+           return false;
+        }
+
 	my_airspy_open	= (pfn_airspy_open)
 	                       GETPROCADDRESS (Handle, "airspy_open");
 	if (my_airspy_open == NULL) {

qt-dab-4.1.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-handler.h -> qt-dab-4.1.1.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-handler.h Changed

qt-dab-4.1.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler/rtlsdr-handler.cpp -> qt-dab-4.1.1.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler/rtlsdr-handler.cpp Changed

qt-dab-4.1.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplay-handler.cpp -> qt-dab-4.1.1.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplay-handler.cpp Changed

@@ -62,8 +62,8 @@
 ULONG APIkeyValue_length = 255;
 
 	wchar_t *libname = (wchar_t *)L"mir_sdr_api.dll";
-        Handle  = LoadLibrary (libname);
-        if (Handle == NULL) {
+	Handle  = LoadLibrary (libname);
+	if (Handle == NULL) {
 	   if (RegOpenKey (HKEY_LOCAL_MACHINE,
 	                   TEXT("Software\\MiricsSDR\\API"),
 	                   &APIkey) != ERROR_SUCCESS) {
@@ -241,14 +241,14 @@
 int     GRdB            = GRdBSelector  -> value ();
 int     lnaState        = lnaGainSetting -> value ();
 
-        (void)newGRdB;
+	(void)newGRdB;
 	if (!running. load ())
 	   return;
 
-        err     =  my_mir_sdr_RSP_SetGr (GRdB, lnaState, 1, 0);
-        if (err != mir_sdr_Success)
-           fprintf (stderr, "Error at set_ifgain %s (%d %d)\n",
-                             errorCodes (err). toLatin1 (). data (),
+	err     =  my_mir_sdr_RSP_SetGr (GRdB, lnaState, 1, 0);
+	if (err != mir_sdr_Success)
+	   fprintf (stderr, "Error at set_ifgain %s (%d %d)\n",
+	                     errorCodes (err). toLatin1 (). data (),
 	                     GRdB, lnaState);
 }
 
@@ -260,29 +260,29 @@
 
 	if (!agcControl -> isChecked ()) {
 	   set_ifgainReduction (0);
-           return;
-        }
-
-        err     = my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
-                                         -30, 0, 0, 0, 0, lnaState);
-        if (err != mir_sdr_Success)
-           fprintf (stderr, "Error at set_lnagainReduction %s\n",
-                               errorCodes (err). toLatin1 (). data ());
+	   return;
+	}
+
+	err     = my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
+	                                 -30, 0, 0, 0, 0, lnaState);
+	if (err != mir_sdr_Success)
+	   fprintf (stderr, "Error at set_lnagainReduction %s\n",
+	                       errorCodes (err). toLatin1 (). data ());
 }
 
 void    sdrplayHandler::set_agcControl (int dummy) {
 bool agcMode    = agcControl -> isChecked ();
-        my_mir_sdr_AgcControl (agcMode ? mir_sdr_AGC_100HZ :
-                                         mir_sdr_AGC_DISABLE,
-                               -30,
-                               0, 0, 0, 0, lnaGainSetting -> value ());
-        if (!agcMode) {
-           GRdBSelector         -> show ();
-           set_ifgainReduction (0);
-        }
-        else {
-           GRdBSelector         -> hide ();
-        }
+	my_mir_sdr_AgcControl (agcMode ? mir_sdr_AGC_100HZ :
+	                                 mir_sdr_AGC_DISABLE,
+	                       -30,
+	                       0, 0, 0, 0, lnaGainSetting -> value ());
+	if (!agcMode) {
+	   GRdBSelector         -> show ();
+	   set_ifgainReduction (0);
+	}
+	else {
+	   GRdBSelector         -> hide ();
+	}
 }
 
 static
@@ -353,17 +353,17 @@
 	   return false;
 	}
 	
-        if (agcControl -> isChecked ()) {
-           my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
-                                  -30,
-                                  0, 0, 0, 0, lnaGainSetting -> value ());
-           GRdBSelector         -> hide ();
-        }
+	if (agcControl -> isChecked ()) {
+	   my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
+	                          -30,
+	                          0, 0, 0, 0, lnaGainSetting -> value ());
+	   GRdBSelector         -> hide ();
+	}
 	else {
-           my_mir_sdr_AgcControl (mir_sdr_AGC_DISABLE,
-                                  -30,
-                                  0, 0, 0, 0, lnaGainSetting -> value ());
-           GRdBSelector         -> show ();
+	   my_mir_sdr_AgcControl (mir_sdr_AGC_DISABLE,
+	                          -30,
+	                          0, 0, 0, 0, lnaGainSetting -> value ());
+	   GRdBSelector         -> show ();
 	}
 
 	err		= my_mir_sdr_SetDcMode (4, 1);

qt-dab-4.1.tar.gz/dab-mini/radio.cpp -> qt-dab-4.1.1.tar.gz/dab-mini/radio.cpp Changed

@@ -38,6 +38,8 @@
 #include	"radio.h"
 #include	"band-handler.h"
 #include	"audiosink.h"
+#include "schedule-selector.h"
+#include "element-selector.h"
 #ifdef	HAVE_RTLSDR
 #include	"rtlsdr-handler.h"
 #endif
@@ -87,7 +89,10 @@
 dataBuffer (32768),
 audioBuffer (8 * 32768),
 	 my_presetHandler (this),
-	 theBand ("", Si ) {
+	 theBand ("", Si ),
+	 filenameFinder (Si),
+	 the_dlCache (10),
+	 theScheduler (this) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -96,6 +101,7 @@
 	dabSettings		= Si;
 	running. 		store (false);
 	scanning. 		store (false);
+	this	-> dlTextFile	= nullptr;
 //
 //	These buffers are not used here, but needed as parameter
 //	in dabProcessor
@@ -235,6 +241,11 @@
 	 this, SLOT (handle_nextChannelButton (void)));
 	connect	(prevchannelButton, SIGNAL (clicked (void)),
 	 this, SLOT (handle_prevChannelButton (void)));
+	connect (dlTextButton, SIGNAL (clicked (void)),
+ this, SLOT (handle_dlTextButton (void)));
+	connect (scheduleButton, SIGNAL (clicked ()),
+	 this, SLOT (handle_scheduleButton ()));
+
 //
 	h	= dabSettings -> value ("channel", "12C"). toString();
 k	= channelSelector -> findText (h);
@@ -257,7 +268,7 @@
 QString RadioInterface::footText () {
 QString versionText = "dabMini-1.0: ";
 versionText += "Copyright J van Katwijk, J. vanKatwijk@gmail.com\n";
- versionText += "Rights of Qt, fftw, portaudio, libsamplerate gratefully acknowledged";
+ versionText += "Rights of Qt, fftw, portaudio, libsamplerate libfaad gratefully acknowledged";
 versionText += "Rights of other contribuants gratefully acknowledged\n";
 versionText += " Build on: " + QString(__TIMESTAMP__) + QString (" ") + QString (GITHASH);
 return versionText;
@@ -466,6 +477,8 @@
 	my_presetHandler. savePresets (presetSelector);
 
 	my_dabProcessor		-> stop();		// definitely concurrent
+	if (dlTextFile != nullptr)
+	 fclose (dlTextFile);
 	usleep (1000);		// give space to clean up pending signals
 //	everything should be halted by now
 	delete		soundOut;
@@ -651,10 +664,26 @@
 }
 
 void	RadioInterface::showLabel	(QString s) {
-	if (running. load ()) {
-	 dynamicLabel	-> setText (s);
-	 dynamicLabel -> setWordWrap (true);
-	}
+	if (!running. load ()) 
+	 return;
+	dynamicLabel	-> setText (s);
+	dynamicLabel -> setWordWrap (true);
+
+	if (dlTextFile == nullptr)
+	 return;
+	if (the_dlCache. addifNew (s))
+	 return;
+ QString currentChannel = channelSelector -> currentText ();
+ QDateTime theDateTime = QDateTime::currentDateTime ();
+ fprintf (dlTextFile, "%s.%s %s: %s\n",
+ currentChannel. toUtf8 (). data (),
+ currentService. serviceName.
+ toUtf8 (). data (),
+	 theDateTime.
+	 toString ("yy-mm-dd hh:mm:ss").
+	 toLatin1 (). data (),
+	 s. toLatin1 (). data ());
+	
 }
 
 void	RadioInterface::setStereo	(bool s) {
@@ -820,8 +849,27 @@
 	QStringList list = s.split (":", QString::SkipEmptyParts);
 	if (list. length () != 2)
 	 return;
-	QString channel = list. at (0);
-	QString service	= list. at (1);
+	localSelect (list. at (0), list. at (1));
+}
+//
+// From a predefined schedule list, the service names most
+// likely are less than 16 characters
+//
+void RadioInterface::scheduleSelect (const QString &s) {
+ QStringList list = s.split (":", QString::SkipEmptyParts);
+ if (list. length () != 2)
+ return;
+ QString channel = list. at (0);
+ QString service = list. at (1);
+ for (int i = service. size (); i < 16; i ++)
+ service. append (' ');
+	fprintf (stderr, "scheduling %s %s\n", channel. toLatin1 (). data (),
+	 service. toLatin1 (). data ());
+ localSelect (channel, service);
+}
+
+void	RadioInterface::localSelect (const QString &channel,
+	 const QString &service) {
 	if (channel == channelSelector -> currentText ()) {
 	 stopService ();
 	 dabService s;
@@ -1349,3 +1397,105 @@
 muting = true;
 }
 
+///////////////////////////////////////////////////////////////////////////
+//	Handling schedule
+
+void	RadioInterface::handle_scheduleButton	() {
+QStringList candidates;
+scheduleSelector theSelector;
+QString		scheduleService;
+
+	theSelector. addtoList ("nothing");
+	theSelector. addtoList ("exit");
+	theSelector. addtoList ("dlText");
+	candidates	+= "nothing";
+	candidates	+= "exit";
+	candidates	+= "dlText";
+	for (uint16_t i = 0; i < serviceList. size (); i ++) {
+	 QString service = channelSelector -> currentText () +
+	 ":" + serviceList. at (i). name;
+	 theSelector. addtoList (service);
+	 candidates += service;
+	}
+	for (int i = 1; i < presetSelector -> count (); i ++) {
+	 if (!candidates. contains (presetSelector -> itemText (i))) {
+	 theSelector.
+	 addtoList (presetSelector -> itemText (i));
+	 candidates += presetSelector -> itemText (i);
+	 }
+	}
+
+	int selected		= theSelector. QDialog::exec ();
+	scheduleService		= candidates. at (selected);
+	fprintf (stderr, "selected %d %s\n", selected, 
+	 scheduleService. toLatin1 (). data ());
+	{ elementSelector	theElementSelector (scheduleService);
+	 int	targetTime	= theElementSelector. QDialog::exec ();
+	 theScheduler. addRow (scheduleService,
+	 targetTime / 60, 
+	 targetTime % 60);
+	}
+	theScheduler. show ();
+}
+
+void	RadioInterface::scheduler_timeOut	(const QString &s) {
+	if (!running. load ())
+	 return;
+
+	if (s == "nothing")
+	 return;
+
+	if (s == "exit") {
+	 QWidget::close ();
+	 return;
+	}
+
+	if (s == "dlText") {
+	 scheduled_dlTextDumping ();
+	 return;
+	}
+
+	presetTimer. stop ();
+	scheduleSelect (s);
+}
+
+void	RadioInterface::handle_dlTextButton	(){
+	if (dlTextFile != nullptr) {
+ fclose (dlTextFile);
+ dlTextFile = nullptr;
+ dlTextButton -> setText ("dlText");
+ return;
+ }
+
+ QString fileName =filenameFinder. finddlText_fileName (true);
+ dlTextFile = fopen (fileName. toUtf8 (). data (), "w+");
+ if (dlTextFile == nullptr)
+ return;
+ dlTextButton -> setText ("writing");
+

qt-dab-4.1.tar.gz/dab-mini/radio.h -> qt-dab-4.1.1.tar.gz/dab-mini/radio.h Changed

@@ -39,8 +39,12 @@
 #include "band-handler.h"
 #include	"text-mapper.h"
 #include	"process-params.h"
+#include	"dl-cache.h"
 #include	"preset-handler.h"
 
+#include	"findfilenames.h"
+#include	"scheduler.h"
+
 class	QSettings;
 class	virtualInput;
 class	audioBase;
@@ -70,6 +74,7 @@
 protected:
 	bool			eventFilter (QObject *obj, QEvent *event);
 private:
+	FILE			*dlTextFile;
 	RingBuffer<std::complex<float>> spectrumBuffer;
 RingBuffer<std::complex<float>> iqBuffer;
 RingBuffer<std::complex<float>> tiiBuffer;
@@ -89,6 +94,10 @@
 	bandHandler		theBand;
 	QSettings		*dabSettings;
 //	std::vector<dabService>	runningServices;
+	dlCache the_dlCache;
+ findfileNames filenameFinder;
+	Scheduler		theScheduler;
+
 	int16_t			tii_delay;
 	int32_t			dataPort;
 	bool			isSynced;
@@ -136,10 +145,15 @@
 	void			colorService		(QModelIndex ind,
 	 QColor c, int pt);
 	void			localSelect		(const QString &s);
+	void			scheduleSelect		(const QString &);
+	void			localSelect		(const QString &,
+	 const QString &);
 	QString			filenameSuggestion 	(QString);
 	bool			doStart			();
 	void			hide_for_safety		();
 	void			show_for_safety		();
+	void			scheduled_dlTextDumping	();
+
 public slots:
 	void			set_CorrectorDisplay	(int);
 	void			addtoEnsemble		(const QString &, int);
@@ -181,6 +195,10 @@
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);
 	void			show_clockError		(int);
+	void			scheduler_timeOut	(const QString &);
+	void			nrServices		(int);
+	void			showCorrelation		(int, int,
+	 QVector<int>);
 
 //	Somehow, these must be connected to the GUI
 private slots:
@@ -196,6 +214,8 @@
 	void			selectService		(QModelIndex);
 	void			setPresetStation	();
 	void			handle_muteButton	();
+	void			handle_scheduleButton	();
+	void			handle_dlTextButton	();
 };
 #endif

qt-dab-4.1.tar.gz/docs/qt-dab.pdf -> qt-dab-4.1.1.tar.gz/docs/qt-dab.pdf Changed

qt-dab-4.1.1.tar.gz/duoreceiver-1.png Added

qt-dab-4.1.tar.gz/forms/config-helper.ui -> qt-dab-4.1.1.tar.gz/forms/config-helper.ui Changed

@@ -252,12 +252,12 @@
 </layout>
 </item>
 <item>
- <widget class="QPushButton" name="scheduleSelector">
+ <widget class="smallPushButton" name="dlTextButton">
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add an element to the schedule. First a list of services is presented from which to choose,&lt;/p&gt;&lt;p&gt;after selecting a service, a second widget will pop up and ask for the time that that&lt;/p&gt;&lt;p&gt;service should be activated.&lt;/p&gt;&lt;p&gt;Note that, since the channel may have to be changed, the actual switch will take&lt;/p&gt;&lt;p&gt;place app 15 seconds before the specified time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save the lines of text that appear as dynamic label&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>add to schedule</string>
+ <string>dlText</string>
 </property>
 </widget>
 </item>

qt-dab-4.1.1.tar.gz/forms/dab-radio.ui-4.1 Added

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

qt-dab-4.1.tar.gz/forms/dabradio.ui -> qt-dab-4.1.1.tar.gz/forms/dabradio.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>756</width>
- <height>412</height>
+ <width>624</width>
+ <height>439</height>
 </rect>
 </property>
 <property name="sizePolicy">
@@ -17,9 +17,9 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB-4.1</string>
+ <string>Qt-DAB-4.11</string>
 </property>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QHBoxLayout" name="horizontalLayout_11">
 <item>
 <widget class="QWidget" name="leftPane" native="true">
 <property name="sizePolicy">
@@ -462,6 +462,13 @@
 </widget>
 </item>
 <item>
+ <widget class="QLabel" name="nrTransmitters">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QLabel" name="transmitter_coordinates">
 <property name="font">
 
@@ -481,22 +488,33 @@
 </layout>
 </item>
 <item>
- <widget class="QLabel" name="serviceLabel">
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>15</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Long label of the selected service&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="serviceLabel">
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>15</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Long label of the selected service&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="verySmallPushButton" name="hideButton">
+ <property name="text">
+ <string>hide</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </item>
 <item>
 <widget class="QLabel" name="dynamicLabel">
@@ -534,306 +552,310 @@
 </widget>
 </item>
 <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="verySmallPushButton" name="contentButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- 
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This will open a 'save as ... dialog' where you can select a file to store a description of the content of the current DAB ensemble (Audio and Data) in a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>Content</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="verySmallPushButton" name="detailButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for further technical information about the selected program&lt;/p&gt;&lt;p&gt;Push again for closing the pop-up-window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>Detail</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3" colspan="2">
- <widget class="verySmallPushButton" name="resetButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to reset, i.e. restart synchronization.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>reset</string>
- </property>
- </widget>
- </item>
- <item row="0" column="5" colspan="2">
- <widget class="verySmallPushButton" name="scanButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching the scan button will cause the software to make a single scan over all channels. Ensembles (and their services) found will be displayed in a separate window.&lt;/p&gt;&lt;p&gt;The windows will be visible as long as the scanning mode is on &lt;br/&gt;
-(note that after completing the scan, i.e. the cycle from channel 5A to 13F, &lt;br /&gt;
-the software will wait until the scanner is officially stopped).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>Scan</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="verySmallPushButton" name="devicewidgetButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>device</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="3">
- <widget class="verySmallPushButton" name="show_correlationButton">
- <property name="sizePolicy">

qt-dab-4.1.1.tar.gz/forms/dabradio.ui-4.1 Added

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

qt-dab-4.1.1.tar.gz/forms/dabradio.ui-411 Added

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

qt-dab-4.1.tar.gz/includes/backend/audio/mp2processor.h -> qt-dab-4.1.1.tar.gz/includes/backend/audio/mp2processor.h Changed

qt-dab-4.1.tar.gz/includes/backend/backend-driver.h -> qt-dab-4.1.1.tar.gz/includes/backend/backend-driver.h Changed

qt-dab-4.1.tar.gz/includes/backend/frame-processor.h -> qt-dab-4.1.1.tar.gz/includes/backend/frame-processor.h Changed

qt-dab-4.1.tar.gz/includes/backend/msc-handler.h -> qt-dab-4.1.1.tar.gz/includes/backend/msc-handler.h Changed

qt-dab-4.1.tar.gz/includes/dab-constants.h -> qt-dab-4.1.1.tar.gz/includes/dab-constants.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/fib-decoder.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/fib-decoder.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/fic-handler.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/fic-handler.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/freq-interleaver.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/freq-interleaver.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/ofdm-decoder.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/ofdm-decoder.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/phasereference.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/phasereference.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/phasetable.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/phasetable.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/sample-reader.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/sample-reader.h Changed

qt-dab-4.1.tar.gz/includes/ofdm/timesyncer.h -> qt-dab-4.1.1.tar.gz/includes/ofdm/timesyncer.h Changed

qt-dab-4.1.tar.gz/includes/scopes-qwt6/spectrogramdata.h -> qt-dab-4.1.1.tar.gz/includes/scopes-qwt6/spectrogramdata.h Changed

qt-dab-4.1.1.tar.gz/includes/support/normalpushbutton.h Added

@@ -0,0 +1,41 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
+ * 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	__NORMAL_BUTTON__
+#define	__NORMAL_BUTTON__
+#include	<QPushButton>
+#include	<QSize>
+
+//
+//	just redefining sizeHint
+class	normalPushButton : public QPushButton {
+Q_OBJECT
+public:
+	normalPushButton	(QWidget *);
+	~normalPushButton	();
+QSize	sizeHint		()const;
+void	mousePressEvent (QMouseEvent *e);
+signals:
+void	rightClicked		();
+};
+#endif
+

qt-dab-4.1.tar.gz/interfacing.txt -> qt-dab-4.1.1.tar.gz/interfacing.txt Changed

qt-dab-4.1.tar.gz/qt-dab-main-controls.png -> qt-dab-4.1.1.tar.gz/qt-dab-main-controls.png Changed

qt-dab-4.1.tar.gz/qt-dab-main-widget.png -> qt-dab-4.1.1.tar.gz/qt-dab-main-widget.png Changed

qt-dab-4.1.1.tar.gz/qt-dab-scan.png Added

qt-dab-4.1.tar.gz/qt-dab-screen.png -> qt-dab-4.1.1.tar.gz/qt-dab-screen.png Changed

qt-dab-4.1.1.tar.gz/qt-dab-technical-widget.png Added

qt-dab-4.1.1.tar.gz/qt-dab.pdf Added

qt-dab-4.1.tar.gz/qt-usersguide.png -> qt-dab-4.1.1.tar.gz/qt-usersguide.png Changed

qt-dab-4.1.1.tar.gz/scheduler.png Added

qt-dab-4.1.1.tar.gz/screen-4.11-1.png Added

qt-dab-4.1.1.tar.gz/screen-4.11-2.png Added

qt-dab-4.1.tar.gz/src/backend/backend-driver.cpp -> qt-dab-4.1.1.tar.gz/src/backend/backend-driver.cpp Changed

qt-dab-4.1.tar.gz/src/backend/charsets.cpp -> qt-dab-4.1.1.tar.gz/src/backend/charsets.cpp Changed

qt-dab-4.1.tar.gz/src/backend/galois.cpp -> qt-dab-4.1.1.tar.gz/src/backend/galois.cpp Changed

qt-dab-4.1.tar.gz/src/backend/msc-handler.cpp -> qt-dab-4.1.1.tar.gz/src/backend/msc-handler.cpp Changed

@@ -57,7 +57,6 @@
 	phaseReference	.resize (params. get_T_u());
 
 	numberofblocksperCIF = cifTable [(dabMode - 1) & 03];
-//	work_to_be_done. store (false);
 #ifdef	__MSC_THREAD__
 	command. resize (nrBlocks);
 	for (int i = 0; i < nrBlocks; i ++)
@@ -69,7 +68,6 @@
 }
 
 		mscHandler::~mscHandler() {
-//	work_to_be_done. store (false);
 #ifdef	__MSC_THREAD__
 	running. store (false);
 	while (isRunning())
@@ -143,9 +141,9 @@
 float ab1 = jan_abs (r1);
 // Recall: the viterbi decoder wants 127 max pos, - 127 max neg
 // we make the bits into softbits in the range -127 .. 127
- ibits [i] = - real (r1) / ab1 * 1023.0;
+ ibits [i] = - (real (r1) * 255) / ab1;
 ibits [params. get_carriers() + i]
-	 = - imag (r1) / ab1 * 1023.0;
+	 = - (imag (r1) * 255) / ab1;
 }
 
 	 process_mscBlock (ibits, currentBlock);
@@ -209,7 +207,6 @@
 }
 
 void	mscHandler::reset_Channel () {
-//	work_to_be_done. store (false);
 	fprintf (stderr, "channel reset: all services will be stopped\n");
 	locker. lock ();
 	for (auto const &b : theBackends) {
@@ -232,8 +229,6 @@
 	 theBackends. erase (theBackends. begin () + i);
 	 }
 	}
-//	if (theBackends. size () == 0)
-//	 work_to_be_done. store (false);
 	locker. unlock ();
 }
 
@@ -253,7 +248,6 @@
 	 audioBuffer,
 	 dataBuffer,
 	 frameBuffer));
-	work_to_be_done. store (true);
 	locker. unlock();
 	return true;
 }
@@ -277,9 +271,6 @@
 	if (currentblk < numberofblocksperCIF - 1) 
 	 return;
 
-//	if (!work_to_be_done. load())
-//	 return;
-
 //	OK, now we have a full CIF and it seems there is some work to
 //	be done. We assume that the backend itself
 //	does the work in a separate thread.
@@ -287,12 +278,9 @@
 	for (auto const& b: theBackends) {
 	 int16_t startAddr	= b -> startAddr;
 	 int16_t Length	= b -> Length; 
-	 if (Length > 0) {		// Length = 0? should not happen
-	 int16_t temp [Length * CUSize];
-	 memcpy (temp, &cifVector [startAddr * CUSize],
-	 Length * CUSize * sizeof (int16_t));
-	 (void) b -> process (temp, Length * CUSize);
-	 }
+	 if (Length > 0) 		// Length = 0? should not happen
+	 (void) b -> process (&cifVector [startAddr * CUSize],
+	 Length * CUSize);
 	}
 	locker. unlock();
 }

qt-dab-4.1.tar.gz/src/ofdm/fib-decoder.cpp -> qt-dab-4.1.1.tar.gz/src/ofdm/fib-decoder.cpp Changed

@@ -52,6 +52,8 @@
 	         myRadioInterface, SLOT (startAnnouncement (const QString &, int)));
 	connect (this, SIGNAL (stopAnnouncement (const QString &, int)),
 	         myRadioInterface, SLOT (stopAnnouncement (const QString &, int)));
+	connect (this, SIGNAL (nrServices (int)),
+	         myRadioInterface, SLOT (nrServices (int)));
 
 	currentConfig	= new dabConfig();
 	nextConfig	= new dabConfig();
@@ -545,22 +547,20 @@
 // FIG0/7: Configuration linking information 6.4.2,
 //
 void    fibDecoder::FIG0Extension7 (uint8_t *d) {
-int16_t used    = 2;            // offset in bytes
+int16_t used		= 2;            // offset in bytes
 int16_t Length          = getBits_5 (d, 3);
 uint8_t CN_bit          = getBits_1 (d, 8 + 0);
 uint8_t OE_bit          = getBits_1 (d, 8 + 1);
 uint8_t PD_bit          = getBits_1 (d, 8 + 2);
 
-int     nrServices      = getBits_6 (d, used * 8);
-int     counter         = getBits   (d, used * 8 + 6, 10);
+int     serviceCount	= getBits_6 (d, used * 8);
+int     counter		= getBits   (d, used * 8 + 6, 10);
 
 	(void)Length;
 	(void)CN_bit; (void)OE_bit; (void)PD_bit;
-#if 0
-        fprintf (stderr, "nrServices %d, count %d\n",
-                          nrServices, counter);
-#endif
-	(void)nrServices; (void)counter;
+	if (CN_bit == 0)	// only current configuration for now
+	   nrServices (serviceCount);
+	(void)counter;
 }
 
 // FIG0/8:  Service Component Global Definition (6.3.5)

qt-dab-4.1.tar.gz/src/ofdm/freq-interleaver.cpp -> qt-dab-4.1.1.tar.gz/src/ofdm/freq-interleaver.cpp Changed

qt-dab-4.1.tar.gz/src/ofdm/ofdm-decoder.cpp -> qt-dab-4.1.1.tar.gz/src/ofdm/ofdm-decoder.cpp Changed

qt-dab-4.1.tar.gz/src/ofdm/phasereference.cpp -> qt-dab-4.1.1.tar.gz/src/ofdm/phasereference.cpp Changed

@@ -21,6 +21,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include	"phasereference.h" 
+#include	<QVector>
 #include	<cstring>
 #include	"radio.h"
 #include	<vector>
@@ -73,8 +74,8 @@
 	 phaseDifferences [i - 1] = abs (arg (refTable [(T_u + i) % T_u] *
 	 conj (refTable [(T_u + i + 1) % T_u])));
 	
-	connect (this, SIGNAL (showCorrelation (int, int)),
-	 mr, SLOT (showCorrelation (int, int)));
+	connect (this, SIGNAL (showCorrelation (int, int, QVector<int>)),
+	 mr, SLOT (showCorrelation (int, int, QVector<int>)));
 }
 
 	phaseReference::~phaseReference() {
@@ -119,10 +120,25 @@
 
 	sum /= T_u / 2;
 //	
+	QVector<int> indices;
+	std::vector<float> maxValues;
 	for (i = 0; i < 200; i ++) {
 	 if (lbuf [T_g - 100 + i] > Max) {
 	 maxIndex = T_g - 100 + i;
 	 Max = lbuf [T_g - 100 + i];
+	 if (Max / sum >= threshold) {
+	 if ((indices. size () > 0) &&
+	 (indices. at (indices. size () - 1) == maxIndex - 1)) {
+	 if (maxValues. at (indices. size () - 1) < Max) {
+	 indices. replace (indices. size () - 1, maxIndex);
+	 maxValues. at (indices. size () - 1) = Max;
+	 }
+	 }
+	 else {
+	 indices. push_back (maxIndex);
+	 maxValues. push_back (Max);
+	 }
+	 }
 	 }
 	}
 
@@ -133,7 +149,7 @@
 	if (response != nullptr) {
 	 if (++displayCounter > framesperSecond / 2) {
 	 response	-> putDataIntoBuffer (mbuf, T_u / 2);
-	 showCorrelation (T_u / 2, T_g);
+	 showCorrelation (T_u / 2, T_g, indices);
 	 displayCounter	= 0;
 	 }
 	}

qt-dab-4.1.tar.gz/src/ofdm/phasetable.cpp -> qt-dab-4.1.1.tar.gz/src/ofdm/phasetable.cpp Changed

qt-dab-4.1.tar.gz/src/ofdm/sample-reader.cpp -> qt-dab-4.1.1.tar.gz/src/ofdm/sample-reader.cpp Changed

qt-dab-4.1.tar.gz/src/output/fir-filters.cpp -> qt-dab-4.1.1.tar.gz/src/output/fir-filters.cpp Changed

@@ -2,24 +2,23 @@
 /*
  *    Copyright (C) 2010, 2011, 2012
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
- *    This file is part of the SDR-J.
+ *    This file is part of Qt-DAB
  *
- *    SDR-J is free software; you can redistribute it and/or modify
+ *    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.
  *
- *    SDR-J is distributed in the hope that it will be useful,
+ *    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 SDR-J; if not, write to the Free Software
+ *    along with Qt-DAB; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include	"fir-filters.h"

qt-dab-4.1.tar.gz/src/output/newconverter.cpp -> qt-dab-4.1.1.tar.gz/src/output/newconverter.cpp Changed

qt-dab-4.1.tar.gz/src/support/history-handler.cpp -> qt-dab-4.1.1.tar.gz/src/support/history-handler.cpp Changed

qt-dab-4.1.1.tar.gz/src/support/normalpushbutton.cpp Added

@@ -0,0 +1,44 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ * 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 "normalpushbutton.h"
+#include	<QMouseEvent>
+
+	normalPushButton::normalPushButton (QWidget *parent):
+	 QPushButton (parent) {
+}
+
+	normalPushButton::~normalPushButton () {}
+
+QSize	normalPushButton::sizeHint ()const {
+QSize	temp = QPushButton::sizeHint ();
+	return QSize (temp. rwidth (), 2 * temp. rheight () / 3);
+}
+
+void	normalPushButton::mousePressEvent (QMouseEvent *e) {
+	if (e -> button () == Qt::RightButton) {
+	 emit rightClicked ();
+	}
+	else
+	 emit clicked ();
+}
+
+

qt-dab-4.1.tar.gz/src/support/preset-handler.cpp -> qt-dab-4.1.1.tar.gz/src/support/preset-handler.cpp Changed

@@ -4,19 +4,20 @@
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Programming
  *
- *    This file is part of the  qt-dab program
+ *    This file is part of the  Qt-DAB program
  *
- *    qt-dab is free software; you can redistribute it and/or modify
+ *    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,
+ *    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
  */

qt-dab-4.1.tar.gz/src/support/scheduler.cpp -> qt-dab-4.1.1.tar.gz/src/support/scheduler.cpp Changed

@@ -27,6 +27,7 @@
 #include	<fstream>
 #include	<string>
 #define	SWITCHTIME	15
+
 	Scheduler::Scheduler (RadioInterface *mr):
 	 myWidget (nullptr) {
 	myWidget. resize (240, 200);
@@ -82,6 +83,7 @@
 	while (true) {
 	 if (!std::getline (f, str))
 	 break;
+
 //	just to be on the safe side
 	 if (str. size () < 10)
 	 continue;
@@ -138,6 +140,8 @@
 	 theDelay = 1000;	// milliseconds
 	else
 	 theDelay = 1000 * theDelay;
+	if (theDelay > 600000)
+	 theDelay = 600000;
 	wakeupTimer. setInterval (theDelay);
 	wakeupTimer. start (theDelay);
 	show ();
@@ -172,14 +176,37 @@
 	else
 	 theDelay = 1000 * theDelay;
 
+	if (theDelay > 600000)
+	 theDelay = 600000;
 	wakeupTimer. setInterval (theDelay);
 	wakeupTimer. start (theDelay);
 }
-
+//
+//	Each 10 minutes we check the time, to avoid too large
+//	delays
 void	Scheduler::handle_timeOut () {
 QString	service	= tableWidget -> item (wakeupIndex, 0) -> text ();
-	wakeupTime	= 24 * 60 + 60;
-	removeRow (wakeupIndex, 0);
-	emit timeOut (service);
+QTime current = QTime::currentTime ();
+int64_t currentTime = current. hour () * 60 + current. minute ();
+	currentTime = 60 * currentTime + current. second ();
+
+	if (currentTime >= wakeupTime * 60 - SWITCHTIME) {
+	 wakeupTime	= 24 * 60 + 60;
+	 removeRow (wakeupIndex, 0);
+	 emit timeOut (service);
+	 return;
+	}
+
+	fprintf (stderr, "currentTime %d\n", (int)currentTime);
+	int64_t theDelay	= wakeupTime * 60 - currentTime - SWITCHTIME; // seconds
+	if (theDelay <= 0) 
+	 theDelay = 1000;	// milliseconds
+	else
+	 theDelay = 1000 * theDelay;
+
+	if (theDelay > 600000)
+	 theDelay = 600000;
+	wakeupTimer. setInterval (theDelay);
+	wakeupTimer. start (theDelay);
 }

qt-dab-4.1.tar.gz/src/support/text-mapper.cpp -> qt-dab-4.1.1.tar.gz/src/support/text-mapper.cpp Changed

qt-dab-4.1.tar.gz/src/support/time-table.cpp -> qt-dab-4.1.1.tar.gz/src/support/time-table.cpp Changed

qt-dab-4.1.tar.gz/tii-viewer/tii-viewer.cpp -> qt-dab-4.1.1.tar.gz/tii-viewer/tii-viewer.cpp Changed

qt-dab-4.1.tar.gz/travis.yml -> qt-dab-4.1.1.tar.gz/travis.yml Changed

qt-dab-4.1.tar.gz/dab-mini/dab-mini.ui-flex Deleted

@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>dab_mini</class>
- <widget class="QWidget" name="dab_mini">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>353</width>
- <height>424</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>dabMini</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="timeDisplay">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="serviceLabel">
- <property name="font">
- 
- <pointsize>14</pointsize>
- <weight>75</weight>
- <italic>true</italic>
- <bold>true</bold>
- 
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="ensembleId">
- <property name="font">
- 
- <pointsize>12</pointsize>
- <weight>75</weight>
- <italic>true</italic>
- <bold>true</bold>
- 
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="smallQListView" name="ensembleDisplay">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="ficLabel">
- <property name="text">
- <string>FIC</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="agcControl">
- <property name="text">
- <string>agc</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="copyrightLabel">
- <property name="text">
- <string>©</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="stereoLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="smallSpinBox" name="gainSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>gain(reduction).
-For the SDRplay: it is gain reduction in the range 20 .. 59
-For the RTLSDR is is gain, range depending on the device</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="smallSpinBox" name="lnaSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>LNA state for the sdrplay, the range of values depends on the model of the RSP</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="smallComboBox" name="channelSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Channel selector. </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="verySmallPushButton" name="muteButton">
- <property name="text">
- <string>mute</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="verySmallPushButton" name="prevchannelButton">
- <property name="toolTip">
- <string>Select the previous channel.</string>
- </property>
- <property name="text">
- <string>&lt;</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="verySmallPushButton" name="nextchannelButton">
- <property name="toolTip">
- <string>Select the next channel.</string>
- </property>
- <property name="text">
- <string>&gt;</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="verySmallPushButton" name="prev_serviceButton">
- <property name="toolTip">
- <string>Select the previous service in the displayed list of services.</string>
- </property>
- <property name="text">
- <string>&lt;</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="verySmallPushButton" name="next_serviceButton">
- <property name="toolTip">
- <string>Select the next service in the list of displayed services.</string>
- </property>
- <property name="text">
- <string>&gt;</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>

qt-dab-4.1.tar.gz/dab-mini/dab-mini.ui-orig Deleted

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

Changes of Revision 41