Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 9

qt-dab.changes Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-2.0.tar.gz/.qmake.stash Deleted

_service:download_url:qt-dab-2.0.tar.gz/.script-ubuntu.swp Deleted

_service:download_url:qt-dab-2.0.tar.gz/Makefile Deleted

@@ -1,11392 +0,0 @@
-#############################################################################
-# Makefile for building: linux-bin/qt-dab-2.0
-# Generated by qmake (3.1) (Qt 5.9.6)
-# Project:  qt-dab.pro
-# Template: app
-# Command: /usr/bin/qmake-qt5 -o Makefile qt-dab.pro
-#############################################################################
-
-MAKEFILE      = Makefile
-
-####### Compiler, tools and options
-
-CC            = gcc
-CXX           = g++
-DEFINES       = -DGITHASH=\"6008446\" -DMSC_DATA__ -DPRESET_NAME -DHAVE_RTLSDR -DHAVE_SDRPLAY -DHAVE_HACKRF -DHAVE_AIRSPY -DHAVE_RTL_TCP -DTRY_EPG -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_XML_LIB -DQT_CORE_LIB
-CFLAGS        = -pipe -flto -ffast-math -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-CXXFLAGS      = -pipe -std=c++11 -flto -ffast-math -isystem /usr/include/qt5 -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-INCPATH       = -I. -I. -I. -Isrc -Iincludes -Iincludes/ofdm -Iincludes/backend -Iincludes/backend/audio -Iincludes/backend/data -Iincludes/backend/data/mot -Iincludes/backend/data/journaline -Iincludes/output -Iincludes/support -Iincludes/support/viterbi_768 -Idevices -Idevices/rawfiles -Idevices/wavfiles -Iincludes/scopes-qwt6 -Ispectrum-viewer -Iimpulse-viewer -Itii-viewer -I../../../../local/include -I../../../../local/include -isystem /usr/include/qt4/qwt -I../../../../include/qt5/qwt -isystem /usr/include/qt4/qwt -isystem /usr/include/qwt -I/usr/local/qwt-6.1.4-svn/ -Idevices/rtlsdr-handler -Idevices/sdrplay-handler -Idevices/hackrf-handler -Idevices/airspy-handler -Idevices/airspy-handler/libairspy -Idevices/rtl_tcp -Iincludes/backend/data/epg -I../../../../include/qt5 -I../../../../include/qt5/QtWidgets -I../../../../include/qt5/QtGui -I../../../../include/qt5/QtNetwork -I../../../../include/qt5/QtXml -I../../../../include/qt5/QtCore -I. -I../../../../include/libdrm -I. -I../../../../lib64/qt5/mkspecs/linux-g++
-QMAKE         = /usr/bin/qmake-qt5
-DEL_FILE      = rm -f
-CHK_DIR_EXISTS= test -d
-MKDIR         = mkdir -p
-COPY          = cp -f
-COPY_FILE     = cp -f
-COPY_DIR      = cp -f -R
-INSTALL_FILE  = install -m 644 -p
-INSTALL_PROGRAM = install -m 755 -p
-INSTALL_DIR   = cp -f -R
-QINSTALL      = /usr/bin/qmake-qt5 -install qinstall
-QINSTALL_PROGRAM = /usr/bin/qmake-qt5 -install qinstall -exe
-DEL_FILE      = rm -f
-SYMLINK       = ln -f -s
-DEL_DIR       = rmdir
-MOVE          = mv -f
-TAR           = tar -cf
-COMPRESS      = gzip -9f
-DISTNAME      = qt-dab-2.01.0.0
-DISTDIR = /usr/shared/sdr-j-development/systems/project-x/.tmp/qt-dab-2.01.0.0
-LINK          = g++
-LFLAGS        = -flto -Wl,-O1
-LIBS          = $(SUBLIBS) -lfftw3f -lusb-1.0 -ldl -lportaudio -lz -lsndfile -lsamplerate -lfaad -lqwt-qt5 -lQt5Widgets -lQt5Gui -lQt5Network -lQt5Xml -lQt5Core -lGL -lpthread 
-AR            = ar cqs
-RANLIB        = 
-SED           = sed
-STRIP         = strip
-
-####### Output directory
-
-OBJECTS_DIR   = ./
-
-####### Files
-
-SOURCES       = main.cpp \
-		radio.cpp \
-		dab-processor.cpp \
-		src/ofdm/timesyncer.cpp \
-		src/ofdm/sample-reader.cpp \
-		src/ofdm/ofdm-decoder.cpp \
-		src/ofdm/phasereference.cpp \
-		src/ofdm/phasetable.cpp \
-		src/ofdm/freq-interleaver.cpp \
-		src/ofdm/tii_table.cpp \
-		src/ofdm/tii_detector.cpp \
-		src/ofdm/fic-handler.cpp \
-		src/ofdm/fib-processor.cpp \
-		src/backend/msc-handler.cpp \
-		src/backend/protection.cpp \
-		src/backend/eep-protection.cpp \
-		src/backend/uep-protection.cpp \
-		src/backend/galois.cpp \
-		src/backend/reed-solomon.cpp \
-		src/backend/rscodec.cpp \
-		src/backend/charsets.cpp \
-		src/backend/firecode-checker.cpp \
-		src/backend/frame-processor.cpp \
-		src/backend/protTables.cpp \
-		src/backend/virtual-backend.cpp \
-		src/backend/audio-backend.cpp \
-		src/backend/data-backend.cpp \
-		src/backend/audio/mp2processor.cpp \
-		src/backend/audio/mp4processor.cpp \
-		src/backend/audio/faad-decoder.cpp \
-		src/backend/data/pad-handler.cpp \
-		src/backend/data/data-processor.cpp \
-		src/backend/data/virtual-datahandler.cpp \
-		src/backend/data/tdc-datahandler.cpp \
-		src/backend/data/ip-datahandler.cpp \
-		src/backend/data/mot/mot-handler.cpp \
-		src/backend/data/mot/mot-object.cpp \
-		src/backend/data/mot/mot-dir.cpp \
-		src/backend/data/journaline-datahandler.cpp \
-		src/backend/data/journaline/crc_8_16.c \
-		src/backend/data/journaline/log.c \
-		src/backend/data/journaline/newssvcdec_impl.cpp \
-		src/backend/data/journaline/Splitter.cpp \
-		src/backend/data/journaline/dabdgdec_impl.c \
-		src/backend/data/journaline/newsobject.cpp \
-		src/backend/data/journaline/NML.cpp \
-		src/output/audio-base.cpp \
-		src/output/newconverter.cpp \
-		src/output/audiosink.cpp \
-		src/support/viterbi_768/viterbi-768.cpp \
-		src/support/fft-handler.cpp \
-		src/support/Xtan2.cpp \
-		src/support/dab-params.cpp \
-		src/support/band-handler.cpp \
-		src/support/text-mapper.cpp \
-		src/support/ensemble-printer.cpp \
-		src/scopes-qwt6/iqdisplay.cpp \
-		devices/virtual-input.cpp \
-		devices/rawfiles/rawfiles.cpp \
-		devices/wavfiles/wavfiles.cpp \
-		spectrum-viewer/spectrum-viewer.cpp \
-		impulse-viewer/impulse-viewer.cpp \
-		tii-viewer/tii-viewer.cpp \
-		devices/rtlsdr-handler/rtlsdr-handler.cpp \
-		devices/rtlsdr-handler/rtl-dongleselect.cpp \
-		devices/sdrplay-handler/sdrplay-handler.cpp \
-		devices/sdrplay-handler/sdrplayselect.cpp \
-		devices/hackrf-handler/hackrf-handler.cpp \
-		devices/airspy-handler/airspy-handler.cpp \
-		devices/airspy-handler/airspyfilter.cpp \
-		devices/rtl_tcp/rtl_tcp_client.cpp \
-		src/backend/data/epg/epgdec.cpp \
-		src/support/viterbi_768/spiral-no-sse.c qrc_resources.cpp \
-		moc_radio.cpp \
-		moc_dab-processor.cpp \
-		moc_sample-reader.cpp \
-		moc_ofdm-decoder.cpp \
-		moc_phasereference.cpp \
-		moc_tii_table.cpp \
-		moc_fic-handler.cpp \
-		moc_fib-processor.cpp \
-		moc_data-backend.cpp \
-		moc_mp2processor.cpp \
-		moc_mp4processor.cpp \
-		moc_faad-decoder.cpp \
-		moc_data-processor.cpp \
-		moc_pad-handler.cpp \
-		moc_virtual-datahandler.cpp \
-		moc_tdc-datahandler.cpp \
-		moc_ip-datahandler.cpp \
-		moc_mot-object.cpp \
-		moc_audio-base.cpp \
-		moc_iqdisplay.cpp \
-		moc_spectrum-viewer.cpp \
-		moc_impulse-viewer.cpp \
-		moc_tii-viewer.cpp \
-		moc_rtlsdr-handler.cpp \
-		moc_rtl-dongleselect.cpp \
-		moc_sdrplay-handler.cpp \
-		moc_sdrplayselect.cpp \
-		moc_hackrf-handler.cpp \
-		moc_airspy-handler.cpp \
-		moc_rtl_tcp_client.cpp
-OBJECTS       = main.o \
-		radio.o \
-		dab-processor.o \
-		timesyncer.o \
-		sample-reader.o \
-		ofdm-decoder.o \
-		phasereference.o \
-		phasetable.o \
-		freq-interleaver.o \
-		tii_table.o \
-		tii_detector.o \
-		fic-handler.o \
-		fib-processor.o \
-		msc-handler.o \
-		protection.o \
-		eep-protection.o \
-		uep-protection.o \
-		galois.o \
-		reed-solomon.o \
-		rscodec.o \
-		charsets.o \
-		firecode-checker.o \
-		frame-processor.o \
-		protTables.o \
-		virtual-backend.o \
-		audio-backend.o \
-		data-backend.o \
-		mp2processor.o \
-		mp4processor.o \
-		faad-decoder.o \
-		pad-handler.o \
-		data-processor.o \
-		virtual-datahandler.o \
-		tdc-datahandler.o \
-		ip-datahandler.o \
-		mot-handler.o \
-		mot-object.o \
-		mot-dir.o \
-		journaline-datahandler.o \
-		crc_8_16.o \
-		log.o \
-		newssvcdec_impl.o \
-		Splitter.o \
-		dabdgdec_impl.o \

_service:download_url:qt-dab-2.0.tar.gz/includes/backend/audio-backend.h Deleted

