Packman Build Service PMBS

_service Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/control-queue.cpp Deleted

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/control-queue.h Deleted

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-controller.cpp Deleted

@@ -1,663 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2019
- * 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	"sdrplay-controller.h"
-#include	"sdrplay-handler-v3.h"
-#include	"control-queue.h"
-
-static
-int RSP1_Table []	= {0, 24, 19, 43};
-
-static
-int RSP1A_Table []	= {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
-
-static
-int RSP2_Table []	= {0, 10, 15, 21, 24, 34, 39, 45, 64};
-
-static
-int	RSPduo_Table []	= {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
-
-static
-int	get_lnaGRdB (int hwVersion, int lnaState) {
-	switch (hwVersion) {
-	 case 1:
-	 default:
-	 return RSP1_Table [lnaState];
-
-	 case 2:
-	 return RSP2_Table [lnaState];
-
-	 case 255: 
-	 return RSP1A_Table [lnaState];
-
-	 case 3:
-	 return RSPduo_Table [lnaState];
-	}
-}
-
-//	here we start
-	sdrplayController::sdrplayController (sdrplayHandler_v3 *parent,
-	 RingBuffer<std::complex<int16_t>> *b,
-	 controlQueue *theQueue) {
-	this	-> parent	= parent;
-	this	-> _I_Buffer	= b;
-	this	-> theQueue	= theQueue;
-
- connect (this, SIGNAL	(setTotalGain (int)),
- parent, SLOT	(show_TotalGain (int)));
-	connect (this, SIGNAL	(setDeviceData (const QString &, int, float)),
-	 parent, SLOT (show_DeviceData (const QString &, int, float)));
-	connect (this, SIGNAL	(error (int)),
-	 parent, SLOT (show_Error (int)));
-	connect (this, SIGNAL	(set_runFlag (bool)),
-	 parent, SLOT (show_runFlag (bool)));
-	connect (this, SIGNAL	(set_lnaGain (int)),
-	 parent, SLOT (show_lnaGain (int)));
-	connect (this, SIGNAL	(set_lnaRange	(int, int)),
-	 parent, SLOT	(set_lnaRange	(int, int)));
-	connect	(this, SIGNAL	(set_deviceLabel (const QString &, int)),
-	 parent, SLOT	(show_deviceLabel (const QString &, int)));
-	connect (this, SIGNAL	(set_antennaSelector (bool)),
-	 parent, SLOT	(show_antennaSelector (bool)));
-	connect (this, SIGNAL	(set_tunerSelector (bool)),
-	 parent, SLOT	(show_tunerSelector (bool)));
-	start ();
-}
-
-	sdrplayController::~sdrplayController () {
-	threadRuns. store (false);
-	while (this -> isRunning ())
-	 msleep (10);
-}
-//
-static
-void StreamACallback (short *xi, short *xq,
- sdrplay_api_StreamCbParamsT *params,
- unsigned int numSamples, unsigned int reset,
- void *cbContext) {
-sdrplayController *p	= static_cast<sdrplayController *> (cbContext);
-float	denominator	= (float)(p -> denominator);
-std::complex<int16_t> localBuf [numSamples];
-
-	(void)params;
-	if (reset)
-	 return;
-	if (!p -> receiverRuns. load ())
-	 return;
-
-	for (int i = 0; i < (int)numSamples; i ++)
-	 localBuf [i] = std::complex<int16_t> (xi [i], xq [i]);
-	int n = (int)(p -> _I_Buffer -> GetRingBufferWriteAvailable ());
-	if (n >= (int)numSamples) 
-	 p -> _I_Buffer -> putDataIntoBuffer (localBuf, numSamples);
-}
-
-static
-void	StreamBCallback (short *xi, short *xq,
- sdrplay_api_StreamCbParamsT *params,
- unsigned int numSamples, unsigned int reset,
- void *cbContext) {
-	(void)xi; (void)xq; (void)params; (void)cbContext;
- if (reset)
- printf ("sdrplay_api_StreamBCallback: numSamples=%d\n", numSamples);
- return;
-}
-
-static
-void	EventCallback (sdrplay_api_EventT eventId,
- sdrplay_api_TunerSelectT tuner,
- sdrplay_api_EventParamsT *params,
- void *cbContext) {
-sdrplayController *p	= static_cast<sdrplayController *> (cbContext);
-	(void)tuner;
-	switch (eventId) {
-	 case sdrplay_api_GainChange:
-	 p -> setTotalGain (params -> gainParams. currGain);
-	 break;
-
-	 case sdrplay_api_PowerOverloadChange:
-	 p -> update_PowerOverload (params);
-	 break;
-
-	 default:
-	 fprintf (stderr, "event %d\n", eventId);
-	 break;
-	}
-}
-
-void	sdrplayController::
-	 update_PowerOverload (sdrplay_api_EventParamsT *params) {
-	sdrplay_api_Update (chosenDevice -> dev,
-	 chosenDevice -> tuner,
-	 sdrplay_api_Update_Ctrl_OverloadMsgAck,
-	 sdrplay_api_Update_Ext1_None);
-	if (params -> powerOverloadParams.powerOverloadChangeType ==
-	 sdrplay_api_Overload_Detected) {
-//	 fprintf (stderr, "Qt-DAB sdrplay_api_Overload_Detected");
-	}
-	else {
-//	 fprintf (stderr, "Qt-DAB sdrplay_api_Overload Corrected");
-	}
-}
-
-void	sdrplayController::run	() {
-sdrplay_api_ErrT err;
-sdrplay_api_DeviceT devs [6];
-float			apiVersion;
-uint32_t ndev;
-
-	chosenDevice	= nullptr;
-	deviceParams	= nullptr;
-
-	denominator		= 2048;		// default
-	nrBits			= 12;		// default
-	threadRuns. store (false);
-
-	Handle			= fetchLibrary ();
-	if (Handle == nullptr)
-	 throw (21);
-//	load the functions
-	bool success	= loadFunctions ();
-	if (!success) {
-	 releaseLibrary ();
-	 emit set_runFlag (false);
- throw (23);
- }
-	fprintf (stderr, "functions loaded\n");
-
-//	try to open the API
-	err	= sdrplay_api_Open ();
-	if (err != sdrplay_api_Success) {
-	 fprintf (stderr, "sdrplay_api_Open failed %s\n",
-	 sdrplay_api_GetErrorString (err));
-	 releaseLibrary ();
-	 emit set_runFlag (false);
-	 throw (24);
-	}
-
-

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-controller.h Deleted

@@ -1,97 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2019
- * 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
- */
-
-#ifndef	__SDRPLAY_CONTROLLER__
-#define	__SDRPLAY_CONTROLLER__
-
-#include	<QThread>
-#include	<dab-constants.h>
-#include	<ringbuffer.h>
-#include	<sdrplay_api.h>
-class	sdrplayHandler_v3;
-class	controlQueue;
-
-
-class	sdrplayController:public QThread {
-Q_OBJECT
-public:
-		sdrplayController (sdrplayHandler_v3 *,
-	 RingBuffer<std::complex<int16_t>> *,
-	 controlQueue *);
-		~sdrplayController	();
-	bool	is_threadRunning	();
-	bool	is_receiverRunning	();
-	RingBuffer<std::complex<int16_t>> *_I_Buffer;
-	int	denominator;
-	void	update_PowerOverload (sdrplay_api_EventParamsT *params);
-	std::atomic<bool>	receiverRuns;
-private:
-	sdrplay_api_Open_t sdrplay_api_Open;
- sdrplay_api_Close_t sdrplay_api_Close;
- sdrplay_api_ApiVersion_t sdrplay_api_ApiVersion;
- sdrplay_api_LockDeviceApi_t sdrplay_api_LockDeviceApi;
- sdrplay_api_UnlockDeviceApi_t sdrplay_api_UnlockDeviceApi;
- sdrplay_api_GetDevices_t sdrplay_api_GetDevices;
- sdrplay_api_SelectDevice_t sdrplay_api_SelectDevice;
- sdrplay_api_ReleaseDevice_t sdrplay_api_ReleaseDevice;
- sdrplay_api_GetErrorString_t sdrplay_api_GetErrorString;
-	sdrplay_api_GetLastError_t sdrplay_api_GetLastError;
- sdrplay_api_DebugEnable_t sdrplay_api_DebugEnable;
- sdrplay_api_GetDeviceParams_t sdrplay_api_GetDeviceParams;
- sdrplay_api_Init_t sdrplay_api_Init;
- sdrplay_api_Uninit_t sdrplay_api_Uninit;
- sdrplay_api_Update_t sdrplay_api_Update;
-
-	sdrplay_api_DeviceT *chosenDevice;
-	sdrplay_api_DeviceParamsT *deviceParams;
-	sdrplay_api_CallbackFnsT cbFns;
-	sdrplay_api_RxChannelParamsT *chParams;
-
-	void				run		();
- uint32_t			numofDevs;
- int16_t				deviceIndex;
- int32_t				vfoFrequency;
- HINSTANCE			Handle;
- int16_t				hwVersion;
- int16_t				nrBits;
-
-	sdrplayHandler_v3		*parent;
-	controlQueue			*theQueue;
-	std::atomic<bool>		threadRuns;
-	HINSTANCE			fetchLibrary	();
-	void				releaseLibrary	();
-	bool				loadFunctions	();
-
-signals:
-	void			setTotalGain		(int);
-	void			setDeviceData		(const QString &,
-	 int, float);
-	void			error			(int);
-	void			set_runFlag		(bool);
-	void			set_lnaGain		(int);
-	void			set_lnaRange		(int, int);
-	void			set_deviceLabel		(const QString &, int);
-	void			set_antennaSelector	(bool);
-	void			set_tunerSelector	(bool);
-};
-
-#endif

_service:download_url:qt-dab-3.3.tar.gz/devices/virtual-input.cpp Deleted

@@ -1,76 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2020
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB-J; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 	Default (void) implementation of
- * 	virtual input class
- */
-#include	"virtual-input.h"
-
-	virtualInput::virtualInput() {
-	lastFrequency	= 100000;
-	vfoOffset	= 0;
-	theGain		= 50;
-	coarseOffset	= 0;
-	myFrame		= nullptr;
-}
-
-	virtualInput::~virtualInput() {
-	myFrame		= nullptr;
-}
-
-bool	virtualInput::restartReader	(int32_t freq) {
-	(void)freq;
-	return true;
-}
-
-void	virtualInput::stopReader() {
-}
-
-int32_t	virtualInput::getSamples	(std::complex<float> *v, int32_t amount) {
-	(void)v; 
-	(void)amount; 
-	return amount;
-}
-
-int32_t	virtualInput::Samples() {
-	return 1024;
-}
-
-void	virtualInput::resetBuffer() {
-}
-
-void	virtualInput::hide	() {
-	if (myFrame != nullptr)
-	 myFrame	-> hide ();
-}
-
-void	virtualInput::show	() {
-	if (myFrame != nullptr)
-	 myFrame -> show ();
-}
-
-bool	virtualInput::isHidden	() { 
-	if (myFrame != nullptr)
-	 return myFrame -> isHidden ();
-	return false;
-}
-

_service:download_url:qt-dab-3.3.tar.gz/devices/virtual-input.h Deleted

@@ -1,59 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB program
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *	We have to create a simple virtual class here, since we
- *	want the interface with different devices (including filehandling)
- *	to be transparent
- */
-#ifndef	__VIRTUAL_INPUT__
-#define	__VIRTUAL_INPUT__
-
-#include	<cstdint>
-#include	"dab-constants.h"
-#include	<QObject>
-#include	<QThread>
-#include	<QFrame>
-
-class	virtualInput: public QThread {
-public:
-			virtualInput	();
-virtual			~virtualInput	();
-virtual		int32_t	getVFOFrequency() {return 0;}
-virtual		bool	restartReader	(int32_t freq);
-virtual		void	stopReader	();
-virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
-virtual		int32_t	Samples		();
-virtual		void	resetBuffer	();
-virtual		int16_t	bitDepth	() { return 10;}
-virtual		void	hide		();
-virtual		void	show		();
-virtual		bool	isHidden	();
-//
-protected:
-		int32_t	lastFrequency;
-	 int32_t	vfoOffset;
-	 int	theGain;
-		int32_t	coarseOffset;
-		QFrame	*myFrame;
-};
-#endif
-

_service:download_url:qt-dab-3.3.tar.gz/includes/backend/.charsets.h.swp Deleted

_service:download_url:qt-dab-3.3.tar.gz/main.cpp Deleted

@@ -1,172 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2019
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
- * Many of the ideas as implemented in Qt-DAB are derived from
- * other work, made available through the GNU general Public License.
- * All copyrights of the original authors are acknowledged.
- *
- * 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
- *
- * Main program
- */
-#include <QApplication>
-#include <QSettings>
-#include	<QTranslator>
-#include	<QString>
-#include <QDir>
-#include	<QDebug>
-#include <unistd.h>
-#include "dab-constants.h"
-#include "radio.h"
-
-#define DEFAULT_INI ".qt-dab.ini"
-#define	PRESETS		".qt-dab-presets.xml"
-#ifndef	GITHASH
-#define	GITHASH	" "
-#endif
-
-QString fullPathfor (QString v) {
-QString fileName;
-
-	if (v == QString (""))
-	 return QString ("/tmp/xxx");
-
-	if (v. at (0) == QChar ('/')) // full path specified
-	 return v;
-
-#ifdef	OSX_INIT_FILE
-	char *PathFile;
-	PathFile = getenv ("HOME");
-	fileName = PathFile;
-	fileName.append("/.qt-dab.ini");
-	qDebug() << fileName;
-#else
-
-	fileName = QDir::homePath();
-	fileName. append ("/");
-	fileName. append (v);
-	fileName = QDir::toNativeSeparators (fileName);
-#endif
-	if (!fileName. endsWith (".ini"))
-	 fileName. append (".ini");
-
-	return fileName;
-}
-
-void setTranslator (QString Language);
-
-int main (int argc, char **argv) {
-QString initFileName = fullPathfor (QString (DEFAULT_INI));
-RadioInterface *MyRadioInterface;
-
-// Default values
-QSettings *dabSettings; // ini file
-QString		presetName	= PRESETS;
-int32_t		dataPort	= 8888;
-int opt;
-QString freqExtension		= "";
-	
-	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:")) != -1) {
-	 switch (opt) {
-	 case 'i':
-	 initFileName = fullPathfor (QString (optarg));
-	 break;
-
-	 case 'P':
-	 dataPort	= atoi (optarg);
-	 break;
-
-	 case 'A':
-	 freqExtension	= optarg;
-	 break;
-
-	 default:
-	 break;
-	 }
-	}
-
-	dabSettings = new QSettings (initFileName, QSettings::IniFormat);
-
-	QString presets = QDir::homePath();
-	presets. append ("/");
-	presets. append (presetName);
-	presets = QDir::toNativeSeparators (presets);
-
-/*
- * Before we connect control to the gui, we have to
- * instantiate
- */
-#if QT_VERSION >= 0x050600
-	QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
-#endif
-
-	QApplication a (argc, argv);
-//	setting the language
-	QString locale = QLocale::system(). name();
-	qDebug() << "main:" << "Detected system language" << locale;
-	setTranslator (locale);
-
-	a. setWindowIcon (QIcon (":/qt-dab.ico"));
-
-	MyRadioInterface = new RadioInterface (dabSettings,
-	 presets,
-	 freqExtension,
-	 dataPort
- );
-	MyRadioInterface -> show();
- a. exec();
-/*
- * done:
- */
-	fprintf (stderr, "back in main program\n");
-	fflush (stdout);
-	fflush (stderr);
-	qDebug ("It is done\n");
-	delete MyRadioInterface;
-	delete dabSettings;
-	return 1;
-}
-
-void	setTranslator (QString Language) {
-QTranslator *Translator = new QTranslator;
-
-//	German is special (as always)
-	if ((Language == "de_AT") || (Language == "de_CH"))
-	 Language = "de_DE";
-//
-//	what about Dutch?
-	bool TranslatorLoaded =
-	 Translator -> load (QString(":/i18n/") + Language);
-	qDebug() << "main:" << "Set language" << Language;
-	QCoreApplication::installTranslator (Translator);
-
-	if (!TranslatorLoaded) {
-	 qDebug() << "main:" << "Error while loading language specifics" << Language << "use English \"en_GB\" instead";
-	 Language = "en_GB";
-	}
-
-	QLocale curLocale (QLocale ((const QString&)Language));
-	QLocale::setDefault (curLocale);
-}
-

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3-history.png Deleted

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3-kaal.png Deleted

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-3.3-presets.png Deleted

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

_service:download_url:qt-dab-3.3.tar.gz/radio.cpp Deleted

@@ -1,2385 +0,0 @@
-#
-/*
- * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB 
- *
- * 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	<QSettings>
-#include	<QMessageBox>
-#include	<QFileDialog>
-#include	<QDebug>
-#include	<QDateTime>
-#include	<QFile>
-#include	<QStringList>
-#include	<QStringListModel>
-#include	<QMouseEvent>
-#include	<QDir>
-#include	<fstream>
-#include	"dab-constants.h"
-#include	<iostream>
-#include	<numeric>
-#include	<unistd.h>
-#include	<vector>
-#include	"radio.h"
-#include	"band-handler.h"
-#include	"ensemble-printer.h"
-#include	"audio-descriptor.h"
-#include	"data-descriptor.h"
-#include	"rawfiles.h"
-#include	"wavfiles.h"
-#include	"xml-filereader.h"
-#include	"dab_tables.h"
-#ifdef	TCP_STREAMER
-#include	"tcp-streamer.h"
-#elif	QT_AUDIO
-#include	"Qt-audio.h"
-#else
-#include	"audiosink.h"
-#endif
-#ifdef	HAVE_RTLSDR
-#include	"rtlsdr-handler.h"
-#endif
-#ifdef	HAVE_SDRPLAY_V2
-#include	"sdrplay-handler-v2.h"
-#endif
-#ifdef	HAVE_SDRPLAY_V3
-#include	"sdrplay-handler-v3.h"
-#endif
-#ifdef	HAVE_ELAD_S1
-#include	"elad-handler.h"
-#endif
-#ifdef	__MINGW32__
-#ifdef	HAVE_EXTIO
-#include	"extio-handler.h"
-#endif
-#endif
-#ifdef	HAVE_RTL_TCP
-#include	"rtl_tcp_client.h"
-#endif
-#ifdef	HAVE_AIRSPY
-#include	"airspy-handler.h"
-#endif
-#ifdef	HAVE_HACKRF
-#include	"hackrf-handler.h"
-#endif
-#ifdef	HAVE_SOAPY
-#include	"soapy-handler.h"
-#endif
-#ifdef	HAVE_LIME
-#include	"lime-handler.h"
-#endif
-#include	"ui_technical_data.h"
-#include	"spectrum-viewer.h"
-#include	"correlation-viewer.h"
-#include	"tii-viewer.h"
-#include	"history-handler.h"
-
-#ifdef	__MINGW32__
-#include <windows.h>
-
-__int64 FileTimeToInt64 (FILETIME & ft) {
-	ULARGE_INTEGER foo;
-
-	foo.LowPart	= ft.dwLowDateTime;
-	foo.HighPart	= ft.dwHighDateTime;
-	return (foo.QuadPart);
-}
-
-bool get_cpu_times (size_t &idle_time, size_t &total_time) {
-FILETIME IdleTime, KernelTime, UserTime;
-size_t	thisIdle, thisKernel, thisUser;
-
-	GetSystemTimes (&IdleTime, &KernelTime, &UserTime);
-	
-	thisIdle	= FileTimeToInt64 (IdleTime);
-	thisKernel	= FileTimeToInt64 (KernelTime);
-	thisUser	= FileTimeToInt64 (UserTime);
-	idle_time	= (size_t) thisIdle;
-	total_time	= (size_t)(thisKernel + thisUser);
-	return true;
-}
-#else
-std::vector<size_t> get_cpu_times() {
-	std::ifstream proc_stat ("/proc/stat");
-	proc_stat. ignore (5, ' '); // Skip the 'cpu' prefix.
-	std::vector<size_t> times;
-	for (size_t time; proc_stat >> time; times. push_back (time));
-	return times;
-}
- 
-bool get_cpu_times (size_t &idle_time, size_t &total_time) {
-	const std::vector <size_t> cpu_times = get_cpu_times();
-	if (cpu_times. size() < 4)
-	 return false;
-	idle_time = cpu_times [3];
-	total_time = std::accumulate (cpu_times. begin(), cpu_times. end(), 0);
-	return true;
-}
-#endif
-
-static
-uint8_t convert (QString s) {
-	if (s == "Mode 1")
-	 return 1;
-	if (s == "Mode 2")
-	 return 2;
-	if (s == "Mode 3")
-	 return 3;
-	if (s == "Mode 4")
-	 return 4;
-	return 1;
-}
-
-	RadioInterface::RadioInterface (QSettings	*Si,
-	 const QString	&presetFile,
-	 const QString	&freqExtension,
-	 int32_t		dataPort,
-	 QWidget		*parent):
-	 QWidget (parent),
-	 my_presetHandler (this),
-	 theBand (freqExtension),
-	 theTable (this) {
-int16_t	latency;
-int16_t k;
-QString h;
-QString	presetName;
-uint8_t	dabBand;
-
-	dabSettings		= Si;
-	running. 		store (false);
-	scanning. 		store (false);
-	isSynced		= false;
-	runningServices. 	resize (0);
-	spectrumBuffer =
-	 new RingBuffer<std::complex<float>> (2 * 32768);
-	iqBuffer		=
-	 new RingBuffer<std::complex<float>> (2 * 1536);
-	responseBuffer		=
-	 new RingBuffer<float> (32768);
-	tiiBuffer		=
-	 new RingBuffer<std::complex<float>> (32768);
-	audioBuffer		=
-	 new RingBuffer<int16_t>(16 * 32768);
-	frameBuffer		=
-	 new RingBuffer<uint8_t> (2 * 32768);
-	dataBuffer		=
-	 new RingBuffer<uint8_t>(32768);
-	switchTime		=
-	 dabSettings -> value ("switchTime", 8000). toInt ();
-	latency			=
-	 dabSettings -> value ("latency", 5). toInt();
-
-	bool has_presetName	=
-	 dabSettings -> value ("has-presetName", 1). toInt() != 0;
-	if (has_presetName) {
-	 presetName		=
-	 dabSettings -> value ("presetname", ""). toString();
-	 dabService s;
-	 s. serviceName = presetName;
-	 s. SId	 = 0;
-	 s. SCIds	 = 0;
-	 runningServices. push_back (s);
-	}
-#ifdef	_SEND_DATAGRAM_

_service:download_url:qt-dab-3.3.tar.gz/radio.h Deleted

@@ -1,243 +0,0 @@
-#
-/*
- * Copyright (C) 2013, 2014, 2015, 2016, 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __RADIO__
-#define __RADIO__
-
-#include	"dab-constants.h"
-#include	<QMainWindow>
-#include	<QStringList>
-#include	<QStandardItemModel>
-#ifdef	_SEND_DATAGRAM_
-#include	<QUdpSocket>
-#endif
-#include	<QComboBox>
-#include	<QByteArray>
-#include	<QLabel>
-#include	<QTimer>
-#include	<sndfile.h>
-#include	"ui_dabradio.h"
-#include	"dab-processor.h"
-#include	"ringbuffer.h"
-#include "band-handler.h"
-#include	"text-mapper.h"
-#ifdef	DATA_STREAMER
-#include	"tcp-server.h"
-#endif
-#include	"preset-handler.h"
-#include	"scanner-table.h"
-
-class	QSettings;
-class	virtualInput;
-class	audioBase;
-class	common_fft;
-class	serviceDescriptor;
-class	historyHandler;
-class	spectrumViewer;
-class	correlationViewer;
-class	tiiViewer;
-
-#include	"ui_technical_data.h"
-
-/*
- *	The main gui object. It inherits from
- *	QWidget and the generated form
- */
-
-class dabService {
-public:
-	QString		serviceName;
-	uint32_t	SId;
-	int		SCIds;
-};
-	
-class RadioInterface: public QWidget, private Ui_dabradio {
-Q_OBJECT
-public:
-		RadioInterface		(QSettings	*,
-	 const QString	&,
-	 const QString	&,
-	 int32_t	 dataPort,
-	 QWidget	*parent = nullptr);
-		~RadioInterface		();
-
-protected:
-	bool			eventFilter (QObject *obj, QEvent *event);
-private:
-	QString			version;
-	bool			noSort;
-	presetHandler		my_presetHandler;
-	bandHandler		theBand;
-	scannerTable		theTable;
-	Ui_technical_data	techData;
-	QFrame			*dataDisplay;
-	QSettings		*dabSettings;
-	std::vector<dabService>	runningServices;
- spectrumViewer		*my_spectrumViewer;
-	RingBuffer<std::complex<float>> *spectrumBuffer;
-	RingBuffer<std::complex<float>> *iqBuffer;
-	RingBuffer<std::complex<float>> *tiiBuffer;
-	correlationViewer	*my_correlationViewer;
-	RingBuffer<float>	*responseBuffer;
-	tiiViewer		*my_tiiViewer;
-
-	bool			normalScan;
-	int16_t			tii_delay;
-	int32_t			dataPort;
-	serviceDescriptor	*currentService;
-
-	std::vector<int>	secondariesVector;
-	bool			isSynced;
-	std::atomic<bool>	running;
-	std::atomic<bool>	scanning;
-	virtualInput		*inputDevice;
-	textMapper		the_textMapper;
-	dabProcessor		*my_dabProcessor;
-	audioBase		*soundOut;
-#ifdef	DATA_STREAMER
-	tcpServer		*dataStreamer;
-#endif
-	RingBuffer<int16_t>	*audioBuffer;
-	RingBuffer<uint8_t>	*dataBuffer;
-	RingBuffer<uint8_t>	*frameBuffer;
-	bool			saveSlides;
-	QString			picturesPath;
-	int			switchTime;
-#ifdef	_SEND_DATAGRAM_
-	QUdpSocket		dataOut_socket;
-	QString			ipAddress;
-	int32_t			port;
-#endif
-	SNDFILE *rawDumper;
- FILE *frameDumper;
- SNDFILE *audioDumper;
-
-	QStandardItemModel	model;
-	QStringList		Services;
-	QStringList		soundChannels;
-	QTimer			displayTimer;
-	QTimer			signalTimer;
-	QTimer			presetTimer;
-	QTimer			startTimer;
-	int32_t			numberofSeconds;
-	int16_t			ficBlocks;
-	int16_t			ficSuccess;
-	void			connectGUI		();
-	void			disconnectGUI		();
-
-	QString			footText		();
-	void			cleanScreen		();
-	void			set_picturePath		();
-	void			dumpControlState	(QSettings *);
-	void			hideButtons		();
-	void			showButtons		();
-	virtualInput		*setDevice		(const QString &);
-	historyHandler		*my_history;
-//
-	void			start_audioService	(const QString &);
-	void			start_packetService	(const QString &);
-	void			startScanning		();
-	void			stopScanning		();
- void			start_audioDumping ();
- void			stop_audioDumping ();
- void			start_sourceDumping ();
- void			stop_sourceDumping ();
- void			start_frameDumping ();
- void			stop_frameDumping ();
-	void			startChannel		(const QString &);
-	void			stopChannel		();
-	void			stopService		();
-	void			startService		(dabService *);
-	void			colorService		(QModelIndex ind,
-	 QColor c, int pt);
-	void			localSelect		(const QString &s);
-	QString			filenameSuggestion 	(QString);
-	void			showServices		();
-
-public slots:
-	void			set_CorrectorDisplay	(int);
-	void			addtoEnsemble		(const QString &, int);
-	void			nameofEnsemble		(int, const QString &);
-	void			show_frameErrors	(int);
-	void			show_rsErrors		(int);
-	void			show_aacErrors		(int);
-	void			show_ficSuccess		(bool);
-	void			show_snr		(int);
-	void			setSynced		(bool);
-	void			showLabel		(QString);
-	void			showMOT			(QByteArray, int,
-	 QString);
-	void			sendDatagram		(int);
-	void			handle_tdcdata		(int, int);
-	void			changeinConfiguration	();
-	void			newAudio		(int, int);
-//
-	void			setStereo		(bool);
-	void			set_streamSelector	(int);
-	void			No_Signal_Found		();
-	void			show_motHandling	(bool);
-	void			setSyncLost		();

_service:download_url:qt-dab-3.3.tar.gz/src/support/dab_tables.cpp Deleted

@@ -1,673 +0,0 @@
-#
-/*
- * Copyright (C) 2018
- * Hayati Ayguen (h_ayguen@web.de)
- *
- * DAB-library 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-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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with DAB-library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include "dab_tables.h"
-
-#include <cstring>
-#include <cstdlib>
-
-
-//	ETSI TS 101 756 V2.2.1: Registered Tables
-//	for Extended Country Code, Country Id, Language Code,
-//	Program Type, User Application Type, Content Type
-//	https://www.etsi.org/deliver/etsi_ts/101700_101799/101756/02.02.01_60/ts_101756v020201p.pdf
-
-//	ETSI TR 101 496-3 V1.1.2
-//	protection level/classes, ..
-//	https://www.etsi.org/deliver/etsi_tr/101400_101499/10149603/01.01.02_60/tr_10149603v010102p.pdf
-
-static const char *uep_rates [] = {"7/20", "2/5", "1/2", "3/5"};
-static const char *eep_Arates[] = {"1/4", "3/8", "1/2", "3/4"}; // see ETSI EN 300 401 V1.3.2 (2000-09), Table 8, page 46
-static const char *eep_Brates[] = {"4/9", "4/7", "4/6", "4/5"}; // see ETSI EN 300 401 V1.3.2 (2000-09), Table 9, page 46
-
-
-struct country_codes {
- uint8_t ecc;
- uint8_t countryId;
- const char *countryName;
-};
-
-//	following countryTable[] is sorted over all regions to make
-//	it easier to find "missing" / "old" but still unused entries.
-//	achieved by searching old standard tables document for each ECC code.
-//	Table 3: ITU Region 1 - European broadcasting area
-//	Table 4: ITU Region 1 - African broadcasting area
-//	Table 6: ITU Region 2 - North and South Americas
-//	Table 7: ITU Region 3 - Asia and Pacific
-
-static country_codes countryTable[] = {
-{0xA0, 0x1, "United States of America"},
-{0xA0, 0x2, "United States of America"},
-{0xA0, 0x3, "United States of America"},
-{0xA0, 0x4, "United States of America"},
-{0xA0, 0x5, "United States of America"},
-{0xA0, 0x6, "United States of America"},
-{0xA0, 0x7, "United States of America"},
-{0xA0, 0x8, "United States of America"},
-{0xA0, 0x9, "United States of America"},
-{0xA0, 0xA, "United States of America"},
-{0xA0, 0xB, "United States of America"},
-{0xA0, 0xC, "United States of America"},
-{0xA0, 0xD, "United States of America"},
-{0xA0, 0xE, "United States of America"},
-
-{0xA1, 0xC, "Canada"},
-{0xA1, 0xF, "Greenland"},
-
-{0xA2, 0x1, "Anguilla"},
-{0xA2, 0x2, "Antigua and Barbuda"},
-{0xA2, 0x3, "Equador"},
-{0xA2, 0x4, "Falkland Islands"},
-{0xA2, 0x5, "Barbados"},
-{0xA2, 0x6, "Belize"},
-{0xA2, 0x7, "Cayman Islands"},
-{0xA2, 0x8, "Costa Rica"},
-{0xA2, 0x9, "Cuba"},
-{0xA2, 0xA, "Argentina"},
-{0xA2, 0xB, "Brazil"},
-{0xA2, 0xC, "Bermuda"},
-{0xA2, 0xD, "Netherlands Antilles"},
-{0xA2, 0xE, "Guadeloupe"},
-{0xA2, 0xF, "Bahamas"},
-
-{0xA3, 0x1, "Bolivia"},
-{0xA3, 0x2, "Colombia"},
-{0xA3, 0x3, "Jamaica"},
-{0xA3, 0x4, "Martinique"},
-{0xA3, 0x6, "Paraguay"},
-{0xA3, 0x7, "Nicaragua"},
-{0xA3, 0x8, "Puerto Rico"},
-{0xA3, 0x9, "Panama"},
-{0xA3, 0xA, "Dominica"},
-{0xA3, 0xB, "Dominican Republic"},
-{0xA3, 0xC, "Chile"},
-{0xA3, 0xD, "Grenada"},
-{0xA3, 0xE, "Turks and Caicos islands"},
-{0xA3, 0xF, "Guyana"},
-
-{0xA4, 0x1, "Guatemala"},
-{0xA4, 0x2, "Honduras"},
-{0xA4, 0x3, "Aruba"},
-{0xA4, 0x5, "Montserrat"},
-{0xA4, 0x6, "Trinidad and Tobago"},
-{0xA4, 0x7, "Peru"},
-{0xA4, 0x8, "Surinam"},
-{0xA4, 0x9, "Uruguay"},
-{0xA4, 0xA, "St. Kitts"},
-{0xA4, 0xB, "St. Lucia"},
-{0xA4, 0xC, "El Salvador"},
-{0xA4, 0xD, "Haiti"},
-{0xA4, 0xE, "Venezuela"},
-{0xA4, 0xF, "Mexico"},
-
-{0xA5, 0xC, "St. Vincent"},
-{0xA5, 0xF, "Virgin islands (British or USA)"}, // British and USA have same IDs! amended "or USA"
-{0xA5, 0xF, "Virgin islands (USA)"}, // keep this entry .. doesn't hurt
-
-{0xA6, 0xF, "St. Pierre and Miquelon"},
-
-{0xD0, 0x1, "Cameroon"},
-{0xD0, 0x2, "Central African Republic"},
-{0xD0, 0x3, "Djibouti"},
-{0xD0, 0x4, "Madagascar"},
-{0xD0, 0x5, "Mali"},
-{0xD0, 0x6, "Angola"},
-{0xD0, 0x7, "Equatorial Guinea"},
-{0xD0, 0x8, "Gabon"},
-{0xD0, 0x9, "Republic of Guinea"},
-{0xD0, 0xA, "South Africa"},
-{0xD0, 0xB, "Burkina Faso"},
-{0xD0, 0xC, "Congo"},
-{0xD0, 0xD, "Togo"},
-{0xD0, 0xE, "Benin"},
-{0xD0, 0xF, "Malawi"},
-
-{0xD1, 0x1, "Namibia"},
-{0xD1, 0x2, "Liberia"},
-{0xD1, 0x3, "Ghana"},
-{0xD1, 0x4, "Mauritania"},
-{0xD1, 0x5, "Sao Tome & Principe"},
-{0xD1, 0x6, "Cape Verde"},
-{0xD1, 0x7, "Senegal"},
-{0xD1, 0x8, "Gambia"},
-{0xD1, 0x9, "Burundi"},
-{0xD1, 0xA, "Ascension island"},
-{0xD1, 0xB, "Botswana"},
-{0xD1, 0xC, "Comoros"},
-{0xD1, 0xD, "Tanzania"},
-{0xD1, 0xE, "Ethiopia"},
-{0xD1, 0xF, "Nigeria"},
-
-{0xD2, 0x1, "Sierra Leone"},
-{0xD2, 0x2, "Zimbabwe"},
-{0xD2, 0x3, "Mozambique"},
-{0xD2, 0x4, "Uganda"},
-{0xD2, 0x5, "Swaziland"},
-{0xD2, 0x6, "Kenya"},
-{0xD2, 0x7, "Somalia"},
-{0xD2, 0x8, "Niger"},
-{0xD2, 0x9, "Chad"},
-{0xD2, 0xA, "Guinea-Bissau"},
-{0xD2, 0xB, "Zaire"},
-{0xD2, 0xC, "Cote d'Ivoire"},
-{0xD2, 0xD, "Zanzibar"},
-{0xD2, 0xE, "Zambia"},
-
-{0xD3, 0x3, "Western Sahara"},
-{0xD3, 0x4, "Cabinda"}, // was in V1.4.1. was removed later. but IDs are unused .. so keep it here
-{0xD3, 0x5, "Rwanda"},
-{0xD3, 0x6, "Lesotho"},
-{0xD3, 0x8, "Seychelles"},
-{0xD3, 0xA, "Mauritius"},
-{0xD3, 0xC, "Sudan"},
-
-{0xE0, 0x1, "Germany"},
-{0xE0, 0x2, "Algeria"},
-{0xE0, 0x3, "Andorra"},
-{0xE0, 0x4, "Israel"},
-{0xE0, 0x5, "Italy"},
-{0xE0, 0x6, "Belgium"},
-{0xE0, 0x7, "Russian Federation"},
-{0xE0, 0x8, "Azores (Portugal)"}, // was in V1.4.1. was removed later. but IDs are unused .. so keep it here
-{0xE0, 0x9, "Albania"},
-{0xE0, 0xA, "Austria"},
-{0xE0, 0xB, "Hungary"},
-{0xE0, 0xC, "Malta"},
-{0xE0, 0xD, "Germany"},
-{0xE0, 0xE, "Canary Islands (Spain)"}, // amended "(Spain)"
-{0xE0, 0xF, "Egypt"},
-
-{0xE1, 0x1, "Greece"},
-{0xE1, 0x2, "Cyprus"},
-{0xE1, 0x3, "San Marino"},
-{0xE1, 0x4, "Switzerland"},

_service:download_url:qt-dab-3.3.tar.gz/.travis.yml -> _service:download_url:qt-dab-3.4.tar.gz/.travis.yml Changed

_service:download_url:qt-dab-3.3.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-3.4.tar.gz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-3.3)
+set (objectName qt-dab-3.4)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -84,6 +84,10 @@
    set(DATA_STREAMER true)
 endif ()
 
+if (DEFINED TRY_EPG)
+   set(TRY_EPG true)
+endif ()
+
 if (DEFINED VITERBI_SSE)
    set(VITERBI_SSE true)
 endif ()
@@ -108,7 +112,7 @@
 
 add_definitions (-DMSC_DATA__)		# use at your own risk
 add_definitions (-DPRESET_NAME)
-#add_definitions (-DTHREADED_DECODING)	# uncomment for use for an RPI
+#add_definitions (-D__THREADED_BACKEND)	# uncomment for use for an RPI
 #
 ########################################################################
 
@@ -176,7 +180,7 @@
 	           ${QT_QTCORE_INCLUDE_DIR}
 	           ${QT_QTGUI_INCLUDE_DIR}
 	           .
-	           ./
+	           ./dab-maxi
 	           ./service-description
 	           ./includes
 	           ./includes/ofdm
@@ -208,6 +212,7 @@
 	     ./service-description/data-descriptor.h 
              ./includes/country-codes.h
 	     ./includes/dab-constants.h
+	     ./includes/mot-content-types.h 
              ./includes/ofdm/sample-reader.h
 	     ./includes/ofdm/phasereference.h
 	     ./includes/ofdm/ofdm-decoder.h
@@ -253,7 +258,7 @@
 	     ./includes/backend/data/mot/mot-object.h
 	     ./includes/backend/data/mot/mot-dir.h
 	     ./includes/backend/data/data-processor.h
-	     ./devices/virtual-input.h
+	     ./devices/device-handler.h
 	     ./devices/xml-filewriter.h
 	     ./devices/rawfiles-new/rawfiles.h
 	     ./devices/rawfiles-new/raw-reader.h
@@ -272,7 +277,7 @@
 	     ./includes/support/dab-params.h
 	     ./includes/support/band-handler.h
 	     ./includes/support/text-mapper.h
-	     ./includes/support/dab_tables.h
+	     ./includes/support/dab-tables.h
 	     ./includes/support/ensemble-printer.h
 	     ./includes/support/viterbi-jan/viterbi-handler.h
 	     ./includes/support/viterbi-spiral/viterbi-spiral.h
@@ -292,7 +297,7 @@
 
 	set (${objectName}_SRCS
 	     ${${objectName}_SRCS}
-	     ./main.cpp
+	     ./dab-maxi/main.cpp
 	     ./dab-processor.cpp
 	     ./service-description/audio-descriptor.cpp
 	     ./service-description/data-descriptor.cpp
@@ -336,7 +341,7 @@
 	     ./src/backend/data/mot/mot-object.cpp
 	     ./src/backend/data/mot/mot-dir.cpp
 	     ./src/backend/data/data-processor.cpp
-	     ./devices/virtual-input.cpp
+	     ./devices/device-handler.cpp
 	     ./devices/xml-filewriter.cpp
 	     ./devices/rawfiles-new/rawfiles.cpp
 	     ./devices/rawfiles-new/raw-reader.cpp
@@ -353,7 +358,7 @@
 	     ./src/support/dab-params.cpp
 	     ./src/support/band-handler.cpp
 	     ./src/support/text-mapper.cpp
-	     ./src/support/dab_tables.cpp
+	     ./src/support/dab-tables.cpp
 	     ./src/support/ensemble-printer.cpp
 	     ./src/support/preset-handler.cpp
 	     ./src/support/presetcombobox.cpp
@@ -428,13 +433,13 @@
 	   )
 
 	set (${objectName}_MOCS
-	        ${${objectName}_MOCS} ./radio.h)
+	        ${${objectName}_MOCS} ./dab-maxi/radio.h)
 
 	set ($(objectName)_HDRS
-	        ${${objectName}_HDRS} ./radio.h)
+	        ${${objectName}_HDRS} ./dab-maxi/radio.h)
 
 	set (${objectName}_SRCS
-	        ${${objectName}_SRCS} ./radio.cpp)
+	        ${${objectName}_SRCS} ./dab-maxi/radio.cpp)
 
 
 #########################################################################
@@ -517,26 +522,23 @@
 	   set (${objectName}_MOCS
 	        ${${objectName}_MOCS}
 	        ./devices/sdrplay-handler-v3/sdrplay-handler-v3.h
-	        ./devices/sdrplay-handler-v3/sdrplay-controller.h
 	   )
 
 	   include_directories (
 	     ./devices/sdrplay-handler-v3
+	     ./devices/sdrplay-handler-v3/include
 	   )
 
 	   set ($(objectName)_HDRS
 	        ${${objectName}_HDRS}
 	        ./devices/sdrplay-handler-v3/sdrplay-handler-v3.h
-	        ./devices/sdrplay-handler-v3/sdrplay-controller.h
-	        ./devices/sdrplay-handler-v3/control-queue.h
-	        ./devices/sdrplay-handler-v3/sdrplay_api.h
+	        ./devices/sdrplay-handler-v3/sdrplay-commands.h
+	        ./devices/sdrplay-handler-v3/include/sdrplay_api.h
            )
 
 	   set (${objectName}_SRCS
 	        ${${objectName}_SRCS}
 	        ./devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp
-	        ./devices/sdrplay-handler-v3/sdrplay-controller.cpp
-	        ./devices/sdrplay-handler-v3/control-queue.cpp
 	   )
 
 	 add_definitions (-DHAVE_SDRPLAY_V3)

_service:download_url:qt-dab-3.3.tar.gz/README.md -> _service:download_url:qt-dab-3.4.tar.gz/README.md Changed

@@ -1,15 +1,31 @@
-# Qt-DAB-3.3 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-3.4 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.3 is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). It is the successor of both DAB-rpi and sdr-j-DAB, two former programs by the same author.
+Qt-DAB-3.4 is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little brother dabMini, built on the same set of sources.
 
 
-![Qt-DAB with xml input](/qt-dab-3.3.png?raw=true)
+![Qt-DAB with xml input](/qt-dab-1.png?raw=true)
+
+------------------------------------------------------------------
+New in 3.4
+------------------------------------------------------------------
+
+There is not much changed in the use of Qt-DAB, quite some internal
+modifications though.
+
+When touching one of the *dump* buttons, a filename is suggested,
+and the directory in which the dump is stored will be remembered for
+a next time.
+
+Furthermore, the Qt-DAB program is pretty large and has quite a number
+of options for users to influence the behaviour, I added a *preliminary*
+piece of documentation in the sections docs
 
 ------------------------------------------------------------------
 Table of Contents
 ------------------------------------------------------------------
 
 * [Introduction](#introduction)
+* [dabMini](#dabMini)
 * [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes)
 * [Presets](#Presets)
@@ -35,21 +51,16 @@
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.3** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
-
-Some other programs are derived from the sources of Qt-DAB, a "light" version **dabradio**, an SDRPlay-specific version **sdrplayDab**, a command-line based version and a stand-alone server version **dab-server**.
-The versions with a GUI are implemented in C++, using the Qt framework for the implementation of the GUI. The command-line version dab-cmdline and the dab-server are implemented using C++, and do not depend on Qt.
-
-The **dab-server** can be installed to run as a "service" on e.g. an RPI, with control - over a bluetooth connection - from an "app" on an Android tablet.
+**Qt-DAB-3.4** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
-Furthermore, for DX purposes, a **dab-scanner** is implemented that allows
+For DX purposes, a **dab-scanner** is implemented that allows
 for a continuous scanning of selected channels in a given band. Results are 
 written in a txt file, formatted for use with *LibreOffice Calc* and
 comparable programs.
 
-**dabradio**, **sdrplayDab**, the **dab-scanner** and the Qt-free versions **dab-cmdline** and the **dab-server** have their own repository on Github.
+Derived programs, such as **sdrplayDab**, the **dab-scanner** and the Qt-free versions **dab-cmdline** and the **dab-server** have their own repository on Github.
 
-Qt-DAB-3.3 also supports file input, from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`) and on the aforementionedxml files. Obviously there is a provision for dumping the input into an (\*.sdr)-file and - for most configured devices - as xml file. 
+Qt-DAB-3.4 also supports file input, from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`) and on the aforementionedxml files. Obviously there is a provision for dumping the input into an (\*.sdr)-file and - for most configured devices - as xml file. 
 
 Finally, Qt-DAB supports input from an rtl_tcp server, if such server is used as input device, the connection needs to support the inputrate, i.e. 2,048,000 I/Q samples (i.e. 2 * 2,048,000 bytes/second).
 
@@ -57,8 +68,36 @@
 
 See also the section of configuring Qt-DAB
 
+-----------------------------------------------------------------
+dabMini
+-----------------------------------------------------------------
+
+When having the sound of DAB as background music, I have often a
+DAB program running on a (headless) RPI2 or 3.
+Since the RPI is headless, control is
+using my laptop. Quite often I do not need all the whistless and bells 
+that are provided on the Qt-DAB GUI, I basically only need a list of
+services, and a very few buttons to select channel and service.
+
+When using *dabradio* for this, I really miss goodies like presets, and
+previous and next selectors for channels and services.
+A choice was made not to upgrade the *dabradio* but to build an
+additional restricted GUI on top of the Qt-DAB sources: the *dabMini*.
+
+The obvious advantage is that modifications to the Qt-DAB sources would
+also apply to the *dabMini* sources.
+As the picture shows, the *dabMini* GUI is minimal, a few selectors
+for setting the gain of the configured and detected device, a channel
+selector, a few buttons to select previous and next channel, to
+select previous and next service, a preset selector and a selector for
+the audio device.
+
+![dab-mini](/dab-mini.png?raw=true)
+
+See the subdirectory *dab-mini* (or the separate repository)
+
 ------------------------------------------------------------------
-Widgets and scopes
+Widgets and scopes for Qt-DAB
 ------------------------------------------------------------------
 
 The picture on top shows Qt-DAB's main window and the other 5 **optional**
@@ -76,7 +115,7 @@
 While the main window is always shown, visibility of the others is
 under user control, the main widget contains a button for each of those.
 
-![Qt-DAB with SDRplay input](/qt-dab-3.3-kaal.png?raw=true)
+![Qt-DAB with SDRplay input](/qt-dab-2.png?raw=true)
 
 The buttons and other controls on the main widget are equipped with
 *tool tips* briefly explaining the (in most cases obvious) function
@@ -167,15 +206,25 @@
 it sometimes happens that a service appears in more than one ensemble
 (as example the "Omroep West" service appears in channels 5B and 8A.)
 
-![Qt-DAB with sdrplay input](/qt-dab-3.3-presets.png?raw=true)
+![Qt-DAB with sdrplay input](/qt-dab-presets.png?raw=true)
 
 The presets are stored in an xml file, `.qt-dab-presets.xml'.
 
+*Adding* a service to the *presets* is simply by *clicking with the right mouse
+button on the name of the service that is currently selected in the
+servicelist* (recall that clicking with the *left* mouse button
+well select the service with that name).
+
+Of course, one is also able to *remove* an entry from the presets.
+To do this, select the entry (by putting the curson on it without
+clicking any of the mouse buttons) and press the *shift* and the *delete*
+button on the keyboard simultaneously.
+
 ---------------------------------------------------------------------------
 Maintaining History 
 ---------------------------------------------------------------------------
 
-Qt-DAB-3.3 saves all service names found. Pairs Channel:serviceName
+Qt-DAB-3.4 saves all service names found. Pairs Channel:serviceName
 will be made (in)visible when touching the appropriate button (the
 one labeled with "xx").
 
@@ -185,7 +234,7 @@
 mouse button will cause the QT-DAB software to attempt to set the channel and
 select the name.
 
-![Qt-DAB with sdrplay input](/qt-dab-3.3-history.png?raw=true)
+![Qt-DAB with sdrplay input](/qt-dab-history.png?raw=true)
 
 ---------------------------------------------------------------------------
 Comment on some settings
@@ -518,7 +567,9 @@
 Raspberry PI
 ------------------------------------------------------------------
 
-The Qt-DAB software runs pretty well on the author's RPI-2 and 3 when configured for running the backend in a separate thread. The average load on the 4 cores is somewhere between 50 and 60 percent.
+The Qt-DAB software runs pretty well on the author's RPI-2 and 3.
+When configured for running the backend in a separate thread, the average load on the 4 cores is slightly higher than avg 50 percent on the RPI2 and
+less than 50 percent on the RPI3.
 
 One remark: getting "sound" is not always easy. Be certain that you have installed the alsa-utils, and that you are - as non-root user - able to see devices with `aplay -L`
 
@@ -531,7 +582,10 @@
 and build a full executable for qt-dab is part of the source tree.
 
 Before running this script, script *script-for-devian.txt*, copy the script
-to the parent directory (executing it will load a whole bunch of files.
+to the parent directory (executing it will load a whole bunch of files).
+
+Since it is possible to divert the sound output to bluetooth, it
+is certainly possible to run the program and listen using bluetooth headphones.
 
 ---------------------------------------------------------------------------
 appImage for x64 Linux systems
@@ -539,21 +593,24 @@
 
 https://github.com/JvanKatwijk/qt-dab/releases contains a generated appImage, **Qt-DAB-x64.Appimage**, which is created on Ubuntu 16.04 (Xenial).
 
-Different from previous versions, this version assumes you have installed
-the support library for the devices you want to use.
+*Different from previous versions, this version assumes you have installed
+the support library for the devices you want to use.*
 
 If you want to run with an SDRplay, follow the installation instructions for the library from http://www.sdrplay.com . All further dependencies are included.
 
 If you want to run an RTLSDR based dabstick, please note that
-the appImage may complain with some Linux distros with a "librtlsdr.so" pre-installed
-that the kernel module has to be blacklisted. Depending on the distribution, blacklisting is in
+the appImage may complain with some Linux distros with a
+"librtlsdr.so" pre-installed that the kernel module has to be blacklisted. Depending on the distribution, blacklisting is in
 /etc/modprobe.d/local-blaclist
 
 For compiling and installing a support library for an RTLSDR device, 
 follow the instruction on https://osmocom.org/projects/rtl-sdr/wiki/Rtl-sdr.
+One of the instructions is how to configure such that blacklisting the
+kernel module is not needed.
 
 For compiling and installing a support library for an AIRspy device,
-find the sources on https://github.com/airspy/airspyone_host/tree/master/libairspy
+find the sources on https://github.com/airspy/airspyone_host/tree/master/libairspy. The sourcetree contains a description of how to generate the
+library, using the Gnu tools or cmake.
 
 The appImage itself is just a self-contained single file which you have to make executable in order to run.

_service:download_url:qt-dab-3.3.tar.gz/correlation-viewer/correlation-viewer.cpp -> _service:download_url:qt-dab-3.4.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

@@ -34,13 +34,21 @@
 QColor	curveColor;
 
 	this	-> myRadioInterface	= mr;
-	plotLength	= s -> value ("plotLength", 1000). toInt ();
+	this	-> dabSettings		= s;
+	plotLength			= s -> value ("plotLength",
+	                                                  1000). toInt ();
 	this	-> responseBuffer	= b;
-	colorString			= "black";
+
+	colorString			= dabSettings -> value ("displaycolor",
+	                                              "black"). toString();
 	displayColor			= QColor (colorString);
-	colorString			= "white";
+	colorString			= dabSettings -> value ("gridcolor",
+	                                               "white"). toString();
 	gridColor			= QColor (colorString);
-	curveColor			= QColor ("red");
+	colorString			= dabSettings -> value ("gridcolor",
+	                                                "white"). toString();
+	curveColor                      = QColor (colorString);
+
 	myFrame				= new QFrame;
 	setupUi (this -> myFrame);
 
@@ -62,10 +70,10 @@
 	grid	-> attach (plotgrid);
 
 	spectrumCurve	= new QwtPlotCurve ("");
-   	spectrumCurve	-> setPen (QPen(Qt::white));
+   	spectrumCurve	-> setPen (QPen(curveColor));
 	spectrumCurve	-> setOrientation (Qt::Horizontal);
 	spectrumCurve	-> setBaseline	(0);
-	ourBrush	= new QBrush (Qt::white);
+	ourBrush	= new QBrush (curveColor);
 	ourBrush	-> setStyle (Qt::Dense3Pattern);
 	spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);

_service:download_url:qt-dab-3.3.tar.gz/correlation-viewer/correlation-viewer.h -> _service:download_url:qt-dab-3.4.tar.gz/correlation-viewer/correlation-viewer.h Changed

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

_service:download_url:qt-dab-3.4.tar.gz/dab-maxi/main.cpp Added

@@ -0,0 +1,175 @@
+#
+/*
+ * Copyright (C) 2014 .. 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Main program
+ */
+#include <QApplication>
+#include <QSettings>
+#include	<QTranslator>
+#include	<QString>
+#include <QDir>
+#include	<QDebug>
+#include <unistd.h>
+#include "dab-constants.h"
+#include "radio.h"
+
+#define DEFAULT_INI ".qt-dab.ini"
+#define	PRESETS		".qt-dab-presets.xml"
+#ifndef	GITHASH
+#define	GITHASH	" "
+#endif
+
+QString fullPathfor (QString v) {
+QString fileName;
+
+	if (v == QString (""))
+	 return QString ("/tmp/xxx");
+
+	if (v. at (0) == QChar ('/')) // full path specified
+	 return v;
+
+#ifdef	OSX_INIT_FILE
+	char *PathFile;
+	PathFile = getenv ("HOME");
+	fileName = PathFile;
+	fileName.append("/.qt-dab.ini");
+	qDebug() << fileName;
+#else
+
+	fileName = QDir::homePath();
+	fileName. append ("/");
+	fileName. append (v);
+	fileName = QDir::toNativeSeparators (fileName);
+#endif
+	if (!fileName. endsWith (".ini"))
+	 fileName. append (".ini");
+
+	return fileName;
+}
+
+void setTranslator (QString Language);
+
+int main (int argc, char **argv) {
+QString initFileName = fullPathfor (QString (DEFAULT_INI));
+RadioInterface *MyRadioInterface;
+
+// Default values
+QSettings *dabSettings; // ini file
+QString		presetName	= PRESETS;
+int32_t		dataPort	= 8888;
+int opt;
+QString freqExtension		= "";
+bool	error_report		= false;
+
+	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) {
+	 switch (opt) {
+	 case 'i':
+	 initFileName = fullPathfor (QString (optarg));
+	 break;
+
+	 case 'P':
+	 dataPort	= atoi (optarg);
+	 break;
+
+	 case 'A':
+	 freqExtension	= optarg;
+	 break;
+	
+	 case 'T':
+	 error_report	= true;
+	 break;
+
+	 default:
+	 break;
+	 }
+	}
+
+	dabSettings = new QSettings (initFileName, QSettings::IniFormat);
+
+	QString presets = QDir::homePath();
+	presets. append ("/");
+	presets. append (presetName);
+	presets = QDir::toNativeSeparators (presets);
+
+/*
+ * Before we connect control to the gui, we have to
+ * instantiate
+ */
+#if QT_VERSION >= 0x050600
+	QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
+#endif
+
+	QApplication a (argc, argv);
+//	setting the language
+	QString locale = QLocale::system(). name();
+	qDebug() << "main:" << "Detected system language" << locale;
+	setTranslator (locale);
+
+	a. setWindowIcon (QIcon (":/qt-dab.ico"));
+
+	MyRadioInterface = new RadioInterface (dabSettings,
+	 presets,
+	 freqExtension,
+	 error_report,
+	 dataPort
+ );
+	MyRadioInterface -> show();
+ a. exec();
+/*
+ * done:
+ */
+	fprintf (stderr, "back in main program\n");
+	fflush (stdout);
+	fflush (stderr);
+	qDebug ("It is done\n");
+	delete MyRadioInterface;
+	delete dabSettings;
+	return 1;
+}
+
+void	setTranslator (QString Language) {
+QTranslator *Translator = new QTranslator;
+
+//	German is special (as always)
+	if ((Language == "de_AT") || (Language == "de_CH"))
+	 Language = "de_DE";
+//
+//	what about Dutch?
+	bool TranslatorLoaded =
+	 Translator -> load (QString(":/i18n/") + Language);
+	qDebug() << "main:" << "Set language" << Language;
+	QCoreApplication::installTranslator (Translator);
+
+	if (!TranslatorLoaded) {
+	 qDebug() << "main:" << "Error while loading language specifics" << Language << "use English \"en_GB\" instead";
+	 Language = "en_GB";
+	}
+
+	QLocale curLocale (QLocale ((const QString&)Language));
+	QLocale::setDefault (curLocale);
+}
+

_service:download_url:qt-dab-3.4.tar.gz/dab-maxi/radio.cpp Added

@@ -0,0 +1,2661 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB 
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<QSettings>
+#include	<QMessageBox>
+#include	<QFileDialog>
+#include	<QDebug>
+#include	<QDateTime>
+#include	<QFile>
+#include	<QStringList>
+#include	<QStringListModel>
+#include	<QMouseEvent>
+#include	<QDir>
+#include	<fstream>
+#include	"dab-constants.h"
+#include	"mot-content-types.h"
+#include	<iostream>
+#include	<numeric>
+#include	<unistd.h>
+#include	<vector>
+#include	"radio.h"
+#include	"band-handler.h"
+#include	"ensemble-printer.h"
+#include	"audio-descriptor.h"
+#include	"data-descriptor.h"
+#include	"rawfiles.h"
+#include	"wavfiles.h"
+#include	"xml-filereader.h"
+#include	"dab-tables.h"
+#ifdef	TCP_STREAMER
+#include	"tcp-streamer.h"
+#elif	QT_AUDIO
+#include	"Qt-audio.h"
+#else
+#include	"audiosink.h"
+#endif
+#ifdef	HAVE_RTLSDR
+#include	"rtlsdr-handler.h"
+#endif
+#ifdef	HAVE_SDRPLAY_V2
+#include	"sdrplay-handler-v2.h"
+#endif
+#ifdef	HAVE_SDRPLAY_V3
+#include	"sdrplay-handler-v3.h"
+#endif
+#ifdef	HAVE_ELAD_S1
+#include	"elad-handler.h"
+#endif
+#ifdef	__MINGW32__
+#ifdef	HAVE_EXTIO
+#include	"extio-handler.h"
+#endif
+#endif
+#ifdef	HAVE_RTL_TCP
+#include	"rtl_tcp_client.h"
+#endif
+#ifdef	HAVE_AIRSPY
+#include	"airspy-handler.h"
+#endif
+#ifdef	HAVE_HACKRF
+#include	"hackrf-handler.h"
+#endif
+#ifdef	HAVE_SOAPY
+#include	"soapy-handler.h"
+#endif
+#ifdef	HAVE_LIME
+#include	"lime-handler.h"
+#endif
+#include	"ui_technical_data.h"
+#include	"spectrum-viewer.h"
+#include	"correlation-viewer.h"
+#include	"tii-viewer.h"
+#include	"history-handler.h"
+
+#ifdef	__MINGW32__
+#include <windows.h>
+
+__int64 FileTimeToInt64 (FILETIME & ft) {
+	ULARGE_INTEGER foo;
+
+	foo.LowPart	= ft.dwLowDateTime;
+	foo.HighPart	= ft.dwHighDateTime;
+	return (foo.QuadPart);
+}
+
+bool get_cpu_times (size_t &idle_time, size_t &total_time) {
+FILETIME IdleTime, KernelTime, UserTime;
+size_t	thisIdle, thisKernel, thisUser;
+
+	GetSystemTimes (&IdleTime, &KernelTime, &UserTime);
+	
+	thisIdle	= FileTimeToInt64 (IdleTime);
+	thisKernel	= FileTimeToInt64 (KernelTime);
+	thisUser	= FileTimeToInt64 (UserTime);
+	idle_time	= (size_t) thisIdle;
+	total_time	= (size_t)(thisKernel + thisUser);
+	return true;
+}
+#else
+std::vector<size_t> get_cpu_times() {
+	std::ifstream proc_stat ("/proc/stat");
+	proc_stat. ignore (5, ' '); // Skip the 'cpu' prefix.
+	std::vector<size_t> times;
+	for (size_t time; proc_stat >> time; times. push_back (time));
+	return times;
+}
+ 
+bool get_cpu_times (size_t &idle_time, size_t &total_time) {
+	const std::vector <size_t> cpu_times = get_cpu_times();
+	if (cpu_times. size() < 4)
+	 return false;
+	idle_time = cpu_times [3];
+	total_time = std::accumulate (cpu_times. begin(), cpu_times. end(), 0);
+	return true;
+}
+#endif
+
+static
+uint8_t convert (QString s) {
+	if (s == "Mode 1")
+	 return 1;
+	if (s == "Mode 2")
+	 return 2;
+	if (s == "Mode 3")
+	 return 3;
+	if (s == "Mode 4")
+	 return 4;
+	return 1;
+}
+
+	RadioInterface::RadioInterface (QSettings	*Si,
+	 const QString	&presetFile,
+	 const QString	&freqExtension,
+	 bool		error_report,
+	 int32_t		dataPort,
+	 QWidget		*parent):
+	 QWidget (parent),
+	 my_presetHandler (this),
+	 theBand (freqExtension),
+	 theTable (this) {
+int16_t	latency;
+int16_t k;
+QString h;
+QString	presetName;
+uint8_t	dabBand;
+
+	dabSettings		= Si;
+	this	-> error_report	= error_report;
+	running. 		store (false);
+	scanning. 		store (false);
+	isSynced		= false;
+	runningServices. 	resize (0);
+	spectrumBuffer =
+	 new RingBuffer<std::complex<float>> (2 * 32768);
+	iqBuffer		=
+	 new RingBuffer<std::complex<float>> (2 * 1536);
+	responseBuffer		=
+	 new RingBuffer<float> (32768);
+	tiiBuffer		=
+	 new RingBuffer<std::complex<float>> (32768);
+	audioBuffer		=
+	 new RingBuffer<int16_t>(16 * 32768);
+	frameBuffer		=
+	 new RingBuffer<uint8_t> (2 * 32768);
+	dataBuffer		=
+	 new RingBuffer<uint8_t>(32768);
+	switchTime		=
+	 dabSettings -> value ("switchTime", 8000). toInt ();
+	latency			=
+	 dabSettings -> value ("latency", 5). toInt();
+
+	bool has_presetName	=
+	 dabSettings -> value ("has-presetName", 1). toInt() != 0;
+	if (has_presetName) {
+	 presetName		=
+	 dabSettings -> value ("presetname", ""). toString();
+	 dabService s;
+	 s. serviceName = presetName;
+	 s. SId	 = 0;
+	 s. SCIds	 = 0;

_service:download_url:qt-dab-3.4.tar.gz/dab-maxi/radio.h Added

@@ -0,0 +1,266 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __RADIO__
+#define __RADIO__
+
+#include	"dab-constants.h"
+#include	<QMainWindow>
+#include	<QStringList>
+#include	<QStandardItemModel>
+#ifdef	_SEND_DATAGRAM_
+#include	<QUdpSocket>
+#endif
+#include	<QComboBox>
+#include	<QByteArray>
+#include	<QLabel>
+#include	<QTimer>
+#include	<sndfile.h>
+#include	"ui_dabradio.h"
+#include	"dab-processor.h"
+#include	"ringbuffer.h"
+#include "band-handler.h"
+#include	"text-mapper.h"
+#ifdef	DATA_STREAMER
+#include	"tcp-server.h"
+#endif
+#include	"preset-handler.h"
+#include	"scanner-table.h"
+#ifdef	TRY_EPG
+#include	"epgdec.h"
+#endif
+
+class	QSettings;
+class	deviceHandler;
+class	audioBase;
+class	common_fft;
+class	serviceDescriptor;
+class	historyHandler;
+class	spectrumViewer;
+class	correlationViewer;
+class	tiiViewer;
+
+#include	"ui_technical_data.h"
+
+/*
+ *	The main gui object. It inherits from
+ *	QWidget and the generated form
+ */
+
+class dabService {
+public:
+	QString		serviceName;
+	uint32_t	SId;
+	int		SCIds;
+};
+
+class RadioInterface: public QWidget, private Ui_dabradio {
+Q_OBJECT
+public:
+		RadioInterface		(QSettings	*,
+	 const QString	&,
+	 const QString	&,
+	 bool,
+	 int32_t	 dataPort,
+	 QWidget	*parent = nullptr);
+		~RadioInterface		();
+
+protected:
+	bool			eventFilter (QObject *obj, QEvent *event);
+private:
+	QString			version;
+	int			serviceOrder;
+	bool			error_report;
+	presetHandler		my_presetHandler;
+	bandHandler		theBand;
+	scannerTable		theTable;
+	Ui_technical_data	techData;
+	QFrame			*dataDisplay;
+	QSettings		*dabSettings;
+	std::vector<dabService>	runningServices;
+ spectrumViewer		*my_spectrumViewer;
+	RingBuffer<std::complex<float>> *spectrumBuffer;
+	RingBuffer<std::complex<float>> *iqBuffer;
+	RingBuffer<std::complex<float>> *tiiBuffer;
+	correlationViewer	*my_correlationViewer;
+	RingBuffer<float>	*responseBuffer;
+	tiiViewer		*my_tiiViewer;
+
+	bool			normalScan;
+	int16_t			tii_delay;
+	int32_t			dataPort;
+	serviceDescriptor	*currentService;
+	QLabel			*motSlides;
+	std::vector<int>	secondariesVector;
+	bool			isSynced;
+	std::atomic<bool>	running;
+	std::atomic<bool>	scanning;
+	deviceHandler		*inputDevice;
+	textMapper		the_textMapper;
+	dabProcessor		*my_dabProcessor;
+	audioBase		*soundOut;
+#ifdef	DATA_STREAMER
+	tcpServer		*dataStreamer;
+#endif
+#ifdef	TRY_EPG
+	CEPGDecoder		epgHandler;
+#endif
+	RingBuffer<uint8_t>	*dataBuffer;
+	RingBuffer<uint8_t>	*frameBuffer;
+	RingBuffer<int16_t>	*audioBuffer;
+	bool			saveSlides;
+	QString			picturesPath;
+	QString			epgPath;
+	QString			filePath;
+	int			switchTime;
+#ifdef	_SEND_DATAGRAM_
+	QUdpSocket		dataOut_socket;
+	QString			ipAddress;
+	int32_t			port;
+#endif
+	SNDFILE *rawDumper;
+ FILE *frameDumper;
+ SNDFILE *audioDumper;
+
+	QStandardItemModel	model;
+	std::vector<serviceId>	serviceList;
+	bool			isMember (std::vector<serviceId>,
+	 serviceId);
+	std::vector<serviceId>
+	 	 insert (std::vector<serviceId>,
+	 serviceId, int);
+	QStringList		soundChannels;
+	QTimer			displayTimer;
+	QTimer			signalTimer;
+	QTimer			presetTimer;
+	QTimer			startTimer;
+	int32_t			numberofSeconds;
+	int16_t			ficBlocks;
+	int16_t			ficSuccess;
+	int			total_ficError;
+	int			total_fics;
+	void			connectGUI		();
+	void			disconnectGUI		();
+
+	QString			footText		();
+	void			cleanScreen		();
+	void			set_picturePath		();
+	void			dumpControlState	(QSettings *);
+	void			hideButtons		();
+	void			showButtons		();
+	deviceHandler		*setDevice		(const QString &);
+	historyHandler		*my_history;
+//
+	void			start_audioService	(const QString &);
+	void			start_packetService	(const QString &);
+	void			startScanning		();
+	void			stopScanning		();
+ void			start_audioDumping ();
+ void			stop_audioDumping ();
+ void			start_sourceDumping ();
+ void			stop_sourceDumping ();
+ void			start_frameDumping ();
+ void			stop_frameDumping ();
+	void			startChannel		(const QString &);
+	void			stopChannel		();
+	void			stopService		();
+	void			startService		(dabService *);
+	void			colorService		(QModelIndex ind,
+	 QColor c, int pt);
+	void			localSelect		(const QString &s);
+	QString			filenameSuggestion 	(QString,
+	 QString, QString);
+	void			showServices		();
+
+	bool			doStart			();
+	void			save_MOTtext		(QByteArray, int,
+ QString);
+	void			show_MOTlabel		(QByteArray, int,
+ QString);

_service:download_url:qt-dab-3.4.tar.gz/dab-mini Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini.png Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/AUTHORS Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/CMakeLists.txt Added

@@ -0,0 +1,628 @@
+cmake_minimum_required( VERSION 2.8.11 )
+set (objectName dabMini-1.0)
+set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
+
+set(CMAKE_AUTORCC ON)
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set (CMAKE_INSTALL_PREFIX "/usr/local/bin" CACHE PATH "default install path" FORCE )
+endif()
+#set (CMAKE_INSTALL_PREFIX /usr/local/bin)
+
+#	modify if you want
+
+if(MINGW)
+    add_definitions ( -municode)
+#else (MINGW)
+#	add_definitions (-DSSE_AVAILABLE)
+endif()
+
+IF(EXISTS (".git") AND IS_DIRECTORY (".git"))
+   execute_process (
+      COMMAND git rev-parse --short HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE GIT_COMMIT_HASH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
+endif ()
+
+if(GIT_COMMIT_HASH)
+   add_definitions("-DGITHASH=\"${GIT_COMMIT_HASH}\"")
+else ()
+   add_definitions ("-DGITHASH=\"       \"")
+endif()
+
+
+########################################################################
+# select the release build type by default to get optimization flags
+########################################################################
+if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE "Release")
+   message(STATUS "Build type not specified: defaulting to release.")
+endif(NOT CMAKE_BUILD_TYPE)
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
+
+### make sure our local CMake Modules path comes first
+list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
+
+######################################################################
+#
+#####################################################################
+#
+#	default value
+	set(USE_PORTAUDIO true)
+
+if(DEFINED AIRSPY)
+   set(AIRSPY true)
+endif ()
+
+if(DEFINED SDRPLAY)
+   set(SDRPLAY true)
+endif ()
+
+if(DEFINED RTLSDR)
+   set(RTLSDR true)
+endif ()
+
+if(DEFINED HACKRF)
+	set(HACKRF true)
+endif ()
+
+if(DEFINED LIMESDR)
+   set(LIMESDR true)
+endif ()
+
+
+add_definitions (-DPRESET_NAME)
+add_definitions (-DTHREADED_DECODING)	# uncomment for use for an RPI
+#
+########################################################################
+
+	find_package (PkgConfig)
+	find_package (LSBId)
+
+	find_package (Qt5Core REQUIRED)
+	find_package (Qt5Widgets REQUIRED)
+	find_package (Qt5Xml REQUIRED)
+	include_directories (
+	  ${Qt5Xml_INCLUDE_DIRS}
+	)
+
+        find_package(FFTW3f)
+        if (NOT FFTW3F_FOUND)
+            message(FATAL_ERROR "please install FFTW3")
+        endif ()
+
+        find_package(Faad)
+        if (NOT FAAD_FOUND )
+            message(FATAL_ERROR "please install libfaad")
+        endif ()
+
+        find_package(zlib)
+	if (NOT ZLIB_FOUND)
+            message(FATAL_ERROR "please install libz")
+        endif ()
+	list(APPEND extraLibs ${ZLIB_LIBRARY})
+
+        find_package(LibSndFile)
+        if (NOT LIBSNDFILE_FOUND)
+            message(FATAL_ERROR "please install libsndfile")
+        endif ()
+        list(APPEND extraLibs ${LIBSNDFILE_LIBRARY})
+
+        find_package(LibSampleRate)
+        if (NOT LIBSAMPLERATE_FOUND)
+            message(FATAL_ERROR "please install libsamplerate")
+        endif ()
+        list(APPEND extraLibs ${LIBSAMPLERATE_LIBRARY})
+
+	find_library (PTHREADS pthread)
+	if (NOT(PTHREADS))
+	   message (FATAL_ERROR "please install libpthread")
+	else (NOT(PTHREADS))
+	   set (extraLibs ${extraLibs} ${PTHREADS})
+	endif (NOT(PTHREADS))
+
+#######################################################################
+#
+#	Here we really start
+
+	include_directories (
+	           ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+	           ${QT5Widgets_INCLUDES}
+	           ${QT_QTCORE_INCLUDE_DIR}
+	           ${QT_QTGUI_INCLUDE_DIR}
+	           .
+	           ..
+	           ../includes
+	           ../includes/ofdm
+	           ../includes/protection
+	           ../includes/backend
+	           ../includes/backend/audio
+	           ../includes/backend/data
+	           ../includes/backend/data/journaline
+	           ../includes/backend/data/mot
+	           ../includes/support
+	           ../includes/support/viterbi-jan
+	           ../includes/support/viterbi-spiral
+	           ../includes/output
+	           ../includes/scopes-qwt6
+	           ./devices-dab-mini
+	           /usr/include/
+	)
+
+	set (${objectName}_HDRS
+	     ../dab-processor.h
+             ../includes/country-codes.h
+	     ../includes/dab-constants.h
+             ../includes/ofdm/sample-reader.h
+	     ../includes/ofdm/phasereference.h
+	     ../includes/ofdm/ofdm-decoder.h
+	     ../includes/ofdm/phasetable.h
+	     ../includes/ofdm/freq-interleaver.h
+	     ../includes/ofdm/fib-decoder.h
+	     ../includes/ofdm/dab-config.h
+	     ../includes/ofdm/fib-table.h
+	     ../includes/ofdm/fic-handler.h
+	     ../includes/ofdm/tii_detector.h
+	     ../includes/ofdm/timesyncer.h
+	     ../includes/protection/protTables.h
+	     ../includes/protection/protection.h
+	     ../includes/protection/uep-protection.h
+	     ../includes/protection/eep-protection.h
+	     ../includes/backend/firecode-checker.h
+	     ../includes/backend/frame-processor.h
+	     ../includes/backend/charsets.h
+	     ../includes/backend/galois.h
+	     ../incluces/backend/reed-solomon.h
+	     ../includes/backend/msc-handler.h
+	     ../includes/backend/backend.h
+	     ../includes/backend/backend-deconvolver.h
+	     ../includes/backend/backend-driver.h
+	     ../includes/backend/audio/faad-decoder.h
+	     ../includes/backend/audio/mp4processor.h
+	     ../includes/backend/audio/bitWriter.h
+	     ../includes/backend/audio/mp2processor.h
+	     ../includes/backend/data/ip-datahandler.h
+	     ../includes/backend/data/tdc-datahandler.h
+	     ../includes/backend/data/journaline-datahandler.h
+	     ../includes/backend/data/journaline/dabdatagroupdecoder.h
+	     ../includes/backend/data/journaline/crc_8_16.h
+	     ../includes/backend/data/journaline/log.h
+	     ../includes/backend/data/journaline/newssvcdec_impl.h
+	     ../includes/backend/data/journaline/Splitter.h
+	     ../includes/backend/data/journaline/dabdgdec_impl.h
+	     ../includes/backend/data/journaline/newsobject.h
+	     ../includes/backend/data/journaline/NML.h
+	     ../includes/backend/data/virtual-datahandler.h
+	     ../includes/backend/data/pad-handler.h
+	     ../includes/backend/data/mot/mot-handler.h

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/COPYING Added

@@ -0,0 +1,126 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+
+ Preamble
+
+ The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+ When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and modification follow.
+
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+ You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/README Added

@@ -0,0 +1,36 @@
+
+dab-mini implements a small GUI on the top of the full set of Qt-DAB sources.
+
+Basically, two files - and device drivers - had to be changed for that.
+
+In the main program, some of the (few) command line options were removed
+The file "radio.cpp" (as well as the header file "radio.h") were adapted
+to deal with a simpler interface. The class RadioInterface, implemented
+in that file, responds to signals from the GUI, but also handles
+all signals arriving from the different parts of the DAB implementation.
+
+The file radio.cpp therefore contains a lot of "slots" doing nothing,
+and it carrier a lot of buffers,
+needed as parameter for the classes instantiated, while it is certain that nothing will be done with the data in those buffers.
+
+The device handlers needed some change as well. They are kept in
+a directory "devices-dab-mini". In the setup chose here, there are no
+separate widgets for device control. All control is in maximum 2 spinboxes
+and one checkbox.
+
+Creating an executable is using either the qmake or the cmake route
+
+For qmake: edit the dab-mini.pro file to select (unselect) devices for the
+configuration.
+
+For cmake:
+	mkdir build
+	cd build
+	cmake .. -DXXXX=ON -DYYY=ON ... -DZZZ=ON
+
+where
+	-DMMM=ON
+is specified for device MMM
+
+
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindFFTW3f.cmake Added

@@ -0,0 +1,41 @@
+# http://tim.klingt.org/code/projects/supernova/repository/revisions/d336dd6f400e381bcfd720e96139656de0c53b6a/entry/cmake_modules/FindFFTW3f.cmake
+# Modified to use pkg config and use standard var names
+
+# Find single-precision (float) version of FFTW3
+
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(PC_FFTW3F "fftw3f >= 3.0")
+
+FIND_PATH(
+    FFTW3F_INCLUDE_DIRS
+    NAMES fftw3.h
+    HINTS $ENV{FFTW3_DIR}/include
+        ${PC_FFTW3F_INCLUDE_DIR}
+    PATHS /usr/local/include
+          /usr/include
+)
+
+FIND_LIBRARY(
+    FFTW3F_LIBRARIES
+    NAMES fftw3f libfftw3f
+    HINTS $ENV{FFTW3_DIR}/lib
+        ${PC_FFTW3F_LIBDIR}
+    PATHS /usr/local/lib
+          /usr/lib
+          /usr/lib64
+)
+
+FIND_LIBRARY(
+    FFTW3F_THREADS_LIBRARIES
+    NAMES fftw3f_threads libfftw3f_threads
+    HINTS $ENV{FFTW3_DIR}/lib
+        ${PC_FFTW3F_LIBDIR}
+    PATHS /usr/local/lib
+          /usr/lib
+          /usr/lib64
+)
+
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3F DEFAULT_MSG FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS)
+MARK_AS_ADVANCED(FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS FFTW3F_THREADS_LIBRARIES)
\ No newline at end of file

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindFaad.cmake Added

@@ -0,0 +1,34 @@
+# Try to find FAAD library and include path.
+# Once done this will define
+#
+# FAAD_INCLUDE_DIRS - where to find faad.h, etc.
+# FAAD_LIBRARIES - List of libraries when using libfaad.
+# FAAD_FOUND - True if libfaad found.
+
+find_path(FAAD_INCLUDE_DIR faad.h DOC "The directory where faad.h resides")
+find_library(FAAD_LIBRARY NAMES faad DOC "The libfaad library")
+
+if(FAAD_INCLUDE_DIR AND FAAD_LIBRARY)
+  set(FAAD_FOUND 1)
+  set(FAAD_LIBRARIES ${FAAD_LIBRARY})
+  set(FAAD_INCLUDE_DIRS ${FAAD_INCLUDE_DIR})
+else(FAAD_INCLUDE_DIR AND FAAD_LIBRARY)
+  set(FAAD_FOUND 0)
+  set(FAAD_LIBRARIES)
+  set(FAAD_INCLUDE_DIRS)
+endif(FAAD_INCLUDE_DIR AND FAAD_LIBRARY)
+
+mark_as_advanced(FAAD_INCLUDE_DIR)
+mark_as_advanced(FAAD_LIBRARY)
+mark_as_advanced(FAAD_FOUND)
+
+if(NOT FAAD_FOUND)
+  set(FAAD_DIR_MESSAGE "libfaad was not found. Make sure FAAD_LIBRARY and FAAD_INCLUDE_DIR are set.")
+  if(NOT FAAD_FIND_QUIETLY)
+    message(STATUS "${FAAD_DIR_MESSAGE}")
+  else(NOT FAAD_FIND_QUIETLY)
+    if(FAAD_FIND_REQUIRED)
+      message(FATAL_ERROR "${FAAD_DIR_MESSAGE}")
+    endif(FAAD_FIND_REQUIRED)
+  endif(NOT FAAD_FIND_QUIETLY)
+endif(NOT FAAD_FOUND)

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindLSBId.cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindLibAIRSPY.cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindLibRTLSDR.cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindLibSampleRate.cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindLibSndFile.cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindPortaudio.cmake Added

@@ -0,0 +1,52 @@
+# - Try to find Portaudio
+# Once done this will define
+#
+# PORTAUDIO_FOUND - system has Portaudio
+# PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory
+# PORTAUDIO_LIBRARIES - Link these to use Portaudio
+
+include(FindPkgConfig)
+pkg_check_modules(PC_PORTAUDIO portaudio-2.0)
+
+find_path(PORTAUDIO_INCLUDE_DIRS
+ NAMES
+ portaudio.h
+ PATHS
+ /usr/local/include
+ /usr/include
+ HINTS
+ ${PC_PORTAUDIO_INCLUDEDIR}
+)
+
+find_library(PORTAUDIO_LIBRARIES
+ NAMES
+ portaudio
+ PATHS
+ /usr/local/lib
+ /usr/lib
+ /usr/lib64
+ HINTS
+ ${PC_PORTAUDIO_LIBDIR}
+)
+
+mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
+
+# Found PORTAUDIO, but it may be version 18 which is not acceptable.
+if(EXISTS ${PORTAUDIO_INCLUDE_DIRS}/portaudio.h)
+ include(CheckCXXSourceCompiles)
+ set(CMAKE_REQUIRED_INCLUDES_SAVED ${CMAKE_REQUIRED_INCLUDES})
+ set(CMAKE_REQUIRED_INCLUDES ${PORTAUDIO_INCLUDE_DIRS})
+ CHECK_CXX_SOURCE_COMPILES(
+ "#include <portaudio.h>\nPaDeviceIndex pa_find_device_by_name(const char *name); int main () {return 0;}"
+ PORTAUDIO2_FOUND)
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVED})
+ unset(CMAKE_REQUIRED_INCLUDES_SAVED)
+ if(PORTAUDIO2_FOUND)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PORTAUDIO DEFAULT_MSG PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
+ else(PORTAUDIO2_FOUND)
+ message(STATUS
+ " portaudio.h not compatible (requires API 2.0)")
+ set(PORTAUDIO_FOUND FALSE)
+ endif(PORTAUDIO2_FOUND)
+endif()

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindQWT.cmake-xxx Added

@@ -0,0 +1,65 @@
+# - try to find Qwt libraries and include files
+# QWT_INCLUDE_DIR where to find qwt_global.h, etc.
+# QWT_LIBRARIES libraries to link against
+# QWT_FOUND If false, do not try to use Qwt
+# qwt_global.h holds a string with the QWT version;
+# test to make sure it's at least 5.2
+
+find_path(QWT_INCLUDE_DIRS
+ NAMES qwt_global.h
+ HINTS
+ ${CMAKE_INSTALL_PREFIX}/include/qwt
+ PATHS
+ /usr/local/include/qwt-qt4
+ /usr/local/include/qwt
+ /usr/include/qwt6
+ /usr/include/qwt-qt4
+ /usr/include/qwt-qt4
+ /usr/include/qwt
+ /usr/include/qwt5
+ /usr/include/qwt6-qt5
+ /usr/include/qt5/qwt
+ /opt/local/include/qwt
+ /sw/include/qwt
+ /usr/local/lib/qwt.framework/Headers
+)
+
+find_library (QWT_LIBRARIES
+ NAMES qwt6 qwt6-qt5 qwt-qt5 qwt6-qt4 qwt qwt-qt4
+ HINTS
+ ${CMAKE_INSTALL_PREFIX}/lib
+ ${CMAKE_INSTALL_PREFIX}/lib64
+ PATHS
+ /usr/local/lib
+ /usr/lib
+ /opt/local/lib
+ /sw/lib
+ /usr/local/lib/qwt.framework
+)
+
+set(QWT_FOUND FALSE)
+if(QWT_INCLUDE_DIRS)
+ file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h"
+ QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
+ set(QWT_WRONG_VERSION True)
+ set(QWT_VERSION "No Version")
+ string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
+ string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
+ string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
+
+ message(STATUS "QWT Version: ${QWT_VERSION}")
+ if(NOT QWT_WRONG_VERSION)
+ set(QWT_FOUND TRUE)
+ else(NOT QWT_WRONG_VERSION)
+ message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
+ endif(NOT QWT_WRONG_VERSION)
+
+endif(QWT_INCLUDE_DIRS)
+
+if(QWT_FOUND)
+ # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if
+ # all listed variables are TRUE
+ include ( FindPackageHandleStandardArgs )
+ find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARIES QWT_INCLUDE_DIRS )
+ MARK_AS_ADVANCED(QWT_LIBRARIES QWT_INCLUDE_DIRS)
+endif(QWT_FOUND)

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/FindQwt.cmake Added

@@ -0,0 +1,65 @@
+# - try to find Qwt libraries and include files
+# QWT_INCLUDE_DIR where to find qwt_global.h, etc.
+# QWT_LIBRARIES libraries to link against
+# QWT_FOUND If false, do not try to use Qwt
+# qwt_global.h holds a string with the QWT version;
+# test to make sure it's at least 5.2
+
+find_path(QWT_INCLUDE_DIRS
+ NAMES qwt_global.h
+ HINTS
+ ${CMAKE_INSTALL_PREFIX}/include/qwt
+ PATHS
+ /usr/local/include/qwt-qt4
+ /usr/local/include/qwt
+ /usr/include/qwt6
+ /usr/include/qwt-qt4
+ /usr/include/qwt-qt4
+ /usr/include/qwt
+ /usr/include/qwt5
+ /usr/include/qwt6-qt5
+ /usr/include/qt5/qwt
+ /opt/local/include/qwt
+ /sw/include/qwt
+ /usr/local/lib/qwt.framework/Headers
+)
+
+find_library (QWT_LIBRARIES
+ NAMES qwt6 qwt6-qt5 qwt-qt5 qwt6-qt4 qwt qwt-qt4
+ HINTS
+ ${CMAKE_INSTALL_PREFIX}/lib
+ ${CMAKE_INSTALL_PREFIX}/lib64
+ PATHS
+ /usr/local/lib
+ /usr/lib
+ /opt/local/lib
+ /sw/lib
+ /usr/local/lib/qwt.framework
+)
+
+set(QWT_FOUND FALSE)
+if(QWT_INCLUDE_DIRS)
+ file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h"
+ QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
+ set(QWT_WRONG_VERSION True)
+ set(QWT_VERSION "No Version")
+ string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
+ string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
+ string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
+
+ message(STATUS "QWT Version: ${QWT_VERSION}")
+ if(NOT QWT_WRONG_VERSION)
+ set(QWT_FOUND TRUE)
+ else(NOT QWT_WRONG_VERSION)
+ message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
+ endif(NOT QWT_WRONG_VERSION)
+
+endif(QWT_INCLUDE_DIRS)
+
+if(QWT_FOUND)
+ # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if
+ # all listed variables are TRUE
+ include ( FindPackageHandleStandardArgs )
+ find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARIES QWT_INCLUDE_DIRS )
+ MARK_AS_ADVANCED(QWT_LIBRARIES QWT_INCLUDE_DIRS)
+endif(QWT_FOUND)

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/Modules/Findzlib.cmake Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/cmake/cmake_uninstall.cmake.in Added

@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    exec_program(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif(NOT "${rm_retval}" STREQUAL 0)
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/dab-mini.ico Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/dab-mini.pro Added

@@ -0,0 +1,403 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue Oct 6 19:48:14 2009
+# but modified by me to accomodate for the includes for qwt, hamlib and
+# portaudio
+######################################################################
+
+TEMPLATE	= app
+TARGET		= dabMini-1.0
+QT		+= widgets xml
+#CONFIG		+= console
+CONFIG		-= console
+QMAKE_CXXFLAGS	+= -std=c++11
+QMAKE_CFLAGS	+=  -flto -ffast-math
+MAKE_CXXFLAGS	+=  -flto -ffast-math
+#QMAKE_CFLAGS	+=  -g
+#QMAKE_CXXFLAGS	+=  -g
+#QMAKE_LFLAGS	+=  -g
+QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
+RC_ICONS	=  dab-mini.ico
+RESOURCES	+= resources.qrc
+
+TRANSLATIONS = i18n/de_DE.ts
+
+DEPENDPATH += . \
+	      .. \
+	      ../src \
+	      ../includes \
+	      ../src/ofdm \
+	      ../src/protection \
+	      ../src/backend \
+	      ../src/backend/audio \
+	      ../src/backend/data \
+	      ../src/backend/data/mot \
+	      ../src/backend/data/journaline \
+	      ../src/output \
+	      ../src/support \
+	      ../src/support/viterbi-jan \
+	      ../src/support/viterbi-spiral \
+	      ../includes/ofdm \
+	      ../includes/protection \
+	      ../includes/backend \
+	      ../includes/backend/audio \
+	      ../includes/backend/data \
+	      ../includes/backend/data/mot \
+	      ../includes/backend/data/journaline \
+	      ../includes/output \
+	      ../includes/support \
+	      ./devices-dab-mini 
+
+INCLUDEPATH += . \
+	      .. \
+	      ../src \
+	      ../includes \
+	      ../includes/protection \
+	      ../includes/ofdm \
+	      ../includes/backend \
+	      ../includes/backend/audio \
+	      ../includes/backend/data \
+	      ../includes/backend/data/mot \
+	      ../includes/backend/data/journaline \
+	      ../includes/output \
+	      ../includes/support \
+	      ../includes/support/viterbi-jan \
+	      ../includes/support/viterbi-spiral \
+	      ./devices-dab-mini 
+
+# Input
+HEADERS += ./radio.h \
+	   ../dab-processor.h \
+	   ../includes/dab-constants.h \
+	   ../includes/country-codes.h \
+	   ../includes/ofdm/timesyncer.h \
+	   ../includes/ofdm/sample-reader.h \
+	   ../includes/ofdm/ofdm-decoder.h \
+	   ../includes/ofdm/phasereference.h \
+	   ../includes/ofdm/phasetable.h \
+	   ../includes/ofdm/freq-interleaver.h \
+	   ../includes/ofdm/tii_detector.h \
+	   ../includes/ofdm/fic-handler.h \
+	   ../includes/ofdm/fib-decoder.h  \
+	   ../includes/ofdm/fib-table.h \
+	   ../includes/ofdm/dab-config.h \
+	   ../includes/protection/protTables.h \
+	   ../includes/protection/protection.h \
+	   ../includes/protection/eep-protection.h \
+	   ../includes/protection/uep-protection.h \
+	   ../includes/backend/msc-handler.h \
+	   ../includes/backend/galois.h \
+	   ../includes/backend/reed-solomon.h \
+	   ../includes/backend/rscodec.h \
+	   ../includes/backend/charsets.h \
+	   ../includes/backend/firecode-checker.h \
+	   ../includes/backend/frame-processor.h \
+	   ../includes/backend/backend.h \
+	   ../includes/backend/backend-driver.h \
+	   ../includes/backend/backend-deconvolver.h \
+	   ../includes/backend/audio/mp2processor.h \
+	   ../includes/backend/audio/mp4processor.h \
+	   ../includes/backend/audio/bitWriter.h \
+	   ../includes/backend/data/data-processor.h \
+	   ../includes/backend/data/pad-handler.h \
+	   ../includes/backend/data/virtual-datahandler.h \
+	   ../includes/backend/data/tdc-datahandler.h \
+	   ../includes/backend/data/ip-datahandler.h \
+	   ../includes/backend/data/mot/mot-handler.h \
+	   ../includes/backend/data/mot/mot-object.h \
+	   ../includes/backend/data/mot/mot-dir.h \
+	   ../includes/backend/data/journaline-datahandler.h \
+	   ../includes/backend/data/journaline/dabdatagroupdecoder.h \
+	   ../includes/backend/data/journaline/crc_8_16.h \
+	   ../includes/backend/data/journaline/log.h \
+	   ../includes/backend/data/journaline/newssvcdec_impl.h \
+	   ../includes/backend/data/journaline/Splitter.h \
+	   ../includes/backend/data/journaline/dabdgdec_impl.h \
+	   ../includes/backend/data/journaline/newsobject.h \
+	   ../includes/backend/data/journaline/NML.h \
+#	   ../includes/output/fir-filters.h \
+	   ../includes/output/audio-base.h \
+	   ../includes/output/newconverter.h \
+	   ../includes/output/audiosink.h \
+	   ../includes/support/viterbi-jan/viterbi-handler.h \
+	   ../includes/support/viterbi-spiral/viterbi-spiral.h \
+           ../includes/support/fft-handler.h \
+	   ../includes/support/ringbuffer.h \
+#	   ../includes/support/Xtan2.h \
+	   ../includes/support/dab-params.h \
+	   ../includes/support/band-handler.h \
+	   ../includes/support/text-mapper.h \
+	   ../includes/support/dab_tables.h \
+	   ../includes/support/ensemble-printer.h \
+	   ../includes/support/preset-handler.h \
+	   ../includes/support/smallcombobox.h \
+	   ../includes/support/smallspinbox.h \
+	   ../includes/support/smallpushbutton.h \
+	   ../includes/support/verysmallpushbutton.h \
+	   ../includes/support/smallqlistview.h \
+	   ../includes/support/presetcombobox.h \
+	   ./devices-dab-mini/device-handler.h
+
+FORMS	+= ./dab-mini.ui
+
+SOURCES += ./main.cpp \
+	   ./radio.cpp \
+	   ../dab-processor.cpp \
+	   ../src/ofdm/timesyncer.cpp \
+	   ../src/ofdm/sample-reader.cpp \
+	   ../src/ofdm/ofdm-decoder.cpp \
+	   ../src/ofdm/phasereference.cpp \
+	   ../src/ofdm/phasetable.cpp \
+	   ../src/ofdm/freq-interleaver.cpp \
+#	   ../src/ofdm/tii_table.cpp \
+	   ../src/ofdm/tii_detector.cpp \
+	   ../src/ofdm/fic-handler.cpp \
+	   ../src/ofdm/fib-decoder.cpp  \
+	   ../src/protection/protTables.cpp \
+	   ../src/protection/protection.cpp \
+	   ../src/protection/eep-protection.cpp \
+	   ../src/protection/uep-protection.cpp \
+	   ../src/backend/msc-handler.cpp \
+	   ../src/backend/galois.cpp \
+	   ../src/backend/reed-solomon.cpp \
+	   ../src/backend/rscodec.cpp \
+	   ../src/backend/charsets.cpp \
+	   ../src/backend/firecode-checker.cpp \
+#	   ../src/backend/frame-processor.cpp \
+	   ../src/backend/backend.cpp \
+           ../src/backend/backend-driver.cpp \
+           ../src/backend/backend-deconvolver.cpp \
+	   ../src/backend/audio/mp2processor.cpp \
+	   ../src/backend/audio/mp4processor.cpp \
+	   ../src/backend/audio/bitWriter.cpp \
+	   ../src/backend/data/pad-handler.cpp \
+	   ../src/backend/data/data-processor.cpp \
+#	   ../src/backend/data/virtual-datahandler.cpp \
+	   ../src/backend/data/tdc-datahandler.cpp \
+	   ../src/backend/data/ip-datahandler.cpp \
+	   ../src/backend/data/mot/mot-handler.cpp \
+	   ../src/backend/data/mot/mot-object.cpp \
+	   ../src/backend/data/mot/mot-dir.cpp \
+	   ../src/backend/data/journaline-datahandler.cpp \
+	   ../src/backend/data/journaline/crc_8_16.c \
+	   ../src/backend/data/journaline/log.c \
+	   ../src/backend/data/journaline/newssvcdec_impl.cpp \
+	   ../src/backend/data/journaline/Splitter.cpp \
+	   ../src/backend/data/journaline/dabdgdec_impl.c \
+	   ../src/backend/data/journaline/newsobject.cpp \
+	   ../src/backend/data/journaline/NML.cpp \
+	   ../src/output/audio-base.cpp \
+	   ../src/output/newconverter.cpp \
+	   ../src/output/audiosink.cpp \
+	   ../src/support/viterbi-jan/viterbi-handler.cpp \
+	   ../src/support/viterbi-spiral/viterbi-spiral.cpp \
+           ../src/support/fft-handler.cpp \
+#	   ../src/support/Xtan2.cpp \
+	   ../src/support/dab-params.cpp \
+	   ../src/support/band-handler.cpp \
+	   ../src/support/text-mapper.cpp \
+	   ../src/support/dab_tables.cpp \
+	   ../src/support/ensemble-printer.cpp \

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/dab-mini.ui Added

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

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-handler.cpp Added

@@ -0,0 +1,576 @@
+
+/**
+ * IW0HDV Extio
+ *
+ * Copyright 2015 by Andrea Montefusco IW0HDV
+ *
+ * Licensed under GNU General Public License 3.0 or later. 
+ * Some rights reserved. See COPYING, AUTHORS.
+ *
+ * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
+ *
+ *	recoding, taking parts and extending for the airspyHandler interface
+ *	for the Qt-DAB program
+ *	jan van Katwijk
+ *	Lazy Chair Computing
+ */
+
+#ifdef	__MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+#include	"airspy-handler.h"
+#include	"airspyfilter.h"
+
+static
+const	int	EXTIO_NS	= 8192;
+static
+const	int	EXTIO_BASE_TYPE_SIZE = sizeof (float);
+
+	airspyHandler::airspyHandler (QSettings *airspySettings,
+	 QSpinBox	*ifgainSelector,
+	 QCheckBox	*agcControl) {
+int	result, i;
+int	distance	= 10000000;
+std::vector <uint32_t> sampleRates;
+uint32_t samplerateCount;
+
+	this	-> airspySettings	= airspySettings;
+	this	-> ifgainSelector	= ifgainSelector;
+	ifgainSelector	-> setRange (1, 21);
+	ifgainSelector	-> setToolTip ("gain setting, range 1 .. 21");
+	this	-> agcControl		= agcControl;
+	airspySettings	-> beginGroup ("airspySettings");
+	ifgainSelector	-> setValue (
+	 airspySettings -> value ("ifgain", 19). toInt ());
+	int agcMode		=
+	 airspySettings -> value ("agcMode", 0). toInt ();
+	if (agcMode)
+	 agcControl	-> setChecked (true);
+	airspySettings	-> endGroup ();
+	filter			= NULL;
+	device			= 0;
+	serialNumber		= 0;
+	theBuffer		= NULL;
+#ifdef	__MINGW32__
+	const char *libraryString = "airspy.dll";
+	Handle		= LoadLibrary ((wchar_t *)L"airspy.dll");
+#else
+	const char *libraryString = "libairspy.so";
+	Handle		= dlopen ("libairspy.so", RTLD_LAZY);
+#endif
+
+	if (Handle == NULL) {
+	 fprintf (stderr, "failed to open %s\n", libraryString);
+#ifndef	__MINGW32__
+	 fprintf (stderr, "Error = %s\n", dlerror ());
+#endif
+	 throw (20);
+	}
+
+	libraryLoaded	= true;
+
+	if (!load_airspyFunctions ()) {
+	 fprintf (stderr, "problem in loading functions\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+	
+#endif
+	}
+//
+	strcpy (serial,"");
+	result = this -> my_airspy_init ();
+	if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airspy_init () failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (21);
+	}
+
+	result = my_airspy_open (&device);
+	if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airpsy_open () failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (22);
+	}
+
+	(void) my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
+	(void) my_airspy_get_samplerates (device, &samplerateCount, 0);
+	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
+	sampleRates. resize (samplerateCount);
+	my_airspy_get_samplerates (device,
+	 sampleRates. data (), samplerateCount);
+
+	selectedRate	= 0;
+	for (i = 0; i < (int)samplerateCount; i ++) {
+	 fprintf (stderr, "%d \n", sampleRates [i]);
+	 if (abs ((int)sampleRates [i] - 2048000) < distance) {
+	 distance	= abs ((int)sampleRates [i] - 2048000);
+	 selectedRate = sampleRates [i];
+	 }
+	}
+
+	if (selectedRate == 0) {
+	 fprintf (stderr, "Sorry. cannot help you\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (23);
+	}
+	else
+	 fprintf (stderr, "selected samplerate = %d\n", selectedRate);
+
+	result = my_airspy_set_samplerate (device, selectedRate);
+	if (result != AIRSPY_SUCCESS) {
+ printf("airspy_set_samplerate() failed: %s (%d)\n",
+	 my_airspy_error_name ((enum airspy_error)result), result);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (24);
+	}
+
+	filtering 	= 0;
+	int filterDegree = 9;
+//
+//	if we apply filtering it is using a symmetric lowpass filter
+	filter		= new airspyFilter (filterDegree,
+	 1024000, 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 (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);
+
+	theBuffer	= new RingBuffer<std::complex<float>>
+	 (256 * 1024);
+	my_airspy_set_sensitivity_gain (device,
+	 ifgainSelector -> value ());
+
+	my_airspy_set_mixer_agc (device, agcControl -> isChecked () ? 1 : 0);
+	connect (ifgainSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_ifgain (int)));
+	connect (agcControl, SIGNAL (stateChanged (int)),
+	 this, SLOT (set_agcControl (int)));
+}
+
+	airspyHandler::~airspyHandler (void) {
+	if (device != NULL) {
+	 int result = my_airspy_stop_rx (device);
+	 if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airspy_stop_rx () failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+	 }
+
+	 result = my_airspy_close (device);
+	 if (result != AIRSPY_SUCCESS) {
+	 printf ("airspy_close () failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+	 }
+	}
+
+
+	airspySettings	-> beginGroup ("airspySettings");
+	airspySettings	-> setValue ("ifgain", ifgainSelector -> value ());
+	airspySettings	-> setValue ("agcMode",

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-handler.h Added

@@ -0,0 +1,161 @@
+
+/**
+ * IW0HDV Extio
+ *
+ * Copyright 2015 by Andrea Montefusco IW0HDV
+ *
+ * Licensed under GNU General Public License 3.0 or later. 
+ * Some rights reserved. See COPYING, AUTHORS.
+ *
+ * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
+ *
+ *	recoding and taking parts for the airspyRadio interface
+ *	for the Qt-DAB program
+ *	jan van Katwijk
+ *	Lazy Chair Computing
+ */
+#ifndef __AIRSPY_HANDLER__
+#define	__AIRSPY_HANDLER__
+
+#include	<QSettings>
+#include	<QSpinBox>
+#include	<QCheckBox>
+#include	<vector>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#ifndef	__MINGW32__
+#include	"libairspy/airspy.h"
+#else
+#include	"libairspy/airspy.h"
+#endif
+
+class	airspyFilter;
+
+extern "C" {
+typedef	int (*pfn_airspy_init) (void);
+typedef int (*pfn_airspy_exit) (void);
+typedef int (*pfn_airspy_open) (struct airspy_device**);
+typedef int (*pfn_airspy_close) (struct airspy_device*);
+typedef int (*pfn_airspy_get_samplerates) (struct airspy_device* device,
+	 uint32_t* buffer,
+	 const uint32_t len);
+typedef int (*pfn_airspy_set_samplerate) (struct airspy_device* device,
+	 uint32_t samplerate);
+typedef int (*pfn_airspy_start_rx) (struct airspy_device* device,
+	 airspy_sample_block_cb_fn callback,
+	 void* rx_ctx);
+typedef int (*pfn_airspy_stop_rx) (struct airspy_device* device);
+
+typedef int (*pfn_airspy_set_sample_type) (struct airspy_device *,
+	 airspy_sample_type);
+typedef int (*pfn_airspy_set_freq) (struct airspy_device* device,
+	 const uint32_t freq_hz);
+
+typedef int (*pfn_airspy_set_lna_gain) (struct airspy_device* device,
+	 uint8_t value);
+
+typedef int (*pfn_airspy_set_mixer_gain) (struct airspy_device* device,
+	 uint8_t value);
+
+typedef int (*pfn_airspy_set_vga_gain) (struct airspy_device*
+	 device, uint8_t
+	 value);
+typedef int (*pfn_airspy_set_lna_agc) (struct airspy_device* device,
+	 uint8_t value);
+typedef int (*pfn_airspy_set_mixer_agc) (struct airspy_device* device,
+	 uint8_t value);
+
+typedef int (*pfn_airspy_set_rf_bias) (struct airspy_device* dev,
+	 uint8_t value);
+
+typedef const char* (*pfn_airspy_error_name) (enum airspy_error errcode);
+typedef int (*pfn_airspy_board_id_read) (struct airspy_device *,
+	 uint8_t *);
+typedef const char* (*pfn_airspy_board_id_name) (enum airspy_board_id board_id);
+typedef int (*pfn_airspy_board_partid_serialno_read)(struct airspy_device* device, airspy_read_partid_serialno_t* read_partid_serialno);
+
+typedef int (*pfn_airspy_set_linearity_gain) (struct airspy_device* device, uint8_t value);
+typedef int (*pfn_airspy_set_sensitivity_gain)(struct airspy_device* device, uint8_t value);
+}
+
+class airspyHandler: public deviceHandler {
+Q_OBJECT
+public:
+			airspyHandler		(QSettings	*,
+	 QSpinBox	*,
+	 QCheckBox	*);
+			~airspyHandler		(void);
+	bool		restartReader		(int32_t);
+	void		stopReader		(void);
+	int32_t		getSamples		(std::complex<float> *v,
+	 int32_t size);
+	int32_t		Samples			(void);
+	void		resetBuffer		(void);
+	int16_t		bitDepth		(void);
+	int16_t		currentTab;
+private:
+	QSettings	*airspySettings;
+	QSpinBox	*ifgainSelector;
+	QCheckBox	*agcControl;
+	bool		load_airspyFunctions	(void);
+//	The functions to be extracted from the dll/.so file
+	pfn_airspy_init		 my_airspy_init;
+	pfn_airspy_exit		 my_airspy_exit;
+	pfn_airspy_error_name	 my_airspy_error_name;
+	pfn_airspy_open		 my_airspy_open;
+	pfn_airspy_close	 my_airspy_close;
+	pfn_airspy_get_samplerates my_airspy_get_samplerates;
+	pfn_airspy_set_samplerate my_airspy_set_samplerate;
+	pfn_airspy_start_rx	 my_airspy_start_rx;
+	pfn_airspy_stop_rx	 my_airspy_stop_rx;
+	pfn_airspy_set_sample_type my_airspy_set_sample_type;
+	pfn_airspy_set_freq	 my_airspy_set_freq;
+	pfn_airspy_set_lna_gain	 my_airspy_set_lna_gain;
+	pfn_airspy_set_mixer_gain my_airspy_set_mixer_gain;
+	pfn_airspy_set_vga_gain	 my_airspy_set_vga_gain;
+	pfn_airspy_set_linearity_gain my_airspy_set_linearity_gain;
+	pfn_airspy_set_sensitivity_gain my_airspy_set_sensitivity_gain;
+	pfn_airspy_set_lna_agc	 my_airspy_set_lna_agc;
+	pfn_airspy_set_mixer_agc my_airspy_set_mixer_agc;
+	pfn_airspy_set_rf_bias	 my_airspy_set_rf_bias;
+	pfn_airspy_board_id_read my_airspy_board_id_read;
+	pfn_airspy_board_id_name my_airspy_board_id_name;
+	pfn_airspy_board_partid_serialno_read
+		 my_airspy_board_partid_serialno_read;
+//
+	HINSTANCE	Handle_usb;
+	HINSTANCE	Handle;
+	bool		libraryLoaded;
+	bool		success;
+	std::atomic<bool>	running;
+	bool		lna_agc;
+	bool		mixer_agc;
+	bool		rf_bias;
+const	char*		board_id_name (void);
+
+	int32_t		selectedRate;
+	int16_t		convBufferSize;
+	int16_t		convIndex;
+	std::vector <complex<float> >	convBuffer;
+	int16_t		mapTable_int [4 * 512];
+	float		mapTable_float [4 * 512];
+	RingBuffer<std::complex<float>> *theBuffer;
+	int32_t		inputRate;
+	airspyFilter	*filter;
+	bool		filtering;
+	struct airspy_device* device;
+	uint64_t 	serialNumber;
+	char		serial[128];
+static
+	int		callback(airspy_transfer_t *);
+	int		data_available (void *buf, int buf_size);
+const	char *		getSerial (void);
+	int		open (void);
+private slots:
+	void		set_ifgain		(int value);
+	void		set_agcControl		(int b);
+};
+
+#endif

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-widget.ui Added

@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>airspyWidget</class>
+ <widget class="QWidget" name="airspyWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>384</width>
+ <height>302</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>airspy</string>
+ </property>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>351</width>
+ <height>191</height>
+ </rect>
+ </property>
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tab_1">
+ <attribute name="title">
+ <string>sensitivity</string>
+ </attribute>
+ <widget class="QSlider" name="sensitivitySlider">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>251</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>21</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivity_lnaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>60</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivity_mixerDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>80</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivity_vgaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>100</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_5">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>60</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna gain</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_6">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>80</y>
+ <width>91</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mixer gain</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_7">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>100</y>
+ <width>81</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>vga gain</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="sensitivityDisplay">
+ <property name="geometry">
+ <rect>
+ <x>280</x>
+ <y>20</y>
+ <width>41</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>linearity</string>
+ </attribute>
+ <widget class="QSlider" name="linearitySlider">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>251</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>21</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="linearityDisplay">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>20</y>
+ <width>51</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspy-widget.ui-new Added

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>airspyWidget</class>
+ <widget class="QWidget" name="airspyWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>423</width>
+ <height>212</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QFrame" name="contents">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>411</width>
+ <height>201</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>170</y>
+ <width>101</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>airspy</string>
+ </property>
+ </widget>
+ <widget class="QSlider" name="linearitySlider">
+ <property name="geometry">
+ <rect>
+ <x>90</x>
+ <y>10</y>
+ <width>251</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>21</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>71</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>linearity</string>
+ </property>
+ </widget>
+ <widget class="QSlider" name="sensitivitySlider">
+ <property name="geometry">
+ <rect>
+ <x>90</x>
+ <y>40</y>
+ <width>251</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>21</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_3">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>40</y>
+ <width>71</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>sensitivity</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="lnaButton">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>130</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna-agc </string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="mixerButton">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>100</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mixer-agc</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="displaySerial">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>150</y>
+ <width>241</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="biasButton">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>160</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>bias</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="lnaDisplay">
+ <property name="geometry">
+ <rect>
+ <x>340</x>
+ <y>10</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="mixerDisplay">
+ <property name="geometry">
+ <rect>
+ <x>340</x>
+ <y>40</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>2</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="vgaDisplay">
+ <property name="geometry">

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspyfilter.cpp Added

@@ -0,0 +1,89 @@
+#
+/*
+ * Copyright (C) 2008, 2009, 2010
+ * 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 as 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	"airspyfilter.h"
+#include	<math.h>
+#ifndef M_PI
+# define M_PI 3.14159265358979323846 /* pi */
+#endif
+
+	airspyFilter::airspyFilter (int16_t firSize,
+	 int32_t cutoffFreq,
+	 int32_t sampleRate) {
+float	tmp [firSize];
+float	lo	= (float)(cutoffFreq) / sampleRate;
+float	sum	= 0.0;
+int16_t	i;
+
+	this	-> buffer_re	= new float [firSize];
+	this	-> buffer_im	= new float [firSize];
+	this	-> kernel	= new float [firSize];
+	this	-> firSize	= firSize;
+	ip			= 0;
+//
+//	create a low pass filter for lo;
+	for (i = 0; i < firSize; i ++) {
+	 if (i == firSize / 2)
+	 tmp [i] = 2 * M_PI * lo;
+	 else 
+	 tmp [i] = sin (2 * M_PI * lo * (i - firSize /2)) / (i - firSize/2);
+//
+//	windowing with Blackman
+	 tmp [i] *= (0.42 -
+		 0.5 * cos (2 * M_PI * (float)i / (float)firSize) +
+		 0.08 * cos (4 * M_PI * (float)i / (float)firSize));
+
+	 sum += tmp [i];
+	}
+//
+//	and the kernel
+	for (i = 0; i < firSize; i ++) 
+	 kernel [i] = tmp [i] / sum;
+}
+
+	airspyFilter::~airspyFilter (void) {
+	delete [] kernel;
+	delete [] buffer_re;
+	delete [] buffer_im;
+}
+
+// we process the samples backwards rather than reversing
+// the kernel
+std::complex<float>	airspyFilter::Pass (float re, float im) {
+int16_t i;
+float	tmp_1	= 0;
+float	tmp_2	= 0;
+
+ buffer_re [ip] = re;
+ buffer_im [ip] = im;
+ for (i = 0; i < firSize; i ++) {
+ int16_t index = ip - i;
+ if (index < 0)
+ index += firSize;
+ tmp_1	+= buffer_re [index] * kernel [i];
+ tmp_2	+= buffer_im [index] * kernel [i];
+ }
+
+ ip = (ip + 1) % firSize;
+ return std::complex<float> (tmp_1, tmp_2);;
+}
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/airspyfilter.h Added

@@ -0,0 +1,44 @@
+#
+/*
+ * Copyright (C) 2010, 2011, 2012
+ * 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; 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 __AIRSPY_FILTER__
+#define __AIRSPY_FILTER__
+
+#include	<stdlib.h>
+#include	<math.h>
+#include	<complex>
+
+class	airspyFilter {
+public:
+			airspyFilter	(int16_t, int32_t, int32_t);
+	 ~airspyFilter	(void);
+	std::complex<float> Pass	(float re, float im);
+	int16_t		firSize;
+	float		*kernel;
+	float		*buffer_re;
+	float		*buffer_im;
+	int16_t		ip;
+	int32_t		sampleRate;
+};
+
+#endif

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/libairspy Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/libairspy/airspy.h Added

@@ -0,0 +1,219 @@
+/*
+Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
+Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
+Copyright (c) 2013-2016, Benjamin Vernoux <bvernoux@airspy.com>
+Copyright (C) 2013-2016, Youssef Touil <youssef@airspy.com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+		Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+		Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
+	documentation and/or other materials provided with the distribution.
+		Neither the name of AirSpy nor the names of its contributors may be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __AIRSPY_H__
+#define __AIRSPY_H__
+
+#include <stdint.h>
+#include "airspy_commands.h"
+
+#define AIRSPY_VERSION "1.0.9"
+#define AIRSPY_VER_MAJOR 1
+#define AIRSPY_VER_MINOR 0
+#define AIRSPY_VER_REVISION 9
+
+#ifdef _WIN32
+	 #define ADD_EXPORTS
+	 
+	/* You should define ADD_EXPORTS *only* when building the DLL. */
+	#ifdef ADD_EXPORTS
+		#define ADDAPI __declspec(dllexport)
+	#else
+		#define ADDAPI __declspec(dllimport)
+	#endif
+
+	/* Define calling convention in one place, for convenience. */
+	#define ADDCALL __cdecl
+
+#else /* _WIN32 not defined. */
+
+	/* Define with no value on non-Windows OSes. */
+	#define ADDAPI
+	#define ADDCALL
+
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+enum airspy_error
+{
+	AIRSPY_SUCCESS = 0,
+	AIRSPY_TRUE = 1,
+	AIRSPY_ERROR_INVALID_PARAM = -2,
+	AIRSPY_ERROR_NOT_FOUND = -5,
+	AIRSPY_ERROR_BUSY = -6,
+	AIRSPY_ERROR_NO_MEM = -11,
+	AIRSPY_ERROR_LIBUSB = -1000,
+	AIRSPY_ERROR_THREAD = -1001,
+	AIRSPY_ERROR_STREAMING_THREAD_ERR = -1002,
+	AIRSPY_ERROR_STREAMING_STOPPED = -1003,
+	AIRSPY_ERROR_OTHER = -9999,
+};
+
+enum airspy_board_id
+{
+	AIRSPY_BOARD_ID_PROTO_AIRSPY = 0,
+	AIRSPY_BOARD_ID_INVALID = 0xFF,
+};
+
+enum airspy_sample_type
+{
+	AIRSPY_SAMPLE_FLOAT32_IQ = 0, /* 2 * 32bit float per sample */
+	AIRSPY_SAMPLE_FLOAT32_REAL = 1, /* 1 * 32bit float per sample */
+	AIRSPY_SAMPLE_INT16_IQ = 2, /* 2 * 16bit int per sample */
+	AIRSPY_SAMPLE_INT16_REAL = 3, /* 1 * 16bit int per sample */
+	AIRSPY_SAMPLE_UINT16_REAL = 4, /* 1 * 16bit unsigned int per sample */
+	AIRSPY_SAMPLE_RAW = 5, /* Raw packed samples from the device */
+	AIRSPY_SAMPLE_END = 6 /* Number of supported sample types */
+};
+
+#define MAX_CONFIG_PAGE_SIZE (0x10000)
+
+struct airspy_device;
+
+typedef struct {
+	struct airspy_device* device;
+	void* ctx;
+	void* samples;
+	int sample_count;
+	uint64_t dropped_samples;
+	enum airspy_sample_type sample_type;
+} airspy_transfer_t, airspy_transfer;
+
+typedef struct {
+	uint32_t part_id[2];
+	uint32_t serial_no[4];
+} airspy_read_partid_serialno_t;
+
+typedef struct {
+	uint32_t major_version;
+	uint32_t minor_version;
+	uint32_t revision;
+} airspy_lib_version_t;
+
+typedef int (*airspy_sample_block_cb_fn)(airspy_transfer* transfer);
+
+extern ADDAPI void ADDCALL airspy_lib_version(airspy_lib_version_t* lib_version);
+/* airspy_init() deprecated */
+extern ADDAPI int ADDCALL airspy_init(void);
+/* airspy_exit() deprecated */
+extern ADDAPI int ADDCALL airspy_exit(void);
+ 
+extern ADDAPI int ADDCALL airspy_open_sn(struct airspy_device** device, uint64_t serial_number);
+extern ADDAPI int ADDCALL airspy_open(struct airspy_device** device);
+extern ADDAPI int ADDCALL airspy_close(struct airspy_device* device);
+
+extern ADDAPI int ADDCALL airspy_get_samplerates(struct airspy_device* device, uint32_t* buffer, const uint32_t len);
+
+/* Parameter samplerate can be either the index of a samplerate or directly its value in Hz within the list returned by airspy_get_samplerates() */
+extern ADDAPI int ADDCALL airspy_set_samplerate(struct airspy_device* device, uint32_t samplerate);
+
+extern ADDAPI int ADDCALL airspy_set_conversion_filter_float32(struct airspy_device* device, const float *kernel, const uint32_t len);
+extern ADDAPI int ADDCALL airspy_set_conversion_filter_int16(struct airspy_device* device, const int16_t *kernel, const uint32_t len);
+
+extern ADDAPI int ADDCALL airspy_start_rx(struct airspy_device* device, airspy_sample_block_cb_fn callback, void* rx_ctx);
+extern ADDAPI int ADDCALL airspy_stop_rx(struct airspy_device* device);
+
+/* return AIRSPY_TRUE if success */
+extern ADDAPI int ADDCALL airspy_is_streaming(struct airspy_device* device);
+
+extern ADDAPI int ADDCALL airspy_si5351c_write(struct airspy_device* device, uint8_t register_number, uint8_t value);
+extern ADDAPI int ADDCALL airspy_si5351c_read(struct airspy_device* device, uint8_t register_number, uint8_t* value);
+
+extern ADDAPI int ADDCALL airspy_config_write(struct airspy_device* device, const uint8_t page_index, const uint16_t length, unsigned char *data);
+extern ADDAPI int ADDCALL airspy_config_read(struct airspy_device* device, const uint8_t page_index, const uint16_t length, unsigned char *data);
+
+extern ADDAPI int ADDCALL airspy_r820t_write(struct airspy_device* device, uint8_t register_number, uint8_t value);
+extern ADDAPI int ADDCALL airspy_r820t_read(struct airspy_device* device, uint8_t register_number, uint8_t* value);
+
+/* Parameter value shall be 0=clear GPIO or 1=set GPIO */
+extern ADDAPI int ADDCALL airspy_gpio_write(struct airspy_device* device, airspy_gpio_port_t port, airspy_gpio_pin_t pin, uint8_t value);
+/* Parameter value corresponds to GPIO state 0 or 1 */
+extern ADDAPI int ADDCALL airspy_gpio_read(struct airspy_device* device, airspy_gpio_port_t port, airspy_gpio_pin_t pin, uint8_t* value);
+
+/* Parameter value shall be 0=GPIO Input direction or 1=GPIO Output direction */
+extern ADDAPI int ADDCALL airspy_gpiodir_write(struct airspy_device* device, airspy_gpio_port_t port, airspy_gpio_pin_t pin, uint8_t value);
+extern ADDAPI int ADDCALL airspy_gpiodir_read(struct airspy_device* device, airspy_gpio_port_t port, airspy_gpio_pin_t pin, uint8_t* value);
+
+extern ADDAPI int ADDCALL airspy_spiflash_erase(struct airspy_device* device);
+extern ADDAPI int ADDCALL airspy_spiflash_write(struct airspy_device* device, const uint32_t address, const uint16_t length, unsigned char* const data);
+extern ADDAPI int ADDCALL airspy_spiflash_read(struct airspy_device* device, const uint32_t address, const uint16_t length, unsigned char* data);
+
+extern ADDAPI int ADDCALL airspy_board_id_read(struct airspy_device* device, uint8_t* value);
+/* Parameter length shall be at least 128bytes */
+extern ADDAPI int ADDCALL airspy_version_string_read(struct airspy_device* device, char* version, uint8_t length);
+
+extern ADDAPI int ADDCALL airspy_board_partid_serialno_read(struct airspy_device* device, airspy_read_partid_serialno_t* read_partid_serialno);
+
+extern ADDAPI int ADDCALL airspy_set_sample_type(struct airspy_device* device, enum airspy_sample_type sample_type);
+
+/* Parameter freq_hz shall be between 24000000(24MHz) and 1750000000(1.75GHz) */
+extern ADDAPI int ADDCALL airspy_set_freq(struct airspy_device* device, const uint32_t freq_hz);
+
+/* Parameter value shall be between 0 and 15 */
+extern ADDAPI int ADDCALL airspy_set_lna_gain(struct airspy_device* device, uint8_t value);
+
+/* Parameter value shall be between 0 and 15 */
+extern ADDAPI int ADDCALL airspy_set_mixer_gain(struct airspy_device* device, uint8_t value);
+
+/* Parameter value shall be between 0 and 15 */
+extern ADDAPI int ADDCALL airspy_set_vga_gain(struct airspy_device* device, uint8_t value);
+
+/* Parameter value:
+	0=Disable LNA Automatic Gain Control
+	1=Enable LNA Automatic Gain Control
+*/
+extern ADDAPI int ADDCALL airspy_set_lna_agc(struct airspy_device* device, uint8_t value);
+/* Parameter value:
+	0=Disable MIXER Automatic Gain Control
+	1=Enable MIXER Automatic Gain Control
+*/
+extern ADDAPI int ADDCALL airspy_set_mixer_agc(struct airspy_device* device, uint8_t value);
+
+/* Parameter value: 0..21 */
+extern ADDAPI int ADDCALL airspy_set_linearity_gain(struct airspy_device* device, uint8_t value);
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/libairspy/airspy_commands.h Added

@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2013-2016, Benjamin Vernoux <bvernoux@airspy.com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
+ documentation and/or other materials provided with the distribution.
+ Neither the name of AirSpy nor the names of its contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __AIRSPY_COMMANDS_H__
+#define __AIRSPY_COMMANDS_H__
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef enum
+{
+ RECEIVER_MODE_OFF = 0,
+ RECEIVER_MODE_RX = 1
+} receiver_mode_t;
+
+/*
+ Note: airspy_samplerate_t is now obsolete and left for backward compatibility.
+ The list of supported sample rates should be retrieved at run time by calling airspy_get_samplerates().
+ Refer to the Airspy Tools for illustrations.
+*/
+typedef enum 
+{
+ AIRSPY_SAMPLERATE_10MSPS = 0, /* 12bits 10MHz IQ */
+ AIRSPY_SAMPLERATE_2_5MSPS = 1, /* 12bits 2.5MHz IQ */
+ AIRSPY_SAMPLERATE_END = 2 /* End index for sample rate (corresponds to number of samplerate) */
+} airspy_samplerate_t;
+
+
+#define AIRSPY_CONF_CMD_SHIFT_BIT (3) // Up to 3bits=8 samplerates (airspy_samplerate_t enum shall not exceed 7)
+
+// Commands (usb vendor request) shared between Firmware and Host.
+#define AIRSPY_CMD_MAX (27)
+typedef enum
+{
+ AIRSPY_INVALID = 0 ,
+ AIRSPY_RECEIVER_MODE = 1 ,
+ AIRSPY_SI5351C_WRITE = 2 ,
+ AIRSPY_SI5351C_READ = 3 ,
+ AIRSPY_R820T_WRITE = 4 ,
+ AIRSPY_R820T_READ = 5 ,
+ AIRSPY_SPIFLASH_ERASE = 6 ,
+ AIRSPY_SPIFLASH_WRITE = 7 ,
+ AIRSPY_SPIFLASH_READ = 8 ,
+ AIRSPY_BOARD_ID_READ = 9 ,
+ AIRSPY_VERSION_STRING_READ = 10,
+ AIRSPY_BOARD_PARTID_SERIALNO_READ = 11,
+ AIRSPY_SET_SAMPLERATE = 12,
+ AIRSPY_SET_FREQ = 13,
+ AIRSPY_SET_LNA_GAIN = 14,
+ AIRSPY_SET_MIXER_GAIN = 15,
+ AIRSPY_SET_VGA_GAIN = 16,
+ AIRSPY_SET_LNA_AGC = 17,
+ AIRSPY_SET_MIXER_AGC = 18,
+ AIRSPY_MS_VENDOR_CMD = 19,
+ AIRSPY_SET_RF_BIAS_CMD = 20,
+ AIRSPY_GPIO_WRITE = 21,
+ AIRSPY_GPIO_READ = 22,
+ AIRSPY_GPIODIR_WRITE = 23,
+ AIRSPY_GPIODIR_READ = 24,
+ AIRSPY_GET_SAMPLERATES = 25,
+ AIRSPY_SET_PACKING = 26,
+ AIRSPY_SPIFLASH_ERASE_SECTOR = AIRSPY_CMD_MAX
+} airspy_vendor_request;
+
+typedef enum
+{
+ CONFIG_CALIBRATION = 0,
+ //CONFIG_META = 1,
+} airspy_common_config_pages_t;
+
+typedef enum
+{
+ GPIO_PORT0 = 0,
+ GPIO_PORT1 = 1,
+ GPIO_PORT2 = 2,
+ GPIO_PORT3 = 3,
+ GPIO_PORT4 = 4,
+ GPIO_PORT5 = 5,
+ GPIO_PORT6 = 6,
+ GPIO_PORT7 = 7
+} airspy_gpio_port_t;
+
+typedef enum
+{
+ GPIO_PIN0 = 0,
+ GPIO_PIN1 = 1,
+ GPIO_PIN2 = 2,
+ GPIO_PIN3 = 3,
+ GPIO_PIN4 = 4,
+ GPIO_PIN5 = 5,
+ GPIO_PIN6 = 6,
+ GPIO_PIN7 = 7,
+ GPIO_PIN8 = 8,
+ GPIO_PIN9 = 9,
+ GPIO_PIN10 = 10,
+ GPIO_PIN11 = 11,
+ GPIO_PIN12 = 12,
+ GPIO_PIN13 = 13,
+ GPIO_PIN14 = 14,
+ GPIO_PIN15 = 15,
+ GPIO_PIN16 = 16,
+ GPIO_PIN17 = 17,
+ GPIO_PIN18 = 18,
+ GPIO_PIN19 = 19,
+ GPIO_PIN20 = 20,
+ GPIO_PIN21 = 21,
+ GPIO_PIN22 = 22,
+ GPIO_PIN23 = 23,
+ GPIO_PIN24 = 24,
+ GPIO_PIN25 = 25,
+ GPIO_PIN26 = 26,
+ GPIO_PIN27 = 27,
+ GPIO_PIN28 = 28,
+ GPIO_PIN29 = 29,
+ GPIO_PIN30 = 30,
+ GPIO_PIN31 = 31
+} airspy_gpio_pin_t;
+
+#ifdef __cplusplus
+} // __cplusplus defined.
+#endif
+
+#endif//__AIRSPY_COMMANDS_H__

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/libairspy/filters.h Added

@@ -0,0 +1,134 @@
+/*
+Copyright (C) 2014, Youssef Touil <youssef@airspy.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#ifndef FILTERS_H
+#define FILTERS_H
+
+#include <stdint.h>
+
+#define HB_KERNEL_FLOAT_LEN 47
+
+const float HB_KERNEL_FLOAT[HB_KERNEL_FLOAT_LEN] =
+{
+	-0.000998606272947510,
+	 0.000000000000000000,
+	 0.001695637278417295,
+	 0.000000000000000000,
+	-0.003054430179754289,
+	 0.000000000000000000,
+	 0.005055504379767936,
+	 0.000000000000000000,
+	-0.007901319195893647,
+	 0.000000000000000000,
+	 0.011873357051047719,
+	 0.000000000000000000,
+	-0.017411159379930066,
+	 0.000000000000000000,
+	 0.025304817427568772,
+	 0.000000000000000000,
+	-0.037225225204559217,
+	 0.000000000000000000,
+	 0.057533286997004301,
+	 0.000000000000000000,
+	-0.102327462004259350,
+	 0.000000000000000000,
+	 0.317034472508947400,
+	 0.500000000000000000,
+	 0.317034472508947400,
+	 0.000000000000000000,
+	-0.102327462004259350,
+	 0.000000000000000000,
+	 0.057533286997004301,
+	 0.000000000000000000,
+	-0.037225225204559217,
+	 0.000000000000000000,
+	 0.025304817427568772,
+	 0.000000000000000000,
+	-0.017411159379930066,
+	 0.000000000000000000,
+	 0.011873357051047719,
+	 0.000000000000000000,
+	-0.007901319195893647,
+	 0.000000000000000000,
+	 0.005055504379767936,
+	 0.000000000000000000,
+	-0.003054430179754289,
+	 0.000000000000000000,
+	 0.001695637278417295,
+	 0.000000000000000000,
+	-0.000998606272947510
+};
+
+#define HB_KERNEL_INT16_LEN 47
+
+const int16_t HB_KERNEL_INT16[HB_KERNEL_INT16_LEN] =
+{
+	-33,
+	 0,
+	 56,
+	 0,
+	-100,
+	 0,
+	 166,
+	 0,
+	-259,
+	 0,
+	 389,
+	 0,
+	-571,
+	 0,
+	 829,
+	 0,
+	-1220,
+	 0,
+	 1885,
+	 0,
+	-3353,
+	 0,
+	 10389,
+	 16384,
+	 10389,
+	 0,
+	-3353,
+	 0,
+	 1885,
+	 0,
+	-1220,
+	 0,
+	 829,
+	 0,
+	-571,
+	 0,
+	 389,
+	 0,
+	-259,
+	 0,
+	 166,
+	 0,
+	-100,
+	 0,
+	 56,
+	 0,
+	-33
+};
+
+#endif // FILTERS_H

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/libairspy/iqconverter_float.h Added

@@ -0,0 +1,47 @@
+/*
+Copyright (C) 2014, Youssef Touil <youssef@airspy.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#ifndef IQCONVERTER_FLOAT_H
+#define IQCONVERTER_FLOAT_H
+
+#include <stdint.h>
+
+#define IQCONVERTER_NZEROS 2
+#define IQCONVERTER_NPOLES 2
+
+typedef struct {
+	float avg;
+	float hbc;
+	int len;
+	int fir_index;
+	int delay_index;
+	float *fir_kernel;
+	float *fir_queue;
+	float *delay_line;
+} iqconverter_float_t;
+
+iqconverter_float_t *iqconverter_float_create(const float *hb_kernel, int len);
+void iqconverter_float_free(iqconverter_float_t *cnv);
+void iqconverter_float_reset(iqconverter_float_t *cnv);
+void iqconverter_float_process(iqconverter_float_t *cnv, float *samples, int len);
+
+#endif // IQCONVERTER_FLOAT_H

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/airspy-handler/libairspy/iqconverter_int16.h Added

@@ -0,0 +1,45 @@
+/*
+Copyright (C) 2014, Youssef Touil <youssef@airspy.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#ifndef IQCONVERTER_INT16_H
+#define IQCONVERTER_INT16_H
+
+#include <stdint.h>
+
+typedef struct {
+	int len;
+	int fir_index;
+	int delay_index;
+	int16_t old_x;
+	int16_t old_y;
+	int32_t old_e;
+	int32_t *fir_kernel;
+	int32_t *fir_queue;
+	int16_t *delay_line;
+} iqconverter_int16_t;
+
+iqconverter_int16_t *iqconverter_int16_create(const int16_t *hb_kernel, int len);
+void iqconverter_int16_free(iqconverter_int16_t *cnv);
+void iqconverter_int16_reset(iqconverter_int16_t *cnv);
+void iqconverter_int16_process(iqconverter_int16_t *cnv, int16_t *samples, int len);
+
+#endif // IQCONVERTER_INT16_H

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/device-handler.cpp Added

@@ -0,0 +1,56 @@
+#
+/*
+ * Copyright (C) 2010, 2011, 2012
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-radio
+ *
+ * dab-radio 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-radio 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-radio; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	Default (void) implementation of
+ * 	virtual input class
+ */
+#include	"device-handler.h"
+
+	deviceHandler::deviceHandler	(void) {
+	lastFrequency	= 100000;
+}
+
+	deviceHandler::~deviceHandler	(void) {
+}
+
+bool	deviceHandler::restartReader	(int32_t) {
+	return true;
+}
+
+void	deviceHandler::stopReader	(void) {
+}
+
+int32_t	deviceHandler::getSamples	(std::complex<float> *v,
+	 int32_t amount) {
+	(void)v; 
+	(void)amount; 
+	return amount;
+}
+
+int32_t	deviceHandler::Samples		(void) {
+	return 1024;
+}
+
+void	deviceHandler::resetBuffer	(void) {
+}
+
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/device-handler.h Added

@@ -0,0 +1,49 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dabmini program
+ *
+ * dabmini 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.
+ *
+ * dabmini 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 dabmini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *	We have to create a simple virtual class here, since we
+ *	want the interface with different devices (including filehandling)
+ *	to be transparent
+ */
+#ifndef	__DEVICE_HANDLER__
+#define	__DEVICE_HANDLER__
+
+#include	<stdint.h>
+#include	"dab-constants.h"
+#include	<QThread>
+
+class	deviceHandler: public QThread {
+public:
+			deviceHandler 	(void);
+virtual			~deviceHandler 	(void);
+virtual		bool	restartReader	(int32_t);
+virtual		void	stopReader	(void);
+virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
+virtual		int32_t	Samples		(void);
+virtual		void	resetBuffer	(void);
+virtual		int16_t	bitDepth	(void) { return 10;}
+//
+protected:
+		int32_t	lastFrequency;
+};
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/hackrf-handler Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/hackrf-handler/hackrf-handler.cpp Added

@@ -0,0 +1,353 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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	<QHBoxLayout>
+#include	<QLabel>
+#include	"hackrf-handler.h"
+
+#define	DEFAULT_GAIN	30
+
+	hackrfHandler::hackrfHandler (QSettings *s,
+	 QSpinBox	*ifgainSelector,
+	 QSpinBox	*lnaSelector) {
+int	err;
+int	res;
+	hackrfSettings			= s;
+	this	-> ifgainSelector	= ifgainSelector;
+	ifgainSelector	-> setToolTip ("vga gain, range 1 .. 62");
+	ifgainSelector	-> setRange (1, 62);
+	this	-> lnaSelector		= lnaSelector;
+	lnaSelector	-> setToolTip ("lna gain, range 1 .. 40");
+	lnaSelector	-> setRange (1, 40);
+	this	-> inputRate		= Khz (2048);
+	_I_Buffer	= new RingBuffer<std::complex<float>>(1024 * 1024);
+
+#ifdef __MINGW32__
+ const char *libraryString = "libhackrf.dll";
+ Handle = LoadLibrary ((wchar_t *)L"libhackrf.dll");
+#else
+ const char *libraryString = "libhackrf.so";
+ Handle = dlopen (libraryString, RTLD_NOW);
+#endif
+
+	if (Handle == nullptr) {
+	 fprintf (stderr, "failed to open %s\n", libraryString);
+	 throw (20);
+	}
+
+ libraryLoaded = true;
+ if (!load_hackrfFunctions ()) {
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+ throw (21);
+ }
+//
+//	See if there are settings from previous incarnations
+	hackrfSettings		-> beginGroup ("hackrfSettings");
+	lnaSelector 		-> setValue (
+	 hackrfSettings -> value ("hack_lnaGain", 20). toInt ());
+	ifgainSelector 		-> setValue (
+	 hackrfSettings -> value ("hack_vgaGain", 20). toInt ());
+
+	hackrfSettings	-> endGroup ();
+
+//
+	res	= hackrf_init ();
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_init:");
+	 fprintf (stderr, "%s \n", hackrf_error_name (hackrf_error (res)));
+	 throw (21);
+	}
+
+	res	= hackrf_open (&theDevice);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_open:");
+	 fprintf (stderr, "%s \n", hackrf_error_name (hackrf_error (res)));
+	 throw (22);
+	}
+
+	res	= hackrf_set_sample_rate (theDevice, 2048000.0);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_samplerate:");
+	 fprintf (stderr, "%s \n", hackrf_error_name (hackrf_error (res)));
+	 throw (23);
+	}
+
+	res	= hackrf_set_baseband_filter_bandwidth (theDevice, 2000000);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_bw:");
+	 fprintf (stderr, "%s \n", hackrf_error_name (hackrf_error (res)));
+	 throw (24);
+	}
+
+	res	= hackrf_set_freq (theDevice, 220000000);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_freq: ");
+	 fprintf (stderr, "%s \n", hackrf_error_name (hackrf_error (res)));
+	 throw (25);
+	}
+
+	hackrf_set_lna_gain (theDevice, lnaSelector -> value ());
+	hackrf_set_vga_gain (theDevice, ifgainSelector -> value ());
+
+//	and be prepared for future changes in the settings
+	connect (lnaSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (setLNAGain (int)));
+	connect (ifgainSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (setVGAGain (int)));
+
+	hackrf_device_list_t *deviceList = hackrf_device_list ();
+	if (deviceList != NULL) {
+	 char *serial = deviceList -> serial_numbers [0];
+//	 serial_number_display -> setText (serial);
+	 enum hackrf_usb_board_id board_id =
+	 deviceList -> usb_board_ids [0];
+//	 usb_board_id_display -> setText (hackrf_usb_board_id_name (board_id));
+	}
+	
+	running. store (false);
+}
+
+	hackrfHandler::~hackrfHandler	(void) {
+	stopReader ();
+	if (_I_Buffer != NULL)
+	 delete _I_Buffer;
+	hackrfSettings	-> beginGroup ("hackrfSettings");
+	hackrfSettings	-> setValue ("hack_lnaGain",
+	 lnaSelector -> value ());
+	hackrfSettings -> setValue ("hack_vgaGain",
+	 ifgainSelector	-> value ());
+	hackrfSettings	-> endGroup ();
+	this -> hackrf_close (theDevice);
+	this -> hackrf_exit ();
+
+}
+//
+
+void	hackrfHandler::setLNAGain	(int newGain) {
+int	res;
+	if ((newGain <= 60) && (newGain >= 0)) {
+	 res	= hackrf_set_lna_gain (theDevice, newGain);
+	 if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_lna_gain %d\n", res);
+	 return;
+	 }
+	}
+}
+
+void	hackrfHandler::setVGAGain	(int newGain) {
+int	res;
+	if ((newGain <= 62) && (newGain >= 0)) {
+	 res	= hackrf_set_vga_gain (theDevice, newGain);
+	 if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_vga_gain %d\n", res);
+	 return;
+	 }
+	}
+}
+
+static std::complex<float>buffer [32 * 32768];
+static
+int	callback (hackrf_transfer *transfer) {
+hackrfHandler *ctx = static_cast <hackrfHandler *>(transfer -> rx_ctx);
+int	i;
+//std::complex<float> buffer [transfer -> buffer_length / 2];
+uint8_t *p	= transfer -> buffer;
+RingBuffer<std::complex<float> > * q = ctx -> _I_Buffer;
+
+	for (i = 0; i < transfer -> valid_length / 2; i ++) {
+	 float re	= (int8_t)(p [2 * i]) / 128.0;
+	 float im	= (int8_t)(p [2 * i + 1]) / 128.0;
+	 buffer [i]	= std::complex<float> (re, im);
+	}
+	q	-> putDataIntoBuffer (buffer, transfer -> valid_length / 2);
+	return 0;
+}
+
+bool	hackrfHandler::restartReader	(int32_t frequency) {
+int	res;
+
+//	if (hackrf_is_streaming (theDevice))
+//	 return true;
+
+	res	= hackrf_set_freq (theDevice, frequency);
+	res	= hackrf_start_rx (theDevice, callback, this);	
+	if (res != HACKRF_SUCCESS) {

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/hackrf-handler/hackrf-handler.h Added

@@ -0,0 +1,118 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __HACKRF_HANDLER__
+#define	__HACKRF_HANDLER__
+
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<QSpinBox>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"libhackrf/hackrf.h"
+
+typedef int (*hackrf_samble_block_bc_fn)(hackrf_transfer *transfer);
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
+//
+//	Dll and ".so" function prototypes
+
+typedef	int	(*pfn_hackrf_init)	(void);
+typedef	int	(*pfn_hackrf_open)	(hackrf_device ** device);
+typedef	int	(*pfn_hackrf_close)	(hackrf_device *device);
+typedef	int	(*pfn_hackrf_exit)	(void);
+typedef	int	(*pfn_hackrf_start_rx)	(hackrf_device *,
+	 hackrf_sample_block_cb_fn, void *);
+typedef	int	(*pfn_hackrf_stop_rx)	(hackrf_device *);
+typedef	hackrf_device_list_t	*(*pfn_hackrf_device_list)	(void);
+typedef	int	(*pfn_hackrf_set_baseband_filter_bandwidth) (hackrf_device *,
+	 const uint32_t bandwidth_hz);
+typedef	int	(*pfn_hackrf_set_lna_gain) (hackrf_device *, uint32_t);
+typedef	int	(*pfn_hackrf_set_vga_gain) (hackrf_device *, uint32_t);
+typedef	int	(*pfn_hackrf_set_freq)	(hackrf_device *, const uint64_t);
+typedef	int	(*pfn_hackrf_set_sample_rate) (hackrf_device *,
+	 const double freq_hz);
+typedef	int	(*pfn_hackrf_is_streaming) (hackrf_device *);
+typedef	const char	*(*pfn_hackrf_error_name) (enum hackrf_error errcode);
+typedef	const char	*(*pfn_hackrf_usb_board_id_name) (enum hackrf_usb_board_id);
+
+
+///////////////////////////////////////////////////////////////////////////
+class	hackrfHandler: public deviceHandler {
+Q_OBJECT
+public:
+			hackrfHandler		(QSettings *,
+	 QSpinBox	*,
+	 QSpinBox	*);
+			~hackrfHandler		(void);
+	bool		restartReader		(int32_t);
+	void		stopReader		(void);
+	int32_t		getSamples		(std::complex<float> *,
+	 int32_t);
+	int32_t		Samples			(void);
+	void		resetBuffer		(void);
+	int16_t		bitDepth		(void);
+//
+//	The buffer should be visible by the callback function
+	RingBuffer<std::complex<float>>	*_I_Buffer;
+	hackrf_device	*theDevice;
+private:
+	bool load_hackrfFunctions (void);
+	pfn_hackrf_init hackrf_init;
+	pfn_hackrf_open hackrf_open;
+	pfn_hackrf_close hackrf_close;
+	pfn_hackrf_exit hackrf_exit;
+	pfn_hackrf_start_rx hackrf_start_rx;
+	pfn_hackrf_stop_rx hackrf_stop_rx;
+	pfn_hackrf_device_list hackrf_device_list;
+	pfn_hackrf_set_baseband_filter_bandwidth
+	 hackrf_set_baseband_filter_bandwidth;
+	pfn_hackrf_set_lna_gain hackrf_set_lna_gain;
+	pfn_hackrf_set_vga_gain hackrf_set_vga_gain;
+	pfn_hackrf_set_freq hackrf_set_freq;
+	pfn_hackrf_set_sample_rate
+	 hackrf_set_sample_rate;
+	pfn_hackrf_is_streaming hackrf_is_streaming;
+	pfn_hackrf_error_name hackrf_error_name;
+	pfn_hackrf_usb_board_id_name
+	 hackrf_usb_board_id_name;
+
+	QSettings	*hackrfSettings;
+	QSpinBox	*ifgainSelector;
+	QSpinBox	*lnaSelector;
+	int32_t		inputRate;
+	std::atomic<bool>	running;
+ HINSTANCE	Handle;
+ bool		libraryLoaded;
+private slots:
+	void		setLNAGain	(int);
+	void		setVGAGain	(int);
+};
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/hackrf-handler/libhackrf Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/hackrf-handler/libhackrf/hackrf.h Added

@@ -0,0 +1,258 @@
+/*
+Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
+Copyright (c) 2013, Benjamin Vernoux <titanmkd@gmail.com>
+Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
+	documentation and/or other materials provided with the distribution.
+ Neither the name of Great Scott Gadgets nor the names of its contributors may be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __HACKRF_H__
+#define __HACKRF_H__
+
+#include <stdint.h>
+
+#ifdef _WIN32
+ #define ADD_EXPORTS
+ 
+ /* You should define ADD_EXPORTS *only* when building the DLL. */
+ #ifdef ADD_EXPORTS
+ #define ADDAPI __declspec(dllexport)
+ #else
+ #define ADDAPI __declspec(dllimport)
+ #endif
+
+ /* Define calling convention in one place, for convenience. */
+ #define ADDCALL __cdecl
+
+#else /* _WIN32 not defined. */
+
+ /* Define with no value on non-Windows OSes. */
+ #define ADDAPI
+ #define ADDCALL
+
+#endif
+
+#define SAMPLES_PER_BLOCK 8192
+#define BYTES_PER_BLOCK 16384
+#define MAX_SWEEP_RANGES 10
+
+enum hackrf_error {
+	HACKRF_SUCCESS = 0,
+	HACKRF_TRUE = 1,
+	HACKRF_ERROR_INVALID_PARAM = -2,
+	HACKRF_ERROR_NOT_FOUND = -5,
+	HACKRF_ERROR_BUSY = -6,
+	HACKRF_ERROR_NO_MEM = -11,
+	HACKRF_ERROR_LIBUSB = -1000,
+	HACKRF_ERROR_THREAD = -1001,
+	HACKRF_ERROR_STREAMING_THREAD_ERR = -1002,
+	HACKRF_ERROR_STREAMING_STOPPED = -1003,
+	HACKRF_ERROR_STREAMING_EXIT_CALLED = -1004,
+	HACKRF_ERROR_USB_API_VERSION = -1005,
+	HACKRF_ERROR_NOT_LAST_DEVICE = -2000,
+	HACKRF_ERROR_OTHER = -9999,
+};
+
+enum hackrf_board_id {
+	BOARD_ID_JELLYBEAN = 0,
+	BOARD_ID_JAWBREAKER = 1,
+	BOARD_ID_HACKRF_ONE = 2,
+	BOARD_ID_RAD1O = 3,
+	BOARD_ID_INVALID = 0xFF,
+};
+
+enum hackrf_usb_board_id {
+	USB_BOARD_ID_JAWBREAKER = 0x604B,
+	USB_BOARD_ID_HACKRF_ONE = 0x6089,
+	USB_BOARD_ID_RAD1O = 0xCC15,
+	USB_BOARD_ID_INVALID = 0xFFFF,
+};
+
+enum rf_path_filter {
+	RF_PATH_FILTER_BYPASS = 0,
+	RF_PATH_FILTER_LOW_PASS = 1,
+	RF_PATH_FILTER_HIGH_PASS = 2,
+};
+
+enum operacake_ports {
+	OPERACAKE_PA1 = 0,
+	OPERACAKE_PA2 = 1,
+	OPERACAKE_PA3 = 2,
+	OPERACAKE_PA4 = 3,
+	OPERACAKE_PB1 = 4,
+	OPERACAKE_PB2 = 5,
+	OPERACAKE_PB3 = 6,
+	OPERACAKE_PB4 = 7,
+};
+
+enum sweep_style {
+	LINEAR = 0,
+	INTERLEAVED = 1,
+};
+
+typedef struct hackrf_device hackrf_device;
+
+typedef struct {
+	hackrf_device* device;
+	uint8_t* buffer;
+	int buffer_length;
+	int valid_length;
+	void* rx_ctx;
+	void* tx_ctx;
+} hackrf_transfer;
+
+typedef struct {
+	uint32_t part_id[2];
+	uint32_t serial_no[4];
+} read_partid_serialno_t;
+
+
+struct hackrf_device_list {
+	char **serial_numbers;
+	enum hackrf_usb_board_id *usb_board_ids;
+	int *usb_device_index;
+	int devicecount;
+	
+	void **usb_devices;
+	int usb_devicecount;
+};
+typedef struct hackrf_device_list hackrf_device_list_t;
+
+typedef int (*hackrf_sample_block_cb_fn)(hackrf_transfer* transfer);
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern ADDAPI int ADDCALL hackrf_init();
+extern ADDAPI int ADDCALL hackrf_exit();
+
+extern ADDAPI const char* ADDCALL hackrf_library_version();
+extern ADDAPI const char* ADDCALL hackrf_library_release();
+
+extern ADDAPI hackrf_device_list_t* ADDCALL hackrf_device_list();
+extern ADDAPI int ADDCALL hackrf_device_list_open(hackrf_device_list_t *list, int idx, hackrf_device** device);
+extern ADDAPI void ADDCALL hackrf_device_list_free(hackrf_device_list_t *list);
+ 
+extern ADDAPI int ADDCALL hackrf_open(hackrf_device** device);
+extern ADDAPI int ADDCALL hackrf_open_by_serial(const char* const desired_serial_number, hackrf_device** device);
+extern ADDAPI int ADDCALL hackrf_close(hackrf_device* device);
+ 
+extern ADDAPI int ADDCALL hackrf_start_rx(hackrf_device* device, hackrf_sample_block_cb_fn callback, void* rx_ctx);
+extern ADDAPI int ADDCALL hackrf_stop_rx(hackrf_device* device);
+ 
+extern ADDAPI int ADDCALL hackrf_start_tx(hackrf_device* device, hackrf_sample_block_cb_fn callback, void* tx_ctx);
+extern ADDAPI int ADDCALL hackrf_stop_tx(hackrf_device* device);
+
+/* return HACKRF_TRUE if success */
+extern ADDAPI int ADDCALL hackrf_is_streaming(hackrf_device* device);
+ 
+extern ADDAPI int ADDCALL hackrf_max2837_read(hackrf_device* device, uint8_t register_number, uint16_t* value);
+extern ADDAPI int ADDCALL hackrf_max2837_write(hackrf_device* device, uint8_t register_number, uint16_t value);
+ 
+extern ADDAPI int ADDCALL hackrf_si5351c_read(hackrf_device* device, uint16_t register_number, uint16_t* value);
+extern ADDAPI int ADDCALL hackrf_si5351c_write(hackrf_device* device, uint16_t register_number, uint16_t value);
+ 
+extern ADDAPI int ADDCALL hackrf_set_baseband_filter_bandwidth(hackrf_device* device, const uint32_t bandwidth_hz);
+ 
+extern ADDAPI int ADDCALL hackrf_rffc5071_read(hackrf_device* device, uint8_t register_number, uint16_t* value);
+extern ADDAPI int ADDCALL hackrf_rffc5071_write(hackrf_device* device, uint8_t register_number, uint16_t value);
+ 
+extern ADDAPI int ADDCALL hackrf_spiflash_erase(hackrf_device* device);
+extern ADDAPI int ADDCALL hackrf_spiflash_write(hackrf_device* device, const uint32_t address, const uint16_t length, unsigned char* const data);
+extern ADDAPI int ADDCALL hackrf_spiflash_read(hackrf_device* device, const uint32_t address, const uint16_t length, unsigned char* data);
+extern ADDAPI int ADDCALL hackrf_spiflash_status(hackrf_device* device, uint8_t* data);
+extern ADDAPI int ADDCALL hackrf_spiflash_clear_status(hackrf_device* device);
+
+/* device will need to be reset after hackrf_cpld_write */
+extern ADDAPI int ADDCALL hackrf_cpld_write(hackrf_device* device,
+		unsigned char* const data, const unsigned int total_length);
+		
+extern ADDAPI int ADDCALL hackrf_board_id_read(hackrf_device* device, uint8_t* value);
+extern ADDAPI int ADDCALL hackrf_version_string_read(hackrf_device* device, char* version, uint8_t length);
+extern ADDAPI int ADDCALL hackrf_usb_api_version_read(hackrf_device* device, uint16_t* version);
+
+extern ADDAPI int ADDCALL hackrf_set_freq(hackrf_device* device, const uint64_t freq_hz);
+extern ADDAPI int ADDCALL hackrf_set_freq_explicit(hackrf_device* device,
+		const uint64_t if_freq_hz, const uint64_t lo_freq_hz,
+		const enum rf_path_filter path);
+
+/* currently 8-20Mhz - either as a fraction, i.e. freq 20000000hz divider 2 -> 10Mhz or as plain old 10000000hz (double)
+	preferred rates are 8, 10, 12.5, 16, 20Mhz due to less jitter */
+extern ADDAPI int ADDCALL hackrf_set_sample_rate_manual(hackrf_device* device, const uint32_t freq_hz, const uint32_t divider);
+extern ADDAPI int ADDCALL hackrf_set_sample_rate(hackrf_device* device, const double freq_hz);

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

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

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

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

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

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

@@ -0,0 +1,422 @@
+#
+/*
+ * Copyright (C) 2014 .. 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-mini program
+ *
+ * dab-mini 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-mini 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-mini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	"lime-handler.h"
+
+#define	FIFO_SIZE	32768
+static
+int16_t localBuffer [4 * FIFO_SIZE];
+lms_info_str_t limedevices [10];
+
+	limeHandler::limeHandler (QSettings	*limeSettings,
+	 QSpinBox	*gainSelector,
+	 QSpinBox	*lnaGainSetting,
+	 QCheckBox *agcControl) {
+	this	-> limeSettings		= limeSettings;
+	this	-> gainSelector		= gainSelector;
+ this	-> lnaGainSetting	= lnaGainSetting;
+ this	-> agcControl		= agcControl;
+
+#ifdef __MINGW32__
+ const char *libraryString = "LimeSuite.dll";
+ Handle = LoadLibrary ((wchar_t *)L"LimeSuite.dll");
+#elif __clang__
+ const char *libraryString = "/opt/local/lib/libLimeSuite.dylib";
+ Handle		= dlopen (libraryString, RTLD_NOW);
+#else
+ const char *libraryString = "libLimeSuite.so";
+ Handle = dlopen (libraryString, RTLD_NOW);
+#endif
+
+ if (Handle == nullptr) {
+ fprintf (stderr, "failed to open %s\n", libraryString);
+ throw (20);
+ }
+
+ libraryLoaded = true;
+	if (!load_limeFunctions()) {
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+ throw (21);
+ }
+
+	fprintf (stderr, "Lime library available\n");
+// From here we have a library available
+
+	int ndevs	= LMS_GetDeviceList (limedevices);
+	if (ndevs == 0) {	// no devices found
+	 throw (21);
+	}
+
+	for (int i = 0; i < ndevs; i ++)
+	 fprintf (stderr, "device %s\n", limedevices [i]);
+
+	int res		= LMS_Open (&theDevice, nullptr, nullptr);
+	if (res < 0) {	// some error
+	 throw (22);
+	}
+
+	res		= LMS_Init (theDevice);
+	if (res < 0) {	// some error
+	 LMS_Close (&theDevice);
+	 throw (23);
+	}
+
+	res		= LMS_GetNumChannels (theDevice, LMS_CH_RX);
+	if (res < 0) {	// some error
+	 LMS_Close (&theDevice);
+	 throw (24);
+	}
+
+	fprintf (stderr, "device %s supports %d channels\n",
+	 limedevices [0], res);
+	res		= LMS_EnableChannel (theDevice, LMS_CH_RX, 0, true);
+	if (res < 0) {	// some error
+	 LMS_Close (theDevice);
+	 throw (24);
+	}
+
+	res	= LMS_SetSampleRate (theDevice, 2048000.0, 0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 throw (25);
+	}
+
+	float_type host_Hz, rf_Hz;
+	res	= LMS_GetSampleRate (theDevice, LMS_CH_RX, 0,
+	 &host_Hz, &rf_Hz);
+
+	fprintf (stderr, "samplerate = %f %f\n", (float)host_Hz, (float)rf_Hz);
+	
+	res	= LMS_GetAntennaList (theDevice, LMS_CH_RX, 0, antennas);
+	for (int i = 0; i < res; i ++) {
+	 fprintf (stderr, "antenna %s\n", antennas [i]);
+	 antennaList << antennas [i];
+	}
+
+	int index	= antennaList. indexOf ("Auto");
+//	default antenna setting
+	res		= LMS_SetAntenna (theDevice, LMS_CH_RX, 0, index + 1);
+
+//	default frequency
+	res		= LMS_SetLOFrequency (theDevice, LMS_CH_RX,
+	 0, 220000000.0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 throw (26);
+	}
+
+	res		= LMS_SetLPFBW (theDevice, LMS_CH_RX,
+	 0, 1536000.0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 throw (27);
+	}
+
+	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, 50);
+
+	LMS_Calibrate (theDevice, LMS_CH_RX, 0, 2500000.0, 0);
+	
+	_I_Buffer	= new RingBuffer<std::complex<int16_t>> (8 * 1024 * 1024);
+
+	gainSelector	-> setRange (0, 73);
+	limeSettings	-> beginGroup ("limeSettings");
+	int k	= limeSettings	-> value ("gain", 50). toInt();
+	limeSettings	-> endGroup();
+	gainSelector -> setValue (k);
+	setGain (k);
+	connect (gainSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (setGain (int)));
+	running. store (false);
+}
+
+	limeHandler::~limeHandler() {
+	stopReader ();
+	running. store (false);
+	while (isRunning())
+	 usleep (100);
+	limeSettings	-> beginGroup ("limeSettings");
+	limeSettings	-> setValue ("gain", gainSelector -> value());
+	limeSettings	-> endGroup();
+	LMS_Close (theDevice);
+	delete _I_Buffer;
+}
+
+void	limeHandler::setGain		(int g) {
+float_type gg;
+	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, g);
+	LMS_GetNormalizedGain (theDevice, LMS_CH_RX, 0, &gg);
+}
+
+bool	limeHandler::restartReader	(int32_t freq) {
+int	res;
+
+	if (isRunning())
+	 return true;
+	LMS_SetLOFrequency (theDevice, LMS_CH_RX, 0, freq);
+	stream. isTx = false;
+ stream. channel = 0;
+ stream. fifoSize = FIFO_SIZE;
+ stream. throughputVsLatency = 0.1; // ???
+ stream. dataFmt = lms_stream_t::LMS_FMT_I12; // 12 bit ints
+	res = LMS_SetupStream (theDevice, &stream);
+ if (res < 0)
+ return false;
+ res = LMS_StartStream (&stream);
+ if (res < 0)
+ return false;
+
+	start();
+	return true;
+}
+	
+void	limeHandler::stopReader() {
+	if (!isRunning())
+	 return;
+	running. store (false);

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

@@ -0,0 +1,169 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-mini
+ *
+ * dab-mini 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-mini 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-mini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __LIME_HANDLER__
+#define	__LIME_HANDLER__
+
+#include	<QObject>
+#include	<QThread>
+#include <QCheckBox>
+#include <QSpinBox>
+#include	<QSettings>
+#include	<atomic>
+#include	<vector>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<LimeSuite.h>
+#include	"device-handler.h"
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
+
+
+//	DLL and ".so" function prototypes
+typedef int	(*pfn_LMS_GetDeviceList)(lms_info_str_t *dev_list);
+typedef	int	(*pfn_LMS_Open)(lms_device_t **device,
+	 const lms_info_str_t info, void* args);
+typedef	int	(*pfn_LMS_Close)(lms_device_t *);
+typedef	int	(*pfn_LMS_Init) (lms_device_t *);
+typedef	int	(*pfn_LMS_GetNumChannels) (lms_device_t *device, bool dir_tx);
+typedef	int	(*pfn_LMS_EnableChannel) (lms_device_t *device, bool dir_tx,
+	 size_t chan, bool enabled);
+typedef	int	(*pfn_LMS_SetSampleRate) (lms_device_t *device,
+	 float_type rate,
+	 size_t oversample);
+typedef	int	(*pfn_LMS_GetSampleRate)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *host_Hz, float_type *rf_Hz);
+typedef	int	(*pfn_LMS_SetLOFrequency)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type frequency);
+typedef	int	(*pfn_LMS_GetLOFrequency)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *frequency);
+typedef	int	(*pfn_LMS_GetAntennaList) (lms_device_t *device, bool dir_tx,
+	 size_t chan, lms_name_t *list);
+typedef	int	(*pfn_LMS_SetAntenna) (lms_device_t *dev, bool dir_tx,
+	 size_t chan, size_t index);
+typedef	int	(*pfn_LMS_GetAntenna)(lms_device_t *dev, bool dir_tx, size_t chan);
+typedef	int	(*pfn_LMS_GetAntennaBW)(lms_device_t *dev, bool dir_tx,
+	 size_t chan, size_t index, lms_range_t *range);
+typedef	int	(*pfn_LMS_SetNormalizedGain)(lms_device_t *device, bool dir_tx,
+	 size_t chan,float_type gain);
+typedef	int	(*pfn_LMS_SetGaindB)(lms_device_t *device, bool dir_tx,
+	 size_t chan, unsigned gain);
+typedef	int	(*pfn_LMS_GetNormalizedGain)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *gain);
+typedef	int	(*pfn_LMS_GetGaindB)(lms_device_t *device, bool dir_tx,
+	 size_t chan, unsigned *gain);
+typedef	int	(*pfn_LMS_SetLPFBW)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type bandwidth);
+typedef	int	(*pfn_LMS_GetLPFBW)(lms_device_t *device, bool dir_tx,
+ size_t chan, float_type *bandwidth);
+typedef	int 	(*pfn_LMS_Calibrate)(lms_device_t *device, bool dir_tx,
+	 size_t chan, double bw, unsigned flags);
+typedef	int	(*pfn_LMS_SetupStream)(lms_device_t *device,
+	 lms_stream_t *stream);
+typedef	int	(*pfn_LMS_DestroyStream)(lms_device_t *dev,
+	 lms_stream_t *stream);
+typedef	int	(*pfn_LMS_StartStream)(lms_stream_t *stream);
+typedef	int	(*pfn_LMS_StopStream)(lms_stream_t *stream);
+typedef	int	(*pfn_LMS_RecvStream)(lms_stream_t *stream, void *samples,
+ size_t sample_count,
+	 lms_stream_meta_t *meta,
+	 unsigned timeout_ms);
+typedef	int	(*pfn_LMS_GetStreamStatus)(lms_stream_t *stream,
+	 lms_stream_status_t* status);
+
+class	limeHandler: public deviceHandler {
+Q_OBJECT
+public:
+			limeHandler		(QSettings *,
+	 QSpinBox *,
+ QSpinBox *,
+ QCheckBox *);
+			~limeHandler		();
+	bool		restartReader		(int32_t);
+	void		stopReader		();
+	int32_t getSamples (std::complex<float> *,
+ int32_t);
+ int32_t Samples			();
+ void resetBuffer		();
+ int16_t bitDepth		();
+
+private:
+	QString		deviceModel;
+	QSettings	*limeSettings;
+	QSpinBox *gainSelector;
+ QSpinBox	*lnaGainSetting;
+ QCheckBox *agcControl;
+
+	std::atomic<bool>	running;
+	lms_device_t	*theDevice;
+	lms_name_t	antennas [10];
+	QStringList	antennaList;
+	RingBuffer<std::complex<int16_t>> *_I_Buffer;
+	bool		load_limeFunctions();
+	HINSTANCE	Handle;
+	bool		libraryLoaded;
+	lms_stream_meta_t meta;
+ lms_stream_t stream;
+ void		run			();
+public slots:
+	void		setGain			(int);
+
+
+//	imported functions
+public:
+	pfn_LMS_GetDeviceList	LMS_GetDeviceList;
+	pfn_LMS_Open		LMS_Open;
+	pfn_LMS_Close		LMS_Close;
+	pfn_LMS_Init		LMS_Init;
+	pfn_LMS_GetNumChannels	LMS_GetNumChannels;
+	pfn_LMS_EnableChannel	LMS_EnableChannel;
+	pfn_LMS_SetSampleRate	LMS_SetSampleRate;
+	pfn_LMS_GetSampleRate	LMS_GetSampleRate;
+	pfn_LMS_SetLOFrequency	LMS_SetLOFrequency;
+	pfn_LMS_GetLOFrequency	LMS_GetLOFrequency;
+	pfn_LMS_GetAntennaList	LMS_GetAntennaList;
+	pfn_LMS_SetAntenna	LMS_SetAntenna;
+	pfn_LMS_GetAntenna	LMS_GetAntenna;
+	pfn_LMS_GetAntennaBW	LMS_GetAntennaBW;
+	pfn_LMS_SetNormalizedGain	LMS_SetNormalizedGain;
+	pfn_LMS_SetGaindB	LMS_SetGaindB;
+	pfn_LMS_GetNormalizedGain	LMS_GetNormalizedGain;
+	pfn_LMS_GetGaindB	LMS_GetGaindB;
+	pfn_LMS_SetLPFBW	LMS_SetLPFBW;
+	pfn_LMS_GetLPFBW	LMS_GetLPFBW;
+	pfn_LMS_Calibrate	LMS_Calibrate;
+
+	pfn_LMS_SetupStream	LMS_SetupStream;
+	pfn_LMS_DestroyStream	LMS_DestroyStream;
+	pfn_LMS_StartStream	LMS_StartStream;
+	pfn_LMS_StopStream	LMS_StopStream;
+	pfn_LMS_RecvStream	LMS_RecvStream;
+	pfn_LMS_GetStreamStatus	LMS_GetStreamStatus;
+};
+
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler/rtl-sdr.h Added

@@ -0,0 +1,367 @@
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012-2013 by Steve Markgraf <steve@steve-m.de>
+ * Copyright (C) 2012 by Dimitri Stolnikov <horiz0n@gmx.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RTL_SDR_H
+#define __RTL_SDR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <rtl-sdr_export.h>
+
+typedef struct rtlsdr_dev rtlsdr_dev_t;
+
+RTLSDR_API uint32_t rtlsdr_get_device_count(void);
+
+RTLSDR_API const char* rtlsdr_get_device_name(uint32_t index);
+
+/*!
+ * Get USB device strings.
+ *
+ * NOTE: The string arguments must provide space for up to 256 bytes.
+ *
+ * \param index the device index
+ * \param manufact manufacturer name, may be NULL
+ * \param product product name, may be NULL
+ * \param serial serial number, may be NULL
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_get_device_usb_strings(uint32_t index,
+					 char *manufact,
+					 char *product,
+					 char *serial);
+
+/*!
+ * Get device index by USB serial string descriptor.
+ *
+ * \param serial serial string of the device
+ * \return device index of first device where the name matched
+ * \return -1 if name is NULL
+ * \return -2 if no devices were found at all
+ * \return -3 if devices were found, but none with matching name
+ */
+RTLSDR_API int rtlsdr_get_index_by_serial(const char *serial);
+
+RTLSDR_API int rtlsdr_open(rtlsdr_dev_t **dev, uint32_t index);
+
+RTLSDR_API int rtlsdr_close(rtlsdr_dev_t *dev);
+
+/* configuration functions */
+
+/*!
+ * Set crystal oscillator frequencies used for the RTL2832 and the tuner IC.
+ *
+ * Usually both ICs use the same clock. Changing the clock may make sense if
+ * you are applying an external clock to the tuner or to compensate the
+ * frequency (and samplerate) error caused by the original (cheap) crystal.
+ *
+ * NOTE: Call this function only if you fully understand the implications.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param rtl_freq frequency value used to clock the RTL2832 in Hz
+ * \param tuner_freq frequency value used to clock the tuner IC in Hz
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq,
+				 uint32_t tuner_freq);
+
+/*!
+ * Get crystal oscillator frequencies used for the RTL2832 and the tuner IC.
+ *
+ * Usually both ICs use the same clock.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param rtl_freq frequency value used to clock the RTL2832 in Hz
+ * \param tuner_freq frequency value used to clock the tuner IC in Hz
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq,
+				 uint32_t *tuner_freq);
+
+/*!
+ * Get USB device strings.
+ *
+ * NOTE: The string arguments must provide space for up to 256 bytes.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param manufact manufacturer name, may be NULL
+ * \param product product name, may be NULL
+ * \param serial serial number, may be NULL
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact,
+				 char *product, char *serial);
+
+/*!
+ * Write the device EEPROM
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param data buffer of data to be written
+ * \param offset address where the data should be written
+ * \param len length of the data
+ * \return 0 on success
+ * \return -1 if device handle is invalid
+ * \return -2 if EEPROM size is exceeded
+ * \return -3 if no EEPROM was found
+ */
+
+RTLSDR_API int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
+				 uint8_t offset, uint16_t len);
+
+/*!
+ * Read the device EEPROM
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param data buffer where the data should be written
+ * \param offset address where the data should be read from
+ * \param len length of the data
+ * \return 0 on success
+ * \return -1 if device handle is invalid
+ * \return -2 if EEPROM size is exceeded
+ * \return -3 if no EEPROM was found
+ */
+
+RTLSDR_API int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data,
+				 uint8_t offset, uint16_t len);
+
+RTLSDR_API int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq);
+
+/*!
+ * Get actual frequency the device is tuned to.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \return 0 on error, frequency in Hz otherwise
+ */
+RTLSDR_API uint32_t rtlsdr_get_center_freq(rtlsdr_dev_t *dev);
+
+/*!
+ * Set the frequency correction value for the device.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param ppm correction value in parts per million (ppm)
+ * \return 0 on success
+ */
+RTLSDR_API int rtlsdr_set_freq_correction(rtlsdr_dev_t *dev, int ppm);
+
+/*!
+ * Get actual frequency correction value of the device.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \return correction value in parts per million (ppm)
+ */
+RTLSDR_API int rtlsdr_get_freq_correction(rtlsdr_dev_t *dev);
+
+enum rtlsdr_tuner {
+	RTLSDR_TUNER_UNKNOWN = 0,
+	RTLSDR_TUNER_E4000,
+	RTLSDR_TUNER_FC0012,
+	RTLSDR_TUNER_FC0013,
+	RTLSDR_TUNER_FC2580,
+	RTLSDR_TUNER_R820T,
+	RTLSDR_TUNER_R828D
+};
+
+/*!
+ * Get the tuner type.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \return RTLSDR_TUNER_UNKNOWN on error, tuner type otherwise
+ */
+RTLSDR_API enum rtlsdr_tuner rtlsdr_get_tuner_type(rtlsdr_dev_t *dev);
+
+/*!
+ * Get a list of gains supported by the tuner.
+ *
+ * NOTE: The gains argument must be preallocated by the caller. If NULL is
+ * being given instead, the number of available gain values will be returned.
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param gains array of gain values. In tenths of a dB, 115 means 11.5 dB.
+ * \return <= 0 on error, number of available (returned) gain values otherwise
+ */

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler/rtl-sdr_export.h Added

@@ -0,0 +1,47 @@
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012 by Hoernchen <la@tfc-server.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RTLSDR_EXPORT_H
+#define RTLSDR_EXPORT_H
+
+#if defined __GNUC__
+# if __GNUC__ >= 4
+# define __SDR_EXPORT __attribute__((visibility("default")))
+# define __SDR_IMPORT __attribute__((visibility("default")))
+# else
+# define __SDR_EXPORT
+# define __SDR_IMPORT
+# endif
+#elif _MSC_VER
+# define __SDR_EXPORT __declspec(dllexport)
+# define __SDR_IMPORT __declspec(dllimport)
+#else
+# define __SDR_EXPORT
+# define __SDR_IMPORT
+#endif
+
+#ifndef rtlsdr_STATIC
+#	ifdef rtlsdr_EXPORTS
+#	define RTLSDR_API __SDR_EXPORT
+#	else
+#	define RTLSDR_API __SDR_IMPORT
+#	endif
+#else
+#define RTLSDR_API
+#endif
+#endif /* RTLSDR_EXPORT_H */

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler/rtlsdr-handler.cpp Added

@@ -0,0 +1,465 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dabradio
+ * dabradio 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.
+ *
+ * dabradio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-SDR; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	This particular driver is a very simple wrapper around the
+ * 	librtlsdr. In order to keep things simple, we dynamically
+ * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
+ * 	are greatly acknowledged
+ */
+
+#include	<QThread>
+#include	"rtlsdr-handler.h"
+#include	"rtl-sdr.h"
+
+#ifdef	__MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+#define	READLEN_DEFAULT	8192
+//
+//	For the callback, we do need some environment which
+//	is passed through the ctx parameter
+//
+//	This is the user-side call back function
+//	ctx is the calling task
+static
+void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
+rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
+
+	if ((theStick == NULL) || (len != READLEN_DEFAULT))
+	 return;
+
+	(void)theStick -> _I_Buffer -> putDataIntoBuffer (buf, len);
+}
+//
+//	for handling the events in libusb, we need a controlthread
+//	whose sole purpose is to process the rtlsdr_read_async function
+//	from the lib.
+class	dll_driver : public QThread {
+private:
+	rtlsdrHandler	*theStick;
+public:
+
+	dll_driver (rtlsdrHandler *d) {
+	theStick	= d;
+	start ();
+	}
+
+	~dll_driver (void) {
+	}
+
+private:
+virtual void	run (void) {
+	(theStick -> rtlsdr_read_async) (theStick -> device,
+	 (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
+	 (void *)theStick,
+	 0,
+	 READLEN_DEFAULT);
+	}
+};
+//
+//	Our wrapper is a simple classs
+	rtlsdrHandler::rtlsdrHandler (QSettings *rtlsdrSettings,
+	 QSpinBox	*ifgainSelector,
+	 QCheckBox	*agcControl) {
+int16_t	deviceCount;
+int32_t	r;
+int	i, k;
+
+	this	-> rtlsdrSettings	= rtlsdrSettings;
+	this	-> ifgainSelector	= ifgainSelector;
+	ifgainSelector	-> setToolTip ("ifgain, range 1 .. 100");
+	ifgainSelector	-> setRange (1, 100);
+	this	-> agcControl		= agcControl;
+
+	inputRate		= 2048000;
+	libraryLoaded		= false;
+	open			= false;
+	_I_Buffer		= NULL;
+	workerHandle		= NULL;
+	lastFrequency		= KHz (22000);	// just a dummy
+	gains			= NULL;
+
+#ifdef	__MINGW32__
+	const char *libraryString = "rtlsdr.dll";
+	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
+#else
+	const char *libraryString = "librtlsdr.so";
+	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
+#endif
+
+	if (Handle == NULL) {
+	 throw (20);
+	}
+
+	libraryLoaded	= true;
+	if (!load_rtlFunctions ()) {
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (21);
+	}
+//
+//	Ok, from here we have the library functions accessible
+	deviceCount 		= this -> rtlsdr_get_device_count ();
+	if (deviceCount == 0) {
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (22);
+	}
+
+//	OK, now open the hardware
+	r			= this -> rtlsdr_open (&device, 0);
+	if (r < 0) {
+	 fprintf (stderr, "Opening rtlsdr device failed\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (23);
+	}
+
+	open			= true;
+	r			= this -> rtlsdr_set_sample_rate (device,
+	 inputRate);
+	if (r < 0) {
+	 fprintf (stderr, "Setting samplerate failed\n");
+	 rtlsdr_close (device);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (24);
+	}
+
+	r			= this -> rtlsdr_get_sample_rate (device);
+	fprintf (stderr, "samplerate set to %d\n", r);
+
+	gainsCount = rtlsdr_get_tuner_gains (device, NULL);
+	fprintf(stderr, "Supported gain values (%d): ", gainsCount);
+	gains		= new int [gainsCount];
+	gainsCount = rtlsdr_get_tuner_gains (device, gains);
+	for (i = gainsCount; i > 0; i--) {
+	 fprintf (stderr, "%.1f ", gains [i - 1] / 10.0);
+	}
+	fprintf(stderr, "\n");
+
+	rtlsdr_set_tuner_gain_mode (device, 1);
+	rtlsdr_set_agc_mode (device, 0);
+	_I_Buffer		= new RingBuffer<uint8_t>(8 * 1024 * 1024);
+//
+//	See what the saved values are and restore the GUI settings
+	
+	rtlsdrSettings	-> beginGroup ("rtlsdrSettings");
+ int ifgain = rtlsdrSettings -> value ("ifgain", 50). toInt ();
+ ifgainSelector	-> setValue (ifgain);
+
+ bool agcMode = rtlsdrSettings -> value ("agcMode", 0). toInt () != 0;
+ if (agcMode) {
+ agcControl -> setChecked (true);
+ }
+
+	rtlsdrSettings	-> endGroup ();
+	if (agcMode)
+	 rtlsdr_set_agc_mode (device, 1);
+	else
+	 rtlsdr_set_agc_mode (device, 0);
+	rtlsdr_set_tuner_gain	(device, gains [(int)(ifgain * gainsCount / 100)]);
+	connect (ifgainSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_ifgain (int)));
+	connect (agcControl, SIGNAL (stateChanged (int)),
+	 this, SLOT (set_agcControl (int)));
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/rtlsdr-handler/rtlsdr-handler.h Added

@@ -0,0 +1,122 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dabradio
+ *
+ * dabradio 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.
+ *
+ * dabradio 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 dabradio; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __RTLSDR_HANDLER__
+#define	__RTLSDR_HANDLER__
+
+#include	<QSettings>
+#include	<QSpinBox>
+#include	<QCheckBox>
+#include	<stdio.h>
+#include	"dab-constants.h"
+#include	"device-handler.h"
+#include	"ringbuffer.h"
+
+class	dll_driver;
+//
+//	create typedefs for the library functions
+typedef	struct rtlsdr_dev rtlsdr_dev_t;
+extern "C" {
+typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
+typedef	 int (* pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
+typedef	int (* pfnrtlsdr_close) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
+typedef uint32_t (* pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
+typedef	int (* pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_agc_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
+typedef	int (* pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_read_async) (rtlsdr_dev_t *,
+	 rtlsdr_read_async_cb_t,
+	 void *,
+	 uint32_t,
+	 uint32_t);
+typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
+typedef uint32_t (* pfnrtlsdr_get_device_count) (void);
+typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
+typedef	char *(* pfnrtlsdr_get_device_name)(int);
+}
+//	This class is a simple wrapper around the
+//	rtlsdr library that is read in as dll (or .so file in linux)
+//	It does not do any processing
+class	rtlsdrHandler: public deviceHandler {
+Q_OBJECT
+public:
+			rtlsdrHandler	(QSettings *,
+	 QSpinBox *,
+	 QCheckBox *);
+			~rtlsdrHandler	(void);
+//	interface to the reader
+	bool		restartReader	(int32_t frequency);
+	void		stopReader	(void);
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples		(void);
+	void		resetBuffer	(void);
+	int16_t		bitDepth	(void);
+//
+//	These need to be visible for the separate usb handling thread
+	RingBuffer<uint8_t>	*_I_Buffer;
+	pfnrtlsdr_read_async	rtlsdr_read_async;
+	struct rtlsdr_dev	*device;
+private:
+	QSettings	*rtlsdrSettings;
+	QSpinBox	*ifgainSelector;
+	QCheckBox	*agcControl;
+	int32_t		inputRate;
+	HINSTANCE	Handle;
+	dll_driver	*workerHandle;
+	bool		libraryLoaded;
+	bool		open;
+	int		*gains;
+	int16_t		gainsCount;
+//	here we need to load functions from the dll
+	bool		load_rtlFunctions	(void);
+	pfnrtlsdr_open	rtlsdr_open;
+	pfnrtlsdr_close	rtlsdr_close;
+
+	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
+	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
+	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
+	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
+	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
+	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
+	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
+	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
+	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
+	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
+	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
+	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
+	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
+	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+private slots:
+	void set_ifgain		(int);
+ void set_agcControl (int);
+};
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/mirsdrapi-rsp.h Added

@@ -0,0 +1,354 @@
+//
+// Copyright (c) 2013 Mirics Ltd, All Rights Reserved
+//
+
+#ifndef MIR_SDR_H
+#define MIR_SDR_H
+
+#ifndef _MIR_SDR_QUALIFIER
+#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86)) 
+#define _MIR_SDR_QUALIFIER __declspec(dllimport)
+#elif defined(STATIC_LIB) || defined(__GNUC__) 
+#define _MIR_SDR_QUALIFIER
+#endif
+#endif  // _MIR_SDR_QUALIFIER
+
+// Application code should check that it is compiled against the same API version
+// mir_sdr_ApiVersion() returns the API version 
+#define MIR_SDR_API_VERSION   (float)(2.13)
+
+#if defined(ANDROID) || defined(__ANDROID__)
+// Android requires a mechanism to request info from Java application
+typedef enum
+{
+  mir_sdr_GetFd              = 0,
+  mir_sdr_FreeFd             = 1,
+  mir_sdr_DevNotFound        = 2,
+  mir_sdr_DevRemoved         = 3,
+  mir_sdr_GetVendorId        = 4,
+  mir_sdr_GetProductId       = 5,
+  mir_sdr_GetRevId           = 6,
+  mir_sdr_GetDeviceId        = 7
+} mir_sdr_JavaReqT;
+
+typedef int (*mir_sdr_SendJavaReq_t)(mir_sdr_JavaReqT cmd, char *path, char *serNum);
+#endif
+
+typedef enum
+{
+  mir_sdr_Success            = 0,
+  mir_sdr_Fail               = 1,
+  mir_sdr_InvalidParam       = 2,
+  mir_sdr_OutOfRange         = 3,
+  mir_sdr_GainUpdateError    = 4,
+  mir_sdr_RfUpdateError      = 5,
+  mir_sdr_FsUpdateError      = 6,
+  mir_sdr_HwError            = 7,
+  mir_sdr_AliasingError      = 8,
+  mir_sdr_AlreadyInitialised = 9,
+  mir_sdr_NotInitialised     = 10,
+  mir_sdr_NotEnabled         = 11,
+  mir_sdr_HwVerError         = 12,
+  mir_sdr_OutOfMemError      = 13,
+  mir_sdr_HwRemoved          = 14
+} mir_sdr_ErrT;
+
+typedef enum
+{
+  mir_sdr_BW_Undefined = 0,
+  mir_sdr_BW_0_200     = 200,
+  mir_sdr_BW_0_300     = 300,
+  mir_sdr_BW_0_600     = 600,
+  mir_sdr_BW_1_536     = 1536,
+  mir_sdr_BW_5_000     = 5000,
+  mir_sdr_BW_6_000     = 6000,
+  mir_sdr_BW_7_000     = 7000,
+  mir_sdr_BW_8_000     = 8000
+} mir_sdr_Bw_MHzT;
+
+typedef enum
+{
+  mir_sdr_IF_Undefined = -1,
+  mir_sdr_IF_Zero      = 0,
+  mir_sdr_IF_0_450     = 450,
+  mir_sdr_IF_1_620     = 1620,
+  mir_sdr_IF_2_048     = 2048
+} mir_sdr_If_kHzT;
+
+typedef enum
+{
+  mir_sdr_ISOCH = 0,
+  mir_sdr_BULK  = 1
+} mir_sdr_TransferModeT;
+
+typedef enum
+{
+  mir_sdr_CHANGE_NONE    = 0x00,
+  mir_sdr_CHANGE_GR      = 0x01,
+  mir_sdr_CHANGE_FS_FREQ = 0x02,
+  mir_sdr_CHANGE_RF_FREQ = 0x04,
+  mir_sdr_CHANGE_BW_TYPE = 0x08,
+  mir_sdr_CHANGE_IF_TYPE = 0x10,
+  mir_sdr_CHANGE_LO_MODE = 0x20,
+  mir_sdr_CHANGE_AM_PORT = 0x40
+} mir_sdr_ReasonForReinitT;
+
+typedef enum
+{
+  mir_sdr_LO_Undefined = 0,
+  mir_sdr_LO_Auto      = 1,
+  mir_sdr_LO_120MHz    = 2,
+  mir_sdr_LO_144MHz    = 3,
+  mir_sdr_LO_168MHz    = 4
+} mir_sdr_LoModeT;
+
+typedef enum
+{
+  mir_sdr_BAND_AM_LO   = 0,
+  mir_sdr_BAND_AM_MID  = 1,
+  mir_sdr_BAND_AM_HI   = 2,
+  mir_sdr_BAND_VHF     = 3,
+  mir_sdr_BAND_3       = 4,
+  mir_sdr_BAND_X       = 5,
+  mir_sdr_BAND_4_5     = 6,
+  mir_sdr_BAND_L       = 7
+} mir_sdr_BandT;
+
+typedef enum
+{
+  mir_sdr_USE_SET_GR                = 0,
+  mir_sdr_USE_SET_GR_ALT_MODE       = 1,
+  mir_sdr_USE_RSP_SET_GR            = 2
+} mir_sdr_SetGrModeT;
+
+typedef enum
+{
+  mir_sdr_RSPII_BAND_UNKNOWN = 0,
+  mir_sdr_RSPII_BAND_AM_LO   = 1,
+  mir_sdr_RSPII_BAND_AM_MID  = 2,
+  mir_sdr_RSPII_BAND_AM_HI   = 3,
+  mir_sdr_RSPII_BAND_VHF     = 4,
+  mir_sdr_RSPII_BAND_3       = 5,
+  mir_sdr_RSPII_BAND_X_LO    = 6,
+  mir_sdr_RSPII_BAND_X_MID   = 7,
+  mir_sdr_RSPII_BAND_X_HI    = 8,
+  mir_sdr_RSPII_BAND_4_5     = 9,
+  mir_sdr_RSPII_BAND_L       = 10
+} mir_sdr_RSPII_BandT;
+
+typedef enum
+{
+  mir_sdr_RSPII_ANTENNA_A = 5,
+  mir_sdr_RSPII_ANTENNA_B = 6
+} mir_sdr_RSPII_AntennaSelectT;
+
+typedef enum
+{
+  mir_sdr_AGC_DISABLE  = 0,
+  mir_sdr_AGC_100HZ    = 1,
+  mir_sdr_AGC_50HZ     = 2,
+  mir_sdr_AGC_5HZ      = 3
+} mir_sdr_AgcControlT;
+
+typedef enum
+{
+  mir_sdr_GAIN_MESSAGE_START_ID  = 0x80000000,
+  mir_sdr_ADC_OVERLOAD_DETECTED  = mir_sdr_GAIN_MESSAGE_START_ID + 1,
+  mir_sdr_ADC_OVERLOAD_CORRECTED = mir_sdr_GAIN_MESSAGE_START_ID + 2
+} mir_sdr_GainMessageIdT;
+
+typedef enum
+{
+  mir_sdr_EXTENDED_MIN_GR = 0,
+  mir_sdr_NORMAL_MIN_GR   = 20
+} mir_sdr_MinGainReductionT;
+
+typedef struct 
+{
+   char *SerNo;
+   char *DevNm;
+   unsigned char hwVer;
+   unsigned char devAvail;
+} mir_sdr_DeviceT;
+
+typedef struct
+{
+   float curr;
+   float max;
+   float min;
+} mir_sdr_GainValuesT;
+
+typedef enum
+{
+   mir_sdr_rspDuo_Tuner_1 = 1,
+   mir_sdr_rspDuo_Tuner_2 = 2,
+} mir_sdr_rspDuo_TunerSelT;
+
+// mir_sdr_StreamInit() callback function prototypes
+typedef void (*mir_sdr_StreamCallback_t)(short *xi, short *xq, unsigned int firstSampleNum, int grChanged, int rfChanged, int fsChanged, unsigned int numSamples, unsigned int reset, unsigned int hwRemoved, void *cbContext); 
+typedef void (*mir_sdr_GainChangeCallback_t)(unsigned int gRdB, unsigned int lnaGRdB, void *cbContext); 
+
+typedef mir_sdr_ErrT (*mir_sdr_Init_t)(int gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int *samplesPerPacket);
+typedef mir_sdr_ErrT (*mir_sdr_Uninit_t)(void);
+typedef mir_sdr_ErrT (*mir_sdr_ReadPacket_t)(short *xi, short *xq, unsigned int *firstSampleNum, int *grChanged, int *rfChanged, int *fsChanged);
+typedef mir_sdr_ErrT (*mir_sdr_SetRf_t)(double drfHz, int abs, int syncUpdate);
+typedef mir_sdr_ErrT (*mir_sdr_SetFs_t)(double dfsHz, int abs, int syncUpdate, int reCal);
+typedef mir_sdr_ErrT (*mir_sdr_SetGr_t)(int gRdB, int abs, int syncUpdate);
+typedef mir_sdr_ErrT (*mir_sdr_SetGrParams_t)(int minimumGr, int lnaGrThreshold);
+typedef mir_sdr_ErrT (*mir_sdr_SetDcMode_t)(int dcCal, int speedUp);
+typedef mir_sdr_ErrT (*mir_sdr_SetDcTrackTime_t)(int trackTime);

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplay-handler.cpp Added

@@ -0,0 +1,611 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of dab-mini
+ *
+ * dab-mini is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * dab-mini 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-mini if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<QSettings>
+#include	"sdrplay-handler.h"
+#include	"sdrplayselect.h"
+
+static
+int RSP1_Table [] = {0, 24, 19, 43};
+//
+static
+int RSP1A_Table [] = {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
+//
+static
+int RSP2_Table [] = {0, 10, 15, 21, 24, 34, 39, 45, 64};
+//
+static
+int RSPduo_Table [] = {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
+
+
+	sdrplayHandler::sdrplayHandler (QSettings *sdrplaySettings,
+	 QSpinBox	*GRdBSetting,
+	 QSpinBox	*lnaGainSetting,
+	 QCheckBox	*agcControl) {
+int	err;
+float	ver;
+mir_sdr_DeviceT devDesc [4];
+mir_sdr_GainValuesT gainDesc;
+
+	this	-> sdrplaySettings	= sdrplaySettings;
+	this	-> GRdBSelector		= GRdBSetting;
+	GRdBSetting	-> setToolTip ("if gain reduction");
+	this	-> lnaGainSetting	= lnaGainSetting;
+	lnaGainSetting	-> setToolTip ("lna state selection");
+	this	-> agcControl		= agcControl;
+
+	this	-> inputRate		= Khz (2048);
+	_I_Buffer			= NULL;
+	libraryLoaded			= false;
+
+#ifdef	__MINGW32__
+HKEY APIkey;
+wchar_t APIkeyValue [256];
+ULONG APIkeyValue_length = 255;
+
+	wchar_t *libname = (wchar_t *)L"mir_sdr_api.dll";
+ Handle = LoadLibrary (libname);
+ if (Handle == NULL) {
+	 if (RegOpenKey (HKEY_LOCAL_MACHINE,
+	 TEXT("Software\\MiricsSDR\\API"),
+	 &APIkey) != ERROR_SUCCESS) {
+	 fprintf (stderr,
+	 "failed to locate API registry entry, error = %d\n",
+	 (int)GetLastError());
+	 throw (21);
+	 }
+
+	 RegQueryValueEx (APIkey,
+	 (wchar_t *)L"Install_Dir",
+	 NULL,
+	 NULL,
+	 (LPBYTE)&APIkeyValue,
+	 (LPDWORD)&APIkeyValue_length);
+//	Ok, make explicit it is in the 64 bits section
+	 wchar_t *x =
+	 wcscat (APIkeyValue, (wchar_t *)L"\\x86\\mir_sdr_api.dll");
+	 RegCloseKey(APIkey);
+
+	 Handle	= LoadLibrary (x);
+	 if (Handle == NULL) {
+	 fprintf (stderr, "Failed to open mir_sdr_api.dll\n");
+	 throw (22);
+	 }
+	}
+#else
+	Handle		= dlopen ("libusb-1.0.so", RTLD_NOW | RTLD_GLOBAL);
+	Handle		= dlopen ("libmirsdrapi-rsp.so", RTLD_NOW);
+	if (Handle == NULL) {
+	 fprintf (stderr, "we could not load libmirsdrapi-rsp\nIf that is not the device you were expecting, do not worry\n", dlerror ());
+	 throw (23);
+	}
+#endif
+	libraryLoaded	= true;
+
+	bool success = loadFunctions ();
+	if (!success) {
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (23);
+	}
+
+	err		= my_mir_sdr_ApiVersion (&ver);
+	if (ver < 2.13) {
+	 fprintf (stderr, "please install mir_sdr library >= 2.13\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (24);
+	}
+
+	_I_Buffer	= new RingBuffer<std::complex<float>>(1024 * 1024);
+//
+	my_mir_sdr_GetDevices (devDesc, &numofDevs, uint32_t (4));
+	if (numofDevs == 0) {
+	 fprintf (stderr, "Sorry, no device found\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 throw (25);
+	}
+
+	deviceIndex = 0;
+	hwVersion = devDesc [deviceIndex]. hwVer;
+	fprintf (stderr, "hwVer = %d\n", hwVersion);
+	err = my_mir_sdr_SetDeviceIdx (deviceIndex);
+	if (err != mir_sdr_Success) {
+	 throw (33);
+	}
+//
+// we know we are only in the frequency range 175 .. 230 Mhz,
+// so we can rely on a single table for the lna reductions.
+	switch (hwVersion) {
+	 case 1: // old RSP
+	 lnaGainSetting	-> setRange (0, 3);
+	 nrBits		= 12;
+	 denominator	= 2048;
+	 break;
+	 case 2:
+	 lnaGainSetting	-> setRange (0, 8);
+	 nrBits		= 14;
+	 denominator	= 8192;
+	 break;
+	 case 3:
+	 lnaGainSetting	-> setRange (0, 9);
+	 nrBits		= 14;
+	 denominator	= 8192;
+	 break;
+	 default:			// RSP1A
+	 lnaGainSetting	-> setRange (0, 9);
+	 nrBits		= 14;
+	 denominator	= 2048;
+	 break;
+	}
+
+	sdrplaySettings	-> beginGroup ("sdrplaySettings");
+	int lnaState	= sdrplaySettings -> value ("lnaState", 3). toInt ();
+	lnaGainSetting	-> setValue (lnaState);
+	int GRdB	= sdrplaySettings -> value ("GRdB", 35). toInt ();
+	GRdBSelector		-> setValue (GRdB);
+	bool	agcMode	= sdrplaySettings -> value ("agcMode", 0). toInt () != 0;
+	sdrplaySettings		-> endGroup ();
+	if (agcMode) {
+	 agcControl	-> setChecked (true);
+	 GRdBSetting	-> hide ();
+	}
+	 
+	if (hwVersion == 2) {
+	 mir_sdr_ErrT err;
+	 err = my_mir_sdr_RSPII_AntennaControl (mir_sdr_RSPII_ANTENNA_A);
+	 if (err != mir_sdr_Success)
+	 fprintf (stderr, "error %d in setting antenna\n", err);
+	 
+	}
+
+	if (hwVersion == 3) { // duo
+	 err = my_mir_sdr_rspDuo_TunerSel (mir_sdr_rspDuo_Tuner_1);
+	 if (err != mir_sdr_Success)
+	 fprintf (stderr, "error %d in setting of rspDuo\n", err);
+	}
+
+	running. store (false);
+	GRdBSetting	-> setMaximum (59);
+	GRdBSetting	-> setMinimum (20);

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplay-handler.h Added

@@ -0,0 +1,164 @@
+#
+ /*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-mini program
+ *
+ * dab-mini 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-mini 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-mini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __SDRPLAY_HANDLER__
+#define	__SDRPLAY_HANDLER__
+
+#include	<QSettings>
+#include	<QCheckBox>
+#include	<QSpinBox>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	"device-handler.h"
+#include	"mirsdrapi-rsp.h"
+
+typedef void (*mir_sdr_StreamCallback_t)(int16_t	*xi,
+	 int16_t	*xq,
+	 uint32_t	firstSampleNum, 
+	 int32_t	grChanged,
+	 int32_t	rfChanged,
+	 int32_t	fsChanged,
+	 uint32_t	numSamples,
+	 uint32_t	reset,
+	 uint32_t	hwRemoved,
+	 void		*cbContext);
+typedef	void	(*mir_sdr_GainChangeCallback_t)(uint32_t	gRdB,
+	 uint32_t	lnaGRdB,
+	 void		*cbContext);
+
+#ifdef __MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+// Dll and ".so" function prototypes
+typedef mir_sdr_ErrT (*pfn_mir_sdr_StreamInit) (int *gRdB, double fsMHz,
+double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int LNAEnable, int *gRdBsystem, int useGrAltMode, int *samplesPerPacket, mir_sdr_StreamCallback_t StreamCbFn, mir_sdr_GainChangeCallback_t GainChangeCbFn, void *cbContext); 
+
+typedef mir_sdr_ErrT (*pfn_mir_sdr_Reinit) (int *gRdB, double fsMHz,
+double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType,
+mir_sdr_LoModeT, int, int*, int, int*, mir_sdr_ReasonForReinitT);
+
+typedef mir_sdr_ErrT (*pfn_mir_sdr_StreamUninit)(void);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetRf)(double drfHz, int abs, int syncUpdate);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetFs)(double dfsHz, int abs, int syncUpdate, int reCal);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetGr)(int gRdB, int abs, int syncUpdate);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_RSP_SetGr)(int gRdB, int lnaState,
+ int abs, int syncUpdate);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetGrParams)(int minimumGr, int lnaGrThreshold);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetDcMode)(int dcCal, int speedUp);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetDcTrackTime)(int trackTime);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetSyncUpdateSampleNum)(unsigned int sampleNum);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetSyncUpdatePeriod)(unsigned int period);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_ApiVersion)(float *version); 
+typedef mir_sdr_ErrT (*pfn_mir_sdr_ResetUpdateFlags)(int resetGainUpdate, int resetRfUpdate, int resetFsUpdate); 
+typedef mir_sdr_ErrT (*pfn_mir_sdr_AgcControl)(uint32_t, int, int, uint32_t,
+	 uint32_t, int, int);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_DCoffsetIQimbalanceControl) (uint32_t, uint32_t);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetPpm)(double); 
+typedef mir_sdr_ErrT (*pfn_mir_sdr_DebugEnable)(uint32_t); 
+typedef mir_sdr_ErrT (*pfn_mir_sdr_GetDevices) (mir_sdr_DeviceT *, uint32_t *, uint32_t);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_GetCurrentGain) (mir_sdr_GainValuesT *);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_GetHwVersion) (unsigned char *);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_RSPII_AntennaControl) (mir_sdr_RSPII_AntennaSelectT);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_rspDuo_TunerSel) (mir_sdr_rspDuo_TunerSelT);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_SetDeviceIdx) (unsigned int);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_ReleaseDeviceIdx) (unsigned int);
+
+
+///////////////////////////////////////////////////////////////////////////
+class	sdrplayHandler: public deviceHandler {
+Q_OBJECT
+public:
+			sdrplayHandler		(QSettings *,
+	 QSpinBox *,
+	 QSpinBox *,
+	 QCheckBox *);
+			~sdrplayHandler		(void);
+
+	bool		restartReader		(int32_t);
+	void		stopReader		(void);
+	int32_t		getSamples		(std::complex<float> *,
+	 int32_t);
+	int32_t		Samples			(void);
+	void		resetBuffer		(void);
+	int16_t		bitDepth		(void);
+//
+//	The buffer should be visible by the callback function
+	RingBuffer<std::complex<float>>	*_I_Buffer;
+	float		denominator;
+private:
+	QSettings	*sdrplaySettings;
+	QSpinBox	*GRdBSelector;
+	QSpinBox	*lnaGainSetting;
+	QCheckBox	*agcControl;
+	QString		errorCodes	(mir_sdr_ErrT);
+	pfn_mir_sdr_StreamInit	my_mir_sdr_StreamInit;
+	pfn_mir_sdr_Reinit	my_mir_sdr_Reinit;
+	pfn_mir_sdr_StreamUninit	my_mir_sdr_StreamUninit;
+	pfn_mir_sdr_SetRf	my_mir_sdr_SetRf;
+	pfn_mir_sdr_SetFs	my_mir_sdr_SetFs;
+	pfn_mir_sdr_SetGr	my_mir_sdr_SetGr;
+ pfn_mir_sdr_RSP_SetGr my_mir_sdr_RSP_SetGr;
+	pfn_mir_sdr_SetGrParams my_mir_sdr_SetGrParams;
+ pfn_mir_sdr_SetDcMode my_mir_sdr_SetDcMode;
+
+	pfn_mir_sdr_SetDcTrackTime my_mir_sdr_SetDcTrackTime;
+	pfn_mir_sdr_SetSyncUpdateSampleNum
+	 my_mir_sdr_SetSyncUpdateSampleNum;
+	pfn_mir_sdr_SetSyncUpdatePeriod
+	 my_mir_sdr_SetSyncUpdatePeriod;
+	pfn_mir_sdr_ApiVersion	my_mir_sdr_ApiVersion;
+	pfn_mir_sdr_ResetUpdateFlags
+	 my_mir_sdr_ResetUpdateFlags;
+	pfn_mir_sdr_AgcControl	my_mir_sdr_AgcControl;
+	pfn_mir_sdr_DCoffsetIQimbalanceControl
+	 my_mir_sdr_DCoffsetIQimbalanceControl;
+	pfn_mir_sdr_SetPpm	my_mir_sdr_SetPpm;
+	pfn_mir_sdr_DebugEnable	my_mir_sdr_DebugEnable;
+	pfn_mir_sdr_GetDevices my_mir_sdr_GetDevices;
+	pfn_mir_sdr_GetCurrentGain my_mir_sdr_GetCurrentGain;
+	pfn_mir_sdr_GetHwVersion my_mir_sdr_GetHwVersion;
+	pfn_mir_sdr_RSPII_AntennaControl my_mir_sdr_RSPII_AntennaControl;
+	pfn_mir_sdr_rspDuo_TunerSel my_mir_sdr_rspDuo_TunerSel;
+	pfn_mir_sdr_SetDeviceIdx my_mir_sdr_SetDeviceIdx;
+	pfn_mir_sdr_ReleaseDeviceIdx my_mir_sdr_ReleaseDeviceIdx;
+
+	int16_t		hwVersion;
+	uint32_t	numofDevs;
+	int16_t		deviceIndex;
+	bool		loadFunctions	(void);
+	int32_t		inputRate;
+	bool		libraryLoaded;
+	std::atomic<bool>	running;
+	HINSTANCE	Handle;
+	int16_t		nrBits;
+private slots:
+	void		set_ifgainReduction	(int);
+	void		set_lnagainReduction	(int);
+	void		set_agcControl		(int);
+};
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplayselect.cpp Added

@@ -0,0 +1,68 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Many of the ideas as implemented in Qt-DAB are derived from
+ * other work, made available through the GNU general Public License. 
+ * All copyrights of the original authors are recognized.
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#include	<stdio.h>
+#include	<QVBoxLayout>
+#include	"sdrplayselect.h"
+//
+//	Whenever there are two or more sdrplay devices connected
+//	to the computer, the user is asked to make a choice.
+
+	sdrplaySelect::sdrplaySelect (void) {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select an rsp device");
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("RSP select"));
+	setLayout (layOut);
+
+	Devices = QStringList ();
+	deviceList. setStringList (Devices);
+	selectorDisplay	-> setModel (&deviceList);
+	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
+	 this, SLOT (select_rsp (QModelIndex)));
+	selectedItem	= -1;
+}
+
+	sdrplaySelect::~sdrplaySelect (void) {
+}
+
+void	sdrplaySelect::addtoList (const char *v) {
+QString s (v);
+
+	Devices << s;
+	deviceList. setStringList (Devices);
+	selectorDisplay	-> setModel (&deviceList);
+	selectorDisplay	-> adjustSize ();
+	adjustSize ();
+}
+
+void	sdrplaySelect::select_rsp (QModelIndex s) {
+	QDialog::done (s. row ());
+}
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/devices-dab-mini/sdrplay-handler/sdrplayselect.h Added

@@ -0,0 +1,50 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#
+#ifndef	__SDRPLAY_SELECT__
+#define	__SDRPLAY_SELECT__
+#
+#include	<QDialog>
+#include	<QLabel>
+#include	<QListView>
+#include	<QStringListModel>
+#include	<QStringList>
+#include	<stdint.h>
+
+class	sdrplaySelect: public QDialog {
+Q_OBJECT
+public:
+			sdrplaySelect	(void);
+			~sdrplaySelect	(void);
+	void		addtoList	(const char *);
+private:
+	QLabel		*toptext;
+	QListView	*selectorDisplay;
+	QStringListModel deviceList;
+	QStringList	Devices;
+	int16_t		selectedItem;
+private slots:
+void	select_rsp	(QModelIndex);
+};
+
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/i18n Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/i18n/de_DE.qm Added

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/i18n/de_DE.ts Added

@@ -0,0 +1,1675 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+ <name>RadioInterface</name>
+ <message>
+ <location filename="../radio.cpp" line="429"/>
+ <location filename="../radio.cpp" line="847"/>
+ <location filename="../radio.cpp" line="861"/>
+ <location filename="../radio.cpp" line="875"/>
+ <location filename="../radio.cpp" line="889"/>
+ <location filename="../radio.cpp" line="905"/>
+ <location filename="../radio.cpp" line="920"/>
+ <location filename="../radio.cpp" line="934"/>
+ <location filename="../radio.cpp" line="948"/>
+ <location filename="../radio.cpp" line="962"/>
+ <location filename="../radio.cpp" line="976"/>
+ <location filename="../radio.cpp" line="998"/>
+ <location filename="../radio.cpp" line="1018"/>
+ <location filename="../radio.cpp" line="1036"/>
+ <location filename="../radio.cpp" line="1056"/>
+ <location filename="../radio.cpp" line="1460"/>
+ <location filename="../radio.cpp" line="1734"/>
+ <location filename="../radio.cpp" line="1847"/>
+ <location filename="../radio.cpp" line="1999"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="430"/>
+ <source>Opening input stream failed
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="848"/>
+ <source>Airspy or Airspy mini not found
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="862"/>
+ <source>hackrf not found
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="876"/>
+ <source>no soapy device found
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="890"/>
+ <source>no lime device found
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="906"/>
+ <source>extio: no luck
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="921"/>
+ <source>rtl_tcp: no luck
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="935"/>
+ <location filename="../radio.cpp" line="949"/>
+ <source>SDRplay: no library or device
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="963"/>
+ <source>elad-s1: no library or device
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="977"/>
+ <source>DAB stick not found! Please use one with RTL2832U or similar chipset!
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="987"/>
+ <location filename="../radio.cpp" line="1007"/>
+ <location filename="../radio.cpp" line="1026"/>
+ <location filename="../radio.cpp" line="1044"/>
+ <source>Open file ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="989"/>
+ <source>xml data (*.*)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1009"/>
+ <source>iq data (*.iq)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="999"/>
+ <location filename="../radio.cpp" line="1019"/>
+ <location filename="../radio.cpp" line="1037"/>
+ <location filename="../radio.cpp" line="1057"/>
+ <source>file not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1028"/>
+ <source>raw data (*.raw)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1046"/>
+ <location filename="../radio.cpp" line="1362"/>
+ <source>raw data (*.sdr)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1453"/>
+ <source>aac data (*.aac)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1848"/>
+ <source>unknown bitrate for this program
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1903"/>
+ <source>sdr</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1904"/>
+ <source>still insufficient data for this service
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1735"/>
+ <source>Incorrect preset
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="622"/>
+ <location filename="../radio.cpp" line="1360"/>
+ <location filename="../radio.cpp" line="1406"/>
+ <location filename="../radio.cpp" line="1451"/>
+ <source>Save file ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1408"/>
+ <source>PCM wave file (*.wav)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="625"/>
+ <source>Text (*.txt)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="2000"/>
+ <source>Oops, ensemble not yet recognized
+select service manually
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1598"/>
+ <source>Are you sure?
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>airspyHandler</name>
+ <message>
+ <location filename="../devices/airspy-handler/airspy-handler.cpp" line="783"/>
+ <source>Save file ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../devices/airspy-handler/airspy-handler.cpp" line="785"/>
+ <source>Xml (*.uff)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/main.cpp Added

@@ -0,0 +1,156 @@
+#
+/*
+ * Copyright (C) 2014 .. 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-mini
+ *
+ * dab-mini 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-mini 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-mini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Main program
+ */
+#include <QApplication>
+#include <QSettings>
+#include	<QTranslator>
+#include	<QString>
+#include <QDir>
+#include	<QDebug>
+#include <unistd.h>
+#include "dab-constants.h"
+#include "radio.h"
+
+#define DEFAULT_INI ".dab-mini.ini"
+#define	PRESETS		".dab-mini-presets.xml"
+#ifndef	GITHASH
+#define	GITHASH	" "
+#endif
+
+QString fullPathfor (QString v) {
+QString fileName;
+
+	if (v == QString (""))
+	 return QString ("/tmp/xxx");
+
+	if (v. at (0) == QChar ('/')) // full path specified
+	 return v;
+
+#ifdef	OSX_INIT_FILE
+	char *PathFile;
+	PathFile = getenv ("HOME");
+	fileName = PathFile;
+	fileName.append("/.qt-dab.ini");
+	qDebug() << fileName;
+#else
+
+	fileName = QDir::homePath();
+	fileName. append ("/");
+	fileName. append (v);
+	fileName = QDir::toNativeSeparators (fileName);
+#endif
+	if (!fileName. endsWith (".ini"))
+	 fileName. append (".ini");
+
+	return fileName;
+}
+
+void setTranslator (QString Language);
+
+int main (int argc, char **argv) {
+QString initFileName = fullPathfor (QString (DEFAULT_INI));
+RadioInterface *MyRadioInterface;
+
+// Default values
+QSettings *dabSettings; // ini file
+QString		presetName	= PRESETS;
+int32_t		dataPort	= 8888;
+int opt;
+
+	QCoreApplication::setOrganizationName ("Lazy Chair Computing");
+	QCoreApplication::setOrganizationDomain ("Lazy Chair Computing");
+	QCoreApplication::setApplicationName ("dab-mini");
+	QCoreApplication::setApplicationVersion (QString (CURRENT_VERSION) + " Git: " + GITHASH);
+
+	while ((opt = getopt (argc, argv, "i:")) != -1) {
+	 switch (opt) {
+	 case 'i':
+	 initFileName = fullPathfor (QString (optarg));
+	 break;
+
+	 default:
+	 break;
+	 }
+	}
+
+	dabSettings = new QSettings (initFileName, QSettings::IniFormat);
+
+	QString presets = QDir::homePath();
+	presets. append ("/");
+	presets. append (presetName);
+	presets = QDir::toNativeSeparators (presets);
+
+/*
+ * Before we connect control to the gui, we have to
+ * instantiate
+ */
+#if QT_VERSION >= 0x050600
+	QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
+#endif
+
+	QApplication a (argc, argv);
+//	setting the language
+	QString locale = QLocale::system(). name();
+	qDebug() << "main:" << "Detected system language" << locale;
+	setTranslator (locale);
+
+	a. setWindowIcon (QIcon (":/dab-mini.ico"));
+
+	MyRadioInterface = new RadioInterface (dabSettings, presets);
+	MyRadioInterface -> show();
+ a. exec();
+/*
+ * done:
+ */
+	fprintf (stderr, "back in main program\n");
+	fflush (stdout);
+	fflush (stderr);
+	qDebug ("It is done\n");
+	delete MyRadioInterface;
+	delete dabSettings;
+	return 1;
+}
+
+void	setTranslator (QString Language) {
+QTranslator *Translator = new QTranslator;
+
+//	German is special (as always)
+	if ((Language == "de_AT") || (Language == "de_CH"))
+	 Language = "de_DE";
+//
+//	what about Dutch?
+	bool TranslatorLoaded =
+	 Translator -> load (QString(":/i18n/") + Language);
+	qDebug() << "main:" << "Set language" << Language;
+	QCoreApplication::installTranslator (Translator);
+
+	if (!TranslatorLoaded) {
+	 qDebug() << "main:" << "Error while loading language specifics" << Language << "use English \"en_GB\" instead";
+	 Language = "en_GB";
+	}
+
+	QLocale curLocale (QLocale ((const QString&)Language));
+	QLocale::setDefault (curLocale);
+}
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/radio.cpp Added

@@ -0,0 +1,1104 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-mini
+ *
+ * dab-mini 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-mini 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-mini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<QSettings>
+#include	<QMessageBox>
+#include	<QDebug>
+#include	<QDateTime>
+#include	<QFile>
+#include	<QStringList>
+#include	<QStringListModel>
+#include	<QMouseEvent>
+#include	<QDir>
+#include	<fstream>
+#include	"dab-constants.h"
+#include	<iostream>
+#include	<numeric>
+#include	<unistd.h>
+#include	<vector>
+#include	"radio.h"
+#include	"band-handler.h"
+#include	"dab_tables.h"
+#include	"audiosink.h"
+#ifdef	HAVE_RTLSDR
+#include	"rtlsdr-handler.h"
+#endif
+#ifdef	HAVE_SDRPLAY
+#include	"sdrplay-handler.h"
+#endif
+#ifdef	HAVE_AIRSPY
+#include	"airspy-handler.h"
+#endif
+#ifdef	HAVE_HACKRF
+#include	"hackrf-handler.h"
+#endif
+#ifdef	HAVE_LIME
+#include	"lime-handler.h"
+#endif
+
+	RadioInterface::RadioInterface (QSettings	*Si,
+	 const QString	&presetFile,
+	 QWidget		*parent):
+	 QWidget (parent),
+	 my_presetHandler (this),
+	 theBand ("") {
+int16_t	latency;
+int16_t k;
+QString h;
+QString	presetName;
+
+	dabSettings		= Si;
+	running. 		store (false);
+	scanning. 		store (false);
+	isSynced		= false;
+	runningServices. 	resize (0);
+//
+//	These buffers are not used here, but needed as parameter
+//	in dabProcessor
+	spectrumBuffer =
+	 new RingBuffer<std::complex<float>> (2 * 32768);
+	iqBuffer		=
+	 new RingBuffer<std::complex<float>> (2 * 1536);
+	responseBuffer		=
+	 new RingBuffer<float> (32768);
+	tiiBuffer		=
+	 new RingBuffer<std::complex<float>> (32768);
+	audioBuffer		=
+	 new RingBuffer<int16_t>(16 * 32768);
+	frameBuffer		=
+	 new RingBuffer<uint8_t> (2 * 32768);
+	dataBuffer		=
+	 new RingBuffer<uint8_t>(32768);
+	switchTime		=
+	 dabSettings -> value ("switchTime", 8000). toInt ();
+	latency			=
+	 dabSettings -> value ("latency", 5). toInt();
+
+	bool has_presetName	=
+	 dabSettings -> value ("has-presetName", 1). toInt() != 0;
+	if (has_presetName) {
+	 presetName		=
+	 dabSettings -> value ("presetname", ""). toString();
+	 dabService s;
+	 s. serviceName = presetName;
+	 s. SId	 = 0;
+	 s. SCIds	 = 0;
+	 runningServices. push_back (s);
+	}
+//
+//	as with many of the buffers, picturesPath is not used
+//	but used in the dabProcessor
+	picturesPath = QDir::tempPath();
+
+	serviceOrder	=
+	 dabSettings -> value ("serviceOrder", 0). toInt ();
+
+//	The settings are done, now creation of the GUI parts
+	setupUi (this);
+//
+	serviceList. clear ();
+ model . clear ();
+ ensembleDisplay -> setModel (&model);
+
+//	Where do we leave the audio out?
+	streamoutSelector	-> hide();
+// just sound out
+	soundOut		= new audioSink		(latency);
+
+	((audioSink *)soundOut)	-> setupChannels (streamoutSelector);
+	streamoutSelector	-> show();
+	bool err;
+	h	= dabSettings -> value ("soundchannel", "default"). toString();
+	k	= streamoutSelector -> findText (h);
+	if (k != -1) {
+	 streamoutSelector -> setCurrentIndex (k);
+	 err = !((audioSink *)soundOut) -> selectDevice (k);
+	}
+
+	if ((k == -1) || err)
+	 ((audioSink *)soundOut)	-> selectDefaultDevice();
+
+	theBand. setupChannels (channelSelector, BAND_III);
+
+	connect (streamoutSelector, SIGNAL (activated (int)),
+	 this, SLOT (set_streamSelector (int)));
+	my_presetHandler. loadPresets (presetFile, presetSelector);
+//	
+//	display the version
+	copyrightLabel	-> setToolTip (footText ());
+
+//	and start the timer(s)
+//	The displaytimer is there to show the number of
+//	seconds running and handle - if available - the tii data
+	displayTimer. setInterval (1000);
+	connect (&displayTimer, SIGNAL (timeout (void)),
+	 this, SLOT (updateTimeDisplay (void)));
+	displayTimer. start (1000);
+	numberofSeconds		= 0;
+//
+//	presetTimer
+	presetTimer. setSingleShot (true);
+	presetTimer. setInterval (switchTime);
+	connect (&presetTimer, SIGNAL (timeout (void)),
+	 this, SLOT (setPresetStation (void)));
+
+//	if a device was selected, we just start, otherwise
+//	we wait until one is selected
+	inputDevice	= findDevice ();
+	if (inputDevice == nullptr) {
+	 QMessageBox::warning (this, tr ("Warning"),
+	 tr ("Opening input stream failed\n"));
+	 exit (21);
+	}
+	qApp	-> installEventFilter (this);
+	int threshold		=
+	 dabSettings -> value ("threshold", 3). toInt();
+	int diff_length	=
+	 dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt();
+	int tii_delay =
+	 dabSettings -> value ("tii_delay", 5). toInt();
+	if (tii_delay < 5)
+	 tii_delay = 5;
+	int tii_depth =
+	 dabSettings -> value ("tii_depth", 1). toInt();
+	int echo_depth =
+	 dabSettings -> value ("echo_depth", 1). toInt();
+	
+	connect (presetSelector, SIGNAL (activated (const QString &)),
+	 this, SLOT (handle_presetSelector (const QString &)));
+	connect (channelSelector, SIGNAL (activated (const QString &)),
+	 this, SLOT (selectChannel (const QString &)));
+	connect (prev_serviceButton, SIGNAL (clicked ()),
+ this, SLOT (handle_prevServiceButton ()));
+ connect (next_serviceButton, SIGNAL (clicked ()),
+ this, SLOT (handle_nextServiceButton ()));
+	connect (ensembleDisplay, SIGNAL (clicked (QModelIndex)),
+	 this, SLOT (selectService (QModelIndex)));
+	connect (nextchannelButton, SIGNAL (clicked (void)),
+	 this, SLOT (handle_nextChannelButton (void)));
+	connect	(prevchannelButton, SIGNAL (clicked (void)),
+	 this, SLOT (handle_prevChannelButton (void)));

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/radio.h Added

@@ -0,0 +1,180 @@
+#
+/*
+ * Copyright (C) 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the dab-mini
+ *
+ * dab-mini 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-mini 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-mini; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __SIMPLE_RADIO__
+#define __SIMPLE_RADIO__
+
+#include	"dab-constants.h"
+#include	<QMainWindow>
+#include	<QStringList>
+#include	<QStandardItemModel>
+#include	<QComboBox>
+#include	<QByteArray>
+#include	<QLabel>
+#include	<QTimer>
+#include	<sndfile.h>
+#include	"ui_dab-mini.h"
+#include	"dab-processor.h"
+#include	"ringbuffer.h"
+#include "band-handler.h"
+#include	"text-mapper.h"
+#include	"preset-handler.h"
+
+class	QSettings;
+class	virtualInput;
+class	audioBase;
+class	common_fft;
+
+/*
+ *	The main gui object. It inherits from
+ *	QWidget and the generated form
+ */
+
+class dabService {
+public:
+	QString		serviceName;
+	uint32_t	SId;
+	int		SCIds;
+};
+
+class RadioInterface: public QWidget, private Ui_dab_mini {
+Q_OBJECT
+public:
+		RadioInterface		(QSettings	*,
+	 const QString	&,
+	 QWidget	*parent = nullptr);
+		~RadioInterface		();
+
+protected:
+	bool			eventFilter (QObject *obj, QEvent *event);
+private:
+	int			serviceOrder;
+	QString			version;
+	presetHandler		my_presetHandler;
+	bandHandler		theBand;
+	QSettings		*dabSettings;
+	std::vector<dabService>	runningServices;
+	RingBuffer<std::complex<float>> *spectrumBuffer;
+	RingBuffer<std::complex<float>> *iqBuffer;
+	RingBuffer<std::complex<float>> *tiiBuffer;
+	RingBuffer<float> *responseBuffer;
+
+
+	int16_t			tii_delay;
+	int32_t			dataPort;
+	bool			isSynced;
+	std::atomic<bool>	running;
+	std::atomic<bool>	scanning;
+	deviceHandler		*inputDevice;
+	deviceHandler		*findDevice ();
+	textMapper		the_textMapper;
+	dabProcessor		*my_dabProcessor;
+	audioBase		*soundOut;
+	RingBuffer<int16_t>	*audioBuffer;
+	RingBuffer<uint8_t>	*dataBuffer;
+	RingBuffer<uint8_t>	*frameBuffer;
+	QString			picturesPath;
+	int			switchTime;
+
+	QStandardItemModel	model;
+	std::vector<serviceId>	serviceList;
+	bool			isMember (std::vector<serviceId>,
+	 serviceId);
+	std::vector<serviceId>
+	 	 insert (std::vector<serviceId>,
+	 serviceId, int);
+	QStringList		soundChannels;
+	QTimer			displayTimer;
+	QTimer			signalTimer;
+	QTimer			presetTimer;
+	QTimer			startTimer;
+	int32_t			numberofSeconds;
+	int16_t			ficBlocks;
+	int16_t			ficSuccess;
+	int			total_ficError;
+	int			total_fics;
+	QString			footText		();
+	void			cleanScreen		();
+	void			dumpControlState	(QSettings *);
+	deviceHandler		*setDevice		(const QString &);
+//
+	void			start_audioService	(const QString &);
+	void			startChannel		(const QString &);
+	void			stopChannel		();
+	void			stopService		();
+	void			startService		(dabService *);
+	void			colorService		(QModelIndex ind,
+	 QColor c, int pt);
+	void			localSelect		(const QString &s);
+	QString			filenameSuggestion 	(QString);
+	bool			doStart			();
+public slots:
+	void			set_CorrectorDisplay	(int);
+	void			addtoEnsemble		(const QString &, int);
+	void			nameofEnsemble		(int, const QString &);
+	void			show_frameErrors	(int);
+	void			show_rsErrors		(int);
+	void			show_aacErrors		(int);
+	void			show_ficSuccess		(bool);
+	void			show_snr		(int);
+	void			setSynced		(bool);
+	void			showLabel		(QString);
+	void			handle_motObject	(QByteArray, QString,
+	 int, bool);
+	void			sendDatagram		(int);
+	void			handle_tdcdata		(int, int);
+	void			changeinConfiguration	();
+	void			newAudio		(int, int);
+//
+	void			setStereo		(bool);
+	void			set_streamSelector	(int);
+	void			No_Signal_Found		();
+	void			show_motHandling	(bool);
+	void			setSyncLost		();
+	void			showCorrelation		(int, int);
+	void			showIndex		(int);
+	void			showSpectrum		(int);
+	void			showIQ			(int);
+	void			showQuality		(float);
+	void			show_tii		(QByteArray);
+	void			closeEvent		(QCloseEvent *event);
+	void			showTime		(const QString &);
+	void			startAnnouncement	(const QString &, int);
+	void			stopAnnouncement	(const QString &, int);
+	void			newFrame		(int);
+//	Somehow, these must be connected to the GUI
+private slots:
+	void			handle_nextChannelButton();
+	void			handle_prevChannelButton();
+	void			handle_prevServiceButton	();
+ void			handle_nextServiceButton	();
+	void			handle_presetSelector	(const QString &);
+	void			TerminateProcess	();
+	void			updateTimeDisplay	();
+	void			signalTimer_out		();
+	void			selectChannel		(const QString &);
+	void			selectService		(QModelIndex);
+	void			setPresetStation	();
+};
+#endif
+

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/resources.qrc Added

_service:download_url:qt-dab-3.3.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-3.4.tar.gz/dab-processor.cpp Changed

@@ -36,16 +36,14 @@
 *	local are classes ofdmDecoder, ficHandler and mschandler.
 */
 
-static	int goodFrames	= 0;
 	dabProcessor::dabProcessor	(RadioInterface	*mr,
-	 virtualInput	*theRig,
+	 deviceHandler	*theRig,
 	 uint8_t	dabMode,
 	 int16_t	threshold,
 	 int16_t	diff_length,
 	 int16_t	tii_delay,
 	 int16_t	tii_depth,
 	 int16_t	echo_depth,
-	 QString	picturesPath,
 	 RingBuffer<float> *responseBuffer,
 		 RingBuffer<std::complex<float>> *
 	 spectrumBuffer,
@@ -62,7 +60,6 @@
 	 ),
 	 my_ficHandler (mr, dabMode),
 	 my_mscHandler (mr, dabMode,
-	 std::move(picturesPath),
 	 frameBuffer),
 	 phaseSynchronizer (mr,
 	 dabMode, 
@@ -77,6 +74,7 @@
 	 iqBuffer) {
 
 	this	-> myRadioInterface	= mr;
+	this	-> threshold		= threshold;
 	this	-> theRig		= theRig;
 	this	-> tiiBuffer		= tiiBuffer;
 	this	-> T_null		= params. get_T_null();
@@ -96,6 +94,10 @@
 	coarseOffset			= 0;	
 	correctionNeeded		= true;
 	attempts			= 0;
+
+	goodFrames			= 0;
+	badFrames			= 0;
+	totalFrames			= 0;
 	scanMode			= false;
 	connect (this, SIGNAL (setSynced (bool)),
 	 myRadioInterface, SLOT (setSynced (bool)));
@@ -157,6 +159,7 @@
 	 }
 //Initing:
 notSynced:
+	 totalFrames ++;
 	 setSynced (false);
 	 my_TII_Detector. reset();
 	 switch (myTimeSyncer. sync (T_null, T_F)) {
@@ -181,17 +184,18 @@
 *	Note that we probably already had 30 to 40 samples of the T_g
 *	part
 */
-	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 3);
+	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, threshold);
 	 if (startIndex < 0) { // no sync, try again
 	 if (!correctionNeeded) {
 	 setSyncLost();
 	 }
+	 badFrames ++;
 	 goto notSynced;
 	 }
-	 goodFrames ++;
 	 goto SyncOnPhase;
 //
 Check_endofNULL:
+	 totalFrames ++;
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_u, coarseOffset + fineOffset);
 /**
@@ -199,16 +203,18 @@
 *	We use a correlation that will find the first sample after the
 *	cyclic prefix.
 */
-	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 10);
+	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer,
+	 3 * threshold);
 	 if (startIndex < 0) { // no sync, try again
 	 if (!correctionNeeded) {
 	 setSyncLost();
 	 }
+	 badFrames	++;
 	 goto notSynced;
 	 }
 
 SyncOnPhase:
-
+	 goodFrames ++;
 /**
 *	Once here, we are synchronized, we need to copy the data we
 *	used for synchronization for block 0
@@ -319,20 +325,8 @@
 // we integrate the newly found frequency error with the
 // existing frequency error.
 //
-//	It might happen that the computation of the "startIndex"
-//	is - more or less - ambiguous, in which case the computation
-//	of the frequency correction hopelessly fails
-
-//	 if (!correctionNeeded && (abs (arg (FreqCorr)) > 1.8)) {
-//	 fprintf (stderr, "resyncing %d %f after %d good frames\n",
-//	 startIndex, arg (FreqCorr), goodFrames);
-//	 goodFrames = 0;
-//	 goto notSynced;
-//	 }
-
 	 fineOffset += 0.05 * arg (FreqCorr) / (2 * M_PI) * carrierDiff;
 
-
 	 if (fineOffset > carrierDiff / 2) {
 	 coarseOffset += carrierDiff;
 	 fineOffset -= carrierDiff;
@@ -397,8 +391,8 @@
 	my_ficHandler. getParameters (s, p_SId, p_SCIds);
 }
 
-QStringList	dabProcessor::getServices	() {
-	return my_ficHandler. getServices ();
+std::vector<serviceId>	dabProcessor::getServices	(int n) {
+	return my_ficHandler. getServices (n);
 }
 
 bool	dabProcessor::is_audioService	(const QString &s) {
@@ -479,3 +473,14 @@
 	}
 }
 
+void	dabProcessor::getFrameQuality	(int	*totalFrames,
+	 int	*goodFrames,
+	 int	*badFrames) {
+	*totalFrames	= this	-> totalFrames;
+	*goodFrames	= this	-> goodFrames;
+	*badFrames	= this	-> badFrames;
+	this	-> totalFrames	= 0;
+	this	-> goodFrames	= 0;
+	this	-> badFrames	= 0;
+}
+

_service:download_url:qt-dab-3.3.tar.gz/dab-processor.h -> _service:download_url:qt-dab-3.4.tar.gz/dab-processor.h Changed

@@ -39,7 +39,7 @@
 #include	"ofdm-decoder.h"
 #include	"fic-handler.h"
 #include	"msc-handler.h"
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"ringbuffer.h"
 #include	"tii_detector.h"
 //
@@ -51,14 +51,13 @@
 Q_OBJECT
 public:
 		dabProcessor 	(RadioInterface *,
-	 virtualInput *,
+	 deviceHandler *,
 	 uint8_t,
 	 int16_t,
 	 int16_t,
 	 int16_t,
 	 int16_t,	// tii_depth
 	 int16_t,	// echo_depth
-	 QString,
 	 RingBuffer<float> *,
 	 RingBuffer<std::complex<float>>	*,
 	 RingBuffer<std::complex<float>>	*,
@@ -81,7 +80,7 @@
 	QString		findService		(uint32_t, int);
 	void		getParameters		(const QString &,
 	 uint32_t *, int *);
-	QStringList	getServices		();
+	std::vector<serviceId>	getServices	(int);
 	bool		is_audioService		(const QString &s);
 	bool		is_packetService	(const QString &s);
 void		dataforAudioService (const QString &,
@@ -93,16 +92,21 @@
 	 RingBuffer<int16_t> *);
 	void		set_dataChannel		(packetdata *,
 	 RingBuffer<uint8_t> *);
- uint8_t		get_ecc();
- int32_t		get_ensembleId();
- QString		get_ensembleName();
-	void		print_Overview();
-	void		clearEnsemble();
+ uint8_t		get_ecc			();
+ int32_t		get_ensembleId		();
+ QString		get_ensembleName	();
+	void		print_Overview		();
+	void		clearEnsemble		();
+	void		getFrameQuality		(int *, int*, int *);
 private:
+	int		threshold;
+	int		totalFrames;
+	int		goodFrames;
+	int		badFrames;
 	bool		tiiSwitch;
 	int16_t		tii_depth;
 	int16_t		echo_depth;
-	virtualInput	*theRig;
+	deviceHandler	*theRig;
 	dabParams	params;
 	RingBuffer<std::complex<float> > *tiiBuffer;
 	int16_t		tii_delay;

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

@@ -22,6 +22,8 @@
 #endif
 
 #include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
 #include	"airspy-handler.h"
 #include	"airspyfilter.h"
 #include	"xml-filewriter.h"
@@ -767,6 +769,10 @@
 	return _I_Buffer -> GetRingBufferWriteAvailable ();
 }
 
+QString	airspyHandler::deviceName	() {
+	return "AIRspy";
+}
+
 void	airspyHandler::set_xmlDump () {
 	if (xmlDumper == nullptr) {
 	 if (setup_xmlDump ())
@@ -779,9 +785,26 @@
 }
 
 bool	airspyHandler::setup_xmlDump () {
-	QString fileName = QFileDialog::getSaveFileName (nullptr,
+QTime	theTime;
+QDate	theDate;
+QString saveDir = airspySettings -> value ("saveDir_xmlDump",
+ QDir::homePath ()). toString ();
+ if ((saveDir != "") && (!saveDir. endsWith ("/")))
+ saveDir += "/";
+	QString channel		= airspySettings -> value ("channel", "xx").
+	 toString ();
+ QString timeString = theDate. currentDate (). toString () + "-" +
+	 theTime. currentTime (). toString ();
+	timeString. replace (":", "-");
+
+ QString suggestedFileName =
+ saveDir + "AIRspy" + "-" + channel + "-" + timeString + ".uff";
+ suggestedFileName. replace (" ", "-");
+
+	QString fileName =
+	 QFileDialog::getSaveFileName (nullptr,
 	 tr ("Save file ..."),
-	 QDir::homePath(),
+	 suggestedFileName,
 	 tr ("Xml (*.uff)"));
 fileName = QDir::toNativeSeparators (fileName);
 xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -797,6 +820,9 @@
 	 "I",
 	 recorderVersion);
 	dumping. store (true);
+	int x		= fileName. lastIndexOf ("/");
+ saveDir		= fileName. remove (x, fileName. count () - x);
+ airspySettings	-> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

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

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

@@ -1,23 +1,23 @@
 #
 /*
- *    Copyright (C) 2010, 2011, 2012
+ *    Copyright (C) 2013 .. 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
- *    This file is part of qt-dab
+ *    This file is part of Qt-DAB
  *
- *    qt-dab is free software; you can redistribute it and/or modify
+ *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *
- *    qt-dab is distributed in the hope that it will be useful,
+ *    Qt-DAB is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
  *
  *    You should have received a copy of the GNU General Public License
- *    along with qt-dab; if not, write to the Free Software
+ *    along with Qt-DAB; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

_service:download_url:qt-dab-3.4.tar.gz/devices/device-handler.cpp Added

@@ -0,0 +1,78 @@
+#
+/*
+ * Copyright (C) 2014 .. 2020
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB-J; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	"device-handler.h"
+
+	deviceHandler::deviceHandler	() {
+	lastFrequency	= 100000;
+	vfoOffset	= 0;
+	theGain		= 50;
+	coarseOffset	= 0;
+	myFrame		= nullptr;
+}
+
+	deviceHandler::~deviceHandler	() {
+	myFrame		= nullptr;
+}
+
+bool	deviceHandler::restartReader	(int32_t freq) {
+	(void)freq;
+	return true;
+}
+
+void	deviceHandler::stopReader	() {
+}
+
+int32_t	deviceHandler::getSamples	(std::complex<float> *v,
+	 int32_t amount) {
+	(void)v; 
+	(void)amount; 
+	return amount;
+}
+
+int32_t	deviceHandler::Samples		() {
+	return 1024;
+}
+
+void	deviceHandler::resetBuffer	() {
+}
+
+void	deviceHandler::hide		() {
+	if (myFrame != nullptr)
+	 myFrame	-> hide ();
+}
+
+void	deviceHandler::show		() {
+	if (myFrame != nullptr)
+	 myFrame -> show ();
+}
+
+bool	deviceHandler::isHidden		() { 
+	if (myFrame != nullptr)
+	 return myFrame -> isHidden ();
+	return false;
+}
+
+QString	deviceHandler::deviceName	() {
+	return "";
+}
+

_service:download_url:qt-dab-3.4.tar.gz/devices/device-handler.h Added

@@ -0,0 +1,60 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *	We have to create a simple virtual class here, since we
+ *	want the interface with different devices (including filehandling)
+ *	to be transparent
+ */
+#ifndef	__DEVICE_HANDLER__
+#define	__DEVICE_HANDLER__
+
+#include	<cstdint>
+#include	"dab-constants.h"
+#include	<QObject>
+#include	<QThread>
+#include	<QFrame>
+
+class	deviceHandler: public QThread {
+public:
+			deviceHandler	();
+virtual			~deviceHandler	();
+virtual		int32_t	getVFOFrequency() {return 0;}
+virtual		bool	restartReader	(int32_t freq);
+virtual		void	stopReader	();
+virtual		int32_t	getSamples	(std::complex<float> *, int32_t);
+virtual		int32_t	Samples		();
+virtual		void	resetBuffer	();
+virtual		int16_t	bitDepth	() { return 10;}
+virtual		void	hide		();
+virtual		void	show		();
+virtual		bool	isHidden	();
+virtual		QString deviceName	();
+//
+protected:
+		int32_t	lastFrequency;
+	 int32_t	vfoOffset;
+	 int	theGain;
+		int32_t	coarseOffset;
+		QFrame	*myFrame;
+};
+#endif
+

_service:download_url:qt-dab-3.3.tar.gz/devices/extio-handler/extio-handler.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/extio-handler/extio-handler.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/extio-handler/reader.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/extio-handler/reader.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/extio-handler/virtual-reader.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/extio-handler/virtual-reader.h Changed

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

@@ -25,7 +25,8 @@
 
 #include	<QThread>
 #include	<QSettings>
-#include	<QHBoxLayout>
+#include	<QTime>
+#include	<QDate>
 #include	<QLabel>
 #include	<QDebug>
 #include	<QFileDialog>
@@ -426,6 +427,10 @@
 	return 8;
 }
 
+QString	hackrfHandler::deviceName	() {
+	return "hackRF";
+}
+
 bool	hackrfHandler::load_hackrfFunctions() {
 //
 //	link the required procedures
@@ -581,9 +586,27 @@
 }
 
 bool	hackrfHandler::setup_xmlDump () {
-	QString fileName = QFileDialog::getSaveFileName (nullptr,
+QTime	theTime;
+QDate	theDate;
+QString saveDir = hackrfSettings -> value ("saveDir_xmlDump",
+ QDir::homePath ()). toString ();
+ if ((saveDir != "") && (!saveDir. endsWith ("/")))
+ saveDir += "/";
+
+	QString channel		= hackrfSettings -> value ("channel", "xx").
+	 toString ();
+	QString timeString = theDate. currentDate (). toString () + "-" +
+	 theTime. currentTime (). toString ();
+ timeString. replace (":", "-");
+
+ QString suggestedFileName =
+ saveDir + "hackrf" + "-" + channel + "-" + timeString + ".uff";
+ suggestedFileName. replace (" ", "-");
+
+	QString fileName =
+	 QFileDialog::getSaveFileName (nullptr,
 	 tr ("Save file ..."),
-	 QDir::homePath(),
+	 suggestedFileName,
 	 tr ("Xml (*.uff)"));
 fileName = QDir::toNativeSeparators (fileName);
 xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -599,6 +622,10 @@
 	 "--",
 	 recorderVersion);
 	dumping. store (true);
+	int x		= fileName. lastIndexOf ("/");
+ saveDir		= fileName. remove (x, fileName. count () - x);
+ hackrfSettings	-> setValue ("saveDir_xmlDump", saveDir);
+
 	return true;
 }

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

@@ -8,6 +8,7 @@
 * Fabio Capozzi
 *
 * 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
@@ -32,7 +33,7 @@
 #include	<atomic>
 #include	"dab-constants.h"
 #include	"ringbuffer.h"
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"ui_hackrf-widget.h"
 #include	"libhackrf/hackrf.h"
 
@@ -78,7 +79,7 @@
 
 
 ///////////////////////////////////////////////////////////////////////////
-class	hackrfHandler: public virtualInput, public Ui_hackrfWidget {
+class	hackrfHandler: public deviceHandler, public Ui_hackrfWidget {
 Q_OBJECT
 public:
 			hackrfHandler		(QSettings *, QString &);
@@ -93,7 +94,8 @@
 	int32_t		Samples			();
 	void		resetBuffer		();
 	int16_t		bitDepth		();
-//
+
+	QString		deviceName		();
 //	The buffer should be visible by the callback function
 	RingBuffer<std::complex<int8_t>>	*_I_Buffer;
 	hackrf_device	*theDevice;

_service:download_url:qt-dab-3.3.tar.gz/devices/lime-handler/lime-handler.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/lime-handler/lime-handler.cpp Changed

@@ -21,6 +21,7 @@
 */
 
 #include	<QFileDialog>
+#include	<QTime>
 #include	"lime-handler.h"
 #include	"xml-filewriter.h"
 
@@ -265,6 +266,10 @@
 	return 12;
 }
 
+QString	limeHandler::deviceName	() {
+	return "limeSDR";
+}
+
 void	limeHandler::showErrors		(int underrun, int overrun) {
 	underrunDisplay	-> display (underrun);
 	overrunDisplay	-> display (overrun);
@@ -479,9 +484,27 @@
 }
 
 bool	limeHandler::setup_xmlDump () {
-	QString fileName = QFileDialog::getSaveFileName (nullptr,
+QTime	theTime;
+QDate	theDate;
+QString saveDir = limeSettings -> value ("saveDir_xmlDump",
+ QDir::homePath ()). toString ();
+ if ((saveDir != "") && (!saveDir. endsWith ("/")))
+ saveDir += "/";
+
+	QString channel		= limeSettings -> value ("channel", "xx").
+	 toString ();
+	QString timeString = theDate. currentDate (). toString () + "-" +
+	 theTime. currentTime (). toString ();
+ timeString. replace (":", "-");
+
+ QString suggestedFileName =
+ saveDir + "limeSDR" + "-" + channel + "-" + timeString + ".uff";
+ suggestedFileName. replace (" ", "-");
+
+	QString fileName =
+	 QFileDialog::getSaveFileName (nullptr,
 	 tr ("Save file ..."),
-	 QDir::homePath(),
+	 suggestedFileName,
 	 tr ("Xml (*.uff)"));
 fileName = QDir::toNativeSeparators (fileName);
 xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -497,6 +520,9 @@
 	 "1",
 	 recorderVersion);
 	dumping. store (true);
+	int x = fileName. lastIndexOf ("/");
+	saveDir = fileName. remove (x, fileName. count () - x);
+	limeSettings -> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

_service:download_url:qt-dab-3.3.tar.gz/devices/lime-handler/lime-handler.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/lime-handler/lime-handler.h Changed

@@ -5,6 +5,7 @@
 * 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
@@ -31,7 +32,7 @@
 #include	"dab-constants.h"
 #include	"ringbuffer.h"
 #include	<LimeSuite.h>
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"lime-widget.h"
 
 #ifdef __MINGW32__
@@ -94,7 +95,7 @@
 typedef	int	(*pfn_LMS_GetStreamStatus)(lms_stream_t *stream,
 	 lms_stream_status_t* status);
 
-class	limeHandler: public virtualInput, public limeWidget {
+class	limeHandler: public deviceHandler, public limeWidget {
 Q_OBJECT
 public:
 			limeHandler		(QSettings *, QString &);
@@ -108,7 +109,7 @@
 int32_t Samples			();
 void resetBuffer		();
 int16_t bitDepth		();
-
+	QString		deviceName		();
 private:
 	QString		recorderVersion;
 	QString		deviceModel;

_service:download_url:qt-dab-3.3.tar.gz/devices/rawfiles-new/raw-reader.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/rawfiles-new/raw-reader.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/rawfiles-new/rawfiles.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/rawfiles-new/rawfiles.h Changed

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

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

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

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

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -27,6 +28,8 @@
 
 #include	<QThread>
 #include	<QFileDialog>
+#include	<QTime>
+#include	<QDate>
 #include	<QDir>
 #include	"rtlsdr-handler.h"
 #include	"rtl-dongleselect.h"
@@ -192,7 +195,7 @@
 	 throw (23);
 	}
 	deviceModel	= rtlsdr_get_device_name (deviceIndex);
-	deviceName -> setText (deviceModel);
+	deviceVersion	-> setText (deviceModel);
 
 	open			= true;
 	r			= this -> rtlsdr_set_sample_rate (device,
@@ -572,6 +575,10 @@
 	return 8;
 }
 
+QString	rtlsdrHandler::deviceName	() {
+	return deviceModel;
+}
+
 void	rtlsdrHandler::set_iqDump	() {
 	if (iqDumper == nullptr) {
 	 if (setup_iqDump ())
@@ -621,9 +628,27 @@
 }
 
 bool	rtlsdrHandler::setup_xmlDump () {
-	QString fileName = QFileDialog::getSaveFileName (nullptr,
+QTime	theTime;
+QDate	theDate;
+QString saveDir = rtlsdrSettings -> value ("saveDir_xmlDump",
+ QDir::homePath ()). toString ();
+ if ((saveDir != "") && (!saveDir. endsWith ("/")))
+ saveDir += "/";
+
+	QString channel		= rtlsdrSettings -> value ("channel", "xx").
+	 toString ();
+	QString timeString = theDate. currentDate (). toString () + "-" +
+	 theTime. currentTime(). toString ();
+ timeString. replace (":", "-");
+
+ QString suggestedFileName =
+ saveDir + deviceModel + "-" + channel + "-" + timeString + ".uff";
+ suggestedFileName. replace (" ", "-");
+
+	QString fileName =
+	 QFileDialog::getSaveFileName (nullptr,
 	 tr ("Save file ..."),
-	 QDir::homePath(),
+	 suggestedFileName,
 	 tr ("Xml (*.uff)"));
 fileName = QDir::toNativeSeparators (fileName);
 xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -639,6 +664,10 @@
 	 deviceModel,
 	 recorderVersion);
 	xml_dumping. store (true);
+	int x		= fileName. lastIndexOf ("/");
+	saveDir		= fileName. remove (x, fileName. count () - x);
+	rtlsdrSettings	-> setValue ("saveDir_xmlDump", saveDir);
+
 	return true;
 }

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

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB
+ *
 * Many of the ideas as implemented in Qt-DAB are derived from
 * other work, made available through the GNU general Public License. 
 * All copyrights of the original authors are recognized.
@@ -34,7 +35,7 @@
 #include	<cstdio>
 #include	<atomic>
 #include	"dab-constants.h"
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"ringbuffer.h"
 #include	"ui_rtlsdr-widget.h"
 class	dll_driver;
@@ -71,7 +72,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 virtualInput, public Ui_dabstickWidget {
+class	rtlsdrHandler: public deviceHandler, public Ui_dabstickWidget {
 Q_OBJECT
 public:
 			rtlsdrHandler	(QSettings *, QString &);
@@ -86,6 +87,7 @@
 	void		resetBuffer	();
 	int16_t		maxGain		();
 	int16_t		bitDepth	();
+	QString		deviceName	();
 //
 //	These need to be visible for the separate usb handling thread
 	RingBuffer<std::complex<uint8_t>>	*_I_Buffer;

_service:download_url:qt-dab-3.3.tar.gz/devices/rtlsdr-handler/rtlsdr-widget.ui -> _service:download_url:qt-dab-3.4.tar.gz/devices/rtlsdr-handler/rtlsdr-widget.ui Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp Changed

@@ -22,7 +22,8 @@
 
 #include	<QThread>
 #include	<QSettings>
-#include	<QHBoxLayout>
+#include	<QTime>
+#include	<QDate>
 #include	<QLabel>
 #include	<QFileDialog>
 #include	"sdrplay-handler-v2.h"
@@ -471,6 +472,9 @@
 	return nrBits;
 }
 
+QString	sdrplayHandler::deviceName	() {
+	return deviceModel;
+}
 
 void	sdrplayHandler::set_agcControl (int dummy) {
 bool agcMode	= agcControl -> isChecked();
@@ -820,9 +824,26 @@
 }
 
 bool	sdrplayHandler::setup_xmlDump () {
+QTime	theTime;
+QDate	theDate;
+QString	saveDir	= sdrplaySettings -> value ("saveDir_xmlDump",
+	 QDir::homePath ()). toString ();
+	if ((saveDir != "") && (!saveDir. endsWith ("/")))
+	 saveDir += "/";
+
+	QString channel		= sdrplaySettings -> value ("channel", "xx").
+	 toString ();
+	QString timeString = theDate. currentDate (). toString () + "-" +
+	 theTime. currentTime(). toString ();
+	timeString. replace (":", "-");
+
+ QString suggestedFileName =
+ saveDir + deviceModel + "-" + channel + "-" + timeString + ".uff";
+ suggestedFileName. replace (" ", "-");
+
 	QString fileName = QFileDialog::getSaveFileName (nullptr,
 	 tr ("Save file ..."),
-	 QDir::homePath(),
+	 suggestedFileName,
 	 tr ("Xml (*.uff)"));
 fileName = QDir::toNativeSeparators (fileName);
 xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -838,6 +859,9 @@
 	 deviceModel,
 	 recorderVersion);
 	dumping. store (true);
+	int x = fileName. lastIndexOf ("/");
+ saveDir = fileName. remove (x, fileName. count () - x);
+	sdrplaySettings	-> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v2/sdrplay-handler-v2.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v2/sdrplay-handler-v2.h Changed

@@ -5,6 +5,7 @@
 * 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
@@ -29,7 +30,7 @@
 #include	<atomic>
 #include	"dab-constants.h"
 #include	"ringbuffer.h"
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"ui_sdrplay-widget-v2.h"
 #include	"mirsdrapi-rsp.h"
 
@@ -90,7 +91,7 @@
 typedef mir_sdr_ErrT (*pfn_mir_sdr_ReleaseDeviceIdx) (unsigned int);
 
 ///////////////////////////////////////////////////////////////////////////
-class	sdrplayHandler: public virtualInput, public Ui_sdrplayWidget {
+class	sdrplayHandler: public deviceHandler, public Ui_sdrplayWidget {
 Q_OBJECT
 public:
 			sdrplayHandler		(QSettings *, QString &);
@@ -105,6 +106,7 @@
 	int32_t		Samples			();
 	void		resetBuffer		();
 	int16_t		bitDepth		();
+	QString		deviceName		();
 //
 //	The buffer should be visible by the callback function
 	RingBuffer<std::complex<int16_t>>	*_I_Buffer;

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v2/sdrplayselect.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v2/sdrplayselect.h Changed

_service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v3/sdrplay-commands.h Added

@@ -0,0 +1,159 @@
+#
+/*
+ * 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
+ */
+
+//
+//	This file will be included in the sdrplay-controller.cpp file
+//
+//	The file contains the definitions of the interface data between
+//	the calling and the callee thread
+#ifndef	__SDRPLAY_COMMANDS__
+#define	__SDRPLAY_COMMANDS__
+#define RESTART_REQUEST 0100
+#define STOP_REQUEST 0101
+#define SETFREQUENCY_REQUEST	0102
+#define	GETFREQUENCY_REQUEST	0103
+#define AGC_REQUEST 0104
+#define GRDB_REQUEST 0105
+#define PPM_REQUEST 0106
+#define LNA_REQUEST 0107
+#define ANTENNASELECT_REQUEST 0110
+#define GAINVALUE_REQUEST	0111
+
+#include	<QSemaphore>
+
+class generalCommand {
+public:
+	int	cmd;
+	bool	result;
+	QSemaphore waiter;
+	generalCommand (int command):
+	 waiter (0){
+	 this -> cmd = command;
+	}
+	generalCommand () {}
+};
+
+class	restartRequest: public generalCommand {
+public:
+	int	frequency;
+	bool	result;
+	restartRequest (int newFrequency):
+	 generalCommand (RESTART_REQUEST) {
+	 this	-> frequency = newFrequency;
+	}
+
+	~restartRequest	() {}
+};
+
+class	stopRequest: public generalCommand {
+public:
+	stopRequest ():
+	 generalCommand (STOP_REQUEST) {
+	}
+
+	~stopRequest	() {}
+};
+
+class set_frequencyRequest: public generalCommand {
+public:
+	int frequency;
+	set_frequencyRequest (int newFreq):
+	 generalCommand (SETFREQUENCY_REQUEST) {
+	 this	-> frequency = newFreq;
+	}
+
+	~set_frequencyRequest	() {}
+};
+
+class get_frequencyRequest: public generalCommand {
+public:
+	int frequency;
+	get_frequencyRequest () :
+	 generalCommand (GETFREQUENCY_REQUEST) {
+	}
+
+	~get_frequencyRequest	() {}
+};
+
+class agcRequest: public generalCommand {
+public:
+	int	setPoint;
+	bool	agcMode;
+	agcRequest (bool onoff, int setPoint) :
+	 generalCommand (AGC_REQUEST) {
+	 this	-> setPoint	= setPoint;
+	 this	-> agcMode	= onoff;
+	}
+	~agcRequest	() {}
+};
+
+class	GRdBRequest: public generalCommand {
+public:
+	int	GRdBValue;
+	GRdBRequest (int GRdBValue):
+	 generalCommand (GRDB_REQUEST) {
+	 this	-> GRdBValue	= GRdBValue;
+	}
+	~GRdBRequest	() {}
+};
+
+class	ppmRequest: public generalCommand {
+public:
+	int	ppmValue;
+	ppmRequest (int ppmValue):
+	 generalCommand (PPM_REQUEST) {
+	 this	-> ppmValue	= ppmValue;
+	}
+	~ppmRequest	() {}
+};
+
+class	lnaRequest: public generalCommand {
+public:
+	int	lnaState;
+	lnaRequest (int lnaState):
+	 generalCommand (LNA_REQUEST) {
+	 this	-> lnaState	= lnaState;
+	}
+	~lnaRequest	() {}
+};
+
+class	gainvalueRequest: public generalCommand {
+public: 
+ int	gainValue;
+ gainvalueRequest ():
+ generalCommand (GAINVALUE_REQUEST) {
+ }
+ ~gainvalueRequest () {}
+};
+
+class	antennaRequest: public generalCommand {
+public:
+	int	antenna;
+	antennaRequest (int antenna) :
+	 generalCommand (ANTENNASELECT_REQUEST) {
+	 this	-> antenna	= antenna;
+	}
+	~antennaRequest	() {}
+};
+
+#endif
+

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2019
+ * Copyright (C) 2020
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -22,14 +22,44 @@
 
 #include	<QThread>
 #include	<QSettings>
-#include	<QHBoxLayout>
+#include	<QTime>
+#include	<QDate>
 #include	<QLabel>
 #include	<QFileDialog>
 #include	"sdrplay-handler-v3.h"
-#include	"control-queue.h"
-#include	"sdrplay-controller.h"
+#include	"sdrplay-commands.h"
 #include	"xml-filewriter.h"
 
+static
+int RSP1_Table []	= {0, 24, 19, 43};
+
+static
+int RSP1A_Table []	= {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
+
+static
+int RSP2_Table []	= {0, 10, 15, 21, 24, 34, 39, 45, 64};
+
+static
+int	RSPduo_Table []	= {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
+
+static
+int	get_lnaGRdB (int hwVersion, int lnaState) {
+	switch (hwVersion) {
+	 case 1:
+	 default:
+	 return RSP1_Table [lnaState];
+
+	 case 2:
+	 return RSP2_Table [lnaState];
+
+	 case 255: 
+	 return RSP1A_Table [lnaState];
+
+	 case 3:
+	 return RSPduo_Table [lnaState];
+	}
+}
+
 
 	sdrplayHandler_v3::sdrplayHandler_v3 (QSettings *s,
 	 QString &recorderVersion) {
@@ -42,34 +72,26 @@
 	tunerSelector		-> hide	();
 	_I_Buffer		= new RingBuffer<
 	 std::complex<int16_t>>(8 *1024 * 1024);
-	theQueue		= new controlQueue ();
 	nrBits			= 12;	// default
+	denominator		= 2048;	// default
 
 	xmlDumper		= nullptr;
 	dumping. store	(false);
 //	See if there are settings from previous incarnations
 //	and config stuff
 
-	theQueue	-> add (STOP_REQUEST);
 	sdrplaySettings		-> beginGroup ("sdrplaySettings");
 	GRdBSelector 		-> setValue (
 	 sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt());
-	theQueue -> add (GRDB_REQUEST, GRdBSelector -> value ());
 
 	lnaGainSetting		-> setValue (
 	 sdrplaySettings -> value ("sdrplay-lnastate", 4). toInt());
-	theQueue -> add (LNA_REQUEST, lnaGainSetting -> value ());
 
 	ppmControl		-> setValue (
 	 sdrplaySettings -> value ("sdrplay-ppm", 0). toInt());
-	theQueue -> add (PPM_REQUEST, ppmControl -> value ());
 
 	agcMode		=
 	 sdrplaySettings -> value ("sdrplay-agcMode", 0). toInt() != 0;
-	if (agcMode) 
-	 theQueue -> add (AGC_REQUEST, true, GRdBSelector -> value ());
-	else
-	 theQueue -> add (AGC_REQUEST, false);
 	if (agcMode) {
 	 agcControl -> setChecked (true);
 	 GRdBSelector -> hide ();
@@ -91,15 +113,17 @@
 	connect (dumpButton, SIGNAL (clicked ()),
 this, SLOT (set_xmlDump ()));
 
-//
-	theController	= new sdrplayController (this, _I_Buffer, theQueue);
-	denominator	= 2048;
+	vfoFrequency	= MHz (220);
+	theGain		= -1;
+	debugControl	-> hide ();
+	start ();
 	usleep (1000);
 }
 
 	sdrplayHandler_v3::~sdrplayHandler_v3 () {
-	delete theController;
-//
+	threadRuns. store (false);
+	while (isRunning ())
+	 usleep (1000);
 //	thread should be stopped by now
 	sdrplaySettings	-> beginGroup ("sdrplaySettings");
 	sdrplaySettings -> setValue ("sdrplay-ppm",
@@ -116,55 +140,11 @@
 	myFrame	-> hide ();
 	delete	myFrame;
 	delete _I_Buffer;
-	delete	theQueue;
-}
-
-void	sdrplayHandler_v3::show_TotalGain (int g) {
-	totalGainDisplay	-> display (g);
-}
-
-void	sdrplayHandler_v3::show_DeviceData (const QString &s,
-	 int hwVersion, float apiVersion) {
-	serialNumber	-> setText (s);
-	this		-> hwVersion	= hwVersion;
-	api_version	-> display (apiVersion);
-}
-
-void	sdrplayHandler_v3::show_Error	(int e) {}
-
-void	sdrplayHandler_v3::show_runFlag	(bool b) {
-	running. store (b);
-	if (!b)
-	 serialNumber	-> setText ("something serious went wrong");
-}
-
-void	sdrplayHandler_v3::show_lnaGain	(int value) {
-	lnaGRdBDisplay	-> display (value);
-}
-
-void	sdrplayHandler_v3::set_lnaRange (int low, int high) {
-	lnaGainSetting	-> setRange (low, high);
-}
-
-void	sdrplayHandler_v3::show_deviceLabel (const QString &s, int nrBits) {
-	deviceLabel	-> setText (s);
-	this	-> nrBits	= nrBits;
-}
-
-void	sdrplayHandler_v3::show_antennaSelector (bool b) {
-	if (b)
-	 antennaSelector		-> show	();
-	else
-	 antennaSelector		-> hide	();
-}
-
-void	sdrplayHandler_v3::show_tunerSelector	(bool b) {
-	if (b)
-	 tunerSelector	-> show	();
-	else
-	 tunerSelector	-> hide	();
 }
 
+/////////////////////////////////////////////////////////////////////////
+//	Implementing the interface
+/////////////////////////////////////////////////////////////////////////
 
 int32_t	sdrplayHandler_v3::defaultFrequency	() {
 	return Mhz (220);
@@ -174,68 +154,22 @@
 	return vfoFrequency;
 }
 
-void	sdrplayHandler_v3::set_ifgainReduction	(int gRdB) {
-	theQueue	-> add (GRDB_REQUEST, gRdB);
-}
-
-void	sdrplayHandler_v3::set_lnagainReduction (int lnaState) {
-	theQueue	-> add (LNA_REQUEST, lnaState);
-}
-
-void	sdrplayHandler_v3::set_agcControl (int dummy) {
-bool agcMode	= agcControl -> isChecked();
-
-	(void)dummy;
-	if (agcMode) 
-	 theQueue	-> add (AGC_REQUEST, true, GRdBSelector -> value ());
-	else
-	 theQueue	-> add (AGC_REQUEST, false);
-
-	if (!agcMode) {
-	 GRdBSelector		-> show();
-	 gainsliderLabel	-> show();	// old name actually
-	}
-	else {

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-handler-v3.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v3/sdrplay-handler-v3.h Changed

@@ -1,10 +1,11 @@
 #
 /*
- * Copyright (C) 2014 .. 2019
+ * 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
@@ -26,15 +27,17 @@
 #include	<QObject>
 #include	<QFrame>
 #include	<QSettings>
+#include	<QSemaphore>
 #include	<atomic>
 #include	<stdio.h>
+#include	<queue>
 #include	"dab-constants.h"
 #include	"ringbuffer.h"
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"ui_sdrplay-widget-v3.h"
+#include	<sdrplay_api.h>
 
-class	controlQueue;
-class	sdrplayController;
+class	generalCommand;
 class	xml_fileWriter;
 
 #ifdef __MINGW32__
@@ -43,7 +46,7 @@
 #define GETPROCADDRESS dlsym
 #endif
 
-class	sdrplayHandler_v3: public virtualInput, public Ui_sdrplayWidget_v3 {
+class	sdrplayHandler_v3: public deviceHandler, public Ui_sdrplayWidget_v3 {
 Q_OBJECT
 public:
 			sdrplayHandler_v3	(QSettings *, QString &);
@@ -58,24 +61,65 @@
 	int32_t		Samples			();
 	void		resetBuffer		();
 	int16_t		bitDepth		();
+	QString		deviceName		();
 
+ void update_PowerOverload (
+ sdrplay_api_EventParamsT *params);
+	RingBuffer<std::complex<int16_t>>	*_I_Buffer;
+ std::atomic<bool>	receiverRuns;
+	int		theGain;
 private:
+	sdrplay_api_Open_t sdrplay_api_Open;
+ sdrplay_api_Close_t sdrplay_api_Close;
+ sdrplay_api_ApiVersion_t sdrplay_api_ApiVersion;
+ sdrplay_api_LockDeviceApi_t sdrplay_api_LockDeviceApi;
+ sdrplay_api_UnlockDeviceApi_t sdrplay_api_UnlockDeviceApi;
+ sdrplay_api_GetDevices_t sdrplay_api_GetDevices;
+ sdrplay_api_SelectDevice_t sdrplay_api_SelectDevice;
+ sdrplay_api_ReleaseDevice_t sdrplay_api_ReleaseDevice;
+ sdrplay_api_GetErrorString_t sdrplay_api_GetErrorString;
+	sdrplay_api_GetLastError_t sdrplay_api_GetLastError;
+ sdrplay_api_DebugEnable_t sdrplay_api_DebugEnable;
+ sdrplay_api_GetDeviceParams_t sdrplay_api_GetDeviceParams;
+ sdrplay_api_Init_t sdrplay_api_Init;
+ sdrplay_api_Uninit_t sdrplay_api_Uninit;
+ sdrplay_api_Update_t sdrplay_api_Update;
+
+	sdrplay_api_DeviceT *chosenDevice;
+	sdrplay_api_DeviceParamsT *deviceParams;
+	sdrplay_api_CallbackFnsT cbFns;
+	sdrplay_api_RxChannelParamsT *chParams;
+
+	int			denominator;
+ std::atomic<bool> threadRuns;
+	void			run			();
+	bool			messageHandler		(generalCommand *);
+
 	QString			recorderVersion;
-	RingBuffer<std::complex<int16_t>>	*_I_Buffer;
-	sdrplayController	*theController;
-	controlQueue		*theQueue;
+	
 	int32_t			vfoFrequency;
-	std::atomic<bool>	running;
 	int16_t			hwVersion;
 	QSettings		*sdrplaySettings;
 	bool			agcMode;
 	int16_t			nrBits;
-	int16_t			denominator;
+	int			lna_upperBound;
+	float			apiVersion;
+	QString			serial;
+	bool			has_antennaSelect;
+	QString			deviceModel;
+	int			lnaState;
+	int			ppmValue;
+	HINSTANCE		Handle;
 FILE			*xmlDumper;
 xml_fileWriter		*xmlWriter;
 bool			setup_xmlDump		();
 void			close_xmlDump		();
 std::atomic<bool>	dumping;
+	std::queue<generalCommand *>	server_queue;
+	QSemaphore		serverjobs;
+	HINSTANCE		fetchLibrary		();
+ void			releaseLibrary		();
+ bool			loadFunctions		();
 
 private slots:
 	void			set_ifgainReduction	(int);
@@ -84,18 +128,19 @@
 	void			set_ppmControl		(int);
 	void			set_antennaSelect	(const QString &);
 public slots:
-	void			show_TotalGain		(int);
-	void			show_DeviceData		(const QString &,
-	 int, float);
-	void			show_Error		(int);
-	void			show_runFlag		(bool);
-	void			show_lnaGain		(int);
-	void			set_lnaRange		(int, int);
-	void			show_deviceLabel	(const QString &, int);
-	void			show_antennaSelector	(bool);
+	void			set_lnabounds		(int, int);
+	void			set_deviceName		(const QString &);
+	void			set_serial		(const QString &);
+	void			set_apiVersion		(float);
+	void			set_antennaSelect	(bool);
 	void			show_tunerSelector	(bool);
 	void			set_xmlDump		();
-
+signals:
+	void			set_lnabounds_signal	(int, int);
+	void			set_deviceName_signal	(const QString &);
+	void			set_serial_signal	(const QString &);
+	void			set_apiVersion_signal	(float);
+	void			set_antennaSelect_signal	(bool);
 };
 #endif

_service:download_url:qt-dab-3.3.tar.gz/devices/sdrplay-handler-v3/sdrplay-widget-v3.ui -> _service:download_url:qt-dab-3.4.tar.gz/devices/sdrplay-handler-v3/sdrplay-widget-v3.ui Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy-handler.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy-handler.cpp Changed

@@ -1,8 +1,30 @@
-
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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	<QMessageBox>
 #include	"soapy-handler.h"
-#include <stdio.h> //printf
-#include <stdlib.h> //free
-#include <complex.h>
+#include	<stdio.h> //printf
+#include	<stdlib.h> //free
+#include	<complex.h>
+#include	"soapy_CS8.h"
 #include	"soapy_CS16.h"
 #include	"soapy_CF32.h"
 
@@ -38,7 +60,6 @@
 	return false;
 }
 
-
 void	soapyHandler::createDevice (void) {
 QString s	= deviceLineEdit -> text();
 QString	handlerName	= "driver=";
@@ -47,8 +68,11 @@
 
 	device = SoapySDR::Device::make (handlerName. toLatin1(). data());
 
- if (device == nullptr)
+ if (device == nullptr) {
+	 QMessageBox::warning (myFrame, tr ("Warning"),
+ tr ("could not find soapy support\n"));
 return;
+	}
 
 	deviceNameLabel	-> setText (device -> getHardwareKey(). c_str());
 fprintf (stderr, "channels = %d\n",
@@ -88,8 +112,8 @@
 SoapySDR::Range r = device -> getGainRange (SOAPY_SDR_RX,
 0,
 gains [0]);
-	 spinBox_1 -> setMinimum (r. minimum());
-	 spinBox_1 -> setMaximum (r. maximum());
+	 spinBox_1 -> setMinimum (r. minimum ());
+	 spinBox_1 -> setMaximum (r. maximum ());
 	 labelSpinbox_1	-> setText (QString (gains [0]. c_str()));
 	 spinBox_1		-> show();
 	 labelSpinbox_1	-> show();
@@ -110,7 +134,7 @@
 	 this, SLOT (handle_spinBox_2 (int)));
 	}
 
- SoapySDR::Range r = device -> getGainRange (SOAPY_SDR_RX, 0);
+ SoapySDR::Range r = device -> getGainRange (SOAPY_SDR_RX, 0, gains [0]);
 fprintf (stderr, "range totaal = %f, %f\n",
 r. minimum(), r. maximum());
 
@@ -150,9 +174,10 @@
 	else
 	if (contains (streamFormats, "CS16"))
 	 worker	= new soapy_CS16 (device);
-//	else
-//	if (contains (streamFormats, "CS8"))
-//	 worker	= new soapy_CS8 (device);
+	else
+	if (contains (streamFormats, "CS8"))
+	 worker	= new soapy_CS8 (device);
+	statusLabel	-> setText ("OK");
 }
 
 void	soapyHandler::setVFOFrequency		(int32_t f) {

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy-handler.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy-handler.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy-widget.ui -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy-widget.ui Changed

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

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy-worker.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy-worker.cpp Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy-worker.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy-worker.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy_CF32.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy_CF32.cpp Changed

@@ -1,9 +1,31 @@
-#include <SoapySDR/Device.hpp>
-#include <SoapySDR/Formats.hpp>
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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	<SoapySDR/Device.hpp>
+#include	<SoapySDR/Formats.hpp>
 #include <SoapySDR/Errors.hpp>
-#include <stdio.h> //printf
-#include <stdlib.h> //free
-#include <complex.h>
+#include	<stdio.h> //printf
+#include	<stdlib.h> //free
+#include	<complex.h>
 #include	"ringbuffer.h"
 
 #include	"soapy_CF32.h"

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy_CF32.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy_CF32.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy_CS16.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy_CS16.cpp Changed

@@ -1,9 +1,30 @@
-#include <SoapySDR/Device.hpp>
-#include <SoapySDR/Formats.hpp>
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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	<SoapySDR/Device.hpp>
+#include	<SoapySDR/Formats.hpp>
 #include <SoapySDR/Errors.hpp>
-#include <stdio.h> //printf
-#include <stdlib.h> //free
-#include <complex.h>
+#include	<stdio.h> //printf
+#include	<stdlib.h> //free
+#include	<complex.h>
 #include	"ringbuffer.h"
 
 #include	"soapy_CS16.h"

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy_CS16.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy_CS16.h Changed

@@ -1,4 +1,24 @@
-
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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
+ */
 #ifndef	SOAPY_CS16
 #define	SOAPY_CS16
 
@@ -9,7 +29,7 @@
 #include <stdlib.h> //free
 #include <complex.h>
 
-#include	"soapy-worker.h";
+#include	"soapy-worker.h"
 
 
 class	soapy_CS16: public soapyWorker {

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy_CS8.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy_CS8.cpp Changed

@@ -1,3 +1,24 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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	<SoapySDR/Device.hpp>
 #include	<SoapySDR/Formats.hpp>
 #include <SoapySDR/Errors.hpp>
@@ -27,11 +48,11 @@
 	delete theBuffer;
 }
 
-int	soapy_CS16::Samples	(void) {
+int	soapy_CS8::Samples	(void) {
 	return theBuffer	-> GetRingBufferReadAvailable () / 2;
 }
 
-int	soapy_CS16::getSamples	(std::complex<float> *v, int amount) {
+int	soapy_CS8::getSamples	(std::complex<float> *v, int amount) {
 int8_t temp [amount * 2];
 int	realAmount;
 	realAmount	= theBuffer -> getDataFromBuffer (temp, amount * 2);
@@ -41,7 +62,7 @@
 	return realAmount / 2;
 }
 
-void	soapy_CS16::run	(void) {
+void	soapy_CS8::run	(void) {
 int flag = 0;
 long long int timeNS;
 int8_t buffer [2048 * 2];

_service:download_url:qt-dab-3.3.tar.gz/devices/soapy/soapy_CS8.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/soapy/soapy_CS8.h Changed

@@ -1,4 +1,24 @@
-
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * 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 recorder 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
+ */
 #ifndef	SOAPY_CS8
 #define	SOAPY_CS8
 
@@ -9,8 +29,7 @@
 #include	<stdlib.h> //free
 #include	<complex.h>
 
-#include	"soapy-worker.h";
-
+#include	"soapy-worker.h"
 
 class	soapy_CS8: public soapyWorker {
 public:

_service:download_url:qt-dab-3.3.tar.gz/devices/uhd/uhd-input.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/uhd/uhd-input.h Changed

@@ -3,29 +3,29 @@
 * Copyright (C) 2015
 * Sebastian Held <sebastian.held@imst.de>
 *
- * This file is part of the SDR-J.
+ * This file is part of Qt-DAB
 * Many of the ideas as implemented in SDR-J are derived from
 * other work, made available through the GNU general Public License.
 * All copyrights of the original authors are recognized.
 *
- * SDR-J is free software; you can redistribute it and/or modify
+ * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
- * SDR-J is distributed in the hope that it will be useful,
+ * Qt-DAB is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with SDR-J; if not, write to the Free Software
+ * along with Qt-DAB; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #ifndef	__UHDINPUT
 #define	__UHDINPUT
 
-#include "virtual-input.h"
+#include	"device-handler.h"
 
 #include	<uhd/usrp/multi_usrp.hpp>
 #include	"ringbuffer.h"
@@ -50,7 +50,7 @@
 };
 
 
-class	uhdInput: public virtualInput, public Ui_uhdWidget {
+class	uhdInput: public deviceHandler, public Ui_uhdWidget {
 Q_OBJECT
 	friend class uhd_streamer;
 public:

_service:download_url:qt-dab-3.3.tar.gz/devices/wavfiles-new/wav-reader.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/wavfiles-new/wav-reader.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/wavfiles-new/wavfiles.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/wavfiles-new/wavfiles.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/element-reader.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/xml-filereader/element-reader.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xml-descriptor.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/xml-filereader/xml-descriptor.h Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xml-filereader.cpp -> _service:download_url:qt-dab-3.4.tar.gz/devices/xml-filereader/xml-filereader.cpp Changed

_service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xml-filereader.h -> _service:download_url:qt-dab-3.4.tar.gz/devices/xml-filereader/xml-filereader.h Changed

@@ -5,6 +5,7 @@
 * 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
@@ -27,7 +28,7 @@
 #include	<QFrame>
 #include	<atomic>
 #include	"dab-constants.h"
-#include	"virtual-input.h"
+#include	"device-handler.h"
 #include	"ringbuffer.h"
 #include	"ui_xmlfiles.h"
 
@@ -36,15 +37,13 @@
 class	xml_Reader;
 /*
 */
-class	xml_fileReader: public virtualInput,
-	 public Ui_xmlfile_widget {
+class	xml_fileReader: public deviceHandler, public Ui_xmlfile_widget {
 Q_OBJECT
 public:
 				xml_fileReader	(QString);
 		~xml_fileReader	();
 	int32_t			getSamples	(std::complex<float> *,
 	 int32_t);
-	uint8_t			myIdentity	();
 	int32_t			Samples		();
 	bool			restartReader	(int32_t);
 	void			stopReader	(void);

_service:download_url:qt-dab-3.3.tar.gz/devices/xml-filereader/xmlfiles.ui -> _service:download_url:qt-dab-3.4.tar.gz/devices/xml-filereader/xmlfiles.ui Changed

_service:download_url:qt-dab-3.4.tar.gz/docs Added

_service:download_url:qt-dab-3.4.tar.gz/docs/qt-dab.pdf Added

_service:download_url:qt-dab-3.3.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-3.4.tar.gz/forms/dabradio.ui Changed

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

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

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

_service:download_url:qt-dab-3.3.tar.gz/includes/backend/backend.h -> _service:download_url:qt-dab-3.4.tar.gz/includes/backend/backend.h Changed

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

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

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

@@ -5,6 +5,7 @@
 * 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
@@ -18,7 +19,6 @@
 * 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	__MOT_HANDLER__
 #define	__MOT_HANDLER__
@@ -32,12 +32,11 @@
 
 class	motHandler:public virtual_dataHandler {
 public:
-		motHandler	(RadioInterface *, QString );
-		~motHandler();
+		motHandler	(RadioInterface *);
+		~motHandler	();
 	void	add_mscDatagroup	(std::vector<uint8_t>);
 private:
 	RadioInterface	*myRadioInterface;
-	QString		picturesPath;
 	void		setHandle	(motObject *, uint16_t);
 	motObject	*getHandle	(uint16_t);
 	int		orderNumber;

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

@@ -5,6 +5,7 @@
 * 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
@@ -23,6 +24,7 @@
 #ifndef	__MOT_OBJECT__
 #define	__MOT_OBJECT__
 #include	"dab-constants.h"
+#include	"mot-content-types.h"
 #include	<QObject>
 #include	<QImage>
 #include	<QLabel>
@@ -31,9 +33,6 @@
 #include	<QDir>
 #include	<map>
 #include	<iterator>
-#ifdef	TRY_EPG
-#include	"epgdec.h"
-#endif
 
 class	RadioInterface;
 
@@ -41,7 +40,6 @@
 Q_OBJECT
 public:
 		motObject (RadioInterface *mr,
-	 QString	picturePath,
 	 bool		dirElement,
 	 uint16_t	transportId,
 	 uint8_t	*segment,
@@ -56,24 +54,20 @@
 	int		get_headerSize();
 private:
 	bool		dirElement;
-	void		checkDir	(QString&);
 	QString		picturePath;
 	uint16_t	transportId;
 	int16_t		numofSegments;
 	int32_t		segmentSize;
 	uint32_t	headerSize;
 	uint32_t	bodySize;
-	int		contentType;
-	int		contentsubType;
+	MOTContentType	contentType;
 	QString		name;
 	void		handleComplete();
-#ifdef	TRY_EPG
-	CEPGDecoder epgHandler;
-#endif
 	std::map<int, QByteArray> motMap;
 
 signals:
- void	the_picture (QByteArray, int, QString);
+ void	the_picture	(QByteArray, int, QString);
+	void	handle_motObject (QByteArray, QString, int, bool);
 };
 
 #endif

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

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

_service:download_url:qt-dab-3.3.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-3.4.tar.gz/includes/dab-constants.h Changed

_service:download_url:qt-dab-3.4.tar.gz/includes/mot-content-types.h Added

@@ -0,0 +1,106 @@
+
+/*
+ * Copyright (C) 2015 .. 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	__MOT_CONTENT_TYPE__
+#define	__MOT_CONTENT_TYPE__
+
+// Content type codes, reference:
+// https://www.etsi.org/deliver/etsi_ts/101700_101799/101756/01.06.01_60/ts_101756v010601p.pdf page 20.
+
+enum MOTContentBaseType {
+	MOTBaseTypeGeneralData		= 0x00,
+	MOTBaseTypeText			= 0x01,
+	MOTBaseTypeImage		= 0x02,
+	MOTBaseTypeAudio		= 0x03,
+	MOTBaseTypeVideo		= 0x04,
+	MOTBaseTypeTransport		= 0x05,
+	MOTBaseTypeSystem		= 0x06,
+	MOTBaseTypeApplication		= 0x07,
+	MOTBaseTypeProprietary		= 0x3f
+};
+
+enum MOTContentType {
+	// Masks
+	MOTCTBaseTypeMask		= 0x3f00,
+	MOTCTSubTypeMask		= 0x00ff,
+
+	// General Data: 0x00xx
+	MOTCTGeneralDataObjectTransfer	= 0x0000,
+	MOTCTGeneralDataMIMEHTTP	= 0x0001,
+	// Text formats: 0x01xx
+	MOTCTTextASCII			= 0x0100,
+	MOTCTTextLatin1			= 0x0101,
+	MOTCTTextHTML			= 0x0102,
+	MOTCTTextPDF			= 0x0103,
+	// Image formats: 0x02xx
+	MOTCTImageGIF			= 0x0200,
+	MOTCTImageJFIF			= 0x0201,
+	MOTCTImageBMP			= 0x0202,
+	MOTCTImagePNG			= 0x0203,
+	MOTCTAudioMPEG1Layer1		= 0x0300,
+	MOTCTAudioMPEG1Layer2		= 0x0301,
+	MOTCTAudioMPEG1Layer3		= 0x0302,
+	MOTCTAudioMPEG2Layer1		= 0x0303,
+	MOTCTAudioMPEG2Layer2		= 0x0304,
+	MOTCTAudioMPEG2Layer3		= 0x0305,
+	MOTCTAudioPCM			= 0x0306,
+	MOTCTAudioAIFF			= 0x0307,
+	MOTCTAudioATRAC			= 0x0308,
+	MOTCTAudioUndefined		= 0x0309,
+	MOTCTAudioMPEG4			= 0x030a,
+	// Video formats: 0x04xx
+	MOTCTVideoMPEG1			= 0x0400,
+	MOTCTVideoMPEG2			= 0x0401,
+	MOTCTVideoMPEG4			= 0x0402,
+	MOTCTVideoH263			= 0x0403,
+	// MOT transport: 0x05xx
+	MOTCTTransportHeaderUpdate	= 0x0500,
+	MOTCTTransportHeaderOnly	= 0x0501,
+	// System: 0x06xx
+	MOTCTSystemMHEG			= 0x0600,
+	MOTCTSystemJava			= 0x0601,
+	// Application Specific: 0x07xx
+	MOTCTApplication		= 0x0700,
+	// Proprietary: 0x3fxx
+	MOTCTProprietary		= 0x3f00
+};
+
+/**
+ * Return the base type from the MOTContentType
+ */
+inline MOTContentBaseType getContentBaseType (MOTContentType ct) {
+	return static_cast<MOTContentBaseType>(
+			(ct & MOTCTBaseTypeMask)
+			>> 8
+	);
+}
+
+/**
+ * Return the sub type from the MOTContentType
+ */
+inline uint8_t getContentSubType(MOTContentType ct) {
+	return static_cast<uint8_t>(
+			(ct & MOTCTSubTypeMask)
+	);
+}
+
+#endif

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

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

_service:download_url:qt-dab-3.4.tar.gz/includes/support/dab-tables.h Changed

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

_service:download_url:qt-dab-3.4.tar.gz/includes/support/smallspinbox.h Added

@@ -0,0 +1,37 @@
+#
+/*
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__SMALL_SPINBOX__
+#define	__SMALL_SPINBOX__
+#include	<QSpinBox>
+#include	<QSize>
+
+//
+//	Just redefining the sizeHint
+class	smallSpinBox : public QSpinBox {
+Q_OBJECT
+public:
+	smallSpinBox	(QWidget *);
+	~smallSpinBox	();
+QSize	sizeHint	()const;
+};
+#endif
+

_service:download_url:qt-dab-3.3.tar.gz/interfacing.txt -> _service:download_url:qt-dab-3.4.tar.gz/interfacing.txt Changed

@@ -18,12 +18,12 @@
 
 The qt-dab software assumes a device to support the interface to
 the device implemented as a class derived from the 
-class "virtualInput"
+class "deviceHandler"
 
-class	virtualInput: public QObject {
+class	deviceHandler: public QObject {
 public:
-			virtualInput 	(void);
-virtual			~virtualInput 	(void);
+			deviceHandler 	(void);
+virtual			~deviceHandler 	(void);
 virtual		void	setVFOFrequency	(int32_t);
 virtual		int32_t	getVFOFrequency	(void);
 virtual		int32_t	defaultFrequency(void);
@@ -74,7 +74,7 @@
 The function resetBuffer will clear the buffer in the device driver, it is
 used when switching channels.
 
-The function bitdepth returns - as the name suggests - the number of bits
+The function bitDepth returns - as the name suggests - the number of bits
 in the (elements of the) sample. E.g dabsticks provide 8 bits, SDRplay 12.
 The value is used to scale the Y-axis of the scopes.
 
@@ -82,7 +82,7 @@
 for gain, and maybe other settings. See one of the existing device drivers
 for examples.
 
-if the drives does contain its own GUI, the function "show" is called
+if the driver does contain its own GUI, the function "show" is called
 whenever it should be visible, the function "hide" when it should
 be hidden and the function "isHidden" to return the status, being hidden or not.
 
@@ -134,7 +134,6 @@
 
 where the appropriate parameters are passed on to the constructor.
 
-
 That is it, however ...
 
 --------------------------------------------------------------------

_service:download_url:qt-dab-3.4.tar.gz/qt-dab-1.png Added

_service:download_url:qt-dab-3.4.tar.gz/qt-dab-2.png Added

_service:download_url:qt-dab-3.4.tar.gz/qt-dab-history.png Added

_service:download_url:qt-dab-3.3.tar.gz/qt-dab-presets.png -> _service:download_url:qt-dab-3.4.tar.gz/qt-dab-presets.png Changed

_service:download_url:qt-dab-3.3.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-3.4.tar.gz/qt-dab.pro Changed

@@ -5,7 +5,7 @@
 ######################################################################
 
 TEMPLATE	= app
-TARGET		= qt-dab-3.3
+TARGET		= qt-dab-3.4
 QT		+= widgets xml
 #CONFIG		+= console
 CONFIG		-= console
@@ -22,6 +22,7 @@
 TRANSLATIONS = i18n/de_DE.ts
 
 DEPENDPATH += . \
+	      ./dab-maxi \
 	      ./src \
 	      ./includes \
 	      ./service-description \
@@ -55,7 +56,7 @@
 	      ./tii-viewer
 
 INCLUDEPATH += . \
-	      ./ \
+	      ./dab-maxi \
 	      ./src \
 	      ./includes \
 	      ./service-description \
@@ -80,12 +81,13 @@
 	      ./tii-viewer
 
 # Input
-HEADERS += ./radio.h \
-	   ./dab-processor.h \
+HEADERS += ./dab-processor.h \
+	   ./dab-maxi/radio.h \
 	   ./service-description/service-descriptor.h \
 	   ./service-description/audio-descriptor.h \
 	   ./service-description/data-descriptor.h \
 	   ./includes/dab-constants.h \
+	   ./includes/mot-content-types.h \
 	   ./includes/country-codes.h \
 	   ./includes/ofdm/timesyncer.h \
 	   ./includes/ofdm/sample-reader.h \
@@ -145,7 +147,7 @@
 	   ./includes/support/dab-params.h \
 	   ./includes/support/band-handler.h \
 	   ./includes/support/text-mapper.h \
-	   ./includes/support/dab_tables.h \
+	   ./includes/support/dab-tables.h \
 	   ./includes/support/ensemble-printer.h \
 	   ./includes/support/preset-handler.h \
 	   ./includes/support/presetcombobox.h \
@@ -157,7 +159,7 @@
 	   ./includes/support/scanner-table.h \
 	   ./includes/scopes-qwt6/spectrogramdata.h \
 	   ./includes/scopes-qwt6/iqdisplay.h \
-	   ./devices/virtual-input.h \
+	   ./devices/device-handler.h \
 	   ./devices/xml-filewriter.h \
 	   ./devices/filereader-widget.h \
 	   ./devices/rawfiles-new/rawfiles.h \
@@ -182,9 +184,9 @@
 #FORMS	+= ./devices/filereader-widget.ui 
 FORMS	+= ./devices/xml-filereader/xmlfiles.ui
 
-SOURCES += ./main.cpp \
-	   ./radio.cpp \
-	   ./dab-processor.cpp \
+SOURCES += ./dab-processor.cpp \
+	   ./dab-maxi/main.cpp \
+	   ./dab-maxi/radio.cpp \
 	   ./service-description/audio-descriptor.cpp \
 	   ./service-description/data-descriptor.cpp \
 	   ./src/ofdm/timesyncer.cpp \
@@ -240,7 +242,7 @@
 	   ./src/support/dab-params.cpp \
 	   ./src/support/band-handler.cpp \
 	   ./src/support/text-mapper.cpp \
-	   ./src/support/dab_tables.cpp \
+	   ./src/support/dab-tables.cpp \
 	   ./src/support/ensemble-printer.cpp \
 	   ./src/support/preset-handler.cpp \
 	   ./src/support/presetcombobox.cpp \
@@ -251,7 +253,7 @@
 	   ./src/support/history-handler.cpp \
 	   ./src/support/scanner-table.cpp \
 	   ./src/scopes-qwt6/iqdisplay.cpp \
-	   ./devices/virtual-input.cpp \
+	   ./devices/device-handler.cpp \
 	   ./devices/xml-filewriter.cpp \
 	   ./devices/rawfiles-new/rawfiles.cpp \
 	   ./devices/rawfiles-new/raw-reader.cpp \
@@ -295,16 +297,16 @@
 CONFIG		+= sdrplay-v2
 CONFIG		+= sdrplay-v3		# pretty experimental
 CONFIG		+= lime
-CONFIG		+= rtl_tcp
+#CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
-#CONFIG		+= soapy
+CONFIG		+= soapy
 #CONFIG		+= elad_s1	# does not work yet
 
 CONFIG		+= faad
 #CONFIG		+= fdk-aac
 #very experimental, simple server for connecting to a tdc handler
-CONFIG		+= datastreamer
+#CONFIG		+= datastreamer
 
 #to handle output of embedded an IP data stream, uncomment
 CONFIG		+= send_datagram
@@ -427,11 +429,8 @@
 	INCLUDEPATH	+= ./devices/sdrplay-handler-v3 \
 	                   ./devices/sdrplay-handler-v3/include
 	HEADERS		+= ./devices/sdrplay-handler-v3/sdrplay-handler-v3.h \
-	                   ./devices/sdrplay-handler-v3/control-queue.h \
-	                   ./devices/sdrplay-handler-v3/sdrplay-controller.h 
-	SOURCES		+= ./devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
-	                   ./devices/sdrplay-handler-v3/control-queue.cpp \
-	                   ./devices/sdrplay-handler-v3/sdrplay-controller.cpp 
+	                   ./devices/sdrplay-handler-v3/sdrplay-commands.h 
+	SOURCES		+= ./devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp 
 	FORMS		+= ./devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
 }
 #
@@ -502,10 +501,12 @@
 	INCLUDEPATH     += ./devices/soapy
         HEADERS         += ./devices/soapy/soapy-handler.h \
 	                   ./devices/soapy/soapy-worker.h \
+	                   ./devices/soapy/soapy_CS8.h \
 	                   ./devices/soapy/soapy_CS16.h \
 	                   ./devices/soapy/soapy_CF32.h
         SOURCES         += ./devices/soapy/soapy-handler.cpp \
 	                   ./devices/soapy/soapy-worker.cpp \
+	                   ./devices/soapy/soapy_CS8.cpp \
 	                   ./devices/soapy/soapy_CS16.cpp \
 	                   ./devices/soapy/soapy_CF32.cpp
         FORMS           += ./devices/soapy/soapy-widget.ui

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

@@ -1,5 +1,25 @@
-
-#include	"dab_tables.h"
+#
+/*
+ *    Copyright (C) 2014 .. 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	"dab-tables.h"
 #include	"audio-descriptor.h"

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

@@ -1,5 +1,26 @@
-
-#include	"dab_tables.h"
+#
+/*
+ *    Copyright (C) 2014 .. 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	"dab-tables.h"
 #include	"data-descriptor.h"

_service:download_url:qt-dab-3.3.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-3.4.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

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

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

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

@@ -31,31 +31,27 @@
 	 descriptorType *d,
 	 RingBuffer<int16_t> *audioBuffer,
 	 RingBuffer<uint8_t> *dataBuffer,
-	 RingBuffer<uint8_t> *frameBuffer,
-	 QString		picturesPath) {
+	 RingBuffer<uint8_t> *frameBuffer) {
 	if (d -> type == AUDIO_SERVICE) {
 	 if (((audiodata *)d) -> ASCTy != 077) {
 theProcessor = new mp2Processor (mr,
 	 d -> bitRate,
 audioBuffer,
-	 frameBuffer,
-	 picturesPath);
+	 frameBuffer);
 	 }
 else
 if (((audiodata *)d) -> ASCTy == 077) {
 theProcessor = new mp4Processor (mr,
 	 d -> bitRate,
 audioBuffer,
-	 frameBuffer,
-	 picturesPath);
+	 frameBuffer);
 	 }
 	}
 	else
 	if (d -> type == PACKET_SERVICE)
 	 theProcessor = new dataProcessor (mr,
 	 (packetdata *)d,
-	 dataBuffer,
-	 picturesPath);
+	 dataBuffer);
 }

_service:download_url:qt-dab-3.3.tar.gz/src/backend/backend.cpp -> _service:download_url:qt-dab-3.4.tar.gz/src/backend/backend.cpp Changed

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

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

@@ -37,14 +37,15 @@
 
 static QDomElement element (QDomDocument &doc, const tag_length_value &tlv);
 
-void	CEPGDecoder::decode (const vector<_BYTE>& vecData, const QString &name) {
+void	CEPGDecoder::decode (const vector<_BYTE>& vecData,
+ const QString &name) {
 //	clear the doc, allowing re-use 
 	doc. setContent (QString (""));
 	tag_length_value tlv (&vecData [0]);
 	if (tlv. is_epg()) {
 	 doc. appendChild (element (doc, tlv));
 	 QString test = doc. toString();
-	 FILE *epgFile = fopen (name. toUtf8(). data(), "w");
+	 FILE *epgFile = fopen (name. toUtf8(). data (), "w");
 	 if (epgFile != nullptr) {
 	 fprintf (stderr, "filename = %s\n", name. toUtf8(). data());
 	 fprintf (epgFile, test. toLatin1(). data());
@@ -70,7 +71,7 @@
 
 static uint32_t default_content_id;
 
-static const char *enums0[] = { (char*)2, "DAB", "DRM" };
+static const char *enums0 [] = { (char*)2, "DAB", "DRM" };
 static const char *enums1[] = { (char*)9, nullptr, "series",
 	"show",
 	"programConcept",

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

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -25,7 +26,6 @@
 #include	"mot-dir.h"
 
 	motDirectory::motDirectory (RadioInterface *mr,
-	 QString	picturesPath,
 	 uint16_t	transportId,
 	 int16_t	segmentSize,
 	 int32_t	dirSize,
@@ -34,7 +34,6 @@
 int16_t	i;
 
 	 this	-> myRadioInterface	= mr;
-	 this	-> picturesPath		= picturesPath;
 	 for (i = 0; i < 512; i ++)
 	 marked [i] = false;
 	 num_dirSegments	= -1;
@@ -132,7 +131,6 @@
 	 break;
 	 uint8_t *segment	= &data [currentBase + 2];
 	 motObject *handle	= new motObject (myRadioInterface,
-	 picturesPath,
 	 true,
 	 transportId,
 	 segment,

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

@@ -34,10 +34,8 @@
 	motObject	*motSlide;
 } motTable [15];
 
-	motHandler::motHandler (RadioInterface *mr,
-	 QString	picturesPath) {
+	motHandler::motHandler (RadioInterface *mr) {
 	myRadioInterface	= mr;
-	this	-> picturesPath	= picturesPath;
 	orderNumber		= 0;
 
 	theDirectory		= nullptr;
@@ -119,7 +117,6 @@
 	 if (h != nullptr) 
 	 break;
 	 h = new motObject (myRadioInterface,
-	 picturesPath,
 	 false,	// not within a directory
 	 transportId,
 	 &motVector [2],	
@@ -162,7 +159,6 @@
 //	 int32_t segSize
 //	 = ((segment [9] & 0x1F) << 8) | segment [10];
 	 theDirectory	= new motDirectory (myRadioInterface,
-	 picturesPath,
 	 transportId,
 	 segmentSize,
 	 dirSize,

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

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -26,18 +27,19 @@
 #include	"radio.h"
 
 	 motObject::motObject (RadioInterface *mr,
-	 QString	picturePath,
 	 bool		dirElement,
 	 uint16_t	transportId,
 	 uint8_t	*segment,
 	 int32_t	segmentSize,
 	 bool		lastFlag) {
 int32_t pointer = 7;
+uint16_t	rawContentType = 0;
 
-	this	-> picturePath	= picturePath;
 	this	-> dirElement	= dirElement;
-	connect (this, SIGNAL (the_picture (QByteArray, int, QString)),
-	 mr, SLOT (showMOT (QByteArray, int, QString)));
+	connect (this, SIGNAL (handle_motObject (QByteArray, QString,
+	 int, bool)),
+	 mr, SLOT (handle_motObject (QByteArray, QString,
+	 int, bool)));
 	this	-> transportId		= transportId;
 	this	-> numofSegments	= -1;
 	this	-> segmentSize		= -1;
@@ -48,8 +50,10 @@
 	bodySize =
 (segment [0] << 20) | (segment [1] << 12) |
 (segment [2] << 4 ) | ((segment [3] & 0xF0) >> 4);
-	contentType = ((segment [5] >> 1) & 0x3F);
-	contentsubType	= ((segment [5] & 0x01) << 8) | segment [6];
+// Extract the content type
+	rawContentType |= ((segment [5] >> 1) & 0x3F) << 8;
+	rawContentType	|= ((segment [5] & 0x01) << 8) | segment [6];
+	contentType = static_cast<MOTContentType>(rawContentType);
 
 //	we are actually only interested in the name, if any
 while ((uint16_t)pointer < headerSize) {
@@ -144,71 +148,10 @@
 
 void	motObject::handleComplete() {
 QByteArray result;
-
 	for (const auto &it : motMap)
 	 result. append (it. second);
 
-	if (contentType == 7) {		// epg data
-#ifdef	TRY_EPG
-	 if (name == QString (""))
-	 name = "epg file";
-	 QString realName = picturePath;
-	 realName. append (name);
-	 realName = QDir::toNativeSeparators (realName);
-	 checkDir (realName);
-	 std::vector<uint8_t> epgData (result. begin(), result. end());
-	 epgHandler. decode (epgData, realName);
-	 fprintf (stderr, "epg file %s\n", realName. toLatin1 (). data ());
-#endif
-	 return;
-	}
-//
-//	Only send the picture to show when it is a slide and not
-//	an element of a directory
-	if ((contentType != 2) || dirElement) {
-	 if (name == QString (""))
-	 name = "no name";
-	 QString realName = picturePath;
-	 realName. append (name);
-	 realName = QDir::toNativeSeparators (realName);
-	 fprintf (stderr, "going to write file %s\n",
-	 realName. toUtf8(). data());
-	 checkDir (realName);
-	 FILE *x = fopen (realName. toLatin1 (). data(), "w+b");
-	 if (x == nullptr)
-	 fprintf (stderr, "cannot write file %s\n",
-	 realName. toUtf8(). data());
-	 else {
-	 (void)fwrite (result. data(), 1, bodySize, x);
-	 fclose (x);
-	 }
-	 return;
-	}
-
-//	MOT slide, to show
-	QString realName = picturePath;
-	if (name == QString (""))
-	 realName. append (QString ("no name"));
- else
-	 realName. append (name);
-	checkDir (realName);
-	the_picture (result, contentsubType, realName);
-}
-
-void	motObject::checkDir (QString &s) {
-int16_t	ind	= s. lastIndexOf (QChar ('/'));
-int16_t	i;
-QString	dir;
-
-	if (ind == -1)		// no slash, no directory
-	 return;
-
-	for (i = 0; i < ind; i ++)
-	 dir. append (s [i]);
-
-	if (QDir (dir). exists())
-	 return;
-	QDir(). mkpath (dir);
+	handle_motObject (result, name, (int)contentType, dirElement);
 }
 
 int	motObject::get_headerSize() {

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

@@ -28,13 +28,12 @@
   *	\class padHandler
   *	Handles the pad segments passed on from mp2- and mp4Processor
   */
-	padHandler::padHandler	(RadioInterface *mr, QString picturesPath) {
+	padHandler::padHandler	(RadioInterface *mr) {
 	myRadioInterface	= mr;
 	connect (this, SIGNAL (showLabel (QString)),
 	         mr, SLOT (showLabel (QString)));
 	connect (this, SIGNAL (show_motHandling (bool)),
 	         mr, SLOT (show_motHandling (bool)));
-	this	-> picturePath	= picturesPath;
 	currentSlide	= nullptr;
 //
 //	mscGroupElement indicates whether we are handling an
@@ -473,7 +472,6 @@
 	      if (currentSlide == nullptr) {
 //	         fprintf (stderr, "creating %d\n", transportId);
 	         currentSlide	= new motObject (myRadioInterface,
-	                                         picturePath,
 	                                         false,
 	   	                                 transportId,
 	                                         &data [index + 2],
@@ -488,7 +486,6 @@
 //	                                           transportId);
 	         delete currentSlide;
 	         currentSlide	= new motObject (myRadioInterface,
-	                                         picturePath,
 	                                         false,
 	   	                                 transportId,
 	                                         &data [index + 2],

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

@@ -37,14 +37,12 @@
 //
 		mscHandler::mscHandler	(RadioInterface *mr,
 	 uint8_t	dabMode,
-	 QString	picturesPath,
 	 RingBuffer<uint8_t> *frameBuffer) :
 	 params (dabMode),
 	 my_fftHandler (dabMode),
 	 myMapper (dabMode),
 	 bufferSpace (params. get_L()){
 	myRadioInterface	= mr;
-	this	-> picturesPath	= picturesPath;
 	this	-> frameBuffer	= frameBuffer;
 	cifVector. resize (55296);
 	BitsperBlock		= 2 * params. get_carriers();
@@ -130,9 +128,9 @@
 float ab1 = jan_abs (r1);
 // Recall: the viterbi decoder wants 127 max pos, - 127 max neg
 // we make the bits into softbits in the range -127 .. 127
- ibits [i] = - real (r1) / ab1 * 511.0;
+ ibits [i] = - real (r1) / ab1 * 1023.0;
 ibits [params. get_carriers() + i]
-	 = - imag (r1) / ab1 * 511.0;
+	 = - imag (r1) / ab1 * 1023.0;
 }
 
 	 process_mscBlock (ibits, currentBlock);
@@ -186,8 +184,7 @@
 	 d,
 	 audioBuffer,
 	 dataBuffer,
-	 frameBuffer,
-	 picturesPath));
+	 frameBuffer));
 	work_to_be_done. store (true);
 	locker. unlock();
 }

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

@@ -1006,8 +1006,10 @@
 	 findServiceComponent (currentConfig, SId, SCIds);
 	if (compIndex > 0) {
 	 if (findService (dataName) == -1) {
-	 createService (dataName, SId, SCIds);
-	 addtoEnsemble (dataName, SId);
+	 if (currentConfig -> serviceComps [compIndex]. TMid == 0) {
+	 createService (dataName, SId, SCIds);
+	 addtoEnsemble (dataName, SId);
+	 }
 	 }
 	}
 }
@@ -1482,16 +1484,49 @@
 	fibLocker. unlock();
 }
 
-QStringList fibDecoder::getServices () {
-QStringList services;
+std::vector<serviceId> fibDecoder::getServices (int order) {
+std::vector<serviceId> services;
 
 	for (int i = 0; i < 64; i ++)
 	 if (ensemble -> services [i]. inUse &&
-	 ensemble -> services [i]. hasName)
-	 services << ensemble -> services [i]. serviceLabel;
+	 ensemble -> services [i]. hasName) {
+	 serviceId ed;
+	 ed. name = ensemble -> services [i]. serviceLabel;
+	 ed. SId = ensemble -> services [i]. SId;
+
+	 services = insert (services, ed, order);
+	 }
 	return services;
 }
 
+std::vector<serviceId>
+	fibDecoder::insert (std::vector<serviceId> l,
+	 serviceId n, int order) {
+std::vector<serviceId> k;
+	if (l . size () == 0) {
+	 k. push_back (n);
+	 return k;
+	}
+	int 	baseN		= 0;
+	QString baseS		= "";
+	bool	inserted	= false;
+	for (const auto serv : l) {
+	 if (!inserted &&
+	 (order == ID_BASED ?
+	 ((baseN < n. SId) && (n. SId <= serv. SId)):
+	 ((baseS < n. name) && (n. name < serv. name)))) {
+	 k. push_back (n);
+	 inserted = true;
+	 }
+	 baseS	= serv. name;
+	 baseN	= serv. SId;
+	 k. push_back (serv);
+	}
+	if (!inserted)
+	 k. push_back (n);
+	return k;
+}
+
 QString	fibDecoder::findService (uint32_t SId, int SCIds) {
 QString result;
 	for (int i = 0; i < 64; i ++)

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

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

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

@@ -2,25 +2,22 @@
 /*
  *    Copyright (C) 2014
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair programming
+ *    Lazy Chair Computing
  *
- *    This file is part of the SDR-J.
- *    Many of the ideas as implemented in SDR-J are derived from
- *    other work, made available through the GNU general Public License. 
- *    All copyrights of the original authors are recognized.
+ *    This file is part of Qt-DAB
  *
- *    SDR-J is free software; you can redistribute it and/or modify
+ *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *
- *    SDR-J is distributed in the hope that it will be useful,
+ *    Qt-DAB is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
  *
  *    You should have received a copy of the GNU General Public License
- *    along with SDR-J; if not, write to the Free Software
+ *    along with Qt-DAB; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

_service:download_url:qt-dab-3.3.tar.gz/src/protection/protTables.cpp -> _service:download_url:qt-dab-3.4.tar.gz/src/protection/protTables.cpp Changed

_service:download_url:qt-dab-3.4.tar.gz/src/support/dab-tables.cpp Added

@@ -0,0 +1,672 @@
+#
+/*
+ * Copyright (C) 2018
+ * Hayati Ayguen (h_ayguen@web.de)
+ *
+ * DAB-library 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-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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DAB-library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include "dab-tables.h"
+
+#include <cstring>
+#include <cstdlib>
+
+
+//	ETSI TS 101 756 V2.2.1: Registered Tables
+//	for Extended Country Code, Country Id, Language Code,
+//	Program Type, User Application Type, Content Type
+//	https://www.etsi.org/deliver/etsi_ts/101700_101799/101756/02.02.01_60/ts_101756v020201p.pdf
+
+//	ETSI TR 101 496-3 V1.1.2
+//	protection level/classes, ..
+//	https://www.etsi.org/deliver/etsi_tr/101400_101499/10149603/01.01.02_60/tr_10149603v010102p.pdf
+
+static const char *uep_rates [] = {"7/20", "2/5", "1/2", "3/5", "3/4"};
+static const char *eep_Arates[] = {"1/4", "3/8", "1/2", "3/4"}; // see ETSI EN 300 401 V1.3.2 (2000-09), Table 8, page 46
+static const char *eep_Brates[] = {"4/9", "4/7", "4/6", "4/5"}; // see ETSI EN 300 401 V1.3.2 (2000-09), Table 9, page 46
+
+
+struct country_codes {
+ uint8_t ecc;
+ uint8_t countryId;
+ const char *countryName;
+};
+
+//	following countryTable[] is sorted over all regions to make
+//	it easier to find "missing" / "old" but still unused entries.
+//	achieved by searching old standard tables document for each ECC code.
+//	Table 3: ITU Region 1 - European broadcasting area
+//	Table 4: ITU Region 1 - African broadcasting area
+//	Table 6: ITU Region 2 - North and South Americas
+//	Table 7: ITU Region 3 - Asia and Pacific
+
+static country_codes countryTable[] = {
+{0xA0, 0x1, "United States of America"},
+{0xA0, 0x2, "United States of America"},
+{0xA0, 0x3, "United States of America"},
+{0xA0, 0x4, "United States of America"},
+{0xA0, 0x5, "United States of America"},
+{0xA0, 0x6, "United States of America"},
+{0xA0, 0x7, "United States of America"},
+{0xA0, 0x8, "United States of America"},
+{0xA0, 0x9, "United States of America"},
+{0xA0, 0xA, "United States of America"},
+{0xA0, 0xB, "United States of America"},
+{0xA0, 0xC, "United States of America"},
+{0xA0, 0xD, "United States of America"},
+{0xA0, 0xE, "United States of America"},
+
+{0xA1, 0xC, "Canada"},
+{0xA1, 0xF, "Greenland"},
+
+{0xA2, 0x1, "Anguilla"},
+{0xA2, 0x2, "Antigua and Barbuda"},
+{0xA2, 0x3, "Equador"},
+{0xA2, 0x4, "Falkland Islands"},
+{0xA2, 0x5, "Barbados"},
+{0xA2, 0x6, "Belize"},
+{0xA2, 0x7, "Cayman Islands"},
+{0xA2, 0x8, "Costa Rica"},
+{0xA2, 0x9, "Cuba"},
+{0xA2, 0xA, "Argentina"},
+{0xA2, 0xB, "Brazil"},
+{0xA2, 0xC, "Bermuda"},
+{0xA2, 0xD, "Netherlands Antilles"},
+{0xA2, 0xE, "Guadeloupe"},
+{0xA2, 0xF, "Bahamas"},
+
+{0xA3, 0x1, "Bolivia"},
+{0xA3, 0x2, "Colombia"},
+{0xA3, 0x3, "Jamaica"},
+{0xA3, 0x4, "Martinique"},
+{0xA3, 0x6, "Paraguay"},
+{0xA3, 0x7, "Nicaragua"},
+{0xA3, 0x8, "Puerto Rico"},
+{0xA3, 0x9, "Panama"},
+{0xA3, 0xA, "Dominica"},
+{0xA3, 0xB, "Dominican Republic"},
+{0xA3, 0xC, "Chile"},
+{0xA3, 0xD, "Grenada"},
+{0xA3, 0xE, "Turks and Caicos islands"},
+{0xA3, 0xF, "Guyana"},
+
+{0xA4, 0x1, "Guatemala"},
+{0xA4, 0x2, "Honduras"},
+{0xA4, 0x3, "Aruba"},
+{0xA4, 0x5, "Montserrat"},
+{0xA4, 0x6, "Trinidad and Tobago"},
+{0xA4, 0x7, "Peru"},
+{0xA4, 0x8, "Surinam"},
+{0xA4, 0x9, "Uruguay"},
+{0xA4, 0xA, "St. Kitts"},
+{0xA4, 0xB, "St. Lucia"},
+{0xA4, 0xC, "El Salvador"},
+{0xA4, 0xD, "Haiti"},
+{0xA4, 0xE, "Venezuela"},
+{0xA4, 0xF, "Mexico"},
+
+{0xA5, 0xC, "St. Vincent"},
+{0xA5, 0xF, "Virgin islands (British or USA)"}, // British and USA have same IDs! amended "or USA"
+{0xA5, 0xF, "Virgin islands (USA)"}, // keep this entry .. doesn't hurt
+
+{0xA6, 0xF, "St. Pierre and Miquelon"},
+
+{0xD0, 0x1, "Cameroon"},
+{0xD0, 0x2, "Central African Republic"},
+{0xD0, 0x3, "Djibouti"},
+{0xD0, 0x4, "Madagascar"},
+{0xD0, 0x5, "Mali"},
+{0xD0, 0x6, "Angola"},
+{0xD0, 0x7, "Equatorial Guinea"},
+{0xD0, 0x8, "Gabon"},
+{0xD0, 0x9, "Republic of Guinea"},
+{0xD0, 0xA, "South Africa"},
+{0xD0, 0xB, "Burkina Faso"},
+{0xD0, 0xC, "Congo"},
+{0xD0, 0xD, "Togo"},
+{0xD0, 0xE, "Benin"},
+{0xD0, 0xF, "Malawi"},
+
+{0xD1, 0x1, "Namibia"},
+{0xD1, 0x2, "Liberia"},
+{0xD1, 0x3, "Ghana"},
+{0xD1, 0x4, "Mauritania"},
+{0xD1, 0x5, "Sao Tome & Principe"},
+{0xD1, 0x6, "Cape Verde"},
+{0xD1, 0x7, "Senegal"},
+{0xD1, 0x8, "Gambia"},
+{0xD1, 0x9, "Burundi"},
+{0xD1, 0xA, "Ascension island"},
+{0xD1, 0xB, "Botswana"},
+{0xD1, 0xC, "Comoros"},
+{0xD1, 0xD, "Tanzania"},
+{0xD1, 0xE, "Ethiopia"},
+{0xD1, 0xF, "Nigeria"},
+
+{0xD2, 0x1, "Sierra Leone"},
+{0xD2, 0x2, "Zimbabwe"},
+{0xD2, 0x3, "Mozambique"},
+{0xD2, 0x4, "Uganda"},
+{0xD2, 0x5, "Swaziland"},
+{0xD2, 0x6, "Kenya"},
+{0xD2, 0x7, "Somalia"},
+{0xD2, 0x8, "Niger"},
+{0xD2, 0x9, "Chad"},
+{0xD2, 0xA, "Guinea-Bissau"},
+{0xD2, 0xB, "Zaire"},
+{0xD2, 0xC, "Cote d'Ivoire"},
+{0xD2, 0xD, "Zanzibar"},
+{0xD2, 0xE, "Zambia"},
+
+{0xD3, 0x3, "Western Sahara"},
+{0xD3, 0x4, "Cabinda"}, // was in V1.4.1. was removed later. but IDs are unused .. so keep it here
+{0xD3, 0x5, "Rwanda"},
+{0xD3, 0x6, "Lesotho"},
+{0xD3, 0x8, "Seychelles"},
+{0xD3, 0xA, "Mauritius"},
+{0xD3, 0xC, "Sudan"},
+
+{0xE0, 0x1, "Germany"},
+{0xE0, 0x2, "Algeria"},
+{0xE0, 0x3, "Andorra"},
+{0xE0, 0x4, "Israel"},
+{0xE0, 0x5, "Italy"},
+{0xE0, 0x6, "Belgium"},
+{0xE0, 0x7, "Russian Federation"},
+{0xE0, 0x8, "Azores (Portugal)"}, // was in V1.4.1. was removed later. but IDs are unused .. so keep it here
+{0xE0, 0x9, "Albania"},
+{0xE0, 0xA, "Austria"},
+{0xE0, 0xB, "Hungary"},
+{0xE0, 0xC, "Malta"},
+{0xE0, 0xD, "Germany"},
+{0xE0, 0xE, "Canary Islands (Spain)"}, // amended "(Spain)"
+{0xE0, 0xF, "Egypt"},
+
+{0xE1, 0x1, "Greece"},
+{0xE1, 0x2, "Cyprus"},
+{0xE1, 0x3, "San Marino"},
+{0xE1, 0x4, "Switzerland"},

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

@@ -5,6 +5,7 @@
 * Lazy Chair Computing
 *
 * This file is part of the Qt-DAB (formerly SDR-J, JSDR).
+ *
 * Qt-DAB is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -23,12 +24,12 @@
 #include	<QStringList>
 #include	"ensemble-printer.h"
 #include	"country-codes.h"
-#include	"dab_tables.h"
+#include	"dab-tables.h"
 #include	"text-mapper.h"
 #include	"dab-processor.h"
 
 static
-const char *uep_rates [] = {nullptr, "7/20", "2/5", "1/2", "3/5"};
+const char *uep_rates [] = {nullptr, "7/20", "2/5", "1/2", "3/5", "3/4"};
 static
 const char *eep_Arates [] = {nullptr, "1/4", "3/8", "1/2", "3/4"};
 static
@@ -57,7 +58,7 @@
 void	ensemblePrinter::showEnsembleData (QString	channel,
 	 int32_t	freq,
 	 QString	theTime,
-	 QStringList	Services,
+	 std::vector<serviceId>	Services,
 	 dabProcessor *my_dabProcessor,
 	 FILE		*file_P) {
 uint8_t	countryId;
@@ -81,7 +82,9 @@
 	 theTime. toUtf8(). data ());
 	 
 	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");
-	for (QString& audioService: Services) {
+
+	for (const auto serv : Services) {
+	 QString audioService = serv. name;
 	 audiodata d;
 	 my_dabProcessor -> dataforAudioService (audioService, &d);
 	 if (!d. defined)
@@ -107,10 +110,11 @@
 	}
 
 	firstData	= true;
-	for (QString& dataService: Services) {
+	for (serviceId dataService: Services) {
 	 for (i = 0; i < 5; i ++) {
 	 packetdata d;
-	 my_dabProcessor -> dataforPacketService (dataService, &d, i);
+	 my_dabProcessor -> dataforPacketService (dataService. name,
+ &d, i);
 	 if (!d. defined)
 	 continue;
 
@@ -138,11 +142,11 @@
 	 else {
 	 protL = "UEP ";
 	 protL. append (QString::number (h));
-	 codeRate = uep_rates [h + 1];
+	 codeRate = uep_rates [h];
 	 }
 	 countryId = (d. SId >> (5 * 4)) & 0xF;
 	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%d;%s;%d;%s;;\n",
-	 dataService. toUtf8(). data(),
+	 dataService. name. toUtf8(). data(),
 	 code_to_string (ecc_byte, countryId). toUtf8(). data(),
 	 d. SId,
 	 d. subchId,

_service:download_url:qt-dab-3.4.tar.gz/src/support/smallspinbox.cpp Added

@@ -0,0 +1,36 @@
+#
+/*
+ *    Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB 
+ *
+ *    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 "smallspinbox.h"
+
+	smallSpinBox::smallSpinBox (QWidget *parent):
+	                                    QSpinBox(parent) {
+}
+
+	smallSpinBox::~smallSpinBox () {}
+
+QSize	smallSpinBox::sizeHint ()const {
+QSize	temp = QSpinBox::sizeHint ();
+	return QSize (temp. rwidth () / 4, temp. rheight () / 4);
+}
+
+

_service:download_url:qt-dab-3.3.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-3.4.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -5,6 +5,7 @@
 * 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; either version 2 of the License, or
@@ -25,7 +26,8 @@
 #include	<QColor>
 
 	tiiViewer::tiiViewer	(RadioInterface	*mr,
-	 RingBuffer<std::complex<float>> *sbuffer) {
+	 QSettings	*dabSettings,
+	 RingBuffer<std::complex<float>> *sbuffer) {
 int16_t	i;
 QString	colorString	= "black";
 QColor	displayColor;
@@ -33,14 +35,23 @@
 QColor	curveColor;
 
 	this	-> myRadioInterface	= mr;
+	this	-> dabSettings		= dabSettings;
 	this	-> tiiBuffer		= sbuffer;
 
+	colorString			= dabSettings -> value ("displaycolor", "black"). toString();
 	displayColor			= QColor (colorString);
-	colorString			= "white";
+	colorString			= dabSettings -> value ("gridcolor",
+	 "white"). toString();
 	gridColor			= QColor (colorString);
+	colorString		 = dabSettings -> value ("gridcolor",
+	 "white"). toString();
 	curveColor			= QColor (colorString);
 
-	displaySize			= 1024;
+	displaySize			= dabSettings -> value ("displaySize",
+	 1024).toInt();
+	if ((displaySize & (displaySize - 1)) != 0)
+	 displaySize = 1024;
+
 	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
 
@@ -72,10 +83,10 @@
 	grid	-> attach (plotgrid);
 
 	spectrumCurve	= new QwtPlotCurve ("");
- 	spectrumCurve	-> setPen (QPen(Qt::white));
+ 	spectrumCurve	-> setPen (QPen(curveColor));
 	spectrumCurve	-> setOrientation (Qt::Horizontal);
 	spectrumCurve	-> setBaseline	(get_db (0));
-	ourBrush	= new QBrush (Qt::white);
+	ourBrush	= new QBrush (curveColor);
 	ourBrush	-> setStyle (Qt::Dense3Pattern);
 	spectrumCurve	-> setBrush (*ourBrush);
 	spectrumCurve	-> attach (plotgrid);

_service:download_url:qt-dab-3.3.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-3.4.tar.gz/tii-viewer/tii-viewer.h Changed

Changes of Revision 18