Packman Build Service PMBS

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.6.tar.gz/dab-2-picture.png Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-2/cmake/Modules/FindQwt.cmake Deleted

@@ -1,65 +0,0 @@
-# - 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.6.tar.gz/dab-maxi/cmake/Modules/Findfdk-aac.cmake Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/color-scheme Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/elad-s1-handler.tgz Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-dongleselect.cpp Deleted

@@ -1,64 +0,0 @@
-#
-/*
- *    Copyright (C) 2013 .. 2017
- *    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	"rtl-dongleselect.h"
-#include	<cstdio>
-#include	<QVBoxLayout>
-//
-//	Whenever there are two or more RT2832 based sticks connected
-//	to the computer, the user is asked to make a choice.
-
-	rtl_dongleSelect::rtl_dongleSelect() {
-	toptext		= new QLabel (this);
-	toptext		-> setText ("Select a dongle");
-	selectorDisplay	= new QListView (this);
-	QVBoxLayout	*layOut = new QVBoxLayout;
-	layOut		-> addWidget (selectorDisplay);
-	layOut		-> addWidget (toptext);
-	setWindowTitle (tr("dongle select"));
-	setLayout (layOut);
-
-	dongleList. setStringList (Dongles);
-	Dongles = QStringList();
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
-	         this, SLOT (selectDongle (QModelIndex)));
-	selectedItem	= -1;
-}
-
-	rtl_dongleSelect::~rtl_dongleSelect() {
-}
-
-void	rtl_dongleSelect::addtoDongleList (const char *v) {
-QString s (v);
-
-	Dongles << s;
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	selectorDisplay	-> adjustSize();
-	adjustSize();
-}
-
-void	rtl_dongleSelect::selectDongle (QModelIndex s) {
-	QDialog::done (s. row());
-}
-

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-dongleselect.h Deleted

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

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-sdr.h Deleted

@@ -1,368 +0,0 @@
-#
-/*
- * 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 <cstdint>
-#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.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtl-sdr_export.h Deleted

@@ -1,47 +0,0 @@
-/*
- * 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.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtlsdr-handler.cpp Deleted

@@ -1,683 +0,0 @@
-#
-/*
- *    Copyright (C) 2013 .. 2017
- *    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-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	<QFileDialog>
-#include	<QTime>
-#include	<QDate>
-#include	<QDir>
-#include	"rtlsdr-handler.h"
-#include	"rtl-dongleselect.h"
-#include	"rtl-sdr.h"
-#include	"xml-filewriter.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 
-float mapTable [] = {
- -128 / 128.0 , -127 / 128.0 , -126 / 128.0 , -125 / 128.0 , -124 / 128.0 , -123 / 128.0 , -122 / 128.0 , -121 / 128.0 , -120 / 128.0 , -119 / 128.0 , -118 / 128.0 , -117 / 128.0 , -116 / 128.0 , -115 / 128.0 , -114 / 128.0 , -113 / 128.0 
-, -112 / 128.0 , -111 / 128.0 , -110 / 128.0 , -109 / 128.0 , -108 / 128.0 , -107 / 128.0 , -106 / 128.0 , -105 / 128.0 , -104 / 128.0 , -103 / 128.0 , -102 / 128.0 , -101 / 128.0 , -100 / 128.0 , -99 / 128.0 , -98 / 128.0 , -97 / 128.0 
-, -96 / 128.0 , -95 / 128.0 , -94 / 128.0 , -93 / 128.0 , -92 / 128.0 , -91 / 128.0 , -90 / 128.0 , -89 / 128.0 , -88 / 128.0 , -87 / 128.0 , -86 / 128.0 , -85 / 128.0 , -84 / 128.0 , -83 / 128.0 , -82 / 128.0 , -81 / 128.0 
-, -80 / 128.0 , -79 / 128.0 , -78 / 128.0 , -77 / 128.0 , -76 / 128.0 , -75 / 128.0 , -74 / 128.0 , -73 / 128.0 , -72 / 128.0 , -71 / 128.0 , -70 / 128.0 , -69 / 128.0 , -68 / 128.0 , -67 / 128.0 , -66 / 128.0 , -65 / 128.0 
-, -64 / 128.0 , -63 / 128.0 , -62 / 128.0 , -61 / 128.0 , -60 / 128.0 , -59 / 128.0 , -58 / 128.0 , -57 / 128.0 , -56 / 128.0 , -55 / 128.0 , -54 / 128.0 , -53 / 128.0 , -52 / 128.0 , -51 / 128.0 , -50 / 128.0 , -49 / 128.0 
-, -48 / 128.0 , -47 / 128.0 , -46 / 128.0 , -45 / 128.0 , -44 / 128.0 , -43 / 128.0 , -42 / 128.0 , -41 / 128.0 , -40 / 128.0 , -39 / 128.0 , -38 / 128.0 , -37 / 128.0 , -36 / 128.0 , -35 / 128.0 , -34 / 128.0 , -33 / 128.0 
-, -32 / 128.0 , -31 / 128.0 , -30 / 128.0 , -29 / 128.0 , -28 / 128.0 , -27 / 128.0 , -26 / 128.0 , -25 / 128.0 , -24 / 128.0 , -23 / 128.0 , -22 / 128.0 , -21 / 128.0 , -20 / 128.0 , -19 / 128.0 , -18 / 128.0 , -17 / 128.0 
-, -16 / 128.0 , -15 / 128.0 , -14 / 128.0 , -13 / 128.0 , -12 / 128.0 , -11 / 128.0 , -10 / 128.0 , -9 / 128.0 , -8 / 128.0 , -7 / 128.0 , -6 / 128.0 , -5 / 128.0 , -4 / 128.0 , -3 / 128.0 , -2 / 128.0 , -1 / 128.0 
-, 0 / 128.0 , 1 / 128.0 , 2 / 128.0 , 3 / 128.0 , 4 / 128.0 , 5 / 128.0 , 6 / 128.0 , 7 / 128.0 , 8 / 128.0 , 9 / 128.0 , 10 / 128.0 , 11 / 128.0 , 12 / 128.0 , 13 / 128.0 , 14 / 128.0 , 15 / 128.0 
-, 16 / 128.0 , 17 / 128.0 , 18 / 128.0 , 19 / 128.0 , 20 / 128.0 , 21 / 128.0 , 22 / 128.0 , 23 / 128.0 , 24 / 128.0 , 25 / 128.0 , 26 / 128.0 , 27 / 128.0 , 28 / 128.0 , 29 / 128.0 , 30 / 128.0 , 31 / 128.0 
-, 32 / 128.0 , 33 / 128.0 , 34 / 128.0 , 35 / 128.0 , 36 / 128.0 , 37 / 128.0 , 38 / 128.0 , 39 / 128.0 , 40 / 128.0 , 41 / 128.0 , 42 / 128.0 , 43 / 128.0 , 44 / 128.0 , 45 / 128.0 , 46 / 128.0 , 47 / 128.0 
-, 48 / 128.0 , 49 / 128.0 , 50 / 128.0 , 51 / 128.0 , 52 / 128.0 , 53 / 128.0 , 54 / 128.0 , 55 / 128.0 , 56 / 128.0 , 57 / 128.0 , 58 / 128.0 , 59 / 128.0 , 60 / 128.0 , 61 / 128.0 , 62 / 128.0 , 63 / 128.0 
-, 64 / 128.0 , 65 / 128.0 , 66 / 128.0 , 67 / 128.0 , 68 / 128.0 , 69 / 128.0 , 70 / 128.0 , 71 / 128.0 , 72 / 128.0 , 73 / 128.0 , 74 / 128.0 , 75 / 128.0 , 76 / 128.0 , 77 / 128.0 , 78 / 128.0 , 79 / 128.0 
-, 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
-, 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
-, 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
-
-static
-void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
-rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
-std::complex<float> localBuffer [READLEN_DEFAULT / 2];
-
-	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
-	   return;
-
-	(void)theStick -> _I_Buffer ->
-	             putDataIntoBuffer ((std::complex<uint8_t> *)buf, len / 2);
-}
-//
-//	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() {
-	}
-
-private:
-virtual void	run () {
-	(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 *s,
-	                              QString &recorderVersion):
-	                                     myFrame (nullptr) {
-int16_t	deviceCount;
-int32_t	r;
-int16_t	deviceIndex;
-int16_t	i;
-QString	temp;
-int	k;
-char	manufac [256], product [256], serial [256];
-
-	rtlsdrSettings			= s;
-	this	-> recorderVersion	= recorderVersion;
-	setupUi (&myFrame);
-	myFrame. show ();
-	inputRate			= 2048000;
-	libraryLoaded			= false;
-	open			= false;
-	_I_Buffer		= nullptr;
-	workerHandle		= nullptr;
-	lastFrequency		= KHz (22000);	// just a dummy
-	gains			= nullptr;
-
-#ifdef	__MINGW32__
-	const char *libraryString = "rtlsdr.dll";
-	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
-	if (Handle == nullptr) {
-	   fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
-	   throw (20);
-	}
-#else
-	const char *libraryString = "librtlsdr.so";
-	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
-
-	if (Handle == nullptr) {
-	   fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
-	   throw (20);
-	}
-#endif
-	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) {
-	   fprintf (stderr, "No devices found\n");
-#ifdef __MINGW32__
-	   FreeLibrary (Handle);
-#else
-	   dlclose (Handle);
-#endif
-	   throw (22);
-	}
-
-	deviceIndex = 0;	// default
-	if (deviceCount > 1) {
-	   rtl_dongleSelect dongleSelector;
-	   for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
-	      dongleSelector.
-	           addtoDongleList (rtlsdr_get_device_name (deviceIndex));
-	   }
-	   deviceIndex = dongleSelector. QDialog::exec();
-	}
-//
-//	OK, now open the hardware
-	r			= this -> rtlsdr_open (&device, deviceIndex);
-	if (r < 0) {
-	   fprintf (stderr, "Opening rtlsdr device failed\n");
-#ifdef __MINGW32__
-	   FreeLibrary (Handle);
-#else
-	   dlclose (Handle);
-#endif
-	   throw (23);
-	}
-	deviceModel	= rtlsdr_get_device_name (deviceIndex);
-	deviceVersion	-> setText (deviceModel);
-
-	open			= true;
-	r			= this -> rtlsdr_set_sample_rate (device,
-	                                                          inputRate);
-	if (r < 0) {

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtlsdr-handler.h Deleted

@@ -1,149 +0,0 @@
-#
-/*
- *    Copyright (C) 2014 .. 2017
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    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.
- *
- *    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 __RTLSDR_HANDLER__
-#define	__RTLSDR_HANDLER__
-
-#include	<QObject>
-#include	<QSettings>
-#include	<QString>
-#include	<cstdio>
-#include	<atomic>
-#include	"dab-constants.h"
-#include	"device-handler.h"
-#include	"ringbuffer.h"
-#include	"ui_rtlsdr-widget.h"
-class	dll_driver;
-class	xml_fileWriter;
-//
-//	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_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
-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)();
-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, public  Ui_dabstickWidget {
-Q_OBJECT
-public:
-			rtlsdrHandler	(QSettings *, QString &);
-			~rtlsdrHandler();
-	void		setVFOFrequency	(int32_t);
-	int32_t		getVFOFrequency	();
-//	interface to the reader
-	bool		restartReader	(int32_t);
-	void		stopReader	();
-	int32_t		getSamples	(std::complex<float> *, int32_t);
-	int32_t		Samples		();
-	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;
-	pfnrtlsdr_read_async	rtlsdr_read_async;
-	struct rtlsdr_dev	*device;
-private:
-	QSettings	*rtlsdrSettings;
-	QString		recorderVersion;
-	QFrame		myFrame;
-	int32_t		inputRate;
-	int32_t		deviceCount;
-	HINSTANCE	Handle;
-	dll_driver	*workerHandle;
-	int32_t		lastFrequency;
-	bool		libraryLoaded;
-	bool		open;
-	int		*gains;
-	int16_t		gainsCount;
-	QString		deviceModel;
-	FILE            *xmlDumper;
-        xml_fileWriter  *xmlWriter;
-        bool            setup_xmlDump		();
-        void            close_xmlDump		();
-        std::atomic<bool> xml_dumping;
-	FILE		*iqDumper;
-        bool            setup_iqDump		();
-        void            close_iqDump		();
-        std::atomic<bool> iq_dumping;
-
-//	here we need to load functions from the dll
-	bool		load_rtlFunctions	();
-	pfnrtlsdr_open	rtlsdr_open;
-	pfnrtlsdr_close	rtlsdr_close;
-	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
-
-	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_ExternalGain	(const QString &);
-	void		set_autogain		(const QString &);
-	void		set_ppmCorrection	(int);
-	void		set_xmlDump		();
-	void		set_iqDump		();
-};
-#endif
-

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-old/rtlsdr-widget.ui Deleted

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>dabstickWidget</class>
- <widget class="QWidget" name="dabstickWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>203</width>
-    <height>330</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>RT2832 dabstick</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>ppm</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="ppm_correction">
-       <property name="minimum">
-        <number>-500</number>
-       </property>
-       <property name="maximum">
-        <number>500</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QComboBox" name="combo_gain">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>gain</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QComboBox" name="combo_autogain">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <item>
-      <property name="text">
-       <string>autogain_off</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>autogain_on</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="xml_dumpButton">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>dump to xml file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="iq_dumpButton">
-     <property name="text">
-      <string>dump to raw file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>dabstick</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="product_display">
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="deviceVersion">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-dongleselect.cpp Deleted

@@ -1,64 +0,0 @@
-#
-/*
- *    Copyright (C) 2013 .. 2017
- *    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	"rtl-dongleselect.h"
-#include	<cstdio>
-#include	<QVBoxLayout>
-//
-//	Whenever there are two or more RT2832 based sticks connected
-//	to the computer, the user is asked to make a choice.
-
-	rtl_dongleSelect::rtl_dongleSelect() {
-	toptext		= new QLabel (this);
-	toptext		-> setText ("Select a dongle");
-	selectorDisplay	= new QListView (this);
-	QVBoxLayout	*layOut = new QVBoxLayout;
-	layOut		-> addWidget (selectorDisplay);
-	layOut		-> addWidget (toptext);
-	setWindowTitle (tr("dongle select"));
-	setLayout (layOut);
-
-	dongleList. setStringList (Dongles);
-	Dongles = QStringList();
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
-	         this, SLOT (selectDongle (QModelIndex)));
-	selectedItem	= -1;
-}
-
-	rtl_dongleSelect::~rtl_dongleSelect() {
-}
-
-void	rtl_dongleSelect::addtoDongleList (const char *v) {
-QString s (v);
-
-	Dongles << s;
-	dongleList. setStringList (Dongles);
-	selectorDisplay	-> setModel (&dongleList);
-	selectorDisplay	-> adjustSize();
-	adjustSize();
-}
-
-void	rtl_dongleSelect::selectDongle (QModelIndex s) {
-	QDialog::done (s. row());
-}
-

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-dongleselect.h Deleted

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

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-sdr.h Deleted

@@ -1,368 +0,0 @@
-#
-/*
- * 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 <cstdint>
-#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.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtl-sdr_export.h Deleted

@@ -1,47 +0,0 @@
-/*
- * 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.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtlsdr-handler.cpp Deleted

@@ -1,720 +0,0 @@
-#
-/*
- *    Copyright (C) 2013 .. 2017
- *    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-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	<QFileDialog>
-#include	<QTime>
-#include	<QDate>
-#include	<QDir>
-#include	"rtlsdr-handler.h"
-#include	"rtl-dongleselect.h"
-#include	"rtl-sdr.h"
-#include	"xml-filewriter.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 
-float mapTable [] = {
- -128 / 128.0 , -127 / 128.0 , -126 / 128.0 , -125 / 128.0 , -124 / 128.0 , -123 / 128.0 , -122 / 128.0 , -121 / 128.0 , -120 / 128.0 , -119 / 128.0 , -118 / 128.0 , -117 / 128.0 , -116 / 128.0 , -115 / 128.0 , -114 / 128.0 , -113 / 128.0 
-, -112 / 128.0 , -111 / 128.0 , -110 / 128.0 , -109 / 128.0 , -108 / 128.0 , -107 / 128.0 , -106 / 128.0 , -105 / 128.0 , -104 / 128.0 , -103 / 128.0 , -102 / 128.0 , -101 / 128.0 , -100 / 128.0 , -99 / 128.0 , -98 / 128.0 , -97 / 128.0 
-, -96 / 128.0 , -95 / 128.0 , -94 / 128.0 , -93 / 128.0 , -92 / 128.0 , -91 / 128.0 , -90 / 128.0 , -89 / 128.0 , -88 / 128.0 , -87 / 128.0 , -86 / 128.0 , -85 / 128.0 , -84 / 128.0 , -83 / 128.0 , -82 / 128.0 , -81 / 128.0 
-, -80 / 128.0 , -79 / 128.0 , -78 / 128.0 , -77 / 128.0 , -76 / 128.0 , -75 / 128.0 , -74 / 128.0 , -73 / 128.0 , -72 / 128.0 , -71 / 128.0 , -70 / 128.0 , -69 / 128.0 , -68 / 128.0 , -67 / 128.0 , -66 / 128.0 , -65 / 128.0 
-, -64 / 128.0 , -63 / 128.0 , -62 / 128.0 , -61 / 128.0 , -60 / 128.0 , -59 / 128.0 , -58 / 128.0 , -57 / 128.0 , -56 / 128.0 , -55 / 128.0 , -54 / 128.0 , -53 / 128.0 , -52 / 128.0 , -51 / 128.0 , -50 / 128.0 , -49 / 128.0 
-, -48 / 128.0 , -47 / 128.0 , -46 / 128.0 , -45 / 128.0 , -44 / 128.0 , -43 / 128.0 , -42 / 128.0 , -41 / 128.0 , -40 / 128.0 , -39 / 128.0 , -38 / 128.0 , -37 / 128.0 , -36 / 128.0 , -35 / 128.0 , -34 / 128.0 , -33 / 128.0 
-, -32 / 128.0 , -31 / 128.0 , -30 / 128.0 , -29 / 128.0 , -28 / 128.0 , -27 / 128.0 , -26 / 128.0 , -25 / 128.0 , -24 / 128.0 , -23 / 128.0 , -22 / 128.0 , -21 / 128.0 , -20 / 128.0 , -19 / 128.0 , -18 / 128.0 , -17 / 128.0 
-, -16 / 128.0 , -15 / 128.0 , -14 / 128.0 , -13 / 128.0 , -12 / 128.0 , -11 / 128.0 , -10 / 128.0 , -9 / 128.0 , -8 / 128.0 , -7 / 128.0 , -6 / 128.0 , -5 / 128.0 , -4 / 128.0 , -3 / 128.0 , -2 / 128.0 , -1 / 128.0 
-, 0 / 128.0 , 1 / 128.0 , 2 / 128.0 , 3 / 128.0 , 4 / 128.0 , 5 / 128.0 , 6 / 128.0 , 7 / 128.0 , 8 / 128.0 , 9 / 128.0 , 10 / 128.0 , 11 / 128.0 , 12 / 128.0 , 13 / 128.0 , 14 / 128.0 , 15 / 128.0 
-, 16 / 128.0 , 17 / 128.0 , 18 / 128.0 , 19 / 128.0 , 20 / 128.0 , 21 / 128.0 , 22 / 128.0 , 23 / 128.0 , 24 / 128.0 , 25 / 128.0 , 26 / 128.0 , 27 / 128.0 , 28 / 128.0 , 29 / 128.0 , 30 / 128.0 , 31 / 128.0 
-, 32 / 128.0 , 33 / 128.0 , 34 / 128.0 , 35 / 128.0 , 36 / 128.0 , 37 / 128.0 , 38 / 128.0 , 39 / 128.0 , 40 / 128.0 , 41 / 128.0 , 42 / 128.0 , 43 / 128.0 , 44 / 128.0 , 45 / 128.0 , 46 / 128.0 , 47 / 128.0 
-, 48 / 128.0 , 49 / 128.0 , 50 / 128.0 , 51 / 128.0 , 52 / 128.0 , 53 / 128.0 , 54 / 128.0 , 55 / 128.0 , 56 / 128.0 , 57 / 128.0 , 58 / 128.0 , 59 / 128.0 , 60 / 128.0 , 61 / 128.0 , 62 / 128.0 , 63 / 128.0 
-, 64 / 128.0 , 65 / 128.0 , 66 / 128.0 , 67 / 128.0 , 68 / 128.0 , 69 / 128.0 , 70 / 128.0 , 71 / 128.0 , 72 / 128.0 , 73 / 128.0 , 74 / 128.0 , 75 / 128.0 , 76 / 128.0 , 77 / 128.0 , 78 / 128.0 , 79 / 128.0 
-, 80 / 128.0 , 81 / 128.0 , 82 / 128.0 , 83 / 128.0 , 84 / 128.0 , 85 / 128.0 , 86 / 128.0 , 87 / 128.0 , 88 / 128.0 , 89 / 128.0 , 90 / 128.0 , 91 / 128.0 , 92 / 128.0 , 93 / 128.0 , 94 / 128.0 , 95 / 128.0 
-, 96 / 128.0 , 97 / 128.0 , 98 / 128.0 , 99 / 128.0 , 100 / 128.0 , 101 / 128.0 , 102 / 128.0 , 103 / 128.0 , 104 / 128.0 , 105 / 128.0 , 106 / 128.0 , 107 / 128.0 , 108 / 128.0 , 109 / 128.0 , 110 / 128.0 , 111 / 128.0 
-, 112 / 128.0 , 113 / 128.0 , 114 / 128.0 , 115 / 128.0 , 116 / 128.0 , 117 / 128.0 , 118 / 128.0 , 119 / 128.0 , 120 / 128.0 , 121 / 128.0 , 122 / 128.0 , 123 / 128.0 , 124 / 128.0 , 125 / 128.0 , 126 / 128.0 , 127 / 128.0 };
-
-static
-void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
-rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
-
-	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
-	   return;
-
-	(void)theStick -> _I_Buffer.
-	             putDataIntoBuffer ((std::complex<uint8_t> *)buf, len / 2);
-}
-//
-//	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() {
-}
-
-private:
-void	run () {
-	(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 *s,
-	                              QString &recorderVersion):
-	                                    _I_Buffer (4 * 1024 * 1024),
-	                                    myFrame (nullptr) {
-int16_t	deviceCount;
-int32_t	r;
-int16_t	deviceIndex;
-int16_t	i;
-QString	temp;
-int	k;
-char	manufac [256], product [256], serial [256];
-
-	rtlsdrSettings			= s;
-	this	-> recorderVersion	= recorderVersion;
-	setupUi (&myFrame);
-	myFrame. show();
-	inputRate			= 2048000;
-	workerHandle		= nullptr;
-	const char *libraryString = "rtlsdr.dll";
-
-#ifdef	__MINGW32__
-	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
-	if (Handle == nullptr) {
-	   fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
-	   throw (20);
-	}
-#else
-	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
-
-	if (Handle == nullptr) {
-	   fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
-	   throw (20);
-	}
-#endif
-	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) {
-	   fprintf (stderr, "No devices found\n");
-#ifdef __MINGW32__
-	   FreeLibrary (Handle);
-#else
-	   dlclose (Handle);
-#endif
-	   throw (22);
-	}
-
-	deviceIndex = 0;	// default
-	if (deviceCount > 1) {
-	   rtl_dongleSelect dongleSelector;
-	   for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
-	      dongleSelector.
-	           addtoDongleList (rtlsdr_get_device_name (deviceIndex));
-	   }
-	   deviceIndex = dongleSelector. QDialog::exec();
-	}
-//
-//	OK, now open the hardware
-	r			= this -> rtlsdr_open (&device, deviceIndex);
-	if (r < 0) {
-	   fprintf (stderr, "Opening rtlsdr device failed\n");
-#ifdef __MINGW32__
-	   FreeLibrary (Handle);
-#else
-	   dlclose (Handle);
-#endif
-	   throw (23);
-	}
-
-	deviceModel	= rtlsdr_get_device_name (deviceIndex);
-	deviceVersion	-> setText (deviceModel);
-	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);
-	}

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtlsdr-handler.h Deleted

@@ -1,155 +0,0 @@
-#
-/*
- *    Copyright (C) 2014 .. 2017
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    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.
- *
- *    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 __RTLSDR_HANDLER__
-#define	__RTLSDR_HANDLER__
-
-#include	<QObject>
-#include	<QSettings>
-#include	<QString>
-#include	<cstdio>
-#include	<atomic>
-#include	"dab-constants.h"
-#include	"device-handler.h"
-#include	"ringbuffer.h"
-#include	"ui_rtlsdr-widget.h"
-class	dll_driver;
-class	xml_fileWriter;
-//
-//	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_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
-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)();
-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, public  Ui_dabstickWidget {
-Q_OBJECT
-public:
-			rtlsdrHandler	(QSettings *, QString &);
-			~rtlsdrHandler();
-	void		setVFOFrequency	(int32_t);
-	int32_t		getVFOFrequency	();
-//	interface to the reader
-	bool		restartReader	(int32_t);
-	void		stopReader	();
-	int32_t		getSamples	(std::complex<float> *, int32_t);
-	int32_t		Samples		();
-	void		resetBuffer	();
-	int16_t		maxGain		();
-	int16_t		bitDepth	();
-	QString		deviceName	();
-	void		show		();
-	void		hide		();
-	bool		isHidden	();
-
-//	These need to be visible for the separate usb handling thread
-	RingBuffer<std::complex<uint8_t>> _I_Buffer;
-	pfnrtlsdr_read_async	rtlsdr_read_async;
-	struct rtlsdr_dev	*device;
-private:
-	QFrame		myFrame;
-	QSettings	*rtlsdrSettings;
-	int32_t		inputRate;
-	int32_t		deviceCount;
-	HINSTANCE	Handle;
-	dll_driver	*workerHandle;
-	int32_t		lastFrequency;
-	int16_t		gainsCount;
-	QString		deviceModel;
-	QString		recorderVersion;
-	FILE            *xmlDumper;
-        xml_fileWriter  *xmlWriter;
-        bool            setup_xmlDump		();
-        void            close_xmlDump		();
-        std::atomic<bool> xml_dumping;
-	FILE		*iqDumper;
-        bool            setup_iqDump		();
-        void            close_iqDump		();
-        std::atomic<bool> iq_dumping;
-
-	void		record_gainSettings	(int);
-	void		update_gainSettings	(int);
-	bool		save_gainSettings;
-//	here we need to load functions from the dll
-	bool		load_rtlFunctions	();
-	pfnrtlsdr_open	rtlsdr_open;
-	pfnrtlsdr_close	rtlsdr_close;
-	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
-
-	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;
-signals:
-	void		new_gainIndex		(int);
-	void		new_agcSetting		(bool);
-private slots:
-	void		set_ExternalGain	(const QString &);
-	void		set_autogain		(int);
-	void		set_ppmCorrection	(int);
-	void		set_xmlDump		();
-	void		set_iqDump		();
-};
-#endif
-

_service:download_url:qt-dab-3.6.tar.gz/dab-maxi/qt-devices/rtlsdr-handler-orig/rtlsdr-widget.ui Deleted

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>dabstickWidget</class>
- <widget class="QWidget" name="dabstickWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>203</width>
-    <height>330</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>RT2832 dabstick</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>ppm</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="ppm_correction">
-       <property name="minimum">
-        <number>-500</number>
-       </property>
-       <property name="maximum">
-        <number>500</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QComboBox" name="gainControl">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set gain in dB, only possible values are displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>gain</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="agcControl">
-     <property name="text">
-      <string>autogain</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="xml_dumpButton">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dumps the raw input from the rtlsdr dongle into a self describing file (with header in xml format containing recorded time, container format, frequency, device name, Qt-DAB version)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Opens a 'Save as ...' dialog. Press again to stop recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Very experimental! The resulting file can be read-in by using the xml file handler (if configured)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Warning: Produces large files!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>dump to xml file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="iq_dumpButton">
-     <property name="text">
-      <string>dump to raw file</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>dabstick</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="product_display">
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="deviceVersion">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Device name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/dabMini-32-2.0_resource.rc Deleted

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/dabMini-64-1.0_resource.rc Deleted

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

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

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

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

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

_service:download_url:qt-dab-3.6.tar.gz/qt-dab-correlation-button.png Deleted

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

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

_service:download_url:qt-dab-3.6.tar.gz/qt-dab-scan-button.png Deleted

_service:download_url:qt-dab-3.6.tar.gz/qt-dab-scope-2.png Deleted

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

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

_service:download_url:qt-dab-3.6.tar.gz/qt-dab-spectrum-button.png Deleted

_service:download_url:qt-dab-3.6.tar.gz/qt-dab-tii-button.png Deleted

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

_service:download_url:qt-dab-3.6.tar.gz/version-v4 Deleted

_service:download_url:qt-dab-3.6.tar.gz/.travis.yml -> _service:download_url:qt-dab-3.7.tar.gz/.travis.yml Changed

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

@@ -1,120 +1,17 @@
-# Qt-DAB-3.6 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-3.7 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.6 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini and brother dab-2 for experimenting, all built on the same set of sources.
+Qt-DAB-3.7 is software for Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini and brother dab-2 for experimenting, all built on the same set of sources.
 
---------------------------------------------------------------------
-DISCLAIMER 
---------------------------------------------------------------------
-
-I develop my software under Linux and 
-cross-compile for windows. Linux development is simple: if something
-is wrong - and that happens from time to time - it is always relatively
-easy to detect what is wrong and fix it.
-
-The point is that things that run fine under Linux do not (always) run
-fine under Windows: same software, no changes. In case it does not run
-correctly under Windows, finding out what happens can be done, but finding
-the cause, i.e. why it happens is virtually impossible!
-
-So, yes, I am aware of the fact that sometime things do not go under Windows
-as under Linux.
-
-So, while I keep on cross compiling the software for windows, do not
-always expect the smooth behaviour as it is under Linux.
-
-----------------------------------------------------------------------
-New in 3.6
------------------------------------------------------------------------
-
-Most of the differences between version 3.6 and previous versions are
-(hopefully) unnoticed by the user (some of them are cornerstones for
-future functional additions). However, one change is very visible:
-the "mute button" is on a different location, and the button on the 
-right bottom corner is now "config" button. The changes are large
-enough to justify a change in version number.
-
-The rationale for a "config" button is that there is a need (well,
-I have a need) to change some of the settings, without having to
-edit the ".ini" file.
-
-![configuration](/qt-dab-config.png?raw=true)
-
-The "config" button, when pressed, gives access to a widget with a few
-settings to set or alter values in the ".ini" (i.e. configuration) file.
-Currently, there are the following settings:
-
-	a. the *switchtime*, the maximum delay when selecting a service in a different channel;
-
-	b. the *mute* time, the time - in minutes - that audio mutes;
-
-	c. the *plotLength*, the length of the X-axis in the correlation display expressed in entities of 100 samples;
-
-	d. *full scan* selector, scan the while band once (default), continuously, or until a DABsignal is detected.
-
-	e. *mot slides* selector, show slides in a separate window when checked, otherwise as part of the technical data widget. 
-
-While most people will not be aware of it,
-there are different orderings possible for displaying the services in
-the service list. 
-One may choose between (Alfabetical, by service Identifier, or by the
-number of the subchannel).
-
-As an experiment - inspired by others - a simple ALARM timer is introduced.
-It happened a few times that I missed the news, transmitted on the hour,
-but on a different service than the one I was listening to.
-
-Now it is possible to specify a time on which a selected service on
-a selected channel can be started, regardless of the service and channel
-that we ar elistening to. The services that can be selected in
-the alarm selection are the ones in the currently selected channel
-and those in the presets.
-
-The GUI contains an indicator which shows when the alarm is set, when no
-alarm is set, the small label is not shown.
-
-Of course, the coloring, as implemented in 3.5.3 also applies to the config
-button.
-
-----------------------------------------------------------------------
-The contents of the qt-dab sourcetree
-----------------------------------------------------------------------
-
-The directory qt-dab is now the home of *THREE* related, but 
-different, versions of a DAB decoder:
-
- * first of all, there is Qt-DAB, a fairly complete DAB decoder,
-based on the idea that *the user is in full control* .
-
-![Qt-DAB with xml input](/qt-dab-1.png?raw=true)
-
- * second, the *little* sister is *dabMini*, built using the same set
-of sources, but with an absolutely minimal GUI.
-To assist in creating and installing an
-executable on an *RPI* the documentation contains a script with
-which all required libraries will be installed, the sources
-will be downloaded and compiled into an executable.
-dabMini and Qt-DAB share over 95 percent of the sources,
-see the subdirectory *dab-mini* for construction details.
-
-![dab-mini](/dab-mini.png?raw=true)
-
- * third, an *experimental version*, called *dab-2*. While the sources
-of *dab-2* and Qt-DAB overlap for more than 90 percent, a completely
-different architectural approach is taken for building up
-the DAB frames. Note that dab-2 and Qt-DAB share almost all of the GUI, 
-dab-2 has a different widget for device control.
-See the subdirectory *dab-2* for construction details.
-
-![dab-2](/dab-2-picture.png?raw=true)
+![overview](/qt-dab-screen.png?raw=true)
 
 ------------------------------------------------------------------
 Table of Contents
 ------------------------------------------------------------------
 
 * [Introduction](#introduction)
-* [Documentation](#documentation)
 * [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes-for-qt-dab)
+* [Documentation](#documentation)
 * [Presets](#presets-for-qt-dab-dabmini-and-dab-2)
 * [Colors](#Colors-for-Qt-DAB)
 * [History](maintaining-history-for-qt-dab-and-dab-2)
@@ -126,40 +23,39 @@
 * [Interfacing to another device](#interfacing-to-another-device)
 * [Using other bands than Band III or L Band](#using-other-bands-than-band-iii-or-l-band)
 * [xml-files and support](#xml-files-and-support)
+* [EPG-Handling](#EPG-Handling)
+* [Recording the SNR](#Recording-the-SNR)
+* [Scanning and the skip table](#Scanning-and-the-skip-table)
 * [Copyright](#copyright)
 
 ------------------------------------------------------------------
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.6** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-3.7** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
 
-For DX purposes, a separate **dab-scanner** is implemented that allows
-for a continuous scanning of selected channels in a given band. Results are 
-written in a text file, formatted for use with *LibreOffice Calc* and
-comparable programs. Note that in **Qt-DAB-3.6** the scan function
-is extended with an option to save detailed data in a text file,
-compatible with e.g. LibreOffice.
-For scanning purposes, a command line scanner exists, one where the channels
-that are to be scanned passed as command line parameter, and that dumps a specified number of seconds of the input of those channels with DAB data into a file.
+It provides an abundant amount of selectors and displays, most of
+which can be switched off, but are of interest for those who want to see aspects of the DAB signal.
 
-Derived programs, such as the **dab-scanner** and the command line based
-versions, **terminal-DAB**, **dab-cmdline**, **channelScanner** and **dab2fm* have their own repository on Github.
+While it is not very complicated to generate an executable, for Linux-x64
+an appImage exists that will run Qt-DAB instantly, and for Windows an installer
+is available.
 
-Since the Qt-DAB program has to run on a headless RPI 2/3 using the home WiFi,
-the resulting PCM output can be sent - if so configured - to a TCP port (Sources for a small client are part of the source distribution).
+The main difference between 3.7 and its predecessor is the introduction
+of **skipTables**. Such a table allows the specification of channels
+that can be skipped duting a scan.
 
---------------------------------------------------------------------
-Documentation
---------------------------------------------------------------------
+Qt-DAB makes extensive use of a GUI. Personally, grown up in the time of
+"command lines", from time to time I often prefer a simple command line
+driven device. Therefore, a **terminal-DAB-xxx** version was developed, a
+simpler version, just for listening to a DAB service, making use of 
+command line
 
-An extensive "user's guide" - in pdf format - can be found in the "docs"
-section of the source tree. The documentation contains a complete
-description of the widgets, of the values in the ".ini" file,
-on configuring for creating an executable (Linux), and even a
-complete description on how to add a device to the configuration.
+![Qt-DAB terminal DAB](/qt-dab-terminal-dab.png?raw=true)
 
-![Qt-DAB documentation](/qt-usersguide.png?raw=true)
+For those who are nostalgic to the era of nice wooden radios with glowing tubes,
+a program exists - for the Pluto - to receive DAB and transmit a selected
+service in FM stereo with the "dynamic label" sent as RDS.
 
 ------------------------------------------------------------------
 Features
@@ -172,8 +68,8 @@
   	* VHF Band III (default),
    	* L-Band (obsolete now)
   * Modes I, II and IV (Mode I default, Modes II and IV obsolete, but can be set in the ".ini" file)m
-  * Views on the signal: spectrum view incl. constellation diagram, correlation result, TII spectrum,
-  * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, 4 quality bars),
+  * Views on the signal: spectrum view incl. constellation diagram, correlation result, TII spectrum and the SNR over time.
+  * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, alternative FM frequency if available, 4 quality bars),
   * Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type),
   * Automatic display of TII (Transmitter Identification Information) data when transmitted,
   * *Presets* for easy switching of programs in different ensembles (see section *Presets*),
@@ -185,6 +81,7 @@
   * Scanning function (scan the band, show the results on the screen and save a detailed description of the services found in a file),

_service:download_url:qt-dab-3.6.tar.gz/correlation-viewer/correlation-viewer.cpp -> _service:download_url:qt-dab-3.7.tar.gz/correlation-viewer/correlation-viewer.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C)  2014 .. 2017
+ *    Copyright (C)  2014 .. 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -28,7 +28,9 @@
 
 	correlationViewer::correlationViewer	(RadioInterface	*mr,
 	                                         QSettings	*s,
-	                                         RingBuffer<float> *b) {
+	                                         RingBuffer<float> *b) :
+	                                           myFrame (nullptr),
+	                                           spectrumCurve ("") {
 QString	colorString	= "black";
 bool	brush;
 	this	-> myRadioInterface	= mr;
@@ -47,25 +49,23 @@
 	curveColor	= QColor (colorString);
 	brush		= dabSettings -> value ("brush", 0). toInt () == 1;
 	dabSettings	-> endGroup ();
-	myFrame				= new QFrame;
-	setupUi (this -> myFrame);
+	setupUi (&myFrame);
 
 	plotgrid			= impulseGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
-	grid		= new QwtPlotGrid;
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMajPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMajorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid		-> enableXMin (true);
-	grid		-> enableYMin (true);
+	grid. enableXMin (true);
+	grid. enableYMin (true);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMinPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMinorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid		-> attach (plotgrid);
+	grid. attach (plotgrid);
 
 	lm_picker       = new QwtPlotPicker (plotgrid -> canvas ());
         QwtPickerMachine *lpickerMachine =
@@ -77,24 +77,20 @@
         connect (lm_picker, SIGNAL (selected (const QPointF&)),
                  this, SLOT (rightMouseClick (const QPointF &)));
 
-	spectrumCurve	= new QwtPlotCurve ("");
-   	spectrumCurve	-> setPen (QPen(curveColor, 2.0));
-	spectrumCurve	-> setOrientation (Qt::Horizontal);
-	spectrumCurve	-> setBaseline	(0);
-	ourBrush	= new QBrush (curveColor);
-	ourBrush	-> setStyle (Qt::Dense3Pattern);
-	if (brush)
-	   spectrumCurve	-> setBrush (*ourBrush);
-	spectrumCurve	-> attach (plotgrid);
+   	spectrumCurve. setPen (QPen(curveColor, 2.0));
+	spectrumCurve. setOrientation (Qt::Horizontal);
+	spectrumCurve. setBaseline	(0);
+	if (brush) {
+	   QBrush ourBrush (curveColor);
+	   ourBrush. setStyle (Qt::Dense3Pattern);
+	   spectrumCurve. setBrush (ourBrush);
+	}
+	spectrumCurve. attach (plotgrid);
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
 }
 
 	correlationViewer::~correlationViewer() {
-	myFrame		-> hide();
-	delete		ourBrush;
-	delete		spectrumCurve;
-	delete		grid;
-	delete		myFrame;
+	myFrame. hide();
 }
 
 void	correlationViewer::showIndex	(int32_t v) {
@@ -124,15 +120,15 @@
 }
 
 void	correlationViewer::show () {
-	myFrame		-> show();
+	myFrame. show ();
 }
 
-void	correlationViewer::hide() {
-	myFrame		-> hide();
+void	correlationViewer::hide () {
+	myFrame. hide ();
 }
 
 bool	correlationViewer::isHidden() {
-	return myFrame	-> isHidden();
+	return myFrame. isHidden();
 }
 
 static int lcount = 0;
@@ -142,7 +138,7 @@
 float	mmax	= 0;
 
 	responseBuffer	-> getDataFromBuffer (data, dots);
-	if (myFrame -> isHidden())
+	if (myFrame. isHidden())
 	   return;
 
 	int plotLength	= dabSettings -> value ("plotLength",
@@ -170,11 +166,11 @@
 	plotgrid	-> setAxisScale (QwtPlot::yLeft,
 				         get_db (0), mmax);
 	plotgrid	-> enableAxis (QwtPlot::yLeft);
-	spectrumCurve   -> setBaseline  (get_db (0));
+	spectrumCurve. setBaseline  (get_db (0));
 
 	Y_values [0]		= get_db (0);
 	Y_values [plotLength - 1] 	= get_db (0);
-	spectrumCurve	-> setSamples (X_axis, Y_values, plotLength);
+	spectrumCurve. setSamples (X_axis, Y_values, plotLength);
 	plotgrid	-> replot(); 
 }
 
@@ -214,22 +210,18 @@
 	this		-> displayColor	= QColor (displayColor);
 	this		-> gridColor	= QColor (gridColor);
 	this		-> curveColor	= QColor (curveColor);
-	spectrumCurve	-> setPen (QPen(this -> curveColor, 2.0));
+	spectrumCurve. setPen (QPen(this -> curveColor, 2.0));
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMajPen (QPen(this -> gridColor, 0,
-	                                                   Qt::DotLine));
+	grid. setMajPen (QPen(this -> gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMajorPen (QPen(this -> gridColor, 0,
-	                                                   Qt::DotLine));
+	grid. setMajorPen (QPen(this -> gridColor, 0, Qt::DotLine));
 #endif
-	grid		-> enableXMin (true);
-	grid		-> enableYMin (true);
+	grid. enableXMin (true);
+	grid. enableYMin (true);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMinPen (QPen(this -> gridColor, 0,
-	                                                   Qt::DotLine));
+	grid. setMinPen (QPen(this -> gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMinorPen (QPen(this -> gridColor, 0,
-	                                                   Qt::DotLine));
+	grid. setMinorPen (QPen(this -> gridColor, 0, Qt::DotLine));
 #endif
 	plotgrid	-> setCanvasBackground (this -> displayColor);
 }

_service:download_url:qt-dab-3.6.tar.gz/correlation-viewer/correlation-viewer.h -> _service:download_url:qt-dab-3.7.tar.gz/correlation-viewer/correlation-viewer.h Changed

_service:download_url:qt-dab-3.6.tar.gz/correlation-viewer/correlation-widget.ui -> _service:download_url:qt-dab-3.7.tar.gz/correlation-viewer/correlation-widget.ui Changed

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

@@ -111,8 +111,8 @@
 	         myRadioInterface, SLOT (set_CorrectorDisplay (int)));
         connect (this, SIGNAL (show_Spectrum (int)),
                  mr, SLOT (showSpectrum (int)));
-	connect (this, SIGNAL (show_tii (QByteArray)),
-                 myRadioInterface, SLOT (show_tii (QByteArray)));
+	connect (this, SIGNAL (show_tii (int, int)),
+                 myRadioInterface, SLOT (show_tii (int, int)));
 	connect (this, SIGNAL (No_Signal_Found (void)),
 	         myRadioInterface, SLOT (No_Signal_Found (void)));
 	my_TII_Detector. reset ();
@@ -525,18 +525,12 @@
 	      if (res != 0) {
 	         uint8_t mainId   = res >> 8;
 	         uint8_t subId    = res & 0xFF;
-	         for (uint16_t k = 0; k < transmitters. size (); k += 2)
-	            if ((transmitters. at (k) == mainId) &&
-	                (transmitters. at (k + 1) == subId))
-	               res = 0;
-                 if (res != 0) {
-                    transmitters. append (mainId);
-                    transmitters. append (subId);
-                    show_tii (transmitters);
-                 }
+	         tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data (), T_u);
+	         show_tii (mainId, subId);
               }
+	      tii_counter = 0;
+	      my_TII_Detector. reset ();
 	   }
-	   tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
 	}
 }

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

_service:download_url:qt-dab-3.6.tar.gz/dab-2/radio.cpp -> _service:download_url:qt-dab-3.7.tar.gz/dab-2/radio.cpp Changed

@@ -283,6 +283,7 @@
 
 	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (dataDisplay);
+	techData. timeTable_button	-> hide ();
 
 	configDisplay	= new QFrame (nullptr);
 	configWidget. setupUi (configDisplay);
@@ -1084,7 +1085,7 @@
 	my_Printer. showEnsembleData (currentChannel,
 	                              frequency, 
 	                              localTimeDisplay -> text (),
-	                              transmitter_coordinates -> text (),
+	                              transmitters,
 	                              serviceList,
 	                              my_dabProcessor, fileP);
 	fclose (fileP);
@@ -1213,6 +1214,7 @@
 
 	QPixmap p;
 	p. loadFromData (data, type);
+
 	if (saveSlides) {
 	   QString pict = QDir::toNativeSeparators (picturesPath + pictureName);
 	   checkDir (pict);
@@ -1462,9 +1464,39 @@
 //	to be displayed
 ///////////////////////////////////////////////////////////////////////////
 
+static
+const char *monthTable [] = {
+        "jan",
+        "feb",
+        "mar",
+        "apr",
+        "may",
+        "jun",
+        "jul",
+        "aug",
+        "sep",
+        "oct",
+        "nov",
+        "dec"
+};
+
+void	RadioInterface::clockTime	(int year, int month, int day,
+	                                        int hours, int minutes) {
+char dayString [3];
+char hourString [3];
+char minuteString [3];
+        currentHour     = hours;
+        currentMinute   = minutes;
+        sprintf (dayString, "%.2d", day);
+        sprintf (hourString, "%.2d", hours);
+        sprintf (minuteString, "%.2d", minutes);
+        QString result = QString::number (year) + "-" +
+                               monthTable [month - 1] + "-" +
+                               QString (dayString) + "  " +
+                               QString (hourString) + ":" +
+                               QString (minuteString);
 
-void	RadioInterface::showTime	(const QString &s) {
-	localTimeDisplay	-> setText (s);
+	localTimeDisplay	-> setText (result);
 }
 
 void	RadioInterface::show_frameErrors (int s) {
@@ -1544,25 +1576,41 @@
 	stereoSetting = s;
 }
 
-void	RadioInterface::show_tii (QByteArray data) {
+static
+QString tiiNumber (int n) {
+        if (n >= 10)
+           return QString::number (n);
+        return QString ("0") + QString::number (n);
+}
+
+void	RadioInterface::show_tii (int mainId, int subId) {
 QString a = "Est: ";
+bool	found	= false;
+
+	for (int i = 0; i < transmitters. size (); i += 2) {
+	   if ((transmitters. at (i) == mainId) &&
+	       (transmitters. at (i + 1) == subId)) {
+	      found = true;
+	      break;
+	   }
+	}
 
+	if (!found) {
+	   transmitters. append (mainId);
+	   transmitters. append (subId);
+	}
         if (!running. load())
            return;
 
-	for (uint16_t i = 0; i < data. size (); i += 2) {
-	   uint8_t mainId	= data. at (i);
-	   uint8_t subId	= data. at (i + 1);
-           a = a + " " +  (QString::number (mainId) + " " +
-	                                QString::number (subId));
-	}
+	a = a + " " +  tiiNumber (mainId) + " " + tiiNumber (subId);
 
-	if (data. size () > 0) {
-	   transmitter_coordinates	-> setAlignment (Qt::AlignRight);
-	   transmitter_coordinates	-> setText (a);
-	   my_tiiViewer. showTransmitters (data);
-        }
+	transmitter_coordinates	-> setAlignment (Qt::AlignRight);
+	transmitter_coordinates	-> setText (a);
+	my_tiiViewer. showTransmitters (transmitters);
 	my_tiiViewer. showSpectrum (1);
+        if (!running. load())
+           return;
+	
 }
 
 void	RadioInterface::showSpectrum	(int32_t amount) {
@@ -2500,6 +2548,7 @@
 	setSynced	(false);
 	ensembleId	-> setText ("");
 	transmitter_coordinates	-> setText (" ");
+	transmitters. clear ();
 	if (serviceList. size () > 0) {
 	   serviceList. clear ();
 	   model. clear ();
@@ -2713,7 +2762,7 @@
 	                       my_dabProcessor	-> get_ensembleName (),
 	                       ensembleId,
 	                       SNR,
-	                       transmitter_coordinates -> text ());
+	                       transmitters);
 	for (serviceId serv: serviceList) {
 	   QString audioService = serv. name;
 	   audiodata d;
@@ -2736,7 +2785,7 @@
 	   my_Printer. showEnsembleData (channelSelector -> currentText (),
 	                                 inputDevice -> getVFOFrequency (),
 	                                 localTimeDisplay -> text (),
-	                                 transmitter_coordinates -> text (),
+	                                 transmitters,
 	                                 serviceList,
 	                                 my_dabProcessor, scanDumpFile);

_service:download_url:qt-dab-3.6.tar.gz/dab-2/radio.h -> _service:download_url:qt-dab-3.7.tar.gz/dab-2/radio.h Changed

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

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-3.6)
+set (objectName qt-dab-3.7)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -201,6 +201,7 @@
 	           ../spectrum-viewer
 	           ../correlation-viewer
 	           ../tii-viewer
+	           ../snr-viewer
 	           ./qt-devices
 	           ./qt-devices/rawfiles-new
 	           ./qt-devices/wavfiles-new
@@ -286,10 +287,13 @@
 	     ../includes/support/scanner-table.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/alarm-selector.h
+	     ../includes/support/time-table.h
+	     ../includes/support/findfilenames.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
 	     ../tii-viewer/tii-viewer.h
+	     ../snr-viewer/snr-viewer.h
 	     ./qt-devices/device-handler.h
 	     ./qt-devices/xml-filewriter.h
 	     ./qt-devices/rawfiles-new/rawfiles.h
@@ -372,10 +376,13 @@
 	     ../src/support/scanner-table.cpp
 	     ../src/support/color-selector.cpp
 	     ../src/support/alarm-selector.cpp
+	     ../src/support/time-table.cpp
+	     ../src/support/findfilenames.cpp
 	     ../src/scopes-qwt6/iqdisplay.cpp 
 	     ../spectrum-viewer/spectrum-viewer.cpp 
 	     ../correlation-viewer/correlation-viewer.cpp 
 	     ../tii-viewer/tii-viewer.cpp
+	     ../snr-viewer/snr-viewer.cpp
 	     ./qt-devices/device-handler.cpp
 	     ./qt-devices/xml-filewriter.cpp
 	     ./qt-devices/rawfiles-new/rawfiles.cpp
@@ -412,6 +419,7 @@
 	     ../includes/backend/data/tdc-datahandler.h
 	     ../includes/backend/data/journaline-datahandler.h
 	     ../includes/backend/data/data-processor.h
+	     ../includes/support/band-handler.h
 	     ../includes/support/preset-handler.h
 	     ../includes/support/presetcombobox.h
 	     ../includes/support/smallqlistview.h
@@ -423,10 +431,12 @@
 	     ../includes/support/scanner-table.h
 	     ../includes/support/color-selector.h
 	     ../includes/support/alarm-selector.h
+	     ../includes/support/time-table.h
 	     ../includes/scopes-qwt6/iqdisplay.h
 	     ../spectrum-viewer/spectrum-viewer.h 
 	     ../correlation-viewer/correlation-viewer.h 
  	     ../tii-viewer/tii-viewer.h
+ 	     ../snr-viewer/snr-viewer.h
 	     ./qt-devices/rawfiles-new/rawfiles.h
 	     ./qt-devices/rawfiles-new/raw-reader.h
 	     ./qt-devices/wavfiles-new/wavfiles.h
@@ -445,6 +455,7 @@
 	     ../spectrum-viewer/scopewidget.ui
 	     ../correlation-viewer/correlation-widget.ui
 	     ../tii-viewer/tii-widget.ui
+	     ../snr-viewer/snr-widget.ui
 	     ./qt-devices/xml-filereader/xmlfiles.ui
 	   )
 
@@ -822,19 +833,25 @@
 	endif (RTL_TCP)
 
 	if (TRY_EPG)
-
 	   include_directories (
+	      ../includes/backend/data/epg-2
 	      ../includes/backend/data/epg
 	   )
 	   set ($(objectName)_HDRS
 	        ${${objectName}_HDRS}
+	             ../includes/backend/data/epg-2/epg-decoder.h
 	             ../includes/backend/data/epg/epgdec.h
 	   )
 
 	   set (${objectName}_SRCS
 	        ${${objectName}_SRCS}
+	             ../src/backend/data/epg-2/epg-decoder.cpp
 	             ../src/backend/data/epg/epgdec.cpp
 	   )
+	   set (${objectName}_MOCS
+	        ${${objectName}_MOCS}
+              ../includes/backend/data/epg-2/epg-decoder.h
+	   )
 	   add_definitions (-DTRY_EPG)
 	endif (TRY_EPG)

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

@@ -48,6 +48,7 @@
               ../spectrum-viewer \
 	      ../correlation-viewer \
 	      ../tii-viewer \
+	      ../snr-viewer \
 	      ./qt-devices \
 	      ./qt-devices/rawfiles-new \
 	      ./qt-devices/wavfiles-new\
@@ -73,6 +74,7 @@
               ../spectrum-viewer \
 	      ../correlation-viewer \
 	      ../tii-viewer \
+	      ../snr-viewer \
 	      ./qt-devices \
 	      ./qt-devices/rawfiles-new \
 	      ./qt-devices/wavfiles-new \
@@ -159,11 +161,14 @@
 	   ../includes/support/scanner-table.h \
 	   ../includes/support/color-selector.h \
 	   ../includes/support/alarm-selector.h \
+	   ../includes/support/time-table.h \
+	   ../includes/support/findfilenames.h \
 	   ../includes/scopes-qwt6/spectrogramdata.h \
 	   ../includes/scopes-qwt6/iqdisplay.h \
 	   ../spectrum-viewer/spectrum-viewer.h \
 	   ../correlation-viewer/correlation-viewer.h \
 	   ../tii-viewer/tii-viewer.h \
+	   ../snr-viewer/snr-viewer.h \
 	   ./qt-devices/device-handler.h \
 	   ./qt-devices/xml-filewriter.h \
 #	   ./qt-devices/filereader-widget.h \
@@ -184,6 +189,7 @@
 FORMS	+= ../spectrum-viewer/scopewidget.ui
 FORMS	+= ../correlation-viewer/correlation-widget.ui
 FORMS	+= ../tii-viewer/tii-widget.ui
+FORMS	+= ../snr-viewer/snr-widget.ui
 #FORMS	+= ./qt-devices/filereader-widget.ui 
 FORMS	+= ./qt-devices/xml-filereader/xmlfiles.ui
 
@@ -258,10 +264,13 @@
 	   ../src/support/scanner-table.cpp \
 	   ../src/support/color-selector.cpp \
 	   ../src/support/alarm-selector.cpp \
+	   ../src/support/time-table.cpp \
+	   ../src/support/findfilenames.cpp \
 	   ../src/scopes-qwt6/iqdisplay.cpp \
 	   ../spectrum-viewer/spectrum-viewer.cpp \
 	   ../correlation-viewer/correlation-viewer.cpp \
 	   ../tii-viewer/tii-viewer.cpp \
+	   ../snr-viewer/snr-viewer.cpp \
 	   ./qt-devices/device-handler.cpp \
 	   ./qt-devices/xml-filewriter.cpp \
 	   ./qt-devices/rawfiles-new/rawfiles.cpp \
@@ -275,7 +284,7 @@
 #
 unix {
 DESTDIR		= ./linux-bin
-TARGET		= qt-dab-3.6
+TARGET		= qt-dab-3.7
 exists ("../.git") {
    GITHASHSTRING = $$system(git rev-parse --short HEAD)
    !isEmpty(GITHASHSTRING) {
@@ -309,9 +318,10 @@
 CONFIG		+= airspy
 CONFIG		+= hackrf
 CONFIG		+= lime
-CONFIG		+= soapy
-CONFIG		+= pluto
-
+#CONFIG		+= soapy
+#CONFIG		+= pluto
+CONFIG		+= elad-device
+#CONFIG		+= elad-files		# do not use this
 CONFIG		+= faad
 #CONFIG		+= fdk-aac
 #very experimental, simple server for connecting to a tdc handler
@@ -326,12 +336,13 @@
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
-#CONFIG		+= try-epg		# do not use
+DEFINES	+= __LOGGING__
+CONFIG		+= try-epg		# do not use
 CONFIG		+= PC
 #CONFIG		+= RPI
 #DEFINES	+= SHOW_MISSING
-
-DEFINES	+=__KEEP_GAIN_SETTINGS__
+DEFINES		+= __DUMP_SNR__		# for experiments only
+DEFINES		+=__KEEP_GAIN_SETTINGS__
 }
 
 
@@ -350,9 +361,9 @@
 }
 
 ##for for 64 bit
-#	TARGET		= qt-dab64-3.6
+#	TARGET		= qt-dab64-3.7
 #	DEFINES		+= __BITS64__
-#	DESTDIR		= /usr/shared/sdr-j-development/w64-programs/windows-dab64-qt
+#	DESTDIR		= /usr/shared/w64-programs/windows-dab64-qt
 #	INCLUDEPATH	+= /usr/x64-w64-mingw32/sys-root/mingw/include
 #	INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
 #	LIBS		+= -L/usr/x64-w64-mingw32/sys-root/mingw/lib
@@ -369,8 +380,8 @@
 #	CONFIG		+= NO_SSE
 #
 #for win32, comment out the lines above
-	TARGET		= qt-dab32-3.6
-	DESTDIR		= /usr/shared/sdr-j-development/w32-programs/windows-dab32-qt
+	TARGET		= qt-dab32-3.7
+	DESTDIR		= /usr/shared/w32-programs/windows-dab32-qt
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include
 	INCLUDEPATH	+= /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
 	LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
@@ -555,6 +566,30 @@
 	FORMS		+= ./qt-devices/pluto-handler-2/pluto-widget.ui
 }
 
+elad-device	{
+	DEFINES		+= HAVE_ELAD
+	DEPENDPATH	+= ./qt-devices/elad-s1-handler
+	INCLUDEPATH	+= ./qt-devices/elad-s1-handler
+	HEADERS		+= ./qt-devices/elad-s1-handler/elad-handler.h
+	HEADERS		+= ./qt-devices/elad-s1-handler/elad-loader.h
+	HEADERS		+= ./qt-devices/elad-s1-handler/elad-worker.h
+	SOURCES		+= ./qt-devices/elad-s1-handler/elad-handler.cpp
+	SOURCES		+= ./qt-devices/elad-s1-handler/elad-loader.cpp
+	SOURCES		+= ./qt-devices/elad-s1-handler/elad-worker.cpp
+	FORMS		+= ./qt-devices/elad-s1-handler/elad-widget.ui
+}
+
+elad-files	{
+	DEFINES		+= HAVE_ELAD_FILES
+	DEPENDPATH	+= ./qt-devices/elad-files
+	INCLUDEPATH	+= ./qt-devices/elad-files
+	HEADERS		+= ./qt-devices/elad-files/elad-files.h
+	HEADERS		+= ./qt-devices/elad-files/elad-reader.h
+	SOURCES		+= ./qt-devices/elad-files/elad-files.cpp
+	SOURCES		+= ./qt-devices/elad-files/elad-reader.cpp
+	FORMS		+= ./qt-devices/elad-files/elad-files.ui
+}
+
 send_datagram {
 	DEFINES		+= _SEND_DATAGRAM_
 	QT		+= network
@@ -564,12 +599,15 @@
 	DEFINES		+= TRY_EPG
 	QT		+= xml
 	DEPENDPATH	+= ../src/backend/data/epg \
-	                   ../includes/backend/data/epg 
-	INCLUDEPATH	+= ../includes/backend/data/epg 
+	                   ../src/backend/data/epg-2 \
+	                   ../includes/backend/data/epg \
+	                   ../includes/backend/data/epg-2
+	INCLUDEPATH	+= ../includes/backend/data/epg \
+	                   ../includes/backend/data/epg-2
 	HEADERS		+= ../includes/backend/data/epg/epgdec.h \
-	                   ./si-processor.h
+	                   ../includes/backend/data/epg-2/epg-decoder.h
 	SOURCES		+= ../src/backend/data/epg/epgdec.cpp \
-	                   ./si-processor.cpp
+	                   ../src/backend/data/epg-2/epg-decoder.cpp
 }
 
 tcp-streamer	{
@@ -654,3 +692,4 @@
 	LIBS		+= -lfdk-aac
 }
 
+

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

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

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-files Added

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-files/elad-files.cpp Added

@@ -0,0 +1,229 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	<cstdio>
+#include	<unistd.h>
+#include	<cstdlib>
+#include	<fcntl.h>
+#include	<sys/time.h>
+#include	<ctime>
+#include	<QString>
+#include	"elad-files.h"
+
+#define	__BUFFERSIZE__	32 * 32768
+
+	eladFiles::eladFiles (QString f):
+	                           myFrame (nullptr),
+	                           _I_Buffer (4 * __BUFFERSIZE__),
+	                           _O_Buffer (__BUFFERSIZE__) {
+SF_INFO *sf_info;
+
+	fileName	= f;
+	setupUi (&myFrame);
+	myFrame. show	();
+
+	filePointer	= fopen (f. toUtf8(). data(), "r+b");
+	if (filePointer == nullptr) {
+	   fprintf (stderr, "file %s no legitimate sound file\n", 
+	                                f. toUtf8().data());
+	   throw (24);
+	}
+
+        for (int i = 0; i < DAB_RATE / 1000; i ++) {
+           float inVal  = float (ELAD_RATE / 1000);
+           mapTable_int [i] =  int (floor (i * (inVal / 2048.0)));
+           mapTable_float [i] = i * (inVal / 2048.0) - mapTable_int [i];
+        }
+        convIndex       = 0;
+        fprintf (stderr, "mapTables initialized\n");
+
+        iqSize          = 8;
+	iqSwitch. store (false);
+	nameofFile	-> setText (f);
+	fileProgress	-> setValue (0);
+	connect (iqSwitch_button, SIGNAL (clicked ()),
+	         this, SLOT (handle_iqButton ()));
+	running. store (false);
+}
+//
+//	Note that running == true <==> readerTask has value assigned
+
+	eladFiles::~eladFiles() {
+	if (running. load()) {
+	   readerTask	-> stopReader();
+	   while (readerTask -> isRunning())
+	      usleep (500);
+	   delete readerTask;
+	}
+	if (filePointer != nullptr)
+	   fclose (filePointer);
+}
+
+bool	eladFiles::restartReader	(int32_t freq) {
+	(void)freq;
+	if (running. load())
+           return true;
+        readerTask      = new eladReader (this, filePointer, &_I_Buffer);
+        running. store (true);
+        return true;
+}
+
+void	eladFiles::stopReader() {
+	if (running. load()) {
+           readerTask   -> stopReader();
+           while (readerTask -> isRunning())
+              usleep (100);
+	   delete readerTask;
+        }
+        running. store (false);
+}
+
+//std::complex<float>	makeSample_31bits (uint8_t *, bool);
+
+typedef union {
+	struct __attribute__((__packed__)) {
+		float	i;
+		float	q;
+		} iqf;
+	struct __attribute__((__packed__)) {
+		int32_t	i;
+		int32_t	q;
+		} iq;
+	struct __attribute__((__packed__)) {
+		uint8_t		i1;
+		uint8_t		i2;
+		uint8_t		i3;
+		uint8_t		i4;
+		uint8_t		q1;
+		uint8_t		q2;
+		uint8_t		q3;
+		uint8_t		q4;
+		};
+} iq_sample;
+
+// ADC output unsigned 14 bit input to FPGA output signed 32 bit
+// multiply output FPGA by SCALE_FACTOR to normalize 32bit signed values to ADC range signed 14 bit
+#define SCALE_FACTOR_32to14    (0.000003814) //(8192/2147483648)
+// ADC out unsigned 14 bit input to FPGA output signed 16 bit
+#define SCALE_FACTOR_16to14    (0.250)       //(8192/32768)  
+
+std::complex<float>	makeSample (uint8_t *buf, bool iqSwitch) {
+//std::complex<float>	makeSample_31bits (uint8_t *buf, bool iqSwitch) {
+int ii = 0; int qq = 0;
+int16_t	i = 0;
+uint32_t	uii = 0, uqq = 0;
+
+	uint8_t i0 = buf [i++];
+	uint8_t i1 = buf [i++];
+	uint8_t i2 = buf [i++];
+	uint8_t i3 = buf [i++];
+
+	uint8_t q0 = buf [i++];
+	uint8_t q1 = buf [i++];
+	uint8_t q2 = buf [i++];
+	uint8_t q3 = buf [i++];
+
+
+	uii = (i3 << 24) | (i2 << 16) | (i1 << 8) | i0;
+	uqq = (q3 << 24) | (q2 << 16) | (q1 << 8) | q0;
+
+	ii	= (int) uii;
+	qq	= (int) uqq;
+	if (iqSwitch)
+	   return std::complex<float> ((float)qq * SCALE_FACTOR_32to14,
+	                               (float)ii * SCALE_FACTOR_32to14);
+	else
+	   return std::complex<float> ((float)ii * SCALE_FACTOR_32to14,
+	                               (float)qq * SCALE_FACTOR_32to14);
+}
+
+#define	SEGMENT_SIZE	(1024 * 8)
+uint8_t	lbuffer [SEGMENT_SIZE];
+//	size is in I/Q pairs
+//	Note: Samples computes the amount of samples that either
+//	are already available or can be computed based on the
+//	current content of the _I_Buffer
+int32_t	eladFiles::getSamples	(std::complex<float> *V, int32_t size) {
+int32_t	amount;
+std::complex<float> temp [2048];
+
+	if (filePointer == nullptr)
+	   return 0;
+
+	while (Samples () < size)	// should not happen
+	   usleep (500);
+
+	while (_O_Buffer. GetRingBufferReadAvailable () < size) {
+	   _I_Buffer. getDataFromBuffer (lbuffer, SEGMENT_SIZE);
+	   for (int i = 0; i < SEGMENT_SIZE / iqSize; i ++) {
+	      if (convIndex > ELAD_RATE / 1000) {
+	         float sum = 0;
+	         int16_t j;
+	         for (j = 0; j < 2048; j ++) {
+	            int16_t  inpBase		= mapTable_int [j];
+	            float    inpRatio		= mapTable_float [j];
+	            temp [j]  = cmul (convBuffer [inpBase + 1], inpRatio) +
+	                        cmul (convBuffer [inpBase], 1 - inpRatio);
+	            sum += abs (temp [j]);
+	         }
+	
+	         _O_Buffer. putDataIntoBuffer (temp, 2048);
+//	shift the sample at the end to the beginning, it is needed
+//	as the starting sample for the next time
+	         convBuffer [0] = convBuffer [ELAD_RATE / 1000];
+	         convIndex = 1;
+              }
+	   }
+	}
+	return _O_Buffer. getDataFromBuffer (V, size);
+}
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-files/elad-files.h Added

@@ -0,0 +1,74 @@
+#
+/*
+ *    Copyright (C) 2013 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef	__ELAD_FILES__
+#define	__ELAD_FILES__
+
+#include	<QString>
+#include	<QFrame>
+#include	<sndfile.h>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"device-handler.h"
+#include	"ringbuffer.h"
+
+#include	"ui_elad-files.h"
+#include	"elad-reader.h"
+
+#define	ELAD_RATE	3072000
+#define	DAB_RATE	2048000
+class	eladFiles: public deviceHandler, public Ui_eladreaderWidget {
+Q_OBJECT
+public:
+			eladFiles	(QString);
+	       		~eladFiles	();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples		();
+	bool		restartReader	(int32_t);
+	void		stopReader	();
+	void		show		();	
+	void		hide		();
+	bool		isHidden	();
+private:
+	QFrame		myFrame;
+	QString		fileName;
+	RingBuffer<uint8_t>	_I_Buffer;
+	RingBuffer<std::complex<float>> _O_Buffer;
+	int32_t		bufferSize;
+	FILE		*filePointer;
+	eladReader	*readerTask;
+	std::atomic<bool>	running;
+
+	int             iqSize;
+        std::complex<float> convBuffer  [ELAD_RATE / 1000 + 1];
+        int             mapTable_int    [DAB_RATE / 1000];
+        float           mapTable_float  [DAB_RATE / 1000];
+        int             convIndex;
+	std::atomic<bool> iqSwitch;
+
+public slots:
+	void		setProgress	(int);
+	void		handle_iqButton	();
+};
+
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-files/elad-files.ui Added

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>eladreaderWidget</class>
+ <widget class="QWidget" name="eladreaderWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>457</width>
+    <height>151</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>elad filereader</string>
+  </property>
+  <widget class="QFrame" name="frame">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>441</width>
+     <height>131</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>20</x>
+      <y>30</y>
+      <width>181</width>
+      <height>21</height>
+     </rect>
+    </property>
+    <property name="toolTip">
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Path to file&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    </property>
+    <property name="text">
+     <string>Playing pre-recorded file:</string>
+    </property>
+    <property name="textInteractionFlags">
+     <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+    </property>
+   </widget>
+   <widget class="QLabel" name="nameofFile">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>60</y>
+      <width>401</width>
+      <height>21</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="textInteractionFlags">
+     <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+    </property>
+   </widget>
+   <widget class="QProgressBar" name="fileProgress">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>80</y>
+      <width>421</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="value">
+     <number>24</number>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="iqSwitch_button">
+    <property name="geometry">
+     <rect>
+      <x>300</x>
+      <y>10</y>
+      <width>103</width>
+      <height>36</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>iq</string>
+    </property>
+   </widget>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-files/elad-reader.cpp Added

@@ -0,0 +1,99 @@
+#
+/*
+ *    Copyright (C) 2013 .. 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; 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	<sys/time.h>
+#include	"elad-reader.h"
+#include	"elad-files.h"
+
+static inline
+int64_t         getMyTime() {
+struct timeval  tv;
+
+        gettimeofday (&tv, nullptr);
+        return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
+}
+
+	eladReader::eladReader	(eladFiles	*mr,
+	                         FILE		*filePointer,
+	                         RingBuffer<uint8_t> *theBuffer) {
+	this	-> parent	= mr;
+	this	-> filePointer	= filePointer;
+	this	-> theBuffer	= theBuffer;
+	fileLength		= fseek (filePointer, 0, SEEK_END);
+	fprintf (stderr, "fileLength = %d\n", (int)fileLength);
+        fseek (filePointer, 0, SEEK_SET);
+	period          = 1000;  // segments of 1 millisecond
+        fprintf (stderr, "Period = %ld\n", period);
+	running. store (false);
+	connect (this, SIGNAL (setProgress (int)),
+	         parent, SLOT (setProgress (int)));
+	start();
+}
+
+	eladReader::~eladReader	() {
+	stopReader();
+}
+
+void	eladReader::stopReader () {
+	if (running. load()) {
+	   running. store (false);
+	   while (isRunning())
+	      usleep (200);
+	}
+}
+
+void	eladReader::run	() {
+int32_t	bufferSize	= 3072 * 8;
+int64_t	nextStop;
+int	teller		= 0;
+uint8_t lBuffer [bufferSize];
+
+	fseek (filePointer, 0, SEEK_SET);
+	running. store (true);
+
+	nextStop	= getMyTime ();
+	try {
+	   while (running. load()) {
+	      while (theBuffer -> WriteSpace() < bufferSize) {
+	         if (!running. load())
+	            throw (33);
+	         usleep (100);
+	      }
+
+	      nextStop += period;
+	      int n = fread (lBuffer, 1, 6 * 8 * 512, filePointer);
+	      if (n < 8 * 512) {
+	         for (int i = n; i < bufferSize; i ++)
+	            lBuffer [i] = 0;
+	         fseek (filePointer, 0, SEEK_SET);
+	         fprintf (stderr, "file reset\n");
+	      }
+
+	      theBuffer -> putDataIntoBuffer (lBuffer, n);
+	      if (nextStop - getMyTime() > 0)
+	         usleep (period);
+//	         usleep (nextStop - getMyTime());
+	   }
+	} catch (int e) {}
+	fprintf (stderr, "taak voor replay eindigt hier\n"); fflush (stderr);
+}
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-files/elad-reader.h Added

@@ -0,0 +1,55 @@
+#
+/*
+ *    Copyright (C) 2013 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef	__ELAD_READER__
+#define	__ELAD_READER__
+
+#include	<QThread>
+#include	<stdio.h>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<atomic>
+class	eladFiles;
+
+class	eladReader:public QThread {
+Q_OBJECT
+public:
+			eladReader	(eladFiles *,
+	                                 FILE *,
+	                                 RingBuffer<uint8_t> *); 
+			~eladReader	();
+	void		startReader	();
+	void		stopReader	();
+private:
+virtual void		run		();
+	FILE		*filePointer;
+	RingBuffer<uint8_t> *theBuffer;
+	uint64_t	period;
+	std::atomic<bool>	running;
+	int64_t		fileLength;
+	eladFiles	*parent;
+signals:
+	void		setProgress	(int);
+};
+
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler Added

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old Added

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-handler.cpp Added

@@ -0,0 +1,376 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QHBoxLayout>
+#include	<QLabel>
+#include	<QMessageBox>
+#include	<QDir>
+
+#include	"elad-handler.h"	// our header
+#include	"elad-worker.h"		// the thread, reading in the data
+#include	"elad-loader.h"		// function loader
+#include	<stdio.h>
+
+//	Currently, we do not have lots of settings,
+//	it just might change suddenly, but not today
+		eladHandler::eladHandler (QSettings *s):
+	                                     myFrame (nullptr),
+	                                     _I_Buffer  (256 * 32768),
+	                                     _O_Buffer  (16 * 32768) {
+int16_t	success;
+
+	this	-> eladSettings	= s;
+	setupUi (&myFrame);
+	myFrame. show ();
+	theLoader		= nullptr;
+	theWorker		= nullptr;
+	Offset			= offsetSelector	-> value ();
+	Nyquist			= NyquistWidth		-> value ();
+//
+//	sometimes problems with dynamic linkage of libusb, it is
+//	loaded indirectly through the dll
+	if (libusb_init (nullptr) < 0) {
+	   fprintf (stderr, "libusb problem\n");	// should not happen
+	   throw (21);
+	}
+
+	libusb_exit (nullptr);
+	theLoader	= new eladLoader (ELAD_RATE, &success);
+	if (success != 0) {
+	   if (success == -1)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in loading libs\n"));
+	   else
+	   if (success == -2)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in setting up USB\n"));
+	   else
+	   if (success == -3)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in FPGA init\n"));
+	   else
+	   if (success == -4)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in hardware init\n"));
+	
+	   statusLabel -> setText ("not functioning");
+	   delete theLoader;
+	   theLoader	= nullptr;
+	   throw (21);
+	}
+	statusLabel	-> setText ("Loaded");
+//
+	externalFrequency	= Khz (220000);
+//
+//	since localFilter and gainReduced are also used as
+//	parameter for the API functions, they are int's rather
+//	than bool.
+	localFilter	= 0;
+	filterText	-> setText ("no filter");
+	gainReduced	= 0;
+	gainLabel	-> setText ("0");
+
+        for (int i = 0; i < 2048; i ++) {
+           float inVal  = float (ELAD_RATE / 1000);
+           mapTable_int [i] =  int (floor (i * (inVal / 2048.0)));
+           mapTable_float [i] = i * (inVal / 2048.0) - mapTable_int [i];
+        }
+	convIndex	= 0;
+	fprintf (stderr, "mapTables initialized\n");
+
+	iqSize		= 8;
+//
+	connect (gainReduction, SIGNAL (clicked ()),
+	         this, SLOT (setGainReduction ()));
+	connect (filter, SIGNAL (clicked ()),
+	         this, SLOT (setFilter ()));
+	connect (NyquistWidth, SIGNAL (valueChanged (int)),
+	         this, SLOT (set_NyquistWidth (int)));
+	connect (offsetSelector, SIGNAL (valueChanged (int)),
+	         this, SLOT (set_Offset (int)));
+	connect (IQSwitch, SIGNAL (clicked ()),
+	         this, SLOT (toggle_IQSwitch ()));
+}
+//
+	eladHandler::~eladHandler	(void) {
+	stopReader ();
+//
+//	theWorker refers to the loader, so clean up int his order
+	if (theWorker != nullptr)
+	   delete theWorker;
+	if (theLoader != nullptr)
+	   delete theLoader;
+}
+
+int32_t	eladHandler::defaultFrequency	(void) {
+	return Khz (220000);
+}
+
+int32_t	eladHandler::getVFOFrequency	(void) {
+	return externalFrequency;
+}
+
+bool	eladHandler::restartReader	(int32_t externalFrequency) {
+bool	success;
+
+	if (theWorker != nullptr) 
+	   return true;
+
+	this	-> externalFrequency	= externalFrequency;
+
+	_O_Buffer. FlushRingBuffer ();
+	_I_Buffer. FlushRingBuffer ();
+//
+//	first map the external frequency to an elad frequency
+
+	int K = 1;
+	iqSwitch. store (false);
+	eladFrequency	= externalFrequency - MHz (Offset);
+	while (eladFrequency > KHz (Nyquist)) {
+	   eladFrequency -= KHz (Nyquist);
+	   K ++;
+	}
+	if ((K & 01) == 0) {	// even
+	   eladFrequency = KHz (Nyquist) - eladFrequency;
+	   iqSwitch. store (true);
+	}
+
+	eladFrequencyDisplay	-> display (eladFrequency);
+	show_iqSwitch	(iqSwitch. load ());
+	fprintf (stderr, "external frequency %d, eladFreq %d\n",
+	                     externalFrequency, eladFrequency);
+
+//	Note that eladWorker now sends its output (_I_Buffer)
+//	in the 3072000 samplerate
+	theWorker	= new eladWorker (eladFrequency,
+	                                  theLoader,
+	                                  this,
+	                                  &_I_Buffer,
+	                                  &success);
+	fprintf (stderr, "worker started, success = %d\n", success);
+	return success;
+}
+
+void	eladHandler::stopReader	(void) {
+	if (theWorker == nullptr) 
+	   return;
+
+	theWorker	-> stop ();
+	while (theWorker -> isRunning ())
+	   usleep (100);
+	delete theWorker;
+	theWorker = nullptr;
+}
+
+std::complex<float>	makeSample_31bits (uint8_t *, bool);
+
+typedef union {
+	struct __attribute__((__packed__)) {
+		float	i;
+		float	q;
+		} iqf;
+	struct __attribute__((__packed__)) {
+		int32_t	i;
+		int32_t	q;
+		} iq;
+	struct __attribute__((__packed__)) {
+		uint8_t		i1;

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-handler.h Added

@@ -0,0 +1,88 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+#ifndef __ELAD_HANDLER__
+#define	__ELAD_HANDLER__
+
+#include	<QObject>
+#include	<QFrame>
+#include	<QFileDialog>
+#include	"dab-constants.h"
+#include	"device-handler.h"
+#include	"ringbuffer.h"
+#include	"ui_elad-widget.h"
+#include	<libusb-1.0/libusb.h>
+
+#define	ELAD_RATE	3072000
+
+class	QSettings;
+class	eladWorker;
+class	eladLoader;
+//typedef	std::complex<float>(*makeSampleP)(uint8_t *);
+
+class	eladHandler: public deviceHandler, public Ui_eladWidget {
+Q_OBJECT
+public:
+		eladHandler		(QSettings *);
+		~eladHandler		();
+	int32_t	getVFOFrequency		();
+	bool	legalFrequency		(int32_t);
+	int32_t	defaultFrequency	();
+
+	bool	restartReader		(int32_t);
+	void	stopReader		();
+	int32_t	getSamples		(std::complex<float> *, int32_t);
+	int32_t	Samples			();
+	void	resetBuffer		();
+	int32_t	getRate			();
+	int16_t	bitDepth		();
+private	slots:
+	void	setGainReduction	();
+	void	setFilter		();
+	void	set_Offset		(int);
+	void	set_NyquistWidth	(int);
+	void	toggle_IQSwitch		();
+	void	show_iqSwitch		(bool);
+private:
+	QSettings	*eladSettings;
+	QFrame		myFrame;
+	RingBuffer<uint8_t>	_I_Buffer;
+	RingBuffer<std::complex<float>>	_O_Buffer;
+	bool		deviceOK;
+	eladLoader	*theLoader;
+	eladWorker	*theWorker;
+	int32_t		externalFrequency;
+	int32_t		eladFrequency;
+	int		gainReduced;
+	int		localFilter;
+	int		Offset;
+	int		Nyquist;
+	std::atomic<bool> iqSwitch;
+	int		iqSize;
+	std::complex<float> convBuffer	[ELAD_RATE / 1000 + 1];
+	int		mapTable_int	[INPUT_RATE / 1000];
+        float		mapTable_float	[INPUT_RATE / 1000];
+	int		convIndex;
+};
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-loader.cpp Added

@@ -0,0 +1,196 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+#include	"elad-loader.h"
+//
+//	Straight forward class to load the functions from the
+//	elad library
+
+	eladLoader::eladLoader	(int32_t theRate, int16_t *success) {
+int	rc;
+	libraryLoaded	= false;
+	hardware_OK	= false;
+	usb_OK		= false;
+	*success	= -1;		// just the default
+
+	fprintf (stderr, "going to load libusb\n");
+	hwHandle	= dlopen ("libusb-1.0.so", RTLD_NOW | RTLD_GLOBAL);
+	hwLibname	= new char [100];
+	sprintf (hwLibname, "libfdms1_hw_init_%d.so.1.0", theRate);
+//	             "/usr/local/lib64/libfdms1_hw_init_%d.so.1.0", theRate);
+	  
+	fprintf (stderr, "going to load %s\n", hwLibname);
+	hwHandle	= dlopen (hwLibname, RTLD_NOW);
+	if (hwHandle == nullptr) {
+	   fprintf (stderr, "error report %s\n", dlerror ());
+	   libusb_close (dev_handle);
+	   return;
+	}
+//	load the init function
+	Init	= (FDMS1_HW_INIT) dlsym (hwHandle, (const char *)"fdms1_hw_init");
+	if (Init == nullptr) {
+	   fprintf (stderr, "Could not load fdms1_hw_init\n");
+	   dlclose (hwHandle);
+	   return;
+	}
+//
+//	now for the control library
+	cwLibname	= "libfdms1_hw_ctrl.so.1.0";
+//	cwLibname	= "/usr/local/lib64/libfdms1_hw_ctrl.so.1.0";
+	fprintf (stderr, "going to load %s\n", cwLibname);
+	cwHandle	= dlopen (cwLibname, RTLD_NOW);
+	if (cwHandle == nullptr) {
+	   fprintf (stderr, "error report %s\n", dlerror ());
+	   dlclose (hwHandle);
+	   return;
+	}
+
+	libraryLoaded	= true;
+//
+//	Load the functions one by one
+	set_en_ext_io_ATT20 = (Pset_en_ext_io_ATT20)
+	                GETPROCADDRESS (cwHandle, "set_en_ext_io_ATT20");
+	if (set_en_ext_io_ATT20 == nullptr) {
+	   fprintf (stderr, "Could not load set_en_ext_io_ATT20\n");
+	   return;
+	}
+
+	set_en_ext_io_LP30 = (Pset_en_ext_io_LP30)
+	                GETPROCADDRESS (cwHandle, "set_en_ext_io_LP30");
+	if (set_en_ext_io_LP30 == nullptr) {
+	   fprintf (stderr, "Could not load set_en_ext_io_LP30\n");
+	   return;
+	}
+
+	OpenHW		= (OPEN_HW) GETPROCADDRESS (cwHandle, "OpenHW");
+	SetHWLO		= (SET_HWLO) GETPROCADDRESS (cwHandle, "SetHWLO");
+	StartFIFO	= (START_FIFO) GETPROCADDRESS (cwHandle, "StartFIFO");
+	StopFIFO	= (STOP_FIFO) GETPROCADDRESS (cwHandle, "StopFIFO");
+	StopHW		= (STOP_HW) GETPROCADDRESS (cwHandle, "StopHW");
+	CloseHW		= (CLOSE_HW) GETPROCADDRESS (cwHandle, "CloseHW");
+	fprintf (stderr, "Functions seem to be loaded\n");
+//
+//	We first open the USB lib
+	usb_OK		= false;
+	dev_handle	= startUSB ();
+	if (dev_handle == nullptr)  {
+	   *success = -2;
+	   return;
+	}
+	usb_OK		= true;
+//	we are going for init
+	fprintf (stderr, "Loading FPGA, please wait\n");
+	rc = Init (dev_handle);
+	if (rc == 0) {
+	   fprintf (stderr, "Loading FPGA Image failed %d\n", rc);
+	   *success = -3;
+	   return;
+	}
+	rc = OpenHW (dev_handle, theRate);
+	fprintf (stderr, "Hardware opened %s\n", rc == 1 ? "good" : "failed");
+	hardware_OK	= rc == 1;
+	if (!hardware_OK) {
+	   *success = -4;	
+	   return;
+	}
+	   
+	if (hardware_OK) {
+	   int d_en_ext_io_ATT20 = 1;
+	   int d_en_ext_io_LP30 = 1;
+	   set_en_ext_io_ATT20 (dev_handle, &d_en_ext_io_ATT20);
+	   set_en_ext_io_LP30 (dev_handle, &d_en_ext_io_LP30);
+	}
+	*success	= 0;
+}
+
+	eladLoader::~eladLoader	(void) {
+	if (hardware_OK) {
+	   StopHW	();
+	   CloseHW ();
+	}
+	if (usb_OK)
+	   libusb_close (dev_handle);
+
+	if (libraryLoaded) {
+	   dlclose (cwHandle);
+	   dlclose (hwHandle);
+	}
+}
+//
+
+libusb_device_handle *eladLoader::startUSB	(void) {
+libusb_device_handle	*dev_handle	= nullptr;
+uint16_t vendor_id =  0x1721;
+uint16_t product_id = 0x0610;
+
+	context		= 0;
+int rc = libusb_init ( &context );
+	
+	if (rc == 0 && context != 0) {
+	   libusb_set_debug (context,3); 
+	}
+	else {
+	   fprintf (stderr,
+	            "Error in libusb_init: [%d] %s\n",
+	            rc, libusb_error_name (rc));
+	   return nullptr;
+	}
+
+	dev_handle = libusb_open_device_with_vid_pid (context,
+	                                              vendor_id,
+	                                              product_id);
+
+	if (dev_handle == 0) {
+	   fprintf (stderr, "Error in libusb_open_device_with_vid_pid\n");
+	   fprintf (stderr,
+	            "Check FDMS1 is properly connected and turned on.\n");
+	   return nullptr;
+	}
+
+	fprintf (stderr, "libusb_open_device_with_vid_pid OK\n");
+
+	if (libusb_kernel_driver_active (dev_handle, 0) ){ 
+	   printf("Device busy...detaching...\n"); 
+	   libusb_detach_kernel_driver (dev_handle, 0); 
+	} else 
+	   printf("Device free from kernel, continue...\n"); 
+ 
+	rc = libusb_claim_interface (dev_handle, 0);
+	      //claim interface 0 (the first) of device
+	if (rc < 0) {
+	   fprintf (stderr,
+	            "Cannot claim interface: [%d] %s\n",
+	            rc, libusb_error_name (rc));
+	   return nullptr;
+	}
+	return dev_handle;
+}
+
+libusb_device_handle *eladLoader::getHandle (void) {
+	return dev_handle;
+}
+
+bool	eladLoader::OK	(void) {
+	return libraryLoaded && hardware_OK && usb_OK;
+}
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-loader.h Added

@@ -0,0 +1,82 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+//
+//	We use a straightforward class "eladLoader"  both as
+//	loader and as container	for the dll functions.
+
+#ifndef	__ELAD_LOADER__
+#define	__ELAD_LOADER__
+#include	"dab-constants.h"
+#include	<stdint.h>
+#include	<libusb-1.0/libusb.h>
+
+//	The naming of functions for accessing shared libraries
+//	differ between Linux and Windows
+#define	GETPROCADDRESS	dlsym
+
+// Dll function prototypes
+
+typedef	void (*Pset_en_ext_io_ATT20)(libusb_device_handle *, int *);
+typedef void (*Pset_en_ext_io_LP30)(libusb_device_handle *, int *);
+typedef	int  (*OPEN_HW)(libusb_device_handle *, long);
+typedef int  (*SET_HWLO)(libusb_device_handle *, long *);
+typedef void (*START_FIFO)(libusb_device_handle *);
+typedef void (*STOP_FIFO)(libusb_device_handle *);
+typedef void (*STOP_HW)(void);
+typedef	void (*CLOSE_HW)(void);
+typedef int  (*FDMS1_HW_INIT)(libusb_device_handle *);
+
+class	eladLoader {
+public:
+
+		eladLoader		(int32_t, int16_t *);
+		~eladLoader		(void);
+	bool	OK			(void);
+libusb_device_handle	*getHandle	(void);
+Pset_en_ext_io_ATT20 set_en_ext_io_ATT20;
+Pset_en_ext_io_LP30 set_en_ext_io_LP30;
+OPEN_HW			OpenHW;
+SET_HWLO		SetHWLO;
+START_FIFO		StartFIFO;
+STOP_FIFO		StopFIFO;
+STOP_HW			StopHW;
+CLOSE_HW		CloseHW;
+FDMS1_HW_INIT		Init;
+private:
+	libusb_device_handle *startUSB	(void);
+	HINSTANCE	hwHandle;
+	HINSTANCE	cwHandle;
+	libusb_device_handle	*dev_handle;
+	libusb_context		*context;
+	bool		libraryLoaded;
+	bool		usb_OK;
+	bool		hardware_OK;
+const	char		*cwLibname;
+	char		*hwLibname;
+	int32_t		theRate;
+};
+
+#endif
+
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-widget.ui Added

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>eladWidget</class>
+ <widget class="QWidget" name="eladWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>319</width>
+    <height>402</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>elad widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QSpinBox" name="offsetSelector">
+       <property name="toolTip">
+        <string>Offset selector: change will have effect on the next channel selection</string>
+       </property>
+       <property name="minimum">
+        <number>-999</number>
+       </property>
+       <property name="maximum">
+        <number>999</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>offset selector (in MHz)</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <widget class="QSpinBox" name="NyquistWidth">
+       <property name="toolTip">
+        <string>Selector for the NyquistWidth. Change will have effect on next channel select</string>
+       </property>
+       <property name="maximum">
+        <number>100000</number>
+       </property>
+       <property name="singleStep">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>30720</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Nyquist width (KHz)</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLCDNumber" name="eladFrequencyDisplay"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>elad frequency</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>elad-s1</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLCDNumber" name="rateDisplay">
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+     <property name="digitCount">
+      <number>7</number>
+     </property>
+     <property name="segmentStyle">
+      <enum>QLCDNumber::Flat</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QPushButton" name="IQSwitch">
+       <property name="text">
+        <string>IQ switch</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="elad_iqSwitch">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="statusLabel">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>gain reduction</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="gainLabel">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="gainReduction">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="filterText">
+       <property name="text">
+        <string>no filter</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="filter">
+       <property name="text">
+        <string>filter</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-worker.cpp Added

@@ -0,0 +1,106 @@
+
+/*
+ *    Copyright (C) 2014
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computinmg
+ *
+ *    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
+ */
+#include	"dab-constants.h"	// some general definitions
+#include	"elad-worker.h"		// our header
+#include	"elad-handler.h"
+#include	"elad-loader.h"		// the API definition
+#include	"ringbuffer.h"		// the buffer
+
+//	The elad-worker is a simple wrapper around the elad
+//	interface. It is a pretty simple thread performing the
+//	basic functions, it reads the bytes, converts them to
+//	samples and converts the rate to 2048000
+//	
+	eladWorker::eladWorker (int32_t		eladFrequency,
+	                        eladLoader	*f,
+	                        eladHandler	*h,
+	                        RingBuffer<uint8_t> *_O_Buffer,
+	                        bool	*OK) {
+	fprintf (stderr, "creating a worker\n");
+	(void)h;
+	this	-> eladFrequency	= eladFrequency;
+	this	-> functions		= f;
+	this	-> _O_Buffer		= _O_Buffer;
+	*OK				= false;	// just the default
+	functions	-> StartFIFO (functions -> getHandle ());
+	start ();
+	*OK			= true;
+}
+
+//	As usual, killing objects containing a thread need to
+//	be done carefully.
+void	eladWorker::stop	(void) {
+	if (running. load ())
+	   functions	-> StopFIFO (functions -> getHandle ());
+	running. store (false);
+}
+
+	eladWorker::~eladWorker	(void) {
+	stop ();
+	while (isRunning ())
+	   msleep (1);
+}
+
+#define	BUFFER_SIZE	(8 * 8192)
+uint8_t	buffer [BUFFER_SIZE];
+//
+//	The libusb function is synchronous, meaning that
+//	we do not have time to do the conversion from 3072
+//	to 2048 here.
+//	So here we convert the samplestream to a stream of
+//	complex IQ samples, and pass them on
+void	eladWorker:: run (void) {
+int32_t	amount;
+int	rc;
+
+	running. store (false);
+//	when (re)starting, clean up first
+	fprintf (stderr, "worker thread started\n");
+
+	bool result = functions -> SetHWLO (functions -> getHandle (),
+	                                                 &eladFrequency);
+	fprintf (stderr, "setting frequency is %s\n",
+	                               result ? "good" : "erroneous");
+
+	running. store (true);
+	while (running. load ()) {
+	   rc = libusb_bulk_transfer (functions -> getHandle (),
+	                              (6 | LIBUSB_ENDPOINT_IN),
+	                              (uint8_t *)buffer,
+	                              BUFFER_SIZE * sizeof (uint8_t),
+	                              &amount,
+	                              2000);
+	   if (rc) {
+              fprintf (stderr,
+	               "Error in libusb_bulk_transfer: [%d] %s\n",
+	               rc,
+	               libusb_error_name (rc));
+	      if (rc != 7)
+	         break;
+	   }
+
+	   _O_Buffer -> putDataIntoBuffer (buffer, amount);
+	}
+	fprintf (stderr, "eladWorker now stopped\n");
+}
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler-old/elad-worker.h Added

