Packman Build Service PMBS

qt-dab.changes Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.7.tar.gz/.gitignore -> _service:download_url:qt-dab-3.7.1.tar.gz/.gitignore Changed

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

@@ -1,6 +1,6 @@
-# Qt-DAB-3.7 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# 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.7 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.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.
 
 ![overview](/qt-dab-screen.png?raw=true)
 
@@ -26,13 +26,14 @@
 * [EPG-Handling](#EPG-Handling)
 * [Recording the SNR](#Recording-the-SNR)
 * [Scanning and the skip table](#Scanning-and-the-skip-table)
+* [Pluto device and fm transmission](#Pluto-device-and-fm-transmission)
 * [Copyright](#copyright)
 
 ------------------------------------------------------------------
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.7** 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.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.
 
 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.
@@ -46,8 +47,9 @@
 that can be skipped duting a scan.
 
 Qt-DAB makes extensive use of a GUI. Personally, grown up in the time of
-"command lines", from time to time I often prefer a simple command line
-driven device. Therefore, a **terminal-DAB-xxx** version was developed, a
+ASR-33 terminals and "command lines", I often prefer a simple command line
+over a GUI.
+Therefore, a **terminal-DAB-xxx** version was developed, a
 simpler version, just for listening to a DAB service, making use of 
 command line
 
@@ -112,7 +114,7 @@
 Widgets and scopes for Qt-DAB
 ------------------------------------------------------------------
 
-Qt-DAB has a main widget and a number of  **optional**
+Qt-DAB shows a main widget and a number of  **optional**
 widgets, visible or invisible under user's control
 
   * a widget with controls for the attached device,
@@ -129,7 +131,7 @@
 
 Another - an eight' - widget shows when running a *scan*; the widget will show the contents of the ensembles found in the selected channel. In 3.5 the
 possibility was created to save a detailed description of the services
-in the different channels, in a format easily to process with LibreOffice
+in the different channels, in a format easy to process with LibreOffice
 or comparable programs.
 
 While the main window is **always** shown, visibility of the others is
@@ -139,7 +141,7 @@
 
 The buttons and other controls on the main widget are equipped with
 *tool tips* briefly explaining the (in most cases obvious) function
-of the element. (The tooltip on the copyright label shows (a.o) the date the executable was generated.)
+of the element (the tooltip on the copyright label shows (a.o) the date the executable was generated.)
 
 The elements in the **left part** of the widget, below the list of services,
  are concerned with selecting a channel and service. 
@@ -151,6 +153,13 @@
 is available, now for selecting the previous resp. the next service 
 on the list.
 
+Some general data is displayed on the top right part of the widget, 
+such as run time and current time, frequency offset and
+(overall) processor load.
+
+In the middle part, name of the ensemble and name of the selected service
+are displayed, complemented with the text of the dynamic label.
+
 Some data on the selected service - if any - is to be found on
 a separate widget, the "technical data" widget.
 This widget will show where the data for the
@@ -160,7 +169,7 @@
 as Program Associated Data with the audio transmission, will be shown here or on a separate widget
 (the setting can be modified from the configuration widget).
 
-The further selectors are concentrated on the bottom part of the right side
+The other selectors are concentrated on the bottom part of the right side
 of the widget. Buttons to make scopes visible, to store input and or
 output into a file, to select input device and the audio and to
 scan and store a description of the ensemble are in that section.
@@ -461,8 +470,13 @@
 samples in the null period.
 
 For every second DAB frame, such a computation is performed, 
-so, about 5 computations per second are performed and shown. To be precise:
-each minute there are 312 computations.
+and, depending on the settings, shown.
+The configuration widget contains a spinbox that can be used to set the
+"speed" of displaying data.
+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.
 
@@ -485,8 +499,8 @@
 ----------------------------------------------------------------------
 
 As known, Qt-DAB provides a possibility of scanning the band. Band III
-contains 39 channels, so - depending on your position - the is
-quite a number of channels where no DAB signal is.
+contains 39 channels, so - depending on your position - there is
+quite a number of channels where no DAB signal is to be found.
 
 As in **dabChannel**, Qt-DAB has an extended mechanism to skip
 specified channels during a scan, a **skipTable**.
@@ -507,6 +521,37 @@
 the same table that is used when no skipFile is selected.
 
 -----------------------------------------------------------------------
+# PLuto device and fm transmission
+-----------------------------------------------------------------------
+
+As (probably) known, the **Adalm Pluto** device has receive and transmit
+capabilities. In a previous project, an extension was made to a
+dab-cmdline version using the Adalm pluto device,
+to allow the transmission on FM of a preselected
+service.
+
+As an exercise - and slightly experimental - the functionality was
+added to qt-dab.
+
+If - on configuration - pluto-rxtx is selected as device rather than
+pluto, and if pluto-rxtx is selected as device, the audio
+of the selected service, augmented with the text of the dynamic label
+encoded as RDS signal, will be transmitted on a specified frequency.
+
+As default, the transmit frequency is 110 MHz, however, the user can specify
+the frequency (obviously within the range supported by the Adalm-Pluto)
+as command line parameter: starting the program from the command line
+with as parameter
+
+	-F XXX
+
+will instruct the software to start the
+transmitter of the Adalm pluto - if the pluto-rxtx is the selected device -
+on the given frequency (specified in KHz)
+
+![dab2fm](/dab2fm.png?raw=true)
+
+-----------------------------------------------------------------------
 # Copyright
 ------------------------------------------------------------------------

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

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer Added

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/dab-streamer.cpp Added

@@ -0,0 +1,509 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computer
+ *
+ *    This file is part of dab-2-fm
+ *
+ *    dab-2-fm is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    dab-2-fm is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-2-fm; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *      rds encoding is heavily based on the "fmstation"
+ *      from Jan Roemisch (github.com/maxx23), all rights acknowledged
+ */
+
+#include        <stdio.h>
+#include        <cstring>
+#include        <signal.h>
+#include        <stdlib.h>
+#include        <stdint.h>
+//#include	<sndfile.h>
+//#include	<samplerate.h>
+#include	<math.h>
+#include	<atomic>
+#include	<sys/time.h>
+#include	<unistd.h>
+#include	<vector>
+#include	"up-filter.h"
+#include	"dab-streamer.h"
+#include	"pluto-rxtx-handler.h"
+static inline
+int64_t         getMyTime       (void) {
+struct timeval  tv;
+
+	gettimeofday (&tv, NULL);
+	return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
+}
+
+		dabStreamer::dabStreamer (int		inRate,
+	                                  int		outRate,
+	                                  plutoHandler	*generator):
+	                                    pcmBuffer (8 * 32768),
+	                                    rdsBuffer (256),
+	                                    lowPassFilter (11, 15000, inRate) {
+
+	this	-> inRate		= inRate;
+	this	-> outRate		= outRate;
+	this	-> generator		= generator;
+
+	oscillatorTable = new std::complex<float> [outRate];
+        for (int i = 0; i < outRate; i ++)
+           oscillatorTable [i] =
+                      std::complex<float> (cos (2 * M_PI * (float)i / outRate),
+                                           sin (2 * M_PI * (float)i / outRate));
+
+	running. store (false);
+	pos			= 0;
+        nextPhase               = 0;
+
+	sinTable		= new float [outRate];
+	for (int i = 0; i < outRate; i ++)
+	   sinTable [i] = sin ((float)i / outRate * 2 * M_PI);
+
+	rt_pos			= 0;
+        m			= 0;
+        e			= 0;
+        prev_e			= 0;
+        bpos			= 0;
+        symclk_p		= 0.0;
+        symclk_b		= 1;
+
+	rds_info.	pi	= 0x10f0;
+	rds_info.	af [0]	= 0xE210;
+	rds_info.	af [1]	= 0x20E0;
+	rds_info.	di	= RDS_GROUP_0A_DI_STEREO;
+	rds_info.	pty	= 0x00;
+	memcpy (&rds_info. ps_name [0], "<home>", 7);
+	memcpy (&rds_info. radiotext [0], "no transmission yet\r", 19);
+	rds_init_groups	(&rds_info);
+	group		= rds_group_schedule ();
+	messageIn. store (false);
+	threadHandle	= std::thread (&dabStreamer::run, this);
+	running. store (true);
+}
+
+	dabStreamer::~dabStreamer (void) {
+	stop ();
+
+	delete	sinTable;
+	delete	oscillatorTable;
+}
+
+void	dabStreamer::stop (void) {
+	if (!running. load ())
+	   return;
+	running. store (false);
+	threadHandle. join ();
+}
+
+void	dabStreamer::audioOutput (float *v, int amount) {
+float lBuffer [2 * amount];
+
+	while (pcmBuffer. GetRingBufferWriteAvailable () < 2 * amount)
+	   usleep (400);
+	for (int i = 0; i < amount; i ++) {
+	   std::complex<float> x = std::complex<float> (v [2 * i],
+	                                                v [2 * i + 1]);
+	   x	= lowPassFilter. Pass (x);
+	   lBuffer [2 * i] = real (x);
+	   lBuffer [2 * i + 1] = imag (x);
+	}
+	pcmBuffer. putDataIntoBuffer (lBuffer, 2 * amount);
+}
+
+void	dabStreamer::addRds (const std::string v) {
+	if (messageIn. load ())		// still processing?
+	   return;
+	rdsBuffer. putDataIntoBuffer (v. c_str (), v. size ());
+	messageIn. store (true);
+}
+
+void	dabStreamer::run (void) {
+int32_t outputLimit     = 2 * outRate / 5;	// in single values
+upFilter	theFilter (15, inRate, outRate);
+uint64_t        nextStop;
+
+//	the rds text will be the name of the file that is being played
+	rds_info.	pi	= 0x10f0;
+	rds_info.	af [0]	= 0xE210;
+	rds_info.	af [1]	= 0x20E0;
+	rds_info.	di	= RDS_GROUP_0A_DI_STEREO;
+	rds_info.	pty	= 0x00;
+	memset (&rds_info. ps_name [0], 0, RDS_PS_LEN);
+	memcpy (&rds_info. ps_name [0], "<DAB>", 6);
+	memcpy (&rds_info. radiotext [0], "no rds yet\r", 12);
+	rds_init_groups	(&rds_info);
+	group		= rds_group_schedule ();
+
+	running. store (true);
+
+	float	lBuf [inRate / 5];
+	while (running. load ()) {
+	   int  readCount;
+//	   uint64_t currentTime      = getMyTime ();
+//
+//	check to see if  we need/can update the rds text
+	   int rdsCount	= rdsBuffer. GetRingBufferReadAvailable ();
+	   if ((rdsCount >= 10) && (rt_pos == 0)) {
+	      char rds [rdsCount];
+	      rdsBuffer. getDataFromBuffer (rds, rdsCount);
+	      messageIn. store (false);
+	      for (int i = 0; i < rdsCount; i ++) {
+	         rds_info. radiotext [i] = rds [i];
+	      }
+	      rds_info. radiotext [rdsCount] = '\r';
+	      rds_info. radiotext [rdsCount + 1] = 0;
+	      rds_init_groups	(&rds_info);
+	      group	= rds_group_schedule ();
+	   }
+
+	   while (running. load () && 
+	        (pcmBuffer. GetRingBufferReadAvailable () < inRate / 10)) {
+	      std::complex<float> filler [48];
+	      memset (filler, 0, 48 * sizeof (std::complex<float>));
+	      usleep (1000);
+	   }
+	   if (!running. load ())
+	      break;
+	   readCount	= pcmBuffer. getDataFromBuffer (lBuf, inRate / 10);
+	   for (int i = 0; i < readCount / 2; i ++) {
+	      std::complex<float> v = std::complex<float> (4 * lBuf [2 * i],
+	                                                   4 * lBuf [2 * i + 1]);
+	      std::complex<float> lbuf [outRate / inRate];	
+	      theFilter. Filter (v, lbuf);	
+	      modulateData ((float *)lbuf, outRate / inRate, 2);
+	   }
+	}
+}
+//
+//	Preemphasis filter derived from the one by Jonti (Jonathan Olds)
+static	double a0	= 5.309858008;
+static	double a1	= -4.794606188;
+static	double b1	= 0.4847481783;
+
+float sample;
+struct sample_i {
+	float l;
+	float r;

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/dab-streamer.h Added

@@ -0,0 +1,187 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the dab streamer
+ *
+ *    dab streamer is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    dab streamer is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-streamer; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *	rds encoding is heavily based on the "fmstation"
+ *	from Jan Roemisch (github.com/maxx23), all rights acknowledged
+ */
+
+#ifndef __DAB_STREAMER__
+#define __DAB_STREAMER__
+
+#include	<thread>
+#include	<stdint.h>
+#include	<stdio.h>
+//#include	<sndfile.h>
+#include	<complex>
+#include	<atomic>
+#include	"ringbuffer.h"
+#include	"audio-base.h"
+#include	"ringbuffer.h"
+#include	"lowpass-filter.h"
+#include	<string>
+
+class	plutoHandler;
+#define RDS_AF_MAX		26
+#define RDS_RT_MAX		256
+#define RDS_PS_LEN		8
+#define RDS_TP			(1 << 10)
+
+#define RDS_GROUP_0A_TA		(1 << 4)
+#define RDS_GROUP_0A_MUSIC	(1 << 3)
+#define RDS_GROUP_0A_DI_EON	(1 << 0)
+#define RDS_GROUP_0A_DI_COMP	(1 << 1)
+#define RDS_GROUP_0A_DI_AHEAD	(1 << 2)
+#define RDS_GROUP_0A_DI_STEREO	(1 << 3)
+
+#define RDS_GROUP_TYPE(a, b)	((((a) & 0xf) << 1) | (b & 0x1))
+#define RDS_GROUP(x)			(((x) & 0x1f) << 11)
+#define RDS_PTY(x)				(((x) & 0x1f) << 5)
+
+#define RDS_BLOCK_A			1
+#define RDS_BLOCK_B			2
+#define RDS_BLOCK_C			4
+#define RDS_BLOCK_D			8
+
+#define RDS_BLOCK_DATA_LEN	16
+#define RDS_BLOCK_CRC_LEN	10
+#define RDS_BLOCK_LEN		(RDS_BLOCK_DATA_LEN + RDS_BLOCK_CRC_LEN)
+
+#define RDS_GROUP_NUMBLOCKS	4
+#define RDS_GROUP_LEN		(RDS_BLOCK_LEN * RDS_GROUP_NUMBLOCKS)
+
+#define RDS_TMC_AID		0xCD46
+#define RDS_TMC_GROUP		RDS_GROUP_TYPE(8, 0)
+#define RDS_TMC_T		(1 << 4)	/*  */
+#define RDS_TMC_F		(1 << 3)	/*  */
+#define RDS_TMC_DP(x)		((x) & 0x7)	/* duration and persistence */
+
+#define RDS_TMC_D		(1 << 15)	/* diversion advice */
+#define RDS_TMC_PN		(1 << 14)	/* direction */
+#define RDS_TMC_EXTENT(x)	(((x) & 0x7) << 11)	/*  */
+#define RDS_TMC_EVENT(x)	(x)		/* terrorist incident */
+#define RDS_TMC_LOCATION(x)	(x)		/* Ilmenau-Ost */
+
+#define RDS_TMC_VAR(x)	(((x) & 0x3) << 14)	/* Variant */
+
+/* Variant 0 */
+#define RDS_TMC_LTN(x)	(((x) & 0x3f) << 6)	/* Location Table Number */
+#define RDS_TMC_AFI		(1 << 5)	/* AF Indicator */
+#define RDS_TMC_M		(1 << 4)	/* Mode of Transmission */
+/* if !M */
+#define RDS_TMC_I		(1 << 3)	/* International */
+#define RDS_TMC_N		(1 << 2)	/* National */
+#define RDS_TMC_R		(1 << 1)	/* Regional */
+#define RDS_TMC_U		(1 << 0)	/* Urban */
+
+/* Variant 1 */
+#define RDS_TMC_GAP(x)		(((x) & 0x3) << 12)	/* Gap parameter */
+#define RDS_TMC_SID(x)		(((x) & 0x3f) << 6)	/* SID */
+#define RDS_TMC_TA(x)		(((x) & 0x3) << 4)	/* Activity time */
+#define RDS_TMC_TW(x)		(((x) & 0x3) << 2)	/* Window time */
+#define RDS_TMC_TD(x)		(((x) & 0x3) << 0)	/* Delay time */
+
+#define MANCH_ENCODE(clk, bit) \
+	(((clk ^ bit) << 1) | ((clk ^ 0x1 ^ bit)))
+
+#define NRZ(in) \
+	(double)(((int)((in) & 0x1) << 1) - 1)
+
+#define	index_A		0
+#define	index_B		1
+#define	index_C		2
+#define	index_D		3
+
+struct rds_info_s {
+	uint16_t	pi;
+	uint16_t	af [RDS_AF_MAX];
+	uint16_t	di;
+	char		pty;
+	char		ps_name [RDS_PS_LEN];
+	char		radiotext [RDS_RT_MAX];
+};
+
+struct rds_group_s {
+	char	bits [RDS_GROUP_LEN];
+	uint16_t blocks [RDS_GROUP_NUMBLOCKS];
+	int info;
+	struct rds_info_s *info_block;
+};
+
+typedef struct {
+	float	leftChannel;
+	float	rightChannel;
+} floatSample;
+
+class dabStreamer : public audioBase {
+public:
+		dabStreamer		(int, int, plutoHandler *);
+		~dabStreamer		(void);
+	void	audioOutput		(float *, int);
+	void	addRds			(const std::string);
+	void	stop			(void);
+private:
+	RingBuffer<float> pcmBuffer;
+	RingBuffer<char>  rdsBuffer;
+	LowPassFIR	lowPassFilter;
+	void		run			(void);
+	std::thread	threadHandle;
+	int		inRate;
+	int		outRate;
+	plutoHandler	*generator;
+	std::complex<float>	*oscillatorTable;
+	float		*sinTable;
+	void		modulateData	(float *, int, int);
+	std::atomic<bool>	running;
+	std::atomic<bool>	messageIn;
+	float		nextPhase;
+	int		pos;
+        char		m;
+        char		e;
+        char		prev_e;
+        int		bpos;
+        double		symclk_p;
+        char		symclk_b;
+
+	struct rds_group_s *group;
+	struct rds_info_s rds_info;
+	
+	struct rds_group_s group_0a;
+	struct rds_group_s group_2a;
+	struct rds_group_s group_3a;
+	struct rds_group_s group_8a;
+
+	int		rt_pos;
+	uint16_t rds_crc		(uint16_t);
+	void	rds_bits_to_values	(char *, uint16_t, int);
+	void	rds_serialize		(struct rds_group_s *, char);
+	void	rds_init_groups		(struct rds_info_s *info);
+
+	void	rds_group_0A_update	(void);
+	void	rds_group_2A_update	(void);
+	void	rds_group_3A_update	(void);
+	void	rds_group_8A_update	(void);
+	struct rds_group_s*
+	   	rds_group_schedule	(void);
+};
+
+#endif
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/file-driver.cpp Added

@@ -0,0 +1,52 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Programming
+ *
+ *    This file is part of the fm-dab streamer (the streamer)
+ *    the streamer is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    the streamer is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with the streamer; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define	BUF_SIZE	512
+
+#include	"file-driver.h"
+
+	fileDriver::fileDriver	(std::string fileName, int rate) {
+	sf_info. samplerate	= rate;
+	sf_info. channels	= 2;
+	sf_info. format		= SF_FORMAT_WAV | SF_FORMAT_FLOAT;
+	oFile			= sf_open (fileName. c_str (),
+	                                   SFM_WRITE, &sf_info);
+	if (oFile == NULL)
+	   throw (23);
+        localBuffer. resize (2 * BUF_SIZE);
+	localBufferP		= 0;
+}
+
+	fileDriver::~fileDriver	(void) {
+	   sf_close (oFile);
+	}
+
+void	fileDriver::sendSample	(std::complex<float> sample) {
+	localBuffer [2 * localBufferP    ] = real (sample);
+	localBuffer [2 * localBufferP + 1] = imag (sample);
+	localBufferP ++;
+	if (localBufferP >= BUF_SIZE) {
+	   sf_writef_float (oFile, localBuffer. data (), BUF_SIZE);
+	   localBufferP = 0;
+	}
+}
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/file-driver.h Added

@@ -0,0 +1,49 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Programming
+ *
+ *    This file is part of the dab streamer
+ *    dab streamer is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    dab streamer is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab streamer; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef	__FILE_DRIVER__
+#define	__FILE_DRIVER__
+
+#include	<stdint.h>
+#include	<sys/types.h>
+#include	<string>
+#include	<thread>
+#include	<unistd.h>
+#include	<sndfile.h>
+#include	<vector>
+#include	<complex>
+#include	"ringbuffer.h"
+#include	"output-driver.h"
+
+class	fileDriver : public outputDriver {
+public:
+		fileDriver	(std::string, int);
+		~fileDriver	(void);
+	void	sendSample	(std::complex<float>);
+private:
+	SNDFILE		*oFile;
+	SF_INFO		sf_info;
+	std::vector<float> localBuffer;
+	int		localBufferP;
+};
+#endif
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/lowpass-filter.cpp Added

@@ -0,0 +1,106 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of dab-2-fm
+ *
+ *    dab-2-fm is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    dab-2-fm is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-2-fm; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	"fir-filters.h"
+#ifndef	__MINGW32__
+#include	"alloca.h"
+#endif
+
+//FIR LowPass
+
+	LowPassFIR::LowPassFIR (int16_t firsize,
+	                        int32_t Fc, int32_t fs){
+float	f	= (float)Fc / fs;
+float	sum	= 0.0;
+int16_t		i;
+float	*temp 	= (float *)alloca (firsize * sizeof (float));
+
+	filterSize	= firsize;
+	filterKernel	= new std::complex<float> [filterSize];
+	Buffer		= new std::complex<float> [filterSize];
+	ip		= 0;
+
+	for (i = 0; i < filterSize; i ++) {
+	   filterKernel [i]	= 0;
+	   Buffer [i]		= 0;
+	}
+
+	for (i = 0; i < filterSize; i ++) {
+	   if (i == filterSize / 2)
+	      temp [i] = 2 * M_PI * f;
+	   else 
+	      temp [i] =
+	         sin (2 * M_PI * f * (i - filterSize/2))/ (i - filterSize/2);
+//
+//	Blackman window
+	   temp [i]  *= (0.42 -
+		    0.5 * cos (2 * M_PI * (float)i / filterSize) +
+		    0.08 * cos (4 * M_PI * (float)i / filterSize));
+
+	   sum += temp [i];
+	}
+
+	for (i = 0; i < filterSize; i ++)
+	   filterKernel [i] = std::complex<float> (temp [i] / sum, 0);
+}
+
+	LowPassFIR::~LowPassFIR () {
+	delete[]	filterKernel;
+	delete[]	Buffer;
+}
+//
+//	we process the samples backwards rather than reversing
+//	the kernel
+std::complex<float>	LowPassFIR::Pass (std::complex<float> z) {
+int16_t	i;
+std::complex<float>	tmp	= 0;
+
+	Buffer [ip]	= z;
+	for (i = 0; i < filterSize; i ++) {
+	   int16_t index = ip - i;
+	   if (index < 0)
+	      index += filterSize;
+	   tmp		+= Buffer [index] * filterKernel [i];
+	}
+
+	ip = (ip + 1) % filterSize;
+	return tmp;
+}
+
+float LowPassFIR::Pass (float v) {
+int16_t		i;
+float	tmp	= 0;
+
+	Buffer [ip] = std::complex<float> (v, 0);
+	for (i = 0; i < filterSize; i ++) {
+	   int16_t index = ip - i;
+	   if (index < 0)
+	      index += filterSize;
+	   tmp += real (Buffer [index]) * real (filterKernel [i]);
+	}
+
+	ip = (ip + 1) % filterSize;
+	return tmp;
+}
+
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/lowpass-filter.h Added

@@ -0,0 +1,46 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of dab-2-fm
+ *
+ *    dab-2-fm is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    dab-2-fm is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with dab-2-fm; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __FIR_LOWPASSFILTER__
+#define __FIR_LOWPASSFILTER__
+
+#include	"dab-constants.h"
+
+class	LowPassFIR {
+public:
+			LowPassFIR (int16_t,	// order
+	                            int32_t, 	// cutoff frequency
+	                            int32_t	// samplerate
+	                           );
+			~LowPassFIR (void);
+	std::complex<float>	Pass		(std::complex<float>);
+	float			Pass		(float);
+private:
+	int16_t		filterSize;
+	std::complex<float>	*filterKernel;
+	std::complex<float>	*Buffer;
+	int16_t		ip;
+};
+
+#endif
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/output-driver.cpp Added

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/output-driver.h Added

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/up-filter.cpp Added

@@ -0,0 +1,67 @@
+#
+#include	"up-filter.h"
+
+static inline
+std::complex<float> cmul (std::complex<float> in, float y) {
+	return std::complex<float> (real (in) * y,
+	                            imag (in) * y);
+}
+
+static inline 
+std::complex<float> cdiv (std::complex<float> in, float y) {
+	return std::complex<float> (real (in) / y,
+	                            imag (in) / y);
+}
+
+	upFilter::upFilter (int bufferSize, int  inRate, int outRate):
+	                                    kernel (bufferSize * (outRate / inRate)),
+	                                    buffer (bufferSize) {
+float	 tmp [bufferSize * (outRate / inRate)];
+float	f	= (float)(inRate / 2) / outRate;
+float	sum	= 0;
+
+	this	-> multiplier	= outRate / inRate;
+	this	-> order	= bufferSize * multiplier;
+	this	-> ip		= 0;
+	this	-> bufferSize	= bufferSize;
+
+	for (int i = 0; i < bufferSize; i ++)
+	   buffer [i] = std::complex<float> (0, 0);
+
+	for (int i = 0; i < order; i ++) {
+	   if (i == order / 2)
+	      tmp [i] = 2 * M_PI * f;
+	   else 
+	      tmp [i] = sin (2 * M_PI * f * (i - order / 2))/ (i - order /2);
+//
+//	Blackman window
+	   tmp [i]  *= (0.42 -
+		    0.5 * cos (2 * M_PI * (float)i / (float) order) +
+		    0.08 * cos (4 * M_PI * (float)i / (float) order));
+	   sum += tmp [i];
+	}
+
+	for (int i = 0; i < order; i ++)
+	   kernel [i] = std::complex<float> (tmp [i] / sum, 0);
+}
+
+	upFilter::~upFilter	() {
+}
+//
+static bool first_time = false;
+void	upFilter::Filter (std::complex<float> in, std::complex<float> *res) {
+
+	buffer [ip] = in;
+	for (int i = 0; i < multiplier; i ++) {
+	   res [i] = std::complex<float> (0, 0);
+	   for (int j = 0; j < bufferSize; j ++) {
+	      int index = ip - j;
+	      if (index < 0)
+	         index += bufferSize;
+	      res [i] += buffer [index] *
+	                   kernel [i + j * multiplier];
+	   }
+	}
+	ip = (ip + 1) % bufferSize;
+}
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/dab-streamer/up-filter.h Added

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

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C) 2014 .. 2019
+ *    Copyright (C) 2014 .. 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -78,13 +78,14 @@
 int     opt;
 QString freqExtension		= "";
 bool	error_report		= false;
+int	fmFrequency		= 110000;
 
 	QCoreApplication::setOrganizationName ("Lazy Chair Computing");
 	QCoreApplication::setOrganizationDomain ("Lazy Chair Computing");
 	QCoreApplication::setApplicationName ("qt-dab");
 	QCoreApplication::setApplicationVersion (QString (CURRENT_VERSION) + " Git: " + GITHASH);
 
-	while ((opt = getopt (argc, argv, "i:P:Q:A:T")) != -1) {
+	while ((opt = getopt (argc, argv, "i:P:Q:A:TMF:")) != -1) {
 	   switch (opt) {
 	      case 'i':
 	         initFileName = fullPathfor (QString (optarg));
@@ -102,6 +103,13 @@
 	         error_report	= true;
 	         break;
 
+	      case 'M':
+	         break;
+
+	      case 'F':
+	         fmFrequency	= atoi (optarg);
+	         break;
+
 	      default:
 	         break;
 	   }
@@ -134,7 +142,8 @@
 	                                       presets,
 	                                       freqExtension,
 	                                       error_report,
-	                                       dataPort
+	                                       dataPort,
+	                                       fmFrequency
                                                );
 	MyRadioInterface -> show();
         a. exec();

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

@@ -284,7 +284,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-3.7
+TARGET		= qt-dab-3.71
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -319,9 +319,10 @@
 CONFIG		+= hackrf
 CONFIG		+= lime
 #CONFIG		+= soapy
+#CONFIG		+= pluto-rxtx
 #CONFIG		+= pluto
-CONFIG		+= elad-device
-#CONFIG		+= elad-files		# do not use this
+#CONFIG		+= elad-device
+#CONFIG		+= colibri
 CONFIG		+= faad
 #CONFIG		+= fdk-aac
 #very experimental, simple server for connecting to a tdc handler
@@ -348,7 +349,6 @@
 
 # an attempt to have it run under W32 through cross compilation
 win32 {
-
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -361,7 +361,7 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-3.7
+#	TARGET		= qt-dab64-3.71
 #	DEFINES		+= __BITS64__
 #	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
@@ -380,7 +380,7 @@
 #	CONFIG		+= NO_SSE
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-3.7
+	TARGET		= qt-dab32-3.71
 	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
@@ -395,6 +395,7 @@
 	CONFIG		+= lime
 	CONFIG		+= pluto-2
 	CONFIG		+= NO_SSE
+	DEFINES		+= __THREADED_BACKEND
 #
 #	end of 32/64 specifics
 INCLUDEPATH	+= /usr/local/include
@@ -425,6 +426,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		+=__KEEP_GAIN_SETTINGS__
 }
 #	devices
@@ -545,13 +547,30 @@
 	LIBS		+= -lSoapySDR -lm
 }
 
+pluto-rxtx	{
+	DEFINES		+= HAVE_PLUTO_RXTX
+	QT		+= network
+	INCLUDEPATH	+= ./qt-devices/pluto-rxtx
+	INCLUDEPATH	+= ./dab-streamer
+	HEADERS		+= ./qt-devices/pluto-rxtx/dabFilter.h
+	HEADERS		+= ./qt-devices/pluto-rxtx/pluto-rxtx-handler.h 
+	HEADERS		+= ./dab-streamer/dab-streamer.h \
+	                   ./dab-streamer/lowpass-filter.h \
+	                   ./dab-streamer/up-filter.h
+	SOURCES		+= ./qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp 
+	SOURCES		+= ./dab-streamer/dab-streamer.cpp \
+	                   ./dab-streamer/lowpass-filter.cpp \
+	                   ./dab-streamer/up-filter.cpp
+	FORMS		+= ./qt-devices/pluto-rxtx/pluto-rxtx-widget.ui
+	LIBS		+= -liio -lad9361
+}
+
 pluto	{
 	DEFINES		+= HAVE_PLUTO
 	QT		+= network
 	INCLUDEPATH	+= ./qt-devices/pluto-handler
-	HEADERS		+= ./qt-devices/pluto-handler/dabFilter.h
 	HEADERS		+= ./qt-devices/pluto-handler/pluto-handler.h
-	SOURCES		+= ./qt-devices/pluto-handler/pluto-handler.cpp
+	SOURCES		+= ./qt-devices/pluto-handler/pluto-handler.cpp 
 	FORMS		+= ./qt-devices/pluto-handler/pluto-widget.ui
 	LIBS		+= -liio -lad9361
 }
@@ -579,15 +598,16 @@
 	FORMS		+= ./qt-devices/elad-s1-handler/elad-widget.ui
 }
 
-elad-files	{
-	DEFINES		+= HAVE_ELAD_FILES
-	DEPENDPATH	+= ./qt-devices/elad-files
-	INCLUDEPATH	+= ./qt-devices/elad-files
-	HEADERS		+= ./qt-devices/elad-files/elad-files.h
-	HEADERS		+= ./qt-devices/elad-files/elad-reader.h
-	SOURCES		+= ./qt-devices/elad-files/elad-files.cpp
-	SOURCES		+= ./qt-devices/elad-files/elad-reader.cpp
-	FORMS		+= ./qt-devices/elad-files/elad-files.ui
+colibri	{
+	DEFINES         += HAVE_COLIBRI
+	DEPENDPATH      += ./qt-devices/colibri-handler
+	INCLUDEPATH     += ./qt-devices/colibri-handler
+	HEADERS         += ./qt-devices/colibri-handler/colibri-handler.h \
+	                   ./qt-devices/colibri-handler/LibLoader.h \
+	                   ./qt-devices/colibri-handler/common.h
+	SOURCES		+= ./qt-devices/colibri-handler/colibri-handler.cpp \
+	                   ./qt-devices/colibri-handler/LibLoader.cpp
+	FORMS           += ./qt-devices/colibri-handler/colibri-widget.ui
 }
 
 send_datagram {

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

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/airspy-handler/airspy-handler.h -> _service:download_url:qt-dab-3.7.1.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/colibri-handler Added

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/colibri-handler/LibLoader.cpp Added

@@ -0,0 +1,151 @@
+#include "LibLoader.h"
+
+#ifndef __linux__
+bool LibLoader::load(const wstring &file)
+#else
+bool LibLoader::load(const char *file)
+#endif
+{
+#ifndef __linux__
+	hDLL = LoadLibrary(file.data());
+#else
+#  define GetProcAddress dlsym
+	hDLL = dlopen(file, RTLD_LAZY);
+#endif
+	if (hDLL == nullptr)
+	   return false;
+
+	m_initialize =
+	     reinterpret_cast<pFunc1> (GetProcAddress (hDLL, "initialize"));
+	if (m_initialize == nullptr)
+	   return false;
+
+	m_finalize =
+	     reinterpret_cast<pFunc1> (GetProcAddress (hDLL, "finalize"));
+	if (m_finalize == nullptr)
+	   return false;
+
+	m_version =
+	     reinterpret_cast<pVersion> (GetProcAddress (hDLL, "version"));
+	if (m_version == nullptr)
+	   return false;
+
+	m_information =
+	    reinterpret_cast<pInformation>(GetProcAddress (hDLL, "information"));
+	if (m_information == nullptr)
+	   return false;
+
+	m_devices =
+	    reinterpret_cast<pDevices>(GetProcAddress (hDLL, "devices"));
+	if (m_devices == nullptr)
+	   return false;
+
+	m_open = reinterpret_cast<pOpen>(GetProcAddress (hDLL, "open"));
+	if (m_open == nullptr)
+	   return false;
+
+	m_close =
+	       reinterpret_cast<pClose>(GetProcAddress (hDLL, "close"));
+	if (m_close == nullptr)
+	   return false;
+
+	m_start =
+	       reinterpret_cast<pStart>(GetProcAddress (hDLL, "start"));
+	if (m_start == nullptr)
+	   return false;
+
+	m_stop = reinterpret_cast<pStop>(GetProcAddress(hDLL, "stop"));
+	if (m_stop == nullptr)
+	   return false;
+
+	m_setPreamp =
+	      reinterpret_cast<pSetPreamp>(GetProcAddress(hDLL, "setPream"));
+	if (m_setPreamp == nullptr)
+	   return false;
+
+	m_setFrequency =
+	      reinterpret_cast<pSetFrequency>(GetProcAddress(hDLL, "setFrequency"));
+	if (m_setFrequency == nullptr)
+	   return false;
+
+	return true;
+}
+
+void LibLoader::initialize () {
+    if (m_initialize)
+        m_initialize();
+}
+
+void LibLoader::finalize() {
+    if (m_finalize)
+        m_finalize();
+}
+
+void LibLoader::version(uint32_t &major, uint32_t &minor, uint32_t &patch) {
+    if (m_version) {
+        m_version (major, minor, patch);
+    }
+    else {
+        major = 0;
+        minor = 0;
+        patch = 0;
+    }
+}
+
+string LibLoader::information () {
+string t_str;
+
+    if (m_information) {
+        char *pStr = nullptr;
+        m_information (&pStr);
+        if (pStr)
+            t_str = string (pStr);
+    }
+
+    return t_str;
+}
+
+uint32_t LibLoader::devices () {
+uint32_t t_count = 0;
+    if (m_devices)
+        m_devices(t_count);
+    return t_count;
+}
+
+bool LibLoader::open(Descriptor *pDev, const uint32_t devIndex) {
+	if (m_open)
+        return m_open(pDev, devIndex);
+    return false;
+}
+
+void LibLoader::close (Descriptor dev) {
+	if (m_open)
+	   m_close(dev);
+}
+
+bool LibLoader::start (Descriptor dev,
+	               SampleRateIndex sr, pCallbackRx p, void *pUserData) {
+	if (m_start)
+	   return m_start(dev, sr, p, pUserData);
+	return false;
+}
+
+bool LibLoader::stop(Descriptor dev) {
+	if (m_stop)
+	   return m_stop(dev);
+	return false;
+}
+
+bool LibLoader::setPream (Descriptor dev, float value) {
+	if (m_setPreamp)
+	   return m_setPreamp (dev, value);
+	return false;
+}
+
+bool LibLoader::setFrequency(Descriptor dev, uint32_t value) {
+	if (m_setFrequency)
+	   return m_setFrequency(dev, value);
+	return false;
+}
+
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/colibri-handler/LibLoader.h Added

@@ -0,0 +1,173 @@
+#ifndef LIBLOADER_H
+#define LIBLOADER_H
+
+#ifndef __linux__
+#  include <windows.h>
+#else
+#  include <dlfcn.h>
+#endif
+
+#include <cstdint>
+#include <string>
+
+#include "common.h"
+
+#ifndef __linux__
+#  define COLIBRI_NANO_API __stdcall
+#else
+#  define COLIBRI_NANO_API
+#endif
+
+using namespace std;
+
+/**
+ * \mainpage ColibriNANO receiver library.
+ *
+ * Internal ADC clock frequency 122.88 MHz, it determines the Nyquist zone bandwidth, ADC clock/2 = 61.44 MHz.
+ * ColibriNANO can receive only in one Nyquist zone at the same time e.g. 0-61.44 MHz, 61.44-122.88 MHz, 122.88-184.32 MHz etc.
+ * In the first Nyquist zone internal LPF works automatically, in the second and higher Nyquist zones LPF is disabled.
+ * This library allows you to control ColibriNANO receiver, change tuning frequency, preamplifier gain/attenuation
+ * and receive IQ stream with adjustable sample rate.
+ * ColibriNANO receiver supports the following sample rates:
+ *   - 48 kHz
+ *   - 96 kHz
+ *   - 192 kHz
+ *   - 384 kHz
+ *   - 768 kHz
+ *   - 1536 kHz
+ *   - 1920 kHz
+ *   - 2560 kHz
+ *   - 3072 kHz
+ *
+ *   Some PC won't be able to support highest sample rates values, it depends on the USB port quality.
+ */
+
+class LibLoader {
+    typedef void (COLIBRI_NANO_API *pVersion)(uint32_t&, uint32_t&, uint32_t&);
+    typedef void (COLIBRI_NANO_API *pInformation)(char**);
+    typedef void (COLIBRI_NANO_API *pDevices)(uint32_t&);
+    typedef void (COLIBRI_NANO_API *pFunc1)(void);
+    typedef bool (COLIBRI_NANO_API *pOpen)(Descriptor*, const uint32_t);
+    typedef void (COLIBRI_NANO_API *pClose)(Descriptor);
+    typedef bool (COLIBRI_NANO_API *pStart)(Descriptor, SampleRateIndex, pCallbackRx, void*);
+    typedef bool (COLIBRI_NANO_API *pStop)(Descriptor);
+    typedef bool (COLIBRI_NANO_API *pSetPreamp)(Descriptor, float);
+    typedef bool (COLIBRI_NANO_API *pSetFrequency)(Descriptor, uint32_t);
+
+public:
+    LibLoader() = default;
+
+    /**
+     * \brief Library load.
+     * \param file - full file name.
+     * \return if success return true, else false.
+     */
+#ifndef __linux__
+    bool load(const wstring &file);
+#else
+    bool load(const char *file);
+#endif
+
+    /**
+     * \brief Library initialization.
+     * \details Required once before start of operation.
+     */
+    void initialize ();
+
+    /**
+     * \brief Finish library operation.
+     *
+     * \details Required to call once before the whole program close.
+     * All objects created in open function will be remove.
+     */
+    void finalize ();
+
+    /**
+     * \brief Read library version.
+     * \param major
+     * \param minor
+     * \param patch
+     */
+    void version (uint32_t &major, uint32_t &minor, uint32_t &patch);
+
+    /**
+     * \brief Return line info about the library.
+     */
+    string information ();
+
+    /**
+     * \brief Return amount of found ColibriNANO receivers.
+     */
+    uint32_t devices ();
+
+
+    /**
+     * \brief Open the ColibriNANO receiver according to its periodic number.
+     * \param pDev - Pointer to the receiver descriptor.
+     * \param devIndex - Receiver's periodic number.
+     * \return if success return true, else false.
+     *
+     * \details If function ended with an error, then descriptor will be equal nullptr.
+     */
+    bool open(Descriptor *pDev, const uint32_t devIndex);
+
+    /**
+     * \brief Close the ColibriNANO receiver.
+     * \param dev - Receiver's descriptor.
+     */
+    void close(Descriptor dev);
+
+    /**
+     * \brief Start IQ stream.
+     * \param dev - Receiver's descriptor.
+     * \return if success return true, else false.
+     */
+    bool start(Descriptor dev, SampleRateIndex sr, pCallbackRx p, void *pUserData);
+
+    /**
+     * \brief Stop IQ stream.
+     * \param dev - Receiver's descriptor.
+     * \return if success return true, else false.
+     */
+    bool stop(Descriptor dev);
+
+    /**
+     * \brief Set preamplifier gain/attenuation value.
+     * \param dev - Receiver's descriptor.
+     * \param value - gain/attenuation, dB.
+     * \return if success return true, else false.
+     *
+     * \details Preamplifier range from -31.5 up to 6 dB with 0.5 dB step.
+     */
+    bool setPream(Descriptor dev, float value);
+
+    /**
+     * \brief Set the tuning frequency for ColibriNANO receiver.
+     * \param dev - Receiver's descriptor.
+     * \param value - tuning frequency, Hz.
+     * \return if success return true, else false.
+     *
+     * \details Tuning frequency range from 0.5*SampleRate Hz up to 500 MHz - 0.5 SampleRate.
+     */
+    bool setFrequency(Descriptor dev, uint32_t value);
+
+private:
+#ifndef __linux__
+    HMODULE hDLL                              { nullptr };
+#else
+    void *hDLL                                { nullptr };
+#endif
+    pVersion m_version                        { nullptr };
+    pInformation m_information                { nullptr };
+    pDevices m_devices                        { nullptr };
+    pFunc1 m_initialize                       { nullptr };
+    pFunc1 m_finalize                         { nullptr };
+    pOpen  m_open                             { nullptr };
+    pClose m_close                            { nullptr };
+    pStart m_start                            { nullptr };
+    pStop  m_stop                             { nullptr };
+    pSetPreamp m_setPreamp                    { nullptr };
+    pSetFrequency m_setFrequency              { nullptr };
+};
+
+#endif // LIBLOADER_H

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/colibri-handler/colibri-handler.cpp Added

@@ -0,0 +1,251 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of Qt-DAB
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation version 2 of the License.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB. if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QMessageBox>
+#include	<QTime>
+#include	<QDate>
+#include	<QLabel>
+#include	<QDebug>
+#include	"colibri-handler.h"
+
+	colibriHandler::colibriHandler  (QSettings *s,
+	                                 bool	marzano):
+	                                  _I_Buffer (4 * 1024 * 1024),
+	                                  myFrame (nullptr) {
+	colibriSettings		= s;
+	setupUi (&myFrame);
+	QString libName = "libcolibrinano_lib.so";
+	if (!m_loader. load (libName. toLatin1 () .data ())) {
+           QMessageBox::critical (nullptr, "colibri",
+	                          tr("Failed to load colibrinano_lib.so"));
+	   throw (21);
+	}
+
+	fprintf (stderr, "library is loaded\n");
+	m_loader. initialize ();
+
+	fprintf (stderr, "... and initialized\n");
+	uint32_t t_devices	= m_loader. devices ();
+	if (t_devices == 0) {
+	   QMessageBox::critical (nullptr, "colibri",
+	                          tr ("No device available\n"));
+	   throw (22);
+	}
+
+	fprintf (stderr, "we found %d device(s)\n", t_devices);
+//	set some defaults
+	if (!m_loader.open (&m_deskriptor, 0)) {
+	   QMessageBox::warning (nullptr, "colibri",
+	                         tr("Failed to open ColibriNANO!"));
+	   throw (23);
+        }
+
+	fprintf (stderr, "and opening device 0 was ok\n");
+        m_loader.setFrequency (m_deskriptor, 220000000);
+
+	this		-> lastFrequency	= 220000000;
+	fprintf (stderr, "set on %d\n", lastFrequency);
+	colibriSettings -> beginGroup ("colibriSettings");
+	int gainSetting = colibriSettings -> value ("colibri-gain", 20). toInt ();
+	gainSelector	-> setValue (gainSetting);
+	colibriSettings -> endGroup ();
+        m_loader.setPream (m_deskriptor, gainSelector ->value () * 0.5 + -31.5);
+	actualGain	-> display (gainSelector -> value () * 0.5 + -31.5);
+
+//	and be prepared for future changes in the settings
+	connect (gainSelector, SIGNAL (valueChanged (int)),
+	         this, SLOT (set_gainControl (int)));
+	connect (iqSwitchButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_iqSwitcher ()));
+	if (marzano) {
+	   selectedRate	= 1920000;
+	}
+	else {
+	   selectedRate	= 2560000;
+	}
+	rateLabel	-> setText (QString::number (selectedRate));
+//	The sizes of the mapTables follow from the input and output rate
+//	(selectedRate / 1000) vs (2048000 / 1000)
+//	so we end up with buffers with 1 msec content
+	convBufferSize		= selectedRate / 1000;
+	for (int i = 0; i < 2048; i ++) {
+	   float inVal	= float (selectedRate / 1000);
+	   mapTable_int [i]	=  int (floor (i * (inVal / 2048.0)));
+	   mapTable_float [i]	= i * (inVal / 2048.0) - mapTable_int [i];
+	}
+	convIndex	= 0;
+	convBuffer. resize (convBufferSize + 1);
+
+	iqSwitcher	= false;
+	switchLabel	-> setText ("I/Q");
+	nameLabel	-> setText (deviceName ());
+	running. store (false);
+}
+
+	colibriHandler::~colibriHandler () {
+	myFrame. hide ();
+	stopReader();
+	colibriSettings	-> beginGroup ("colibriSettings");
+	colibriSettings	-> setValue ("colibri-gain", 
+	                              gainSelector -> value ());
+	colibriSettings	-> endGroup ();
+}
+//
+
+void	colibriHandler::setVFOFrequency	(int32_t newFrequency) {
+        m_loader. setFrequency (m_deskriptor, newFrequency);
+	this	-> lastFrequency	= newFrequency;
+}
+
+int32_t	colibriHandler::getVFOFrequency () {
+	return this -> lastFrequency;
+}
+
+void	colibriHandler::set_gainControl	(int newGain) {
+float	gainValue	= -31.5 + newGain * 0.5;
+	if (gainValue <= 6) {
+           m_loader.setPream (m_deskriptor, gainValue);
+	   actualGain	-> display (gainValue);
+	}
+}
+
+void	colibriHandler::handle_iqSwitcher	()  {
+	iqSwitcher	= !iqSwitcher;
+	if (iqSwitcher)
+	   switchLabel	-> setText ("Q/I");
+	else
+	   switchLabel -> setText ("I/Q");
+}
+
+static
+bool	the_callBackRx (std::complex<float> *buffer, uint32_t len,
+	                               bool overload, void *ctx) {
+colibriHandler *p = static_cast<colibriHandler *>(ctx);
+std::complex<float> temp [2048];
+
+	(void)overload;
+	for (int i = 0; i < len; i ++) {
+	   p -> convBuffer [p -> convIndex] = buffer [i];
+	   p -> convIndex ++;
+	   if (p -> convIndex > p -> convBufferSize) {
+	      for (int j = 0; j < 2048; j ++) {
+	         int16_t  inpBase	= p -> mapTable_int [j];
+	         float	inpRatio	= p ->  mapTable_float [j];
+                 temp [j]  = cmul (p -> convBuffer [inpBase + 1], inpRatio) +
+                             cmul (p -> convBuffer [inpBase], 1 - inpRatio);
+              }
+
+              p -> _I_Buffer. putDataIntoBuffer (temp, 2048);
+	      p -> convBuffer [0] = p -> convBuffer [p -> convBufferSize];
+	      p -> convIndex = 1;
+	   }
+	}
+	return true;
+}
+
+bool	colibriHandler::restartReader	(int32_t newFrequency) {
+	if (running. load ())
+	   return true;		// should not happen
+
+	fprintf (stderr, "restarting at %d\n", newFrequency);
+        m_loader. setFrequency (m_deskriptor, newFrequency);
+	this	-> lastFrequency	= newFrequency;
+	m_loader.start (m_deskriptor,
+	                selectedRate == 2560000 ? (SampleRateIndex)Sr_2560kHz:
+	                                        (SampleRateIndex)Sr_1920kHz,
+                        the_callBackRx,
+	                this);
+	running. store (true);
+	return true;
+}
+
+void	colibriHandler::stopReader() {
+	if (!running. load())
+	   return;
+	fprintf (stderr, "stopreader (%d)\n", lastFrequency);
+	m_loader. stop (m_deskriptor);
+	running. store (false);
+}
+
+int32_t	colibriHandler::getSamples (std::complex<float> *V, int32_t size) { 
+	if (iqSwitcher) {
+	   std::complex<float> xx [size];
+	   _I_Buffer. getDataFromBuffer (xx, size);
+	   for (int i = 0; i < size; i ++)
+	      V[i] = std::complex<float> (imag (xx [i]), real (xx [i]));
+	   return size;
+	}
+	else

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/colibri-handler/colibri-handler.h Added

@@ -0,0 +1,78 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the spectrumViewer
+ *
+ *    spectrumViewer is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation version 2 of the License.
+ *
+ *    spectrumViewer is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with spectrumViewer. if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef	__COLIBRI_HANDLER_H
+#define	__COLIBRI_HANDLER_H
+#include	<QThread>
+#include	<QSettings>
+#include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
+#include	<QLabel>
+#include	<QDebug>
+#include	<QFileDialog>
+#include	"ui_colibri-widget.h"
+#include	"common.h"
+#include	"LibLoader.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+
+	class	colibriHandler: public deviceHandler, public Ui_colibriWidget {
+Q_OBJECT
+public:
+
+			colibriHandler		(QSettings *,
+	                                         bool);
+			~colibriHandler		(void);
+	bool		restartReader		(int32_t);
+	void		stopReader		();
+	void		setVFOFrequency		(int32_t);
+	int32_t		getVFOFrequency		(void);
+	int32_t		getSamples		(std::complex<float> *, int32_t);
+	int32_t		Samples			();
+	void		resetBuffer		(void);
+	int16_t		bitDepth		(void);
+	void		hide			();
+	void		show			();
+	bool		isHidden		();
+	QString		deviceName		();
+
+	RingBuffer<std::complex<float>>	_I_Buffer;
+	int16_t		convBufferSize;
+	int16_t		convIndex;
+	std::vector <complex<float> >   convBuffer;
+	int16_t		mapTable_int   [2048];
+	float		mapTable_float [2048];
+private:
+	QFrame			myFrame;
+	LibLoader		m_loader;
+	QSettings		*colibriSettings;
+	int			sampleRate	(int);
+	int			selectedRate;
+	Descriptor		m_deskriptor;
+	std::atomic<bool>	running;
+	bool			iqSwitcher;
+private slots:
+	void			set_gainControl	(int);
+	void			handle_iqSwitcher	();
+};
+#endif

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/colibri-handler/colibri-widget.ui Added

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>colibriWidget</class>
+ <widget class="QWidget" name="colibriWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>257</width>
+    <height>291</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>lime control</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="deviceLabel">
+     <property name="text">
+      <string>colibri handler</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="nameLabel">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="iqSwitchButton">
+       <property name="text">
+        <string>I/Q</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="switchLabel">
+       <property name="text">
+        <string>I/Q</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QSpinBox" name="gainSelector">
+       <property name="maximum">
+        <number>73</number>
+       </property>
+       <property name="value">
+        <number>20</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelSpinbox_1">
+       <property name="text">
+        <string>gain</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLCDNumber" name="actualGain">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="segmentStyle">
+        <enum>QLCDNumber::Flat</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="rateLabel">
+     <property name="text">
+      <string>2560000</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/colibri-handler/common.h Added

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

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-handler.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-handler.h Changed

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

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

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

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-handler.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-handler-2/pluto-handler.h Changed

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

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx Added

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/dabFilter.h Added

@@ -0,0 +1,145 @@
+
+#
+//
+//	To avoid including the ad9361 library (just because in
+//	Ubuntu 16.04, used for generating an appImage, only
+//	an old version is available, the parameters of a filter
+//	
+//	Fpass     = 1536000 / 2;
+//	Fstop     = Fpass * 1.2;
+//	wnomTX    = 1.6 * Fstop;  // dummy here
+//	wnomRX    = 1536000; // RF bandwidth of analog filter
+//
+//	were extracted and the filter configuration is loaded
+
+const char * dabFilter =
+"RX 3 GAIN -12 DEC 4\n"
+"TX 3 GAIN 0 INT 4\n"
+"924,226\n"
+"-576,-562\n"
+"1276,-78\n"
+"-710,-1344\n"
+"274,-1448\n"
+"-1630,-2816\n"
+"-1662,-3388\n"
+"-3472,-4572\n"
+"-3878,-4970\n"
+"-5114,-5406\n"
+"-5014,-4970\n"
+"-5092,-4288\n"
+"-3978,-2894\n"
+"-2918,-1422\n"
+"-1158,254\n"
+"188,1530\n"
+"1542,2442\n"
+"2056,2602\n"
+"2176,2216\n"
+"1474,1238\n"
+"576,90\n"
+"-602,-1064\n"
+"-1406,-1800\n"
+"-1894,-2046\n"
+"-1678,-1654\n"
+"-1062,-838\n"
+"-32,234\n"
+"904,1174\n"
+"1626,1768\n"
+"1752,1782\n"
+"1378,1266\n"
+"486,332\n"
+"-522,-690\n"
+"-1432,-1520\n"
+"-1840,-1848\n"
+"-1688,-1598\n"
+"-916,-798\n"
+"166,280\n"
+"1282,1318\n"
+"1988,1950\n"
+"2084,1966\n"
+"1436,1306\n"
+"268,168\n"
+"-1112,-1118\n"
+"-2202,-2108\n"
+"-2642,-2462\n"
+"-2176,-1982\n"
+"-908,-770\n"
+"852,856\n"
+"2512,2368\n"
+"3518,3244\n"
+"3388,3076\n"
+"2020,1776\n"
+"-354,-408\n"
+"-3066,-2874\n"
+"-5262,-4828\n"
+"-6028,-5460\n"
+"-4708,-4184\n"
+"-1070,-808\n"
+"4560,4360\n"
+"11344,10552\n"
+"18086,16686\n"
+"23502,21604\n"
+"26516,24338\n"
+"26516,24338\n"
+"23502,21604\n"
+"18086,16686\n"
+"11344,10552\n"
+"4560,4360\n"
+"-1070,-808\n"
+"-4708,-4184\n"
+"-6028,-5460\n"
+"-5262,-4828\n"
+"-3066,-2874\n"
+"-354,-408\n"
+"2020,1776\n"
+"3388,3076\n"
+"3518,3244\n"
+"2512,2368\n"
+"852,856\n"
+"-908,-770\n"
+"-2176,-1982\n"
+"-2642,-2462\n"
+"-2202,-2108\n"
+"-1112,-1118\n"
+"268,168\n"
+"1436,1306\n"
+"2084,1966\n"
+"1988,1950\n"
+"1282,1318\n"
+"166,280\n"
+"-916,-798\n"
+"-1688,-1598\n"
+"-1840,-1848\n"
+"-1432,-1520\n"
+"-522,-690\n"
+"486,332\n"
+"1378,1266\n"
+"1752,1782\n"
+"1626,1768\n"
+"904,1174\n"
+"-32,234\n"
+"-1062,-838\n"
+"-1678,-1654\n"
+"-1894,-2046\n"
+"-1406,-1800\n"
+"-602,-1064\n"
+"576,90\n"
+"1474,1238\n"
+"2176,2216\n"
+"2056,2602\n"
+"1542,2442\n"
+"188,1530\n"
+"-1158,254\n"
+"-2918,-1422\n"
+"-3978,-2894\n"
+"-5092,-4288\n"
+"-5014,-4970\n"
+"-5114,-5406\n"
+"-3878,-4970\n"
+"-3472,-4572\n"
+"-1662,-3388\n"
+"-1630,-2816\n"
+"274,-1448\n"
+"-710,-1344\n"
+"1276,-78\n"
+"-576,-562\n"
+"924,226\n";

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/functions Added

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

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/iio.h Added

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

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/pluto-rxtx-handler.cpp Added

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

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/pluto-rxtx-handler.h Added

@@ -0,0 +1,142 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __PLUTO_RXTX_HANDLER__
+#define	__PLUTO_RXTX_HANDLER__
+
+#include	<QObject>
+#include        <QMessageBox>
+#include        <QByteArray>
+#include	<QFrame>
+#include	<QSettings>
+#include	<atomic>
+#include	<thread>
+#include	<iio.h>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"ui_pluto-rxtx-widget.h"
+
+#include	"up-filter.h"
+
+class	xml_fileWriter;
+
+#ifndef	RX_RATE
+#define	RX_RATE		2112000
+#define	DAB_RATE	2048000
+#define	DIVIDER		1000
+#define	CONV_SIZE	(RX_RATE / DIVIDER)
+#define	FM_RATE		2112000
+#endif
+
+
+struct stream_cfg {
+        long long bw_hz;
+        long long fs_hz;
+        long long lo_hz;
+        const char *rfport;
+};
+
+class	plutoHandler: public QObject,
+	              public deviceHandler, public Ui_plutorxtxWidget {
+Q_OBJECT
+public:
+			plutoHandler		(QSettings *,
+	                                         QString &, int fmFreq = 0);
+            		~plutoHandler		();
+	void		setVFOFrequency		(int32_t);
+	int32_t		getVFOFrequency		();
+	bool		restartReader		(int32_t);
+	void		stopReader		();
+	int32_t		getSamples		(std::complex<float> *,
+	                                                          int32_t);
+	int32_t		Samples			();
+	void		sendSample		(std::complex<float>);
+	void		startTransmitter	(int);
+	void		stopTransmitter		();
+	void		resetBuffer		();
+	int16_t		bitDepth		();
+
+	void		show			();
+	void		hide			();
+	bool		isHidden		();
+	QString		deviceName		();
+private:
+	QFrame			myFrame;
+	RingBuffer<std::complex<float>>	_I_Buffer;
+	RingBuffer<std::complex<float>>	_O_Buffer;
+	upFilter		theFilter;
+	int			fmFrequency;
+	QSettings		*plutoSettings;
+	QString			recorderVersion;
+	FILE			*xmlDumper;
+	xml_fileWriter		*xmlWriter;
+	bool			setup_xmlDump	();
+	void			close_xmlDump	();
+	std::atomic<bool>	dumping;
+	bool			filterOn;
+	void			run_receiver	();
+	void			run_transmitter	();
+	int32_t			inputRate;
+	int32_t			vfoFrequency;
+	std::atomic<bool>	running;
+	std::atomic<bool>	transmitting;
+	bool			debugFlag;
+	std::thread		threadHandle_r;
+	std::thread		threadHandle_t;
+//      configuration items
+
+	struct  iio_device      *rx;
+        struct  iio_device      *tx;
+        struct  iio_context     *ctx;
+        struct  iio_channel     *rx0_i;
+        struct  iio_channel     *rx0_q;
+        struct  iio_channel     *tx0_i;
+        struct  iio_channel     *tx0_q;
+        struct  iio_buffer      *rxbuf;
+        struct  iio_buffer      *txbuf;
+        struct  stream_cfg      rx_cfg;
+        struct  stream_cfg      tx_cfg;
+
+	bool			connected;
+	std::complex<float>	convBuffer	[CONV_SIZE + 1];
+	int			convIndex;
+	int16_t			mapTable_int	[DAB_RATE / DIVIDER];
+	float			mapTable_float	[DAB_RATE / DIVIDER];
+
+	void			record_gainSettings	(int);
+	void			update_gainSettings	(int);
+	bool			save_gainSettings;
+//
+signals:
+	void		new_gainValue		(int);
+	void		new_agcValue		(bool);
+private slots:
+	void		set_gainControl		(int);
+	void		set_agcControl		(int);
+	void		toggle_debugButton	();
+	void		set_filter		();
+	void		set_xmlDump		();
+};
+#endif
+

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/pluto-rxtx-widget.ui Added

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>plutorxtxWidget</class>
+ <widget class="QWidget" name="plutorxtxWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>324</width>
+    <height>295</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Pluto control</string>
+  </property>
+  <property name="toolTip">
+   <string>Pluto support is experimental. I do not have one so testing was limited.</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QCheckBox" name="agcControl">
+       <property name="text">
+        <string>agc</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="gainControl">
+       <property name="maximum">
+        <number>73</number>
+       </property>
+       <property name="value">
+        <number>33</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="state">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="toolTip">
+      <string>Experimental interface for Adalm Pluto. No garantees!!</string>
+     </property>
+     <property name="text">
+      <string>Pluto interface</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="contextName">
+     <property name="text">
+      <string>context name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="name_of_device">
+     <property name="text">
+      <string>device name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="filterButton">
+       <property name="toolTip">
+        <string>The filter button. The pluto has a possibility of loading a filter configuration and enabling (or
+disabling it). By default a filter configuration is loaded and enabled. The text on the button states what the effect of touching it is. If the button text reads &quot;filter on&quot;, it therefore means that the
+filter is disabled, but will be enabled by touching the button.</string>
+       </property>
+       <property name="text">
+        <string>filter</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="debugButton">
+       <property name="text">
+        <string>debug off</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="dumpButton">
+       <property name="text">
+        <string>dump</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="serial_number_display">
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>PLUTO TRANSMITTER VERSION</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/pluto-rxtx/xx Added

@@ -0,0 +1,130 @@
+RX 3 GAIN -12 DEC 4
+TX 3 GAIN 0 INT 4
+924,226
+-576,-562
+1276,-78
+-710,-1344
+274,-1448
+-1630,-2816
+-1662,-3388
+-3472,-4572
+-3878,-4970
+-5114,-5406
+-5014,-4970
+-5092,-4288
+-3978,-2894
+-2918,-1422
+-1158,254
+188,1530
+1542,2442
+2056,2602
+2176,2216
+1474,1238
+576,90
+-602,-1064
+-1406,-1800
+-1894,-2046
+-1678,-1654
+-1062,-838
+-32,234
+904,1174
+1626,1768
+1752,1782
+1378,1266
+486,332
+-522,-690
+-1432,-1520
+-1840,-1848
+-1688,-1598
+-916,-798
+166,280
+1282,1318
+1988,1950
+2084,1966
+1436,1306
+268,168
+-1112,-1118
+-2202,-2108
+-2642,-2462
+-2176,-1982
+-908,-770
+852,856
+2512,2368
+3518,3244
+3388,3076
+2020,1776
+-354,-408
+-3066,-2874
+-5262,-4828
+-6028,-5460
+-4708,-4184
+-1070,-808
+4560,4360
+11344,10552
+18086,16686
+23502,21604
+26516,24338
+26516,24338
+23502,21604
+18086,16686
+11344,10552
+4560,4360
+-1070,-808
+-4708,-4184
+-6028,-5460
+-5262,-4828
+-3066,-2874
+-354,-408
+2020,1776
+3388,3076
+3518,3244
+2512,2368
+852,856
+-908,-770
+-2176,-1982
+-2642,-2462
+-2202,-2108
+-1112,-1118
+268,168
+1436,1306
+2084,1966
+1988,1950
+1282,1318
+166,280
+-916,-798
+-1688,-1598
+-1840,-1848
+-1432,-1520
+-522,-690
+486,332
+1378,1266
+1752,1782
+1626,1768
+904,1174
+-32,234
+-1062,-838
+-1678,-1654
+-1894,-2046
+-1406,-1800
+-602,-1064
+576,90
+1474,1238
+2176,2216
+2056,2602
+1542,2442
+188,1530
+-1158,254
+-2918,-1422
+-3978,-2894
+-5092,-4288
+-5014,-4970
+-5114,-5406
+-3878,-4970
+-3472,-4572
+-1662,-3388
+-1630,-2816
+274,-1448
+-710,-1344
+1276,-78
+-576,-562
+924,226

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/rawfiles-new/raw-reader.cpp -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/rawfiles-new/raw-reader.cpp Changed

@@ -85,6 +85,7 @@
 , 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
 , 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
 , 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
+
 void	rawReader::run () {
 int64_t	nextStop;
 int	i;
@@ -122,8 +123,8 @@
 
 	      for (i = 0; i < BUFFERSIZE / 2; i ++)
 	         localBuffer [i] = std::complex<float> (
-	                                       mapTable [bi [2 * i]],
-	                                       mapTable [bi [2 * i + 1]]);
+	                                       4 * mapTable [bi [2 * i]],
+	                                       4 * mapTable [bi [2 * i + 1]]);
               _I_Buffer -> putDataIntoBuffer (localBuffer, BUFFERSIZE / 2);
               if (nextStop - getMyTime() > 0)
                  usleep (nextStop - getMyTime());

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/rawfiles-new/rawfiles.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/rawfiles-new/rawfiles.h Changed

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/rtl_tcp/rtl_tcp_client.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/rtl_tcp/rtl_tcp_client.h Changed

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtl-sdr.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/rtlsdr-handler/rtl-sdr.h Changed

@@ -1,4 +1,3 @@
-#
 /*
  * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
  * Copyright (C) 2012-2013 by Steve Markgraf <steve@steve-m.de>
@@ -25,7 +24,7 @@
 extern "C" {
 #endif
 
-#include <cstdint>
+#include <stdint.h>
 #include <rtl-sdr_export.h>
 
 typedef struct rtlsdr_dev rtlsdr_dev_t;
@@ -217,6 +216,15 @@
 RTLSDR_API int rtlsdr_set_tuner_gain(rtlsdr_dev_t *dev, int gain);
 
 /*!
+ * Set the bandwidth for the device.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param bw bandwidth in Hz. Zero means automatic BW selection.
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw);
+
+/*!
  * Get actual gain the device is configured to.
  *
  * \param dev the device handle given by rtlsdr_open()
@@ -244,7 +252,17 @@
  */
 RTLSDR_API int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int manual);
 
-/* this will select the baseband filters according to the requested sample rate */
+/*!
+ * Set the sample rate for the device, also selects the baseband filters
+ * according to the requested sample rate for tuners where this is possible.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param samp_rate the sample rate to be set, possible values are:
+ * 		    225001 - 300000 Hz
+ * 		    900001 - 3200000 Hz
+ * 		    sample loss is to be expected for rates > 2400000
+ * \return 0 on success, -EINVAL on invalid rate
+ */
 RTLSDR_API int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t rate);
 
 /*!
@@ -342,9 +360,10 @@
  * \param cb callback function to return received samples
  * \param ctx user specific context to pass via the callback function
  * \param buf_num optional buffer count, buf_num * buf_len = overall buffer size
- *		  set to 0 for default buffer count (32)
+ *		  set to 0 for default buffer count (15)
  * \param buf_len optional buffer length, must be multiple of 512,
- *		  set to 0 for default buffer length (16 * 32 * 512)
+ *		  should be a multiple of 16384 (URB size), set to 0
+ *		  for default buffer length (16 * 32 * 512)
  * \return 0 on success
  */
 RTLSDR_API int rtlsdr_read_async(rtlsdr_dev_t *dev,
@@ -361,6 +380,26 @@
  */
 RTLSDR_API int rtlsdr_cancel_async(rtlsdr_dev_t *dev);
 
+/*!
+ * Enable or disable the bias tee on GPIO PIN 0.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param on  1 for Bias T on. 0 for Bias T off.
+ * \return -1 if device is not initialized. 0 otherwise.
+ */
+RTLSDR_API int rtlsdr_set_bias_tee(rtlsdr_dev_t *dev, int on);
+
+/*!
+ * Enable or disable the bias tee on the given GPIO pin.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param gpio the gpio pin to configure as a Bias T control.
+ * \param on  1 for Bias T on. 0 for Bias T off.
+ * \return -1 if device is not initialized. 0 otherwise.
+ */
+RTLSDR_API int rtlsdr_set_bias_tee_gpio(rtlsdr_dev_t *dev, int gpio, int on);
+
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -256,6 +256,8 @@
 	         this, SLOT (set_xmlDump ()));
 	connect (iq_dumpButton, SIGNAL (clicked ()),
 	         this, SLOT (set_iqDump ()));
+	connect (biasControl, SIGNAL (stateChanged (int)),
+	         this, SLOT (set_biasControl (int)));
 	xmlDumper       = nullptr;
 //
 //	and for saving/restoring the gain setting:
@@ -344,6 +346,11 @@
 	                gainControl -> currentText (). toInt ());
 }
 //
+void	rtlsdrHandler::set_biasControl	(int dummy) {
+	(void)dummy;
+	if (rtlsdr_set_bias_tee != nullptr)
+	   rtlsdr_set_bias_tee (device, biasControl -> isChecked () ? 1 : 0);
+}
 //	correction is in Hz
 void	rtlsdrHandler::set_ppmCorrection	(int32_t ppm) {
 	this -> rtlsdr_set_freq_correction (device, ppm);
@@ -518,6 +525,12 @@
 	   return false;
 	}
 
+	rtlsdr_set_bias_tee = (pfnrtlsdr_set_bias_tee)
+	                  GETPROCADDRESS (Handle, "rtlsdr_set_bias_tee");
+
+	if (rtlsdr_set_bias_tee == nullptr)
+	   fprintf (stderr, "biasControl will not work\n");
+//	nullpointer - if function is not available - is handled
 	fprintf (stderr, "OK, functions seem to be loaded\n");
 	return true;
 }

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

@@ -63,6 +63,7 @@
 	                               void *,
 	                               uint32_t,
 	                               uint32_t);
