Packman Build Service PMBS

qt-dab.changes Changed

qt-dab.spec Changed

_service Changed

_service:download_url:qt-dab-3.4.tar.gz/.gitignore -> _service:download_url:qt-dab-3.4.1.tar.gz/.gitignore Changed

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

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

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

@@ -1,24 +1,18 @@
-# Qt-DAB-3.4 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
+# Qt-DAB-3.4.1 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
-Qt-DAB-3.4 is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little brother dabMini, built on the same set of sources.
+Qt-DAB-3.4.1 is software for Windows, Linux and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little brother dabMini, built on the same set of sources.
 
 
 ![Qt-DAB with xml input](/qt-dab-1.png?raw=true)
 
 ------------------------------------------------------------------
-New in 3.4
+New in 3.4.1
 ------------------------------------------------------------------
 
-There is not much changed in the use of Qt-DAB, quite some internal
-modifications though.
-
-When touching one of the *dump* buttons, a filename is suggested,
-and the directory in which the dump is stored will be remembered for
-a next time.
-
-Furthermore, the Qt-DAB program is pretty large and has quite a number
-of options for users to influence the behaviour, I added a *preliminary*
-piece of documentation in the sections docs
+Based on user requests, a minor addition is implemented: if scanning
+ends normally, i.e. not being interrupted, a possibility is created
+to save the scan into a file. File is in text format,
+can be shown nicely in LibreOffice of similar programs.
 
 ------------------------------------------------------------------
 Table of Contents
@@ -51,7 +45,7 @@
 Introduction
 ------------------------------------------------------------------
 
-**Qt-DAB-3.4** is an implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI, both 2 and 3.
+**Qt-DAB-3.4,1** 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.
 
 For DX purposes, a **dab-scanner** is implemented that allows
 for a continuous scanning of selected channels in a given band. Results are 
@@ -60,7 +54,7 @@
 
 Derived programs, such as **sdrplayDab**, the **dab-scanner** and the Qt-free versions **dab-cmdline** and the **dab-server** have their own repository on Github.
 
-Qt-DAB-3.4 also supports file input, from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`) and on the aforementionedxml files. Obviously there is a provision for dumping the input into an (\*.sdr)-file and - for most configured devices - as xml file. 
+Qt-DAB-3.4.1 also supports file input, from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`) and on the aforementionedxml files. Obviously there is a provision for dumping the input into an (\*.sdr)-file and - for most configured devices - as xml file. 
 
 Finally, Qt-DAB supports input from an rtl_tcp server, if such server is used as input device, the connection needs to support the inputrate, i.e. 2,048,000 I/Q samples (i.e. 2 * 2,048,000 bytes/second).
 
@@ -224,7 +218,7 @@
 Maintaining History 
 ---------------------------------------------------------------------------
 
-Qt-DAB-3.4 saves all service names found. Pairs Channel:serviceName
+Qt-DAB-3.4.1 saves all service names found. Pairs Channel:serviceName
 will be made (in)visible when touching the appropriate button (the
 one labeled with "xx").

_service:download_url:qt-dab-3.4.tar.gz/dab-maxi/radio.cpp -> _service:download_url:qt-dab-3.4.1.tar.gz/dab-maxi/radio.cpp Changed

@@ -168,7 +168,6 @@
 	running. 		store (false);
 	scanning. 		store (false);
 	isSynced		= false;
-	runningServices. 	resize (0);
 	spectrumBuffer          =
 	                  new RingBuffer<std::complex<float>> (2 * 32768);
 	iqBuffer		=
@@ -188,16 +187,19 @@
 	latency			=
 	                  dabSettings -> value ("latency", 5). toInt();
 
+	currentService. valid	= false;
+	nextService. valid	= false;
 	bool has_presetName	=
 	              dabSettings -> value ("has-presetName", 1). toInt() != 0;
 	if (has_presetName) {
 	   presetName		=
 	              dabSettings -> value ("presetname", ""). toString();
-	   dabService s;
-	   s. serviceName = presetName;
-	   s. SId	  = 0;
-	   s. SCIds	  = 0;
-	   runningServices. push_back (s);
+	   if (presetName != "") {
+	      nextService. serviceName = presetName;
+	      nextService. SId		= 0;
+	      nextService. SCIds	= 0;
+	      nextService. valid	= true;
+	   }
 	}
 #ifdef	_SEND_DATAGRAM_
 	ipAddress		= dabSettings -> value ("ipAddress", "127.0.0.1"). toString();