@@ -0,0 +1,59 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+#ifndef __ELAD_WORKER__
+#define	__ELAD_WORKER__
+
+#include	<stdlib.h>
+#include	<stdio.h>
+#include	<math.h>
+#include	<string.h>
+#include	<unistd.h>
+#include	<atomic>
+#include	<stdint.h>
+#include	<QThread>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+
+class	eladLoader;
+class	eladHandler;
+
+class	eladWorker: public QThread {
+Q_OBJECT
+public:
+			eladWorker	(int32_t,	// selected frequency
+	                                 eladLoader *,
+	                                 eladHandler *,
+	                                 RingBuffer<uint8_t> *,
+	                                 bool *);
+			~eladWorker		();
+	void		stop			();
+private:
+	void			run		();
+	eladLoader		*functions;	// 
+	RingBuffer<uint8_t>	*_O_Buffer;
+	long int		eladFrequency;
+	std::atomic<bool>	running;
+};
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-handler.cpp Added

@@ -0,0 +1,389 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	<QThread>
+#include	<QSettings>
+#include	<QHBoxLayout>
+#include	<QLabel>
+#include	<QMessageBox>
+#include	<QDir>
+
+#include	"elad-handler.h"	// our header
+#include	"elad-worker.h"		// the thread, reading in the data
+#include	"elad-loader.h"		// function loader
+#include	<stdio.h>
+
+//	Currently, we do not have lots of settings,
+//	it just might change suddenly, but not today
+		eladHandler::eladHandler (QSettings *s):
+	                                     myFrame (nullptr),
+	                                     _I_Buffer  (256 * 32768),
+	                                     _O_Buffer  (16 * 32768) {
+int16_t	success;
+
+	this	-> eladSettings	= s;
+	setupUi (&myFrame);
+	myFrame. show ();
+	theLoader		= nullptr;
+	theWorker		= nullptr;
+	Offset			= offsetSelector	-> value ();
+	Nyquist			= NyquistWidth		-> value ();
+//
+//	sometimes problems with dynamic linkage of libusb, it is
+//	loaded indirectly through the dll
+	if (libusb_init (nullptr) < 0) {
+	   fprintf (stderr, "libusb problem\n");	// should not happen
+	   throw (21);
+	}
+
+	libusb_exit (nullptr);
+	theLoader	= new eladLoader (ELAD_RATE, &success);
+	if (success != 0) {
+	   if (success == -1)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in loading libs\n"));
+	   else
+	   if (success == -2)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in setting up USB\n"));
+	   else
+	   if (success == -3)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in FPGA init\n"));
+	   else
+	   if (success == -4)
+	   QMessageBox::warning (&myFrame, tr ("sdr"),
+	                         tr ("No success in hardware init\n"));
+	
+	   statusLabel -> setText ("not functioning");
+	   delete theLoader;
+	   theLoader	= nullptr;
+	   throw (21);
+	}
+	statusLabel	-> setText ("Loaded");
+//
+	externalFrequency	= Khz (220000);
+//
+//	since localFilter and gainReduced are also used as
+//	parameter for the API functions, they are int's rather
+//	than bool.
+	localFilter	= 1;
+	filterText	-> setText ("no filter");
+	gainReduced	= 1;
+	gainLabel	-> setText ("0");
+
+        for (int i = 0; i < 2048; i ++) {
+           float inVal  = float (ELAD_RATE / 1000);
+           mapTable_int [i] =  int (floor (i * (inVal / 2048.0)));
+           mapTable_float [i] = i * (inVal / 2048.0) - mapTable_int [i];
+        }
+	convIndex	= 0;
+	fprintf (stderr, "mapTables initialized\n");
+
+	iqSize		= 8;
+//
+	connect (gainReduction, SIGNAL (clicked ()),
+	         this, SLOT (setGainReduction ()));
+	connect (filter, SIGNAL (clicked ()),
+	         this, SLOT (setFilter ()));
+	connect (NyquistWidth, SIGNAL (valueChanged (int)),
+	         this, SLOT (set_NyquistWidth (int)));
+	connect (offsetSelector, SIGNAL (valueChanged (int)),
+	         this, SLOT (set_Offset (int)));
+	connect (IQSwitch, SIGNAL (clicked ()),
+	         this, SLOT (toggle_IQSwitch ()));
+}
+//
+	eladHandler::~eladHandler	(void) {
+	stopReader ();
+//
+//	theWorker refers to the loader, so clean up int his order
+	if (theWorker != nullptr)
+	   delete theWorker;
+	if (theLoader != nullptr)
+	   delete theLoader;
+}
+
+int32_t	eladHandler::defaultFrequency	(void) {
+	return Khz (220000);
+}
+
+int32_t	eladHandler::getVFOFrequency	(void) {
+	return externalFrequency;
+}
+
+bool	eladHandler::restartReader	(int32_t externalFrequency) {
+bool	success;
+
+	if (theWorker != nullptr) 
+	   return true;
+
+	this	-> externalFrequency	= externalFrequency;
+
+	_O_Buffer. FlushRingBuffer ();
+	_I_Buffer. FlushRingBuffer ();
+//
+//	first map the external frequency to an elad frequency
+
+	int K = 1;
+	iqSwitch. store (false);
+	eladFrequency	= externalFrequency - MHz (Offset);
+	while (eladFrequency > KHz (Nyquist)) {
+	   eladFrequency -= KHz (Nyquist);
+	   K ++;
+	}
+	if ((K & 01) == 0) {	// even
+	   eladFrequency = KHz (Nyquist) - eladFrequency;
+	   iqSwitch. store (true);
+	}
+
+	eladFrequencyDisplay	-> display (eladFrequency);
+	show_iqSwitch	(iqSwitch. load ());
+	fprintf (stderr, "external frequency %d, eladFreq %d\n",
+	                     externalFrequency, eladFrequency);
+
+//	Note that eladWorker now sends its output (_I_Buffer)
+//	in the 3072000 samplerate
+	theWorker	= new eladWorker (eladFrequency,
+	                                  theLoader,
+	                                  this,
+	                                  &_I_Buffer,
+	                                  &success);
+	fprintf (stderr, "worker started, success = %d\n", success);
+	return success;
+}
+
+void	eladHandler::stopReader	(void) {
+	if (theWorker == nullptr) 
+	   return;
+
+	theWorker	-> stop ();
+	while (theWorker -> isRunning ())
+	   usleep (100);
+	delete theWorker;
+	theWorker = nullptr;
+}
+
+std::complex<float>	makeSample_31bits (uint8_t *, bool);
+
+typedef union {
+	struct __attribute__((__packed__)) {
+		float	i;
+		float	q;
+		} iqf;
+	struct __attribute__((__packed__)) {
+		int32_t	i;
+		int32_t	q;
+		} iq;
+	struct __attribute__((__packed__)) {
+		uint8_t		i1;

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

@@ -0,0 +1,88 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+#ifndef __ELAD_HANDLER__
+#define	__ELAD_HANDLER__
+
+#include	<QObject>
+#include	<QFrame>
+#include	<QFileDialog>
+#include	"dab-constants.h"
+#include	"device-handler.h"
+#include	"ringbuffer.h"
+#include	"ui_elad-widget.h"
+#include	<libusb-1.0/libusb.h>
+
+#define	ELAD_RATE	3072000
+
+class	QSettings;
+class	eladWorker;
+class	eladLoader;
+//typedef	std::complex<float>(*makeSampleP)(uint8_t *);
+
+class	eladHandler: public deviceHandler, public Ui_eladWidget {
+Q_OBJECT
+public:
+		eladHandler		(QSettings *);
+		~eladHandler		();
+	int32_t	getVFOFrequency		();
+	bool	legalFrequency		(int32_t);
+	int32_t	defaultFrequency	();
+
+	bool	restartReader		(int32_t);
+	void	stopReader		();
+	int32_t	getSamples		(std::complex<float> *, int32_t);
+	int32_t	Samples			();
+	void	resetBuffer		();
+	int32_t	getRate			();
+	int16_t	bitDepth		();
+private	slots:
+	void	setGainReduction	();
+	void	setFilter		();
+	void	set_Offset		(int);
+	void	set_NyquistWidth	(int);
+	void	toggle_IQSwitch		();
+	void	show_iqSwitch		(bool);
+private:
+	QSettings	*eladSettings;
+	QFrame		myFrame;
+	RingBuffer<uint8_t>	_I_Buffer;
+	RingBuffer<std::complex<float>>	_O_Buffer;
+	bool		deviceOK;
+	eladLoader	*theLoader;
+	eladWorker	*theWorker;
+	int32_t		externalFrequency;
+	int32_t		eladFrequency;
+	int		gainReduced;
+	int		localFilter;
+	int		Offset;
+	int		Nyquist;
+	std::atomic<bool> iqSwitch;
+	int		iqSize;
+	std::complex<float> convBuffer	[ELAD_RATE / 1000 + 1];
+	int		mapTable_int	[INPUT_RATE / 1000];
+        float		mapTable_float	[INPUT_RATE / 1000];
+	int		convIndex;
+};
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-loader.cpp Added

@@ -0,0 +1,206 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+#include	"elad-loader.h"
+//
+//	Straight forward class to load the functions from the
+//	elad library
+
+	eladLoader::eladLoader	(int32_t theRate, int16_t *success) {
+int	rc;
+	libraryLoaded	= false;
+	hardware_OK	= false;
+	usb_OK		= false;
+	*success	= -1;		// just the default
+
+	fprintf (stderr, "going to load libusb\n");
+	hwHandle	= dlopen ("libusb-1.0.so", RTLD_NOW | RTLD_GLOBAL);
+	hwLibname	= new char [100];
+	sprintf (hwLibname, "libfdms1_hw_init_%d.so.1.0", theRate);
+//	             "/usr/local/lib64/libfdms1_hw_init_%d.so.1.0", theRate);
+	  
+	fprintf (stderr, "going to load %s\n", hwLibname);
+	hwHandle	= dlopen (hwLibname, RTLD_NOW);
+	if (hwHandle == nullptr) {
+	   fprintf (stderr, "error report %s\n", dlerror ());
+	   libusb_close (dev_handle);
+	   return;
+	}
+//	load the init function
+	Init	= (FDMS1_HW_INIT) dlsym (hwHandle, (const char *)"fdms1_hw_init");
+	if (Init == nullptr) {
+	   fprintf (stderr, "Could not load fdms1_hw_init\n");
+	   dlclose (hwHandle);
+	   return;
+	}
+//
+//	now for the control library
+	cwLibname	= "libfdms1_hw_ctrl.so.1.0";
+//	cwLibname	= "/usr/local/lib64/libfdms1_hw_ctrl.so.1.0";
+	fprintf (stderr, "going to load %s\n", cwLibname);
+	cwHandle	= dlopen (cwLibname, RTLD_NOW);
+	if (cwHandle == nullptr) {
+	   fprintf (stderr, "error report %s\n", dlerror ());
+	   dlclose (hwHandle);
+	   return;
+	}
+
+	libraryLoaded	= true;
+//
+//	Load the functions one by one
+	set_en_ext_io_ATT20 = (Pset_en_ext_io_ATT20)
+	                GETPROCADDRESS (cwHandle, "set_en_ext_io_ATT20");
+	if (set_en_ext_io_ATT20 == nullptr) {
+	   fprintf (stderr, "Could not load set_en_ext_io_ATT20\n");
+	   return;
+	}
+
+	set_en_ext_io_LP30 = (Pset_en_ext_io_ATT20)
+	                GETPROCADDRESS (cwHandle, "set_en_ext_io_LP30");
+	if (set_en_ext_io_LP30 == nullptr) {
+	   fprintf (stderr, "Could not load set_en_ext_io_ATT20\n");
+	   return;
+	}
+
+	OpenHW		= (OPEN_HW) GETPROCADDRESS (cwHandle, "OpenHW");
+	SetHWLO		= (SET_HWLO) GETPROCADDRESS (cwHandle, "SetHWLO");
+	StartFIFO	= (START_FIFO) GETPROCADDRESS (cwHandle, "StartFIFO");
+	StopFIFO	= (STOP_FIFO) GETPROCADDRESS (cwHandle, "StopFIFO");
+	StopHW		= (STOP_HW) GETPROCADDRESS (cwHandle, "StopHW");
+	CloseHW		= (CLOSE_HW) GETPROCADDRESS (cwHandle, "CloseHW");
+	fprintf (stderr, "Functions seem to be loaded\n");
+//
+//	We first open the USB lib
+	usb_OK		= false;
+	dev_handle	= startUSB ();
+	if (dev_handle == nullptr)  {
+	   *success = -2;
+	   return;
+	}
+	usb_OK		= true;
+//	we are going for init
+	fprintf (stderr, "Loading FPGA, please wait ~10s \n");
+	rc = Init (dev_handle);
+	if (rc == 0) {
+	   fprintf (stderr, "Loading FPGA Image failed %d\n", rc);
+	   *success = -3;
+	   return;
+	}
+	
+	rc = OpenHW (dev_handle, theRate);
+	fprintf (stderr, "Hardware opened %s Rate=%8d\n", rc == 1 ? "good" : "failed", theRate);
+	hardware_OK	= rc == 1;
+	if (!hardware_OK) {
+	   *success = -4;	
+	   return;
+	}
+	   
+	if (hardware_OK) {
+	   fprintf(stderr,"init undersampling mode: no filter LP30=1 , no attenuation ATT20=1\n");
+	   int d_en_ext_io_ATT20 = 1;
+	   int d_en_ext_io_LP30  = 1;
+	   //fprintf(stderr,"LP30=%2d ATT20=%2d   pre\n",d_en_ext_io_LP30,d_en_ext_io_ATT20);
+	   
+	   set_en_ext_io_ATT20 (dev_handle, &d_en_ext_io_ATT20);
+	   usleep(500000);
+	   set_en_ext_io_LP30  (dev_handle, &d_en_ext_io_LP30);
+	   usleep(500000);
+	   //fprintf(stderr,"LP30=%2d ATT20=%2d  post\n",d_en_ext_io_LP30,d_en_ext_io_ATT20); 
+	   d_en_ext_io_ATT20 = 1;
+	   d_en_ext_io_LP30  = 1;
+	   //fprintf(stderr,"LP30=%2d ATT20=%2d reset\n",d_en_ext_io_LP30,d_en_ext_io_ATT20);
+	}
+	*success	= 0;
+}
+
+	eladLoader::~eladLoader	(void) {
+	if (hardware_OK) {
+	   StopHW	();
+	   CloseHW ();
+	}
+	if (usb_OK)
+	   libusb_close (dev_handle);
+
+	if (libraryLoaded) {
+	   dlclose (cwHandle);
+	   dlclose (hwHandle);
+	}
+}
+//
+
+libusb_device_handle *eladLoader::startUSB	(void) {
+libusb_device_handle	*dev_handle	= nullptr;
+uint16_t vendor_id =  0x1721;
+uint16_t product_id = 0x0610;
+
+	context		= 0;
+int rc = libusb_init ( &context );
+	
+	if (rc == 0 && context != 0) {
+	   libusb_set_debug (context,3); 
+	}
+	else {
+	   fprintf (stderr,
+	            "Error in libusb_init: [%d] %s\n",
+	            rc, libusb_error_name (rc));
+	   return nullptr;
+	}
+
+	dev_handle = libusb_open_device_with_vid_pid (context,
+	                                              vendor_id,
+	                                              product_id);
+
+	if (dev_handle == 0) {
+	   fprintf (stderr, "Error in libusb_open_device_with_vid_pid\n");
+	   fprintf (stderr,
+	            "Check FDMS1 is properly connected and turned on.\n");
+	   return nullptr;
+	}
+
+	fprintf (stderr, "libusb_open_device_with_vid_pid OK\n");
+
+	if (libusb_kernel_driver_active (dev_handle, 0) ){ 
+	   printf("Device busy...detaching...\n"); 
+	   libusb_detach_kernel_driver (dev_handle, 0); 
+	} else 
+	   printf("Device free from kernel, continue...\n"); 
+ 
+	rc = libusb_claim_interface (dev_handle, 0);
+	      //claim interface 0 (the first) of device
+	if (rc < 0) {
+	   fprintf (stderr,
+	            "Cannot claim interface: [%d] %s\n",
+	            rc, libusb_error_name (rc));
+	   return nullptr;
+	}
+	return dev_handle;
+}
+
+libusb_device_handle *eladLoader::getHandle (void) {

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-loader.h Added

@@ -0,0 +1,82 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+//
+//	We use a straightforward class "eladLoader"  both as
+//	loader and as container	for the dll functions.
+
+#ifndef	__ELAD_LOADER__
+#define	__ELAD_LOADER__
+#include	"dab-constants.h"
+#include	<stdint.h>
+#include	<libusb-1.0/libusb.h>
+
+//	The naming of functions for accessing shared libraries
+//	differ between Linux and Windows
+#define	GETPROCADDRESS	dlsym
+
+// Dll function prototypes
+
+typedef	void (*Pset_en_ext_io_ATT20)(libusb_device_handle *, int *);
+typedef void (*Pset_en_ext_io_LP30)(libusb_device_handle *, int *);
+typedef	int  (*OPEN_HW)(libusb_device_handle *, long);
+typedef int  (*SET_HWLO)(libusb_device_handle *, long *);
+typedef void (*START_FIFO)(libusb_device_handle *);
+typedef void (*STOP_FIFO)(libusb_device_handle *);
+typedef void (*STOP_HW)(void);
+typedef	void (*CLOSE_HW)(void);
+typedef int  (*FDMS1_HW_INIT)(libusb_device_handle *);
+
+class	eladLoader {
+public:
+
+		eladLoader		(int32_t, int16_t *);
+		~eladLoader		(void);
+	bool	OK			(void);
+libusb_device_handle	*getHandle	(void);
+Pset_en_ext_io_ATT20 set_en_ext_io_ATT20;
+Pset_en_ext_io_LP30 set_en_ext_io_LP30;
+OPEN_HW			OpenHW;
+SET_HWLO		SetHWLO;
+START_FIFO		StartFIFO;
+STOP_FIFO		StopFIFO;
+STOP_HW			StopHW;
+CLOSE_HW		CloseHW;
+FDMS1_HW_INIT		Init;
+private:
+	libusb_device_handle *startUSB	(void);
+	HINSTANCE	hwHandle;
+	HINSTANCE	cwHandle;
+	libusb_device_handle	*dev_handle;
+	libusb_context		*context;
+	bool		libraryLoaded;
+	bool		usb_OK;
+	bool		hardware_OK;
+const	char		*cwLibname;
+	char		*hwLibname;
+	int32_t		theRate;
+};
+
+#endif
+
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-widget.ui Added

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>eladWidget</class>
+ <widget class="QWidget" name="eladWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>319</width>
+    <height>402</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>elad widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QSpinBox" name="offsetSelector">
+       <property name="toolTip">
+        <string>Offset selector: change will have effect on the next channel selection</string>
+       </property>
+       <property name="minimum">
+        <number>-999</number>
+       </property>
+       <property name="maximum">
+        <number>999</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>offset selector (in MHz)</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <widget class="QSpinBox" name="NyquistWidth">
+       <property name="toolTip">
+        <string>Selector for the NyquistWidth. Change will have effect on next channel select</string>
+       </property>
+       <property name="maximum">
+        <number>100000</number>
+       </property>
+       <property name="singleStep">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>30720</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Nyquist width (KHz)</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLCDNumber" name="eladFrequencyDisplay"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>elad frequency</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>elad-s1</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLCDNumber" name="rateDisplay">
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+     <property name="digitCount">
+      <number>7</number>
+     </property>
+     <property name="segmentStyle">
+      <enum>QLCDNumber::Flat</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QPushButton" name="IQSwitch">
+       <property name="text">
+        <string>IQ switch</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="elad_iqSwitch">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="statusLabel">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>gain reduction</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="gainLabel">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="gainReduction">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="filterText">
+       <property name="text">
+        <string>no filter</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="filter">
+       <property name="text">
+        <string>filter</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-worker.cpp Added

@@ -0,0 +1,106 @@
+
+/*
+ *    Copyright (C) 2014
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computinmg
+ *
+ *    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
+ */
+#include	"dab-constants.h"	// some general definitions
+#include	"elad-worker.h"		// our header
+#include	"elad-handler.h"
+#include	"elad-loader.h"		// the API definition
+#include	"ringbuffer.h"		// the buffer
+
+//	The elad-worker is a simple wrapper around the elad
+//	interface. It is a pretty simple thread performing the
+//	basic functions, it reads the bytes, converts them to
+//	samples and converts the rate to 2048000
+//	
+	eladWorker::eladWorker (int32_t		eladFrequency,
+	                        eladLoader	*f,
+	                        eladHandler	*h,
+	                        RingBuffer<uint8_t> *_O_Buffer,
+	                        bool	*OK) {
+	fprintf (stderr, "creating a worker\n");
+	(void)h;
+	this	-> eladFrequency	= eladFrequency;
+	this	-> functions		= f;
+	this	-> _O_Buffer		= _O_Buffer;
+	*OK				= false;	// just the default
+	functions	-> StartFIFO (functions -> getHandle ());
+	start ();
+	*OK			= true;
+}
+
+//	As usual, killing objects containing a thread need to
+//	be done carefully.
+void	eladWorker::stop	(void) {
+	if (running. load ())
+	   functions	-> StopFIFO (functions -> getHandle ());
+	running. store (false);
+}
+
+	eladWorker::~eladWorker	(void) {
+	stop ();
+	while (isRunning ())
+	   msleep (1);
+}
+
+#define	BUFFER_SIZE	(8 * 8192)
+uint8_t	buffer [BUFFER_SIZE];
+//
+//	The libusb function is synchronous, meaning that
+//	we do not have time to do the conversion from 3072
+//	to 2048 here.
+//	So here we convert the samplestream to a stream of
+//	complex IQ samples, and pass them on
+void	eladWorker:: run (void) {
+int32_t	amount;
+int	rc;
+
+	running. store (false);
+//	when (re)starting, clean up first
+	fprintf (stderr, "worker thread started\n");
+
+	bool result = functions -> SetHWLO (functions -> getHandle (),
+	                                                 &eladFrequency);
+	fprintf (stderr, "setting frequency is %s\n",
+	                               result ? "good" : "erroneous");
+
+	running. store (true);
+	while (running. load ()) {
+	   rc = libusb_bulk_transfer (functions -> getHandle (),
+	                              (6 | LIBUSB_ENDPOINT_IN),
+	                              (uint8_t *)buffer,
+	                              BUFFER_SIZE * sizeof (uint8_t),
+	                              &amount,
+	                              2000);
+	   if (rc) {
+              fprintf (stderr,
+	               "Error in libusb_bulk_transfer: [%d] %s\n",
+	               rc,
+	               libusb_error_name (rc));
+	      if (rc != 7)
+	         break;
+	   }
+
+	   _O_Buffer -> putDataIntoBuffer (buffer, amount);
+	}
+	fprintf (stderr, "eladWorker now stopped\n");
+}
+

_service:download_url:qt-dab-3.7.tar.gz/dab-maxi/qt-devices/elad-s1-handler/elad-worker.h Added

@@ -0,0 +1,59 @@
+#
+/*
+ *    Copyright (C) 2014
+ *    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
+ */
+
+#ifndef __ELAD_WORKER__
+#define	__ELAD_WORKER__
+
+#include	<stdlib.h>
+#include	<stdio.h>
+#include	<math.h>
+#include	<string.h>
+#include	<unistd.h>
+#include	<atomic>
+#include	<stdint.h>
+#include	<QThread>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+
+class	eladLoader;
+class	eladHandler;
+
+class	eladWorker: public QThread {
+Q_OBJECT
+public:
+			eladWorker	(int32_t,	// selected frequency
+	                                 eladLoader *,
+	                                 eladHandler *,
+	                                 RingBuffer<uint8_t> *,
+	                                 bool *);
+			~eladWorker		();
+	void		stop			();
+private:
+	void			run		();
+	eladLoader		*functions;	// 
+	RingBuffer<uint8_t>	*_O_Buffer;
+	long int		eladFrequency;
+	std::atomic<bool>	running;
+};
+#endif
+

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

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

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

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

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

@@ -240,6 +240,7 @@
 
 	sdrplayHandler::~sdrplayHandler() {
 	stopReader();
+	myFrame. hide ();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings");
 	sdrplaySettings	-> setValue ("sdrplayOffset", coarseOffset);
 	sdrplaySettings -> setValue ("sdrplay-ppm", ppmControl -> value());
@@ -295,7 +296,7 @@
 	}
 //
 //	apparently, agcControl is checked
-	(void)my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
+	(void)my_mir_sdr_AgcControl (mir_sdr_AGC_5HZ,
 	                             -30, 0, 0, 0, 0, lnaState);
 	lnaGRdBDisplay	-> display (get_lnaGRdB (hwVersion, lnaState));
 }
@@ -392,7 +393,7 @@
 	                errorCodes (err). toLatin1(). data());
 
 	if (agc == 1) {
-	   my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
+	   my_mir_sdr_AgcControl (mir_sdr_AGC_5HZ,
 	                          -30,
 	                          0, 0, 0, 0, lnaGainSetting -> value());
 	   GRdBSelector		-> hide ();
@@ -491,7 +492,7 @@
 void	sdrplayHandler::set_agcControl (int dummy) {
 bool agcMode	= agcControl -> isChecked();
 	(void)dummy;
-	my_mir_sdr_AgcControl (agcMode ? mir_sdr_AGC_100HZ :
+	my_mir_sdr_AgcControl (agcMode ? mir_sdr_AGC_5HZ :
 	                                 mir_sdr_AGC_DISABLE,
 	                       -30,
 	                       0, 0, 0, 0, lnaGainSetting -> value());

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

@@ -140,6 +140,7 @@
 	while (isRunning ())
 	   usleep (1000);
 //	thread should be stopped by now
+	myFrame. hide ();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings_v3");
 	sdrplaySettings -> setValue ("sdrplay-ppm",
 	                                           ppmControl -> value ());
@@ -151,8 +152,6 @@
 	                                  agcControl -> isChecked() ? 1 : 0);
 	sdrplaySettings	-> endGroup ();
 	sdrplaySettings	-> sync();
-
-	myFrame. hide ();
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -262,8 +261,10 @@
            gainsliderLabel      -> hide ();
 	}
 	else {
+	   GRdBRequest r2 (GRdBSelector -> value ());
 	   GRdBSelector		-> show ();
 	   gainsliderLabel	-> show ();
+	   messageHandler  (&r2);
 	}
 }
 
@@ -576,7 +577,7 @@
 	if (agcMode) {
 	   chParams    -> ctrlParams. agc. setPoint_dBfs = -30;
 	   chParams    -> ctrlParams. agc. enable =
-                                             sdrplay_api_AGC_100HZ;
+                                             sdrplay_api_AGC_5HZ;
 	}
 	else
 	   chParams    -> ctrlParams. agc. enable =
@@ -689,7 +690,7 @@
 	            chParams    -> ctrlParams. agc. setPoint_dBfs =
 	                                              - p -> setPoint;
                     chParams    -> ctrlParams. agc. enable =
-                                             sdrplay_api_AGC_100HZ;
+                                             sdrplay_api_AGC_5HZ;
 	         }
 	         else
 	            chParams    -> ctrlParams. agc. enable =

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