+typedef	int (*	pfnrtlsdr_set_bias_tee) (rtlsdr_dev_t *, int);
 typedef int (*  pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
 typedef int (*  pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
 typedef uint32_t (*  pfnrtlsdr_get_device_count)();
@@ -72,7 +73,7 @@
 //	This class is a simple wrapper around the
 //	rtlsdr library that is read in  as dll (or .so file in linux)
 //	It does not do any processing
-class	rtlsdrHandler: public deviceHandler, public  Ui_dabstickWidget {
+class	rtlsdrHandler: public QObject, public deviceHandler, public  Ui_dabstickWidget {
 Q_OBJECT
 public:
 			rtlsdrHandler	(QSettings *, QString &);
@@ -137,10 +138,12 @@
 	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
 	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
 	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
+	pfnrtlsdr_set_bias_tee rtlsdr_set_bias_tee;
 	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
 	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
 	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
 	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+	
 signals:
 	void		new_gainIndex		(int);
 	void		new_agcSetting		(bool);
@@ -150,6 +153,7 @@
 	void		set_ppmCorrection	(int);
 	void		set_xmlDump		();
 	void		set_iqDump		();
+	void		set_biasControl		(int);
 };
 #endif

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

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>203</width>
-    <height>330</height>
+    <width>206</width>
+    <height>344</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -67,6 +67,13 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="biasControl">
+     <property name="text">
+      <string>biasT</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QPushButton" name="xml_dumpButton">
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v2/sdrplay-handler-v2.h Changed

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.h Changed

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/wavfiles-new/wavfiles.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/wavfiles-new/wavfiles.h Changed

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/xml-filereader/xml-filereader.h -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-maxi/qt-devices/xml-filereader/xml-filereader.h Changed

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

@@ -82,18 +82,22 @@
 #ifdef	HAVE_LIME
 #include	"lime-handler.h"
 #endif
+#ifdef	HAVE_PLUTO_RXTX
+#include	"pluto-rxtx-handler.h"
+#include	"dab-streamer.h"
+#endif
 #ifdef	HAVE_PLUTO
 #include	"pluto-handler.h"
 #endif
 #ifdef	HAVE_SOAPY
 #include	"soapy-handler.h"
 #endif
+#ifdef	HAVE_COLIBRI
+#include	"colibri-handler.h"
+#endif
 #ifdef	HAVE_ELAD
 #include	"elad-handler.h"
 #endif
-#ifdef	HAVE_ELAD_FILES
-#include	"elad-files.h"
-#endif
 #include	"spectrum-viewer.h"
 #include	"correlation-viewer.h"
 #include	"tii-viewer.h"
@@ -204,12 +208,14 @@
 void	RadioInterface::LOG	(const QString &a1, const QString &a2) {
 	(void)a1; (void)a2;
 }
+
 #endif
 	RadioInterface::RadioInterface (QSettings	*Si,
 	                                const QString	&presetFile,
 	                                const QString	&freqExtension,
 	                                bool		error_report,
 	                                int32_t		dataPort,
+	                                int		fmFrequency,
 	                                QWidget		*parent):
 	                                        QWidget (parent),
 	                                        spectrumBuffer (2 * 32768),
@@ -238,19 +244,16 @@
 int16_t	latency;
 int16_t k;
 QString h;
-QString	presetName;
 uint8_t	dabBand;
 
 	dabSettings		= Si;
 	this	-> error_report	= error_report;
+	this	-> fmFrequency	= fmFrequency;
 	running. 		store (false);
 	scanning. 		store (false);
 	my_dabProcessor		= nullptr;
 	isSynced		= false;
 	stereoSetting		= false;
-
-	currentHour		= -1;
-	currentMinute		= -1;
 //
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
@@ -271,7 +274,7 @@
 	globals. diff_length	=
 	          dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt();
 	globals. tii_delay   =
-	          dabSettings  -> value ("tii_delay", 2). toInt();
+	          dabSettings  -> value ("tii_delay", 5). toInt();
 	if (globals. tii_delay < 2)
 	   globals. tii_delay	= 2;
 	globals. tii_depth      =
@@ -279,20 +282,11 @@
 	globals. echo_depth     =
 	          dabSettings -> value ("echo_depth", 1). toInt();
 
-	currentService. valid	= false;
-	nextService. valid	= false;
-	bool has_presetName	=
-	              dabSettings -> value ("has-presetName", 1). toInt() != 0;
-	if (has_presetName) {
-	   presetName		=
-	              dabSettings -> value ("presetname", ""). toString();
-	   if (presetName != "") {
-	      nextService. serviceName = presetName;
-	      nextService. SId		= 0;
-	      nextService. SCIds	= 0;
-	      nextService. valid	= true;
-	   }
-	}
+	theFont			=
+	          dabSettings -> value ("theFont", "Times"). toString ();
+	fontSize		=
+	          dabSettings -> value ("fontSize", 12). toInt ();
+
 #ifdef	_SEND_DATAGRAM_
 	ipAddress		= dabSettings -> value ("ipAddress", "127.0.0.1"). toString();
 	port			= dabSettings -> value ("port", 8888). toInt();
@@ -302,6 +296,7 @@
 	if (saveSlides != 0)
 	   set_picturePath ();
 
+	filePath	= dabSettings -> value ("filePath", ""). toString ();
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	   filePath = filePath + "/";
 
@@ -323,6 +318,24 @@
 	x = dabSettings -> value ("switchDelay", 8). toInt ();
 	configWidget. switchDelaySetting -> setValue (x);
 
+	snrDelay = dabSettings -> value ("snrDelay", 5). toInt ();
+	configWidget. snrDelaySetting -> setValue (snrDelay);
+
+	currentService. valid	= false;
+	nextService. valid	= false;
+
+	if (dabSettings -> value ("has-presetName", 0). toInt () != 0) {
+	   configWidget. saveServiceSelector -> setChecked (true);
+	   QString presetName		=
+	              dabSettings -> value ("presetname", ""). toString();
+	   if (presetName != "") {
+	      nextService. serviceName = presetName;
+	      nextService. SId		= 0;
+	      nextService. SCIds	= 0;
+	      nextService. valid	= true;
+	   }
+	}
+
 	dabSettings	-> beginGroup ("snrViewer");
 	configWidget. snrHeightSelector -> setValue (dabSettings -> value ("snrHeight", 15). toInt ());
 	configWidget. snrLengthSelector -> setValue (dabSettings -> value ("snrLength", 312). toInt ());
@@ -362,7 +375,6 @@
                          setStyleSheet ("QLabel {background-color : red}");
 	alarmLabel		-> setText ("Alarm");
 	alarmLabel		-> hide ();
-
 /*
  */
 #ifdef	DATA_STREAMER
@@ -401,7 +413,6 @@
 	connect (&epgProcessor,
 	             SIGNAL (set_epgData (int, int, const QString &)),
 	         this, SLOT (set_epgData (int, int, const QString &)));
-	filePath	= dabSettings -> value ("filePath", ""). toString ();
 	if ((epgPath != "") && (!epgPath. endsWith ("/")))
 	   epgPath = epgPath + "/";
 //	timer for autostart epg service
@@ -557,6 +568,9 @@
 
 //
 //	add devices to the list
+	deviceSelector	-> addItem ("file input(.raw)");
+	deviceSelector	-> addItem ("file input(.iq)");
+	deviceSelector	-> addItem ("file input(.sdr)");
 	deviceSelector	-> addItem ("xml files");
 #ifdef	HAVE_SDRPLAY_V2
 	deviceSelector	-> addItem ("sdrplay");
@@ -579,9 +593,16 @@
 #ifdef	HAVE_LIME
 	deviceSelector	-> addItem ("limeSDR");
 #endif
+#ifdef	HAVE_PLUTO_RXTX
+	deviceSelector	-> addItem ("pluto-rxtx");
+	streamerOut	= nullptr;
+#endif
 #ifdef	HAVE_PLUTO
 	deviceSelector	-> addItem ("pluto");
 #endif
+#ifdef	HAVE_COLIBRI
+	deviceSelector	-> addItem ("colibri");
+#endif
 #ifdef  HAVE_EXTIO
 	deviceSelector	-> addItem ("extio");
 #endif
@@ -591,9 +612,6 @@
 #ifdef	HAVE_ELAD
 	deviceSelector	-> addItem ("elad-s1");
 #endif
-#ifdef	HAVE_ELAD_FILES
-	deviceSelector	-> addItem ("elad-files");
-#endif
 	inputDevice	= nullptr;
 	h               =
 	           dabSettings -> value ("device", "no device"). toString();
@@ -659,10 +677,10 @@
 void	RadioInterface::doStart (const QString &dev) {
 	(void)dev;
 	inputDevice	= setDevice	(dev);
-	if (inputDevice == nullptr) {
 //	just in case someone wants to push all those nice buttons that
 //	are now connected to erroneous constructs
 //	Some buttons should not be touched before we have a device
+	if (inputDevice == nullptr) {
 	   disconnectGUI ();
 	   return;
 	}
@@ -727,11 +745,6 @@
 	if (s == nullptr)	// cannot happen
 	   return;
 
-	if (currentService. valid)

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

@@ -66,6 +66,9 @@
 class	serviceDescriptor;
 class	historyHandler;
 class	timeTableHandler;
+#ifdef	HAVE_PLUTO_RXTX
+class	dabStreamer;
+#endif
 
 #include	"ui_technical_data.h"
 #include	"ui_config-helper.h"
@@ -92,6 +95,7 @@
 	                                 const QString	&,
 	                                 bool,
 	                                 int32_t	 dataPort,
+	                                 int,
 	                                 QWidget	*parent = nullptr);
 		~RadioInterface		();
 
@@ -115,6 +119,9 @@
 	findfileNames		filenameFinder;
 	processParams		globals;
 	QString			version;
+	QString			theFont;
+	int			fontSize;
+	int			fmFrequency;
 #ifdef	__LOGGING__
 	FILE			*logFile;
 #endif
@@ -130,8 +137,6 @@
 	dabService		currentService;
 	dabService		nextService;
 
-	int			currentHour;
-	int			currentMinute;
 	QByteArray		transmitters;
 	int16_t			tii_delay;
 	int32_t			dataPort;
@@ -143,6 +148,9 @@
 	std::atomic<bool>	running;
 	std::atomic<bool>	scanning;
 	deviceHandler		*inputDevice;
+#ifdef	HAVE_PLUTO_RXTX
+	dabStreamer		*streamerOut;
+#endif
 	textMapper		the_textMapper;
 	dabProcessor		*my_dabProcessor;
 	audioBase		*soundOut;
@@ -194,6 +202,7 @@
 	int16_t			ficSuccess;
 	int			total_ficError;
 	int			total_fics;
+	int			snrDelay;
 	void			connectGUI		();
 	void			disconnectGUI		();
 
@@ -273,7 +282,6 @@
 	void			show_motHandling	(bool);
 	void			setSyncLost		();
 	void			showCorrelation		(int, int);
-	void			showIndex		(int);
 	void			showSpectrum		(int);
 	void			showIQ			(int);
 	void			showQuality		(float);
@@ -365,9 +373,11 @@
 	void			handle_plotLengthSetting	(int);
 	void			handle_scanmodeSelector		(int);
 	void			handle_motslideSelector		(int);
+	void			handle_saveServiceSelector	(int);
 	void			handle_snrHeightSelector	(int);
 	void			handle_snrLengthSelector	(int);
 	void			handle_skipList_button		();
 	void			handle_skipFile_button		();
+	void			handle_snrDelaySetting		(int);
 };
 #endif

_service:download_url:qt-dab-3.7.tar.gz/dab-mini/CMakeLists.txt -> _service:download_url:qt-dab-3.7.1.tar.gz/dab-mini/CMakeLists.txt Changed

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

@@ -294,14 +294,18 @@
 	      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;
 	      }
+	      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(),
@@ -309,12 +313,14 @@
 	      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;
 	      }
+	      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);
+                 my_mscHandler. process_Msc  (&((ofdmBuffer. data()) [T_g]),
+                                                            ofdmSymbolCount);
+
 	   }
 /**
   *	OK,  here we are at the end of the frame
@@ -329,12 +335,8 @@
 	   sum /= T_null;
 	   static	float snr	= 0;
 	   snr = 0.9 * snr +
-	     0.1 * 20 * log10 ((myReader. get_sLevel() + 0.005) / sum);
-	   static int ccc	= 0;
-	   if (++ccc >= 2 ) {
-	      ccc = 0;
-	      show_snr ((int)snr, cLevel / cCount, sum);
-	   }
+	        0.1 * 20 * log10 ((myReader. get_sLevel() + 0.005) / sum);
+	   show_snr ((int)snr, cLevel / cCount, sum);
 /*
  *	The TII data is encoded in the null period of the
  *	odd frames 
@@ -426,6 +428,10 @@
 	return ad. defined;
 }
 
+int	dabProcessor::getSubChId	(const QString &s, uint32_t SId) {
+	return my_ficHandler. getSubChId (s, SId);
+}
+
 bool	dabProcessor::is_packetService	(const QString &s) {
 packetdata pd;
 	my_ficHandler. dataforPacketService (s, &pd, 0);

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

_service:download_url:qt-dab-3.7.1.tar.gz/dab2fm.png Added

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

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

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>343</width>
-    <height>516</height>
+    <height>595</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -64,14 +64,14 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>snr height</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="QSpinBox" name="snrHeightSelector">
        <property name="minimum">
         <number>5</number>
@@ -81,14 +81,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>snr Length</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="QSpinBox" name="snrLengthSelector">
        <property name="minimum">
         <number>112</number>
@@ -104,12 +104,29 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="1">
+      <widget class="QSpinBox" name="snrDelaySetting">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>snr compression</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="QComboBox" name="scanmodeSelector">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose one of three modes for scanning&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <item>
         <property name="text">
          <string>single scan</string>
@@ -129,6 +146,9 @@
      </item>
      <item>
       <widget class="smallPushButton" name="skipList_button">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the skipList. Updates in the skipList will be saved.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="text">
         <string>skipList</string>
        </property>
@@ -136,6 +156,9 @@
      </item>
      <item>
       <widget class="smallPushButton" name="skipFile_button">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a file for the skipList. If the file does not exist yet, it will be created and initialized with a skipList with no channels set to skip.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="text">
         <string>skipFile</string>
        </property>
@@ -145,12 +168,25 @@
    </item>
    <item>
     <widget class="QCheckBox" name="motslideSelector">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;MOT slides can be displayed as (small) part of the technical data widget or in a separate widget. If set, MOT slides are displayed in a separate widget.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
      <property name="text">
       <string>    MOT slides on separate widget</string>
      </property>
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="saveServiceSelector">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;save on program exit the name of the current service - if any - and select this service after restarting.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>    save service on exit</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_3">

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

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

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

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

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

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-main-widget.png -> _service:download_url:qt-dab-3.7.1.tar.gz/qt-dab-main-widget.png Changed

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-screen.png -> _service:download_url:qt-dab-3.7.1.tar.gz/qt-dab-screen.png Changed

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

@@ -26,12 +26,14 @@
 #include	"snr-viewer.h"
 #include	<QSettings>
 #include	<QColor>
+#include	<string.h>
 #include	"color-selector.h"
 
 	snrViewer::snrViewer	(RadioInterface	*mr,
 	                         QSettings	*s):
 	                             myFrame (nullptr),
-	                             spectrumCurve ("") {
+	                             spectrum_curve (""),
+	                             baseLine_curve ("") {
 QString	colorString	= "black";
 	this		-> myRadioInterface	= mr;
 	this		-> dabSettings		= s;
@@ -83,10 +85,14 @@
 	connect (lm_picker, SIGNAL (selected (const QPointF &)),
 	         this, SLOT (rightMouseClick (const QPointF &)));
 
-   	spectrumCurve. setPen (QPen(curveColor, 2.0));
-	spectrumCurve. setOrientation (Qt::Horizontal);
-	spectrumCurve. setBaseline	(0);
-	spectrumCurve. attach (plotgrid);
+   	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);
@@ -95,6 +101,7 @@
 	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;
@@ -117,25 +124,19 @@
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
 				              0, plotHeight);
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
-	spectrumCurve. setBaseline  (0);
+//	spectrum_curve. setBaseline  (0);
 }
 
 void	snrViewer::setLength	(int n) {
-	if (n < plotLength) {
-	   plotLength = n;
-	   Y_Buffer. resize (n);
-	   X_axis. resize (n);
-	}
-	else
+	Y_Buffer. resize (n);
+	X_axis. resize (n);
 	if (n > plotLength) {
-	   Y_Buffer. resize (n);
-	   X_axis. resize (n);
 	   for (int i = plotLength; i < n; i ++) {
 	      Y_Buffer [i] = 0;
-	      X_axis [i] = plotLength + i;
+	      X_axis [i] = i;
 	   }
-	   plotLength = n;
 	}
+	plotLength = n;
 	dabSettings	-> beginGroup ("snrViewer");
 	dabSettings	-> setValue ("snrLength", plotLength);
 	dabSettings	-> endGroup ();
@@ -160,9 +161,28 @@
 }
 
 void	snrViewer::add_snr	(float snr) {
-	for (int i = plotLength - 1; i > 0; i --)
-	   Y_Buffer [i] = Y_Buffer [i - 1];
+	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 ());
+#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 ());
@@ -170,8 +190,10 @@
 }
 
 void	snrViewer::show_snr () {
-	spectrumCurve. setSamples (X_axis. data (),
-	                                Y_Buffer. data (), plotLength);
+	spectrum_curve. setSamples (X_axis. data (),
+	                           Y_Buffer. data (), plotLength);
+	baseLine_curve. setSamples (X_axis. data (),
+	                            baseLine_Buffer. data (), plotLength);
 	plotgrid	-> replot (); 
 }
 
@@ -211,7 +233,8 @@
 	this		-> displayColor	= QColor (displayColor);
 	this		-> gridColor	= QColor (gridColor);
 	this		-> curveColor	= QColor (curveColor);
-	spectrumCurve. setPen (QPen(this -> curveColor, 2.0));
+	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.tar.gz/snr-viewer/snr-viewer.h -> _service:download_url:qt-dab-3.7.1.tar.gz/snr-viewer/snr-viewer.h Changed

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

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

@@ -63,11 +63,6 @@
 	this	-> T_g			= T_s - T_u;
 	fft_buffer			= my_fftHandler. getVector();
 	phaseReference			.resize (T_u);
-
-//	connect (this, SIGNAL (show_snr (int)),
-//	         mr, SLOT (show_snr (int)));
-	snrCount		= 0;
-	snr			= 0;	
 }
 
 	ofdmDecoder::~ofdmDecoder() {
@@ -87,21 +82,10 @@
 
 	my_fftHandler. do_FFT();
 /**
-  *	The SNR is determined by looking at a segment of bins
-  *	within the signal region and bits outside.
-  *	It is just an indication
-  */
-
-	if (++snrCount > 10) {
-	   snr	= 0.8 * snr + 0.2 * get_snr (fft_buffer);
-//	   show_snr (snr);
-	   snrCount = 0;
-	}
-/**
   *	we are now in the frequency domain, and we keep the carriers
   *	as coming from the FFT as phase reference.
   */