@@ -408,7 +410,7 @@
 	if (inputDevice != nullptr) {
 	   if (doStart()) {
 	      qApp	-> installEventFilter (this);
-	      currentService	= nullptr;
+	      currentServiceDescriptor	= nullptr;
 	      return;
 	   }
 	   else {
@@ -420,7 +422,7 @@
 	connect (deviceSelector, SIGNAL (activated (const QString &)),
 	         this,  SLOT (doStart (const QString &)));
 	qApp	-> installEventFilter (this);
-	currentService	= nullptr;
+	currentServiceDescriptor	= nullptr;
 }
 
 QString RadioInterface::footText () {
@@ -524,7 +526,7 @@
 	                                      frameBuffer
 	                                      );
 
-	if (runningServices. size () > 0) {
+	if (nextService. valid) {
 	   presetTimer. setSingleShot	(true);
 	   presetTimer. setInterval 	(switchTime);
 	   presetTimer. start 		(switchTime);
@@ -548,12 +550,11 @@
 void	RadioInterface::dumpControlState (QSettings *s) {
 	if (s == nullptr)	// cannot happen
 	   return;
-	QString presetName;
-	
-	if (runningServices. size () > 0) {
-	   dabService serv = runningServices. back ();
-	   s	-> setValue ("presetname", serv. serviceName);
-	}
+
+	if (currentService. valid)
+	   s	-> setValue ("presetname", currentService. serviceName);
+	else
+	   s	-> setValue ("presetname", "");
 
 	s	-> setValue ("device",
 	                      deviceSelector -> currentText());
@@ -643,7 +644,7 @@
 	ensembleId	-> setText (v + QString (":") + hextoString (id));
 	my_dabProcessor	-> coarseCorrectorOff();
 	if (normalScan)
-	   stopScanning ();	// if scanning, we are done
+	   stopScanning (false);	// if scanning, we are done
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -660,33 +661,41 @@
 	return inp;
 }
 
-QString	RadioInterface::filenameSuggestion (QString name,
-	                                    QString theTime, QString type) {
-QString result;
-	name	= trim (name);	// get rid of spaces to up to 16 positions
-	theTime. replace (":", "-");
-	result = name + theTime + type;
-	result. replace (" ", "-");
-	return result;
+static inline
+bool	isValid (QChar c) {
+	return c. isLetter () || c. isDigit () || (c == '-');
 }
 
 void	RadioInterface::handle_contentButton	() {
+ensemblePrinter	my_Printer;
+QString suggestedFileName;
 QString currentChannel	= channelSelector -> currentText();
 int32_t	frequency	= inputDevice -> getVFOFrequency();
-QString theTime		= localTimeDisplay -> text ();
-ensemblePrinter	my_Printer;
+QString	saveDir		= dabSettings -> value ("contentDir",
+	                                        QDir::homePath ()). toString ();
 
 	if (!running. load() || (ensembleId -> text () == QString ("")))
 	   return;
 
-	QString suggestedFileName =
-	                 filenameSuggestion (QDir::homePath () + "/Qt-DAB-",
-	                                                theTime, ".txt");
+	if ((saveDir != "") && (!saveDir. endsWith ('/')))
+	   saveDir = saveDir + '/';
+
+	QString theTime	= localTimeDisplay -> text ();
+	for (int i = 0; i < theTime. length (); i ++)
+	   if (!isValid (theTime. at (i)))
+	      theTime. replace (i, 1, '-');
+	suggestedFileName = saveDir + "Qt-DAB-" + currentChannel +
+	                    "-" + theTime;
+	
+	fprintf (stderr, "suggested filename %s\n",
+	                         suggestedFileName. toLatin1 (). data ());
 	QString fileName = QFileDialog::getSaveFileName (this,
 	                                        tr ("Save file ..."),
-	                                        suggestedFileName,
-//	                                        QDir::homePath(),
+	                                        suggestedFileName + ".txt",
 	                                        tr ("Text (*.txt)"));
+	if (fileName == "")
+	   return;
+
 	fileName	= QDir::toNativeSeparators (fileName);
 	FILE *file_P	= fopen (fileName. toUtf8(). data(), "w");
 
@@ -696,8 +705,14 @@
 	   return;
 	}
 
+	QString	dumper	= QDir::fromNativeSeparators (fileName);
+        int x           = dumper. lastIndexOf ("/");
+        saveDir         = dumper. remove (x, dumper. count () - x);
+        dabSettings     -> setValue ("contentDir", saveDir);
+
 	my_Printer. showEnsembleData (currentChannel,
-	                              frequency, theTime,
+	                              frequency,
+	                              localTimeDisplay -> text (),
 	                              serviceList,
 	                              my_dabProcessor, file_P);
 
@@ -912,9 +927,9 @@
 void	RadioInterface::changeinConfiguration() {
 	if (running. load ()) {
 	   dabService s;
-	   if (runningServices. size () > 0) 
-	      s = runningServices. at (runningServices. size () - 1);
-	   stopScanning    ();
+	   if (currentService. valid) 
+	      s = currentService;
+	   stopScanning    (false);
 	   stopService     ();
 	   fprintf (stderr, "change detected\n");
 //
@@ -932,11 +947,10 @@
 	   ensembleDisplay -> setModel (&model);
 //
 //	and restart the one that was running
-	   if (s. serviceName != "") {
+	   if (s. valid) {
 	      if (s. SCIds != 0) { // secondary service may be gone
 	         if (my_dabProcessor -> findService (s. SId, s. SCIds) ==
 	                                                   s. serviceName) {
-	            runningServices. push_back (s);
 	            startService (&s);
 	            return;
 	         }
@@ -953,7 +967,6 @@
                                 tr ("insufficient data for this program\n"));
                  return;
               }
-	      runningServices. push_back (s);
 	      startService (&s);
 	   }
 	}
@@ -1010,9 +1023,9 @@
 	delete my_history;
 	if (motSlides != nullptr)
 	   delete	motSlides;
-	if (currentService != nullptr)
-	   delete currentService;

_service:download_url:qt-dab-3.4.tar.gz/dab-maxi/radio.h -> _service:download_url:qt-dab-3.4.1.tar.gz/dab-maxi/radio.h Changed

@@ -72,6 +72,7 @@
 	QString		serviceName;
 	uint32_t	SId;
 	int		SCIds;
+	bool		valid;
 };
 
 class RadioInterface: public QWidget, private Ui_dabradio {
@@ -97,8 +98,9 @@
 	Ui_technical_data	techData;
 	QFrame			*dataDisplay;
 	QSettings		*dabSettings;
-	std::vector<dabService>	runningServices;
         spectrumViewer		*my_spectrumViewer;
+	dabService		currentService;
+	dabService		nextService;
 	RingBuffer<std::complex<float>>  *spectrumBuffer;
 	RingBuffer<std::complex<float>>  *iqBuffer;
 	RingBuffer<std::complex<float>>  *tiiBuffer;
@@ -109,7 +111,7 @@
 	bool			normalScan;
 	int16_t			tii_delay;
 	int32_t			dataPort;
-	serviceDescriptor	*currentService;
+	serviceDescriptor	*currentServiceDescriptor;
 	QLabel			*motSlides;
 	std::vector<int>	secondariesVector;
 	bool			isSynced;
@@ -174,7 +176,7 @@
 	void			start_audioService	(const QString &);
 	void			start_packetService	(const QString &);
 	void			startScanning		();
-	void			stopScanning		();
+	void			stopScanning		(bool);
         void			start_audioDumping      ();
         void			stop_audioDumping       ();
         void			start_sourceDumping     ();
@@ -188,8 +190,6 @@
 	void			colorService		(QModelIndex ind,
 	                                                   QColor c, int pt);
 	void			localSelect		(const QString &s);
-	QString			filenameSuggestion 	(QString,
-	                                                 QString, QString);
 	void			showServices		();
 
 	bool			doStart			();

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

_service:download_url:qt-dab-3.4.1.tar.gz/dab-mini/dab-mini-installer.iss Added

@@ -0,0 +1,69 @@
+
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "dabMini"
+#define MyAppVersion "1.0"
+#define MyAppPublisher "Lazy Chair Computing"
+#define MyAppURL "https://github.com/JvanKatwijk/qt-dab/dab-mini"
+#define MyAppExeName "dabMini-1.0.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= {{ED75284F-A9A5-4499-B0B0-12C3B802D4CB}}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DisableProgramGroupPage=yes
+LicenseFile=D:\sdr-j-development\windows-dab-mini\COPYRIGHT.this_software
+InfoBeforeFile=D:\sdr-j-development\windows-dab-mini\preamble.txt
+OutputBaseFilename=setup-dabMini
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\sdr-j-development\windows-dab-mini\dabMini-1.0.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\sdr-j-development\windows-dab-mini\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\JvanK\Downloads\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
+
+[Icons]
+Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[code]
+procedure install_sdrplayApi;
+var
+    resultCode : Integer;
+    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, installing', 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-3.4.tar.gz/dab-mini/dab-mini.ico -> _service:download_url:qt-dab-3.4.1.tar.gz/dab-mini/dab-mini.ico Changed

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

@@ -126,7 +126,7 @@
 	   ../includes/support/dab-params.h \
 	   ../includes/support/band-handler.h \
 	   ../includes/support/text-mapper.h \
-	   ../includes/support/dab_tables.h \
+	   ../includes/support/dab-tables.h \
 	   ../includes/support/ensemble-printer.h \
 	   ../includes/support/preset-handler.h \
 	   ../includes/support/smallcombobox.h \
@@ -195,7 +195,7 @@
 	   ../src/support/dab-params.cpp \
 	   ../src/support/band-handler.cpp \
 	   ../src/support/text-mapper.cpp \
-	   ../src/support/dab_tables.cpp \
+	   ../src/support/dab-tables.cpp \
 	   ../src/support/ensemble-printer.cpp \
 	   ../src/support/preset-handler.cpp \
 	   ../src/support/presetcombobox.cpp \
@@ -254,7 +254,7 @@
 # an attempt to have it run under W32 through cross compilation
 win32 {
 #DESTDIR	= ../../../dab-win
-DESTDIR		=  ../../windows-qt-dab
+DESTDIR		=  ../../../windows-dab-mini
 #DESTDIR	= /usr/shared/sdr-j-development/windows-qt-dab
 # includes in mingw differ from the includes in fedora linux
 
@@ -285,26 +285,13 @@
 LIBS		+= -lusb-1.0
 LIBS		+= -lz
 CONFIG		+= faad
-#CONFIG		+= extio
 CONFIG		+= airspy
-CONFIG		+= rtl_tcp
 CONFIG		+= dabstick
-CONFIG		+= sdrplay-v2
-CONFIG		+= sdrplay-v3
+CONFIG		+= sdrplay
 CONFIG		+= hackrf
-#CONFIG		+= lime
+CONFIG		+= lime
 CONFIG		+= NO_SSE
 
-#very experimental, simple server for connecting to a tdc handler
-#CONFIG		+= datastreamer
-
-#if you want to listen remote, uncomment
-#CONFIG		+= tcp-streamer		# use for remote listening
-#otherwise, if you want to use the default qt way of soud out
-#CONFIG		+= qt-audio
-#comment both out if you just want to use the "normal" way
-
-CONFIG		+= try-epg		# do not use
 DEFINES		+= PRESET_NAME
 }
 #

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

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/radio.cpp -> _service:download_url:qt-dab-3.4.1.tar.gz/dab-mini/radio.cpp Changed

@@ -37,7 +37,6 @@
 #include	<vector>
 #include	"radio.h"
 #include	"band-handler.h"
-#include	"dab_tables.h"
 #include	"audiosink.h"
 #ifdef	HAVE_RTLSDR
 #include	"rtlsdr-handler.h"
@@ -55,6 +54,14 @@
 #include	"lime-handler.h"
 #endif
 
+//
+//	approach: if a preset is called for, the "nextService"
+//	is set,
+//	if a service is running "currentService" is set
+
+dabService	nextService;
+dabService	currentService;
+
 	RadioInterface::RadioInterface (QSettings	*Si,
 	                                const QString	&presetFile,
 	                                QWidget		*parent):
@@ -70,7 +77,6 @@
 	running. 		store (false);
 	scanning. 		store (false);
 	isSynced		= false;
-	runningServices. 	resize (0);
 //
 //	These buffers are not used here, but needed as parameter
 //	in dabProcessor
@@ -93,16 +99,19 @@
 	latency			=
 	                  dabSettings -> value ("latency", 5). toInt();
 
+	currentService. valid	= false;
+	nextService. valid	= false;
 	bool has_presetName	=
 	              dabSettings -> value ("has-presetName", 1). toInt() != 0;
 	if (has_presetName) {
 	   presetName		=
 	              dabSettings -> value ("presetname", ""). toString();
-	   dabService s;
-	   s. serviceName = presetName;
-	   s. SId	  = 0;
-	   s. SCIds	  = 0;
-	   runningServices. push_back (s);
+	   if (presetName != "") {
+	      nextService. serviceName = presetName;
+	      nextService. SId		= 0;
+	      nextService. SCIds	= 0;
+	      nextService. valid	= true;
+	   }
 	}
 //
 //	as with many of the buffers, picturesPath is not used
@@ -162,19 +171,20 @@
 	            this, SLOT (setPresetStation (void)));
 
 //	if a device was selected, we just start, otherwise
-//	we wait until one is selected
+//	we do not know what to do other than giving up
 	inputDevice	= findDevice ();
 	if (inputDevice == nullptr) {
 	   QMessageBox::warning (this, tr ("Warning"),
 	                               tr ("Opening  input stream failed\n"));
 	   exit (21);
 	}
+
 	qApp	-> installEventFilter (this);
 	int threshold		=
 	                  dabSettings -> value ("threshold", 3). toInt();
-	int diff_length	=
+	int diff_length		=
 	           dabSettings	-> value ("diff_length", DIFF_LENGTH). toInt();
-	int tii_delay   =
+	int tii_delay		=
 	           dabSettings  -> value ("tii_delay", 5). toInt();
 	if (tii_delay < 5)
 	   tii_delay = 5;
@@ -213,7 +223,7 @@
 	                                      tiiBuffer,
 	                                      frameBuffer
 	                                      );
-	if (runningServices. size () > 0) {
+	if (nextService. valid) {
 	   presetTimer. setSingleShot	(true);
 	   presetTimer. setInterval 	(switchTime);
 	   presetTimer. start 		(switchTime);
@@ -229,16 +239,15 @@
 }
 
 QString RadioInterface::footText () {
-	version			= QString (CURRENT_VERSION);
-        QString versionText = "simpeRadio- : " + QString(CURRENT_VERSION);
+        QString versionText = "dabMini-1.0: ";
         versionText += "Copyright J van Katwijk, J. vanKatwijk@gmail.com\n";
-        versionText += "Rights of Qt, portaudio, libsamplerate gratefully acknowledged";
+        versionText += "Rights of Qt, fftw, portaudio, libsamplerate gratefully acknowledged";
         versionText += "Rights of other contribuants gratefully acknowledged\n";
         versionText += " Build on: " + QString(__TIMESTAMP__) + QString (" ") + QString (GITHASH);
         return versionText;
 }
 
-	RadioInterface::~RadioInterface() {
+	RadioInterface::~RadioInterface () {
 	fprintf (stderr, "radioInterface is deleted\n");
 }
 //
@@ -252,15 +261,15 @@
 	   return;
 	QString presetName;
 	
-	if (runningServices. size () > 0) {
-	   dabService serv = runningServices. back ();
-	   s	-> setValue ("presetname", serv. serviceName);
-	}
+	if (currentService. valid)
+	   s	-> setValue ("presetname", currentService. serviceName);
+	else
+	   s	-> setValue ("presetname", "");
 
 	s	-> setValue ("channel",
 	                      channelSelector -> currentText());
 	s	-> setValue ("soundchannel",
-	                               streamoutSelector -> currentText());
+	                      streamoutSelector -> currentText());
 	s	-> sync();
 }
 
@@ -281,10 +290,9 @@
 //	a slot, called by the fic/fib handlers
 void	RadioInterface::addtoEnsemble (const QString &serviceName,
 	                                             int32_t SId) {
-	if (!running. load())
+	if (!running. load ())
 	   return;
 
-	(void)SId;
 	serviceId ed;
 	ed. name = serviceName;
 	ed. SId	= SId;
@@ -334,9 +342,8 @@
 	my_dabProcessor	-> coarseCorrectorOff();
 }
 
-//////////////////////////////////////////////////////////////////////////
-//
-///////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
 
 void	RadioInterface::handle_motObject (QByteArray result, QString name,
 	                                  int contentType, bool dirName) {
@@ -365,9 +372,10 @@
 void	RadioInterface::changeinConfiguration() {
 	if (running. load ()) {
 	   dabService s;
-	   if (runningServices. size () > 0) 
-	      s = runningServices. at (runningServices. size () - 1);
-	   stopService     ();
+	   if (currentService. valid) { 
+	      s = currentService;
+	      stopService     ();
+	   }
 	   fprintf (stderr, "change detected\n");
 //
 //	we rebuild the services list from the fib and
@@ -384,11 +392,10 @@
 	   ensembleDisplay -> setModel (&model);
 //
 //	and restart the one that was running
-	   if (s. serviceName != "") {
+	   if (s. valid) {
 	      if (s. SCIds != 0) { // secondary service may be gone
 	         if (my_dabProcessor -> findService (s. SId, s. SCIds) ==
 	                                                   s. serviceName) {
-	            runningServices. push_back (s);
 	            startService (&s);
 	            return;
 	         }
@@ -405,7 +412,7 @@
                                 tr ("insufficient data for this program\n"));
                  return;
               }
-	      runningServices. push_back (s);
+
 	      startService (&s);
 	   }
 	}
@@ -440,40 +447,26 @@
 
 	my_presetHandler. savePresets (presetSelector);
 
+	dumpControlState (dabSettings);
 	inputDevice		-> stopReader();	// might be concurrent
 	my_dabProcessor		-> stop();		// definitely concurrent
 
 	soundOut		-> stop();
 //	everything should be halted by now

_service:download_url:qt-dab-3.4.tar.gz/dab-mini/radio.h -> _service:download_url:qt-dab-3.4.1.tar.gz/dab-mini/radio.h Changed

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

@@ -5,6 +5,7 @@
  *    Lazy Chair Computing
  *
  *    This file is part of the Qt-DAB program
+ *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
@@ -150,6 +151,7 @@
 	theRig  -> resetBuffer();
 	coarseOffset		= 0;
 	myReader. setRunning (true);	// useful after a restart
+	my_ficHandler. reset ();
 	my_mscHandler. start ();
 //
 //	to get some idea of the signal strength
@@ -345,25 +347,22 @@
 	   fprintf (stderr, "dabProcessor is stopping\n");
 	   ;
 	}
-	my_mscHandler.  stop();
-	my_ficHandler.  stop();
 }
 
 void	dabProcessor:: reset() {
-	myReader. setRunning (false);
-	while (isRunning())
-	   wait();
-	usleep (10000);
-	my_ficHandler.  reset();
-	start();
+	stop	();
+	start	();
 }
 
 void	dabProcessor::stop() {
+	if (!isRunning ())
+	   return;
 	myReader. setRunning (false);
-	while (isRunning())
-	   wait();
+	while (isRunning ())
+	   wait ();
 	usleep (10000);
-	my_ficHandler.  reset();
+	my_mscHandler.  stop();
+	my_ficHandler.  stop();
 }
 
 void	dabProcessor::coarseCorrectorOn() {
@@ -432,7 +431,7 @@
 	my_mscHandler. set_Channel (d, (RingBuffer<int16_t> *)nullptr, b);
 }
 
-uint8_t	dabProcessor::get_ecc() {
+uint8_t	dabProcessor::get_ecc () {
 	return my_ficHandler. get_ecc();
 }

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

@@ -784,6 +784,11 @@
 	}
 }
 
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
 bool	airspyHandler::setup_xmlDump () {
 QTime	theTime;
 QDate	theDate;
@@ -795,16 +800,15 @@
 	                                                     toString ();
         QString timeString      = theDate. currentDate (). toString () + "-" +
 	                          theTime. currentTime (). toString ();
-	timeString. replace (":", "-");
-
+	for (int i = 0; i < timeString. length (); i ++)
+	   if (!isValid (timeString. at (i)))
+	      timeString. replace (i, 1, "-");
         QString suggestedFileName =
-                saveDir + "AIRspy" + "-" + channel + "-" + timeString + ".uff";
-        suggestedFileName. replace (" ", "-");
-
+                saveDir + "AIRspy" + "-" + channel + "-" + timeString;
 	QString fileName =
 	           QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
-	                                         suggestedFileName,
+	                                         suggestedFileName + ".uff",
 	                                         tr ("Xml (*.uff)"));
         fileName        = QDir::toNativeSeparators (fileName);
         xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -820,8 +824,10 @@
 	                                      "I",
 	                                      recorderVersion);
 	dumping. store (true);
-	int x		= fileName. lastIndexOf ("/");
-        saveDir		= fileName. remove (x, fileName. count () - x);
+
+	QString dumper	= QDir::fromNativeSeparators (fileName);
+	int x		= dumper. lastIndexOf ("/");
+        saveDir		= dumper. remove (x, dumper. count () - x);
         airspySettings	-> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

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

@@ -585,6 +585,11 @@
 	}
 }
 
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
 bool	hackrfHandler::setup_xmlDump () {
 QTime	theTime;
 QDate	theDate;
@@ -597,16 +602,15 @@
 	                                                   toString ();
 	QString timeString      = theDate. currentDate (). toString () + "-" +
 	                          theTime. currentTime (). toString ();
-        timeString. replace (":", "-");
-
+	for (int i = 0; i < timeString. length (); i ++)
+	   if (!isValid (timeString. at (i)))
+	      timeString. replace (i, 1, '-');
         QString suggestedFileName =
-                    saveDir + "hackrf" + "-" + channel +  "-" + timeString + ".uff";
-        suggestedFileName. replace (" ", "-");
-
+                    saveDir + "hackrf" + "-" + channel +  "-" + timeString;
 	QString fileName =
 	           QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
-	                                         suggestedFileName,
+	                                         suggestedFileName + ".uff",
 	                                         tr ("Xml (*.uff)"));
         fileName        = QDir::toNativeSeparators (fileName);
         xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -622,8 +626,10 @@
 	                                      "--",
 	                                      recorderVersion);
 	dumping. store (true);