@@ -1,6 +1,6 @@
 #
 /*
- *    Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020
+ *    Copyright (C)  2015, 2016, 2017, 2018, 2019, 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
@@ -79,19 +79,26 @@
 #ifdef	HAVE_HACKRF
 #include	"hackrf-handler.h"
 #endif
-#ifdef	HAVE_SOAPY
-#include	"soapy-handler.h"
-#endif
 #ifdef	HAVE_LIME
 #include	"lime-handler.h"
 #endif
 #ifdef	HAVE_PLUTO
 #include	"pluto-handler.h"
 #endif
+#ifdef	HAVE_SOAPY
+#include	"soapy-handler.h"
+#endif
+#ifdef	HAVE_ELAD
+#include	"elad-handler.h"
+#endif
+#ifdef	HAVE_ELAD_FILES
+#include	"elad-files.h"
+#endif
 #include	"spectrum-viewer.h"
 #include	"correlation-viewer.h"
 #include	"tii-viewer.h"
 #include	"history-handler.h"
+#include	"time-table.h"
 
 #ifdef	__MINGW32__
 #include <windows.h>
@@ -140,15 +147,15 @@
 #define	SCAN_TO_DATA		1
 #define	SCAN_CONTINUOUSLY	2
 
+const
+char	*scanTextTable [3] = {
+	"single scan",
+	"scan to data",
+	"scan continuously"
+};
 static inline
 QString scanmodeText (int e) {
-	if (e == SINGLE_SCAN)
-	   return QString ("single scan");
-	if (e == SCAN_TO_DATA)
-	   return QString ("scan to data");
-	if (e == SCAN_CONTINUOUSLY)
-	   return QString ("scan continuously");
-	return QString ("???");
+	return QString (scanTextTable [e]);
 }
 
 #define	CONTENT_BUTTON		QString ("contentButton")
@@ -158,6 +165,7 @@
 #define	TII_BUTTON		QString ("tiiButton")
 #define	CORRELATION_BUTTON	QString ("correlationButton")
 #define	SPECTRUM_BUTTON		QString ("spectrumButton")
+#define	SNR_BUTTON		QString ("snrButton")
 #define	DEVICEWIDGET_BUTTON	QString ("devicewidgetButton")
 #define	HISTORY_BUTTON		QString ("historyButton")
 #define	DUMP_BUTTON		QString ("dumpButton")
@@ -183,6 +191,20 @@
 	return 1;
 }
 
+#ifdef	__LOGGING__
+void	RadioInterface::LOG	(const QString &a1, const QString &a2) {
+QString theTime	= QDateTime::currentDateTime (). toString ();
+	if (logFile == nullptr)
+	   return;
+	fprintf (logFile, "at %s: %s %s\n",
+	              theTime. toLatin1 (). data (),
+	              a1. toLatin1 (). data (), a2. toLatin1 (). data ());
+}
+#else
+void	RadioInterface::LOG	(const QString &a1, const QString &a2) {
+	(void)a1; (void)a2;
+}
+#endif
 	RadioInterface::RadioInterface (QSettings	*Si,
 	                                const QString	&presetFile,
 	                                const QString	&freqExtension,
@@ -207,9 +229,12 @@
 	                                        my_tiiViewer (
 	                                                  this, Si,
 	                                                  &tiiBuffer),
+	                                        my_snrViewer (
+	                                                  this, Si),
 	                                        my_presetHandler (this),
-	                                        theBand (freqExtension),
-	                                        theTable (this) {
+	                                        theBand (freqExtension, Si),
+	                                        theTable (this),
+	                                        filenameFinder (Si) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -223,6 +248,9 @@
 	my_dabProcessor		= nullptr;
 	isSynced		= false;
 	stereoSetting		= false;
+
+	currentHour		= -1;
+	currentMinute		= -1;
 //
 //	"globals" is introduced to reduce the number of parameters
 //	for the dabProcessor
@@ -231,6 +259,7 @@
 	globals. responseBuffer	= &responseBuffer;
 	globals. tiiBuffer	= &tiiBuffer;
 	globals. frameBuffer	= &frameBuffer;
+
 	latency			=
 	                  dabSettings -> value ("latency", 5). toInt();
 
@@ -273,10 +302,6 @@
 	if (saveSlides != 0)
 	   set_picturePath ();
 
-	epgPath		= dabSettings -> value ("epgPath", ""). toString ();
-	filePath	= dabSettings -> value ("filePath", ""). toString ();
-	if ((epgPath != "") && (!epgPath. endsWith ("/")))
-	   epgPath = epgPath + "/";
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	   filePath = filePath + "/";
 
@@ -285,7 +310,10 @@
 //
 	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (dataDisplay);
+	techData. timeTable_button -> hide ();
 
+	epgLabel	-> hide ();
+	epgLabel	-> setStyleSheet ("QLabel {background-color : yellow}");
 	configDisplay	= new QFrame (nullptr);
 	configWidget. setupUi (configDisplay);
 
@@ -294,9 +322,19 @@
 
 	x = dabSettings -> value ("switchDelay", 8). toInt ();
 	configWidget. switchDelaySetting -> setValue (x);
+
+	dabSettings	-> beginGroup ("snrViewer");
+	configWidget. snrHeightSelector -> setValue (dabSettings -> value ("snrHeight", 15). toInt ());
+	configWidget. snrLengthSelector -> setValue (dabSettings -> value ("snrLength", 312). toInt ());
+	dabSettings	-> endGroup ();
 //
-//	scanMode is - unfortunately - global
-	scanMode	=
+#ifdef	__LOGGING__
+	logFile		= nullptr;
+	QString abc	= dabSettings	-> value ("logFile", ""). toString ();
+	if (abc != "")
+	   logFile	= fopen (abc. toLatin1 (). data (), "a");
+#endif
+	int scanMode	=
 	           dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
 	configWidget. scanmodeSelector -> setCurrentIndex (scanMode);
 
@@ -313,6 +351,7 @@
 	   configWidget. orderServiceIds -> setChecked (true);
 	else
 	   configWidget. ordersubChannelIds -> setChecked (true);
+
 	motSlides		= nullptr;
 	dataDisplay		-> hide ();
 	stillMuting		-> hide ();
@@ -323,6 +362,7 @@
                          setStyleSheet ("QLabel {background-color : red}");
 	alarmLabel		-> setText ("Alarm");
 	alarmLabel		-> hide ();
+
 /*
  */
 #ifdef	DATA_STREAMER
