Packman Build Service PMBS

dab-mini.changes Changed

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.7.1.tar.gz/.travis.yml -> _service:download_url:qt-dab-3.7.2.tar.gz/.travis.yml Changed

_service:download_url:qt-dab-3.7.1.tar.gz/README.md -> _service:download_url:qt-dab-3.7.2.tar.gz/README.md Changed

@@ -1,6 +1,6 @@
-# Qt-DAB-3.71 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-3.72 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.71 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini and brother dab-2 for experimenting, all built on the same set of sources.
+Qt-DAB-3.72 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
 
 ![overview](/qt-dab-screen.png?raw=true)
 
@@ -33,7 +33,7 @@
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.71** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-3.72** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
 It provides an abundant amount of selectors and displays, most of
 which can be switched off, but are of interest for those who want to see aspects of the DAB signal.
@@ -89,7 +89,7 @@
    	- SDR DAB sticks (RTL2838U or similar), 
 	- HACKRF One, 
   	- Airspy, including Airspy mini,
-  	- SDRplay ( RSP I, RSP II, RSP Duo and RSP Dx), with separate entries for v2 and v3 library
+  	- SDRplay (RSP I, RSP II, RSP Duo and RSP Dx), with separate entries for v2 and v3 library
 	- limeSDR, 
 	- Soapy (experimental, Linux only), 
 	- ExtIO (expertimental, Windows only),
@@ -457,14 +457,14 @@
 on the time table are two hours off.
 
 -----------------------------------------------------------------------
-Recording the SNR
+* [Recording the SNR](#Recording-the-SNR)
 -----------------------------------------------------------------------
 
 Just as an experiment, a widget was added that shows the development of the 
 SNR over time. The main purpose of the widget is to look at the
 performance of antennas. 
 
-Computation of the SNR is done with every second DAB frame. As is known,
+Computation of the SNR is done with all DAB frames. As is known,
 a sampled DAB frame starts with a null period of app 2600 samples, followed by
 76 blocks (each about 2500 samples) with data. SNR is computed as the ratio between the amplitudes in the data blocks and the amplitudes of the
 samples in the null period.
@@ -476,9 +476,7 @@
 If the value "1" is chosen, the result of each snr computation is shown,
 if a value larger than "1" is chosen that number of computations will be
 averaged and the result shown.
-Each minute there are 312 computations.
-The default value for the X-axis of the display in the widget is
-therefore 312.
+The default value for the X-axis of the display in the widget is 312.
 
 As configuration option, the widget can be equipped with a **dump** button,
 touching the button will show a menu for file selection. Once a file

_service:download_url:qt-dab-3.7.1.tar.gz/dab-2/devices-dab-2/hackrf-handler/hackrf-widget.ui -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-2/devices-dab-2/hackrf-handler/hackrf-widget.ui Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/CMakeLists.txt -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/CMakeLists.txt Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/main.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/main.cpp Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-dab.pro -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-dab.pro Changed

@@ -9,11 +9,14 @@
 #CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++14
-QMAKE_CFLAGS	+=  -O3 -ffast-math
-QMAKE_CXXFLAGS	+=  -O3 -ffast-math
-#QMAKE_CFLAGS	+=  -g
-#QMAKE_CXXFLAGS	+=  -g
-#QMAKE_LFLAGS	+=  -g
+#QMAKE_CFLAGS	+=  -O4 -ffast-math
+#QMAKE_CXXFLAGS	+=  -O4 -ffast-math
+QMAKE_CXXFLAGS	+=  -ffast-math -flto
+QMAKE_CFLAGS	+=  -ffast-math -flto
+QMAKE_LFLAGS	+=  -ffast-math -flto
+#QMAKE_CFLAGS	+=  -g -fsanitize=address
+#QMAKE_CXXFLAGS	+=  -g -fsanitize=address
+#QMAKE_LFLAGS	+=  -g -fsanitize=address
 QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
 RC_ICONS	=  qt-dab.ico
 RESOURCES	+= resources.qrc
@@ -284,7 +287,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-3.71
+TARGET		= qt-dab-3.72
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -318,9 +321,9 @@
 CONFIG		+= airspy
 CONFIG		+= hackrf
 CONFIG		+= lime
-#CONFIG		+= soapy
+CONFIG		+= soapy
 #CONFIG		+= pluto-rxtx
-#CONFIG		+= pluto
+CONFIG		+= pluto
 #CONFIG		+= elad-device
 #CONFIG		+= colibri
 CONFIG		+= faad
@@ -361,7 +364,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-3.71
+#	TARGET		= qt-dab64-3.72
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -380,7 +383,7 @@
 #	CONFIG		+= NO_SSE
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-3.71
+	TARGET		= qt-dab32-3.72
 	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
@@ -426,7 +429,7 @@
 #comment both out if you just want to use the "normal" way
 
 CONFIG		+= try-epg		# do not use
-DEFINES		+= __DUMP_SNR__		# for experiments only
+DEFINES	+= __DUMP_SNR__		# for experiments only
 DEFINES		+=__KEEP_GAIN_SETTINGS__
 }
 #	devices

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.cpp Changed

@@ -199,12 +199,12 @@
 	         this, SLOT (set_vga_gain (int)));
 	connect (mixerSlider, SIGNAL (valueChanged (int)),
 	         this, SLOT (set_mixer_gain (int)));
-	connect (lnaButton, SIGNAL (clicked (void)),
-	         this, SLOT (set_lna_agc (void)));
-	connect (mixerButton, SIGNAL (clicked (void)),
-	         this, SLOT (set_mixer_agc (void)));
-	connect (biasButton, SIGNAL (clicked (void)),
-	         this, SLOT (set_rf_bias (void)));
+	connect (lnaButton, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_lna_agc (int)));
+	connect (mixerButton, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_mixer_agc (int)));
+	connect (biasButton, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_rf_bias (int)));
 	connect (tabWidget, SIGNAL (currentChanged (int)),
 	         this, SLOT (show_tab (int)));
 	connect (dumpButton, SIGNAL (clicked ()),
@@ -224,11 +224,6 @@
 	         sensitivitySlider, SLOT (setValue (int)));
 	connect (this, SIGNAL (new_tabSetting (int)),
 	         tabWidget, SLOT (setCurrentIndex (int)));