-	int x		= fileName. lastIndexOf ("/");
-        saveDir		= fileName. remove (x, fileName. count () - x);
+
+	QString	dumper	= QDir::fromNativeSeparators (fileName);
+	int x		= dumper. lastIndexOf ("/");
+        saveDir		= dumper. remove (x, dumper. count () - x);
         hackrfSettings	-> setValue ("saveDir_xmlDump", saveDir);
 
 	return true;

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

@@ -5,6 +5,7 @@
  *    Lazy Chair Computing
  *
  *    This file is part of the Qt-DAB program
+ *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
@@ -483,6 +484,11 @@
 	}
 }
 
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
 bool	limeHandler::setup_xmlDump () {
 QTime	theTime;
 QDate	theDate;
@@ -495,16 +501,15 @@
 	                                                      toString ();
 	QString timeString      = theDate. currentDate (). toString () + "-" +
 	                          theTime. currentTime (). toString ();
-        timeString. replace (":", "-");
-
+	for (int i = 0; i < timeString. length (); i ++)
+	if (!isValid (timeString. at (i)))
+	   timeString. replace (i, 1, '-');
         QString suggestedFileName =
-                    saveDir + "limeSDR" + "-" + channel + "-" + timeString + ".uff";
-        suggestedFileName. replace (" ", "-");
-
+                    saveDir + "limeSDR" + "-" + channel + "-" + timeString;
 	QString fileName =
 	           QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
-	                                         suggestedFileName,
+	                                         suggestedFileName + ".uff",
 	                                         tr ("Xml (*.uff)"));
         fileName        = QDir::toNativeSeparators (fileName);
         xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -520,8 +525,10 @@
 	                                      "1",
 	                                      recorderVersion);
 	dumping. store (true);