@@ -345,6 +385,7 @@
 	streamoutSelector	-> show();
 	bool err;
 	h	= dabSettings -> value ("soundchannel", "default"). toString();
+
 	k	= streamoutSelector -> findText (h);
 	if (k != -1) {
 	   streamoutSelector -> setCurrentIndex (k);
@@ -355,12 +396,27 @@
 	   ((audioSink *)soundOut)	-> selectDefaultDevice();
 #endif
 //
+#ifdef	TRY_EPG
+	epgPath		= dabSettings -> value ("epgPath", "/tmp"). toString ();
+	connect (&epgProcessor,
+	             SIGNAL (set_epgData (int, int, const QString &)),
+	         this, SLOT (set_epgData (int, int, const QString &)));

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

@@ -50,19 +50,22 @@
 #include	"scanner-table.h"
 #ifdef	TRY_EPG
 #include	"epgdec.h"
-#include	"si-processor.h"
+#include	"epg-decoder.h"
 #endif
 
 #include	"spectrum-viewer.h"
 #include	"tii-viewer.h"
 #include	"correlation-viewer.h"
+#include	"snr-viewer.h"
 
+#include	"findfilenames.h"
 class	QSettings;
 class	deviceHandler;
 class	audioBase;
 class	common_fft;
 class	serviceDescriptor;
 class	historyHandler;
+class	timeTableHandler;
 
 #include	"ui_technical_data.h"
 #include	"ui_config-helper.h"
@@ -105,13 +108,20 @@
         spectrumViewer		my_spectrumViewer;
 	correlationViewer	my_correlationViewer;
 	tiiViewer		my_tiiViewer;
+	snrViewer		my_snrViewer;
 	presetHandler		my_presetHandler;
+	bandHandler		theBand;
+	scannerTable		theTable;
+	findfileNames		filenameFinder;
 	processParams		globals;
 	QString			version;
+#ifdef	__LOGGING__
+	FILE			*logFile;
+#endif
+	void			LOG		(const QString &,
+	                                           const QString &);
 	int			serviceOrder;
 	bool			error_report;
-	bandHandler		theBand;
-	scannerTable		theTable;
 	Ui_technical_data	techData;
 	QFrame			*dataDisplay;
 	Ui_configWidget		configWidget;
@@ -120,12 +130,14 @@
 	dabService		currentService;
 	dabService		nextService;
 
+	int			currentHour;
+	int			currentMinute;
 	QByteArray		transmitters;
 	int16_t			tii_delay;
 	int32_t			dataPort;
 	serviceDescriptor	*currentServiceDescriptor;
 	QLabel			*motSlides;
-	std::vector<int>	secondariesVector;
+//	std::vector<int>	secondariesVector;
 	bool			isSynced;
 	bool			stereoSetting;
 	std::atomic<bool>	running;
@@ -139,11 +151,15 @@
 #endif
 #ifdef	TRY_EPG
 	CEPGDecoder		epgHandler;
-	siProcessor		siHandler;
+	epgDecoder		epgProcessor;
+	QString			epgPath;
+	QTimer			epgTimer;
+	uint32_t		extract_epg (QString,
+                                             std::vector<serviceId> serviceList,
+	                                     uint32_t);
 #endif
 	bool			saveSlides;
 	QString			picturesPath;
-	QString			epgPath;
 	QString			filePath;
 #ifdef	_SEND_DATAGRAM_
 	QUdpSocket		dataOut_socket;
@@ -153,7 +169,7 @@
 	SNDFILE                 *rawDumper;
         FILE                    *frameDumper;
         SNDFILE                 *audioDumper;
-	int			scanMode;
+	FILE			*scanDumpFile;
 	void			set_Colors		();
 	void			set_channelButton	(int);
 	QStandardItemModel	model;
@@ -163,13 +179,13 @@
 	std::vector<serviceId>
 	  	                insert   (std::vector<serviceId>,
 	                                  serviceId, int);
+
 	QStringList		soundChannels;
 	QTimer			displayTimer;
 	QTimer			channelTimer;
 	QTimer			presetTimer;
 	QTimer			startTimer;
 	QTimer			muteTimer;
-	QTimer			epgTimer;
 	QTimer			alarmTimer;
 	int			muteDelay;
 	int32_t			numberofSeconds;
@@ -192,19 +208,11 @@
 	deviceHandler		*setDevice		(const QString &);
 	historyHandler		*my_history;
 	historyHandler		*my_presets;
+	timeTableHandler	*my_timeTable;
 //
 	void			start_audioService	(audiodata *);
 	void			start_packetService	(const QString &);
 	void			startScanning		();
-	FILE			*findContentDump_fileName	(const QString &);
-	FILE			*findFrameDump_fileName	(const QString &,
-	                                                 const QString &);
-	SNDFILE			*findAudioDump_fileName	(const QString &,
-	                                                 const QString &);
-	SNDFILE			*findRawDump_fileName	(const QString &,
-	                                                 const QString &);
-	FILE			*findScanDump_FileName	();
-	FILE			*scanDumpFile;
 	void			stopScanning		(bool);
         void			start_audioDumping      ();
         void			stop_audioDumping       ();
@@ -225,7 +233,8 @@
 	void			save_MOTtext		(QByteArray, int,
                                                                  QString);
 	void			show_MOTlabel		(QByteArray, int,
-                                                                  QString);
+                                                                  QString, int);
+	void			stop_muting		();
 enum direction {FORWARD, BACKWARDS};
 
 	void			handle_serviceButton	(direction);
