Packman Build Service PMBS

qt-dab.changes Changed

qt-dab.spec Changed

qt-dab-2.5-fix-missing-return.patch Deleted

_service Changed

_service:download_url:qt-dab-2.5.tar.gz/travis.yml-qt4-old Deleted

@@ -1,74 +0,0 @@
-language: c++
-compiler: gcc
-sudo: require
-dist: trusty
-
-before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt532-trusty -y
-    - sudo apt-get update -qq
-    
-install: 
-  -  sudo apt-get install qt4-qmake build-essential g++
-  -  sudo apt-get install libsndfile1-dev qt4-default libfftw3-dev portaudio19-dev 
-  -  sudo apt-get install libfaad-dev zlib1g-dev libusb-1.0-0-dev mesa-common-dev
-  - sudo apt-get install libgl1-mesa-dev libqt4-opengl-dev libsamplerate-dev libqwt-dev
-
-  - cp CMakeLists.txt-qt4 CMakeLists.txt
-script:
-  - # sed -i -e 's|CONFIG.*sdrplay||g' qt-dab.pro
-  - # sed -i -e 's|CONFIG.*airspy||g' qt-dab.pro
-  - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
-  - cmake . -DDABSTICK=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSPECTRUM=ON -DCMAKE_INSTALL_PREFIX=/usr
-  - make -j4
-  - # sudo make DESTIDR=appdir install ; sudo chown -R $USER appdir ; find appdir/
-  - ls -lh .
-  - mkdir -p appdir/usr/bin 
-  - cp qt-dab-1.0-alpha appdir/usr/bin/qt-dab 
-  - mkdir -p appdir/usr/lib
-  - mkdir -p appdir/usr/share/applications ; cp qt-dab.desktop appdir/usr/share/applications
-  - cp screenshot_qt-dab.png appdir/qt-dab.png
-  - touch appdir/qt-dab.png # Dear upstream developers, please provide an application icon
-
-  - wget http://sm5bsz.com/linuxdsp/hware/rtlsdr/rtl-sdr-linrad4.tbz
-  - tar xvfj rtl-sdr-linrad4.tbz
-  - cd rtl-sdr-linrad4
-  - mkdir build
-  - cd build
-  - cmake .. -DDETACH_KERNEL_DRIVER=ON  -DCMAKE_INSTALL_PREFIX=../../appdir/usr
-  - make
-  - make install
-  - cd ..
-  - cd ..
-
-  - sudo apt-get install build-essential cmake libusb-1.0-0-dev pkg-config
-  - wget https://github.com/airspy/host/archive/master.zip
-  - unzip master.zip
-  - cd airspyone_host-master
-  - mkdir build
-  - cd build
-#	udev rules are installed separately
-  - cmake ../ -DCMAKE_INSTALL_PREFIX=../../appdir/usr
-  - make
-  - make install
-  - cd ..
-  - cd ..
-  - ls -l appdir/usr/lib
-after_success:
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
-  - chmod a+x linuxdeployqt*.AppImage
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
-  - # Workaround for https://github.com/probonopd/linuxdeployqt/issues/31#issuecomment-289267637
-  - ./linuxdeployqt*.AppImage --appimage-extract
-  - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
-  - # Workaround for https://github.com/JvanKatwijk/qt-dab/issues/34
-  - # find /usr/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/)
-  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-  - curl --upload-file ./Qt_DAB*.AppImage https://transfer.sh/Qt_DAB-git.$(git rev-parse --short HEAD)-x86_64.AppImage
-  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
-  - bash ./upload.sh ./Qt_DAB*.AppImage
-

_service:download_url:qt-dab-2.5.tar.gz/.gitignore -> _service:download_url:qt-dab-2.7.1.tar.gz/.gitignore Changed

_service:download_url:qt-dab-2.5.tar.gz/.travis.yml -> _service:download_url:qt-dab-2.7.1.tar.gz/.travis.yml Changed

_service:download_url:qt-dab-2.5.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-2.7.1.tar.gz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.5)
+set (objectName qt-dab-2.7.1)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -62,14 +62,19 @@
    set(RTLSDR true)
 endif ()
 
+if(DEFINED HACKRF)
+	set(HACKRF true)
+endif ()
+
 if(DEFINED RTLTCP)
    set(RTLTCP true)
 endif ()
 
-if(DEFINED HACKRF)
-	set(HACKRF true)
+if(DEFINED LIMESDR)
+   set(LIMESDR true)
 endif ()
 
+
 if (DEFINED DATA_STREAMER)
    set(DATA_STREAMER true)
 endif ()
@@ -486,6 +491,36 @@
 	   add_definitions (-DHAVE_HACKRF)
 	endif (HACKRF)
 #
+	if (LIMESDR)
+	   set (${objectName}_UIS
+	        ${${objectName}_UIS}
+	        ./devices/lime-handler/lime-widget.ui
+	   )
+
+	   set (${objectName}_MOCS
+	        ${${objectName}_MOCS}
+	        ./devices/lime-handler/lime-handler.h
+	   )
+
+	   include_directories (
+	     ./devices/lime-handler
+	   )
+
+	   set ($(objectName)_HDRS
+	        ${${objectName}_HDRS}
+	        ./devices/lime-handler/lime-handler.h
+	        ./devices/lime-handler/LimeSuite.h
+	        ./devices/lime-handler/LMS7002M_parameters.h
+	   )
+
+	   set (${objectName}_SRCS
+	        ${${objectName}_SRCS}
+	        ./devices/lime-handler/lime-handler.cpp
+	   )
+
+	   add_definitions (-DHAVE_LIME)
+	endif (LIMESDR)
+
 	if (RTLSDR)
            find_package(LibRTLSDR)
            if (NOT LIBRTLSDR_FOUND)

_service:download_url:qt-dab-2.5.tar.gz/CMakeLists.txt-qt4 -> _service:download_url:qt-dab-2.7.1.tar.gz/CMakeLists.txt-qt4 Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.5)
+set (objectName qt-dab-2.7.1)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -63,6 +63,10 @@
    set(RTLTCP true)
 endif ()
 
+if(DEFINED LIMESDR)
+   set(LIMESDR true)
+endif ()
+
 if (DEFINED DATA_STREAMER)
    set(DATA_STREAMER true)
 endif ()
@@ -92,7 +96,7 @@
 	set(CMAKE_INCLUDE_CURRENT_DIR ON)
 	find_package(Qt4 REQUIRED COMPONENTS QtCore QtNetwork)
 	include(${QT_USE_FILE})
-	find_package(QWT REQUIRED)
+	find_package(Qwt REQUIRED)
 	if (NOT QWT_FOUND)
 	   message(FATAL_ERROR "please install qwt library")
 	endif ()
@@ -484,6 +488,36 @@
 	   add_definitions (-DHAVE_HACKRF)
 	endif (HACKRF)
 #
+	if (LIMESDR)
+	   set (${objectName}_UIS
+	        ${${objectName}_UIS}
+	        ./devices/lime-handler/lime-widget.ui
+	   )
+
+	   set (${objectName}_MOCS
+	        ${${objectName}_MOCS}
+	        ./devices/lime-handler/lime-handler.h
+	   )
+
+	   include_directories (
+	     ./devices/lime-handler
+	   )
+
+	   set ($(objectName)_HDRS
+	        ${${objectName}_HDRS}
+	        ./devices/lime-handler/lime-handler.h
+	        ./devices/lime-handler/LimeSuite.h
+	        ./devices/lime-handler/LMS7002M_parameters.h
+	   )
+
+	   set (${objectName}_SRCS
+	        ${${objectName}_SRCS}
+	        ./devices/lime-handler/lime-handler.cpp
+	   )
+
+	   add_definitions (-DHAVE_LIME)
+	endif (LIMESDR)
+#
 	if (DABSTICK)
 #           find_package(LibRTLSDR)
 #           if (NOT LIBRTLSDR_FOUND)

_service:download_url:qt-dab-2.5.tar.gz/CMakeLists.txt-qt5 -> _service:download_url:qt-dab-2.7.1.tar.gz/CMakeLists.txt-qt5 Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.5)
+set (objectName qt-dab-2.7.1)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -62,14 +62,19 @@
    set(RTLSDR true)
 endif ()
 
+if(DEFINED HACKRF)
+	set(HACKRF true)
+endif ()
+
 if(DEFINED RTLTCP)
    set(RTLTCP true)
 endif ()
 
-if(DEFINED HACKRF)
-	set(HACKRF true)
+if(DEFINED LIMESDR)
+   set(LIMESDR true)
 endif ()
 
+
 if (DEFINED DATA_STREAMER)
    set(DATA_STREAMER true)
 endif ()
@@ -187,12 +192,12 @@
              ./includes/country-codes.h
 	     ./includes/dab-constants.h
              ./includes/ofdm/sample-reader.h
-	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasereference.h
+	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasetable.h
 	     ./includes/ofdm/freq-interleaver.h
-	     ./includes/ofdm/fib-decoder.cpp
-	     ./includes/ofdm/fic-handler.cpp
+	     ./includes/ofdm/fib-decoder.h
+	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/tii_table.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/timesyncer.h
@@ -329,8 +334,8 @@
 	     ./includes/ofdm/sample-reader.h
 	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasereference.h
-	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/fib-decoder.h
+	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/tii_table.h
 	     ./includes/backend/backend.h
@@ -486,6 +491,36 @@
 	   add_definitions (-DHAVE_HACKRF)
 	endif (HACKRF)
 #
+	if (LIMESDR)
+	   set (${objectName}_UIS
+	        ${${objectName}_UIS}
+	        ./devices/lime-handler/lime-widget.ui
+	   )
+
+	   set (${objectName}_MOCS
+	        ${${objectName}_MOCS}
+	        ./devices/lime-handler/lime-handler.h
+	   )
+
+	   include_directories (
+	     ./devices/lime-handler
+	   )
+
+	   set ($(objectName)_HDRS
+	        ${${objectName}_HDRS}
+	        ./devices/lime-handler/lime-handler.h
+	        ./devices/lime-handler/LimeSuite.h
+	        ./devices/lime-handler/LMS7002M_parameters.h
+	   )
+
+	   set (${objectName}_SRCS
+	        ${${objectName}_SRCS}
+	        ./devices/lime-handler/lime-handler.cpp
+	   )
+
+	   add_definitions (-DHAVE_LIME)
+	endif (LIMESDR)
+
 	if (RTLSDR)
            find_package(LibRTLSDR)
            if (NOT LIBRTLSDR_FOUND)

_service:download_url:qt-dab-2.5.tar.gz/README.md -> _service:download_url:qt-dab-2.7.1.tar.gz/README.md Changed

@@ -2,18 +2,63 @@
 
 Qt-DAB is a Software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). It is the successor of both DAB-rpi and sdr-j-DAB, two former programs by the same author.
 
+-----------------------------------------------------------------
+NEW in 2.7.1
+-----------------------------------------------------------------
 
-# NEW FEATURES in Qt-DAB 2.5
+2.7.1 is merely a "bug-fix" version.
 
-If configured, the EPG data will be written to a file. The pathname to the directory in which the file will be written is set in the "picturePath"
+------------------------------------------------------------------
+NEW in 2.7
+------------------------------------------------------------------
 
-If available, the frequency in the FM band on which the service can be heard, is given in the Technical Data widget.
+New devices:
 
+ a) the LimeSDR is now supported (due to missing a decent "dll" file
+for the library, for now in Linux only);
 
-# Table of Contents
+ b) as an experimental feature, a Soapy interface is implemented. Tested
+with the SDRplay and the LimeSDR it works.
+Soapy support is included in neither the appImage nor the Windows version.
+
+Synchronization reconsidered
+
+One of the issues to be resolved was resynchronization. It could
+happen that - due to some faulty input - the synchronization
+got lost and could not be regained without a reset.
+
+The chain of events leading to such a loss of synchronization is
+identified and chance that - due to some faulty input - synchronization
+will be lost is - at least - much smaller.
+
+Obsolete properties
+
+The DAB standard eliminated the support for Modes other than Mode 1 and
+Bands other than VHF Band III. The implementation still supports these
+features, however, since they are obsolete, there are no controls on the
+GUI anymore (the control for the Mode was already removed from earlier
+versions). 
+Explicitly setting the Mode and/or the Band is possible by 
+including some command lines in the ".qt-dab.ini" file.
+
+For the Mode, one will add/set a line
+
+	dabMode=Mode x, where x is either 1, 2 or 4
+
+For the Band, one will add/set a line
+
+	dabBand=band, where band is either VHF Band III or L_Band
+
+Since the control for the dab band is now removed from the GUI, this GUI
+could be made slightly smaller.
+
+
+------------------------------------------------------------------
+Table of Contents
+------------------------------------------------------------------
 
-* [Features](#features)
 * [Introduction](#introduction)
+* [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes)
 * [Installation](#features)
   * [Windows](#windows)
@@ -26,9 +71,10 @@
   * [Comment on some settings](#comment-on-some-settings)
   * [A note on intermittent sound](#a-note-on-intermittent-sound)
 * [Copyright](#copyright)
-
-
-# Features
+ 
+------------------------------------------------------------------
+Features
+------------------------------------------------------------------
 
   * DAB (mp2) and DAB+ (HE-AAC v1, HE-AAC v2 and LC-AAC) decoding
   * MOT SlideShow (SLS)
@@ -47,7 +93,9 @@
   	- SDRplay (both RSP I and RSP II),
   	- Airspy, including Airspy mini,
    	- SDR DAB sticks (RTL2838U or similar), and
-	- HACKRF One, and
+	- HACKRF One, 
+	- limeSDR, 
+	- Soapy (experimental, Linux only),
    	- prerecorded dump (*.raw, *.iq and *.sdr) 
  
 Not  (Not yet or partly) implemented:
@@ -57,18 +105,21 @@
     are part of the source distribution.
   * EPG: when configured, the EPG decoding will generate so called EHB files.
   * Journaline (an untested Journaline implementation is part of the sources).
-  * IP output: when configured the IP data - if selected - is sent to a specificied IP address (default: 127.0.0.1:8888).
+  * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888).
   * Other bands than used for terrestrial broadcasting in Europe (like DAB over cable)
 
-
-# Introduction
+------------------------------------------------------------------
+Introduction
+------------------------------------------------------------------
 
 ![Qt-DAB with sdrplay input](/qt-dab-1.png?raw=true)
 
-**Qt-DAB-2.5** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-2.7* is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
 Beside to Qt-DAB, there exists a "light" version, **dabradio**, an SDRPlay-specific version **sdrplayDab** , a command-line based version and a stand-alone
-server version. All these versions with a GUI are implemented in C++, using the Qt framework for the implementation of the GUI. The command-line version is implemented using C++, and does not depend on Qt.
+server version **dab-server**. All these versions with a GUI are implemented in C++, using the Qt framework for the implementation of the GUI. The command-line version is implemented using C++, and does not depend on Qt.
+The **dab-server** will run as a "service" on an RPI, with control - over a bluetooth connection - from an "app" on
+an Android tablet.
 
 **dabradio**, **sdrplayDab**, the Qt-free version, **dab-cmdline** the "command-line only", and the **dab-server** version have their own repository on Github.
 
@@ -86,8 +137,9 @@
 
 Some settings are preserved between program invocations, they are stored in a file `.qt-dab.ini`, to be found in the home directory. See [Comment on some settings](#comment-on-some-settings) for more details.
 
-
-# Widgets and scopes
+------------------------------------------------------------------
+Widgets and scopes
+------------------------------------------------------------------
 
 The picture below shows Qt-DAB's main window, with the (few) control buttons, and 5 other widgets
 
@@ -101,18 +153,18 @@
 
 ![Qt-DAB with SDRplay input](/qt-dab-2.png?raw=true)
 
-
-## Windows
+------------------------------------------------------------------
+Windows
+------------------------------------------------------------------
 
 For windows there is an installer, to be found in the releases section, https://github.com/JvanKatwijk/qt-dab/releases. The installer will install the executable as well as required libraries.
 The installer will also call the official installer for the dll implementing the api for getting access to the SDRplay devices.
 
-Furthermore, the releases section contains a "zipped" folder, with executables for this and other programs.
-
 If you want to compile it by yourself, please install Qt through its online installer, see https://www.qt.io/ 
 
-
-## Ubuntu Linux
+------------------------------------------------------------------
+Ubuntu Linux
+------------------------------------------------------------------
 
 If you are not familar with compiling then please continue reading by jumping to chapter [appImage](#appimage-for-x64-linux-systems) which is much easier for Linux beginners.
 
@@ -187,34 +239,7 @@
 
 4.b. If you are compiling on/for an RPI2 device, you might want to uncomment the line DEFINE+=__THREADED_BACKEND__. This will cause a better load balance on the cores of the processor. 
 
-4.c. If you are compiling on/for a Linux x64 based PC, you might want to select to uncomment
-   ````
-   CONFIG += SSE
-   ````
-This will cause the SSE instructions to be used in some parts of the implementation.
-If you are compiling on/for an RPI2 with Stretch (or comparable system), you might want to uncomment
-   ````
-   CONFIG += NEON_RPI2
-   ````
- and if you are compiling on/for an RPI3 with Stretch (or comparable system), you might want to uncomment
-   ````
-   CONFIG += NEON_RPI3.
-   ````
-
-If unsure, uncomment only 
-   ````
-   CONFIG += NO_SSE.
-   ````
-BE SURE TO UNCOMMENT PRECISELY ONE OF
-
-   ````
-  #CONFIG += NEON_RPI2
-  #CONFIG += NEON_RPI3
-  #CONFIG += SSE
-  CONFIG += NO_SSE
-  ``````
-
-6. Build and make
+5. Build and make
   ```
   qmake qt-dab.pro
   make
@@ -222,14 +247,12 @@
 
   You could also use QtCreator, load the `qt-dab.pro` file and build the executable.
   
-  Remark: The executable file can be found in the sub-directory `linux-bin`. 
-  A make install command is not implemented, but you could copy it to `/usr/local/bin`

_service:download_url:qt-dab-2.5.tar.gz/appimage/AppRun -> _service:download_url:qt-dab-2.7.1.tar.gz/appimage/AppRun Changed

_service:download_url:qt-dab-2.7.1.tar.gz/cmake/Modules/FindQWT.cmake-xxx Changed

_service:download_url:qt-dab-2.5.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/dab-processor.cpp Changed

@@ -20,6 +20,8 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include	"dab-processor.h"
+
+#include <utility>
 #include	"fic-handler.h"
 #include	"msc-handler.h"
 #include	"radio.h"
@@ -34,6 +36,7 @@
 *	local are classes ofdmDecoder, ficHandler and mschandler.
 */
 
+static	int goodFrames	= 0;
 	dabProcessor::dabProcessor	(RadioInterface	*mr,
 	 virtualInput	*theRig,
 	 uint8_t	dabMode,
@@ -58,30 +61,30 @@
 	 ),
 	 my_ficHandler (mr, dabMode),
 	 my_mscHandler (mr, dabMode,
-	 picturesPath),
+	 std::move(picturesPath)),
 	 phaseSynchronizer (mr,
 	 dabMode, 
- threshold,
+	 threshold,
 	 diff_length,
 	 echo_depth,
 	 responseBuffer),
 	 my_TII_Detector (dabMode, tii_depth), 
 	 my_ofdmDecoder (mr,
 	 dabMode,
-	 theRig -> bitDepth (), 
+	 theRig -> bitDepth(),
 	 iqBuffer) {
 
 	this	-> myRadioInterface	= mr;
 	this	-> theRig		= theRig;
 	this	-> tiiBuffer		= tiiBuffer;
-	this	-> T_null		= params. get_T_null ();
-	this	-> T_s			= params. get_T_s ();
-	this	-> T_u			= params. get_T_u ();
+	this	-> T_null		= params. get_T_null();
+	this	-> T_s			= params. get_T_s();
+	this	-> T_u			= params. get_T_u();
 	this	-> T_g			= T_s - T_u;
-	this	-> T_F			= params. get_T_F ();
-	this	-> nrBlocks		= params. get_L ();
-	this	-> carriers		= params. get_carriers ();
-	this	-> carrierDiff		= params. get_carrierDiff ();
+	this	-> T_F			= params. get_T_F();
+	this	-> nrBlocks		= params. get_L();
+	this	-> carriers		= params. get_carriers();
+	this	-> carrierDiff		= params. get_carrierDiff();
 
 	this	-> tii_delay		= tii_delay;
 	this	-> tii_counter		= 0;
@@ -108,17 +111,17 @@
 	 myRadioInterface, SLOT (show_tii (int)));
 	connect (this, SIGNAL (show_snr (int)),
 	 mr, SLOT (show_snr (int)));
-	my_TII_Detector. reset ();
+ my_TII_Detector. reset();
 //	the thread will be started from somewhere else
 }
 
-	dabProcessor::~dabProcessor	(void) {
-	if (isRunning ()) {
+ dabProcessor::~dabProcessor() {
+ if (isRunning()) {
 	 myReader. setRunning (false);
 	 // exception to be raised
 	 	// through the getSample(s) functions.
 	 msleep (100);
-	 while (isRunning ()) {
+ while (isRunning()) {
 	 usleep (100);
 	 }
 	}
@@ -132,21 +135,24 @@
 *	and sending them to the ofdmDecoder who will transfer the results
 *	Finally, estimating the small freqency error
 */
-void	dabProcessor::run	(void) {
+void	dabProcessor::run() {
 int32_t startIndex;
 int32_t		i;
 std::complex<float>	FreqCorr;
 timeSyncer	myTimeSyncer (&myReader);
 int		attempts;
 
- fineOffset		= 0;
- correctionNeeded	= true;
-	attempts		= 0;
- theRig -> resetBuffer ();
-	coarseOffset		= theRig -> getOffset ();
+float		avgValue_nullPeriod	= 0;
+float		avgValue_testPeriod	= 0;
+int		testLength		= 200;
+
 	fineOffset		= 0;
+	correctionNeeded	= true;
+	attempts		= 0;
+	theRig -> resetBuffer();
+	coarseOffset		= 0;
 	myReader. setRunning (true);	// useful after a restart
-	my_mscHandler. start ();
+	my_mscHandler. start();
 //
 //	to get some idea of the signal strength
 	try {
@@ -163,54 +169,108 @@
 
 	 case NO_DIP_FOUND:
 	 if (scanMode && (++ attempts >= 5)) {
-	 emit (No_Signal_Found ());
- attempts = 0;
- }
+	 emit (No_Signal_Found());
+	 attempts = 0;
+	 }
 	 goto notSynced;
 
 	 default:			// does not happen
 	 case NO_END_OF_DIP_FOUND:
 	 goto notSynced;
 	 }
+	 myReader. getSamples (ofdmBuffer. data(),
+	 T_u, coarseOffset + fineOffset);
 /**
- *	The end of the null period is identified, the actual end
- *	is probably about 40 samples earlier.
+ *	Looking for the first sample of the T_u part of the sync block.
+ *	Note that we probably already had 30 to 40 samples of the T_g
+ *	part
 */
-SyncOnPhase:
+	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 3);
+	 if (startIndex < 0) { // no sync, try again
+	 if (!correctionNeeded) {
+	 setSyncLost();
+	 }
+//	 fprintf (stderr, "x = %d after %d good frames\n",
+//	 startIndex, goodFrames);
+//	 goodFrames	= 0;
+	 goto notSynced;
+	 }
+	 goodFrames ++;
+//	 fprintf (stderr, "startIndex = %d\n", startIndex);
+	 goto SyncOnPhase;
+
+//
+//	Note: Optimization Kills
+//	An old saying is that "optimization kills", and indeed, here
+//	is another example.
+//	Spoiled by excellent devices such as the SDRplay, I noticed that
+//	at the end of recognizing a DAB frame, the only thing that has to 
+//	be done is to skip T_null examples to get the start of the
+//	next frame. The findIndex function then would identify the
+//	precise start of the T_u part of the zero-th block.
+//	However, it turns out that with devices that give more noisy
+//	samples the findIndex function might give wrong results, leading
+//	to loosing synchronization.
+//	Therefore, a simple test is added to just verify that the "dip"
+//	of the null period ends within a reasonable distance of the 
+//	estimated begin, and if no such end of dip could be identified
+//	within a reasonable distance, just resync.
+//	we make it into a simple test, just compare the avg value of the
+//	samples that are (should be) in the non-null period after the
+//	null period with the avg value of the samples in the null period
+//	
+Check_endofNULL:
+
+	 avgValue_testPeriod	= 0;
+	 myReader. getSamples (ofdmBuffer. data(),
+	 T_u, coarseOffset + fineOffset);
+//	 for (i = 100; i < 100 + testLength; i ++)
+//	 avgValue_testPeriod += abs (ofdmBuffer [i]);
+//	 avgValue_testPeriod	/= testLength;
+//
+//	It seems reasonable to expect that the avg value of a segment
+//	of samples belonging to the T_g part of the first block of the
+//	DAB frame is at least twice the avg value of the samples in he
+//	null period
+//	 if (avgValue_testPeriod < 1.7 * avgValue_nullPeriod) {
+//	 fprintf (stderr, "failing %f after %d good frames\n",
+//	 avgValue_testPeriod / avgValue_nullPeriod,
+//	 goodFrames);
+//	 goodFrames	= 0;
+//	 goto notSynced;
+//	 }
+//	 fprintf (stderr, "%f \n", avgValue_testPeriod / avgValue_nullPeriod);
+
 /**
 *	We now have to find the exact first sample of the non-null period.
 *	We use a correlation that will find the first sample after the
 *	cyclic prefix.
- *	When in "sync", i.e. pretty sure that we know were we are,
- *	we skip the "dip" identification and come here right away.

_service:download_url:qt-dab-2.5.tar.gz/dab-processor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/dab-processor.h Changed

@@ -30,7 +30,7 @@
 #include	<QThread>
 #include	<QObject>
 #include	<vector>
-#include	"stdint.h"
+#include	<cstdint>
 #include	<sndfile.h>
 #include	"sample-reader.h"
 #include	"phasereference.h"
@@ -62,18 +62,18 @@
 	 RingBuffer<std::complex<float>>	*,
 	 RingBuffer<std::complex<float>>	*
 	 );
-		~dabProcessor	(void);
-	void		reset			(void);
-	void		stop			(void);
+		~dabProcessor();
+ void		reset();
+	void		stop();
 	void		setOffset		(int32_t);
-	void		coarseCorrectorOn	(void);
-	void		coarseCorrectorOff	(void);
+	void		coarseCorrectorOn();
+	void		coarseCorrectorOff();
 	void		startDumping		(SNDFILE *);
-	void		stopDumping		(void);
+ void		stopDumping();
 	void		set_scanMode		(bool);
 //
 //	inheriting from our delegates
-	void		set_tiiCoordinates	(void);
+	void		set_tiiCoordinates();
 	void		setSelectedService (QString &);
 	bool		is_audioService		(QString &s);
 	bool		is_packetService	(QString &s);
@@ -81,15 +81,16 @@
 	 audiodata *, int16_t);
 void		dataforPacketService	(QString &,
 	 packetdata *, int16_t);
-	void		reset_msc		(void);
+	void		reset_msc();
 	void		set_audioChannel	(audiodata *,
 	 RingBuffer<int16_t> *);
 	void		set_dataChannel		(packetdata *,
 	 RingBuffer<uint8_t> *);
- uint8_t		get_ecc (void);
- int32_t		get_ensembleId (void);
- QString		get_ensembleName (void);
-	void		clearEnsemble		(void);
+ uint8_t		get_ecc();
+ int32_t		get_ensembleId();
+ QString		get_ensembleName();
+	void		print_Overview();
+	void		clearEnsemble();
 private:
 	bool		tiiSwitch;
 	int16_t		tii_depth;
@@ -124,11 +125,11 @@
 	bool		correctionNeeded;
 	std::vector<std::complex<float>	>ofdmBuffer;
 	bool		wasSecond		(int16_t, dabParams *);
-virtual	void		run			(void);
+virtual	void		run();
 signals:
 	void		setSynced		(char);
-	void		No_Signal_Found		(void);
-	void		setSyncLost		(void);
+ void		No_Signal_Found();
+ void		setSyncLost();
 	void		showCoordinates		(int);
 	void		showSecondaries		(int);
 	void		show_Spectrum		(int);

_service:download_url:qt-dab-2.5.tar.gz/devices/airspy-handler/airspy-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/airspy-handler.cpp Changed

@@ -36,40 +36,40 @@
 uint32_t samplerateCount;
 
 	this	-> airspySettings	= s;
-	this	-> myFrame		= new QFrame (NULL);
+	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
-	this	-> myFrame	-> show ();
+	this	-> myFrame	-> show();
 
-	filter			= NULL;
+	filter			= nullptr;
 	airspySettings	-> beginGroup ("airspyHandler");
 	int16_t temp 		= airspySettings -> value ("linearity", 10).
-	 toInt ();
+	 toInt();
 	linearitySlider		-> setValue (temp);
 	linearityDisplay	-> display (temp);
 	temp			= airspySettings -> value ("sensitivity", 10).
-	 toInt ();
+	 toInt();
 	sensitivitySlider	-> setValue (temp);
 	sensitivityDisplay	-> display (temp);
 
-	vgaGain			= airspySettings -> value ("vga", 5).toInt ();
+	vgaGain			= airspySettings -> value ("vga", 5).toInt();
 	vgaSlider		-> setValue (vgaGain);
 	vgaDisplay		-> display (vgaGain);
-	mixerGain		= airspySettings -> value ("mixer", 10). toInt ();
+	mixerGain		= airspySettings -> value ("mixer", 10). toInt();
 	mixerSlider		-> setValue (mixerGain);
 	mixerDisplay		-> display (mixerGain);
 	mixer_agc		= false;
-	lnaGain			= airspySettings -> value ("lna", 5). toInt ();
+	lnaGain			= airspySettings -> value ("lna", 5). toInt();
 	lnaSlider		-> setValue (lnaGain);
 	lnaDisplay		-> display (lnaGain);
 	mixer_agc		= false;
 	lna_agc			= false;
 	rf_bias			= false;
-	coarseOffset		= airspySettings -> value ("airspyOffset", 0). toInt ();
-	airspySettings	-> endGroup ();
+	coarseOffset		= airspySettings -> value ("airspyOffset", 0). toInt();
+	airspySettings	-> endGroup();
 
-	device			= 0;
+	device			= nullptr;
 	serialNumber		= 0;
-	theBuffer		= NULL;
+	theBuffer		= nullptr;
 #ifdef	__MINGW32__
 	const char *libraryString = "airspy.dll";
 	Handle		= LoadLibrary ((wchar_t *)L"airspy.dll");
@@ -78,10 +78,10 @@
 	Handle		= dlopen ("libairspy.so", RTLD_LAZY);
 #endif
 
-	if (Handle == NULL) {
+	if (Handle == nullptr) {
 	 fprintf (stderr, "failed to open %s\n", libraryString);
 #ifndef	__MINGW32__
-	 fprintf (stderr, "Error = %s\n", dlerror ());
+	 fprintf (stderr, "Error = %s\n", dlerror());
 #endif
 	 delete myFrame;
 	 throw (20);
@@ -89,7 +89,7 @@
 
 	libraryLoaded	= true;
 
-	if (!load_airspyFunctions ()) {
+	if (!load_airspyFunctions()) {
 	 fprintf (stderr, "problem in loading functions\n");
 #ifdef __MINGW32__
 	 FreeLibrary (Handle);
@@ -101,9 +101,9 @@
 	}
 //
 	strcpy (serial,"");
-	result = this -> my_airspy_init ();
+	result = this -> my_airspy_init();
 	if (result != AIRSPY_SUCCESS) {
-	 printf ("my_airspy_init () failed: %s (%d)\n",
+	 printf ("my_airspy_init() failed: %s (%d)\n",
 	 my_airspy_error_name((airspy_error)result), result);
 #ifdef __MINGW32__
 	 FreeLibrary (Handle);
@@ -116,7 +116,7 @@
 
 	result = my_airspy_open (&device);
 	if (result != AIRSPY_SUCCESS) {
-	 printf ("my_airpsy_open () failed: %s (%d)\n",
+	 printf ("my_airpsy_open() failed: %s (%d)\n",
 	 my_airspy_error_name ((airspy_error)result), result);
 #ifdef __MINGW32__
 	 FreeLibrary (Handle);
@@ -132,7 +132,7 @@
 	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
 	sampleRates. resize (samplerateCount);
 	my_airspy_get_samplerates (device,
-	 sampleRates. data (), samplerateCount);
+	 sampleRates. data(), samplerateCount);
 
 	selectedRate	= 0;
 	for (i = 0; i < (int)samplerateCount; i ++) {
@@ -170,14 +170,14 @@
 	}
 
 	airspySettings	-> beginGroup ("airspyHandler");
-	filtering 	= airspySettings -> value ("filtering", 0). toInt ();
-	int filterDegree = airspySettings -> value ("filterdegree", 9). toInt ();
+	filtering 	= airspySettings -> value ("filtering", 0). toInt();
+	int filterDegree = airspySettings -> value ("filterdegree", 9). toInt();
 	filterDegree	= (filterDegree & ~01) + 1;
 //
 //	if we apply filtering it is using a symmetric lowpass filter
 	filter		= new airspyFilter (filterDegree,
 	 1024000, selectedRate);
-	airspySettings	-> endGroup ();
+	airspySettings	-> endGroup();
 
 //	The sizes of the mapTables follow from the input and output rate
 //	(selectedRate / 1000) vs (2048000 / 1000)
@@ -212,47 +212,49 @@
 	 this, SLOT (set_rf_bias (void)));
 	connect (tabWidget, SIGNAL (currentChanged (int)),
 	 this, SLOT (show_tab (int)));
-	displaySerial	-> setText (getSerial ());
+	displaySerial	-> setText (getSerial());
 	running. store (false);
+//	my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
+
 	show_tab (0);			// will set currentTab
 }
 
-	airspyHandler::~airspyHandler (void) {
+	airspyHandler::~airspyHandler() {
 	airspySettings	-> beginGroup ("airspyHandler");
-	airspySettings -> setValue ("linearity", linearitySlider -> value ());
-	airspySettings -> setValue ("sensitivity", sensitivitySlider -> value ());
+	airspySettings -> setValue ("linearity", linearitySlider -> value());
+	airspySettings -> setValue ("sensitivity", sensitivitySlider -> value());
 	airspySettings -> setValue ("vga", vgaGain);
 	airspySettings -> setValue ("mixer", mixerGain);
 	airspySettings -> setValue ("lna", lnaGain);
 	airspySettings	-> setValue ("airspyOffset", coarseOffset);
-	airspySettings	-> endGroup ();
-	if (device != NULL) {
+	airspySettings	-> endGroup();
+	if (device != nullptr) {
 	 int result = my_airspy_stop_rx (device);
 	 if (result != AIRSPY_SUCCESS) {
-	 printf ("my_airspy_stop_rx () failed: %s (%d)\n",
+	 printf ("my_airspy_stop_rx() failed: %s (%d)\n",
 	 my_airspy_error_name((airspy_error)result), result);
 	 }
 
 	 result = my_airspy_close (device);
 	 if (result != AIRSPY_SUCCESS) {
-	 printf ("airspy_close () failed: %s (%d)\n",
+	 printf ("airspy_close() failed: %s (%d)\n",
 	 my_airspy_error_name((airspy_error)result), result);
 	 }
 	}
-	if (filter	!= NULL)
+	if (filter	!= nullptr)
 	 delete filter;
 	delete myFrame;
-	if (Handle == NULL) {
+	if (Handle == nullptr) {
 	 return;	// nothing achieved earlier
 	}
-	my_airspy_exit ();
+	my_airspy_exit();
 #ifdef __MINGW32__
 	FreeLibrary (Handle);
 #else
 	dlclose (Handle);
 #endif
 err:
-	if (theBuffer != NULL)
+	if (theBuffer != nullptr)
 	 delete theBuffer;
 }
 
@@ -265,34 +267,34 @@
 	}
 }
 
-int32_t	airspyHandler::getVFOFrequency (void) {
+int32_t	airspyHandler::getVFOFrequency() {
 	return lastFrequency;
 }
 
-int32_t	airspyHandler::defaultFrequency (void) {
+int32_t	airspyHandler::defaultFrequency() {
 	return Khz (94700);
 }
 
-bool	airspyHandler::restartReader	(void) {

_service:download_url:qt-dab-2.5.tar.gz/devices/airspy-handler/airspy-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/airspy-handler.h Changed

@@ -35,8 +35,8 @@
 class	airspyFilter;
 
 extern "C" {
-typedef	int (*pfn_airspy_init) (void);
-typedef int (*pfn_airspy_exit) (void);
+typedef	int (*pfn_airspy_init)();
+typedef int (*pfn_airspy_exit)();
 typedef int (*pfn_airspy_open) (struct airspy_device**);
 typedef int (*pfn_airspy_close) (struct airspy_device*);
 typedef int (*pfn_airspy_get_samplerates) (struct airspy_device* device,
@@ -85,17 +85,17 @@
 Q_OBJECT
 public:
 			airspyHandler		(QSettings *);
-			~airspyHandler		(void);
+			~airspyHandler();
 	void		setVFOFrequency		(int32_t nf);
-	int32_t		getVFOFrequency		(void);
-	int32_t		defaultFrequency	(void);
-	bool		restartReader		(void);
-	void		stopReader		(void);
+	int32_t		getVFOFrequency();
+	int32_t		defaultFrequency();
+	bool		restartReader();
+	void		stopReader();
 	int32_t		getSamples		(std::complex<float> *v,
 	 int32_t size);
-	int32_t		Samples			(void);
-	void		resetBuffer		(void);
-	int16_t		bitDepth		(void);
+	int32_t		Samples();
+	void		resetBuffer();
+	int16_t		bitDepth();
 	int16_t		currentTab;
 private slots:
 	void		set_linearity		(int value);
@@ -103,12 +103,12 @@
 	void		set_lna_gain		(int value);
 	void		set_mixer_gain		(int value);
 	void		set_vga_gain		(int value);
-	void		set_lna_agc		(void);
-	void		set_mixer_agc		(void);
-	void		set_rf_bias		(void);
+	void		set_lna_agc();
+	void		set_mixer_agc();
+	void		set_rf_bias();
 	void		show_tab		(int);
 private:
-	bool		load_airspyFunctions	(void);
+	bool		load_airspyFunctions();
 //	The functions to be extracted from the dll/.so file
 	pfn_airspy_init		 my_airspy_init;
 	pfn_airspy_exit		 my_airspy_exit;
@@ -143,7 +143,7 @@
 	bool		lna_agc;
 	bool		mixer_agc;
 	bool		rf_bias;
-const	char*		board_id_name (void);
+const	char*		board_id_name();
 
 	int16_t		vgaGain;
 	int16_t		mixerGain;
@@ -165,8 +165,8 @@
 static
 	int		callback(airspy_transfer_t *);
 	int		data_available (void *buf, int buf_size);
-const	char *		getSerial (void);
-	int		open (void);
+const	char *		getSerial();
+	int		open();
 };
 
 #endif

_service:download_url:qt-dab-2.5.tar.gz/devices/airspy-handler/airspyfilter.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/airspyfilter.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/airspy-handler/airspyfilter.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/airspyfilter.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/airspy-handler/libairspy/airspy.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/libairspy/airspy.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/airspy-handler/libairspy/airspy_commands.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/libairspy/airspy_commands.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/elad-s1-handler/elad-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/elad-s1-handler/elad-handler.cpp Changed

@@ -41,12 +41,12 @@
 	this	-> eladSettings	= s;
 	this	-> myFrame	= new QFrame (NULL);
 	setupUi (myFrame);
-	myFrame	-> show ();
+	myFrame	-> show();
 	_I_Buffer		= NULL;
 	theLoader		= NULL;
 	theWorker		= NULL;
 	vfoOffset			=
-	             eladSettings -> value ("elad-offset", 0). toInt ();
+	             eladSettings -> value ("elad-offset", 0). toInt();
 
 //
 //	sometimes problems with dynamic linkage of libusb, it is
@@ -108,7 +108,7 @@
 //
 	eladHandler::~eladHandler	(void) {
 	eladSettings -> setValue ("elad-offset", vfoOffset);
-	stopReader ();
+	stopReader();
 	if (_I_Buffer != NULL)
 	   delete _I_Buffer;
 	if (theLoader != NULL)
@@ -130,7 +130,7 @@
 	}
 
 	theWorker -> setVFOFrequency (realFreq);
-	vfoFrequency = theWorker -> getVFOFrequency ();
+	vfoFrequency = theWorker -> getVFOFrequency();
 }
 
 int32_t	eladHandler::getVFOFrequency	(void) {
@@ -143,7 +143,7 @@
 	if (theWorker != NULL) 
 	   return true;
 
-	_I_Buffer	-> FlushRingBuffer ();
+	_I_Buffer	-> FlushRingBuffer();
 	theWorker	= new eladWorker (vfoFrequency,
 	                                  theLoader,
 	                                  this,
@@ -157,8 +157,8 @@
 	if (theWorker == NULL) 
 	   return;
 
-	theWorker	-> stop ();
-	while (theWorker -> isRunning ())
+	theWorker	-> stop();
+	while (theWorker -> isRunning())
 	   usleep (100);
 	delete theWorker;
 	theWorker = NULL;
@@ -171,11 +171,11 @@
 }
 
 int32_t	eladHandler::Samples	(void) {
-	return _I_Buffer	-> GetRingBufferReadAvailable () / 2;
+	return _I_Buffer	-> GetRingBufferReadAvailable() / 2;
 }
 
 void	eladHandler::resetBuffer	(void) {
-	_I_Buffer	-> FlushRingBuffer ();
+	_I_Buffer	-> FlushRingBuffer();
 }
 
 //
@@ -194,14 +194,14 @@
 
 void	eladHandler::setGainReduction	(void) {
 	gainReduced = gainReduced == 1 ? 0 : 1;
-	theLoader -> set_en_ext_io_ATT20 (theLoader -> getHandle (),
+	theLoader -> set_en_ext_io_ATT20 (theLoader -> getHandle(),
 	                                     &gainReduced);
 	gainLabel -> setText (gainReduced == 1 ? "-20" : "0");
 }
 
 void	eladHandler::setFilter	(void) {
 	localFilter = localFilter == 1 ? 0 : 1;
-	theLoader -> set_en_ext_io_LP30 (theLoader -> getHandle (),
+	theLoader -> set_en_ext_io_LP30 (theLoader -> getHandle(),
 	                                     &localFilter);
 	filterText	-> setText (localFilter == 1 ? "30 Mhz" : "no filter");
 }

_service:download_url:qt-dab-2.5.tar.gz/devices/elad-s1-handler/elad-loader.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/elad-s1-handler/elad-loader.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/elad-s1-handler/elad-worker.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/elad-s1-handler/elad-worker.cpp Changed

@@ -70,17 +70,17 @@
 	fprintf (stderr, "mapTables initialized\n");
 //
 	fprintf (stderr, "testing functions\n");
-	if (!functions	-> OK ())
+	if (!functions	-> OK())
 	   return;
 	lastFrequency		= defaultFreq;	// the parameter!!!!
 	runnable		= true;
 	fprintf (stderr, "functions are OK\n");
-	functions	-> StartFIFO (functions -> getHandle ());
+	functions	-> StartFIFO (functions -> getHandle());
 	connect (this, SIGNAL (show_eladFrequeny (int)),
 	         h, SLOT (show_eladFrequency (int)));
 	connect (this, SIGNAL (show_iqSwitch (bool)),
 	         h, SLOT (show_iqSwitch (bool)));
-	start ();
+	start();
 	*OK			= true;
 }
 
@@ -88,13 +88,13 @@
 //	be done carefully.
 void	eladWorker::stop	(void) {
 	if (runnable)
-	   functions	-> StopFIFO (functions -> getHandle ());
+	   functions	-> StopFIFO (functions -> getHandle());
 	runnable	= false;
 }
 
 	eladWorker::~eladWorker	(void) {
-	stop ();
-	while (isRunning ())
+	stop();
+	while (isRunning())
 	   msleep (1);
 	delete _I_Buffer;
 	delete [] convBuffer;
@@ -204,12 +204,12 @@
 int	rc, i;
 
 //	when (re)starting, clean up first
-	_I_Buffer	-> FlushRingBuffer ();
+	_I_Buffer	-> FlushRingBuffer();
 
 	fprintf (stderr, "worker thread started\n");
 
 	while (runnable) {
-	   rc = libusb_bulk_transfer (functions -> getHandle (),
+	   rc = libusb_bulk_transfer (functions -> getHandle(),
 	                              (6 | LIBUSB_ENDPOINT_IN),
 	                              (uint8_t *)buffer,
 	                              BUFFER_SIZE * sizeof (uint8_t),
@@ -227,7 +227,7 @@
 //	Since we do not know whether the amount read is a multiple
 //	of iqSize, we use an intermediate buffer
 	   _I_Buffer	-> putDataIntoBuffer (buffer, amount);
-	   while (_I_Buffer -> GetRingBufferReadAvailable () >= iqSize * 1024) {
+	   while (_I_Buffer -> GetRingBufferReadAvailable() >= iqSize * 1024) {
 	      uint8_t myBuffer [iqSize * 1024];
 	      _I_Buffer -> getDataFromBuffer (myBuffer, iqSize * 1024);
 //
@@ -272,7 +272,7 @@
 	realFreq	= f % Khz (3072);
 	iqSwitch	= ((f / Khz (3072)) & 01) == 01;
 	lastFrequency	= f;
-	result = functions -> SetHWLO (functions -> getHandle (),
+	result = functions -> SetHWLO (functions -> getHandle(),
 	                                                 &lastFrequency);
 	if (result == 1)
 	   fprintf (stderr, "setting frequency to %d succeeded\n",

_service:download_url:qt-dab-2.5.tar.gz/devices/extio-handler/extio-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/extio-handler/extio-handler.cpp Changed

@@ -110,9 +110,9 @@
 
 	inputRate	= 2048000;	// default
 	lastFrequency	= Khz (25000);
-	base_16		= s -> value ("base_16", 128). toInt ();
-	base_24		= s -> value ("base_24", 32767 * 256). toInt ();
-	base_32		= s -> value ("base_32", 32767 * 32768). toInt ();
+	base_16		= s -> value ("base_16", 128). toInt();
+	base_24		= s -> value ("base_24", 32767 * 256). toInt();
+	base_32		= s -> value ("base_32", 32767 * 32768). toInt();
 	isStarted	= false;
 	theReader	= NULL;
 	dll_open	= false;
@@ -121,7 +121,7 @@
 	dll_file = QFileDialog::
 	 getOpenFileName (NULL,
 	 tr ("load file .."),
-	 QDir::currentPath (),
+	 QDir::currentPath(),
 #ifdef	__MINGW32__
 	 tr ("libs (Extio*.dll)"));
 #else
@@ -136,17 +136,17 @@
 
 #ifdef	__MINGW32__
 	wchars_num = MultiByteToWideChar (CP_UTF8, 0,
-	 dll_file. toLatin1 (). data (),
+	 dll_file. toLatin1(). data(),
 	 -1, NULL, 0);
 	windowsName = new wchar_t [wchars_num];
 	MultiByteToWideChar (CP_UTF8, 0,
-	 dll_file. toLatin1 (). data (),
+	 dll_file. toLatin1(). data(),
 	 -1, windowsName, wchars_num);
 	wcstombs (temp, windowsName, 128);
 	Handle		= LoadLibrary (windowsName);
-	fprintf (stderr, "Last error = %ld\n", GetLastError ());
+	fprintf (stderr, "Last error = %ld\n", GetLastError());
 #else
-	Handle		= dlopen (dll_file. toLatin1 (). data (), RTLD_NOW);
+	Handle		= dlopen (dll_file. toLatin1(). data(), RTLD_NOW);
 #endif
 	if (Handle == NULL) {
 	 QMessageBox::warning (NULL, tr ("sdr"),
@@ -154,7 +154,7 @@
 	 throw (21);
 	}
 
-	if (!loadFunctions ()) {
+	if (!loadFunctions()) {
 	 QMessageBox::warning (NULL, tr ("sdr"),
 	 tr ("loading functions failed\n"));
 	 FREELIBRARY (Handle);
@@ -184,7 +184,7 @@
 
 	bool	OK = false;
 	while (!OK) {
-	 inputRate	= GetHWSR	();
+	 inputRate	= GetHWSR();
 	 fprintf (stderr, "inputRate = %d\n", inputRate);
 	 if (inputRate < Khz (2000) ||
 	 (1000 * (inputRate / 1000) != inputRate)) 
@@ -221,15 +221,15 @@
 	 break;
 	}
 
-	ShowGUI ();
+	ShowGUI();
 	fprintf (stderr, "Hw open successful\n");
 }
 
 	extioHandler::~extioHandler (void) {
 	if (dll_open) {
-	 HideGUI ();
-	 StopHW ();
-	 CloseHW ();
+	 HideGUI();
+	 StopHW();
+	 CloseHW();
 	}
 
 	if (Handle != NULL)
@@ -309,7 +309,7 @@
 }
 
 int32_t	extioHandler::getRate	(void) {
-	return GetHWSR ();
+	return GetHWSR();
 }
 
 void	extioHandler::setVFOFrequency (int32_t f) {
@@ -328,16 +328,16 @@
 //	be available
 void	extioHandler::ShowGUI		(void) {
 	if (L_ShowGUI != NULL)
-	 (*L_ShowGUI) ();
+	 (*L_ShowGUI)();
 }
 
 void	extioHandler::HideGUI		(void) {
 	if (L_HideGUI != NULL)
-	 (*L_HideGUI) ();
+	 (*L_HideGUI)();
 }
 
 long	extioHandler::GetHWSR		(void) {
-	return L_GetHWSR != NULL ? (*L_GetHWSR) () : 192000;
+	return L_GetHWSR != NULL ? (*L_GetHWSR)() : 192000;
 }
 
 long	extioHandler::GetHWLO		(void) {
@@ -360,13 +360,13 @@
 void	extioHandler::stopReader	(void) {
 	if (isStarted) {
 	 (*StopHW)();
-	 theReader	-> stopReader ();
+	 theReader	-> stopReader();
 	 isStarted = false;
 	}
 }
 
 int32_t	extioHandler::Samples		(void) {
-int32_t	x = theBuffer -> GetRingBufferReadAvailable ();
+int32_t	x = theBuffer -> GetRingBufferReadAvailable();
 	if (x < 0)
 	 fprintf (stderr, "toch een fout in ringbuffer\n");
 	return x;
@@ -378,7 +378,7 @@
 }
 
 int16_t	extioHandler::bitDepth		(void) {
-	return	theReader	-> bitDepth ();
+	return	theReader	-> bitDepth();
 }
 
 int32_t	extioHandler::defaultFrequency (void) {

_service:download_url:qt-dab-2.5.tar.gz/devices/hackrf-handler/hackrf-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/hackrf-handler/hackrf-handler.cpp Changed

@@ -37,7 +37,7 @@
 	hackrfSettings			= s;
 	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
-	this	-> myFrame	-> show ();
+	this	-> myFrame	-> show();
 	this	-> inputRate		= Khz (2048);
 	_I_Buffer			= nullptr;
 
@@ -59,7 +59,7 @@
 	}
 
 libraryLoaded = true;
- if (!load_hackrfFunctions ()) {
+ if (!load_hackrfFunctions()) {
 #ifdef __MINGW32__
 FreeLibrary (Handle);
 #else
@@ -77,12 +77,12 @@
 //	See if there are settings from previous incarnations
 	hackrfSettings		-> beginGroup ("hackrfSettings");
 	lnagainSlider 		-> setValue (
-	 hackrfSettings -> value ("hack_lnaGain", DEFAULT_GAIN). toInt ());
+	 hackrfSettings -> value ("hack_lnaGain", DEFAULT_GAIN). toInt());
 	vgagainSlider 		-> setValue (
-	 hackrfSettings -> value ("hack_vgaGain", DEFAULT_GAIN). toInt ());
+	 hackrfSettings -> value ("hack_vgaGain", DEFAULT_GAIN). toInt());
 //	contributed by Fabio
 	bool isChecked =
-	 hackrfSettings -> value ("hack_AntEnable", false). toBool ();
+	 hackrfSettings -> value ("hack_AntEnable", false). toBool();
 	AntEnableButton -> setCheckState (isChecked ? Qt::Checked :
 	 Qt::Unchecked);
 	isChecked	=
@@ -90,13 +90,13 @@
 	AmpEnableButton	-> setCheckState (isChecked ? Qt::Checked : 
 Qt::Unchecked);
 	ppm_correction -> setValue (
-	 hackrfSettings -> value ("hack_ppmCorrection", 0). toInt ());
+	 hackrfSettings -> value ("hack_ppmCorrection", 0). toInt());
 //	end
 
-	hackrfSettings	-> endGroup ();
+	hackrfSettings	-> endGroup();
 
 //
-	res	= this -> hackrf_init ();
+	res	= this -> hackrf_init();
 	if (res != HACKRF_SUCCESS) {
 	 fprintf (stderr, "Problem with hackrf_init:");
 	 fprintf (stderr, "%s \n",
@@ -180,11 +180,11 @@
 	 throw (29);
 	}
 
-	setLNAGain	(lnagainSlider		-> value ());
-	setVGAGain	(vgagainSlider		-> value ());
+	setLNAGain	(lnagainSlider		-> value());
+	setVGAGain	(vgagainSlider		-> value());
 	EnableAntenna	(1);		// value is a dummy really
 	EnableAmpli	(1);		// value is a dummy, really
-	set_ppmCorrection (ppm_correction	-> value ());
+	set_ppmCorrection (ppm_correction	-> value());
 
 //	and be prepared for future changes in the settings
 	connect (lnagainSlider, SIGNAL (valueChanged (int)),
@@ -198,7 +198,7 @@
 	connect (ppm_correction, SIGNAL (valueChanged (int)),
 	 this, SLOT (set_ppmCorrection (int)));
 
-	hackrf_device_list_t *deviceList = this -> hackrf_device_list ();
+	hackrf_device_list_t *deviceList = this -> hackrf_device_list();
 	if (deviceList != nullptr) {	// well, it should be
 	 char *serial = deviceList -> serial_numbers [0];
 	 serial_number_display -> setText (serial);
@@ -211,24 +211,24 @@
 	running. store (false);
 }
 
-	hackrfHandler::~hackrfHandler	(void) {
-	stopReader ();
+	hackrfHandler::~hackrfHandler() {
+	stopReader();
 	if (_I_Buffer != nullptr)
 	 delete _I_Buffer;
 	hackrfSettings	-> beginGroup ("hackrfSettings");
 	hackrfSettings	-> setValue ("hack_lnaGain",
-	 lnagainSlider -> value ());
+	 lnagainSlider -> value());
 	hackrfSettings -> setValue ("hack_vgaGain",
-	 vgagainSlider	-> value ());
+	 vgagainSlider	-> value());
 	hackrfSettings -> setValue ("hack_AntEnable",
-	 AntEnableButton -> checkState () == Qt::Checked);
+	 AntEnableButton -> checkState() == Qt::Checked);
 	hackrfSettings -> setValue ("hack_AmpEnable",
-	 AmpEnableButton -> checkState () == Qt::Checked);
+	 AmpEnableButton -> checkState() == Qt::Checked);
 	hackrfSettings	-> setValue ("hack_ppmCorrection",
-	 ppm_correction -> value ());
-	hackrfSettings	-> endGroup ();
+	 ppm_correction -> value());
+	hackrfSettings	-> endGroup();
 	this	-> hackrf_close (theDevice);
-	this	-> hackrf_exit ();
+	this	-> hackrf_exit();
 	delete myFrame;
 }
 //
@@ -245,12 +245,12 @@
 
 //
 //	It seems that after changing the frequency, the preamp is switched off
-	if (AmpEnableButton -> checkState () == Qt::Checked) 
+	if (AmpEnableButton -> checkState() == Qt::Checked) 
 	 EnableAmpli (1);
 	vfoFrequency = newFrequency;
 }
 
-int32_t	hackrfHandler::getVFOFrequency	(void) {
+int32_t	hackrfHandler::getVFOFrequency() {
 	return vfoFrequency;
 }
 
@@ -287,7 +287,7 @@
 bool	b;
 
 	(void)d;
-	b = AntEnableButton	-> checkState () == Qt::Checked;
+	b = AntEnableButton	-> checkState() == Qt::Checked;
 	res = this -> hackrf_set_antenna_enable (theDevice, b);
 //	fprintf(stderr,"Passed %d\n",(int)b);
 	if (res != HACKRF_SUCCESS) {
@@ -304,7 +304,7 @@
 bool	b;
 
 	(void)a;
-	b = AmpEnableButton	-> checkState () == Qt::Checked;
+	b = AmpEnableButton	-> checkState() == Qt::Checked;
 	res = this -> hackrf_set_amp_enable (theDevice, b);
 	if (res != HACKRF_SUCCESS) {
 	 fprintf (stderr, "Problem with hackrf_set_amp_enable :\n");
@@ -343,20 +343,21 @@
 int	i;
 uint8_t *p	= transfer -> buffer;
 RingBuffer<std::complex<float> > * q = ctx -> _I_Buffer;
+int	bufferIndex	= 0;
 
-	for (i = 0; i < transfer -> valid_length / 2; i ++) {
+	for (i = 0; i < transfer -> valid_length / 2; i += 1) {
 	 float re	= (((int8_t *)p) [2 * i]) / 128.0;
 	 float im	= (((int8_t *)p) [2 * i + 1]) / 128.0;
-	 buffer [i]	= std::complex<float> (re, im);
+	 buffer [bufferIndex ++]	= std::complex<float> (re, im);
 	}
-	q -> putDataIntoBuffer (buffer, transfer -> valid_length / 2);
+	q -> putDataIntoBuffer (buffer, bufferIndex);
 	return 0;
 }
 
-bool	hackrfHandler::restartReader	(void) {
+bool	hackrfHandler::restartReader() {
 int	res;
 
-	if (running. load ())
+	if (running. load())
 	 return true;
 
 	res	= this -> hackrf_start_rx (theDevice, callback, this);	
@@ -367,13 +368,13 @@
 	 return false;
 	}
 	running. store (this -> hackrf_is_streaming (theDevice));
-	return running. load ();
+	return running. load();
 }
 
-void	hackrfHandler::stopReader	(void) {
+void	hackrfHandler::stopReader() {
 int	res;
 
-	if (!running. load ())
+	if (!running. load())
 	 return;
 
 	res	= this -> hackrf_stop_rx (theDevice);
@@ -393,19 +394,19 @@
 	return _I_Buffer	-> getDataFromBuffer (V, size);
 }
 
-int32_t	hackrfHandler::Samples	(void) {
-	return _I_Buffer	-> GetRingBufferReadAvailable ();
+int32_t	hackrfHandler::Samples() {
+	return _I_Buffer	-> GetRingBufferReadAvailable();
 }
 
-void	hackrfHandler::resetBuffer	(void) {
-	_I_Buffer	-> FlushRingBuffer ();
+void	hackrfHandler::resetBuffer() {
+	_I_Buffer	-> FlushRingBuffer();

_service:download_url:qt-dab-2.5.tar.gz/devices/hackrf-handler/hackrf-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/hackrf-handler/hackrf-handler.h Changed

@@ -46,14 +46,14 @@
 //
 //	Dll and ".so" function prototypes
 
-typedef	int	(*pfn_hackrf_init)	(void);
+typedef	int	(*pfn_hackrf_init)();
 typedef	int	(*pfn_hackrf_open)	(hackrf_device ** device);
 typedef	int	(*pfn_hackrf_close)	(hackrf_device *device);
-typedef	int	(*pfn_hackrf_exit)	(void);
+typedef	int	(*pfn_hackrf_exit)();
 typedef	int	(*pfn_hackrf_start_rx)	(hackrf_device *,
 	 hackrf_sample_block_cb_fn, void *);
 typedef	int	(*pfn_hackrf_stop_rx)	(hackrf_device *);
-typedef	hackrf_device_list_t	*(*pfn_hackrf_device_list)	(void);
+typedef	hackrf_device_list_t	*(*pfn_hackrf_device_list)();
 typedef	int	(*pfn_hackrf_set_baseband_filter_bandwidth) (hackrf_device *,
 	 const uint32_t bandwidth_hz);
 typedef	int	(*pfn_hackrf_set_lna_gain) (hackrf_device *, uint32_t);
@@ -75,31 +75,29 @@
 // fine aggiunta
 
 
-
-
 ///////////////////////////////////////////////////////////////////////////
 class	hackrfHandler: public virtualInput, public Ui_hackrfWidget {
 Q_OBJECT
 public:
 			hackrfHandler		(QSettings *);
-			~hackrfHandler		(void);
+ ~hackrfHandler();
 	void		setVFOFrequency		(int32_t);
-	int32_t		getVFOFrequency		(void);
+ int32_t		getVFOFrequency();
 
-	bool		restartReader		(void);
-	void		stopReader		(void);
+ bool		restartReader();
+ void		stopReader();
 	int32_t		getSamples		(std::complex<float> *,
 	 int32_t);
-	int32_t		Samples			(void);
-	void		resetBuffer		(void);
-	int16_t		bitDepth		(void);
+	int32_t		Samples();
+ void		resetBuffer();
+ int16_t		bitDepth();
 //
 //	The buffer should be visible by the callback function
 	RingBuffer<std::complex<float>>	*_I_Buffer;
 	hackrf_device	*theDevice;
 private:
 
-	bool			load_hackrfFunctions	(void);
+ bool			load_hackrfFunctions();
 	pfn_hackrf_init		hackrf_init;
 	pfn_hackrf_open		hackrf_open;
 	pfn_hackrf_close	hackrf_close;

_service:download_url:qt-dab-2.5.tar.gz/devices/hackrf-handler/libhackrf/hackrf.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/hackrf-handler/libhackrf/hackrf.h Changed

_service:download_url:qt-dab-2.7.1.tar.gz/devices/lime-handler Added

_service:download_url:qt-dab-2.7.1.tar.gz/devices/lime-handler/LMS7002M_parameters.h Added

@@ -0,0 +1,761 @@
+/**
+@file	LMS7002M_parameters.h
+@author Lime Microsystems (www.limemicro.com)
+@brief 	List of LMS7002M transceiver control parameters
+*/
+
+#ifndef LMS7002M_PARAMETERS_H
+#define LMS7002M_PARAMETERS_H
+#include <cstdint>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LMS7param(id) LMS7_ ## id
+
+struct LMS7Parameter
+{
+ uint16_t address;
+ uint8_t msb;
+ uint8_t lsb;
+ uint16_t defaultValue;
+ const char* name;
+ const char* tooltip;
+};
+
+int LMS7ParameterCompare(struct LMS7Parameter a, struct LMS7Parameter b);
+
+static const struct LMS7Parameter LMS7_LRST_TX_B = { 0x0020, 15, 15, 1, "LRST_TX_B", "Resets all the logic registers to the default state for Tx MIMO channel B" };
+static const struct LMS7Parameter LMS7_MRST_TX_B = { 0x0020, 14, 14, 1, "MRST_TX_B", "Resets all the configuration memory to the default state for Tx MIMO channel B" };
+static const struct LMS7Parameter LMS7_LRST_TX_A = { 0x0020, 13, 13, 1, "LRST_TX_A", "Resets all the logic registers to the default state for Tx MIMO channel A" };
+static const struct LMS7Parameter LMS7_MRST_TX_A = { 0x0020, 12, 12, 1, "MRST_TX_A", "Resets all the configuration memory to the default state for Tx MIMO channel A" };
+static const struct LMS7Parameter LMS7_LRST_RX_B = { 0x0020, 11, 11, 1, "LRST_RX_B", "Resets all the logic registers to the default state for Rx MIMO channel B" };
+static const struct LMS7Parameter LMS7_MRST_RX_B = { 0x0020, 10, 10, 1, "MRST_RX_B", "Resets all the configuration memory to the default state for Rx MIMO channel B" };
+static const struct LMS7Parameter LMS7_LRST_RX_A = { 0x0020, 9, 9, 1, "LRST_RX_A", "Resets all the logic registers to the default state for Rx MIMO channel A" };
+static const struct LMS7Parameter LMS7_MRST_RX_A = { 0x0020, 8, 8, 1, "MRST_RX_A", "Resets all the configuration memory to the default state for Rx MIMO channel A" };
+static const struct LMS7Parameter LMS7_SRST_RXFIFO = { 0x0020, 7, 7, 1, "SRST_RXFIFO", "RX FIFO soft reset (LimeLight Interface)" };
+static const struct LMS7Parameter LMS7_SRST_TXFIFO = { 0x0020, 6, 6, 1, "SRST_TXFIFO", "TX FIFO soft reset (LimeLight Interface)" };
+static const struct LMS7Parameter LMS7_RXEN_B = { 0x0020, 5, 5, 1, "RXEN_B", "Power control for Rx MIMO channel B" };
+static const struct LMS7Parameter LMS7_RXEN_A = { 0x0020, 4, 4, 1, "RXEN_A", "Power control for Rx MIMO channel A" };
+static const struct LMS7Parameter LMS7_TXEN_B = { 0x0020, 3, 3, 1, "TXEN_B", "Power control for Tx MIMO channel B" };
+static const struct LMS7Parameter LMS7_TXEN_A = { 0x0020, 2, 2, 1, "TXEN_A", "Power control for Tx MIMO channel A" };
+static const struct LMS7Parameter LMS7_MAC = { 0x0020, 1, 0, 3, "MAC", "Selects MIMO channel for communication" };
+static const struct LMS7Parameter LMS7_TX_CLK_PE = { 0x0021, 11, 11, 1, "TX_CLK_PE", "Pull up control of TX_CLK pad" };
+static const struct LMS7Parameter LMS7_RX_CLK_PE = { 0x0021, 10, 10, 1, "RX_CLK_PE", "Pull up control of RX_CLK pad" };
+static const struct LMS7Parameter LMS7_SDA_PE = { 0x0021, 9, 9, 1, "SDA_PE", "Pull up control of SDA pad" };
+static const struct LMS7Parameter LMS7_SDA_DS = { 0x0021, 8, 8, 0, "SDA_DS", "Driver strength of SDA pad" };
+static const struct LMS7Parameter LMS7_SCL_PE = { 0x0021, 7, 7, 1, "SCL_PE", "Pull up control of SCL pad" };
+static const struct LMS7Parameter LMS7_SCL_DS = { 0x0021, 6, 6, 0, "SCL_DS", "Driver strength of SCL pad" };
+static const struct LMS7Parameter LMS7_SDIO_DS = { 0x0021, 5, 5, 0, "SDIO_DS", "Driver strength of SDIO pad" };
+static const struct LMS7Parameter LMS7_SDIO_PE = { 0x0021, 4, 4, 1, "SDIO_PE", "Pull up control of SDIO pad" };
+static const struct LMS7Parameter LMS7_SDO_PE = { 0x0021, 3, 3, 1, "SDO_PE", "Pull up control of SDO pad" };
+static const struct LMS7Parameter LMS7_SCLK_PE = { 0x0021, 2, 2, 1, "SCLK_PE", "Pull up control of SCLK pad" };
+static const struct LMS7Parameter LMS7_SEN_PE = { 0x0021, 1, 1, 1, "SEN_PE", "Pull up control of SEN pad" };
+static const struct LMS7Parameter LMS7_SPIMODE = { 0x0021, 0, 0, 1, "SPIMODE", "SPI communication mode" };
+static const struct LMS7Parameter LMS7_DIQ2_DS = { 0x0022, 11, 11, 0, "DIQ2_DS", "Driver strength of DIQ2 pad" };
+static const struct LMS7Parameter LMS7_DIQ2_PE = { 0x0022, 10, 10, 1, "DIQ2_PE", "Pull up control of DIQ2 pad" };
+static const struct LMS7Parameter LMS7_IQ_SEL_EN_2_PE = { 0x0022, 9, 9, 1, "IQ_SEL_EN_2_PE", "Pull up control of IQ_SEL_EN_2 pad" };
+static const struct LMS7Parameter LMS7_TXNRX2_PE = { 0x0022, 8, 8, 1, "TXNRX2_PE", "Pull up control of TXNRX2 pad" };
+static const struct LMS7Parameter LMS7_FCLK2_PE = { 0x0022, 7, 7, 1, "FCLK2_PE", "Pull up control of FCLK2 pad" };
+static const struct LMS7Parameter LMS7_MCLK2_PE = { 0x0022, 6, 6, 1, "MCLK2_PE", "Pull up control of MCLK2 pad" };
+static const struct LMS7Parameter LMS7_DIQ1_DS = { 0x0022, 5, 5, 0, "DIQ1_DS", "Pull up control of MCLK2 pad" };
+static const struct LMS7Parameter LMS7_DIQ1_PE = { 0x0022, 4, 4, 1, "DIQ1_PE", "Pull up control of DIQ1 pad" };
+static const struct LMS7Parameter LMS7_IQ_SEL_EN_1_PE = { 0x0022, 3, 3, 1, "IQ_SEL_EN_1_PE", "Pull up control of IQ_SEL_EN_1 pad" };
+static const struct LMS7Parameter LMS7_TXNRX1_PE = { 0x0022, 2, 2, 1, "TXNRX1_PE", "Pull up control of TXNRX1 pad" };
+static const struct LMS7Parameter LMS7_FCLK1_PE = { 0x0022, 1, 1, 1, "FCLK1_PE", "Pull up control of FCLK1 pad" };
+static const struct LMS7Parameter LMS7_MCLK1_PE = { 0x0022, 0, 0, 1, "MCLK1_PE", "Pull up control of MCLK1 pad" };
+static const struct LMS7Parameter LMS7_DIQDIRCTR2 = { 0x0023, 15, 15, 0, "DIQDIRCTR2", "DIQ2 direction control mode" };
+static const struct LMS7Parameter LMS7_DIQDIR2 = { 0x0023, 14, 14, 1, "DIQDIR2", "DIQ2 direction" };
+static const struct LMS7Parameter LMS7_DIQDIRCTR1 = { 0x0023, 13, 13, 0, "DIQDIRCTR1", "DIQ1 direction control mode" };
+static const struct LMS7Parameter LMS7_DIQDIR1 = { 0x0023, 12, 12, 1, "DIQDIR1", "DIQ1 direction" };
+static const struct LMS7Parameter LMS7_ENABLEDIRCTR2 = { 0x0023, 11, 11, 0, "ENABLEDIRCTR2", "ENABLE2 direction control mode" };
+static const struct LMS7Parameter LMS7_ENABLEDIR2 = { 0x0023, 10, 10, 1, "ENABLEDIR2", "ENABLE2 direction" };
+static const struct LMS7Parameter LMS7_ENABLEDIRCTR1 = { 0x0023, 9, 9, 0, "ENABLEDIRCTR1", "ENABLE1 direction control mode" };
+static const struct LMS7Parameter LMS7_ENABLEDIR1 = { 0x0023, 8, 8, 1, "ENABLEDIR1", "ENABLE1 direction." };
+static const struct LMS7Parameter LMS7_MOD_EN = { 0x0023, 6, 6, 1, "MOD_EN", "LimeLight interface enable" };
+static const struct LMS7Parameter LMS7_LML2_FIDM = { 0x0023, 5, 5, 0, "LML2_FIDM", "Frame start ID selection for Port 2 when LML_MODE2 = 0" };
+static const struct LMS7Parameter LMS7_LML2_TXNRXIQ = { 0x0023, 4, 4, 1, "LML2_TXNRXIQ", "TXIQ/RXIQ mode selection for Port 2 when LML_MODE2 = 0" };
+static const struct LMS7Parameter LMS7_LML2_MODE = { 0x0023, 3, 3, 1, "LML2_MODE", "Mode of LimeLight Port 2" };
+static const struct LMS7Parameter LMS7_LML1_FIDM = { 0x0023, 2, 2, 0, "LML1_FIDM", "Frame start ID selection for Port 1 when LML_MODE1 = 0" };
+static const struct LMS7Parameter LMS7_LML1_TXNRXIQ = { 0x0023, 1, 1, 0, "LML1_TXNRXIQ", "TXIQ/RXIQ mode selection for Port 1 when LML_MODE1 = 0" };
+static const struct LMS7Parameter LMS7_LML1_MODE = { 0x0023, 0, 0, 1, "LML1_MODE", "Mode of LimeLight Port 1" };
+static const struct LMS7Parameter LMS7_LML1_S3S = { 0x0024, 15, 14, 3, "LML1_S3S", "Sample source in position 3, when Port 1 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML1_S2S = { 0x0024, 13, 12, 2, "LML1_S2S", "Sample source in position 2, when Port 1 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML1_S1S = { 0x0024, 11, 10, 1, "LML1_S1S", "Sample source in position 1, when Port 1 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML1_S0S = { 0x0024, 9, 8, 0, "LML1_S0S", "Sample source in position 0, when Port 1 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML1_BQP = { 0x0024, 7, 6, 3, "LML1_BQP", "BQ sample position in frame, when Port 1 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML1_BIP = { 0x0024, 5, 4, 2, "LML1_BIP", "BI sample position in frame, when Port 1 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML1_AQP = { 0x0024, 3, 2, 1, "LML1_AQP", "AQ sample position in frame, when Port 1 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML1_AIP = { 0x0024, 1, 0, 0, "LML1_AIP", "AI sample position in frame, when Port 1 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML1_BB2RF_PST = { 0x0025, 15, 8, 1, "LML1_BB2RF_PST", "Number of clock cycles to wait before data drive stop after burst stop is detected in JESD207 mode on Port 1 and Port 1 BB2RF" };
+static const struct LMS7Parameter LMS7_LML1_BB2RF_PRE = { 0x0025, 7, 0, 1, "LML1_BB2RF_PRE", "Number of clock cycles to wait before data drive start after burst start is detected in JESD207 mode on Port 1 and Port 1 BB2RF" };
+static const struct LMS7Parameter LMS7_LML1_RF2BB_PST = { 0x0026, 15, 8, 1, "LML1_RF2BB_PST", "Number of clock cycles to wait before data capture stop after burst stop is detected in JESD207 mode on Port 1 and Port 1 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML1_RF2BB_PRE = { 0x0026, 7, 0, 1, "LML1_RF2BB_PRE", "Number of clock cycles to wait before data capture start after burst start is detected in JESD207 mode on Port 1 and Port 1 RF2BB" };
+static const struct LMS7Parameter LMS7_LML2_S3S = { 0x0027, 15, 14, 3, "LML2_S3S", "Sample source in position 3, when Port 2 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML2_S2S = { 0x0027, 13, 12, 2, "LML2_S2S", "Sample source in position 2, when Port 2 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML2_S1S = { 0x0027, 11, 10, 1, "LML2_S1S", "Sample source in position 1, when Port 2 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML2_S0S = { 0x0027, 9, 8, 0, "LML2_S0S", "Sample source in position 0, when Port 2 is RF2BB" };
+static const struct LMS7Parameter LMS7_LML2_BQP = { 0x0027, 7, 6, 3, "LML2_BQP", "BQ sample position in frame, when Port 2 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML2_BIP = { 0x0027, 5, 4, 2, "LML2_BIP", "BI sample position in frame, when Port 2 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML2_AQP = { 0x0027, 3, 2, 1, "LML2_AQP", "AQ sample position in frame, when Port 2 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML2_AIP = { 0x0027, 1, 0, 0, "LML2_AIP", "AI sample position in frame, when Port 2 is BB2RF" };
+static const struct LMS7Parameter LMS7_LML2_BB2RF_PST = { 0x0028, 15, 8, 1, "LML2_BB2RF_PST", "Number of clock cycles to wait before data drive stop after burst stop is detected in JESD207 mode on Port 2 and Port 2 BB2RF" };
+static const struct LMS7Parameter LMS7_LML2_BB2RF_PRE = { 0x0028, 7, 0, 1, "LML2_BB2RF_PRE", "Number of clock cycles to wait before data drive start after burst start is detected in JESD207 mode on Port 2 and Port 2 BB2RF" };
+static const struct LMS7Parameter LMS7_LML2_RF2BB_PST = { 0x0029, 15, 8, 1, "LML2_RF2BB_PST", "Number of clock cycles to wait before data capture stop after burst stop is detected in JESD207 mode on Port 2 and Port 2 RF2BB" };
+static const struct LMS7Parameter LMS7_LML2_RF2BB_PRE = { 0x0029, 7, 0, 1, "LML2_RF2BB_PRE", "Number of clock cycles to wait before data capture start after burst start is detected in JESD207 mode on Port 2 and Port 2 RF2BB" };
+static const struct LMS7Parameter LMS7_FCLK2_DLY = { 0x002A, 15, 14, 0, "FCLK2_DLY", "" };
+static const struct LMS7Parameter LMS7_FCLK1_DLY = { 0x002A, 13, 12, 0, "FCLK1_DLY", "" };
+static const struct LMS7Parameter LMS7_RX_MUX = { 0x002A, 11, 10, 0, "RX_MUX", "RxFIFO data source selection" };
+static const struct LMS7Parameter LMS7_TX_MUX = { 0x002A, 9, 8, 0, "TX_MUX", "Port selection for data transmit to TSP" };
+static const struct LMS7Parameter LMS7_TXRDCLK_MUX = { 0x002A, 7, 6, 2, "TXRDCLK_MUX", "TX FIFO read clock selection" };
+static const struct LMS7Parameter LMS7_TXWRCLK_MUX = { 0x002A, 5, 4, 0, "TXWRCLK_MUX", "TX FIFO write clock selection" };
+static const struct LMS7Parameter LMS7_RXRDCLK_MUX = { 0x002A, 3, 2, 1, "RXRDCLK_MUX", "RX FIFO read clock selection" };
+static const struct LMS7Parameter LMS7_RXWRCLK_MUX = { 0x002A, 1, 0, 2, "RXWRCLK_MUX", "RX FIFO write clock selection" };
+static const struct LMS7Parameter LMS7_FCLK2_INV = { 0x002B, 15, 15, 0, "FCLK2_INV", "FCLK2 clock inversion" };
+static const struct LMS7Parameter LMS7_FCLK1_INV = { 0x002B, 14, 14, 0, "FCLK1_INV", "FCLK1 clock inversion" };
+static const struct LMS7Parameter LMS7_MCLK2DLY = { 0x002B, 13, 12, 0, "MCLK2DLY", "MCLK2 clock internal delay" };
+static const struct LMS7Parameter LMS7_MCLK1DLY = { 0x002B, 11, 10, 0, "MCLK1DLY", "MCLK1 clock internal delay" };
+static const struct LMS7Parameter LMS7_MCLK2SRC = { 0x002B, 5, 4, 1, "MCLK2SRC", "MCLK2 clock source" };
+static const struct LMS7Parameter LMS7_MCLK1SRC = { 0x002B, 3, 2, 0, "MCLK1SRC", "MCLK1 clock source" };
+static const struct LMS7Parameter LMS7_TXDIVEN = { 0x002B, 1, 1, 0, "TXDIVEN", "TX clock divider enable" };
+static const struct LMS7Parameter LMS7_RXDIVEN = { 0x002B, 0, 0, 0, "RXDIVEN", "RX clock divider enable" };
+static const struct LMS7Parameter LMS7_TXTSPCLKA_DIV = { 0x002C, 15, 8, 255, "TXTSPCLKA_DIV", "TxTSP clock divider, used to produce MCLK(1/2). Clock division ratio is 2(TXTSPCLKA_DIV + 1)"};
+static const struct LMS7Parameter LMS7_RXTSPCLKA_DIV = { 0x002C, 7, 0, 255, "RXTSPCLKA_DIV", "RxTSP clock divider, used to produce MCLK(1/2). Clock division ratio is 2(RXTSPCLKA_DIV + 1)"};
+static const struct LMS7Parameter LMS7_MIMO_SISO = { 0x002E, 15, 15, 0, "MIMO_SISO", "MIMO channel B enable control" };
+static const struct LMS7Parameter LMS7_VER = { 0x002F, 15, 11, 7, "VER", "" };
+static const struct LMS7Parameter LMS7_REV = { 0x002F, 10, 6, 1, "REV", "" };
+static const struct LMS7Parameter LMS7_MASK = { 0x002F, 5, 0, 1, "MASK", "" };
+static const struct LMS7Parameter LMS7_EN_DIR_LDO = { 0x0081, 3, 3, 0, "EN_DIR_LDO", "" };
+static const struct LMS7Parameter LMS7_EN_DIR_CGEN = { 0x0081, 2, 2, 0, "EN_DIR_CGEN", "" };
+static const struct LMS7Parameter LMS7_EN_DIR_XBUF = { 0x0081, 1, 1, 0, "EN_DIR_XBUF", "" };
+static const struct LMS7Parameter LMS7_EN_DIR_AFE = { 0x0081, 0, 0, 0, "EN_DIR_AFE", "" };
+static const struct LMS7Parameter LMS7_ISEL_DAC_AFE = { 0x0082, 15, 13, 4, "ISEL_DAC_AFE", "Controls the peak current of the DAC output current" };
+static const struct LMS7Parameter LMS7_MODE_INTERLEAVE_AFE = { 0x0082, 12, 12, 0, "MODE_INTERLEAVE_AFE", "time interleaves the two ADCs into one ADC" };
+static const struct LMS7Parameter LMS7_MUX_AFE_1 = { 0x0082, 11, 10, 0, "MUX_AFE_1", "Controls the MUX at the input of the ADC channel 1" };
+static const struct LMS7Parameter LMS7_MUX_AFE_2 = { 0x0082, 9, 8, 0, "MUX_AFE_2", "Controls the MUX at the input of the ADC channel 2" };
+static const struct LMS7Parameter LMS7_PD_AFE = { 0x0082, 5, 5, 0, "PD_AFE", "Power down control for the AFE current mirror in BIAS_TOP" };
+static const struct LMS7Parameter LMS7_PD_RX_AFE1 = { 0x0082, 4, 4, 0, "PD_RX_AFE1", "Power down control for the ADC of channel 1" };
+static const struct LMS7Parameter LMS7_PD_RX_AFE2 = { 0x0082, 3, 3, 1, "PD_RX_AFE2", "Power down control for the ADC of channel 2" };
+static const struct LMS7Parameter LMS7_PD_TX_AFE1 = { 0x0082, 2, 2, 0, "PD_TX_AFE1", "Power down control for the DAC of channel 1" };
+static const struct LMS7Parameter LMS7_PD_TX_AFE2 = { 0x0082, 1, 1, 1, "PD_TX_AFE2", "Power down control for the DAC of channel 2" };
+static const struct LMS7Parameter LMS7_EN_G_AFE = { 0x0082, 0, 0, 1, "EN_G_AFE", "Enable control for all the AFE power downs" };
+static const struct LMS7Parameter LMS7_MUX_BIAS_OUT = { 0x0084, 12, 11, 0, "MUX_BIAS_OUT", "Test mode of the BIAS_TOP" };
+static const struct LMS7Parameter LMS7_RP_CALIB_BIAS = { 0x0084, 10, 6, 16, "RP_CALIB_BIAS", "Calibration code for rppolywo. This code is set by the calibration algorithm: BIAS_RPPOLY_calibration" };
+static const struct LMS7Parameter LMS7_PD_FRP_BIAS = { 0x0084, 4, 4, 0, "PD_FRP_BIAS", "Power down signal for Fix/RP block" };
+static const struct LMS7Parameter LMS7_PD_F_BIAS = { 0x0084, 3, 3, 0, "PD_F_BIAS", "Power down signal for Fix" };
+static const struct LMS7Parameter LMS7_PD_PTRP_BIAS = { 0x0084, 2, 2, 0, "PD_PTRP_BIAS", "Power down signal for PTAT/RP block" };
+static const struct LMS7Parameter LMS7_PD_PT_BIAS = { 0x0084, 1, 1, 0, "PD_PT_BIAS", "Power down signal for PTAT block" };
+static const struct LMS7Parameter LMS7_PD_BIAS_MASTER = { 0x0084, 0, 0, 0, "PD_BIAS_MASTER", "Enable signal for central bias block" };
+static const struct LMS7Parameter LMS7_SLFB_XBUF_RX = { 0x0085, 8, 8, 0, "SLFB_XBUF_RX", "Self biasing digital contol SLFB_XBUF_RX" };
+static const struct LMS7Parameter LMS7_SLFB_XBUF_TX = { 0x0085, 7, 7, 0, "SLFB_XBUF_TX", "Self biasing digital contol SLFB_XBUF_TX" };
+static const struct LMS7Parameter LMS7_BYP_XBUF_RX = { 0x0085, 6, 6, 0, "BYP_XBUF_RX", "Shorts the Input 3.3V buffer in XBUF" };
+static const struct LMS7Parameter LMS7_BYP_XBUF_TX = { 0x0085, 5, 5, 0, "BYP_XBUF_TX", "Shorts the Input 3.3V buffer in XBUF" };
+static const struct LMS7Parameter LMS7_EN_OUT2_XBUF_TX = { 0x0085, 4, 4, 0, "EN_OUT2_XBUF_TX", "Enables the 2nd output of TX XBUF. This 2nd buffer goes to XBUF_RX. This should be active when only 1 XBUF is to be used" };
+static const struct LMS7Parameter LMS7_EN_TBUFIN_XBUF_RX = { 0x0085, 3, 3, 0, "EN_TBUFIN_XBUF_RX", "Disables the input from the external XOSC and buffers the 2nd input signal (from TX XBUF 2nd output) to the RX. This should be active when only 1 XBUF is to be used" };
+static const struct LMS7Parameter LMS7_PD_XBUF_RX = { 0x0085, 2, 2, 0, "PD_XBUF_RX", "Power down signal PD_XBUF_RX" };
+static const struct LMS7Parameter LMS7_PD_XBUF_TX = { 0x0085, 1, 1, 0, "PD_XBUF_TX", "Power down signal PD_XBUF_TX" };
+static const struct LMS7Parameter LMS7_EN_G_XBUF = { 0x0085, 0, 0, 1, "EN_G_XBUF", "Enable control for all the XBUF power downs" };
+static const struct LMS7Parameter LMS7_SPDUP_VCO_CGEN = { 0x0086, 15, 15, 0, "SPDUP_VCO_CGEN", "Bypasses the noise filter resistor for fast setlling time. It should be connected to a 1us pulse" };
+static const struct LMS7Parameter LMS7_RESET_N_CGEN = { 0x0086, 14, 14, 1, "RESET_N_CGEN", "A pulse should be used in the start-up to reset ( 1-normal operation)" };
+static const struct LMS7Parameter LMS7_EN_ADCCLKH_CLKGN = { 0x0086, 11, 11, 1, "EN_ADCCLKH_CLKGN", "Selects if F_CLKH or F_CLKL is connected to FCLK_ADC" };
+static const struct LMS7Parameter LMS7_EN_COARSE_CKLGEN = { 0x0086, 10, 10, 0, "EN_COARSE_CKLGEN", "Enable signal for coarse tuning block" };
+static const struct LMS7Parameter LMS7_EN_INTONLY_SDM_CGEN = { 0x0086, 9, 9, 0, "EN_INTONLY_SDM_CGEN", "Enables INTEGER-N mode of the SX " };
+static const struct LMS7Parameter LMS7_EN_SDM_CLK_CGEN = { 0x0086, 8, 8, 1, "EN_SDM_CLK_CGEN", "Enables/Disables SDM clock. In INT-N mode or for noise testing, SDM clock can be disabled" };
+static const struct LMS7Parameter LMS7_PD_CP_CGEN = { 0x0086, 6, 6, 0, "PD_CP_CGEN", "Power down for Charge Pump" };
+static const struct LMS7Parameter LMS7_PD_FDIV_FB_CGEN = { 0x0086, 5, 5, 0, "PD_FDIV_FB_CGEN", "Power down for feedback frequency divider" };
+static const struct LMS7Parameter LMS7_PD_FDIV_O_CGEN = { 0x0086, 4, 4, 0, "PD_FDIV_O_CGEN", "Power down for forward frequency divider of the CGEN block" };
+static const struct LMS7Parameter LMS7_PD_SDM_CGEN = { 0x0086, 3, 3, 0, "PD_SDM_CGEN", "Power down for SDM" };
+static const struct LMS7Parameter LMS7_PD_VCO_CGEN = { 0x0086, 2, 2, 0, "PD_VCO_CGEN", "Power down for VCO" };
+static const struct LMS7Parameter LMS7_PD_VCO_COMP_CGEN = { 0x0086, 1, 1, 0, "PD_VCO_COMP_CGEN", "Power down for VCO comparator" };
+static const struct LMS7Parameter LMS7_EN_G_CGEN = { 0x0086, 0, 0, 1, "EN_G_CGEN", "Enable control for all the CGEN power downs" };
+static const struct LMS7Parameter LMS7_FRAC_SDM_CGEN_LSB = { 0x0087, 15, 0, 0x0400, "FRAC_SDM_CGEN_LSB", "" };
+static const struct LMS7Parameter LMS7_INT_SDM_CGEN = { 0x0088, 13, 4, 120, "INT_SDM_CGEN", "" };
+static const struct LMS7Parameter LMS7_FRAC_SDM_CGEN_MSB = { 0x0088, 3, 0, 0, "FRAC_SDM_CGEN_MSB", "" };
+static const struct LMS7Parameter LMS7_REV_SDMCLK_CGEN = { 0x0089, 15, 15, 0, "REV_SDMCLK_CGEN", "Reverses the SDM clock" };
+static const struct LMS7Parameter LMS7_SEL_SDMCLK_CGEN = { 0x0089, 14, 14, 0, "SEL_SDMCLK_CGEN", "Selects between the feedback divider output and Fref for SDM" };
+static const struct LMS7Parameter LMS7_SX_DITHER_EN_CGEN = { 0x0089, 13, 13, 0, "SX_DITHER_EN_CGEN", "Enabled dithering in SDM" };
+static const struct LMS7Parameter LMS7_CLKH_OV_CLKL_CGEN = { 0x0089, 12, 11, 0, "CLKH_OV_CLKL_CGEN", "FCLKL here is ADC clock. FCLKH is the clock to the DAC and if no division is added to the ADC as well" };
+static const struct LMS7Parameter LMS7_DIV_OUTCH_CGEN = { 0x0089, 10, 3, 4, "DIV_OUTCH_CGEN", "" };
+static const struct LMS7Parameter LMS7_TST_CGEN = { 0x0089, 2, 0, 0, "TST_CGEN",
+"Controls the test mode of the SX\n\
+0 - TST disabled; RSSI analog outputs enabled if RSSI blocks active and when all PLL test signals are off\n\
+1 - tstdo[0] = ADC clock; tstdo[1] = DAC clock; tstao = High impedance;\n\
+2 - tstdo[0] = SDM clock; tstdo[1] = feedback divider output; tstao = VCO tune through a 60kOhm resistor;\n\
+3 - tstdo[0] = Reference clock; tstdo[1] = feedback divider output; tstao = VCO tune through a 10kOhm resistor;\n\
+4 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = High impedance;\n\
+5 - tstdo[0] = Charge pump Down signal; tstdo[1] = Charge pump Up signal; tstao = High impedance;\n\
+6 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = VCO tune through a 60kOhm resistor;\n\
+7 - tstdo[0] = High impedance; tstdo[1] = High impedance; tstao = VCO tune through a 10kOhm resistor;\n\
+if TST_SX[2] = 1 --> VCO_TSTBUF active generating VCO_TST_DIV20 and VCO_TST_DIV40"};
+static const struct LMS7Parameter LMS7_REV_CLKDAC_CGEN = { 0x008A, 14, 14, 0, "REV_CLKDAC_CGEN", "Inverts the clock F_CLKL" };
+static const struct LMS7Parameter LMS7_CMPLO_CTRL_CGEN = { 0x008B, 14, 14, 0, "CMPLO_CTRL_CGEN", "" };
+static const struct LMS7Parameter LMS7_REV_CLKADC_CGEN = { 0x008A, 13, 13, 0, "REV_CLKADC_CGEN", "Inverts the clock F_CLKL" };
+static const struct LMS7Parameter LMS7_REVPH_PFD_CGEN = { 0x008A, 12, 12, 0, "REVPH_PFD_CGEN", "Reverse the pulses of PFD. It can be used to reverse the polarity of the PLL loop (positive feedback to negative feedback)" };
+static const struct LMS7Parameter LMS7_IOFFSET_CP_CGEN = { 0x008A, 11, 6, 20, "IOFFSET_CP_CGEN", "Scales the offset current of the charge pump, 0-->63. This current is used in Fran-N mode to create an offset in the CP response and avoide the non-linear section" };
+static const struct LMS7Parameter LMS7_IPULSE_CP_CGEN = { 0x008A, 5, 0, 20, "IPULSE_CP_CGEN", "Scales the pulse current of the charge pump" };
+static const struct LMS7Parameter LMS7_ICT_VCO_CGEN = { 0x008B, 13, 9, 16, "ICT_VCO_CGEN", "Scales the VCO bias current from 0 to 2.5xInom" };
+static const struct LMS7Parameter LMS7_CSW_VCO_CGEN = { 0x008B, 8, 1, 128, "CSW_VCO_CGEN", "" };
+static const struct LMS7Parameter LMS7_COARSE_START_CGEN = { 0x008B, 0, 0, 0, "COARSE_START_CGEN", "Control signal for coarse tuning algorithm (SX_SWC_calibration)" };

_service:download_url:qt-dab-2.7.1.tar.gz/devices/lime-handler/LimeSuite.h Added

@@ -0,0 +1,1338 @@
+/**
+ * @file lime/LimeSuite.h
+ *
+ * @brief LMS API library
+ *
+ * Copyright (C) 2016 Lime Microsystems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef LMS7_API_H
+#define LMS7_API_H
+
+#include <cstdint>
+#include <cstdlib>
+#include "LMS7002M_parameters.h"
+
+#ifdef __cplusplus
+extern "C" {
+#else
+/* stdbool.h is not applicable for C++ programs, as the language inherently
+ * provides the bool type.
+ *
+ * Users of Visual Studio 2012 and earlier will need to supply a stdbool.h
+ * implementation, as it is not included with the toolchain. Visual Studio 2013
+ * onward supplies this header.
+ */
+#include <stdbool.h>
+#endif
+
+#if defined _WIN32 || defined __CYGWIN__
+# include <windows.h>
+# define CALL_CONV __cdecl
+# ifdef __GNUC__
+# define API_EXPORT __attribute__ ((dllexport))
+# else
+# define API_EXPORT __declspec(dllexport)
+# endif
+#elif defined _DOXYGEN_ONLY_
+ /** Marks an API routine to be made visible to the dynamic loader.
+ * This is OS and/or compiler-specific. */
+# define API_EXPORT
+ /** Specifies calling convention, if necessary.
+ * This is OS and/or compiler-specific. */
+# define CALL_CONV
+#else
+# define API_EXPORT __attribute__ ((visibility ("default")))
+# define CALL_CONV
+#endif
+
+///Floating point data type
+typedef double float_type;
+
+///convenience constant for good return code
+static const int LMS_SUCCESS = 0;
+
+/**
+ * @defgroup FN_INIT Initialization/deinitialization
+ *
+ * The functions in this section provide the ability to query available devices,
+ * initialize them, and deinitialize them.
+ * @{
+ */
+
+///LMS Device handle
+typedef void lms_device_t;
+
+///Convenience type for fixed length LMS Device information string
+typedef char lms_info_str_t[256];
+
+/**
+ * Obtain a list of LMS devices attached to the system
+ *
+ * @param[out] dev_list List of available devices
+ *
+ * @return number of devices in the list on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetDeviceList(lms_info_str_t *dev_list);
+
+/**
+ * Opens device specified by the provided ::lms_info_str_t string
+ * This function should be used to open a device based upon the results of
+ * LMS_GetDeviceList()
+ *
+ * @pre device should be initialized to NULL
+ *
+ * @param[out] device Updated with device handle on success
+ * @param[in] info Device information string. If NULL, the first
+ * available device will be opened.
+ * @param[in] args additional arguments. Can be NULL.
+ *
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_Open(lms_device_t **device, const lms_info_str_t info,
+ void* args);
+
+/**
+ * Close device
+ *
+ * @post device is deallocated and may no longer be used.
+ *
+ * @param device Device handle previously obtained by LMS_Open().
+ *
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_Close(lms_device_t *device);
+
+/** @} (End FN_INIT) */
+
+/**
+ * @defgroup FN_HIGH_LVL High-level control functions
+ *
+ * The functions in this section provide the ability to easily configure the
+ * device for operation. They modify multiple internal device settings. 
+ *
+ * @{
+ */
+
+static const bool LMS_CH_TX = true; ///<Convenience constants for TX selection
+static const bool LMS_CH_RX = false; ///<Convenience constants for RX selection
+
+/** Convenience type for fixed length name string*/
+typedef char lms_name_t[16];
+
+/**Structure used to represent the allowed value range of various parameters*/
+typedef struct
+{
+ float_type min; ///<Minimum allowed value
+ float_type max; ///<Minimum allowed value
+ float_type step; ///<Minimum value step
+}lms_range_t;
+
+/**Enumeration of LMS7 TEST signal types*/
+typedef enum
+{
+ LMS_TESTSIG_NONE=0, ///<Disable test signals. Return to normal operation
+ LMS_TESTSIG_NCODIV8, ///<Test signal from NCO half scale
+ LMS_TESTSIG_NCODIV4, ///<Test signal from NCO half scale
+ LMS_TESTSIG_NCODIV8F, ///<Test signal from NCO full scale
+ LMS_TESTSIG_NCODIV4F, ///<Test signal from NCO full scale
+ LMS_TESTSIG_DC ///<DC test signal
+}lms_testsig_t;
+
+/**
+ * Configure LMS chip with settings that make it ready for operation.
+ *
+ * @note This configuration differs from default LMS chip configuration which is
+ * described in chip datasheet. In order to load default chip configuration use
+ * LMS_Reset().
+ *
+ * @param[in] device Device handle previously obtained by LMS_Open().
+ *
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_Init(lms_device_t *device);
+
+/**
+ * Obtain number of RX or TX channels. Use this to determine the maximum
+ * channel index (specifying channel index is required by most API functions).
+ * The maximum channel index is N-1, where N is number returned by this function
+ *
+ * @param device Device handle previously obtained by LMS_Open().
+ * @param dir_tx Select RX or TX
+ *
+ * @return Number of channels on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_GetNumChannels(lms_device_t *device, bool dir_tx);
+
+/**
+ * Enable or disable specified RX or TX channel. Some API functions will fail
+ * when performed on disabled channel.
+ *
+ * @param[in] device Device handle previously obtained by LMS_Open().
+ * @param dir_tx Select RX or TX
+ * @param chan Channel index
+ * @param enabled true(1) to enable, false(0) to disable.
+ *
+ * @return 0 on success, (-1) on failure
+ */
+API_EXPORT int CALL_CONV LMS_EnableChannel(lms_device_t *device, bool dir_tx,
+ size_t chan, bool enabled);
+
+/**
+ * Set sampling rate for all RX/TX channels. Sample rate is in complex samples
+ * (1 sample = I + Q). The function sets sampling rate that is used for data
+ * exchange with the host. It also allows to specify higher sampling rate to be
+ * used in RF by setting oversampling ratio. Valid oversampling values are 1, 2,
+ * 4, 8, 16, 32 or 0 (use device default oversampling value).
+ *

_service:download_url:qt-dab-2.7.1.tar.gz/devices/lime-handler/lime-handler.cpp Added

@@ -0,0 +1,453 @@
+#
+/*
+ * Copyright (C) 2014 .. 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	"lime-handler.h"
+
+#define	FIFO_SIZE	32768
+static
+float localBuffer [4 * FIFO_SIZE];
+lms_info_str_t limedevices [10];
+
+	limeHandler::limeHandler (QSettings *s) {
+	this	-> limeSettings	= s;
+
+	this	-> myFrame	= new QFrame (nullptr);
+	setupUi (this -> myFrame);
+	this	-> myFrame	-> show();
+
+#ifdef __MINGW32__
+ const char *libraryString = "LimeSuite.dll";
+ Handle = LoadLibrary ((wchar_t *)L"LimeSuite.dll");
+#elif __clang__
+ const char *libraryString = "/opt/local/lib/libLimeSuite.dylib";
+ Handle		= dlopen (libraryString, RTLD_NOW);
+#else
+ const char *libraryString = "libLimeSuite.so";
+ Handle = dlopen (libraryString, RTLD_NOW);
+#endif
+
+ if (Handle == nullptr) {
+ fprintf (stderr, "failed to open %s\n", libraryString);
+ delete myFrame;
+ throw (20);
+ }
+
+ libraryLoaded = true;
+	if (!load_limeFunctions()) {
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+ delete myFrame;
+ throw (21);
+ }
+//
+// From here we have a library available
+
+	int ndevs	= LMS_GetDeviceList (limedevices);
+	if (ndevs == 0) {	// no devices found
+	 delete myFrame;
+	 throw (21);
+	}
+
+	for (int i = 0; i < ndevs; i ++)
+	 fprintf (stderr, "device %s\n", limedevices [i]);
+
+	int res		= LMS_Open (&theDevice, nullptr, nullptr);
+	if (res < 0) {	// some error
+	 delete myFrame;
+	 throw (22);
+	}
+
+	res		= LMS_Init (theDevice);
+	if (res < 0) {	// some error
+	 LMS_Close (&theDevice);
+	 delete myFrame;
+	 throw (23);
+	}
+
+	res		= LMS_GetNumChannels (theDevice, LMS_CH_RX);
+	if (res < 0) {	// some error
+	 LMS_Close (&theDevice);
+	 delete myFrame;
+	 throw (24);
+	}
+
+	fprintf (stderr, "device %s supports %d channels\n",
+	 limedevices [0], res);
+	res		= LMS_EnableChannel (theDevice, LMS_CH_RX, 0, true);
+	if (res < 0) {	// some error
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (24);
+	}
+
+	res	= LMS_SetSampleRate (theDevice, 2048000.0, 0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (25);
+	}
+
+	float_type host_Hz, rf_Hz;
+	res	= LMS_GetSampleRate (theDevice, LMS_CH_RX, 0,
+	 &host_Hz, &rf_Hz);
+
+	fprintf (stderr, "samplerate = %f %f\n", (float)host_Hz, (float)rf_Hz);
+	
+	res		= LMS_GetAntennaList (theDevice, LMS_CH_RX, 0, antennas);
+	for (int i = 0; i < res; i ++) 	
+	 antennaList	-> addItem (QString (antennas [i]));
+
+	limeSettings -> beginGroup ("limeSettings");
+	QString antenne	= limeSettings -> value ("antenna", "default"). toString();
+	limeSettings	-> endGroup();
+
+	int k = antennaList -> findText (antenne);
+ if (k != -1) 
+ antennaList -> setCurrentIndex (k);
+	
+	connect (antennaList, SIGNAL (activated (int)),
+	 this, SLOT (setAntenna (int)));
+
+
+//	default antenna setting
+	res		= LMS_SetAntenna (theDevice, LMS_CH_RX, 0, 
+	 antennaList -> currentIndex());
+
+//	default frequency
+	res		= LMS_SetLOFrequency (theDevice, LMS_CH_RX,
+	 0, 220000000.0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (26);
+	}
+
+	res		= LMS_SetLPFBW (theDevice, LMS_CH_RX,
+	 0, 1536000.0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (27);
+	}
+
+	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, 50);
+
+	LMS_Calibrate (theDevice, LMS_CH_RX, 0, 2500000.0, 0);
+	
+	theBuffer	= new RingBuffer<std::complex<float>> (64 * 32768);
+	
+	limeSettings	-> beginGroup ("limeSettings");
+	k	= limeSettings	-> value ("gain", 50). toInt();
+	limeSettings	-> endGroup();
+	gainSelector -> setValue (k);
+	setGain (k);
+	connect (gainSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (setGain (int)));
+	running. store (false);
+}
+
+	limeHandler::~limeHandler() {
+	running. store (false);
+	while (isRunning())
+	 usleep (100);
+	limeSettings	-> beginGroup ("limeSettings");
+	limeSettings	-> setValue ("antenna", antennaList -> currentText());
+	limeSettings	-> setValue ("gain", gainSelector -> value());
+	limeSettings	-> endGroup();
+	LMS_Close (theDevice);
+	delete theBuffer;
+	delete myFrame;
+}
+
+void	limeHandler::setVFOFrequency	(int32_t f) {
+	LMS_SetLOFrequency (theDevice, LMS_CH_RX, 0, f);
+}
+
+int32_t	limeHandler::getVFOFrequency() {
+float_type freq;
+	int res = LMS_GetLOFrequency (theDevice, LMS_CH_RX, 0, &freq);
+	return (int)freq;
+}
+
+void	limeHandler::setGain		(int g) {
+float_type gg;
+	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, g);
+	LMS_GetNormalizedGain (theDevice, LMS_CH_RX, 0, &gg);
+	actualGain	-> display (gg);
+}

_service:download_url:qt-dab-2.7.1.tar.gz/devices/lime-handler/lime-handler.h Added

@@ -0,0 +1,163 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __LIME_HANDLER__
+#define	__LIME_HANDLER__
+
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<atomic>
+#include	<vector>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<LimeSuite.h>
+#include	"virtual-input.h"
+#include	"ui_lime-widget.h"
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
+
+//	DLL and ".so" function prototypes
+typedef int	(*pfn_LMS_GetDeviceList)(lms_info_str_t *dev_list);
+typedef	int	(*pfn_LMS_Open)(lms_device_t **device,
+	 const lms_info_str_t info, void* args);
+typedef	int	(*pfn_LMS_Close)(lms_device_t *);
+typedef	int	(*pfn_LMS_Init) (lms_device_t *);
+typedef	int	(*pfn_LMS_GetNumChannels) (lms_device_t *device, bool dir_tx);
+typedef	int	(*pfn_LMS_EnableChannel) (lms_device_t *device, bool dir_tx,
+	 size_t chan, bool enabled);
+typedef	int	(*pfn_LMS_SetSampleRate) (lms_device_t *device,
+	 float_type rate,
+	 size_t oversample);
+typedef	int	(*pfn_LMS_GetSampleRate)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *host_Hz, float_type *rf_Hz);
+typedef	int	(*pfn_LMS_SetLOFrequency)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type frequency);
+typedef	int	(*pfn_LMS_GetLOFrequency)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *frequency);
+typedef	int	(*pfn_LMS_GetAntennaList) (lms_device_t *device, bool dir_tx,
+	 size_t chan, lms_name_t *list);
+typedef	int	(*pfn_LMS_SetAntenna) (lms_device_t *dev, bool dir_tx,
+	 size_t chan, size_t index);
+typedef	int	(*pfn_LMS_GetAntenna)(lms_device_t *dev, bool dir_tx, size_t chan);
+typedef	int	(*pfn_LMS_GetAntennaBW)(lms_device_t *dev, bool dir_tx,
+	 size_t chan, size_t index, lms_range_t *range);
+typedef	int	(*pfn_LMS_SetNormalizedGain)(lms_device_t *device, bool dir_tx,
+	 size_t chan,float_type gain);
+typedef	int	(*pfn_LMS_SetGaindB)(lms_device_t *device, bool dir_tx,
+	 size_t chan, unsigned gain);
+typedef	int	(*pfn_LMS_GetNormalizedGain)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *gain);
+typedef	int	(*pfn_LMS_GetGaindB)(lms_device_t *device, bool dir_tx,
+	 size_t chan, unsigned *gain);
+typedef	int	(*pfn_LMS_SetLPFBW)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type bandwidth);
+typedef	int	(*pfn_LMS_GetLPFBW)(lms_device_t *device, bool dir_tx,
+ size_t chan, float_type *bandwidth);
+typedef	int 	(*pfn_LMS_Calibrate)(lms_device_t *device, bool dir_tx,
+	 size_t chan, double bw, unsigned flags);
+typedef	int	(*pfn_LMS_SetupStream)(lms_device_t *device,
+	 lms_stream_t *stream);
+typedef	int	(*pfn_LMS_DestroyStream)(lms_device_t *dev,
+	 lms_stream_t *stream);
+typedef	int	(*pfn_LMS_StartStream)(lms_stream_t *stream);
+typedef	int	(*pfn_LMS_StopStream)(lms_stream_t *stream);
+typedef	int	(*pfn_LMS_RecvStream)(lms_stream_t *stream, void *samples,
+ size_t sample_count,
+	 lms_stream_meta_t *meta,
+	 unsigned timeout_ms);
+typedef	int	(*pfn_LMS_GetStreamStatus)(lms_stream_t *stream,
+	 lms_stream_status_t* status);
+
+class	limeHandler: public virtualInput, public Ui_limeWidget {
+Q_OBJECT
+public:
+			limeHandler		(QSettings *);
+			~limeHandler();
+	void		setVFOFrequency		(int32_t);
+	int32_t		getVFOFrequency();
+	bool		restartReader();
+	void		stopReader();
+	int32_t getSamples (std::complex<float> *,
+ int32_t);
+ int32_t Samples();
+ void resetBuffer();
+ int16_t bitDepth();
+
+private:
+	QSettings	*limeSettings;
+	QFrame		*myFrame;
+	std::atomic<bool>	running;
+	lms_device_t	*theDevice;
+	lms_name_t	antennas [10];
+	RingBuffer<std::complex<float>> *theBuffer;
+	bool		load_limeFunctions();
+	HINSTANCE	Handle;
+	bool		libraryLoaded;
+	lms_stream_meta_t meta;
+ lms_stream_t stream;
+ void		run();
+
+//	imported functions
+public:
+	pfn_LMS_GetDeviceList	LMS_GetDeviceList;
+	pfn_LMS_Open		LMS_Open;
+	pfn_LMS_Close		LMS_Close;
+	pfn_LMS_Init		LMS_Init;
+	pfn_LMS_GetNumChannels	LMS_GetNumChannels;
+	pfn_LMS_EnableChannel	LMS_EnableChannel;
+	pfn_LMS_SetSampleRate	LMS_SetSampleRate;
+	pfn_LMS_GetSampleRate	LMS_GetSampleRate;
+	pfn_LMS_SetLOFrequency	LMS_SetLOFrequency;
+	pfn_LMS_GetLOFrequency	LMS_GetLOFrequency;
+	pfn_LMS_GetAntennaList	LMS_GetAntennaList;
+	pfn_LMS_SetAntenna	LMS_SetAntenna;
+	pfn_LMS_GetAntenna	LMS_GetAntenna;
+	pfn_LMS_GetAntennaBW	LMS_GetAntennaBW;
+	pfn_LMS_SetNormalizedGain	LMS_SetNormalizedGain;
+	pfn_LMS_SetGaindB	LMS_SetGaindB;
+	pfn_LMS_GetNormalizedGain	LMS_GetNormalizedGain;
+	pfn_LMS_GetGaindB	LMS_GetGaindB;
+	pfn_LMS_SetLPFBW	LMS_SetLPFBW;
+	pfn_LMS_GetLPFBW	LMS_GetLPFBW;
+	pfn_LMS_Calibrate	LMS_Calibrate;
+
+	pfn_LMS_SetupStream	LMS_SetupStream;
+	pfn_LMS_DestroyStream	LMS_DestroyStream;
+	pfn_LMS_StartStream	LMS_StartStream;
+	pfn_LMS_StopStream	LMS_StopStream;
+	pfn_LMS_RecvStream	LMS_RecvStream;
+	pfn_LMS_GetStreamStatus	LMS_GetStreamStatus;
+private slots:
+	void		setGain		(int);
+	void		setAntenna	(int);
+
+public slots:
+	void		showErrors	(int, int);
+};
+
+#endif
+

_service:download_url:qt-dab-2.7.1.tar.gz/devices/lime-handler/lime-widget.ui Added

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>limeWidget</class>
+ <widget class="QWidget" name="limeWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>350</width>
+ <height>270</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>lime control</string>
+ </property>
+ <widget class="QFrame" name="frame">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>321</width>
+ <height>261</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <widget class="QLabel" name="deviceLabel">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>20</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Lime handler</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="statusLabel">
+ <property name="geometry">
+ <rect>
+ <x>16</x>
+ <y>180</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="serialNumber">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>50</y>
+ <width>171</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="gainSelector">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>80</y>
+ <width>106</width>
+ <height>35</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>73</number>
+ </property>
+ <property name="value">
+ <number>20</number>
+ </property>
+ </widget>
+ <widget class="QLabel" name="labelSpinbox_1">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>90</y>
+ <width>67</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>gain</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="antennaList">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>130</y>
+ <width>111</width>
+ <height>31</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="actualGain">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>80</y>
+ <width>91</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>170</x>
+ <y>135</y>
+ <width>111</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>antennas</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="underrunDisplay">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>180</y>
+ <width>101</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>170</x>
+ <y>180</y>
+ <width>111</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>underruns</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="overrunDisplay">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>210</y>
+ <width>81</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_3">
+ <property name="geometry">
+ <rect>
+ <x>170</x>
+ <y>210</y>
+ <width>67</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>overruns</string>
+ </property>
+ </widget>
+ <zorder>antennaList</zorder>
+ <zorder>deviceLabel</zorder>
+ <zorder>statusLabel</zorder>
+ <zorder>serialNumber</zorder>

_service:download_url:qt-dab-2.5.tar.gz/devices/rawfiles/raw-reader.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rawfiles/raw-reader.cpp Changed

@@ -27,10 +27,10 @@
 
 #define	BUFFERSIZE	32768
 static inline
-int64_t getMyTime (void) {
+int64_t getMyTime() {
 struct timeval tv;
 
- gettimeofday (&tv, NULL);
+ gettimeofday (&tv, nullptr);
 return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
 }
 
@@ -49,23 +49,23 @@
 fprintf (stderr, "Period = %ld\n", period);
 bi = new uint8_t [BUFFERSIZE];
 	running. store (false);
-	start ();
+	start();
 }
 
-		rawReader::~rawReader	(void) {
-	stopReader ();
+		rawReader::~rawReader() {
+	stopReader();
 	delete[] bi;
 }
 
-void	rawReader::stopReader	(void) {
+void	rawReader::stopReader() {
 	if (running) {
 	 running = false;
-	 while (isRunning ())
+	 while (isRunning())
 	 usleep (200);
 	}
 }
 
-void	rawReader::run		(void) {
+void	rawReader::run() {
 int64_t	nextStop;
 int	i;
 int	teller	= 0;
@@ -74,11 +74,11 @@
 	 parent, SLOT (setProgress (int, float)));
 	fseek (filePointer, 0, SEEK_SET);
 	running. store (true);
-	nextStop = getMyTime ();
+	nextStop = getMyTime();
 	try {
-	 while (running. load ()) {
-	 while (theBuffer -> WriteSpace () < BUFFERSIZE + 10) {
-	 if (!running. load ())
+	 while (running. load()) {
+	 while (theBuffer -> WriteSpace() < BUFFERSIZE + 10) {
+	 if (!running. load())
 	 throw (32);
 	 usleep (100);
 }
@@ -100,8 +100,8 @@
 }
 
 theBuffer -> putDataIntoBuffer (bi, BUFFERSIZE);
- if (nextStop - getMyTime () > 0)
- usleep (nextStop - getMyTime ());
+ if (nextStop - getMyTime() > 0)
+ usleep (nextStop - getMyTime());
 }
 	} catch (int e) {}
 fprintf (stderr, "taak voor replay eindigt hier\n");

_service:download_url:qt-dab-2.5.tar.gz/devices/rawfiles/raw-reader.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rawfiles/raw-reader.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/rawfiles/rawfiles.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rawfiles/rawfiles.cpp Changed

@@ -24,13 +24,13 @@
 *	dabsticks 
 */
 #include	"rawfiles.h"
-#include	<stdio.h>
+#include	<cstdio>
 #include	<unistd.h>
-#include	<stdlib.h>
+#include	<cstdlib>
 #include	<fcntl.h>
 //
 #include	<sys/time.h>
-#include	<time.h>
+#include	<ctime>
 
 #include	"raw-reader.h"
 
@@ -41,12 +41,12 @@
 	fileName	= f;
 	myFrame		= new QFrame;
 	setupUi	(myFrame);
-	myFrame		-> show ();
+	myFrame		-> show();
 	_I_Buffer	= new RingBuffer<uint8_t>(INPUT_FRAMEBUFFERSIZE);
-	filePointer	= fopen (f. toUtf8 (). data (), "rb");
-	if (filePointer == NULL) {
+	filePointer	= fopen (f. toUtf8(). data(), "rb");
+	if (filePointer == nullptr) {
 	 fprintf (stderr, "file %s cannot open\n",
-	 f. toUtf8 (). data ());
+	 f. toUtf8(). data());
 	 perror ("file ?");
 	 delete myFrame;
 	 delete _I_Buffer;
@@ -63,32 +63,32 @@
 	running. store (false);
 }
 
-	rawFiles::~rawFiles (void) {
-	if (running. load ()) {
-	 readerTask	-> stopReader ();
-	 while (readerTask -> isRunning ())
+	rawFiles::~rawFiles() {
+	if (running. load()) {
+	 readerTask	-> stopReader();
+	 while (readerTask -> isRunning())
 	 usleep (100);
 	 delete readerTask;
 	}
-	if (filePointer != NULL)
+	if (filePointer != nullptr)
 	 fclose (filePointer);
 
 	delete _I_Buffer;
 	delete	myFrame;
 }
 
-bool	rawFiles::restartReader	(void) {
-	if (running. load ())
+bool	rawFiles::restartReader() {
+	if (running. load())
 	 return true;
 	readerTask	= new rawReader (this, filePointer, _I_Buffer);
 	running. store (true);
 	return true;
 }
 
-void	rawFiles::stopReader	(void) {
-	if (running. load ()) {
-	 readerTask	-> stopReader ();
-	 while (readerTask -> isRunning ())
+void	rawFiles::stopReader() {
+	if (running. load()) {
+	 readerTask	-> stopReader();
+	 while (readerTask -> isRunning())
 	 usleep (100);
 	 delete readerTask;
 	}
@@ -100,10 +100,10 @@
 int32_t	amount, i;
 uint8_t	temp [2 * size];
 
-	if (filePointer == NULL)
+	if (filePointer == nullptr)
 	 return 0;
 
-	while ((int32_t)(_I_Buffer -> GetRingBufferReadAvailable ()) < 2 * size)
+	while ((int32_t)(_I_Buffer -> GetRingBufferReadAvailable()) < 2 * size)
 	 usleep (500);
 
 	amount = _I_Buffer	-> getDataFromBuffer (temp, 2 * size);
@@ -113,8 +113,8 @@
 	return amount / 2;
 }
 
-int32_t	rawFiles::Samples (void) {
-	return _I_Buffer -> GetRingBufferReadAvailable () / 2;
+int32_t	rawFiles::Samples() {
+	return _I_Buffer -> GetRingBufferReadAvailable() / 2;
 }
 
 void	rawFiles::setProgress (int progress, float timelength) {

_service:download_url:qt-dab-2.5.tar.gz/devices/rawfiles/rawfiles.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rawfiles/rawfiles.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/rtl_tcp/rtl_tcp_client.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtl_tcp/rtl_tcp_client.cpp Changed

@@ -38,25 +38,25 @@
 
 	theFrame		= new QFrame;
 	setupUi (theFrame);
-	this	-> theFrame	-> show ();
+	this	-> theFrame	-> show();
 
 //	setting the defaults and constants
 	theRate		= 2048000;
 	remoteSettings	-> beginGroup ("rtl_tcp_client");
 	theGain		= remoteSettings ->
-	 value ("rtl_tcp_client-gain", 20). toInt ();
+	 value ("rtl_tcp_client-gain", 20). toInt();
 	thePpm		= remoteSettings ->
-	 value ("rtl_tcp_client-ppm", 0). toInt ();
+	 value ("rtl_tcp_client-ppm", 0). toInt();
 	vfoOffset	= remoteSettings ->
-	 value ("rtl_tcp_client-offset", 0). toInt ();
+	 value ("rtl_tcp_client-offset", 0). toInt();
 	basePort = remoteSettings -> value ("rtl_tcp_port", 1234).toInt();
-	remoteSettings	-> endGroup ();
+	remoteSettings	-> endGroup();
 	tcp_gain	-> setValue (theGain);
 	tcp_ppm		-> setValue (thePpm);
 	vfoFrequency	= DEFAULT_FREQUENCY;
 	theBuffer	= new RingBuffer<uint8_t>(32 * 32768);
 	connected	= false;
-	hostLineEdit 	= new QLineEdit (NULL);
+	hostLineEdit 	= new QLineEdit (nullptr);
 	dumping		= false;
 
 	connect (tcp_connect, SIGNAL (clicked (void)),
@@ -72,26 +72,26 @@
 	state	-> setText ("waiting to start");
 }
 
-	rtl_tcp_client::~rtl_tcp_client	(void) {
+	rtl_tcp_client::~rtl_tcp_client() {
 	remoteSettings -> beginGroup ("rtl_tcp_client");
 	if (connected) {		// close previous connection
-	 stopReader	();
-//	 streamer. close ();
+	 stopReader();
+//	 streamer. close();
 	 remoteSettings -> setValue ("remote-server",
-	 toServer. peerAddress (). toString ());
+	 toServer. peerAddress(). toString());
 	 QByteArray datagram;
 	}
 	remoteSettings -> setValue ("rtl_tcp_client-gain", theGain);
 	remoteSettings -> setValue ("rtl_tcp_client-ppm", thePpm);
 	remoteSettings -> setValue ("rtl_tcp_client-offset", vfoOffset);
-	remoteSettings -> endGroup ();
-	toServer. close ();
+	remoteSettings -> endGroup();
+	toServer. close();
 	delete	theBuffer;
 	delete	hostLineEdit;
 	delete	theFrame;
 }
 //
-void	rtl_tcp_client::wantConnect (void) {
+void	rtl_tcp_client::wantConnect() {
 QString ipAddress;
 int16_t	i;
 QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
@@ -101,23 +101,23 @@
 	// use the first non-localhost IPv4 address
 	for (i = 0; i < ipAddressesList.size(); ++i) {
 	 if (ipAddressesList.at (i) != QHostAddress::LocalHost &&
-	 ipAddressesList. at (i). toIPv4Address ()) {
+	 ipAddressesList. at (i). toIPv4Address()) {
 	 ipAddress = ipAddressesList. at(i). toString();
 	 break;
 	 }
 	}
 	// if we did not find one, use IPv4 localhost
 	if (ipAddress. isEmpty())
-	 ipAddress = QHostAddress (QHostAddress::LocalHost).toString ();
+	 ipAddress = QHostAddress (QHostAddress::LocalHost).toString();
 	remoteSettings -> beginGroup ("rtl_tcp_client");
 	ipAddress = remoteSettings ->
-	 value ("remote-server", ipAddress). toString ();
-	remoteSettings -> endGroup ();
+	 value ("remote-server", ipAddress). toString();
+	remoteSettings -> endGroup();
 	hostLineEdit -> setText (ipAddress);
 
 	hostLineEdit	-> setInputMask ("000.000.000.000");
 //	Setting default IP address
-	hostLineEdit	-> show ();
+	hostLineEdit	-> show();
 	state	-> setText ("Enter IP address, \nthen press return");
 	connect (hostLineEdit, SIGNAL (returnPressed (void)),
 	 this, SLOT (setConnection (void)));
@@ -127,8 +127,8 @@
 //	a signal appears and we are able to collect the
 //	inserted text. The format is the IP-V4 format.
 //	Using this text, we try to connect,
-void	rtl_tcp_client::setConnection (void) {
-QString s	= hostLineEdit -> text ();
+void	rtl_tcp_client::setConnection() {
+QString s	= hostLineEdit -> text();
 QHostAddress theAddress	= QHostAddress (s);
 
 	serverAddress	= QHostAddress (s);
@@ -144,16 +144,16 @@
 	sendGain (theGain);
 	sendRate (theRate);
 	sendVFO	(DEFAULT_FREQUENCY - theRate / 4);
-	toServer. waitForBytesWritten ();
+	toServer. waitForBytesWritten();
 	state -> setText ("Connected");
 	connected	= true;
 }
 
-int32_t	rtl_tcp_client::getRate	(void) {
+int32_t	rtl_tcp_client::getRate() {
 	return theRate;
 }
 
-int32_t	rtl_tcp_client::defaultFrequency (void) {
+int32_t	rtl_tcp_client::defaultFrequency() {
 	return DEFAULT_FREQUENCY;	// choose any legal frequency here
 }
 
@@ -165,11 +165,11 @@
 	sendVFO (newFrequency);
 }
 
-int32_t	rtl_tcp_client::getVFOFrequency	(void) {
+int32_t	rtl_tcp_client::getVFOFrequency() {
 	return vfoFrequency;
 }
 
-bool	rtl_tcp_client::restartReader	(void) {
+bool	rtl_tcp_client::restartReader() {
 	if (!connected)
 	 return true;
 	connect (&toServer, SIGNAL (readyRead (void)),
@@ -177,7 +177,7 @@
 	return true;
 }
 
-void	rtl_tcp_client::stopReader	(void) {
+void	rtl_tcp_client::stopReader() {
 	if (!connected)
 	 return;
 	disconnect (&toServer, SIGNAL (readyRead (void)),
@@ -203,18 +203,18 @@
 	return amount / 2;
 }
 
-int32_t	rtl_tcp_client::Samples	(void) {
-	return theBuffer	-> GetRingBufferReadAvailable () / 2;
+int32_t	rtl_tcp_client::Samples() {
+	return theBuffer	-> GetRingBufferReadAvailable() / 2;
 }
 //
-int16_t	rtl_tcp_client::bitDepth	(void) {
+int16_t	rtl_tcp_client::bitDepth() {
 	return 8;
 }
 
 //	These functions are typical for network use
-void	rtl_tcp_client::readData	(void) {
+void	rtl_tcp_client::readData() {
 uint8_t	buffer [8192];
-	while (toServer. bytesAvailable () > 8192) {
+	while (toServer. bytesAvailable() > 8192) {
 	 toServer. read ((char *)buffer, 8192);
 	 theBuffer -> putDataIntoBuffer (buffer, 8192);
 	}
@@ -239,7 +239,7 @@
 	datagram [3] = (param >> ONE_BYTE) & 0xFF;
 	datagram [2] = (param >> (2 * ONE_BYTE)) & 0xFF;
 	datagram [1] = (param >> (3 * ONE_BYTE)) & 0xFF;
-	toServer. write (datagram. data (), datagram. size ());
+	toServer. write (datagram. data(), datagram. size());
 }
 
 void rtl_tcp_client::sendVFO (int32_t frequency) {
@@ -265,16 +265,16 @@
 	thePpm		= ppm;
 }
 
-void	rtl_tcp_client::setDisconnect (void) {
+void	rtl_tcp_client::setDisconnect() {
 	if (connected) {		// close previous connection
-	 stopReader	();
+	 stopReader();
 	 remoteSettings -> beginGroup ("rtl_tcp_client");
 	 remoteSettings -> setValue ("remote-server",
-	 toServer. peerAddress (). toString ());
+	 toServer. peerAddress(). toString());
 	 remoteSettings -> setValue ("rtl_tcp_client-gain", theGain);
 	 remoteSettings -> setValue ("rtl_tcp_client-ppm", thePpm);
-	 remoteSettings -> endGroup ();
-	 toServer. close ();
+	 remoteSettings -> endGroup();

_service:download_url:qt-dab-2.5.tar.gz/devices/rtl_tcp/rtl_tcp_client.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtl_tcp/rtl_tcp_client.h Changed

@@ -33,7 +33,7 @@
 #include	<QTcpSocket>
 #include	<QTimer>
 #include	<QComboBox>
-#include	<stdio.h>
+#include	<cstdio>
 #include	"dab-constants.h"
 #include	"virtual-input.h"
 #include	"ringbuffer.h"
@@ -43,24 +43,24 @@
 Q_OBJECT
 public:
 			rtl_tcp_client (QSettings *);
-			~rtl_tcp_client	(void);
-	int32_t		getRate		(void);
-	int32_t		defaultFrequency	(void);
+			~rtl_tcp_client();
+	int32_t		getRate();
+	int32_t		defaultFrequency();
 	void		setVFOFrequency	(int32_t);
-	int32_t		getVFOFrequency	(void);
-	bool		restartReader	(void);
-	void		stopReader	(void);
+	int32_t		getVFOFrequency();
+	bool		restartReader();
+	void		stopReader();
 	int32_t		getSamples	(std::complex<float> *V, int32_t size);
-	int32_t		Samples		(void);
-	int16_t		bitDepth	(void);
+	int32_t		Samples();
+	int16_t		bitDepth();
 private slots:
 	void		sendGain	(int);
 	void		set_Offset	(int);
 	void		set_fCorrection	(int);
-	void		readData	(void);
-	void		setConnection	(void);
-	void		wantConnect	(void);
-	void		setDisconnect	(void);
+	void		readData();
+	void		setConnection();
+	void		wantConnect();
+	void		setDisconnect();
 private:
 	void		sendVFO		(int32_t);
 	void		sendRate	(int32_t);

_service:download_url:qt-dab-2.5.tar.gz/devices/rtlsdr-handler/rtl-dongleselect.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtlsdr-handler/rtl-dongleselect.cpp Changed

@@ -20,13 +20,13 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include	"rtl-dongleselect.h"
-#include	<stdio.h>
+#include	<cstdio>
 #include	<QVBoxLayout>
 //
 //	Whenever there are two or more RT2832 based sticks connected
 //	to the computer, the user is asked to make a choice.
 
-	rtl_dongleSelect::rtl_dongleSelect (void) {
+	rtl_dongleSelect::rtl_dongleSelect() {
 	toptext		= new QLabel (this);
 	toptext		-> setText ("Select a dongle");
 	selectorDisplay	= new QListView (this);
@@ -37,7 +37,7 @@
 	setLayout (layOut);
 
 	dongleList. setStringList (Dongles);
-	Dongles = QStringList ();
+	Dongles = QStringList();
 	dongleList. setStringList (Dongles);
 	selectorDisplay	-> setModel (&dongleList);
 	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
@@ -45,7 +45,7 @@
 	selectedItem	= -1;
 }
 
-	rtl_dongleSelect::~rtl_dongleSelect (void) {
+	rtl_dongleSelect::~rtl_dongleSelect() {
 }
 
 void	rtl_dongleSelect::addtoDongleList (const char *v) {
@@ -54,11 +54,11 @@
 	Dongles << s;
 	dongleList. setStringList (Dongles);
 	selectorDisplay	-> setModel (&dongleList);
-	selectorDisplay	-> adjustSize ();
-	adjustSize ();
+	selectorDisplay	-> adjustSize();
+	adjustSize();
 }
 
 void	rtl_dongleSelect::selectDongle (QModelIndex s) {
-	QDialog::done (s. row ());
+	QDialog::done (s. row());
 }

_service:download_url:qt-dab-2.5.tar.gz/devices/rtlsdr-handler/rtl-dongleselect.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtlsdr-handler/rtl-dongleselect.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/rtlsdr-handler/rtl-sdr.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtlsdr-handler/rtl-sdr.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -49,7 +49,7 @@
 void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
 rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
 
-	if ((theStick == NULL) || (len != READLEN_DEFAULT))
+	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
 	   return;
 
 	(void)theStick -> _I_Buffer -> putDataIntoBuffer (buf, len);
@@ -65,14 +65,14 @@
 
 	dll_driver (rtlsdrHandler *d) {
 	theStick	= d;
-	start ();
+	start();
 	}
 
-	~dll_driver (void) {
+	~dll_driver() {
 	}
 
 private:
-virtual void	run (void) {
+virtual void	run() {
 	(theStick -> rtlsdr_read_async) (theStick -> device,
 	                          (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
 	                          (void *)theStick,
@@ -92,22 +92,22 @@
 char	manufac [256], product [256], serial [256];
 
 	rtlsdrSettings		= s;
-	this	-> myFrame	= new QFrame (NULL);
+	this	-> myFrame	= new QFrame (nullptr);
 	setupUi (this -> myFrame);
-	this	-> myFrame	-> show ();
+	this	-> myFrame	-> show();
 	inputRate		= 2048000;
 	libraryLoaded		= false;
 	open			= false;
-	_I_Buffer		= NULL;
-	workerHandle		= NULL;
+	_I_Buffer		= nullptr;
+	workerHandle		= nullptr;
 	lastFrequency		= KHz (22000);	// just a dummy
-	gains			= NULL;
+	gains			= nullptr;
 
 #ifdef	__MINGW32__
 	const char *libraryString = "rtlsdr.dll";
 	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
-	if (Handle == NULL) {
-	   fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError ());
+	if (Handle == nullptr) {
+	   fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
 	   delete myFrame;
 	   throw (20);
 	}
@@ -115,14 +115,14 @@
 	const char *libraryString = "librtlsdr.so";
 	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
 
-	if (Handle == NULL) {
-	   fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror ());
+	if (Handle == nullptr) {
+	   fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
 	   delete myFrame;
 	   throw (20);
 	}
 #endif
 	libraryLoaded	= true;
-	if (!load_rtlFunctions ()) {
+	if (!load_rtlFunctions()) {
 #ifdef __MINGW32__
 	   FreeLibrary (Handle);
 #else
@@ -133,7 +133,7 @@
 	}
 //
 //	Ok, from here we have the library functions accessible
-	deviceCount 		= this -> rtlsdr_get_device_count ();
+	deviceCount 		= this -> rtlsdr_get_device_count();
 	if (deviceCount == 0) {
 	   fprintf (stderr, "No devices found\n");
 #ifdef __MINGW32__
@@ -152,7 +152,7 @@
 	      dongleSelector.
 	           addtoDongleList (rtlsdr_get_device_name (deviceIndex));
 	   }
-	   deviceIndex = dongleSelector. QDialog::exec ();
+	   deviceIndex = dongleSelector. QDialog::exec();
 	}
 //
 //	OK, now open the hardware
@@ -189,7 +189,7 @@
 	fprintf (stderr, "samplerate set to %d\n", r);
 
 	
-	gainsCount = rtlsdr_get_tuner_gains (device, NULL);
+	gainsCount = rtlsdr_get_tuner_gains (device, nullptr);
 	fprintf(stderr, "Supported gain values (%d): ", gainsCount);
 	gains		= new int [gainsCount];
 	gainsCount = rtlsdr_get_tuner_gains (device, gains);
@@ -208,36 +208,36 @@
 //
 //	See what the saved values are and restore the GUI settings
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
-	coarseOffset	= rtlsdrSettings -> value ("rtlsdrOffset", 0). toInt ();
-	temp = rtlsdrSettings -> value ("externalGain", "10"). toString ();
+	coarseOffset	= rtlsdrSettings -> value ("rtlsdrOffset", 0). toInt();
+	temp = rtlsdrSettings -> value ("externalGain", "10"). toString();
 	k	= combo_gain -> findText (temp);
 	if (k != -1) {
 	   combo_gain	-> setCurrentIndex (k);
-	   theGain	= temp. toInt ();
+	   theGain	= temp. toInt();
 	}
 
 	temp	= rtlsdrSettings -> value ("autogain",
-	                                      "autogain_on"). toString ();
+	                                      "autogain_on"). toString();
 	k	= combo_autogain -> findText (temp);
 	if (k != -1) 
 	   combo_autogain	-> setCurrentIndex (k);
 	
 	
-	ppm_correction	-> setValue (rtlsdrSettings -> value ("ppm_correction", 0). toInt ());
-	rtlsdrSettings	-> endGroup ();
+	ppm_correction	-> setValue (rtlsdrSettings -> value ("ppm_correction", 0). toInt());
+	rtlsdrSettings	-> endGroup();
 
 	rtlsdr_get_usb_strings (device, manufac, product, serial);
 
 //	all sliders/values are set to previous values, now do the settings
 //	based on these slider values
 	rtlsdr_set_tuner_gain_mode (device,
-	                   combo_autogain -> currentText () == "autogain_on");
-	if (combo_autogain -> currentText () == "autogain_on")
+	                   combo_autogain -> currentText() == "autogain_on");
+	if (combo_autogain -> currentText() == "autogain_on")
 	   rtlsdr_set_agc_mode (device, 1);
 	else
 	   rtlsdr_set_agc_mode (device, 0);
 	rtlsdr_set_tuner_gain	(device, theGain);
-	set_ppmCorrection	(ppm_correction -> value ());
+	set_ppmCorrection	(ppm_correction -> value());
 
 	dumping			= false;
 //	and attach the buttons/sliders to the actions
@@ -251,8 +251,8 @@
 	         this, SLOT (dumpButton_pressed (void)));
 }
 
-	rtlsdrHandler::~rtlsdrHandler	(void) {
-	if (Handle == NULL) {	// nothing achieved earlier on
+	rtlsdrHandler::~rtlsdrHandler() {
+	if (Handle == nullptr) {	// nothing achieved earlier on
 	   delete myFrame;
 	   return;
 	}
@@ -266,17 +266,17 @@
 	   return;
 	}
 
-	stopReader ();
+	stopReader();
 	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
 	rtlsdrSettings	-> setValue ("rtlsdrOffset", coarseOffset);
 	rtlsdrSettings	-> setValue ("externalGain",
-	                                      combo_gain -> currentText ());
+	                                      combo_gain -> currentText());
 	rtlsdrSettings	-> setValue ("autogain",
-	                                      combo_autogain -> currentText ());
+	                                      combo_autogain -> currentText());
 	rtlsdrSettings	-> setValue ("ppm_correction",
-	                                      ppm_correction -> value ());
-	rtlsdrSettings	-> sync ();
-	rtlsdrSettings	-> endGroup ();
+	                                      ppm_correction -> value());
+	rtlsdrSettings	-> sync();
+	rtlsdrSettings	-> endGroup();
 	
 	this -> rtlsdr_close (device);
 #ifdef __MINGW32__
@@ -284,9 +284,9 @@
 #else
 	dlclose (Handle);
 #endif
-	if (_I_Buffer != NULL)
+	if (_I_Buffer != nullptr)
 	   delete _I_Buffer;
-	if (gains != NULL)
+	if (gains != nullptr)
 	   delete[] gains;
 	delete	myFrame;
 }
@@ -296,18 +296,18 @@
 	(void)(this -> rtlsdr_set_center_freq (device, f));
 }
 
-int32_t	rtlsdrHandler::getVFOFrequency	(void) {

_service:download_url:qt-dab-2.5.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.h Changed

@@ -30,7 +30,7 @@
 
 #include	<QObject>
 #include	<QSettings>
-#include	<stdio.h>
+#include	<cstdio>
 #include	"dab-constants.h"
 #include	"virtual-input.h"
 #include	"ringbuffer.h"
@@ -61,7 +61,7 @@
 	 uint32_t);
 typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
 typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
-typedef uint32_t (* pfnrtlsdr_get_device_count) (void);
+typedef uint32_t (* pfnrtlsdr_get_device_count)();
 typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
 typedef	char *(* pfnrtlsdr_get_device_name)(int);
 }
@@ -72,17 +72,17 @@
 Q_OBJECT
 public:
 			rtlsdrHandler	(QSettings *);
-			~rtlsdrHandler	(void);
+			~rtlsdrHandler();
 	void		setVFOFrequency	(int32_t);
-	int32_t		getVFOFrequency	(void);
+	int32_t		getVFOFrequency();
 //	interface to the reader
-	bool		restartReader	(void);
-	void		stopReader	(void);
+	bool		restartReader();
+	void		stopReader();
 	int32_t		getSamples	(std::complex<float> *, int32_t);
-	int32_t		Samples		(void);
-	void		resetBuffer	(void);
-	int16_t		maxGain		(void);
-	int16_t		bitDepth	(void);
+	int32_t		Samples();
+	void		resetBuffer();
+	int16_t		maxGain();
+	int16_t		bitDepth();
 //
 //	These need to be visible for the separate usb handling thread
 	RingBuffer<uint8_t>	*_I_Buffer;
@@ -103,7 +103,7 @@
 	bool		dumping;
 	FILE		*dumpfilePointer;
 //	here we need to load functions from the dll
-	bool		load_rtlFunctions	(void);
+	bool		load_rtlFunctions();
 	pfnrtlsdr_open	rtlsdr_open;
 	pfnrtlsdr_close	rtlsdr_close;
 	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
@@ -127,7 +127,7 @@
 	void		set_ExternalGain	(const QString &);
 	void		set_autogain		(const QString &);
 	void		set_ppmCorrection	(int);
-	void		dumpButton_pressed	(void);
+	void		dumpButton_pressed();
 };
 #endif

_service:download_url:qt-dab-2.5.tar.gz/devices/sdrplay-handler/mirsdrapi-rsp.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/sdrplay-handler/mirsdrapi-rsp.h Changed

@@ -189,7 +189,7 @@
 typedef void (*mir_sdr_GainChangeCallback_t)(unsigned int gRdB, unsigned int lnaGRdB, void *cbContext); 
 
 typedef mir_sdr_ErrT (*mir_sdr_Init_t)(int gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int *samplesPerPacket);
-typedef mir_sdr_ErrT (*mir_sdr_Uninit_t)(void);
+typedef mir_sdr_ErrT (*mir_sdr_Uninit_t)();
 typedef mir_sdr_ErrT (*mir_sdr_ReadPacket_t)(short *xi, short *xq, unsigned int *firstSampleNum, int *grChanged, int *rfChanged, int *fsChanged);
 typedef mir_sdr_ErrT (*mir_sdr_SetRf_t)(double drfHz, int abs, int syncUpdate);
 typedef mir_sdr_ErrT (*mir_sdr_SetFs_t)(double dfsHz, int abs, int syncUpdate, int reCal);
@@ -214,16 +214,16 @@
 typedef mir_sdr_ErrT (*mir_sdr_DecimateControl_t)(unsigned int enable, unsigned int decimationFactor, unsigned int wideBandSignal); 
 typedef mir_sdr_ErrT (*mir_sdr_AgcControl_t)(mir_sdr_AgcControlT enable, int setPoint_dBfs, int knee_dBfs, unsigned int decay_ms, unsigned int hang_ms, int syncUpdate, int LNAstate); 
 typedef mir_sdr_ErrT (*mir_sdr_StreamInit_t)(int *gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode, int *samplesPerPacket, mir_sdr_StreamCallback_t StreamCbFn, mir_sdr_GainChangeCallback_t GainChangeCbFn, void *cbContext); 
-typedef mir_sdr_ErrT (*mir_sdr_StreamUninit_t)(void); 
+typedef mir_sdr_ErrT (*mir_sdr_StreamUninit_t)(); 
 typedef mir_sdr_ErrT (*mir_sdr_Reinit_t)(int *gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, mir_sdr_LoModeT loMode, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode, int *samplesPerPacket, mir_sdr_ReasonForReinitT reasonForReinit);
 typedef mir_sdr_ErrT (*mir_sdr_GetGrByFreq_t)(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode); 
 typedef mir_sdr_ErrT (*mir_sdr_DebugEnable_t)(unsigned int enable);    
 typedef mir_sdr_ErrT (*mir_sdr_GetCurrentGain_t)(mir_sdr_GainValuesT *gainVals);    
-typedef mir_sdr_ErrT (*mir_sdr_GainChangeCallbackMessageReceived_t)(void); 
+typedef mir_sdr_ErrT (*mir_sdr_GainChangeCallbackMessageReceived_t)(); 
 
 typedef mir_sdr_ErrT (*mir_sdr_GetDevices_t)(mir_sdr_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
 typedef mir_sdr_ErrT (*mir_sdr_SetDeviceIdx_t)(unsigned int idx);    
-typedef mir_sdr_ErrT (*mir_sdr_ReleaseDeviceIdx_t)(void);    
+typedef mir_sdr_ErrT (*mir_sdr_ReleaseDeviceIdx_t)();    
 typedef mir_sdr_ErrT (*mir_sdr_GetHwVersion_t)(unsigned char *ver);    
 typedef mir_sdr_ErrT (*mir_sdr_RSPII_AntennaControl_t)(mir_sdr_RSPII_AntennaSelectT select); 
 typedef mir_sdr_ErrT (*mir_sdr_RSPII_ExternalReferenceControl_t)(unsigned int output_enable);

_service:download_url:qt-dab-2.5.tar.gz/devices/sdrplay-handler/sdrplay-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/sdrplay-handler/sdrplay-handler.cpp Changed

@@ -62,13 +62,13 @@
 sdrplaySelect	*sdrplaySelector;
 
 	sdrplaySettings			= s;
-	this	-> myFrame		= new QFrame (NULL);
+	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
-	this	-> myFrame	-> show ();
-	antennaSelector		-> hide ();
-	tunerSelector		-> hide ();
+	this	-> myFrame	-> show();
+	antennaSelector		-> hide();
+	tunerSelector		-> hide();
 	this	-> inputRate		= Khz (2048);
-	_I_Buffer			= NULL;
+	_I_Buffer			= nullptr;
 	libraryLoaded			= false;
 
 #ifdef	__MINGW32__
@@ -79,7 +79,7 @@
 
 	wchar_t *libname = (wchar_t *)L"mir_sdr_api.dll";
 	Handle	= LoadLibrary (libname);
-	if (Handle == NULL) {
+	if (Handle == nullptr) {
 	 if (RegOpenKey (HKEY_LOCAL_MACHINE,
 	 TEXT("Software\\MiricsSDR\\API"),
 	 &APIkey) != ERROR_SUCCESS) {
@@ -92,8 +92,8 @@
 
 	 RegQueryValueEx (APIkey,
 	 (wchar_t *)L"Install_Dir",
-	 NULL,
-	 NULL,
+	 nullptr,
+	 nullptr,
 	 (LPBYTE)&APIkeyValue,
 	 (LPDWORD)&APIkeyValue_length);
 //	Ok, make explicit it is in the 32 bits section
@@ -102,7 +102,7 @@
 	 RegCloseKey(APIkey);
 
 	 Handle	= LoadLibrary (x);
-	 if (Handle == NULL) {
+	 if (Handle == nullptr) {
 	 fprintf (stderr, "Failed to open mir_sdr_api.dll\n");
 	 delete myFrame;
 	 throw (22);
@@ -111,18 +111,18 @@
 #else
 	Handle		= dlopen ("libusb-1.0.so", RTLD_NOW | RTLD_GLOBAL);
 	Handle		= dlopen ("libmirsdrapi-rsp.so", RTLD_NOW);
-	if (Handle == NULL)
+	if (Handle == nullptr)
 	 Handle	= dlopen ("libmir_sdr.so", RTLD_NOW);
 
-	if (Handle == NULL) {
-	 fprintf (stderr, "error report %s\n", dlerror ());
+	if (Handle == nullptr) {
+	 fprintf (stderr, "error report %s\n", dlerror());
 	 delete myFrame;
 	 throw (23);
 	}
 #endif
 	libraryLoaded	= true;
 
-	bool success = loadFunctions ();
+	bool success = loadFunctions();
 	if (!success) {
 #ifdef __MINGW32__
 FreeLibrary (Handle);
@@ -136,7 +136,7 @@
 	err		= my_mir_sdr_ApiVersion (&ver);
 	if (err != mir_sdr_Success) {
 	 fprintf (stderr, "error at ApiVersion %s\n",
-	 errorCodes (err). toLatin1 (). data ());
+	 errorCodes (err). toLatin1(). data());
 #ifdef __MINGW32__
 FreeLibrary (Handle);
 #else
@@ -166,31 +166,31 @@
 
 	sdrplaySettings		-> beginGroup ("sdrplaySettings");
 	coarseOffset	=
-	 sdrplaySettings -> value ("sdrplayOffset", 0). toInt ();
+	 sdrplaySettings -> value ("sdrplayOffset", 0). toInt();
 	GRdBSelector 		-> setValue (
-	 sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt ());
+	 sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt());
 	lnaGainSetting		-> setValue (
-	 sdrplaySettings -> value ("sdrplay-lnastate", 0). toInt ());
+	 sdrplaySettings -> value ("sdrplay-lnastate", 0). toInt());
 
 	ppmControl		-> setValue (
-	 sdrplaySettings -> value ("sdrplay-ppm", 0). toInt ());
+	 sdrplaySettings -> value ("sdrplay-ppm", 0). toInt());
 	bool	debugFlag	=
-	 sdrplaySettings -> value ("sdrplay-debug", 0). toInt ();
+	 sdrplaySettings -> value ("sdrplay-debug", 0). toInt();
 	if (!debugFlag)
-	 debugControl -> hide ();
+	 debugControl -> hide();
 	bool agcMode		=
-	 sdrplaySettings -> value ("sdrplay-agcMode", 0). toInt () != 0;
+	 sdrplaySettings -> value ("sdrplay-agcMode", 0). toInt() != 0;
 	if (agcMode) {
 	 agcControl -> setChecked (true);
-	 GRdBSelector -> hide ();
-	 gainsliderLabel -> hide ();
+	 GRdBSelector -> hide();
+	 gainsliderLabel -> hide();
 	}
-	sdrplaySettings	-> endGroup ();
+	sdrplaySettings	-> endGroup();
 
 	err = my_mir_sdr_GetDevices (devDesc, &numofDevs, uint32_t (4));
 	if (err != mir_sdr_Success) {
 	 fprintf (stderr, "error at GetDevices %s \n",
-	 errorCodes (err). toLatin1 (). data ());
+	 errorCodes (err). toLatin1(). data());
 
 #ifdef __MINGW32__
 FreeLibrary (Handle);
@@ -213,7 +213,7 @@
 	}
 
 	if (numofDevs > 1) {
- sdrplaySelector = new sdrplaySelect ();
+ sdrplaySelector = new sdrplaySelect();
 for (deviceIndex = 0; deviceIndex < numofDevs; deviceIndex ++) {
 #ifndef	__MINGW32__
 sdrplaySelector ->
@@ -223,7 +223,7 @@
 addtoList (devDesc [deviceIndex]. SerNo);
 #endif
 }
- deviceIndex = sdrplaySelector -> QDialog::exec ();
+ deviceIndex = sdrplaySelector -> QDialog::exec();
 delete sdrplaySelector;
 }
 	else
@@ -237,7 +237,8 @@
 	err = my_mir_sdr_SetDeviceIdx (deviceIndex);
 	if (err != mir_sdr_Success) {
 	 fprintf (stderr, "error at SetDeviceIdx %s \n",
-	 errorCodes (err). toLatin1 (). data ());
+	 errorCodes (err). toLatin1(). data());
+	 my_mir_sdr_ReleaseDeviceIdx (deviceIndex);
 
 #ifdef __MINGW32__
 FreeLibrary (Handle);
@@ -262,7 +263,7 @@
 	 deviceLabel	-> setText ("RSP-II");
 	 nrBits		= 12;
 	 denominator	= 2048;
-	 antennaSelector -> show ();
+	 antennaSelector -> show();
 	 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);
@@ -274,7 +275,7 @@
 	 deviceLabel	-> setText ("RSP-DUO");
 	 nrBits		= 14;
 	 denominator	= 8192;
-	 tunerSelector	-> show ();
+	 tunerSelector	-> show();
 	 err	= my_mir_sdr_rspDuo_TunerSel (mir_sdr_rspDuo_Tuner_1);
 	 if (err != mir_sdr_Success) 
 	 fprintf (stderr, "error %d in setting of rspDuo\n", err);
@@ -302,30 +303,30 @@
 	 this, SLOT (set_ppmControl (int)));
 
 	lnaGRdBDisplay		-> display (get_lnaGRdB (hwVersion,
-	 lnaGainSetting -> value ()));
+	 lnaGainSetting -> value()));
 	running. store (false);
 }
 
-	sdrplayHandler::~sdrplayHandler	(void) {
+	sdrplayHandler::~sdrplayHandler() {
 	if (!libraryLoaded)
 	 return;
-	stopReader ();
+	stopReader();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings");
 	sdrplaySettings	-> setValue ("sdrplayOffset", coarseOffset);
-	sdrplaySettings -> setValue ("sdrplay-ppm", ppmControl -> value ());
+	sdrplaySettings -> setValue ("sdrplay-ppm", ppmControl -> value());
 	sdrplaySettings -> setValue ("sdrplay-ifgrdb",
-	 GRdBSelector -> value ());
+	 GRdBSelector -> value());
 	sdrplaySettings -> setValue ("sdrplay-lnastate",
-	 lnaGainSetting -> value ());
+	 lnaGainSetting -> value());
 	sdrplaySettings	-> setValue ("sdrplay-agcMode",
-	 agcControl -> isChecked () ? 1 : 0);
-	sdrplaySettings	-> endGroup ();
-	sdrplaySettings	-> sync ();
+	 agcControl -> isChecked() ? 1 : 0);
+	sdrplaySettings	-> endGroup();

_service:download_url:qt-dab-2.5.tar.gz/devices/sdrplay-handler/sdrplay-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/sdrplay-handler/sdrplay-handler.h Changed

@@ -60,7 +60,7 @@
 double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType,
 mir_sdr_LoModeT, int, int*, int, int*, mir_sdr_ReasonForReinitT);
 
-typedef mir_sdr_ErrT (*pfn_mir_sdr_StreamUninit)(void);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_StreamUninit)();
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetRf)(double drfHz, int abs, int syncUpdate);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetFs)(double dfsHz, int abs, int syncUpdate, int reCal);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetGr)(int gRdB, int abs, int syncUpdate);
@@ -91,18 +91,18 @@
 Q_OBJECT
 public:
 			sdrplayHandler		(QSettings *);
-			~sdrplayHandler		(void);
+			~sdrplayHandler();
 	void		setVFOFrequency		(int32_t);
-	int32_t		getVFOFrequency		(void);
-	int32_t		defaultFrequency	(void);
+	int32_t		getVFOFrequency();
+	int32_t		defaultFrequency();
 
-	bool		restartReader		(void);
-	void		stopReader		(void);
+	bool		restartReader();
+	void		stopReader();
 	int32_t		getSamples		(std::complex<float> *,
 	 int32_t);
-	int32_t		Samples			(void);
-	void		resetBuffer		(void);
-	int16_t		bitDepth		(void);
+	int32_t		Samples();
+	void		resetBuffer();
+	int16_t		bitDepth();
 //
 //	The buffer should be visible by the callback function
 	RingBuffer<std::complex<float>>	*_I_Buffer;
@@ -142,7 +142,7 @@
 	int16_t		hwVersion;
 	uint32_t	numofDevs;
 	int16_t		deviceIndex;
-	bool		loadFunctions	(void);
+	bool		loadFunctions();
 	QSettings	*sdrplaySettings;
 	QFrame		*myFrame;
 	int32_t		inputRate;

_service:download_url:qt-dab-2.5.tar.gz/devices/sdrplay-handler/sdrplayselect.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/sdrplay-handler/sdrplayselect.cpp Changed

@@ -24,14 +24,14 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 */
-#include	<stdio.h>
+#include	<cstdio>
 #include	<QVBoxLayout>
 #include	"sdrplayselect.h"
 //
 //	Whenever there are two or more sdrplay devices connected
 //	to the computer, the user is asked to make a choice.
 
-	sdrplaySelect::sdrplaySelect (void) {
+	sdrplaySelect::sdrplaySelect() {
 	toptext		= new QLabel (this);
 	toptext		-> setText ("Select an rsp device");
 	selectorDisplay	= new QListView (this);
@@ -41,7 +41,7 @@
 	setWindowTitle (tr("RSP select"));
 	setLayout (layOut);
 
-	Devices = QStringList ();
+	Devices = QStringList();
 	deviceList. setStringList (Devices);
 	selectorDisplay	-> setModel (&deviceList);
 	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
@@ -49,7 +49,7 @@
 	selectedItem	= -1;
 }
 
-	sdrplaySelect::~sdrplaySelect (void) {
+	sdrplaySelect::~sdrplaySelect() {
 }
 
 void	sdrplaySelect::addtoList (const char *v) {
@@ -58,11 +58,11 @@
 	Devices << s;
 	deviceList. setStringList (Devices);
 	selectorDisplay	-> setModel (&deviceList);
-	selectorDisplay	-> adjustSize ();
-	adjustSize ();
+	selectorDisplay	-> adjustSize();
+	adjustSize();
 }
 
 void	sdrplaySelect::select_rsp (QModelIndex s) {
-	QDialog::done (s. row ());
+	QDialog::done (s. row());
 }

_service:download_url:qt-dab-2.5.tar.gz/devices/sdrplay-handler/sdrplayselect.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/sdrplay-handler/sdrplayselect.h Changed

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy Added

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy-handler.cpp Added

@@ -0,0 +1,210 @@
+
+
+#include	"soapy-handler.h"
+#include <stdio.h> //printf
+#include <stdlib.h> //free
+#include <complex.h>
+#include	"soapy_CS16.h"
+#include	"soapy_CF32.h"
+
+	soapyHandler::soapyHandler (QSettings *soapySettings) {
+	this	-> soapySettings	= soapySettings;
+ this -> myFrame = new QFrame (nullptr);
+ setupUi (this -> myFrame);
+ this -> myFrame -> show();
+	deviceLineEdit		= new QLineEdit (nullptr);
+	deviceLineEdit		-> show();
+	connect (deviceLineEdit, SIGNAL (returnPressed (void)),
+	 this, SLOT (createDevice (void)));
+
+	worker			= nullptr;
+	comboBox_1	-> hide();
+	spinBox_1	-> hide();
+	spinBox_2	-> hide();
+	labelSpinbox_1	-> hide();
+	labelSpinbox_2	-> hide();
+	agcControl	-> hide();
+}
+
+	soapyHandler::~soapyHandler (void) {
+	if (worker != nullptr)
+	 delete worker;
+	delete deviceLineEdit;
+	delete myFrame;
+}
+
+bool	contains (std::vector<std::string> s, std::string key) {
+	for (int i = 0; i < s. size(); i ++)
+	 if (s. at (i) == key)
+	 return true;
+	return false;
+}
+
+
+void	soapyHandler::createDevice (void) {
+QString s	= deviceLineEdit -> text();
+QString	handlerName	= "driver=";
+
+	handlerName. append (s);
+
+	device = SoapySDR::Device::make (handlerName. toLatin1(). data());
+
+ if (device == nullptr)
+ return;
+
+	deviceNameLabel	-> setText (device -> getHardwareKey(). c_str());
+ fprintf (stderr, "channels = %d\n",
+ device -> getNumChannels (SOAPY_SDR_RX));
+ std::vector<std::string> streamFormats =
+ device -> getStreamFormats (SOAPY_SDR_RX, 0);
+
+ std::vector<std::string> antennas =
+ device -> listAntennas (SOAPY_SDR_RX, 0);
+	if (antennas. size() > 1) {
+	 for (int i = 0; i < antennas. size(); i ++)
+	 comboBox_1	-> addItem (antennas [i]. c_str());
+	 connect (comboBox_1, SIGNAL (activated (const QString &)),
+	 this, SLOT (handleAntenna (const QString &)));
+	 comboBox_1	-> show();
+	}
+	
+ for (int i = 0; i < antennas. size(); i ++)
+ fprintf (stderr, "antenna %d = %s\n", i, antennas [i]. c_str());
+
+	if (device -> hasGainMode (SOAPY_SDR_RX, 0)) {
+	 connect (agcControl, SIGNAL (stateChanged (int)),
+ this, SLOT (set_agcControl (int)));
+	 agcControl -> show();
+	}
+	else
+	 agcControl -> hide();
+
+	spinBox_1	-> hide();
+	labelSpinbox_1	-> hide();
+	spinBox_2	-> hide();
+	labelSpinbox_2	-> hide();
+
+ gains = device -> listGains (SOAPY_SDR_RX, 0);
+
+	if (gains. size() > 0) {
+ SoapySDR::Range r = device -> getGainRange (SOAPY_SDR_RX,
+ 0,
+ gains [0]);
+	 spinBox_1 -> setMinimum (r. minimum());
+	 spinBox_1 -> setMaximum (r. maximum());
+	 labelSpinbox_1	-> setText (QString (gains [0]. c_str()));
+	 spinBox_1		-> show();
+	 labelSpinbox_1	-> show();
+	 connect (spinBox_1, SIGNAL (valueChanged (int)),
+	 this, SLOT (handle_spinBox_1 (int)));
+	}
+
+	if (gains. size() > 1) {
+ SoapySDR::Range r = device -> getGainRange (SOAPY_SDR_RX,
+ 0,
+ gains [1]);
+	 spinBox_2 -> setMinimum (r. minimum());
+	 spinBox_2 -> setMaximum (r. maximum());
+	 labelSpinbox_2	-> setText (QString (gains [1]. c_str()));
+	 spinBox_2		-> show();
+	 labelSpinbox_2	-> show();
+	 connect (spinBox_2, SIGNAL (valueChanged (int)),
+	 this, SLOT (handle_spinBox_2 (int)));
+	}
+
+ SoapySDR::Range r = device -> getGainRange (SOAPY_SDR_RX, 0);
+ fprintf (stderr, "range totaal = %f, %f\n",
+ r. minimum(), r. maximum());
+
+	std::vector<SoapySDR::Range> freqs =
+ device -> getFrequencyRange (SOAPY_SDR_RX, 0);
+ for (int i = 0; i < freqs. size(); i ++)
+ fprintf (stderr, "freqs %f %f\n", freqs [i]. minimum(),
+ freqs [i]. maximum());
+
+
+ std::vector<double>bandwidths =
+ device -> listBandwidths (SOAPY_SDR_RX, 0);
+
+	int	minDist	= 10000000;
+	int	selectedWidth	= 0;
+	for (int i = 0; i < bandwidths. size(); i ++)
+	 if ((bandwidths [i] >= 1536000) &&
+	 (bandwidths [i] - 1536000 < minDist)) {
+	 minDist = bandwidths [i] - 1536000;
+	 selectedWidth	= bandwidths [i];
+	 }
+
+	bool	validRate = false;
+ std::vector<double> samplerates =
+ device -> listSampleRates (SOAPY_SDR_RX, 0);
+ for (int i = 0; i < samplerates. size(); i ++)
+	 if ((int)(samplerates [i]) == 2048000) {
+	 validRate = true;
+	 break;
+	 }
+
+	device -> setBandwidth 	(SOAPY_SDR_RX, 0, selectedWidth);
+ device -> setSampleRate (SOAPY_SDR_RX, 0, 2048000.0);
+ device -> setFrequency (SOAPY_SDR_RX, 0, 220000000.0);
+	if (contains (streamFormats, std::string ("CF32")))
+	 worker = new soapy_CF32 (device);
+	else
+	if (contains (streamFormats, "CS16"))
+	 worker	= new soapy_CS16 (device);
+//	else
+//	if (contains (streamFormats, "CS8"))
+//	 worker	= new soapy_CS8 (device);
+}
+
+void	soapyHandler::setVFOFrequency		(int32_t f) {
+	if (worker == nullptr)
+	 return;
+	device	-> setFrequency (SOAPY_SDR_RX, 0, f);
+}
+
+int32_t	soapyHandler::getVFOFrequency		(void) {
+	return device	-> getFrequency (SOAPY_SDR_RX, 0);
+}
+	
+int32_t	soapyHandler::defaultFrequency		(void) {return 220000000;}
+
+bool	soapyHandler::restartReader		(void) {return true;}
+void	soapyHandler::stopReader		(void) {}
+int32_t	soapyHandler::getSamples		(std::complex<float> *v,
+ int32_t a) {
+	if (worker == nullptr)
+	 return 0;
+	return worker -> getSamples (v, a);
+}
+
+int32_t	soapyHandler::Samples			(void) {
+	if (worker == nullptr)
+	 return 0;
+	return worker	-> Samples();
+}
+
+void	soapyHandler::resetBuffer		(void) {}
+int16_t soapyHandler::bitDepth			(void) {return 12;}
+
+void	soapyHandler::handle_spinBox_1 (int v) {
+ device -> setGain (SOAPY_SDR_RX, 0, gains [0], (float)v);
+}
+
+void	soapyHandler::handle_spinBox_2 (int v) {
+ device -> setGain (SOAPY_SDR_RX, 0, gains [1], (float)v);
+}
+
+void	soapyHandler::set_agcControl	(int v) {
+	if (agcControl -> isChecked())

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy-handler.h Added

@@ -0,0 +1,72 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __SOAPY_HANDLER__
+#define	__SOAPY_HANDLER__
+
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<QLineEdit>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<SoapySDR/Device.hpp>
+#include	<SoapySDR/Formats.hpp>
+#include <SoapySDR/Errors.hpp>
+#include	"virtual-input.h"
+#include	"ui_soapy-widget.h"
+#include	"soapy-worker.h"
+
+class	soapyHandler: public virtualInput, public Ui_soapyWidget {
+Q_OBJECT
+public:
+			soapyHandler		(QSettings *);
+			~soapyHandler		(void);
+	void		setVFOFrequency		(int32_t);
+	int32_t		getVFOFrequency		(void);
+	int32_t		defaultFrequency	(void);
+
+	bool		restartReader		(void);
+	void		stopReader		(void);
+	int32_t		getSamples		(std::complex<float> *,
+	 int32_t);
+	int32_t		Samples			(void);
+	void		resetBuffer		(void);
+	int16_t		bitDepth		(void);
+private:
+	SoapySDR::Device	*device;
+	SoapySDR::Stream	*stream;
+	QSettings		*soapySettings;
+	QFrame			*myFrame;
+	QLineEdit		*deviceLineEdit;
+	std::vector<std::string> gains;
+	soapyWorker		*worker;
+private slots:
+	void		createDevice		(void);
+	void		handle_spinBox_1	(int);
+	void		handle_spinBox_2	(int);
+	void		set_agcControl		(int);
+	void		handleAntenna		(const QString &);
+};
+#endif
+

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy-widget.ui Added

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>soapyWidget</class>
+ <widget class="QWidget" name="soapyWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>350</width>
+ <height>270</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>soapy control</string>
+ </property>
+ <widget class="QFrame" name="frame">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>321</width>
+ <height>261</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <widget class="QLabel" name="deviceLabel">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>20</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>soapy</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="statusLabel">
+ <property name="geometry">
+ <rect>
+ <x>16</x>
+ <y>180</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>30</y>
+ <width>71</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touch to switch on automatic gain control - based on the setting of the lnastate and the ifgain.&lt;/p&gt;&lt;p&gt;If switched on, the lnastate switch and the ifgain slider are switched off&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="serialNumber">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>50</y>
+ <width>171</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="spinBox_1">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>80</y>
+ <width>106</width>
+ <height>35</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="spinBox_2">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>120</y>
+ <width>106</width>
+ <height>35</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="labelSpinbox_1">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>90</y>
+ <width>67</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="labelSpinbox_2">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>130</y>
+ <width>67</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="deviceNameLabel">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>50</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>13</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="comboBox_1">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>160</y>
+ <width>151</width>
+ <height>41</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy-worker.cpp Added

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy-worker.h Added

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy_CF32.cpp Added

@@ -0,0 +1,55 @@
+#include <SoapySDR/Device.hpp>
+#include <SoapySDR/Formats.hpp>
+#include <SoapySDR/Errors.hpp>
+#include <stdio.h> //printf
+#include <stdlib.h> //free
+#include <complex.h>
+#include	"ringbuffer.h"
+
+#include	"soapy_CF32.h"
+
+	soapy_CF32::soapy_CF32 (SoapySDR::Device *device) {
+	this	-> theDevice	= device;
+	theBuffer		= new RingBuffer<std::complex<float>> (32 * 32768);
+	std::vector<size_t> xxx;
+	stream		= device -> setupStream (SOAPY_SDR_RX,
+	 "CF32", xxx,
+	 SoapySDR::Kwargs());
+	start();
+}
+
+	soapy_CF32::~soapy_CF32	(void) {
+	running	= false;
+	while (isRunning()) {
+	 usleep (1000);
+	}
+	theDevice	-> deactivateStream (stream);
+	delete theBuffer;
+}
+
+int	soapy_CF32::Samples	(void) {
+	return theBuffer	-> GetRingBufferReadAvailable();
+}
+
+int	soapy_CF32::getSamples	(std::complex<float> *v, int amount) {
+int	realAmount;
+	realAmount	= theBuffer -> getDataFromBuffer (v, amount);
+	return realAmount;
+}
+
+void	soapy_CF32::run	(void) {
+int flag = 0;
+long long int timeNS;
+std::complex<float> buffer [4096];
+void *const buffs [] = {buffer};
+	running	= true;
+
+ theDevice -> activateStream (stream);
+	while (running) {
+ int aa = theDevice -> readStream (stream, buffs,
+	 4096, flag, timeNS, 10000);
+	 if (aa > 0)
+	 theBuffer -> putDataIntoBuffer (buffer, aa);
+	}
+}
+

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy_CF32.h Added

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy_CS16.cpp Added

@@ -0,0 +1,57 @@
+#include <SoapySDR/Device.hpp>
+#include <SoapySDR/Formats.hpp>
+#include <SoapySDR/Errors.hpp>
+#include <stdio.h> //printf
+#include <stdlib.h> //free
+#include <complex.h>
+#include	"ringbuffer.h"
+
+#include	"soapy_CS16.h"
+
+	soapy_CS16::soapy_CS16 (SoapySDR::Device *device) {
+	this	-> theDevice	= device;
+	theBuffer		= new RingBuffer<int16_t> (16 * 32768);
+	std::vector<size_t> xxx;
+	stream		= device -> setupStream (SOAPY_SDR_RX,
+	 "CS16", xxx,
+	 SoapySDR::Kwargs());
+ theDevice -> activateStream (stream);
+	start();
+}
+
+	soapy_CS16::~soapy_CS16	(void) {
+	running	= false;
+	while (isRunning()) {
+	 usleep (1000);
+	}
+	theDevice	-> deactivateStream (stream);
+	delete theBuffer;
+}
+
+int	soapy_CS16::Samples	(void) {
+	return theBuffer	-> GetRingBufferReadAvailable() / 2;
+}
+
+int	soapy_CS16::getSamples	(std::complex<float> *v, int amount) {
+int16_t temp [amount * 2];
+int	realAmount;
+	realAmount	= theBuffer -> getDataFromBuffer (temp, amount * 2);
+	for (int i = 0; i < realAmount / 2; i ++) 
+	 v [i] = std::complex<float> (temp [2 * i] / 8191.0,
+	 temp [2 * i + 1] / 8191.0);
+	return realAmount / 2;
+}
+
+void	soapy_CS16::run	(void) {
+int flag = 0;
+long long int timeNS;
+int buffer [2048 * 2];
+void *const buffs [] = {buffer};
+	running	= true;
+int	cnt	= 0;
+	while (running) {
+ theDevice -> readStream (stream, buffs, 2048, flag, timeNS, 10000);
+	 theBuffer -> putDataIntoBuffer (buffer, 2 * 2048);
+	}
+}
+

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy_CS16.h Added

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy_CS8.cpp Added

@@ -0,0 +1,56 @@
+#include	<SoapySDR/Device.hpp>
+#include	<SoapySDR/Formats.hpp>
+#include <SoapySDR/Errors.hpp>
+#include	<stdio.h> //printf
+#include	<stdlib.h> //free
+#include	<complex.h>
+#include	"ringbuffer.h"
+
+#include	"soapy_CS8.h"
+
+	soapy_CS8::soapy_CS8 (SoapySDR::Device *device) {
+	this	-> theDevice	= device;
+	theBuffer		= new RingBuffer<int8_t> (16 * 32768);
+	std::vector<size_t> xxx;
+	stream		= device -> setupStream (SOAPY_SDR_RX,
+	 "CS8", xxx,
+	 SoapySDR::Kwargs ());
+ theDevice -> activateStream (stream);
+	start ();
+}
+
+	soapy_CS8::~soapy_CS8	(void) {
+	running	= false;
+	while (isRunning ()) {
+	 usleep (1000);
+	}
+	delete theBuffer;
+}
+
+int	soapy_CS16::Samples	(void) {
+	return theBuffer	-> GetRingBufferReadAvailable () / 2;
+}
+
+int	soapy_CS16::getSamples	(std::complex<float> *v, int amount) {
+int8_t temp [amount * 2];
+int	realAmount;
+	realAmount	= theBuffer -> getDataFromBuffer (temp, amount * 2);
+	for (int i = 0; i < realAmount / 2; i ++) 
+	 v [i] = std::complex<float> (temp [2 * i] / 127.0,
+	 temp [2 * i + 1] / 127.0);
+	return realAmount / 2;
+}
+
+void	soapy_CS16::run	(void) {
+int flag = 0;
+long long int timeNS;
+int8_t buffer [2048 * 2];
+void *const buffs [] = {buffer};
+	running	= true;
+	while (running) {
+ theDevice -> readStream (stream, buffs, 2048, flag, timeNS, 10000);
+	 theBuffer -> putDataIntoBuffer (buffer, 2 * 2048);
+	}
+	theDevice	-> deactivateStream (stream);
+}
+

_service:download_url:qt-dab-2.7.1.tar.gz/devices/soapy/soapy_CS8.h Added

_service:download_url:qt-dab-2.5.tar.gz/devices/virtual-input.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/virtual-input.cpp Changed

@@ -25,29 +25,29 @@
 */
 #include	"virtual-input.h"
 
-	virtualInput::virtualInput (void) {
+	virtualInput::virtualInput() {
 	lastFrequency	= 100000;
 	vfoOffset	= 0;
 	theGain		= 50;
 	coarseOffset	= 0;
 }
 
-	virtualInput::~virtualInput (void) {
+	virtualInput::~virtualInput() {
 }
 
 void	virtualInput::setVFOFrequency (int32_t f) {
 	lastFrequency = f;
 }
 
-int32_t	virtualInput::getVFOFrequency	(void) {
+int32_t	virtualInput::getVFOFrequency() {
 	return lastFrequency;
 }
 
-bool	virtualInput::restartReader	(void) {
+bool	virtualInput::restartReader() {
 	return true;
 }
 
-void	virtualInput::stopReader	(void) {
+void	virtualInput::stopReader() {
 }
 
 int32_t	virtualInput::getSamples	(std::complex<float> *v, int32_t amount) {
@@ -56,22 +56,22 @@
 	return amount;
 }
 
-int32_t	virtualInput::Samples		(void) {
+int32_t	virtualInput::Samples() {
 	return 1024;
 }
 
-int32_t	virtualInput::defaultFrequency	(void) {
+int32_t	virtualInput::defaultFrequency() {
 	return Khz (220000);
 }
 
-void	virtualInput::resetBuffer	(void) {
+void	virtualInput::resetBuffer() {
 }
 
 void	virtualInput::setOffset		(int32_t o) {
 	coarseOffset = o;
 }
 
-int32_t	virtualInput::getOffset		(void) {
+int32_t	virtualInput::getOffset() {
 	return coarseOffset;
 }

_service:download_url:qt-dab-2.5.tar.gz/devices/virtual-input.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/virtual-input.h Changed

@@ -26,24 +26,25 @@
 #ifndef	__VIRTUAL_INPUT__
 #define	__VIRTUAL_INPUT__
 
-#include	<stdint.h>
+#include	<cstdint>
 #include	"dab-constants.h"
 #include	<QObject>
+#include	<QThread>
 
-class	virtualInput: public QObject {
+class	virtualInput: public QThread {
 public:
-			virtualInput 	(void);
-virtual			~virtualInput 	(void);
+			virtualInput();
+virtual			~virtualInput();
 virtual		void	setVFOFrequency	(int32_t);
-virtual		int32_t	getVFOFrequency	(void);
-virtual		int32_t	defaultFrequency(void);
-virtual		bool	restartReader	(void);
-virtual		void	stopReader	(void);
+virtual		int32_t	getVFOFrequency();
+virtual		int32_t	defaultFrequency();
+virtual		bool	restartReader();
+virtual		void	stopReader();
 virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
-virtual		int32_t	Samples		(void);
-virtual		void	resetBuffer	(void);
-virtual		int16_t	bitDepth	(void) { return 10;}
-virtual		int32_t	getOffset	(void);
+virtual		int32_t	Samples();
+virtual		void	resetBuffer();
+virtual		int16_t	bitDepth() { return 10;}
+virtual		int32_t	getOffset();
 virtual		void	setOffset	(int32_t);
 //
 protected:

_service:download_url:qt-dab-2.5.tar.gz/devices/wavfiles/wav-reader.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/wavfiles/wav-reader.cpp Changed

@@ -27,10 +27,10 @@
 
 #define	BUFFERSIZE	32768
 static inline
-int64_t getMyTime (void) {
+int64_t getMyTime() {
 struct timeval tv;
 
- gettimeofday (&tv, NULL);
+ gettimeofday (&tv, nullptr);
 return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
 }
 
@@ -46,22 +46,22 @@
 	period = (32768 * 1000) / (2048); // full IQś read
 fprintf (stderr, "Period = %ld\n", period);
 	running. store (false);
-	start ();
+	start();
 }
 
-	wavReader::~wavReader	(void) {
-	stopReader ();
+	wavReader::~wavReader() {
+	stopReader();
 }
 
-void	wavReader::stopReader	(void) {
-	if (running. load ()) {
+void	wavReader::stopReader() {
+	if (running. load()) {
 	 running. store (false);
-	 while (isRunning ())
+	 while (isRunning())
 	 usleep (200);
 	}
 }
 
-void	wavReader::run (void) {
+void	wavReader::run() {
 int32_t	t, i;
 std::complex<float>	*bi;
 int32_t	bufferSize	= 32768;
@@ -75,11 +75,11 @@
 	running. store (true);
 
 	bi		= new std::complex<float> [bufferSize];
-	nextStop	= getMyTime ();
+	nextStop	= getMyTime();
 	try {
-	 while (running. load ()) {
-	 while (theBuffer -> WriteSpace () < bufferSize) {
-	 if (!running. load ())
+	 while (running. load()) {
+	 while (theBuffer -> WriteSpace() < bufferSize) {
+	 if (!running. load())
 	 throw (33);
 	 usleep (100);
 	 }
@@ -100,8 +100,8 @@
 	 bi [i] = std::complex <float> (0, 0);
 	 }
 	 theBuffer -> putDataIntoBuffer (bi, bufferSize);
-	 if (nextStop - getMyTime () > 0)
-	 usleep (nextStop - getMyTime ());
+	 if (nextStop - getMyTime() > 0)
+	 usleep (nextStop - getMyTime());
 	 }
 	} catch (int e) {}
 	fprintf (stderr, "taak voor replay eindigt hier\n"); fflush (stderr);

_service:download_url:qt-dab-2.5.tar.gz/devices/wavfiles/wav-reader.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/wavfiles/wav-reader.h Changed

_service:download_url:qt-dab-2.5.tar.gz/devices/wavfiles/wavfiles.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/wavfiles/wavfiles.cpp Changed

@@ -19,12 +19,12 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include	<stdio.h>
+#include	<cstdio>
 #include	<unistd.h>
-#include	<stdlib.h>
+#include	<cstdlib>
 #include	<fcntl.h>
 #include	<sys/time.h>
-#include	<time.h>
+#include	<ctime>
 #include	<QString>
 #include	"wavfiles.h"
 
@@ -36,16 +36,16 @@
 	fileName	= f;
 	myFrame		= new QFrame;
 	setupUi (myFrame);
-	myFrame		-> show ();
+	myFrame		-> show();
 
 	_I_Buffer	= new RingBuffer<std::complex<float>> (__BUFFERSIZE);
 
 	sf_info		= (SF_INFO *)alloca (sizeof (SF_INFO));
 	sf_info	-> format	= 0;
-	filePointer	= sf_open (f. toUtf8 (). data (), SFM_READ, sf_info);
-	if (filePointer == NULL) {
+	filePointer	= sf_open (f. toUtf8(). data(), SFM_READ, sf_info);
+	if (filePointer == nullptr) {
 	 fprintf (stderr, "file %s no legitimate sound file\n", 
-	 f. toUtf8 ().data ());
+	 f. toUtf8().data());
 	 delete myFrame;
 	 throw (24);
 	}
@@ -66,31 +66,31 @@
 //
 //	Note that running == true <==> readerTask has value assigned
 
-	wavFiles::~wavFiles (void) {
-	if (running. load ()) {
-	 readerTask	-> stopReader ();
-	 while (readerTask -> isRunning ())
+	wavFiles::~wavFiles() {
+	if (running. load()) {
+	 readerTask	-> stopReader();
+	 while (readerTask -> isRunning())
 	 usleep (500);
 	 delete readerTask;
 	}
-	if (filePointer != NULL)
+	if (filePointer != nullptr)
 	 sf_close (filePointer);
 	delete _I_Buffer;
 	delete	myFrame;
 }
 
-bool	wavFiles::restartReader	(void) {
-	if (running. load ())
+bool	wavFiles::restartReader() {
+	if (running. load())
 return true;
 readerTask = new wavReader (this, filePointer, _I_Buffer);
 running. store (true);
 return true;
 }
 
-void	wavFiles::stopReader	(void) {
- if (running. load ()) {
- readerTask -> stopReader ();
- while (readerTask -> isRunning ())
+void	wavFiles::stopReader() {
+ if (running. load()) {
+ readerTask -> stopReader();
+ while (readerTask -> isRunning())
 usleep (100);
 	 delete readerTask;
 }
@@ -101,10 +101,10 @@
 int32_t	wavFiles::getSamples	(std::complex<float> *V, int32_t size) {
 int32_t	amount;
 	
-	if (filePointer == NULL)
+	if (filePointer == nullptr)
 	 return 0;
 
-	while (_I_Buffer -> GetRingBufferReadAvailable () < size)
+	while (_I_Buffer -> GetRingBufferReadAvailable() < size)
 	 usleep (100);
 
 	amount = _I_Buffer	-> getDataFromBuffer (V, size);
@@ -112,8 +112,8 @@
 	return amount;
 }
 
-int32_t	wavFiles::Samples (void) {
-	return _I_Buffer -> GetRingBufferReadAvailable ();
+int32_t	wavFiles::Samples() {
+	return _I_Buffer -> GetRingBufferReadAvailable();
 }
 
 void wavFiles::setProgress (int progress, float timelength) {

_service:download_url:qt-dab-2.5.tar.gz/devices/wavfiles/wavfiles.h -> _service:download_url:qt-dab-2.7.1.tar.gz/devices/wavfiles/wavfiles.h Changed

_service:download_url:qt-dab-2.5.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-2.7.1.tar.gz/forms/dabradio.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>622</width>
- <height>411</height>
+ <width>547</width>
+ <height>348</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -18,8 +18,8 @@
 <rect>
 <x>20</x>
 <y>90</y>
- <width>181</width>
- <height>301</height>
+ <width>171</width>
+ <height>251</height>
 </rect>
 </property>
 <property name="font">
@@ -190,8 +190,8 @@
 <widget class="QLabel" name="versionName">
 <property name="geometry">
 <rect>
- <x>20</x>
- <y>0</y>
+ <x>30</x>
+ <y>10</y>
 <width>181</width>
 <height>31</height>
 </rect>
@@ -214,8 +214,8 @@
 <widget class="QLabel" name="label">
 <property name="geometry">
 <rect>
- <x>580</x>
- <y>30</y>
+ <x>10</x>
+ <y>10</y>
 <width>21</width>
 <height>20</height>
 </rect>
@@ -238,9 +238,9 @@
 <widget class="QLabel" name="timeDisplay">
 <property name="geometry">
 <rect>
- <x>390</x>
+ <x>360</x>
 <y>110</y>
- <width>201</width>
+ <width>161</width>
 <height>20</height>
 </rect>
 </property>
@@ -257,7 +257,7 @@
 <widget class="QLCDNumber" name="ensembleId">
 <property name="geometry">
 <rect>
- <x>310</x>
+ <x>290</x>
 <y>70</y>
 <width>81</width>
 <height>23</height>
@@ -287,7 +287,7 @@
 <widget class="QLabel" name="label_5">
 <property name="geometry">
 <rect>
- <x>220</x>
+ <x>200</x>
 <y>70</y>
 <width>100</width>
 <height>23</height>
@@ -323,7 +323,7 @@
 <widget class="QLCDNumber" name="correctorDisplay">
 <property name="geometry">
 <rect>
- <x>300</x>
+ <x>280</x>
 <y>40</y>
 <width>90</width>
 <height>23</height>
@@ -368,7 +368,7 @@
 <widget class="QLCDNumber" name="snrDisplay">
 <property name="geometry">
 <rect>
- <x>300</x>
+ <x>280</x>
 <y>10</y>
 <width>90</width>
 <height>23</height>
@@ -399,7 +399,7 @@
 <x>210</x>
 <y>170</y>
 <width>381</width>
- <height>91</height>
+ <height>61</height>
 </rect>
 </property>
 <property name="font">
@@ -474,10 +474,10 @@
 <widget class="QWidget" name="layoutWidget">
 <property name="geometry">
 <rect>
- <x>430</x>
- <y>280</y>
+ <x>350</x>
+ <y>232</y>
 <width>184</width>
- <height>113</height>
+ <height>101</height>
 </rect>
 </property>
 <layout class="QGridLayout" name="gridLayout_2">
@@ -579,14 +579,32 @@
 <widget class="QWidget" name="layoutWidget">
 <property name="geometry">
 <rect>
- <x>210</x>
- <y>280</y>
- <width>201</width>
- <height>111</height>
+ <x>200</x>
+ <y>235</y>
+ <width>141</width>
+ <height>101</height>
 </rect>
 </property>
 <layout class="QGridLayout" name="gridLayout_3">
- <item row="2" column="0" colspan="2">
+ <item row="1" column="0">
+ <widget class="QComboBox" name="streamoutSelector">
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>10</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a device (channel) for the audio output. On program start up a default is chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Audio Device</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="0">
 <widget class="QComboBox" name="deviceSelector">
 <property name="font">
 
@@ -620,29 +638,6 @@
 </widget>
 </item>
 <item row="3" column="0">
- <widget class="QComboBox" name="bandSelector">
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a DAB band.&lt;/p&gt;&lt;p&gt;The default is VHF Band III (174–230 MHz).&lt;/p&gt;&lt;p&gt;Alternatively, the L Band may be selected (1452 bis 1492 MHz, but only used in very few countries like Czech Republic).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <item>
- <property name="text">
- <string>VHF Band III</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>L Band</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="3" column="1">
 <widget class="QComboBox" name="channelSelector">
 <property name="font">
 
@@ -654,33 +649,15 @@
 </property>
 </widget>
 </item>
- <item row="1" column="0">
- <widget class="QComboBox" name="streamoutSelector">
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a device (channel) for the audio output. On program start up a default is chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <item>
- <property name="text">

_service:download_url:qt-dab-2.5.tar.gz/impulse-viewer/impulse-viewer.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/impulse-viewer/impulse-viewer.cpp Changed

@@ -70,8 +70,8 @@
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
 }
 
-	impulseViewer::~impulseViewer	(void) {
-	myFrame		-> hide ();
+	impulseViewer::~impulseViewer() {
+	myFrame		-> hide();
 	delete		ourBrush;
 	delete		spectrumCurve;
 	delete		grid;
@@ -92,11 +92,11 @@
 	 return;
 	}
 
-	if (indexVector. size () < 2)
+	if (indexVector. size() < 2)
 	 theText	= QString (" ");
 	else {
 	 theText	= QString (" trans ");
-	 for (int i = 1; i < indexVector. size (); i ++) {
+	 for (int i = 1; i < indexVector. size(); i ++) {
 	 char t [255];
 	 sprintf (t, " (%d -> %d msec) ", i,
 	 (indexVector. at (i) - indexVector. at (0)) / 2);
@@ -106,16 +106,16 @@
 	indexDisplay -> setText (theText);
 }
 
-void	impulseViewer::show	(void) {
-	myFrame		-> show ();
+void	impulseViewer::show() {
+	myFrame		-> show();
 }
 
-void	impulseViewer::hide	(void) {
-	myFrame		-> hide ();
+void	impulseViewer::hide() {
+	myFrame		-> hide();
 }
 
-bool	impulseViewer::isHidden	(void) {
-	return myFrame	-> isHidden ();
+bool	impulseViewer::isHidden() {
+	return myFrame	-> isHidden();
 }
 
 
@@ -128,7 +128,7 @@
 float	mmax	= 0;
 
 	responseBuffer	-> getDataFromBuffer (data, dots);
-	if (myFrame -> isHidden ())
+	if (myFrame -> isHidden())
 	 return;
 
 	for (i = 0; i < dots; i ++) 
@@ -154,7 +154,6 @@
 
 	Y_values [0]		= get_db (0);
 	Y_values [dots - 1] 	= get_db (0);
-
 	spectrumCurve	-> setSamples (X_axis, Y_values, dots);
 	plotgrid	-> replot(); 
 }

_service:download_url:qt-dab-2.5.tar.gz/impulse-viewer/impulse-viewer.h -> _service:download_url:qt-dab-2.7.1.tar.gz/impulse-viewer/impulse-viewer.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/audio/faad-decoder.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/audio/faad-decoder.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/audio/mp2processor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/audio/mp2processor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/audio/mp4processor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/audio/mp4processor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/backend-deconvolver.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/backend-deconvolver.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/backend-driver.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/backend-driver.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/backend.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/backend.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/data-processor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/data-processor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/epg/epgdec.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/epg/epgdec.h Changed

@@ -29,7 +29,7 @@
 
 #ifndef _EPGDEC_H
 #define _EPGDEC_H
-#include	<stdint.h>
+#include	<cstdint>
 #include	<vector>
 #include	<qdom.h>
 using namespace std;
@@ -39,13 +39,13 @@
 public:
 	uint8_t tag;
 		tag_length_value	(const _BYTE* p);
-	bool	is_cdata		(void) const { return tag == 1; }
-	bool	is_epg			(void) const { return tag == 2; }
-	bool	is_service_information	(void) const { return tag == 3; }
-	bool	is_string_token_table	(void) const { return tag == 4; }
-	bool	is_default_id		(void) const { return tag == 5; }
-	bool	is_child_element	(void) const { return (5<tag) && (tag<0x80); }
-	bool	is_attribute		(void) const { return tag>=0x80; }
+	bool	is_cdata() const { return tag == 1; }
+	bool	is_epg() const { return tag == 2; }
+	bool	is_service_information() const { return tag == 3; }
+	bool	is_string_token_table() const { return tag == 4; }
+	bool	is_default_id() const { return tag == 5; }
+	bool	is_child_element() const { return (5<tag) && (tag<0x80); }
+	bool	is_attribute() const { return tag>=0x80; }
 
 	size_t length;
 	_BYTE* value;
@@ -53,7 +53,7 @@
 
 class CEPGDecoder {
 public:
-		CEPGDecoder		(void) {
+		CEPGDecoder() {
 	 }
 	void	decode			(const vector<_BYTE>&,
 	 const QString &);

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/ip-datahandler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/ip-datahandler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/journaline-datahandler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/journaline-datahandler.h Changed

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

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/mot/mot-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/mot/mot-handler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/mot/mot-object.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/mot/mot-object.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/pad-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/pad-handler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/tdc-datahandler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/tdc-datahandler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/virtual-datahandler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/data/virtual-datahandler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/firecode-checker.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/firecode-checker.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/frame-processor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/frame-processor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/galois.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/galois.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/msc-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/msc-handler.h Changed

@@ -28,9 +28,9 @@
 #include	<QMutex>
 #include	<QSemaphore>
 #include	<atomic>
-#include	<stdio.h>
-#include	<stdint.h>
-#include	<stdio.h>
+#include	<cstdio>
+#include	<cstdint>
+#include	<cstdio>
 #include	<vector>
 #include	"dab-constants.h"
 #include	"dab-params.h"
@@ -47,7 +47,7 @@
 			mscHandler		(RadioInterface *,
 	 uint8_t,
 	 QString);
-			~mscHandler		(void);
+			~mscHandler();
 	void		processBlock_0		(std::complex<float> *);
 	void		process_Msc		(std::complex<float> *, int);
 	void		set_Channel		(descriptorType *,
@@ -56,10 +56,10 @@
 //
 //	This function should be called beore issuing a request
 //	to handle a service
-	void		reset			(void);
+	void		reset();
 //
 //	This function will kill
-	void		stop			(void);
+	void		stop();
 private:
 	void		process_mscBlock	(std::vector<int16_t>, int16_t);
 
@@ -82,12 +82,12 @@
 	int16_t		BitsperBlock;
 	int16_t		numberofblocksperCIF;
 	int16_t		blockCount;
-	void run (void);
+	void run();
 std::atomic<bool> running;
 std::vector<std::vector<std::complex<float> > > command;
 int16_t amount;
 int16_t currentBlock;
- void processBlock_0	(void);
+ void processBlock_0();
 void processMsc	(int32_t n);
 QSemaphore bufferSpace;
 QWaitCondition commandHandler;

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/reed-solomon.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/reed-solomon.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/backend/rscodec.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/rscodec.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/country-codes.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/country-codes.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/dab-constants.h Changed

@@ -26,17 +26,17 @@
 #ifndef	__DAB_CONSTANTS__
 #define	__DAB_CONSTANTS__
 #include	<QString>
-#include	<math.h>
-#include	<stdint.h>
-#include	<stdlib.h>
-#include	<stdio.h>
+#include	<cmath>
+#include	<cstdint>
+#include	<cstdlib>
+#include	<cstdio>
 #include	<complex>
 #include	<limits>
 #include	<cstring>
 #include	<unistd.h>
 
 #ifndef	__FREEBSD__
-#include	<malloc.h>
+//#include	<malloc.h>
 #endif
 
 #ifdef	__MINGW32__
@@ -44,7 +44,7 @@
 #include	"windows.h"
 #else
 #ifndef	__FREEBSD__
-#include	"alloca.h"
+//#include	"alloca.h"
 #endif
 #include	"dlfcn.h"
 typedef	void	*HINSTANCE;
@@ -64,7 +64,7 @@
 #define	MHz(x)		(KHz (x) * 1000)
 #define	mHz(x)		(kHz (x) * 1000)
 
-#define	CURRENT_VERSION	"2.5"
+#define	CURRENT_VERSION	"2.7.1"
 
 #define		DAB		0100
 #define		DAB_PLUS	0101
@@ -88,7 +88,7 @@
 
 static inline
 bool	isInfinite (float x) {
-	return x == numeric_limits<float>::infinity ();
+	return x == numeric_limits<float>::infinity();
 }
 
 static inline
@@ -135,11 +135,11 @@
 	int16_t	length;
 	int16_t	bitRate;
 public:
-		descriptorType	(void) {
+		descriptorType() {
 	defined		= false;
 	serviceName	= "";
 	}
-virtual		~descriptorType	(void) {}
+virtual		~descriptorType() {}
 };
 
 //	for service handling we define
@@ -151,7 +151,7 @@
 	int16_t	appType;
 	int16_t	compnr;
 	int16_t	packetAddress;
-	packetdata (void) {
+	packetdata() {
 	 type	= PACKET_SERVICE;
 	}
 };
@@ -163,7 +163,7 @@
 	int16_t	programType;
 	int16_t	compnr;
 	int32_t	fmFrequency;
-	audiodata (void) {
+	audiodata() {
 	 type	= AUDIO_SERVICE;
 	}

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

@@ -1,4 +1,3 @@
-
 #
 /*
 * Copyright (C) 2013
@@ -25,8 +24,8 @@
 #define	__FIB_DECODER__
 #
 //
-#include	<stdint.h>
-#include	<stdio.h>
+#include	<cstdint>
+#include	<cstdio>
 #include	<QObject>
 #include	"msc-handler.h"
 #include	<QMutex>
@@ -40,20 +39,21 @@
 Q_OBJECT
 public:
 		fibDecoder		(RadioInterface *);
-		~fibDecoder		(void);
+		~fibDecoder();
 
-	void	clearEnsemble		(void);
-	bool	syncReached		(void);
+	void	clearEnsemble();
+	bool	syncReached();
 	void	dataforAudioService	(const QString &,
 	 audiodata *, int16_t);
 	void	dataforPacketService	(const QString &,
 	 packetdata *, int16_t);
- uint8_t get_ecc (void);
-	int32_t	get_ensembleId		(void);
-	QString get_ensembleName	(void);
-	int32_t	get_CIFcount		(void);
+ uint8_t get_ecc();
+	int32_t	get_ensembleId();
+	QString get_ensembleName();
+	int32_t	get_CIFcount();	
+	void	print_Overview ();
 protected:
-	void	newFrame		(void);
+	void	newFrame();
 	void	process_FIB		(uint8_t *, uint16_t);
 private:
 	RadioInterface	*myRadioInterface;
@@ -135,6 +135,9 @@
 //	void		bind_SCIds_to_SubChannel	(uint16_t, uint16_t);
 //	void		bindServiceComponenttoService	(uint32_t, uint16_t, uint8_t);
 //	void		bind_xpadComponent		(uint32_t, uin16_t, uint8_t);
+	void		setCluster (int clusterId,
+ int16_t serviceIndex, uint16_t asuFlags);
+	QString		announcements (uint16_t a);
 	int32_t		dateTime [8];
 	QMutex		fibLocker;
 	int		CIFcount;
@@ -142,7 +145,9 @@
 	void		addtoEnsemble	(const QString &);
 	void		nameofEnsemble (int, const QString &);
 	void		setTime		(const QString &);
-	void		changeinConfiguration (void);
+	void		changeinConfiguration();
+	void		startAnnouncement (const QString &, int);
+	void		stopAnnouncement (const QString &, int);
 };
 
 #endif

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/fic-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/fic-handler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/freq-interleaver.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/freq-interleaver.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/ofdm-decoder.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/ofdm-decoder.h Changed

@@ -25,7 +25,7 @@
 #include	"dab-constants.h"
 #include	<QObject>
 #include	<vector>
-#include	<stdint.h>
+#include	<cstdint>
 #include	"fft-handler.h"
 #include	"ringbuffer.h"
 #include	"phasetable.h"
@@ -41,13 +41,13 @@
 	 uint8_t,
 	 int16_t,
 	 RingBuffer<std::complex<float>> * iqBuffer = nullptr);
-		~ofdmDecoder		(void);
+		~ofdmDecoder();
 	void	processBlock_0		(std::vector<std::complex<float> >);
 	void	decode			(std::vector<std::complex<float> >,
 	 int32_t n, int16_t *);
 	int16_t	get_snr			(std::complex<float> *);
-	void	stop			(void);
-	void	reset			(void);
+	void	stop();
+	void	reset();
 private:
 	RadioInterface	*myRadioInterface;
 	dabParams	params;
@@ -61,7 +61,7 @@
 	int32_t		T_g;
 	int32_t		nrBlocks;
 	int32_t		carriers;
-	int16_t		getMiddle	(void);
+	int16_t		getMiddle();
 	std::vector<complex<float>>	phaseReference;
 	std::vector<int16_t>		ibits;
 	std::complex<float>	*fft_buffer;
@@ -70,6 +70,7 @@
 	int16_t		snrCount;
 	int16_t		snr;
 	int16_t		maxSignal;
+
 signals:
 	void		show_snr	(int);
 	void		showIQ		(int);

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/phasereference.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/phasereference.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/phasetable.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/phasetable.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/sample-reader.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/sample-reader.h Changed

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

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/tii_table.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/tii_table.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/timesyncer.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/timesyncer.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/output/audio-base.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/output/audio-base.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/output/audiosink.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/output/audiosink.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/output/newconverter.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/output/newconverter.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/protection/eep-protection.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/protection/eep-protection.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/protection/protTables.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/protection/protTables.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/protection/protection.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/protection/protection.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/protection/uep-protection.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/protection/uep-protection.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/scopes-qwt6/iqdisplay.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/scopes-qwt6/iqdisplay.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/scopes-qwt6/spectrogramdata.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/scopes-qwt6/spectrogramdata.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/support/band-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/band-handler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/support/dab-params.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/dab-params.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/support/dab_tables.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/dab_tables.h Changed

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

_service:download_url:qt-dab-2.5.tar.gz/includes/support/fft-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/fft-handler.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/support/ringbuffer.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/ringbuffer.h Changed

@@ -65,26 +65,37 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-
 #ifndef __RINGBUFFER__
 #define	__RINGBUFFER__
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<string.h>
-#include	<stdint.h>
+#include	<cstdlib>
+#include	<cstdio>
+#include	<cstring>
+#include	<cstdint>
 /*
 *	a simple ringbuffer, lockfree, however only for a
 *	single reader and a single writer.
 *	Mostly used for getting samples from or to the soundcard
 */
-#if defined(__APPLE__)
-# include <libkern/OSAtomic.h>
- /* Here are the memory barrier functions. Mac OS X only provides
+#ifdef __APPLE__
+#include <libkern/OSAtomic.h>
+#ifdef OSATOMIC_DEPRECATED
+#include <atomic>
+#endif
+#
+ /* Mac OS X only provides
 full memory barriers, so the three types of barriers are the same,
 however, these barriers are superior to compiler-based ones. */
-# define PaUtil_FullMemoryBarrier() OSMemoryBarrier()
-# define PaUtil_ReadMemoryBarrier() OSMemoryBarrier()
-# define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
+
+inline void Apple_MemoryBarrier() {
+#ifdef OSATOMIC_DEPRECATED
+ std::atomic_thread_fence(std::memory_order_seq_cst);
+#else
+ OSMemoryBarrier();
+#endif 
+}
+# define PaUtil_FullMemoryBarrier() Apple_MemoryBarrier()
+# define PaUtil_ReadMemoryBarrier() Apple_MemoryBarrier()
+# define PaUtil_WriteMemoryBarrier() Apple_MemoryBarrier()
 #elif defined(__GNUC__)
 /* GCC >= 4.1 has built-in intrinsics. We'll use those */
 # if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
@@ -146,7 +157,7 @@
 	bigMask		= (elementCount * 2) - 1;
 }
 
-	~RingBuffer () {
+ ~RingBuffer() {
 	 delete[]	 buffer;
 }
 
@@ -154,23 +165,23 @@
 * 	functions for checking available data for reading and space
 * 	for writing
 */
-int32_t	GetRingBufferReadAvailable (void) {
+int32_t	GetRingBufferReadAvailable() {
 	return (writeIndex - readIndex) & bigMask;
 }
 
-int32_t	ReadSpace	(void){
-	return GetRingBufferReadAvailable ();
+int32_t	ReadSpace(){
+ return GetRingBufferReadAvailable();
 }
 
-int32_t	GetRingBufferWriteAvailable (void) {
-	return bufferSize - GetRingBufferReadAvailable ();
+int32_t	GetRingBufferWriteAvailable() {
+ return bufferSize - GetRingBufferReadAvailable();
 }
 
-int32_t	WriteSpace	(void) {
-	return GetRingBufferWriteAvailable ();
+int32_t	WriteSpace() {
+ return GetRingBufferWriteAvailable();
 }
 
-void	FlushRingBuffer () {
+void	FlushRingBuffer() {
 	writeIndex	= 0;
 	readIndex	= 0;
 }
@@ -201,7 +212,7 @@
 void **dataPtr1, int32_t *sizePtr1,
 void **dataPtr2, int32_t *sizePtr2 ) {
 uint32_t index;
-uint32_t available = GetRingBufferWriteAvailable ();
+uint32_t available = GetRingBufferWriteAvailable();
 
 	if (elementCount > available)
 	 elementCount = available;
@@ -219,7 +230,7 @@
 	else {		// fits
 	 *dataPtr1	= &buffer [index * sizeof(elementtype)];
 	 *sizePtr1	= elementCount;
-	 *dataPtr2	= NULL;
+	 *dataPtr2	= nullptr;
 	 *sizePtr2	= 0;
 	}
 
@@ -239,7 +250,7 @@
 	 void **dataPtr1, int32_t *sizePtr1,
 	 void **dataPtr2, int32_t *sizePtr2) {
 uint32_t index;
-uint32_t available = GetRingBufferReadAvailable (); /* doesn't use memory barrier */
+uint32_t available = GetRingBufferReadAvailable(); /* doesn't use memory barrier */
 
 	if (elementCount > available)
 	 elementCount = available;
@@ -257,7 +268,7 @@
 	else {
 	 *dataPtr1 = &buffer [index * sizeof(elementtype)];
 	 *sizePtr1 = elementCount;
-	 *dataPtr2 = NULL;
+	 *dataPtr2 = nullptr;
 	 *sizePtr2 = 0;
 	}
 
@@ -309,9 +320,9 @@
 
 int32_t	skipDataInBuffer (uint32_t n_values) {
 //	ensure that we have the correct read and write indices
-	PaUtil_FullMemoryBarrier ();
-	if (n_values > GetRingBufferReadAvailable ())
-	 n_values = GetRingBufferReadAvailable ();
+ PaUtil_FullMemoryBarrier();
+ if (n_values > GetRingBufferReadAvailable())
+ n_values = GetRingBufferReadAvailable();
 	AdvanceRingBufferReadIndex (n_values);
 	return n_values;
 }

_service:download_url:qt-dab-2.5.tar.gz/includes/support/text-mapper.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/text-mapper.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/support/viterbi-jan/viterbi-handler.h -> _service:download_url:qt-dab-2.7.1.tar.gz/includes/support/viterbi-jan/viterbi-handler.h Changed

_service:download_url:qt-dab-2.7.1.tar.gz/interfacing.txt Added

@@ -0,0 +1,164 @@
+
+-----------------------------------------------------------------------
+How to add a new device
+-----------------------------------------------------------------------
+
+While perhaps not so interesting for most users, one with interest
+in programming and in possession of yet another device might wonder
+whether or not it is difficult to add such a device to the list
+of supported devices.
+
+In this txt an overview is given of what steps to take
+when adding a device to the list of supported devices.
+
+
+-----------------------------------------------------------------------
+The interface
+-----------------------------------------------------------------------
+
+The qt-dab software assumes a device to support the interface to
+the device implemented as a class derived from the 
+class "virtualInput"
+
+class	virtualInput: public QObject {
+public:
+			virtualInput 	(void);
+virtual			~virtualInput 	(void);
+virtual		void	setVFOFrequency	(int32_t);
+virtual		int32_t	getVFOFrequency	(void);
+virtual		int32_t	defaultFrequency(void);
+virtual		bool	restartReader	(void);
+virtual		void	stopReader	(void);
+virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
+virtual		int32_t	Samples		(void);
+virtual		void	resetBuffer	(void);
+virtual		int16_t	bitDepth	(void) { return 10;}
+};
+
+The constructor of the class for the new device driver
+is supposed to throw an exception when the device cannot be handled.
+
+The functions setVFOFrequency and getVFOFrequency are pretty obvious,
+just set the VFO of the device to a frequency (specified in Hz) and
+get the current value.
+
+defaultFrequency may just return a frequency with the range of valid
+frequencies for the device.
+
+the function restartReader is supposed to start or restart the generation of 
+samples from the device. Note that while not specified explicitly
+the assumed samplerate is 2048000, with a bandwidth of 1536000 Hz.
+
+the function stopReader will do the opposite,
+it will stop the generation of the samplestream.
+
+The airspy is one of the devices where the samplerate cannot be set
+to 2048000, so in that driver the software takes care of translating the
+samplerate to 2048000.
+
+The function Samples will tell the amount of samples currently available, the qt-software
+will use that function to check whether or not sufficient samples are
+available to continue processing. 
+getSamples will try to extract the specified amount of samples - I/Q samples
+as complex float numbers - from the buffer from the device driver.
+It will return the amount actually read, in case the buffer in the
+device driver contains less than the requested amount, it will not wait.
+
+The function resetBuffer will clear the buffer in the device driver, it is
+used when switching channels.
+
+The function bitdepth returns - as the name suggests - the number of bits
+in the (elements of the) sample. E.g dabsticks provide 8 bits, SDRplay 12.
+The value is used to scale the scopes.
+
+The device driver might have a small GUI, with probably a slider or spinbox
+for gain, and maybe other settings. See one of the existing device drivers
+for examples.
+
+--------------------------------------------------------------------------
+Modifications to the file radio.cpp
+--------------------------------------------------------------------------
+
+The file radio.cpp needs to be "informed" about the new device.
+Let us assume the device driver for the new device is implemented
+in a class newDevice, implemented in files new-device.h and new-device.cpp.
+
+step 1.
+In the list of includes add
+#ifdef	__HAVE_NEWDEVICE__
+#include	"new-device.h"
+#endif
+
+
+step 2.
+The selectable devices are listed in a combobox on the main GUI. 
+Add the lines
+
+#ifdef	__HAVE_NEWDEVICE__
+	deviceSelector	-> addItem ("newDevice");
+#endif
+
+around line 300.
+
+step 3
+Of course, when selection of the device is possible, the device driver
+needs to be part of the configuration.
+
+To handle that properly, add in the function setDevice (app line 1022)
+the following lines
+
+#ifdef	__HAVE_NEWDEVICE__
+	if (s == "newDevice") {
+	 try {
+ inputDevice = new newDevice (..parameters..);
+ showButtons ();
+ }
+ catch (int e) {
+ QMessageBox::warning (this, tr ("Warning"),
+ tr ("newDevice not found\n"));
+ return nullptr;
+ }
+ }
+ else
+#endif
+
+where the appropriate parameters are passed on to the constructor.
+
+
+That is it, however ...
+
+--------------------------------------------------------------------
+Modifying the qt-dab.pro file
+---------------------------------------------------------------------
+
+To generate an executable, the qt-dab.pro file (or the CMakeLists.txt file)
+needs to be informed on the modified configuration
+
+step 1.
+
+add - around line 273 in the qt-dab file - the line
+
+CONFIG	+= newDevice
+
+step 2.
+
+add - somewhere in the qt-dab.pro file - the section describing the
+files needed for handling the new device.
+Assuming you created a directory "new-device" in the directory "devices",
+and assuming the GUI file is desscribed in the xml file newdevice-widget.ui,
+the paragraph would look like
+
+newDevice {
+ DEFINES += HAVE_NEWDEVICE
+ INCLUDEPATH += ./devices/new-device
+ HEADERS += ./devices/new-device/new-device.h \
+	 .. add further includes to development files
+ SOURCES += ./devices/new-device/new-device.cpp 
+ FORMS += ./devices/new-device/newdevice-widget.ui
+ LIBS += .. add here libraries to be included
+}
+
+
+Modifications for the CMakeLists.txt are left as an exercise.
+
+

_service:download_url:qt-dab-2.5.tar.gz/main.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/main.cpp Changed

@@ -58,7 +58,7 @@
 	qDebug() << fileName;
 #else
 
-	fileName = QDir::homePath ();
+	fileName = QDir::homePath();
 	fileName. append ("/");
 	fileName. append (v);
 	fileName = QDir::toNativeSeparators (fileName);
@@ -76,7 +76,6 @@
 RadioInterface *MyRadioInterface;
 
 // Default values
-int16_t tii_delay = 20;
 QSettings *dabSettings; // ini file
 int32_t		dataPort	= 8888;
 int opt;
@@ -107,9 +106,13 @@
 * Before we connect control to the gui, we have to
 * instantiate
 */
+#if QT_VERSION >= 0x050600
+ QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
+#endif
+
 	QApplication a (argc, argv);
 //	setting the language
-	QString locale = QLocale::system (). name ();
+	QString locale = QLocale::system(). name();
 	qDebug() << "main:" << "Detected system language" << locale;
 	setTranslator (locale);
 
@@ -118,12 +121,8 @@
 	MyRadioInterface = new RadioInterface (dabSettings,
 	 dataPort
 );
-
-#if QT_VERSION >= 0x050600
-	QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
-#endif
-	MyRadioInterface -> show ();
- a. exec ();
+	MyRadioInterface -> show();
+ a. exec();
 /*
 * done:
 */

_service:download_url:qt-dab-2.7.1.tar.gz/note-for-appimage-on-rpi Added

_service:download_url:qt-dab-2.5.tar.gz/qt-dab-1.png -> _service:download_url:qt-dab-2.7.1.tar.gz/qt-dab-1.png Changed

_service:download_url:qt-dab-2.5.tar.gz/qt-dab-2.png -> _service:download_url:qt-dab-2.7.1.tar.gz/qt-dab-2.png Changed

_service:download_url:qt-dab-2.5.tar.gz/qt-dab-installer.iss -> _service:download_url:qt-dab-2.7.1.tar.gz/qt-dab-installer.iss Changed

@@ -2,10 +2,10 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "qt-dab"
-#define MyAppVersion "2.0.1"
+#define MyAppVersion "2.7"
 #define MyAppPublisher "Lazy Chair Computing"
 #define MyAppURL "https://github.com/JvanKatwijk/qt-dab"
-#define MyAppExeName "qt-dab-2.1.exe";
+#define MyAppExeName "qt-dab-2.7.exe";
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -21,8 +21,8 @@
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=E:\sdr-j-development\windows-qt-dab\COPYRIGHT.this_software
-InfoBeforeFile=E:\sdr-j-development\windows-qt-dab\preamble.txt
+LicenseFile=C:\Users\JvanK\windows-qt-dab\COPYRIGHT.this_software
+InfoBeforeFile=C:\Users\JvanK\windows-qt-dab\preamble.txt
 OutputBaseFilename=setup-qt-dab
 Compression=lzma
 SolidCompression=yes
@@ -34,9 +34,9 @@
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "E:\sdr-j-development\windows-qt-dab\qt-dab-2.1.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "E:\sdr-j-development\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "E:\sdr-j-development\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
+Source: "C:\Users\JvanK\windows-qt-dab\qt-dab-2.7.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\JvanK\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\JvanK\Downloads\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
 
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"

_service:download_url:qt-dab-2.5.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-2.7.1.tar.gz/qt-dab.pro Changed

@@ -5,12 +5,12 @@
 ######################################################################
 
 TEMPLATE	= app
-TARGET		= qt-dab-2.5
+TARGET		= qt-dab-2.7.1
 QT		+= widgets 
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
-QMAKE_CFLAGS	+=  -O3 -ffast-math
-QMAKE_CXXFLAGS	+=  -O3 -ffast-math
+QMAKE_CFLAGS	+=  -flto -ffast-math
+MAKE_CXXFLAGS	+=  -flto -ffast-math
 #QMAKE_CFLAGS	+=  -g
 #QMAKE_CXXFLAGS	+=  -g
 #QMAKE_LFLAGS	+=  -g
@@ -268,6 +268,8 @@
 CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
+#CONFIG		+= soapy
+CONFIG		+= lime
 #CONFIG		+= elad_s1	# does not work yet
 
 #very experimental, simple server for connecting to a tdc handler
@@ -348,7 +350,7 @@
 CONFIG		+= dabstick
 CONFIG		+= sdrplay
 CONFIG		+= hackrf
-
+CONFIG		+= lime
 #CONFIG		+= NO_SSE
 
 #very experimental, simple server for connecting to a tdc handler
@@ -448,6 +450,29 @@
 	FORMS		+= ./devices/rtl_tcp/rtl_tcp-widget.ui
 }
 
+soapy {
+	DEFINES		+= HAVE_SOAPY
+	INCLUDEPATH     += ./devices/soapy
+        HEADERS         += ./devices/soapy/soapy-handler.h \
+	                   ./devices/soapy/soapy-worker.h \
+	                   ./devices/soapy/soapy_CS16.h \
+	                   ./devices/soapy/soapy_CF32.h
+        SOURCES         += ./devices/soapy/soapy-handler.cpp \
+	                   ./devices/soapy/soapy-worker.cpp \
+	                   ./devices/soapy/soapy_CS16.cpp \
+	                   ./devices/soapy/soapy_CF32.cpp
+        FORMS           += ./devices/soapy/soapy-widget.ui
+	LIBS		+= -lSoapySDR -lm
+}
+
+lime  {
+	DEFINES		+= HAVE_LIME
+	INCLUDEPATH	+= ./devices/lime-handler
+        HEADERS         += ./devices/lime-handler/lime-handler.h 
+        SOURCES         += ./devices/lime-handler/lime-handler.cpp 
+        FORMS           += ./devices/lime-handler/lime-widget.ui
+}
+	
 send_datagram {
 	DEFINES		+= _SEND_DATAGRAM_
 	QT		+= network

_service:download_url:qt-dab-2.7.1.tar.gz/qt-dab.pro.user Added

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+
+<qtcreator>
+ <data>
+ <variable>EnvironmentId</variable>
+ <value type="QByteArray">{2982e5e0-9ddc-4b17-b1f4-a42e7cf1a22e}</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
+ <value type="int">0</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.EditorSettings</variable>
+ <valuemap type="QVariantMap">
+ <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+ <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+ <value type="QString" key="language">Cpp</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+ </valuemap>
+ </valuemap>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+ <value type="QString" key="language">QmlJS</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+ </valuemap>
+ </valuemap>
+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+ <value type="int" key="EditorConfiguration.IndentSize">4</value>
+ <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+ <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+ <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+ <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+ <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+ <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+ <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+ <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+ <value type="int" key="EditorConfiguration.TabSize">8</value>
+ <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+ <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.PluginSettings</variable>
+ <valuemap type="QVariantMap">
+ <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
+ <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.12.4 (System)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.12.4 (System)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{c8881a93-bfc8-4041-92de-a73fb56f691c}</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/usr/shared/sdr-j-development/systems/qt-dab</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+ <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+ <value type="QString">cpu-cycles</value>
+ </valuelist>
+ <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+ <value type="int" key="Analyzer.Perf.Frequency">250</value>
+ <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+ <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+ <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+ <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+ <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+ <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+ <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+ <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+ <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+ <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qt-dab</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/usr/shared/sdr-j-development/systems/qt-dab/qt-dab.pro</value>
+ <value type="QString" key="RunConfiguration.Arguments"></value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>

_service:download_url:qt-dab-2.5.tar.gz/radio.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/radio.cpp Changed

@@ -73,12 +73,18 @@
 #ifdef	HAVE_HACKRF
 #include	"hackrf-handler.h"
 #endif
+#ifdef	HAVE_SOAPY
+#include	"soapy-handler.h"
+#endif
+#ifdef	HAVE_LIME
+#include	"lime-handler.h"
+#endif
 #include	"ui_technical_data.h"
 #include	"spectrum-viewer.h"
 #include	"impulse-viewer.h"
 #include	"tii-viewer.h"
 
-std::vector<size_t> get_cpu_times (void) {
+std::vector<size_t> get_cpu_times() {
 	std::ifstream proc_stat ("/proc/stat");
 	proc_stat. ignore (5, ' '); // Skip the 'cpu' prefix.
 	std::vector<size_t> times;
@@ -87,11 +93,11 @@
 }
 
 bool get_cpu_times (size_t &idle_time, size_t &total_time) {
-	const std::vector <size_t> cpu_times = get_cpu_times ();
-	if (cpu_times. size () < 4)
+	const std::vector <size_t> cpu_times = get_cpu_times();
+	if (cpu_times. size() < 4)
 return false;
 	idle_time = cpu_times [3];
-	total_time = std::accumulate (cpu_times. begin (), cpu_times. end (), 0);
+	total_time = std::accumulate (cpu_times. begin(), cpu_times. end(), 0);
 	return true;
 }
 /**
@@ -126,38 +132,38 @@
 *	3 is a reasonable value
 */
 	threshold	=
-	 dabSettings -> value ("threshold", 3). toInt ();
+	 dabSettings -> value ("threshold", 3). toInt();
 //
 //	latency is used to allow different settings for different
 //	situations wrt the output buffering. For windows and the RPI
 //	this need to be a pretty large value (e.g. 5 to 10)
 	latency		=
-	 dabSettings -> value ("latency", 5). toInt ();
+	 dabSettings -> value ("latency", 5). toInt();
 
 	diff_length	=
-	 dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt ();
+	 dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt();
 
 	tii_delay	=
-	 dabSettings	-> value ("tii_delay", 5). toInt ();
+	 dabSettings	-> value ("tii_delay", 5). toInt();
 	if (tii_delay < 5)
 	 tii_delay = 5;
 
 	dataBuffer		= new RingBuffer<uint8_t>(32768);
 ///	The default, most likely to be overruled
 #ifdef	_SEND_DATAGRAM_
-	ipAddress		= dabSettings -> value ("ipAddress", "127.0.0.1"). toString ();
-	port			= dabSettings -> value ("port", 8888). toInt ();
+	ipAddress		= dabSettings -> value ("ipAddress", "127.0.0.1"). toString();
+	port			= dabSettings -> value ("port", 8888). toInt();
 #endif
 //
-	has_presetName		= dabSettings -> value ("has-presetName", 1). toInt () != 0;
+	has_presetName		= dabSettings -> value ("has-presetName", 1). toInt() != 0;
 	if (has_presetName) 
-	 presetName		= dabSettings -> value ("presetname", ""). toString ();
+	 presetName		= dabSettings -> value ("presetname", ""). toString();
 	currentName		= QString ("");
 
-	saveSlides	= dabSettings -> value ("saveSlides", 1). toInt ();
-	showSlides	= dabSettings -> value ("showPictures", 1). toInt ();
+	saveSlides	= dabSettings -> value ("saveSlides", 1). toInt();
+	showSlides	= dabSettings -> value ("showPictures", 1). toInt();
 	if (saveSlides != 0)
-	 set_picturePath ();
+	 set_picturePath();
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -166,10 +172,10 @@
 //
 	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (dataDisplay);
-	dataDisplay		-> hide ();
+	dataDisplay		-> hide();
 #ifdef	__MINGW32__
-	techData. cpuLabel	-> hide ();
-	techData. cpuMonitor	-> hide ();
+	techData. cpuLabel	-> hide();
+	techData. cpuMonitor	-> hide();
 #endif
 //
 #ifdef	DATA_STREAMER
@@ -179,19 +185,19 @@
 #endif
 
 //	Where do we leave the audio out?
-	streamoutSelector	-> hide ();
+	streamoutSelector	-> hide();
 #ifdef	TCP_STREAMER
 	soundOut		= new tcpStreamer	(20040);
 #elif	QT_AUDIO
-	soundOut		= new Qt_Audio ();
+	soundOut		= new Qt_Audio();
 #else
 // just sound out
 	soundOut		= new audioSink		(latency);
 
 	((audioSink *)soundOut)	-> setupChannels (streamoutSelector);
-	streamoutSelector	-> show ();
+	streamoutSelector	-> show();
 	bool err;
-	h	= dabSettings -> value ("soundchannel", "default"). toString ();
+	h	= dabSettings -> value ("soundchannel", "default"). toString();
 	k	= streamoutSelector -> findText (h);
 	if (k != -1) {
 	 streamoutSelector -> setCurrentIndex (k);
@@ -199,7 +205,7 @@
 	}
 
 	if ((k == -1) || err)
-	 ((audioSink *)soundOut)	-> selectDefaultDevice ();
+	 ((audioSink *)soundOut)	-> selectDefaultDevice();
 #endif
 //
 	my_spectrumViewer	= new spectrumViewer (this, dabSettings,
@@ -213,29 +219,25 @@
 //
 //	restore some settings from previous incarnations
 	QString t =
- dabSettings -> value ("dabBand", "VHF Band III"). toString ();
- k = bandSelector -> findText (t);
- if (k != -1)
- bandSelector -> setCurrentIndex (k);
- dabBand = bandSelector -> currentText () == "VHF Band III" ?
- BAND_III : L_BAND;
+ dabSettings -> value ("dabBand", "VHF Band III"). toString();
+ dabBand = t == "VHF Band III" ? BAND_III : L_BAND;
 
 theBand. setupChannels (channelSelector, dabBand);
 
- dabMode = dabSettings -> value ("dabMode", "Mode 1"). toString ();
+ dabMode = dabSettings -> value ("dabMode", "Mode 1"). toString();
 //
-	QPalette p	= techData. ficError_display -> palette ();
+	QPalette p	= techData. ficError_display -> palette();
 	p. setColor (QPalette::Highlight, Qt::green);
 	techData. ficError_display	-> setPalette (p);
 	techData. frameError_display	-> setPalette (p);
 	techData. rsError_display	-> setPalette (p);
 	techData. aacError_display	-> setPalette (p);
-	techData. rsError_display	-> hide ();
-	techData. aacError_display	-> hide ();
+	techData. rsError_display	-> hide();
+	techData. aacError_display	-> hide();
 	techData. motAvailable		-> 
 setStyleSheet ("QLabel {background-color : red}");
-	techData. fmLabel		-> hide ();
-	techData. fmFrequency		-> hide ();
+	techData. fmLabel		-> hide();
+	techData. fmFrequency		-> hide();
 //
 //
 	sourceDumping		= false;
@@ -294,28 +296,35 @@
 #ifdef	HAVE_HACKRF
 	deviceSelector	-> addItem ("hackrf");
 #endif
+#ifdef	HAVE_SOAPY
+	deviceSelector	-> addItem ("soapy");
+#endif
+#ifdef	HAVE_LIME
+	deviceSelector	-> addItem ("limeSDR");
+#endif
 #ifdef HAVE_EXTIO
 	deviceSelector	-> addItem ("extio");
 #endif
 #ifdef	HAVE_RTL_TCP
 	deviceSelector	-> addItem ("rtl_tcp");
 #endif
-	
+
+	ensembleAvailable	= false;
 	inputDevice	= nullptr;
 	h =
- dabSettings -> value ("device", "no device"). toString ();
+ dabSettings -> value ("device", "no device"). toString();
 	k = deviceSelector -> findText (h);
-//	fprintf (stderr, "%d %s\n", k, h. toUtf8 (). data ());
+//	fprintf (stderr, "%d %s\n", k, h. toUtf8(). data());
 if (k != -1) {
 deviceSelector -> setCurrentIndex (k);
- inputDevice	= setDevice (deviceSelector -> currentText ());
+ inputDevice	= setDevice (deviceSelector -> currentText());

_service:download_url:qt-dab-2.5.tar.gz/radio.h -> _service:download_url:qt-dab-2.7.1.tar.gz/radio.h Changed

@@ -57,14 +57,13 @@
 *	GThe main gui object. It inherits from
 *	QDialog and the generated form
 */
-class RadioInterface: public QMainWindow,
-		 private Ui_dabradio {
+class RadioInterface: public QMainWindow, private Ui_dabradio {
 Q_OBJECT
 public:
 		RadioInterface		(QSettings	*,
 	 int32_t	 dataPort,
-	 QWidget	*parent = NULL);
-		~RadioInterface		(void);
+	 QWidget	*parent = nullptr);
+		~RadioInterface();
 
 protected:
 	bool	eventFilter (QObject *obj, QEvent *event);
@@ -72,21 +71,22 @@
 	QSettings	*dabSettings;
 	int16_t		tii_delay;
 	int32_t dataPort;
+	bool		ensembleAvailable;
 	QString deviceName;
 	Ui_technical_data	techData;
 	QFrame		*dataDisplay;
 	bool		show_data;
 	serviceDescriptor	*currentService;
-	void		clear_showElements	(void);
-	void		set_picturePath		(void);
+	void		clear_showElements();
+	void		set_picturePath();
 //const	char		*get_programm_type_string (int16_t);
 //const	char		*get_programm_language_string (int16_t);
 	void		dumpControlState	(QSettings *);
-	void		Yes_Signal_Found	(void);
-	void		Increment_Channel	(void);
+	void		Yes_Signal_Found();
+	void		Increment_Channel();
 	uint8_t		convert			(QString);
-	void		hideButtons		(void);
-	void		showButtons		(void);
+	void		hideButtons();
+	void		showButtons();
 	virtualInput	*setDevice		(QString);
 
 	std::vector<int> secondariesVector;
@@ -118,8 +118,8 @@
 	int32_t		port;
 #endif
 
-	void		start_sourceDumping	(void);
-	void		stop_sourceDumping	(void);
+	void		start_sourceDumping();
+	void		stop_sourceDumping();
 	bool		sourceDumping;
 	SNDFILE		*dumpfilePointer;
 	bool		audioDumping;
@@ -138,8 +138,8 @@
 	int32_t		numberofSeconds;
 	int16_t		ficBlocks;
 	int16_t		ficSuccess;
-	void		connectGUI		(void);
-	void		disconnectGUI		(void);
+	void		connectGUI();
+	void		disconnectGUI();
 spectrumViewer *my_spectrumViewer;
 	RingBuffer<std::complex<float>> *spectrumBuffer;
 	RingBuffer<std::complex<float>> *iqBuffer;
@@ -150,9 +150,9 @@
 
 	QString		picturesPath;
 public slots:
-	void		set_Scanning		(void);
+	void		set_Scanning();
 	void		set_CorrectorDisplay	(int);
-	void		clearEnsemble		(void);
+	void		clearEnsemble();
 	void		addtoEnsemble		(const QString &);
 	void		nameofEnsemble		(int, const QString &);
 	void		show_frameErrors	(int);
@@ -165,7 +165,7 @@
 	void		showMOT			(QByteArray, int, QString);
 	void		sendDatagram		(int);
 	void		handle_tdcdata		(int, int);
-	void		changeinConfiguration	(void);
+	void		changeinConfiguration();
 	void		newAudio		(int, int);
 //
 	void		show_techData		(QString,
@@ -175,9 +175,9 @@
 
 	void		setStereo		(bool);
 	void		set_streamSelector	(int);
-	void		No_Signal_Found		(void);
+	void		No_Signal_Found();
 	void		show_motHandling	(bool);
-	void		setSyncLost		(void);
+	void		setSyncLost();
 	void		showCoordinates		(int);
 	void		showSecondaries		(int);
 	void		showImpulse		(int);
@@ -188,31 +188,31 @@
 	void		show_tii		(int);
 	void		closeEvent		(QCloseEvent *event);
 	void		showTime		(const QString &);
-
+	void		startAnnouncement	(const QString &, int);
+	void		stopAnnouncement	(const QString &, int);
 //	Somehow, these must be connected to the GUI
 private slots:
-	void		set_nextChannel		(void);
-	void		toggle_show_data	(void);
+	void		set_nextChannel();
+	void		toggle_show_data();
 	void		doStart			(QString);
-	void		doStart			(void);
-	void		TerminateProcess	(void);
+	void		doStart();
+	void		TerminateProcess();
 	void		selectChannel		(QString);
-	void		updateTimeDisplay	(void);
-	void		signalTimer_out		(void);
-	void		autoCorrector_on	(void);
+	void		updateTimeDisplay();
+	void		signalTimer_out();
+	void		autoCorrector_on();
 
 	void		newDevice		(QString);
-	void		set_bandSelect		(QString s);
 
 	void		selectService		(QModelIndex);
 	void		selectService		(QString);
-	void		set_audioDump		(void);
-	void		set_sourceDump		(void);
-	void		showEnsembleData	(void);
-	void		setPresetStation	(void);
-	void		set_tiiSwitch		(void);
-	void		set_irSwitch		(void);
-	void		set_spectrumSwitch	(void);
+	void		set_audioDump();
+	void		set_sourceDump();
+	void		showEnsembleData();
+	void		setPresetStation();
+	void		set_tiiSwitch();
+	void		set_irSwitch();
+	void		set_spectrumSwitch();
 };
 #endif

_service:download_url:qt-dab-2.5.tar.gz/server-thread/tcp-server.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/server-thread/tcp-server.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/service-description/audio-descriptor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/service-description/audio-descriptor.cpp Changed

@@ -4,12 +4,12 @@
 
 
 	audioDescriptor::audioDescriptor (audiodata *ad):
-	                                       myFrame (NULL) {
+	                                       myFrame (nullptr) {
         setupUi (&myFrame);
-        myFrame. show ();
+        myFrame. show();
 	serviceLabel    -> setText
-                      (QString ().number (ad -> serviceId, 16). toUpper ());
-        QFont font      = serviceLabel -> font ();
+                      (QString().number (ad -> serviceId, 16). toUpper());
+        QFont font      = serviceLabel -> font();
         font. setBold (true);
         serviceLabel    -> setFont (font);
 
@@ -27,17 +27,17 @@
 	   setText (the_textMapper.
 	               get_programm_type_string (ad -> programType));
 	if (ad -> fmFrequency == -1) {
-	   fmLabel	-> hide ();
-	   fmFrequency	-> hide ();
+	   fmLabel	-> hide();
+	   fmFrequency	-> hide();
 	}
 	else {
-	   fmLabel	-> show ();
+	   fmLabel	-> show();
 	   QString f	= QString::number (ad -> fmFrequency);
 	   f. append (" Khz");
 	   fmFrequency	-> setText (f);
 	}
 }
 
-	audioDescriptor::~audioDescriptor (void) {
+	audioDescriptor::~audioDescriptor() {
 }

_service:download_url:qt-dab-2.5.tar.gz/service-description/audio-descriptor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/service-description/audio-descriptor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/service-description/data-descriptor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/service-description/data-descriptor.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/service-description/data-descriptor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/service-description/data-descriptor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/service-description/service-descriptor.h -> _service:download_url:qt-dab-2.7.1.tar.gz/service-description/service-descriptor.h Changed

_service:download_url:qt-dab-2.5.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

@@ -40,22 +40,22 @@
 	this	-> spectrumBuffer	= sbuffer;
 	this	-> iqBuffer		= ibuffer;
 
-	colorString			= dabSettings -> value ("displaycolor", "black"). toString ();
+	colorString			= dabSettings -> value ("displaycolor", "black"). toString();
 	displayColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor", "white"). toString ();
+	colorString			= dabSettings -> value ("gridcolor", "white"). toString();
 	gridColor			= QColor (colorString);
-	colorString			= dabSettings -> value ("gridcolor", "white"). toString ();
+	colorString			= dabSettings -> value ("gridcolor", "white"). toString();
 	curveColor			= QColor (colorString);
 
-	displaySize			= dabSettings -> value ("displaySize", 1024).toInt ();
+	displaySize			= dabSettings -> value ("displaySize", 1024).toInt();
 	if ((displaySize & (displaySize - 1)) != 0)
 	 displaySize = 1024;
-	this	-> myFrame		= new QFrame (NULL);
+	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
 
-	this	-> myFrame	-> hide ();
+	this	-> myFrame	-> hide();
 	displayBuffer. resize (displaySize);
-	memset (displayBuffer. data (), 0, displaySize * sizeof (double));
+	memset (displayBuffer. data(), 0, displaySize * sizeof (double));
 	this	-> spectrumSize	= 4 * displaySize;
 	spectrum		= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
 plan = fftwf_plan_dft_1d (spectrumSize,
@@ -89,7 +89,7 @@
 	spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);
 	
-	Marker		= new QwtPlotMarker ();
+	Marker		= new QwtPlotMarker();
 	Marker		-> setLineStyle (QwtPlotMarker::VLine);
 	Marker		-> setLinePen (QPen (Qt::red));
 	Marker		-> attach (plotgrid);
@@ -105,10 +105,10 @@
 	myIQDisplay	= new IQDisplay (iqDisplay, 256);
 }
 
-	spectrumViewer::~spectrumViewer	(void) {
+	spectrumViewer::~spectrumViewer() {
 	fftwf_destroy_plan (plan);
 	fftwf_free	(spectrum);
-	myFrame		-> hide ();
+	myFrame		-> hide();
 	delete		Marker;
 	delete		ourBrush;
 	delete		spectrumCurve;
@@ -125,13 +125,13 @@
 
 	 
 	(void)amount;
-	if (spectrumBuffer -> GetRingBufferReadAvailable () < spectrumSize)
+	if (spectrumBuffer -> GetRingBufferReadAvailable() < spectrumSize)
 	 return;
 
 	spectrumBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
-	spectrumBuffer	-> FlushRingBuffer ();
-	if (myFrame	-> isHidden ()) {
-	 spectrumBuffer	-> FlushRingBuffer ();
+	spectrumBuffer	-> FlushRingBuffer();
+	if (myFrame	-> isHidden()) {
+	 spectrumBuffer	-> FlushRingBuffer();
 	 return;
 	}
 
@@ -173,9 +173,9 @@
 	}
 
 	memcpy (Y_values,
-	 displayBuffer. data (), displaySize * sizeof (double));
+	 displayBuffer. data(), displaySize * sizeof (double));
 	ViewSpectrum (X_axis, Y_values,
-	 scopeAmplification -> value (),
+	 scopeAmplification -> value(),
 	 vfoFrequency / 1000);
 }
 
@@ -221,16 +221,16 @@
 	 normalizer <<= 1;
 }
 
-void	spectrumViewer::show		(void) {
-	myFrame	-> show ();
+void	spectrumViewer::show() {
+	myFrame	-> show();
 }
 
-void	spectrumViewer::hide		(void) {
-	myFrame	-> hide ();
+void	spectrumViewer::hide() {
+	myFrame	-> hide();
 }
 
-bool	spectrumViewer::isHidden	(void) {
-	return myFrame -> isHidden ();
+bool	spectrumViewer::isHidden() {
+	return myFrame -> isHidden();
 }
 
 void	spectrumViewer::showIQ	(int amount) {
@@ -238,10 +238,10 @@
 int16_t	i;
 int16_t	t;
 double	avg	= 0;
-int	scopeWidth	= scopeSlider -> value ();
+int	scopeWidth	= scopeSlider -> value();
 
 	t = iqBuffer -> getDataFromBuffer (Values, amount);
-	if (myFrame -> isHidden ())
+	if (myFrame -> isHidden())
 	 return;
 
 	for (i = 0; i < t; i ++) {
@@ -255,7 +255,7 @@
 }
 
 void	spectrumViewer:: showQuality (float q) {
-	if (!myFrame -> isHidden ())
+	if (!myFrame -> isHidden())
 	 quality_display -> display (q);
 }

_service:download_url:qt-dab-2.5.tar.gz/spectrum-viewer/spectrum-viewer.h -> _service:download_url:qt-dab-2.7.1.tar.gz/spectrum-viewer/spectrum-viewer.h Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/audio/faad-decoder.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/audio/faad-decoder.cpp Changed

@@ -26,8 +26,8 @@
 faadDecoder::faadDecoder (RadioInterface *mr,
 RingBuffer<int16_t> *buffer) {
 this -> audioBuffer = buffer;
- aacCap = NeAACDecGetCapabilities ();
- aacHandle = NeAACDecOpen ();
+ aacCap = NeAACDecGetCapabilities();
+ aacHandle = NeAACDecOpen();
 aacConf = NeAACDecGetCurrentConfiguration (aacHandle);
 aacInitialized = false;
 baudRate = 48000;
@@ -35,7 +35,7 @@
 mr, SLOT (newAudio (int, int)));
 }
 
- faadDecoder::~faadDecoder (void) {
+ faadDecoder::~faadDecoder() {
 NeAACDecClose (aacHandle);
 }
 
@@ -150,7 +150,7 @@
 
 if (channels == 2) {
 audioBuffer -> putDataIntoBuffer (outBuffer, samples);
-	 if (audioBuffer -> GetRingBufferReadAvailable () > sampleRate / 8)
+	 if (audioBuffer -> GetRingBufferReadAvailable() > (int)sampleRate / 8)
 newAudio (samples, sampleRate);
 }
 else
@@ -162,7 +162,7 @@
 buffer [2 * i + 1] = buffer [2 * i];
 }
 audioBuffer -> putDataIntoBuffer (buffer, samples);
-	 if (audioBuffer -> GetRingBufferReadAvailable () > sampleRate / 8)
+	 if (audioBuffer -> GetRingBufferReadAvailable() > (int)sampleRate / 8)
 newAudio (samples, sampleRate);
 }
 else

_service:download_url:qt-dab-2.5.tar.gz/src/backend/audio/mp2processor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/audio/mp2processor.cpp Changed

@@ -1,657 +1,660 @@
-/******************************************************************************
-** kjmp2 -- a minimal MPEG-1/2 Audio Layer II decoder library **
-** version 1.1 **
-*******************************************************************************
-** Copyright (C) 2006-2013 Martin J. Fiedler <martin.fiedler@gmx.net> **
-** **
-** This software is provided 'as-is', without any express or implied **
-** warranty. In no event will the authors be held liable for any damages **
-** arising from the use of this software. **
-** **
-** Permission is granted to anyone to use this software for any purpose, **
-** including commercial applications, and to alter it and redistribute it **
-** freely, subject to the following restrictions: **
-** 1. The origin of this software must not be misrepresented; you must not **
-** claim that you wrote the original software. If you use this software **
-** in a product, an acknowledgment in the product documentation would **
-** be appreciated but is not required. **
-** 2. Altered source versions must be plainly marked as such, and must not **
-** be misrepresented as being the original software. **
-** 3. This notice may not be removed or altered from any source **
-** distribution. **
-******************************************************************************/
-
-//
-//	Code adapted of the original code:
-//	- it is made into a class for use within the framework
-//	of the sdr-j DAB/DAB+ software
-//
-#include	"mp2processor.h"
-#include	"radio.h"
-#include	"pad-handler.h"
-
-#ifdef _MSC_VER
- #define FASTCALL __fastcall
-#else
- #define FASTCALL
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// TABLES AND CONSTANTS //
-////////////////////////////////////////////////////////////////////////////////
-
-// mode constants
-#define STEREO 0
-#define JOINT_STEREO 1
-#define DUAL_CHANNEL 2
-#define MONO 3
-
-// sample rate table
-static
-const unsigned short sample_rates[8] = {
- 44100, 48000, 32000, 0, // MPEG-1
- 22050, 24000, 16000, 0 // MPEG-2
-};
-
-// bitrate table
-static
-const short bitrates[28] = {
- 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, // MPEG-1
- 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160 // MPEG-2
-};
-
-// scale factor base values (24-bit fixed-point)
-static
-const int scf_base [3] = {0x02000000, 0x01965FEA, 0x01428A30};
-
-// synthesis window
-static
-const int D[512] = {
- 0x00000, 0x00000, 0x00000, 0x00000, 0x00000, 0x00000, 0x00000,-0x00001,
- -0x00001,-0x00001,-0x00001,-0x00002,-0x00002,-0x00003,-0x00003,-0x00004,
- -0x00004,-0x00005,-0x00006,-0x00006,-0x00007,-0x00008,-0x00009,-0x0000A,
- -0x0000C,-0x0000D,-0x0000F,-0x00010,-0x00012,-0x00014,-0x00017,-0x00019,
- -0x0001C,-0x0001E,-0x00022,-0x00025,-0x00028,-0x0002C,-0x00030,-0x00034,
- -0x00039,-0x0003E,-0x00043,-0x00048,-0x0004E,-0x00054,-0x0005A,-0x00060,
- -0x00067,-0x0006E,-0x00074,-0x0007C,-0x00083,-0x0008A,-0x00092,-0x00099,
- -0x000A0,-0x000A8,-0x000AF,-0x000B6,-0x000BD,-0x000C3,-0x000C9,-0x000CF,
- 0x000D5, 0x000DA, 0x000DE, 0x000E1, 0x000E3, 0x000E4, 0x000E4, 0x000E3,
- 0x000E0, 0x000DD, 0x000D7, 0x000D0, 0x000C8, 0x000BD, 0x000B1, 0x000A3,
- 0x00092, 0x0007F, 0x0006A, 0x00053, 0x00039, 0x0001D,-0x00001,-0x00023,
- -0x00047,-0x0006E,-0x00098,-0x000C4,-0x000F3,-0x00125,-0x0015A,-0x00190,
- -0x001CA,-0x00206,-0x00244,-0x00284,-0x002C6,-0x0030A,-0x0034F,-0x00396,
- -0x003DE,-0x00427,-0x00470,-0x004B9,-0x00502,-0x0054B,-0x00593,-0x005D9,
- -0x0061E,-0x00661,-0x006A1,-0x006DE,-0x00718,-0x0074D,-0x0077E,-0x007A9,
- -0x007D0,-0x007EF,-0x00808,-0x0081A,-0x00824,-0x00826,-0x0081F,-0x0080E,
- 0x007F5, 0x007D0, 0x007A0, 0x00765, 0x0071E, 0x006CB, 0x0066C, 0x005FF,
- 0x00586, 0x00500, 0x0046B, 0x003CA, 0x0031A, 0x0025D, 0x00192, 0x000B9,
- -0x0002C,-0x0011F,-0x00220,-0x0032D,-0x00446,-0x0056B,-0x0069B,-0x007D5,
- -0x00919,-0x00A66,-0x00BBB,-0x00D16,-0x00E78,-0x00FDE,-0x01148,-0x012B3,
- -0x01420,-0x0158C,-0x016F6,-0x0185C,-0x019BC,-0x01B16,-0x01C66,-0x01DAC,
- -0x01EE5,-0x02010,-0x0212A,-0x02232,-0x02325,-0x02402,-0x024C7,-0x02570,
- -0x025FE,-0x0266D,-0x026BB,-0x026E6,-0x026ED,-0x026CE,-0x02686,-0x02615,
- -0x02577,-0x024AC,-0x023B2,-0x02287,-0x0212B,-0x01F9B,-0x01DD7,-0x01BDD,
- 0x019AE, 0x01747, 0x014A8, 0x011D1, 0x00EC0, 0x00B77, 0x007F5, 0x0043A,
- 0x00046,-0x003E5,-0x00849,-0x00CE3,-0x011B4,-0x016B9,-0x01BF1,-0x0215B,
- -0x026F6,-0x02CBE,-0x032B3,-0x038D3,-0x03F1A,-0x04586,-0x04C15,-0x052C4,
- -0x05990,-0x06075,-0x06771,-0x06E80,-0x0759F,-0x07CCA,-0x083FE,-0x08B37,
- -0x09270,-0x099A7,-0x0A0D7,-0x0A7FD,-0x0AF14,-0x0B618,-0x0BD05,-0x0C3D8,
- -0x0CA8C,-0x0D11D,-0x0D789,-0x0DDC9,-0x0E3DC,-0x0E9BD,-0x0EF68,-0x0F4DB,
- -0x0FA12,-0x0FF09,-0x103BD,-0x1082C,-0x10C53,-0x1102E,-0x113BD,-0x116FB,
- -0x119E8,-0x11C82,-0x11EC6,-0x120B3,-0x12248,-0x12385,-0x12467,-0x124EF,
- 0x1251E, 0x124F0, 0x12468, 0x12386, 0x12249, 0x120B4, 0x11EC7, 0x11C83,
- 0x119E9, 0x116FC, 0x113BE, 0x1102F, 0x10C54, 0x1082D, 0x103BE, 0x0FF0A,
- 0x0FA13, 0x0F4DC, 0x0EF69, 0x0E9BE, 0x0E3DD, 0x0DDCA, 0x0D78A, 0x0D11E,
- 0x0CA8D, 0x0C3D9, 0x0BD06, 0x0B619, 0x0AF15, 0x0A7FE, 0x0A0D8, 0x099A8,
- 0x09271, 0x08B38, 0x083FF, 0x07CCB, 0x075A0, 0x06E81, 0x06772, 0x06076,
- 0x05991, 0x052C5, 0x04C16, 0x04587, 0x03F1B, 0x038D4, 0x032B4, 0x02CBF,
- 0x026F7, 0x0215C, 0x01BF2, 0x016BA, 0x011B5, 0x00CE4, 0x0084A, 0x003E6,
- -0x00045,-0x00439,-0x007F4,-0x00B76,-0x00EBF,-0x011D0,-0x014A7,-0x01746,
- 0x019AE, 0x01BDE, 0x01DD8, 0x01F9C, 0x0212C, 0x02288, 0x023B3, 0x024AD,
- 0x02578, 0x02616, 0x02687, 0x026CF, 0x026EE, 0x026E7, 0x026BC, 0x0266E,
- 0x025FF, 0x02571, 0x024C8, 0x02403, 0x02326, 0x02233, 0x0212B, 0x02011,
- 0x01EE6, 0x01DAD, 0x01C67, 0x01B17, 0x019BD, 0x0185D, 0x016F7, 0x0158D,
- 0x01421, 0x012B4, 0x01149, 0x00FDF, 0x00E79, 0x00D17, 0x00BBC, 0x00A67,
- 0x0091A, 0x007D6, 0x0069C, 0x0056C, 0x00447, 0x0032E, 0x00221, 0x00120,
- 0x0002D,-0x000B8,-0x00191,-0x0025C,-0x00319,-0x003C9,-0x0046A,-0x004FF,
- -0x00585,-0x005FE,-0x0066B,-0x006CA,-0x0071D,-0x00764,-0x0079F,-0x007CF,
- 0x007F5, 0x0080F, 0x00820, 0x00827, 0x00825, 0x0081B, 0x00809, 0x007F0,
- 0x007D1, 0x007AA, 0x0077F, 0x0074E, 0x00719, 0x006DF, 0x006A2, 0x00662,
- 0x0061F, 0x005DA, 0x00594, 0x0054C, 0x00503, 0x004BA, 0x00471, 0x00428,
- 0x003DF, 0x00397, 0x00350, 0x0030B, 0x002C7, 0x00285, 0x00245, 0x00207,
- 0x001CB, 0x00191, 0x0015B, 0x00126, 0x000F4, 0x000C5, 0x00099, 0x0006F,
- 0x00048, 0x00024, 0x00002,-0x0001C,-0x00038,-0x00052,-0x00069,-0x0007E,
- -0x00091,-0x000A2,-0x000B0,-0x000BC,-0x000C7,-0x000CF,-0x000D6,-0x000DC,
- -0x000DF,-0x000E2,-0x000E3,-0x000E3,-0x000E2,-0x000E0,-0x000DD,-0x000D9,
- 0x000D5, 0x000D0, 0x000CA, 0x000C4, 0x000BE, 0x000B7, 0x000B0, 0x000A9,
- 0x000A1, 0x0009A, 0x00093, 0x0008B, 0x00084, 0x0007D, 0x00075, 0x0006F,
- 0x00068, 0x00061, 0x0005B, 0x00055, 0x0004F, 0x00049, 0x00044, 0x0003F,
- 0x0003A, 0x00035, 0x00031, 0x0002D, 0x00029, 0x00026, 0x00023, 0x0001F,
- 0x0001D, 0x0001A, 0x00018, 0x00015, 0x00013, 0x00011, 0x00010, 0x0000E,
- 0x0000D, 0x0000B, 0x0000A, 0x00009, 0x00008, 0x00007, 0x00007, 0x00006,
- 0x00005, 0x00005, 0x00004, 0x00004, 0x00003, 0x00003, 0x00002, 0x00002,
- 0x00002, 0x00002, 0x00001, 0x00001, 0x00001, 0x00001, 0x00001, 0x00001
-};
-
-
-///////////// Table 3-B.2: Possible quantization per subband ///////////////////
-
-// quantizer lookup, step 1: bitrate classes
-static uint8_t quant_lut_step1[2][16] = {
- // 32, 48, 56, 64, 80, 96,112,128,160,192,224,256,320,384 <- bitrate
- { 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2 }, // mono
- // 16, 24, 28, 32, 40, 48, 56, 64, 80, 96,112,128,160,192 <- BR / chan
- { 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2 } // stereo
-};
-
-// quantizer lookup, step 2: bitrate class, sample rate -> B2 table idx, sblimit
-#define QUANT_TAB_A (27 | 64) // Table 3-B.2a: high-rate, sblimit = 27
-#define QUANT_TAB_B (30 | 64) // Table 3-B.2b: high-rate, sblimit = 30
-#define QUANT_TAB_C 8 // Table 3-B.2c: low-rate, sblimit = 8
-#define QUANT_TAB_D 12 // Table 3-B.2d: low-rate, sblimit = 12
-
-static
-const char quant_lut_step2 [3][4] = {
- // 44.1 kHz, 48 kHz, 32 kHz
- { QUANT_TAB_C, QUANT_TAB_C, QUANT_TAB_D }, // 32 - 48 kbit/sec/ch
- { QUANT_TAB_A, QUANT_TAB_A, QUANT_TAB_A }, // 56 - 80 kbit/sec/ch
- { QUANT_TAB_B, QUANT_TAB_A, QUANT_TAB_B }, // 96+ kbit/sec/ch
-};
-
-// quantizer lookup, step 3: B2 table, subband -> nbal, row index
-// (upper 4 bits: nbal, lower 4 bits: row index)
-static
-uint8_t quant_lut_step3 [3][32] = {
- // low-rate table (3-B.2c and 3-B.2d)
- { 0x44,0x44, // SB 0 - 1
- 0x34,0x34,0x34,0x34,0x34,0x34,0x34,0x34,0x34,0x34 // SB 2 - 12
- },
- // high-rate table (3-B.2a and 3-B.2b)
- { 0x43,0x43,0x43, // SB 0 - 2
- 0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42, // SB 3 - 10
- 0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31, // SB 11 - 22
- 0x20,0x20,0x20,0x20,0x20,0x20,0x20 // SB 23 - 29
- },
- // MPEG-2 LSR table (B.2 in ISO 13818-3)
- { 0x45,0x45,0x45,0x45, // SB 0 - 3
- 0x34,0x34,0x34,0x34,0x34,0x34,0x34, // SB 4 - 10
- 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24, // SB 11 -
- 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24 // - 29
- }
-};
-
-// quantizer lookup, step 4: table row, allocation[] value -> quant table index
-static
-const char quant_lut_step4 [6][16] = {
- { 0, 1, 2, 17 },
- { 0, 1, 2, 3, 4, 5, 6, 17 },
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17 },
- { 0, 1, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 },
- { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17 },
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
-};
-
-// quantizer table
-static
-struct quantizer_spec quantizer_table [17] = {
- { 3, 1, 5 }, // 1
- { 5, 1, 7 }, // 2
- { 7, 0, 3 }, // 3

_service:download_url:qt-dab-2.5.tar.gz/src/backend/audio/mp4processor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/audio/mp4processor.cpp Changed

@@ -71,7 +71,7 @@
 	rsErrors	= 0;
 }
 
-	mp4Processor::~mp4Processor (void) {
+	mp4Processor::~mp4Processor() {
 }
 
 /**
@@ -116,7 +116,7 @@
   *	and adjust the buffer here for the next round
   */
 	   if (fc. check (&frameBytes [blockFillIndex * nbits / 8]) &&
-	       (processSuperframe (frameBytes. data (),
+	       (processSuperframe (frameBytes. data(),
 	                           blockFillIndex * nbits / 8))) {
 //	since we processed a full cycle of 5 blocks, we just start a
 //	new sequence, beginning with block blockFillIndex
@@ -181,6 +181,7 @@
 	sbrFlag		= (outVector [2] >> 5) & 01;	// bit 18
 	aacChannelMode	= (outVector [2] >> 4) & 01;	// bit 19
 	psFlag		= (outVector [2] >> 3) & 01;	// bit 20
+	(void)psFlag;
 	mpegSurround	= (outVector [2] & 07);		// bits 21 .. 23
 
 	switch (2 * dacRate + sbrFlag) {
@@ -269,7 +270,7 @@
 	                 &outVector [au_start [i]], aac_frame_length);
 	      memset (&theAudioUnit [aac_frame_length], 0, 10);
 
-	      int tmp = aacDecoder. MP42PCM (dacRate,
+	      tmp = aacDecoder. MP42PCM (dacRate,
 	                                     sbrFlag,
 	                                     mpegSurround,
 	                                     aacChannelMode,

_service:download_url:qt-dab-2.5.tar.gz/src/backend/backend-deconvolver.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/backend-deconvolver.cpp Changed

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

_service:download_url:qt-dab-2.5.tar.gz/src/backend/backend.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/backend.cpp Changed

@@ -53,7 +53,7 @@
 	interleaveData. resize (16);
 	for (i = 0; i < 16; i ++) {
 	 interleaveData [i]. resize (fragmentSize);
-	 memset (interleaveData [i]. data (), 0,
+	 memset (interleaveData [i]. data(), 0,
 	 fragmentSize * sizeof (int16_t));
 	}
 
@@ -79,14 +79,14 @@
 	for (i = 0; i < 20; i ++)
 	 theData [i]. resize (fragmentSize);
 	running. store (true);
-	start ();
+	start();
 #endif
 }
 
-	Backend::~Backend (void) {
+	Backend::~Backend() {
 #ifdef	__THREADED_BACKEND
 	running. store (false);
-	while (this -> isRunning ())
+	while (this -> isRunning())
 	 usleep (1000);
 #endif
 }
@@ -97,9 +97,9 @@
 	while (!freeSlots. tryAcquire (1, 200))
 	 if (!running)
 	 return 0;
-	memcpy (theData [nextIn]. data (), v, fragmentSize * sizeof (int16_t));
+	memcpy (theData [nextIn]. data(), v, fragmentSize * sizeof (int16_t));
 	nextIn = (nextIn + 1) % 20;
-	usedSlots. release ();
+	usedSlots. release();
 #else
 	processSegment (v);
 #endif
@@ -119,7 +119,7 @@
 	interleaverIndex = (interleaverIndex + 1) & 0x0F;
 #ifdef	__THREADED_BACKEND
 	nextOut = (nextOut + 1) % 20;
-	freeSlots. release ();
+	freeSlots. release();
 #endif
 
 //	only continue when de-interleaver is filled
@@ -128,7 +128,7 @@
 	 return;
 	}
 
-	deconvolver. deconvolve (tempX. data (), fragmentSize, outV. data ());
+	deconvolver. deconvolve (tempX. data(), fragmentSize, outV. data());
 //	and the energy dispersal
 	for (i = 0; i < bitRate * 24; i ++)
 	 outV [i] ^= disperseVector [i];
@@ -137,24 +137,24 @@
 }
 
 #ifdef	__THREADED_BACKEND
-void	Backend::run	(void) {
+void	Backend::run() {
 
-	while (running. load ()) {
+	while (running. load()) {
 	 while (!usedSlots. tryAcquire (1, 200)) 
 	 if (!running)
 	 return;
-	 processSegment (theData [nextOut]. data ());
+	 processSegment (theData [nextOut]. data());
 	}
 }
 #endif
 
 //	It might take a msec for the task to stop
-void	Backend::stopRunning (void) {
+void	Backend::stopRunning() {
 #ifdef	__THREADED_BACKEND
 	running = false;
-	while (this -> isRunning ())
+	while (this -> isRunning())
 	 usleep (1);
-//	myAudioSink	-> stop ();
+//	myAudioSink	-> stop();
 #endif
 }

_service:download_url:qt-dab-2.5.tar.gz/src/backend/charsets.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/charsets.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/data-processor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/data-processor.cpp Changed

@@ -48,7 +48,7 @@
 	this	-> expectedIndex	= 0;
 	switch (DSCTy) {
 	 default:
-	 my_dataHandler	= new virtual_dataHandler ();
+	 my_dataHandler	= new virtual_dataHandler();
 	 break;
 
 	 case 5:			
@@ -56,7 +56,7 @@
 	 break;
 
 	 case 44:
-	 my_dataHandler	= new journaline_dataHandler ();
+	 my_dataHandler	= new journaline_dataHandler();
 	 break;
 
 	 case 59:
@@ -71,7 +71,7 @@
 	packetState	= 0;
 }
 
-	dataProcessor::~dataProcessor	(void) {
+	dataProcessor::~dataProcessor() {
 	delete		my_dataHandler;
 }
 
@@ -81,9 +81,9 @@
 //	when the DG flag is on and there are no datagroups for DSCTy5
 	 if ((this -> DSCTy == 5) &&
 	 (this -> DGflag))	// no datagroups
-	 handleTDCAsyncstream (outV. data (), 24 * bitRate);
+	 handleTDCAsyncstream (outV. data(), 24 * bitRate);
 	 else
-	 handlePackets (outV. data (), 24 * bitRate);
+	 handlePackets (outV. data(), 24 * bitRate);
 }
 //
 //	While for a full mix data and audio there will be a single packet in a
@@ -142,13 +142,13 @@
 	 if (firstLast == 02) {	// first packet
 	 packetState = 1;
 	 series. resize (usefulLength * 8);
-	 for (i = 0; i < series. size (); i ++)
+	 for (i = 0; i < series. size(); i ++)
 	 series [i] = data [24 + i];
 	 }
 	 else
 	 if (firstLast == 03) {	// single packet, mostly padding
 	 series. resize (usefulLength * 8);
-	 for (i = 0; i < series. size (); i ++)
+	 for (i = 0; i < series. size(); i ++)
 	 series [i] = data [24 + i];
 	 my_dataHandler	-> add_mscDatagroup (series);
 	 }
@@ -158,14 +158,14 @@
 	else
 	if (packetState == 01) {	// within a series
 	 if (firstLast == 0) {	// intermediate packet
-	 int32_t currentLength = series. size ();
+	 int32_t currentLength = series. size();
 	 series. resize (currentLength + 8 * usefulLength);
 	 for (i = 0; i < 8 * usefulLength; i ++)
 	 series [currentLength + i] = data [24 + i];
 	 }
 	 else
 	 if (firstLast == 01) {	// last packet
-	 int32_t currentLength = series. size ();
+	 int32_t currentLength = series. size();
 	 series. resize (currentLength + 8 * usefulLength);
 	 for (i = 0; i < 8 * usefulLength; i ++)
 	 series [currentLength + i] = data [24 + i];
@@ -177,7 +177,7 @@
 	 if (firstLast == 02) {	// first packet, previous one erroneous
 	 packetState = 1;
 	 series. resize (usefulLength * 8);
-	 for (i = 0; i < series. size (); i ++)
+	 for (i = 0; i < series. size(); i ++)
 	 series [i] = data [24 + i];
 	 }
 	 else {

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/epg/EPG.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/epg/EPG.cpp Changed

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

@@ -28,9 +28,9 @@
 \******************************************************************************/
 
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <map>
-#include	<stdio.h>
+#include	<cstdio>
 #include <iostream>
 #include <sstream>
 #include "epgdec.h"
@@ -41,17 +41,17 @@
 //	clear the doc, allowing re-use 
 	doc. setContent (QString (""));
 	tag_length_value tlv (&vecData [0]);
-	if (tlv. is_epg ()) {
+	if (tlv. is_epg()) {
 	 doc. appendChild (element (doc, tlv));
-	 QString test = doc. toString ();
-	 FILE *epgFile = fopen (name. toUtf8 (). data (), "w");
+	 QString test = doc. toString();
+	 FILE *epgFile = fopen (name. toUtf8(). data(), "w");
 	 if (epgFile != nullptr) {
-	 fprintf (stderr, "filename = %s\n", name. toUtf8 (). data ());
-	 fprintf (epgFile, test. toLatin1 (). data ());
+	 fprintf (stderr, "filename = %s\n", name. toUtf8(). data());
+	 fprintf (epgFile, test. toLatin1(). data());
 	 fclose (epgFile);
 	 }
 	 else
-	 fprintf (stderr, "cannot open %s\n", name. toUtf8 (). data ());
+	 fprintf (stderr, "cannot open %s\n", name. toUtf8(). data());
 	}
 }
 
@@ -71,7 +71,7 @@
 static uint32_t default_content_id;
 
 static const char *enums0[] = { (char*)2, "DAB", "DRM" };
-static const char *enums1[] = { (char*)9, 0, "series",
+static const char *enums1[] = { (char*)9, nullptr, "series",
 	"show",
 	"programConcept",
 	"magazine",
@@ -91,7 +91,7 @@
 static const char *enums7[] = { (char*)2, "none", "unspecified" };
 static const char *enums8[] = { (char*)2, "on-air", "off-air" };
 static const char *enums9[] = { (char*)2, "no", "yes" };
-static const char *enums10[] = { (char*)4, 0, "logo_unrestricted",
+static const char *enums10[] = { (char*)4, nullptr, "logo_unrestricted",
 	 "logo_mono_square",
 	 "logo_colour_square",
 	 "logo_mono_rectangle"
@@ -100,7 +100,7 @@
 static const char *enums11 [] = { (char*)3, "main", "secondary", "other"};
 
 static const char *classificationScheme [] = {
- 0,
+ nullptr,
 "IntentionCS",
 "FormatCS",
 "ContentCS",
@@ -109,45 +109,45 @@
 "ContentalertCS",
 "MediaTypeCS",
 "AtmosphereCS",
- 0, 0, 0, 0, 0, 0, 0
+ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
 
 static dectab attribute_tags_epg[] = {
 	{"system", enums0, enum_attr},
-	{"id", 0, string_attr}
+	{"id", nullptr, string_attr}
 };
 
 static dectab attribute_tags_sch[] = {
-	{"version", 0, u16_attr},
-	{"creationTime", 0, datetime_attr},
-	{"originator", 0, string_attr}
+	{"version", nullptr, u16_attr},
+	{"creationTime", nullptr, datetime_attr},
+	{"originator", nullptr, string_attr}
 };
 
 static dectab attribute_tags_si[] = {
- {"version", 0, u16_attr},
- {"creationTime", 0, datetime_attr},
- {"originator", 0, string_attr},
- {"serviceProvider", 0, string_attr},
+ {"version", nullptr, u16_attr},
+ {"creationTime", nullptr, datetime_attr},
+ {"originator", nullptr, string_attr},
+ {"serviceProvider", nullptr, string_attr},
 {"system", enums0, enum_attr}
 };
 
 static dectab attribute_tags2[] = {
- {"shortId", 0, u24_attr},
- {"version", 0, u16_attr},
+ {"shortId", nullptr, u24_attr},
+ {"version", nullptr, u16_attr},
 {"type", enums1, enum_attr},
- {"numOfItems", 0, u16_attr},
+ {"numOfItems", nullptr, u16_attr},
 };
 
 static dectab attribute_tags_scope[] = {
- {"startTime", 0, datetime_attr},
- {"stopTime", 0, datetime_attr}
+ {"startTime", nullptr, datetime_attr},
+ {"stopTime", nullptr, datetime_attr}
 };
 
 static dectab attribute_tags4[] = {
 {"protocol", enums2, enum_attr},
 {"type", enums3, enum_attr},
- {"url", 0, string_attr},
+ {"url", nullptr, string_attr},
 };
 
 //static dectab attribute_tags5[] = {
@@ -157,73 +157,73 @@
 
 static dectab attribute_tags6[] = {
 {"type", enums4, enum_attr},
- {"kHz", 0, u24_attr}
+ {"kHz", nullptr, u24_attr}
 };
 
 static dectab attribute_tags7[] = {
- {"version", 0, u16_attr},
+ {"version", nullptr, u16_attr},
 {"format", enums5, enum_attr},
- {"Not used", 0, nu_attr},
- {"bitrate", 0, bitrate_attr}
+ {"Not used", nullptr, nu_attr},
+ {"bitrate", nullptr, bitrate_attr}
 };
 
 static dectab attribute_tags8[] = {
- {"id", 0, string_attr},
+ {"id", nullptr, string_attr},
 {"type", enums6, enum_attr}
 };
 
 static dectab attribute_tags_name[] = {
- {"xml:lang", 0, string_attr}
+ {"xml:lang", nullptr, string_attr}
 };
 
 static dectab attribute_tags10[] = {
- {"mimeValue", 0, string_attr},
- {"xml:lang", 0, string_attr},
- {"url", 0, string_attr},
+ {"mimeValue", nullptr, string_attr},
+ {"xml:lang", nullptr, string_attr},
+ {"url", nullptr, string_attr},
 {"type", enums10, enum_attr},
- {"width", 0, u16_attr},
- {"height", 0, u16_attr}
+ {"width", nullptr, u16_attr},
+ {"height", nullptr, u16_attr}
 };
 
 static dectab attribute_tags11[] = {
- {"time", 0, datetime_attr},
- {"duration", 0, duration_attr},
- {"actualTime", 0, datetime_attr},
- {"actualDuration", 0, duration_attr}
+ {"time", nullptr, datetime_attr},
+ {"duration", nullptr, duration_attr},
+ {"actualTime", nullptr, datetime_attr},
+ {"actualDuration", nullptr, duration_attr}
 };
 
 static dectab attribute_tags12[] = {
- {"id", 0, sid_attr},
- {"trigger", 0, u16_attr}
+ {"id", nullptr, sid_attr},
+ {"trigger", nullptr, u16_attr}
 };
 
 static dectab attribute_tags13[] = {
- {"id", 0, string_attr},
- {"shortId", 0, u24_attr},
- {"index", 0, u16_attr}
+ {"id", nullptr, string_attr},
+ {"shortId", nullptr, u24_attr},
+ {"index", nullptr, u16_attr}
 };
 
 static dectab attribute_tags14[] = {
- {"url", 0, string_attr},
- {"mimeValue", 0, string_attr},
- {"xml:lang", 0, string_attr},
- {"description", 0, string_attr},
- {"expiryTime", 0, datetime_attr}

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/ip-datahandler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/ip-datahandler.cpp Changed

@@ -31,11 +31,11 @@
 	 mr, SLOT (sendDatagram (int)));
 }
 
-	ip_dataHandler::~ip_dataHandler (void) {
+	ip_dataHandler::~ip_dataHandler() {
 }
 
 void	ip_dataHandler::add_mscDatagroup (std::vector<uint8_t> msc) {
-uint8_t *data		= (uint8_t *)(msc. data ());
+uint8_t *data		= (uint8_t *)(msc. data());
 bool	extensionFlag	= getBits_1 (data, 0) != 0;
 bool	crcFlag		= getBits_1 (data, 1) != 0;
 bool	segmentFlag	= getBits_1 (data, 2) != 0;
@@ -48,7 +48,7 @@
 uint8_t	lengthInd;
 int16_t	i;
 
-	if (crcFlag && !check_CRC_bits (data, msc.size ())) 
+	if (crcFlag && !check_CRC_bits (data, msc.size())) 
 	 return;
 
 	if (extensionFlag)
@@ -72,9 +72,9 @@
 
 	uint16_t	ipLength	= 0;
 	int16_t		sizeinBits	=
-	 msc. size () - next - (crcFlag != 0 ? 16 : 0);
+	 msc. size() - next - (crcFlag != 0 ? 16 : 0);
 	ipLength = getBits (data, next + 16, 16);
-	if (ipLength < msc. size () / 8) {	// just to be sure
+	if (ipLength < msc. size() / 8) {	// just to be sure
 	 std::vector<uint8_t> ipVector;
 	 ipVector. resize (ipLength);
 	 for (i = 0; i < ipLength; i ++)
@@ -86,7 +86,7 @@
 }
 
 void	ip_dataHandler::process_ipVector (std::vector<uint8_t> v) {
-uint8_t	*data		= (uint8_t *)(v. data ());
+uint8_t	*data		= (uint8_t *)(v. data());
 int16_t	headerSize	= data [0] & 0x0F;	// in 32 bits words
 int16_t ipSize		= (data [2] << 8) | data [3];
 uint8_t	protocol	= data [9];

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/journaline-datahandler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/journaline-datahandler.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/journaline/newssvcdec_impl.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/journaline/newssvcdec_impl.cpp Changed

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

@@ -50,7 +50,7 @@
 	 marked [0] = true;
 	}
 
-	motDirectory::~motDirectory (void) {
+	motDirectory::~motDirectory() {
 int	i;
 	delete []	dir_segments;
 
@@ -67,7 +67,7 @@
 	 (motComponents [i]. transportId == transportId))
 	 return motComponents [i]. motSlide;
 
-	return NULL;
+	return nullptr;
 }
 
 void	motDirectory::setHandle (motObject *h, uint16_t transportId) {
@@ -110,13 +110,13 @@
 	}
 //
 //	yes we have all data to build up the directory
-	analyse_theDirectory ();
+	analyse_theDirectory();
 }
 //
 //	This is the tough one, we collected the bits, and now
 //	we need to extract the "motObject"s from it
 
-void	motDirectory::analyse_theDirectory (void) {
+void	motDirectory::analyse_theDirectory() {
 uint32_t	currentBase	= 11;	// in bytes
 uint8_t	*data			= dir_segments;
 uint16_t extensionLength	= (dir_segments [currentBase] << 8) |
@@ -139,12 +139,12 @@
 	 -1,
 	 false);
 
-	 currentBase		+= 2 + handle -> get_headerSize ();
+	 currentBase		+= 2 + handle -> get_headerSize();
 	 setHandle (handle, transportId);
 	}
 }
 
-uint16_t	motDirectory::get_transportId	(void) {
+uint16_t	motDirectory::get_transportId() {
 	return transportId;
 }

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

@@ -45,7 +45,7 @@
 	 motTable [i]. orderNumber = -1;
 }
 
-	motHandler::~motHandler (void) {
+	motHandler::~motHandler() {
 int	i;
 
 	for (i = 0; i < 15; i ++)
@@ -56,7 +56,7 @@
 }
 
 void	motHandler::add_mscDatagroup (std::vector<uint8_t> msc) {
-uint8_t *data		= (uint8_t *)(msc. data ());
+uint8_t *data		= (uint8_t *)(msc. data());
 bool	extensionFlag	= getBits_1 (data, 0) != 0;
 bool	crcFlag		= getBits_1 (data, 1) != 0;
 bool	segmentFlag	= getBits_1 (data, 2) != 0;
@@ -72,11 +72,11 @@
 int32_t	i;
 
 	(void)CI;
-	if (msc. size () <= 0) {
+	if (msc. size() <= 0) {
 	 return;
 	}
 
-	if (crcFlag && !check_CRC_bits (data, msc.size ())) 
+	if (crcFlag && !check_CRC_bits (data, msc.size())) 
 	 return;
 
 	if (extensionFlag)
@@ -99,7 +99,7 @@
 	}
 
 	int32_t		sizeinBits	=
-	 msc. size () - next - (crcFlag != 0 ? 16 : 0);
+	 msc. size() - next - (crcFlag != 0 ? 16 : 0);
 
 	if (!transportIdFlag)
 	 return;
@@ -143,7 +143,7 @@
 	 case 6:
 	 if (segmentNumber == 0) { 	// MOT directory
 	 if (theDirectory != nullptr)
-	 if (theDirectory -> get_transportId () == transportId)
+	 if (theDirectory -> get_transportId() == transportId)
 	 break;	// already existing
 
 	 if (theDirectory != nullptr)	// an old one, replace it
@@ -172,7 +172,7 @@
 	 }
 	 else {
 	 if ((theDirectory == nullptr) || 
-	 (theDirectory -> get_transportId () != transportId))
+	 (theDirectory -> get_transportId() != transportId))
 	 break;
 	 theDirectory -> directorySegment (transportId,
 	 &motVector [2],

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

@@ -44,7 +44,7 @@
 
 	headerSize =
 ((segment [3] & 0x0F) << 9) |
-	 (segment [4] << 1) | ((segment [5] >> 7) && 0x01);
+ (segment [4] << 1) | ((segment [5] >> 7) & 0x01);
 	bodySize =
 (segment [0] << 20) | (segment [1] << 12) |
 (segment [2] << 4 ) | ((segment [3] & 0xF0) >> 4);
@@ -89,10 +89,10 @@
 	}
 }
 
-	motObject::~motObject	(void) {
+	motObject::~motObject() {
 }
 
-uint16_t	motObject::get_transportId (void) {
+uint16_t	motObject::get_transportId() {
 	return transportId;
 }
 
@@ -111,7 +111,7 @@
 	if ((segmentNumber < 0) || (segmentNumber >= 8192))
 	 return;
 
-	if (motMap. find (segmentNumber) != motMap. end ())
+	if (motMap. find (segmentNumber) != motMap. end())
 	 return;
 
 // Note that the last segment may have a different size
@@ -133,16 +133,16 @@
 //	once we know how many segments there are/should be,
 //	we check for completeness
 	for (i = 0; i < numofSegments; i ++) {
-	 if (motMap. find (i) == motMap. end ())
+	 if (motMap. find (i) == motMap. end())
 	 return;
 	}
 
 //	The motObject is (seems to be) complete
-	handleComplete ();
+	handleComplete();
 }
 
 
-void	motObject::handleComplete (void) {
+void	motObject::handleComplete() {
 QByteArray result;
 
 	for (const auto &it : motMap)
@@ -156,9 +156,9 @@
 	 realName. append (name);
 	 realName = QDir::toNativeSeparators (realName);
 	 fprintf (stderr, "going to write file %s\n",
-	 realName. toUtf8 (). data ());
+	 realName. toUtf8(). data());
 	 checkDir (realName);
-	 std::vector<uint8_t> epgData (result. begin (), result. end ());
+	 std::vector<uint8_t> epgData (result. begin(), result. end());
 	 epgHandler. decode (epgData, realName);
 #endif
 	 return;
@@ -173,14 +173,14 @@
 	 realName. append (name);
 	 realName = QDir::toNativeSeparators (realName);
 	 fprintf (stderr, "going to write file %s\n",
-	 realName. toUtf8 (). data ());
+	 realName. toUtf8(). data());
 	 checkDir (realName);
-	 FILE *x = fopen (realName. toLatin1 (). data (), "w+b");
+	 FILE *x = fopen (realName. toLatin1(). data(), "w+b");
 	 if (x == nullptr)
 	 fprintf (stderr, "cannot write file %s\n",
-	 realName. toUtf8 (). data ());
+	 realName. toUtf8(). data());
 	 else {
-	 (void)fwrite (result. data (), 1, bodySize, x);
+	 (void)fwrite (result. data(), 1, bodySize, x);
 	 fclose (x);
 	 }
 	 return;
@@ -207,12 +207,12 @@
 	for (i = 0; i < ind; i ++)
 	 dir. append (s [i]);
 
-	if (QDir (dir). exists ())
+	if (QDir (dir). exists())
 	 return;
-	QDir (). mkpath (dir);
+	QDir(). mkpath (dir);
 }
 
-int	motObject::get_headerSize	(void) {
+int	motObject::get_headerSize() {
 	return headerSize;
 }

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

@@ -53,7 +53,7 @@
 	segmentNumber	= -1;
 }
 
-	padHandler::~padHandler	(void) {
+	padHandler::~padHandler() {
 	if (currentSlide != nullptr)
 	 delete currentSlide;
 }
@@ -119,9 +119,9 @@
 	 case 2:	// start of fragment, extract the length
 	 if (firstSegment && !lastSegment) {
 	 segmentNumber = b [last - 2] >> 4;
-	 if (dynamicLabelText. size () > 0)
+	 if (dynamicLabelText. size() > 0)
 	 showLabel (dynamicLabelText);
-	 dynamicLabelText. clear ();
+	 dynamicLabelText. clear();
 	 }
 	 still_to_go = b [last - 1] & 0x0F;
 	 shortpadData. resize (0);
@@ -134,13 +134,13 @@
 	 shortpadData. push_back (b [last - 1 - i]);
 	 }
 
-	 if ((still_to_go <= 0) && (shortpadData. size () > 1)) {
+	 if ((still_to_go <= 0) && (shortpadData. size() > 1)) {
 	 shortpadData. push_back (0);
 	 dynamicLabelText.
 	 append (toQStringUsingCharset 
-	 ((char *)(shortpadData. data ()),
+	 ((char *)(shortpadData. data()),
 (CharacterSet)charSet,
-	 shortpadData. size ()));
+	 shortpadData. size()));
 	 shortpadData. resize (0);
 	 }
 	 break;
@@ -154,20 +154,20 @@
 	 still_to_go --;
 	 }
 //	at the end of a frame
-	 if ((still_to_go <= 0) && (shortpadData. size () > 0)) {
+	 if ((still_to_go <= 0) && (shortpadData. size() > 0)) {
 	 shortpadData . push_back (0);
 //
 //	just to avoid doubling by unsollicited shortpads
 	 dynamicLabelText.
-	 append (toQStringUsingCharset ((char *)(shortpadData. data ()),
+	 append (toQStringUsingCharset ((char *)(shortpadData. data()),
 (CharacterSet)charSet));
 	 shortpadData. resize (0);
 //	if we are at the end of the last segment (and the text is not empty)
 //	then show it.
 	 if (!firstSegment && lastSegment) {
-	 if (dynamicLabelText. size () > 0)
+	 if (dynamicLabelText. size() > 0)
 	 showLabel (dynamicLabelText);
-	 dynamicLabelText. clear ();
+	 dynamicLabelText. clear();
 	 }
 	 }
 	}
@@ -244,8 +244,8 @@
 
 	 case 2:	 // Dynamic label segment, start of X-PAD data group
 	 case 3:	 // Dynamic label segment, continuation of X-PAD data group
-	 dynamicLabel ((uint8_t *)(data. data ()),
-	 data. size (), CI_table [i]);
+	 dynamicLabel ((uint8_t *)(data. data()),
+	 data. size(), CI_table [i]);
 	 break;
 
 	 case 12:	 // MOT, start of X-PAD data group
@@ -286,14 +286,14 @@
 	 if (first) { 
 	 segmentno = 1;
 	 charSet = (prefix >> 4) & 017;
-	 dynamicLabelText. clear ();
+	 dynamicLabelText. clear();
 	 }
 	 else 
 	 segmentno = ((prefix >> 4) & 07) + 1;
 
 	 if (Cflag) {		// special dynamic label command
 	 // the only specified command is to clear the display
-	 dynamicLabelText. clear ();
+	 dynamicLabelText. clear();
 	 }
 	 else {		// Dynamic text length
 	 int16_t totalDataLength = field_1 + 1;
@@ -357,18 +357,18 @@
 void	padHandler::new_MSC_element (std::vector<uint8_t> data) {
 
 //	if (mscGroupElement) { 
-////	 if (msc_dataGroupBuffer. size () < dataGroupLength)
+////	 if (msc_dataGroupBuffer. size() < dataGroupLength)
 ////	 fprintf (stderr, "short ? %d %d\n",
-////	 msc_dataGroupBuffer. size (),
+////	 msc_dataGroupBuffer. size(),
 ////	 dataGroupLength);
-//	 msc_dataGroupBuffer. clear ();
+//	 msc_dataGroupBuffer. clear();
 //	 build_MSC_segment (data);
 //	 mscGroupElement	= true;
 //	 show_motHandling (true);
 //	}
 
-	if (data. size () >= dataGroupLength) {	// msc element is single item
-	 msc_dataGroupBuffer. clear ();
+	if (data. size() >= dataGroupLength) {	// msc element is single item
+	 msc_dataGroupBuffer. clear();
 	 build_MSC_segment (data);
 	 mscGroupElement = false;
 	 show_motHandling (true);
@@ -377,7 +377,7 @@
 	}
 
 	mscGroupElement		= true;
-	msc_dataGroupBuffer. clear ();
+	msc_dataGroupBuffer. clear();
 	msc_dataGroupBuffer	= data;
 	show_motHandling (true);
 }
@@ -385,7 +385,7 @@
 //
 void	padHandler::add_MSC_element	(std::vector<uint8_t> data) {
 int16_t	i;
-int32_t	currentLength = msc_dataGroupBuffer. size ();
+int32_t	currentLength = msc_dataGroupBuffer. size();
 //
 //	just to ensure that, when a "12" appType is missing, the
 //	data of "13" appType elements is not endlessly collected.
@@ -395,9 +395,9 @@
 
 	msc_dataGroupBuffer. insert (std::end (msc_dataGroupBuffer),
 	 std::begin (data), std::end (data));
-	if (msc_dataGroupBuffer. size () >= dataGroupLength) {
+	if (msc_dataGroupBuffer. size() >= dataGroupLength) {
 	 build_MSC_segment (msc_dataGroupBuffer);
-	 msc_dataGroupBuffer. clear ();
+	 msc_dataGroupBuffer. clear();
 //	 mscGroupElement	= false;
 	 show_motHandling (false);
 	}
@@ -407,7 +407,7 @@
 //	we have a MOT segment, let us look what is in it
 //	according to DAB 300 401 (page 37) the header (MSC data group)
 //	is
-int32_t	size	= data. size () < dataGroupLength ? data. size () :
+int32_t	size	= data. size() < dataGroupLength ? data. size() :
 	 dataGroupLength;
 	 
 	uint8_t		groupType	= data [0] & 0xF;
@@ -419,7 +419,7 @@
 	uint16_t	index;
 
 	if ((data [0] & 0x40) != 0) {
-	 bool res	= check_crc_bytes (data. data (), size - 2);
+	 bool res	= check_crc_bytes (data. data(), size - 2);
 	 if (!res) {
 //	 fprintf (stderr, "build_MSC_segment fails on crc check\n");
 	 return;
@@ -482,10 +482,10 @@
 	 lastFlag);
 	 }
 	 else {
-	 if (currentSlide -> get_transportId () == transportId)
+	 if (currentSlide -> get_transportId() == transportId)
 	 break;
 //	 fprintf (stderr, "out goes %d, in comes %d\n",
-//	 currentSlide -> get_transportId (),
+//	 currentSlide -> get_transportId(),
 //	 transportId);
 	 delete currentSlide;
 	 currentSlide	= new motObject (myRadioInterface,
@@ -501,7 +501,7 @@
 	 case 4:
 	 if (currentSlide == nullptr)
 	 return;
-	 if (currentSlide -> get_transportId () == transportId) {
+	 if (currentSlide -> get_transportId() == transportId) {
 //	 fprintf (stderr, "add segment %d of %d\n",
 //	 segmentNumber, transportId);
 	 currentSlide -> addBodySegment (&data [index + 2],

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/tdc-datahandler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/tdc-datahandler.cpp Changed

@@ -33,7 +33,7 @@
 	 myRadioInterface, SLOT (handle_tdcdata (int, int)));
 }
 
-	tdc_dataHandler::~tdc_dataHandler (void) {
+	tdc_dataHandler::~tdc_dataHandler() {
 }
 
 #define	swap(a)	(((a) << 8) | ((a) >> 8))
@@ -54,8 +54,8 @@
 
 void	tdc_dataHandler::add_mscDatagroup (std::vector<uint8_t> m) {
 int32_t	offset	= 0;
-uint8_t	*data	= (uint8_t *)(m. data ());
-int32_t	size	= m. size ();
+uint8_t	*data	= (uint8_t *)(m. data());
+int32_t	size	= m. size();
 int16_t	i;
 uint16_t	crc;
 
@@ -101,7 +101,7 @@
 	 return;
 	 }
 
-	 fprintf (stderr, "handling tdc frametype %d\n", frametypeIndicator);
+//	 fprintf (stderr, "handling tdc frametype %d\n", frametypeIndicator);
 	 if (frametypeIndicator == 0)
 	 offset = handleFrame_type_0 (data, offset + 7 * 8, length);
 	 else
@@ -118,10 +118,10 @@
 int16_t noS	= getBits (data, offset, 8);
 uint8_t buffer [length];
 
- for (i = 0; i < length; i ++)
- buffer [i] = getBits (data, offset + i * 8, 8);
+	for (i = 0; i < length; i ++)
+	 buffer [i] = getBits (data, offset + i * 8, 8);
 	dataBuffer -> putDataIntoBuffer (buffer, length);
- bytesOut (0, length);
+	bytesOut (0, length);
 	return offset + length * 8;
 }
 
@@ -131,17 +131,17 @@
 int16_t i;
 uint8_t buffer [length];
 
-	fprintf (stderr, " frametype 1 met %o %o %o\n",
- getBits (data, offset, 8),
- getBits (data, offset + 8, 8),
- getBits (data, offset + 16, 8));
+//	fprintf (stderr, " frametype 1 met %o %o %o\n",
+// getBits (data, offset, 8),
+// getBits (data, offset + 8, 8),
+// getBits (data, offset + 16, 8));
 
- fprintf (stderr, "encryption %d\n", getBits (data, offset + 24, 8));
+//	fprintf (stderr, "encryption %d\n", getBits (data, offset + 24, 8));
 
- for (i = 0; i < length; i ++)
- buffer [i] = getBits (data, offset + i * 8, 8);
+	for (i = 0; i < length; i ++)
+	 buffer [i] = getBits (data, offset + i * 8, 8);
 	dataBuffer	-> putDataIntoBuffer (buffer, length);
- bytesOut (1, length);
+	bytesOut (1, length);
 	return offset + length * 8;
 }
 //	The component header CRC is two bytes long,

_service:download_url:qt-dab-2.5.tar.gz/src/backend/data/virtual-datahandler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/data/virtual-datahandler.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/firecode-checker.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/firecode-checker.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/frame-processor.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/frame-processor.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/galois.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/galois.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/msc-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/msc-handler.cpp Changed

@@ -41,38 +41,38 @@
 	 params (dabMode),
 	 my_fftHandler (dabMode),
 	 myMapper (dabMode),
-	 bufferSpace (params. get_L ()){
+	 bufferSpace (params. get_L()){
 	myRadioInterface	= mr;
 	this	-> picturesPath	= picturesPath;
 	cifVector. resize (55296);
 //	theBackends. push_back (new virtualBackend (0, 0));
-	BitsperBlock		= 2 * params. get_carriers ();
-	nrBlocks		= params. get_L ();
+	BitsperBlock		= 2 * params. get_carriers();
+	nrBlocks		= params. get_L();
 
 	command. resize (nrBlocks);
 	for (int i = 0; i < nrBlocks; i ++)
-	 command [i]. resize (params. get_T_u ());
+	 command [i]. resize (params. get_T_u());
 
 	amount = 0;
-	fft_buffer = my_fftHandler. getVector ();
-	phaseReference .resize (params. get_T_u ());
+	fft_buffer = my_fftHandler. getVector();
+	phaseReference .resize (params. get_T_u());
 
 	numberofblocksperCIF = cifTable [(dabMode - 1) & 03];
 	work_to_be_done. store (false);
-	start ();
+	start();
 }
 
-		mscHandler::~mscHandler	(void) {
+		mscHandler::~mscHandler() {
 	running. store (false);
-	while (isRunning ())
+	while (isRunning())
 	 usleep (100);
-	locker. lock ();
+	locker. lock();
 	work_to_be_done. store (false);
 	for (auto const &b : theBackends) {
-	 b -> stopRunning ();
+	 b -> stopRunning();
 	 delete b;
 	}
-	locker. unlock ();
+	locker. unlock();
 	theBackends. resize (0);
 }
 
@@ -81,46 +81,46 @@
 //	will handle the data from the buffer
 void	mscHandler::processBlock_0 (std::complex<float> *b) {
 	bufferSpace. acquire (1);
-	memcpy (command [0]. data (), b,
-	 params. get_T_u () * sizeof (std::complex<float>));
-	helper. lock ();
+	memcpy (command [0]. data(), b,
+	 params. get_T_u() * sizeof (std::complex<float>));
+	helper. lock();
 	amount ++;
- commandHandler. wakeOne ();
- helper. unlock ();
+ commandHandler. wakeOne();
+ helper. unlock();
 }
 
 void	mscHandler::process_Msc	(std::complex<float> *b, int blkno) {
 	bufferSpace. acquire (1);
- memcpy (command [blkno]. data (), b,
-	 params. get_T_u () * sizeof (std::complex<float>));
- helper. lock ();
+ memcpy (command [blkno]. data(), b,
+	 params. get_T_u() * sizeof (std::complex<float>));
+ helper. lock();
 amount ++;
- commandHandler. wakeOne ();
- helper. unlock ();
+ commandHandler. wakeOne();
+ helper. unlock();
 }
 
-void mscHandler::run (void) {
+void mscHandler::run() {
 int	currentBlock	= 0;
 std::vector<int16_t> ibits;
 
 	running. store (true);
 	ibits. resize (BitsperBlock);
- while (running. load ()) {
- helper. lock ();
+ while (running. load()) {
+ helper. lock();
 commandHandler. wait (&helper, 100);
- helper. unlock ();
- while ((amount > 0) && running. load ()) {
-	 memcpy (fft_buffer, command [currentBlock]. data (),
-	 params. get_T_u () * sizeof (std::complex<float>));
+ helper. unlock();
+ while ((amount > 0) && running. load()) {
+	 memcpy (fft_buffer, command [currentBlock]. data(),
+	 params. get_T_u() * sizeof (std::complex<float>));
 //
 //	block 3 and up are needed as basis for demodulation the "mext" block
 //	"our" msc blocks start with blkno 4
-	 my_fftHandler. do_FFT ();
+	 my_fftHandler. do_FFT();
 if (currentBlock >= 4) {
- for (int i = 0; i < params. get_carriers (); i ++) {
+ for (int i = 0; i < params. get_carriers(); i ++) {
 int16_t index = myMapper. mapIn (i);
 if (index < 0)
- index += params. get_T_u ();
+ index += params. get_T_u();
 
 std::complex<float> r1 = fft_buffer [index] *
 conj (phaseReference [index]);
@@ -128,46 +128,45 @@
 // 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 * 127.0;
- ibits [params. get_carriers () + i]
+ ibits [params. get_carriers() + i]
 	 = - imag (r1) / ab1 * 127.0;
 }
 
 	 process_mscBlock (ibits, currentBlock);
 	 }
-	 memcpy (phaseReference. data (), fft_buffer,
-	 params. get_T_u () * sizeof (std::complex<float>));
+	 memcpy (phaseReference. data(), fft_buffer,
+	 params. get_T_u() * sizeof (std::complex<float>));
 bufferSpace. release (1);
- helper. lock ();
+ helper. lock();
 currentBlock = (currentBlock + 1) % (nrBlocks);
 amount -= 1;
- helper. unlock ();
+ helper. unlock();
 }
 }
 }
 //	This function is to be called between invocations of
 //	services
 //	It might be called several times, so ...
-void	mscHandler::reset	(void) {
-int i;
+void	mscHandler::reset() {
 	running. store (false);
-	while (isRunning ())
+	while (isRunning())
 	 usleep (100);
-	locker. lock ();
+	locker. lock();
 	work_to_be_done. store (false);
 	for (auto const &b : theBackends) {
-	 b -> stopRunning ();
+	 b -> stopRunning();
 	 delete b;
 	}
 	theBackends. resize (0);
 
-	bufferSpace. release (nrBlocks - bufferSpace. available ());
+	bufferSpace. release (nrBlocks - bufferSpace. available());
 	amount	= 0;
-	locker. unlock ();
-	start ();
+	locker. unlock();
+	start();
 }
 
-void	mscHandler::stop	(void) {
-	reset ();
+void	mscHandler::stop() {
+	reset();
 }
 //
 //	Note, the set_Channel function is called from within a
@@ -178,7 +177,7 @@
 void	mscHandler::set_Channel (descriptorType *d,
 	 RingBuffer<int16_t> *audioBuffer,
 	 RingBuffer<uint8_t> *dataBuffer) {
-	locker. lock ();
+	locker. lock();
 //
 	theBackends. push_back (new Backend (myRadioInterface,
 	 d,
@@ -186,7 +185,7 @@
 	 dataBuffer,
 	 picturesPath));
 	work_to_be_done. store (true);
-	locker. unlock ();
+	locker. unlock();
 }
 
 //
@@ -201,22 +200,21 @@
 void	mscHandler::process_mscBlock	(std::vector<int16_t> fbits,
 	 int16_t blkno) {

_service:download_url:qt-dab-2.5.tar.gz/src/backend/reed-solomon.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/reed-solomon.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/backend/rscodec.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/backend/rscodec.cpp Changed

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

@@ -100,13 +100,13 @@
 //
 class	service {
 public:
-	service	(void) {
-	 clear ();
+	service() {
+	 clear();
 	}
-	~service	(void) {
-		clear ();
+	~service() {
+		clear();
 	}
-	void		clear	(void) {
+	void		clear() {
 	 inUse	= false;
 	 hasName	= false;
 	 language	= 0;
@@ -127,13 +127,13 @@
 
 class ensembleDescriptor {
 public:
-	ensembleDescriptor (void) {
-	 clear ();
+	ensembleDescriptor() {
+	 clear();
 	 for (int i = 0; i < 64; i ++)
-	 services [i]. clear ();
+	 services [i]. clear();
 	}
-	~ensembleDescriptor	(void) {}
-	void		clear (void) {
+	~ensembleDescriptor() {}
+	void		clear() {
 	 namePresent	= false;
 	 ecc_Present	= false;
 	 isSynced	= false;
@@ -149,11 +149,11 @@
 
 class	subChannelDescriptor {
 public:
-	subChannelDescriptor	(void) {
-	 clear ();
+	subChannelDescriptor() {
+	 clear();
 	}
-	~subChannelDescriptor	(void) {}
-	void		clear (void) {
+	~subChannelDescriptor() {}
+	void		clear() {
 	 inUse	= false;
 	 language	= 0;
 	 FEC_scheme	= 0;
@@ -175,11 +175,11 @@
 // audio and data are quite different
 class	serviceComponentDescriptor {
 public:
-	serviceComponentDescriptor	(void) {
-	 clear	();
+	serviceComponentDescriptor() {
+	 clear();
 	}
-	~serviceComponentDescriptor	(void) {}
-	void		clear		(void) {
+	~serviceComponentDescriptor() {}
+	void		clear() {
 	 inUse		= false;
 	 is_madePublic	= false;
 	 SCIds		= -1;
@@ -210,23 +210,51 @@
 //	The implementation of the services is in service components
 //	and subchannels. We prepare - a little - for the possibility
 //	that the transmitter changes the configuration while running
+class	Cluster {
+	public:
+	 uint16_t flags;
+	 std::vector<uint16_t> services;
+	 bool	inUse;
+	 int	announcing;
+	Cluster () {
+	 flags	= 0;
+	 services. resize (0);
+	 inUse	= false;
+	 announcing	= 0;
+	}
+	~Cluster () {
+	 flags	= 0;
+	 services. resize (0);
+	 inUse	= false;
+	 announcing	= 0;
+	}
+};
+
 class	dataBase {
 public:
-	dataBase	(void) {
-	 clear ();
+	dataBase() {
+	 clear();
 	}
-	~dataBase	(void) {
-	 clear ();
+	~dataBase() {
+	 clear();
 	}
-	void	clear	(void) {
+	void	clear() {
 	int i;
 	 for (i = 0; i < 64; i ++) {
-	 subChannels [i]. clear ();
-	 serviceComps [i]. clear ();
+	 subChannels [i]. clear();
+	 serviceComps [i]. clear();
 	 }
 	}
+	Cluster	*getCluster (int16_t clusterId) {
+	 if (clusterTable [clusterId]. inUse)
+	 return &(clusterTable [clusterId]);
+
+	 clusterTable [clusterId]. inUse	= true;
+	 return &(clusterTable [clusterId]);
+	}
 	subChannelDescriptor subChannels [64];
 	serviceComponentDescriptor serviceComps [64];
+	Cluster			clusterTable [64];
 };
 
 //
@@ -243,19 +271,24 @@
 	 myRadioInterface, SLOT (showTime (const QString &)));
 	connect (this, SIGNAL (changeinConfiguration (void)),
 	 myRadioInterface, SLOT (changeinConfiguration (void)));
-	currentBase	= new dataBase ();
-	nextBase	= new dataBase ();
-	ensemble	= new ensembleDescriptor ();
+	connect (this, SIGNAL (startAnnouncement (const QString &, int)),
+	 myRadioInterface, SLOT (startAnnouncement (const QString &, int)));
+	connect (this, SIGNAL (stopAnnouncement (const QString &, int)),
+	 myRadioInterface, SLOT (stopAnnouncement (const QString &, int)));
+
+	currentBase	= new dataBase();
+	nextBase	= new dataBase();
+	ensemble	= new ensembleDescriptor();
 	CIFcount	= 0;
 }
 	
-	fibDecoder::~fibDecoder (void) {
+	fibDecoder::~fibDecoder() {
 	delete	nextBase;
 	delete	currentBase;
 	delete	ensemble;
 }
 
-void	fibDecoder::newFrame (void) {
+void	fibDecoder::newFrame() {
 }
 
 //
@@ -266,7 +299,7 @@
 int8_t	processedBytes	= 0;
 uint8_t	*d		= p;
 
-	fibLocker. lock ();
+	fibLocker. lock();
 	(void)fib;
 	while (processedBytes < 30) {
 	 uint8_t FIGtype	= getBits_3 (d, 0);
@@ -299,7 +332,7 @@
 //	 processedBytes += getBits (p, 3, 5) + 1;
 	 d = p + processedBytes * 8;
 	}
-	fibLocker. unlock ();
+	fibLocker. unlock();
 }
 //
 //
@@ -376,11 +409,11 @@
 	 break;
 
 	 case 18:		// announcement support (8.1.6.1)
-	 FIG0Extension18 (d);
+//	 FIG0Extension18 (d);
 	 break;
 
 	 case 19:		// announcement switching (8.1.6.2)
-	 FIG0Extension19 (d);
+//	 FIG0Extension19 (d);
 	 break;
 
 	 case 20:		// service component information (8.1.4)
@@ -441,6 +474,8 @@
 	highpart = getBits_5 (d, 16 + 19) % 20;
 	(void)highpart;
 	lowpart = getBits_8 (d, 16 + 24) % 250;
+	(void)changeFlag;
+	(void)alarmFlag;
 	(void)lowpart;
 	occurrenceChange = getBits_8 (d, 16 + 32);
 	(void)occurrenceChange;

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/fic-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/fic-handler.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/freq-interleaver.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/freq-interleaver.cpp Changed

@@ -20,8 +20,8 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #
-#include	<stdint.h>
-#include	<stdio.h>
+#include	<cstdint>
+#include	<cstdio>
 #include	"freq-interleaver.h"
 #include	"dab-params.h"
 
@@ -57,32 +57,32 @@
 
 	interLeaver::interLeaver (uint8_t mode): p (mode) {
 
-	int32_t T_u		= p. get_T_u ();
-	int32_t	carriers	= p. get_carriers ();
+	int32_t T_u		= p. get_T_u();
+	int32_t	carriers	= p. get_carriers();
 	permTable. resize (T_u);
 
 	switch (mode) {
 	 case 1:
 	 default:		// shouldn't happen
-	 createMapper (T_u, 511, 256, 256 + carriers, permTable. data ());
+	 createMapper (T_u, 511, 256, 256 + carriers, permTable. data());
 	 break;
 
 	 case 2:
-	 createMapper (T_u, 127, 64, 64 + carriers, permTable. data ());
+	 createMapper (T_u, 127, 64, 64 + carriers, permTable. data());
 	 break;
 
 	 case 3:
-	 createMapper (T_u, 63, 32, 32 + carriers, permTable. data ());
+	 createMapper (T_u, 63, 32, 32 + carriers, permTable. data());
 	 break;
 
 	 case 4:
-	 createMapper (T_u, 255, 128, 128 + carriers, permTable. data ());
+	 createMapper (T_u, 255, 128, 128 + carriers, permTable. data());
 	 break;
 	}
 }
 //
 //
-	interLeaver::~interLeaver (void) {
+	interLeaver::~interLeaver() {
 }
 //
 //	according to the standard, the map is a function from

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/ofdm-decoder.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/ofdm-decoder.cpp Changed

@@ -47,7 +47,6 @@
 	 params (dabMode),
 	 my_fftHandler (dabMode),
 	 myMapper (dabMode) {
-int16_t	i;
 	this	-> myRadioInterface	= mr;
 	this	-> iqBuffer		= iqBuffer;
 	connect (this, SIGNAL (showIQ (int)),
@@ -55,13 +54,13 @@
 	connect (this, SIGNAL (showQuality (float)),
 	 myRadioInterface, SLOT (showQuality (float)));
 //
-	this	-> T_s			= params. get_T_s ();
-	this	-> T_u			= params. get_T_u ();
-	this	-> nrBlocks		= params. get_L ();
-	this	-> carriers		= params. get_carriers ();
+	this	-> T_s			= params. get_T_s();
+	this	-> T_u			= params. get_T_u();
+	this	-> nrBlocks		= params. get_L();
+	this	-> carriers		= params. get_carriers();
 
 	this	-> T_g			= T_s - T_u;
-	fft_buffer			= my_fftHandler. getVector ();
+	fft_buffer			= my_fftHandler. getVector();
 	phaseReference			.resize (T_u);
 
 	connect (this, SIGNAL (show_snr (int)),
@@ -70,22 +69,22 @@
 	snr			= 0;	
 }
 
-	ofdmDecoder::~ofdmDecoder	(void) {
+	ofdmDecoder::~ofdmDecoder() {
 }
 //
-void	ofdmDecoder::stop	(void) {
+void	ofdmDecoder::stop() {
 }
 
-void	ofdmDecoder::reset	(void) {
+void	ofdmDecoder::reset() {
 }
 
 /**
 */
 void	ofdmDecoder::processBlock_0 (std::vector <std::complex<float> > buffer) {
-	memcpy (fft_buffer, buffer. data (),
+	memcpy (fft_buffer, buffer. data(),
 	 T_u * sizeof (std::complex<float>));
 
-	my_fftHandler. do_FFT ();
+	my_fftHandler. do_FFT();
 /**
 *	The SNR is determined by looking at a segment of bins
 *	within the signal region and bits outside.
@@ -101,7 +100,7 @@
 *	we are now in the frequency domain, and we keep the carriers
 *	as coming from the FFT as phase reference.
 */
-	memcpy (phaseReference. data (), fft_buffer,
+	memcpy (phaseReference. data(), fft_buffer,
 	 T_u * sizeof (std::complex<float>));
 }
 //
@@ -145,22 +144,22 @@
 void	ofdmDecoder::decode (std::vector <std::complex<float>> buffer,
 	 int32_t blkno, int16_t *ibits) {
 int16_t	i;
-	memcpy (fft_buffer, &((buffer. data ()) [T_g]),
-	 T_u * sizeof (std::complex<float>));
 std::complex<float> conjVector [T_u];
-std::complex<float> freqOff	= std::complex<float> (0, 0);
+	memcpy (fft_buffer, &((buffer. data()) [T_g]),
+	 T_u * sizeof (std::complex<float>));
 
-fftlabel:
+//fftlabel:
 /**
 *	first step: do the FFT
 */
-	my_fftHandler. do_FFT ();
+	my_fftHandler. do_FFT();
+	 
 /**
 *	a little optimization: we do not interchange the
 *	positive/negative frequencies to their right positions.
 *	The de-interleaving understands this
 */
-toBitsLabel:
+//toBitsLabel:
 /**
 *	Note that from here on, we are only interested in the
 *	"carriers", the useful carriers of the FFT output
@@ -184,7 +183,8 @@
 	 ibits [i]		= - real (r1) / ab1 * 127.0;
 	 ibits [carriers + i] = - imag (r1) / ab1 * 127.0;
 	}
-	memcpy (phaseReference. data (), fft_buffer,
+
+	memcpy (phaseReference. data(), fft_buffer,
 	 T_u * sizeof (std::complex<float>));
 //	From time to time we show the constellation of symbol 2.
 	if (blkno == 2) {

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/phasereference.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/phasereference.cpp Changed

@@ -20,7 +20,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include	"phasereference.h" 
-#include	"string.h"
+#include	<cstring>
 #include	"radio.h"
 #include	<vector>
 /**
@@ -42,25 +42,26 @@
 	 my_fftHandler (dabMode) {
 int32_t	i;
 float	Phi_k;
-FILE	*tableFile;
 
 	this	-> response	= b;
 	this	-> threshold	= threshold;
 	this	-> diff_length	= diff_length;
 	this	-> depth	= depth;
-	this	-> T_u		= params. get_T_u ();
-	this	-> carriers	= params. get_carriers ();
-
+	this	-> T_u		= params. get_T_u();
+	this	-> T_g		= params. get_T_g();
+	this	-> carriers	= params. get_carriers();
+	
 	refTable.		resize (T_u);
 	phaseDifferences. resize (diff_length);
-	fft_buffer		= my_fftHandler. getVector ();
+	fft_buffer		= my_fftHandler. getVector();
 
-	framesperSecond		= 2048000 / params. get_T_F ();
+	framesperSecond		= 2048000 / params. get_T_F();
 	displayCounter		= 0;
+	
+	for (i = 0; i < T_u; i ++)
+	 refTable [i] = std::complex<float> (0, 0);
 
-	memset (refTable. data (), 0, sizeof (std::complex<float>) * T_u);
-
-	for (i = 1; i <= params. get_carriers () / 2; i ++) {
+	for (i = 1; i <= params. get_carriers() / 2; i ++) {
 	 Phi_k = get_Phi (i);
 	 refTable [i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
 	 Phi_k = get_Phi (-i);
@@ -81,7 +82,7 @@
 	 mr, SLOT (showIndex (int)));
 }
 
-	phaseReference::~phaseReference (void) {
+	phaseReference::~phaseReference() {
 }
 
 /**
@@ -94,46 +95,54 @@
 *	looking for.
 */
 
-int32_t	phaseReference::findIndex (std::vector <std::complex<float>> v) {
+int32_t	phaseReference::findIndex (std::vector <std::complex<float>> v,
+	 int threshold ) {
 int32_t	i;
 int32_t	maxIndex	= -1;
-int32_t	oldIndex	= -1;
 float	sum		= 0;
 float	Max		= -1000;
-float	lbuf [T_u];
-float	mbuf [T_u];
+float	lbuf [T_u / 2];
+float	mbuf [T_u / 2];
 std::vector<int> resultVector;
 
-	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
-	my_fftHandler. do_FFT ();
+	memcpy (fft_buffer, v. data(), T_u * sizeof (std::complex<float>));
+	my_fftHandler. do_FFT();
 //
 //	into the frequency domain, now correlate
 	for (i = 0; i < T_u; i ++) 
 	 fft_buffer [i] *= conj (refTable [i]);
 //	and, again, back into the time domain
-	my_fftHandler. do_IFFT ();
+	my_fftHandler. do_IFFT();
 /**
 *	We compute the average and the max signal values
 */
-	for (i = 0; i < T_u; i ++) {
+	for (i = 0; i < T_u / 2; i ++) {
 	 lbuf [i] = jan_abs (fft_buffer [i]);
 	 mbuf [i] = lbuf [i];
 	 sum	+= lbuf [i];
-	 if (lbuf [i] > Max) {
-	 maxIndex = i;
-	 Max = lbuf [i];
+	}
+	
+
+	sum /= T_u / 2;
+//	
+	for (i = 0; i < 100; i ++) {
+	 if (lbuf [T_g - 80 + i] > Max) {
+	 maxIndex = T_g - 80 + i;
+	 Max = lbuf [T_g - 80 + i];
 	 }
 	}
 
-	if (Max < threshold * sum / T_u) 
-	 return (- abs (Max * T_u / sum) - 1);
+	if (Max / sum < threshold) {
+	 return (- abs (Max / sum) - 1);
+	}
 	else 
 	 resultVector. push_back (maxIndex);	
 
+//	fprintf (stderr, "%f (%d)\n", Max / sum, maxIndex);
+	float MMax = 0;
 	for (int k = 0; k < depth; k ++) {
-	 float MMax = 4 * threshold * sum / T_u;
 	 int	lIndex = -1;
-	 for (i = 0; i < T_u / 2; i ++) {
+	 for (i = T_g - 100; i < T_u / 2; i ++) {
 	 if (lbuf [i] > MMax) {
 	 MMax = lbuf [i];
 	 lIndex = i;
@@ -148,14 +157,14 @@
 	 break;
 	}
 
-	if (response != NULL) {
+	if (response != nullptr) {
 	 if (++displayCounter > framesperSecond / 4) {
-	 response	-> putDataIntoBuffer (mbuf, T_u);
-	 showImpulse (T_u);
+	 response	-> putDataIntoBuffer (mbuf, T_u / 2);
+	 showImpulse (T_u / 2);
 	 displayCounter	= 0;
 	 if (resultVector. at (0) > 0) {
 	 showIndex (-1);
-	 for (i = 1; i < resultVector. size (); i ++)
+	 for (i = 1; i < (int)(resultVector. size()); i ++)
 	 showIndex (resultVector. at (i));
 	 showIndex (0);
 	 }
@@ -163,49 +172,17 @@
 	}
 	return resultVector. at (0);
 }
-
-//
-//	The intuitive approach (at least mine) was to correlate the
-//	incoming data with the reference table. It did not work
-//	which is actually logical, since (a) the amplitudes are not
-//	discriminating and (b) the phases might be really off
-//#define	SEARCH_RANGE	(2 * 35)
-//int16_t	phaseReference::estimate_CarrierOffset (std::vector<std::complex<float>> v) {
-//int16_t	i, j;
-//std::complex<float> temp;
-//float	maxCorr	= 0;
-//int	maxIndex = -1;
 //
-//	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
-//	my_fftHandler. do_FFT ();
-//
-//	for (i = T_u - SEARCH_RANGE / 2;
-//	 i < T_u + SEARCH_RANGE / 2; i ++) {
-//	 temp = std::complex<float> (0, 0);
-//	 for (j = 0; j < diff_length; j ++)
-//	 temp += fft_buffer [(i + j) % T_u] *
-//	 conj (refTable [(T_u - SEARCH_RANGE / 2 + j) % T_u]);
-//	 if (abs (temp) > maxCorr) {
-//	 maxIndex = i - (T_u - SEARCH_RANGE / 2);
-//	 maxCorr = abs (temp);
-//	 }
-//	}
-//
-//	return maxIndex;
-//}
-
 //
 //	an approach that works fine is to correlate the phasedifferences
 //	between subsequent carriers
 #define	SEARCH_RANGE	(2 * 35)
 int16_t	phaseReference::estimate_CarrierOffset (std::vector<std::complex<float>> v) {
 int16_t	i, j, index = 100;
-float	diff;
 float	computedDiffs [SEARCH_RANGE + diff_length + 1];
-int	index_1	= 0;
 
-	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
-	my_fftHandler. do_FFT ();
+	memcpy (fft_buffer, v. data(), T_u * sizeof (std::complex<float>));
+	my_fftHandler. do_FFT();
 
 	for (i = T_u - SEARCH_RANGE / 2;
 	 i < T_u + SEARCH_RANGE / 2 + diff_length; i ++) 
@@ -237,7 +214,7 @@
 //	on the fly
 #define	LLENGTH	100
 float	phaseReference::estimate_FrequencyOffset (std::vector <std::complex<float>> v) {
-int16_t	i, j;

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/phasetable.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/phasetable.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/sample-reader.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/sample-reader.cpp Changed

@@ -58,11 +58,11 @@
 	corrector	= 0;
 	dumpfilePointer. store (nullptr);
 	dumpIndex	= 0;
-	dumpScale	= valueFor (theRig -> bitDepth ());
+	dumpScale	= valueFor (theRig -> bitDepth());
 	running. store (true);
 }
 
-	sampleReader::~sampleReader (void) {
+	sampleReader::~sampleReader() {
 	delete[] oscillatorTable;
 }
 
@@ -70,7 +70,7 @@
 	running. store (b);
 }
 
-float	sampleReader::get_sLevel (void) {
+float	sampleReader::get_sLevel() {
 	return sLevel;
 }
 
@@ -78,29 +78,29 @@
 std::complex<float> temp;
 
 	corrector	= phaseOffset;
-	if (!running. load ())
+	if (!running. load())
 	 throw 21;
 
-///	bufferContent is an indicator for the value of ... -> Samples ()
+///	bufferContent is an indicator for the value of ... -> Samples()
 	if (bufferContent == 0) {
-	 bufferContent = theRig -> Samples ();
-	 while ((bufferContent <= 2048) && running. load ()) {
+	 bufferContent = theRig -> Samples();
+	 while ((bufferContent <= 2048) && running. load()) {
 	 usleep (10);
-	 bufferContent = theRig -> Samples (); 
+	 bufferContent = theRig -> Samples(); 
 	 }
 	}
 
-	if (!running. load ())	
+	if (!running. load())	
 	 throw 20;
 //
 //	so here, bufferContent > 0
 	theRig -> getSamples (&temp, 1);
 	bufferContent --;
-	if (dumpfilePointer. load () != nullptr) {
+	if (dumpfilePointer. load() != nullptr) {
 	 dumpBuffer [2 * dumpIndex ] = real (temp) * dumpScale;
 	 dumpBuffer [2 * dumpIndex + 1] = imag (temp) * dumpScale;
 	 if ( ++dumpIndex >= DUMPSIZE / 2) {
-	 sf_writef_short (dumpfilePointer. load (),
+	 sf_writef_short (dumpfilePointer. load(),
 	 dumpBuffer, dumpIndex);
 	 dumpIndex = 0;
 	 }
@@ -121,7 +121,7 @@
 	 show_Corrector	(corrector);
 	 sampleCount = 0;
 	 if (spectrumBuffer != nullptr) {
- spectrumBuffer -> putDataIntoBuffer (localBuffer. data (),
+ spectrumBuffer -> putDataIntoBuffer (localBuffer. data(),
 	 localCounter);
 emit show_Spectrum (bufferSize);
 	 }
@@ -135,28 +135,28 @@
 int32_t		i;
 
 	corrector	= phaseOffset;
-	if (!running. load ())
+	if (!running. load())
 	 throw 21;
 	if (n > bufferContent) {
-	 bufferContent = theRig -> Samples ();
-	 while ((bufferContent < n) && running. load ()) {
+	 bufferContent = theRig -> Samples();
+	 while ((bufferContent < n) && running. load()) {
 	 usleep (10);
-	 bufferContent = theRig -> Samples ();
+	 bufferContent = theRig -> Samples();
 	 }
 	}
 
-	if (!running. load ())	
+	if (!running. load())	
 	 throw 20;
 //
 //	so here, bufferContent >= n
 	n	= theRig -> getSamples (v, n);
 	bufferContent -= n;
-	if (dumpfilePointer. load () != nullptr) {
+	if (dumpfilePointer. load() != nullptr) {
 	 for (i = 0; i < n; i ++) {
 	 dumpBuffer [2 * dumpIndex ] = real (v [i]) * dumpScale;
 	 dumpBuffer [2 * dumpIndex + 1] = imag (v [i]) * dumpScale;
 	 if (++dumpIndex >= DUMPSIZE / 2) {
-	 sf_writef_short (dumpfilePointer. load (),
+	 sf_writef_short (dumpfilePointer. load(),
 	 dumpBuffer, dumpIndex);
 	 dumpIndex = 0;
 	 }
@@ -180,7 +180,7 @@
 	if (sampleCount > INPUT_RATE / N) {
 	 show_Corrector	(corrector);
 	 if (spectrumBuffer != nullptr) {
-	 spectrumBuffer -> putDataIntoBuffer (localBuffer. data (),
+	 spectrumBuffer -> putDataIntoBuffer (localBuffer. data(),
 	 bufferSize);
 	 emit show_Spectrum (bufferSize);
 	 }
@@ -193,7 +193,7 @@
 	dumpfilePointer. store (f);
 }
 
-void	sampleReader::stopDumping (void) {
+void	sampleReader::stopDumping() {
 	dumpfilePointer. store (nullptr);
 }

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

@@ -21,8 +21,8 @@
 */
 
 #include	"tii_detector.h"
-#include	<stdio.h>
-#include	<inttypes.h>
+#include	<cstdio>
+#include	<cinttypes>
 //
 
 static
@@ -109,16 +109,14 @@
 		TII_Detector::TII_Detector (uint8_t dabMode, int16_t depth):
 	 params (dabMode),
 	 my_fftHandler (dabMode) {
-int16_t	p, c, k;
 int16_t	i;
-float	Phi_k;
 
 	this	-> depth	= depth;
-	this	-> T_u		= params. get_T_u ();
-	carriers		= params. get_carriers ();
+	this	-> T_u		= params. get_T_u();
+	carriers		= params. get_carriers();
 	theBuffer. resize	(T_u);
 	fillCount		= 0;
-	fft_buffer		= my_fftHandler. getVector ();	
+	fft_buffer		= my_fftHandler. getVector();	
 	window. resize 		(T_u);
 	for (i = 0; i < T_u; i ++)
 	 window [i] = (0.42 -
@@ -131,12 +129,13 @@
 	 invTable [table [i]] = i;
 }
 
-		TII_Detector::~TII_Detector (void) {
+		TII_Detector::~TII_Detector() {
 }
 
 
-void	TII_Detector::reset (void) {
-	memset (theBuffer. data (), 0, T_u * sizeof (std::complex<float>));
+void	TII_Detector::reset() {
+	for (int i = 0; i < T_u; i ++)
+	 theBuffer [i] = std::complex<float> (0, 0);
 }
 
 //	To eliminate (reduce?) noise in the input signal, we might
@@ -146,7 +145,7 @@
 
 	for (i = 0; i < T_u; i ++)
 	 fft_buffer [i] = cmul (v [i], window [i]);
-	my_fftHandler. do_FFT ();
+	my_fftHandler. do_FFT();
 
 	for (i = 0; i < T_u; i ++)
 	 theBuffer [i] = cmul (theBuffer [i], 0.9) +
@@ -180,7 +179,7 @@
 
 #define	NUM_GROUPS	8
 #define	GROUPSIZE	24
-std::vector<int>	TII_Detector::processNULL (void) {
+std::vector<int>	TII_Detector::processNULL() {
 int i, j;
 float	hulpTable	[NUM_GROUPS * GROUPSIZE];
 float	C_table		[GROUPSIZE];	// contains the values
@@ -196,7 +195,7 @@
 //	Each "value" is the sum of 4 pairs of subsequent carriers,
 //	taken from the 4 quadrants -768 .. 385, 384 .. -1, 1 .. 384, 385 .. 768
 
-	collapse (theBuffer. data (), hulpTable);
+	collapse (theBuffer. data(), hulpTable);
 //
 //	since the "energy levels" in the different GROUPSIZE'd values
 //	may differ, we compute an average for each of the

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/tii_table.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/tii_table.cpp Changed

@@ -37,41 +37,41 @@
 //	 mr, SLOT (show_tiiLabel (int)));
 }
 
-	tii_table::~tii_table (void) {
+	tii_table::~tii_table() {
 }
 
-void	tii_table::cleanUp (void) {
-	tiiLocker. lock ();
-	offsets. clear ();
+void	tii_table::cleanUp() {
+	tiiLocker. lock();
+	offsets. clear();
 	mainId		= -1;
-	tiiLocker. unlock ();
+	tiiLocker. unlock();
 //	show_tiiLabel (mainId);
 }
 
 void	tii_table::add_main	(int16_t mainId,
 	 float latitude, float longitude) {
-	tiiLocker. lock ();
+	tiiLocker. lock();
 	if (this -> mainId > 0) {
-	 tiiLocker. unlock ();
+	 tiiLocker. unlock();
 	 return;
 	}
 	this	-> mainId	= mainId;
 	this	-> latitude	= latitude;
 	this	-> longitude	= longitude;
-	tiiLocker. unlock ();
+	tiiLocker. unlock();
 //	show_tiiLabel (mainId);
 }
 
 void	tii_table::add_element (tii_element *t) {
 int16_t i;
-	tiiLocker. lock ();
+	tiiLocker. lock();
 	if (this -> mainId < 0) {
-	 tiiLocker. unlock ();
+	 tiiLocker. unlock();
 	 return;
 	}
-	for (i = 0; i < (int16_t) offsets. size (); i ++)
+	for (i = 0; i < (int16_t) offsets. size(); i ++)
 	 if (offsets [i]. subId == t -> subId) {
-	 tiiLocker. unlock ();
+	 tiiLocker. unlock();
 	 return;
 	 }
 	fprintf (stderr, "transmitter %d at\t(%f %f)\n",
@@ -79,7 +79,7 @@
 	 latitude + t -> latitudeOffset,
 	 longitude + t -> longitudeOffset);
 	offsets. push_back (*t);
-	tiiLocker. unlock ();
+	tiiLocker. unlock();
 	
 }
 
@@ -89,53 +89,53 @@
 int16_t i;
 float x, y;
 
-	tiiLocker. lock ();
+	tiiLocker. lock();
 	*success	= false;
 	if (this -> mainId != mainId) {
-	 tiiLocker. unlock ();
+	 tiiLocker. unlock();
 	 return std::complex<float> (0, 0);
 	}
 
-//	print_coordinates ();
-	for (i = 0; i < (int16_t) offsets. size (); i ++) {
+//	print_coordinates();
+	for (i = 0; i < (int16_t) offsets. size(); i ++) {
 	 if (offsets [i]. subId != subId)
 	 continue;
 	 x	= latitude + offsets [i]. latitudeOffset;
 	 y	= longitude + offsets [i]. longitudeOffset;
 	
 	 *success = true;
-	 tiiLocker. unlock ();
+	 tiiLocker. unlock();
 	 return std::complex<float> (x, y);
 	}
-	tiiLocker. unlock ();
+	tiiLocker. unlock();
 	return std::complex<float> (0, 0);
 }
 
-void	tii_table::print_coordinates	(void) {
+void	tii_table::print_coordinates() {
 int16_t	i;
 
-	tiiLocker. lock ();
+	tiiLocker. lock();
 	if (mainId < 0) {
-	 tiiLocker. unlock ();
+	 tiiLocker. unlock();
 	 return;
 	}
 
 	fprintf (stderr, "mainId = %d\n", mainId);
 	fprintf (stderr, "Transmitter coordinates (%f %f)\n",
 	 latitude, longitude);
-	for (i = 0; i < (int16_t)offsets. size (); i ++) {
+	for (i = 0; i < (int16_t)offsets. size(); i ++) {
 	 float x	= latitude + offsets [i]. latitudeOffset;
 	 float y	= longitude + offsets [i]. longitudeOffset;
 	 fprintf (stderr, "%d\t-> %f\t%f\n", offsets [i]. subId, x, y);
 	}
-	tiiLocker. unlock ();
+	tiiLocker. unlock();
 }
 
-int16_t	tii_table::get_mainId	(void) {
+int16_t	tii_table::get_mainId() {
 int16_t m;
-	tiiLocker. lock ();
+	tiiLocker. lock();
 	m	= mainId;
-	tiiLocker. unlock ();
+	tiiLocker. unlock();
 	return m;
 }

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/timesyncer.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/timesyncer.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/output/Qt-audio.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/output/Qt-audio.cpp Changed

@@ -33,12 +33,12 @@
 	Buffer		= new RingBuffer<float> (8 * 32768);
 	outputRate	= 48000;	// default
 	theAudioDevice	= new Qt_AudioDevice (Buffer, this);
-	theAudioOutput	= NULL;
+	theAudioOutput	= nullptr;
 	setParams (outputRate);
 }
 
 	Qt_Audio::~Qt_Audio(void) {
-	if (theAudioOutput != NULL)
+	if (theAudioOutput != nullptr)
 	 delete	theAudioOutput;
 	delete	theAudioDevice;
 	delete	Buffer;
@@ -47,15 +47,15 @@
 //	Note that audioBase functions have - if needed - the rate
 //	converted. This functions overrides the one in audioBase
 void	Qt_Audio::audioOutput (float *fragment, int32_t size) {
-	if (theAudioDevice != NULL) {
+	if (theAudioDevice != nullptr) {
 	 Buffer -> putDataIntoBuffer (fragment, 2 * size);
 	}
 }
 
 void	Qt_Audio::setParams (int outputRate) {
-	if (theAudioOutput != NULL) {
+	if (theAudioOutput != nullptr) {
 	 delete theAudioOutput;
-	 theAudioOutput = NULL;
+	 theAudioOutput = nullptr;
 	}
 
 	AudioFormat. setSampleRate	(outputRate);
@@ -65,7 +65,7 @@
 	AudioFormat. setByteOrder	(QAudioFormat::LittleEndian);
 	AudioFormat. setSampleType	(QAudioFormat::Float);
 
-	QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice ());
+	QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
 	if (!info. isFormatSupported(AudioFormat)) {
 	 fprintf (stderr, "Audio: Sorry, format cannot be handled");
 	 return;
@@ -75,21 +75,21 @@
 	connect (theAudioOutput, SIGNAL (stateChanged (QAudio::State)),
 	 this, SLOT (handleStateChanged (QAudio::State)));
 
-	restart ();
-	currentState = theAudioOutput -> state ();
+	restart();
+	currentState = theAudioOutput -> state();
 }
 
 void	Qt_Audio::stop (void) {
-	if (theAudioDevice == NULL)
+	if (theAudioDevice == nullptr)
 	 return;
-	theAudioDevice	-> stop ();
+	theAudioDevice	-> stop();
 	theAudioOutput	-> stop();
 }
 
 void	Qt_Audio::restart	(void) {
-	if (theAudioDevice == NULL)
+	if (theAudioDevice == nullptr)
 	 return;
-	theAudioDevice	-> start ();
+	theAudioDevice	-> start();
 	theAudioOutput	-> start (theAudioDevice);
 }

_service:download_url:qt-dab-2.5.tar.gz/src/output/Qt-audiodevice.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/output/Qt-audiodevice.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/output/audio-base.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/output/audio-base.cpp Changed

@@ -22,7 +22,7 @@
 */
 
 #include	"audio-base.h"
-#include	<stdio.h>
+#include	<cstdio>
 
 /*
 *	The class is the abstract sink for the data generated
@@ -30,20 +30,20 @@
 *	someone else will handle the PCM samples, all made
 *	on a rate of 48000
 */
-	audioBase::audioBase	(void):
+	audioBase::audioBase():
 	 converter_16 (16000, 48000, 2 * 1600),
 	 converter_24 (24000, 48000, 2 * 2400),
 	 converter_32 (32000, 48000, 2 * 3200) {
-	dumpFile		= NULL;
+	dumpFile		= nullptr;
 }
 
-	audioBase::~audioBase	(void) {
+	audioBase::~audioBase() {
 }
 
-void	audioBase::restart	(void) {
+void	audioBase::restart() {
 }
 
-void	audioBase::stop	(void) {
+void	audioBase::stop() {
 }
 //
 //	This one is a hack for handling different baudrates coming from
@@ -72,8 +72,8 @@
 //	scale up from 16 -> 48
 //	amount gives number of pairs
 void	audioBase::audioOut_16000	(int16_t *V, int32_t amount) {
-std::complex<float> outputBuffer [converter_16. getOutputsize ()];
-float buffer [2 * converter_16. getOutputsize ()];
+std::complex<float> outputBuffer [converter_16. getOutputsize()];
+float buffer [2 * converter_16. getOutputsize()];
 int16_t	i, j;
 int32_t	result;
 
@@ -87,10 +87,10 @@
 	 buffer [2 * j + 1] = imag (outputBuffer [j]);
 	 }
 	 
-	 myLocker. lock ();
-	 if (dumpFile != NULL)
+	 myLocker. lock();
+	 if (dumpFile != nullptr)
 	 sf_writef_float (dumpFile, (float *)buffer, result);
-	 myLocker. unlock ();
+	 myLocker. unlock();
 
 	 audioOutput (buffer, result);
 	 }
@@ -99,8 +99,8 @@
 //	scale up from 24000 -> 48000
 //	amount gives number of pairs
 void	audioBase::audioOut_24000	(int16_t *V, int32_t amount) {
-std::complex<float> outputBuffer [converter_24. getOutputsize ()];
-float buffer [2 * converter_24. getOutputsize ()];
+std::complex<float> outputBuffer [converter_24. getOutputsize()];
+float buffer [2 * converter_24. getOutputsize()];
 int16_t	i, j;
 int32_t	result;
 
@@ -114,10 +114,10 @@
 	 buffer [2 * j + 1] = imag (outputBuffer [j]);
 	 }
 	 
-	 myLocker. lock ();
-	 if (dumpFile != NULL)
+	 myLocker. lock();
+	 if (dumpFile != nullptr)
 	 sf_writef_float (dumpFile, (float *)buffer, result);
-	 myLocker. unlock ();
+	 myLocker. unlock();
 
 	 audioOutput (buffer, result);
 	 }
@@ -126,8 +126,8 @@
 //	scale up from 32000 -> 48000
 //	amount is number of pairs
 void	audioBase::audioOut_32000	(int16_t *V, int32_t amount) {
-std::complex<float> outputBuffer [converter_32. getOutputsize ()];
-float buffer [2 * converter_32. getOutputsize ()];
+std::complex<float> outputBuffer [converter_32. getOutputsize()];
+float buffer [2 * converter_32. getOutputsize()];
 int32_t	i, j;
 int32_t	result;
 
@@ -141,10 +141,10 @@
 	 buffer [2 * j + 1] = imag (outputBuffer [j]);
 	 }
 	 
-	 myLocker. lock ();
-	 if (dumpFile != NULL)
+	 myLocker. lock();
+	 if (dumpFile != nullptr)
 	 sf_writef_float (dumpFile, (float *)buffer, result);
-	 myLocker. unlock ();
+	 myLocker. unlock();
 //	 fprintf (stderr, "result %d\n", result);
 	 audioOutput (buffer, result);
 	 }
@@ -160,25 +160,25 @@
 	 buffer [2 * i + 1]	= V [2 * i + 1] / 32767.0;
 	}
 
-	myLocker. lock ();
-	if (dumpFile != NULL)
+	myLocker. lock();
+	if (dumpFile != nullptr)
 	 sf_writef_float (dumpFile, (float *)buffer, amount);
-	myLocker. unlock ();
+	myLocker. unlock();
 	audioOutput (buffer, amount);
 }
 //
 //	we ensure that no one is fiddling with the dumpfile
 //	while we are writing
 void	audioBase::startDumping	(SNDFILE *f) {
-	myLocker. lock ();
+	myLocker. lock();
 	dumpFile	= f;
-	myLocker. unlock ();
+	myLocker. unlock();
 }
 
-void	audioBase::stopDumping	(void) {
-	myLocker. lock ();
-	dumpFile	= NULL;
-	myLocker. unlock ();
+void	audioBase::stopDumping() {
+	myLocker. lock();
+	dumpFile	= nullptr;
+	myLocker. unlock();
 }
 
 //

_service:download_url:qt-dab-2.5.tar.gz/src/output/audiosink.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/output/audiosink.cpp Changed

@@ -22,7 +22,7 @@
 */
 
 #include	"audiosink.h"
-#include	<stdio.h>
+#include	<cstdio>
 #include	<QDebug>
 #include	<QMessageBox>
 #include	<QComboBox>
@@ -37,27 +37,27 @@
 	_O_Buffer		= new RingBuffer<float>(4 * 32768);
 	portAudio		= false;
 	writerRunning		= false;
-	if (Pa_Initialize () != paNoError) {
+	if (Pa_Initialize() != paNoError) {
 	 fprintf (stderr, "Initializing Pa for output failed\n");
 	 return;
 	}
 
 	portAudio	= true;
 
-	qDebug ("Hostapis: %d\n", Pa_GetHostApiCount ());
+	qDebug ("Hostapis: %d\n", Pa_GetHostApiCount());
 
-	for (i = 0; i < Pa_GetHostApiCount (); i ++)
+	for (i = 0; i < Pa_GetHostApiCount(); i ++)
 	 qDebug ("Api %d is %s\n", i, Pa_GetHostApiInfo (i) -> name);
 
-	numofDevices	= Pa_GetDeviceCount ();
+	numofDevices	= Pa_GetDeviceCount();
 	outTable	= new int16_t [numofDevices + 1];
 	for (i = 0; i < numofDevices; i ++)
 	 outTable [i] = -1;
-	ostream		= NULL;
+	ostream		= nullptr;
 }
 
-	audioSink::~audioSink	(void) {
-	if ((ostream != NULL) && !Pa_IsStreamStopped (ostream)) {
+	audioSink::~audioSink() {
+	if ((ostream != nullptr) && !Pa_IsStreamStopped (ostream)) {
 	 paCallbackReturn = paAbort;
 	 (void) Pa_AbortStream (ostream);
 	 while (!Pa_IsStreamStopped (ostream))
@@ -65,11 +65,11 @@
 	 writerRunning = false;
 	}
 
-	if (ostream != NULL)
+	if (ostream != nullptr)
 	 Pa_CloseStream (ostream);
 
 	if (portAudio)
-	 Pa_Terminate ();
+	 Pa_Terminate();
 
 	delete	_O_Buffer;
 	delete[] outTable;
@@ -88,7 +88,7 @@
 	 return false;
 	}
 
-	if ((ostream != NULL) && !Pa_IsStreamStopped (ostream)) {
+	if ((ostream != nullptr) && !Pa_IsStreamStopped (ostream)) {
 	 paCallbackReturn = paAbort;
 	 (void) Pa_AbortStream (ostream);
 	 while (!Pa_IsStreamStopped (ostream))
@@ -96,7 +96,7 @@
 	 writerRunning = false;
 	}
 
-	if (ostream != NULL)
+	if (ostream != nullptr)
 	 Pa_CloseStream (ostream);
 
 	outputParameters. device		= outputDevice;
@@ -113,11 +113,11 @@
 	
 //	bufSize	= latency * 512;
 
-	outputParameters. hostApiSpecificStreamInfo = NULL;
+	outputParameters. hostApiSpecificStreamInfo = nullptr;
 //
 	fprintf (stderr, "Suggested size for outputbuffer = %d\n", bufSize);
 	err = Pa_OpenStream (&ostream,
-	 NULL,
+	 nullptr,
 	 &outputParameters,
 	 CardRate,
 	 bufSize,
@@ -142,20 +142,20 @@
 	return true;
 }
 
-void	audioSink::restart	(void) {
+void	audioSink::restart() {
 PaError err;
 
 	if (!Pa_IsStreamStopped (ostream))
 	 return;
 
-	_O_Buffer	-> FlushRingBuffer ();
+	_O_Buffer	-> FlushRingBuffer();
 	paCallbackReturn = paContinue;
 	err = Pa_StartStream (ostream);
 	if (err == paNoError)
 	 writerRunning	= true;
 }
 
-void	audioSink::stop	(void) {
+void	audioSink::stop() {
 	if (Pa_IsStreamStopped (ostream))
 	 return;
 
@@ -175,9 +175,9 @@
 	outputParameters -> channelCount	= 2;	/* I and Q	*/
 	outputParameters -> sampleFormat	= paFloat32;
 	outputParameters -> suggestedLatency	= 0;
-	outputParameters -> hostApiSpecificStreamInfo = NULL;
+	outputParameters -> hostApiSpecificStreamInfo = nullptr;
 
-	return Pa_IsFormatSupported (NULL, outputParameters, Rate) ==
+	return Pa_IsFormatSupported (nullptr, outputParameters, Rate) ==
 	 paFormatIsSupported;
 }
 /*
@@ -211,7 +211,7 @@
 	return ud -> paCallbackReturn;
 }
 
-int32_t	audioSink::missed	(void) {
+int32_t	audioSink::missed() {
 int32_t	h	= theMissed;
 	theMissed = 0;
 	return h / 2;
@@ -229,7 +229,7 @@
 	 return name;
 
 	deviceInfo = Pa_GetDeviceInfo (ch);
-	if (deviceInfo == NULL)
+	if (deviceInfo == nullptr)
 	 return name;
 	if (deviceInfo -> maxOutputChannels <= 0)
 	 return name;
@@ -239,7 +239,7 @@
 	return name;
 }
 
-int16_t	audioSink::invalidDevice	(void) {
+int16_t	audioSink::invalidDevice() {
 	return numofDevices + 128;
 }
 
@@ -247,11 +247,11 @@
 	return 0 <= dev && dev < numofDevices;
 }
 
-bool	audioSink::selectDefaultDevice (void) {
-	return selectDevice (Pa_GetDefaultOutputDevice ());
+bool	audioSink::selectDefaultDevice() {
+	return selectDevice (Pa_GetDefaultOutputDevice());
 }
 
-int32_t	audioSink::cardRate	(void) {
+int32_t	audioSink::cardRate() {
 	return 48000;
 }
 
@@ -268,17 +268,17 @@
 	 streamOutSelector -> insertItem (ocnt, so, QVariant (i));
 	 outTable [ocnt] = i;
 	 qDebug (" (output):item %d wordt stream %d (%s)\n", ocnt , i,
-	 so. toLatin1 ().data ());
+	 so. toLatin1().data());
 	 ocnt ++;
 	 }
 	}
 
-	qDebug () << "added items to combobox";
+	qDebug() << "added items to combobox";
 	return ocnt > 1;
 }
 
 //
-int16_t	audioSink::numberofDevices	(void) {
+int16_t	audioSink::numberofDevices() {
 	return numofDevices;
 }

_service:download_url:qt-dab-2.5.tar.gz/src/output/newconverter.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/output/newconverter.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/output/tcp-streamer.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/output/tcp-streamer.cpp Changed

@@ -47,9 +47,9 @@
 	 return;
 	}
 
-	streamerAddress = streamer. nextPendingConnection ();
-	QHostAddress s = streamerAddress -> peerAddress ();
-	fprintf (stderr, "Accepted a client %s\n", s.toString (). toLatin1 (). data ());
+	streamerAddress = streamer. nextPendingConnection();
+	QHostAddress s = streamerAddress -> peerAddress();
+	fprintf (stderr, "Accepted a client %s\n", s.toString(). toLatin1(). data());
 	connected	= true;
 }
 
@@ -64,8 +64,8 @@
 	if (!connected)
 	 return;
 	buffer -> putDataIntoBuffer (b, 2 * amount);
-	if (buffer -> GetRingBufferReadAvailable () > bufferSize)
-	 emit handleSamples ();
+	if (buffer -> GetRingBufferReadAvailable() > bufferSize)
+	 emit handleSamples();
 }
 
 
@@ -75,13 +75,13 @@
 int16_t	i;
 int32_t		amount;
 	if (!connected) {
-	 buffer -> FlushRingBuffer ();
+	 buffer -> FlushRingBuffer();
 	 return;
 	}
 //	an encoded sample takes 2 input values and delivers 4 bytes
 //	It is assumed that the "sound values" do not exceed 16 bits
 	datagram. resize (2 * bufferSize);
-	while (buffer -> GetRingBufferReadAvailable () > bufferSize) {
+	while (buffer -> GetRingBufferReadAvailable() > bufferSize) {
 	 amount = buffer -> getDataFromBuffer (localBuffer, bufferSize);
 	 for (i = 0; i < amount / 2; i ++) {
 	 int16_t re = localBuffer [2 * i] * largeValue;
@@ -93,16 +93,16 @@
 	 datagram [4 * i + 3] = (im & 0x00FF) & 0xFF;
 	 }
 
-	 if (streamerAddress -> state () ==
+	 if (streamerAddress -> state() ==
 	 QAbstractSocket::UnconnectedState) {
 	 fprintf (stderr, "unconnected state\n");
-	 streamer. close ();
+	 streamer. close();
 	 streamer. listen (QHostAddress::Any, port);
 	 connected	= false;
 	 return;
 	 }
 
-	 streamerAddress -> write (datagram. data (), datagram. size ());
+	 streamerAddress -> write (datagram. data(), datagram. size());
 	}
 }

_service:download_url:qt-dab-2.5.tar.gz/src/protection/eep-protection.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/protection/eep-protection.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/protection/protection.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/protection/protection.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/protection/uep-protection.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/protection/uep-protection.cpp Changed

@@ -155,7 +155,8 @@
 int8_t *PI4;
 int8_t *PI_X;
 
-	fprintf (stderr, "protLevel %d, bitRate %d\n", protLevel, bitRate);
+	fprintf (stderr, "protLevel %d, bitRate %d outSize = %d\n",
+	 protLevel, bitRate, outSize);
 	index	= findIndex (bitRate, protLevel);
 	if (index == -1) {
 	 fprintf (stderr, "%d (%d) has a problem\n", bitRate, protLevel);
@@ -178,7 +179,7 @@
 	PI_X	= get_PCodes (8 - 1);
 //
 //	We prepare a mapping table with the given punctures
-	memset (indexTable. data (), 0, (4 * outSize + 24) * sizeof (uint8_t));
+	memset (indexTable. data(), 0, (4 * outSize + 24) * sizeof (uint8_t));
 	for (i = 0; i < L1; i ++) {
 	 for (j = 0; j < 128; j ++) {
 	 if (PI1 [j % 32] != 0) 
@@ -223,7 +224,7 @@
 	}
 }
 
-	uep_protection::~uep_protection (void) {
+	uep_protection::~uep_protection() {
 }
 
 bool	uep_protection::deconvolve (int16_t *v,
@@ -233,13 +234,13 @@
 int16_t	inputCounter	= 0;
 //	clear the bits in the viterbiBlock,
 //	only the non-punctured ones are set
-	memset (viterbiBlock. data (), 0,
+	memset (viterbiBlock. data(), 0,
 	 (outSize * 4 + 24) * sizeof (int16_t)); 
 ///	The actual deconvolution is done by the viterbi decoder
 
 	for (i = 0; i < outSize * 4 + 24; i ++)
 	 if (indexTable [i])
 	 viterbiBlock [i] = v [inputCounter ++];
-	viterbiHandler::deconvolve (viterbiBlock. data (), outBuffer);
+	viterbiHandler::deconvolve (viterbiBlock. data(), outBuffer);
 	return true;
 }

_service:download_url:qt-dab-2.5.tar.gz/src/scopes-qwt6/iqdisplay.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/scopes-qwt6/iqdisplay.cpp Changed

@@ -25,10 +25,10 @@
 /*
 *	iq circle plotter
 */
-SpectrogramData	*IQData	= NULL;
+SpectrogramData	*IQData	= nullptr;
 
 	IQDisplay::IQDisplay (QwtPlot *plot, int16_t x):
-	 QwtPlotSpectrogram () {
+	 QwtPlotSpectrogram() {
 QwtLinearColorMap *colorMap = new QwtLinearColorMap (Qt::black, Qt::white);
 
 	setRenderThreadCount	(1);
@@ -37,27 +37,27 @@
 	x_amount	= x;
 	CycleCount	= 0;
 	Points. resize (x_amount);
-	memset (Points. data (), 0, x_amount * sizeof (std::complex<float>));
+	memset (Points. data(), 0, x_amount * sizeof (std::complex<float>));
 	this		-> setColorMap (colorMap);
 	plotData. resize (2 * Radius * 2 * Radius);
 	plot2.	 resize (2 * Radius * 2 * Radius);
-	memset (plotData. data (), 0,
+	memset (plotData. data(), 0,
 	 2 * 2 * Radius * Radius * sizeof (double));
-	IQData		= new SpectrogramData (plot2. data (),
+	IQData		= new SpectrogramData (plot2. data(),
 	 0,
 	 2 * Radius,
 	 2 * Radius,
 	 2 * Radius,
 	 50.0);
 	this		-> setData (IQData);
-	plot		-> enableAxis (QwtPlot::xBottom, 0);
-	plot		-> enableAxis (QwtPlot::yLeft, 0);
+	plot		-> enableAxis (QwtPlot::xBottom, false);
+	plot		-> enableAxis (QwtPlot::yLeft, false);
 	this		-> setDisplayMode (QwtPlotSpectrogram::ImageMode, true);
 	plotgrid	-> replot();
 }
 
-	IQDisplay::~IQDisplay () {
-	this		-> detach ();
+	IQDisplay::~IQDisplay() {
+	this		-> detach();
 //	delete		IQData;
 }
 
@@ -87,9 +87,9 @@
 	 plotData [(x + Radius - 1) * 2 * Radius + y + Radius - 1] = 100;
 	}
 
-	memcpy (plot2. data (), plotData. data (),
+	memcpy (plot2. data(), plotData. data(),
 	 2 * 2 * Radius * Radius * sizeof (double));
-	this		-> detach	();
+	this		-> detach();
 	this		-> setData	(IQData);
 	this		-> setDisplayMode (QwtPlotSpectrogram::ImageMode, true);
 	this		-> attach (plotgrid);

_service:download_url:qt-dab-2.5.tar.gz/src/support/band-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/support/band-handler.cpp Changed

@@ -68,7 +68,7 @@
 {"13D",	235776},
 {"13E",	237488},
 {"13F",	239200},
-{NULL, 0}
+{nullptr, 0}
 };
 
 static
@@ -89,16 +89,16 @@
 {"LN", 1475216},
 {"LO", 1476928},
 {"LP", 1478640},
-{NULL, 0}
+{nullptr, 0}
 };
 
-	bandHandler::bandHandler (void) {}
-	bandHandler::~bandHandler (void) {}
+	bandHandler::bandHandler() {}
+	bandHandler::~bandHandler() {}
 
 void	bandHandler::setupChannels (QComboBox *s, uint8_t band) {
 struct dabFrequencies *t;
 int16_t	i;
-int16_t	c	= s -> count ();
+int16_t	c	= s -> count();
 
 //	clear the fields in the comboBox
 	for (i = 0; i < c; i ++) 
@@ -109,7 +109,7 @@
 	else
 	 t = Lband_frequencies;
 
-	for (i = 0; t [i]. key != NULL; i ++) 
+	for (i = 0; t [i]. key != nullptr; i ++) 
 	 s -> insertItem (i, t [i]. key, QVariant (i));
 }
 
@@ -125,7 +125,7 @@
 	else
 	 finger = Lband_frequencies;
 
-	for (i = 0; finger [i]. key != NULL; i ++) {
+	for (i = 0; finger [i]. key != nullptr; i ++) {
 	 if (finger [i]. key == Channel) {
 	 tunedFrequency	= KHz (finger [i]. fKHz);
 	 break;

_service:download_url:qt-dab-2.5.tar.gz/src/support/dab-params.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/support/dab-params.cpp Changed

@@ -79,47 +79,47 @@
 	}
 }
 
-	dabParams::~dabParams (void) {
+	dabParams::~dabParams() {
 }
 
-int16_t	dabParams::get_dabMode (void) {
+int16_t	dabParams::get_dabMode() {
 	return dabMode;
 }
 
-int16_t dabParams::get_L (void) {
+int16_t dabParams::get_L() {
 	return L;
 }
 
-int16_t	dabParams::get_carriers (void) {
+int16_t	dabParams::get_carriers() {
 	return K;
 }
 
 
-int16_t	dabParams::get_T_null (void) {
+int16_t	dabParams::get_T_null() {
 	return T_null;
 }
 
-int16_t	dabParams::get_T_s (void) {
+int16_t	dabParams::get_T_s() {
 	return T_s;
 }
 
-int16_t	dabParams::get_T_u (void) {
+int16_t	dabParams::get_T_u() {
 	return T_u;
 }
 
-int16_t	dabParams::get_T_g (void) {
+int16_t	dabParams::get_T_g() {
 	return T_g;
 }
 
-int32_t	dabParams::get_T_F (void) {
+int32_t	dabParams::get_T_F() {
 	return T_F;
 }
 
-int32_t	dabParams::get_carrierDiff (void) {
+int32_t	dabParams::get_carrierDiff() {
 	return carrierDiff;
 }
 
-int16_t	dabParams::get_CIFs	(void) {
+int16_t	dabParams::get_CIFs() {
 	return CIFs;
 }

_service:download_url:qt-dab-2.5.tar.gz/src/support/dab_tables.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/support/dab_tables.cpp Changed

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

@@ -19,7 +19,7 @@
 * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include	<stdio.h>
+#include	<cstdio>
 #include	<QStringList>
 #include	"ensemble-printer.h"
 #include	"country-codes.h"
@@ -28,17 +28,17 @@
 #include	"dab-processor.h"
 
 static
-const char *uep_rates [] = {NULL, "7/20", "2/5", "1/2", "3/5"};
+const char *uep_rates [] = {nullptr, "7/20", "2/5", "1/2", "3/5"};
 static
-const char *eep_Arates [] = {NULL, "1/4", "3/8", "1/2", "3/4"};
+const char *eep_Arates [] = {nullptr, "1/4", "3/8", "1/2", "3/4"};
 static
-const char *eep_Brates [] = {NULL, "4/9", "4/7", "4/6", "4/5"};
+const char *eep_Brates [] = {nullptr, "4/9", "4/7", "4/6", "4/5"};
 
 
-		ensemblePrinter:: ensemblePrinter	(void) {
+		ensemblePrinter:: ensemblePrinter() {
 }
 
-		ensemblePrinter::~ensemblePrinter	(void) {
+		ensemblePrinter::~ensemblePrinter() {
 }
 
 QString		ensemblePrinter::code_to_string (uint8_t ecc,
@@ -62,9 +62,9 @@
 uint8_t	countryId;
 int16_t	i;
 textMapper	theMapper;
-uint8_t ecc_byte	= my_dabProcessor -> get_ecc ();
-QString	ensembleLabel	= my_dabProcessor -> get_ensembleName ();
-int32_t	ensembleId	= my_dabProcessor -> get_ensembleId ();
+uint8_t ecc_byte	= my_dabProcessor -> get_ecc();
+QString	ensembleLabel	= my_dabProcessor -> get_ensembleName();
+int32_t	ensembleId	= my_dabProcessor -> get_ensembleId();
 QString currentChannel	= channel;
 int32_t	frequency	= freq;
 bool	firstData;
@@ -73,9 +73,9 @@
 	 return;
 
 	fprintf (file_P, "%s; ensembleId %X; channel %s; frequency %d; \n\n",
-	 ensembleLabel. toUtf8 (). data (),
+	 ensembleLabel. toUtf8(). data(),
 	 ensembleId,
-	 currentChannel. toUtf8 (). data (),
+	 currentChannel. toUtf8(). data(),
 	 frequency / 1000);
 	 
 	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");
@@ -91,16 +91,16 @@
 	 d. protLevel);
 	 countryId = (d. serviceId >> 12) & 0xF;
 	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%s;%s;%s;%s;%s;\n",
-	 audioService. toUtf8(). data (),
-	 code_to_string (ecc_byte, countryId). toUtf8 (). data (),
+	 audioService. toUtf8(). data(),
+	 code_to_string (ecc_byte, countryId). toUtf8(). data(),
 	 d. serviceId,
 	 d. subchId,
 	 d. startAddr,
 	 d. length,
 	 d. bitRate,
 	 d. ASCTy == 077 ? "DAB+" : "DAB",
-	 protL. toUtf8 (). data (),
-	 codeRate. toUtf8 (). data (),
+	 protL. toUtf8(). data(),
+	 codeRate. toUtf8(). data(),
 	 theMapper. get_programm_language_string (d. language),
 	 theMapper. get_programm_type_string (d. programType) );
 	 }
@@ -142,15 +142,15 @@
 	 }
 	 countryId = (d. serviceId >> (5 * 4)) & 0xF;
 	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%d;%s;%d;%s;;\n",
-	 dataService. toUtf8 (). data (),
-	 code_to_string (ecc_byte, countryId). toUtf8 (). data (),
+	 dataService. toUtf8(). data(),
+	 code_to_string (ecc_byte, countryId). toUtf8(). data(),
 	 d. serviceId,
 	 d. subchId,
 	 d. startAddr,
 	 d. length,
 	 d. bitRate,
 	 d. FEC_scheme,
-	 protL. toUtf8 (). data (),
+	 protL. toUtf8(). data(),
 	 d. appType,
 	 d. compnr == 0 ? "no": "yes");
 	 }

_service:download_url:qt-dab-2.5.tar.gz/src/support/fft-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/support/fft-handler.cpp Changed

@@ -30,7 +30,7 @@
 //	it seems some locking there is inevitable
 //
 	fftHandler::fftHandler (uint8_t mode): p (mode) {
-	this	-> fftSize = p. get_T_u ();
+	this	-> fftSize = p. get_T_u();
 	vector	= (std::complex<float> *)
 	 FFTW_MALLOC (sizeof (std::complex<float>) * fftSize);
 	plan	= FFTW_PLAN_DFT_1D (fftSize,
@@ -39,22 +39,22 @@
 	 FFTW_FORWARD, FFTW_ESTIMATE);
 }
 
-	fftHandler::~fftHandler (void) {
+	fftHandler::~fftHandler() {
 	 FFTW_DESTROY_PLAN (plan);
 	 FFTW_FREE (vector);
 }
 
-std::complex<float>	*fftHandler::getVector (void) {
+std::complex<float>	*fftHandler::getVector() {
 	return vector;
 }
 
-void	fftHandler::do_FFT (void) {
+void	fftHandler::do_FFT() {
 	FFTW_EXECUTE (plan);
 }
 //
 //	Note that we do not scale here, not needed
 //	for the purpose we are using it for
-void	fftHandler::do_IFFT (void) {
+void	fftHandler::do_IFFT() {
 int16_t i;
 
 	for (i = 0; i < fftSize; i ++)
@@ -78,16 +78,16 @@
 	 FFTW_BACKWARD, FFTW_ESTIMATE);
 }
 
-	common_ifft::~common_ifft (void) {
+	common_ifft::~common_ifft() {
 	 FFTW_DESTROY_PLAN (plan);
 	 FFTW_FREE (vector);
 }
 
-std::complex<float>	*common_ifft::getVector () {
+std::complex<float>	*common_ifft::getVector() {
 	return vector;
 }
 
-void	common_ifft::do_IFFT (void) {
+void	common_ifft::do_IFFT() {
 	FFTW_EXECUTE	(plan);
 }

_service:download_url:qt-dab-2.5.tar.gz/src/support/text-mapper.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/support/text-mapper.cpp Changed

_service:download_url:qt-dab-2.5.tar.gz/src/support/viterbi-jan/viterbi-handler.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/src/support/viterbi-jan/viterbi-handler.cpp Changed

@@ -22,7 +22,7 @@
 */
 
 #include	"viterbi-handler.h"
-#include	<stdio.h>
+#include	<cstdio>
 
 #define	K	7
 #define	Poly1	0133
@@ -79,10 +79,10 @@
 // to an index, used in computing the costs
 	for (i = 0; i < 2 * numofStates; i ++)
 	 indexTable [i] = (int16_t) (
- ((poly1_table [i] != 0) ? 8 : 0) +
- ((poly2_table [i] != 0) ? 4 : 0) +
- ((poly3_table [i] != 0) ? 2 : 0) +
- ((poly4_table [i] != 0) ? 1 : 0));
+	 ((poly1_table [i] != 0) ? 8 : 0) +
+	 ((poly2_table [i] != 0) ? 4 : 0) +
+	 ((poly3_table [i] != 0) ? 2 : 0) +
+	 ((poly4_table [i] != 0) ? 1 : 0));
 
 	for (i = 0; i < numofStates; i ++) {
 	 predecessor_for_0 [i] = ((i << 1) + 00) & (numofStates - 1);
@@ -90,8 +90,7 @@
 	}
 }
 
-	viterbiHandler::~viterbiHandler (void) {
-int	i;
+	viterbiHandler::~viterbiHandler() {
 //
 	for (int i = 0; i < blockLength + 6; i++) {
 	 delete [] transCosts [i];
@@ -105,24 +104,24 @@
 //	Note that the soft bits are such that
 //	they are int16_t -255 -> (bit)1, +255 -> (bit)0
 void	viterbiHandler::computeCostTable (int16_t sym_0,
- int16_t sym_1,
+	 int16_t sym_1,
 	 int16_t sym_2, int16_t sym_3) {
- costTable [0] = - sym_0 - sym_1 - sym_2 - sym_3;
- costTable [1] = - sym_0 - sym_1 - sym_2 + sym_3;
- costTable [2] = - sym_0 - sym_1 + sym_2 - sym_3;
- costTable [3] = - sym_0 - sym_1 + sym_2 + sym_3;
- costTable [4] = - sym_0 + sym_1 - sym_2 - sym_3;
- costTable [5] = - sym_0 + sym_1 - sym_2 + sym_3;
- costTable [6] = - sym_0 + sym_1 + sym_2 - sym_3;
- costTable [7] = - sym_0 + sym_1 + sym_2 + sym_3;
- costTable [8] = + sym_0 - sym_1 - sym_2 - sym_3;
- costTable [9] = + sym_0 - sym_1 - sym_2 + sym_3;
- costTable [10] = + sym_0 - sym_1 + sym_2 - sym_3;
- costTable [11] = + sym_0 - sym_1 + sym_2 + sym_3;
- costTable [12] = + sym_0 + sym_1 - sym_2 - sym_3;
- costTable [13] = + sym_0 + sym_1 - sym_2 + sym_3;
- costTable [14] = + sym_0 + sym_1 + sym_2 - sym_3;
- costTable [15] = + sym_0 + sym_1 + sym_2 + sym_3;
+	costTable [0] = - sym_0 - sym_1 - sym_2 - sym_3;
+	costTable [1] = - sym_0 - sym_1 - sym_2 + sym_3;
+	costTable [2] = - sym_0 - sym_1 + sym_2 - sym_3;
+	costTable [3] = - sym_0 - sym_1 + sym_2 + sym_3;
+	costTable [4] = - sym_0 + sym_1 - sym_2 - sym_3;
+	costTable [5] = - sym_0 + sym_1 - sym_2 + sym_3;
+	costTable [6] = - sym_0 + sym_1 + sym_2 - sym_3;
+	costTable [7] = - sym_0 + sym_1 + sym_2 + sym_3;
+	costTable [8] = + sym_0 - sym_1 - sym_2 - sym_3;
+	costTable [9] = + sym_0 - sym_1 - sym_2 + sym_3;
+	costTable [10] = + sym_0 - sym_1 + sym_2 - sym_3;
+	costTable [11] = + sym_0 - sym_1 + sym_2 + sym_3;
+	costTable [12] = + sym_0 + sym_1 - sym_2 - sym_3;
+	costTable [13] = + sym_0 + sym_1 - sym_2 + sym_3;
+	costTable [14] = + sym_0 + sym_1 + sym_2 - sym_3;
+	costTable [15] = + sym_0 + sym_1 + sym_2 + sym_3;
 }
 
 // block is the sequence of soft bits
@@ -138,18 +137,18 @@
 // and remain zero
 
 	for (i = 1; i < blockLength + 6; i ++) {
- int16_t	sym_0 = (int16_t)(- sym [4 * (i - 1) + 0]);
- int16_t	sym_1 = (int16_t)(- sym [4 * (i - 1) + 1]);
- int16_t	sym_2 = (int16_t)(- sym [4 * (i - 1) + 2]);
- int16_t	sym_3 = (int16_t)(- sym [4 * (i - 1) + 3]);
+	 int16_t	sym_0 = (int16_t)(- sym [4 * (i - 1) + 0]);
+	 int16_t	sym_1 = (int16_t)(- sym [4 * (i - 1) + 1]);
+	 int16_t	sym_2 = (int16_t)(- sym [4 * (i - 1) + 2]);
+	 int16_t	sym_3 = (int16_t)(- sym [4 * (i - 1) + 3]);
 	 int	*transCosts_i	= transCosts [i];
 	 int	*history_i	= history [i];
 
 	 computeCostTable (sym_0, sym_1, sym_2, sym_3);
- for (int cState = 0; cState < numofStates / 2; cState ++) {
- uint8_t entrybit = 0;
- prev_0 = predecessor_for_0 [cState];
- prev_1 = predecessor_for_1 [cState];
+	 for (int cState = 0; cState < numofStates / 2; cState ++) {
+//	 uint8_t entrybit = 0;
+	 prev_0 = predecessor_for_0 [cState];
+	 prev_1 = predecessor_for_1 [cState];
 // we compute the minimal costs, based on the costs of the
 // prev states, and the additional costs of arriving from
 // the previous state to the current state with the symbol "sym"
@@ -170,7 +169,7 @@
 
 	 for (int cState = numofStates / 2;
 	 cState < numofStates; cState ++) {
- uint8_t entrybit = 1;
+// uint8_t entrybit = 1;
 	 prev_0 = predecessor_for_0 [cState];
 	 prev_1 = predecessor_for_1 [cState];
 
@@ -183,15 +182,15 @@
 	 costs_0 = transCosts [i - 1] [prev_0] +
 	 costTable [indexTable [prev_0 + numofStates]];
 	 costs_1 = transCosts [i - 1] [prev_1] +
- costTable [indexTable [prev_1 + numofStates]];
+	 costTable [indexTable [prev_1 + numofStates]];
 	 if (costs_0 < costs_1) {
 	 transCosts_i [cState] = costs_0;
 	 history_i [cState] = prev_0;
 	 } else {
 	 transCosts_i [cState] = costs_1;
 	 history_i [cState] = prev_1;
- }
- }
+	 }
+	 }
 	}
 
 // Once all costs are computed, we can look for the minimal cost
@@ -227,7 +226,6 @@
 uint8_t	viterbiHandler::bitFor (int state, int poly, int bit) {
 int theRegister;
 uint8_t resBit = 0;
-int	i;
 //
 // the register after shifting "bit" in would be:
 	theRegister = bit == 0 ? state : (state + numofStates);

_service:download_url:qt-dab-2.5.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-2.7.1.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -41,12 +41,12 @@
 	curveColor			= QColor (colorString);
 
 	displaySize			= 1024;
-	this	-> myFrame		= new QFrame (NULL);
+	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
 
-	this	-> myFrame	-> hide ();
+	this	-> myFrame	-> hide();
 	displayBuffer. resize (displaySize);
-	memset (displayBuffer. data (), 0, displaySize * sizeof (double));
+	memset (displayBuffer. data(), 0, displaySize * sizeof (double));
 	this	-> spectrumSize	= 4 * displaySize;
 	spectrum		= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
 plan = fftwf_plan_dft_1d (spectrumSize,
@@ -80,7 +80,7 @@
 	spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);
 	
-	Marker		= new QwtPlotMarker ();
+	Marker		= new QwtPlotMarker();
 	Marker		-> setLineStyle (QwtPlotMarker::VLine);
 	Marker		-> setLinePen (QPen (Qt::red));
 	Marker		-> attach (plotgrid);
@@ -94,10 +94,10 @@
 	setBitDepth	(12);
 }
 
-	tiiViewer::~tiiViewer	(void) {
+ tiiViewer::~tiiViewer() {
 	fftwf_destroy_plan (plan);
 	fftwf_free	(spectrum);
-	myFrame		-> hide ();
+	myFrame		-> hide();
 	delete		Marker;
 	delete		ourBrush;
 	delete		spectrumCurve;
@@ -105,21 +105,21 @@
 	delete		myFrame;
 }
 
-void	tiiViewer::clear		(void) {
+void	tiiViewer::clear() {
 	secondariesDisplay	-> setText (" ");
 }
 
 void	tiiViewer::showSecondaries	(std::vector<int> data) {
-	if (myFrame	-> isHidden ())
+	if (myFrame	-> isHidden())
 	 return;
 
-	if (data. size () == 0) {
+	if (data. size() == 0) {
 	 secondariesDisplay	-> setText (" ");
 	 return;
 	}
 
 	QString t	= "transmitter IDs ";
-	for (int i = 0; i < data. size (); i ++) {
+	for (int i = 0; i < data. size(); i ++) {
 	 int mainId	= data. at (i) >> 8;
 	 int subId	= data. at (i) & 0xFF;
 	 char temp [255];
@@ -138,12 +138,12 @@
 
 	 
 	(void)amount;
-	if (tiiBuffer -> GetRingBufferReadAvailable () < spectrumSize)
+	if (tiiBuffer -> GetRingBufferReadAvailable() < spectrumSize)
 	 return;
 
 	tiiBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
-	tiiBuffer	-> FlushRingBuffer ();
-	if (myFrame	-> isHidden ())
+	tiiBuffer	-> FlushRingBuffer();
+	if (myFrame	-> isHidden())
 	 return;
 //	and window it
 //	first X axis labels
@@ -183,9 +183,9 @@
 	}
 
 	memcpy (Y_values,
-	 displayBuffer. data (), displaySize * sizeof (double));
+	 displayBuffer. data(), displaySize * sizeof (double));
 	ViewSpectrum (X_axis, Y_values,
-	 AmplificationSlider -> value (),
+	 AmplificationSlider -> value(),
 	 0 / 1000);
 }
 
@@ -231,16 +231,16 @@
 	 normalizer <<= 1;
 }
 
-void	tiiViewer::show		(void) {
-	myFrame	-> show ();
+void	tiiViewer::show() {
+	myFrame	-> show();
 }
 
-void	tiiViewer::hide		(void) {
-	myFrame	-> hide ();
+void	tiiViewer::hide() {
+	myFrame	-> hide();
 }
 
-bool	tiiViewer::isHidden	(void) {
-	return myFrame -> isHidden ();
+bool	tiiViewer::isHidden() {
+	return myFrame -> isHidden();
 }

_service:download_url:qt-dab-2.5.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-2.7.1.tar.gz/tii-viewer/tii-viewer.h Changed

_service:download_url:qt-dab-2.5.tar.gz/travis.yml-qt4 -> _service:download_url:qt-dab-2.7.1.tar.gz/travis.yml-qt4 Changed

Changes of Revision 12