-	int x   = fileName. lastIndexOf ("/");
-	saveDir = fileName. remove (x, fileName. count () - x);
+
+	QString dumper	= QDir::fromNativeSeparators (fileName);
+	int x		= dumper. lastIndexOf ("/");
+	saveDir		= dumper. remove (x, dumper. count () - x);
 	limeSettings -> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

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

@@ -98,7 +98,7 @@
 	}
 
 private:
-virtual void	run() {
+virtual void	run () {
 	(theStick -> rtlsdr_read_async) (theStick -> device,
 	                          (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
 	                          (void *)theStick,
@@ -213,13 +213,11 @@
 	}
 
 	r			= this -> rtlsdr_get_sample_rate (device);
-	fprintf (stderr, "samplerate set to %d\n", r);
-
 	
 	gainsCount = rtlsdr_get_tuner_gains (device, nullptr);
 	fprintf(stderr, "Supported gain values (%d): ", gainsCount);
 	gains		= new int [gainsCount];
-	gainsCount = rtlsdr_get_tuner_gains (device, gains);
+	gainsCount	= rtlsdr_get_tuner_gains (device, gains);
 	for (i = gainsCount; i > 0; i--) {
 	   fprintf(stderr, "%.1f ", gains [i - 1] / 10.0);
 	   combo_gain -> addItem (QString::number (gains [i - 1]));
@@ -229,8 +227,7 @@
 	rtlsdr_set_tuner_gain_mode (device, 1);
 	rtlsdr_set_agc_mode (device, 0);
 
-	_I_Buffer		= new RingBuffer<std::complex<uint8_t>>(4 * 1024 * 1024);
-
+	_I_Buffer	= new RingBuffer<std::complex<uint8_t>>(4 * 1024 * 1024);
 	theGain		= gains [gainsCount / 2];	// default
 //
 //	See what the saved values are and restore the GUI settings
@@ -358,19 +355,15 @@
 	return true;
 }
 
-void	rtlsdrHandler::stopReader() {
+void	rtlsdrHandler::stopReader () {
 	if (workerHandle == nullptr)
 	   return;
-
 	close_xmlDump ();
-	if (workerHandle != nullptr) { // we are running
-	   this -> rtlsdr_cancel_async (device);
-	   if (workerHandle != nullptr) {
-	      while (!workerHandle -> isFinished()) 
-	         usleep (100);
-	      delete	workerHandle;
-	   }
-	}
+	this -> rtlsdr_cancel_async (device);
+	while (!workerHandle -> isFinished()) 
+	   usleep (100);
+	_I_Buffer -> FlushRingBuffer();
+	delete	workerHandle;
 	workerHandle = nullptr;
 }
 //
@@ -581,9 +574,10 @@
 
 void	rtlsdrHandler::set_iqDump	() {
 	if (iqDumper == nullptr) {
-	   if (setup_iqDump ())
+	   if (setup_iqDump ()) {
               iq_dumpButton	-> setText ("writing raw file");
 	      xml_dumpButton	-> hide ();
+	   }
         }
         else {
            close_iqDump ();
@@ -615,7 +609,7 @@
 }
 	   
 void	rtlsdrHandler::set_xmlDump () {
-	if (xmlDumper == nullptr) {
+	if (!xml_dumping. load ()) {
 	  if (setup_xmlDump ())
 	      xml_dumpButton	-> setText ("writing xml file");
 	      iq_dumpButton	-> hide	();
@@ -627,11 +621,20 @@
 	}
 }
 
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
 bool	rtlsdrHandler::setup_xmlDump () {
 QTime	theTime;
 QDate	theDate;
 QString saveDir = rtlsdrSettings -> value ("saveDir_xmlDump",
                                            QDir::homePath ()). toString ();
+
+	if (xml_dumping. load ())
+	   return false;
+
         if ((saveDir != "") && (!saveDir. endsWith ("/")))
            saveDir += "/";
 
@@ -639,16 +642,15 @@
 	                                                      toString ();
 	QString timeString      = theDate. currentDate (). toString () + "-" +
 	                          theTime. currentTime(). toString ();
-        timeString. replace (":", "-");
-
+	for (int i = 0; i < timeString. length (); i ++)
+	   if (!isValid (timeString. at (i)))
+	      timeString. replace (i, 1, '-');
         QString suggestedFileName =
-                    saveDir + deviceModel + "-" + channel + "-" + timeString + ".uff";
-        suggestedFileName. replace (" ", "-");
-
+                    saveDir + deviceModel + "-" + channel + "-" + timeString;
 	QString fileName =
 	           QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
-	                                         suggestedFileName,
+	                                         suggestedFileName + ".uff",
 	                                         tr ("Xml (*.uff)"));
         fileName        = QDir::toNativeSeparators (fileName);
         xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -664,15 +666,19 @@
 	                                      deviceModel,
 	                                      recorderVersion);
 	xml_dumping. store (true);
-	int x		= fileName. lastIndexOf ("/");
-	saveDir		= fileName. remove (x, fileName. count () - x);
+
+	QString	dumper	= QDir::fromNativeSeparators (fileName);
+	int x		= dumper. lastIndexOf ("/");
+	saveDir		= dumper. remove (x, dumper. count () - x);
 	rtlsdrSettings	-> setValue ("saveDir_xmlDump", saveDir);
 
 	return true;
 }
 
 void	rtlsdrHandler::close_xmlDump () {
-	if (xmlDumper == nullptr)	// this can happen !!
+	if (!xml_dumping. load ())
+	   return;
+	if (xmlDumper == nullptr)	// cannot happen
 	   return;
 	xml_dumping. store (false);
 	usleep (1000);

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

@@ -344,7 +344,6 @@
 	               void		*cbContext) {
 int16_t	i;
 sdrplayHandler	*p	= static_cast<sdrplayHandler *> (cbContext);
-float	denominator	= (float)(p -> denominator);
 std::complex<int16_t> localBuf [numSamples];
 
 	if (reset || hwRemoved)
@@ -442,6 +441,7 @@
 	if (err != mir_sdr_Success)
 	   fprintf (stderr, "error = %s\n",
 	                errorCodes (err). toLatin1(). data());
+	_I_Buffer	-> FlushRingBuffer();
 	running. store (false);
 }
 
@@ -823,6 +823,11 @@
 	}
 }
 
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
 bool	sdrplayHandler::setup_xmlDump () {
 QTime	theTime;
 QDate	theDate;
@@ -835,15 +840,16 @@
 	                                                       toString ();
 	QString timeString      = theDate. currentDate (). toString () + "-" +
 	                           theTime. currentTime(). toString ();
-	timeString. replace (":", "-");
-
+	for (int i = 0; i < timeString. length (); i ++)
+           if (!isValid (timeString. at (i)))
+              timeString. replace (i, 1, '-');
+	
         QString suggestedFileName =
-                    saveDir + deviceModel + "-" + channel + "-" + timeString + ".uff";
-        suggestedFileName. replace (" ", "-");
+                    saveDir + deviceModel + "-" + channel + "-" + timeString;
 
 	QString fileName = QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
-	                                         suggestedFileName,
+	                                         suggestedFileName + ".uff",
 	                                         tr ("Xml (*.uff)"));
         fileName        = QDir::toNativeSeparators (fileName);
         xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -859,8 +865,10 @@
 	                                      deviceModel,
 	                                      recorderVersion);
 	dumping. store (true);
-	int x   = fileName. lastIndexOf ("/");
-        saveDir = fileName. remove (x, fileName. count () - x);
+
+	QString dumper	= QDir::fromNativeSeparators (fileName);
+	int x		= dumper. lastIndexOf ("/");
+        saveDir		= dumper. remove (x, dumper. count () - x);
 	sdrplaySettings	-> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

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

@@ -291,6 +291,11 @@
 	   tunerSelector	-> hide	();
 }
 