@@ -248,7 +257,7 @@
 	void			show_rsErrors		(int);
 	void			show_aacErrors		(int);
 	void			show_ficSuccess		(bool);
-	void			show_snr		(int);
+	void			show_snr		(int, float, float);
 	void			setSynced		(bool);
 	void			showLabel		(QString);
 	void			handle_motObject	(QByteArray, QString,
@@ -271,21 +280,28 @@
 	void			show_rsCorrections	(int);
 	void			show_tii		(int, int);
 	void			closeEvent		(QCloseEvent *event);
-	void			showTime		(const QString &);
+	void			clockTime		(int, int, int, int, int);
 	void			startAnnouncement	(const QString &, int);
 	void			stopAnnouncement	(const QString &, int);
 	void			newFrame		(int);
 
 	void			show_clockError		(int);
-
+#ifdef	TRY_EPG
+	void			set_epgData		(int,
+	                                                 int, const QString &);
+	void			epgTimer_timeOut	();
+#endif
+	void			switchVisibility	(QWidget *);
 //	Somehow, these must be connected to the GUI
 private slots:
+	void			handle_timeTable	();
 	void			handle_contentButton	();
 	void			handle_detailButton	();
 	void			handle_resetButton	();
 	void			handle_scanButton	();
 
 	void			handle_tiiButton	();
+	void			handle_snrButton	();
 	void			handle_correlationButton	();
 	void			handle_spectrumButton	();
 	void			handle_devicewidgetButton	();
@@ -314,7 +330,6 @@
 	void			setPresetStation	();
 	void			handle_muteButton	();
 	void			muteButton_timeOut	();
-	void			epgTimer_timeOut	();
 	void			alarmTimer_timeOut	();
 //
 //	color handlers
@@ -325,6 +340,7 @@
 	void			color_tiiButton		();
 	void			color_correlationButton	();
 	void			color_spectrumButton	();
+	void			color_snrButton		();
 	void			color_devicewidgetButton	();
 	void			color_historyButton	();
 	void			color_sourcedumpButton	();
@@ -338,16 +354,20 @@
 	void			color_configButton	();
 //
 //	config handlers
-	void			handle_configSetting	();
-	void			handle_muteTimeSetting	(int);
-	void			handle_switchDelaySetting (int);
-	void			handle_orderAlfabetical	();

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/dab-mini.pro -> _service:download_url:qt-dab-3.7.tar.gz/dab-mini/dab-mini.pro Changed

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/radio.cpp -> _service:download_url:qt-dab-3.7.tar.gz/dab-mini/radio.cpp Changed

@@ -86,7 +86,7 @@
                                                 dataBuffer (32768),
                                                 audioBuffer (8 * 32768),
 	                                        my_presetHandler (this),
-	                                        theBand ("") {
+	                                        theBand ("", Si ) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -568,10 +568,43 @@
 //	to be displayed
 ///////////////////////////////////////////////////////////////////////////
 
-
-void	RadioInterface::showTime	(const QString &s) {
-	timeDisplay	-> setText (s);
-}
+static
+const char *monthTable [] = {
+	"jan",
+	"feb",
+	"mar",
+	"apr",
+	"may",
+	"jun",
+	"jul",
+	"aug",
+	"sep",
+	"oct",
+	"nov",
+	"dec"
+};
+
+void	RadioInterface::clockTime (int year, int month, int day,
+	                                    int hours, int minutes){
+char dayString [3];
+char hourString [3];
+char minuteString [3];
+//	currentHour	= hours;
+//	currentMinute	= minutes;
+	sprintf (dayString, "%.2d", day);
+	sprintf (hourString, "%.2d", hours);
+	sprintf (minuteString, "%.2d", minutes);
+	QString result = QString::number (year) + "-" +
+	                       monthTable [month - 1] + "-" +
+	                       QString (dayString) + "  " +
+	                       QString (hourString) + ":" +
+	                       QString (minuteString);
+	timeDisplay -> setText (result);
+}
+
+//void	RadioInterface::showTime	(const QString &s) {
+//	timeDisplay	-> setText (s);
+//}
 
 void	RadioInterface::show_frameErrors (int s) {
 	(void)s;
@@ -634,8 +667,12 @@
 
 }
 
-void	RadioInterface::show_tii	(QByteArray data) {
-	(void)data;
+void	RadioInterface::show_tii	(int s1, int s2) {
+	(void)s1; (void)s2;
+}
+
+void	RadioInterface::show_snr	(int s1, float f1, float f2) {
+	(void)s1; (void)f1; (void)f2;
 }
 
 void	RadioInterface::showSpectrum	(int32_t amount) {

_service:download_url:qt-dab-3.6.tar.gz/dab-mini/radio.h -> _service:download_url:qt-dab-3.7.tar.gz/dab-mini/radio.h Changed

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

@@ -91,8 +91,8 @@
 	         myRadioInterface, SLOT (showSpectrum (int)));
 	connect (this, SIGNAL (show_tii (int, int)),
 	         myRadioInterface, SLOT (show_tii (int, int)));
-	connect (this, SIGNAL (show_snr (int)),
-	         mr, SLOT (show_snr (int)));
+	connect (this, SIGNAL (show_snr (int, float, float)),
+	         mr, SLOT (show_snr (int, float, float)));
 	connect (this, SIGNAL (show_clockErr (int)),
 	         mr, SLOT (show_clockError (int)));
 	my_TII_Detector. reset();
@@ -143,7 +143,8 @@
 int	frameCount	= 0;
 int	sampleCount	= 0;
 int	totalSamples	= 0;
-
+double	cLevel		= 0;
+int	cCount		= 0;
 //	inputDevice	-> resetBuffer ();
 //	inputDevice	-> restartReader (frequency);
 	ibits. resize (2 * params. get_carriers());
@@ -227,8 +228,11 @@
 	   }
 
 	   sampleCount = startIndex;
+
 SyncOnPhase:
 	   goodFrames ++;
+	   cLevel	= 0;
+	   cCount	= 0;
 /**
   *	Once here, we are synchronized, we need to copy the data we
   *	used for synchronization for block 0
@@ -250,7 +254,7 @@
 	   myReader. getSamples (&((ofdmBuffer. data()) [ofdmBufferIndex]),
 	                           T_u - ofdmBufferIndex,
 	                           coarseOffset + fineOffset);
-	   sampleCount += T_u;
+	   sampleCount	+= T_u;
 	   my_ofdmDecoder. processBlock_0 (ofdmBuffer);
 	   if (!scanMode)
 	      my_mscHandler.  processBlock_0 (ofdmBuffer. data());
@@ -280,21 +284,34 @@
   *	the phase difference between the samples in the cyclic prefix
   *	and the	corresponding samples in the datapart.
   */
+	   cCount	= 0;
+	   cLevel	= 0;
 	   FreqCorr	= std::complex<float> (0, 0);
 	   for (int ofdmSymbolCount = 1;
-	        ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
+	        ofdmSymbolCount < 4; ofdmSymbolCount ++) {
 	      myReader. getSamples (ofdmBuffer. data(),
 	                              T_s, coarseOffset + fineOffset);
 	      sampleCount += T_s;
-	      for (i = (int)T_u; i < (int)T_s; i ++) 
+	      for (i = (int)T_u; i < (int)T_s; i ++) {
 	         FreqCorr += ofdmBuffer [i] * conj (ofdmBuffer [i - T_u]);
-
-	      if (ofdmSymbolCount < 4) {
-	         my_ofdmDecoder. decode (ofdmBuffer,
-	                            ofdmSymbolCount, ibits. data());
-	         my_ficHandler. process_ficBlock (ibits, ofdmSymbolCount);
+	         cLevel += abs (ofdmBuffer [i]) + abs (ofdmBuffer [i - T_u]);
+	         cCount += 2;
 	      }
+	      my_ofdmDecoder. decode (ofdmBuffer,
+	                            ofdmSymbolCount, ibits. data());
+	      my_ficHandler. process_ficBlock (ibits, ofdmSymbolCount);
 
+	   }
+	   for (int ofdmSymbolCount = 4;
+	        ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
+	      myReader. getSamples (ofdmBuffer. data(),
+	                              T_s, coarseOffset + fineOffset);
+	      sampleCount += T_s;
+	      for (i = (int)T_u; i < (int)T_s; i ++) {
+	         FreqCorr += ofdmBuffer [i] * conj (ofdmBuffer [i - T_u]);
+	         cLevel += abs (ofdmBuffer [i]) + abs (ofdmBuffer [i - T_u]);
+	         cCount += 2;
+	      }
 	      if (!scanMode)
 	         my_mscHandler. process_Msc  (&((ofdmBuffer. data()) [T_g]),
 	                                                    ofdmSymbolCount);
@@ -314,9 +331,9 @@
 	   snr = 0.9 * snr +
 	     0.1 * 20 * log10 ((myReader. get_sLevel() + 0.005) / sum);
 	   static int ccc	= 0;
-	   if (++ccc > 10) {
+	   if (++ccc >= 2 ) {
 	      ccc = 0;
-	      show_snr ((int)snr);
+	      show_snr ((int)snr, cLevel / cCount, sum);
 	   }
 /*
  *	The TII data is encoded in the null period of the
@@ -330,12 +347,12 @@
 	            if (res != 0) {
 	               uint8_t mainId	= res >> 8;
 	               uint8_t subId	= res & 0xFF;
+	               tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
 	               show_tii (mainId, subId);
 	            }
 	            tii_counter = 0;
 	            my_TII_Detector. reset();
 	         }
-	         tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data(), T_u);
 	      }
 	   }
 /**
@@ -437,6 +454,20 @@
 QString dabProcessor::get_ensembleName	() {
 	return my_ficHandler. get_ensembleName();
 }
+
+void	dabProcessor::set_epgData	(int SId,
+	                                 int32_t theTime, const QString &s) {
+	my_ficHandler. set_epgData (SId, theTime, s);
+}
+
+bool	dabProcessor::has_timeTable	(uint32_t SId) {
+	return my_ficHandler. has_timeTable (SId);
+}
+
+std::vector<epgElement>	dabProcessor::find_epgData	(uint32_t SId) {
+	return my_ficHandler. find_epgData (SId);
+}
+
 //
 //	for the mscHandler:
 void	dabProcessor::reset_Services	() {
@@ -449,16 +480,20 @@
 	   my_mscHandler. stopService (d);
 }
 
-void    dabProcessor::set_audioChannel (audiodata *d,
+bool    dabProcessor::set_audioChannel (audiodata *d,
 	                                      RingBuffer<int16_t> *b) {
 	if (!scanMode)
-	   my_mscHandler. set_Channel (d, b, (RingBuffer<uint8_t> *)nullptr);
+	   return my_mscHandler. set_Channel (d, b, (RingBuffer<uint8_t> *)nullptr);
+	else
+	   return false;
 }
 
-void    dabProcessor::set_dataChannel (packetdata *d,
+bool    dabProcessor::set_dataChannel (packetdata *d,
 	                                      RingBuffer<uint8_t> *b) {
 	if (!scanMode)
-	   my_mscHandler. set_Channel (d, (RingBuffer<int16_t> *)nullptr, b);
+	   return my_mscHandler. set_Channel (d, (RingBuffer<int16_t> *)nullptr, b);
+	else
+	   return false;
 }
 
 void	dabProcessor::startDumping	(SNDFILE *f) {

_service:download_url:qt-dab-3.6.tar.gz/dab-processor.h -> _service:download_url:qt-dab-3.7.tar.gz/dab-processor.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
@@ -77,14 +78,17 @@
         uint8_t		get_ecc			();
         int32_t		get_ensembleId		();
         QString		get_ensembleName	();
-
+	void		set_epgData		(int32_t, int32_t,
+	                                                 const QString &);
+	bool		has_timeTable		(uint32_t);
+	std::vector<epgElement>	find_epgData		(uint32_t);
 //
 //	for the mscHandler
 	void		reset_Services		();
 	void		stopService		(descriptorType *);
-	void		set_audioChannel	(audiodata *,
+	bool		set_audioChannel	(audiodata *,
 	                                             RingBuffer<int16_t> *);
-	void		set_dataChannel		(packetdata *,
+	bool		set_dataChannel		(packetdata *,
 	                                             RingBuffer<uint8_t> *);
 private:
 	int		frequency;
@@ -132,7 +136,7 @@
 	void		setSyncLost		();
 	void		show_tii		(int, int);
 	void		show_Spectrum		(int);
-	void		show_snr		(int);
+	void		show_snr		(int, float, float);
 	void		show_clockErr		(int);
 };
 #endif

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

_service:download_url:qt-dab-3.7.tar.gz/dumpViewer.png Added

_service:download_url:qt-dab-3.7.tar.gz/dumpviewer Added

_service:download_url:qt-dab-3.7.tar.gz/dumpviewer/dump-viewer.cpp Added

@@ -0,0 +1,136 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the dumpViewer
+ *
+ *    dumpViewer 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.
+ *
+ *    dumpViewer 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 dumpViewer; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	<QCoreApplication>
+#include	"dump-viewer.h"
+//
+
+	dumpViewer::dumpViewer (FILE *f, QWidget *parent):
+	                                       QDialog (parent) {
+int16_t	i;
+
+	this	-> theFile	= f;
+	setupUi (this);
+	displayColor	= QColor	("white");
+	gridColor	= QColor	("red");
+	curveColor	= QColor	("red");
+	plotgrid	= viewerWindow;
+	plotgrid	-> setCanvasBackground (displayColor);
+	grid		= new QwtPlotGrid;
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
+#else
+	grid		-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
+#endif
+	grid		-> enableXMin (true);
+	grid		-> enableYMin (true);
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid		-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
+#else
+	grid		-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
+#endif
+	grid		-> attach (plotgrid);
+
+	lm_picker       = new QwtPlotPicker (plotgrid -> canvas ());
+        QwtPickerMachine *lpickerMachine =
+                             new QwtPickerClickPointMachine ();
+
+        lm_picker       -> setStateMachine (lpickerMachine);
+        lm_picker       -> setMousePattern (QwtPlotPicker::MouseSelect1,
+                                            Qt::RightButton);
+//	connect (lm_picker, SIGNAL (selected (const QPointF&)),
+//	         this, SLOT (rightMouseClick (const QPointF &)));
+
+	spectrumCurve	= new QwtPlotCurve ("");
+   	spectrumCurve	-> setPen (QPen(curveColor, 2.0));
+	spectrumCurve	-> setOrientation (Qt::Horizontal);
+	spectrumCurve	-> setBaseline	(0);
+	spectrumCurve	-> attach (plotgrid);
+	plotgrid	-> enableAxis (QwtPlot::yLeft);
+	connect (viewSlider, SIGNAL (valueChanged (int)),
+	         this, SLOT (handle_viewSlider (int)));
+	connect (amplitudeSlider, SIGNAL (valueChanged (int)),
+	         this, SLOT (handle_amplitudeSlider (int)));
+	connect (compressor, SIGNAL (valueChanged (int)),
+	         this, SLOT (handle_compressor (int)));
+//
+//	Now looking at the file
+	seconds_per_frame	= 12.0 / 125;
+	seconds_per_sample	= 2 * seconds_per_frame;
+	fseek (theFile, 0, SEEK_END);
+	fileLength	= ftell (theFile);
+	fseek (theFile, 0, SEEK_SET);
+	fprintf (stderr, "samples per minute: %d\n",
+	                          (int)(60 / seconds_per_sample));
+	fprintf (stderr, "duration of record: %d seconds\n", 
+	                     (int)(fileLength / sizeof (float) * seconds_per_sample));
+	show_segment (0, 1);
+}
+//
+
+	dumpViewer::~dumpViewer	(void) {
+}
+
+void	dumpViewer::handle_viewSlider	(int pos) {
+	show_segment (pos, compressor -> value ());
+}
+
+void	dumpViewer::handle_amplitudeSlider (int h) {
+	(void)h;
+	show_segment (viewSlider -> value (), 
+	              compressor -> value ());
+}
+
+void	dumpViewer::handle_compressor	(int h) {
+	show_segment (viewSlider -> value (), h);
+}
+
+//
+//	pos is the pos of the slider, so a value between 0 .. 100
+void	dumpViewer::show_segment (int pos, int compression) {
+double	X_axis [512];
+double	Y_Values [512];
+float	temp [512 * compression];
+int	lengthF	=  fileLength / sizeof (float);
+int	p	= pos * lengthF / 100;
+	for (int i = 0; i < 512; i ++)
+	   X_axis [i] = (p + i) * compression * seconds_per_sample;
+
+	memset (Y_Values, 0, sizeof (double) * 512);
+	fseek (theFile, p * sizeof (float), SEEK_SET);
+	int length = fread (temp, sizeof (float), 512 * compression, theFile);
+	for (int i = 0; i < length / compression; i ++)
+	   Y_Values [i] = temp [i * compression];
+
+	plotgrid        -> setAxisScale (QwtPlot::xBottom,
+                                         double (p * compression * seconds_per_sample),
+                                         (double)((p + 512) * compression * seconds_per_sample));
+        plotgrid        -> enableAxis (QwtPlot::xBottom);
+        plotgrid        -> setAxisScale (QwtPlot::yLeft,
+                                         0, amplitudeSlider -> value ());
+        plotgrid        -> enableAxis (QwtPlot::yLeft);
+        spectrumCurve   -> setBaseline  (0);
+        spectrumCurve   -> setSamples (X_axis, Y_Values, 512);
+        plotgrid        -> replot();
+}
+

_service:download_url:qt-dab-3.7.tar.gz/dumpviewer/dump-viewer.h Added

@@ -0,0 +1,72 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the dumpViewer
+ *
+ *    dumpViewer 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.
+ *
+ *    dumpViewer 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 dumpViewer; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef	__DUMP_VIEWER__
+#define	__DUMP_VIEWER__
+#include	<QDialog>
+#include        <qwt.h>
+#include        <qwt_plot.h>
+#include        <qwt_plot_marker.h>
+#include        <qwt_plot_grid.h>
+#include        <qwt_plot_curve.h>
+#include        <qwt_color_map.h>
+#include        <qwt_plot_zoomer.h>
+#include        <qwt_plot_textlabel.h>
+#include        <qwt_plot_panner.h>
+#include        <qwt_plot_layout.h>
+#include        <qwt_picker_machine.h>
+#include        <qwt_scale_widget.h>
+
+#include	<QLabel>
+#include	<QMessageBox>
+#include	"ui_dumpwidget.h"
+//
+
+class	dumpViewer:public QDialog,
+	            public Ui_dumpViewer {
+Q_OBJECT
+public:
+		dumpViewer	(FILE *, QWidget *parent = NULL);
+		~dumpViewer	(void);
+
+private	slots:
+	void	handle_viewSlider	(int);
+	void	handle_amplitudeSlider	(int);
+	void	handle_compressor	(int);
+private:
+	FILE		*theFile;
+	float		seconds_per_frame;
+	float		seconds_per_sample;
+	void		show_segment	(int, int);
+	int		fileLength;
+	QwtPlot         *plotgrid;
+        QwtPlotGrid     *grid;
+        QwtPlotCurve    *spectrumCurve;
+        QwtPlotPicker   *lm_picker;
+        QColor          displayColor;
+        QColor          gridColor;
+        QColor          curveColor;
+};
+#endif
+
+

_service:download_url:qt-dab-3.7.tar.gz/dumpviewer/dump-viewer.pro Added

_service:download_url:qt-dab-3.7.tar.gz/dumpviewer/dumpwidget.ui Added

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dumpViewer</class>
+ <widget class="QDialog" name="dumpViewer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>616</width>
+    <height>520</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>dumpViewer</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QSlider" name="amplitudeSlider">
+       <property name="maximum">
+        <number>30</number>
+       </property>
+       <property name="value">
+        <number>15</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QwtPlot" name="viewerWindow">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;snr viewer. The snr viewer shows a recording of a stream snr data as collected by the Qt-DAB software. The Y axis show the strength in dB, the X-axis shows the time in seconds of the recording.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QSlider" name="viewSlider">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="compressor">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;compressor: value is used to look at lager segments by skipping intermediate values&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="state">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QwtPlot</class>
+   <extends>QFrame</extends>
+   <header>qwt_plot.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.7.tar.gz/dumpviewer/main.cpp Added

@@ -0,0 +1,55 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of dumpViewer
+ *
+ *    dumpViewer 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.
+ *
+ *    dumpViewer 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 dumpViewer; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *	Main program
+ */
+#include	<QApplication>
+#include	<stdio.h>
+#include	"dump-viewer.h"
+
+int	main (int argc, char **argv) {
+dumpViewer	*theViewer;
+FILE	*theFile;
+
+	if (argc < 2) {
+	   fprintf (stderr, "Usage: dumpViewer fileName\n");
+	   exit (1);
+	}
+
+	theFile	= fopen (argv [1], "r+b");
+	if (theFile == nullptr) {
+	   fprintf (stderr, "we could not open %s\n", argv [1]);
+	   exit (1);
+	}
+
+	QApplication a (argc, argv);
+	theViewer 	= new dumpViewer (theFile);
+	theViewer	-> show ();
+	a. exec ();
+/*
+ *	done:
+ */
+	fflush (stdout);
+	fflush (stderr);
+	qDebug ("It is done\n");
+}
+

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

@@ -6,183 +6,261 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>373</width>
-    <height>415</height>
+    <width>343</width>
+    <height>516</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Configuration</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>mute time (in minutes)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4">
-    <widget class="smallSpinBox" name="muteTimeSetting">
-     <property name="toolTip">
-      <string>Set here the mute time in minutes</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="3">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>switch time (in seconds)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="4">
-    <widget class="smallSpinBox" name="switchDelaySetting">
-     <property name="toolTip">
-      <string>Set here the delay, when searching for data in a channel, in seconds</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string> PlotLength (unit 100)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="4" rowspan="2">
-    <widget class="smallSpinBox" name="plotLengthSetting">
-     <property name="minimum">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <number>10</number>
-     </property>
-     <property name="value">
-      <number>5</number>
-     </property>
-    </widget>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>mute time (in minutes)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="smallSpinBox" name="muteTimeSetting">
+       <property name="toolTip">
+        <string>Set here the mute time in minutes</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>switch time (in seconds)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="smallSpinBox" name="switchDelaySetting">
+       <property name="toolTip">
+        <string>Set here the delay, when searching for data in a channel, in seconds</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string> PlotLength (unit 100)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="smallSpinBox" name="plotLengthSetting">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>5</number>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>snr height</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QSpinBox" name="snrHeightSelector">
+       <property name="minimum">
+        <number>5</number>
+       </property>
+       <property name="value">
+        <number>15</number>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>snr Length</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QSpinBox" name="snrLengthSelector">
+       <property name="minimum">
+        <number>112</number>
+       </property>
+       <property name="maximum">
+        <number>5000</number>
+       </property>
+       <property name="singleStep">
+        <number>50</number>
+       </property>
+       <property name="value">
+        <number>312</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QComboBox" name="scanmodeSelector">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
-      <property name="text">
-       <string>single scan</string>
-      </property>
+      <widget class="QComboBox" name="scanmodeSelector">
+       <item>
+        <property name="text">
+         <string>single scan</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>scan to data</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>continuous</string>
+        </property>
+       </item>
+      </widget>
      </item>
      <item>
-      <property name="text">
-       <string>scan to data</string>
-      </property>
+      <widget class="smallPushButton" name="skipList_button">
+       <property name="text">
+        <string>skipList</string>
+       </property>
+      </widget>
      </item>
      <item>
-      <property name="text">
-       <string>continuous</string>
-      </property>
+      <widget class="smallPushButton" name="skipFile_button">
+       <property name="text">
+        <string>skipFile</string>
+       </property>
+      </widget>
      </item>

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

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>642</width>
-    <height>407</height>
+    <height>400</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Qt-DAB-3.6</string>
+   <string>Qt-DAB-3.7</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_3">
    <item>
@@ -75,7 +75,8 @@
         <item>
          <widget class="smallPushButton" name="prevServiceButton">
           <property name="toolTip">
-           <string>Select the previous service on the list of services (the previous one of the first element is the last element of the list).</string>
+           <string>&lt;html&gt;&lt;head&gt;&lt;/head&gt;&lt;body&gt;
+&lt;p&gt;Select the previous service on the list of services&lt;br /&gt;(the previous one of the first element is the last element of the list).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>-</string>
@@ -85,7 +86,7 @@
         <item>
          <widget class="smallPushButton" name="nextServiceButton">
           <property name="toolTip">
-           <string>Select the next service on the list of services (the next of the last element is the first element).</string>
+           <string>&lt;html&gt;&lt;head /&gt; &lt;body&gt;&lt;p&gt;Select the next service on the list of services &lt;br /&gt;(the next of the last element is the first element).&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>+</string>
@@ -170,8 +171,8 @@
             <item>
              <widget class="QLabel" name="localTimeDisplay">
               <property name="toolTip">
-               <string>Local time is the time as received from the transmission. If you are running recordings, then
-it is definitely not the time on your clock.</string>
+               <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;Local time is the time as received from the transmission. &lt;br /&gt;&lt;br /&gt;If you are running recordings, then
+it is definitely not the time on your clock.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="frameShape">
                <enum>QFrame::Panel</enum>
@@ -424,6 +425,13 @@
            </widget>
           </item>
           <item>
+           <widget class="QLabel" name="epgLabel">
+            <property name="text">
+             <string>EPG</string>
+            </property>
+           </widget>
+          </item>
+          <item>
            <widget class="QLabel" name="alarmLabel">
             <property name="text">
              <string>Alarm</string>
@@ -592,10 +600,12 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>Touching this button will show (or hide) the resulting correlation of the first datablock of the DAB
-ensemble with the values as they should be. The &quot;peaks&quot; (if any) show the samples where
-the correlation is strongest. More than one peak shows more than one transmitter within
-the reach of this receiver.</string>
+           <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;
+Touching this button will show (or hide) the resulting correlation of the first&lt;br /&gt;
+ datablock of the DAB ensemble with the values as they should be. &lt;br /&gt;&lt;br /&gt;
+The &quot;peaks&quot; (if any) show the samples where the correlation is strongest. &lt;br /&gt;
+More than one peak shows more than one transmitter within
+the reach &lt;br /&gt;of this receiver.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>corr-result</string>
@@ -603,12 +613,12 @@
          </widget>
         </item>
         <item row="1" column="7">
-         <widget class="verySmallPushButton" name="devicewidgetButton">
+         <widget class="verySmallPushButton" name="show_tiiButton">
           <property name="toolTip">
-           <string>Hide or show the widget for device control.</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for showing the tii spectrum&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>show</string>
+           <string>tii</string>
           </property>
          </widget>
         </item>
@@ -649,15 +659,15 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spectrum and the constellation of the DAB signal is shown when pressing this button. Pressing it&lt;/p&gt;&lt;p&gt;again will cause the spectrum and constellation to be invisible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spectrum and the constellation of the DAB signal is shown when pressing this button. &lt;br /&gt;&lt;br /&gt;Pressing it again will cause the spectrum and constellation to be invisible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>Spectrum</string>
+           <string>spectrum</string>
           </property>
          </widget>
         </item>
         <item row="1" column="0" colspan="2">
-         <widget class="verySmallPushButton" name="show_tiiButton">
+         <widget class="verySmallPushButton" name="devicewidgetButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -671,10 +681,10 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If configured - pushing this button will switch the spectrum display between &amp;quot;regular&amp;quot; and a spectrum showing the &amp;quot;null symbol&amp;quot; period. In the console window the pattern, main ID and sub ID of the TII will be displayed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;show or hide the widget for controlling the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>TII</string>
+           <string>device</string>
           </property>
          </widget>
         </item>
@@ -775,10 +785,9 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>Touching the scan button will cause the software to make a single scan over all channels in the selected band. Ensembles (and their services) found will be displayed in a separate window.
-The windows will be visible as long as the scanning mode is on (note that after completing the
-scan, i.e. the cycle from (in Mode I) channel 5A to 13F, the software will wait until the scanner
-is officlally stopped).</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching the scan button will cause the software to make a single scan over all channels. Ensembles (and their services) found will be displayed in a separate window.&lt;/p&gt;&lt;p&gt;The windows will be visible as long as the scanning mode is on &lt;br/&gt;
+(note that after completing the scan, i.e. the cycle from channel 5A to 13F, &lt;br /&gt;
+the software will wait until the scanner is officially stopped).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>Scan</string>
@@ -800,8 +809,7 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>config Button. Touching this button will show/hide a widget where some configuration settings
-can be changed. The config widget also contains a posisbility for setting an alarm like signal.</string>
+           <string>&lt;html&gt;&lt;head /&gt;&lt;body&gt;&lt;p&gt;Touching this button will show/hide a widget where some configuration settings can be changed. &lt;br /&gt;&lt;br /&gt;The config widget also contains a posisbility for setting an alarm like signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>config</string>
@@ -809,7 +817,7 @@
          </widget>
         </item>
         <item row="3" column="4" colspan="2">
-         <widget class="verySmallPushButton" name="muteButton">
+         <widget class="verySmallPushButton" name="snrButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -823,11 +831,10 @@
            </font>
           </property>
           <property name="toolTip">
-           <string>The mute button, when touched a first time, the audio - if any - will be muted for a given amount of time (default 2 minutes, can be set in the configuration widget). If touched for a second time
-muting will stop.</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The snrViewer button controls a widget that - when enabled - will show the development of SNR over time. Parameters of the screen, height (the Y-axis) and the number of measurements (X-axis) can be set in the configuration widget.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>mute</string>
+           <string>snr viewer</string>
           </property>
          </widget>
         </item>

_service:download_url:qt-dab-3.7.tar.gz/forms/dabradio.ui-3.6 Added

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

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

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

_service:download_url:qt-dab-3.6.tar.gz/forms/data-description.ui -> _service:download_url:qt-dab-3.7.tar.gz/forms/data-description.ui Changed

_service:download_url:qt-dab-3.6.tar.gz/forms/technical_data.ui -> _service:download_url:qt-dab-3.7.tar.gz/forms/technical_data.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>229</width>
-    <height>570</height>
+    <width>246</width>
+    <height>669</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,19 +15,33 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
-      <widget class="QLabel" name="programName">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-        </font>
-       </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="programName">
+         <property name="font">
+          <font>
+           <pointsize>14</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Service long label&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>programName</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QPushButton" name="timeTable_button">
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Service long label&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If configured - opens a new windows with SPI (formerly called EPG) preview.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Note that this is still work in progress.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
-        <string>programName</string>
+        <string>timeTable</string>
        </property>
       </widget>
      </item>
@@ -38,10 +52,7 @@
      <item>
       <widget class="smallPushButton" name="framedumpButton">
        <property name="toolTip">
-        <string>DAB+ audio services are encoded in an AAC format. Touching this button will show a menu
-with which a file can be selected to store the AAC frames into.
-As usual, touching the button again will close the output file. Programs like vlc can handle such
-files</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DAB+ audio services are encoded in an AAC format. &lt;/p&gt;&lt;p&gt;Touching this button will show a menu to store the AAC frames into a file.&lt;/p&gt;&lt;p&gt;As usual, touching the button again will close the output file. Programs like vlc can handle such files.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>frame dump</string>
@@ -51,9 +62,7 @@
      <item>
       <widget class="smallPushButton" name="audiodumpButton">
        <property name="toolTip">
-        <string>The audio output can be saved as a file in uncompressed PCM format. Touching this button
-will show a menu with which a file can be selected for storage of the PCM data.
-The output is a regular &quot;.wav&quot; file which can be handled by many other audio programs.</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The audio output can be saved as a file in uncompressed PCM format. &lt;/p&gt;&lt;p&gt;Touching this button will show a menu to save the PCM data into a file.&lt;/p&gt;&lt;p&gt;The output is a regular &amp;quot;.wav&amp;quot; file which can be handled by many other audio programs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>dump audio</string>
@@ -63,6 +72,16 @@
     </layout>
    </item>
    <item>
+    <widget class="smallPushButton" name="muteButton">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The mute button controls whether or not the sound will be made audible. If set, the sound will be muted for a specified number of seconds, number being set in the configuration widget.&lt;/p&gt;&lt;p&gt;Touching the button when muting is on, will switch it off, as will changing the selected service or changing the channel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>mute</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_3">
@@ -135,6 +154,13 @@
        </property>
       </widget>
      </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>rs corrections/100</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="1">
       <widget class="QLCDNumber" name="rsCorrections">
        <property name="toolTip">
@@ -165,17 +191,37 @@
        </property>
       </widget>
      </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout_2">
      <item row="4" column="0">
-      <widget class="QLabel" name="label_4">
+      <widget class="QLabel" name="label_10">
        <property name="text">
-        <string>rs corrections/100</string>
+        <string>PTY:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="codeRate">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLabel" name="programType">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PTY (Program Type)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="text">
+        <string>programType</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout_2">
      <item row="0" column="0">
       <widget class="QLabel" name="label_5">
        <property name="minimumSize">
@@ -189,91 +235,81 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="uepField">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>20</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows Protection Level and Type (A or B)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
+     <item row="2" column="1">
+      <widget class="QLabel" name="ASCTy">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="text">
-        <string>uepField</string>
+        <string>ASCTy</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_8">
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_11">
        <property name="text">
-        <string>Type:</string>
+        <string>audio:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="ASCTy">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_8">
        <property name="text">
-        <string>ASCTy</string>
+        <string>Type:</string>
        </property>
       </widget>

_service:download_url:qt-dab-3.6.tar.gz/includes/backend/backend.h -> _service:download_url:qt-dab-3.7.tar.gz/includes/backend/backend.h Changed

_service:download_url:qt-dab-3.7.tar.gz/includes/backend/data/epg-2 Added

_service:download_url:qt-dab-3.7.tar.gz/includes/backend/data/epg-2/epg-decoder.h Added

@@ -0,0 +1,94 @@
+#
+/*
+ *    Copyright (C) 2013 .. 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-TAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef	__EPG_DECODER__
+#define	__EPG_DECODER__
+
+#include	<QObject>
+#include	<stdio.h>
+#include	<stdint.h>
+#include	<stdlib.h>
+#include	<QString>
+
+class progDesc {
+public:
+	QString		ident;
+	QString		shortName;
+	QString		mediumName;
+	QString		longName;
+	int		startTime;
+	progDesc	() {
+	   startTime	= -1;
+	}
+	void	clean		() {
+	   startTime	= -1;
+	   longName	= "";
+	   mediumName	= "";
+	   shortName	= "";
+	   ident	= "";
+	}
+	   
+};
+
+class	epgDecoder: public QObject {
+Q_OBJECT
+public:
+			epgDecoder		();
+			~epgDecoder		();
+
+	int		process_epg		(uint8_t *, int, uint32_t);
+private:
+	uint32_t	SId;
+	QString		stringTable [20];
+	int		getBit			(uint8_t *, int);
+	uint32_t	getBits			(uint8_t *, int, int);
+
+	int		process_epgElement	(uint8_t *, int);
+	int		schedule_element	(uint8_t *, int);
+	int		programme_element	(uint8_t *, int, progDesc *);
+	int		process_mediaDescription	(uint8_t *, int);
+	int		process_location	(uint8_t *, int, progDesc *);
+	int		location_element	(uint8_t *, int, progDesc *);
+	int		time_element		(uint8_t *, int);
+	int		genre_element		(uint8_t *, int);
+	int		bearer_element		(uint8_t *, int);
+	int		multimedia		(uint8_t *, int);
+
+	void		process_tokens		(uint8_t *, int, int);
+	int		process_token		(uint8_t *, int);
+	void		process_45		(uint8_t *, int, int);
+	void		process_46		(uint8_t *, int, int);
+	QString		process_471		(uint8_t *, int, int);
+	void		process_472		(uint8_t *, int, int);
+	void		process_473		(uint8_t *, int, int);
+	int		process_474		(uint8_t *, int, int);
+	void		process_475		(uint8_t *, int, int);
+	void		process_476		(uint8_t *, int, int);
+	QString		process_481		(uint8_t *, int, int);
+	void		process_483		(uint8_t *, int, int);
+	void		record			(progDesc *);
+signals:
+	void		set_epgData		(int, int, const QString &);
+};
+
+#endif
+

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

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

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

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

@@ -28,9 +28,12 @@
 #include	<cstdint>
 #include	<cstdio>
 #include	<QObject>
+#include	<QByteArray>
 #include	"msc-handler.h"
 #include	<QMutex>
-	
+#include	"dab-config.h"
+
+
 class	RadioInterface;
 
 class	ensembleDescriptor;
@@ -40,14 +43,14 @@
 class	fibDecoder: public QObject {
 Q_OBJECT
 public:
-			fibDecoder	(RadioInterface *);
-			~fibDecoder	();
+			fibDecoder		(RadioInterface *);
+			~fibDecoder		();
 
-	void		clearEnsemble	();
-	bool		syncReached	();
-	void	dataforAudioService	(const QString &, audiodata *);
-	void	dataforPacketService	(const QString &,
-	                                      packetdata *, int16_t);
+	void		clearEnsemble		();
+	bool		syncReached		();
+	void		dataforAudioService	(const QString &, audiodata *);
+	void		dataforPacketService	(const QString &,
+	                                          packetdata *, int16_t);
 
 	std::vector<serviceId>	getServices	(int);
 
@@ -57,7 +60,11 @@
 	int32_t		get_ensembleId	();
 	QString		get_ensembleName	();
 	int32_t		get_CIFcount	();	
-	void		print_Overview	();
+	void		set_epgData	(uint32_t, int32_t, const QString);
+	std::vector<epgElement> get_timeTable	(uint32_t);
+	std::vector<epgElement> get_timeTable	(const QString &);
+	bool		has_timeTable	(uint32_t SId);
+	std::vector<epgElement>	find_epgData	(uint32_t);
 protected:
 	void	process_FIB		(uint8_t *, uint16_t);
 private:
@@ -158,7 +165,7 @@
 signals:
 	void		addtoEnsemble		(const QString &, int);
 	void		nameofEnsemble		(int, const QString &);
-	void		setTime			(const QString &);
+	void		clockTime		(int, int, int, int, int);
 	void		changeinConfiguration	();
 	void		startAnnouncement	(const QString &, int);
 	void		stopAnnouncement	(const QString &, int);

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

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

@@ -1,10 +1,11 @@
 #
 /*
- *    Copyright (C) 2013, 2014, 2015, 2016, 2017
+ *    Copyright (C) 2015 .. 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
@@ -24,20 +25,50 @@
 #define	__BANDHANDLER__
 #include	<cstdint>
 #include	<QComboBox>
+#include	<QObject>
 #include	<QString>
+#include	<QSettings>
+#include	<QTableWidget>
+#include	<QFile>
+#include	<QtXml>
+#include	<stdio.h>
 //
 //	a simple convenience class
 //
-class bandHandler {
+
+typedef struct {
+	QString key;
+	int	fKHz;
+	bool	skip;
+} dabFrequencies;
+
+class bandHandler: public QObject {
+Q_OBJECT
 public:
-	bandHandler	(const QString &);
-	~bandHandler	();
-void	setupChannels	(QComboBox *s, uint8_t band);
-int32_t Frequency	(QString Channel);
-private:
-void	addItem		(char *name, int freq);
+		bandHandler	(const QString &, QSettings *);
+		~bandHandler	();
+	void    saveSettings	();
+	void	setupChannels	(QComboBox *s, uint8_t band);
+	void	setup_skipList	(const QString &);
+	int32_t Frequency	(QString Channel);
+	int	firstChannel	();
+	int	nextChannel	(int);
+	int	prevChannel	(int);
+	void	show		();
+	void	hide		();
+	bool	isHidden	();
 
-	uint8_t		theBand;
+public slots:
+	void	cellSelected	(int, int);
+private:
+	QSettings		*dabSettings;
+	QString			fileName;
+	int			lastOf			(dabFrequencies *);
+	dabFrequencies		*selectedBand;
+	QTableWidget		theTable;
+	void			default_skipList	();
+	void			file_skipList		(const QString &);
+	void			updateEntry		(const QString &);
 };
 #endif

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

_service:download_url:qt-dab-3.7.tar.gz/includes/support/findfilenames.h Added

@@ -0,0 +1,50 @@
+#
+/*
+ *    Copyright (C)  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
+ */
+//
+//	just a convenience class to pack a number of functions
+//	dealing with getting a filename
+#include	<QSettings>
+#include	<QString>
+#include	<QDateTime>
+#include	<QDir>
+#include	<QFileDialog>
+#include	<QMessageBox>
+#include	<stdio.h>
+#include	<sndfile.h>
+
+class	findfileNames {
+	QSettings	*dabSettings;
+public:
+	findfileNames			(QSettings *);
+	~findfileNames			();
+FILE	*findContentDump_fileName	(const QString &channel);
+FILE	*findFrameDump_fileName		(const QString &service);
+SNDFILE	*findAudioDump_fileName		(const QString &service);
+SNDFILE *findRawDump_fileName		(const QString &deviceName,
+	                                       const QString &channelName);
+FILE	*findScanDump_fileName		();
+FILE	*findSummary_fileName		();
+const 
+QString	findskipFile_fileName		();
+};
+

_service:download_url:qt-dab-3.6.tar.gz/includes/support/scanner-table.h -> _service:download_url:qt-dab-3.7.tar.gz/includes/support/scanner-table.h Changed

_service:download_url:qt-dab-3.7.tar.gz/includes/support/time-table.h Added

@@ -0,0 +1,49 @@
+#
+/*
+ *    Copyright (C) 2019
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Programming
+ *
+ *    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	__TIMETABLE_HANDLER__
+#define	__TIMETABLE_HANDLER__
+
+#include	"radio.h"
+#include	<QListView>
+#include	<QStringList>
+#include	<QStringListModel>
+#include	<QModelIndex>
+
+class	RadioInterface;
+
+class	timeTableHandler:public QListView {
+Q_OBJECT
+public:
+		timeTableHandler	(RadioInterface *radio);
+		~timeTableHandler	();
+	void	addElement		(int, const QString &);
+	void	clear			();
+private:
+	QStringList		timeTableList;
+	QStringListModel	displayList;
+	RadioInterface	*radio;
+};
+
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-config-widget.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-epg-data.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-epg-widget.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-general-information.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-main-controls.png Added

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

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-scan-result.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-screen.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-terminal-dab.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-tii-spectrum-widget.png Added

_service:download_url:qt-dab-3.7.tar.gz/qt-dab-totaal.png Added

_service:download_url:qt-dab-3.6.tar.gz/qt-usersguide.png -> _service:download_url:qt-dab-3.7.tar.gz/qt-usersguide.png Changed

_service:download_url:qt-dab-3.7.tar.gz/qt0dab-snrView-widget.png Added

_service:download_url:qt-dab-3.7.tar.gz/snr-viewer Added

_service:download_url:qt-dab-3.7.tar.gz/snr-viewer/snr-viewer.cpp Added

@@ -0,0 +1,272 @@
+#
+/*
+ *    Copyright (C)  2014 .. 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; 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	<QFileDialog>
+#include	<QMessageBox>
+#include	"snr-viewer.h"
+#include	<QSettings>
+#include	<QColor>
+#include	"color-selector.h"
+
+	snrViewer::snrViewer	(RadioInterface	*mr,
+	                         QSettings	*s):
+	                             myFrame (nullptr),
+	                             spectrumCurve ("") {
+QString	colorString	= "black";
+	this		-> myRadioInterface	= mr;
+	this		-> dabSettings		= s;
+
+	dabSettings	-> beginGroup ("snrViewer");
+	plotLength	= dabSettings -> value ("snrLength", 312). toInt ();
+	plotHeight	= dabSettings -> value ("snrHeight", 15). toInt ();
+	         
+	colorString	= dabSettings -> value ("displayColor",
+	                                              "black"). toString();
+	displayColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("gridColor",
+	                                               "white"). toString();
+	gridColor	= QColor (colorString);
+	colorString	= dabSettings -> value ("curveColor",
+	                                                "white"). toString();
+	curveColor	= QColor (colorString);
+	dabSettings	-> endGroup ();
+	setupUi (&myFrame);
+#ifdef	__DUMP_SNR__
+	snrDumpFile. store (nullptr);
+	connect (snrDumpButton, SIGNAL (clicked ()),
+	         this, SLOT (handle_snrDumpButton ()));
+#else
+	snrDumpButton 	-> hide ();
+#endif
+	plotgrid	= snrPlot;
+	plotgrid	-> setCanvasBackground (displayColor);
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid. setMajPen (QPen(gridColor, 0, Qt::DotLine));
+#else
+	grid. setMajorPen (QPen(gridColor, 0, Qt::DotLine));
+#endif
+	grid. enableXMin (true);
+	grid. enableYMin (true);
+#if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
+	grid. setMinPen (QPen(gridColor, 0, Qt::DotLine));
+#else
+	grid. setMinorPen (QPen(gridColor, 0, Qt::DotLine));
+#endif
+	grid. attach (plotgrid);
+
+	lm_picker	= new QwtPlotPicker (plotgrid -> canvas ());
+	lpickerMachine =
+	                  new QwtPickerClickPointMachine ();
+	lm_picker	-> setStateMachine (lpickerMachine);
+	lm_picker	-> setMousePattern (QwtPlotPicker::MouseSelect1,
+	                                            Qt::RightButton);
+	connect (lm_picker, SIGNAL (selected (const QPointF &)),
+	         this, SLOT (rightMouseClick (const QPointF &)));
+
+   	spectrumCurve. setPen (QPen(curveColor, 2.0));
+	spectrumCurve. setOrientation (Qt::Horizontal);
+	spectrumCurve. setBaseline	(0);
+	spectrumCurve. attach (plotgrid);
+	plotgrid	-> enableAxis (QwtPlot::yLeft);
+	plotgrid	-> setAxisScale (QwtPlot::yLeft,
+				         0, plotHeight);
+	plotgrid	-> setAxisScale (QwtPlot::xBottom,
+	                                 0, plotLength - 1);
+	plotgrid	-> enableAxis (QwtPlot::xBottom);
+	X_axis.   resize (plotLength);
+	Y_Buffer. resize (plotLength);
+	for (int i = 0; i < plotLength; i ++) {
+	   X_axis  [i] = i;
+	   Y_Buffer [i] = 0;
+	}
+}
+
+	snrViewer::~snrViewer () {
+#ifdef	__DUMP_SNR__
+	stopDumping 	();
+#endif
+//	delete lm_picker;
+//	delete lpickerMachine;
+}
+
+void	snrViewer::setHeight	(int n) {
+	plotHeight	= n;
+	dabSettings	-> beginGroup ("snrViewer");
+	dabSettings	-> setValue ("snrHeight", n);
+	dabSettings	-> endGroup ();
+	plotgrid	-> setAxisScale (QwtPlot::yLeft,
+				              0, plotHeight);
+	plotgrid	-> enableAxis (QwtPlot::yLeft);
+	spectrumCurve. setBaseline  (0);
+}
+
+void	snrViewer::setLength	(int n) {
+	if (n < plotLength) {
+	   plotLength = n;
+	   Y_Buffer. resize (n);
+	   X_axis. resize (n);
+	}
+	else
+	if (n > plotLength) {
+	   Y_Buffer. resize (n);
+	   X_axis. resize (n);
+	   for (int i = plotLength; i < n; i ++) {
+	      Y_Buffer [i] = 0;
+	      X_axis [i] = plotLength + i;
+	   }
+	   plotLength = n;
+	}
+	dabSettings	-> beginGroup ("snrViewer");
+	dabSettings	-> setValue ("snrLength", plotLength);
+	dabSettings	-> endGroup ();
+	plotgrid	-> setAxisScale (QwtPlot::xBottom,
+	                                           0, plotLength - 1);
+	plotgrid	-> enableAxis (QwtPlot::xBottom);
+}
+
+void	snrViewer::show () {
+	myFrame. show();
+}
+
+void	snrViewer::hide	() {
+	myFrame. hide();
+#ifdef	__DUMP_SNR__
+	stopDumping ();
+#endif
+}
+
+bool	snrViewer::isHidden () {
+	return myFrame. isHidden();
+}
+
+void	snrViewer::add_snr	(float snr) {
+	for (int i = plotLength - 1; i > 0; i --)
+	   Y_Buffer [i] = Y_Buffer [i - 1];
+	Y_Buffer [0]	= snr;
+#ifdef	__DUMP_SNR__
+	if (snrDumpFile. load () != nullptr)
+	   fwrite (&snr, sizeof (float), 1, snrDumpFile. load ());
+#endif
+}
+
+void	snrViewer::show_snr () {
+	spectrumCurve. setSamples (X_axis. data (),
+	                                Y_Buffer. data (), plotLength);
+	plotgrid	-> replot (); 
+}
+
+float	snrViewer::get_db (float x) {
+	return 20 * log10 ((x + 1) / (float)(4 * 512));
+}
+
+void	snrViewer::rightMouseClick	(const QPointF &point) {
+colorSelector *selector;
+int	index;
+	(void)point;
+	selector		= new colorSelector ("display color");
+	index			= selector -> QDialog::exec ();
+	QString displayColor	= selector -> getColor (index);
+	delete selector;
+	if (index == 0)
+	   return;
+	selector		= new colorSelector ("grid color");
+	index			= selector	-> QDialog::exec ();
+	QString gridColor	= selector	-> getColor (index);
+	delete selector;
+	if (index == 0)
+	   return;
+	selector		= new colorSelector ("curve color");
+	index			= selector	-> QDialog::exec ();

_service:download_url:qt-dab-3.7.tar.gz/snr-viewer/snr-viewer.h Added

@@ -0,0 +1,99 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    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
+ */
+
+//
+//	Simple viewer for correlation
+//
+#ifndef		__SNR_VIEWER__
+#define		__SNR_VIEWER__
+
+#include        "dab-constants.h"
+#include	<QFrame>
+#include	<QSettings>
+#include	<QObject>
+#include	<vector>
+#include	<atomic>
+#include	<stdio.h>
+#include	"ui_snr-widget.h"
+#include	<qwt.h>
+#include	<qwt_plot.h>
+#include	<qwt_plot_marker.h>
+#include	<qwt_plot_grid.h>
+#include	<qwt_plot_curve.h>
+#include        <qwt_color_map.h>
+#include        <qwt_plot_zoomer.h>
+#include        <qwt_plot_textlabel.h>
+#include        <qwt_plot_panner.h>
+#include        <qwt_plot_layout.h>
+#include        <qwt_picker_machine.h>
+#include        <qwt_scale_widget.h>
+#include        <QBrush>
+
+
+class	RadioInterface;
+class	snrViewer: public QObject, Ui_snrWidget {
+Q_OBJECT
+public:
+			snrViewer	(RadioInterface *,
+	                                 QSettings	*);
+			~snrViewer	();
+	void		show_snr	();
+	void		add_snr		(float);
+	void		setLength	(int);
+	void		setHeight	(int);
+	void		show		();
+	void		hide		();
+	bool		isHidden	();
+
+private:
+	RadioInterface	*myRadioInterface;
+	QSettings	*dabSettings;
+	QFrame		myFrame;
+	QwtPlotCurve	spectrumCurve;
+	QwtPlotGrid	grid;
+	QwtPlotPicker	*lm_picker;
+	QwtPickerMachine	*lpickerMachine;
+	std::vector<double>	X_axis;
+	std::vector<double>	Y_Buffer;
+	float		get_db		(float);
+	int16_t		displaySize;
+	QwtPlot		*plotgrid;
+        QColor          displayColor;
+        QColor          gridColor;
+        QColor          curveColor;
+	int		plotLength;
+	int		plotHeight;
+#ifdef	__DUMP_SNR__
+	std::atomic<FILE *>	snrDumpFile;
+	void		startDumping		();
+	void		stopDumping		();
+#endif
+private slots:
+        void            rightMouseClick (const QPointF &);
+#ifdef	__DUMP_SNR__
+	void		handle_snrDumpButton	();
+#endif
+};
+
+#endif
+

_service:download_url:qt-dab-3.7.tar.gz/snr-viewer/snr-widget.ui Added

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>snrWidget</class>
+ <widget class="QWidget" name="snrWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>330</width>
+    <height>188</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>snr widget</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QwtPlot" name="snrPlot">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;snr display. As well known a DAB frame starts with a so-called null period, a period where the amplitude of the transmitted  signal is (should be) zero. So, it is an excellent noise floor, and the SNR shown is computed as 10 * log10 (average amplitude from data blocks / average amplitude null period)&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="snrDumpButton">
+     <property name="text">
+      <string>dump</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="indexDisplay">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter is detected, the relative distance - in msec - is shown between the arrival time of the data of the transmitter that is used, and the arrival time of the data of the other transmitter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QwtPlot</class>
+   <extends>QFrame</extends>
+   <header>qwt_plot.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-3.6.tar.gz/spectrum-viewer/scopewidget.ui -> _service:download_url:qt-dab-3.7.tar.gz/spectrum-viewer/scopewidget.ui Changed

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>620</width>
-    <height>211</height>
+    <height>216</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,7 +35,7 @@
         </sizepolicy>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrum view&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrumview. &lt;/p&gt;&lt;p&gt;The spectrum of the incoming signal is shown here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </string>
        </property>
       </widget>
      </item>
@@ -52,7 +52,7 @@
         </sizepolicy>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram.&lt;/p&gt;&lt;/p&gt;The decoded symbols consist of a complex value, i.e. a value in a two dimensional space. Ideally, the diagram shows 4 dots, one in each quadrant. The number below the diagram (at left) shows - in dB - the deviation of the ideal position.&lt;/p&gt;&lt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>

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

_service:download_url:qt-dab-3.6.tar.gz/src/backend/backend.cpp -> _service:download_url:qt-dab-3.7.tar.gz/src/backend/backend.cpp Changed

_service:download_url:qt-dab-3.7.tar.gz/src/backend/data/epg-2 Added

_service:download_url:qt-dab-3.7.tar.gz/src/backend/data/epg-2/epg-decoder.cpp Added

@@ -0,0 +1,598 @@
+#
+/*
+ *    Copyright (C) 2013 .. 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-TAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	<stdio.h>
+#include	<stdint.h>
+#include	<stdlib.h>
+#include	"epg-decoder.h"
+
+#define	EPG_TAG			0X02
+
+//
+	epgDecoder::epgDecoder	() {
+}
+
+	epgDecoder::~epgDecoder	() {
+}
+	  
+
+static
+uint8_t	bitTable [] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
+
+int	epgDecoder::getBit (uint8_t *v, int bitnr) {
+int bytenr	= bitnr / 8;
+
+	bitnr 	= bitnr % 8;
+	return (v [bytenr] & bitTable [bitnr]) != 0 ? 1 : 0;
+}
+
+uint32_t epgDecoder::getBits (uint8_t *v, int bitnr, int length) {
+uint16_t res	= 0;
+	for (int i = 0; i < length; i ++) {
+	   res <<= 1;
+	   res |= getBit (v, bitnr + i);
+	}
+	return res;
+}
+
+int	epgDecoder::process_epg	(uint8_t *v, int e_length, uint32_t SId) {
+int	ind	= 0;
+uint8_t	tag	= v [0];
+int length	= v [1];
+int	index	= 0;
+
+	this	-> SId	= SId;
+	if (v [0] != EPG_TAG)
+	   return length;
+
+	if (length == 0xFE) {
+	   length = (v [2] << 8) | v [3];
+	   index	= 4;
+	}
+	else
+	if (length == 0xFF) {
+	   length = (v [2] << 16) | (v [3] << 8) | v [4];
+	   index	= 5;
+	}
+	else
+	   index	= 2;
+
+	int endPoint	= index + length;
+
+	while (index < endPoint)
+	   index = process_epgElement (v, index);
+	return endPoint;
+}
+
+int32_t	epgDecoder::process_epgElement	(uint8_t *v, int index) {
+uint8_t	tag	= v [index];
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	   length = (v [index + 2] << 8) | v [index + 3];
+	   index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	   length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	   index += 5;
+	}
+	else
+	   index += 2;
+
+	int endPoint	= index + length;
+
+	switch (tag) {
+	   case 0x04: 		// token table element
+	      while (index < endPoint)
+	         index = process_token (v, index);
+	      return endPoint;
+
+	   case 0x05:		// obsolete
+	      return endPoint;
+
+	   case 0x06:		// default language
+//	      for (int i = 0; i < length; i ++)
+//	         fprintf (stderr, "%c", v [index + i]);
+	      return endPoint;
+
+	   case 0x20:		// programmeGroups
+	      return endPoint;
+
+	   case 0x21:		// schedule
+	      while (index < endPoint) 
+	         index = schedule_element (v, index);
+	      return endPoint;
+
+	   case 0x22:		//alternate source
+	      return endPoint;
+
+	   default:
+//	      fprintf (stderr, "Missed tag %d in epg\n", tag);
+	      return endPoint;
+	}
+}
+
+int	epgDecoder::schedule_element (uint8_t *v, int index) {
+uint8_t	tag	= v [index];
+int length	= v [index + 1];
+progDesc	theElement;
+
+	if (length == 0XFE) {
+	   length = (v [index + 2] << 8) | v [index + 3];
+	   index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	   length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];
+	   index += 5;
+	}
+	else
+	   index += 2;
+
+	int endPoint	= index + length;
+
+//	fprintf (stderr, "schedule element %x (length %d)\n", tag, length);
+	switch (tag) {
+	   case 0x1C:		// programme
+	      theElement. clean ();
+	      while (index < endPoint) {
+	         index = programme_element (v, index, &theElement);
+	      }
+	      record (&theElement);
+	      return endPoint;
+
+	   case 0x24:		// scope
+//	      fprintf (stderr, "we have a service scope\n");
+	      return endPoint;
+
+//	the attributes
+	   case 0x80:		// version
+	      process_483 (v, index, length);
+	      return endPoint;
+
+	   case 0x81: {		// creation time
+//	      int time = process_474 (v, index, length);
+//	      fprintf (stderr, "schedule created  at %.2d:%.2d\n",
+//	                             time / 60, time % 60);
+	      return endPoint;
+	   }
+	
+	   case 0x82:		// originator
+	      return endPoint;
+
+	   default:
+	      fprintf (stderr, "missed tag $d in schedule\n", tag);
+	      return index + length;
+	}
+}
+
+int	epgDecoder::programme_element (uint8_t *v, int index, progDesc *p) {
+uint8_t	tag	= v [index];
+int length	= v [index + 1];
+
+	if (length == 0XFE) {
+	   length = (v [index + 2] << 8) | v [index + 3];
+	   index += 4;
+	}
+	else
+	if (length == 0XFF) {
+	   length = (v [index + 2] << 16) | (v [index + 3] << 8) | v [index + 4];

_service:download_url:qt-dab-3.7.tar.gz/src/backend/data/epg-2/epg-decoder.o Added

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

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

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

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

@@ -42,8 +42,8 @@
 	connect (this, SIGNAL (nameofEnsemble (int, const QString &)),
 	         myRadioInterface,
 	                    SLOT (nameofEnsemble (int, const QString &)));
-	connect (this, SIGNAL (setTime (const QString &)),
-	         myRadioInterface, SLOT (showTime (const QString &)));
+	connect (this, SIGNAL (clockTime (int, int, int, int, int)),
+	         myRadioInterface, SLOT (clockTime (int, int, int, int, int)));
 	connect (this, SIGNAL (changeinConfiguration ()),
 	         myRadioInterface, SLOT (changeinConfiguration ()));
 	connect (this, SIGNAL (startAnnouncement (const QString &, int)),
@@ -555,9 +555,8 @@
 #if 0
         fprintf (stderr, "nrServices %d, count %d\n",
                           nrServices, counter);
-#else
-	(void)nrServices; (void)counter;
 #endif
+	(void)nrServices; (void)counter;
 }
 
 // FIG0/8:  Service Component Global Definition (6.3.5)
@@ -1575,9 +1574,6 @@
 	return 0;
 }
 
-void	fibDecoder::print_Overview () {
-}
-
 /////////////////////////////////////////////////////////////////////////////
 //
 //	Country, LTO & international table 8.1.3.2
@@ -1602,9 +1598,10 @@
 	}
 }
 
-QString monthTable [] = {
-"jan", "feb", "mar", "apr", "may", "jun",
-"jul", "aug", "sep", "oct", "nov", "dec"};
+//static
+//QString monthTable [] = {
+//"jan", "feb", "mar", "apr", "may", "jun",
+//"jul", "aug", "sep", "oct", "nov", "dec"};
 
 int	monthLength [] {
 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
@@ -1654,29 +1651,30 @@
 	}
 }
 
-QString	mapTime (int32_t *dateTime) {
-QString result	= QString::number (dateTime [0]);
-	result. append ("-");
-	result. append (monthTable [dateTime [1] - 1]);
-	result. append ("-");
-
-	QString day	= QString ("%1").
-	                      arg (dateTime [2], 2, 10, QChar ('0'));
-	result. append (day);
-	result. append (" ");
-	int hours	= dateTime [3];
-	if (hours < 0)	hours += 24;
-	if (hours >= 24) hours -= 24;
-
-	QString hoursasString 
-		= QString ("%1"). arg (hours, 2, 10, QChar ('0'));
-	result. append (hoursasString);
-	result. append (":");
-	QString minutesasString =
-	              QString ("%1"). arg (dateTime [4], 2, 10, QChar ('0'));
-	result. append (minutesasString);
-	return result;
-}
+//QString	mapTime (int32_t *dateTime) {
+//QString result	= QString::number (dateTime [0]);
+//	result. append ("-");
+//	result. append (monthTable [dateTime [1] - 1]);
+//	result. append ("-");
+//
+//	QString day	= QString ("%1").
+//	                      arg (dateTime [2], 2, 10, QChar ('0'));
+//	result. append (day);
+//	result. append (" ");
+//	int hours	= dateTime [3];
+//	if (hours < 0)	hours += 24;
+//	if (hours >= 24) hours -= 24;
+//
+//	dateTime [3] = hours;
+//	QString hoursasString 
+//		= QString ("%1"). arg (hours, 2, 10, QChar ('0'));
+//	result. append (hoursasString);
+//	result. append (":");
+//	QString minutesasString =
+//	              QString ("%1"). arg (dateTime [4], 2, 10, QChar ('0'));
+//	result. append (minutesasString);
+//	return result;
+//}
 //
 //	Date and Time
 //	FIG0/10 are copied from the work of
@@ -1725,7 +1723,68 @@
 
 	if (change) {
 	   adjustTime (dateTime);
-	   const QString timeString = mapTime (dateTime);
-	   emit  setTime (timeString);
+//	   const QString timeString = mapTime (dateTime);
+	   emit  clockTime (dateTime [0], dateTime [1],
+	                    dateTime [2], dateTime [3], dateTime [4]);
 	}
 }
+
+void	fibDecoder::set_epgData	(uint32_t SId, int32_t theTime, 
+	                            const QString theText) {
+	for (int i = 0; i < 64; i ++) {
+           if (ensemble -> services [i]. inUse &&
+               ensemble -> services [i]. SId == SId) {
+	      service *S = &(ensemble -> services [i]);
+	      for (uint16_t j = 0; j < S -> epgData. size (); j ++) {
+	         if (S -> epgData. at (j). theTime == theTime)  {
+	            S -> epgData.at (j). theText = theText;
+	            return;	
+	         }
+	      }
+	      epgElement ep;
+	      ep. theTime	= theTime;
+	      ep. theText	= theText;
+	      S -> epgData. push_back (ep);
+	      return;
+	   }
+	}
+}
+
+std::vector<epgElement> fibDecoder::get_timeTable (uint32_t SId) {
+std::vector<epgElement> res;
+int	index	= findService (SId);
+	if (index == -1)
+	   return res;
+	 return ensemble -> services [index]. epgData;
+}
+
+std::vector<epgElement> fibDecoder::get_timeTable (const QString &service) {
+std::vector<epgElement> res;
+int	index	= findService (service);
+	if (index == -1)
+	   return res;
+	 return ensemble -> services [index]. epgData;
+}
+
+bool	fibDecoder::has_timeTable	(uint32_t SId) {
+int index	= findService (SId);
+std::vector<epgElement> t;
+	if (index == -1)
+	   return false;
+	t = ensemble -> services [index]. epgData;
+	return t. size () > 2;
+}
+
+std::vector<epgElement>	fibDecoder::find_epgData	(uint32_t SId) {
+int index	= findService (SId);
+std::vector<epgElement> res;
+
+	if (index == -1)
+	   return res;
+
+	service *s = &(ensemble -> services [index]);
+
+	res = s -> epgData;
+	return res;
+}
+

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

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

@@ -1,10 +1,11 @@
 #
 /*
- *    Copyright (C) 2013, 2014, 2015, 2016, 2017
+ *    Copyright (C) 2020
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    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
@@ -21,194 +22,353 @@
  */
 //
 //
-//	The issue:
-//	suppose that someone wants to add some -non official -
-//	frequencies, e.g. amateur bands.
-//	we therefore use the "frequencies_1" and "frequencies_2"
-//	tables for initializing the "bandIII" and "LBand" tables
-//	and allow the BandIII table to be overwritten by a
-//	supplied table.
+//	The band handler now manages the skipTable
 //
 #include	"band-handler.h"
 #include	"dab-constants.h"
+#include	<QHeaderView>
+#include	<QDomDocument>
 #include	<stdio.h>
 
 static
-struct {
-	const char *key;
-	int	fKHz;
-} frequencies_1 [] = {
-{"5A",	174928},
-{"5B",	176640},
-{"5C",	178352},
-{"5D",	180064},
-{"6A",	181936},
-{"6B",	183648},
-{"6C",	185360},
-{"6D",	187072},
-{"7A",	188928},
-{"7B",	190640},
-{"7C",	192352},
-{"7D",	194064},
-{"8A",	195936},
-{"8B",	197648},
-{"8C",	199360},
-{"8D",	201072},
-{"9A",	202928},
-{"9B",	204640},
-{"9C",	206352},
-{"9D",	208064},
-{"10A",	209936},
-{"10B", 211648},
-{"10C", 213360},
-{"10D", 215072},
-{"11A", 216928},
-{"11B",	218640},
-{"11C",	220352},
-{"11D",	222064},
-{"12A",	223936},
-{"12B",	225648},
-{"12C",	227360},
-{"12D",	229072},
-{"13A",	230784},
-{"13B",	232496},
-{"13C",	234208},
-{"13D",	235776},
-{"13E",	237488},
-{"13F",	239200},
-{nullptr, 0}
+dabFrequencies frequencies_1 [] = {
+{"5A",	174928, false},
+{"5B",	176640, false},
+{"5C",	178352, false},
+{"5D",	180064, false},
+{"6A",	181936, false},
+{"6B",	183648, false},
+{"6C",	185360, false},
+{"6D",	187072, false},
+{"7A",	188928, false},
+{"7B",	190640, false},
+{"7C",	192352, false},
+{"7D",	194064, false},
+{"8A",	195936, false},
+{"8B",	197648, false},
+{"8C",	199360, false},
+{"8D",	201072, false},
+{"9A",	202928, false},
+{"9B",	204640, false},
+{"9C",	206352, false},
+{"9D",	208064, false},
+{"10A",	209936, false},
+{"10B", 211648, false},
+{"10C", 213360, false},
+{"10D", 215072, false},
+{"11A", 216928, false},
+{"11B",	218640, false},
+{"11C",	220352, false},
+{"11D",	222064, false},
+{"12A",	223936, false},
+{"12B",	225648, false},
+{"12C",	227360, false},
+{"12D",	229072, false},
+{"13A",	230784, false},
+{"13B",	232496, false},
+{"13C",	234208, false},
+{"13D",	235776, false},
+{"13E",	237488, false},
+{"13F",	239200, false},
+{nullptr, 0, false}
 };
 
 static
-struct  {
-	const char *key;
-	int	fKHz;
-} frequencies_2 [] = {
-{"LA", 1452960},
-{"LB", 1454672},
-{"LC", 1456384},
-{"LD", 1458096},
-{"LE", 1459808},
-{"LF", 1461520},
-{"LG", 1463232},
-{"LH", 1464944},
-{"LI", 1466656},
-{"LJ", 1468368},
-{"LK", 1470080},
-{"LL", 1471792},
-{"LM", 1473504},
-{"LN", 1475216},
-{"LO", 1476928},
-{"LP", 1478640},
-{nullptr, 0}
+dabFrequencies frequencies_2 [] = {
+{"LA", 1452960, false},
+{"LB", 1454672, false},
+{"LC", 1456384, false},
+{"LD", 1458096, false},
+{"LE", 1459808, false},
+{"LF", 1461520, false},
+{"LG", 1463232, false},
+{"LH", 1464944, false},
+{"LI", 1466656, false},
+{"LJ", 1468368, false},
+{"LK", 1470080, false},
+{"LL", 1471792, false},
+{"LM", 1473504, false},
+{"LN", 1475216, false},
+{"LO", 1476928, false},
+{"LP", 1478640, false},
+{nullptr, 0, false}
 };
 
-typedef struct {
-	QString key;
-	int fKHz;
-}dab_frequencies;
-
-dab_frequencies bandIII_frequencies [100];
-dab_frequencies Lband_frequencies   [100];
-
-	bandHandler::bandHandler (const QString &a_band) {
-int filler;
-	for (filler = 0; frequencies_2 [filler]. fKHz != 0; filler ++) {
-	   Lband_frequencies [filler]. key =
-	                        QString (frequencies_2 [filler]. key);
-	   Lband_frequencies [filler]. fKHz =
-	                        frequencies_2 [filler]. fKHz;
-	}
-	Lband_frequencies [filler]. fKHz = 0;
-//
-	FILE *f	= nullptr;
+
+dabFrequencies alternatives [100];
+
+	bandHandler::bandHandler (const QString &a_band,
+	                           QSettings *s):
+	                                theTable (nullptr) {
+FILE	*f;
+	selectedBand		= nullptr;
+	dabSettings		= s;
+	fileName 		= "";
+
+	theTable. setColumnCount (2);
+	QStringList header;
+	header	<< tr ("channel") << tr ("scan");
+	theTable. setHorizontalHeaderLabels (header);
+	theTable. verticalHeader () -> hide ();
+	theTable. setShowGrid	(true);
 #ifndef	__MINGW32__
-	if (a_band != "")
-	   f = fopen (a_band. toLatin1 (). data (), "r");

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

@@ -58,7 +58,7 @@
 static
 QString textfor (QByteArray transmitters) {
 QString s;
-	fprintf (stderr, "in textfor: transmitters. size = %d\n", transmitters. size ());
+//	fprintf (stderr, "in textfor: transmitters. size = %d\n", transmitters. size ());
 	if (transmitters. size () == 0)
 	   return " ";
 	for (int i = 0; i < transmitters. size (); i += 2)
@@ -67,6 +67,38 @@
 	return s;
 }
 
+void	ensemblePrinter::showSummaryData  (QString	channel,
+	                                   int32_t	freq,
+	                                   QString	SNR,
+	                                   QString	theTime,
+	                                   QByteArray	transmitters,
+	                                   std::vector<serviceId> Services,
+	                                   dabProcessor *my_dabProcessor,
+	                                   FILE		*file_P) {
+uint8_t ecc_byte	= my_dabProcessor -> get_ecc();
+QString	ensembleLabel	= my_dabProcessor -> get_ensembleName();
+int32_t	ensembleId	= my_dabProcessor -> get_ensembleId();
+QString currentChannel	= channel;
+int32_t	frequency	= freq;
+bool	firstData;
+
+	if (ensembleLabel == QString (""))
+	   return;
+
+	fprintf (file_P, "\n\n\n");
+	fprintf (file_P, "%s; %s; %X; frequency %d; transmitterId(s) %s; %s; nr services %d;%s \n\n",
+	                  currentChannel. toUtf8(). data(),
+	                  ensembleLabel. toUtf8(). data(),
+	                  ensembleId,
+	                  frequency / 1000,
+	                  textfor (transmitters). toLatin1 (). data (),
+	                  SNR. toLatin1 (). data (),
+	                  Services. size (),
+	                  theTime. toUtf8(). data ());
+}
+
+
+
 void	ensemblePrinter::showEnsembleData (QString	channel,
 	                                   int32_t	freq,
 	                                   QString	theTime,

_service:download_url:qt-dab-3.7.tar.gz/src/support/findfilenames.cpp Added

@@ -0,0 +1,288 @@
+#
+/*
+ *    Copyright (C)  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	"findfilenames.h"
+#include	"dab-constants.h"
+#include	<QDebug>
+static inline
+bool    isValid (QChar c) {
+	return c. isLetter () || c. isDigit () || (c == '-');
+}
+
+	findfileNames::findfileNames (QSettings *s) {
+	dabSettings	= s;
+}
+
+	findfileNames::~findfileNames	() {}
+
+
+FILE	*findfileNames::findContentDump_fileName (const QString &channel) {
+QString	saveDir		= dabSettings -> value ("contentDir",
+	                                        QDir::homePath ()). toString ();
+QString theTime         = QDateTime::currentDateTime (). toString ();
+QString suggestedFileName;
+
+	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+	   saveDir = saveDir + '/';
+
+	for (int i = 0; i < theTime. length (); i ++)
+	   if (!isValid (theTime. at (i)))
+	      theTime. replace (i, 1, '-');
+	suggestedFileName = saveDir + "Qt-DAB-" + channel +
+	                                          "-" + theTime + ".txt";
+
+	QString fileName = QFileDialog::getSaveFileName (nullptr,
+	                                                 "Save file ...",
+	                                                  suggestedFileName,
+	                                                  "Text (*.txt)");
+	if (fileName == "")
+	   return nullptr;
+
+	fileName	= QDir::toNativeSeparators (fileName);
+	FILE *fileP	= fopen (fileName. toUtf8(). data(), "w");
+
+	if (fileP == nullptr) {
+	   fprintf (stderr, "Could not open file %s\n",
+	                              fileName. toUtf8(). data());
+	   return nullptr;
+	}
+
+	QString	dumper	= QDir::fromNativeSeparators (fileName);
+	int x           = dumper. lastIndexOf ("/");
+	saveDir         = dumper. remove (x, dumper. count () - x);
+	dabSettings     -> setValue ("contentDir", saveDir);
+	return fileP;
+}
+
+//
+FILE	*findfileNames::findFrameDump_fileName (const QString &service) {
+QString	saveDir	= dabSettings -> value ("saveDir_frameDump",
+	                                QDir::homePath ()).  toString ();
+QString theTime         = QDateTime::currentDateTime (). toString ();
+
+	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+	   saveDir = saveDir + '/';
+
+	QString tailS	= service + "-" + theTime + ".aac";
+	for (int i = 0; i < tailS. length (); i ++)
+	   if (!isValid (tailS. at (i)))
+	      tailS. replace (i,1, '-');
+
+	QString suggestedFileName = saveDir + tailS;
+	QString file = QFileDialog::getSaveFileName (nullptr,
+	                                             "Save file ...",
+	                                             suggestedFileName,
+	                                             "aac data (*.aac)");
+	if (file == QString (""))       // apparently cancelled
+	   return nullptr;
+
+	file		= QDir::toNativeSeparators (file);
+	FILE *theFile	= fopen (file. toLatin1 (). data (), "w+b");
+	if (theFile == nullptr) {
+	   QString s = QString ("cannot open ") + file;
+	   QMessageBox::warning (nullptr, "Warning",
+	                               s. toLatin1 (). data ());
+	   return nullptr;
+	}
+
+	QString dumper	= QDir::fromNativeSeparators (file);
+	int x		= dumper. lastIndexOf ("/");
+	saveDir		= dumper. remove (x, dumper. count () - x);
+	dabSettings	-> setValue ("saveDir_frameDump", saveDir);
+	
+	return theFile;
+}
+
+SNDFILE	*findfileNames::findAudioDump_fileName (const QString &service) {
+SF_INFO	*sf_info	= (SF_INFO *)alloca (sizeof (SF_INFO));
+QString theTime		= QDateTime::currentDateTime (). toString ();
+QString	saveDir	 = dabSettings -> value ("saveDir_audioDump",
+	                                 QDir::homePath ()).  toString ();
+
+	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+	   saveDir = saveDir + '/';
+
+	QString tailS = service + "-" + theTime;
+	for (int i = 0; i < tailS. length (); i ++)
+	   if (!isValid (tailS. at (i))) 
+	      tailS. replace (i, 1, '-');
+
+	QString suggestedFileName = saveDir + tailS + ".wav";
+	QString file = QFileDialog::getSaveFileName (nullptr,
+	                                             "Save file ...",
+	                                             suggestedFileName,
+	                                             "PCM wave file (*.wav)");
+	if (file == QString (""))
+	   return nullptr;
+	if (!file.endsWith (".wav", Qt::CaseInsensitive))
+	   file.append (".wav");
+	file		= QDir::toNativeSeparators (file);
+	sf_info		-> samplerate	= 48000;
+	sf_info		-> channels	= 2;
+	sf_info		-> format	= SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+
+	SNDFILE *theFile	= sf_open (file. toUtf8(). data(),
+	                                   SFM_WRITE, sf_info);
+	if (theFile == nullptr) {
+	   qDebug() << "Cannot open " << file. toUtf8(). data();
+	   return nullptr;
+	}
+
+	QString	dumper	= QDir::fromNativeSeparators (file);
+	int x		= dumper. lastIndexOf ("/");
+	saveDir		= dumper. remove (x, dumper. count () - x);
+	dabSettings	-> setValue ("saveDir_audioDump", saveDir);
+
+	return theFile;
+}
+
+SNDFILE *findfileNames::findRawDump_fileName (const QString &deviceName,
+	                                       const QString &channelName) {
+SF_INFO *sf_info        = (SF_INFO *)alloca (sizeof (SF_INFO));
+QString theTime		= QDateTime::currentDateTime (). toString ();
+QString	saveDir		= dabSettings -> value ("saveDir_rawDump",
+	                                        QDir::homePath ()). toString ();
+SNDFILE	*theFile;
+	for (int i = 0; i < theTime. length (); i ++)
+	   if (!isValid (theTime. at (i)))
+	      theTime. replace (i, 1, '-');
+
+
+	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+	   saveDir = saveDir + '/';
+	QString suggestedFileName = saveDir +
+		                    deviceName + "-" +
+	                            channelName + "-" + theTime + ".sdr";
+	QString file = QFileDialog::getSaveFileName (nullptr,
+	                                             "Save file ...",
+	                                             suggestedFileName,
+	                                             "raw data (*.sdr)");
+
+	if (file == QString (""))       // apparently cancelled
+	   return nullptr;
+	if (!file.endsWith (".sdr", Qt::CaseInsensitive))
+	   file.append (".sdr");
+
+	file	= QDir::toNativeSeparators (file);
+	sf_info -> samplerate   = INPUT_RATE;
+	sf_info -> channels     = 2;
+	sf_info -> format       = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+	theFile = sf_open (file. toUtf8 (). data(),
+	                                   SFM_WRITE, sf_info);
+	fprintf (stderr, "the file %s is open?\n", 
+	                              file. toUtf8 (). data ());
+	if (theFile == nullptr) {
+	   fprintf (stderr, "foute boel\n");
+	   qDebug() << "cannot open " << file. toUtf8(). data();
+	   return nullptr;
+	}
+

_service:download_url:qt-dab-3.6.tar.gz/src/support/scanner-table.cpp -> _service:download_url:qt-dab-3.7.tar.gz/src/support/scanner-table.cpp Changed

_service:download_url:qt-dab-3.7.tar.gz/src/support/time-table.cpp Added

@@ -0,0 +1,58 @@
+#
+/*
+ *    Copyright (C) 2020
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Programming
+ *
+ *    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
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+//
+//
+#include	"time-table.h"
+#include	"radio.h"
+
+	timeTableHandler::timeTableHandler (RadioInterface *radio):
+	                                             QListView (nullptr) {
+	this	-> radio	= radio;
+//
+//	start with an empty list, waiting ...
+	timeTableList. clear ();
+	displayList. setStringList (timeTableList);
+	this	-> setModel (&displayList);
+}
+
+	timeTableHandler::~timeTableHandler   () {
+}
+
+void	timeTableHandler::addElement (int theTime,
+	                              const QString &theText) {
+int	hours	= theTime / 60;
+int	minutes	= theTime % 60;
+char t [6];
+	sprintf (t, "%.2d:%.2d", theTime / 60, theTime % 60);
+	
+	const QString listElement = QString (t)+ " -- " + theText;
+	timeTableList. append (listElement);
+	displayList. setStringList (timeTableList);
+	this	-> setModel (&displayList);
+}
+
+void	timeTableHandler::clear () {
+        timeTableList. clear ();
+        displayList. setStringList (timeTableList);
+        this    -> setModel (&displayList);
+}
+

_service:download_url:qt-dab-3.7.tar.gz/startup.png Added

_service:download_url:qt-dab-3.6.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-3.7.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -28,7 +28,9 @@
 
 	tiiViewer::tiiViewer	(RadioInterface	*mr,
 	                         QSettings	*dabSettings,
-	                         RingBuffer<std::complex<float>> *sbuffer) {
+	                         RingBuffer<std::complex<float>> *sbuffer):
+	                              myFrame (nullptr),
+	                              spectrumCurve ("") {
 int16_t	i;
 QString	colorString	= "black";
 bool	brush;
@@ -55,13 +57,12 @@
 	if ((displaySize & (displaySize - 1)) != 0)
 	   displaySize = 1024;
 
-	this	-> myFrame		= new QFrame (nullptr);
-	setupUi (this -> myFrame);
+	setupUi (&myFrame);
 
-	this	-> myFrame	-> hide();
+	myFrame. hide();
 	displayBuffer. resize (displaySize);
-	memset (displayBuffer. data(), 0, displaySize * sizeof (double));
-	this	-> spectrumSize	= 4 * displaySize;
+	memset (displayBuffer. data (), 0, displaySize * sizeof (double));
+	this	-> spectrumSize	= 2 * displaySize;
 	spectrum		= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
         plan    = fftwf_plan_dft_1d (spectrumSize,
                                     reinterpret_cast <fftwf_complex *>(spectrum),
@@ -70,20 +71,20 @@
 	
 	plotgrid	= tiiGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
-	grid		= new QwtPlotGrid;
+//	grid		= new QwtPlotGrid;
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMajPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMajPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMajorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMajorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid		-> enableXMin (true);
-	grid		-> enableYMin (true);
+	grid. enableXMin (true);
+	grid. enableYMin (true);
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMinPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMinPen (QPen(gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMinorPen (QPen(gridColor, 0, Qt::DotLine));
+	grid. setMinorPen (QPen(gridColor, 0, Qt::DotLine));
 #endif
-	grid		-> attach (plotgrid);
+	grid. attach (plotgrid);
 
 	lm_picker       = new QwtPlotPicker (plotgrid -> canvas ());
         QwtPickerMachine *lpickerMachine =
@@ -95,15 +96,18 @@
         connect (lm_picker, SIGNAL (selected (const QPointF&)),
                  this, SLOT (rightMouseClick (const QPointF &)));
 
-	spectrumCurve	= new QwtPlotCurve ("");
-   	spectrumCurve	-> setPen (QPen(curveColor, 2.0));
-	spectrumCurve	-> setOrientation (Qt::Horizontal);
-	spectrumCurve	-> setBaseline	(get_db (0));
-	ourBrush	= new QBrush (curveColor);
-	ourBrush	-> setStyle (Qt::Dense3Pattern);
-	if (brush)
-	   spectrumCurve	-> setBrush (*ourBrush);
-	spectrumCurve	-> attach (plotgrid);
+//	spectrumCurve	= new QwtPlotCurve ("");
+   	spectrumCurve. setPen (QPen(curveColor, 2.0));
+	spectrumCurve. setOrientation (Qt::Horizontal);
+	spectrumCurve.  setBaseline	(get_db (0));
+//	ourBrush	= new QBrush (curveColor);
+//	ourBrush	-> setStyle (Qt::Dense3Pattern);
+	if (brush) {
+	   QBrush ourBrush (curveColor);
+	   ourBrush. setStyle (Qt::Dense3Pattern);
+	   spectrumCurve. setBrush (ourBrush);
+	}
+	spectrumCurve. attach (plotgrid);
 	
 	Marker		= new QwtPlotMarker();
 	Marker		-> setLineStyle (QwtPlotMarker::VLine);
@@ -122,20 +126,24 @@
     tiiViewer::~tiiViewer() {
 	fftwf_destroy_plan (plan);
 	fftwf_free	(spectrum);
-	myFrame		-> hide();
+	myFrame. hide();
 	delete		Marker;
-	delete		ourBrush;
-	delete		spectrumCurve;
-	delete		grid;
-	delete		myFrame;
+//	delete		ourBrush;
 }
 
 void	tiiViewer::clear() {
 	transmitterDisplay	-> setText (" ");
 }
 
+static
+QString tiiNumber (int n) {
+	if (n >= 10)
+	   return QString::number (n);
+	return QString ("0") + QString::number (n);
+}
+
 void	tiiViewer::showTransmitters	(QByteArray transmitters) {
-	if (myFrame	-> isHidden())
+	if (myFrame. isHidden())
 	   return;
 
 	if (transmitters. size () == 0) {
@@ -147,8 +155,8 @@
 	for (int i = 0; i < transmitters. size (); i += 2) {
 	   uint8_t mainId	= transmitters. at (i);
 	   uint8_t subId	= transmitters. at (i + 1);
-	   t = t + " (" + QString::number (mainId) +
-                    "+" + QString::number (subId) + ")";
+	   t = t + " (" + tiiNumber (mainId) +
+                    "+" + tiiNumber (subId) + ")";
         }
 	transmitterDisplay	-> setText (t);
 }
@@ -162,12 +170,12 @@
 
 	   
 	(void)amount;
-	if (tiiBuffer -> GetRingBufferReadAvailable() < spectrumSize)
+	if (tiiBuffer -> GetRingBufferReadAvailable() < spectrumSize) {
 	   return;
-
+	}
 	tiiBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
 	tiiBuffer	-> FlushRingBuffer ();
-	if (myFrame	-> isHidden ())
+	if (myFrame. isHidden ())
 	   return;
 //	and window it
 //	first X axis labels
@@ -232,11 +240,11 @@
 	for (i = 0; i < displaySize; i ++) 
 	   Y1_value [i] = get_db (amp1 * Y1_value [i]); 
 
-	spectrumCurve	-> setBaseline (get_db (0));
+	spectrumCurve. setBaseline (get_db (0));
 	Y1_value [0]		= get_db (0);
 	Y1_value [displaySize - 1] = get_db (0);
 
-	spectrumCurve	-> setSamples (X_axis, Y1_value, displaySize);
+	spectrumCurve. setSamples (X_axis, Y1_value, displaySize);
 	Marker		-> setXValue (marker);
 	plotgrid	-> replot(); 
 }
@@ -255,16 +263,16 @@
 	   normalizer <<= 1;
 }
 
-void	tiiViewer::show() {
-	myFrame	-> show();
+void	tiiViewer::show () {
+	myFrame. show ();
 }
 
-void	tiiViewer::hide() {
-	myFrame	-> hide();
+void	tiiViewer::hide () {
+	myFrame. hide ();
 }
 
-bool	tiiViewer::isHidden() {
-	return myFrame -> isHidden();
+bool	tiiViewer::isHidden () {
+	return myFrame. isHidden ();
 }
 
 void	tiiViewer::rightMouseClick	(const QPointF &point) {
@@ -298,22 +306,18 @@
 	this		-> displayColor	= QColor (displayColor);
 	this		-> gridColor	= QColor (gridColor);
 	this		-> curveColor	= QColor (curveColor);
-	spectrumCurve	-> setPen (QPen (this -> curveColor, 2.0));
+	spectrumCurve. setPen (QPen (this -> curveColor, 2.0));
 #if defined QWT_VERSION && ((QWT_VERSION >> 8) < 0x0601)
-	grid		-> setMajPen (QPen(this -> gridColor, 0,
-	                                                    Qt::DotLine));
+	grid. setMajPen (QPen(this -> gridColor, 0, Qt::DotLine));
 #else
-	grid		-> setMajorPen (QPen(this -> gridColor, 0,
-	                                                    Qt::DotLine));
+	grid. setMajorPen (QPen(this -> gridColor, 0, Qt::DotLine));
 #endif
-	grid		-> enableXMin (true);
-	grid		-> enableYMin (true);
+	grid. enableXMin (true);
+	grid. enableYMin (true);

_service:download_url:qt-dab-3.6.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-3.7.tar.gz/tii-viewer/tii-viewer.h Changed

_service:download_url:qt-dab-3.6.tar.gz/tii-viewer/tii-widget.ui -> _service:download_url:qt-dab-3.7.tar.gz/tii-viewer/tii-widget.ui Changed

_service:download_url:qt-dab-3.7.tar.gz/travis.yml Added

@@ -0,0 +1,62 @@
+language: c++
+compiler: gcc
+sudo: require
+dist: xenial
+
+before_install:
+    - sudo add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -y
+    - sudo apt-get update -qq
+    
+install: 
+    - sudo apt-get -y install qt5-qmake qt5-default libqt5opengl5-dev qtbase5-dev libqwt-qt5-dev libsndfile1-dev librtlsdr-dev librtlsdr0 libfftw3-dev portaudio19-dev libfaad-dev zlib1g-dev rtl-sdr libusb-1.0-0-dev mesa-common-dev libgl1-mesa-dev libsamplerate-dev 
+    - sudo apt-get -y install libiio-dev
+    - # source /opt/qt5/bin/qt5-env.sh
+    - # QWT for Qt 5, see https://github.com/arkottke/strata/blob/master/.travis.yml
+    - # svn checkout svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.1 qwt
+    - # cd qwt
+    - # qmake
+    - # make -j4
+    - # sudo make install
+    - # find /usr/local/qwt-6.1.4-svn/
+    - # cd ..
+    
+script:
+  - # sed -i -e 's|CONFIG.*sdrplay||g' qt-dab.pro
+  - # sed -i -e 's|CONFIG.*airspy||g' qt-dab.pro
+  - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
+
+  - cd dab-maxi
+  - cmake . -DTRY_EPG=ON -DRTLSDR=ON -DRTL_TCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSDRPLAY_V3=ON -DLIMESDR=ON -DHACKRF=ON -DPLUTO=ON -DCMAKE_INSTALL_PREFIX=/usr
+  - make -j4
+  - # sudo make DESTIDR=appdir install ; sudo chown -R $USER appdir ; find appdir/
+  - ls -lh .
+  - rm -rf *_autogen
+  - mkdir -p appdir/usr/bin
+  - cp qt-dab-3.7  appdir/usr/bin/qt-dab
+ 
+  - mkdir -p appdir/usr/share/applications ; cp qt-dab.desktop appdir/usr/share/applications
+  - cp qt-dab.png appdir/qt-dab.png
+  - touch appdir/qt-dab.png # Dear upstream developers, please provide an application icon
+  - mkdir -p ./appdir/usr/share/icons/hicolor/256x256/apps/
+  - cp qt-dab.png appdir/usr/share/icons/hicolor/256x256/apps/
+  
+after_success:
+  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+  - chmod a+x linuxdeployqt*.AppImage
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - # Workaround for https://github.com/probonopd/linuxdeployqt/issues/31#issuecomment-289267637
+  - ./linuxdeployqt*.AppImage --appimage-extract
+  - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - # Workaround for https://github.com/JvanKatwijk/qt-dab/issues/34
+  - # find /usr/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
+  - find /usr/lib/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
+  - chmod a+x appimage/* ; rm appdir/AppRun ; cp appimage/* appdir/
+  - export PATH=squashfs-root/usr/bin/:$PATH # Make it pick up our private patched mksquashfs; https://github.com/plougher/squashfs-tools/pull/13/files
+  - squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)
+  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+  - curl --upload-file ./Qt_DAB*.AppImage https://transfer.sh/Qt_DAB-git.$(git rev-parse --short HEAD)-x86_64.AppImage
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash ./upload.sh ./Qt_DAB*.AppImage
+

_service:download_url:qt-dab-3.6.tar.gz/travis.yml-copy -> _service:download_url:qt-dab-3.7.tar.gz/travis.yml-copy Changed

@@ -24,9 +24,9 @@
   - # sed -i -e 's|CONFIG.*sdrplay||g' qt-dab.pro
   - # sed -i -e 's|CONFIG.*airspy||g' qt-dab.pro
   - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
-  -
+
   - cd dab-maxi
-  - cmake . -DRTLSDR=ON -DRTLTCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSDRPLAY_V3=ON -DLIMESDR=ON -DHACKRF=ON -DPLUTO=ON -DCMAKE_INSTALL_PREFIX=/usr
+  - cmake . -DRTLSDR=ON -DRTL_TCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DSDRPLAY_V3=ON -DLIMESDR=ON -DHACKRF=ON -DPLUTO=ON -DCMAKE_INSTALL_PREFIX=/usr
   - make -j4
   - # sudo make DESTIDR=appdir install ; sudo chown -R $USER appdir ; find appdir/
   - ls -lh .
@@ -45,8 +45,13 @@
   - chmod a+x linuxdeployqt*.AppImage
   - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
   - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - # Workaround for https://github.com/probonopd/linuxdeployqt/issues/31#issuecomment-289267637
   - ./linuxdeployqt*.AppImage --appimage-extract
   - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - # Workaround for https://github.com/JvanKatwijk/qt-dab/issues/34
+  - # find /usr/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
+  - find /usr/lib/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
   - chmod a+x appimage/* ; rm appdir/AppRun ; cp appimage/* appdir/
   - export PATH=squashfs-root/usr/bin/:$PATH # Make it pick up our private patched mksquashfs; https://github.com/plougher/squashfs-tools/pull/13/files
   - squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)

Changes of Revision 34