-	memcpy (phaseReference. data(), fft_buffer,
+	memcpy (phaseReference. data (), fft_buffer,
 	                   T_u * sizeof (std::complex<float>));
 }
 //
@@ -119,8 +103,6 @@
 std::complex<float>	avgPoint	= std::complex<float> (0, 0);
 float		absVal			= 0;
 std::complex<float>	x [T_u];
-//float	avg	= 0;
-//float	S	= 0;
 float	nominator	= 0;
 float	denominator	= 0;
 //
@@ -142,17 +124,7 @@
 	                   square (absVal - abs (imag (x [i])));
 	}
 
-	return 10 * log10 (1.0 + nominator / denominator);
-//	avg	= arg (avgPoint * conj (std::complex<float> (absVal, absVal)));
-//	for (i = 0; i < carriers; i ++) {
-//	   float f = arg (x [i] * conj (std::complex<float> (1, 1))) - avg;
-//	   f = f / M_PI * 360;
-//	   S += f * f;
-//	}
-//
-//	S /= (carriers - 1);
-//	
-//	return sqrt (S);
+	return 20 * log10 (1.0 + nominator / denominator);
 }
 /**
   *	for the other blocks of data, the first step is to go from
@@ -281,9 +253,14 @@
 	for (int i = - carriers / 2; i < carriers / 2; i += 6) {
 	   int index = i < 0 ? (i + T_u) : i;
 	   int index_2 = i + carriers / 2;
-	   std::complex<float> s = r [index] * conj (v [index]);
-	   s = std::complex<float> (abs (real (s)), abs (imag (s)));
-	   offsa += index_2 * arg (s * std::complex<float> (1, -1));
+	   std::complex<float> a1 =
+	              std::complex<float> (abs (real (r [index])),
+	                                   abs (imag (r [index])));
+	   std::complex<float> a2 =
+	              std::complex<float> (abs (real (v [index])),
+	                                   abs (imag (v [index])));
+	   float s = abs (arg (a1 * conj (a2)));
+	   offsa += index * s;
 	   offsb += index_2 * index_2;
 	}
 	
@@ -294,29 +271,3 @@
 }
 
 
-/**
-  *	Obsolete: we now compute the snr by looking at the 
-  *	ratio between the power of the data in the signal and the power
-  *	of the signal in the null period.
-  *	for the snr we have a full T_u wide vector, with in the middle
-  *	K carriers.
-  *	Just get the strength from the selected carriers compared
-  *	to the strength of the carriers outside that region
-  */
-int16_t	ofdmDecoder::get_snr (std::complex<float>  *v) {
-int16_t	i;
-float	noise 	= 0;
-float	signal	= 0;
-
-	for (i = -100; i < 100; i ++)
-	   noise += abs (v [(T_u / 2 + i)]);
-
-	noise	/= 200;
-	for (i =  - carriers / 4;  i <  carriers / 4; i ++)
-	   signal += abs (v [(T_u + i) % T_u]);
-	signal	/= (carriers / 2);
-
-	return 20 * log10 ((signal + 0.005) / (noise + 0.005));
-}
-
-

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