+static inline
+bool	isValid (QChar c) {
+	return c. isLetterOrNumber () || (c == '-');
+}
+
 bool	sdrplayHandler_v3::setup_xmlDump () {
 QTime theTime;
 QDate theDate;
@@ -303,16 +308,16 @@
 	                                                      toString ();
 	QString timeString      = theDate. currentDate (). toString () + "-" +
 	                          theTime. currentTime (). toString ();
-	timeString. replace (":", "-");
+        for (int i = 0; i < timeString. length (); i ++)
+           if (!isValid (timeString. at (i)))
+              timeString. replace (i, 1, "-");
 
 	QString suggestedFileName =
-                    saveDir + deviceModel + "-" + timeString + ".uff";
-        suggestedFileName. replace (" ", "-");
-
+                    saveDir + deviceModel + "-" + channel + "-" +timeString;
 	QString fileName =
 	           QFileDialog::getSaveFileName (nullptr,
 	                                         tr ("Save file ..."),
-	                                         suggestedFileName,
+	                                         suggestedFileName +".uff",
 	                                         tr ("Xml (*.uff)"));
         fileName        = QDir::toNativeSeparators (fileName);
         xmlDumper	= fopen (fileName. toUtf8(). data(), "w");
@@ -328,8 +333,10 @@
 	                                      "????",
 	                                      recorderVersion);
 	dumping. store (true);