@@ -1,85 +0,0 @@
-#
-/*
- * 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
- */
-#
-#ifndef	__AUDIO_BACKEND__
-#define	__AUDIO_BACKEND__
-
-#include	<QSemaphore>
-#include	"virtual-backend.h"
-#include	<vector>
-#ifdef	__THREADED_BACKEND
-#include	<QThread>
-#include	<atomic>
-#endif
-#include	"ringbuffer.h"
-#include	<stdio.h>
-
-class	frameProcessor;
-class	protection;
-class	RadioInterface;
-
-#ifdef	__THREADED_BACKEND
-class	audioBackend:public QThread, public virtualBackend {
-#else
-class	audioBackend:public virtualBackend {
-#endif
-public:
-	audioBackend	(RadioInterface	*mr,
-	 audiodata	*d,
-	 RingBuffer<int16_t> *,
-	 QString	picturesPath);
-	~audioBackend	(void);
-int32_t	process		(int16_t *, int16_t);
-void	stopRunning	(void);
-protected:
-	RadioInterface	*myRadioInterface;
-	RingBuffer<int16_t>	*audioBuffer;
-private:
-#ifdef	__THREADED_BACKEND
-void	run		(void);
-	atomic<bool>	running;
-	QSemaphore	freeSlots;
-	QSemaphore	usedSlots;
-	int16_t		*theData [20];
-	int16_t		nextIn;
-	int16_t		nextOut;
-#endif
-void	processSegment	(int16_t *Data);
-
-	uint8_t		dabModus;
-	int16_t		fragmentSize;
-	int16_t		bitRate;
-	bool		shortForm;
-	int16_t		protLevel;
-	std::vector<uint8_t> outV;
-	int16_t		**interleaveData;
-	std::vector<int16_t> tempX;
-	int16_t		countforInterleaver;
-	int16_t		interleaverIndex;
-	std::vector<uint8_t> disperseVector;
-
-	protection	*protectionHandler;
-	frameProcessor	*our_dabProcessor;
-};
-
-#endif
-

_service:download_url:qt-dab-2.0.tar.gz/includes/backend/data-backend.h Deleted

@@ -1,75 +0,0 @@
-#
-/*
- * Copyright (C) 2015
- * 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	__DATA_BACKEND__
-#define	__DATA_BACKEND__
-
-#include	<QSemaphore>
-#include	<vector>
-#include	<QThread>
-#include	"ringbuffer.h"
-#include	<stdio.h>
-#include	<string.h>
-#include	"dab-constants.h"
-#include	"virtual-backend.h"
-
-class	dataProcessor;
-class	RadioInterface;
-class	protection;
-
-class	dataBackend:public QThread, public virtualBackend {
-Q_OBJECT
-public:
-	dataBackend	(RadioInterface *mr,
-	 packetdata	*d,
-	 RingBuffer<uint8_t> *dataBuffer,
-	 QString	picturesPath);
-	~dataBackend	(void);
-int32_t	process		(int16_t *, int16_t);
-void	stopRunning	(void);
-private:
-	RadioInterface	*myRadioInterface;
-	bool		shortForm;
-	int16_t		protLevel;
-	uint8_t		DGflag;
-	int16_t		FEC_scheme;
-	std::vector<uint8_t> disperseVector;
-void	run		(void);
-	volatile bool	running;
-	int32_t		countforInterleaver;
-	uint8_t		* outV;
-	int16_t		**interleaveData;
-	int16_t		*Data;
-	protection	*protectionHandler;
-	RingBuffer<int16_t>	*Buffer;
-	dataProcessor	*our_frameProcessor;
-	QSemaphore freeSlots;
-	QSemaphore usedSlots;
-	int16_t *theData [20];
-	int16_t nextIn;
-	int16_t nextOut;
- int		fragmentSize;
- int16_t		bitRate;
-};
-
-#endif
-

_service:download_url:qt-dab-2.0.tar.gz/includes/backend/protection.h Deleted

@@ -1,47 +0,0 @@
-#
-/*
- * 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 base class for combining uep and eep deconvolvers
- */
-#ifndef	__PROTECTION__
-#define	__PROTECTION__
-
-#include	<stdint.h>
-#include <vector>
-#include "viterbi-768.h"
-
-extern uint8_t	PI_X [];
-
-class protection: public viterbi_768 {
-public:
- protection (int16_t, int16_t);
-virtual ~protection (void);
-virtual bool deconvolve (int16_t *, int32_t, uint8_t *);
-protected:
- int16_t bitRate;
- int32_t outSize;
- std::vector<int16_t> viterbiBlock;
-	std::vector<uint8_t> indexTable;
-};
-
-#endif
-

_service:download_url:qt-dab-2.0.tar.gz/includes/backend/virtual-backend.h Deleted

@@ -1,49 +0,0 @@
-#
-/*
- * 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
- */
-#
-#ifndef __VIRTUAL_BACKEND__
-#define	__VIRTUAL_BACKEND__
-
-#include	<stdint.h>
-#include	<stdio.h>
-
-class	RadioInterface;
-class	audioSink;
-
-#define	CUSize	(4 * 16)
-
-class	virtualBackend {
-public:
-		virtualBackend	(int32_t, int16_t);
-virtual		~virtualBackend	(void);
-virtual int32_t	process		(int16_t *, int16_t);
-virtual void	stopRunning	(void);
-virtual	void	stop		(void);
-	int32_t	startAddr	(void);
-	int16_t	Length		(void);
-protected:
-	int32_t	startAddress;
-	int16_t	segmentLength;
-};
-#endif
-
-

_service:download_url:qt-dab-2.0.tar.gz/program-structure Deleted

@@ -1,155 +0,0 @@
-
-	Qt-DAB: structure of the program
-
-1. Introduction
-Qt-DAB is written in C++ and makes use of the Qt toolset.
-
-
-2. Overall structure
-The program implements a series of transformations on an input
-that consists of a continuous stream of I/Q samples, with an
-inputrate of 2048000.
-The implementation of the processing can be thought of to
-exist of 4 stages:
-a. reading samples
-b. mapping samples onto DAB frames 
-c. extracting services from these DAB frames
-d. generating output
-
-Main "driver" of the implementation is in a class "dabProcessor",
-a class implementing an interface to the input device is one
-of its parameters, as are the dabMode, some settings and a number
-of buffers, with which data is passed to the GUI handler.
-
-The dabProcessor extracts the samples from the input device (through
-a class "sampleReader", does time synchronization to estimate the
-first sample of the non-null part of a DAB frame (using a class
-"timeSyncer"), does the fine time synchronization - determining the
-first sample of the first data block (using a class "phaseReference"),
-collects the samples for the data blocks of the DAB frame, and
-makes a guess of the small error correction.
-
-Decoding the first few data blocks, FIC blocks, is delegated to an instance
-of the class "ofdmDecoder", processing the result is delegated
-to an instance of the class ficHandler.
-
-Decoding of the remaining data blocks, MSC blocks, is delegated to
-an instance of the class "mscProcessor". On selecting a service,
-a delegate is instatiated that is capable of dealing with it.
-Audio output is send back to the GUI for processing by an output module.
-
-The rationale for this choice is that the dabProcessor proper and
-the mscProcessor can be executed in different threads.
-
-Control of the GUI is implemented in the class "RadioInterface",
-it implements the two way communication betwene the (visual) outside
-world and the processing chain.
-
-3. the dabProcessor and processing
-3.0 the dabProcessor
-The dabProcessor is built as a thread, pulling the data in,
-processing the samples and emitting dabBlocks to its delegates.
-The "run" function will call upon an instance of the
-class "sampleReader" to obtain the samples - corrected for any
-frequency offset that might occur.
-
-If there is no (coarse) time sychronization yet, an instance
-of the class "timeSyncer" will try to obtain this.
-
-If the is (coarse) time synchronization, a - pretty arbitary - amount
-of samples are read in, and passed on to a n instance of the
-class "phaseReference", that will compute the precise offset
-of where the data is to be found in the sample stream.
-
-Reading in a frame is then straight forward, the first data block
-is used for frequency synchronization and acts as a reference for decoding
-the next block, samples constituing the next blocks are read in
-and the blocks are collected.
-
-The first datablocks are passed on to an instance of the class ficHandler,
-that class builds a structure with a description of the data that is
-contained in the MSC blocks.
-
-The remaining data blocks are passed on to the instance of the mscHandler.
-
-
-While reading in the data blocks, an estimate is made of the small (fine)
-frequency offset, by averaging over all blocks of the frame.
-
-Note that when there is time synchronization, there is not need to
-repeat that part of the procedure for the next DAB frame, so the code
-ends with a jump back to the part fine syncing with the next DAB frame.
-
-3.1 phaseReference
-
-A class "phaseReference" is built to handle the identification of the
-first sample of the first datablock in a DAB frame and the computation
-of the coarse frequency offset.
-
-Identification of the first sample is possible since the pattern of
-the first data block as transformed into the frequency domain is predefined.
-
-The actual computation is done by taking the IFFT of the product of the
-FFT of the incoming data and the aforementioned pattern.
-
-The frequency offset is computed by correlating elements of the
-predefined pattern with the FFT of the first data block.
-
-3.2 ofdmDecoder
-
-The mapping of the first data block and the first few FIC blocks
-is done in the class ofdmDecoder. Decoding is by computing - for each
-relevant carrier - the product of the carrier with the value of the
-carrier in the preceding block. Since there is some interleaving
-involved, computation takes the interleaving into account.
-
-3.3 ficHandler
-
-The decoder data of the FIC blocks is passed on to the instance of the
-ficHandler class. The class itself is derived from the fibProcessor class,
-that one does the real interpretation.
-
-The incoming data is partitioned into segments of 2304 (soft) bits,
-these segments are depunctured according to a predefined rule, and
-are fed into a deconvolutional decoder.
-
-The result are segments of 768 (hard) bits, each consisting of three
-vectors of 256 bits, 240 data bits and a 16 bit CRC.
-
-These vectors - if the CRC check is passed - are further processed
-by (an instance of) the "fibProcessor" class.
-
-The latter maintains three 64 element vectors, one for the "subChannels",
-one for the "subServices" and one for the "services".
-
-4. the mscHandler
-
-The class mscHandler is built as a thread, buffering the input.
-The "run" function will read the raw datablocks and will decode them,
-i.e. map them onto (soft)bits. These bits are collected into CIFs.
-
-This approach is chosen to (more or less) balance the workload between
-the ofdmProcessor and the mscHandler.
-
-As long as no service is selected, it ends here. If/when a service
-is selected, the GUI passes a description of the selected service
-to the mscHandler. The mscHandler then -  if applicable - terminates
-delegates operating on the previously selected service, and adds
-an appropriate delete to a "stack" of delegates. This allows handling
-of subservices.
-
-The service description contains an indication of the startaddress
-of the data i the CIF, of the length of the data segment, and an
-indication whether it is an audio or data (sub)service.
-
-Since the mscHandler has both the dabProcessor and the GUI as client,
-some locking is introduced, locking by simple mutexes.
-
-An audio (sub)service will be handled by an instance of the class 
-"audioProcessor", a data (sub)service by an instance of the class
-"dataProcessor".
-
-
-
-
-

_service:download_url:qt-dab-2.0.tar.gz/qt-dab-2.0_resource.rc Deleted

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

_service:download_url:qt-dab-2.0.tar.gz/screenshot-2_qt-dab.png Deleted

_service:download_url:qt-dab-2.0.tar.gz/src/backend/audio-backend.cpp Deleted

@@ -1,197 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of Qt-DAB
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; 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"
-#include	"audio-backend.h"
-#include	"mp2processor.h"
-#include	"mp4processor.h"
-#include	"eep-protection.h"
-#include	"uep-protection.h"
-#include	"radio.h"
-//
-//	Interleaving is - for reasons of simplicity - done
-//	inline rather than through a special class-object
-//
-//	fragmentsize == Length * CUSize
-	audioBackend::audioBackend	(RadioInterface *mr,
-	 audiodata	*d,
-	 RingBuffer<int16_t> *buffer,
-	 QString	picturesPath):
-	 virtualBackend (d -> startAddr,
-	 d -> length),
-	 outV (d -> bitRate * 24)
-#ifdef	__THREADED_BACKEND
-	 ,freeSlots (20) 
-#endif 
-	 {
-int32_t i, j;
-	this	-> myRadioInterface	= mr;
-	this -> dabModus = d -> ASCTy == 077 ? DAB_PLUS : DAB;
- this -> fragmentSize = d -> length * CUSize;
- this -> bitRate = d -> bitRate;
- this -> shortForm = d -> shortForm;
- this -> protLevel = d -> protLevel;
-
-	this	-> audioBuffer		= buffer;
-
-	interleaveData		= new int16_t *[16]; // max size
-	for (i = 0; i < 16; i ++) {
-	 interleaveData [i] = new int16_t [fragmentSize];
-	 memset (interleaveData [i], 0, fragmentSize * sizeof (int16_t));
-	}
-
-	countforInterleaver	= 0;
-	interleaverIndex	= 0;
-
-	if (shortForm)
-	 protectionHandler	= new uep_protection (bitRate,
-	 protLevel);
-	else
-	 protectionHandler	= new eep_protection (bitRate,
-	 protLevel);
-//
-	if (dabModus == DAB) 
-	 our_dabProcessor = new mp2Processor (myRadioInterface,
-	 bitRate,
-	 audioBuffer,
-	 picturesPath);
-	else
-	if (dabModus == DAB_PLUS) 
-	 our_dabProcessor = new mp4Processor (myRadioInterface,
-	 bitRate,
-	 audioBuffer,
-	 picturesPath);
-	else		// cannot happen
-	 our_dabProcessor = new frameProcessor ();
-
-	fprintf (stderr, "we now have %s\n", dabModus == DAB_PLUS ? "DAB+" : "DAB");
-	tempX. resize (fragmentSize);
-	
-	uint8_t shiftRegister [9];
-	disperseVector. resize (24 * bitRate);
-	memset (shiftRegister, 1, 9);
-	for (i = 0; i < bitRate * 24; i ++) {
-	 uint8_t b = shiftRegister [8] ^ shiftRegister [4];
-	 for (j = 8; j > 0; j--)
-	 shiftRegister [j] = shiftRegister [j - 1];
-	 shiftRegister [0] = b;
-	 disperseVector [i] = b;
-	}
-#ifdef	__THREADED_BACKEND
-//	for local buffering the input, we have
-	nextIn				= 0;
-	nextOut				= 0;
-	for (i = 0; i < 20; i ++)
-	 theData [i] = new int16_t [fragmentSize];
-	running. store (true);
-	start ();
-#endif
-}
-
-	audioBackend::~audioBackend (void) {
-int16_t	i;
-#ifdef	__THREADED_BACKEND
-	running. store (false);
-	while (this -> isRunning ())
-	 usleep (1000);
-#endif
-	delete protectionHandler;
-	delete our_dabProcessor;
-	for (i = 0; i < 16; i ++) 
-	 delete[] interleaveData [i];
-	delete [] interleaveData;
-#ifdef	__THREADED_BACKEND
-	for (i = 0; i < 20; i ++)
-	 delete [] theData [i];
-#endif
-}
-
-int32_t	audioBackend::process	(int16_t *v, int16_t cnt) {
-
-#ifdef	__THREADED_BACKEND
-	while (!freeSlots. tryAcquire (1, 200))
-	 if (!running)
-	 return 0;
-	memcpy (theData [nextIn], v, fragmentSize * sizeof (int16_t));
-	nextIn = (nextIn + 1) % 20;
-	usedSlots. release ();
-#else
-	processSegment (v);
-#endif
-	return 1;
-}
-
-const	int16_t interleaveMap [] = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
-void	audioBackend::processSegment (int16_t *Data) {
-int16_t	i, j;
-
-	for (i = 0; i < fragmentSize; i ++) {
-	 tempX [i] = interleaveData [(interleaverIndex + 
-	 interleaveMap [i & 017]) & 017][i];
-	 interleaveData [interleaverIndex][i] = Data [i];
-	}
-
-	interleaverIndex = (interleaverIndex + 1) & 0x0F;
-#ifdef	__THREADED_BACKEND
-	nextOut = (nextOut + 1) % 20;
-	freeSlots. release ();
-#endif
-
-//	only continue when de-interleaver is filled
-	if (countforInterleaver <= 15) {
-	 countforInterleaver ++;
-	 return;
-	}
-
-	protectionHandler -> deconvolve (tempX. data (),
-	 fragmentSize,
-	 outV. data ());
-//
-//	and the energy dispersal
-	for (i = 0; i < bitRate * 24; i ++)
-	 outV [i] ^= disperseVector [i];
-
-	our_dabProcessor -> addtoFrame (outV);
-}
-
-#ifdef	__THREADED_BACKEND
-void	audioBackend::run	(void) {
-
-	while (running. load ()) {
-	 while (!usedSlots. tryAcquire (1, 200)) 
-	 if (!running)
-	 return;
-	 processSegment (theData [nextOut]);
-	}
-}
-#endif
-
-//	It might take a msec for the task to stop
-void	audioBackend::stopRunning (void) {
-#ifdef	__THREADED_BACKEND
-	running = false;
-	while (this -> isRunning ())
-	 usleep (1);
-//	myAudioSink	-> stop ();
-#endif
-}
-

_service:download_url:qt-dab-2.0.tar.gz/src/backend/audio/newconverter.cpp Deleted

@@ -1,85 +0,0 @@
-#
-/*
- * Copyright (C) 2011, 2012, 2013
- * 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	"newconverter.h"
-
-	newConverter::newConverter (int32_t inRate, int32_t outRate, 
-	 int32_t inSize) {
-int	err;
-	this	-> inRate	= inRate;
-	this	-> outRate	= outRate;
-	inputLimit		= inSize;
-	ratio			= double(outRate) / inRate;
-	fprintf (stderr, "ratio = %f\n", ratio);
-	outputLimit		= inSize * ratio;
-//	converter		= src_new (SRC_SINC_BEST_QUALITY, 2, &err);
-//	converter		= src_new (SRC_LINEAR, 2, &err);
-	converter		= src_new (SRC_SINC_MEDIUM_QUALITY, 2, &err);
-	src_data		= new SRC_DATA;
-	inBuffer		= new float [2 * inputLimit + 20];
-	outBuffer		= new float [2 * outputLimit + 20];
-	src_data-> data_in	= inBuffer;
-	src_data-> data_out	= outBuffer;
-	src_data-> src_ratio	= ratio;
-	src_data-> end_of_input	= 0;
-	inp			= 0;
-}
-
-	newConverter::~newConverter (void) {
-	src_delete	(converter);
-	delete []	inBuffer;
-	delete []	outBuffer;
-	delete		src_data;
-}
-
-bool	newConverter::convert (DSPCOMPLEX v,
-	 DSPCOMPLEX *out, int32_t *amount) {
-int32_t	i;
-int32_t	framesOut;
-int	res;
-
-	inBuffer [2 * inp]	= real (v);
-	inBuffer [2 * inp + 1]	= imag (v);
-	inp ++;
-	if (inp < inputLimit)
-	 return false;
-
-	src_data	-> input_frames		= inp;
-	src_data	-> output_frames	= outputLimit + 10;
-	res		= src_process (converter, src_data);
-	if (res != 0) {
-	 fprintf (stderr, "error %s\n", src_strerror (res));
-	 return false;
-	}
-	inp		= 0;
-	framesOut	= src_data -> output_frames_gen;
-	for (i = 0; i < framesOut; i ++)
-	 out [i] = DSPCOMPLEX (outBuffer [2 * i], outBuffer [2 * i + 1]);
-	*amount		= framesOut;
-	return true;
-}
-
-int32_t		newConverter::getOutputsize (void) {
-	return outputLimit;
-}
-

_service:download_url:qt-dab-2.0.tar.gz/src/backend/data-backend.cpp Deleted

@@ -1,169 +0,0 @@
-#
-/*
- * Copyright (C) 2015
- * 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	"dab-constants.h"
-#include	"radio.h"
-#include	"frame-processor.h"
-#include	"data-backend.h"
-#include	"eep-protection.h"
-#include	"uep-protection.h"
-#include	"data-processor.h"
-
-//	Interleaving is - for reasons of simplicity - done
-//	inline rather than through a special class-object
-//	We could make a single handler for interleaving
-//	and deconvolution, but it is a pretty simple operation
-//	so for now keep it in-line
-//
-//	The main function of this class is to assemble the 
-//	MSCdatagroups and dispatch to the appropriate handler
-//
-//	fragmentsize == Length * CUSize
-	dataBackend::dataBackend(RadioInterface *mr,
-	 packetdata	*d,
-	 RingBuffer<uint8_t> *dataBuffer,
-	 QString	picturesPath) :
-	 virtualBackend (d -> startAddr,
-	 d -> length),
-	 freeSlots (20) {
-int32_t i, j;
-
-	this	-> myRadioInterface	= mr;
-	this	-> fragmentSize		= d -> length * CUSize;
-	this	-> bitRate		= d -> bitRate;
-	this	-> protLevel		= d -> protLevel;
-	our_frameProcessor	= new dataProcessor (mr,
-	 d,
-	 dataBuffer,
-	 picturesPath);
-	nextIn = 0;
- nextOut = 0;
- for (i = 0; i < 20; i ++)
- theData [i] = new int16_t [fragmentSize];
-
-	outV			= new uint8_t [24 * bitRate];
-	interleaveData		= new int16_t *[16]; // the size
-	for (i = 0; i < 16; i ++) {
-	 interleaveData [i] = new int16_t [fragmentSize];
-	 memset (interleaveData [i], 0, fragmentSize * sizeof (int16_t));
-	}
-	countforInterleaver	= 0;
-//
-//	The handling of the depuncturing and deconvolution is
-//	shared with that of the audio
-	if (d -> shortForm)
-	 protectionHandler	= new uep_protection (bitRate,
-	 d -> protLevel);
-	else
-	 protectionHandler	= new eep_protection (bitRate,
-	 d -> protLevel);
-//
-	uint8_t shiftRegister [9];
-	disperseVector. resize (24 * bitRate);
-//	and the energy dispersal
-	memset (shiftRegister, 1, 9);
-	for (i = 0; i < bitRate * 24; i ++) {
-	 uint8_t b = shiftRegister [8] ^ shiftRegister [4];
-	 for (j = 8; j > 0; j--)
-	 shiftRegister [j] = shiftRegister [j - 1];
-	 shiftRegister [0] = b;
-	 disperseVector[i] = b;
-	}
-
-	start ();
-}
-
-	dataBackend::~dataBackend (void) {
-int16_t	i;
-	running = false;
-	while (this -> isRunning ())
-	 usleep (1);
-	delete protectionHandler;
-	for (i = 0; i < 16; i ++)
-	 delete[] interleaveData [i];
- for (i = 0; i < 20; i ++)
- delete [] theData [i];
-	delete[]	interleaveData;
-	delete		outV;
-}
-
-int32_t	dataBackend::process	(int16_t *v, int16_t cnt) {
-	(void)cnt;
-	while (!freeSlots. tryAcquire (1, 200))
- if (!running)
- return 0;
- memcpy (theData [nextIn], v, fragmentSize * sizeof (int16_t));
- nextIn = (nextIn + 1) % 20;
- usedSlots. release ();
- return 1;
-}
-
-const int16_t interleaveMap[] = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
-
-void	dataBackend::run	(void) {
-int16_t	countforInterleaver	= 0;
-int16_t interleaverIndex	= 0;
-int16_t	tempX [fragmentSize];
-int16_t	i, j;
-
-	running	= true;
-	while (running) {
-	 while (!usedSlots. tryAcquire (1, 200))
- if (!running)
- return;
-
-//	 memcpy (Data, theData [nextOut], fragmentSize * sizeof (int16_t));
-
-	 for (i = 0; i < fragmentSize; i ++) {
-	 tempX [i] = interleaveData [(interleaverIndex + 
-	 interleaveMap [i & 017]) & 017][i];
-	 interleaveData [interleaverIndex][i] = theData [nextOut] [i];
-	 }
- nextOut = (nextOut + 1) % 20;
-	 freeSlots. release ();
-
-	 interleaverIndex = (interleaverIndex + 1) & 0x0F;
-
-//	only continue when de-interleaver is filled
-	 if (countforInterleaver <= 15) {
-	 countforInterleaver ++;
-	 continue;
-	 }
-//
-	 protectionHandler -> deconvolve (tempX, fragmentSize, outV);
-
-	 for (i = 0; i < bitRate * 24; i ++)
-	 outV [i] ^= disperseVector [i];
-//	What we get here is a long sequence (24 * bitrate) of bits, not packed
-//	but forming a DAB packet
-//	we hand it over to make an MSC data group
-	 our_frameProcessor -> addtoFrame (outV);
-	}
-}
-
-//	It might take a msec for the task to stop
-void	dataBackend::stopRunning (void) {
-	running = false;
-	while (this -> isRunning ())
-	 usleep (100);
-}
-//

_service:download_url:qt-dab-2.0.tar.gz/src/backend/uep-protection.cpp Deleted

@@ -1,245 +0,0 @@
-#
-/*
- * Copyright (C) 2014 .. 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB program
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 	The deconvolution for uep
- */
-#include	"dab-constants.h"
-#include	"uep-protection.h"
-#include	"protTables.h"
-
-struct protectionProfile {
-	int16_t	bitRate;
-	int16_t	protLevel;
-	int16_t L1;
-	int16_t	L2;
-	int16_t	L3;
-	int16_t	L4;
-	int16_t	PI1;
-	int16_t	PI2;
-	int16_t	PI3;
-	int16_t	PI4;
-} profileTable [] = {
-	{32,	5,	3, 4, 17, 0,	5, 3, 2, -1},
-	{32,	4,	3, 3, 18, 0,	11, 6, 5, -1},
-	{32,	3,	3, 4, 14, 3,	15, 9, 6, 8},
-	{32,	2,	3, 4, 14, 3,	22, 13, 8, 13},
-	{32,	1,	3, 5, 13, 3,	24, 17, 12, 17},
-
-	{48,	5,	4, 3, 26, 3,	5, 4, 2, 3},
-	{48,	4,	3, 4, 26, 3,	9, 6, 4, 6},
-	{48,	3,	3, 4, 26, 3,	15, 10, 6, 9},
-	{48,	2,	3, 4, 26, 3,	24, 14, 8, 15},
-	{48,	1,	3, 5, 25, 3,	24, 18, 13, 18},
-//
-//	Thanks to Pr2 who discovered that the tables for 56 were missing
-	{56,	5,	6, 10, 23, 3,	5, 4, 2, 3},
-	{56,	4,	6, 10, 23, 3,	9, 6, 4, 5},
-	{56,	3,	6, 12, 21, 3,	16, 7, 6, 9},
-	{56,	2,	6, 10, 23, 3,	23, 13, 8, 13},
-//
-//	edinsam discovered that one of the 64 rows contained an error
-	{64,	5,	6, 9, 31, 2,	5, 3, 2, 3},
-	{64,	4,	6, 9, 33, 0,	11, 6, 5, -1},
-	{64,	3,	6, 12, 27, 3,	16, 8, 6, 9},
-	{64,	2,	6, 10, 29, 3,	23, 13, 8, 13},
-	{64,	1,	6, 11, 28, 3,	24, 18, 12, 18},
-
-	{80,	5,	6, 10, 41, 3,	6, 3, 2, 3},
-	{80,	4,	6, 10, 41, 3,	11, 6, 5, 6},
-	{80,	3,	6, 11, 40, 3,	16, 8, 6, 7},
-	{80,	2,	6, 10, 41, 3,	23, 13, 8, 13},
-	{80,	1,	6, 10, 41, 3,	24, 7, 12, 18},
-
-	{96,	5,	7, 9, 53, 3,	5, 4, 2, 4},
-	{96,	4,	7, 10, 52, 3,	9, 6, 4, 6},
-	{96,	3,	6, 12, 51, 3,	16, 9, 6, 10},
-	{96,	2,	6, 10, 53, 3,	22, 12, 9, 12},
-	{96,	1,	6, 13, 50, 3,	24, 18, 13, 19},
-//
-//	Thanks to Kalle Riis, who found that the "112" was missing
-	{112,	5,	14, 17, 50, 3,	5, 4, 2, 5},
-	{112,	4,	11, 21, 49, 3,	9, 6, 4, 8},
-	{112,	3,	11, 23, 47, 3,	16, 8, 6, 9},
-	{112,	2,	11, 21, 49, 3,	23, 12, 9, 14},
-
-	{128,	5,	12, 19, 62, 3,	5, 3, 2, 4},
-	{128,	4,	11, 21, 61, 3,	11, 6, 5, 7},
-	{128,	3,	11, 22, 60, 3,	16, 9, 6, 10},
-	{128,	2,	11, 21, 61, 3,	22, 12, 9, 14},
-	{128,	1,	11, 20, 62, 3,	24, 17, 13, 19},
-
-	{160,	5,	11, 19, 87, 3,	5, 4, 2, 4},
-	{160,	4,	11, 23, 83, 3,	11, 6, 5, 9},
-	{160,	3,	11, 24, 82, 3,	16, 8, 6, 11},
-	{160,	2,	11, 21, 85, 3,	22, 11, 9, 13},
-	{160,	1,	11, 22, 84, 3,	24, 18, 12, 19},
-
-	{192,	5,	11, 20, 110, 3,	6, 4, 2, 5},
-	{192,	4,	11, 22, 108, 3,	10, 6, 4, 9},
-	{192,	3,	11, 24, 106, 3, 16, 10, 6, 11},
-	{192,	2,	11, 20, 110, 3, 22, 13, 9, 13},
-	{192,	1,	11, 21, 109, 3,	24, 20, 13, 24},
-
-	{224,	5,	12, 22, 131, 3,	8, 6, 2, 6},
-	{224,	4,	12, 26, 127, 3,	12, 8, 4, 11},
-	{224,	3,	11, 20, 134, 3, 16, 10, 7, 9},
-	{224,	2,	11, 22, 132, 3,	24, 16, 10, 15},
-	{224,	1,	11, 24, 130, 3,	24, 20, 12, 20},
-
-	{256,	5,	11, 24, 154, 3,	6, 5, 2, 5},
-	{256,	4,	11, 24, 154, 3,	12, 9, 5, 10},
-	{256,	3,	11, 27, 151, 3,	16, 10, 7, 10},
-	{256,	2,	11, 22, 156, 3,	24, 14, 10, 13},
-	{256,	1,	11, 26, 152, 3,	24, 19, 14, 18},
-
-	{320,	5,	11, 26, 200, 3,	8, 5, 2, 6},
-	{320,	4,	11, 25, 201, 3,	13, 9, 5, 10},
-	{320,	2,	11, 26, 200, 3,	24, 17, 9, 17},
-	
-	{384,	5,	11, 27, 247, 3,	8, 6, 2, 7},
-	{384,	3,	11, 24, 250, 3,	16, 9, 7, 10},
-	{384,	1,	12, 28, 245, 3,	24, 20, 14, 23},
-	{0,	-1,	-1, -1, -1, -1,	-1, -1, -1, -1}
-};
-
-static
-int16_t	findIndex (int16_t bitRate, int16_t protLevel) {
-int16_t	i;
-
-	for (i = 0; profileTable [i].bitRate != 0; i ++)
-	 if ((profileTable [i]. bitRate == bitRate) &&
-	 (profileTable [i]. protLevel == protLevel))
-	 return i;
-
-	return -1;
-}
-
-/**
- *	the table is based on chapter 11 of the DAB standard.
- *
- *	\brief uep_deconvolve
- *
- *	The bitRate and the protectionLevel determine the 
- *	depuncturing scheme.
- */
- uep_protection::uep_protection (int16_t bitRate,
- int16_t protLevel):
- protection (bitRate, protLevel) {
-int16_t index, i, j;
-int16_t	viterbiCounter	= 0;
-int16_t L1;
-int16_t L2;
-int16_t L3;
-int16_t L4;
-int8_t *PI1;
-int8_t *PI2;
-int8_t *PI3;
-int8_t *PI4;
-int8_t *PI_X;
-
-	fprintf (stderr, "protLevel %d, bitRate %d\n", protLevel, bitRate);
-	index	= findIndex (bitRate, protLevel);
-	if (index == -1) {
-	 fprintf (stderr, "%d (%d) has a problem\n", bitRate, protLevel);
-	 index = 1;
-	}
-
-	L1	= profileTable [index]. L1;
-	L2	= profileTable [index]. L2;
-	L3	= profileTable [index]. L3;
-	L4	= profileTable [index]. L4;
-
-	PI1	= get_PCodes (profileTable [index]. PI1 -1);
-	PI2	= get_PCodes (profileTable [index]. PI2 -1);
-	PI3	= get_PCodes (profileTable [index]. PI3 -1);
-	if ((profileTable [index]. PI4 - 1) != -1)
-	 PI4	= get_PCodes (profileTable [index]. PI4 -1);
-	else
-	 PI4	= NULL;
-
-	PI_X	= get_PCodes (8 - 1);
-//
-//	We prepare a mapping table with the given punctures
-	memset (indexTable. data (), 0, (4 * outSize + 24) * sizeof (uint8_t));
-	for (i = 0; i < L1; i ++) {
-	 for (j = 0; j < 128; j ++) {
-	 if (PI1 [j % 32] != 0) 
-	 indexTable [viterbiCounter] = true;
-	 viterbiCounter ++;
-	 }
-	}
-
-	for (i = 0; i < L2; i ++) {
-	 for (j = 0; j < 128; j ++) {
-	 if (PI2 [j % 32] != 0) 
-	 indexTable [viterbiCounter] = true;
-	 viterbiCounter ++;
-	 }
-	}
-
-	for (i = 0; i < L3; i ++) {
-	 for (j = 0; j < 128; j ++) {

_service:download_url:qt-dab-2.0.tar.gz/src/backend/virtual-backend.cpp Deleted

@@ -1,55 +0,0 @@
-#
-/*
- *    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
- */
-//
-//	dummy for the dab backends
-//
-#include	"dab-constants.h"
-#include	"virtual-backend.h"
-
-	virtualBackend::virtualBackend	(int32_t a, int16_t b) {
-	startAddress	= a;
-	segmentLength	= b;
-}
-
-	virtualBackend::~virtualBackend	(void) {
-}
-
-int32_t	virtualBackend::process	(int16_t *v, int16_t c) {
-	(void)v;
-	(void)c;
-	return 32768;
-}
-
-int32_t	virtualBackend::startAddr (void) {
-	return startAddress;
-}
-
-int16_t	virtualBackend::Length    (void) {
-	return segmentLength;
-}
-
-void	virtualBackend::stopRunning	(void) {
-}
-
-void	virtualBackend::stop	(void) {
-}
-

_service:download_url:qt-dab-2.01.tar.gz/.gitignore Added

_service:download_url:qt-dab-2.0.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-2.01.tar.gz/CMakeLists.txt Changed

@@ -157,8 +157,10 @@
 	           ${QT_QTGUI_INCLUDE_DIR}
 	           .
 	           ./
+	           ./service-description
 	           ./includes
 	           ./includes/ofdm
+	           ./includes/protection
 	           ./includes/backend
 	           ./includes/backend/audio
 	           ./includes/backend/data
@@ -179,9 +181,12 @@
 
 	set (${objectName}_HDRS
 	     ./dab-processor.h
+	     ./service-description/service-descriptor.h 
+	     ./service-description/audio-descriptor.h 
+	     ./service-description/data-descriptor.h 
              ./includes/country-codes.h
-             ./includes/ofdm/sample-reader.h
 	     ./includes/dab-constants.h
+             ./includes/ofdm/sample-reader.h
 	     ./includes/ofdm/phasereference.h
 	     ./includes/ofdm/phasetable.h
 	     ./includes/ofdm/freq-interleaver.h
@@ -190,18 +195,19 @@
 	     ./includes/ofdm/tii_table.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/timesyncer.h
-	     ./includes/backend/protection.h
-	     ./includes/backend/uep-protection.h
-	     ./includes/backend/eep-protection.h
+	     ./includes/protection/protTables.h
+	     ./includes/protection/protection.h
+	     ./includes/protection/uep-protection.h
+	     ./includes/protection/eep-protection.h
 	     ./includes/backend/firecode-checker.h
 	     ./includes/backend/frame-processor.h
 	     ./includes/backend/charsets.h
 	     ./includes/backend/galois.h
 	     ./incluces/backend/reed-solomon.h
 	     ./includes/backend/msc-handler.h
-	     ./includes/backend/virtual-backend.h
-	     ./includes/backend/audio-backend.h
-	     ./includes/backend/data-backend.h
+	     ./includes/backend/backend.h
+	     ./includes/backend/backend-deconvolver.h
+	     ./includes/backend/backend-driver.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp4processor.h
 	     ./includes/backend/audio/mp2processor.h
@@ -224,7 +230,9 @@
 	     ./includes/backend/data/data-processor.h
 	     ./devices/virtual-input.h
 	     ./devices/rawfiles/rawfiles.h
+	     ./devices/rawfiles/raw-reader.h
 	     ./devices/wavfiles/wavfiles.h
+	     ./devices/wavfiles/wav-reader.h
 	     ./includes/output/fir-filters.h
 	     ./includes/output/audio-base.h
 	     ./includes/output/newconverter.h
@@ -234,6 +242,7 @@
 	     ./includes/support/dab-params.h
 	     ./includes/support/band-handler.h
 	     ./includes/support/text-mapper.h
+	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
 	     ./includes/support/viterbi_768/viterbi-768.h
 	     ./includes/scopes-qwt6/iqdisplay.h
@@ -246,6 +255,8 @@
 	     ${${objectName}_SRCS}
 	     ./main.cpp
 	     ./dab-processor.cpp
+	     ./service-description/audio-descriptor.cpp
+	     ./service-description/data-descriptor.cpp
              ./src/ofdm/sample-reader.cpp
 	     ./src/ofdm/ofdm-decoder.cpp
 	     ./src/ofdm/phasereference.cpp
@@ -256,19 +267,19 @@
 	     ./src/ofdm/tii_table.cpp
 	     ./src/ofdm/tii_detector.cpp
 	     ./src/ofdm/timesyncer.cpp
-	     ./src/backend/protection.cpp
-	     ./src/backend/eep-protection.cpp
-	     ./src/backend/uep-protection.cpp
+	     ./src/protection/protTables.cpp
+	     ./src/protection/protection.cpp
+	     ./src/protection/eep-protection.cpp
+	     ./src/protection/uep-protection.cpp
 	     ./src/backend/firecode-checker.cpp
 	     ./src/backend/frame-processor.cpp
-	     ./src/backend/protTables.cpp
 	     ./src/backend/charsets.cpp
 	     ./src/backend/galois.cpp
 	     ./src/backend/reed-solomon.cpp
 	     ./src/backend/msc-handler.cpp
-	     ./src/backend/virtual-backend.cpp
-	     ./src/backend/audio-backend.cpp
-	     ./src/backend/data-backend.cpp
+	     ./src/backend/backend.cpp
+	     ./src/backend/backend-deconvolver.cpp
+	     ./src/backend/backend-driver.cpp
 	     ./src/backend/audio/faad-decoder.cpp
 	     ./src/backend/audio/mp4processor.cpp
 	     ./src/backend/audio/mp2processor.cpp
@@ -290,7 +301,9 @@
 	     ./src/backend/data/data-processor.cpp
 	     ./devices/virtual-input.cpp
 	     ./devices/rawfiles/rawfiles.cpp
+	     ./devices/rawfiles/raw-reader.cpp
 	     ./devices/wavfiles/wavfiles.cpp
+	     ./devices/wavfiles/wav-reader.cpp
 	     ./src/output/audio-base.cpp
 	     ./src/output/newconverter.cpp
 	     ./src/output/fir-filters.cpp
@@ -299,6 +312,7 @@
 	     ./src/support/dab-params.cpp
 	     ./src/support/band-handler.cpp
 	     ./src/support/text-mapper.cpp
+	     ./src/support/dab_tables.cpp
 	     ./src/support/ensemble-printer.cpp
 	     ./src/support/viterbi_768/viterbi-768.cpp
 	     ./src/support/viterbi_768/spiral-no-sse.c
@@ -318,7 +332,7 @@
 	     ./includes/ofdm/fib-processor.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/tii_table.h
-	     ./includes/backend/data-backend.h
+	     ./includes/backend/backend.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp2processor.h
 	     ./includes/backend/audio/mp4processor.h
@@ -332,7 +346,9 @@
 	     ./includes/backend/data/journaline-datahandler.h
 	     ./includes/backend/data/data-processor.h
 	     ./devices/rawfiles/rawfiles.h
+	     ./devices/rawfiles/raw-reader.h
 	     ./devices/wavfiles/wavfiles.h
+	     ./devices/wavfiles/wav-reader.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./impulse-viewer/impulse-viewer.h 
@@ -343,6 +359,8 @@
 	        ${${objectName}_UIS}
 	     ./forms/dabradio.ui
 	     ./forms/technical_data.ui
+	     ./forms/audio-description.ui
+	     ./forms/data-description.ui
 	     ./spectrum-viewer/scopewidget.ui
 	     ./impulse-viewer/impulse-widget.ui
 	     ./tii-viewer/tii-widget.ui

_service:download_url:qt-dab-2.0.tar.gz/CMakeLists.txt-qt4 -> _service:download_url:qt-dab-2.01.tar.gz/CMakeLists.txt-qt4 Changed

@@ -151,7 +151,9 @@
 	           ${QT_QTGUI_INCLUDE_DIR}
 	           .
 	           ./
+	           ./service-description
 	           ./includes
+	           ./includes/protection
 	           ./includes/ofdm
 	           ./includes/backend
 	           ./includes/backend/audio
@@ -173,6 +175,9 @@
 
 	set (${objectName}_HDRS
 	     ./dab-processor.h
+	     ./service-description/service-descriptor.h
+	     ./service-description/audio-descriptor.h
+	     ./service-description/data-descriptor.h
 	     ./includes/country-codes.h
 	     ./includes/dab-constants.h
 	     ./includes/ofdm/sample-reader.h
@@ -184,18 +189,19 @@
              ./includes/ofdm/fic-handler.h
              ./includes/ofdm/fib-processor.h
 	     ./includes/ofdm/timesyncer.h
-	     ./includes/backend/protection.h
-	     ./includes/backend/uep-protection.h
-	     ./includes/backend/eep-protection.h
+	     ./includes/protection/protTables.h
+             ./includes/protection/protection.h
+             ./includes/protection/uep-protection.h
+             ./includes/protection/eep-protection.h
 	     ./includes/backend/firecode-checker.h
 	     ./includes/backend/frame-processor.h
 	     ./includes/backend/charsets.h
 	     ./includes/backend/galois.h
 	     ./incluces/backend/reed-solomon.h
 	     ./includes/backend/msc-handler.h
-	     ./includes/backend/virtual-backend.h
-	     ./includes/backend/audio-backend.h
-	     ./includes/backend/databackend.h
+	     ./includes/backend/backend.h
+	     ./includes/backend/backend-deconvolver.h
+             ./includes/backend/backend-driver.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp4processor.h
 	     ./includes/backend/audio/mp2processor.h
@@ -219,7 +225,9 @@
 	     ./includes/backend/data/data-processor.h
 	     ./devices/virtual-input.h
 	     ./devices/rawfiles/rawfiles.h
+	     ./devices/rawfiles/raw-reader.h
 	     ./devices/wavfiles/wavfiles.h
+	     ./devices/wavfiles/wav-reader.h
 	     ./includes/output/fir-filters.h
 	     ./includes/output/audio-base.h
 	     ./includes/output/audiosink.h
@@ -230,6 +238,7 @@
 	     ./includes/support/dab-params.h
 	     ./includes/support/band-handler.h
 	     ./includes/support/text-mapper.h
+	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
 	     ./includes/backend/viterbi_768/viterbi-768.h
 	     ./includes/scopes-qwt6/iqdisplay.h
@@ -242,6 +251,8 @@
 	     ${${objectName}_SRCS}
 	     ./main.cpp
 	     ./dab-processor.cpp
+             ./service-description/audio-descriptor.cpp
+             ./service-description/data-descriptor.cpp
              ./src/ofdm/sample-reader.cpp
 	     ./src/ofdm/ofdm-decoder.cpp
 	     ./src/ofdm/phasereference.cpp
@@ -249,22 +260,22 @@
 	     ./src/ofdm/freq-interleaver.cpp
 	     ./src/ofdm/tii_table.cpp
              ./src/ofdm/tii_detector.cpp
-	     ./src/ofdm/timesyncer.cpp
 	     ./src/ofdm/fic-handler.cpp
 	     ./src/ofdm/fib-processor.cpp
-	     ./src/backend/protection.cpp
-	     ./src/backend/eep-protection.cpp
-	     ./src/backend/uep-protection.cpp
+	     ./src/ofdm/timesyncer.cpp
+	     ./src/protection/protTables.cpp
+             ./src/protection/protection.cpp
+             ./src/protection/eep-protection.cpp
+             ./src/protection/uep-protection.cpp
 	     ./src/backend/firecode-checker.cpp
 	     ./src/backend/frame-processor.cpp
-	     ./src/backend/protTables.cpp
 	     ./src/backend/charsets.cpp
 	     ./src/backend/galois.cpp
 	     ./src/backend/reed-solomon.cpp
 	     ./src/backend/msc-handler.cpp
-	     ./src/backend/virtual-backend.cpp
-	     ./src/backend/audio-backend.cpp
-	     ./src/backend/data-backend.cpp
+	     ./src/backend/backend.cpp
+	     ./src/backend/backend-deconvolver.cpp
+             ./src/backend/backend-driver.cpp
 	     ./src/backend/audio/faad-decoder.cpp
 	     ./src/backend/audio/mp4processor.cpp
 	     ./src/backend/audio/mp2processor.cpp
@@ -287,7 +298,9 @@
 	     ./src/backend/data/data-processor.cpp
 	     ./devices/virtual-input.cpp
 	     ./devices/rawfiles/rawfiles.cpp
+	     ./devices/rawfiles/raw-reader.cpp
 	     ./devices/wavfiles/wavfiles.cpp
+	     ./devices/wavfiles/wav-reader.cpp
 	     ./src/output/audio-base.cpp
 	     ./src/output/audiosink.cpp
 	     ./src/output/newconverter.cpp
@@ -297,6 +310,7 @@
 	     ./src/support/dab-params.cpp
 	     ./src/support/band-handler.cpp
 	     ./src/support/text-mapper.cpp
+	     ./src/support/dab_tables.cpp
              ./src/support/ensemble-printer.cpp
 	     ./src/support/viterbi_768/viterbi-768.cpp
 	     ./src/support/viterbi_768/spiral-no-sse.c
@@ -316,7 +330,7 @@
              ./includes/ofdm/tii_table.h
              ./includes/ofdm/fic-handler.h
              ./includes/ofdm/fib-processor.h
-	     ./includes/backend/data-backend.h
+	     ./includes/backend/backend.h
              ./includes/backend/audio/faad-decoder.h
              ./includes/backend/audio/mp2processor.h
              ./includes/backend/audio/mp4processor.h
@@ -330,7 +344,9 @@
              ./includes/backend/data/journaline-datahandler.h
              ./includes/backend/data/data-processor.h
              ./devices/rawfiles/rawfiles.h
+             ./devices/rawfiles/raw-reader.h
              ./devices/wavfiles/wavfiles.h
+             ./devices/wavfiles/wav-reader.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h
 	     ./impulse-viewer/impulse-viewer.h
@@ -341,6 +357,8 @@
 	        ${${objectName}_UIS}
 	     ./forms/dabradio.ui
 	     ./forms/technical_data.ui
+	     ./forms/audio-description.ui
+	     ./forms/data-description.ui
 	     ./spectrum-viewer/scopewidget.ui
 	     ./impulse-viewer/impulse-widget.ui
 	     ./tii-viewer/tii-widget.ui)

_service:download_url:qt-dab-2.0.tar.gz/CMakeLists.txt-qt5 -> _service:download_url:qt-dab-2.01.tar.gz/CMakeLists.txt-qt5 Changed

@@ -157,8 +157,10 @@
 	           ${QT_QTGUI_INCLUDE_DIR}
 	           .
 	           ./
+	           ./service-description
 	           ./includes
 	           ./includes/ofdm
+	           ./includes/protection
 	           ./includes/backend
 	           ./includes/backend/audio
 	           ./includes/backend/data
@@ -179,6 +181,9 @@
 
 	set (${objectName}_HDRS
 	     ./dab-processor.h
+	     ./service-description/service-descriptor.h 
+	     ./service-description/audio-descriptor.h 
+	     ./service-description/data-descriptor.h 
              ./includes/country-codes.h
 	     ./includes/dab-constants.h
              ./includes/ofdm/sample-reader.h
@@ -190,18 +195,19 @@
 	     ./includes/ofdm/tii_table.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/timesyncer.h
-	     ./includes/backend/protection.h
-	     ./includes/backend/uep-protection.h
-	     ./includes/backend/eep-protection.h
+	     ./includes/protection/protTables.h
+	     ./includes/protection/protection.h
+	     ./includes/protection/uep-protection.h
+	     ./includes/protection/eep-protection.h
 	     ./includes/backend/firecode-checker.h
 	     ./includes/backend/frame-processor.h
 	     ./includes/backend/charsets.h
 	     ./includes/backend/galois.h
 	     ./incluces/backend/reed-solomon.h
 	     ./includes/backend/msc-handler.h
-	     ./includes/backend/virtual-backend.h
-	     ./includes/backend/audio-backend.h
-	     ./includes/backend/data-backend.h
+	     ./includes/backend/backend.h
+	     ./includes/backend/backend-deconvolver.h
+	     ./includes/backend/backend-driver.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp4processor.h
 	     ./includes/backend/audio/mp2processor.h
@@ -224,7 +230,9 @@
 	     ./includes/backend/data/data-processor.h
 	     ./devices/virtual-input.h
 	     ./devices/rawfiles/rawfiles.h
+	     ./devices/rawfiles/raw-reader.h
 	     ./devices/wavfiles/wavfiles.h
+	     ./devices/wavfiles/wav-reader.h
 	     ./includes/output/fir-filters.h
 	     ./includes/output/audio-base.h
 	     ./includes/output/newconverter.h
@@ -234,6 +242,7 @@
 	     ./includes/support/dab-params.h
 	     ./includes/support/band-handler.h
 	     ./includes/support/text-mapper.h
+	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
 	     ./includes/support/viterbi_768/viterbi-768.h
 	     ./includes/scopes-qwt6/iqdisplay.h
@@ -246,6 +255,8 @@
 	     ${${objectName}_SRCS}
 	     ./main.cpp
 	     ./dab-processor.cpp
+	     ./service-description/audio-descriptor.cpp
+	     ./service-description/data-descriptor.cpp
              ./src/ofdm/sample-reader.cpp
 	     ./src/ofdm/ofdm-decoder.cpp
 	     ./src/ofdm/phasereference.cpp
@@ -256,19 +267,19 @@
 	     ./src/ofdm/tii_table.cpp
 	     ./src/ofdm/tii_detector.cpp
 	     ./src/ofdm/timesyncer.cpp
-	     ./src/backend/protection.cpp
-	     ./src/backend/eep-protection.cpp
-	     ./src/backend/uep-protection.cpp
+	     ./src/protection/protTables.cpp
+	     ./src/protection/protection.cpp
+	     ./src/protection/eep-protection.cpp
+	     ./src/protection/uep-protection.cpp
 	     ./src/backend/firecode-checker.cpp
 	     ./src/backend/frame-processor.cpp
-	     ./src/backend/protTables.cpp
 	     ./src/backend/charsets.cpp
 	     ./src/backend/galois.cpp
 	     ./src/backend/reed-solomon.cpp
 	     ./src/backend/msc-handler.cpp
-	     ./src/backend/virtual-backend.cpp
-	     ./src/backend/audio-backend.cpp
-	     ./src/backend/data-backend.cpp
+	     ./src/backend/backend.cpp
+	     ./src/backend/backend-deconvolver.cpp
+	     ./src/backend/backend-driver.cpp
 	     ./src/backend/audio/faad-decoder.cpp
 	     ./src/backend/audio/mp4processor.cpp
 	     ./src/backend/audio/mp2processor.cpp
@@ -290,7 +301,9 @@
 	     ./src/backend/data/data-processor.cpp
 	     ./devices/virtual-input.cpp
 	     ./devices/rawfiles/rawfiles.cpp
+	     ./devices/rawfiles/raw-reader.cpp
 	     ./devices/wavfiles/wavfiles.cpp
+	     ./devices/wavfiles/wav-reader.cpp
 	     ./src/output/audio-base.cpp
 	     ./src/output/newconverter.cpp
 	     ./src/output/fir-filters.cpp
@@ -299,6 +312,7 @@
 	     ./src/support/dab-params.cpp
 	     ./src/support/band-handler.cpp
 	     ./src/support/text-mapper.cpp
+	     ./src/support/dab_tables.cpp
 	     ./src/support/ensemble-printer.cpp
 	     ./src/support/viterbi_768/viterbi-768.cpp
 	     ./src/support/viterbi_768/spiral-no-sse.c
@@ -318,7 +332,7 @@
 	     ./includes/ofdm/fib-processor.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/tii_table.h
-	     ./includes/backend/data-backend.h
+	     ./includes/backend/backend.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp2processor.h
 	     ./includes/backend/audio/mp4processor.h
@@ -332,7 +346,9 @@
 	     ./includes/backend/data/journaline-datahandler.h
 	     ./includes/backend/data/data-processor.h
 	     ./devices/rawfiles/rawfiles.h
+	     ./devices/rawfiles/raw-reader.h
 	     ./devices/wavfiles/wavfiles.h
+	     ./devices/wavfiles/wav-reader.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./impulse-viewer/impulse-viewer.h 
@@ -343,6 +359,8 @@
 	        ${${objectName}_UIS}
 	     ./forms/dabradio.ui
 	     ./forms/technical_data.ui
+	     ./forms/audio-description.ui
+	     ./forms/data-description.ui
 	     ./spectrum-viewer/scopewidget.ui
 	     ./impulse-viewer/impulse-widget.ui
 	     ./tii-viewer/tii-widget.ui

_service:download_url:qt-dab-2.0.tar.gz/LICENSE -> _service:download_url:qt-dab-2.01.tar.gz/LICENSE Changed

@@ -1,39 +1,12 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
 
-	Copyright (c) 2013 .. 2017
-	Jan van Katwijk
-	Lazy Chair Computing
-	J.vanKatwijk@gmail.com
-
-The Qt-DAB software - as well as its predecessors DAB-rpi and sdr-j-dab 
-and derivatives - are made available under GPL license Version 2.
-
-Many of the ideas as implemented in Qt-DAB are derived from
-other work, made available through the GNU general Public License.
-All copyrights of the original authors are acknowledged.
-
-Qt-DAB is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License, version 2,
-as published by the Free Software Foundation.
-
-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.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden. Commercial non-GPL licensing of this software is possible.
-For more info contact the author, named above.
-
-===========================================================================
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 
- Preamble
+ Preamble
 
 The licenses for most software are designed to take away your
 freedom to share and change it. By contrast, the GNU General Public
@@ -42,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
 your programs, too.
 
 When we speak of free software, we are referring to freedom, not
@@ -82,8 +55,8 @@
 
 The precise terms and conditions for copying, distribution and
 modification follow.
-&#xc;
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 0. This License applies to any program or other work which contains
@@ -137,7 +110,7 @@
 License. (Exception: if the Program itself is interactive but
 does not normally print such an announcement, your work based on
 the Program is not required to print an announcement.)
-&#xc;
+
 These requirements apply to the modified work as a whole. If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -195,7 +168,7 @@
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-&#xc;
+
 4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License. Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -252,7 +225,7 @@
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-&#xc;
+
 8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -282,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
- NO WARRANTY
+ NO WARRANTY
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -304,9 +277,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
- END OF TERMS AND CONDITIONS
-&#xc;
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
 
 If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -318,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
 <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -330,17 +303,16 @@
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type `show c' for details.
@@ -363,5 +335,5 @@
 This General Public License does not permit incorporating your program into
 proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

_service:download_url:qt-dab-2.0.tar.gz/README.md -> _service:download_url:qt-dab-2.01.tar.gz/README.md Changed

@@ -31,12 +31,12 @@
   * Both DAB bands supported: 
   	* VHF Band III
    	* L-Band (only used in Czech Republic and Vatican)
-  * Spectrum view (incl. constellation diagram)
-  * Scanning function (scan the subsequent channels in the selected band  until a channel is encountered where a DAB signal is detected)
+  * Spectrum view (incl. constellation diagram, impulse response, NULL symbol)
+  * Scanning function (scan the subsequent channels in the selected band until a channel is encountered where a DAB signal is detected)
   * 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)
   * Automatic display of TII (Transmitter Identification Information) data when transmitted
   * Dumping of the complete DAB channel (Warning: produces large raw files!) into \* sdr files and playing them again later
-  * Saving audio as uncompressed wave file
+  * Saving audio as uncompressed wave files
   * Saving the ensemble content (audio and data streams, including almost all technical data) into a text file
   * Supports various inputs from 
   	- SDRplay (both RSP I and RSP II),
@@ -48,81 +48,61 @@
 Not  (Not yet or partly) implemented:
 
   * DMB (Audio and Video)
-  * TPEG when configured, TPEG messages are being send to a TCP port, sources for a simple client
+  * TPEG: when configured, TPEG messages are being sent to a TCP port; sources for a simple client
     are part of the source distribution.
   * EPG: when configured, the EPG decoding will generate so called EHB files.
-  * Journaline (an untested Journaline implementation is part of the sources)
+  * Journaline (an untested Journaline implementation is part of the sources).
+  * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888).
   * Other bands than used for terrestrial broadcasting in Europe (like DAB over cable)
 
 ------------------------------------------------------------------
 Introduction
 ------------------------------------------------------------------
 
-![Qt-DAB with Airspy input](/screenshot_qt-dab.png?raw=true)
+![Qt-DAB with sdrplay input](/qt-dab-1.png?raw=true)
 
-**Qt-DAB-2.0** is an implementation of a DAB decoder for use on Linux and
-Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-2.0** 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.
 
-Next to Qt-DAB, there exists a "light" version, dabradio, and a command-line
-based version. Both the Qt-DAB version and the dabradio version are implemented
-in C++, using the Qt framework for the implementation of the GUI.
-The command-line version is implemented using C++, but does not depend on Qt.
+Beside to Qt-DAB, there exists a "light" version, **dabradio**, an SDRPlay-specific version **sdrplayDab** , a command-line based version and a stand-alone
+server version. All these versions with a GUI are implemented in C++, using the Qt framework for the implementation of the GUI. The command-line version is implemented using C++, and does not depend on Qt.
 
-dabradio and the Qt-free version, the "command-line only" version have
-their own repository on Github.
+**dabradio**, **sdrplayDab**, the Qt-free version, **dab-cmdline** the "command-line only", and the **dab-server** version have their own repository on Github.
 
-The Qt-DAB and the dab-cmdline version both support decoding of terrestrial DAB and DAB+ reception from either an AIRSPY, a SDRplay, the HACK rf, or a dabstick (rtl_sdr).
+The Qt-DAB, the dab-cmdline version, and the dab-server version support decoding of terrestrial DAB and DAB+ reception from either an AIRSPY, an SDRplay, the HACK RF, or a dabstick (rtl_sdr). The sdrplayDab version is tightly couples to the SDRplay device.
 
-Next to these C++ based versions, a version in Java is being developed, it has its own repository on Github.
+Beside to these C++ based versions,  (slightly limited) versions are implemented in Java and Ada, both with their own repository on Github. 
 
-The Qt-DAB version also supports input from an rtl-tcp server (see
-osmocom software) and pre-recorded files (`*.sdr`, `*.iq` and `*.raw`).
-Obviously there is a provision for dumping the input into a (*.sdr)-file. 
+The Qt-DAB version also supports input from an rtl-tcp server (see osmocom software) and pre-recorded files (`*.sdr`, `*.iq` and `*.raw`). Obviously there is a provision for dumping the input into an (\*.sdr)-file. 
 
-Note that if the rtl_tcp server is used as input device, the connection
-needs to support the inputrate, i.e. 2048000 I/Q samples (i.e. 2 * 2048000 bytes/second).
+Note that if the rtl_tcp server is used as input device, the connection needs to support the inputrate, i.e. 2,048,000 I/Q samples (i.e. 2 * 2,048,000 bytes/second).
 
-Since the Qt-DAB version has to run on a headless RPI 2,
-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).
+Since the Qt-DAB version 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).
 
 For further information please visit http://www.sdr-j.tk
 
-An (outdated) manual in PDF format can be found at http://www.sdr-j.tk/sdr-j-dab-manual-0.99.pdf (is valid for qt-dab as well)
-
 Some settings are preserved between program invocations, they are stored in a file `.qt-dab.ini`, to be found in the home directory. See [Comment on some settings](#comment-on-some-settings) for more details.
 
 ------------------------------------------------------------------
 Widgets and scopes
 ------------------------------------------------------------------
 
-The picture above shows the execution of the Qt-DAB software. It shows
-the main window, with the (few) control buttons, and 5 other widgets
+The picture below shows Qt-DAB's main window, with the (few) control buttons, and 5 other widgets
 
 * a widget with controls for the attached device,
 * a widget showing the technical information of the selected service, 
-* a widget showing the spectrum of the received radio signal and the
-\ constellation of the decoded signal,
+* a widget showing the spectrum of the received radio signal and the constellation of the decoded signal,
 * a widget showing the spectrum of the NULL period between successive DAB frames,
 * and a widget showing the response(s) from different transmitters in the SFN.
 
-While the main window and the widget for the device control
-are always shown,  each of the others is
-only shown when pushing a button on the main window. 
-In case a widget is invisible (i.e. not selected), the software to
-generate a spectrum is bypassed, so not to waste CPU power.
+While the main window and the widget for the device control are always shown, each of the others is only shown when pushing a button on the main window. In case a widget is invisible (i.e. not selected), the software to generate a spectrum is bypassed, so not to waste CPU power.
 
-![Qt-DAB with Airspy input](/screenshot-2_qt-dab.png?raw=true)
+![Qt-DAB with SDRplay input](/qt-dab-2.png?raw=true)
 
 ------------------------------------------------------------------
 Windows
 ------------------------------------------------------------------
 
-Windows releases can be found at
-https://github.com/JvanKatwijk/qt-dab/releases. The software is packed
-in a zipped folder, (windows-bin.zip). The folder - after unpacking -
-contains the executable (and other executables) as well as the libraries
-to run the software.
+Windows releases can be found at https://github.com/JvanKatwijk/qt-dab/releases. The software is packed in a zipped folder, (windows-bin.zip). The folder - after unpacking - contains the executable (and other executables) as well as the libraries to run the software.
 
 If you want to compile it by yourself, please install Qt through its online installer, see https://www.qt.io/ 
 
@@ -132,9 +112,7 @@
 
 If you are not familar with compiling then please continue reading by jumping to chapter [appImage](#appimage-for-x64-linux-systems) which is much easier for Linux beginners.
 
-Ubuntu 16.04 (and on) have good support for Qt5 and qwt (compiled for Qt5).
-For generating an executable under Ubuntu (16.04 or newer), you can put the following commands into a script. 
-(For Ubuntu 14.04 look into the package manager for Qt4 packages)
+Ubuntu 16.04 (and on) have good support for Qt5 and qwt (compiled for Qt5). For generating an executable under Ubuntu (16.04 or newer), you can put the following commands into a script. (For Ubuntu 14.04 look into the package manager for Qt4 packages)
 
 1. Fetch the required components
    ```
@@ -155,7 +133,7 @@
    cd rtl-sdr/
    mkdir build
    cd build
-   cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER
+   cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
    make
    sudo make install
    sudo ldconfig
@@ -185,10 +163,10 @@
   ```
 
   Note that in order for the libraries to be effective, ensure that
-* (a) the path "/usr/local/lib" is in the load library paths (i.e. it \
-is named in one of the ".conf" files in the "etc/ld.so.conf" directory
-* (b) a file exists in the "/etc/udev/rules.d" directory describing the device,\
-allowing "ordinary" users to access the device.
+  
+ a) the path `/usr/local/lib` is in the load library paths (i.e. it is named in one of the `.conf` files in the `etc/ld.so.conf` directory
+ 
+ b) a file exists in the `/etc/udev/rules.d` directory describing the device, allowing "ordinary" users to access the device.
 
 3. Get a copy of the Qt-DAB sources
   ```
@@ -203,8 +181,7 @@
   INCLUDEPATH += /usr/local/include  /usr/local/qwt-6.1.3
   ````
 
-4.b. If you are compiling on/for an RPI2 device, you might want to uncomment the line DEFINE+=__THREADED_BACKEND__. This will cause a better load balance on
-the cores of the processor. 
+4.b. If you are compiling on/for an RPI2 device, you might want to uncomment the line DEFINE+=__THREADED_BACKEND__. This will cause a better load balance on the cores of the processor. 
 
 4.c. If you are compiling on/for a Linux x64 based PC, you might want to select to uncomment
    ````
@@ -220,7 +197,7 @@
    CONFIG+= NEON_RPI3.
    ````
 
-If unsure uncomment only 
+If unsure, uncomment only 
    ````
    CONFIG+=NO_SSE.
    ````
@@ -241,7 +218,7 @@
 
   You could also use QtCreator, load the `qt-dab.pro` file and build the executable.
   
-  Remark: The exacutable file can be found in the sub-directory linux-bin. A make install command is not implemented.
+  Remark: The executable file can be found in the sub-directory `linux-bin`. A make install command is not implemented.
 
 
 ------------------------------------------------------------------
@@ -273,21 +250,18 @@
 
 for use with (appropriate) extio handlers
 
-Remark: Input from pre-recorded files (8 bit unsigned `*.raw` and `*.iq' as well as 16-bit "wav" `*.sdr` files) is configured by default.
+Remark: Input from pre-recorded files (8 bit unsigned `*.raw` and `*.iq` as well as 16-bit wav `*.sdr` files) is configured by default.
 
-
-Audio samples are - by default - sent to an audio device using the portaudio
-library. Two alternatives are available:
+Audio samples are - by default - sent to an audio device using the portaudio library. Two alternatives are available:
 
 For selecting the output to be sent to a TCP port, uncomment
 ```
 #CONFIG         += tcp-streamer         # use for remote listening
 ```
 
-The source tree contains a directory "sound-client", that contains sources to generate a simple "listener" for remote listening.
+The source tree contains a directory `sound-client`, that contains sources to generate a simple "listener" for remote listening.
 
-For selecting the output to be handled by the Qt system (default device only)

_service:download_url:qt-dab-2.0.tar.gz/appimage/udev-rules-helper -> _service:download_url:qt-dab-2.01.tar.gz/appimage/udev-rules-helper Changed

_service:download_url:qt-dab-2.0.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-2.01.tar.gz/dab-processor.cpp Changed

@@ -34,7 +34,6 @@
 *	local are classes ofdmDecoder, ficHandler and mschandler.
 */
 
-#define	C_LEVEL_SIZE	50
 	dabProcessor::dabProcessor	(RadioInterface	*mr,
 	 virtualInput	*theRig,
 	 uint8_t	dabMode,
@@ -60,15 +59,14 @@
 	 picturesPath),
 	 phaseSynchronizer (mr,
 	 dabMode, 
-	 responseBuffer,
 threshold,
-	 diff_length),
+	 diff_length,
+	 responseBuffer),
 	 my_TII_Detector (dabMode), 
 	 my_ofdmDecoder (mr,
 	 dabMode,
-	 iqBuffer,
-	 theRig -> bitDepth ()) {
-int32_t	i;
+	 theRig -> bitDepth (), 
+	 iqBuffer) {
 
 	this	-> myRadioInterface	= mr;
 	this	-> theRig		= theRig;
@@ -103,6 +101,9 @@
 	 myRadioInterface, SLOT (showSpectrum (int)));
 	connect (this, SIGNAL (show_tii (int)),
 	 myRadioInterface, SLOT (show_tii (int)));
+	connect (this, SIGNAL (show_snr (int)),
+	 mr, SLOT (show_snr (int)));
+	my_TII_Detector. reset ();
 	
 //	the thread will be started from somewhere else
 }
@@ -132,9 +133,11 @@
 int32_t		i;
 std::complex<float>	FreqCorr;
 timeSyncer	myTimeSyncer (&myReader);
+int		attempts;
 
 fineOffset		= 0;
 correctionNeeded	= true;
+	attempts		= 0;
 theRig -> resetBuffer ();
 	coarseOffset	= theRig -> getOffset ();
 	fineOffset		= 0;
@@ -149,6 +152,7 @@
 //Initing:
 notSynced:
 	 setSynced (false);
+	 my_TII_Detector. reset();
 	 switch (myTimeSyncer. sync (T_null, T_F)) {
 	 case TIMESYNC_ESTABLISHED:
 	 break;			// yes, we are ready
@@ -266,6 +270,19 @@
 */
 	 myReader. getSamples (ofdmBuffer. data (),
 	 T_null, coarseOffset + fineOffset);
+	 float sum	= 0;
+	 for (i = 0; i < T_null; i ++)
+	 sum += abs (ofdmBuffer [i]);
+	 sum /= T_null;
+
+	 static	float snr	= 0;
+	 snr = 0.9 * snr +
+	 0.1 * 20 * log10 ((myReader. get_sLevel () + 0.005) / sum);
+	 static int ccc	= 0;
+	 if (++ccc > 10) {
+	 ccc = 0;
+	 show_snr ((int)snr);
+	 }
 /*
 *	The TII data is encoded in the null period of the
 *	odd frames 
@@ -274,26 +291,28 @@
 	 if (wasSecond (my_ficHandler. get_CIFcount (), &params)) {
 	 my_TII_Detector. addBuffer (ofdmBuffer);
 	 if (++tii_counter >= tii_delay) {
-	 int16_t mainId	= -1;
-	 int16_t subId	= -1;
+	 int16_t mainId, subId;
 	 my_TII_Detector. processNULL (&mainId, &subId);
 	 if (mainId > 0)
 	 showCoordinates (mainId, subId);
-	 }
-	 if ((tii_counter & 02) != 0) {
+
 	 tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data (),
 	 T_u);
 	 show_tii (1);
-	 }
-	 if (tii_counter >= tii_delay)
 	 tii_counter = 1;
 	 }
 	 }
+	}
 /**
 *	The first sample to be found for the next frame should be T_g
 *	samples ahead. Before going for the next frame, we
 *	we just check the fineCorrector
 */
+//NewOffset:
+/// we integrate the newly found frequency error with the
+/// existing frequency error.
+ fineOffset += 0.1 * arg (FreqCorr) / (2 * M_PI) * carrierDiff;
+
 	 if (fineOffset > carrierDiff / 2) {
 	 coarseOffset += carrierDiff;
 	 fineOffset -= carrierDiff;
@@ -304,10 +323,6 @@
 	 fineOffset += carrierDiff;
 	 }
 
-//NewOffset:
-///	we integrate the newly found frequency error with the
-///	existing frequency error.
-	 fineOffset += 0.1 * arg (FreqCorr) / (2 * M_PI) * carrierDiff;
 ReadyForNewFrame:
 ///	and off we go, up to the next frame
 	 goto SyncOnPhase;
@@ -387,16 +402,17 @@
 	my_mscHandler. reset ();
 }
 
-void	dabProcessor::set_audioChannel (audiodata *d,
-	 RingBuffer<int16_t> *b) {
-	my_mscHandler. set_audioChannel (d, b);
+void dabProcessor::set_audioChannel (audiodata *d,
+ RingBuffer<int16_t> *b) {
+ my_mscHandler. set_Channel (d, b, (RingBuffer<uint8_t> *)nullptr);
 }
 
-void	dabProcessor::set_dataChannel (packetdata *d,
-	 RingBuffer<uint8_t> *b) {
-	my_mscHandler. set_dataChannel (d, b);
+void dabProcessor::set_dataChannel (packetdata *d,
+ RingBuffer<uint8_t> *b) {
+ my_mscHandler. set_Channel (d, (RingBuffer<int16_t> *)nullptr, b);
 }
 
+
 uint8_t	dabProcessor::get_ecc		(void) {
 	return my_ficHandler. get_ecc ();
 }
@@ -434,4 +450,3 @@
 	}
 }
 
-

_service:download_url:qt-dab-2.0.tar.gz/dab-processor.h -> _service:download_url:qt-dab-2.01.tar.gz/dab-processor.h Changed

_service:download_url:qt-dab-2.0.tar.gz/devices/filereader-widget.ui -> _service:download_url:qt-dab-2.01.tar.gz/devices/filereader-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>589</width>
- <height>124</height>
+ <width>457</width>
+ <height>189</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -17,9 +17,9 @@
 <property name="geometry">
 <rect>
 <x>10</x>
- <y>20</y>
- <width>571</width>
- <height>91</height>
+ <y>10</y>
+ <width>441</width>
+ <height>161</height>
 </rect>
 </property>
 <property name="frameShape">
@@ -31,7 +31,7 @@
 <widget class="QLabel" name="label">
 <property name="geometry">
 <rect>
- <x>10</x>
+ <x>20</x>
 <y>20</y>
 <width>181</width>
 <height>21</height>
@@ -50,9 +50,9 @@
 <widget class="QLabel" name="nameofFile">
 <property name="geometry">
 <rect>
- <x>10</x>
- <y>50</y>
- <width>551</width>
+ <x>20</x>
+ <y>60</y>
+ <width>401</width>
 <height>21</height>
 </rect>
 </property>
@@ -63,6 +63,64 @@
 <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="QLCDNumber" name="currentTime">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>120</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>80</x>
+ <y>120</y>
+ <width>81</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>seconds of </string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="totalTime">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>120</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
 </widget>
 </widget>
 <resources/>

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

@@ -32,11 +32,11 @@
 int	err;
 int	res;
 	hackrfSettings			= s;
-	this	-> myFrame		= new QFrame (NULL);
+	this	-> myFrame		= new QFrame (nullptr);
 	setupUi (this -> myFrame);
 	this	-> myFrame	-> show ();
 	this	-> inputRate		= Khz (2048);
-	_I_Buffer			= NULL;
+	_I_Buffer			= nullptr;
 
 #ifdef __MINGW32__
 const char *libraryString = "libhackrf.dll";
@@ -46,7 +46,7 @@
 Handle = dlopen (libraryString, RTLD_NOW);
 #endif
 
-	if (Handle == NULL) {
+	if (Handle == nullptr) {
 	 fprintf (stderr, "failed to open %s\n", libraryString);
 	 delete myFrame;
 	 throw (20);
@@ -133,7 +133,7 @@
 	 this, SLOT (setVGAGain (int)));
 
 	hackrf_device_list_t *deviceList = this -> hackrf_device_list ();
-	if (deviceList != NULL) {	// well, it should be
+	if (deviceList != nullptr) {	// well, it should be
 	 char *serial = deviceList -> serial_numbers [0];
 	 serial_number_display -> setText (serial);
 	 enum hackrf_usb_board_id board_id =
@@ -148,7 +148,7 @@
 	hackrfHandler::~hackrfHandler	(void) {
 	stopReader ();
 	delete myFrame;
-	if (_I_Buffer != NULL)
+	if (_I_Buffer != nullptr)
 	 delete _I_Buffer;
 	hackrfSettings	-> beginGroup ("hackrfSettings");
 	hackrfSettings	-> setValue ("hack_lnaGain",
@@ -208,8 +208,6 @@
 //	we use a static large buffer, rather than trying to allocate
 //	a buffer on the stack
 static std::complex<float>buffer [32 * 32768];
-static	int64_t	sum	= 0;
-static	int	xount	= 0;
 static
 int	callback (hackrf_transfer *transfer) {
 hackrfHandler *ctx = static_cast <hackrfHandler *>(transfer -> rx_ctx);
@@ -221,14 +219,8 @@
 	 float re	= (((int8_t *)p) [2 * i]) / 128.0;
 	 float im	= (((int8_t *)p) [2 * i + 1]) / 128.0;
 	 buffer [i]	= std::complex<float> (re, im);
-	 sum += (re < 0 ? - re : re) + (im < 0 ? -im : im);
-	}
-	q	-> putDataIntoBuffer (buffer, transfer -> valid_length / 2);
-	if (xount > 2048000) {
-	 xount = 0;
-	 fprintf (stderr, "%d\n", sum / xount);
-	 sum = 0;
 	}
+	q -> putDataIntoBuffer (buffer, transfer -> valid_length / 2);
 	return 0;
 }
 
@@ -289,49 +281,49 @@
 //	link the required procedures
 	this -> hackrf_init	= (pfn_hackrf_init)
 	 GETPROCADDRESS (Handle, "hackrf_init");
-	if (this -> hackrf_init == NULL) {
+	if (this -> hackrf_init == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_init\n");
 	 return false;
 	}
 
 	this -> hackrf_open	= (pfn_hackrf_open)
 	 GETPROCADDRESS (Handle, "hackrf_open");
-	if (this -> hackrf_open == NULL) {
+	if (this -> hackrf_open == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_open\n");
 	 return false;
 	}
 
 	this -> hackrf_close	= (pfn_hackrf_close)
 	 GETPROCADDRESS (Handle, "hackrf_close");
-	if (this -> hackrf_close == NULL) {
+	if (this -> hackrf_close == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_close\n");
 	 return false;
 	}
 
 	this -> hackrf_exit	= (pfn_hackrf_exit)
 	 GETPROCADDRESS (Handle, "hackrf_exit");
-	if (this -> hackrf_exit == NULL) {
+	if (this -> hackrf_exit == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_exit\n");
 	 return false;
 	}
 
 	this -> hackrf_start_rx	= (pfn_hackrf_start_rx)
 	 GETPROCADDRESS (Handle, "hackrf_start_rx");
-	if (this -> hackrf_start_rx == NULL) {
+	if (this -> hackrf_start_rx == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_start_rx\n");
 	 return false;
 	}
 
 	this -> hackrf_stop_rx	= (pfn_hackrf_stop_rx)
 	 GETPROCADDRESS (Handle, "hackrf_stop_rx");
-	if (this -> hackrf_stop_rx == NULL) {
+	if (this -> hackrf_stop_rx == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_stop_rx\n");
 	 return false;
 	}
 
 	this -> hackrf_device_list	= (pfn_hackrf_device_list)
 	 GETPROCADDRESS (Handle, "hackrf_device_list");
-	if (this -> hackrf_device_list == NULL) {
+	if (this -> hackrf_device_list == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_device_list\n");
 	 return false;
 	}
@@ -340,56 +332,56 @@
 	 (pfn_hackrf_set_baseband_filter_bandwidth)
 	 GETPROCADDRESS (Handle,
 	 "hackrf_set_baseband_filter_bandwidth");
-	if (this -> hackrf_set_baseband_filter_bandwidth == NULL) {
+	if (this -> hackrf_set_baseband_filter_bandwidth == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_set_baseband_filter_bandwidth\n");
 	 return false;
 	}
 
 	this -> hackrf_set_lna_gain	= (pfn_hackrf_set_lna_gain)
 	 GETPROCADDRESS (Handle, "hackrf_set_lna_gain");
-	if (this -> hackrf_set_lna_gain == NULL) {
+	if (this -> hackrf_set_lna_gain == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_set_lna_gain\n");
 	 return false;
 	}
 
 	this -> hackrf_set_vga_gain	= (pfn_hackrf_set_vga_gain)
 	 GETPROCADDRESS (Handle, "hackrf_set_vga_gain");
-	if (this -> hackrf_set_vga_gain == NULL) {
+	if (this -> hackrf_set_vga_gain == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_set_vga_gain\n");
 	 return false;
 	}
 
 	this -> hackrf_set_freq	= (pfn_hackrf_set_freq)
 	 GETPROCADDRESS (Handle, "hackrf_set_freq");
-	if (this -> hackrf_set_freq == NULL) {
+	if (this -> hackrf_set_freq == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_set_freq\n");
 	 return false;
 	}
 
 	this -> hackrf_set_sample_rate	= (pfn_hackrf_set_sample_rate)
 	 GETPROCADDRESS (Handle, "hackrf_set_sample_rate");
-	if (this -> hackrf_set_sample_rate == NULL) {
+	if (this -> hackrf_set_sample_rate == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_set_sample_rate\n");
 	 return false;
 	}
 
 	this -> hackrf_is_streaming	= (pfn_hackrf_is_streaming)
 	 GETPROCADDRESS (Handle, "hackrf_is_streaming");
-	if (this -> hackrf_is_streaming == NULL) {
+	if (this -> hackrf_is_streaming == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_is_streaming\n");
 	 return false;
 	}
 
 	this -> hackrf_error_name	= (pfn_hackrf_error_name)
 	 GETPROCADDRESS (Handle, "hackrf_error_name");
-	if (this -> hackrf_error_name == NULL) {
+	if (this -> hackrf_error_name == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_error_name\n");
 	 return false;
 	}
 
 	this -> hackrf_usb_board_id_name = (pfn_hackrf_usb_board_id_name)
 	 GETPROCADDRESS (Handle, "hackrf_usb_board_id_name");
-	if (this -> hackrf_usb_board_id_name == NULL) {
+	if (this -> hackrf_usb_board_id_name == nullptr) {
 	 fprintf (stderr, "Could not find hackrf_usb_board_id_name\n");
 	 return false;
 	}

_service:download_url:qt-dab-2.01.tar.gz/devices/rawfiles/raw-reader.cpp Added

@@ -0,0 +1,110 @@
+#
+/*
+ * 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
+ */
+
+#include	<sys/time.h>
+#include	"raw-reader.h"
+#include	"rawfiles.h"
+
+
+#define	BUFFERSIZE	32768
+static inline
+int64_t getMyTime (void) {
+struct timeval tv;
+
+ gettimeofday (&tv, NULL);
+ return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
+}
+
+	rawReader::rawReader	(rawFiles *mr,
+	 FILE	*filePointer,
+	 RingBuffer<uint8_t> *theBuffer) {
+	this	-> parent	= mr;
+	this	-> filePointer	= filePointer;
+	this	-> theBuffer	= theBuffer;
+
+	fseek (filePointer, 0, SEEK_END);
+	fileLength		= ftell (filePointer);
+	fprintf (stderr, "fileLength = %d\n", fileLength);
+ fseek (filePointer, 0, SEEK_SET);
+	period = (32768 * 1000) / (2 * 2048); // full IQś read
+ fprintf (stderr, "Period = %ld\n", period);
+ bi = new uint8_t [BUFFERSIZE];
+	running. store (false);
+	start ();
+}
+
+		rawReader::~rawReader	(void) {
+	stopReader ();
+	delete[] bi;
+}
+
+void	rawReader::stopReader	(void) {
+	if (running) {
+	 running = false;
+	 while (isRunning ())
+	 usleep (200);
+	}
+}
+
+void	rawReader::run		(void) {
+int64_t	nextStop;
+int	i;
+int	teller	= 0;
+
+	connect (this, SIGNAL (setProgress (int, float)),
+	 parent, SLOT (setProgress (int, float)));
+	fseek (filePointer, 0, SEEK_SET);
+	running. store (true);
+	nextStop = getMyTime ();
+	try {
+	 while (running. load ()) {
+	 while (theBuffer -> WriteSpace () < BUFFERSIZE + 10) {
+	 if (!running. load ())
+	 throw (32);
+	 usleep (100);
+ }
+	
+	 if (++teller >= 20) {
+	 int xx = ftell (filePointer);
+	 float progress = (float)xx / fileLength;
+	 setProgress ((int)(progress * 100), (float)xx / (2 * 2048000));
+ teller = 0;
+	 }
+
+	 nextStop += period;
+	 int n = fread (bi, sizeof (uint8_t), BUFFERSIZE, filePointer);
+	 if (n < BUFFERSIZE) {
+	 fprintf (stderr, "eof gehad\n");
+	 fseek (filePointer, 0, SEEK_SET);
+ for (i = n; i < BUFFERSIZE; i ++)
+ bi [i] = 0;
+ }
+
+ theBuffer -> putDataIntoBuffer (bi, BUFFERSIZE);
+ if (nextStop - getMyTime () > 0)
+ usleep (nextStop - getMyTime ());
+ }
+	} catch (int e) {}
+ fprintf (stderr, "taak voor replay eindigt hier\n");
+}
+
+

_service:download_url:qt-dab-2.01.tar.gz/devices/rawfiles/raw-reader.h Added

@@ -0,0 +1,53 @@
+#
+/*
+ * 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	__RAW_READER__
+#define	__RAW_READER__
+
+#include	<QThread>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<atomic>
+class	rawFiles;
+
+class	rawReader:public QThread {
+Q_OBJECT
+public:
+			rawReader	(rawFiles *,
+	 FILE *, RingBuffer<uint8_t> *); 
+			~rawReader	(void);
+	void		startReader	(void);
+	void		stopReader	(void);
+private:
+virtual void		run		(void);
+	FILE		*filePointer;
+	RingBuffer<uint8_t>	*theBuffer;
+	uint64_t	period;
+	std::atomic<bool>	running;
+	uint8_t		*bi;
+	rawFiles	*parent;
+	int64_t		fileLength;
+signals:
+	void		setProgress	(int, float);
+};
+
+#endif
+

_service:download_url:qt-dab-2.0.tar.gz/devices/rawfiles/rawfiles.cpp -> _service:download_url:qt-dab-2.01.tar.gz/devices/rawfiles/rawfiles.cpp Changed

@@ -32,13 +32,7 @@
 #include	<sys/time.h>
 #include	<time.h>
 
-static inline
-int64_t		getMyTime	(void) {
-struct timeval	tv;
-
-	gettimeofday (&tv, NULL);
-	return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
-}
+#include	"raw-reader.h"
 
 #define	INPUT_FRAMEBUFFERSIZE	8 * 32768
 //
@@ -49,7 +43,6 @@
 	setupUi	(myFrame);
 	myFrame		-> show ();
 	_I_Buffer	= new RingBuffer<uint8_t>(INPUT_FRAMEBUFFERSIZE);
-	readerOK	= false;
 	filePointer	= fopen (f. toUtf8 (). data (), "rb");
 	if (filePointer == NULL) {
 	 fprintf (stderr, "file %s cannot open\n",
@@ -60,48 +53,58 @@
 	 throw (31);
 	}
 	nameofFile	-> setText (f);
-	readerOK	= true;
-	readerPausing	= true;
-	currPos		= 0;
-	start	();
+	fseek (filePointer, 0, SEEK_END);
+	int64_t fileLength = ftell (filePointer);
+ totalTime -> display ((float)fileLength / (2048000 * 2));
+	fseek (filePointer, 0, SEEK_SET);
+	fileProgress -> setValue (0);
+ currentTime -> display (0);
+
+	running. store (false);
 }
 
 	rawFiles::~rawFiles (void) {
-	ExitCondition = true;
-	if (readerOK) {
-	 while (isRunning ())
+	if (running. load ()) {
+	 readerTask	-> stopReader ();
+	 while (readerTask -> isRunning ())
 	 usleep (100);
-	 if (filePointer != NULL)
-	 fclose (filePointer);
+	 delete readerTask;
 	}
+	if (filePointer != NULL)
+	 fclose (filePointer);
+
 	delete _I_Buffer;
 	delete	myFrame;
 }
 
 bool	rawFiles::restartReader	(void) {
-	if (readerOK)
-	 readerPausing = false;
-	return readerOK;
+	if (running. load ())
+	 return true;
+	readerTask	= new rawReader (this, filePointer, _I_Buffer);
+	running. store (true);
+	return true;
 }
 
 void	rawFiles::stopReader	(void) {
-	if (readerOK)
-	 readerPausing = true;
+	if (running. load ()) {
+	 readerTask	-> stopReader ();
+	 while (readerTask -> isRunning ())
+	 usleep (100);
+	 delete readerTask;
+	}
+	running. store (false);
 }
 
 //	size is in I/Q pairs, file contains 8 bits values
 int32_t	rawFiles::getSamples	(std::complex<float> *V, int32_t size) {
 int32_t	amount, i;
-uint8_t	*temp = (uint8_t *)alloca (2 * size * sizeof (uint8_t));
+uint8_t	temp [2 * size];
 
 	if (filePointer == NULL)
 	 return 0;
 
 	while ((int32_t)(_I_Buffer -> GetRingBufferReadAvailable ()) < 2 * size)
-	 if (readerPausing)
-	 usleep (100000);
-	 else
-	 msleep (100);
+	 usleep (500);
 
 	amount = _I_Buffer	-> getDataFromBuffer (temp, 2 * size);
 	for (i = 0; i < amount / 2; i ++)
@@ -114,59 +117,9 @@
 	return _I_Buffer -> GetRingBufferReadAvailable () / 2;
 }
 
-void	rawFiles::run (void) {
-int32_t	t, i;
-uint8_t	*bi;
-int32_t	bufferSize	= 32768;
-int64_t	period;
-int64_t	nextStop;
-
-	if (!readerOK)
-	 return;
-
-	ExitCondition = false;
-
-	period		= (32768 * 1000) / (2 * 2048);	// full IQś read
-	fprintf (stderr, "Period = %ld\n", period);
-	bi		= new uint8_t [bufferSize];
-	nextStop	= getMyTime ();
-	while (!ExitCondition) {
-	 if (readerPausing) {
-	 usleep (1000);
-	 nextStop = getMyTime ();
-	 continue;
-	 }
-	 while (_I_Buffer -> WriteSpace () < bufferSize + 10) {
-	 if (ExitCondition)
-	 break;
-	 usleep (100);
-	 }
-
-	 nextStop += period;
-	 t = readBuffer (bi, bufferSize);
-	 if (t <= 0) {
-	 for (i = 0; i < bufferSize; i ++)
-	 bi [i] = 0;
-	 t = bufferSize;
-	 }
-	 _I_Buffer -> putDataIntoBuffer (bi, t);
-	 if (nextStop - getMyTime () > 0)
-	 usleep (nextStop - getMyTime ());
-	}
-	fprintf (stderr, "taak voor replay eindigt hier\n");
+void	rawFiles::setProgress (int progress, float timelength) {
+	fileProgress -> setValue (progress);
+	currentTime -> display (timelength);
 }
-/*
- *	length is number of uints that we read.
- */
-int32_t	rawFiles::readBuffer (uint8_t *data, int32_t length) {
-int32_t	n;
 
-	n = fread (data, sizeof (uint8_t), length, filePointer);
-	currPos		+= n;
-	if (n < length) {
-	 fseek (filePointer, 0, SEEK_SET);
-	 fprintf (stderr, "End of file, restarting\n");
-	}
-	return	n & ~01;
-}

_service:download_url:qt-dab-2.0.tar.gz/devices/rawfiles/rawfiles.h -> _service:download_url:qt-dab-2.01.tar.gz/devices/rawfiles/rawfiles.h Changed

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

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

@@ -15,7 +15,7 @@
 
 // Application code should check that it is compiled against the same API version
 // mir_sdr_ApiVersion() returns the API version 
-#define MIR_SDR_API_VERSION   (float)(2.09)
+#define MIR_SDR_API_VERSION   (float)(2.13)
 
 #if defined(ANDROID) || defined(__ANDROID__)
 // Android requires a mechanism to request info from Java application
@@ -24,10 +24,14 @@
   mir_sdr_GetFd              = 0,
   mir_sdr_FreeFd             = 1,
   mir_sdr_DevNotFound        = 2,
-  mir_sdr_DevRemoved         = 3
+  mir_sdr_DevRemoved         = 3,
+  mir_sdr_GetVendorId        = 4,
+  mir_sdr_GetProductId       = 5,
+  mir_sdr_GetRevId           = 6,
+  mir_sdr_GetDeviceId        = 7
 } mir_sdr_JavaReqT;
 
-typedef int (*mir_sdr_SendJavaReq_t)(mir_sdr_JavaReqT cmd, int param);
+typedef int (*mir_sdr_SendJavaReq_t)(mir_sdr_JavaReqT cmd, char *path, char *serNum);
 #endif
 
 typedef enum
@@ -45,7 +49,8 @@
   mir_sdr_NotInitialised     = 10,
   mir_sdr_NotEnabled         = 11,
   mir_sdr_HwVerError         = 12,
-  mir_sdr_OutOfMemError      = 13
+  mir_sdr_OutOfMemError      = 13,
+  mir_sdr_HwRemoved          = 14
 } mir_sdr_ErrT;
 
 typedef enum
@@ -173,8 +178,14 @@
    float min;
 } mir_sdr_GainValuesT;
 
+typedef enum
+{
+   mir_sdr_rspDuo_Tuner_1 = 1,
+   mir_sdr_rspDuo_Tuner_2 = 2,
+} mir_sdr_rspDuo_TunerSelT;
+
 // mir_sdr_StreamInit() callback function prototypes
-typedef void (*mir_sdr_StreamCallback_t)(short *xi, short *xq, unsigned int firstSampleNum, int grChanged, int rfChanged, int fsChanged, unsigned int numSamples, unsigned int reset, void *cbContext); 
+typedef void (*mir_sdr_StreamCallback_t)(short *xi, short *xq, unsigned int firstSampleNum, int grChanged, int rfChanged, int fsChanged, unsigned int numSamples, unsigned int reset, unsigned int hwRemoved, void *cbContext); 
 typedef void (*mir_sdr_GainChangeCallback_t)(unsigned int gRdB, unsigned int lnaGRdB, void *cbContext); 
 
 typedef mir_sdr_ErrT (*mir_sdr_Init_t)(int gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int *samplesPerPacket);
@@ -208,6 +219,7 @@
 typedef mir_sdr_ErrT (*mir_sdr_GetGrByFreq_t)(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode); 
 typedef mir_sdr_ErrT (*mir_sdr_DebugEnable_t)(unsigned int enable);    
 typedef mir_sdr_ErrT (*mir_sdr_GetCurrentGain_t)(mir_sdr_GainValuesT *gainVals);    
+typedef mir_sdr_ErrT (*mir_sdr_GainChangeCallbackMessageReceived_t)(void); 
 
 typedef mir_sdr_ErrT (*mir_sdr_GetDevices_t)(mir_sdr_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
 typedef mir_sdr_ErrT (*mir_sdr_SetDeviceIdx_t)(unsigned int idx);    
@@ -223,6 +235,17 @@
 
 typedef mir_sdr_ErrT (*mir_sdr_AmPortSelect_t)(int port);                          
 
+typedef mir_sdr_ErrT (*mir_sdr_rsp1a_BiasT_t)(int enable);
+typedef mir_sdr_ErrT (*mir_sdr_rsp1a_DabNotch_t)(int enable);
+typedef mir_sdr_ErrT (*mir_sdr_rsp1a_BroadcastNotch_t)(int enable);
+
+typedef mir_sdr_ErrT (*mir_sdr_rspDuo_TunerSel_t)(mir_sdr_rspDuo_TunerSelT sel);
+typedef mir_sdr_ErrT (*mir_sdr_rspDuo_ExtRef_t)(int enable);
+typedef mir_sdr_ErrT (*mir_sdr_rspDuo_BiasT_t)(int enable);
+typedef mir_sdr_ErrT (*mir_sdr_rspDuo_Tuner1AmNotch_t)(int enable);
+typedef mir_sdr_ErrT (*mir_sdr_rspDuo_BroadcastNotch_t)(int enable);
+typedef mir_sdr_ErrT (*mir_sdr_rspDuo_DabNotch_t)(int enable);
+
 // API function definitions
 #ifdef __cplusplus
 extern "C"
@@ -288,9 +311,10 @@
    _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_StreamInit(int *gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode, int *samplesPerPacket, mir_sdr_StreamCallback_t StreamCbFn, mir_sdr_GainChangeCallback_t GainChangeCbFn, void *cbContext); 
    _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_StreamUninit(void); 
    _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_Reinit(int *gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, mir_sdr_LoModeT loMode, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode, int *samplesPerPacket, mir_sdr_ReasonForReinitT reasonForReinit);
-   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetGrByFreq(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode); 
-   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_DebugEnable(unsigned int enable);  
-   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetCurrentGain(mir_sdr_GainValuesT *gainVals);    
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetGrByFreq(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_DebugEnable(unsigned int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetCurrentGain(mir_sdr_GainValuesT *gainVals);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GainChangeCallbackMessageReceived(void); 
 
    _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetDevices(mir_sdr_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
    _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_SetDeviceIdx(unsigned int idx);   
@@ -311,6 +335,18 @@
 
    _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_AmPortSelect(int port);   // If called after mir_sdr_Init() a call to mir_sdr_Reinit(..., reasonForReinit = mir_sdr_CHANGE_AM_PORT)
                                                                      // is also required to change the port
+
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rsp1a_BiasT(int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rsp1a_DabNotch(int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rsp1a_BroadcastNotch(int enable);
+
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_TunerSel(mir_sdr_rspDuo_TunerSelT sel);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_ExtRef(int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_BiasT(int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_Tuner1AmNotch(int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_BroadcastNotch(int enable);
+   _MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_DabNotch(int enable);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -27,10 +27,35 @@
 #include	"sdrplay-handler.h"
 #include	"sdrplayselect.h"
 
-#define	DEFAULT_GRED	40
+static
+int RSP1_Table [] = {0, 24, 19, 43};
+
+static
+int RSP1A_Table [] = {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
+
+static
+int RSP2_Table [] = {0, 10, 15, 21, 24, 34, 39, 45, 64};
+
+static
+int	RSPduo_Table [] = {0, 6, 12, 18, 20, 26, 32, 38, 57, 62};
 
+static
+int	get_lnaGRdB (int hwVersion, int lnaState) {
+	switch (hwVersion) {
+	 case 1:
+	 return RSP1_Table [lnaState];
+
+	 case 2:
+	 return RSP2_Table [lnaState];
+
+	 default:
+	 return RSP1A_Table [lnaState];
+	}
+}
+//
+//	here we start
 	sdrplayHandler::sdrplayHandler (QSettings *s) {
-int	err;
+mir_sdr_ErrT	err;
 float	ver;
 mir_sdr_DeviceT devDesc [4];
 mir_sdr_GainValuesT gainDesc;
@@ -41,6 +66,7 @@
 	setupUi (this -> myFrame);
 	this	-> myFrame	-> show ();
 	antennaSelector		-> hide ();
+	tunerSelector		-> hide ();
 	this	-> inputRate		= Khz (2048);
 	_I_Buffer			= NULL;
 	libraryLoaded			= false;
@@ -66,7 +92,7 @@
 	 NULL,
 	 (LPBYTE)&APIkeyValue,
 	 (LPDWORD)&APIkeyValue_length);
-//	Ok, make explicit it is in the 64 bits section
+//	Ok, make explicit it is in the 32 bits section
 	wchar_t *x = wcscat (APIkeyValue, (wchar_t *)L"\\x86\\mir_sdr_api.dll");
 //	wchar_t *x = wcscat (APIkeyValue, (wchar_t *)L"\\x64\\mir_sdr_api.dll");
 //	fprintf (stderr, "Length of APIkeyValue = %d\n", APIkeyValue_length);
@@ -105,7 +131,19 @@
 	}
 
 	err		= my_mir_sdr_ApiVersion (&ver);
-	if (ver < 2.05) {
+	if (err != mir_sdr_Success) {
+	 fprintf (stderr, "error at ApiVersion %s\n",
+	 errorCodes (err). toLatin1 (). data ());
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (24);
+	}
+	
+	if (ver < 2.13) {
 	 fprintf (stderr, "sorry, library too old\n");
 #ifdef __MINGW32__
 FreeLibrary (Handle);
@@ -118,32 +156,50 @@
 
 	api_version	-> display (ver);
 	_I_Buffer	= new RingBuffer<std::complex<float>>(1024 * 1024);
-	vfoFrequency	= Khz (220000);
-	currentGred	= DEFAULT_GRED;
-//
+	vfoFrequency	= Khz (220000);		// default
+
 //	See if there are settings from previous incarnations
+//	and config stuff
+
 	sdrplaySettings		-> beginGroup ("sdrplaySettings");
 	coarseOffset	=
-	 sdrplaySettings -> value ("sdrplayOffset", 0). toInt ();
-	gainSlider 		-> setValue (
-	 sdrplaySettings -> value ("sdrplayGain", 50). toInt ());
+	 sdrplaySettings -> value ("sdrplayOffset", 0). toInt ();
+	ifgainSlider 		-> setValue (
+	 sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt ());
+	lnaGainSetting		-> setValue (
+	 sdrplaySettings -> value ("sdrplay-lnastate", 0). toInt ());
+//	show the value
+	GRdBDisplay		-> display (ifgainSlider -> value ());
 
 	ppmControl		-> setValue (
 	 sdrplaySettings -> value ("sdrplay-ppm", 0). toInt ());
+	bool	debugFlag	=
+	 sdrplaySettings -> value ("sdrplay-debug", 0). toInt ();
+	if (!debugFlag)
+	 debugControl -> hide ();
+	bool agcMode		=
+	 sdrplaySettings -> value ("sdrplay-agcMode", 0). toInt () != 0;
+	if (agcMode) {
+	 agcControl -> setChecked (true);
+	 ifgainSlider -> hide ();
+	 gainsliderLabel -> hide ();
+	}
 	sdrplaySettings	-> endGroup ();
 
-	setExternalGain	(gainSlider	-> value ());
-	set_ppmControl (ppmControl	-> value ());
-//
-//	and be prepared for future changes in the settings
-	connect (gainSlider, SIGNAL (valueChanged (int)),
-	 this, SLOT (setExternalGain (int)));
-	connect (agcControl, SIGNAL (stateChanged (int)),
-	 this, SLOT (agcControl_toggled (int)));
-	connect (ppmControl, SIGNAL (valueChanged (int)),
-	 this, SLOT (set_ppmControl (int)));
+	err = my_mir_sdr_GetDevices (devDesc, &numofDevs, uint32_t (4));
+	if (err != mir_sdr_Success) {
+	 fprintf (stderr, "error at GetDevices %s \n",
+	 errorCodes (err). toLatin1 (). data ());
+
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (25);
+	}
 
-	my_mir_sdr_GetDevices (devDesc, &numofDevs, uint32_t (4));
 	if (numofDevs == 0) {
 	 fprintf (stderr, "Sorry, no device found\n");
 #ifdef __MINGW32__
@@ -174,31 +230,79 @@
 
 	serialNumber -> setText (devDesc [deviceIndex]. SerNo);
 	hwVersion = devDesc [deviceIndex]. hwVer;
- fprintf (stderr, "hwVer = %d\n", hwVersion);
-	my_mir_sdr_SetDeviceIdx (deviceIndex);
+	fprintf (stderr, "hwVer = %d\n", hwVersion);
+	fprintf (stderr, "devicename = %s\n", devDesc [deviceIndex]. DevNm);
 
-	antennaSelector -> hide ();
-	if (hwVersion == 2) {
-	 antennaSelector -> show ();
-	 connect (antennaSelector, SIGNAL (activated (const QString &)),
-	 this, SLOT (set_antennaControl (const QString &)));
-	}
+	err = my_mir_sdr_SetDeviceIdx (deviceIndex);
+	if (err != mir_sdr_Success) {
+	 fprintf (stderr, "error at SetDeviceIdx %s \n",
+	 errorCodes (err). toLatin1 (). data ());
 
-	if (hwVersion == 255) {
-	 nrBits	= 14;
-	 denominator	= 2048;
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (25);
 	}
-	else {
-	 nrBits	= 12;
-	 denominator	= 2048;
-	}
-	 
-	unsigned char text;
-	(void)my_mir_sdr_GetHwVersion (&text);
-	fprintf (stderr, "hwVersion = %o\n", hwVersion);
-//	my_mir_sdr_ResetUpdateFlags (1, 0, 0);
+//
+//	we know we are only in the frequency range 175 .. 230 Mhz,
+//	so we can rely on a single table for the lna reductions.
+	switch (hwVersion) {
+	 case 1:		// old RSP
+	 lnaGainSetting	-> setRange (0, 3);
+	 deviceLabel	-> setText ("RSP-I");
+	 nrBits		= 12;
+	 denominator	= 2048;
+	 break;
+	 case 2:
+	 lnaGainSetting	-> setRange (0, 8);
+	 deviceLabel	-> setText ("RSP-II");
+	 nrBits		= 12;
+	 denominator	= 2048;
+	 antennaSelector -> show ();

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

@@ -40,6 +40,7 @@
 	 int32_t	fsChanged,
 	 uint32_t	numSamples,
 	 uint32_t	reset,
+	 uint32_t	hwRemoved,
 	 void		*cbContext);
 typedef	void	(*mir_sdr_GainChangeCallback_t)(uint32_t	gRdB,
 	 uint32_t	lnaGRdB,
@@ -63,6 +64,8 @@
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetRf)(double drfHz, int abs, int syncUpdate);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetFs)(double dfsHz, int abs, int syncUpdate, int reCal);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetGr)(int gRdB, int abs, int syncUpdate);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_RSP_SetGr)(int gRdB, int lnaState,
+		 int abs, int syncUpdate);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetGrParams)(int minimumGr, int lnaGrThreshold);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetDcMode)(int dcCal, int speedUp);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetDcTrackTime)(int trackTime);
@@ -79,10 +82,10 @@
 typedef mir_sdr_ErrT (*pfn_mir_sdr_GetCurrentGain) (mir_sdr_GainValuesT *);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_GetHwVersion) (unsigned char *);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_RSPII_AntennaControl) (mir_sdr_RSPII_AntennaSelectT);
+typedef mir_sdr_ErrT (*pfn_mir_sdr_rspDuo_TunerSel) (mir_sdr_rspDuo_TunerSelT);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_SetDeviceIdx) (unsigned int);
 typedef mir_sdr_ErrT (*pfn_mir_sdr_ReleaseDeviceIdx) (unsigned int);
 
-
 ///////////////////////////////////////////////////////////////////////////
 class	sdrplayHandler: public virtualInput, public Ui_sdrplayWidget {
 Q_OBJECT
@@ -99,7 +102,6 @@
 	 int32_t);
 	int32_t		Samples			(void);
 	void		resetBuffer		(void);
-	int16_t		maxGain			(void);
 	int16_t		bitDepth		(void);
 //
 //	The buffer should be visible by the callback function
@@ -112,6 +114,7 @@
 	pfn_mir_sdr_SetRf	my_mir_sdr_SetRf;
 	pfn_mir_sdr_SetFs	my_mir_sdr_SetFs;
 	pfn_mir_sdr_SetGr	my_mir_sdr_SetGr;
+	pfn_mir_sdr_RSP_SetGr	my_mir_sdr_RSP_SetGr;
 	pfn_mir_sdr_SetGrParams	my_mir_sdr_SetGrParams;
 	pfn_mir_sdr_SetDcMode	my_mir_sdr_SetDcMode;
 	pfn_mir_sdr_SetDcTrackTime my_mir_sdr_SetDcTrackTime;
@@ -131,9 +134,11 @@
 	pfn_mir_sdr_GetCurrentGain my_mir_sdr_GetCurrentGain;
 	pfn_mir_sdr_GetHwVersion my_mir_sdr_GetHwVersion;
 	pfn_mir_sdr_RSPII_AntennaControl my_mir_sdr_RSPII_AntennaControl;
+	pfn_mir_sdr_rspDuo_TunerSel my_mir_sdr_rspDuo_TunerSel;
 	pfn_mir_sdr_SetDeviceIdx my_mir_sdr_SetDeviceIdx;
 	pfn_mir_sdr_ReleaseDeviceIdx my_mir_sdr_ReleaseDeviceIdx;
 
+	QString		errorCodes	(mir_sdr_ErrT);
 	int16_t		hwVersion;
 	uint32_t	numofDevs;
 	int16_t		deviceIndex;
@@ -142,17 +147,19 @@
 	QFrame		*myFrame;
 	int32_t		inputRate;
 	int32_t		vfoFrequency;
-	int		currentGred;
 	bool		libraryLoaded;
 	std::atomic<bool>	running;
 	HINSTANCE	Handle;
 	bool		agcMode;
 	int16_t		nrBits;
 private slots:
-	void		setExternalGain	(int);
-	void		agcControl_toggled	(int);
+	void		set_ifgainReduction	(int);
+	void		set_lnagainReduction	(int);
+	void		set_agcControl		(int);
+	void		set_debugControl	(int);
 	void		set_ppmControl		(int);
-	void		set_antennaControl	(const QString &);
+	void		set_antennaSelect	(const QString &);
+	void		set_tunerSelect		(const QString &);
 };
 #endif

_service:download_url:qt-dab-2.0.tar.gz/devices/sdrplay-handler/sdrplay-widget.ui -> _service:download_url:qt-dab-2.01.tar.gz/devices/sdrplay-handler/sdrplay-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>256</width>
- <height>300</height>
+ <width>280</width>
+ <height>301</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -18,7 +18,7 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>211</width>
+ <width>261</width>
 <height>291</height>
 </rect>
 </property>
@@ -28,12 +28,12 @@
 <property name="frameShadow">
 <enum>QFrame::Raised</enum>
 </property>
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="deviceLabel">
 <property name="geometry">
 <rect>
 <x>10</x>
 <y>80</y>
- <width>101</width>
+ <width>81</width>
 <height>21</height>
 </rect>
 </property>
@@ -57,12 +57,15 @@
 <widget class="QLCDNumber" name="api_version">
 <property name="geometry">
 <rect>
- <x>20</x>
- <y>40</y>
- <width>91</width>
+ <x>90</x>
+ <y>80</y>
+ <width>81</width>
 <height>21</height>
 </rect>
 </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version of the SDRplay library detected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="lineWidth">
 <number>0</number>
 </property>
@@ -70,30 +73,42 @@
 <enum>QLCDNumber::Flat</enum>
 </property>
 </widget>
- <widget class="QSlider" name="gainSlider">
+ <widget class="QSlider" name="ifgainSlider">
 <property name="geometry">
 <rect>
- <x>170</x>
- <y>29</y>
+ <x>220</x>
+ <y>50</y>
 <width>20</width>
- <height>171</height>
+ <height>121</height>
 </rect>
 </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;gain slider, its value is used as measure for the gain reduction of the baseband signal. If the agc is selected, the slider is not effective and is not shown.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>20</number>
+ </property>
+ <property name="maximum">
+ <number>59</number>
+ </property>
 <property name="orientation">
 <enum>Qt::Vertical</enum>
 </property>
 </widget>
- <widget class="QLCDNumber" name="gainDisplay">
+ <widget class="QLCDNumber" name="GRdBDisplay">
 <property name="geometry">
 <rect>
- <x>160</x>
- <y>0</y>
- <width>41</width>
- <height>23</height>
+ <x>190</x>
+ <y>180</y>
+ <width>61</width>
+ <height>31</height>
 </rect>
 </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The display shows the gain reduction applied to the baseband signal in the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="digitCount">
- <number>3</number>
+ <number>2</number>
 </property>
 <property name="segmentStyle">
 <enum>QLCDNumber::Flat</enum>
@@ -102,12 +117,23 @@
 <widget class="QCheckBox" name="agcControl">
 <property name="geometry">
 <rect>
- <x>110</x>
+ <x>10</x>
 <y>140</y>
- <width>51</width>
- <height>25</height>
+ <width>71</width>
+ <height>21</height>
 </rect>
 </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touch to switch on automatic gain control - based on the setting of the lnastate and the ifgain.&lt;/p&gt;&lt;p&gt;If switched on, the lnastate switch and the ifgain slider are switched off&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="text">
 <string>agc</string>
 </property>
@@ -121,6 +147,9 @@
 <height>21</height>
 </rect>
 </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ppm control. Tells the device the offset (in ppm) of the observed oscillator offset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <property name="minimum">
 <number>-200</number>
 </property>
@@ -132,8 +161,8 @@
 <property name="geometry">
 <rect>
 <x>10</x>
- <y>210</y>
- <width>141</width>
+ <y>110</y>
+ <width>151</width>
 <height>20</height>
 </rect>
 </property>
@@ -144,12 +173,23 @@
 <widget class="QComboBox" name="antennaSelector">
 <property name="geometry">
 <rect>
- <x>10</x>
- <y>230</y>
- <width>181</width>
- <height>36</height>
+ <x>130</x>
+ <y>240</y>
+ <width>121</width>
+ <height>31</height>
 </rect>
 </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select an antenna (RSP-II)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
 <item>
 <property name="text">
 <string>Antenna A</string>
@@ -161,6 +201,145 @@
 </property>
 </item>
 </widget>
+ <widget class="QSpinBox" name="lnaGainSetting">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>180</y>
+ <width>131</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Setting the lna state, determining the gain reduction applied in the lna.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>

_service:download_url:qt-dab-2.01.tar.gz/devices/wavfiles/wav-reader.cpp Added

@@ -0,0 +1,110 @@
+#
+/*
+ * 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
+ */
+
+#include	<sys/time.h>
+#include	"wav-reader.h"
+#include	"wavfiles.h"
+
+
+#define	BUFFERSIZE	32768
+static inline
+int64_t getMyTime (void) {
+struct timeval tv;
+
+ gettimeofday (&tv, NULL);
+ return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
+}
+
+	wavReader::wavReader	(wavFiles	*mr,
+	 SNDFILE	*filePointer,
+	 RingBuffer<std::complex<float> > *theBuffer) {
+	this	-> parent	= mr;
+	this	-> filePointer	= filePointer;
+	this	-> theBuffer	= theBuffer;
+	fileLength		= sf_seek (filePointer, 0, SEEK_END);
+	fprintf (stderr, "fileLength = %d\n", fileLength);
+ sf_seek (filePointer, 0, SEEK_SET);
+	period = (32768 * 1000) / (2048); // full IQś read
+ fprintf (stderr, "Period = %ld\n", period);
+	running. store (false);
+	start ();
+}
+
+	wavReader::~wavReader	(void) {
+	stopReader ();
+}
+
+void	wavReader::stopReader	(void) {
+	if (running. load ()) {
+	 running. store (false);
+	 while (isRunning ())
+	 usleep (200);
+	}
+}
+
+void	wavReader::run (void) {
+int32_t	t, i;
+std::complex<float>	*bi;
+int32_t	bufferSize	= 32768;
+int64_t	nextStop;
+int	teller		= 0;
+
+	connect (this, SIGNAL (setProgress (int, float)),
+ parent, SLOT (setProgress (int, float)));
+	sf_seek (filePointer, 0, SEEK_SET);
+
+	running. store (true);
+
+	bi		= new std::complex<float> [bufferSize];
+	nextStop	= getMyTime ();
+	try {
+	 while (running. load ()) {
+	 while (theBuffer -> WriteSpace () < bufferSize) {
+	 if (!running. load ())
+	 throw (33);
+	 usleep (100);
+	 }
+
+	 if (++teller >= 20) {
+	 int xx = sf_seek (filePointer, 0, SEEK_CUR);
+	 float progress = (float)xx / fileLength;
+	 setProgress ((int)(progress * 100), (float)xx / 2048000);
+	 teller = 0;
+	 }
+
+	 nextStop += period;
+	 int n = sf_readf_float (filePointer,
+		 (float *)bi, bufferSize);
+	 if (n < bufferSize) {
+	 sf_seek (filePointer, 0, SEEK_SET);
+	 for (i = n; i < bufferSize; i ++)
+	 bi [i] = std::complex <float> (0, 0);
+	 }
+	 theBuffer -> putDataIntoBuffer (bi, bufferSize);
+	 if (nextStop - getMyTime () > 0)
+	 usleep (nextStop - getMyTime ());
+	 }
+	} catch (int e) {}
+	fprintf (stderr, "taak voor replay eindigt hier\n"); fflush (stderr);
+	delete[] bi;
+}
+

_service:download_url:qt-dab-2.01.tar.gz/devices/wavfiles/wav-reader.h Added

@@ -0,0 +1,54 @@
+#
+/*
+ * 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	__WAV_READER__
+#define	__WAV_READER__
+
+#include	<QThread>
+#include	<sndfile.h>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<atomic>
+class	wavFiles;
+
+class	wavReader:public QThread {
+Q_OBJECT
+public:
+			wavReader	(wavFiles *,
+	 SNDFILE *,
+	 RingBuffer<std::complex<float>> *); 
+			~wavReader	(void);
+	void		startReader	(void);
+	void		stopReader	(void);
+private:
+virtual void		run		(void);
+	SNDFILE		*filePointer;
+	RingBuffer<std::complex<float> >	*theBuffer;
+	uint64_t	period;
+	std::atomic<bool>	running;
+	wavFiles	*parent;
+	int64_t		fileLength;
+signals:
+	void		setProgress	(int, float);
+};
+
+#endif
+

_service:download_url:qt-dab-2.0.tar.gz/devices/wavfiles/wavfiles.cpp -> _service:download_url:qt-dab-2.01.tar.gz/devices/wavfiles/wavfiles.cpp Changed

@@ -28,14 +28,6 @@
 #include	<QString>
 #include	"wavfiles.h"
 
-static inline
-int64_t		getMyTime	(void) {
-struct timeval	tv;
-
-	gettimeofday (&tv, NULL);
-	return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
-}
-
 #define	__BUFFERSIZE	8 * 32768
 
 	wavFiles::wavFiles (QString f) {
@@ -46,9 +38,7 @@
 	setupUi (myFrame);
 	myFrame		-> show ();
 
-	tester		= 3;
-	readerOK	= false;
-	_I_Buffer	= new RingBuffer<std::complex<float>>(__BUFFERSIZE);
+	_I_Buffer	= new RingBuffer<std::complex<float>> (__BUFFERSIZE);
 
 	sf_info		= (SF_INFO *)alloca (sizeof (SF_INFO));
 	sf_info	-> format	= 0;
@@ -67,47 +57,54 @@
 	 throw (25);
 	}
 	nameofFile	-> setText (f);
-	readerOK	= true;
-	readerPausing	= true;
-	currPos		= 0;
-//	start	();
+	fileProgress	-> setValue (0);
+	currentTime	-> display (0);
+	int64_t fileLength	= sf_seek (filePointer, 0, SEEK_END);
+	totalTime	-> display ((float)fileLength / 2048000);
+	running. store (false);
 }
+//
+//	Note that running == true <==> readerTask has value assigned
 
 	wavFiles::~wavFiles (void) {
-	ExitCondition = true;
-	if (readerOK) {
-	 while (isRunning ())
-	 usleep (100);
-	 sf_close (filePointer);
+	if (running. load ()) {
+	 readerTask	-> stopReader ();
+	 while (readerTask -> isRunning ())
+	 usleep (500);
+	 delete readerTask;
 	}
+	if (filePointer != NULL)
+	 sf_close (filePointer);
 	delete _I_Buffer;
 	delete	myFrame;
 }
 
 bool	wavFiles::restartReader	(void) {
-	if (readerOK)
-	 readerPausing = false;
-	start ();
-	return readerOK;
+	if (running. load ())
+ return true;
+ readerTask = new wavReader (this, filePointer, _I_Buffer);
+ running. store (true);
+ return true;
 }
 
 void	wavFiles::stopReader	(void) {
-	if (readerOK)
-	 readerPausing = true;
+ if (running. load ()) {
+ readerTask -> stopReader ();
+ while (readerTask -> isRunning ())
+ usleep (100);
+	 delete readerTask;
+ }
+ running. store (false);
 }
 
 //	size is in I/Q pairs
 int32_t	wavFiles::getSamples	(std::complex<float> *V, int32_t size) {
 int32_t	amount;
-
 	
 	if (filePointer == NULL)
 	 return 0;
 
 	while (_I_Buffer -> GetRingBufferReadAvailable () < size)
-	 if (readerPausing)
-	 usleep (100000);
-	 else
 	 usleep (100);
 
 	amount = _I_Buffer	-> getDataFromBuffer (V, size);
@@ -119,61 +116,10 @@
 	return _I_Buffer -> GetRingBufferReadAvailable ();
 }
 
-void	wavFiles::run (void) {
-int32_t	t, i;
-std::complex<float>	*bi;
-int32_t	bufferSize	= 32768;
-int64_t	period;
-int64_t	nextStop;
-
-	if (!readerOK)
-	 return;
-
-	ExitCondition = false;
-
-	period		= (32768 * 1000) / 2048;	// full IQś read
-	fprintf (stderr, "Period = %ld\n", period);
-	bi		= new std::complex<float> [bufferSize];
-	nextStop	= getMyTime ();
-	while (!ExitCondition) {
-	 if (readerPausing) {
-	 usleep (1000);
-	 nextStop = getMyTime ();
-	 continue;
-	 }
-	 while (_I_Buffer -> WriteSpace () < bufferSize) {
-	 if (ExitCondition)
-	 break;
-	 usleep (100);
-	 }
-
-	 nextStop += period;
-	 t = readBuffer (bi, bufferSize);
-	 if (t < bufferSize) {
-	 for (i = t; i < bufferSize; i ++)
-	 bi [i] = 0;
-	 t = bufferSize;
-	 }
-	 _I_Buffer -> putDataIntoBuffer (bi, bufferSize);
-	 if (nextStop - getMyTime () > 0)
-	 usleep (nextStop - getMyTime ());
-	}
-	fprintf (stderr, "taak voor replay eindigt hier\n"); fflush (stderr);
-}
-/*
- *	length is number of uints that we read.
- */
-int32_t	wavFiles::readBuffer (std::complex<float> *data, int32_t length) {
-int32_t	i, n;
-float	temp [2 * length];
-
-	n = sf_readf_float (filePointer, temp, length);
-	if (n < length) {
-	 sf_seek (filePointer, 0, SEEK_SET);
-	 fprintf (stderr, "End of file, restarting\n");
-	}
-	for (i = 0; i < n; i ++)
-	 data [i] = std::complex<float> (temp [2 * i], temp [2 * i + 1]);
-	return	n & ~01;
+void wavFiles::setProgress (int progress, float timelength) {
+ fileProgress -> setValue (progress);
+ currentTime -> display (timelength);
 }
 
+
+

_service:download_url:qt-dab-2.0.tar.gz/devices/wavfiles/wavfiles.h -> _service:download_url:qt-dab-2.01.tar.gz/devices/wavfiles/wavfiles.h Changed

@@ -22,39 +22,37 @@
 #ifndef	__WAV_FILES__
 #define	__WAV_FILES__
 
-#include	<QThread>
 #include	<QString>
 #include	<QFrame>
 #include	<sndfile.h>
+#include	<atomic>
 #include	"dab-constants.h"
 #include	"virtual-input.h"
 #include	"ringbuffer.h"
 
 #include	"ui_filereader-widget.h"
+#include		"wav-reader.h"
 
 class	wavFiles: public virtualInput,
-	 public Ui_filereaderWidget, QThread {
+	 public Ui_filereaderWidget {
+Q_OBJECT
 public:
 			wavFiles	(QString);
 	 		~wavFiles	(void);
 	int32_t		getSamples	(std::complex<float> *, int32_t);
-	uint8_t		myIdentity	(void);
 	int32_t		Samples		(void);
 	bool		restartReader	(void);
 	void		stopReader	(void);
 private:
 	QString		fileName;
-	int		tester;
 	QFrame		*myFrame;
-virtual	void		run		(void);
-	int32_t		readBuffer	(std::complex<float> *, int32_t);
 	RingBuffer<std::complex<float>>	*_I_Buffer;
 	int32_t		bufferSize;
 	SNDFILE		*filePointer;
-	bool		readerOK;
-	bool		readerPausing;
-	bool		ExitCondition;
-	int64_t		currPos;
+	wavReader	*readerTask;
+	std::atomic<bool>	running;
+public slots:
+	void		setProgress	(int, float);
 };
 
 #endif

_service:download_url:qt-dab-2.01.tar.gz/forms/audio-description.ui Added

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>audioDescription</class>
+ <widget class="QWidget" name="audioDescription">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>329</width>
+ <height>289</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>audio description</string>
+ </property>
+ <widget class="QLabel" name="serviceName">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>70</y>
+ <width>151</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <pointsize>10</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="subChannelId">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>130</y>
+ <width>111</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="startAddress">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>150</y>
+ <width>171</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="Length">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>170</y>
+ <width>171</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>190</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>bitRate</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="protectionLevel">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>210</y>
+ <width>161</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="programType">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>230</y>
+ <width>161</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="Language">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>250</y>
+ <width>181</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>130</y>
+ <width>111</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>subchannel Id</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_3">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>150</y>
+ <width>91</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Start Address</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_4">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>170</y>
+ <width>81</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Length</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="bitrate">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>190</y>
+ <width>59</width>
+ <height>15</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_6">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>210</y>
+ <width>101</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Protection level</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_7">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>230</y>
+ <width>111</width>

_service:download_url:qt-dab-2.0.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-2.01.tar.gz/forms/dabradio.ui Changed

@@ -1,646 +1,755 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
 <class>dabradio</class>
- <widget class="QMainWindow" name="dabradio">
+ <widget class="QWidget" name="dabradio">
 <property name="geometry">
 <rect>
 <x>0</x>
 <y>0</y>
- <width>513</width>
- <height>363</height>
+ <width>601</width>
+ <height>394</height>
 </rect>
 </property>
 <property name="windowTitle">
- <string>Qt-DAB</string>
+ <string>qt-dab</string>
 </property>
- <widget class="QWidget" name="centralwidget">
- <widget class="QComboBox" name="streamoutSelector">
- <property name="geometry">
- <rect>
- <x>8</x>
- <y>180</y>
- <width>211</width>
- <height>29</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a device (channel) for the audio output. On program start up a default is chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <widget class="QListView" name="ensembleDisplay">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>90</y>
+ <width>181</width>
+ <height>281</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>10</pointsize>
+ 
+ </property>
+ </widget>
+ <widget class="QWidget" name="layoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>110</y>
+ <width>118</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="spacing">
+ <number>4</number>
 </property>
 <item>
- <property name="text">
- <string>Select audio device</string>
- </property>
+ <widget class="QLabel" name="syncedLabel">
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ 
+ <pointsize>10</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indicator for time synchronization&lt;/p&gt;&lt;p&gt;Green means that the software recognizes that there are DAB frames, not necessarily that the software is able to decode the DAB stream.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string>Sync</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
 </item>
- </widget>
- <widget class="QComboBox" name="bandSelector">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>240</y>
- <width>131</width>
- <height>29</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a DAB band.&lt;/p&gt;&lt;p&gt;The default is VHF Band III (174–230 MHz).&lt;/p&gt;&lt;p&gt;Alternatively, the L Band may be selected (1452 bis 1492 MHz, but only used in very few countries like Czech Republic).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
 <item>
- <property name="text">
- <string>VHF Band III</string>
- </property>
+ <widget class="QLabel" name="stereoLabel">
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>

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

@@ -0,0 +1,815 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabradio</class>
+ <widget class="QMainWindow" name="dabradio">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>640</width>
+ <height>460</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>640</width>
+ <height>460</height>
+ </size>
+ </property>
+ <property name="sizeIncrement">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="windowTitle">
+ <string>Qt-DAB</string>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <widget class="QListView" name="ensembleDisplay">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>231</width>
+ <height>331</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ 
+ </property>
+ </widget>
+ <widget class="QLabel" name="versionName">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>231</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>16</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright (C) 2016, 2017 Jan van Katwijk (J.vanKatwijk@gmail.com), Lazy Chair Programming&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>10</y>
+ <width>21</width>
+ <height>21</height>
+ </rect>
+ </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 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 viterbi decoder kernel: the Spiral project&lt;/p&gt;&lt;p&gt;Copyright of the Reed Solomon Decoder software: Phil Karns&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;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">
+ <string>©</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="timeDisplay">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>70</y>
+ <width>231</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QWidget" name="layoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>250</x>
+ <y>110</y>
+ <width>381</width>
+ <height>211</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>12</pointsize>
+ 
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="ensembleName">
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>14</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ensemble name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="serviceLabel">
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>20</pointsize>
+ 
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="dynamicLabel">
+ <property name="font">
+ 
+ <pointsize>12</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dynamic label (DLS)&lt;/p&gt;&lt;p&gt;The selected program may carry some textual information, that information is displayed here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>

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

@@ -0,0 +1,647 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabradio</class>
+ <widget class="QMainWindow" name="dabradio">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>513</width>
+ <height>363</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Qt-DAB</string>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <widget class="QComboBox" name="streamoutSelector">
+ <property name="geometry">
+ <rect>
+ <x>8</x>
+ <y>180</y>
+ <width>211</width>
+ <height>29</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a device (channel) for the audio output. On program start up a default is chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Select audio device</string>
+ </property>
+ </item>
+ </widget>
+ <widget class="QComboBox" name="bandSelector">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>240</y>
+ <width>131</width>
+ <height>29</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a DAB band.&lt;/p&gt;&lt;p&gt;The default is VHF Band III (174–230 MHz).&lt;/p&gt;&lt;p&gt;Alternatively, the L Band may be selected (1452 bis 1492 MHz, but only used in very few countries like Czech Republic).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>VHF Band III</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>L Band</string>
+ </property>
+ </item>
+ </widget>
+ <widget class="QPushButton" name="audioDumpButton">
+ <property name="geometry">
+ <rect>
+ <x>8</x>
+ <y>150</y>
+ <width>91</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save audio output into a file. First push will show a menu for file selection. &lt;/p&gt;&lt;p&gt;Push again to stop recording.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>Save audio</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="dumpButton">
+ <property name="geometry">
+ <rect>
+ <x>98</x>
+ <y>150</y>
+ <width>121</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button to save the raw input. Pushing will cause a menu to appear where a filename can be selected. Please note the big filesizes!&lt;/p&gt;&lt;p&gt;Push again to stop recording. You can reload it by using the file input (*.sdr) option. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>Write sdr file</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="deviceSelector">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>210</y>
+ <width>211</width>
+ <height>29</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the input device. The devices shown are configured. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Select device</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>file input (.raw)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>file input (.iq)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>file input (.sdr)</string>
+ </property>
+ </item>
+ </widget>
+ <widget class="QComboBox" name="channelSelector">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>240</y>
+ <width>81</width>
+ <height>29</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the DAB channel.&lt;/p&gt;&lt;p&gt;This depends on the band chosen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="timeDisplay">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>90</y>
+ <width>181</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="correctorDisplay">
+ <property name="geometry">
+ <rect>
+ <x>120</x>
+ <y>120</y>
+ <width>91</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Coarse offset, indicates - in Hz - the frequency offset. Coarse offset is in large steps, where a step is the distance - in Hz - between two subsequent carriers in the ofdm signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>6</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="dynamicLabel">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>300</y>
+ <width>491</width>
+ <height>41</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dynamic label (DLS)&lt;/p&gt;&lt;p&gt;The selected program may carry some textual information, that information is displayed here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>

_service:download_url:qt-dab-2.01.tar.gz/forms/data-description.ui Added

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dataDescription</class>
+ <widget class="QWidget" name="dataDescription">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>325</width>
+ <height>308</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>data description</string>
+ </property>
+ <widget class="QLabel" name="serviceName">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>70</y>
+ <width>151</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <pointsize>10</pointsize>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="subChannelId">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>140</y>
+ <width>111</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="startAddress">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>160</y>
+ <width>171</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="Length">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>180</y>
+ <width>171</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>200</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>bitRate</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="protectionLevel">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>220</y>
+ <width>161</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="packetAddress">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>240</y>
+ <width>171</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>140</y>
+ <width>111</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>subchannel Id</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_3">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>160</y>
+ <width>91</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Start Address</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_4">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>180</y>
+ <width>81</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Length</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="bitrate">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>200</y>
+ <width>59</width>
+ <height>15</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_6">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>220</y>
+ <width>101</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Protection level</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_8">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>240</y>
+ <width>91</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>packet address</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="appType">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>70</y>
+ <width>141</width>

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

@@ -30,6 +30,7 @@
 #include	"dab-constants.h"
 #include	<stdio.h>
 #include	<stdint.h>
+#include	<vector>
 #include	"audio-base.h"
 #include	"frame-processor.h"
 #include	"faad-decoder.h"
@@ -53,20 +54,13 @@
 	RadioInterface	*myRadioInterface;
 	padHandler	my_padhandler;
 	bool		processSuperframe (uint8_t [], int16_t);
-	void		handle_aacFrame (uint8_t *,
-	 int16_t,
-	 uint8_t,
-	 uint8_t,
-	 uint8_t,
-	 uint8_t,
-	 bool*);
 	int16_t		superFramesize;
 	int16_t		blockFillIndex;
 	int16_t		blocksInBuffer;
 	int16_t		blockCount;
 	int16_t		bitRate;
-	uint8_t		*frameBytes;
-	uint8_t		**RSMatrix;
+	std::vector<uint8_t> frameBytes;
+	std::vector<uint8_t> outVector;
 	int16_t		RSDims;
 	int16_t		au_start	[10];
 	int32_t		baudRate;
@@ -76,7 +70,6 @@
 	int16_t		errorRate;
 	firecode_checker	fc;
 	reedSolomon	my_rsDecoder;
-	uint8_t		*outVector;
 //	and for the aac decoder
 	faadDecoder	aacDecoder;
 	int16_t		frameCount;

_service:download_url:qt-dab-2.01.tar.gz/includes/backend/backend-deconvolver.h Added

@@ -0,0 +1,40 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef	__BACKEND_DECONVOLVER__
+#define	__BACKEND_DECONVOLVER__
+
+#include	"dab-constants.h"
+class	protection;
+
+class	backendDeconvolver {
+public:
+	backendDeconvolver (descriptorType *d);
+	~backendDeconvolver	(void);
+void	deconvolve	(int16_t	*rawBits_in,
+	                 int32_t	length,
+	                 uint8_t	*outData);
+private:
+	protection	* protectionHandler;
+};
+
+#endif
+

_service:download_url:qt-dab-2.01.tar.gz/includes/backend/backend-driver.h Added

@@ -0,0 +1,46 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef	__BACKEND_DRIVER__
+#define	__BACKEND_DRIVER__
+
+#include	"dab-constants.h"
+#include	"radio.h"
+#include	<vector>
+
+class	frameProcessor;
+
+class	backendDriver {
+public:
+	backendDriver	(RadioInterface *,
+	 descriptorType *,
+	 RingBuffer<int16_t> *,
+	 RingBuffer<uint8_t> *,
+	 QString);
+	~backendDriver	(void);
+void	addtoFrame	(std::vector<uint8_t> outData);
+private:
+	frameProcessor	* theProcessor;
+};
+
+#endif
+

_service:download_url:qt-dab-2.01.tar.gz/includes/backend/backend.h Added

@@ -0,0 +1,81 @@
+#
+/*
+ * 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
+ */
+#
+#ifndef	__BACKEND__
+#define	__BACKEND__
+
+#include	<QSemaphore>
+#include	<vector>
+#ifdef	__THREADED_BACKEND
+#include	<QThread>
+#include	<atomic>
+#endif
+#include	"ringbuffer.h"
+#include	<stdio.h>
+#include "backend-driver.h"
+#include "backend-deconvolver.h"
+
+class	RadioInterface;
+
+#ifdef	__THREADED_BACKEND
+class	Backend:public QThread {
+#else
+class	Backend {
+#endif
+public:
+	Backend	(RadioInterface	*mr,
+	 descriptorType	*d,
+	 RingBuffer<int16_t> *,
+	 RingBuffer<uint8_t> *,
+	 QString	picturesPath);
+	~Backend	(void);
+int32_t	process		(int16_t *, int16_t);
+void	stopRunning	(void);
+	int		startAddr;
+	int		Length;
+private:
+#ifdef	__THREADED_BACKEND
+void	run		(void);
+	atomic<bool>	running;
+	QSemaphore	freeSlots;
+	QSemaphore	usedSlots;
+	std::vector<int16_t>	theData [20];
+	int16_t		nextIn;
+	int16_t		nextOut;
+#endif
+void	processSegment	(int16_t *Data);
+
+	int16_t		bitRate;
+	int16_t		fragmentSize;
+	std::vector<uint8_t> outV;
+	std::vector<std::vector <int16_t>> interleaveData;
+	std::vector<int16_t> tempX;
+	int16_t		countforInterleaver;
+	int16_t		interleaverIndex;
+	std::vector<uint8_t> disperseVector;
+
+	backendDriver		driver;
+	backendDeconvolver	deconvolver;
+};
+
+#endif
+

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

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

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

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

@@ -40,7 +40,7 @@
 #include "freq-interleaver.h"
 
 class	RadioInterface;
-class	virtualBackend;
+class	Backend;
 
 class mscHandler: public QThread {
 public:
@@ -50,9 +50,8 @@
 			~mscHandler		(void);
 	void		processBlock_0		(std::complex<float> *);
 	void		process_Msc		(std::complex<float> *, int);
-	void		set_audioChannel	(audiodata *,
-	 RingBuffer<int16_t> *);
-	void		set_dataChannel (packetdata *,
+	void		set_Channel		(descriptorType *,
+	 RingBuffer<int16_t> *,
 	 RingBuffer<uint8_t> *);
 //
 //	This function should be called beore issuing a request
@@ -75,31 +74,17 @@
 interLeaver myMapper;
 	QMutex		locker;
 	bool		audioService;
-	std::vector<virtualBackend *>theBackends;
+	std::vector<Backend *>theBackends;
 	std::vector<int16_t> cifVector;
 	int16_t		cifCount;
 	int16_t		blkCount;
 	std::atomic<bool> work_to_be_done;
-	int16_t		packetAddress;
-	int16_t		appType;
-	int16_t		ASCTy;
-	int16_t		DSCTy;
-	int32_t		startAddr;
-	int16_t		Length;
-	bool		shortForm;
-	int16_t		protLevel;
-	uint8_t		DGflag;
-	int16_t		bitRate;
-	int16_t		language;
-	int16_t		type;
-	int16_t		FEC_scheme;
-	int8_t		dabModus;
 	int16_t		BitsperBlock;
 	int16_t		numberofblocksperCIF;
 	int16_t		blockCount;
 	void run (void);
 std::atomic<bool> running;
- std::complex<float> **command;
+ std::vector<std::vector<std::complex<float> > > command;
 int16_t amount;
 int16_t currentBlock;
 void processBlock_0	(void);

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

_service:download_url:qt-dab-2.0.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-2.01.tar.gz/includes/dab-constants.h Changed

@@ -80,7 +80,7 @@
 #define		UNSYNCED	04
 //
 //	40 up shows good results
-#define		DIFF_LENGTH	60
+#define		DIFF_LENGTH	40
 static inline
 bool	isIndeterminate (float x) {
 	return x != x;
@@ -122,10 +122,9 @@
 #define		BAND_III	0100
 #define		L_BAND		0101
 
-//
-//	for service handling we define
-class packetdata {
+class	descriptorType {
 public:
+	uint8_t	type;
 	bool	defined;
 	QString	serviceName;
 	int32_t	serviceId;
@@ -133,37 +132,41 @@
 	int16_t	startAddr;
 	bool	shortForm;
 	int16_t	protLevel;
-	int16_t DSCTy;
 	int16_t	length;
 	int16_t	bitRate;
+public:
+		descriptorType	(void) {
+	defined		= false;
+	serviceName	= "";
+	}
+virtual		~descriptorType	(void) {}
+};
+
+//	for service handling we define
+class packetdata: public descriptorType {
+public:
+	int16_t DSCTy;
 	int16_t	FEC_scheme;
 	int16_t	DGflag;
 	int16_t	appType;
 	int16_t	compnr;
 	int16_t	packetAddress;
 	packetdata (void) {
-	   serviceName	= "";
-	   defined	= false;
-	}
-	~packetdata (void) {
+	   type	= PACKET_SERVICE;
 	}
 };
 
-typedef	struct {
-	bool	defined;
-	QString serviceName;
-	int32_t	serviceId;
-	int16_t	subchId;
-	int16_t	startAddr;
-	bool	shortForm;
-	int16_t	protLevel;
-	int16_t	length;
-	int16_t	bitRate;
+class audiodata: public descriptorType {
+public:
 	int16_t	ASCTy;
 	int16_t	language;
 	int16_t	programType;
 	int16_t	compnr;
-} audiodata;
+	audiodata (void) {
+	   type	= AUDIO_SERVICE;
+	}
+};
+
 
 //	just some locals
 //

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

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

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

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

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

@@ -35,10 +35,13 @@
 		~TII_Detector	(void);
 	void	reset		(void);
 	void	addBuffer	(std::vector<std::complex<float>>);
-	int16_t	find_C		(int16_t);
 	void	processNULL	(int16_t *, int16_t *);
 
 private:
+	void			collapse	(std::complex<float> *,
+	 float *);
+	uint8_t			invTable [256];
+	void			initInvTable	(void);
 	dabParams		params;
 	fftHandler		my_fftHandler;
 	int16_t			T_u;
@@ -49,18 +52,11 @@
 	std::vector<float>	window;
 	std::vector<complex<float> >	refTable;
 	int16_t		fillCount;
-	int16_t		A		(uint8_t, uint8_t c,
+	int16_t		A		(uint8_t c,
 	 uint8_t p, int16_t k);
-	int16_t		A_mode_1	(uint8_t c, uint8_t p, int16_t k);
-	int16_t		A_mode_2	(uint8_t c, uint8_t p, int16_t k);
-	int16_t		A_mode_4	(uint8_t c, uint8_t p, int16_t k);
-	float		correlate	(std::vector<complex<float> >,
-	 int16_t, uint64_t);
+	void		createPattern	(void);
+	void		printOverlap (int pNum, int cNum);
 
-	void		createPattern	(uint8_t);
-	void		createPattern_1	(void);
-	void		createPattern_2	(void);
-	void		createPattern_4	(void);
 	struct nullTable {
 	 int16_t	carrier;
 	 uint64_t	pattern;

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

_service:download_url:qt-dab-2.01.tar.gz/includes/protection Added

_service:download_url:qt-dab-2.01.tar.gz/includes/protection/eep-protection.h Changed

_service:download_url:qt-dab-2.01.tar.gz/includes/protection/protTables.h Changed

_service:download_url:qt-dab-2.01.tar.gz/includes/protection/protection.h Added

@@ -0,0 +1,46 @@
+#
+/*
+ * 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 base class for combining uep and eep deconvolvers
+ */
+#ifndef	__PROTECTION__
+#define	__PROTECTION__
+
+#include	<stdint.h>
+#include <vector>
+#include "viterbi-768.h"
+
+extern uint8_t	PI_X [];
+
+class protection: public viterbi_768 {
+public:
+ protection (int16_t, int16_t);
+virtual ~protection (void);
+virtual bool deconvolve (int16_t *, int32_t, uint8_t *);
+protected:
+ int16_t bitRate;
+ int32_t outSize;
+	std::vector<uint8_t> indexTable;
+ std::vector<int16_t> viterbiBlock;
+};
+
+#endif
+

_service:download_url:qt-dab-2.01.tar.gz/includes/protection/uep-protection.h Changed

_service:download_url:qt-dab-2.01.tar.gz/includes/support/dab_tables.h Added

_service:download_url:qt-dab-2.0.tar.gz/main.cpp -> _service:download_url:qt-dab-2.01.tar.gz/main.cpp Changed

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

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

_service:download_url:qt-dab-2.0.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-2.01.tar.gz/qt-dab.pro Changed

@@ -24,7 +24,9 @@
 DEPENDPATH += . \
 	      ./src \
 	      ./includes \
+	      ./service-description \
 	      ./src/ofdm \
+	      ./src/protection \
 	      ./src/backend \
 	      ./src/backend/audio \
 	      ./src/backend/data \
@@ -37,6 +39,7 @@
 	      ./devices/rawfiles \
 	      ./devices/wavfiles \
 	      ./includes/ofdm \
+	      ./includes/protection \
 	      ./includes/backend \
 	      ./includes/backend/audio \
 	      ./includes/backend/data \
@@ -56,6 +59,8 @@
 	      ./ \
 	      ./src \
 	      ./includes \
+	      ./service-description \
+	      ./includes/protection \
 	      ./includes/ofdm \
 	      ./includes/backend \
 	      ./includes/backend/audio \
@@ -76,6 +81,9 @@
 # Input
 HEADERS += ./radio.h \
 	   ./dab-processor.h \
+	   ./service-description/service-descriptor.h \
+	   ./service-description/audio-descriptor.h \
+	   ./service-description/data-descriptor.h \
 	   ./includes/dab-constants.h \
 	   ./includes/country-codes.h \
 	   ./includes/ofdm/timesyncer.h \
@@ -88,6 +96,10 @@
 	   ./includes/ofdm/tii_detector.h \
 	   ./includes/ofdm/fic-handler.h \
 	   ./includes/ofdm/fib-processor.h  \
+	   ./includes/protection/protTables.h \
+	   ./includes/protection/protection.h \
+	   ./includes/protection/eep-protection.h \
+	   ./includes/protection/uep-protection.h \
 	   ./includes/backend/msc-handler.h \
 	   ./includes/backend/galois.h \
 	   ./includes/backend/reed-solomon.h \
@@ -95,9 +107,9 @@
 	   ./includes/backend/charsets.h \
 	   ./includes/backend/firecode-checker.h \
 	   ./includes/backend/frame-processor.h \
-	   ./includes/backend/virtual-backend.h \
-	   ./includes/backend/audio-backend.h \
-	   ./includes/backend/data-backend.h \
+	   ./includes/backend/backend.h \
+	   ./includes/backend/backend-driver.h \
+	   ./includes/backend/backend-deconvolver.h \
 	   ./includes/backend/audio/mp2processor.h \
 	   ./includes/backend/audio/mp4processor.h \
 	   ./includes/backend/audio/faad-decoder.h \
@@ -118,9 +130,6 @@
 	   ./includes/backend/data/journaline/dabdgdec_impl.h \
 	   ./includes/backend/data/journaline/newsobject.h \
 	   ./includes/backend/data/journaline/NML.h \
-	   ./includes/backend/protection.h \
-	   ./includes/backend/eep-protection.h \
-	   ./includes/backend/uep-protection.h \
 #	   ./includes/output/fir-filters.h \
 	   ./includes/output/audio-base.h \
 	   ./includes/output/newconverter.h \
@@ -133,18 +142,23 @@
 	   ./includes/support/dab-params.h \
 	   ./includes/support/band-handler.h \
 	   ./includes/support/text-mapper.h \
+	   ./includes/support/dab_tables.h \
 	   ./includes/support/ensemble-printer.h \
 	   ./includes/scopes-qwt6/spectrogramdata.h \
 	   ./includes/scopes-qwt6/iqdisplay.h \
 	   ./devices/virtual-input.h \
 	   ./devices/rawfiles/rawfiles.h \
+	   ./devices/rawfiles/raw-reader.h \
            ./devices/wavfiles/wavfiles.h \
+           ./devices/wavfiles/wav-reader.h \
 	   ./spectrum-viewer/spectrum-viewer.h \
 	   ./impulse-viewer/impulse-viewer.h \
 	   ./tii-viewer/tii-viewer.h
 
 FORMS	+= ./forms/technical_data.ui
 FORMS	+= ./forms/dabradio.ui 
+FORMS	+= ./forms/audio-description.ui
+FORMS	+= ./forms/data-description.ui
 FORMS	+= ./spectrum-viewer/scopewidget.ui
 FORMS	+= ./impulse-viewer/impulse-widget.ui
 FORMS	+= ./tii-viewer/tii-widget.ui
@@ -153,6 +167,8 @@
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
 	   ./dab-processor.cpp \
+	   ./service-description/audio-descriptor.cpp \
+	   ./service-description/data-descriptor.cpp \
 	   ./src/ofdm/timesyncer.cpp \
 	   ./src/ofdm/sample-reader.cpp \
 	   ./src/ofdm/ofdm-decoder.cpp \
@@ -163,20 +179,20 @@
 	   ./src/ofdm/tii_detector.cpp \
 	   ./src/ofdm/fic-handler.cpp \
 	   ./src/ofdm/fib-processor.cpp  \
+	   ./src/protection/protTables.cpp \
+	   ./src/protection/protection.cpp \
+	   ./src/protection/eep-protection.cpp \
+	   ./src/protection/uep-protection.cpp \
 	   ./src/backend/msc-handler.cpp \
-	   ./src/backend/protection.cpp \
-	   ./src/backend/eep-protection.cpp \
-	   ./src/backend/uep-protection.cpp \
 	   ./src/backend/galois.cpp \
 	   ./src/backend/reed-solomon.cpp \
 	   ./src/backend/rscodec.cpp \
 	   ./src/backend/charsets.cpp \
 	   ./src/backend/firecode-checker.cpp \
 	   ./src/backend/frame-processor.cpp \
-	   ./src/backend/protTables.cpp \
-	   ./src/backend/virtual-backend.cpp \
-	   ./src/backend/audio-backend.cpp \
-	   ./src/backend/data-backend.cpp \
+	   ./src/backend/backend.cpp \
+           ./src/backend/backend-driver.cpp \
+           ./src/backend/backend-deconvolver.cpp \
 	   ./src/backend/audio/mp2processor.cpp \
 	   ./src/backend/audio/mp4processor.cpp \
 	   ./src/backend/audio/faad-decoder.cpp \
@@ -207,11 +223,14 @@
 	   ./src/support/dab-params.cpp \
 	   ./src/support/band-handler.cpp \
 	   ./src/support/text-mapper.cpp \
+	   ./src/support/dab_tables.cpp \
 	   ./src/support/ensemble-printer.cpp \
 	   ./src/scopes-qwt6/iqdisplay.cpp \
 	   ./devices/virtual-input.cpp \
 	   ./devices/rawfiles/rawfiles.cpp \
+	   ./devices/rawfiles/raw-reader.cpp \
            ./devices/wavfiles/wavfiles.cpp \
+           ./devices/wavfiles/wav-reader.cpp \
 	   ./spectrum-viewer/spectrum-viewer.cpp \
 	   ./impulse-viewer/impulse-viewer.cpp \
 	   ./tii-viewer/tii-viewer.cpp
@@ -246,7 +265,7 @@
 # (you obviously have libraries installed for the selected ones)
 CONFIG		+= dabstick
 CONFIG		+= sdrplay
-CONFIG		+= rtl_tcp
+#CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
 #CONFIG		+= elad_s1	# does not work yet
@@ -255,7 +274,7 @@
 #CONFIG		+= datastreamer
 
 #to handle output of embedded an IP data stream, uncomment
-#CONFIG		+= send_datagram
+CONFIG		+= send_datagram
 
 #if you want to listen remote, uncomment
 #CONFIG		+= tcp-streamer		# use for remote listening
@@ -265,10 +284,10 @@
 
 CONFIG		+= try-epg		# do not use
 DEFINES		+= MSC_DATA__		# use at your own risk
-
-#and this one is experimental
 DEFINES		+= PRESET_NAME
 
+DEFINES		+= __THREADED_BACKEND
+
 # you might select SSE if you are compiling on a x64 with SSE support
 # and you might select NEON if you are compiling for an arm (however
 # have a look at the config section for neon then)
@@ -295,11 +314,12 @@
     DEFINES += GITHASH=\\\"------\\\"
 }
 
-INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include
+INCLUDEPATH	+= /usr/i686-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/
 INCLUDEPATH	+= /mingw32/include
 INCLUDEPATH	+= /mingw32/include/qwt
 LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
+LIBS		+= -lfaad
 LIBS		+= -lfftw3f
 LIBS		+= -lportaudio
 LIBS		+= -lsndfile
@@ -322,6 +342,7 @@
 CONFIG		+= dabstick
 CONFIG		+= sdrplay
 CONFIG		+= hackrf
+
 CONFIG		+= NO_SSE
 
 #very experimental, simple server for connecting to a tdc handler

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

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+
+<qtcreator>
+ <data>
+ <variable>EnvironmentId</variable>
+ <value type="QByteArray">{a685cd88-ee35-4cba-8c8a-d7b830696043}</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
+ <value type="int">0</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.EditorSettings</variable>
+ <valuemap type="QVariantMap">
+ <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+ <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+ <value type="QString" key="language">Cpp</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+ </valuemap>
+ </valuemap>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+ <value type="QString" key="language">QmlJS</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+ </valuemap>
+ </valuemap>
+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+ <value type="int" key="EditorConfiguration.IndentSize">4</value>
+ <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+ <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+ <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+ <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+ <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+ <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+ <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+ <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+ <value type="int" key="EditorConfiguration.TabSize">8</value>
+ <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+ <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.PluginSettings</variable>
+ <valuemap type="QVariantMap">
+ <valuelist type="QVariantList" key="ClangStaticAnalyzer.SuppressedDiagnostics"/>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{e3c9112e-d6d9-4999-a83f-721aa6e32575}</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/usr/shared/sdr-j-development/systems/build-qt-dab-Desktop-Debug</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+ <value type="QString">-w</value>
+ <value type="QString">-r</value>
+ </valuelist>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+ <value type="QString">-w</value>
+ <value type="QString">-r</value>
+ </valuelist>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+ <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+ <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+ <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+ <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+ <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qt-dab</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/usr/shared/sdr-j-development/systems/qt-dab/qt-dab.pro</value>
+ <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">qt-dab.pro</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/usr/shared/sdr-j-development/systems/build-qt-dab-Desktop-Debug/linux-bin</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+ <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>

_service:download_url:qt-dab-2.0.tar.gz/radio.cpp -> _service:download_url:qt-dab-2.01.tar.gz/radio.cpp Changed

@@ -27,6 +27,7 @@
 #include	<QFile>
 #include	<QStringList>
 #include	<QStringListModel>
+#include	<QMouseEvent>
 #include	<QDir>
 #include	<fstream>
 #include	"dab-constants.h"
@@ -37,8 +38,11 @@
 #include	"radio.h"
 #include	"band-handler.h"
 #include	"ensemble-printer.h"
+#include	"audio-descriptor.h"
+#include	"data-descriptor.h"
 #include	"rawfiles.h"
 #include	"wavfiles.h"
+#include	"dab_tables.h"
 #ifdef	TCP_STREAMER
 #include	"tcp-streamer.h"
 #elif	QT_AUDIO
@@ -129,13 +133,14 @@
 //	this need to be a pretty large value (e.g. 5 to 10)
 	latency		=
 	 dabSettings -> value ("latency", 5). toInt ();
+
 	diff_length	=
 	 dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt ();
 
 	tii_delay	=
-	 dabSettings	-> value ("tii_delay", 20). toInt ();
-	if (tii_delay < 20)
-	 tii_delay = 20;
+	 dabSettings	-> value ("tii_delay", 5). toInt ();
+	if (tii_delay < 5)
+	 tii_delay = 5;
 
 	dataBuffer		= new RingBuffer<uint8_t>(32768);
 ///	The default, most likely to be overruled
@@ -159,9 +164,9 @@
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
 //
-	dataDisplay	= new QFrame (NULL);
+	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (dataDisplay);
-	show_data		= false;
+	dataDisplay		-> hide ();
 #ifdef	__MINGW32__
 	techData. cpuLabel	-> hide ();
 	techData. cpuMonitor	-> hide ();
@@ -232,12 +237,12 @@
 //
 //
 	sourceDumping		= false;
-	dumpfilePointer		= NULL;
+	dumpfilePointer		= nullptr;
 	audioDumping		= false;
-	audiofilePointer	= NULL;
+	audiofilePointer	= nullptr;
 	ficBlocks		= 0;
 	ficSuccess		= 0;
-	pictureLabel		= NULL;
+	pictureLabel		= nullptr;
 	syncedLabel		->
 	 setStyleSheet ("QLabel {background-color : red}");
 
@@ -294,7 +299,7 @@
 	deviceSelector	-> addItem ("rtl_tcp");
 #endif
 	
-	inputDevice	= NULL;
+	inputDevice	= nullptr;
 	h =
 dabSettings -> value ("device", "no device"). toString ();
 	k = deviceSelector -> findText (h);
@@ -303,22 +308,23 @@
 deviceSelector -> setCurrentIndex (k);
 inputDevice	= setDevice (deviceSelector -> currentText ());
 }
-
 	
-	my_dabProcessor	= NULL;
+	my_dabProcessor	= nullptr;
 //	if a device was selected, we just start, otherwise
 //	we wait until one is selected
-	if (inputDevice != NULL) 
+	if (inputDevice != nullptr) 
 	 emit doStart ();
 	else 
 	 connect (deviceSelector, SIGNAL (activated (QString)),
 	 this, SLOT (doStart (QString)));
+	qApp	-> installEventFilter (this);
+	currentService	= nullptr;
 }
 
 
 void	RadioInterface::doStart (QString dev) {
 	inputDevice = setDevice	(deviceSelector -> currentText ());
-	if (inputDevice == NULL) {
+	if (inputDevice == nullptr) {
 //	just in case someone wants to push all those nice buttons that
 //	are now connected to erroneous constructs
 //	Some buttons should not be touched before we have a device
@@ -407,7 +413,7 @@
 *	as the parameter
 */
 void	RadioInterface::dumpControlState (QSettings *s) {
-	if (s == NULL)	// cannot happen
+	if (s == nullptr)	// cannot happen
 	 return;
 
 	if (has_presetName)
@@ -431,7 +437,8 @@
 //
 //	a slot called by the ofdmprocessor
 void	RadioInterface::set_CorrectorDisplay (int v) {
-	correctorDisplay	-> display (v);
+	if (running. load ())
+	 correctorDisplay	-> display (v);
 }
 
 //	If the ofdm processor has waited for a period of N frames
@@ -446,7 +453,7 @@
 
 void	RadioInterface::No_Signal_Found (void) {
 	signalTimer. stop ();
-	if (!scanning)
+	if (!running. load () || !scanning)
 	 return;
 //
 //	we stop the thread from running,
@@ -464,6 +471,9 @@
 //	In case the scanning button was pressed, we
 //	set it off as soon as we have a signal found
 void	RadioInterface::Yes_Signal_Found (void) {
+	if (!running. load ())
+	 return;
+
 	signalTimer. stop ();
 	if (!scanning)
 	 return;
@@ -471,6 +481,8 @@
 }
 
 void	RadioInterface::set_Scanning	(void) {
+	if (!running. load ())
+	 return;
 	presetTimer. stop ();
 	setStereo (false);
 	if (!running. load ())
@@ -495,6 +507,9 @@
 //	generate a signal
 void	RadioInterface::Increment_Channel (void) {
 int32_t	tunedFrequency;
+	if (!running. load ())
+	 return;
+
 int	cc	= channelSelector -> currentIndex ();
 
 	cc	+= 1;
@@ -523,16 +538,22 @@
 *	might run in a separate thread and generate data to be displayed
 */
 void	RadioInterface::clearEnsemble	(void) {
-//
+
+	clear_showElements	();
+	if (!running. load ())
+	 return;
+
 //	it obviously means: stop processing
 	my_dabProcessor	-> clearEnsemble ();
 	my_dabProcessor	-> reset ();
-	clear_showElements	();
 }
 
 //
 //	a slot, called by the fic/fib handlers
 void	RadioInterface::addtoEnsemble (const QString &s) {
+	if (!running. load ())
+	 return;
+
 	Services << s;
 	Services. removeDuplicates ();
 	ensemble. setStringList (Services);
@@ -543,10 +564,14 @@
 ///	a slot, called by the fib processor
 void	RadioInterface::nameofEnsemble (int id, const QString &v) {
 QString s;
+	if (!running. load ())
+	 return;
+
 	(void)v;
-	ensembleId		-> display (id);
-	ensembleLabel		= v;
-	ensembleName		-> setText (v);
+	ensembleId	-> display (id);
+	ensembleLabel	= v;
+ ensembleName	-> setAlignment(Qt::AlignCenter);
+	ensembleName	-> setText (v);

_service:download_url:qt-dab-2.0.tar.gz/radio.h -> _service:download_url:qt-dab-2.01.tar.gz/radio.h Changed

_service:download_url:qt-dab-2.0.tar.gz/screenshot_qt-dab.png -> _service:download_url:qt-dab-2.01.tar.gz/screenshot_qt-dab.png Changed

_service:download_url:qt-dab-2.01.tar.gz/service-description Added

_service:download_url:qt-dab-2.01.tar.gz/service-description/audio-descriptor.cpp Added

@@ -0,0 +1,33 @@
+
+#include	"dab_tables.h"
+#include	"audio-descriptor.h"
+
+
+	audioDescriptor::audioDescriptor (audiodata *ad):
+	                                       myFrame (NULL) {
+        setupUi (&myFrame);
+        myFrame. show ();
+	serviceLabel    -> setText
+                      (QString ().number (ad -> serviceId, 16). toUpper ());
+        QFont font      = serviceLabel -> font ();
+        font. setBold (true);
+        serviceLabel    -> setFont (font);
+
+	serviceName  -> setText (ad -> serviceName);
+	subChannelId -> setText (QString::number (ad -> subchId));
+	startAddress -> setText (QString::number (ad -> startAddr));
+	Length       -> setText (QString::number (ad -> length));
+	bitrate      -> setText (QString::number (ad -> bitRate));
+	QString protL	= getProtectionLevel (ad -> shortForm,
+	                                      ad -> protLevel);
+	protectionLevel   -> setText (protL);
+	dabType      -> setText (ad -> ASCTy == 077 ? "DAB+" : "DAB");
+	Language     -> setText (getLanguage (ad -> language));
+	programType  ->
+	   setText (the_textMapper.
+	               get_programm_type_string (ad -> programType));
+}
+
+	audioDescriptor::~audioDescriptor (void) {
+}
+

_service:download_url:qt-dab-2.01.tar.gz/service-description/audio-descriptor.h Added

_service:download_url:qt-dab-2.01.tar.gz/service-description/data-descriptor.cpp Added

@@ -0,0 +1,29 @@
+
+#include	"dab_tables.h"
+#include	"data-descriptor.h"
+
+
+	dataDescriptor::dataDescriptor (packetdata *pd):
+	                                       myFrame (NULL) {
+        setupUi (&myFrame);
+        myFrame. show ();
+	serviceName  -> setText (pd -> serviceName);
+	serviceLabel    -> setText
+                      (QString ().number (pd -> serviceId, 16). toUpper ());
+        QFont font      = serviceLabel -> font ();
+        font. setBold (true);
+	subChannelId -> setText (QString::number (pd -> subchId));
+	startAddress -> setText (QString::number (pd -> startAddr));
+	Length       -> setText (QString::number (pd -> length));
+	bitrate      -> setText (QString::number (pd -> bitRate));
+	packetAddress-> setText (QString::number (pd -> packetAddress));
+	QString protL	= getProtectionLevel (pd -> shortForm,
+	                                      pd -> protLevel);
+	protectionLevel   -> setText (protL);
+	appType	     -> setText (getDSCTy (pd -> DSCTy));
+	FECscheme    -> setText (getFECscheme (pd -> FEC_scheme));
+}
+
+	dataDescriptor::~dataDescriptor (void) {
+}
+

_service:download_url:qt-dab-2.01.tar.gz/service-description/data-descriptor.h Added

_service:download_url:qt-dab-2.01.tar.gz/service-description/service-descriptor.h Added

_service:download_url:qt-dab-2.0.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-2.01.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

@@ -128,13 +128,13 @@
 	if (spectrumBuffer -> GetRingBufferReadAvailable () < spectrumSize)
 	 return;
 
+	spectrumBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
+	spectrumBuffer	-> FlushRingBuffer ();
 	if (myFrame	-> isHidden ()) {
 	 spectrumBuffer	-> FlushRingBuffer ();
 	 return;
 	}
 
-	spectrumBuffer	-> getDataFromBuffer (spectrum, spectrumSize);
-	spectrumBuffer	-> FlushRingBuffer ();
 //	and window it
 //	first X axis labels
 	for (i = 0; i < displaySize; i ++)
@@ -184,8 +184,9 @@
 	 double amp,
 	 int32_t marker) {
 uint16_t	i;
+float	amp1	= amp / 100;
 
-	amp		= amp / 50.0 * (-get_db (0));
+	amp		= amp / 100.0 * (- get_db (0));
 	plotgrid	-> setAxisScale (QwtPlot::xBottom,
 				 (double)X_axis [0],
 				 X_axis [displaySize - 1]);
@@ -195,7 +196,7 @@
 //				 get_db (0), 0);
 
 	for (i = 0; i < displaySize; i ++) 
-	 Y1_value [i] = get_db (amp * Y1_value [i]); 
+	 Y1_value [i] = get_db (amp1 * Y1_value [i]); 
 
 	spectrumCurve	-> setBaseline (get_db (0));
 	Y1_value [0]		= get_db (0);

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

@@ -59,8 +59,8 @@
 
 	superFramesize		= 110 * (bitRate / 8);
 	RSDims			= bitRate / 8;
-	frameBytes		= new uint8_t [RSDims * 120];	// input
-	outVector		= new uint8_t [RSDims * 110];
+	frameBytes. resize (RSDims * 120);	// input
+	outVector . resize (RSDims * 110);
 	blockFillIndex	= 0;
 	blocksInBuffer	= 0;
 	frameCount	= 0;
@@ -72,8 +72,6 @@
 }
 
 	mp4Processor::~mp4Processor (void) {
-	delete[]	frameBytes;
-	delete[]	outVector;
 }
 
 /**
@@ -118,7 +116,7 @@
   *	and adjust the buffer here for the next round
   */
 	   if (fc. check (&frameBytes [blockFillIndex * nbits / 8]) &&
-	       (processSuperframe (frameBytes,
+	       (processSuperframe (frameBytes. data (),
 	                           blockFillIndex * nbits / 8))) {
 //	since we processed a full cycle of 5 blocks, we just start a
 //	new sequence, beginning with block blockFillIndex
@@ -279,13 +277,6 @@
 	                                     aac_frame_length);
 	      err	= tmp == 0;
 	      emit isStereo (!err);
-//	      handle_aacFrame (&outVector [au_start [i]],
-//	                                   aac_frame_length,
-//	                                   dacRate,
-//	                                   sbrFlag,
-//	                                   mpegSurround,
-//	                                   aacChannelMode,
-//	                                   &err);
 	      if (err) 
 	         aacErrors ++;
 	      if (++aacFrames > 25) {
@@ -302,24 +293,3 @@
 	return true;
 }
 
-void	mp4Processor::handle_aacFrame (uint8_t *v,
-	                               int16_t frame_length,
-	                               uint8_t	dacRate,
-	                               uint8_t	sbrFlag,
-	                               uint8_t	mpegSurround,
-	                               uint8_t	aacChannelMode,
-	                               bool	*error) {
-uint8_t theAudioUnit [2 * 960 + 10];	// sure, large enough
-
-	memcpy (theAudioUnit, v, frame_length);
-	memset (&theAudioUnit [frame_length], 0, 10);
-
-	int tmp = aacDecoder. MP42PCM (dacRate,
-	                               sbrFlag,
-	                               mpegSurround,
-	                               aacChannelMode,
-	                               theAudioUnit,
-	                               frame_length);
-	*error	= tmp == 0;
-}
-

_service:download_url:qt-dab-2.01.tar.gz/src/backend/backend-deconvolver.cpp Added

@@ -0,0 +1,47 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB program
+ *    Qt-DAB is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Qt-DAB is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	"backend-deconvolver.h"
+#include        "eep-protection.h"
+#include        "uep-protection.h"
+
+
+	backendDeconvolver::backendDeconvolver (descriptorType *d) {
+        if (d -> shortForm)
+           protectionHandler    = new uep_protection (d -> bitRate,
+                                                      d -> protLevel);
+        else
+           protectionHandler    = new eep_protection (d -> bitRate,
+                                                      d -> protLevel);
+}
+
+	backendDeconvolver::~backendDeconvolver	(void) {
+	delete protectionHandler;
+}
+
+void	backendDeconvolver::deconvolve	(int16_t	*rawBits_in,
+	                         int32_t	length,
+	                         uint8_t	*outData) {
+	   protectionHandler -> deconvolve (rawBits_in,
+	                                    length,
+	                                    outData);
+}
+

_service:download_url:qt-dab-2.01.tar.gz/src/backend/backend-driver.cpp Added

@@ -0,0 +1,67 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	"backend-driver.h"
+#include "mp2processor.h"
+#include "mp4processor.h"
+#include	"data-processor.h"
+//
+//	Driver program for the selected backend. Embodying that in a4
+//	separate class makes the "Backend" class simpler.
+
+	backendDriver::backendDriver (RadioInterface *mr,
+	 descriptorType *d,
+	 RingBuffer<int16_t> *audioBuffer,
+	 RingBuffer<uint8_t> *dataBuffer,
+	 QString		picturesPath) {
+	if (d -> type == AUDIO_SERVICE) {
+	 if (((audiodata *)d) -> ASCTy != 077) {
+ theProcessor = new mp2Processor (mr,
+	 d -> bitRate,
+ audioBuffer,
+	 picturesPath);
+	 }
+ else
+ if (((audiodata *)d) -> ASCTy == 077) {
+ theProcessor = new mp4Processor (mr,
+	 d -> bitRate,
+ audioBuffer,
+	 picturesPath);
+	 }
+	}
+	else
+	if (d -> type == PACKET_SERVICE)
+	 theProcessor = new dataProcessor (mr,
+	 (packetdata *)d,
+	 dataBuffer,
+	 picturesPath);
+}
+
+
+	backendDriver::~backendDriver	(void) {
+	delete theProcessor;
+}
+
+	
+void	backendDriver::addtoFrame (std::vector<uint8_t>	theData) {
+	theProcessor	-> addtoFrame (theData);
+}
+

_service:download_url:qt-dab-2.01.tar.gz/src/backend/backend.cpp Added

@@ -0,0 +1,160 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of Qt-DAB
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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"
+#include	"radio.h"
+#include	"backend.h"
+//
+//	Interleaving is - for reasons of simplicity - done
+//	inline rather than through a special class-object
+#define CUSize (4 * 16)
+
+//	fragmentsize == Length * CUSize
+	Backend::Backend	(RadioInterface *mr,
+	 descriptorType	*d,
+	 RingBuffer<int16_t> *audiobuffer,
+	 RingBuffer<uint8_t> *databuffer,
+	 QString	picturesPath):
+	 outV (d -> bitRate * 24),
+	 driver (mr, 
+	 d,
+	 audiobuffer,
+	 databuffer,
+	 picturesPath),
+	 deconvolver (d)
+#ifdef	__THREADED_BACKEND
+	 ,freeSlots (20) 
+#endif 
+	 {
+int32_t i, j;
+	this	-> startAddr		= d -> startAddr;
+	this	-> Length		= d -> length;
+ this -> fragmentSize = d -> length * CUSize;
+	this	-> bitRate		= d -> bitRate;
+	interleaveData. resize (16);
+	for (i = 0; i < 16; i ++) {
+	 interleaveData [i]. resize (fragmentSize);
+	 memset (interleaveData [i]. data (), 0,
+	 fragmentSize * sizeof (int16_t));
+	}
+
+	countforInterleaver	= 0;
+	interleaverIndex	= 0;
+
+	tempX. resize (fragmentSize);
+	
+	uint8_t shiftRegister [9];
+	disperseVector. resize (24 * bitRate);
+	memset (shiftRegister, 1, 9);
+	for (i = 0; i < bitRate * 24; i ++) {
+	 uint8_t b = shiftRegister [8] ^ shiftRegister [4];
+	 for (j = 8; j > 0; j--)
+	 shiftRegister [j] = shiftRegister [j - 1];
+	 shiftRegister [0] = b;
+	 disperseVector [i] = b;
+	}
+#ifdef	__THREADED_BACKEND
+//	for local buffering the input, we have
+	nextIn				= 0;
+	nextOut				= 0;
+	for (i = 0; i < 20; i ++)
+	 theData [i]. resize (fragmentSize);
+	running. store (true);
+	start ();
+#endif
+}
+
+	Backend::~Backend (void) {
+#ifdef	__THREADED_BACKEND
+	running. store (false);
+	while (this -> isRunning ())
+	 usleep (1000);
+#endif
+}
+
+int32_t	Backend::process	(int16_t *v, int16_t cnt) {
+	(void)cnt;
+#ifdef	__THREADED_BACKEND
+	while (!freeSlots. tryAcquire (1, 200))
+	 if (!running)
+	 return 0;
+	memcpy (theData [nextIn]. data (), v, fragmentSize * sizeof (int16_t));
+	nextIn = (nextIn + 1) % 20;
+	usedSlots. release ();
+#else
+	processSegment (v);
+#endif
+	return 1;
+}
+
+const	int16_t interleaveMap [] = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
+void	Backend::processSegment (int16_t *Data) {
+int16_t	i;
+
+	for (i = 0; i < fragmentSize; i ++) {
+	 tempX [i] = interleaveData [(interleaverIndex + 
+	 interleaveMap [i & 017]) & 017][i];
+	 interleaveData [interleaverIndex][i] = Data [i];
+	}
+
+	interleaverIndex = (interleaverIndex + 1) & 0x0F;
+#ifdef	__THREADED_BACKEND
+	nextOut = (nextOut + 1) % 20;
+	freeSlots. release ();
+#endif
+
+//	only continue when de-interleaver is filled
+	if (countforInterleaver <= 15) {
+	 countforInterleaver ++;
+	 return;
+	}
+
+	deconvolver. deconvolve (tempX. data (), fragmentSize, outV. data ());
+//	and the energy dispersal
+	for (i = 0; i < bitRate * 24; i ++)
+	 outV [i] ^= disperseVector [i];
+
+	driver. addtoFrame (outV);
+}
+
+#ifdef	__THREADED_BACKEND
+void	Backend::run	(void) {
+
+	while (running. load ()) {
+	 while (!usedSlots. tryAcquire (1, 200)) 
+	 if (!running)
+	 return;
+	 processSegment (theData [nextOut]. data ());
+	}
+}
+#endif
+
+//	It might take a msec for the task to stop
+void	Backend::stopRunning (void) {
+#ifdef	__THREADED_BACKEND
+	running = false;
+	while (this -> isRunning ())
+	 usleep (1);
+//	myAudioSink	-> stop ();
+#endif
+}
+

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

@@ -27,43 +27,41 @@
 /**
  * This table maps "EBU Latin" charset to corresponding
  * Unicode (UCS2-encoded) characters.
- * See ETSI TS 101 756 v1.6.1, Annex C
+ * See ETSI TS 101 756 v1.8.1, Annex C
  */
 static const unsigned short ebuLatinToUcs2[] = {
-/* 0x00 - 0x07 */ 0x00,   0x01,   0x02,   0x03,   0x04,   0x05,   0x06,   0x07,
-/* 0x08 - 0x0f */ 0x08,   0x09,   0x0a,   0x0b,   0x0c,   0x0d,   0x0e,   0x0f,
-/* 0x10 - 0x17 */ 0x10,   0x11,   0x12,   0x13,   0x14,   0x15,   0x16,   0x17,
-/* 0x18 - 0x1f */ 0x18,   0x19,   0x1a,   0x1b,   0x1c,   0x1d,   0x1e,   0x2d,
-
-/* 0x20 - 0x27 */ 0x20,   0x21,   0x22,   0x23,   0xa4,   0x25,   0x26,   0x27,
-/* 0x28 - 0x2f */ 0x28,   0x29,   0x2a,   0x2b,   0x2c,   0x2d,   0x2e,   0x2f,
-/* 0x30 - 0x37 */ 0x30,   0x31,   0x32,   0x33,   0x34,   0x35,   0x36,   0x37,
-/* 0x38 - 0x3f */ 0x38,   0x39,   0x3a,   0x3b,   0x3c,   0x3d,   0x3e,   0x3f,
-/* 0x40 - 0x47 */ 0x40,   0x41,   0x42,   0x43,   0x44,   0x45,   0x46,   0x47,
-/* 0x48 - 0x4f */ 0x48,   0x49,   0x4a,   0x4b,   0x4c,   0x4d,   0x4e,   0x4f,
-/* 0x50 - 0x57 */ 0x50,   0x51,   0x52,   0x53,   0x54,   0x55,   0x56,   0x57,
-/* 0x58 - 0x5f */ 0x58,   0x59,   0x5a,   0x5b,   0x5c,   0x5d,   0x2015, 0x5f,
-/* 0x60 - 0x67 */ 0x2551, 0x61,   0x62,   0x63,   0x64,   0x65,   0x66,   0x67,
-/* 0x68 - 0x6f */ 0x68,   0x69,   0x6a,   0x6b,   0x6c,   0x6d,   0x6e,   0x6f,
-/* 0x70 - 0x77 */ 0x70,   0x71,   0x72,   0x73,   0x74,   0x75,   0x76,   0x77,
-/* 0x78 - 0x7f */ 0x78,   0x79,   0x7a,   0x7b,   0x7c,   0x7d,   0xaf,   0x7f,
-
-/* 0x80 - 0x87 */ 0xe1,   0xe0,   0xe9,   0xe8,   0xed,   0xec,   0xf3,   0xf2,
-/* 0x88 - 0x8f */ 0xfa,   0xf9,   0xd1,   0xc7,   0x015e, 0xdf,   0xa1,   0x0132,
-/* 0x90 - 0x97 */ 0xe2,   0xe4,   0xea,   0xeb,   0xee,   0xef,   0xf4,   0xf6,
-/* 0x98 - 0x9f */ 0xfb,   0xfc,   0xf1,   0xe7,   0x015f, 0x011f, 0x0131, 0x0133,
-/* 0xa0 - 0xa7 */ 0xaa,   0x03b1, 0xa9,   0x2030, 0x011e, 0x011b, 0x0148, 0x0151,
-/* 0xa8 - 0xaf */ 0x03c0, 0x20ac, 0xa3,   0x24,   0x2190, 0x2191, 0x2192, 0x2193,
-/* 0xb0 - 0xb7 */ 0xba,   0xb9,   0xb2,   0xb3,   0xb1,   0x0130, 0x0144, 0x0171,
-/* 0xb8 - 0xbf */ 0xb5,   0xbf,   0xf7,   0xb0,   0xbc,   0xbd,   0xbe,   0xa7,
-/* 0xc0 - 0xc7 */ 0xc1,   0xc0,   0xc9,   0xc8,   0xcd,   0xcc,   0xd3,   0xd2,
-/* 0xc8 - 0xcf */ 0xda,   0xd9,   0x0158, 0x010c, 0x0160, 0x017d, 0xd0,   0x13f,
-/* 0xd0 - 0xd7 */ 0xc2,   0xc4,   0xca,   0xcb,   0xce,   0xcf,   0xd4,   0xd6,
-/* 0xd8 - 0xdf */ 0xdb,   0xdc,   0x0159, 0x010d, 0x0161, 0x017e, 0x0111, 0x0140,
-/* 0xe0 - 0xe7 */ 0x00c3, 0x00c5, 0x00c6, 0x0152, 0x0177, 0xdd,   0xd5,   0xd8,
-/* 0xe8 - 0xef */ 0xde,   0x014a, 0x0154, 0x0106, 0x015a, 0x0179, 0x0166, 0xf0,
-/* 0xf0 - 0xf7 */ 0xe3,   0xe5,   0xe6,   0x0153, 0x0175, 0xfd,   0xf5,   0xf8,
-/* 0xf8 - 0xff */ 0xfe,   0x014b, 0x0155, 0x0107, 0x015b, 0x017a, 0x0167, 0xff
+/* 0x00 - 0x07 */   0x00,  0x118,  0x12e,  0x172,  0x102,  0x116,  0x10e,  0x218,
+/*  0x8 -  0xf */  0x21a,  0x10a,    0xa,    0xb,  0x120,  0x139,  0x17b,  0x143,
+/* 0x10 - 0x17 */  0x105,  0x119,  0x12f,  0x173,  0x103,  0x117,  0x10f,  0x219,
+/* 0x18 - 0x1f */  0x21b,  0x10b,  0x147,  0x11a,  0x121,  0x13a,  0x17c,   0x82,
+/* 0x20 - 0x27 */   0x20,   0x21,   0x22,   0x23,  0x142,   0x25,   0x26,   0x27,
+/* 0x28 - 0x2f */   0x28,   0x29,   0x2a,   0x2b,   0x2c,   0x2d,   0x2e,   0x2f,
+/* 0x30 - 0x37 */   0x30,   0x31,   0x32,   0x33,   0x34,   0x35,   0x36,   0x37,
+/* 0x38 - 0x3f */   0x38,   0x39,   0x3a,   0x3b,   0x3c,   0x3d,   0x3e,   0x3f,
+/* 0x40 - 0x47 */   0x40,   0x41,   0x42,   0x43,   0x44,   0x45,   0x46,   0x47,
+/* 0x48 - 0x4f */   0x48,   0x49,   0x4a,   0x4b,   0x4c,   0x4d,   0x4e,   0x4f,
+/* 0x50 - 0x57 */   0x50,   0x51,   0x52,   0x53,   0x54,   0x55,   0x56,   0x57,
+/* 0x58 - 0x5f */   0x58,   0x59,   0x5a,   0x5b,  0x16e,   0x5d,  0x141,   0x5f,
+/* 0x60 - 0x67 */  0x104,   0x61,   0x62,   0x63,   0x64,   0x65,   0x66,   0x67,
+/* 0x68 - 0x6f */   0x68,   0x69,   0x6a,   0x6b,   0x6c,   0x6d,   0x6e,   0x6f,
+/* 0x70 - 0x77 */   0x70,   0x71,   0x72,   0x73,   0x74,   0x75,   0x76,   0x77,
+/* 0x78 - 0x7f */   0x78,   0x79,   0x7a,   0xab,  0x16f,   0xbb,  0x13d,  0x126,
+/* 0x80 - 0x87 */   0xe1,   0xe0,   0xe9,   0xe8,   0xed,   0xec,   0xf3,   0xf2,
+/* 0x88 - 0x8f */   0xfa,   0xf9,   0xd1,   0xc7,  0x15e,   0xdf,   0xa1,  0x178,
+/* 0x90 - 0x97 */   0xe2,   0xe4,   0xea,   0xeb,   0xee,   0xef,   0xf4,   0xf6,
+/* 0x98 - 0x9f */   0xfb,   0xfc,   0xf1,   0xe7,  0x15f,  0x11f,  0x131,   0xff,
+/* 0xa0 - 0xa7 */  0x136,  0x145,   0xa9,  0x122,  0x11e,  0x11b,  0x148,  0x151,
+/* 0xa8 - 0xaf */  0x150, 0x20ac,   0xa3,   0x24,  0x100,  0x112,  0x12a,  0x16a,
+/* 0xb0 - 0xb7 */  0x137,  0x146,  0x13b,  0x123,  0x13c,  0x130,  0x144,  0x171,
+/* 0xb8 - 0xbf */  0x170,   0xbf,  0x13e,   0xb0,  0x101,  0x113,  0x12b,  0x16b,
+/* 0xc0 - 0xc7 */   0xc1,   0xc0,   0xc9,   0xc8,   0xcd,   0xcc,   0xd3,   0xd2,
+/* 0xc8 - 0xcf */   0xda,   0xd9,  0x158,  0x10c,  0x160,  0x17d,   0xd0,  0x13f,
+/* 0xd0 - 0xd7 */   0xc2,   0xc4,   0xca,   0xcb,   0xce,   0xcf,   0xd4,   0xd6,
+/* 0xd8 - 0xdf */   0xdb,   0xdc,  0x159,  0x10d,  0x161,  0x17e,  0x111,  0x140,
+/* 0xe0 - 0xe7 */   0xc3,   0xc5,   0xc6,  0x152,  0x177,   0xdd,   0xd5,   0xd8,
+/* 0xe8 - 0xef */   0xde,  0x14a,  0x154,  0x106,  0x15a,  0x179,  0x164,   0xf0,
+/* 0xf0 - 0xf7 */   0xe3,   0xe5,   0xe6,  0x153,  0x175,   0xfd,   0xf5,   0xf8,
+/* 0xf8 - 0xff */   0xfe,  0x14b,  0x155,  0x107,  0x15b,  0x17a,  0x165,  0x127
 };
 
 QString toQStringUsingCharset (const char* buffer,

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

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

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

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

@@ -40,7 +40,7 @@
 	this	-> picturesPath	= picturesPath;
 	orderNumber		= 0;
 
-	theDirectory		= NULL;
+	theDirectory		= nullptr;
 	for (int i = 0; i < 15; i ++)
 	 motTable [i]. orderNumber = -1;
 }
@@ -51,7 +51,7 @@
 	for (i = 0; i < 15; i ++)
 	 if (motTable [i]. orderNumber > 0)
 	 delete motTable [i]. motSlide;
-	if (theDirectory != NULL)
+	if (theDirectory != nullptr)
 	 delete theDirectory;
 }
 
@@ -116,7 +116,7 @@
 	 case 3:
 	 if (segmentNumber == 0) {
 	 motObject *h = getHandle (transportId);
-	 if (h != NULL) 
+	 if (h != nullptr) 
 	 break;
 	 h = new motObject (myRadioInterface,
 	 picturesPath,
@@ -131,7 +131,7 @@
 
 	 case 4: {
 	 motObject *h = getHandle (transportId);
-	 if (h == NULL)
+	 if (h == nullptr)
 	 break;
 	 h -> addBodySegment (&motVector [2],
 	 segmentNumber,
@@ -142,11 +142,11 @@
 
 	 case 6:
 	 if (segmentNumber == 0) { 	// MOT directory
-	 if (theDirectory != NULL)
+	 if (theDirectory != nullptr)
 	 if (theDirectory -> get_transportId () == transportId)
 	 break;	// already existing
 
-	 if (theDirectory != NULL)	// an old one, replace it
+	 if (theDirectory != nullptr)	// an old one, replace it
 	 delete theDirectory;
 
 	 int32_t segmentSize = ((motVector [0] & 0x1F) << 8) |
@@ -171,7 +171,7 @@
 	 segment);
 	 }
 	 else {
-	 if ((theDirectory == NULL) || 
+	 if ((theDirectory == nullptr) || 
 	 (theDirectory -> get_transportId () != transportId))
 	 break;
 	 theDirectory -> directorySegment (transportId,
@@ -194,9 +194,9 @@
 	 if ((motTable [i]. orderNumber >= 0) &&
 	 (motTable [i]. transportId == transportId))
 	 return motTable [i]. motSlide;
-	if (theDirectory != NULL)
+	if (theDirectory != nullptr)
 	 return theDirectory -> getHandle (transportId);
-	return NULL;
+	return nullptr;
 }
 
 void	motHandler::setHandle (motObject *h, uint16_t transportId) {

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

@@ -87,10 +87,6 @@
 pointer += length;
 }
 	}
-
-//	no segments as yet
-	for (int i = 0; i < 128; i ++)
-	 marked [i] = false;
 }
 
 	motObject::~motObject	(void) {
@@ -111,17 +107,22 @@
 	 bool		lastFlag) {
 int32_t i;
 
- if (marked [segmentNumber]) // we already have the segment
- return;
+//	fprintf (stderr, "adding segment %d\n", segmentNumber);
+	if ((segmentNumber < 0) || (segmentNumber >= 8192))
+	 return;
+
+	if (motMap. find (segmentNumber) != motMap. end ())
+	 return;
 
 // Note that the last segment may have a different size
 if (!lastFlag && (this -> segmentSize == -1))
 this -> segmentSize = segmentSize;
-//
- segments [segmentNumber]. resize (segmentSize);
- for (i = 0; i < segmentSize; i ++)
- segments [segmentNumber][i] = bodySegment [i];
- marked [segmentNumber] = true;
+
+	QByteArray segment;
+	segment. resize (segmentSize);
+	for (i = 0; i < segmentSize; i ++)
+	 segment [i] = bodySegment [i];
+	motMap. insert (std::make_pair (segmentNumber, segment));
 //
 if (lastFlag)
 numofSegments = segmentNumber + 1;
@@ -131,10 +132,10 @@
 //
 //	once we know how many segments there are/should be,
 //	we check for completeness
-	for (i = 0; i < numofSegments; i ++) 
- if (!(marked [i])) {
+	for (i = 0; i < numofSegments; i ++) {
+	 if (motMap. find (i) == motMap. end ())
 	 return;
-	 }
+	}
 
 //	The motObject is (seems to be) complete
 	handleComplete ();
@@ -142,11 +143,10 @@
 
 
 void	motObject::handleComplete (void) {
-int	i;
 QByteArray result;
 
-	for (i = 0; i < numofSegments; i ++)
-	 result. append (segments [i]);
+	for (const auto &it : motMap)
+	 result. append (it. second);
 
 	if (contentType == 7) {		// epg data
 #ifdef	TRY_EPG
@@ -168,7 +168,7 @@
 	 realName. toLatin1 (). data ());
 	 checkDir (realName);
 	 FILE *x = fopen (realName. toLatin1 (). data (), "w+b");
-	 if (x == NULL)
+	 if (x == nullptr)
 	 fprintf (stderr, "cannot write file %s\n",
 	 realName. toLatin1 (). data ());
 	 else {

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

@@ -35,7 +35,7 @@
 	connect (this, SIGNAL (show_motHandling (bool)),
 	 mr, SLOT (show_motHandling (bool)));
 	this	-> picturePath	= picturesPath;
-	currentSlide	= NULL;
+	currentSlide	= nullptr;
 //
 //	mscGroupElement indicates whether we are handling an
 //	msc datagroup or not.
@@ -54,7 +54,7 @@
 }
 
 	padHandler::~padHandler	(void) {
-	if (currentSlide != NULL)
+	if (currentSlide != nullptr)
 	 delete currentSlide;
 }
 
@@ -116,6 +116,18 @@
 	 case 0:	// end marker
 	 break;
 //
+	 case 2:	// start of fragment, extract the length
+	 if (firstSegment && !lastSegment) {
+	 segmentNumber = b [last - 2] >> 4;
+	 if (dynamicLabelText. size () > 0)
+	 showLabel (dynamicLabelText);
+	 dynamicLabelText. clear ();
+	 }
+	 still_to_go = b [last - 1] & 0x0F;
+	 shortpadData. resize (0);
+	 shortpadData. push_back (b [last - 3]);
+	 break;
+
 	 case 3:	// continuation of fragment
 	 for (i = 0; (i < 3) && (still_to_go > 0); i ++) {
 	 still_to_go --;
@@ -133,17 +145,6 @@
 	 }
 	 break;
 
-	 case 2:	// start of fragment, extract the length
-	 if (firstSegment && !lastSegment) {
-	 segmentNumber = b [last - 2] >> 4;
-	 if (dynamicLabelText. size () > 0)
-	 showLabel (dynamicLabelText);
-	 dynamicLabelText. clear ();
-	 }
-	 still_to_go = b [last - 1] & 0x0F;
-	 shortpadData. resize (0);
-	 shortpadData. push_back (b [last - 3]);
-	 break;
 	 }
 	}
 	else {	// No CI flag
@@ -354,17 +355,20 @@
 //	Called at the start of the msc datagroupfield,
 //	the msc_length was given by the preceding appType "1"
 void	padHandler::new_MSC_element (std::vector<uint8_t> data) {
-	if (mscGroupElement) { 
-	 if (msc_dataGroupBuffer. size () < dataGroupLength)
-//	 fprintf (stderr, "short ? %d %d\n",
-//	 msc_dataGroupBuffer. size (),
-//	 dataGroupLength);
-	 build_MSC_segment (msc_dataGroupBuffer);
-	 mscGroupElement	= false;
-	 show_motHandling (false);
-	}
+
+//	if (mscGroupElement) { 
+////	 if (msc_dataGroupBuffer. size () < dataGroupLength)
+////	 fprintf (stderr, "short ? %d %d\n",
+////	 msc_dataGroupBuffer. size (),
+////	 dataGroupLength);
+//	 msc_dataGroupBuffer. clear ();
+//	 build_MSC_segment (data);
+//	 mscGroupElement	= true;
+//	 show_motHandling (true);
+//	}
 
 	if (data. size () >= dataGroupLength) {	// msc element is single item
+	 msc_dataGroupBuffer. clear ();
 	 build_MSC_segment (data);
 	 mscGroupElement = false;
 	 show_motHandling (true);
@@ -372,7 +376,7 @@
 	 return;
 	}
 
-	mscGroupElement	= true;
+	mscGroupElement		= true;
 	msc_dataGroupBuffer. clear ();
 	msc_dataGroupBuffer	= data;
 	show_motHandling (true);
@@ -394,7 +398,7 @@
 	if (msc_dataGroupBuffer. size () >= dataGroupLength) {
 	 build_MSC_segment (msc_dataGroupBuffer);
 	 msc_dataGroupBuffer. clear ();
-	 mscGroupElement	= false;
+//	 mscGroupElement	= false;
 	 show_motHandling (false);
 	}
 }
@@ -430,12 +434,14 @@
 //	extensionflag
 	bool	extensionFlag	= (data [0] & 0x80) != 0;
 //	if the segmentflag is on, then a lastflag and segmentnumber are
-//	available, i.e. 2 bytes more
+//	available, i.e. 2 bytes more.
+//	Theoretically, the segment number can be as large as 16384
 	index			= extensionFlag ? 4 : 2;
 	bool	segmentFlag	= (data [0] & 0x20) != 0;
 	if ((segmentFlag) != 0) {
 	 lastFlag		= data [index] & 0x80;
-	 segmentNumber	= ((data [index] & 0x7F) << 8) | data [index + 1];
+	 segmentNumber	= ((data [index] & 0x7F) << 8) |
+	 data [index + 1];
 	 index += 2;
 	}
 
@@ -448,20 +454,24 @@
 	 index += 3;
 	 }
 	 else {
-	 fprintf (stderr, "sorry no transportId\n");
+//	 fprintf (stderr, "sorry no transportId\n");
 	 return;
 	 }
 	 index += (lengthIndicator - 2);
 	}
 
+	if (transportId == 0)	// no idea wat it means
+	 return;
 
 	uint32_t segmentSize	= ((data [index + 0] & 0x1F) << 8) |
 	 data [index + 1];
+//	fprintf (stderr, "segmentSize = %d (transportId = %d)\n",
+//	 segmentSize, transportId);
 //
 //	handling MOT in the PAD, we only deal here with type 3/4
 	switch (groupType) {
 	 case 3:
-	 if (currentSlide == NULL) {
+	 if (currentSlide == nullptr) {
 //	 fprintf (stderr, "creating %d\n", transportId);
 	 currentSlide	= new motObject (myRadioInterface,
 	 picturePath,
@@ -489,7 +499,7 @@
 	 break;
 
 	 case 4:
-	 if (currentSlide == NULL)
+	 if (currentSlide == nullptr)
 	 return;
 	 if (currentSlide -> get_transportId () == transportId) {
 //	 fprintf (stderr, "add segment %d of %d\n",

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

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

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

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

@@ -23,9 +23,7 @@
 #include	"dab-constants.h"
 #include	"radio.h"
 #include	"msc-handler.h"
-#include	"virtual-backend.h"
-#include	"audio-backend.h"
-#include	"data-backend.h"
+#include	"backend.h"
 #include	"dab-params.h"
 //
 //	Interface program for processing the MSC.
@@ -47,37 +45,21 @@
 	myRadioInterface	= mr;
 	this	-> picturesPath	= picturesPath;
 	cifVector. resize (55296);
-	theBackends. push_back (new virtualBackend (0, 0));
+//	theBackends. push_back (new virtualBackend (0, 0));
 	BitsperBlock		= 2 * params. get_carriers ();
 	nrBlocks		= params. get_L ();
 
-	command = new std::complex<float> * [nrBlocks];
-	
+	command. resize (nrBlocks);
 	for (int i = 0; i < nrBlocks; i ++)
-	 command [i] = new std::complex<float> [params. get_T_u ()];
+	 command [i]. resize (params. get_T_u ());
+
 	amount = 0;
 	fft_buffer = my_fftHandler. getVector ();
 	phaseReference .resize (params. get_T_u ());
 
 	numberofblocksperCIF = cifTable [(dabMode - 1) & 03];
-//	switch (dabMode) {
-//	 case 4:	// 2 CIFS per 76 blocks
-//	 numberofblocksperCIF	= 36;
-//	 break;
-//
-//	 case 1:	// 4 CIFS per 76 blocks
-//	 numberofblocksperCIF	= 18;
-//	 break;
-//
-//	 case 2:	// 1 CIF per 76 blocks
-//	 numberofblocksperCIF	= 72;
-//	 break;
-//
-//	 default:
-//	 numberofblocksperCIF	= 18;
-//	 break;
-//	}
 	work_to_be_done. store (false);
+	start ();
 }
 
 		mscHandler::~mscHandler	(void) {
@@ -86,9 +68,9 @@
 	 usleep (100);
 	locker. lock ();
 	work_to_be_done. store (false);
-	for (int i = 0; i < theBackends. size (); i ++) {
-	 theBackends [i] -> stopRunning ();
-	 delete theBackends [i];
+	for (auto const &b : theBackends) {
+	 b -> stopRunning ();
+	 delete b;
 	}
 	locker. unlock ();
 	theBackends. resize (0);
@@ -99,7 +81,7 @@
 //	will handle the data from the buffer
 void	mscHandler::processBlock_0 (std::complex<float> *b) {
 	bufferSpace. acquire (1);
-	memcpy (command [0], b,
+	memcpy (command [0]. data (), b,
 	 params. get_T_u () * sizeof (std::complex<float>));
 	helper. lock ();
 	amount ++;
@@ -109,7 +91,7 @@
 
 void	mscHandler::process_Msc	(std::complex<float> *b, int blkno) {
 	bufferSpace. acquire (1);
- memcpy (command [blkno], b,
+ memcpy (command [blkno]. data (), b,
 	 params. get_T_u () * sizeof (std::complex<float>));
 helper. lock ();
 amount ++;
@@ -128,7 +110,7 @@
 commandHandler. wait (&helper, 100);
 helper. unlock ();
 while ((amount > 0) && running. load ()) {
-	 memcpy (fft_buffer, command [currentBlock],
+	 memcpy (fft_buffer, command [currentBlock]. data (),
 	 params. get_T_u () * sizeof (std::complex<float>));
 //
 //	block 3 and up are needed as basis for demodulation the "mext" block
@@ -172,12 +154,14 @@
 	 usleep (100);
 	locker. lock ();
 	work_to_be_done. store (false);
-	for (i = 0; i < theBackends. size (); i ++) {
-	 theBackends [i] -> stopRunning ();
-	 delete theBackends [i];
+	for (auto const &b : theBackends) {
+	 b -> stopRunning ();
+	 delete b;
 	}
 	theBackends. resize (0);
+
 	bufferSpace. release (nrBlocks - bufferSpace. available ());
+	amount	= 0;
 	locker. unlock ();
 	start ();
 }
@@ -186,31 +170,21 @@
 	reset ();
 }
 //
-//	Note, the set_xxx functions are called from within a
+//	Note, the set_Channel function is called from within a
 //	different thread than the process_mscBlock method is,
 //	so, a little bit of locking seems wise while
 //	the actual changing of the settings is done in the
 //	thread executing process_mscBlock
-void	mscHandler::set_audioChannel (audiodata *d,
-	 RingBuffer<int16_t> *audioBuffer) {
+void	mscHandler::set_Channel (descriptorType *d,
+	 RingBuffer<int16_t> *audioBuffer,
+	 RingBuffer<uint8_t> *dataBuffer) {
 	locker. lock ();
 //
-//	we could assert here that theBackend == NULL
-	theBackends. push_back (new audioBackend (myRadioInterface,
-	 d,
-	 audioBuffer,
-	 picturesPath));
-	work_to_be_done. store (true);
-	locker. unlock ();
-}
-//
-void	mscHandler::set_dataChannel (packetdata	*d,
-	 RingBuffer<uint8_t> *dataBuffer) {
-	locker. lock ();
-	theBackends. push_back (new dataBackend (myRadioInterface,
-	 d,
-	 dataBuffer,
-	 picturesPath));
+	theBackends. push_back (new Backend (myRadioInterface,
+	 d,
+	 audioBuffer,
+	 dataBuffer,
+	 picturesPath));
 	work_to_be_done. store (true);
 	locker. unlock ();
 }
@@ -243,14 +217,14 @@
 //	be done. We assume that the backend itself
 //	does the work in a separate thread.
 	locker. lock ();
-	for (i = 0; i < theBackends. size (); i ++) {
-	 int16_t startAddr	= theBackends [i] -> startAddr ();
-	 int16_t Length	= theBackends [i] -> Length (); 
-	 if (Length > 0) {		// Length = 0? virtual Backend
+	for (auto const& b: theBackends) {
+	 int16_t startAddr	= b -> startAddr;
+	 int16_t Length	= b -> Length; 
+	 if (Length > 0) {		// Length = 0? should not happen
 	 int16_t temp [Length * CUSize];
 	 memcpy (temp, &cifVector [startAddr * CUSize],
 	 Length * CUSize * sizeof (int16_t));
-	 (void) theBackends [i] -> process (temp, Length * CUSize);
+	 (void) b -> process (temp, Length * CUSize);
 	 }
 	}
 	locker. unlock ();

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

_service:download_url:qt-dab-2.0.tar.gz/src/ofdm/fib-processor.cpp -> _service:download_url:qt-dab-2.01.tar.gz/src/ofdm/fib-processor.cpp Changed

@@ -116,6 +116,8 @@
 
 	coordinates. cleanUp ();
 	CIFcount	= 0;
+	ensemble_Descriptor. ecc_Present	= false;
+	ensemble_Descriptor. name_Present	= false;
 }
 	
 	fib_processor::~fib_processor (void) {
@@ -502,7 +504,7 @@
 	}
 used += 40 / 8;
 	
- if (packetComp == NULL)		// no serviceComponent yet
+ if (packetComp == nullptr)		// no serviceComponent yet
 return used;
 //
 //	We want to have the subchannel OK
@@ -617,7 +619,7 @@
 if (lsFlag == 1) {
 SCid = getBits (d, lOffset + 4, 12);
 lOffset += 16;
-// if (find_packetComponent ((SCIds << 4) | SCid) != NULL) {
+// if (find_packetComponent ((SCIds << 4) | SCid) != nullptr) {
 // fprintf (stderr, "packet component bestaat !!\n");
 // }
 }
@@ -734,7 +736,7 @@
 ;
 	 serviceComponent *packetComp =
 find_serviceComponent (SId, SCId);
- if (packetComp != NULL) 
+ if (packetComp != nullptr) 
 packetComp -> appType = appType;
 	}
 
@@ -1127,7 +1129,7 @@
 if (ServiceComps [i]. SCId == SCId) 
 return &ServiceComps [i];
 }
- return NULL;
+ return nullptr;
 }
 
 serviceComponent *fib_processor::find_serviceComponent (int32_t SId,
@@ -1144,7 +1146,7 @@
 	 }
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 //	bind_audioService is the main processor for - what the name suggests -

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

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

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

@@ -32,9 +32,9 @@
 
 	phaseReference::phaseReference (RadioInterface *mr,
 	 uint8_t		dabMode,
-	 RingBuffer<float> *b,
 	 int16_t		threshold,
-	 int16_t		diff_length):
+	 int16_t		diff_length,
+	 RingBuffer<float> *b):
 	 phaseTable (dabMode),
 	 params (dabMode),
 	 my_fftHandler (dabMode) {
@@ -114,10 +114,12 @@
 	 }
 	}
 
-	if (++displayCounter > framesperSecond / 4) {
-	 response	-> putDataIntoBuffer (lbuf, T_u);
-	 showImpulse (T_u);
-	 displayCounter	= 0;
+	if (response != NULL) {
+	 if (++displayCounter > framesperSecond / 4) {
+	 response	-> putDataIntoBuffer (lbuf, T_u);
+	 showImpulse (T_u);
+	 displayCounter	= 0;
+	 }
 	}
 /**
 *	that gives us a basis for defining the actual threshold value
@@ -176,6 +178,7 @@
 	return index - T_u; 
 }
 //
+
 //	NOT USED, just for some tests
 //	An alternative way to compute the small frequency offset
 //	is to look at the phase offset of subsequent carriers

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

@@ -56,7 +56,7 @@
 
 	bufferContent	= 0;
 	corrector	= 0;
-	dumpfilePointer. store (NULL);
+	dumpfilePointer. store (nullptr);
 	dumpIndex	= 0;
 	dumpScale	= valueFor (theRig -> bitDepth ());
 	running. store (true);
@@ -96,7 +96,7 @@
 //	so here, bufferContent > 0
 	theRig -> getSamples (&temp, 1);
 	bufferContent --;
-	if (dumpfilePointer. load () != NULL) {
+	if (dumpfilePointer. load () != nullptr) {
 	 dumpBuffer [2 * dumpIndex ] = real (temp) * dumpScale;
 	 dumpBuffer [2 * dumpIndex + 1] = imag (temp) * dumpScale;
 	 if ( ++dumpIndex >= DUMPSIZE / 2) {
@@ -117,13 +117,14 @@
 	temp		*= oscillatorTable [currentPhase];
 	sLevel		= 0.00001 * jan_abs (temp) + (1 - 0.00001) * sLevel;
 #define	N	5
-	sampleCount	++;
 	if (++ sampleCount > INPUT_RATE / N) {
 	 show_Corrector	(corrector);
 	 sampleCount = 0;
- spectrumBuffer -> putDataIntoBuffer (localBuffer. data (),
-	 localCounter);
- emit show_Spectrum (bufferSize);
+	 if (spectrumBuffer != nullptr) {
+ spectrumBuffer -> putDataIntoBuffer (localBuffer. data (),
+	 localCounter);
+ emit show_Spectrum (bufferSize);
+	 }
 localCounter = 0;
 	}
 	return temp;
@@ -150,7 +151,7 @@
 //	so here, bufferContent >= n
 	n	= theRig -> getSamples (v, n);
 	bufferContent -= n;
-	if (dumpfilePointer. load () != NULL) {
+	if (dumpfilePointer. load () != nullptr) {
 	 for (i = 0; i < n; i ++) {
 	 dumpBuffer [2 * dumpIndex ] = real (v [i]) * dumpScale;
 	 dumpBuffer [2 * dumpIndex + 1] = imag (v [i]) * dumpScale;
@@ -178,9 +179,11 @@
 	sampleCount	+= n;
 	if (sampleCount > INPUT_RATE / N) {
 	 show_Corrector	(corrector);
-	 spectrumBuffer -> putDataIntoBuffer (localBuffer. data (),
-	 bufferSize);
-	 emit show_Spectrum (bufferSize);
+	 if (spectrumBuffer != nullptr) {
+	 spectrumBuffer -> putDataIntoBuffer (localBuffer. data (),
+	 bufferSize);
+	 emit show_Spectrum (bufferSize);
+	 }
 	 localCounter = 0;
 	 sampleCount = 0;
 	}
@@ -191,6 +194,6 @@
 }
 
 void	sampleReader::stopDumping (void) {
-	dumpfilePointer. store (NULL);
+	dumpfilePointer. store (nullptr);
 }

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

@@ -24,25 +24,17 @@
 #include	<stdio.h>
 #include	<inttypes.h>
 //
-//	Transmitter Identification Info is carrier in the null period
-//	of a DAB frame. In case the FIB's carry information on the
-//	set of transmitters used in the SFN, an attempt is made
-//	to identify the transmitter by inspecting the null period.
 //	The information in the null-period is encoded in a "p"
 //	a "pattern" and a "c", a "carrier"
-//	value. The "p" value, derived from the FIB, defines the
+//	value. The "p" value defines the
 //	pattern within the null-period as well as a set of
 //	startcarriers, i.e. carrier numbers where the pattern
 //	could start.
-//	The start carrier itself determined the "c" value.
+//	The start carrier itself determines the "c" value.
 //	Basically, within an SFN the "p" is fixed for all transmitters,
 //	while the latter show the pattern on different positions in
 //	the carriers of the null-period.
 //
-//	Matching the position of the pattern is relatively easy, since
-//	the standard defines the signals (i.e. phase and amplitude) of
-//	the carriers in the pattern.
-//
 //	As it turns out, the pattern is represented by a sequence
 //	consisting of elements with two subsequent bins with the same
 //	value, followed by a "gap" of K * 48 (-1) bins.
@@ -65,25 +57,29 @@
 	window. resize 		(T_u);
 	for (i = 0; i < T_u; i ++)
 	 window [i] = (0.42 -
- 0.5 * cos (2 * M_PI * (float)i / T_u) +
- 0.08 * cos (4 * M_PI * (float)i / T_u));
+	 0.5 * cos (2 * M_PI * (float)i / T_u) +
+	 0.08 * cos (4 * M_PI * (float)i / T_u));
 
- refTable. resize (T_u);
+	refTable. resize (T_u);
 
- memset (refTable. data (), 0, sizeof (std::complex<float>) * T_u);
- for (i = 1; i <= params. get_carriers () / 2; i ++) {
- Phi_k = get_Phi (i);
- refTable [T_u / 2 + i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
- Phi_k = get_Phi (-i);
- refTable [T_u / 2 - i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
- }
+	memset (refTable. data (), 0, sizeof (std::complex<float>) * T_u);
+	for (i = 1; i <= params. get_carriers () / 2; i ++) {
+	 Phi_k = get_Phi (i);
+	 refTable [T_u / 2 + i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
+	 Phi_k = get_Phi (-i);
+	 refTable [T_u / 2 - i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
+	}
 
-	createPattern (dabMode);
+	initInvTable	();
+	createPattern ();
+//	for (i = 0; i < 70; i ++)
+//	 printOverlap (i, 15);
 }
 
 		TII_Detector::~TII_Detector (void) {
 }
 
+
 //	Zm (0, k) is a function of the P and the C, together forming the key to
 //	the database where he transmitter locations are described.
 //
@@ -174,8 +170,17 @@
 	0360		// 1 1 1 1 0 0 0 0		69
 };
 
+
+void	TII_Detector::initInvTable() {
+	int	i;
+	for (i = 0; i < 256; ++i)
+	 invTable [i] = -1;
+	for (i = 0; i < 70; ++i) 
+	 invTable [table [i]] = i;
+}
+
 static
-uint8_t bits [] = {128, 64, 32, 16, 8, 4, 2, 1};
+uint8_t bits [] = {0x80, 0x40, 0x20, 0x10 , 0x08, 0x04, 0x02, 0x01};
 static inline
 uint8_t getbit (uint8_t value, int16_t bitPos) {
 	return value & bits [bitPos] ? 1 : 0;
@@ -190,31 +195,7 @@
 //	creating the patterns above can be done more efficient, however
 //	this approach feels more readable, while initialization, i.e.
 //	executing the constructor, is done once
-int16_t	TII_Detector::A (uint8_t dabMode, uint8_t c, uint8_t p, int16_t k) {
-	if (dabMode == 2)
-	 return A_mode_2 (c, p, k);
-	if (dabMode == 4)
-	 return A_mode_4 (c, p, k);
-	return A_mode_1 (c, p, k);
-}
-
-int16_t	TII_Detector::A_mode_2 (uint8_t c, uint8_t p, int16_t k) {
-int16_t	res	= 0;
-int16_t	b;
-
-	if ((-192 <= k) && (k < - 191)) {
-	 for (b = 0; b <= 3; b ++)
-	 res += delta (k, -192 + 2 * c + 48 * b) * getbit (table [p], b);
-	 for (b = 4; b <= 7; b ++)
-	 res += delta (k, -191 + 2 * c + 48 * b) * getbit (table [p], b);
-	}
-	return res;
-}
-
-int16_t	TII_Detector::A_mode_4 (uint8_t c, uint8_t p, int16_t k) {
-}
-
-int16_t	TII_Detector::A_mode_1 (uint8_t c, uint8_t p, int16_t k) {
+int16_t	TII_Detector::A (uint8_t c, uint8_t p, int16_t k) {
 int16_t b;
 int16_t res	= 0;
 
@@ -239,8 +220,6 @@
 	return res;
 }
 //
-//	If we know the "mainId" from the FIG0/22, we can try to locate
-//	the pattern and compute the C
 
 void	TII_Detector::reset (void) {
 	memset (theBuffer. data (), 0, T_u * sizeof (std::complex<float>));
@@ -256,191 +235,163 @@
 	my_fftHandler. do_FFT ();
 
 	for (i = 0; i < T_u; i ++)
-	 theBuffer [i] += fft_buffer [(T_u / 2 + i) % T_u];
+	 theBuffer [i] = cmul (theBuffer [i], 0.9) +
+	 cmul (fft_buffer [i], 0.1);
 }
 
-//	We collected some "spectra', and start correlating the 
-//	combined spectrum with the pattern defined by the mainId
+void	TII_Detector::collapse (std::complex<float> *inVec, float *outVec) {
+int	i;
 
-int16_t	TII_Detector::find_C (int16_t mainId) {
-int16_t	i;
-int16_t	startCarrier	= theTable [mainId]. carrier;
-uint64_t pattern	= theTable [mainId]. pattern;
-float	maxCorr		= -1;
-int	maxIndex	= -1;
-float	avg		= 0;
-float	corrTable [24];
+	for (i = 0; i < carriers / 8; i ++) {
+	 int carr = - carriers / 2 + 2 * i;
+	 outVec [i] = abs (real (inVec [(T_u + carr) % T_u] *
+	 conj (inVec [(T_u + carr + 1) % T_u])));
 
-	if (mainId < 0)
-	 return - 1;
+	 carr	= - carriers / 2 + 1 * carriers / 4 + 2 * i;
+	 outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
+	 conj (inVec [(T_u + carr + 1) % T_u])));
 
-//	fprintf (stderr, "the carrier is %d\n", startCarrier);
-//
-//	The "c" value is in the range 1 .. 23
-	for (i = 1; i < 24; i ++) {
-	 corrTable [i] = correlate (theBuffer,
-	 startCarrier + 2 * i,
-	 pattern);
-	}
+	 carr	= - carriers / 2 + 2 * carriers / 4 + 2 * i + 1;
+	 outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
+	 conj (inVec [(T_u + carr + 1) % T_u])));
 
-	for (i = 1; i < 24; i ++) {
-	 avg += corrTable [i];
-	 if (corrTable [i] > maxCorr) {
-	 maxCorr = corrTable [i];
-	 maxIndex = i;
-	 }
+	 carr	= - carriers / 2 + 3 * carriers / 4 + 2 * i + 1;
+	 outVec [i] += abs (real (inVec [(T_u + carr) % T_u] *
+	 conj (inVec [(T_u + carr + 1) % T_u])));
 	}
+}
 
-	avg /= 23;
-	if (maxCorr < 2 * avg)
-	 maxIndex = -1;
 
-	return maxIndex;
-}
-//
-//	The difficult one: guessing for Mode 1 only
+#define	NUM_GROUPS	8
+#define	GROUPSIZE	24
 void	TII_Detector::processNULL (int16_t *mainId, int16_t *subId) {
 int i, j;
-float maxCorr_1	= 0;

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

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

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

@@ -36,19 +36,17 @@
 //	converter		= src_new (SRC_SINC_BEST_QUALITY, 2, &err);
 	converter		= src_new (SRC_LINEAR, 2, &err);
 //	converter		= src_new (SRC_SINC_MEDIUM_QUALITY, 2, &err);
-	src_data		= new SRC_DATA;
-	inBuffer. resize (2 * inputLimit + 20);
+	inBuffer. resize (2 * inputLimit + 20);
 	outBuffer. resize (2 * outputLimit + 20);
-	src_data-> data_in	= inBuffer. data ();
-	src_data-> data_out	= outBuffer. data ();
-	src_data-> src_ratio	= ratio;
-	src_data-> end_of_input	= 0;
+	src_data. data_in	= inBuffer. data ();
+	src_data. data_out	= outBuffer. data ();
+	src_data. src_ratio	= ratio;
+	src_data. end_of_input	= 0;
 	inp			= 0;
 }
 
 	newConverter::~newConverter (void) {
 	src_delete	(converter);
-	delete		src_data;
 }
 
 bool	newConverter::convert (std::complex<float> v,
@@ -63,15 +61,15 @@
 	if (inp < inputLimit)
 	 return false;
 
-	src_data	-> input_frames		= inp;
-	src_data	-> output_frames	= outputLimit + 10;
-	res		= src_process (converter, src_data);
+	src_data.	input_frames	= inp;
+	src_data.	output_frames	= outputLimit + 10;
+	res		= src_process (converter, &src_data);
 	if (res != 0) {
 	 fprintf (stderr, "error %s\n", src_strerror (res));
 	 return false;
 	}
 	inp		= 0;
-	framesOut	= src_data -> output_frames_gen;
+	framesOut	= src_data.	output_frames_gen;
 	for (i = 0; i < framesOut; i ++)
 	 out [i] = std::complex<float> (outBuffer [2 * i],
 	 outBuffer [2 * i + 1]);

_service:download_url:qt-dab-2.01.tar.gz/src/protection Added

_service:download_url:qt-dab-2.01.tar.gz/src/protection/eep-protection.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/src/protection/protTables.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/src/protection/protection.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/src/protection/uep-protection.cpp Added

@@ -0,0 +1,245 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	The deconvolution for uep
+ */
+#include	"dab-constants.h"
+#include	"uep-protection.h"
+#include	"protTables.h"
+
+struct protectionProfile {
+	int16_t	bitRate;
+	int16_t	protLevel;
+	int16_t L1;
+	int16_t	L2;
+	int16_t	L3;
+	int16_t	L4;
+	int16_t	PI1;
+	int16_t	PI2;
+	int16_t	PI3;
+	int16_t	PI4;
+} profileTable [] = {
+	{32,	5,	3, 4, 17, 0,	5, 3, 2, -1},
+	{32,	4,	3, 3, 18, 0,	11, 6, 5, -1},
+	{32,	3,	3, 4, 14, 3,	15, 9, 6, 8},
+	{32,	2,	3, 4, 14, 3,	22, 13, 8, 13},
+	{32,	1,	3, 5, 13, 3,	24, 17, 12, 17},
+
+	{48,	5,	4, 3, 26, 3,	5, 4, 2, 3},
+	{48,	4,	3, 4, 26, 3,	9, 6, 4, 6},
+	{48,	3,	3, 4, 26, 3,	15, 10, 6, 9},
+	{48,	2,	3, 4, 26, 3,	24, 14, 8, 15},
+	{48,	1,	3, 5, 25, 3,	24, 18, 13, 18},
+//
+//	Thanks to Pr2 who discovered that the tables for 56 were missing
+	{56,	5,	6, 10, 23, 3,	5, 4, 2, 3},
+	{56,	4,	6, 10, 23, 3,	9, 6, 4, 5},
+	{56,	3,	6, 12, 21, 3,	16, 7, 6, 9},
+	{56,	2,	6, 10, 23, 3,	23, 13, 8, 13},
+//
+//	edinsam discovered that one of the 64 rows contained an error
+	{64,	5,	6, 9, 31, 2,	5, 3, 2, 3},
+	{64,	4,	6, 9, 33, 0,	11, 6, 5, -1},
+	{64,	3,	6, 12, 27, 3,	16, 8, 6, 9},
+	{64,	2,	6, 10, 29, 3,	23, 13, 8, 13},
+	{64,	1,	6, 11, 28, 3,	24, 18, 12, 18},
+
+	{80,	5,	6, 10, 41, 3,	6, 3, 2, 3},
+	{80,	4,	6, 10, 41, 3,	11, 6, 5, 6},
+	{80,	3,	6, 11, 40, 3,	16, 8, 6, 7},
+	{80,	2,	6, 10, 41, 3,	23, 13, 8, 13},
+	{80,	1,	6, 10, 41, 3,	24, 7, 12, 18},
+
+	{96,	5,	7, 9, 53, 3,	5, 4, 2, 4},
+	{96,	4,	7, 10, 52, 3,	9, 6, 4, 6},
+	{96,	3,	6, 12, 51, 3,	16, 9, 6, 10},
+	{96,	2,	6, 10, 53, 3,	22, 12, 9, 12},
+	{96,	1,	6, 13, 50, 3,	24, 18, 13, 19},
+//
+//	Thanks to Kalle Riis, who found that the "112" was missing
+	{112,	5,	14, 17, 50, 3,	5, 4, 2, 5},
+	{112,	4,	11, 21, 49, 3,	9, 6, 4, 8},
+	{112,	3,	11, 23, 47, 3,	16, 8, 6, 9},
+	{112,	2,	11, 21, 49, 3,	23, 12, 9, 14},
+
+	{128,	5,	12, 19, 62, 3,	5, 3, 2, 4},
+	{128,	4,	11, 21, 61, 3,	11, 6, 5, 7},
+	{128,	3,	11, 22, 60, 3,	16, 9, 6, 10},
+	{128,	2,	11, 21, 61, 3,	22, 12, 9, 14},
+	{128,	1,	11, 20, 62, 3,	24, 17, 13, 19},
+
+	{160,	5,	11, 19, 87, 3,	5, 4, 2, 4},
+	{160,	4,	11, 23, 83, 3,	11, 6, 5, 9},
+	{160,	3,	11, 24, 82, 3,	16, 8, 6, 11},
+	{160,	2,	11, 21, 85, 3,	22, 11, 9, 13},
+	{160,	1,	11, 22, 84, 3,	24, 18, 12, 19},
+
+	{192,	5,	11, 20, 110, 3,	6, 4, 2, 5},
+	{192,	4,	11, 22, 108, 3,	10, 6, 4, 9},
+	{192,	3,	11, 24, 106, 3, 16, 10, 6, 11},
+	{192,	2,	11, 20, 110, 3, 22, 13, 9, 13},
+	{192,	1,	11, 21, 109, 3,	24, 20, 13, 24},
+
+	{224,	5,	12, 22, 131, 3,	8, 6, 2, 6},
+	{224,	4,	12, 26, 127, 3,	12, 8, 4, 11},
+	{224,	3,	11, 20, 134, 3, 16, 10, 7, 9},
+	{224,	2,	11, 22, 132, 3,	24, 16, 10, 15},
+	{224,	1,	11, 24, 130, 3,	24, 20, 12, 20},
+
+	{256,	5,	11, 24, 154, 3,	6, 5, 2, 5},
+	{256,	4,	11, 24, 154, 3,	12, 9, 5, 10},
+	{256,	3,	11, 27, 151, 3,	16, 10, 7, 10},
+	{256,	2,	11, 22, 156, 3,	24, 14, 10, 13},
+	{256,	1,	11, 26, 152, 3,	24, 19, 14, 18},
+
+	{320,	5,	11, 26, 200, 3,	8, 5, 2, 6},
+	{320,	4,	11, 25, 201, 3,	13, 9, 5, 10},
+	{320,	2,	11, 26, 200, 3,	24, 17, 9, 17},
+	
+	{384,	5,	11, 27, 247, 3,	8, 6, 2, 7},
+	{384,	3,	11, 24, 250, 3,	16, 9, 7, 10},
+	{384,	1,	12, 28, 245, 3,	24, 20, 14, 23},
+	{0,	-1,	-1, -1, -1, -1,	-1, -1, -1, -1}
+};
+
+static
+int16_t	findIndex (int16_t bitRate, int16_t protLevel) {
+int16_t	i;
+
+	for (i = 0; profileTable [i].bitRate != 0; i ++)
+	 if ((profileTable [i]. bitRate == bitRate) &&
+	 (profileTable [i]. protLevel == protLevel))
+	 return i;
+
+	return -1;
+}
+
+/**
+ *	the table is based on chapter 11 of the DAB standard.
+ *
+ *	\brief uep_deconvolve
+ *
+ *	The bitRate and the protectionLevel determine the 
+ *	depuncturing scheme.
+ */
+ uep_protection::uep_protection (int16_t bitRate,
+ int16_t protLevel):
+ protection (bitRate, protLevel) {
+int16_t index, i, j;
+int16_t	viterbiCounter	= 0;
+int16_t L1;
+int16_t L2;
+int16_t L3;
+int16_t L4;
+int8_t *PI1;
+int8_t *PI2;
+int8_t *PI3;
+int8_t *PI4;
+int8_t *PI_X;
+
+	fprintf (stderr, "protLevel %d, bitRate %d\n", protLevel, bitRate);
+	index	= findIndex (bitRate, protLevel);
+	if (index == -1) {
+	 fprintf (stderr, "%d (%d) has a problem\n", bitRate, protLevel);
+	 index = 1;
+	}
+
+	L1	= profileTable [index]. L1;
+	L2	= profileTable [index]. L2;
+	L3	= profileTable [index]. L3;
+	L4	= profileTable [index]. L4;
+
+	PI1	= get_PCodes (profileTable [index]. PI1 -1);
+	PI2	= get_PCodes (profileTable [index]. PI2 -1);
+	PI3	= get_PCodes (profileTable [index]. PI3 -1);
+	if ((profileTable [index]. PI4 - 1) != -1)
+	 PI4	= get_PCodes (profileTable [index]. PI4 -1);
+	else
+	 PI4	= nullptr;
+
+	PI_X	= get_PCodes (8 - 1);
+//
+//	We prepare a mapping table with the given punctures
+	memset (indexTable. data (), 0, (4 * outSize + 24) * sizeof (uint8_t));
+	for (i = 0; i < L1; i ++) {
+	 for (j = 0; j < 128; j ++) {
+	 if (PI1 [j % 32] != 0) 
+	 indexTable [viterbiCounter] = true;
+	 viterbiCounter ++;
+	 }
+	}
+
+	for (i = 0; i < L2; i ++) {
+	 for (j = 0; j < 128; j ++) {
+	 if (PI2 [j % 32] != 0) 
+	 indexTable [viterbiCounter] = true;
+	 viterbiCounter ++;
+	 }
+	}
+
+	for (i = 0; i < L3; i ++) {
+	 for (j = 0; j < 128; j ++) {

_service:download_url:qt-dab-2.01.tar.gz/src/support/dab_tables.cpp Added

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

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

@@ -22,6 +22,7 @@
 #include	<stdio.h>
 #include	"ensemble-printer.h"
 #include	"country-codes.h"
+#include	"dab_tables.h"
 #include	"text-mapper.h"
 #include	"dab-processor.h"
 
@@ -81,29 +82,10 @@
 	 my_dabProcessor -> dataforAudioService (i, &d);
 	 if (!d. defined)
 	 continue;
-	 uint16_t h = d. protLevel;
-	 QString protL;
-	 QString codeRate;
-	 if (!d. shortForm) {
-	 protL = "EEP ";
-
- protL. append (QString::number ((h & 03) + 1));
-	 if ((h & (1 << 2)) == 0) {
- protL. append ("-A");
-	 codeRate = eep_Arates [(h & 03) + 1];
-	 }
-	 else {
- protL. append ("-B");
-	 codeRate = eep_Brates [(h & 03) + 1];
-	 }
- h = (h & 03) + 1;
-	 }
-	 else {
-	 protL = "UEP ";
-	 protL. append (QString::number (h));
-	 codeRate = uep_rates [h + 1];
-	 }
-
+	 QString protL	= getProtectionLevel (d. shortForm, 
+	 d. protLevel);
+	 QString codeRate	= getCodeRate (d. shortForm, 
+	 d. protLevel);
 	 countryId = (d. serviceId >> 12) & 0xF;
 	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%s;%s;%s;%s;%s;\n",
 	 d. serviceName. toUtf8(). data (),
@@ -149,7 +131,6 @@
 	 h = (h & 03) + 1;
 	 }
 	 else {
-	 h = h & 03;
 	 protL = "UEP ";
 	 protL. append (QString::number (h));
 	 codeRate = uep_rates [h + 1];

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

_service:download_url:qt-dab-2.0.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-2.01.tar.gz/tii-viewer/tii-viewer.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/tii_detection.txt Added

@@ -0,0 +1,60 @@
+
+
+tii_detection always was found to be a problem. In fact it is
+trivial to solve, but due to an error in a generating program
+I missed that.
+
+The way tii is encoded is simple, it is a 4 out of 8 code for the
+mainId, and a 1 .. 23 offset for the subId.
+
+The code maps by assigning bit values to the positions in the
+8 bits. The first bit has a value of 0x80, the seconds 0x40 etc.
+
+The 4/8 code is implemented in 8 0/1 values with corresponding indices
+each in a segment of 24 values. So, an encoded value is represented
+in the fft by 4 non-null values, appearing at a distance of N * 24
+elements.
+
+Note 1:
+	null value not to be taken to litterally, there is noise
+Note 2:
+	elements consists of two subsequent bins (carriers) in the fft
+
+The offset indicates the position in the 24 value segments, and is
+- obviously - the same for all four high values in the set of 8 values.
+
+Decoding is then straight forward, it is restricted to DAB Mode 1.
+
+The carriers, -768 .. 768, are collapsed onto a vector of 192 (8 * 24)
+length. The transmitted pattern is repeated, it occurs 4 times,
+and each offset value takes 2 carriers.
+
+After collapsing, the 192 value vector is considered to consist
+of 6 segments of 24 values. 
+A search is made in these 8 segments to locate the elements with the highest
+(or high-enough) values, and the number of times these elements
+are detected is maintained in a separate 24 bit element vector.
+
+The sum of the high values determines the offset, the pattern seen
+in the corresponding elements in the 8 24 value segments determine
+a pattern.
+
+The "value" of the pattern - bit encoded as stated above -
+is used in an index table to locate the corresponding 'P' value
+
+
+============================================================================
+
+What was I doing wrong:
+
+Using a simple generator I had the - erroneous - impression that
+the pattern that could occur were NOT unique. Apparently an error
+in my generator. By the search to patters starting and stopping with 
+a "1", patterns were not unique, of course by looking at the patters
+consisting of the full 8 0/1 values they are unique.
+
+Assuming the pattern were NOT unique, a search had to be
+made to allowable patterns for each starting position in the
+transmitted null period.
+
+

qt-dab-2.0git20181215.tar.gz Deleted