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 11

qt-dab.changes Changed

qt-dab.spec Changed

qt-dab-2.02-missing-q_object.patch Deleted

qt-dab-2.5-fix-missing-return.patch Added

_service Changed

_service:download_url:qt-dab-2.02.tar.gz/README_VITERBI Deleted

@@ -1,57 +0,0 @@
-
-A Note on Viterbi Handling
-
-Deconvolution is one of the resource consuming operations in DAB decoding.
-Up until now, we used the deconvolution, using some variant of the
-do-called "spiral-code", heavily optimized code with different
-variants for use with and without SSE instructions etc etc.
-
-For the RPI there we also variants, using specialized NEON instructions.
-
-There are two reasons I was not happy with that solution,
-the first one - of course - being that I did not write it myself.
-The second, maybe even more important reason was that these spiral
-approached are higly optimized for fixed, known, length segments
-to be deconvolved, but not usable for use in an environment with
-differently sized segments.
-
-While for the FIC blocks the length is predefined, for the data blocks
-in the audio or data streams it is not. This lead to a construction
-where the full spiral could be used for deconvolving the data in the
-FIC blocks, while for the data in the MSC the more "generic" deconvolver
-was used.
-
-A further complication was that the mingw cross compilers for windows do not
-have support for SSE instructions, so there all data was handled by
-the "generic" deconvolver.
-
-Looking at the requirements for the deconvolution in the DAB decoder,
-I saw a number of potential optimizations (in this case reducing the amount of
-computations) that could be applied to my original
-straightforward implementation.
-
-To test the two versions, I created three versions, one with
-the locally manually optimized viterbi decoder, one with the
-spiral/generic  and on with only the generic deconvolver
-(all three versions with O3 as optimization, and - of course - profiling flags.
-Running the three versions on
-same channel and the same service with profiling versions
-gave the following results
-a. the locally optimized version takes  38.10 (deconvolve) + 0.62
-(computeCosts)app 38 % of the load, resulting in 38.7 %
-b. the no-sse version takes  22.5 (BFlY) + 9.87 (update_viterbi) + 6.36 (FULL_SPIRAL_no_sse) + 0.72 (deconvolve) resulting in app 39.5 % of the load.
-c. the sse_version takes 24.28 (BFlY) + 9.94 (update_viterbi) + 2.22 (FULL_SPIRAL_sse) + 0.72 (deconvolve) resulting in app 37 %.
-
-While there is no doubt that the "sse" version is fastest, I prefer to
-use the "locally optimized" version, and set the parameters accordingly.
-
-If you want to use the spiral version for the x64, then
-a. uncomment the "viterbi-handler" lines and comment the "viterbi-jan"
-lines out in the different sections in the ".pro" file
-b. uncomment the line "CONFIG += SSE" (and be sure to have commented out the other SSE related lines)
-
-If you want to use the "generic" version, then follow the steps above, however,
-be sure to have uncommented the line "CONFIG+=NO_SSE"
-
-
-

_service:download_url:qt-dab-2.02.tar.gz/i18n/hu_HU.qm Deleted

_service:download_url:qt-dab-2.02.tar.gz/i18n/hu_HU.ts Deleted

@@ -1,816 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="hu_HU">
-<context>
- <name>CDABConstants</name>
- <message>
- <location filename="../src/DabConstants.cpp" line="37"/>
- <source>none</source>
- <translation type="unfinished">Meghatározatlan</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="38"/>
- <source>News</source>
- <translation type="unfinished">Hírek</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="39"/>
- <source>Current Affairs</source>
- <translation type="unfinished">Aktuális ügyek</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="40"/>
- <source>Information</source>
- <translation type="unfinished">Információ</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="41"/>
- <source>Sport</source>
- <translation type="unfinished">Sport</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="42"/>
- <source>Education</source>
- <translation type="unfinished">Oktatás</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="43"/>
- <source>Drama</source>
- <translation type="unfinished">Dráma</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="44"/>
- <source>Arts</source>
- <translation type="unfinished">Kultúra</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="45"/>
- <source>Science</source>
- <translation type="unfinished">Tudomány</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="46"/>
- <source>Talk</source>
- <translation type="unfinished">Vegyes</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="47"/>
- <source>Pop Music</source>
- <translation type="unfinished">Popzene</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="48"/>
- <source>Rock Music</source>
- <translation type="unfinished">Rockzene</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="49"/>
- <source>Easy Listening</source>
- <translation type="unfinished">Lágy zenék</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="50"/>
- <source>Light classical</source>
- <translation type="unfinished">Könnyű klasszikus zene</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="51"/>
- <source>Classical Music</source>
- <translation type="unfinished">Komoly klasszikus zene</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="52"/>
- <source>Other Music</source>
- <translation type="unfinished">Egyéb zene</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="53"/>
- <source>Weather</source>
- <translation type="unfinished">Időjárás</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="54"/>
- <source>Finance</source>
- <translation type="unfinished">Pénzügy</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="55"/>
- <source>Children&apos;s</source>
- <translation type="unfinished">Gyermekprogramok</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="56"/>
- <source>Factual</source>
- <translation type="unfinished">Szociális ügyek</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="57"/>
- <source>Religion</source>
- <translation type="unfinished">Vallás</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="58"/>
- <source>Phone In</source>
- <translation type="unfinished">Telefonos műsor</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="59"/>
- <source>Travel</source>
- <translation type="unfinished">Utazás</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="60"/>
- <source>Leisure</source>
- <translation type="unfinished">Szabadidő</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="61"/>
- <source>Jazz and Blues</source>
- <translation type="unfinished">Jazz</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="62"/>
- <source>Country Music</source>
- <translation type="unfinished">Country</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="63"/>
- <source>National Music</source>
- <translation type="unfinished">Nemzet zenéje</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="64"/>
- <source>Oldies Music</source>
- <translation type="unfinished">Régi slágerek</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="65"/>
- <source>Folk Music</source>
- <translation type="unfinished">Népzene</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="66"/>
- <source>entry 29 not used</source>
- <translation type="unfinished">Dokumentumműsor</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="67"/>
- <source>entry 30 not used</source>
- <translation type="unfinished">Riadó próbája</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="68"/>
- <source>entry 31 not used</source>
- <translation type="unfinished">Riadó</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="82"/>
- <source>Unknown</source>
- <translation type="unfinished">Ismeretlen</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="83"/>
- <source>Albanian</source>
- <translation type="unfinished">Albán</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="84"/>
- <source>Breton</source>
- <translation type="unfinished">Breton</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="85"/>
- <source>Catalan</source>
- <translation type="unfinished">Katalán</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="86"/>
- <source>Croatian</source>
- <translation type="unfinished">Horvát</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="87"/>
- <source>Welsh</source>
- <translation type="unfinished">Walesi</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="88"/>
- <source>Czech</source>
- <translation type="unfinished">Cseh</translation>

_service:download_url:qt-dab-2.02.tar.gz/i18n/it_IT.qm Deleted

_service:download_url:qt-dab-2.02.tar.gz/i18n/it_IT.ts Deleted

@@ -1,753 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="it">
-<context>
- <name>CAndroid_RTL_SDR</name>
- <message>
- <location filename="../src/input/CAndroid_RTL_SDR.cpp" line="111"/>
- <location filename="../src/input/CAndroid_RTL_SDR.cpp" line="140"/>
- <source>Android RTL-SDR driver is not installed</source>
- <translation>Il driver RTL-SDR per Android non è installato</translation>
- </message>
- <message>
- <location filename="../src/input/CAndroid_RTL_SDR.cpp" line="111"/>
- <source>Do you would like to install it? After install start welle.io again.</source>
- <translation>Vuoi installarlo? Una volta installato riapri welle.io.</translation>
- </message>
-</context>
-<context>
- <name>CDABConstants</name>
- <message>
- <location filename="../src/DabConstants.cpp" line="37"/>
- <source>none</source>
- <translation>Nessuno</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="38"/>
- <source>news</source>
- <translation>Notizie</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="39"/>
- <source>current affairs</source>
- <translation>Attualità</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="40"/>
- <source>information</source>
- <translation>Informazione</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="41"/>
- <source>sport</source>
- <translation>Sport</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="42"/>
- <source>education</source>
- <translation>Educazione</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="43"/>
- <source>dram</source>
- <translation>Dramma</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="44"/>
- <source>arts</source>
- <translation>Arti</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="45"/>
- <source>science</source>
- <translation>Scienza</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="46"/>
- <source>talk</source>
- <translation>Discorso</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="47"/>
- <source>pop music</source>
- <translation>Pop</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="48"/>
- <source>rock music</source>
- <translation>Rock</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="49"/>
- <source>easy listening</source>
- <translation>Easy Listening</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="50"/>
- <source>light classical</source>
- <translation>Musica leggera</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="51"/>
- <source>classical music</source>
- <translation>Classica</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="52"/>
- <source>other music</source>
- <translation>Altra musica</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="53"/>
- <source>wheather</source>
- <translation>Meteo</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="54"/>
- <source>finance</source>
- <translation>Finanza</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="55"/>
- <source>children&apos;s</source>
- <translation>Bambini</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="56"/>
- <source>factual</source>
- <translation>Fatti</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="57"/>
- <source>religion</source>
- <translation>Religione</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="58"/>
- <source>phone in</source>
- <translation>Chiamata</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="59"/>
- <source>travel</source>
- <translation>Viaggio</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="60"/>
- <source>leisure</source>
- <translation>Svago</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="61"/>
- <source>jazz and blues</source>
- <translation>Jazz and Blues</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="62"/>
- <source>country music</source>
- <translation>Country</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="63"/>
- <source>national music</source>
- <translation>Musica Nazionale</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="64"/>
- <source>oldies music</source>
- <translation>Oldies</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="65"/>
- <source>folk music</source>
- <translation>Musica Folk</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="66"/>
- <source>entry 29 not used</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="67"/>
- <source>entry 30 not used</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="68"/>
- <source>entry 31 not used</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="82"/>
- <source>Unknown</source>
- <translation>Sconosciuto</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="83"/>
- <source>Albanian</source>
- <translation>Albanese</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="84"/>
- <source>Breton</source>
- <translation>Bretone</translation>
- </message>
- <message>
- <location filename="../src/DabConstants.cpp" line="85"/>
- <source>Catalan</source>
- <translation>Catalano</translation>
- </message>

_service:download_url:qt-dab-2.02.tar.gz/includes/ofdm/fib-processor.h Deleted

@@ -1,195 +0,0 @@
-#
-/*
- * Copyright (C) 2013
- * 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	__FIB_PROCESSOR__
-#define	__FIB_PROCESSOR__
-#
-//
-#include	<stdint.h>
-#include	<stdio.h>
-#include	<QObject>
-#include	"msc-handler.h"
-#include	"tii_table.h"
-#include	<QMutex>
-
-	struct dablabel {
-	 QString	label;
-	 bool		hasName;
-	};
-
-	typedef struct dablabel	dabLabel;
-
-	typedef struct subchannelmap channelMap;
-
-//	from FIG1/2
-	struct serviceid {
-	 bool		inUse;
-	 uint32_t	serviceId;
-	 dabLabel	serviceLabel;
-	 int16_t	language;
-	 int16_t	programType;
-	 int16_t	pNum;
-	};
-	typedef	struct serviceid serviceId;
-
-// The service component describes the actual service
-// It really should be a union, the component data for
-//	audio and data are quite different
- struct servicecomponents {
- bool inUse; // just administration
- int8_t TMid; // the transport mode
- serviceId *service; // belongs to the service
- int16_t componentNr; // component
-
- int16_t ASCTy; // used for audio
- int16_t PS_flag; // use for both audio and packet
- int16_t subchannelId; // used in both audio and packet
- uint16_t SCId; // used in packet
- uint8_t CAflag; // used in packet (or not at all)
- int16_t DSCTy; // used in packet
-	 uint8_t	DGflag;		// used for TDC
- int16_t packetAddress; // used in packet
-	 int16_t	appType;	// used in packet
-	 bool		is_madePublic;	// used to make service visible
- };
-
- typedef struct servicecomponents serviceComponent;
-
-	struct subchannelmap {
-	 bool		inUse;
-	 int32_t	SubChId;
-	 int32_t	startAddr;
-	 int32_t	Length;
-	 bool		shortForm;
-	 int32_t	protLevel;
-	 int32_t	bitRate;
-	 int16_t	language;
-	 int16_t	FEC_scheme;
-	};
-
-	struct {
-	 QString ensembleName;
-	 int32_t ensembleId;
-	 uint8_t ecc_byte;
-	 bool	 name_Present;
-	 bool	 ecc_Present;
-	} ensemble_Descriptor;
-
-class	RadioInterface;
-class	dabParams;
-
-class	fib_processor: public QObject {
-Q_OBJECT
-public:
-		fib_processor		(RadioInterface *, uint8_t dabMode);
-		~fib_processor		(void);
-
-	void	setupforNewFrame	(void);
-	void	clearEnsemble		(void);
-	bool	syncReached		(void);
-	void	resetSync		(void);
-	void	setSelectedService	(QString &);
-	uint8_t	kindofService		(QString &);
-	void	dataforAudioService	(int16_t, audiodata *);
-	void	dataforDataService	(int16_t, packetdata *);
-	void	dataforAudioService	(QString &, audiodata *, int16_t);
-	void	dataforDataService	(QString &, packetdata *, int16_t);
-	std::complex<float> get_coordinates	(int16_t, int16_t, bool *);
-	int16_t	mainId			(void);
-	uint8_t	get_ecc			(void);
-	int32_t	get_ensembleId		(void);
-	QString get_ensembleName	(void);
-	int32_t	get_CIFcount		(void);
-protected:
-	void	newFrame		(void);
-	void	process_FIB		(uint8_t *, uint16_t);
-	dabParams params;
-private:
-	RadioInterface	*myRadioInterface;
-	serviceId	*findServiceId (int32_t);
-	serviceComponent *find_packetComponent (int16_t);
-	serviceComponent *find_serviceComponent (int32_t SId, int16_t SCId);
- void bind_audioService (int8_t,
- uint32_t, int16_t,
- int16_t, int16_t, int16_t);
- void bind_packetService (int8_t,
- uint32_t, int16_t,
- int16_t, int16_t, int16_t);
-	int32_t		findServiceIdwithName (QString &s);
-	int32_t		CIFcount;
-	void		process_FIG0		(uint8_t *);
-	void		process_FIG1		(uint8_t *);
-	void		FIG0Extension0		(uint8_t *);
-	void		FIG0Extension1		(uint8_t *);
-	void		FIG0Extension2		(uint8_t *);
-	void		FIG0Extension3		(uint8_t *);
-	void		FIG0Extension4		(uint8_t *);
-	void		FIG0Extension5		(uint8_t *);
-	void		FIG0Extension6		(uint8_t *);
-	void		FIG0Extension7		(uint8_t *);
-	void		FIG0Extension8		(uint8_t *);
-	void		FIG0Extension9		(uint8_t *);
-	void		FIG0Extension10		(uint8_t *);
-	void		FIG0Extension11		(uint8_t *);
-	void		FIG0Extension12		(uint8_t *);
-	void		FIG0Extension13		(uint8_t *);
-	void		FIG0Extension14		(uint8_t *);
-	void		FIG0Extension15		(uint8_t *);
-	void		FIG0Extension16		(uint8_t *);
-	void		FIG0Extension17		(uint8_t *);
-	void		FIG0Extension18		(uint8_t *);
-	void		FIG0Extension19		(uint8_t *);
-	void		FIG0Extension20		(uint8_t *);
-	void		FIG0Extension21		(uint8_t *);
-	void		FIG0Extension22		(uint8_t *);
-	void		FIG0Extension23		(uint8_t *);
-	void		FIG0Extension24		(uint8_t *);
-	void		FIG0Extension25		(uint8_t *);
-	void		FIG0Extension26		(uint8_t *);
-
-	int16_t		HandleFIG0Extension1	(uint8_t *,
-	 int16_t, uint8_t);
-	int16_t		HandleFIG0Extension2	(uint8_t *,
-	 int16_t, uint8_t, uint8_t);
-	int16_t		HandleFIG0Extension3	(uint8_t *, int16_t);
-	int16_t		HandleFIG0Extension5	(uint8_t *, int16_t);
-	int16_t		HandleFIG0Extension8	(uint8_t *,
-	 int16_t, uint8_t);
-	int16_t		HandleFIG0Extension13	(uint8_t *,
-	 int16_t, uint8_t);
-	int16_t		HandleFIG0Extension22	(uint8_t *, int16_t);
-	int32_t		dateTime	[8];
-	channelMap	subChannels	[64];
-	serviceComponent	ServiceComps [64];
-	serviceId	listofServices	[64];
-	tii_table	coordinates;
-	bool		dateFlag;
-	bool		isSynced;
-	QMutex		fibLocker;
-signals:
-	void		addtoEnsemble	(const QString &);
-	void		nameofEnsemble (int, const QString &);
-	void		changeinConfiguration (void);
-};
-
-#endif
-

_service:download_url:qt-dab-2.02.tar.gz/qt-dab.pro.user Deleted

@@ -1,218 +0,0 @@
-<?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.02.tar.gz/src/ofdm/fib-processor.cpp Deleted

@@ -1,1534 +0,0 @@
-#
-/*
- * Copyright (C) 2014
- * 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
- *
- * 	fib processor. Functionality is shared between fic handler, i.e. the
- *	one preparing the FIC blocks for processing, and the mainthread
- *	from which calls are coming on selecting a program
- */
-#include	"fib-processor.h"
-#include	<cstring>
-#include	<vector>
-#include	"radio.h"
-#include	"charsets.h"
-#include	"dab-params.h"
-//
-// Tabelle ETSI EN 300 401 Page 50
-// Table is copied from the work of Michael Hoehn
- const int ProtLevel[64][3] = {{16,5,32},	// Index 0
- {21,4,32},
- {24,3,32},
- {29,2,32},
- {35,1,32},	// Index 4
- {24,5,48},
- {29,4,48},
- {35,3,48},
- {42,2,48},
- {52,1,48},	// Index 9
- {29,5,56},
- {35,4,56},
- {42,3,56},
- {52,2,56},
- {32,5,64},	// Index 14
- {42,4,64},
- {48,3,64},
- {58,2,64},
- {70,1,64},
- {40,5,80},	// Index 19
- {52,4,80},
- {58,3,80},
- {70,2,80},
- {84,1,80},
- {48,5,96},	// Index 24
- {58,4,96},
- {70,3,96},
- {84,2,96},
- {104,1,96},
- {58,5,112},	// Index 29
- {70,4,112},
- {84,3,112},
- {104,2,112},
- {64,5,128},
- {84,4,128},	// Index 34
- {96,3,128},
- {116,2,128},
- {140,1,128},
- {80,5,160},
- {104,4,160},	// Index 39
- {116,3,160},
- {140,2,160},
- {168,1,160},
- {96,5,192},
- {116,4,192},	// Index 44
- {140,3,192},
- {168,2,192},
- {208,1,192},
- {116,5,224},
- {140,4,224},	// Index 49
- {168,3,224},
- {208,2,224},
- {232,1,224},
- {128,5,256},
- {168,4,256},	// Index 54
- {192,3,256},
- {232,2,256},
- {280,1,256},
- {160,5,320},
- {208,4,320},	// index 59
- {280,2,320},
- {192,5,384},
- {280,3,384},
- {416,1,384}};
-
-//
-	fib_processor::fib_processor (RadioInterface *mr, uint8_t dabMode):
-	 params (dabMode),
-	 coordinates (mr) {
-	myRadioInterface	= mr;
-
-	memset (dateTime, 0, sizeof (dateTime));
-	dateFlag	= false;
-	clearEnsemble	();
-	connect (this, SIGNAL (addtoEnsemble (const QString &)),
-	 myRadioInterface, SLOT (addtoEnsemble (const QString &)));
-	connect (this, SIGNAL (nameofEnsemble (int, const QString &)),
-	 myRadioInterface, SLOT (nameofEnsemble (int, const QString &)));
-
-	connect (this, SIGNAL (changeinConfiguration (void)),
-	 myRadioInterface, SLOT (changeinConfiguration (void)));
-
-	coordinates. cleanUp ();
-	CIFcount	= 0;
-	ensemble_Descriptor. ecc_Present	= false;
-	ensemble_Descriptor. name_Present	= false;
-}
-	
-	fib_processor::~fib_processor (void) {
-}
-
-void	fib_processor::newFrame (void) {
-	 CIFcount ++;
-	}
-
-//
-//	FIB's are segments of 256 bits. When here, we already
-//	passed the crc and we start unpacking into FIGs
-//	This is merely a dispatcher
-void	fib_processor::process_FIB (uint8_t *p, uint16_t fib) {
-uint8_t	FIGtype;
-int8_t	processedBytes	= 0;
-uint8_t	*d		= p;
-
-	fibLocker. lock ();
-	(void)fib;
-	while (processedBytes < 30) {
-	 FIGtype 		= getBits_3 (d, 0);
-	 switch (FIGtype) {
-	 case 0:
-	 process_FIG0 (d);	
-	 break;
-
-	 case 1:
-	 process_FIG1 (d);
-	 break;
-
-	 case 7:
-	 break;
-
-	 default:
-//	 fprintf (stderr, "FIG%d aanwezig\n", FIGtype);
-	 break;
-	 }
-//
-//	Thanks to Ronny Kunze, who discovered that I used
-//	a p rather than a d
-	 processedBytes += getBits_5 (d, 3) + 1;
-//	 processedBytes += getBits (p, 3, 5) + 1;
-	 d = p + processedBytes * 8;
-	}
-	fibLocker. unlock ();
-}
-//
-//	Handle ensemble is all through FIG0
-//
-void	fib_processor::process_FIG0 (uint8_t *d) {
-uint8_t	extension	= getBits_5 (d, 8 + 3);
-//uint8_t	CN	= getBits_1 (d, 8 + 0);
-
-	switch (extension) {
-	 case 0:
-	 FIG0Extension0 (d);
-	 break;
-
-	 case 1:
-	 FIG0Extension1 (d);
-	 break;
-
-	 case 2:
-	 FIG0Extension2 (d);
-	 break;
-
-	 case 3:
-	 FIG0Extension3 (d);
-	 break;
-
-	 case 4:
-	 FIG0Extension4 (d);
-	 break;
-
-	 case 5:
-	 FIG0Extension5 (d);
-	 break;
-

_service:download_url:qt-dab-2.02.tar.gz/tii_detection.txt Deleted

@@ -1,60 +0,0 @@
-
-
-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.
-
-

_service:download_url:qt-dab-2.02.tar.gz/.travis.yml -> _service:download_url:qt-dab-2.5.tar.gz/.travis.yml Changed

_service:download_url:qt-dab-2.02.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-2.5.tar.gz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.0)
+set (objectName qt-dab-2.5)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -188,10 +188,11 @@
 	     ./includes/dab-constants.h
              ./includes/ofdm/sample-reader.h
 	     ./includes/ofdm/phasereference.h
+	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasetable.h
 	     ./includes/ofdm/freq-interleaver.h
-	     ./includes/ofdm/fib-processor.cpp
-	     ./includes/ofdm/fic-handler.cpp
+	     ./includes/ofdm/fib-decoder.h
+	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/tii_table.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/timesyncer.h
@@ -262,7 +263,7 @@
 	     ./src/ofdm/phasereference.cpp
 	     ./src/ofdm/phasetable.cpp
 	     ./src/ofdm/freq-interleaver.cpp
-	     ./src/ofdm/fib-processor.cpp
+	     ./src/ofdm/fib-decoder.cpp
 	     ./src/ofdm/fic-handler.cpp
 	     ./src/ofdm/tii_table.cpp
 	     ./src/ofdm/tii_detector.cpp
@@ -324,11 +325,12 @@
 	set (${objectName}_MOCS
 	     ./dab-processor.h
 	     ./includes/output/audio-base.h
+	     ./includes/output/audiosink.h
 	     ./includes/ofdm/sample-reader.h
 	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasereference.h
+	     ./includes/ofdm/fib-decoder.h
 	     ./includes/ofdm/fic-handler.h
-	     ./includes/ofdm/fib-processor.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/tii_table.h
 	     ./includes/backend/backend.h

_service:download_url:qt-dab-2.02.tar.gz/CMakeLists.txt-qt4 -> _service:download_url:qt-dab-2.5.tar.gz/CMakeLists.txt-qt4 Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.0)
+set (objectName qt-dab-2.5)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -187,7 +187,7 @@
 	     ./includes/ofdm/tii_table.h
              ./includes/ofdm/tii_detector.h
              ./includes/ofdm/fic-handler.h
-             ./includes/ofdm/fib-processor.h
+             ./includes/ofdm/fib-decoder.h
 	     ./includes/ofdm/timesyncer.h
 	     ./includes/protection/protTables.h
              ./includes/protection/protection.h
@@ -261,7 +261,7 @@
 	     ./src/ofdm/tii_table.cpp
              ./src/ofdm/tii_detector.cpp
 	     ./src/ofdm/fic-handler.cpp
-	     ./src/ofdm/fib-processor.cpp
+	     ./src/ofdm/fib-decoder.cpp
 	     ./src/ofdm/timesyncer.cpp
 	     ./src/protection/protTables.cpp
              ./src/protection/protection.cpp
@@ -322,13 +322,14 @@
 	set (${objectName}_MOCS
 	     ./dab-processor.h
              ./includes/output/audio-base.h
+             ./includes/output/audiosink.h
              ./includes/ofdm/sample-reader.h
              ./includes/ofdm/ofdm-decoder.h
              ./includes/ofdm/phasereference.h
              ./includes/ofdm/tii_detector.h
              ./includes/ofdm/tii_table.h
              ./includes/ofdm/fic-handler.h
-             ./includes/ofdm/fib-processor.h
+             ./includes/ofdm/fib-decoder.h
 	     ./includes/backend/backend.h
              ./includes/backend/audio/faad-decoder.h
              ./includes/backend/audio/mp2processor.h

_service:download_url:qt-dab-2.02.tar.gz/CMakeLists.txt-qt5 -> _service:download_url:qt-dab-2.5.tar.gz/CMakeLists.txt-qt5 Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.0)
+set (objectName qt-dab-2.5)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -187,10 +187,11 @@
              ./includes/country-codes.h
 	     ./includes/dab-constants.h
              ./includes/ofdm/sample-reader.h
+	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasereference.h
 	     ./includes/ofdm/phasetable.h
 	     ./includes/ofdm/freq-interleaver.h
-	     ./includes/ofdm/fib-processor.cpp
+	     ./includes/ofdm/fib-decoder.cpp
 	     ./includes/ofdm/fic-handler.cpp
 	     ./includes/ofdm/tii_table.h
 	     ./includes/ofdm/tii_detector.h
@@ -262,7 +263,7 @@
 	     ./src/ofdm/phasereference.cpp
 	     ./src/ofdm/phasetable.cpp
 	     ./src/ofdm/freq-interleaver.cpp
-	     ./src/ofdm/fib-processor.cpp
+	     ./src/ofdm/fib-decoder.cpp
 	     ./src/ofdm/fic-handler.cpp
 	     ./src/ofdm/tii_table.cpp
 	     ./src/ofdm/tii_detector.cpp
@@ -324,11 +325,12 @@
 	set (${objectName}_MOCS
 	     ./dab-processor.h
 	     ./includes/output/audio-base.h
+	     ./includes/output/audiosink.h
 	     ./includes/ofdm/sample-reader.h
 	     ./includes/ofdm/ofdm-decoder.h
 	     ./includes/ofdm/phasereference.h
 	     ./includes/ofdm/fic-handler.h
-	     ./includes/ofdm/fib-processor.h
+	     ./includes/ofdm/fib-decoder.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/tii_table.h
 	     ./includes/backend/backend.h

_service:download_url:qt-dab-2.02.tar.gz/README.md -> _service:download_url:qt-dab-2.5.tar.gz/README.md Changed

@@ -2,12 +2,18 @@
 
 Qt-DAB is a Software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). It is the successor of both DAB-rpi and sdr-j-DAB, two former programs by the same author.
 
-------------------------------------------------------------------
-Table of Contents
-------------------------------------------------------------------
 
-* [Introduction](#introduction)
+# NEW FEATURES in Qt-DAB 2.5
+
+If configured, the EPG data will be written to a file. The pathname to the directory in which the file will be written is set in the "picturePath"
+
+If available, the frequency in the FM band on which the service can be heard, is given in the Technical Data widget.
+
+
+# Table of Contents
+
 * [Features](#features)
+* [Introduction](#introduction)
 * [Widgets and scopes](#widgets-and-scopes)
 * [Installation](#features)
   * [Windows](#windows)
@@ -20,10 +26,9 @@
   * [Comment on some settings](#comment-on-some-settings)
   * [A note on intermittent sound](#a-note-on-intermittent-sound)
 * [Copyright](#copyright)
- 
-------------------------------------------------------------------
-Features
-------------------------------------------------------------------
+
+
+# Features
 
   * DAB (mp2) and DAB+ (HE-AAC v1, HE-AAC v2 and LC-AAC) decoding
   * MOT SlideShow (SLS)
@@ -52,16 +57,15 @@
     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).
-  * ip output: when configured the ip data - if selected - is sent to a specificied ip address (default: 127.0.0.1:8888).
+  * 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
-------------------------------------------------------------------
+
+# Introduction
 
 ![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.5** 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.
 
 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.
@@ -82,9 +86,8 @@
 
 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
-------------------------------------------------------------------
+
+# Widgets and scopes
 
 The picture below shows Qt-DAB's main window, with the (few) control buttons, and 5 other widgets
 
@@ -98,17 +101,18 @@
 
 ![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
+
+For windows there is an installer, to be found in the releases section, https://github.com/JvanKatwijk/qt-dab/releases. The installer will install the executable as well as required libraries.
+The installer will also call the official installer for the dll implementing the api for getting access to the SDRplay devices.
+
+Furthermore, the releases section contains a "zipped" folder, with executables for this and other programs.
 
 If you want to compile it by yourself, please install Qt through its online installer, see https://www.qt.io/ 
 
-------------------------------------------------------------------
-Ubuntu Linux
-------------------------------------------------------------------
+
+## Ubuntu Linux
 
 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.
 
@@ -194,19 +198,19 @@
    ````
  and if you are compiling on/for an RPI3 with Stretch (or comparable system), you might want to uncomment
    ````
-   CONFIG+= NEON_RPI3.
+   CONFIG += NEON_RPI3.
    ````
 
 If unsure, uncomment only 
    ````
-   CONFIG+=NO_SSE.
+   CONFIG += NO_SSE.
    ````
 BE SURE TO UNCOMMENT PRECISELY ONE OF
 
    ````
   #CONFIG += NEON_RPI2
   #CONFIG += NEON_RPI3
-  #CONFIG  += SSE
+  #CONFIG += SSE
   CONFIG += NO_SSE
   ``````
 
@@ -218,12 +222,14 @@
 
   You could also use QtCreator, load the `qt-dab.pro` file and build the executable.
   
-  Remark: The executable 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, but you could copy it to `/usr/local/bin`
+  (as root)
+  
+	sudo cp linux-bin/qt-dab* /usr/local/bin/
 
 
-------------------------------------------------------------------
-Configuring using the qt-dab.pro file
-------------------------------------------------------------------
+### Configuring using the qt-dab.pro file
 
 Options in the configuration are:
 
@@ -311,9 +317,8 @@
 CONFIG          += NO_SSE
 ```
 
-------------------------------------------------------------------
-Configuring using CMake
-------------------------------------------------------------------
+
+### Configuring using CMake
 
 The `CMakeLists.txt` file has all devices and the spectrum switched off per default. You can select a device (or more devices) without altering the `CMakeLists.txt` file, but by passing on definitions to the command line.
 
@@ -341,23 +346,20 @@
 
 Important: Note that `CMakeLists.txt` file expects the appropriate Qt version (and - if configured - the qwt library) to be installed.
 
------------------------------------------------------------------
-SDRplay
------------------------------------------------------------------
+
+## SDRplay
 
 The current set of sources provides support for both the RSP-I and the RSP-II. Due to an incompatibility between libraries 2.13 and older versions, be certain to have at least 1.13 installed.
 
-------------------------------------------------------------------
-Qt
-------------------------------------------------------------------
+
+## Qt
 
 The software uses the Qt library and - for the spectrum and the constellation diagram - the qwt library.
 
 The `CMakeLists.txt` assumes Qt5. If you want to use Qt4, and you want to have the spectrum in the configuration, be aware of the binding of the qwt library (i.e. Qt4 and a qwt that uses Qt5 does not work well).  
 
------------------------------------------------------------------
-Raspberry PI
-------------------------------------------------------------------
+
+## Raspberry PI
 
 The Qt-DAB software runs pretty well on the author's RPI-2. The average load on the 4 cores is somewhere between 50 and 60 percent.
 
@@ -373,9 +375,8 @@
 
 Since Raspbian Stretch is a Debian derivate, the description for creating a version under Ubuntu applies.
 
----------------------------------------------------------------------------
-appImage for x64 Linux systems
----------------------------------------------------------------------------
+
+## appImage for x64 Linux systems
 
 https://github.com/JvanKatwijk/qt-dab/releases contains a generated appImage, **Qt-DAB-x64.Appimage**, which is created on Ubuntu 14.04 (Trusty), and uses Qt4 (so it basically should run on any x-64 based linux system that isn't too old.).
 
@@ -391,9 +392,8 @@
 
 For more information see http://appimage.org/
 
---------------------------------------------------------------------------------
-Comment on some settings
--------------------------------------------------------------------------------
+

_service:download_url:qt-dab-2.02.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-2.5.tar.gz/dab-processor.cpp Changed

@@ -40,6 +40,8 @@
 	 int16_t	threshold,
 	 int16_t	diff_length,
 	 int16_t	tii_delay,
+	 int16_t	tii_depth,
+	 int16_t	echo_depth,
 	 QString	picturesPath,
 	 RingBuffer<float> *responseBuffer,
 		 RingBuffer<std::complex<float>> *
@@ -61,8 +63,9 @@
 	 dabMode, 
 threshold,
 	 diff_length,
+	 echo_depth,
 	 responseBuffer),
-	 my_TII_Detector (dabMode), 
+	 my_TII_Detector (dabMode, tii_depth), 
 	 my_ofdmDecoder (mr,
 	 dabMode,
 	 theRig -> bitDepth (), 
@@ -89,8 +92,10 @@
 	correctionNeeded		= true;
 	attempts			= 0;
 	scanMode			= false;
-	connect (this, SIGNAL (showCoordinates (int, int)),
-	 mr, SLOT (showCoordinates (int, int)));
+	connect (this, SIGNAL (showCoordinates (int)),
+	 mr, SLOT (showCoordinates (int)));
+	connect (this, SIGNAL (showSecondaries (int)),
+	 mr, SLOT (showSecondaries (int)));
 	connect (this, SIGNAL (setSynced (char)),
 	 myRadioInterface, SLOT (setSynced (char)));
 	connect (this, SIGNAL (No_Signal_Found (void)),
@@ -104,7 +109,6 @@
 	connect (this, SIGNAL (show_snr (int)),
 	 mr, SLOT (show_snr (int)));
 	my_TII_Detector. reset ();
-	
 //	the thread will be started from somewhere else
 }
 
@@ -129,7 +133,7 @@
 *	Finally, estimating the small freqency error
 */
 void	dabProcessor::run	(void) {
-int32_t		startIndex;
+int32_t startIndex;
 int32_t		i;
 std::complex<float>	FreqCorr;
 timeSyncer	myTimeSyncer (&myReader);
@@ -139,7 +143,7 @@
 correctionNeeded	= true;
 	attempts		= 0;
 theRig -> resetBuffer ();
-	coarseOffset	= theRig -> getOffset ();
+	coarseOffset		= theRig -> getOffset ();
 	fineOffset		= 0;
 	myReader. setRunning (true);	// useful after a restart
 	my_mscHandler. start ();
@@ -196,6 +200,7 @@
 	 }
 	 goto notSynced;
 	 }
+
 /**
 *	Once here, we are synchronized, we need to copy the data we
 *	used for synchronization for block 0
@@ -291,18 +296,23 @@
 	 if (wasSecond (my_ficHandler. get_CIFcount (), &params)) {
 	 my_TII_Detector. addBuffer (ofdmBuffer);
 	 if (++tii_counter >= tii_delay) {
-	 int16_t mainId, subId;
-	 my_TII_Detector. processNULL (&mainId, &subId);
-	 if (mainId > 0)
-	 showCoordinates (mainId, subId);
+	 std::vector<int> secondaries;
+	 secondaries =
+	 my_TII_Detector. processNULL ();
+	 showSecondaries (-1);
+	 if (secondaries. size () > 0) {
+	 showCoordinates (secondaries. at (0));
+	 for (i = 0; i < secondaries. size (); i ++)
+	 showSecondaries (secondaries. at (i));
+	 }
 
-	 tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data (),
-	 T_u);
 	 show_tii (1);
-	 tii_counter = 1;
+	 tii_counter = 0;
+	 my_TII_Detector. reset ();
+	 }
+	 tiiBuffer -> putDataIntoBuffer (ofdmBuffer. data (), T_u);
 	 }
 	 }
-	}
 /**
 *	The first sample to be found for the next frame should be T_g
 *	samples ahead. Before going for the next frame, we
@@ -366,35 +376,28 @@
 	scanMode	= b;
 	attempts	= 0;
 }
-
-uint8_t dabProcessor::kindofService (QString &s) {
-	return my_ficHandler. kindofService (s);
-}
-
-void	dabProcessor::dataforAudioService (int16_t c, audiodata *dd) {
-	my_ficHandler. dataforAudioService (c, dd);
+//
+//	just a convenience function
+bool	dabProcessor::is_audioService	(QString &s) {
+audiodata ad;
+	my_ficHandler. dataforAudioService (s, &ad, 0);
+	return ad. defined;
 }
 
-void	dabProcessor::dataforAudioService (QString &s,audiodata *dd) {
-	my_ficHandler. dataforAudioService (s, dd, 0);
+bool	dabProcessor::is_packetService	(QString &s) {
+packetdata pd;
+	my_ficHandler. dataforPacketService (s, &pd, 0);
+	return pd. defined;
 }
 
-void	dabProcessor::dataforAudioService (QString &s,
+void	dabProcessor::dataforAudioService	(QString &s,
 	 audiodata *d, int16_t c) {
 	my_ficHandler. dataforAudioService (s, d, c);
 }
 
-void	dabProcessor::dataforDataService	(int16_t c, packetdata *dd) {
-	my_ficHandler. dataforDataService (c, dd);
-}
-
-void	dabProcessor::dataforDataService	(QString &s, packetdata *dd) {
-	my_ficHandler. dataforDataService (s, dd, 0);
-}
-
-void	dabProcessor::dataforDataService	(QString &s,
-	 packetdata *d, int16_t c) {
-	my_ficHandler. dataforDataService (s, d, c);
+void	dabProcessor::dataforPacketService	(QString &s,
+	 packetdata *d, int16_t c) {
+	my_ficHandler. dataforPacketService (s, d, c);
 }

_service:download_url:qt-dab-2.02.tar.gz/dab-processor.h -> _service:download_url:qt-dab-2.5.tar.gz/dab-processor.h Changed

@@ -54,6 +54,8 @@
 	 int16_t,
 	 int16_t,
 	 int16_t,
+	 int16_t,	// tii_depth
+	 int16_t,	// echo_depth
 	 QString,
 	 RingBuffer<float> *,
 	 RingBuffer<std::complex<float>>	*,
@@ -73,14 +75,11 @@
 //	inheriting from our delegates
 	void		set_tiiCoordinates	(void);
 	void		setSelectedService (QString &);
- uint8_t		kindofService (QString &);
- void		dataforAudioService (int16_t, audiodata *);
- void		dataforAudioService (QString &, audiodata *);
+	bool		is_audioService		(QString &s);
+	bool		is_packetService	(QString &s);
 void		dataforAudioService (QString &,
 	 audiodata *, int16_t);
- void		dataforDataService (int16_t, packetdata *);
- void		dataforDataService (QString &, packetdata *);
- void		dataforDataService (QString &,
+ void		dataforPacketService	(QString &,
 	 packetdata *, int16_t);
 	void		reset_msc		(void);
 	void		set_audioChannel	(audiodata *,
@@ -93,6 +92,8 @@
 	void		clearEnsemble		(void);
 private:
 	bool		tiiSwitch;
+	int16_t		tii_depth;
+	int16_t		echo_depth;
 	virtualInput	*theRig;
 	dabParams	params;
 	RingBuffer<std::complex<float> > *tiiBuffer;
@@ -128,8 +129,8 @@
 	void		setSynced		(char);
 	void		No_Signal_Found		(void);
 	void		setSyncLost		(void);
-	void		showCoordinates		(int, int);
-//	void		showCoordinates		(float, float);
+	void		showCoordinates		(int);
+	void		showSecondaries		(int);
 	void		show_Spectrum		(int);
 	void		show_tii		(int);
 	void		show_snr		(int);

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

@@ -350,29 +350,29 @@
 std::complex<float> temp [2048];
 int32_t i, j;
 
-	if (filtering) {
-	 for (i = 0; i < nSamples; i ++) {
-	 convBuffer [convIndex ++] = filter -> Pass (
-	 sbuf [2 * i] / (float)2048,
-	 sbuf [2 * i + 1] / (float)2048);
-	 if (convIndex > convBufferSize) {
-	 for (j = 0; j < 2048; j ++) {
-	 int16_t inpBase	= mapTable_int [j];
-	 float inpRatio	= mapTable_float [j];
-	 temp [j]	= cmul (convBuffer [inpBase + 1], inpRatio) + 
-	 cmul (convBuffer [inpBase], 1 - inpRatio);
-	 }
-
-	 theBuffer	-> putDataIntoBuffer (temp, 2048);
+//	if (filtering) {
+//	 for (i = 0; i < nSamples; i ++) {
+//	 convBuffer [convIndex ++] = filter -> Pass (
+//	 sbuf [2 * i] / (float)2048,
+//	 sbuf [2 * i + 1] / (float)2048);
+//	 if (convIndex > convBufferSize) {
+//	 for (j = 0; j < 2048; j ++) {
+//	 int16_t inpBase	= mapTable_int [j];
+//	 float inpRatio	= mapTable_float [j];
+//	 temp [j]	= cmul (convBuffer [inpBase + 1], inpRatio) + 
+//	 cmul (convBuffer [inpBase], 1 - inpRatio);
+//	 }
 //
-//	shift the sample at the end to the beginning, it is needed
-//	as the starting sample for the next time
-	 convBuffer [0] = convBuffer [convBufferSize];
-	 convIndex = 1;
-	 }
-	 }
-	}
-	else
+//	 theBuffer	-> putDataIntoBuffer (temp, 2048);
+////
+////	shift the sample at the end to the beginning, it is needed
+////	as the starting sample for the next time
+//	 convBuffer [0] = convBuffer [convBufferSize];
+//	 convIndex = 1;
+//	 }
+//	 }
+//	}
+//	else
 	for (i = 0; i < nSamples; i ++) {
 	 convBuffer [convIndex ++] = std::complex<float> (
 	 sbuf [2 * i] / (float)2048,

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

@@ -4,6 +4,9 @@
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
+ * Copyright (C) 2019 Amplifier, antenna and ppm correctors
+ * Fabio Capozzi
+ *
 * This file is part of Qt-DAB
 *
 * Qt-DAB is free software; you can redistribute it and/or modify
@@ -24,12 +27,12 @@
 #include	<QSettings>
 #include	<QHBoxLayout>
 #include	<QLabel>
+#include	<QDebug>
 #include	"hackrf-handler.h"
 
 #define	DEFAULT_GAIN	30
 
 	hackrfHandler::hackrfHandler (QSettings *s) {
-int	err;
 int	res;
 	hackrfSettings			= s;
 	this	-> myFrame		= new QFrame (nullptr);
@@ -41,6 +44,9 @@
 #ifdef __MINGW32__
 const char *libraryString = "libhackrf.dll";
 Handle = LoadLibrary ((wchar_t *)L"libhackrf.dll");
+#elif __clang__
+ const char *libraryString = "/opt/local/lib/libhackrf.dylib";
+ Handle = dlopen(libraryString,RTLD_NOW);
 #else
 const char *libraryString = "libhackrf.so";
 Handle = dlopen (libraryString, RTLD_NOW);
@@ -74,6 +80,18 @@
 	 hackrfSettings -> value ("hack_lnaGain", DEFAULT_GAIN). toInt ());
 	vgagainSlider 		-> setValue (
 	 hackrfSettings -> value ("hack_vgaGain", DEFAULT_GAIN). toInt ());
+//	contributed by Fabio
+	bool isChecked =
+	 hackrfSettings -> value ("hack_AntEnable", false). toBool ();
+	AntEnableButton -> setCheckState (isChecked ? Qt::Checked :
+	 Qt::Unchecked);
+	isChecked	=
+	 hackrfSettings -> value ("hack_AmpEnable", false). toBool();
+	AmpEnableButton	-> setCheckState (isChecked ? Qt::Checked : 
+ Qt::Unchecked);
+	ppm_correction -> setValue (
+	 hackrfSettings -> value ("hack_ppmCorrection", 0). toInt ());
+//	end
 
 	hackrfSettings	-> endGroup ();
 
@@ -124,13 +142,61 @@
 	 throw (25);
 	}
 
-	setLNAGain	(lnagainSlider	-> value ());
-	setVGAGain	(vgagainSlider	-> value ());
+
+	res = this -> hackrf_set_antenna_enable (theDevice, 1);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_antenna_enable: ");
+	 fprintf (stderr, "%s \n",
+ this -> hackrf_error_name (hackrf_error (res)));
+	 delete myFrame;
+	 throw (26);
+	}
+
+	res = this -> hackrf_set_amp_enable (theDevice, 1);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_antenna_enable: ");
+	 fprintf (stderr, "%s \n",
+	 this -> hackrf_error_name (hackrf_error (res)));
+	 delete myFrame;
+	 throw (27);
+	}
+
+	uint16_t regValue;
+	res = this -> hackrf_si5351c_read (theDevice, 162, &regValue);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_si5351c_read: ");
+	 fprintf (stderr, "%s \n",
+ this -> hackrf_error_name (hackrf_error (res)));
+	 delete myFrame;
+	 throw (28);
+	}
+
+	res = this -> hackrf_si5351c_write (theDevice, 162, regValue);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_si5351c_write: ");
+	 fprintf (stderr, "%s \n",
+	 this -> hackrf_error_name (hackrf_error (res)));
+	 delete myFrame;
+	 throw (29);
+	}
+
+	setLNAGain	(lnagainSlider		-> value ());
+	setVGAGain	(vgagainSlider		-> value ());
+	EnableAntenna	(1);		// value is a dummy really
+	EnableAmpli	(1);		// value is a dummy, really
+	set_ppmCorrection (ppm_correction	-> value ());
+
 //	and be prepared for future changes in the settings
 	connect (lnagainSlider, SIGNAL (valueChanged (int)),
 	 this, SLOT (setLNAGain (int)));
 	connect (vgagainSlider, SIGNAL (valueChanged (int)),
 	 this, SLOT (setVGAGain (int)));
+	connect (AntEnableButton, SIGNAL (stateChanged (int)),
+	 this, SLOT (EnableAntenna (int)));
+	connect (AmpEnableButton, SIGNAL (stateChanged (int)),
+	 this, SLOT (EnableAmpli (int)));
+	connect (ppm_correction, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_ppmCorrection (int)));
 
 	hackrf_device_list_t *deviceList = this -> hackrf_device_list ();
 	if (deviceList != nullptr) {	// well, it should be
@@ -147,7 +213,6 @@
 
 	hackrfHandler::~hackrfHandler	(void) {
 	stopReader ();
-	delete myFrame;
 	if (_I_Buffer != nullptr)
 	 delete _I_Buffer;
 	hackrfSettings	-> beginGroup ("hackrfSettings");
@@ -155,9 +220,16 @@
 	 lnagainSlider -> value ());
 	hackrfSettings -> setValue ("hack_vgaGain",
 	 vgagainSlider	-> value ());
+	hackrfSettings -> setValue ("hack_AntEnable",
+	 AntEnableButton -> checkState () == Qt::Checked);
+	hackrfSettings -> setValue ("hack_AmpEnable",
+	 AmpEnableButton -> checkState () == Qt::Checked);
+	hackrfSettings	-> setValue ("hack_ppmCorrection",
+	 ppm_correction -> value ());
 	hackrfSettings	-> endGroup ();
 	this	-> hackrf_close (theDevice);
 	this	-> hackrf_exit ();
+	delete myFrame;
 }
 //
 
@@ -170,6 +242,11 @@
 	 this -> hackrf_error_name (hackrf_error (res)));
 	 return;
 	}
+
+//
+//	It seems that after changing the frequency, the preamp is switched off
+	if (AmpEnableButton -> checkState () == Qt::Checked) 
+	 EnableAmpli (1);
 	vfoFrequency = newFrequency;
 }
 
@@ -204,6 +281,58 @@
 	 vgagainDisplay	-> display (newGain);
 	}
 }
+
+void	hackrfHandler::EnableAntenna (int d) {
+int res;
+bool	b;
+
+	(void)d;
+	b = AntEnableButton	-> checkState () == Qt::Checked;
+	res = this -> hackrf_set_antenna_enable (theDevice, b);
+//	fprintf(stderr,"Passed %d\n",(int)b);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_antenna_enable :\n");
+	 fprintf (stderr, "%s \n",
+	 this -> hackrf_error_name (hackrf_error (res)));
+	 return;
+	}
+//	AntEnableButton -> setChecked (b);
+}
+
+void	hackrfHandler::EnableAmpli (int a) {
+int res;
+bool	b;
+
+	(void)a;
+	b = AmpEnableButton	-> checkState () == Qt::Checked;
+	res = this -> hackrf_set_amp_enable (theDevice, b);
+	if (res != HACKRF_SUCCESS) {
+	 fprintf (stderr, "Problem with hackrf_set_amp_enable :\n");
+	 fprintf (stderr, "%s \n",
+	 this -> hackrf_error_name (hackrf_error (res)));
+	 return;
+	}
+//	AmpEnableButton->setChecked (b);
+}
+
+// correction is in Hz
+// This function has to be modified to implement ppm correction
+// writing in the si5351 register does not seem to work yet
+// To be completed
+
+void	hackrfHandler::set_ppmCorrection	(int32_t ppm) {
+int res;
+uint16_t value;

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

@@ -4,6 +4,9 @@
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Computing
  *
+ *    Copyright (C) 2019 amplifier, antenna and ppm corectors
+ *    Fabio Capozzi
+ *
  *    This file is part of the Qt-DAB program
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -61,6 +64,17 @@
 typedef	int	(*pfn_hackrf_is_streaming) (hackrf_device *);
 typedef	const char	*(*pfn_hackrf_error_name) (enum hackrf_error errcode);
 typedef	const char	*(*pfn_hackrf_usb_board_id_name) (enum hackrf_usb_board_id);
+// contributes by Fabio
+typedef int	(*pfn_hackrf_set_antenna_enable)
+	                         (hackrf_device *, const uint8_t);
+typedef int	(*pfn_hackrf_set_amp_enable) (hackrf_device *, const uint8_t);
+typedef int	(*pfn_hackrf_si5351c_read)
+	                         (hackrf_device *, const uint16_t, uint16_t *);
+typedef int	(*pfn_hackrf_si5351c_write)
+	                    (hackrf_device *, const uint16_t, const uint16_t);
+// fine aggiunta
+
+
 
 
 ///////////////////////////////////////////////////////////////////////////
@@ -105,6 +119,13 @@
 	pfn_hackrf_usb_board_id_name
 	                        hackrf_usb_board_id_name;
 
+//	aggiunta Fabio
+	pfn_hackrf_set_antenna_enable hackrf_set_antenna_enable;
+	pfn_hackrf_set_amp_enable hackrf_set_amp_enable;
+	pfn_hackrf_si5351c_read hackrf_si5351c_read;
+	pfn_hackrf_si5351c_write hackrf_si5351c_write;
+//	Fine aggiunta
+
 	QSettings	*hackrfSettings;
 	QFrame		*myFrame;
 	int32_t		inputRate;
@@ -115,6 +136,11 @@
 private slots:
 	void		setLNAGain	(int);
 	void		setVGAGain	(int);
+// contributed by Fabio
+	void		EnableAntenna	(int);
+	void		EnableAmpli	(int);
+	void		set_ppmCorrection (int);
+// Fine aggiunta
 };
 #endif

_service:download_url:qt-dab-2.02.tar.gz/devices/hackrf-handler/hackrf-widget.ui -> _service:download_url:qt-dab-2.5.tar.gz/devices/hackrf-handler/hackrf-widget.ui Changed

@@ -45,7 +45,7 @@
 <property name="geometry">
 <rect>
 <x>210</x>
- <y>30</y>
+ <y>40</y>
 <width>20</width>
 <height>161</height>
 </rect>
@@ -61,7 +61,7 @@
 <property name="geometry">
 <rect>
 <x>200</x>
- <y>0</y>
+ <y>10</y>
 <width>41</width>
 <height>23</height>
 </rect>
@@ -90,7 +90,7 @@
 <property name="geometry">
 <rect>
 <x>150</x>
- <y>30</y>
+ <y>40</y>
 <width>24</width>
 <height>161</height>
 </rect>
@@ -105,9 +105,9 @@
 <widget class="QLCDNumber" name="vgagainDisplay">
 <property name="geometry">
 <rect>
- <x>130</x>
- <y>0</y>
- <width>64</width>
+ <x>133</x>
+ <y>10</y>
+ <width>61</width>
 <height>23</height>
 </rect>
 </property>
@@ -119,7 +119,7 @@
 <property name="geometry">
 <rect>
 <x>150</x>
- <y>200</y>
+ <y>210</y>
 <width>31</width>
 <height>16</height>
 </rect>
@@ -132,7 +132,7 @@
 <property name="geometry">
 <rect>
 <x>210</x>
- <y>200</y>
+ <y>210</y>
 <width>31</width>
 <height>20</height>
 </rect>
@@ -145,11 +145,16 @@
 <property name="geometry">
 <rect>
 <x>10</x>
- <y>220</y>
+ <y>250</y>
 <width>231</width>
 <height>16</height>
 </rect>
 </property>
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
 <property name="text">
 <string/>
 </property>
@@ -167,6 +172,77 @@
 <string/>
 </property>
 </widget>
+ <widget class="QCheckBox" name="AntEnableButton">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>91</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Ant Enable</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="AmpEnableButton">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>60</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Amp Enable</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="ppm_correction">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>120</y>
+ <width>91</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="minimum">
+ <number>-100</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>100</y>
+ <width>111</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>ppm Correction</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_4">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>230</y>
+ <width>91</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Serial Number</string>
+ </property>
+ </widget>
 </widget>
 </widget>
 <resources/>

_service:download_url:qt-dab-2.5.tar.gz/devices/hackrf-handler/hackrf-widget.ui.old Added

@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>hackrfWidget</class>
+ <widget class="QWidget" name="hackrfWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>256</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>HACKRF control</string>
+ </property>
+ <widget class="QFrame" name="frame">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>10</y>
+ <width>251</width>
+ <height>291</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <widget class="QLabel" name="statusLabel">
+ <property name="geometry">
+ <rect>
+ <x>16</x>
+ <y>180</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QSlider" name="lnagainSlider">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>30</y>
+ <width>20</width>
+ <height>161</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>39</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="lnagainDisplay">
+ <property name="geometry">
+ <rect>
+ <x>200</x>
+ <y>0</y>
+ <width>41</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="digitCount">
+ <number>3</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="serialNumber">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>210</y>
+ <width>141</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QSlider" name="vgagainSlider">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>30</y>
+ <width>24</width>
+ <height>161</height>
+ </rect>
+ </property>
+ <property name="maximum">
+ <number>62</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="vgagainDisplay">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>0</y>
+ <width>64</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_2">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>200</y>
+ <width>31</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>vga</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_3">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>200</y>
+ <width>31</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>lna</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="serial_number_display">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>220</y>
+ <width>231</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLabel" name="usb_board_id_display">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>180</y>
+ <width>111</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QRadioButton" name="AntennaEnableButton">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>40</y>
+ <width>121</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Ant Enable</string>
+ </property>
+ </widget>
+ <widget class="QRadioButton" name="AmpEnableButton">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>80</y>
+ <width>97</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Amp Enable</string>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>

_service:download_url:qt-dab-2.02.tar.gz/forms/audio-description.ui -> _service:download_url:qt-dab-2.5.tar.gz/forms/audio-description.ui Changed

_service:download_url:qt-dab-2.02.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-2.5.tar.gz/forms/dabradio.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>601</width>
- <height>394</height>
+ <width>622</width>
+ <height>411</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -19,7 +19,7 @@
 <x>20</x>
 <y>90</y>
 <width>181</width>
- <height>281</height>
+ <height>301</height>
 </rect>
 </property>
 <property name="font">
@@ -214,8 +214,8 @@
 <widget class="QLabel" name="label">
 <property name="geometry">
 <rect>
- <x>570</x>
- <y>20</y>
+ <x>580</x>
+ <y>30</y>
 <width>21</width>
 <height>20</height>
 </rect>
@@ -226,7 +226,7 @@
 
 </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;The current layout of the GUI is based on a design of Luo Zhang, Thanks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Qt-DAB (an SDR-J program) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB copyright:&lt;/p&gt;&lt;p&gt;J van Katwijk, Lazy Chair Computing. J.vanKatwijk@gmail.com&lt;/p&gt;&lt;p&gt;Copyright of the Qt toolkit used: the Qt Company&lt;/p&gt;&lt;p&gt;Copyright of the libraries used for SDRplay, rtl-sdr based sticks, AIRspy, portaudio, libsndfile and libsamplerate and libfftw3 to their developers&lt;/p&gt;&lt;p&gt;Copyright of the MP2 library used Martin J Fiedler&lt;/p&gt;&lt;p&gt;Copyright of the firecode checker: Gnu Radio&lt;/p&gt;&lt;p&gt;Copyright of the Reed Solomon Decoder software: Phil Karns&lt;/p&gt;&lt;p&gt;All copyrights gratefully acknowledged&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;The current layout of the GUI is based on a design of Luo Zhang, Thanks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Qt-DAB (an SDR-J program) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 <property name="text">
 <string>©</string>
@@ -239,7 +239,7 @@
 <property name="geometry">
 <rect>
 <x>390</x>
- <y>70</y>
+ <y>110</y>
 <width>201</width>
 <height>20</height>
 </rect>
@@ -446,7 +446,7 @@
 <enum>Qt::LeftToRight</enum>
 </property>
 <property name="text">
- <string>Ensemble Lable</string>
+ <string>Ensemble Label</string>
 </property>
 </widget>
 <widget class="QLabel" name="serviceLabel">
@@ -474,10 +474,10 @@
 <widget class="QWidget" name="layoutWidget">
 <property name="geometry">
 <rect>
- <x>420</x>
+ <x>430</x>
 <y>280</y>
- <width>168</width>
- <height>89</height>
+ <width>184</width>
+ <height>113</height>
 </rect>
 </property>
 <layout class="QGridLayout" name="gridLayout_2">
@@ -581,13 +581,13 @@
 <rect>
 <x>210</x>
 <y>280</y>
- <width>209</width>
- <height>91</height>
+ <width>201</width>
+ <height>111</height>
 </rect>
 </property>
 <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0" colspan="2">
- <widget class="QComboBox" name="streamoutSelector">
+ <item row="2" column="0" colspan="2">
+ <widget class="QComboBox" name="deviceSelector">
 <property name="font">
 
 <family>DejaVu Sans</family>
@@ -595,16 +595,31 @@
 
 </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>
+ <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>Audio Device</string>
+ <string>Input 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>
 </item>
- <item row="2" column="0">
+ <item row="3" column="0">
 <widget class="QComboBox" name="bandSelector">
 <property name="font">
 
@@ -627,7 +642,7 @@
 </item>
 </widget>
 </item>
- <item row="2" column="1">
+ <item row="3" column="1">
 <widget class="QComboBox" name="channelSelector">
 <property name="font">
 
@@ -639,8 +654,8 @@
 </property>
 </widget>
 </item>
- <item row="1" column="0" colspan="2">
- <widget class="QComboBox" name="deviceSelector">
+ <item row="1" column="0">
+ <widget class="QComboBox" name="streamoutSelector">
 <property name="font">
 
 <family>DejaVu Sans</family>
@@ -648,26 +663,11 @@
 
 </property>
 <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the input device. The devices shown are configured. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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>Input 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>
+ <string>Audio Device</string>
 </property>
 </item>
 </widget>
@@ -678,9 +678,9 @@
 <property name="geometry">
 <rect>
 <x>390</x>
- <y>10</y>
- <width>168</width>
- <height>58</height>
+ <y>0</y>
+ <width>184</width>
+ <height>74</height>
 </rect>
 </property>
 <layout class="QGridLayout" name="gridLayout_4">
@@ -750,6 +750,19 @@
 </item>
 </layout>
 </widget>
+ <widget class="QLabel" name="localTimeDisplay">
+ <property name="geometry">
+ <rect>
+ <x>420</x>
+ <y>80</y>
+ <width>191</width>
+ <height>21</height>
+ </rect>
+ </property>

_service:download_url:qt-dab-2.02.tar.gz/forms/technical_data.ui -> _service:download_url:qt-dab-2.5.tar.gz/forms/technical_data.ui Changed

@@ -17,7 +17,7 @@
 <property name="geometry">
 <rect>
 <x>160</x>
- <y>150</y>
+ <y>130</y>
 <width>64</width>
 <height>23</height>
 </rect>
@@ -33,7 +33,7 @@
 <property name="geometry">
 <rect>
 <x>160</x>
- <y>180</y>
+ <y>160</y>
 <width>64</width>
 <height>23</height>
 </rect>
@@ -49,7 +49,7 @@
 <property name="geometry">
 <rect>
 <x>120</x>
- <y>310</y>
+ <y>290</y>
 <width>101</width>
 <height>21</height>
 </rect>
@@ -68,7 +68,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>150</y>
+ <y>130</y>
 <width>141</width>
 <height>20</height>
 </rect>
@@ -81,7 +81,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>180</y>
+ <y>160</y>
 <width>121</width>
 <height>20</height>
 </rect>
@@ -94,7 +94,7 @@
 <property name="geometry">
 <rect>
 <x>120</x>
- <y>330</y>
+ <y>310</y>
 <width>101</width>
 <height>21</height>
 </rect>
@@ -113,7 +113,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>240</y>
+ <y>220</y>
 <width>121</width>
 <height>20</height>
 </rect>
@@ -126,7 +126,7 @@
 <property name="geometry">
 <rect>
 <x>160</x>
- <y>240</y>
+ <y>220</y>
 <width>64</width>
 <height>23</height>
 </rect>
@@ -142,7 +142,7 @@
 <property name="geometry">
 <rect>
 <x>160</x>
- <y>210</y>
+ <y>190</y>
 <width>64</width>
 <height>23</height>
 </rect>
@@ -158,7 +158,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>210</y>
+ <y>190</y>
 <width>111</width>
 <height>20</height>
 </rect>
@@ -171,7 +171,7 @@
 <property name="geometry">
 <rect>
 <x>120</x>
- <y>270</y>
+ <y>250</y>
 <width>101</width>
 <height>21</height>
 </rect>
@@ -196,7 +196,7 @@
 <property name="geometry">
 <rect>
 <x>120</x>
- <y>290</y>
+ <y>270</y>
 <width>101</width>
 <height>21</height>
 </rect>
@@ -211,8 +211,8 @@
 <widget class="QLabel" name="ensemble">
 <property name="geometry">
 <rect>
- <x>20</x>
- <y>10</y>
+ <x>10</x>
+ <y>0</y>
 <width>221</width>
 <height>31</height>
 </rect>
@@ -232,8 +232,8 @@
 <widget class="QLCDNumber" name="frequency">
 <property name="geometry">
 <rect>
- <x>20</x>
- <y>40</y>
+ <x>30</x>
+ <y>30</y>
 <width>141</width>
 <height>31</height>
 </rect>
@@ -266,7 +266,7 @@
 <property name="geometry">
 <rect>
 <x>180</x>
- <y>50</y>
+ <y>30</y>
 <width>41</width>
 <height>31</height>
 </rect>
@@ -287,7 +287,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>360</y>
+ <y>340</y>
 <width>201</width>
 <height>23</height>
 </rect>
@@ -303,7 +303,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>390</y>
+ <y>370</y>
 <width>201</width>
 <height>23</height>
 </rect>
@@ -319,7 +319,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>420</y>
+ <y>400</y>
 <width>201</width>
 <height>23</height>
 </rect>
@@ -335,7 +335,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>450</y>
+ <y>430</y>
 <width>201</width>
 <height>23</height>
 </rect>
@@ -351,7 +351,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>118</y>
+ <y>98</y>
 <width>121</width>
 <height>20</height>
 </rect>
@@ -364,7 +364,7 @@
 <property name="geometry">
 <rect>
 <x>20</x>
- <y>80</y>
+ <y>60</y>
 <width>221</width>
 <height>31</height>
 </rect>
@@ -384,8 +384,8 @@
 <widget class="QLabel" name="motAvailable">
 <property name="geometry">
 <rect>
- <x>180</x>
- <y>490</y>
+ <x>190</x>

_service:download_url:qt-dab-2.02.tar.gz/i18n/de_DE.qm -> _service:download_url:qt-dab-2.5.tar.gz/i18n/de_DE.qm Changed

_service:download_url:qt-dab-2.02.tar.gz/i18n/de_DE.ts -> _service:download_url:qt-dab-2.5.tar.gz/i18n/de_DE.ts Changed

@@ -2,842 +2,1218 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
 <context>
- <name>CAndroid_RTL_SDR</name>
+ <name>Form</name>
 <message>
- <source>Android RTL-SDR driver is not installed</source>
- <translation type="vanished">Android RTL-SDR Treiber ist nicht installiert</translation>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="60"/>
+ <source>elad-s1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="86"/>
+ <source>Hz</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="99"/>
+ <source>gain reduction</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <source>Do you would like to install it? After install start welle.io again.</source>
- <translation type="vanished">Soll er installiert werden? welle.io muss nach der Treiberinstallation neu gestartet werden.</translation>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="151"/>
+ <source>filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="164"/>
+ <source>no filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../devices/elad-s1-handler/widget.ui" line="187"/>
+ <source>elad frequency</source>
+ <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
- <name>CDABConstants</name>
+ <name>RadioInterface</name>
+ <message>
+ <location filename="../radio.cpp" line="353"/>
+ <location filename="../radio.cpp" line="935"/>
+ <location filename="../radio.cpp" line="1010"/>
+ <location filename="../radio.cpp" line="1024"/>
+ <location filename="../radio.cpp" line="1040"/>
+ <location filename="../radio.cpp" line="1055"/>
+ <location filename="../radio.cpp" line="1069"/>
+ <location filename="../radio.cpp" line="1083"/>
+ <location filename="../radio.cpp" line="1097"/>
+ <location filename="../radio.cpp" line="1118"/>
+ <location filename="../radio.cpp" line="1136"/>
+ <location filename="../radio.cpp" line="1156"/>
+ <location filename="../radio.cpp" line="1263"/>
+ <location filename="../radio.cpp" line="1334"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="37"/>
- <source>none</source>
- <translation>nicht gesetzt</translation>
+ <location filename="../radio.cpp" line="354"/>
+ <source>Opening input stream failed
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="38"/>
- <source>News</source>
- <translation>Nachrichten</translation>
+ <location filename="../radio.cpp" line="936"/>
+ <source>Device will not restart
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="39"/>
- <source>Current Affairs</source>
- <translation>Aktuelle Nachrichten</translation>
+ <location filename="../radio.cpp" line="1011"/>
+ <source>Airspy or Airspy mini not found
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="40"/>
- <source>Information</source>
- <translation>Informationen</translation>
+ <location filename="../radio.cpp" line="1025"/>
+ <source>hackrf not found
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="41"/>
- <source>Sport</source>
- <translation>Sport</translation>
+ <location filename="../radio.cpp" line="1041"/>
+ <source>extio: no luck
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="42"/>
- <source>Education</source>
- <translation>Bildung</translation>
+ <location filename="../radio.cpp" line="1056"/>
+ <source>rtl_tcp: no luck
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="43"/>
- <source>Drama</source>
- <translation>Drama</translation>
+ <location filename="../radio.cpp" line="1070"/>
+ <source>SDRplay: no library or device
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="44"/>
- <source>Arts</source>
- <translation>Kunst</translation>
+ <location filename="../radio.cpp" line="1084"/>
+ <source>elad-s1: no library or device
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="45"/>
- <source>Science</source>
- <translation>Forschung</translation>
+ <location filename="../radio.cpp" line="1098"/>
+ <source>DAB stick not found! Please use one with RTL2832U or similar chipset!
+</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="46"/>
- <source>Talk</source>
- <translation>Talk</translation>
+ <location filename="../radio.cpp" line="1107"/>
+ <location filename="../radio.cpp" line="1126"/>
+ <location filename="../radio.cpp" line="1144"/>
+ <source>Open file ...</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="47"/>
- <source>Pop Music</source>
- <translation>Pop</translation>
+ <location filename="../radio.cpp" line="1109"/>
+ <source>iq data (*.iq)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="48"/>
- <source>Rock Music</source>
- <translation>Rock</translation>
+ <location filename="../radio.cpp" line="1119"/>
+ <location filename="../radio.cpp" line="1137"/>
+ <location filename="../radio.cpp" line="1157"/>
+ <source>file not found</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="49"/>
- <source>Easy Listening</source>
+ <location filename="../radio.cpp" line="1128"/>
+ <source>raw data (*.raw)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="50"/>
- <source>Light classical</source>
- <translation>Klassik</translation>
+ <location filename="../radio.cpp" line="1146"/>
+ <location filename="../radio.cpp" line="1561"/>
+ <source>raw data (*.sdr)</source>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../src/DabConstants.cpp" line="51"/>
- <source>Classical Music</source>
- <translation>Klassik</translation>
+ <location filename="../radio.cpp" line="1264"/>
+ <source>unknown bitrate for this program
+</source>
+ <translation type="unfinished"></translation>

_service:download_url:qt-dab-2.02.tar.gz/impulse-viewer/impulse-viewer.cpp -> _service:download_url:qt-dab-2.5.tar.gz/impulse-viewer/impulse-viewer.cpp Changed

_service:download_url:qt-dab-2.02.tar.gz/impulse-viewer/impulse-viewer.h -> _service:download_url:qt-dab-2.5.tar.gz/impulse-viewer/impulse-viewer.h Changed

_service:download_url:qt-dab-2.02.tar.gz/impulse-viewer/impulse-widget.ui -> _service:download_url:qt-dab-2.5.tar.gz/impulse-viewer/impulse-widget.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>363</width>
- <height>164</height>
+ <width>367</width>
+ <height>202</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -26,6 +26,22 @@
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrum display, shows the frequency spectrum from the channel currently being received.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 </property>
 </widget>
+ <widget class="QLabel" name="indexDisplay">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>160</y>
+ <width>301</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter is detected, the relative distance - in msec - is shown between&lt;/p&gt;&lt;p&gt;the arrival time of the data of the transmitter that is used, and the arrival time of the data of&lt;/p&gt;&lt;p&gt;the other transmitter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
 </widget>
 <customwidgets>
 <customwidget>

_service:download_url:qt-dab-2.02.tar.gz/includes/backend/data/epg/epgdec.h -> _service:download_url:qt-dab-2.5.tar.gz/includes/backend/data/epg/epgdec.h Changed

_service:download_url:qt-dab-2.02.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-2.5.tar.gz/includes/dab-constants.h Changed

_service:download_url:qt-dab-2.5.tar.gz/includes/ofdm/fib-decoder.h Added

@@ -0,0 +1,149 @@
+
+#
+/*
+ * Copyright (C) 2013
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-TAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#
+#ifndef	__FIB_DECODER__
+#define	__FIB_DECODER__
+#
+//
+#include	<stdint.h>
+#include	<stdio.h>
+#include	<QObject>
+#include	"msc-handler.h"
+#include	<QMutex>
+	
+class	RadioInterface;
+
+class	ensembleDescriptor;
+class	dataBase;
+
+class	fibDecoder: public QObject {
+Q_OBJECT
+public:
+		fibDecoder		(RadioInterface *);
+		~fibDecoder		(void);
+
+	void	clearEnsemble		(void);
+	bool	syncReached		(void);
+	void	dataforAudioService	(const QString &,
+	 audiodata *, int16_t);
+	void	dataforPacketService	(const QString &,
+	 packetdata *, int16_t);
+ uint8_t get_ecc (void);
+	int32_t	get_ensembleId		(void);
+	QString get_ensembleName	(void);
+	int32_t	get_CIFcount		(void);
+protected:
+	void	newFrame		(void);
+	void	process_FIB		(uint8_t *, uint16_t);
+private:
+	RadioInterface	*myRadioInterface;
+	dataBase	*currentBase;
+	dataBase	*nextBase;
+	ensembleDescriptor	*ensemble;
+	void		process_FIG0		(uint8_t *);
+	void		process_FIG1		(uint8_t *);
+	void		FIG0Extension0		(uint8_t *);
+	void		FIG0Extension1		(uint8_t *);
+	void		FIG0Extension2		(uint8_t *);
+	void		FIG0Extension3		(uint8_t *);
+	void		FIG0Extension4		(uint8_t *);
+	void		FIG0Extension5		(uint8_t *);
+	void		FIG0Extension6		(uint8_t *);
+	void		FIG0Extension7		(uint8_t *);
+	void		FIG0Extension8		(uint8_t *);
+	void		FIG0Extension9		(uint8_t *);
+	void		FIG0Extension10		(uint8_t *);
+//	void		FIG0Extension11		(uint8_t *);
+//	void		FIG0Extension12		(uint8_t *);
+	void		FIG0Extension13		(uint8_t *);
+	void		FIG0Extension14		(uint8_t *);
+//	void		FIG0Extension15		(uint8_t *);
+//	void		FIG0Extension16		(uint8_t *);
+	void		FIG0Extension17		(uint8_t *);
+	void		FIG0Extension18		(uint8_t *);
+	void		FIG0Extension19		(uint8_t *);
+	void		FIG0Extension20		(uint8_t *);
+	void		FIG0Extension21		(uint8_t *);
+//	void		FIG0Extension22		(uint8_t *);
+//	void		FIG0Extension23		(uint8_t *);
+	void		FIG0Extension24		(uint8_t *);
+	void		FIG0Extension25		(uint8_t *);
+	void		FIG0Extension26		(uint8_t *);
+
+	int16_t		HandleFIG0Extension1	(uint8_t *,
+	 int16_t,
+	 uint8_t, uint8_t, uint8_t);
+	int16_t		HandleFIG0Extension2	(uint8_t *,
+	 int16_t,
+	 uint8_t, uint8_t, uint8_t);
+	int16_t		HandleFIG0Extension3	(uint8_t *,
+	 int16_t,
+	 uint8_t, uint8_t, uint8_t);
+	int16_t		HandleFIG0Extension5	(uint8_t *, int16_t);
+	int16_t		HandleFIG0Extension8	(uint8_t *,
+	 int16_t,
+	 uint8_t, uint8_t, uint8_t);
+	int16_t		HandleFIG0Extension13	(uint8_t *,
+	 int16_t,
+	 uint8_t, uint8_t, uint8_t);
+	int16_t		HandleFIG0Extension21	(uint8_t*, int16_t);
+
+	void		FIG1Extension0		(uint8_t *);
+	void		FIG1Extension1		(uint8_t *);
+//	void		FIG1Extension2		(uint8_t *);
+//	void		FIG1Extension3		(uint8_t *);
+	void		FIG1Extension4		(uint8_t *);
+	void		FIG1Extension5		(uint8_t *);
+	void		FIG1Extension6		(uint8_t *);
+
+	int		findServiceIndex	(uint32_t);
+	int		setServiceIndex		(uint32_t);
+	int		findServiceComponent	(dataBase *, int16_t);
+	int		findServiceComponentinService	(dataBase *,
+	 uint32_t, int16_t);
+
+ void bind_audioService (dataBase *,
+	 int8_t,
+ uint32_t, int16_t,
+ int16_t, int16_t, int16_t);
+ void bind_packetService (dataBase *,
+	 int8_t,
+ uint32_t, int16_t,
+ int16_t, int16_t, int16_t);
+	int		findService	(const QString &);
+//	void		bind_SCIds_to_ServiceComponent (uint16_t, uint16_t);
+//	void		bind_SCIds_to_SubChannel	(uint16_t, uint16_t);
+//	void		bindServiceComponenttoService	(uint32_t, uint16_t, uint8_t);
+//	void		bind_xpadComponent		(uint32_t, uin16_t, uint8_t);
+	int32_t		dateTime [8];
+	QMutex		fibLocker;
+	int		CIFcount;
+signals:
+	void		addtoEnsemble	(const QString &);
+	void		nameofEnsemble (int, const QString &);
+	void		setTime		(const QString &);
+	void		changeinConfiguration (void);
+};
+
+#endif
+

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

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

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

@@ -26,22 +26,21 @@
 #include	<stdint.h>
 #include	"dab-params.h"
 #include	"fft-handler.h"
-#include	"phasetable.h"
 #include	<vector>
 
-class	TII_Detector : public phaseTable {
+class	TII_Detector {
 public:
-		TII_Detector	(uint8_t dabMode);
+		TII_Detector	(uint8_t dabMode, int16_t);
 		~TII_Detector	(void);
 	void	reset		(void);
 	void	addBuffer	(std::vector<std::complex<float>>);
-	void	processNULL	(int16_t *, int16_t *);
+	std::vector<int>	processNULL	(void);
 
 private:
 	void			collapse	(std::complex<float> *,
 	 float *);
+	int16_t			depth;
 	uint8_t			invTable [256];
-	void			initInvTable	(void);
 	dabParams		params;
 	fftHandler		my_fftHandler;
 	int16_t			T_u;
@@ -50,17 +49,7 @@
 	std::complex<float>	*fft_buffer;
 	std::vector<complex<float> >	theBuffer;
 	std::vector<float>	window;
-	std::vector<complex<float> >	refTable;
 	int16_t		fillCount;
-	int16_t		A		(uint8_t c,
-	 uint8_t p, int16_t k);
-	void		createPattern	(void);
-	void		printOverlap (int pNum, int cNum);
-
-	struct nullTable {
-	 int16_t	carrier;
-	 uint64_t	pattern;
-	} theTable [70];
 };
 
 #endif

_service:download_url:qt-dab-2.02.tar.gz/includes/output/audiosink.h -> _service:download_url:qt-dab-2.5.tar.gz/includes/output/audiosink.h Changed

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

_service:download_url:qt-dab-2.02.tar.gz/main.cpp -> _service:download_url:qt-dab-2.5.tar.gz/main.cpp Changed

@@ -1,6 +1,6 @@
 #
 /*
- * Copyright (C) 2014 .. 2017
+ * Copyright (C) 2014 .. 2019
 * Jan van Katwijk (J.vanKatwijk@gmail.com)
 * Lazy Chair Computing
 *
@@ -28,6 +28,7 @@
 #include <QApplication>
 #include <QSettings>
 #include	<QTranslator>
+#include	<QString>
 #include <QDir>
 #include	<QDebug>
 #include <unistd.h>
@@ -49,11 +50,19 @@
 	if (v. at (0) == QChar ('/')) // full path specified
 	 return v;
 
+#ifdef	OSX_INIT_FILE
+	char *PathFile;
+	PathFile = getenv("HOME");
+	fileName = PathFile;
+	fileName.append("/.qt-dab.ini");
+	qDebug() << fileName;
+#else
+
 	fileName = QDir::homePath ();
 	fileName. append ("/");
 	fileName. append (v);
 	fileName = QDir::toNativeSeparators (fileName);
-
+#endif
 	if (!fileName. endsWith (".ini"))
 	 fileName. append (".ini");
 
@@ -77,7 +86,7 @@
 	QCoreApplication::setApplicationName ("qt-dab");
 	QCoreApplication::setApplicationVersion (QString (CURRENT_VERSION) + " Git: " + GITHASH);
 
-	while ((opt = getopt (argc, argv, "i:P:")) != -1) {
+	while ((opt = getopt (argc, argv, "i:P:Q:")) != -1) {
 	 switch (opt) {
 	 case 'i':
 	 initFileName = fullPathfor (QString (optarg));
@@ -109,11 +118,11 @@
 	MyRadioInterface = new RadioInterface (dabSettings,
 	 dataPort
 );
-	MyRadioInterface -> show ();
 
 #if QT_VERSION >= 0x050600
 	QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
 #endif
+	MyRadioInterface -> show ();
 a. exec ();
 /*
 * done:

_service:download_url:qt-dab-2.02.tar.gz/qt-dab-1.png -> _service:download_url:qt-dab-2.5.tar.gz/qt-dab-1.png Changed

_service:download_url:qt-dab-2.02.tar.gz/qt-dab-installer.iss -> _service:download_url:qt-dab-2.5.tar.gz/qt-dab-installer.iss Changed

@@ -5,13 +5,13 @@
 #define MyAppVersion "2.0.1"
 #define MyAppPublisher "Lazy Chair Computing"
 #define MyAppURL "https://github.com/JvanKatwijk/qt-dab"
-#define MyAppExeName "qt-dab-2.0.exe";
+#define MyAppExeName "qt-dab-2.1.exe";
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId= {{92064982-08C3-41AA-AECD-4F8265E3A73B}
+AppId= {{0BD3638B-D634-4F75-B8BF-756A9FB7A370}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
@@ -34,7 +34,7 @@
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "E:\sdr-j-development\windows-qt-dab\qt-dab-2.0.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "E:\sdr-j-development\windows-qt-dab\qt-dab-2.1.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "E:\sdr-j-development\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "E:\sdr-j-development\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
 
@@ -49,7 +49,21 @@
 procedure install_sdrplayApi;
 var
     resultCode : Integer;
-begin
-   Exec (ExpandConstant('{app}\SDRplay_RSP_API-Windows-2.13.1.exe'), '', '', SW_SHOWNORMAL,
-    ewWaitUntilTerminated, ResultCode)
+    Names      : TArrayOfString;
+    I          : Integer;
+    found      : Boolean;
+
+ begin
+    
+    RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'SOFTWARE\MiricsSDR', Names);
+    for I := 0 to GetArrayLength(Names)-1 do
+       if Names [I] = 'API' then found := true;
+
+    if not found 
+    then
+       begin
+          MsgBox ('Software\MiricsSDR\API not found', mbInformation, MB_OK);
+          Exec (ExpandConstant('{app}\SDRplay_RSP_API-Windows-2.13.1.exe'), '', '', SW_SHOWNORMAL,
+          ewWaitUntilTerminated, ResultCode);
+       end
 end;

_service:download_url:qt-dab-2.02.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-2.5.tar.gz/qt-dab.pro Changed

@@ -5,7 +5,7 @@
 ######################################################################
 
 TEMPLATE	= app
-TARGET		= qt-dab-2.0
+TARGET		= qt-dab-2.5
 QT		+= widgets 
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
@@ -18,7 +18,7 @@
 RC_ICONS	=  qt-dab.ico
 RESOURCES	+= resources.qrc
 
-TRANSLATIONS = i18n/de_DE.ts i18n/it_IT.ts i18n/hu_HU.ts
+TRANSLATIONS = i18n/de_DE.ts
 
 DEPENDPATH += . \
 	      ./src \
@@ -96,7 +96,7 @@
 	   ./includes/ofdm/tii_table.h \
 	   ./includes/ofdm/tii_detector.h \
 	   ./includes/ofdm/fic-handler.h \
-	   ./includes/ofdm/fib-processor.h  \
+	   ./includes/ofdm/fib-decoder.h  \
 	   ./includes/protection/protTables.h \
 	   ./includes/protection/protection.h \
 	   ./includes/protection/eep-protection.h \
@@ -139,7 +139,7 @@
 #	   ./includes/support/viterbi-handler/viterbi-handler.h \
            ./includes/support/fft-handler.h \
 	   ./includes/support/ringbuffer.h \
-	   ./includes/support/Xtan2.h \
+#	   ./includes/support/Xtan2.h \
 	   ./includes/support/dab-params.h \
 	   ./includes/support/band-handler.h \
 	   ./includes/support/text-mapper.h \
@@ -179,7 +179,7 @@
 	   ./src/ofdm/tii_table.cpp \
 	   ./src/ofdm/tii_detector.cpp \
 	   ./src/ofdm/fic-handler.cpp \
-	   ./src/ofdm/fib-processor.cpp  \
+	   ./src/ofdm/fib-decoder.cpp  \
 	   ./src/protection/protTables.cpp \
 	   ./src/protection/protection.cpp \
 	   ./src/protection/eep-protection.cpp \
@@ -219,7 +219,7 @@
 	   ./src/support/viterbi-jan/viterbi-handler.cpp \
 #	   ./src/support/viterbi-handler/viterbi-handler.cpp \
            ./src/support/fft-handler.cpp \
-	   ./src/support/Xtan2.cpp \
+#	   ./src/support/Xtan2.cpp \
 	   ./src/support/dab-params.cpp \
 	   ./src/support/band-handler.cpp \
 	   ./src/support/text-mapper.cpp \
@@ -265,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
@@ -286,11 +286,17 @@
 DEFINES		+= MSC_DATA__		# use at your own risk
 DEFINES		+= PRESET_NAME
 DEFINES		+= __THREADED_BACKEND
-DEFINES	+= SHOW_MISSING
+#DEFINES	+= SHOW_MISSING
 
 # 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)
+# By default we are using an alternative implementation for the
+# deconvolution, it outperforms the "NO_SSE" version, so it is
+# usable for both windows and linux.
+# If you want it changed, make sure to adapt the specification
+# of the header and the source files.
+
 #CONFIG	+= NEON_RPI2
 #CONFIG	+= NEON_RPI3
 #CONFIG	+= SSE

_service:download_url:qt-dab-2.02.tar.gz/radio.cpp -> _service:download_url:qt-dab-2.5.tar.gz/radio.cpp Changed

@@ -234,6 +234,8 @@
 	techData. aacError_display	-> hide ();
 	techData. motAvailable		-> 
 setStyleSheet ("QLabel {background-color : red}");
+	techData. fmLabel		-> hide ();
+	techData. fmFrequency		-> hide ();
 //
 //
 	sourceDumping		= false;
@@ -357,6 +359,9 @@
 //	Some buttons should not be touched before we have a device
 	connectGUI ();
 
+	int	tii_depth	= dabSettings -> value ("tii_depth", 1). toInt ();
+	int	echo_depth	= dabSettings -> value ("echo_depth", 1). toInt ();
+	
 //	we avoided up till now connecting the channel selector
 //	to the slot since that function does a lot more that we
 //	do not want here
@@ -383,6 +388,8 @@
 	 threshold,
 	 diff_length,
 	 tii_delay,
+	 tii_depth,
+	 echo_depth,
 	 picturesPath,
 	 responseBuffer,
 	 spectrumBuffer,
@@ -399,6 +406,7 @@
 	}
 
 	clearEnsemble ();		// the display
+	secondariesVector. resize (0);
 	my_dabProcessor	-> start ();
 	running. store (true);
 }
@@ -835,11 +843,10 @@
 	techData. motAvailable		-> 
 	 setStyleSheet ("QLabel {background-color : red}");
 	techData. transmitter_coordinates -> setText (" ");
-
-	snrDisplay		-> display (0);
 	if (pictureLabel != nullptr)
 	 delete pictureLabel;
 	pictureLabel = nullptr;
+	my_tiiViewer	-> clear ();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -926,7 +933,7 @@
 	}
 
 	clear_showElements ();
-
+	secondariesVector. resize (0);
 	tunedFrequency	= theBand. Frequency (dabBand, s);
 	inputDevice	-> setVFOFrequency (tunedFrequency);
 
@@ -1238,10 +1245,9 @@
 //	Might be called from the GUI as well as from an internal call
 void	RadioInterface::selectService (QString s) {
 	serviceLabel -> setText (" ");
-	if ((my_dabProcessor -> kindofService (s) != AUDIO_SERVICE) &&
-	 (my_dabProcessor -> kindofService (s) != PACKET_SERVICE))
-	return;
-//	fprintf (stderr, "Selected service %s\n", s. toUtf8 (). data ());
+	if (!my_dabProcessor -> is_audioService (s) &&
+	 !my_dabProcessor -> is_packetService (s))
+	 return;
 	my_dabProcessor -> reset_msc ();
 	currentName = s;
 	setStereo (false);
@@ -1253,88 +1259,78 @@
 	techData. motAvailable		-> 
 	 setStyleSheet ("QLabel {background-color : red}");
 
-	int k = my_dabProcessor -> kindofService (s);
-
-	switch (k) {
-	 case AUDIO_SERVICE:
-	 { audiodata d;
-	 my_dabProcessor -> dataforAudioService (s, &d);
-	 if (!d. defined) {
- QMessageBox::warning (this, tr ("Warning"),
- 	 tr ("unknown bitrate for this program\n"));
- 	 return;
- 	 }
-
-	 show_techData (ensembleLabel, s, 
-	 inputDevice -> getVFOFrequency () / 1000000.0,
-	 &d);
-	 serviceLabel -> setAlignment(Qt::AlignCenter);
-	 serviceLabel -> setText (s);
-	 my_dabProcessor -> set_audioChannel (&d, audioBuffer);
-	 for (int i = 1; i < 10; i ++) {
-	 packetdata pd;
-	 my_dabProcessor -> dataforDataService (s, &pd, i);
-	 if (pd. defined) {
-	 my_dabProcessor -> set_dataChannel (&pd, dataBuffer);
-	 break;
-	 }
-	 }
-
-	 soundOut	-> restart ();
-	 showLabel (QString (" "));
-	 break;
-	 }
-
-	 case PACKET_SERVICE:
-	 { packetdata pd;
-	 my_dabProcessor -> dataforDataService (s, &pd);
-	 if ((!pd. defined) ||
-	 (pd. DSCTy == 0) || (pd. bitRate == 0)) {
-	 fprintf (stderr, "d. DSCTy = %d, d. bitRate = %d\n",
+	if (my_dabProcessor -> is_audioService (s)) {
+	 audiodata d;
+	 my_dabProcessor -> dataforAudioService (s, &d, 0);
+	 if (!d. defined) {
+ QMessageBox::warning (this, tr ("Warning"),
+ 	 tr ("unknown bitrate for this program\n"));
+ 	 return;
+ 	 }
+
+	 show_techData (ensembleLabel, s, 
+	 inputDevice -> getVFOFrequency () / 1000000.0,
+	 &d);
+	 serviceLabel -> setAlignment(Qt::AlignCenter);
+	 serviceLabel -> setText (s);
+	 my_dabProcessor -> set_audioChannel (&d, audioBuffer);
+	 for (int i = 1; i < 10; i ++) {
+	 packetdata pd;
+	 my_dabProcessor -> dataforPacketService (s, &pd, i);
+	 if (pd. defined) {
+	 my_dabProcessor -> set_dataChannel (&pd, dataBuffer);
+	 break;
+	 }
+	 }
+
+	 soundOut	-> restart ();
+	 showLabel (QString (" "));
+	}
+	else
+	if (my_dabProcessor -> is_packetService (s)) {
+	 packetdata pd;
+	 my_dabProcessor -> dataforPacketService (s, &pd, 0);
+	 if ((!pd. defined) ||
+	 (pd. DSCTy == 0) || (pd. bitRate == 0)) {
+	 fprintf (stderr, "d. DSCTy = %d, d. bitRate = %d\n",
 	 pd. DSCTy, pd. bitRate);
-	 QMessageBox::warning (this, tr ("sdr"),
- 	 tr ("still insufficient data for this service\n"));
+	 QMessageBox::warning (this, tr ("sdr"),
+ 	 tr ("still insufficient data for this service\n"));
+	 return;
+	 }
 
-	 return;
-	 }
-	 my_dabProcessor -> set_dataChannel (&pd, dataBuffer);
-	 switch (pd. DSCTy) {
-	 default:
-	 showLabel (QString ("unimplemented Data"));
-	 break;
-	 case 5:
-	 fprintf (stderr, "selected apptype %d\n", 
-	 pd. appType);
-	 showLabel (QString ("Transp. Channel not implemented"));
-	 break;
-	 case 60:
-	 showLabel (QString ("MOT partially implemented"));
-	 break;
-	 case 59: {
+	 my_dabProcessor -> set_dataChannel (&pd, dataBuffer);
+	 switch (pd. DSCTy) {
+	 default:
+	 showLabel (QString ("unimplemented Data"));
+	 break;
+	 case 5:
+	 fprintf (stderr, "selected apptype %d\n", pd. appType);
+	 showLabel (QString ("Transp. Channel not implemented"));
+	 break;
+	 case 60:
+	 showLabel (QString ("MOT partially implemented"));
+	 break;
+	 case 59: {
 #ifdef	_SEND_DATAGRAM_
-	 QString text = QString ("Embedded IP: UDP data to ");
-	 text. append (ipAddress);
-	 text. append (" ");
-	 QString n = QString::number (port);
-	 text. append (n);
-	 showLabel (text);
+	 QString text = QString ("Embedded IP: UDP data to ");
+	 text. append (ipAddress);
+	 text. append (" ");
+	 QString n = QString::number (port);
+	 text. append (n);
+	 showLabel (text);
 #else
-	 showLabel ("Embedded IP not supported ");

_service:download_url:qt-dab-2.02.tar.gz/radio.h -> _service:download_url:qt-dab-2.5.tar.gz/radio.h Changed

_service:download_url:qt-dab-2.02.tar.gz/resources.qrc -> _service:download_url:qt-dab-2.5.tar.gz/resources.qrc Changed

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

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

@@ -296,9 +296,10 @@
 // DECODE HELPER FUNCTIONS //
 ////////////////////////////////////////////////////////////////////////////////
 
-struct quantizer_spec* mp2Processor::read_allocation(int sb, int b2_table) {
- int table_idx = quant_lut_step3[b2_table][sb];
- table_idx = quant_lut_step4[table_idx & 15][get_bits(table_idx >> 4)];
+struct quantizer_spec*
+	mp2Processor::read_allocation (int sb, int b2_table) {
+int table_idx = quant_lut_step3 [b2_table][sb];
+ table_idx = quant_lut_step4 [table_idx & 15] [get_bits(table_idx >> 4)];
 return table_idx ? (&quantizer_table[table_idx - 1]) : 0;
 }
 
@@ -326,13 +327,13 @@
 	adj = q -> nlevels;
 	if (q -> grouping) { // decode grouped samples
 	 val = get_bits (q -> cw_bits);
-	 sample[0] = val % adj;
+	 sample [0] = val % adj;
 	 val /= adj;
-	 sample[1] = val % adj;
-	 sample[2] = val / adj;
+	 sample [1] = val % adj;
+	 sample [2] = val / adj;
 	} else { // decode direct samples
 	 for (idx = 0; idx < 3; ++idx)
-	 sample[idx] = get_bits(q->cw_bits);
+	 sample [idx] = get_bits (q -> cw_bits);
 	}
 
 	// postmultiply samples

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

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

@@ -150,8 +150,16 @@
 
 	if (contentType == 7) {		// epg data
 #ifdef	TRY_EPG
+	 if (name == QString (""))
+	 name = "epg file";
+	 QString realName = picturePath;
+	 realName. append (name);
+	 realName = QDir::toNativeSeparators (realName);
+	 fprintf (stderr, "going to write file %s\n",
+	 realName. toUtf8 (). data ());
+	 checkDir (realName);
 	 std::vector<uint8_t> epgData (result. begin (), result. end ());
-	 epgHandler. decode (epgData, name);
+	 epgHandler. decode (epgData, realName);
 #endif
 	 return;
 	}
@@ -165,12 +173,12 @@
 	 realName. append (name);
 	 realName = QDir::toNativeSeparators (realName);
 	 fprintf (stderr, "going to write file %s\n",
-	 realName. toLatin1 (). data ());
+	 realName. toUtf8 (). data ());
 	 checkDir (realName);
 	 FILE *x = fopen (realName. toLatin1 (). data (), "w+b");
 	 if (x == nullptr)
 	 fprintf (stderr, "cannot write file %s\n",
-	 realName. toLatin1 (). data ());
+	 realName. toUtf8 (). data ());
 	 else {
 	 (void)fwrite (result. data (), 1, bodySize, x);
 	 fclose (x);

_service:download_url:qt-dab-2.5.tar.gz/src/ofdm/fib-decoder.cpp Added

@@ -0,0 +1,1605 @@
+#
+/*
+ * Copyright (C) 2018, 2019
+ * 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
+ *
+ * 	fib decoder. Functionality is shared between fic handler, i.e. the
+ *	one preparing the FIC blocks for processing, and the mainthread
+ *	from which calls are coming on selecting a program
+ */
+#include	"fib-decoder.h"
+#include	<cstring>
+#include	<vector>
+#include	"radio.h"
+#include	"charsets.h"
+//
+//
+// Tabelle ETSI EN 300 401 Page 50
+// Table is copied from the work of Michael Hoehn
+ const int ProtLevel[64][3] = {{16,5,32},	// Index 0
+	 {21,4,32},
+	 {24,3,32},
+	 {29,2,32},
+	 {35,1,32},	// Index 4
+	 {24,5,48},
+	 {29,4,48},
+	 {35,3,48},
+	 {42,2,48},
+	 {52,1,48},	// Index 9
+	 {29,5,56},
+	 {35,4,56},
+	 {42,3,56},
+	 {52,2,56},
+	 {32,5,64},	// Index 14
+	 {42,4,64},
+	 {48,3,64},
+	 {58,2,64},
+	 {70,1,64},
+	 {40,5,80},	// Index 19
+	 {52,4,80},
+	 {58,3,80},
+	 {70,2,80},
+	 {84,1,80},
+	 {48,5,96},	// Index 24
+	 {58,4,96},
+	 {70,3,96},
+	 {84,2,96},
+	 {104,1,96},
+	 {58,5,112},	// Index 29
+	 {70,4,112},
+	 {84,3,112},
+	 {104,2,112},
+	 {64,5,128},
+	 {84,4,128},	// Index 34
+	 {96,3,128},
+	 {116,2,128},
+	 {140,1,128},
+	 {80,5,160},
+	 {104,4,160},	// Index 39
+	 {116,3,160},
+	 {140,2,160},
+	 {168,1,160},
+	 {96,5,192},
+	 {116,4,192},	// Index 44
+	 {140,3,192},
+	 {168,2,192},
+	 {208,1,192},
+	 {116,5,224},
+	 {140,4,224},	// Index 49
+	 {168,3,224},
+	 {208,2,224},
+	 {232,1,224},
+	 {128,5,256},
+	 {168,4,256},	// Index 54
+	 {192,3,256},
+	 {232,2,256},
+	 {280,1,256},
+	 {160,5,320},
+	 {208,4,320},	// index 59
+	 {280,2,320},
+	 {192,5,384},
+	 {280,3,384},
+	 {416,1,384}};
+
+//
+class	service {
+public:
+	service	(void) {
+	 clear ();
+	}
+	~service	(void) {
+		clear ();
+	}
+	void		clear	(void) {
+	 inUse	= false;
+	 hasName	= false;
+	 language	= 0;
+	 programType	= 0;
+	 serviceLabel	= "";
+	 is_shown	= false;
+	 fmFrequency	= -1;
+	}
+	bool		inUse;
+	uint32_t	serviceId;
+	bool		hasName;
+	QString		serviceLabel;
+	int		language;
+	int		programType;
+	bool		is_shown;
+	int32_t		fmFrequency;
+};
+
+class ensembleDescriptor {
+public:
+	ensembleDescriptor (void) {
+	 clear ();
+	 for (int i = 0; i < 64; i ++)
+	 services [i]. clear ();
+	}
+	~ensembleDescriptor	(void) {}
+	void		clear (void) {
+	 namePresent	= false;
+	 ecc_Present	= false;
+	 isSynced	= false;
+	}
+	QString ensembleName;
+	int32_t ensembleId;
+	bool namePresent;
+	bool	ecc_Present;
+	uint8_t	ecc_byte;
+	bool	isSynced;
+	service	services [64];
+};
+
+class	subChannelDescriptor {
+public:
+	subChannelDescriptor	(void) {
+	 clear ();
+	}
+	~subChannelDescriptor	(void) {}
+	void		clear (void) {
+	 inUse	= false;
+	 language	= 0;
+	 FEC_scheme	= 0;
+	}
+	bool		inUse;
+	int32_t		SubChId;
+	int32_t		startAddr;
+	int32_t		Length;
+	bool		shortForm;
+	int32_t		protLevel;
+	int32_t		bitRate;
+	int16_t		language;
+	int16_t		FEC_scheme;
+	int16_t		SCIds;		// for audio channels
+};
+
+// The service component describes the actual service
+// It really should be a union, the component data for
+// audio and data are quite different
+class	serviceComponentDescriptor {
+public:
+	serviceComponentDescriptor	(void) {
+	 clear	();
+	}
+	~serviceComponentDescriptor	(void) {}
+	void		clear		(void) {
+	 inUse		= false;
+	 is_madePublic	= false;
+	 SCIds		= -1;
+	 componentNr		= -1;
+	 SCId			= -1;
+	 componentNr		= -1;
+	}
+
+	bool		inUse;		// field in use
+	int8_t		TMid;		// the transport mode
+	int16_t		serviceIndex;	// belongs to the service
+	int16_t		subchannelId;	// used in both audio and packet
+	int16_t		componentNr; // component
+	int16_t		SCIds;		// component within service
+	int16_t		ASCTy; // used for audio
+	int16_t		PS_flag;	// use for both audio and packet
+	uint16_t	SCId; // Component Id (12 bit, unique)

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

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

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

@@ -22,6 +22,7 @@
 #include	"phasereference.h" 
 #include	"string.h"
 #include	"radio.h"
+#include	<vector>
 /**
 *	\class phaseReference
 *	Implements the correlation that is used to identify
@@ -34,21 +35,24 @@
 	 uint8_t		dabMode,
 	 int16_t		threshold,
 	 int16_t		diff_length,
+	 int16_t		depth,
 	 RingBuffer<float> *b):
 	 phaseTable (dabMode),
 	 params (dabMode),
 	 my_fftHandler (dabMode) {
 int32_t	i;
 float	Phi_k;
+FILE	*tableFile;
 
 	this	-> response	= b;
 	this	-> threshold	= threshold;
 	this	-> diff_length	= diff_length;
+	this	-> depth	= depth;
 	this	-> T_u		= params. get_T_u ();
 	this	-> carriers	= params. get_carriers ();
 
 	refTable.		resize (T_u);
-	phaseDifferences.	resize (diff_length);
+	phaseDifferences. resize (diff_length);
 	fft_buffer		= my_fftHandler. getVector ();
 
 	framesperSecond		= 2048000 / params. get_T_F ();
@@ -62,15 +66,19 @@
 	 Phi_k = get_Phi (-i);
 	 refTable [T_u - i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
 	}
+
 //
-//	prepare a table for the coarse frequency synchronization
-//	can be a static one, actually, we are only interested in
-//	the ones with a null
-	for (i = 1; i <= diff_length; i ++) 
+// prepare a table for the coarse frequency synchronization
+// can be a static one, actually, we are only interested in
+// the ones with a null
+	for (i = 1; i <= diff_length; i ++)
 	 phaseDifferences [i - 1] = abs (arg (refTable [(T_u + i) % T_u] *
- conj (refTable [(T_u + i + 1) % T_u])));
+	 conj (refTable [(T_u + i + 1) % T_u])));
+
 	connect (this, SIGNAL (showImpulse (int)),
 	 mr, SLOT (showImpulse (int)));
+	connect (this, SIGNAL (showIndex (int)),
+	 mr, SLOT (showIndex (int)));
 }
 
 	phaseReference::~phaseReference (void) {
@@ -93,6 +101,8 @@
 float	sum		= 0;
 float	Max		= -1000;
 float	lbuf [T_u];
+float	mbuf [T_u];
+std::vector<int> resultVector;
 
 	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
 	my_fftHandler. do_FFT ();
@@ -107,6 +117,7 @@
 */
 	for (i = 0; i < T_u; i ++) {
 	 lbuf [i] = jan_abs (fft_buffer [i]);
+	 mbuf [i] = lbuf [i];
 	 sum	+= lbuf [i];
 	 if (lbuf [i] > Max) {
 	 maxIndex = i;
@@ -114,38 +125,78 @@
 	 }
 	}
 
+	if (Max < threshold * sum / T_u) 
+	 return (- abs (Max * T_u / sum) - 1);
+	else 
+	 resultVector. push_back (maxIndex);	
+
+	for (int k = 0; k < depth; k ++) {
+	 float MMax = 4 * threshold * sum / T_u;
+	 int	lIndex = -1;
+	 for (i = 0; i < T_u / 2; i ++) {
+	 if (lbuf [i] > MMax) {
+	 MMax = lbuf [i];
+	 lIndex = i;
+	 }
+	 }
+	 if (lIndex > 0) {
+	 resultVector . push_back (lIndex);
+	 for (i = lIndex - 15; i < lIndex + 15; i ++)
+	 lbuf [i] = 0;
+	 }
+	 else
+	 break;
+	}
+
 	if (response != NULL) {
 	 if (++displayCounter > framesperSecond / 4) {
-	 response	-> putDataIntoBuffer (lbuf, T_u);
+	 response	-> putDataIntoBuffer (mbuf, T_u);
 	 showImpulse (T_u);
 	 displayCounter	= 0;
+	 if (resultVector. at (0) > 0) {
+	 showIndex (-1);
+	 for (i = 1; i < resultVector. size (); i ++)
+	 showIndex (resultVector. at (i));
+	 showIndex (0);
+	 }
 	 }
 	}
-/**
- *	that gives us a basis for defining the actual threshold value
- */
-	if (Max < threshold * sum / T_u)
-	 return - abs (Max * T_u / sum) - 1;
-	else {
-	 return maxIndex;	
-	}
+	return resultVector. at (0);
 }
 
-//	We investigate a sequence of phasedifferences that
-//	are known starting at real carrier 0.
-//	Phase of the carriers of the "real" block 0 may be
-//	quite different than the phase of the carriers of the "reference"
-//	block, plain correlation (i.e. sum (x, y, i) does not work well.
-//	What is a good measure though is looking at the phase differences
-//	between successive carriers in both the "real" block and the
-//	reference block. These should be more or less the same.
-//	So we just compute the phasedifference between phasedifferences
-//	as measured and as they should be.
-//	To keep things simple, we just look at the locations where
-//	the phasedifference with the successor should be 0
-//	In previous versions we looked
-//	at the "weight" of the positive and negative carriers in the
-//	fft, but that did not work too well.
+//
+//	The intuitive approach (at least mine) was to correlate the
+//	incoming data with the reference table. It did not work
+//	which is actually logical, since (a) the amplitudes are not
+//	discriminating and (b) the phases might be really off
+//#define	SEARCH_RANGE	(2 * 35)
+//int16_t	phaseReference::estimate_CarrierOffset (std::vector<std::complex<float>> v) {
+//int16_t	i, j;
+//std::complex<float> temp;
+//float	maxCorr	= 0;
+//int	maxIndex = -1;
+//
+//	memcpy (fft_buffer, v. data (), T_u * sizeof (std::complex<float>));
+//	my_fftHandler. do_FFT ();
+//
+//	for (i = T_u - SEARCH_RANGE / 2;
+//	 i < T_u + SEARCH_RANGE / 2; i ++) {
+//	 temp = std::complex<float> (0, 0);
+//	 for (j = 0; j < diff_length; j ++)
+//	 temp += fft_buffer [(i + j) % T_u] *
+//	 conj (refTable [(T_u - SEARCH_RANGE / 2 + j) % T_u]);
+//	 if (abs (temp) > maxCorr) {
+//	 maxIndex = i - (T_u - SEARCH_RANGE / 2);
+//	 maxCorr = abs (temp);
+//	 }
+//	}
+//
+//	return maxIndex;
+//}
+
+//
+//	an approach that works fine is to correlate the phasedifferences
+//	between subsequent carriers
 #define	SEARCH_RANGE	(2 * 35)
 int16_t	phaseReference::estimate_CarrierOffset (std::vector<std::complex<float>> v) {
 int16_t	i, j, index = 100;
@@ -177,8 +228,6 @@
 	
 	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.02.tar.gz/src/ofdm/tii_detector.cpp -> _service:download_url:qt-dab-2.5.tar.gz/src/ofdm/tii_detector.cpp Changed

@@ -24,71 +24,6 @@
 #include	<stdio.h>
 #include	<inttypes.h>
 //
-//	The information in the null-period is encoded in a "p"
-//	a "pattern" and a "c", a "carrier"
-//	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 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.
-//
-//	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.
-//
-//	The constructor of the class generates the patterns, according
-//	to the algorithm in the standard.
-		TII_Detector::TII_Detector (uint8_t dabMode):
-	 phaseTable (dabMode),
-	 params (dabMode),
-	 my_fftHandler (dabMode) {
-int16_t	p, c, k;
-int16_t	i;
-float	Phi_k;
-
-	this	-> T_u		= params. get_T_u ();
-	carriers		= params. get_carriers ();
-	theBuffer. resize	(T_u);
-	fillCount		= 0;
-	fft_buffer		= my_fftHandler. getVector ();	
-	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));
-
-	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));
-	}
-
-	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.
-//
-//	p is in the range 0 .. 69
-//	c is in the range 0 .. 23
-//	The transmitted signal - for a given p and c -
-//	 Zm (0, k) = A (c, p) (k) e^jPhi (k) + A (c, p) (k - 1) e ^jPhi (k - 1)
-//
-//	a (b, p) = getBit (table [p], b);
 
 static
 uint8_t table [] = {
@@ -171,55 +106,34 @@
 };
 
 
-void	TII_Detector::initInvTable() {
-	int	i;
+		TII_Detector::TII_Detector (uint8_t dabMode, int16_t depth):
+	 params (dabMode),
+	 my_fftHandler (dabMode) {
+int16_t	p, c, k;
+int16_t	i;
+float	Phi_k;
+
+	this	-> depth	= depth;
+	this	-> T_u		= params. get_T_u ();
+	carriers		= params. get_carriers ();
+	theBuffer. resize	(T_u);
+	fillCount		= 0;
+	fft_buffer		= my_fftHandler. getVector ();	
+	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));
+
 	for (i = 0; i < 256; ++i)
 	 invTable [i] = -1;
 	for (i = 0; i < 70; ++i) 
 	 invTable [table [i]] = i;
 }
 
-static
-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;
-}
-
-static inline
-uint8_t delta (int16_t a, int16_t b) {
-	return a == b ? 1 : 0;
+		TII_Detector::~TII_Detector (void) {
 }
-//
-//	Litterally copied from the standard. There is no doubt that
-//	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 c, uint8_t p, int16_t k) {
-int16_t b;
-int16_t res	= 0;
-
-	if ((-768 <= k) && (k < - 384))
-	 for (b = 0; b <= 7; b ++)
-	 res += delta (k, -768 + 2 * c + 48 * b) * getbit (table [p], b);
-	else
-	if ((-384 <= k) && (k < 0))
-	 for (b = 0; b <= 7; b ++)
-	 res += delta (k, -384 + 2 * c + 48 * b) * getbit (table [p], b);
-	else
-	if ((0 < k) && (k <= 384))
-	 for (b = 0; b <= 7; b ++)
-	 res += delta (k, 1 + 2 * c + 48 * b) * getbit (table [p], b);
-	else
-	if ((384 < k) && (k <= 768))
-	 for (b = 0; b <= 7; b ++)
-	 res += delta (k, 385 + 2 * c + 48 * b) * getbit (table [p], b);
-	else
-	 return 0;
 
-	return res;
-}
-//
 
 void	TII_Detector::reset (void) {
 	memset (theBuffer. data (), 0, T_u * sizeof (std::complex<float>));
@@ -261,22 +175,21 @@
 	}
 }
 
+static
+uint8_t bits [] = {0x80, 0x40, 0x20, 0x10 , 0x08, 0x04, 0x02, 0x01};
 
 #define	NUM_GROUPS	8
 #define	GROUPSIZE	24
-void	TII_Detector::processNULL (int16_t *mainId, int16_t *subId) {
+std::vector<int>	TII_Detector::processNULL (void) {
 int i, j;
 float	hulpTable	[NUM_GROUPS * GROUPSIZE];
 float	C_table		[GROUPSIZE];	// contains the values
 int	D_table		[GROUPSIZE];	// count of indices in C_table with data
 float	avgTable	[NUM_GROUPS];
 float	minTable	[NUM_GROUPS];
-//
-//	defaults:
-	*mainId	= -1;
-	*subId	= -1;
-
+std::vector<int> results;
 
+	results. resize (0);
 //	we map the "carriers" carriers (complex values) onto
 //	a collapsed vector of "carriers / 8" length, 
 //	considered to consist of 8 segments of 24 values
@@ -300,19 +213,19 @@
 	 }
 	 avgTable [i] /= GROUPSIZE;
 	}
-
-//
 //	
 //	Determining the offset is then easy, look at the corresponding
-//	elements in the NUM_GROUPS sections and mark the highest ones
+//	elements in the NUM_GROUPS sections and mark the highest ones.
 //	The summation of the high values are stored in the C_table,
 //	the number of times the limit is reached in the group
 //	is recorded in the D_table
 //
+//	So, basically we look into GROUPSIZE colums of NUMGROUPS
+//	values and look for the maximum
 //	Threshold 4 * avgTable is 6dB, we consider that a minimum
 //	measurement shows that that is a reasonable value,
 //	alternatively, we could take the "minValue" as reference
-//	and "raise" the threshold. However, while that might be
+//	and "raise" the threshold. However, that might be
 //	too much for 8-bit incoming values
 	memset (D_table, 0, GROUPSIZE * sizeof (int));
 	memset (C_table, 0, GROUPSIZE * sizeof (float));

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

@@ -20,6 +20,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include	<stdio.h>
+#include	<QStringList>
 #include	"ensemble-printer.h"
 #include	"country-codes.h"
 #include	"dab_tables.h"
@@ -55,6 +56,7 @@
 
 void	ensemblePrinter::showEnsembleData (QString channel,
 	 int32_t freq,
+	 QStringList Services,
 	 dabProcessor *my_dabProcessor,
 	 FILE *file_P) {
 uint8_t	countryId;
@@ -77,18 +79,19 @@
 	 frequency / 1000);
 	 
 	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");
-	for (i = 0; i < 64; i ++) {
-	 audiodata d;
-	 my_dabProcessor -> dataforAudioService (i, &d);
-	 if (!d. defined)
-	 continue;
-	 QString protL	= getProtectionLevel (d. shortForm, 
+	for (QString& audioService: Services) {
+	 for (i = 0; i < 5; i ++) {
+	 audiodata d;
+	 my_dabProcessor -> dataforAudioService (audioService, &d, i);
+	 if (!d. defined)
+	 continue;
+	 QString protL	= getProtectionLevel (d. shortForm, 
 	 d. protLevel);
-	 QString codeRate	= getCodeRate (d. shortForm, 
+	 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 (),
+	 countryId = (d. serviceId >> 12) & 0xF;
+	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%s;%s;%s;%s;%s;\n",
+	 audioService. toUtf8(). data (),
 	 code_to_string (ecc_byte, countryId). toUtf8 (). data (),
 	 d. serviceId,
 	 d. subchId,
@@ -100,44 +103,46 @@
 	 codeRate. toUtf8 (). data (),
 	 theMapper. get_programm_language_string (d. language),
 	 theMapper. get_programm_type_string (d. programType) );
+	 }
 	}
 
 	firstData	= true;
-	for (i = 0; i < 64; i ++) {
-	 packetdata d;
-	 my_dabProcessor -> dataforDataService (i, &d);
-	 if (!d. defined)
-	 continue;
+	for (QString& dataService: Services) {
+	 for (i = 0; i < 5; i ++) {
+	 packetdata d;
+	 my_dabProcessor -> dataforPacketService (dataService, &d, i);
+	 if (!d. defined)
+	 continue;
 
-	 if (firstData) {
-	 fprintf (file_P, "\n\n\nData Services\nprogram name;;serviceId;subchannelId;start address;length (CU); bit rate; FEC; prot level; appType ; subService ; \n\n");
-	 firstData = false;
-	 }
-	 
-	 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];
+	 if (firstData) {
+	 fprintf (file_P, "\n\n\nData Services\nprogram name;;serviceId;subchannelId;start address;length (CU); bit rate; FEC; prot level; appType ; subService ; \n\n");
+	 firstData = false;
 	 }
-	 else {
-	 protL. append ("-B");
-	 codeRate = eep_Brates [(h & 03) + 1];
+
+	 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;
 	 }
-	 h = (h & 03) + 1;
-	 }
-	 else {
-	 protL = "UEP ";
-	 protL. append (QString::number (h));
-	 codeRate = uep_rates [h + 1];
-	 }
-	 countryId = (d. serviceId >> (5 * 4)) & 0xF;
-	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%d;%s;%d;%s;;\n",
-	 d. serviceName. toUtf8 (). data (),
+	 else {
+	 protL = "UEP ";
+	 protL. append (QString::number (h));
+	 codeRate = uep_rates [h + 1];
+	 }
+	 countryId = (d. serviceId >> (5 * 4)) & 0xF;
+	 fprintf (file_P, "%s;%s;%X;%d;%d;%d;%d;%d;%s;%d;%s;;\n",
+	 dataService. toUtf8 (). data (),
 	 code_to_string (ecc_byte, countryId). toUtf8 (). data (),
 	 d. serviceId,
 	 d. subchId,
@@ -148,6 +153,7 @@
 	 protL. toUtf8 (). data (),
 	 d. appType,
 	 d. compnr == 0 ? "no": "yes");
+	 }
 	}
 }

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

_service:download_url:qt-dab-2.02.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-2.5.tar.gz/tii-viewer/tii-viewer.cpp Changed

_service:download_url:qt-dab-2.02.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-2.5.tar.gz/tii-viewer/tii-viewer.h Changed

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

_service:download_url:qt-dab-2.02.tar.gz/travis.yml-qt4 -> _service:download_url:qt-dab-2.5.tar.gz/travis.yml-qt4 Changed