-	int x		= fileName. lastIndexOf ("/");
-	saveDir		= fileName. remove (x, fileName. count () - x);
+
+	QString dumper	= QDir::fromNativeSeparators (fileName);
+	int x		= dumper. lastIndexOf ("/");
+	saveDir		= dumper. remove (x, dumper. count () - x);
         sdrplaySettings -> setValue ("saveDir_xmlDump", saveDir);
 	return true;
 }

_service:download_url:qt-dab-3.4.tar.gz/docs/qt-dab.pdf -> _service:download_url:qt-dab-3.4.1.tar.gz/docs/qt-dab.pdf Changed

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

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

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

_service:download_url:qt-dab-3.4.tar.gz/includes/support/preset-handler.h -> _service:download_url:qt-dab-3.4.1.tar.gz/includes/support/preset-handler.h Changed

@@ -4,14 +4,14 @@
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
  *    Lazy Chair Programming
  *
- *    This file is part of the  qt-dab program
+ *    This file is part of the  Qt-DAB program
  *
- *    qt-dab is free software; you can redistribute it and/or modify
+ *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *
- *    qt-dab is distributed in the hope that it will be useful,
+ *    Qt-DAB is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
@@ -33,7 +33,7 @@
 class   RadioInterface;
 class	QComboBox;
 