@@ -75,8 +75,6 @@
 	
 	connect (this, SIGNAL (showCorrelation (int, int)),
 	         mr,   SLOT   (showCorrelation (int, int)));
-	connect (this, SIGNAL (showIndex   (int)),
-	         mr,   SLOT   (showIndex   (int)));
 }
 
 	phaseReference::~phaseReference() {
@@ -131,45 +129,15 @@
 	if (Max / sum < threshold) {
 	   return (- abs (Max / sum) - 1);
 	}
-	else 
-	   resultVector. push_back (maxIndex);	
-
-	if (threshold <= 3)	//	
-	   return maxIndex;
-	for (int k = 0; k < depth; k ++) {
-	   float MMax = 0;
-	   int	lIndex = -1;
-	   for (i = T_g - 100; i < T_g / 2 + 200; i ++) {
-	      if (lbuf [i] > MMax) {
-	         MMax = lbuf [i];
-	         lIndex = i;
-	      }
-	   }
-	   if (0.7 * MMax < Max)
-	      break;
-	   if (lIndex > 0) {
-	      resultVector . push_back (lIndex);
-	      for (i = lIndex - 15; i < lIndex + 15; i ++)
-	         lbuf [i] = 0;
-	   }
-	   else
-	      break;
-	}
 
 	if (response != nullptr) {
 	   if (++displayCounter > framesperSecond / 2) {
 	      response	-> putDataIntoBuffer (mbuf, T_u / 2);
 	      showCorrelation (T_u / 2, T_g);
 	      displayCounter	= 0;
-	      if (resultVector. at (0) > 0) {
-	         showIndex (-1);
-	         for (i = 1; i < (int)(resultVector. size()); i ++)
-	            showIndex (resultVector. at (i));
-	         showIndex (0);
-	      }
 	   }
 	}
-	return resultVector. at (0);
+	return maxIndex;
 }
 //
 //

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

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

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/si-processor.cpp Deleted

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

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/si-processor.h Deleted

@@ -1,57 +0,0 @@
-#
-/*
- *    Copyright (C) 2013 .. 2017
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB program
- *
- *    Qt-DAB is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    Qt-DAB is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef	__SI_PROCESSOR__
-#define	__SI_PROCESSOR__
-
-#include	<QString>
-#include	<stdio.h>
-#include	<stdint.h>
-#include	<stdlib.h>
-#include	<vector>
-
-class	ensembleInfo;
-class	serviceInfo;
-
-class	siProcessor {
-public:
-		siProcessor		();
-		~siProcessor		();
-ensembleInfo	*process_SI		(uint8_t *, int);
-private:
-int		header			(int *pos);
-ensembleInfo	*process_ensemble	(int *pos);
-serviceInfo	process_service		(int *pos, int length);
-
-int		process_serviceId	(int pos);
-QString		process_serviceName	(int pos);
-QString		process_mediaDescription (int pos);
-QString		process_keywords	(int pos);
-QString		longDescription		(int pos);
-
-QString stringTable [30];
-uint8_t	*data;
-int	length;
-};
-
-#endif
-

Changes of Revision 35