-	connect (this, SIGNAL (new_lnaButtonText (const QString &)),
-	         lnaButtonLabel, SLOT (setText (const QString &)));
-	connect (this, SIGNAL (new_mixerButtonText (const QString &)),
-	         mixerButtonLabel, SLOT (setText (const QString &)));
-
 	connect (this, SIGNAL (new_lnaDisplay (int)),
 	         lnaDisplay, SLOT (display (int)));
 	connect (this, SIGNAL (new_vgaDisplay (int)),
@@ -560,26 +555,24 @@
 	0=Disable LNA Automatic Gain Control
 	1=Enable LNA Automatic Gain Control
 */
-void	airspyHandler::set_lna_agc() {
-	lna_agc	= !lna_agc;
+void	airspyHandler::set_lna_agc	(int dummy) {
+	(void)dummy;
+	lna_agc	= !lnaButton	-> isChecked ();
 int result = my_airspy_set_lna_agc (device, lna_agc ? 1 : 0);
 
 	if (result != AIRSPY_SUCCESS) {
 	   printf ("airspy_set_lna_agc() failed: %s (%d)\n",
 	            my_airspy_error_name ((airspy_error)result), result);
 	}
-	if (lna_agc)
-	   lnaButtonLabel	-> setText ("lna agc on");
-	else
-	   lnaButtonLabel	-> setText ("lna agc");
 }
 
 /* Parameter value:
 	0=Disable MIXER Automatic Gain Control
 	1=Enable MIXER Automatic Gain Control
 */
-void	airspyHandler::set_mixer_agc() {
-	mixer_agc	= !mixer_agc;
+void	airspyHandler::set_mixer_agc	(int dummy) {
+	(void)dummy;
+	mixer_agc	= mixerButton -> isChecked ();
 
 int result = my_airspy_set_mixer_agc (device, mixer_agc ? 1 : 0);
 
@@ -587,16 +580,13 @@
 	   printf ("airspy_set_mixer_agc() failed: %s (%d)\n",
 	            my_airspy_error_name ((airspy_error)result), result);
 	}
-	if (mixer_agc)
-	   mixerButtonLabel	-> setText ("mixer agc on");
-	else
-	   mixerButtonLabel	-> setText ("mixer agc");
 }
 
 
 /* Parameter value shall be 0=Disable BiasT or 1=Enable BiasT */
-void	airspyHandler::set_rf_bias() {
-	rf_bias	= !rf_bias;
+void	airspyHandler::set_rf_bias (int dummy) {
+	(void)dummy;
+	rf_bias	= biasButton -> isChecked ();
 int result = my_airspy_set_rf_bias (device, rf_bias ? 1 : 0);
 
 	if (result != AIRSPY_SUCCESS) {
@@ -938,6 +928,21 @@
 	rf_bias			= result. at (7). toInt ();
 	tab_setting		= result. at (8). toInt ();
 
+	lnaButton	-> blockSignals (true);
+	lnaButton	-> setChecked (lna_agc);
+	usleep (1000);
+	lnaButton	-> blockSignals (false);
+
+	mixerButton	-> blockSignals (true);
+	mixerButton	-> setChecked (mixer_agc);
+	usleep	(1000);
+	mixerButton	-> blockSignals (false);
+
+	biasButton	-> blockSignals (true);
+	biasButton	-> setChecked (rf_bias);
+	usleep (1000);
+	biasButton	-> blockSignals (false);
+	
 	lnaSlider	-> blockSignals (true);
 	new_lnaGainValue	(lnaGainValue);
 	new_lnaDisplay		(lnaGainValue);
@@ -973,20 +978,6 @@
 	   usleep (1000);
 	sensitivitySlider -> blockSignals (false);
 
-	lnaButton	-> blockSignals (true);
-	QString	 lnaText = lna_agc == 1 ? "lna agc on" : " lna agc";
-	new_lnaButtonText (lnaText);
-	while (lnaButtonLabel -> text () != lnaText)
-	   usleep (1000);
-	lnaButton	-> blockSignals (false);
-
-	mixerButton	-> blockSignals (true);
-	QString mixerText = mixer_agc ? "mixer agc on" : "mixer agc";
-	new_mixerButtonText (mixerText);
-	while (mixerButtonLabel -> text () != mixerText)
-	   usleep (1000);
-	mixerButton	-> blockSignals (false);
-
 	tabWidget	-> blockSignals (true);
 	new_tabSetting (tab_setting);
 	while (tabWidget -> currentIndex () != tab_setting)

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.h -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.h Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-widget.ui -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-widget.ui Changed

@@ -445,7 +445,7 @@
 <enum>QLCDNumber::Flat</enum>
 </property>
 </widget>
- <widget class="QPushButton" name="lnaButton">
+ <widget class="QCheckBox" name="lnaButton">
 <property name="geometry">
 <rect>
 <x>20</x>
@@ -458,7 +458,7 @@
 <string>lna</string>
 </property>
 </widget>
- <widget class="QPushButton" name="mixerButton">
+ <widget class="QCheckBox" name="mixerButton">
 <property name="geometry">
 <rect>
 <x>110</x>
@@ -471,7 +471,7 @@
 <string>mixer </string>
 </property>
 </widget>
- <widget class="QPushButton" name="biasButton">
+ <widget class="QCheckBox" name="biasButton">
 <property name="geometry">
 <rect>
 <x>220</x>
@@ -484,32 +484,6 @@
 <string>bias</string>
 </property>
 </widget>
- <widget class="QLabel" name="lnaButtonLabel">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>100</y>
- <width>67</width>
- <height>19</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="mixerButtonLabel">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>100</y>
- <width>81</width>
- <height>19</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
 </widget>
 </widget>
 <widget class="QLabel" name="displaySerial">

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/hackrf-handler/hackrf-widget.ui -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/hackrf-handler/hackrf-widget.ui Changed

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

@@ -42,7 +42,7 @@
 #define	GETPROCADDRESS	dlsym
 #endif
 
-#define	READLEN_DEFAULT	8192
+#define	READLEN_DEFAULT	(2 * 8192)
 //
 //	For the callback, we do need some environment which
 //	is passed through the ctx parameter
@@ -73,12 +73,17 @@
 void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
 rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
 
-	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
+	if ((theStick == nullptr) || (len != READLEN_DEFAULT)) {
+	 fprintf (stderr, "%d \n", len);
 	 return;
+	}
 
-	if (theStick -> isActive)
+	if (theStick -> isActive) {
+	 if (theStick -> _I_Buffer. GetRingBufferWriteAvailable () < len / 2)
+	 fprintf (stderr, "xx? ");
 	 (void)theStick -> _I_Buffer.
 	 putDataIntoBuffer ((std::complex<uint8_t> *)buf, len / 2);
+	}
 }
 //
 //	for handling the events in libusb, we need a controlthread
@@ -110,7 +115,7 @@
 //	Our wrapper is a simple classs
 	rtlsdrHandler::rtlsdrHandler (QSettings *s,
 	 QString &recorderVersion):
-	 _I_Buffer (4 * 1024 * 1024),
+	 _I_Buffer (8 * 1024 * 1024),
 	 myFrame (nullptr) {
 int16_t	deviceCount;
 int32_t	r;
@@ -128,8 +133,8 @@
 	workerHandle			= nullptr;
 	isActive		= false;
 #ifdef	__MINGW32__
-	const char *libraryString	= "rtlsdr.dll";
-	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
+	const char *libraryString	= "librtlsdr.dll";
+	Handle		= LoadLibrary ((wchar_t *)L"librtlsdr.dll");
 	if (Handle == nullptr) {
 	 fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
 	 throw (20);
@@ -364,8 +369,8 @@
 static int iqTeller	= 0;
 	amount = _I_Buffer. getDataFromBuffer (temp, size);
 	for (int i = 0; i < amount; i ++) 
-	 V [i] = std::complex<float> (mapTable [real (temp [i])],
-	 mapTable [imag (temp [i])]);
+	 V [i] = std::complex<float> (mapTable [real (temp [i]) & 0xFF],
+	 mapTable [imag (temp [i]) & 0xFF]);
 	if (xml_dumping. load ())
 	 xmlWriter -> add (temp, amount);
 	else

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR Added

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Config.h Added

@@ -0,0 +1,55 @@
+///
+/// \file SoapySDR/Config.h
+///
+/// Common macro definitions for Soapy SDR library API export.
+///
+/// \copyright
+/// Copyright (c) 2014-2014 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+// http://gcc.gnu.org/wiki/Visibility
+// Generic helper definitions for shared library support
+#if defined _WIN32 || defined __CYGWIN__
+ #define SOAPY_SDR_HELPER_DLL_IMPORT __declspec(dllimport)
+ #define SOAPY_SDR_HELPER_DLL_EXPORT __declspec(dllexport)
+ #define SOAPY_SDR_HELPER_DLL_LOCAL
+#else
+ #if __GNUC__ >= 4
+ #define SOAPY_SDR_HELPER_DLL_IMPORT __attribute__ ((visibility ("default")))
+ #define SOAPY_SDR_HELPER_DLL_EXPORT __attribute__ ((visibility ("default")))
+ #define SOAPY_SDR_HELPER_DLL_LOCAL __attribute__ ((visibility ("hidden")))
+ #else
+ #define SOAPY_SDR_HELPER_DLL_IMPORT
+ #define SOAPY_SDR_HELPER_DLL_EXPORT
+ #define SOAPY_SDR_HELPER_DLL_LOCAL
+ #endif
+#endif
+
+// Now we use the generic helper definitions above to define SOAPY_SDR_API and SOAPY_SDR_LOCAL.
+// SOAPY_SDR_API is used for the public API symbols. It either DLL imports or DLL exports (or does nothing for static build)
+// SOAPY_SDR_LOCAL is used for non-api symbols.
+
+#define SOAPY_SDR_DLL //always building a DLL
+
+#ifdef SOAPY_SDR_DLL // defined if SOAPY is compiled as a DLL
+ #ifdef SOAPY_SDR_DLL_EXPORTS // defined if we are building the SOAPY DLL (instead of using it)
+ #define SOAPY_SDR_API SOAPY_SDR_HELPER_DLL_EXPORT
+ #define SOAPY_SDR_EXTERN
+ #else
+ #define SOAPY_SDR_API SOAPY_SDR_HELPER_DLL_IMPORT
+ #define SOAPY_SDR_EXTERN extern
+ #endif // SOAPY_SDR_DLL_EXPORTS
+ #define SOAPY_SDR_LOCAL SOAPY_SDR_HELPER_DLL_LOCAL
+#else // SOAPY_SDR_DLL is not defined: this means SOAPY is a static lib.
+ #define SOAPY_SDR_API
+ #define SOAPY_SDR_LOCAL
+ #define SOAPY_SDR_EXTERN
+#endif // SOAPY_SDR_DLL
+
+#include <iso646.h>
+
+#ifndef _MSC_VER
+#include <stdbool.h>
+#endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Config.hpp Added

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Constants.h Added

@@ -0,0 +1,66 @@
+///
+/// \file SoapySDR/Constants.h
+///
+/// Constants used in the device API.
+///
+/// \copyright
+/// Copyright (c) 2014-2016 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+
+/*!
+ * Constant to represent the transmit direction
+ */
+#define SOAPY_SDR_TX 0
+
+/*!
+ * Constant to represent the receive direction
+ */
+#define SOAPY_SDR_RX 1
+
+/*!
+ * Indicate end of burst for transmit or receive.
+ * For write, end of burst if set by the caller.
+ * For read, end of burst is set by the driver.
+ */
+#define SOAPY_SDR_END_BURST (1 << 1)
+
+/*!
+ * Indicates that the time stamp is valid.
+ * For write, the caller must set has time when timeNs is provided.
+ * For read, the driver sets has time when timeNs is provided.
+ */
+#define SOAPY_SDR_HAS_TIME (1 << 2)
+
+/*!
+ * Indicates that stream terminated prematurely.
+ * This is the flag version of an overflow error
+ * that indicates an overflow with the end samples.
+ */
+#define SOAPY_SDR_END_ABRUPT (1 << 3)
+
+/*!
+ * Indicates transmit or receive only a single packet.
+ * Applicable when the driver fragments samples into packets.
+ * For write, the user sets this flag to only send a single packet.
+ * For read, the user sets this flag to only receive a single packet.
+ */
+#define SOAPY_SDR_ONE_PACKET (1 << 4)
+
+/*!
+ * Indicate that this read call and the next results in a fragment.
+ * Used when the implementation has an underlying packet interface.
+ * The caller can use this indicator and the SOAPY_SDR_ONE_PACKET flag
+ * on subsequent read stream calls to re-align with packet boundaries.
+ */
+#define SOAPY_SDR_MORE_FRAGMENTS (1 << 5)
+
+/*!
+ * Indicate that the stream should wait for an external trigger event.
+ * This flag might be used with the flags argument in any of the
+ * stream API calls. The trigger implementation is hardware-specific.
+ */
+#define SOAPY_SDR_WAIT_TRIGGER (1 << 6)

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/ConverterPrimitives.hpp Added

@@ -0,0 +1,153 @@
+///
+/// \file SoapySDR/ConverterPrimatives.hpp
+///
+/// inline Soapy real format Converter Primitives.
+///
+/// \copyright
+/// Copyright (c) 2017-2018 Coburn Wightman
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <stdint.h>
+
+namespace SoapySDR
+{
+ 
+const uint32_t U32_ZERO_OFFSET = uint32_t(1<<31);
+const uint16_t U16_ZERO_OFFSET = uint16_t(1<<15);
+const uint8_t U8_ZERO_OFFSET = uint8_t(1<<7);
+
+const uint32_t S32_FULL_SCALE = uint32_t(1<<31);
+const uint16_t S16_FULL_SCALE = uint16_t(1<<15);
+const uint8_t S8_FULL_SCALE = uint8_t(1<<7);
+ 
+/*!
+ * Conversion Primitives for converting real values between Soapy formats.
+ * \param from the value to convert from
+ * \return the converted value
+ */
+
+// type conversion: float <> signed integers
+
+inline int32_t F32toS32(float from){
+ return int32_t(from * S32_FULL_SCALE);
+}
+inline float S32toF32(int32_t from){
+ return float(from) / S32_FULL_SCALE;
+}
+
+inline int16_t F32toS16(float from){
+ return int16_t(from * S16_FULL_SCALE);
+}
+inline float S16toF32(int16_t from){
+ return float(from) / S16_FULL_SCALE;
+}
+
+inline int8_t F32toS8(float from){
+ return int8_t(from * S8_FULL_SCALE);
+}
+inline float S8toF32(int8_t from){
+ return float(from) / S8_FULL_SCALE;
+}
+
+
+// type conversion: offset binary <> two's complement (signed) integers
+
+inline int32_t U32toS32(uint32_t from){
+ return int32_t(from - U32_ZERO_OFFSET);
+}
+
+inline uint32_t S32toU32(int32_t from){
+ return uint32_t(from) + U32_ZERO_OFFSET;
+}
+
+inline int16_t U16toS16(uint16_t from){
+ return int16_t(from - U16_ZERO_OFFSET);
+}
+
+inline uint16_t S16toU16(int16_t from){
+ return uint16_t(from) + U16_ZERO_OFFSET;
+}
+
+inline int8_t U8toS8(uint8_t from){
+ return int8_t(from - U8_ZERO_OFFSET);
+}
+
+inline uint8_t S8toU8(int8_t from){
+ return uint8_t(from) + U8_ZERO_OFFSET;
+}
+
+// size conversion: signed <> signed
+
+inline int16_t S32toS16(int32_t from){
+ return int16_t(from >> 16);
+}
+inline int32_t S16toS32(int16_t from){
+ return int32_t(from << 16);
+}
+
+inline int8_t S16toS8(int16_t from){
+ return int8_t(from >> 8);
+}
+inline int16_t S8toS16(int8_t from){
+ return int16_t(from << 8);
+}
+
+// compound conversions
+
+// float <> unsigned (type and size)
+
+inline uint32_t F32toU32(float from){
+ return S32toU32(F32toS32(from));
+}
+inline float U32toF32(uint32_t from){
+ return S32toF32(U32toS32(from));
+}
+
+inline uint16_t F32toU16(float from){
+ return S16toU16(F32toS16(from));
+}
+inline float U16toF32(uint16_t from){
+ return S16toF32(U16toS16(from));
+}
+
+inline uint8_t F32toU8(float from){
+ return S8toU8(F32toS8(from));
+}
+inline float U8toF32(uint8_t from){
+ return S8toF32(U8toS8(from));
+}
+
+// signed <> unsigned (type and size)
+
+inline uint16_t S32toU16(int32_t from){
+ return S16toU16(S32toS16(from));
+}
+inline int32_t U16toS32(uint16_t from){
+ return S16toS32(U16toS16(from));
+}
+
+inline uint8_t S32toU8(int32_t from){
+ return S8toU8(S16toS8(S32toS16(from)));
+}
+inline int32_t U8toS32(uint8_t from){
+ return S16toS32(S8toS16(U8toS8(from)));
+}
+
+inline uint8_t S16toU8(int16_t from){
+ return S8toU8(S16toS8(from));
+}
+inline int16_t U8toS16(uint8_t from){
+ return S8toS16(U8toS8(from));
+}
+
+inline uint16_t S8toU16(int8_t from){
+ return S16toU16(S8toS16(from));
+}
+inline int8_t U16toS8(uint16_t from){
+ return S16toS8(U16toS16(from));
+}
+
+
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/ConverterRegistry.hpp Added

@@ -0,0 +1,131 @@
+///
+/// \file SoapySDR/ConverterRegistry.hpp
+///
+/// Convert buffers between stream formats.
+///
+/// \copyright
+/// Copyright (c) 2015-2018 Josh Blum
+/// Copyright (c) 2017-2018 Coburn Wightman
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Logger.hpp>
+#include <SoapySDR/Formats.hpp>
+#include <utility>
+#include <vector>
+#include <map>
+#include <string>
+
+namespace SoapySDR
+{
+ /*!
+ * ConverterRegistry class. The ConverterRegistry maintains a list of
+ * ConverterFunctions that can be queried and retrieved by markup strings for
+ * converting buffers between formats.
+ *
+ * While Soapy standard format markup strings are declared in the formats include file,
+ * custom formats can be created and ConverterFunctions registered to be used as needed.
+ * Additionally, different functions can be registered for the same source/target pair
+ * with FunctionPriority serving as a selector to allow specialization.
+ */
+ class SOAPY_SDR_API ConverterRegistry
+ {
+ public:
+ /*!
+ * A typedef for declaring a ConverterFunction to be maintained in the ConverterRegistry.
+ * A converter function copies and optionally converts an input buffer of one format into an
+ * output buffer of another format.
+ * The parameters are (input pointer, output pointer, number of elements, optional scalar)
+ */
+ typedef void (*ConverterFunction)(const void *, void *, const size_t, const double);
+
+ /*!
+ * FunctionPriority: allow selection of a converter function with a given source and target format.
+ */
+ enum FunctionPriority{
+ GENERIC = 0, //!< Usual C for-loops, shifts, multiplies, etc. Min priority.
+ VECTORIZED = 3, //!< Vectorized operations such as SIMD.
+ CUSTOM = 5 //!< Custom user re-implementation. Max priority.
+ };
+
+ /*!
+ * TargetFormatConverterPriority: a map of possible conversion functions for a given Priority.
+ * Maintained by the registry.
+ */
+ typedef std::map<FunctionPriority, ConverterFunction> TargetFormatConverterPriority;
+
+ /*!
+ * TargetFormatConverters: a map of possible conversion functions for a given Target/Priority Format.
+ * Maintained by the registry.
+ */
+ typedef std::map<std::string, TargetFormatConverterPriority> TargetFormatConverters;
+ 
+ /*!
+ * FormatConverters: a map of possible conversion functions for a given Source/Target Format.
+ * Maintained by the registry.
+ */
+ typedef std::map<std::string, TargetFormatConverters> FormatConverters;
+
+ /*!
+ * Class constructor. Registers a ConverterFunction with a
+ * given source format, target format, and priority.
+ *
+ * refuses to register converter and logs error if a source/target/priority entry already exists
+ * \param sourceFormat the source format markup string
+ * \param targetFormat the target format markup string
+ * \param priority the FunctionPriority of the converter to register
+ * \param converter function to register
+ */
+ ConverterRegistry(const std::string &sourceFormat, const std::string &targetFormat, const FunctionPriority &priority, ConverterFunction converter);
+ 
+ /*!
+ * Get a list of existing target formats to which we can convert the specified source from.
+ * There is a source format converter function registered for each target format
+ * returned in the result vector.
+ * \param sourceFormat the source format markup string
+ * \return a vector of target formats or an empty vector if none found
+ */
+ static std::vector<std::string> listTargetFormats(const std::string &sourceFormat);
+ 
+ /*!
+ * Get a list of existing source formats from which we can convert to the specified target.
+ * There is a target format converter function registered for each source format
+ * returned in the result vector.
+ * \param targetFormat the target format markup string
+ * \return a vector of source formats or an empty vector if none found
+ */
+ static std::vector<std::string> listSourceFormats(const std::string &targetFormat);
+ 
+ /*!
+ * Get a list of available converter priorities for a given source and target format.
+ * \param sourceFormat the source format markup string
+ * \param targetFormat the target format markup string
+ * \return a vector of priorities or an empty vector if none found
+ */
+ static std::vector<FunctionPriority> listPriorities(const std::string &sourceFormat, const std::string &targetFormat);
+ 
+ /*!
+ * Get a converter between a source and target format with the highest available priority.
+ * \throws invalid_argument when the conversion does not exist and logs error
+ * \param sourceFormat the source format markup string
+ * \param targetFormat the target format markup string
+ * \return a conversion function pointer
+ */
+ static ConverterFunction getFunction(const std::string &sourceFormat, const std::string &targetFormat);
+
+ /*!
+ * Get a converter between a source and target format with a given priority.
+ */
+
+ static ConverterFunction getFunction(const std::string &sourceFormat, const std::string &targetFormat, const FunctionPriority &priority);
+
+ /*!
+ * Get a list of known source formats in the registry.
+ */
+ static std::vector<std::string> listAvailableSourceFormats(void);
+
+ };
+ 
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Device.h Added

@@ -0,0 +1,1491 @@
+///
+/// \file SoapySDR/Device.h
+///
+/// Interface definition for Soapy SDR devices.
+/// This is the C version of the Device interface.
+///
+/// General design rules about the API:
+/// The caller must free non-const array results.
+///
+/// \copyright
+/// Copyright (c) 2014-2018 Josh Blum
+/// Copyright (c) 2016-2016 Bastille Networks
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+#include <SoapySDR/Types.h>
+#include <SoapySDR/Constants.h>
+#include <SoapySDR/Errors.h>
+#include <SoapySDR/Device.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//! Forward declaration of device handle
+typedef struct SoapySDRDevice SoapySDRDevice;
+
+//! Forward declaration of stream handle
+typedef struct SoapySDRStream SoapySDRStream;
+
+/*!
+ * Get the last status code after a Device API call.
+ * The status code is cleared on entry to each Device call.
+ * When an device API call throws, the C bindings catch
+ * the exception, and set a non-zero last status code.
+ * Use lastStatus() to determine success/failure for
+ * Device calls without integer status return codes.
+ */
+SOAPY_SDR_API int SoapySDRDevice_lastStatus(void);
+
+/*!
+ * Get the last error message after a device call fails.
+ * When an device API call throws, the C bindings catch
+ * the exception, store its message in thread-safe storage,
+ * and return a non-zero status code to indicate failure.
+ * Use lastError() to access the exception's error message.
+ */
+SOAPY_SDR_API const char *SoapySDRDevice_lastError(void);
+
+/*!
+ * Enumerate a list of available devices on the system.
+ * \param args device construction key/value argument filters
+ * \param [out] length the number of elements in the result.
+ * \return a list of arguments strings, each unique to a device
+ */
+SOAPY_SDR_API SoapySDRKwargs *SoapySDRDevice_enumerate(const SoapySDRKwargs *args, size_t *length);
+
+/*!
+ * Enumerate a list of available devices on the system.
+ * Markup format for args: "keyA=valA, keyB=valB".
+ * \param args a markup string of key/value argument filters
+ * \param [out] length the number of elements in the result.
+ * \return a list of arguments strings, each unique to a device
+ */
+SOAPY_SDR_API SoapySDRKwargs *SoapySDRDevice_enumerateStrArgs(const char *args, size_t *length);
+
+/*!
+ * Make a new Device object given device construction args.
+ * The device pointer will be stored in a table so subsequent calls
+ * with the same arguments will produce the same device.
+ * For every call to make, there should be a matched call to unmake.
+ *
+ * \param args device construction key/value argument map
+ * \return a pointer to a new Device object
+ */
+SOAPY_SDR_API SoapySDRDevice *SoapySDRDevice_make(const SoapySDRKwargs *args);
+
+/*!
+ * Make a new Device object given device construction args.
+ * The device pointer will be stored in a table so subsequent calls
+ * with the same arguments will produce the same device.
+ * For every call to make, there should be a matched call to unmake.
+ *
+ * \param args a markup string of key/value arguments
+ * \return a pointer to a new Device object or null for error
+ */
+SOAPY_SDR_API SoapySDRDevice *SoapySDRDevice_makeStrArgs(const char *args);
+
+/*!
+ * Unmake or release a device object handle.
+ *
+ * \param device a pointer to a device object
+ * \return 0 for success or error code on failure
+ */
+SOAPY_SDR_API int SoapySDRDevice_unmake(SoapySDRDevice *device);
+
+/*******************************************************************
+ * Parallel support
+ ******************************************************************/
+
+/*!
+ * Create a list of devices from a list of construction arguments.
+ * This is a convenience call to parallelize device construction,
+ * and is fundamentally a parallel for loop of make(Kwargs).
+ *
+ * \param argsList a list of device arguments per each device
+ * \param length the length of the argsList array
+ * \return a list of device pointers per each specified argument
+ */
+SOAPY_SDR_API SoapySDRDevice **SoapySDRDevice_make_list(const SoapySDRKwargs *argsList, const size_t length);
+
+/*!
+ * Unmake or release a list of device handles
+ * and free the devices array memory as well.
+ * This is a convenience call to parallelize device destruction,
+ * and is fundamentally a parallel for loop of unmake(Device *).
+ *
+ * \param devices a list of pointers to device objects
+ * \param length the length of the devices array
+ * \return 0 for success or error code on failure
+ */
+SOAPY_SDR_API int SoapySDRDevice_unmake_list(SoapySDRDevice **devices, const size_t length);
+
+/*******************************************************************
+ * Identification API
+ ******************************************************************/
+
+/*!
+ * A key that uniquely identifies the device driver.
+ * This key identifies the underlying implementation.
+ * Serveral variants of a product may share a driver.
+ * \param device a pointer to a device instance
+ */
+SOAPY_SDR_API char *SoapySDRDevice_getDriverKey(const SoapySDRDevice *device);
+
+/*!
+ * A key that uniquely identifies the hardware.
+ * This key should be meaningful to the user
+ * to optimize for the underlying hardware.
+ * \param device a pointer to a device instance
+ */
+SOAPY_SDR_API char *SoapySDRDevice_getHardwareKey(const SoapySDRDevice *device);
+
+/*!
+ * Query a dictionary of available device information.
+ * This dictionary can any number of values like
+ * vendor name, product name, revisions, serials...
+ * This information can be displayed to the user
+ * to help identify the instantiated device.
+ * \param device a pointer to a device instance
+ */
+SOAPY_SDR_API SoapySDRKwargs SoapySDRDevice_getHardwareInfo(const SoapySDRDevice *device);
+
+/*******************************************************************
+ * Channels API
+ ******************************************************************/
+
+/*!
+ * Set the frontend mapping of available DSP units to RF frontends.
+ * This mapping controls channel mapping and channel availability.
+ * \param device a pointer to a device instance
+ * \param direction the channel direction RX or TX
+ * \param mapping a vendor-specific mapping string
+ * \return an error code or 0 for success
+ */
+SOAPY_SDR_API int SoapySDRDevice_setFrontendMapping(SoapySDRDevice *device, const int direction, const char *mapping);
+
+/*!
+ * Get the mapping configuration string.
+ * \param device a pointer to a device instance
+ * \param direction the channel direction RX or TX
+ * \return the vendor-specific mapping string
+ */
+SOAPY_SDR_API char *SoapySDRDevice_getFrontendMapping(const SoapySDRDevice *device, const int direction);
+
+/*!
+ * Get a number of channels given the streaming direction
+ * \param device a pointer to a device instance
+ * \param direction the channel direction RX or TX
+ * \return the number of channels
+ */
+SOAPY_SDR_API size_t SoapySDRDevice_getNumChannels(const SoapySDRDevice *device, const int direction);
+
+/*!
+ * Get channel info given the streaming direction
+ * \param device a pointer to a device instance
+ * \param direction the channel direction RX or TX
+ * \param channel the channel number to get info for
+ * \return channel information
+ */
+SOAPY_SDR_API SoapySDRKwargs SoapySDRDevice_getChannelInfo(const SoapySDRDevice *device, const int direction, const size_t channel);
+
+/*!
+ * Find out if the specified channel is full or half duplex.
+ * \param device a pointer to a device instance
+ * \param direction the channel direction RX or TX
+ * \param channel an available channel on the device

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Device.hpp Added

@@ -0,0 +1,1313 @@
+///
+/// \file SoapySDR/Device.hpp
+///
+/// Interface definition for Soapy SDR devices.
+///
+/// \copyright
+/// Copyright (c) 2014-2018 Josh Blum
+/// Copyright (c) 2016-2016 Bastille Networks
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Types.hpp>
+#include <SoapySDR/Constants.h>
+#include <SoapySDR/Errors.h>
+#include <vector>
+#include <string>
+#include <complex>
+#include <cstddef> //size_t
+
+namespace SoapySDR
+{
+
+//! Forward declaration of stream handle for type safety
+class Stream;
+
+/*!
+ * Abstraction for an SDR tranceiver device - configuration and streaming.
+ */
+class SOAPY_SDR_API Device
+{
+public:
+
+ //! virtual destructor for inheritance
+ virtual ~Device(void);
+
+ /*!
+ * Enumerate a list of available devices on the system.
+ * \param args device construction key/value argument filters
+ * \return a list of argument maps, each unique to a device
+ */
+ static KwargsList enumerate(const Kwargs &args = Kwargs());
+
+ /*!
+ * Enumerate a list of available devices on the system.
+ * Markup format for args: "keyA=valA, keyB=valB".
+ * \param args a markup string of key/value argument filters
+ * \return a list of argument maps, each unique to a device
+ */
+ static KwargsList enumerate(const std::string &args);
+
+ /*!
+ * Make a new Device object given device construction args.
+ * The device pointer will be stored in a table so subsequent calls
+ * with the same arguments will produce the same device.
+ * For every call to make, there should be a matched call to unmake.
+ *
+ * \param args device construction key/value argument map
+ * \return a pointer to a new Device object
+ */
+ static Device *make(const Kwargs &args = Kwargs());
+
+ /*!
+ * Make a new Device object given device construction args.
+ * The device pointer will be stored in a table so subsequent calls
+ * with the same arguments will produce the same device.
+ * For every call to make, there should be a matched call to unmake.
+ *
+ * \param args a markup string of key/value arguments
+ * \return a pointer to a new Device object
+ */
+ static Device *make(const std::string &args);
+
+ /*!
+ * Unmake or release a device object handle.
+ *
+ * \param device a pointer to a device object
+ */
+ static void unmake(Device *device);
+
+ /*******************************************************************
+ * Parallel support
+ ******************************************************************/
+
+ /*!
+ * Create a list of devices from a list of construction arguments.
+ * This is a convenience call to parallelize device construction,
+ * and is fundamentally a parallel for loop of make(Kwargs).
+ *
+ * \param argsList a list of device arguments per each device
+ * \return a list of device pointers per each specified argument
+ */
+ static std::vector<Device *> make(const KwargsList &argsList);
+
+ /*!
+ * Unmake or release a list of device handles.
+ * This is a convenience call to parallelize device destruction,
+ * and is fundamentally a parallel for loop of unmake(Device *).
+ *
+ * \param devices a list of pointers to device objects
+ */
+ static void unmake(const std::vector<Device *> &devices);
+
+ /*******************************************************************
+ * Identification API
+ ******************************************************************/
+
+ /*!
+ * A key that uniquely identifies the device driver.
+ * This key identifies the underlying implementation.
+ * Serveral variants of a product may share a driver.
+ */
+ virtual std::string getDriverKey(void) const;
+
+ /*!
+ * A key that uniquely identifies the hardware.
+ * This key should be meaningful to the user
+ * to optimize for the underlying hardware.
+ */
+ virtual std::string getHardwareKey(void) const;
+
+ /*!
+ * Query a dictionary of available device information.
+ * This dictionary can any number of values like
+ * vendor name, product name, revisions, serials...
+ * This information can be displayed to the user
+ * to help identify the instantiated device.
+ */
+ virtual Kwargs getHardwareInfo(void) const;
+
+ /*******************************************************************
+ * Channels API
+ ******************************************************************/
+
+ /*!
+ * Set the frontend mapping of available DSP units to RF frontends.
+ * This mapping controls channel mapping and channel availability.
+ * \param direction the channel direction RX or TX
+ * \param mapping a vendor-specific mapping string
+ */
+ virtual void setFrontendMapping(const int direction, const std::string &mapping);
+
+ /*!
+ * Get the mapping configuration string.
+ * \param direction the channel direction RX or TX
+ * \return the vendor-specific mapping string
+ */
+ virtual std::string getFrontendMapping(const int direction) const;
+
+ /*!
+ * Get a number of channels given the streaming direction
+ */
+ virtual size_t getNumChannels(const int direction) const;
+
+ /*!
+ * Query a dictionary of available channel information.
+ * This dictionary can any number of values like
+ * decoder type, version, available functions...
+ * This information can be displayed to the user
+ * to help identify the instantiated channel.
+ * \param direction the channel direction RX or TX
+ * \param channel an available channel on the device
+ * \return channel information
+ */
+ virtual Kwargs getChannelInfo(const int direction, const size_t channel) const;
+
+ /*!
+ * Find out if the specified channel is full or half duplex.
+ * \param direction the channel direction RX or TX
+ * \param channel an available channel on the device
+ * \return true for full duplex, false for half duplex
+ */
+ virtual bool getFullDuplex(const int direction, const size_t channel) const;
+
+ /*******************************************************************
+ * Stream API
+ ******************************************************************/
+
+ /*!
+ * Query a list of the available stream formats.
+ * \param direction the channel direction RX or TX
+ * \param channel an available channel on the device
+ * \return a list of allowed format strings. See setupStream() for the format syntax.
+ */
+ virtual std::vector<std::string> getStreamFormats(const int direction, const size_t channel) const;
+
+ /*!
+ * Get the hardware's native stream format for this channel.
+ * This is the format used by the underlying transport layer,
+ * and the direct buffer access API calls (when available).
+ * \param direction the channel direction RX or TX
+ * \param channel an available channel on the device
+ * \param [out] fullScale the maximum possible value
+ * \return the native stream buffer format string
+ */
+ virtual std::string getNativeStreamFormat(const int direction, const size_t channel, double &fullScale) const;
+
+ /*!

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Errors.h Added

@@ -0,0 +1,68 @@
+///
+/// \file SoapySDR/Errors.h
+///
+/// Error codes used in the device API.
+///
+/// \copyright
+/// Copyright (c) 2014-2015 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * Convert a error code to a string for printing purposes.
+ * If the error code is unrecognized, errToStr returns "UNKNOWN".
+ * \param errorCode a negative integer return code
+ * \return a pointer to a string representing the error
+ */
+SOAPY_SDR_API const char *SoapySDR_errToStr(const int errorCode);
+
+#ifdef __cplusplus
+}
+#endif
+
+/*!
+ * Returned when read has a timeout.
+ */
+#define SOAPY_SDR_TIMEOUT (-1)
+
+/*!
+ * Returned for non-specific stream errors.
+ */
+#define SOAPY_SDR_STREAM_ERROR (-2)
+
+/*!
+ * Returned when read has data corruption.
+ * For example, the driver saw a malformed packet.
+ */
+#define SOAPY_SDR_CORRUPTION (-3)
+
+/*!
+ * Returned when read has an overflow condition.
+ * For example, and internal buffer has filled.
+ */
+#define SOAPY_SDR_OVERFLOW (-4)
+
+/*!
+ * Returned when a requested operation or flag setting
+ * is not supported by the underlying implementation.
+ */
+#define SOAPY_SDR_NOT_SUPPORTED (-5)
+
+/*!
+ * Returned when a the device encountered a stream time
+ * which was expired (late) or too early to process.
+ */
+#define SOAPY_SDR_TIME_ERROR (-6)
+
+/*!
+ * Returned when write caused an underflow condition.
+ * For example, a continuous stream was interrupted.
+ */
+#define SOAPY_SDR_UNDERFLOW (-7)

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Errors.hpp Added

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Formats.h Added

@@ -0,0 +1,88 @@
+///
+/// \file SoapySDR/Formats.h
+///
+/// Format strings used in the stream API.
+///
+/// \copyright
+/// Copyright (c) 2015-2015 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+#include <stddef.h> //size_t
+
+//! Complex 64-bit floats (complex double)
+#define SOAPY_SDR_CF64 "CF64"
+
+//! Complex 32-bit floats (complex float)
+#define SOAPY_SDR_CF32 "CF32"
+
+//! Complex signed 32-bit integers (complex int32)
+#define SOAPY_SDR_CS32 "CS32"
+
+//! Complex unsigned 32-bit integers (complex uint32)
+#define SOAPY_SDR_CU32 "CU32"
+
+//! Complex signed 16-bit integers (complex int16)
+#define SOAPY_SDR_CS16 "CS16"
+
+//! Complex unsigned 16-bit integers (complex uint16)
+#define SOAPY_SDR_CU16 "CU16"
+
+//! Complex signed 12-bit integers (3 bytes)
+#define SOAPY_SDR_CS12 "CS12"
+
+//! Complex unsigned 12-bit integers (3 bytes)
+#define SOAPY_SDR_CU12 "CU12"
+
+//! Complex signed 8-bit integers (complex int8)
+#define SOAPY_SDR_CS8 "CS8"
+
+//! Complex unsigned 8-bit integers (complex uint8)
+#define SOAPY_SDR_CU8 "CU8"
+
+//! Complex signed 4-bit integers (1 byte)
+#define SOAPY_SDR_CS4 "CS4"
+
+//! Complex unsigned 4-bit integers (1 byte)
+#define SOAPY_SDR_CU4 "CU4"
+
+//! Real 64-bit floats (double)
+#define SOAPY_SDR_F64 "F64"
+
+//! Real 32-bit floats (float)
+#define SOAPY_SDR_F32 "F32"
+
+//! Real signed 32-bit integers (int32)
+#define SOAPY_SDR_S32 "S32"
+
+//! Real unsigned 32-bit integers (uint32)
+#define SOAPY_SDR_U32 "U32"
+
+//! Real signed 16-bit integers (int16)
+#define SOAPY_SDR_S16 "S16"
+
+//! Real unsigned 16-bit integers (uint16)
+#define SOAPY_SDR_U16 "U16"
+
+//! Real signed 8-bit integers (int8)
+#define SOAPY_SDR_S8 "S8"
+
+//! Real unsigned 8-bit integers (uint8)
+#define SOAPY_SDR_U8 "U8"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * Get the size of a single element in the specified format.
+ * \param format a supported format string
+ * \return the size of an element in bytes
+ */
+SOAPY_SDR_API size_t SoapySDR_formatToSize(const char *format);
+
+#ifdef __cplusplus
+}
+#endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Formats.hpp Added

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Logger.h Added

@@ -0,0 +1,97 @@
+///
+/// \file SoapySDR/Logger.h
+///
+/// Logger API for SoapySDR devices.
+/// Implementations should use the logger rather than stdio.
+/// The default log handler prints to stderr.
+///
+/// \copyright
+/// Copyright (c) 2014-2015 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+#include <stdarg.h>
+
+/*!
+ * The available priority levels for log messages.
+ *
+ * The default log level threshold is SOAPY_SDR_INFO.
+ * Log messages with lower priorities are dropped.
+ *
+ * The default threshold can be set via the
+ * SOAPY_SDR_LOG_LEVEL environment variable.
+ * Set SOAPY_SDR_LOG_LEVEL to the string value:
+ * "WARNING", "ERROR", "DEBUG", etc...
+ * or set it to the equivalent integer value.
+ */
+typedef enum
+{
+ SOAPY_SDR_FATAL = 1, //!< A fatal error. The application will most likely terminate. This is the highest priority.
+ SOAPY_SDR_CRITICAL = 2, //!< A critical error. The application might not be able to continue running successfully.
+ SOAPY_SDR_ERROR = 3, //!< An error. An operation did not complete successfully, but the application as a whole is not affected.
+ SOAPY_SDR_WARNING = 4, //!< A warning. An operation completed with an unexpected result.
+ SOAPY_SDR_NOTICE = 5, //!< A notice, which is an information with just a higher priority.
+ SOAPY_SDR_INFO = 6, //!< An informational message, usually denoting the successful completion of an operation.
+ SOAPY_SDR_DEBUG = 7, //!< A debugging message.
+ SOAPY_SDR_TRACE = 8, //!< A tracing message. This is the lowest priority.
+ SOAPY_SDR_SSI = 9, //!< Streaming status indicators such as "U" (underflow) and "O" (overflow).
+} SoapySDRLogLevel;
+
+//! Compile-time detection macro for SSI feature
+#define SOAPY_SDR_SSI SOAPY_SDR_SSI
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * Send a message to the registered logger.
+ * \param logLevel a possible logging level
+ * \param message a logger message string
+ */
+SOAPY_SDR_API void SoapySDR_log(const SoapySDRLogLevel logLevel, const char *message);
+
+/*!
+ * Send a message to the registered logger.
+ * \param logLevel a possible logging level
+ * \param format a printf style format string
+ * \param argList an argument list for the formatter
+ */
+SOAPY_SDR_API void SoapySDR_vlogf(const SoapySDRLogLevel logLevel, const char *format, va_list argList);
+
+/*!
+ * Send a message to the registered logger.
+ * \param logLevel a possible logging level
+ * \param format a printf style format string
+ */
+static inline void SoapySDR_logf(const SoapySDRLogLevel logLevel, const char *format, ...)
+{
+ va_list argList;
+ va_start(argList, format);
+ SoapySDR_vlogf(logLevel, format, argList);
+ va_end(argList);
+}
+
+/*!
+ * Typedef for the registered log handler function.
+ */
+typedef void (*SoapySDRLogHandler)(const SoapySDRLogLevel logLevel, const char *message);
+
+/*!
+ * Register a new system log handler.
+ * Platforms should call this to replace the default stdio handler.
+ * Passing `NULL` restores the default.
+ */
+SOAPY_SDR_API void SoapySDR_registerLogHandler(const SoapySDRLogHandler handler);
+
+/*!
+ * Set the log level threshold.
+ * Log messages with lower priority are dropped.
+ */
+SOAPY_SDR_API void SoapySDR_setLogLevel(const SoapySDRLogLevel logLevel);
+
+#ifdef __cplusplus
+}
+#endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Logger.hpp Added

@@ -0,0 +1,69 @@
+///
+/// \file SoapySDR/Logger.hpp
+///
+/// Logger API for SoapySDR devices.
+/// Implementations should use the logger rather than stdio.
+/// The default log handler prints to stderr.
+///
+/// \copyright
+/// Copyright (c) 2014-2015 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Logger.h>
+#include <string>
+#include <cstdarg>
+
+namespace SoapySDR
+{
+
+typedef SoapySDRLogLevel LogLevel;
+
+/*!
+ * Send a message to the registered logger.
+ * \param logLevel a possible logging level
+ * \param message a logger message string
+ */
+SOAPY_SDR_API void log(const LogLevel logLevel, const std::string &message);
+
+/*!
+ * Send a message to the registered logger.
+ * \param logLevel a possible logging level
+ * \param format a printf style format string
+ * \param argList an argument list for the formatter
+ */
+SOAPY_SDR_API void vlogf(const SoapySDRLogLevel logLevel, const char *format, va_list argList);
+
+/*!
+ * Send a message to the registered logger.
+ * \param logLevel a possible logging level
+ * \param format a printf style format string
+ */
+static inline void logf(const SoapySDRLogLevel logLevel, const char *format, ...)
+{
+ va_list argList;
+ va_start(argList, format);
+ SoapySDR::vlogf(logLevel, format, argList);
+ va_end(argList);
+}
+
+/*!
+ * Typedef for the registered log handler function.
+ */
+typedef SoapySDRLogHandler LogHandler;
+
+/*!
+ * Register a new system log handler.
+ * Platforms should call this to replace the default stdio handler.
+ * Passing `nullptr` restores the default.
+ */
+SOAPY_SDR_API void registerLogHandler(const LogHandler &handler);
+
+/*!
+ * Set the log level threshold.
+ * Log messages with lower priority are dropped.
+ */
+SOAPY_SDR_API void setLogLevel(const LogLevel logLevel);
+
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Modules.h Added

@@ -0,0 +1,92 @@
+///
+/// \file SoapySDR/Modules.h
+///
+/// Utility functions to deal with modules.
+/// These utility functions are made available for advanced usage.
+/// For most use cases, the API will automatically load modules.
+///
+/// \copyright
+/// Copyright (c) 2014-2018 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+#include <SoapySDR/Types.h>
+#include <stddef.h> //size_t
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//! Query the root installation path
+SOAPY_SDR_API const char *SoapySDR_getRootPath(void);
+
+/*!
+ * The list of paths automatically searched by loadModules().
+ * \param [out] length the number of elements in the result.
+ * \return a list of automatically searched file paths
+ */
+SOAPY_SDR_API char **SoapySDR_listSearchPaths(size_t *length);
+
+/*!
+ * List all modules found in default path.
+ * The result is an array of strings owned by the caller.
+ * \param [out] length the number of elements in the result.
+ * \return a list of file paths to loadable modules
+ */
+SOAPY_SDR_API char **SoapySDR_listModules(size_t *length);
+
+/*!
+ * List all modules found in the given path.
+ * The result is an array of strings owned by the caller.
+ * \param path a directory on the system
+ * \param [out] length the number of elements in the result.
+ * \return a list of file paths to loadable modules
+ */
+SOAPY_SDR_API char **SoapySDR_listModulesPath(const char *path, size_t *length);
+
+/*!
+ * Load a single module given its file system path.
+ * The caller must free the result error string.
+ * \param path the path to a specific module file
+ * \return an error message, empty on success
+ */
+SOAPY_SDR_API char *SoapySDR_loadModule(const char *path);
+
+/*!
+ * List all registration loader errors for a given module path.
+ * The resulting dictionary contains all registry entry names
+ * provided by the specified module. The value of each entry
+ * is an error message string or empty on successful load.
+ * \param path the path to a specific module file
+ * \return a dictionary of registry names to error messages
+ */
+SOAPY_SDR_API SoapySDRKwargs SoapySDR_getLoaderResult(const char *path);
+
+/*!
+ * Get a version string for the specified module.
+ * Modules may optionally provide version strings.
+ * \param path the path to a specific module file
+ * \return a version string or empty if no version provided
+ */
+SOAPY_SDR_API char *SoapySDR_getModuleVersion(const char *path);
+
+/*!
+ * Unload a module that was loaded with loadModule().
+ * The caller must free the result error string.
+ * \param path the path to a specific module file
+ * \return an error message, empty on success
+ */
+SOAPY_SDR_API char *SoapySDR_unloadModule(const char *path);
+
+/*!
+ * Load the support modules installed on this system.
+ * This call will only actually perform the load once.
+ * Subsequent calls are a NOP.
+ */
+SOAPY_SDR_API void SoapySDR_loadModules(void);
+
+#ifdef __cplusplus
+}
+#endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Modules.hpp Added

@@ -0,0 +1,92 @@
+///
+/// \file SoapySDR/Modules.hpp
+///
+/// Utility functions to deal with modules.
+/// These utility functions are made available for advanced usage.
+/// For most use cases, the API will automatically load modules.
+///
+/// \copyright
+/// Copyright (c) 2014-2018 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Types.hpp>
+#include <vector>
+#include <string>
+
+namespace SoapySDR
+{
+
+//! Query the root installation path
+SOAPY_SDR_API std::string getRootPath(void);
+
+/*!
+ * The list of paths automatically searched by loadModules().
+ * \return a list of automatically searched file paths
+ */
+SOAPY_SDR_API std::vector<std::string> listSearchPaths(void);
+
+/*!
+ * List all modules found in default path.
+ * \return a list of file paths to loadable modules
+ */
+SOAPY_SDR_API std::vector<std::string> listModules(void);
+
+/*!
+ * List all modules found in the given path.
+ * \param path a directory on the system
+ * \return a list of file paths to loadable modules
+ */
+SOAPY_SDR_API std::vector<std::string> listModules(const std::string &path);
+
+/*!
+ * Load a single module given its file system path.
+ * \param path the path to a specific module file
+ * \return an error message, empty on success
+ */
+SOAPY_SDR_API std::string loadModule(const std::string &path);
+
+/*!
+ * List all registration loader errors for a given module path.
+ * The resulting dictionary contains all registry entry names
+ * provided by the specified module. The value of each entry
+ * is an error message string or empty on successful load.
+ * \param path the path to a specific module file
+ * \return a dictionary of registry names to error messages
+ */
+SOAPY_SDR_API Kwargs getLoaderResult(const std::string &path);
+
+/*!
+ * Get a version string for the specified module.
+ * Modules may optionally provide version strings.
+ * \param path the path to a specific module file
+ * \return a version string or empty if no version provided
+ */
+SOAPY_SDR_API std::string getModuleVersion(const std::string &path);
+
+/*!
+ * Unload a module that was loaded with loadModule().
+ * \param path the path to a specific module file
+ * \return an error message, empty on success
+ */
+SOAPY_SDR_API std::string unloadModule(const std::string &path);
+
+/*!
+ * Load the support modules installed on this system.
+ * This call will only actually perform the load once.
+ * Subsequent calls are a NOP.
+ */
+SOAPY_SDR_API void loadModules(void);
+
+//! \cond
+//! Internal call to register version with a module during load
+class SOAPY_SDR_API ModuleVersion
+{
+public:
+ ModuleVersion(const std::string &version);
+};
+//! \endcond
+
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Registry.hpp Added

@@ -0,0 +1,72 @@
+///
+/// \file SoapySDR/Registry.hpp
+///
+/// Device factory registration API.
+///
+/// \copyright
+/// Copyright (c) 2014-2015 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Version.hpp>
+#include <SoapySDR/Types.hpp>
+#include <vector>
+#include <string>
+#include <map>
+
+namespace SoapySDR
+{
+
+//! forward declaration of device
+class Device;
+
+//! typedef for a device enumeration function
+typedef KwargsList (*FindFunction)(const Kwargs &);
+
+//! typedef for a device factory function
+typedef Device* (*MakeFunction)(const Kwargs &);
+
+//! typedef for a dictionary of find functions
+typedef std::map<std::string, FindFunction> FindFunctions;
+
+//! typedef for a dictionary of make functions
+typedef std::map<std::string, MakeFunction> MakeFunctions;
+
+/*!
+ * A registry object loads device functions into the global registry.
+ */
+class SOAPY_SDR_API Registry
+{
+public:
+
+ /*!
+ * Register a SDR device find and make function.
+ * \param name a unique name to identify the entry
+ * \param find the find function returns an arg list
+ * \param make the make function returns a device sptr
+ * \param abi this value must be SOAPY_SDR_ABI_VERSION
+ */
+ Registry(const std::string &name, const FindFunction &find, const MakeFunction &make, const std::string &abi);
+
+ //! Cleanup this registry entry
+ ~Registry(void);
+
+ /*!
+ * List all loaded find functions.
+ * \return a dictionary of registry entry names to find functions
+ */
+ static FindFunctions listFindFunctions(void);
+
+ /*!
+ * List all loaded make functions.
+ * \return a dictionary of registry entry names to make functions
+ */
+ static MakeFunctions listMakeFunctions(void);
+
+private:
+ std::string _name;
+};
+
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Time.h Added

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Time.hpp Added

@@ -0,0 +1,44 @@
+///
+/// \file SoapySDR/Time.hpp
+///
+/// Utility functions to convert time and ticks.
+///
+/// \copyright
+/// Copyright (c) 2015-2015 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Time.h>
+
+namespace SoapySDR
+{
+
+/*!
+ * Convert a tick count into a time in nanoseconds using the tick rate.
+ * \param ticks a integer tick count
+ * \param rate the ticks per second
+ * \return the time in nanoseconds
+ */
+static inline long long ticksToTimeNs(const long long ticks, const double rate);
+
+/*!
+ * Convert a time in nanoseconds into a tick count using the tick rate.
+ * \param timeNs time in nanoseconds
+ * \param rate the ticks per second
+ * \return the integer tick count
+ */
+static inline long long timeNsToTicks(const long long timeNs, const double rate);
+
+}
+
+static inline long long SoapySDR::ticksToTimeNs(const long long ticks, const double rate)
+{
+ return SoapySDR_ticksToTimeNs(ticks, rate);
+}
+
+static inline long long SoapySDR::timeNsToTicks(const long long timeNs, const double rate)
+{
+ return SoapySDR_timeNsToTicks(timeNs, rate);
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Types.h Added

@@ -0,0 +1,154 @@
+///
+/// \file SoapySDR/Types.h
+///
+/// Misc data type definitions used in the API.
+///
+/// \copyright
+/// Copyright (c) 2014-2018 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+#include <stddef.h> //size_t
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//! Definition for a min/max numeric range
+typedef struct
+{
+ double minimum;
+ double maximum;
+ double step;
+} SoapySDRRange;
+
+//! Definition for a key/value string map
+typedef struct
+{
+ size_t size;
+ char **keys;
+ char **vals;
+} SoapySDRKwargs;
+
+/*!
+ * Convert a markup string to a key-value map.
+ * The markup format is: "key0=value0, key1=value1"
+ */
+SOAPY_SDR_API SoapySDRKwargs SoapySDRKwargs_fromString(const char *markup);
+
+/*!
+ * Convert a key-value map to a markup string.
+ * The markup format is: "key0=value0, key1=value1"
+ */
+SOAPY_SDR_API char *SoapySDRKwargs_toString(const SoapySDRKwargs *args);
+
+//! Possible data types for argument info
+typedef enum
+{
+ SOAPY_SDR_ARG_INFO_BOOL,
+ SOAPY_SDR_ARG_INFO_INT,
+ SOAPY_SDR_ARG_INFO_FLOAT,
+ SOAPY_SDR_ARG_INFO_STRING
+} SoapySDRArgInfoType;
+
+//! Definition for argument info
+typedef struct
+{
+ //! The key used to identify the argument (required)
+ char *key;
+
+ /*!
+ * The default value of the argument when not specified (required)
+ * Numbers should use standard floating point and integer formats.
+ * Boolean values should be represented as "true" and "false".
+ */
+ char *value;
+
+ //! The displayable name of the argument (optional, use key if empty)
+ char *name;
+
+ //! A brief description about the argument (optional)
+ char *description;
+
+ //! The units of the argument: dB, Hz, etc (optional)
+ char *units;
+
+ //! The data type of the argument (required)
+ SoapySDRArgInfoType type;
+
+ /*!
+ * The range of possible numeric values (optional)
+ * When specified, the argument should be restricted to this range.
+ * The range is only applicable to numeric argument types.
+ */
+ SoapySDRRange range;
+
+ //! The size of the options set, or 0 when not used.
+ size_t numOptions;
+
+ /*!
+ * A discrete list of possible values (optional)
+ * When specified, the argument should be restricted to this options set.
+ */
+ char **options;
+
+ /*!
+ * A discrete list of displayable names for the enumerated options (optional)
+ * When not specified, the option value itself can be used as a display name.
+ */
+ char **optionNames;
+
+} SoapySDRArgInfo;
+
+/*!
+ * Clear the contents of a list of string
+ * Convenience call to deal with results that return a string list.
+ */
+SOAPY_SDR_API void SoapySDRStrings_clear(char ***elems, const size_t length);
+
+/*!
+ * Set a key/value pair in a kwargs structure.
+ * \post
+ * If the key exists, the existing entry will be modified;
+ * otherwise a new entry will be appended to args.
+ * On error, the elements of args will not be modified,
+ * and args is guaranteed to be in a good state.
+ * \return 0 for success, otherwise allocation error
+ */
+SOAPY_SDR_API int SoapySDRKwargs_set(SoapySDRKwargs *args, const char *key, const char *val);
+
+/*!
+ * Get a value given a key in a kwargs structure.
+ * \return the string or NULL if not found
+ */
+SOAPY_SDR_API const char *SoapySDRKwargs_get(const SoapySDRKwargs *args, const char *key);
+
+/*!
+ * Clear the contents of a kwargs structure.
+ * This frees all the underlying memory and clears the members.
+ */
+SOAPY_SDR_API void SoapySDRKwargs_clear(SoapySDRKwargs *args);
+
+/*!
+ * Clear a list of kwargs structures.
+ * This frees all the underlying memory and clears the members.
+ */
+SOAPY_SDR_API void SoapySDRKwargsList_clear(SoapySDRKwargs *args, const size_t length);
+
+/*!
+ * Clear the contents of a argument info structure.
+ * This frees all the underlying memory and clears the members.
+ */
+SOAPY_SDR_API void SoapySDRArgInfo_clear(SoapySDRArgInfo *info);
+
+/*!
+ * Clear a list of argument info structures.
+ * This frees all the underlying memory and clears the members.
+ */
+SOAPY_SDR_API void SoapySDRArgInfoList_clear(SoapySDRArgInfo *info, const size_t length);
+
+#ifdef __cplusplus
+}
+#endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Types.hpp Added

@@ -0,0 +1,144 @@
+///
+/// \file SoapySDR/Types.hpp
+///
+/// Misc data type definitions used in the API.
+///
+/// \copyright
+/// Copyright (c) 2014-2017 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Types.h>
+#include <vector>
+#include <string>
+#include <map>
+
+namespace SoapySDR
+{
+
+//! Typedef for a dictionary of key-value string arguments
+typedef std::map<std::string, std::string> Kwargs;
+
+/*!
+ * Convert a markup string to a key-value map.
+ * The markup format is: "key0=value0, key1=value1"
+ */
+SOAPY_SDR_API Kwargs KwargsFromString(const std::string &markup);
+
+/*!
+ * Convert a key-value map to a markup string.
+ * The markup format is: "key0=value0, key1=value1"
+ */
+SOAPY_SDR_API std::string KwargsToString(const Kwargs &args);
+
+//! Typedef for a list of key-word dictionaries
+typedef std::vector<Kwargs> KwargsList;
+
+/*!
+ * A simple min/max numeric range pair
+ */
+class SOAPY_SDR_API Range
+{
+public:
+
+ //! Create an empty range (0.0, 0.0)
+ Range(void);
+
+ //! Create a min/max range
+ Range(const double minimum, const double maximum, const double step=0.0);
+
+ //! Get the range minimum
+ double minimum(void) const;
+
+ //! Get the range maximum
+ double maximum(void) const;
+
+ //! Get the range step size
+ double step(void) const;
+
+private:
+ double _min, _max, _step;
+};
+
+/*!
+ * Typedef for a list of min/max range pairs.
+ * Overall minimum: rl.front().minimum();
+ * Overall maximum: rl.back().maximum();
+ */
+typedef std::vector<Range> RangeList;
+
+/*!
+ * Argument info describes a key/value argument.
+ */
+class SOAPY_SDR_API ArgInfo
+{
+public:
+
+ //! Default constructor
+ ArgInfo(void);
+
+ //! The key used to identify the argument (required)
+ std::string key;
+
+ /*!
+ * The default value of the argument when not specified (required)
+ * Numbers should use standard floating point and integer formats.
+ * Boolean values should be represented as "true" and "false".
+ */
+ std::string value;
+
+ //! The displayable name of the argument (optional, use key if empty)
+ std::string name;
+
+ //! A brief description about the argument (optional)
+ std::string description;
+
+ //! The units of the argument: dB, Hz, etc (optional)
+ std::string units;
+
+ //! The data type of the argument (required)
+ enum Type {BOOL, INT, FLOAT, STRING} type;
+
+ /*!
+ * The range of possible numeric values (optional)
+ * When specified, the argument should be restricted to this range.
+ * The range is only applicable to numeric argument types.
+ */
+ Range range;
+
+ /*!
+ * A discrete list of possible values (optional)
+ * When specified, the argument should be restricted to this options set.
+ */
+ std::vector<std::string> options;
+
+ /*!
+ * A discrete list of displayable names for the enumerated options (optional)
+ * When not specified, the option value itself can be used as a display name.
+ */
+ std::vector<std::string> optionNames;
+};
+
+/*!
+ * Typedef for a list of Argument infos.
+ */
+typedef std::vector<ArgInfo> ArgInfoList;
+
+}
+
+inline double SoapySDR::Range::minimum(void) const
+{
+ return _min;
+}
+
+inline double SoapySDR::Range::maximum(void) const
+{
+ return _max;
+}
+
+inline double SoapySDR::Range::step(void) const
+{
+ return _step;
+}

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Version.h Added

@@ -0,0 +1,175 @@
+///
+/// \file SoapySDR/Version.h
+///
+/// Utility functions to query version information.
+///
+/// \copyright
+/// Copyright (c) 2014-2018 Josh Blum
+/// Copyright (c) 2016-2016 Bastille Networks
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.h>
+
+/*!
+ * API version number which can be used as a preprocessor check.
+ * The format of the version number is encoded as follows:
+ * (major << 24) | (minor << 16) | (16 bit increment).
+ * Where the increment can be used to indicate implementation
+ * changes, fixes, or API additions within a minor release series.
+ *
+ * The macro is typically used in an application as follows:
+ * \code
+ * #if defined(SOAPY_SDR_API_VERSION) && (SOAPY_SDR_API_VERSION >= 0x00001234)
+ * // Use a newer feature from the SoapySDR library API
+ * #endif
+ * \endcode
+ */
+#define SOAPY_SDR_API_VERSION 0x00070001
+
+/*!
+ * ABI Version Information - incremented when the ABI is changed.
+ * The ABI version format is version[-extra].
+ * The version comes from the associated library major.minor version.
+ * And extra is empty for releases but set on development branches.
+ * The ABI should remain constant across patch releases of the library.
+ */
+#define SOAPY_SDR_ABI_VERSION "0.7"
+
+/*!
+ * Compatibility define for GPIO access API with masks
+ */
+#define SOAPY_SDR_API_HAS_MASKED_GPIO
+
+/*!
+ * Compatibility define for channel sensors access API
+ */
+#define SOAPY_SDR_API_HAS_CHANNEL_SENSORS
+
+/*!
+ * Compatibility define for error to string function
+ */
+#define SOAPY_SDR_API_HAS_ERR_TO_STR
+
+/*!
+ * Compatibility define for corrections support checks
+ */
+#define SOAPY_SDR_API_HAS_CORRECTIONS_QUERY
+
+/*!
+ * Compatibility define for clock rates query API
+ */
+#define SOAPY_SDR_API_HAS_CLOCK_RATES_QUERY
+
+/*!
+ * Compatibility define for AGC support check
+ */
+#define SOAPY_SDR_API_HAS_AGC_MODE_QUERY
+
+/*!
+ * Compatibility define for querying stream argument info
+ */
+#define SOAPY_SDR_API_HAS_STREAM_ARG_INFO
+
+/*!
+ * Compatibility define for querying setting argument info
+ */
+#define SOAPY_SDR_API_HAS_SETTING_ARG_INFO
+
+/*!
+ * Compatibility define for querying sensor info API
+ */
+#define SOAPY_SDR_API_HAS_QUERY_SENSOR_INFO
+
+/*!
+ * Compatibility define for querying tune args info
+ */
+#define SOAPY_SDR_API_HAS_QUERY_TUNE_ARG_INFO
+
+/*!
+ * Compatibility define for querying native stream format
+ */
+#define SOAPY_SDR_API_HAS_NATIVE_STREAM_FORMAT
+
+/*!
+ * Compatibility define for setting the log level
+ */
+#define SOAPY_SDR_API_HAS_SET_LOG_LEVEL
+
+/*!
+ * Compatibility define for format header and defines
+ */
+#define SOAPY_SDR_API_HAS_FORMAT_DEFINES
+
+/*!
+ * Compatibility define for arbitrary channel settings
+ */
+#define SOAPY_SDR_API_HAS_CHANNEL_SETTINGS
+
+/*!
+ * Compatibility define for get bandwidth range API
+ */
+#define SOAPY_SDR_API_HAS_GET_BANDWIDTH_RANGE
+
+/*!
+ * Compatibility define for get channel info API
+ */
+#define SOAPY_SDR_API_HAS_GET_CHANNEL_INFO
+
+/*!
+ * Compatibility define for named register interface API
+ */
+#define SOAPY_SDR_API_HAS_NAMED_REGISTER_API
+
+/*!
+ * Compatibility define for named memory block interface API
+ */
+#define SOAPY_SDR_API_HAS_NAMED_REGISTERS_API
+
+/*!
+ * Compatibility define for step field in range type
+ */
+#define SOAPY_SDR_API_HAS_RANGE_TYPE_STEP
+
+/*!
+ * Compatibility define for get sample rate range API
+ */
+#define SOAPY_SDR_API_HAS_GET_SAMPLE_RATE_RANGE
+
+/*!
+ * Compatibility define for frequency correction API
+ */
+#define SOAPY_SDR_API_HAS_FREQUENCY_CORRECTION_API
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * Get the SoapySDR library API version as a string.
+ * The format of the version string is major.minor.increment,
+ * where the digits are taken directly from SOAPY_SDR_API_VERSION.
+ */
+SOAPY_SDR_API const char *SoapySDR_getAPIVersion(void);
+
+/*!
+ * Get the ABI version string that the library was built against.
+ * A client can compare SOAPY_SDR_ABI_VERSION to getABIVersion()
+ * to check for ABI incompatibility before using the library.
+ * If the values are not equal then the client code was
+ * compiled against a different ABI than the library.
+ */
+SOAPY_SDR_API const char *SoapySDR_getABIVersion(void);
+
+/*!
+ * Get the library version and build information string.
+ * The format of the version string is major.minor.patch-buildInfo.
+ * This function is commonly used to identify the software back-end
+ * to the user for command-line utilities and graphical applications.
+ */
+SOAPY_SDR_API const char *SoapySDR_getLibVersion(void);
+
+#ifdef __cplusplus
+}
+#endif

_service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/SoapySDR/Version.hpp Added

@@ -0,0 +1,43 @@
+///
+/// \file SoapySDR/Version.hpp
+///
+/// Utility functions to query version information.
+///
+/// \copyright
+/// Copyright (c) 2014-2016 Josh Blum
+/// SPDX-License-Identifier: BSL-1.0
+///
+
+#pragma once
+#include <SoapySDR/Config.hpp>
+#include <SoapySDR/Version.h>
+#include <string>
+
+namespace SoapySDR
+{
+
+/*!
+ * Get the SoapySDR library API version as a string.
+ * The format of the version string is major.minor.increment,
+ * where the digits are taken directly from SOAPY_SDR_API_VERSION.
+ */
+SOAPY_SDR_API std::string getAPIVersion(void);
+
+/*!
+ * Get the ABI version string that the library was built against.
+ * A client can compare SOAPY_SDR_ABI_VERSION to getABIVersion()
+ * to check for ABI incompatibility before using the library.
+ * If the values are not equal then the client code was
+ * compiled against a different ABI than the library.
+ */
+SOAPY_SDR_API std::string getABIVersion(void);
+
+/*!
+ * Get the library version and build information string.
+ * The format of the version string is major.minor.patch-buildInfo.
+ * This function is commonly used to identify the software back-end
+ * to the user for command-line utilities and graphical applications.
+ */
+SOAPY_SDR_API std::string getLibVersion(void);
+
+}

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/soapy/soapy-handler.h -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/qt-devices/soapy/soapy-handler.h Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/radio.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/radio.cpp Changed

@@ -157,6 +157,7 @@
 	"scan to data",
 	"scan continuously"
 };
+
 static inline
 QString scanmodeText (int e) {
 	return QString (scanTextTable [e]);
@@ -221,6 +222,7 @@
 	 spectrumBuffer (2 * 32768),
 	 iqBuffer (2 * 1536),
 	 tiiBuffer (32768),
+	 snrBuffer (512),
 	 responseBuffer (32768),
 	 frameBuffer (2 * 32768),
 	 dataBuffer (32768),
@@ -261,6 +263,7 @@
 	globals. iqBuffer	= &iqBuffer;
 	globals. responseBuffer	= &responseBuffer;
 	globals. tiiBuffer	= &tiiBuffer;
+	globals. snrBuffer	= &snrBuffer;
 	globals. frameBuffer	= &frameBuffer;
 
 	latency			=
@@ -318,7 +321,7 @@
 	x = dabSettings -> value ("switchDelay", 8). toInt ();
 	configWidget. switchDelaySetting -> setValue (x);
 
-	snrDelay = dabSettings -> value ("snrDelay", 5). toInt ();
+	int snrDelay = dabSettings -> value ("snrDelay", 5). toInt ();
 	configWidget. snrDelaySetting -> setValue (snrDelay);
 
 	currentService. valid	= false;
@@ -519,8 +522,10 @@
 	 this, SLOT (color_audiodumpButton (void)));
 	connect (techData. timeTable_button, SIGNAL (clicked ()),
 	 this, SLOT (handle_timeTable ()));
-	connect (techData. muteButton, SIGNAL (rightClicked (void)),
-	 this, SLOT (color_muteButton (void)));
+//	connect (techData. muteButton, SIGNAL (rightClicked (void)),
+//	 this, SLOT (color_muteButton (void)));
+	connect (muteButton, SIGNAL (rightClicked ()),
+	 this, SLOT (color_muteButton ()));
 //	display the version
 	copyrightLabel	-> setToolTip (footText ());
 
@@ -551,16 +556,16 @@
 	alarmTimer. setSingleShot	(true);
 	connect (&alarmTimer, SIGNAL (timeout ()),
 	 this, SLOT (alarmTimer_timeOut ()));
-	QPalette *lcdPalette	= new QPalette;
-	lcdPalette		-> setColor (QPalette::Background, Qt::white);
-	lcdPalette		-> setColor (QPalette::Base, Qt::black);
-	snrDisplay		-> setPalette (*lcdPalette);
+	QPalette lcdPalette;
+	lcdPalette. setColor (QPalette::Background, Qt::white);
+	lcdPalette. setColor (QPalette::Base, Qt::black);
+	snrDisplay		-> setPalette (lcdPalette);
 	snrDisplay		-> setAutoFillBackground (true);
-	frequencyDisplay	-> setPalette (*lcdPalette);
+	frequencyDisplay	-> setPalette (lcdPalette);
 	frequencyDisplay	-> setAutoFillBackground (true);
-	cpuMonitor		-> setPalette (*lcdPalette);
+	cpuMonitor		-> setPalette (lcdPalette);
 	cpuMonitor		-> setAutoFillBackground (true);
-	correctorDisplay	-> setPalette (*lcdPalette);
+	correctorDisplay	-> setPalette (lcdPalette);
 	correctorDisplay	-> setAutoFillBackground (true);
 	set_Colors ();
 	localTimeDisplay -> setStyleSheet ("QLabel {background-color : gray; color: white}");
@@ -696,6 +701,8 @@
 
 	my_dabProcessor	= new dabProcessor (this, inputDevice, &globals);
 
+	int snrDelay = dabSettings -> value ("snrDelay", 5). toInt ();
+	my_snrViewer. set_snrDelay (snrDelay);
 //	Some buttons should not be touched before we have a device
 	connectGUI ();
 
@@ -840,6 +847,8 @@
 
 void	RadioInterface::handle_contentButton	() {
 ensemblePrinter	my_Printer;
+QString	utcTime		= convertTime (UTC. year, UTC. month, UTC. day,
+	 UTC. hour, UTC. minute);
 QString	currentChannel	= channelSelector -> currentText ();
 int	frequency	= inputDevice	-> getVFOFrequency ();
 
@@ -856,7 +865,7 @@
 //	we asserted that my_dabProcessor exists
 	my_Printer. showEnsembleData (currentChannel,
 	 frequency,
-	 localTimeDisplay -> text (),
+	 utcTime,
 	 transmitters,
 	 serviceList,
 	 my_dabProcessor, fileP);
@@ -884,10 +893,10 @@
 	 int contentType, bool dirElement) {
 QString realName;
 
-	fprintf (stderr, "handle_MOT: type %x (%x), name %s dir = %d\n",
-	 contentType,
-	 getContentBaseType ((MOTContentType)contentType),
-	 name. toLatin1 (). data (), dirElement);
+//	fprintf (stderr, "handle_MOT: type %x (%x), name %s dir = %d\n",
+//	 contentType,
+//	 getContentBaseType ((MOTContentType)contentType),
+//	 name. toLatin1 (). data (), dirElement);
 	switch (getContentBaseType ((MOTContentType)contentType)) {
 	 case MOTBaseTypeGeneralData:
 	 break;
@@ -1630,7 +1639,24 @@
 //
 //	called from the fibDecoder
 void	RadioInterface::clockTime (int year, int month, int day,
-	 int hours, int minutes){
+	 int hours, int minutes, int d2, int h2, int m2){
+	this	-> localTime. year	= year;
+	this	-> localTime. month	= month;
+	this	-> localTime. day	= day;
+	this	-> localTime. hour	= hours;
+	this	-> localTime. minute	= minutes;
+
+	this	-> UTC. year		= year;
+	this	-> UTC. month		= month;
+	this	-> UTC. day		= d2;
+	this	-> UTC. hour		= h2;
+	this	-> UTC. minute		= m2;
+	QString result	= convertTime (year, month, day, hours, minutes);
+	localTimeDisplay -> setText (result);
+}
+
+QString	RadioInterface::convertTime (int year, int month,
+	 int day, int hours, int minutes) {
 char dayString [3];
 char hourString [3];
 char minuteString [3];
@@ -1642,7 +1668,7 @@
 	 QString (dayString) + " " +
 	 QString (hourString) + ":" +
 	 QString (minuteString);
-	localTimeDisplay -> setText (result);
+	return result;
 }
 //
 //	called from the MP4 decoder
@@ -1721,25 +1747,26 @@
 }
 	
 //	called from the dabProcessor
-void	RadioInterface::show_snr (int s, float sig, float noise) {
-static int delayCount = snrDelay;
-static	float sigValue	= 0;
-static	float noiseValue = 0;
-	if (running. load ()) {
-	 snrDisplay	-> display (s);
-	 sigValue	+= sig;
-	 noiseValue	+= noise;
-	 if (!my_snrViewer. isHidden ()) {
-	 delayCount --;
-	 if (delayCount <= 0) {
-	 my_snrViewer. add_snr (sigValue, noiseValue);
-	 my_snrViewer. show_snr ();
-	 delayCount = snrDelay;
-	 sigValue	= 0;
-	 noiseValue	= 0;
-	 }
-	 }
+void	RadioInterface::show_snr (int s) {
+	if (!running. load ())
+	 return;
+	snrDisplay	-> display (s);
+	
+	if (my_snrViewer. isHidden ()) {
+	 snrBuffer. FlushRingBuffer ();
+	 return;
+	}
+
+	int amount = snrBuffer. GetRingBufferReadAvailable ();
+	if (amount <= 0)
+	 return;
+
+	float ss [amount];
+	snrBuffer. getDataFromBuffer (ss, amount);
+	for (int i = 0; i < amount; i ++) {
+	 my_snrViewer. add_snr (ss [i]);
 	}
+	my_snrViewer. show_snr ();
 }
 
 //	just switch a color, called from the dabprocessor
@@ -2156,8 +2183,10 @@
 	 this, SLOT (handle_audiodumpButton (void)));
 	connect (techData. framedumpButton, SIGNAL (clicked (void)),
 	 this, SLOT (handle_framedumpButton (void)));
-	connect (techData. muteButton, SIGNAL (clicked (void)),
-	 this, SLOT (handle_muteButton (void)));
+//	connect (techData. muteButton, SIGNAL (clicked (void)),
+//	 this, SLOT (handle_muteButton (void)));

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/radio.h -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-maxi/radio.h Changed

@@ -87,6 +87,14 @@
 	bool		is_audio;
 };
 
+struct	theTime {
+	int	year;
+	int	month;
+	int	day;
+	int	hour;
+	int	minute;
+};
+
 class RadioInterface: public QWidget, private Ui_dabradio {
 Q_OBJECT
 public:
@@ -105,6 +113,7 @@
 	RingBuffer<std::complex<float>> spectrumBuffer;
 	RingBuffer<std::complex<float>> iqBuffer;
 	RingBuffer<std::complex<float>> tiiBuffer;
+	RingBuffer<float>	snrBuffer;
 	RingBuffer<float>	responseBuffer;
 	RingBuffer<uint8_t>	frameBuffer;
 	RingBuffer<uint8_t>	dataBuffer;
@@ -202,10 +211,12 @@
 	int16_t			ficSuccess;
 	int			total_ficError;
 	int			total_fics;
-	int			snrDelay;
 	void			connectGUI		();
 	void			disconnectGUI		();
 
+	struct theTime		localTime;
+	struct theTime		UTC;
+	QString			convertTime		(int, int, int, int, int);
 	void			set_buttonColors	(QPushButton *,
 	 const QString &);
 	QString			footText		();
@@ -266,7 +277,7 @@
 	void			show_rsErrors		(int);
 	void			show_aacErrors		(int);
 	void			show_ficSuccess		(bool);
-	void			show_snr		(int, float, float);
+	void			show_snr		(int);
 	void			setSynced		(bool);
 	void			showLabel		(QString);
 	void			handle_motObject	(QByteArray, QString,
@@ -288,7 +299,9 @@
 	void			show_rsCorrections	(int);
 	void			show_tii		(int, int);
 	void			closeEvent		(QCloseEvent *event);
-	void			clockTime		(int, int, int, int, int);
+	void			clockTime		(int, int, int,
+	 int, int,
+	 int, int, int);
 	void			startAnnouncement	(const QString &, int);
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);

_service:download_url:qt-dab-3.7.1.tar.gz/dab-mini/radio.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-mini/radio.cpp Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-mini/radio.h -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-mini/radio.h Changed

_service:download_url:qt-dab-3.7.1.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-processor.cpp Changed

@@ -61,6 +61,7 @@
 	this	-> frequency		= 220000000;	// default
 	this	-> threshold		= p -> threshold;
 	this	-> tiiBuffer		= p -> tiiBuffer;
+	this	-> snrBuffer		= p -> snrBuffer;
 	this	-> T_null		= params. get_T_null();
 	this	-> T_s			= params. get_T_s();
 	this	-> T_u			= params. get_T_u();
@@ -91,8 +92,8 @@
 	 myRadioInterface, SLOT (showSpectrum (int)));
 	connect (this, SIGNAL (show_tii (int, int)),
 	 myRadioInterface, SLOT (show_tii (int, int)));
-	connect (this, SIGNAL (show_snr (int, float, float)),
-	 mr, SLOT (show_snr (int, float, float)));
+	connect (this, SIGNAL (show_snr (int)),
+	 mr, SLOT (show_snr (int)));
 	connect (this, SIGNAL (show_clockErr (int)),
 	 mr, SLOT (show_clockError (int)));
 	my_TII_Detector. reset();
@@ -288,40 +289,24 @@
 	 cLevel	= 0;
 	 FreqCorr	= std::complex<float> (0, 0);
 	 for (int ofdmSymbolCount = 1;
-	 ofdmSymbolCount < 4; ofdmSymbolCount ++) {
+	 ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_s, coarseOffset + fineOffset);
 	 sampleCount += T_s;
 	 for (i = (int)T_u; i < (int)T_s; i ++) {
 	 FreqCorr += ofdmBuffer [i] * conj (ofdmBuffer [i - T_u]);
+	 cLevel += abs (ofdmBuffer [i]) + abs (ofdmBuffer [i - T_u]);
+	 }
+	 cCount += 2 * T_g;
+	 if (ofdmSymbolCount < 4) {
+	 my_ofdmDecoder. decode (ofdmBuffer,
+	 ofdmSymbolCount, ibits. data());
+	 my_ficHandler. process_ficBlock (ibits, ofdmSymbolCount);
 	 }
-	 for (int i = 0; i < (int)T_s; i ++)
-	 cLevel += abs (ofdmBuffer [i]);
-	 cCount += T_s;
-	 my_ofdmDecoder. decode (ofdmBuffer,
-	 ofdmSymbolCount, ibits. data());
-	 my_ficHandler. process_ficBlock (ibits, ofdmSymbolCount);
 	 if (!scanMode)
 	 my_mscHandler. process_Msc (&((ofdmBuffer. data()) [T_g]),
 	 ofdmSymbolCount);
 	 }
-
-	 for (int ofdmSymbolCount = 4;
-	 ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
-	 myReader. getSamples (ofdmBuffer. data(),
-	 T_s, coarseOffset + fineOffset);
-	 sampleCount += T_s;
-	 for (i = (int)T_u; i < (int)T_s; i ++) {
-	 FreqCorr += ofdmBuffer [i] * conj (ofdmBuffer [i - T_u]);
-	 }
-	 for (i = 0; i < (int)T_s; i ++) 
-	 cLevel += abs (ofdmBuffer [i]);
-	 cCount += T_s;
-	 if (!scanMode)
- my_mscHandler. process_Msc (&((ofdmBuffer. data()) [T_g]),
- ofdmSymbolCount);
-
-	 }
 /**
 *	OK, here we are at the end of the frame
 *	Assume everything went well and skip T_null samples
@@ -333,10 +318,19 @@
 	 for (i = 0; i < T_null; i ++)
 	 sum += abs (ofdmBuffer [i]);
 	 sum /= T_null;
-	 static	float snr	= 0;
-	 snr = 0.9 * snr +
-	 0.1 * 20 * log10 ((myReader. get_sLevel() + 0.005) / sum);
-	 show_snr ((int)snr, cLevel / cCount, sum);
+	 if (this -> snrBuffer != nullptr) {
+	 float snrV	= 20 * log10 ((cLevel / cCount + 0.005) / (sum + 0.005));
+	 snrBuffer -> putDataIntoBuffer (&snrV, 1);
+	 }
+	 static float snr	= 0;
+	 static int ccc	= 0;
+	 ccc ++;
+	 if (ccc >= 5) {
+	 ccc = 0;
+	 snr = 0.9 * snr +
+	 0.1 * 20 * log10 ((myReader. get_sLevel() + 0.005) / (sum + 0.005));
+	 show_snr ((int)snr);
+	 }
 /*
 *	The TII data is encoded in the null period of the
 *	odd frames 
@@ -388,6 +382,7 @@
 	}
 //	inputDevice	-> stopReader ();
 }
+
 //
 //
 void	dabProcessor::set_scanMode	(bool b) {

_service:download_url:qt-dab-3.7.1.tar.gz/dab-processor.h -> _service:download_url:qt-dab-3.7.2.tar.gz/dab-processor.h Changed

_service:download_url:qt-dab-3.7.1.tar.gz/docs/qt-dab.pdf -> _service:download_url:qt-dab-3.7.2.tar.gz/docs/qt-dab.pdf Changed

_service:download_url:qt-dab-3.7.1.tar.gz/forms/config-helper.ui -> _service:download_url:qt-dab-3.7.2.tar.gz/forms/config-helper.ui Changed

_service:download_url:qt-dab-3.7.1.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-3.7.2.tar.gz/forms/dabradio.ui Changed

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>642</width>
- <height>400</height>
+ <height>412</height>
 </rect>
 </property>
 <property name="sizePolicy">
@@ -17,7 +17,7 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB-3.71</string>
+ <string>Qt-DAB-3.72</string>
 </property>
 <layout class="QHBoxLayout" name="horizontalLayout_3">
 <item>
@@ -205,6 +205,13 @@
 </property>
 </widget>
 </item>
+ <item>
+ <widget class="verySmallPushButton" name="muteButton">
+ <property name="text">
+ <string>mute</string>
+ </property>
+ </widget>
+ </item>
 </layout>
 </item>
 <item>
@@ -569,24 +576,30 @@
 </property>
 </widget>
 </item>
- <item row="0" column="5">
- <widget class="verySmallPushButton" name="resetButton">
+ <item row="3" column="6" colspan="2">
+ <widget class="verySmallPushButton" name="configButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>10</pointsize>
+ 
+ </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to reset, i.e. restart synchronization.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;Touching this button will show/hide a widget where some configuration settings can be changed. &lt;br /&gt;&lt;br /&gt;The config widget also contains a posisbility for setting an alarm like signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>reset</string>
+ <string>config</string>
 </property>
 </widget>
 </item>
- <item row="1" column="2" colspan="3">
- <widget class="verySmallPushButton" name="show_correlationButton">
+ <item row="3" column="1" colspan="3">
+ <widget class="verySmallPushButton" name="dumpButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -600,30 +613,15 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;
-Touching this button will show (or hide) the resulting correlation of the first&lt;br /&gt;
- datablock of the DAB ensemble with the values as they should be. &lt;br /&gt;&lt;br /&gt;
-The &quot;peaks&quot; (if any) show the samples where the correlation is strongest. &lt;br /&gt;
-More than one peak shows more than one transmitter within
-the reach &lt;br /&gt;of this receiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>corr-result</string>
- </property>
- </widget>
- </item>
- <item row="1" column="7">
- <widget class="verySmallPushButton" name="show_tiiButton">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for showing the tii spectrum&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save the raw input. Pushing will cause a menu to appear where a filename can be selected. Please note the big filesizes!&lt;/p&gt;&lt;p&gt;Push again to stop recording. You can reload it by using the file input (*.sdr) option. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>tii</string>
+ <string>Raw dump</string>
 </property>
 </widget>
 </item>
- <item row="3" column="1" colspan="3">
- <widget class="verySmallPushButton" name="dumpButton">
+ <item row="1" column="0" colspan="2">
+ <widget class="verySmallPushButton" name="devicewidgetButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -637,15 +635,15 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save the raw input. Pushing will cause a menu to appear where a filename can be selected. Please note the big filesizes!&lt;/p&gt;&lt;p&gt;Push again to stop recording. You can reload it by using the file input (*.sdr) option. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>Raw dump</string>
+ <string>device</string>
 </property>
 </widget>
 </item>
- <item row="1" column="5" colspan="2">
- <widget class="verySmallPushButton" name="show_spectrumButton">
+ <item row="3" column="4" colspan="2">
+ <widget class="verySmallPushButton" name="snrButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -659,15 +657,15 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spectrum and the constellation of the DAB signal is shown when pressing this button. &lt;br /&gt;&lt;br /&gt;Pressing it again will cause the spectrum and constellation to be invisible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The snrViewer button controls a widget that - when enabled - will show the development of SNR over time. Parameters of the screen, height (the Y-axis) and the number of measurements (X-axis) can be set in the configuration widget.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>spectrum</string>
+ <string>snr viewer</string>
 </property>
 </widget>
 </item>
- <item row="1" column="0" colspan="2">
- <widget class="verySmallPushButton" name="devicewidgetButton">
+ <item row="0" column="6" colspan="2">
+ <widget class="verySmallPushButton" name="scanButton">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
@@ -681,17 +679,19 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching the scan button will cause the software to make a single scan over all channels. Ensembles (and their services) found will be displayed in a separate window.&lt;/p&gt;&lt;p&gt;The windows will be visible as long as the scanning mode is on &lt;br/&gt;
+(note that after completing the scan, i.e. the cycle from channel 5A to 13F, &lt;br /&gt;
+the software will wait until the scanner is officially stopped).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
- <string>device</string>
+ <string>Scan</string>
 </property>
 </widget>
 </item>
- <item row="2" column="4" colspan="4">
- <widget class="smallComboBox" name="deviceSelector">
+ <item row="1" column="2" colspan="3">
+ <widget class="verySmallPushButton" name="show_correlationButton">
 <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
@@ -703,13 +703,16 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the input device. The devices shown are configured. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;
+Touching this button will show (or hide) the resulting correlation of the first&lt;br /&gt;
+ datablock of the DAB ensemble with the values as they should be. &lt;br /&gt;&lt;br /&gt;
+The &quot;peaks&quot; (if any) show the samples where the correlation is strongest. &lt;br /&gt;
+More than one peak shows more than one transmitter within
+the reach &lt;br /&gt;of this receiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>corr-result</string>
 </property>
- <item>
- <property name="text">
- <string>Input Device</string>
- </property>
- </item>
 </widget>
 </item>
 <item row="0" column="2" colspan="3">
@@ -734,29 +737,32 @@
 </property>
 </widget>
 </item>
- <item row="0" column="0" colspan="2">
- <widget class="verySmallPushButton" name="contentButton">
+ <item row="2" column="4" colspan="4">
+ <widget class="smallComboBox" name="deviceSelector">

_service:download_url:qt-dab-3.7.2.tar.gz/forms/dabradio.ui-3.71 Added

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

_service:download_url:qt-dab-3.7.1.tar.gz/forms/technical_data.ui -> _service:download_url:qt-dab-3.7.2.tar.gz/forms/technical_data.ui Changed

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

_service:download_url:qt-dab-3.7.1.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-3.7.2.tar.gz/includes/dab-constants.h Changed

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

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

_service:download_url:qt-dab-3.7.1.tar.gz/includes/support/process-params.h -> _service:download_url:qt-dab-3.7.2.tar.gz/includes/support/process-params.h Changed

_service:download_url:qt-dab-3.7.1.tar.gz/snr-viewer/snr-viewer.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/snr-viewer/snr-viewer.cpp Changed

@@ -32,8 +32,7 @@
 	snrViewer::snrViewer	(RadioInterface	*mr,
 	 QSettings	*s):
 	 myFrame (nullptr),
-	 spectrum_curve (""),
-	 baseLine_curve ("") {
+	 spectrum_curve ("") {
 QString	colorString	= "black";
 	this		-> myRadioInterface	= mr;
 	this		-> dabSettings		= s;
@@ -88,11 +87,7 @@
 	spectrum_curve. setPen (QPen(curveColor, 2.0));
 	spectrum_curve. setOrientation (Qt::Horizontal);
 	spectrum_curve. setBaseline	(0);
-	baseLine_curve. setPen (QPen (curveColor, 2.0));
-	baseLine_curve. setOrientation (Qt::Horizontal);
-	baseLine_curve. setBaseline 	(0);
 	spectrum_curve. attach (plotgrid);
-	baseLine_curve. attach (plotgrid);
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
 				 0, plotHeight);
@@ -101,11 +96,12 @@
 	plotgrid	-> enableAxis (QwtPlot::xBottom);
 	X_axis. resize (plotLength);
 	Y_Buffer. resize (plotLength);
-	baseLine_Buffer. resize (plotLength);
 	for (int i = 0; i < plotLength; i ++) {
 	 X_axis [i] = i;
 	 Y_Buffer [i] = 0;
 	}
+	delayCount	= 5;
+	delayBufferP	= 0;
 }
 
 	snrViewer::~snrViewer () {
@@ -160,29 +156,53 @@
 	return myFrame. isHidden();
 }
 
+void	snrViewer::set_snrDelay	(int d) {
+	if ((0 <= d) && (d <= 10))
+	 delayCount = d;
+	else
+	 delayCount = 5;
+	delayBufferP	= 0;
+}
+
 void	snrViewer::add_snr	(float snr) {
-	memmove (&(Y_Buffer. data () [1]), &(Y_Buffer. data () [0]),
-	 (plotLength - 1) * sizeof (double));
-	memmove (&(baseLine_Buffer. data () [1]),
-	 &(baseLine_Buffer. data () [0]),
-	 (plotLength - 1) * sizeof (double));
-	Y_Buffer [0]	= snr;
-	baseLine_Buffer [0] = 0;
+static float delayBuffer [10];
+float	sum	= 0;
+	delayBuffer [delayBufferP] = snr;
+	delayBufferP = (delayBufferP + 1) % delayCount;
+	if (delayBufferP == 0) {
+	 for (int i = 0; i < delayCount; i ++)
+	 sum += delayBuffer [i];
+	 sum /= delayCount;
+	 addtoView (sum);
+	}
+}
+
+#define	VIEWBUFFER_SIZE 5
+void	snrViewer::addtoView (float v) {
+static float displayBuffer [VIEWBUFFER_SIZE];
+static int displayPointer = 0;
+
+	displayBuffer [displayPointer] = v;
+	displayPointer = (displayPointer + 1) % VIEWBUFFER_SIZE;
+	if (displayPointer == 0) {
+	 memmove (&(Y_Buffer. data () [VIEWBUFFER_SIZE]),
+	 &(Y_Buffer. data () [0]),
+	 (plotLength - VIEWBUFFER_SIZE) * sizeof (double));
+	 for (int i = 0; i < VIEWBUFFER_SIZE; i ++)
+	 Y_Buffer [i] = displayBuffer [i];
 #ifdef	__DUMP_SNR__
-	if (snrDumpFile. load () != nullptr)
-	 fwrite (&snr, sizeof (float), 1, snrDumpFile. load ());
+	 if (snrDumpFile. load () != nullptr)
+	 fwrite (displayBuffer, sizeof (float), 
+	 VIEWBUFFER_SIZE, snrDumpFile. load ());
 #endif
+	}
 }
 
 void	snrViewer::add_snr	(float sig, float noise) {
 float snr = 20 * log10 ((sig + 0.001) / (noise + 0.001));
 	memmove (&(Y_Buffer. data () [1]), &(Y_Buffer. data () [0]),
 	 (plotLength - 1) * sizeof (double));
-	memmove (&(baseLine_Buffer. data () [1]),
-	 &(baseLine_Buffer. data () [0]),
-	 (plotLength - 1) * sizeof (double));
 	Y_Buffer [0]	= snr;
-	baseLine_Buffer [0] = 0;
 #ifdef	__DUMP_SNR__
 	if (snrDumpFile. load () != nullptr)
 	 fwrite (&snr, sizeof (float), 1, snrDumpFile. load ());
@@ -192,8 +212,6 @@
 void	snrViewer::show_snr () {
 	spectrum_curve. setSamples (X_axis. data (),
 	 Y_Buffer. data (), plotLength);
-	baseLine_curve. setSamples (X_axis. data (),
-	 baseLine_Buffer. data (), plotLength);
 	plotgrid	-> replot (); 
 }
 
@@ -234,7 +252,6 @@
 	this		-> gridColor	= QColor (gridColor);
 	this		-> curveColor	= QColor (curveColor);
 	spectrum_curve. setPen (QPen(this -> curveColor, 2.0));
-	baseLine_curve. setPen (QPen(this -> curveColor, 2.0));
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
 	grid. setMajPen (QPen(this -> gridColor, 0,
 	 Qt::DotLine));

_service:download_url:qt-dab-3.7.1.tar.gz/snr-viewer/snr-viewer.h -> _service:download_url:qt-dab-3.7.2.tar.gz/snr-viewer/snr-viewer.h Changed

_service:download_url:qt-dab-3.7.1.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

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

_service:download_url:qt-dab-3.7.1.tar.gz/src/backend/data/epg-2/epg-decoder.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/src/backend/data/epg-2/epg-decoder.cpp Changed

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

@@ -41,6 +41,8 @@
 	 this	-> dirSize	= dirSize;
 	 this	-> numObjects	= objects;
 	 this	-> dir_segmentSize	= segmentSize;
+	 fprintf (stderr, "dirSize %d, numObjects %d, segmentSize %d\n",
+	 dirSize, objects, segmentSize);
 	 dir_segments		= new uint8_t [dirSize];
 	 motComponents	= new motComponentType [objects];
 	 for (i = 0; i < objects; i ++)
@@ -55,7 +57,7 @@
 
 	for (i = 0; i < numObjects; i ++) 
 	 if (motComponents [i]. inUse)
-	 delete motComponents [i]. motSlide;
+	 delete [] motComponents [i]. motSlide;
 	delete []	motComponents;
 }
 
@@ -106,10 +108,9 @@
 	 for (i = 0; i < this -> num_dirSegments; i ++)
 	 if (!this -> marked [i])
 	 return;
+//	 yes we have all data to build up the directory
+	 analyse_theDirectory();
 	}
-//
-//	yes we have all data to build up the directory
-	analyse_theDirectory();
 }
 //
 //	This is the tough one, we collected the bits, and now
@@ -121,14 +122,13 @@
 uint16_t extensionLength	= (dir_segments [currentBase] << 8) |
 	 data [currentBase + 1];
 
-int16_t	i;
-
 	currentBase += 2 + extensionLength;
-	for (i = 0; i < numObjects; i ++) {
+	for (int i = 0; i < numObjects; i ++) {
 	 uint16_t transportId	= (data [currentBase] << 8) |
 	 data [currentBase + 1];
 	 if (transportId == 0)	// just a dummy
 	 break;
+
 	 uint8_t *segment	= &data [currentBase + 2];
 	 motObject *handle	= new motObject (myRadioInterface,
 	 true,

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

@@ -103,15 +103,19 @@
 	}
 
 	int32_t		sizeinBits	=
-	 msc. size() - next - (crcFlag != 0 ? 16 : 0);
+	 msc. size () - next - (crcFlag != 0 ? 16 : 0);
 
 	if (!transportIdFlag)
 	 return;
 
 	std::vector<uint8_t> motVector;
 	motVector. resize (sizeinBits / 8);
-	for (i = 0; i < sizeinBits / 8; i ++)
-	 motVector [i] = getBits_8 (data, next + 8 * i);
+	for (i = 0; i < sizeinBits / 8; i ++) {
+	 uint8_t t = 0;
+	 for (int j = 0; j < 8; j ++)
+	 t = (t << 1) | data [next + 8 * i + j];
+	 motVector [i] = t;
+	}
 
 	uint32_t segmentSize = ((motVector [0] & 0x1F) << 8) |
 	 motVector [1];
@@ -134,23 +138,13 @@
 
 	 case 4: {
 	 motObject *h = getHandle (transportId);
-	 if ((h == nullptr) && (segmentNumber != 0))
-	 break;
-	 if ((h == nullptr) && (segmentNumber == 0)) {
-	 h = new motObject (myRadioInterface,
- false, // not within a directory
- transportId,
- &motVector [2],
- segmentSize,
- lastFlag);
- setHandle (h, transportId);
-	 break;
-	 }
-
-	 h -> addBodySegment (&motVector [2],
-	 segmentNumber,
-	 segmentSize,
-	 lastFlag);
+//	 if ((h == nullptr) && (segmentNumber != 0))
+//	 break;
+	 if (h != nullptr)
+	 h -> addBodySegment (&motVector [2],
+	 segmentNumber,
+	 segmentSize,
+	 lastFlag);
 	 }
 	 break;

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

@@ -45,17 +45,22 @@
 	this	-> segmentSize		= -1;
 
 	headerSize =
- ((segment [3] & 0x0F) << 9) |
+//	 ((segment [3] & 0x0F) << 9) |
 (segment [4] << 1) | ((segment [5] >> 7) & 0x01);
 	bodySize =
 (segment [0] << 20) | (segment [1] << 12) |
 (segment [2] << 4 ) | ((segment [3] & 0xF0) >> 4);
+
 // Extract the content type
+	int b	= (segment [5] >> 1) & 0x3F;
 	rawContentType |= ((segment [5] >> 1) & 0x3F) << 8;
 	rawContentType	|= ((segment [5] & 0x01) << 8) | segment [6];
 	contentType = static_cast<MOTContentType>(rawContentType);
 
+//	fprintf (stderr, "headerSize %d, bodySize %d. contentType %d, transportId %d\n",
+//	 headerSize, bodySize, b, transportId);
 //	we are actually only interested in the name, if any
+
 while ((uint16_t)pointer < headerSize) {
 uint8_t PLI	= (segment [pointer] & 0300) >> 6;
 uint8_t paramId = (segment [pointer] & 077);
@@ -83,13 +88,33 @@
 length = segment [pointer + 1] & 0177;
 pointer += 2;
 }
-	 if (paramId == 12) {
- int16_t i;
- for (i = 0; i < length - 1; i ++)
- name. append (segment [pointer + i + 1]);
- }
- pointer += length;
- }
+	 switch (paramId) {
+	 case 12: {
+ int16_t i;
+ for (i = 0; i < length - 1; i ++)
+ name. append (segment [pointer + i + 1]);
+ }
+ pointer += length;
+	 break;
+
+	 case 2:	// creation time
+	 case 3:	// start validity
+	 case 4:	// expiretime
+	 case 5:	// triggerTime
+	 case 6:	// version number
+	 case 7: 	// retransmission distance
+	 case 8:	// group reference
+	 case 10:	// priority
+	 case 11:	// label
+	 case 15:	// content description
+ pointer += length;
+	 break;
+
+	 default:
+	 pointer += headerSize;	// this is so wrong!!!
+	 break;
+	 }
+ }
 	}
 }
 
@@ -139,7 +164,6 @@
 	 if (motMap. find (i) == motMap. end())
 	 return;
 	}
-
 //	The motObject is (seems to be) complete
 	handleComplete();
 }
@@ -149,7 +173,7 @@
 QByteArray result;
 	for (const auto &it : motMap)
 	 result. append (it. second);
-
+	fprintf (stderr, "Handling complete\n");
 	handle_motObject (result, name, (int)contentType, dirElement);
 }

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

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

@@ -42,8 +42,9 @@
 	connect (this, SIGNAL (nameofEnsemble (int, const QString &)),
 	         myRadioInterface,
 	                    SLOT (nameofEnsemble (int, const QString &)));
-	connect (this, SIGNAL (clockTime (int, int, int, int, int)),
-	         myRadioInterface, SLOT (clockTime (int, int, int, int, int)));
+	connect (this, SIGNAL (clockTime (int, int, int, int, int, int, int, int)),
+	         myRadioInterface, SLOT (clockTime (int, int, int, int, int,
+	                                                int, int, int)));
 	connect (this, SIGNAL (changeinConfiguration ()),
 	         myRadioInterface, SLOT (changeinConfiguration ()));
 	connect (this, SIGNAL (startAnnouncement (const QString &, int)),
@@ -62,6 +63,7 @@
 	delete	currentConfig;
 	delete	ensemble;
 }
+
 //
 //	FIB's are segments of 256 bits. When here, we already
 //	passed the crc and we start unpacking into FIGs
@@ -243,6 +245,7 @@
 	CIFcount 		= highpart * 250 + lowpart;
 
 	if ((changeFlag == 0) && (prevChangeFlag == 3)) {
+	   fprintf (stderr, "handling change\n");
 	   dabConfig 	*temp	= currentConfig;
 	   currentConfig	= nextConfig;
 	   nextConfig		= temp;
@@ -963,12 +966,12 @@
 	                                  (const char *) label,
 	                                  (CharacterSet) charSet);
 	serviceIndex	= findService (dataName);
-	if (serviceIndex == -1) 
+	if (serviceIndex == -1) {
 	   createService (dataName, SId, 0);
-	else
+	} else {
 	  ensemble -> services [serviceIndex]. SCIds = 0;
-
-	ensemble -> services [serviceIndex]. hasName = true;
+	  ensemble -> services [serviceIndex]. hasName = true;
+	}
 }
 
 // service component label 8.1.14.3
@@ -1740,10 +1743,13 @@
 	}
 
 	if (change) {
+	   int utc_day	= dateTime [2];
+	   int utc_hour	= dateTime [3];
+	   int utc_minute = dateTime [4];
 	   adjustTime (dateTime);
-//	   const QString timeString = mapTime (dateTime);
 	   emit  clockTime (dateTime [0], dateTime [1],
-	                    dateTime [2], dateTime [3], dateTime [4]);
+	                    dateTime [2], dateTime [3], dateTime [4],
+	                              utc_day, utc_hour, utc_minute);
 	}
 }

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

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

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

_service:download_url:qt-dab-3.7.1.tar.gz/src/protection/protection.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/src/protection/protection.cpp Changed

_service:download_url:qt-dab-3.7.1.tar.gz/src/support/findfilenames.cpp -> _service:download_url:qt-dab-3.7.2.tar.gz/src/support/findfilenames.cpp Changed

Changes of Revision 37