-typedef struct {
+typedef struct presetData_ {
 	QString serviceName;
 	QString channel;
 } presetData;

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

_service:download_url:qt-dab-3.4.tar.gz/qt-dab-1.png -> _service:download_url:qt-dab-3.4.1.tar.gz/qt-dab-1.png Changed

_service:download_url:qt-dab-3.4.tar.gz/qt-dab-2.png -> _service:download_url:qt-dab-3.4.1.tar.gz/qt-dab-2.png Changed

_service:download_url:qt-dab-3.4.tar.gz/qt-dab-installer.iss -> _service:download_url:qt-dab-3.4.1.tar.gz/qt-dab-installer.iss Changed

@@ -2,10 +2,10 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "qt-dab"
-#define MyAppVersion "3.3-Beta"
+#define MyAppVersion "3.4.1"
 #define MyAppPublisher "Lazy Chair Computing"
 #define MyAppURL "https://github.com/JvanKatwijk/qt-dab"
-#define MyAppExeName "qt-dab-3.3.exe";
+#define MyAppExeName "qt-dab-3.4.1.exe";
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -34,7 +34,7 @@
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "D:\sdr-j-development\windows-qt-dab\qt-dab-3.3.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\sdr-j-development\windows-qt-dab\qt-dab-3.4.1.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\sdr-j-development\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "C:\Users\JvanK\Downloads\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi

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

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

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

@@ -5,6 +5,7 @@
  *    Lazy Chair Computing
  *
  *    This file is part of the Qt-DAB program
+ *
  *    Qt-DAB is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +28,7 @@
 #include	"dab-params.h"
 //
 //	Interface program for processing the MSC.
-//	The ofdm processor assumes the existence of an msc-handler, whether
+//	The dabProcessor assumes the existence of an msc-handler, whether
 //	a service is selected or not. 
 
 #define	CUSize	(4 * 16)
@@ -102,8 +103,11 @@
 int	currentBlock	= 0;
 std::vector<int16_t> ibits;
 
-	if (running. load ())
+	if (running. load ()) {
 	   fprintf (stderr, "already running\n");
+	   return;
+	}
+
 	running. store (true);
 	ibits. resize (BitsperBlock);
         while (running. load()) {
@@ -149,11 +153,16 @@
 //	services
 //	It might be called several times, so ...
 void	mscHandler::reset() {
+	stop	();
+	start	();
+}
+
+void	mscHandler::stop() {
 	running. store (false);
+	work_to_be_done. store (false);
 	while (isRunning())
 	   usleep (100);
 	locker. lock();
-	work_to_be_done. store (false);
 	for (auto const &b : theBackends) {
 	   b -> stopRunning();
 	   delete b;
@@ -163,11 +172,6 @@
 	bufferSpace. release (nrBlocks - bufferSpace. available());
 	amount	= 0;
 	locker. unlock();
-	start();
-}
-
-void	mscHandler::stop() {
-	reset();
 }
 //
 //	Note, the set_Channel function is called from within a

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

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

Changes of Revision 23