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 13

qt-dab.changes Changed

qt-dab.spec Changed

qt-dab-no-return.patch Added

_service Changed

_service:download_url:qt-dab-2.7.1.tar.gz/CMakeLists.txt-qt4 Deleted

@@ -1,704 +0,0 @@
-cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.7.1)
-set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
-
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set (CMAKE_INSTALL_PREFIX "/usr/local/bin" CACHE PATH "default install path" FORCE )
-endif()
-#set (CMAKE_INSTALL_PREFIX /usr/local/bin)
-#	modify if you want
-
-if(MINGW)
-    add_definitions ( -municode)
-endif()
-IF(EXISTS (".git") AND IS_DIRECTORY (".git"))
-   execute_process (
-      COMMAND git rev-parse --short HEAD
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE GIT_COMMIT_HASH
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-   )
-endif ()
-
-if(GIT_COMMIT_HASH)
-   add_definitions("-DGITHASH=\"${GIT_COMMIT_HASH}\"")
-else ()
-   add_definitions ("-DGITHASH=\"       \"")
-endif()
-
-########################################################################
-# select the release build type by default to get optimization flags
-########################################################################
-if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE "Release")
-   message(STATUS "Build type not specified: defaulting to release.")
-endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
-
-### make sure our local CMake Modules path comes first
-list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
-
-######################################################################
-#
-#####################################################################
-
-if(DEFINED AIRSPY)
-   set(AIRSPY true)
-endif ()
-
-if(DEFINED SDRPLAY)
-   set(SDRPLAY true)
-endif ()
-
-if(DEFINED DABSTICK)
-   set(DABSTICK true)
-endif ()
-
-if(DEFINED HACKRF)
-   set(HACKRF true)
-endif ()
-
-if(DEFINED RTLTCP)
-   set(RTLTCP true)
-endif ()
-
-if(DEFINED LIMESDR)
-   set(LIMESDR true)
-endif ()
-
-if (DEFINED DATA_STREAMER)
-   set(DATA_STREAMER true)
-endif ()
-
-#	If you want a tcp stream of the audio rather than
-#	audio being sent to the soundcard, set
-if (DEFINED TCP_STREAMER)
-   set(TCP_STREAMER true)
-endif ()
-
-#	If you want the Qt system to handle the audio (only default out)
-#	then set
-if (DEFINED QT_AUDIO)
-   set(QT_AUDIO true)
-endif ()
-
-add_definitions (-DMSC_DATA__)		# use at your own risk
-add_definitions (-DPRESET_NAME)
-#add_definitions (-DTHREADED_BACKEND__)	# uncomment for use for an RPI
-
-########################################################################
-
-	find_package (PkgConfig)
-	find_package (LSBId)
-
-#	set(CMAKE_AUTOMOC ON)
-	set(CMAKE_INCLUDE_CURRENT_DIR ON)
-	find_package(Qt4 REQUIRED COMPONENTS QtCore QtNetwork)
-	include(${QT_USE_FILE})
-	find_package(Qwt REQUIRED)
-	if (NOT QWT_FOUND)
-	   message(FATAL_ERROR "please install qwt library")
-	endif ()
-	include_directories ( ${QWT_INCLUDE_DIRS})
-	list(APPEND extraLibs ${QWT_LIBRARIES})
-	
-        find_package(FFTW3f)
-        if (NOT FFTW3F_FOUND)
-            message(FATAL_ERROR "please install FFTW3")
-        endif ()
-
-        find_package(Portaudio)
-        if (NOT PORTAUDIO_FOUND)
-            message(FATAL_ERROR "please install portaudio V19")
-        endif ()
-        list(APPEND extraLibs ${PORTAUDIO_LIBRARIES})
-
-        find_package(Faad)
-        if (NOT FAAD_FOUND )
-            message(FATAL_ERROR "please install libfaad")
-        endif ()
-
-        find_package(zlib)
-	if (NOT ZLIB_FOUND)
-            message(FATAL_ERROR "please install libz")
-        endif ()
-	list(APPEND extraLibs ${ZLIB_LIBRARY})
-
-        find_package(LibSndFile)
-        if (NOT LIBSNDFILE_FOUND)
-            message(FATAL_ERROR "please install libsndfile")
-        endif ()
-        list(APPEND extraLibs ${LIBSNDFILE_LIBRARY})
-
-        find_package(LibSampleRate)
-        if (NOT LIBSAMPLERATE_FOUND)
-            message(FATAL_ERROR "please install libsamplerate")
-        endif ()
-        list(APPEND extraLibs ${LIBSAMPLERATE_LIBRARY})
-
-	find_library (PTHREADS pthread)
-	if (NOT(PTHREADS))
-	   message (FATAL_ERROR "please install libpthread")
-	else (NOT(PTHREADS))
-	   set (extraLibs ${extraLibs} ${PTHREADS})
-	endif (NOT(PTHREADS))
-
-#######################################################################
-#
-#	Here we really start
-
-	include_directories (
-	           ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-	           ${QT5Widgets_INCLUDES}
-	           ${QT_QTCORE_INCLUDE_DIR}
-	           ${QT_QTGUI_INCLUDE_DIR}
-	           .
-	           ./
-	           ./service-description
-	           ./includes
-	           ./includes/protection
-	           ./includes/ofdm
-	           ./includes/backend
-	           ./includes/backend/audio
-	           ./includes/backend/data
-	           ./includes/backend/data/mot
-	           ./includes/backend/data/journaline
-	           ./includes/support
-	           ./includes/support/viterbi-jan
-	           ./includes/output
-	           ./includes/scopes-qwt6
-	           ./devices
-	           ./devices/rawfiles
-	           ./devices/wavfiles
-	           ./spectrum-viewer
-                   ./impulse-viewer
-                   ./tii-viewer
-	           /usr/include/
-	)
-
-	set (${objectName}_HDRS
-	     ./dab-processor.h
-	     ./service-description/service-descriptor.h
-	     ./service-description/audio-descriptor.h
-	     ./service-description/data-descriptor.h
-	     ./includes/country-codes.h
-	     ./includes/dab-constants.h
-	     ./includes/ofdm/sample-reader.h
-	     ./includes/ofdm/phasereference.h
-	     ./includes/ofdm/phasetable.h
-	     ./includes/ofdm/freq-interleaver.h
-	     ./includes/ofdm/tii_table.h
-             ./includes/ofdm/tii_detector.h
-             ./includes/ofdm/fic-handler.h
-             ./includes/ofdm/fib-decoder.h
-	     ./includes/ofdm/timesyncer.h
-	     ./includes/protection/protTables.h
-             ./includes/protection/protection.h
-             ./includes/protection/uep-protection.h
-             ./includes/protection/eep-protection.h

_service:download_url:qt-dab-2.7.1.tar.gz/CMakeLists.txt-qt5 Deleted

@@ -1,737 +0,0 @@
-cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.7.1)
-set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
-
-set(CMAKE_AUTORCC ON)
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set (CMAKE_INSTALL_PREFIX "/usr/local/bin" CACHE PATH "default install path" FORCE )
-endif()
-#set (CMAKE_INSTALL_PREFIX /usr/local/bin)
-
-#	modify if you want
-
-if(MINGW)
-    add_definitions ( -municode)
-endif()
-
-IF(EXISTS (".git") AND IS_DIRECTORY (".git"))
-   execute_process (
-      COMMAND git rev-parse --short HEAD
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE GIT_COMMIT_HASH
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-   )
-endif ()
-
-if(GIT_COMMIT_HASH)
-   add_definitions("-DGITHASH=\"${GIT_COMMIT_HASH}\"")
-else ()
-   add_definitions ("-DGITHASH=\"       \"")
-endif()
-
-
-########################################################################
-# select the release build type by default to get optimization flags
-########################################################################
-if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE "Release")
-   message(STATUS "Build type not specified: defaulting to release.")
-endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
-
-### make sure our local CMake Modules path comes first
-list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
-
-######################################################################
-#
-#####################################################################
-#
-#	default value
-	set(USE_PORTAUDIO true)
-
-if(DEFINED AIRSPY)
-   set(AIRSPY true)
-endif ()
-
-if(DEFINED SDRPLAY)
-   set(SDRPLAY true)
-endif ()
-
-if(DEFINED RTLSDR)
-   set(RTLSDR true)
-endif ()
-
-if(DEFINED HACKRF)
-	set(HACKRF true)
-endif ()
-
-if(DEFINED RTLTCP)
-   set(RTLTCP true)
-endif ()
-
-if(DEFINED LIMESDR)
-   set(LIMESDR true)
-endif ()
-
-
-if (DEFINED DATA_STREAMER)
-   set(DATA_STREAMER true)
-endif ()
-
-#	If you want a tcp stream of the audio rather than
-#	audio being sent to the soundcard, set
-if (DEFINED TCP_STREAMER)
-	set(TCP_STREAMER true)
-	set(USE_PORTAUDIO false)
-endif ()
-
-#	If you want the Qt system to handle the audio (only default out)
-#	then set
-if (DEFINED QT_AUDIO)
-	set(QT_AUDIO true)
-	set(USE_PORTAUDIO false)
-endif ()
-
-add_definitions (-DMSC_DATA__)		# use at your own risk
-add_definitions (-DPRESET_NAME)
-#add_definitions (-DTHREADED_DECODING)	# uncomment for use for an RPI
-#
-########################################################################
-
-	find_package (PkgConfig)
-	find_package (LSBId)
-
-	find_package (Qt5Core REQUIRED)
-	find_package (Qt5Widgets REQUIRED)
-	find_package (Qt5Network REQUIRED)
-	include_directories (
-	  ${Qt5Network_INCLUDE_DIRS}
-	)
-
-	find_package(Qwt)
-	if (NOT QWT_FOUND)
-	   message(FATAL_ERROR "please install qwt library")
-	endif ()
-	include_directories ( ${QWT_INCLUDE_DIRS})
-	list(APPEND extraLibs ${QWT_LIBRARIES})
-
-        find_package(FFTW3f)
-        if (NOT FFTW3F_FOUND)
-            message(FATAL_ERROR "please install FFTW3")
-        endif ()
-
-        find_package(Faad)
-        if (NOT FAAD_FOUND )
-            message(FATAL_ERROR "please install libfaad")
-        endif ()
-
-        find_package(zlib)
-	if (NOT ZLIB_FOUND)
-            message(FATAL_ERROR "please install libz")
-        endif ()
-	list(APPEND extraLibs ${ZLIB_LIBRARY})
-
-        find_package(LibSndFile)
-        if (NOT LIBSNDFILE_FOUND)
-            message(FATAL_ERROR "please install libsndfile")
-        endif ()
-        list(APPEND extraLibs ${LIBSNDFILE_LIBRARY})
-
-        find_package(LibSampleRate)
-        if (NOT LIBSAMPLERATE_FOUND)
-            message(FATAL_ERROR "please install libsamplerate")
-        endif ()
-        list(APPEND extraLibs ${LIBSAMPLERATE_LIBRARY})
-
-	find_library (PTHREADS pthread)
-	if (NOT(PTHREADS))
-	   message (FATAL_ERROR "please install libpthread")
-	else (NOT(PTHREADS))
-	   set (extraLibs ${extraLibs} ${PTHREADS})
-	endif (NOT(PTHREADS))
-
-#######################################################################
-#
-#	Here we really start
-
-	include_directories (
-	           ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-	           ${QT5Widgets_INCLUDES}
-	           ${QT_QTCORE_INCLUDE_DIR}
-	           ${QT_QTGUI_INCLUDE_DIR}
-	           .
-	           ./
-	           ./service-description
-	           ./includes
-	           ./includes/ofdm
-	           ./includes/protection
-	           ./includes/backend
-	           ./includes/backend/audio
-	           ./includes/backend/data
-	           ./includes/backend/data/journaline
-	           ./includes/backend/data/mot
-	           ./includes/support
-	           ./includes/support/viterbi-jan
-	           ./includes/output
-	           ./includes/scopes-qwt6
-	           ./devices
-	           ./devices/rawfiles
-	           ./devices/wavfiles
-	           ./spectrum-viewer
-	           ./impulse-viewer
-	           ./tii-viewer
-	           /usr/include/
-	)
-
-	set (${objectName}_HDRS
-	     ./dab-processor.h
-	     ./service-description/service-descriptor.h 
-	     ./service-description/audio-descriptor.h 
-	     ./service-description/data-descriptor.h 
-             ./includes/country-codes.h
-	     ./includes/dab-constants.h
-             ./includes/ofdm/sample-reader.h
-	     ./includes/ofdm/phasereference.h
-	     ./includes/ofdm/ofdm-decoder.h
-	     ./includes/ofdm/phasetable.h
-	     ./includes/ofdm/freq-interleaver.h
-	     ./includes/ofdm/fib-decoder.h

_service:download_url:qt-dab-2.7.1.tar.gz/forms/dabradio.ui-1 Deleted

@@ -1,815 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>dabradio</class>
- <widget class="QMainWindow" name="dabradio">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>640</width>
- <height>460</height>
- </rect>
- </property>
- <property name="minimumSize">
- <size>
- <width>640</width>
- <height>460</height>
- </size>
- </property>
- <property name="sizeIncrement">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="windowTitle">
- <string>Qt-DAB</string>
- </property>
- <widget class="QWidget" name="centralwidget">
- <widget class="QListView" name="ensembleDisplay">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>90</y>
- <width>231</width>
- <height>331</height>
- </rect>
- </property>
- <property name="font">
- 
- <pointsize>14</pointsize>
- 
- </property>
- </widget>
- <widget class="QLabel" name="versionName">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>231</width>
- <height>31</height>
- </rect>
- </property>
- <property name="font">
- 
- <pointsize>16</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright (C) 2016, 2017 Jan van Katwijk (J.vanKatwijk@gmail.com), Lazy Chair Programming&lt;/p&gt;&lt;p&gt;Qt-DAB is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- <widget class="QLabel" name="label">
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>10</y>
- <width>21</width>
- <height>21</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB copyright:&lt;/p&gt;&lt;p&gt;J van Katwijk, Lazy Chair Computing. J.vanKatwijk@gmail.com&lt;/p&gt;&lt;p&gt;Copyright of the Qt toolkit used: the Qt Company&lt;/p&gt;&lt;p&gt;Copyright of the libraries used for SDRplay, rtl-sdr based sticks, AIRspy, portaudio, libsndfile and libsamplerate to their developers&lt;/p&gt;&lt;p&gt;Copyright of the MP2 library used Martin J Fiedler&lt;/p&gt;&lt;p&gt;Copyright of the firecode checker: Gnu Radio&lt;/p&gt;&lt;p&gt;Copyright of the viterbi decoder kernel: the Spiral project&lt;/p&gt;&lt;p&gt;Copyright of the Reed Solomon Decoder software: Phil Karns&lt;/p&gt;&lt;p&gt;All copyrights gratefully acknowledged&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Qt-DAB (an SDR-J program) is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>©</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- <widget class="QLabel" name="timeDisplay">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>70</y>
- <width>231</width>
- <height>20</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>250</x>
- <y>110</y>
- <width>381</width>
- <height>211</height>
- </rect>
- </property>
- <property name="font">
- 
- <pointsize>12</pointsize>
- 
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="spacing">
- <number>2</number>
- </property>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>2</number>
- </property>
- <item>
- <widget class="QLabel" name="ensembleName">
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>14</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ensemble name&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="serviceLabel">
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>20</pointsize>
- 
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="dynamicLabel">
- <property name="font">
- 
- <pointsize>12</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dynamic label (DLS)&lt;/p&gt;&lt;p&gt;The selected program may carry some textual information, that information is displayed here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- <property name="openExternalLinks">
- <bool>true</bool>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
- </property>

_service:download_url:qt-dab-2.7.1.tar.gz/forms/dabradio.ui-old Deleted

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

_service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/tii_table.h Deleted

@@ -1,64 +0,0 @@
-#
-/*
- * Copyright (C) 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef	__TII_TABLE__
-#define	__TII_TABLE__
-#include	"dab-constants.h"
-#include	<QObject>
-#include	<vector>
-#include	<QMutex>
-
-class	RadioInterface;
-
-class	tii_element {
-public:
-	int16_t	subId;
-	float	latitudeOffset;
-	float	longitudeOffset;
-	tii_element (int16_t subId,
-	 float latitudeOffset, float longitudeOffset);
-	~tii_element() {}
-};
-
-class	tii_table : public QObject {
-Q_OBJECT
-public:
-			tii_table		(RadioInterface *);
-			~tii_table();
-	void		cleanUp();
-	void		add_element		(tii_element *);
-	void		add_main		(int16_t, float, float);
-	std::complex<float> get_coordinates (int16_t, int16_t, bool *);
-	void		print_coordinates();
-	int16_t		get_mainId();
-private:
-	RadioInterface	*myRadio;
-	QMutex		tiiLocker;
-	int16_t		mainId;
-	float		latitude;
-	float		longitude;
-	std::vector<tii_element> offsets;
-signals:
-//	void		show_tiiLabel		(int);
-};
-#endif

_service:download_url:qt-dab-2.7.1.tar.gz/includes/ofdm/tii_verify.h-xx Deleted

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

_service:download_url:qt-dab-2.7.1.tar.gz/note-for-appimage-on-rpi Deleted

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

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

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

@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{2982e5e0-9ddc-4b17-b1f4-a42e7cf1a22e}</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="ClangCodeModel.CustomCommandLineKey"/>
- <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.12.4 (System)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.12.4 (System)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{c8881a93-bfc8-4041-92de-a73fb56f691c}</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/qt-dab</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">false</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.BuildTargets"/>
- <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>
- <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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.BuildTargets"/>
- <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>
- <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</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">Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</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="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
- <valuelist type="QVariantList" key="Analyzer.Perf.Events">
- <value type="QString">cpu-cycles</value>
- </valuelist>
- <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
- <value type="int" key="Analyzer.Perf.Frequency">250</value>
- <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
- <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
- <value type="int" key="Analyzer.Perf.StackSize">4096</value>
- <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="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</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="QString" key="RunConfiguration.Arguments"></value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>

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

_service:download_url:qt-dab-2.7.1.tar.gz/src/ofdm/tii_table.cpp Deleted

@@ -1,141 +0,0 @@
-#
-/*
- * Copyright (C) 2017
- * Jan van Katwijk (J.vanKatwijk@gmail.com)
- * Lazy Chair Computing
- *
- * This file is part of the Qt-DAB
- *
- * Qt-DAB is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Qt-DAB is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Qt-DAB; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include	"tii_table.h"
-#include	"radio.h"
-
-	tii_element::tii_element (int16_t subId,
-	 float latitudeOffset,
-	 float longitudeOffset) {
-	this	-> subId	= subId;
-	this	-> latitudeOffset = latitudeOffset;
-	this	-> longitudeOffset = longitudeOffset;
-}
-
-	tii_table::tii_table (RadioInterface *mr) {
-	 myRadio	= mr;
-//	 connect (this, SIGNAL (show_tiiLabel (int)),
-//	 mr, SLOT (show_tiiLabel (int)));
-}
-
-	tii_table::~tii_table() {
-}
-
-void	tii_table::cleanUp() {
-	tiiLocker. lock();
-	offsets. clear();
-	mainId		= -1;
-	tiiLocker. unlock();
-//	show_tiiLabel (mainId);
-}
-
-void	tii_table::add_main	(int16_t mainId,
-	 float latitude, float longitude) {
-	tiiLocker. lock();
-	if (this -> mainId > 0) {
-	 tiiLocker. unlock();
-	 return;
-	}
-	this	-> mainId	= mainId;
-	this	-> latitude	= latitude;
-	this	-> longitude	= longitude;
-	tiiLocker. unlock();
-//	show_tiiLabel (mainId);
-}
-
-void	tii_table::add_element (tii_element *t) {
-int16_t i;
-	tiiLocker. lock();
-	if (this -> mainId < 0) {
-	 tiiLocker. unlock();
-	 return;
-	}
-	for (i = 0; i < (int16_t) offsets. size(); i ++)
-	 if (offsets [i]. subId == t -> subId) {
-	 tiiLocker. unlock();
-	 return;
-	 }
-	fprintf (stderr, "transmitter %d at\t(%f %f)\n",
-	 t -> subId,
-	 latitude + t -> latitudeOffset,
-	 longitude + t -> longitudeOffset);
-	offsets. push_back (*t);
-	tiiLocker. unlock();
-	
-}
-
-std::complex<float>
-	tii_table::get_coordinates (int16_t mainId,
-	 int16_t subId, bool *success) {
-int16_t i;
-float x, y;
-
-	tiiLocker. lock();
-	*success	= false;
-	if (this -> mainId != mainId) {
-	 tiiLocker. unlock();
-	 return std::complex<float> (0, 0);
-	}
-
-//	print_coordinates();
-	for (i = 0; i < (int16_t) offsets. size(); i ++) {
-	 if (offsets [i]. subId != subId)
-	 continue;
-	 x	= latitude + offsets [i]. latitudeOffset;
-	 y	= longitude + offsets [i]. longitudeOffset;
-	
-	 *success = true;
-	 tiiLocker. unlock();
-	 return std::complex<float> (x, y);
-	}
-	tiiLocker. unlock();
-	return std::complex<float> (0, 0);
-}
-
-void	tii_table::print_coordinates() {
-int16_t	i;
-
-	tiiLocker. lock();
-	if (mainId < 0) {
-	 tiiLocker. unlock();
-	 return;
-	}
-
-	fprintf (stderr, "mainId = %d\n", mainId);
-	fprintf (stderr, "Transmitter coordinates (%f %f)\n",
-	 latitude, longitude);
-	for (i = 0; i < (int16_t)offsets. size(); i ++) {
-	 float x	= latitude + offsets [i]. latitudeOffset;
-	 float y	= longitude + offsets [i]. longitudeOffset;
-	 fprintf (stderr, "%d\t-> %f\t%f\n", offsets [i]. subId, x, y);
-	}
-	tiiLocker. unlock();
-}
-
-int16_t	tii_table::get_mainId() {
-int16_t m;
-	tiiLocker. lock();
-	m	= mainId;
-	tiiLocker. unlock();
-	return m;
-}
-

_service:download_url:qt-dab-2.7.1.tar.gz/travis.yml-qt4 Deleted

@@ -1,74 +0,0 @@
-language: c++
-compiler: gcc
-sudo: require
-dist: trusty
-
-before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt532-trusty -y
-    - sudo apt-get update -qq
-    
-install: 
-  -  sudo apt-get install qt4-qmake build-essential g++
-  -  sudo apt-get install libsndfile1-dev qt4-default libfftw3-dev portaudio19-dev 
-  -  sudo apt-get install libfaad-dev zlib1g-dev libusb-1.0-0-dev mesa-common-dev
-  - sudo apt-get install libgl1-mesa-dev libqt4-opengl-dev libsamplerate-dev libqwt-dev
-
-  - cp CMakeLists.txt-qt4 CMakeLists.txt
-script:
-  - # sed -i -e 's|CONFIG.*sdrplay||g' qt-dab.pro
-  - # sed -i -e 's|CONFIG.*airspy||g' qt-dab.pro
-  - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
-  - cmake . -DDABSTICK=ON  -DAIRSPY=ON -DSDRPLAY=ON -DLIMESDR=ON -DCMAKE_INSTALL_PREFIX=/usr
-  - make -j4
-  - # sudo make DESTIDR=appdir install ; sudo chown -R $USER appdir ; find appdir/
-  - ls -lh .
-  - mkdir -p appdir/usr/bin 
-  - cp qt-dab-2.7.1 appdir/usr/bin/qt-dab 
-  - mkdir -p appdir/usr/lib
-  - mkdir -p appdir/usr/share/applications ; cp qt-dab.desktop appdir/usr/share/applications
-  - cp screenshot_qt-dab.png appdir/qt-dab.png
-  - touch appdir/qt-dab.png # Dear upstream developers, please provide an application icon
-
-  - wget http://sm5bsz.com/linuxdsp/hware/rtlsdr/rtl-sdr-linrad4.tbz
-  - tar xvfj rtl-sdr-linrad4.tbz
-  - cd rtl-sdr-linrad4
-  - mkdir build
-  - cd build
-  - cmake .. -DDETACH_KERNEL_DRIVER=ON  -DCMAKE_INSTALL_PREFIX=../../appdir/usr
-  - make
-  - make install
-  - cd ..
-  - cd ..
-
-  - sudo apt-get install build-essential cmake libusb-1.0-0-dev pkg-config
-  - wget https://github.com/airspy/host/archive/master.zip
-  - unzip master.zip
-  - cd airspyone_host-master
-  - mkdir build
-  - cd build
-#	udev rules are installed separately
-  - cmake ../ -DCMAKE_INSTALL_PREFIX=../../appdir/usr
-  - make
-  - make install
-  - cd ..
-  - cd ..
-   ls -l appdir/usr/lib
-after_success:
-  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
-  - chmod a+x linuxdeployqt*.AppImage
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
-  - # Workaround for https://github.com/probonopd/linuxdeployqt/issues/31#issuecomment-289267637
-  - ./linuxdeployqt*.AppImage --appimage-extract
-  - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
-  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
-  - # Workaround for https://github.com/JvanKatwijk/qt-dab/issues/34
-  - # find /usr/lib/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
-  - chmod a+x appimage/* ; rm appdir/AppRun ; cp appimage/* appdir/
-  - export PATH=squashfs-root/usr/bin/:$PATH # Make it pick up our private patched mksquashfs; https://github.com/plougher/squashfs-tools/pull/13/files
-  - squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)
-  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
-  - curl --upload-file ./Qt_DAB*.AppImage https://transfer.sh/Qt_DAB-git.$(git rev-parse --short HEAD)-x86_64.AppImage
-  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
-  - bash ./upload.sh ./Qt_DAB*.AppImage
-

_service:download_url:qt-dab-2.7.1.tar.gz/travis.yml-qt5 Deleted

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

_service:download_url:qt-dab-2.7.1.tar.gz/.gitignore -> _service:download_url:qt-dab-2.7.4.tar.gz/.gitignore Changed

_service:download_url:qt-dab-2.7.1.tar.gz/.travis.yml -> _service:download_url:qt-dab-2.7.4.tar.gz/.travis.yml Changed

@@ -1,58 +1,42 @@
 language: c++
 compiler: gcc
 sudo: require
-dist: trusty
+dist: xenial
 
 before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt532-trusty -y
+    - sudo add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -y
     - sudo apt-get update -qq
     
 install: 
-  -  sudo apt-get install qt4-qmake build-essential g++
-  -  sudo apt-get install libsndfile1-dev qt4-default libfftw3-dev portaudio19-dev 
-  -  sudo apt-get install libfaad-dev zlib1g-dev libusb-1.0-0-dev mesa-common-dev
-  - sudo apt-get install libgl1-mesa-dev libqt4-opengl-dev libsamplerate-dev libqwt-dev
-
-  - cp CMakeLists.txt-qt4 CMakeLists.txt
+    - sudo apt-get -y install qt5-qmake qt5-default libqt5opengl5-dev qtbase5-dev libqwt-qt5-dev libsndfile1-dev librtlsdr-dev librtlsdr0 libfftw3-dev portaudio19-dev libfaad-dev zlib1g-dev rtl-sdr libusb-1.0-0-dev mesa-common-dev libgl1-mesa-dev libsamplerate-dev 
+    - # source /opt/qt5/bin/qt5-env.sh
+    - # QWT for Qt 5, see https://github.com/arkottke/strata/blob/master/.travis.yml
+    - # svn checkout svn://svn.code.sf.net/p/qwt/code/branches/qwt-6.1 qwt
+    - # cd qwt
+    - # qmake
+    - # make -j4
+    - # sudo make install
+    - # find /usr/local/qwt-6.1.4-svn/
+    - # cd ..
+    
 script:
   - # sed -i -e 's|CONFIG.*sdrplay||g' qt-dab.pro
   - # sed -i -e 's|CONFIG.*airspy||g' qt-dab.pro
   - # sed -i -e 's|CONFIG.*spectrum||g' qt-dab.pro
-  - cmake . -DDABSTICK=ON  -DAIRSPY=ON -DSDRPLAY=ON -DLIMESDR=ON -DCMAKE_INSTALL_PREFIX=/usr
+  - cmake . -DRTLSDR=ON -DRTLTCP=ON  -DAIRSPY=ON -DSDRPLAY=ON -DCMAKE_INSTALL_PREFIX=/usr
   - make -j4
   - # sudo make DESTIDR=appdir install ; sudo chown -R $USER appdir ; find appdir/
   - ls -lh .
-  - mkdir -p appdir/usr/bin 
-  - cp qt-dab-2.7.1 appdir/usr/bin/qt-dab 
-  - mkdir -p appdir/usr/lib
+  - rm -rf *_autogen
+  - mkdir -p appdir/usr/bin
+  - cp qt-dab-2.7.4  appdir/usr/bin/qt-dab
+ 
   - mkdir -p appdir/usr/share/applications ; cp qt-dab.desktop appdir/usr/share/applications
-  - cp screenshot_qt-dab.png appdir/qt-dab.png
+  - cp qt-dab.png appdir/qt-dab.png
   - touch appdir/qt-dab.png # Dear upstream developers, please provide an application icon
-
-  - wget http://sm5bsz.com/linuxdsp/hware/rtlsdr/rtl-sdr-linrad4.tbz
-  - tar xvfj rtl-sdr-linrad4.tbz
-  - cd rtl-sdr-linrad4
-  - mkdir build
-  - cd build
-  - cmake .. -DDETACH_KERNEL_DRIVER=ON  -DCMAKE_INSTALL_PREFIX=../../appdir/usr
-  - make
-  - make install
-  - cd ..
-  - cd ..
-
-  - sudo apt-get install build-essential cmake libusb-1.0-0-dev pkg-config
-  - wget https://github.com/airspy/host/archive/master.zip
-  - unzip master.zip
-  - cd airspyone_host-master
-  - mkdir build
-  - cd build
-#	udev rules are installed separately
-  - cmake ../ -DCMAKE_INSTALL_PREFIX=../../appdir/usr
-  - make
-  - make install
-  - cd ..
-  - cd ..
-   ls -l appdir/usr/lib
+  - mkdir -p ./appdir/usr/share/icons/hicolor/256x256/apps/
+  - cp qt-dab.png appdir/usr/share/icons/hicolor/256x256/apps/
+  
 after_success:
   - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
   - chmod a+x linuxdeployqt*.AppImage
@@ -63,7 +47,7 @@
   - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
   - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
   - # Workaround for https://github.com/JvanKatwijk/qt-dab/issues/34
-  - # find /usr/lib/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
+  - find /usr/lib/ -type f -name librtlsdr.so* -exec cp {} appdir/usr/lib/librtlsdr.so \;
   - chmod a+x appimage/* ; rm appdir/AppRun ; cp appimage/* appdir/
   - export PATH=squashfs-root/usr/bin/:$PATH # Make it pick up our private patched mksquashfs; https://github.com/plougher/squashfs-tools/pull/13/files
   - squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)

_service:download_url:qt-dab-2.7.1.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-2.7.4.tar.gz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.11 )
-set (objectName qt-dab-2.7.1)
+set (objectName qt-dab-2.7.4)
 set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++11 -flto")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
 
@@ -105,8 +105,10 @@
 	find_package (Qt5Core REQUIRED)
 	find_package (Qt5Widgets REQUIRED)
 	find_package (Qt5Network REQUIRED)
+	find_package (Qt5Xml REQUIRED)
 	include_directories (
 	  ${Qt5Network_INCLUDE_DIRS}
+	  ${Qt5Xml_INCLUDE_DIRS}
 	)
 
 	find_package(Qwt)
@@ -198,7 +200,6 @@
 	     ./includes/ofdm/freq-interleaver.h
 	     ./includes/ofdm/fib-decoder.h
 	     ./includes/ofdm/fic-handler.h
-	     ./includes/ofdm/tii_table.h
 	     ./includes/ofdm/tii_detector.h
 	     ./includes/ofdm/timesyncer.h
 	     ./includes/protection/protTables.h
@@ -251,6 +252,8 @@
 	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
 	     ./includes/support/viterbi-jan/viterbi-handler.h
+	     ./includes/support/preset-handler.h
+	     ./includes/support/presetcombobox.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./impulse-viewer/impulse-viewer.h 
@@ -270,7 +273,6 @@
 	     ./src/ofdm/freq-interleaver.cpp
 	     ./src/ofdm/fib-decoder.cpp
 	     ./src/ofdm/fic-handler.cpp
-	     ./src/ofdm/tii_table.cpp
 	     ./src/ofdm/tii_detector.cpp
 	     ./src/ofdm/timesyncer.cpp
 	     ./src/protection/protTables.cpp
@@ -320,6 +322,8 @@
 	     ./src/support/text-mapper.cpp
 	     ./src/support/dab_tables.cpp
 	     ./src/support/ensemble-printer.cpp
+	     ./src/support/preset-handler.cpp
+	     ./src/support/presetcombobox.cpp
 	     ./src/support/viterbi-jan/viterbi-handler.cpp
 	     ./src/scopes-qwt6/iqdisplay.cpp 
 	     ./spectrum-viewer/spectrum-viewer.cpp 
@@ -337,7 +341,6 @@
 	     ./includes/ofdm/fib-decoder.h
 	     ./includes/ofdm/fic-handler.h
 	     ./includes/ofdm/tii_detector.h
-	     ./includes/ofdm/tii_table.h
 	     ./includes/backend/backend.h
 	     ./includes/backend/audio/faad-decoder.h
 	     ./includes/backend/audio/mp2processor.h
@@ -355,6 +358,8 @@
 	     ./devices/rawfiles/raw-reader.h
 	     ./devices/wavfiles/wavfiles.h
 	     ./devices/wavfiles/wav-reader.h
+	     ./includes/support/preset-handler.h
+	     ./includes/support/presetcombobox.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./impulse-viewer/impulse-viewer.h 
@@ -492,14 +497,10 @@
 	endif (HACKRF)
 #
 	if (LIMESDR)
-	   set (${objectName}_UIS
-	        ${${objectName}_UIS}
-	        ./devices/lime-handler/lime-widget.ui
-	   )
-
 	   set (${objectName}_MOCS
 	        ${${objectName}_MOCS}
 	        ./devices/lime-handler/lime-handler.h
+	        ./devices/lime-handler/lime-widget.h
 	   )
 
 	   include_directories (
@@ -509,6 +510,7 @@
 	   set ($(objectName)_HDRS
 	        ${${objectName}_HDRS}
 	        ./devices/lime-handler/lime-handler.h
+	        ./devices/lime-handler/lime-widget.h
 	        ./devices/lime-handler/LimeSuite.h
 	        ./devices/lime-handler/LMS7002M_parameters.h
 	   )
@@ -522,16 +524,10 @@
 	endif (LIMESDR)
 
 	if (RTLSDR)
-           find_package(LibRTLSDR)
-           if (NOT LIBRTLSDR_FOUND)
-               message(FATAL_ERROR "please install librtlsdr")
-           endif ()
-	   ###include_directories (${RTLSDR_INCLUDE_DIR})
-
 	   set (${objectName}_UIS
-	        ${${objectName}_UIS}
-	        ./devices/rtlsdr-handler/rtlsdr-widget.ui
-	   )
+                ${${objectName}_UIS}
+                ./devices/rtlsdr-handler/rtlsdr-widget.ui
+           )
 
 	   set (${objectName}_MOCS
 	        ${${objectName}_MOCS}
@@ -547,6 +543,8 @@
 	        ${${objectName}_HDRS}
 	        ./devices/rtlsdr-handler/rtlsdr-handler.h
 	        ./devices/rtlsdr-handler/rtl-dongleselect.h
+	        ./devices/rtlsdr-handler/rtl-sdr.h
+	        ./devices/rtlsdr-handler/rtl-sdr_export.h
 	   )
 
 	   set (${objectName}_SRCS
@@ -711,6 +709,7 @@
 	target_link_libraries (${objectName}
 	                       Qt5::Widgets
 	                       Qt5::Network
+	                       Qt5::Xml
 	                       ${RTLTCP_lib}
 	                       ${FFTW3F_LIBRARIES}
 	                       ${extraLibs}

_service:download_url:qt-dab-2.7.1.tar.gz/README.md -> _service:download_url:qt-dab-2.7.4.tar.gz/README.md Changed

@@ -1,57 +1,6 @@
-# Qt-DAB [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
-
-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.
-
------------------------------------------------------------------
-NEW in 2.7.1
------------------------------------------------------------------
-
-2.7.1 is merely a "bug-fix" version.
-
-------------------------------------------------------------------
-NEW in 2.7
-------------------------------------------------------------------
-
-New devices:
-
- a) the LimeSDR is now supported (due to missing a decent "dll" file
-for the library, for now in Linux only);
-
- b) as an experimental feature, a Soapy interface is implemented. Tested
-with the SDRplay and the LimeSDR it works.
-Soapy support is included in neither the appImage nor the Windows version.
-
-Synchronization reconsidered
-
-One of the issues to be resolved was resynchronization. It could
-happen that - due to some faulty input - the synchronization
-got lost and could not be regained without a reset.
-
-The chain of events leading to such a loss of synchronization is
-identified and chance that - due to some faulty input - synchronization
-will be lost is - at least - much smaller.
-
-Obsolete properties
-
-The DAB standard eliminated the support for Modes other than Mode 1 and
-Bands other than VHF Band III. The implementation still supports these
-features, however, since they are obsolete, there are no controls on the
-GUI anymore (the control for the Mode was already removed from earlier
-versions). 
-Explicitly setting the Mode and/or the Band is possible by 
-including some command lines in the ".qt-dab.ini" file.
-
-For the Mode, one will add/set a line
-
-	dabMode=Mode x, where x is either 1, 2 or 4
-
-For the Band, one will add/set a line
-
-	dabBand=band, where band is either VHF Band III or L_Band
-
-Since the control for the dab band is now removed from the GUI, this GUI
-could be made slightly smaller.
+# Qt-DAB-2.7 [![Build Status](https://travis-ci.org/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.org/JvanKatwijk/qt-dab)
 
+Qt-DAB-2.7 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
@@ -60,6 +9,9 @@
 * [Introduction](#introduction)
 * [Features](#features)
 * [Widgets and scopes](#widgets-and-scopes)
+* [Presets](#Presets)
+* [Comment on some settings](#comment-on-some-settings)
+* [Obsolete properties](#Obsolete-properties)
 * [Installation](#features)
   * [Windows](#windows)
   * [Ubuntu Linux](#ubuntu-linux)
@@ -68,8 +20,7 @@
    	- [Qt](#qt)
   * [Raspberry PI](#raspberry-pi)
   * [appImage for x64 Linux systems](#appimage-for-x64-linux-systems)
-  * [Comment on some settings](#comment-on-some-settings)
-  * [A note on intermittent sound](#a-note-on-intermittent-sound)
+* [Interfacing to another device](#interfacing-to-another-device)
 * [Copyright](#copyright)
  
 ------------------------------------------------------------------
@@ -81,23 +32,27 @@
   * Dynamic Label (DLS) 
   * Both DAB bands supported: 
   	* VHF Band III
-   	* L-Band (only used in Czech Republic and Vatican)
-  * Spectrum view (incl. constellation diagram, impulse response, NULL symbol)
+   	* L-Band (only used in Czech Republic and Vatican) (see "obsolete properties")
+  * Spectrum view (incl. constellation diagram, impulse response, TII spectrum)
   * Scanning function (scan the subsequent channels in the selected band until a channel is encountered where a DAB signal is detected)
   * Detailed information for selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, 4 quality bars)
+  * Detailed information for other services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type)
   * Automatic display of TII (Transmitter Identification Information) data when transmitted
+  * Presets for easy switching of programs in different ensembles (see *Presets*)
   * Dumping of the complete DAB channel (Warning: produces large raw files!) into \* sdr files and playing them again later
   * Saving audio as uncompressed wave files
+  * Saving aac frames from DAB+ services
   * Saving the ensemble content (audio and data streams, including almost all technical data) into a text file
   * Supports various inputs from 
   	- SDRplay (both RSP I and RSP II),
   	- Airspy, including Airspy mini,
-   	- SDR DAB sticks (RTL2838U or similar), and
+   	- SDR DAB sticks (RTL2838U or similar), 
 	- HACKRF One, 
 	- limeSDR, 
-	- Soapy (experimental, Linux only),
+	- Soapy (experimental, Linux only), and
    	- prerecorded dump (*.raw, *.iq and *.sdr) 
- 
+  * Clean interface to add other devices, see below.
+
 Not  (Not yet or partly) implemented:
 
   * DMB (Audio and Video)
@@ -112,31 +67,30 @@
 Introduction
 ------------------------------------------------------------------
 
-![Qt-DAB with sdrplay input](/qt-dab-1.png?raw=true)
+![Qt-DAB with sdrplay input](/qt-dab-presets.png?raw=true)
 
-**Qt-DAB-2.7* 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.7** 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 **dab-server**. 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.
-The **dab-server** will run as a "service" on an RPI, with control - over a bluetooth connection - from an "app" on
-an Android tablet.
+Some other programs are derived from Qt-DAB, a "light" version **dabradio**, an SDRPlay-specific version **sdrplayDab**, a command-line based version and a stand-alone server version **dab-server**.
+The versions with a GUI are implemented in C++, using the Qt framework for the implementation of the GUI. The command-line version is implemented using C++, and does not depend on Qt.
 
-**dabradio**, **sdrplayDab**, the Qt-free version, **dab-cmdline** the "command-line only", and the **dab-server** version have their own repository on Github.
+The **dab-server** will run as a "service" on an RPI, with control - over a bluetooth connection - from an "app" on an Android tablet.
 
-The Qt-DAB, the dab-cmdline version, and the dab-server version support decoding of terrestrial DAB and DAB+ reception from either an AIRSPY, an SDRplay, the HACK RF, or a dabstick (rtl_sdr). The sdrplayDab version is tightly couples to the SDRplay device.
+Furthermore, for DX purposes, a **dab-scanner** is implemented that allows
+for a continuous scanning of selected channels in a given band. Results are 
+written in a txt file, formatted for use with *LibreOffice Calc* and
+comparable programs.
 
-Beside to these C++ based versions,  (slightly limited) versions are implemented in Java and Ada, both with their own repository on Github. 
+**dabradio**, **sdrplayDab**, the Qt-free version **dab-cmdline**, the **dab-server** version and the **dab-scanner** have their own repository on Github.
 
-The Qt-DAB version also supports input from an rtl-tcp server (see osmocom software) and pre-recorded files (`*.sdr`, `*.iq` and `*.raw`). Obviously there is a provision for dumping the input into an (\*.sdr)-file. 
+Qt-DAB-2.7 also supports input from an rtl-tcp server (see osmocom software) and from pre-recorded files (`*.sdr`, `*.iq` and `*.raw`). Obviously there is a provision for dumping the input into an (\*.sdr)-file. 
 
 Note that if the rtl_tcp server is used as input device, the connection needs to support the inputrate, i.e. 2,048,000 I/Q samples (i.e. 2 * 2,048,000 bytes/second).
 
-Since the Qt-DAB version has to run on a headless RPI 2/3, using the home WiFi, the resulting PCM output can be sent - if so configured - to a TCP port (Sources for a small client are part of the source distribution).
+Since the Qt-DAB program has to run on a headless RPI 2/3 using the home WiFi, the resulting PCM output can be sent - if so configured - to a TCP port (Sources for a small client are part of the source distribution).
 
 For further information please visit http://www.sdr-j.tk
 
-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
 ------------------------------------------------------------------
@@ -151,17 +105,98 @@
 
 While the main window and the widget for the device control are always shown, each of the others is only shown when pushing a button on the main window. In case a widget is invisible (i.e. not selected), the software to generate a spectrum is bypassed, so not to waste CPU power.
 
-![Qt-DAB with SDRplay input](/qt-dab-2.png?raw=true)
+![Qt-DAB with SDRplay input](/qt-dab-x.png?raw=true)
+
+The buttons and other controls on the main widget are equipped with
+*tool tips* briefly explaining the (in most cases obvious) function
+of the element.
+
+------------------------------------------------------------------
+Presets
+-----------------------------------------------------------------
+
+**Presets** are a feature, introduced in version 2.7.2
+(following a suggestion of Stuart Longland (who added code to make (most) widgets resizable)).
+
+**Presets** make it possible to switch easily between services in different ensembles (different channels). The service names in the presets are seen in a combobox at the bottom of the services list on the GUI. Touching a name in this combobox will instruct the software to select the right channel and switch to the named service. 
+ 
+**Adding** a service to the list of presets is simply by *clicking with the right mouse button on the name of the service that is currently selected in the servicelist* (note that clicking with the *left* mouse button well select the service with that name).
+
+**Removing** a service from the presets is by selecting the service name (by putting the curson on it without clicking any of the mouse buttons) in the combobox and pressing the *shift* and the *delete* button on the keyboard simultaneously.
+
+Service names in the presets are kept in a file in xml format. The file - .qt-dab-presets.xml - is stored in the user's home directory. This file is read on program start and rewritten on program termination.
+
+Encoding of the presets is as **channel:service**, it sometimes happens that different channels have (differently encoded) versions of the same service (in the pictures channel 5B and channel 8A both carry a service "Omroep West").
+
+(Note that clicking with the **right** mouse button on any other service name
+than the currently selected one will show some technical data of that service as shown in the picture below.)
+
+![Qt-DAB with sdrplay input](/qt-dab-servicedata.png?raw=true)
+
+--------------------------------------------------------------------------------
+Comment on some settings
+-------------------------------------------------------------------------------
+
+Some settings are preserved between program invocations, they are stored in a file `.qt-dab.ini`, to be found in the home directory.
+Settings maintained between program invocations are typically the name 
+of the device used, the channel that was used, the name of the service
+last used etc.
+
+The presets are stored in an xml file, `.qt-dab-presets.xml'.

_service:download_url:qt-dab-2.7.1.tar.gz/dab-processor.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/dab-processor.cpp Changed

@@ -47,12 +47,13 @@
 	 int16_t	echo_depth,
 	 QString	picturesPath,
 	 RingBuffer<float> *responseBuffer,
-		 RingBuffer<std::complex<float>> *
+		 RingBuffer<DSPCOMPLEX> *
 	 spectrumBuffer,
 	 RingBuffer<std::complex<float>> *
 	 iqBuffer,
-	 RingBuffer<std::complex<float>> *
-	 tiiBuffer
+	 RingBuffer<DSPCOMPLEX> *
+	 tiiBuffer,
+	 RingBuffer<uint8_t> * frameBuffer
 	 ):
 	 params (dabMode),
 	 myReader (mr,
@@ -61,7 +62,8 @@
 	 ),
 	 my_ficHandler (mr, dabMode),
 	 my_mscHandler (mr, dabMode,
-	 std::move(picturesPath)),
+	 std::move(picturesPath),
+	 frameBuffer),
 	 phaseSynchronizer (mr,
 	 dabMode, 
 	 threshold,
@@ -77,6 +79,7 @@
 	this	-> myRadioInterface	= mr;
 	this	-> theRig		= theRig;
 	this	-> tiiBuffer		= tiiBuffer;
+	this	-> threshold		= threshold;
 	this	-> T_null		= params. get_T_null();
 	this	-> T_s			= params. get_T_s();
 	this	-> T_u			= params. get_T_u();
@@ -111,7 +114,7 @@
 	 myRadioInterface, SLOT (show_tii (int)));
 	connect (this, SIGNAL (show_snr (int)),
 	 mr, SLOT (show_snr (int)));
- my_TII_Detector. reset();
+	my_TII_Detector. reset();
 //	the thread will be started from somewhere else
 }
 
@@ -138,7 +141,7 @@
 void	dabProcessor::run() {
 int32_t startIndex;
 int32_t		i;
-std::complex<float>	FreqCorr;
+DSPCOMPLEX	FreqCorr;
 timeSyncer	myTimeSyncer (&myReader);
 int		attempts;
 
@@ -178,14 +181,16 @@
 	 case NO_END_OF_DIP_FOUND:
 	 goto notSynced;
 	 }
+
 	 myReader. getSamples (ofdmBuffer. data(),
-	 T_u, coarseOffset + fineOffset);
+	 T_u, coarseOffset + fineOffset);
 /**
 *	Looking for the first sample of the T_u part of the sync block.
 *	Note that we probably already had 30 to 40 samples of the T_g
 *	part
 */
-	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 3);
+	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 2);
+//	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, threshold);
 	 if (startIndex < 0) { // no sync, try again
 	 if (!correctionNeeded) {
 	 setSyncLost();
@@ -210,43 +215,17 @@
 //	precise start of the T_u part of the zero-th block.
 //	However, it turns out that with devices that give more noisy
 //	samples the findIndex function might give wrong results, leading
-//	to loosing synchronization.
-//	Therefore, a simple test is added to just verify that the "dip"
-//	of the null period ends within a reasonable distance of the 
-//	estimated begin, and if no such end of dip could be identified
-//	within a reasonable distance, just resync.
-//	we make it into a simple test, just compare the avg value of the
-//	samples that are (should be) in the non-null period after the
-//	null period with the avg value of the samples in the null period
+//	to loosing synchronization. That is why we call the findIndex
+//	function - once sync is established - with a much higher
+//	threshold value
 //	
 Check_endofNULL:
 
 	 avgValue_testPeriod	= 0;
 	 myReader. getSamples (ofdmBuffer. data(),
 	 T_u, coarseOffset + fineOffset);
-//	 for (i = 100; i < 100 + testLength; i ++)
-//	 avgValue_testPeriod += abs (ofdmBuffer [i]);
-//	 avgValue_testPeriod	/= testLength;
-//
-//	It seems reasonable to expect that the avg value of a segment
-//	of samples belonging to the T_g part of the first block of the
-//	DAB frame is at least twice the avg value of the samples in he
-//	null period
-//	 if (avgValue_testPeriod < 1.7 * avgValue_nullPeriod) {
-//	 fprintf (stderr, "failing %f after %d good frames\n",
-//	 avgValue_testPeriod / avgValue_nullPeriod,
-//	 goodFrames);
-//	 goodFrames	= 0;
-//	 goto notSynced;
-//	 }
-//	 fprintf (stderr, "%f \n", avgValue_testPeriod / avgValue_nullPeriod);
-
-/**
- *	We now have to find the exact first sample of the non-null period.
- *	We use a correlation that will find the first sample after the
- *	cyclic prefix.
- */
-	 startIndex = phaseSynchronizer. findIndex (ofdmBuffer, 10);
+	 startIndex = phaseSynchronizer.
+	 findIndex (ofdmBuffer, 4 * threshold);
 	 if (startIndex < 0) { // no sync, try again
 	 if (!correctionNeeded) {
 	 setSyncLost();
@@ -267,7 +246,7 @@
 */
 	 memmove (ofdmBuffer. data(),
 	 &((ofdmBuffer. data()) [startIndex]),
-	 (T_u - startIndex) * sizeof (std::complex<float>));
+	 (T_u - startIndex) * sizeof (DSPCOMPLEX));
 	 int ofdmBufferIndex	= T_u - startIndex;
 
 //Block_0:
@@ -283,6 +262,9 @@
 	 T_u - ofdmBufferIndex,
 	 coarseOffset + fineOffset);
 	 my_ofdmDecoder. processBlock_0 (ofdmBuffer);
+//
+//	this is not really necessary, it makes things
+//	simpler in the msc decoder
 	 my_mscHandler. processBlock_0 (ofdmBuffer. data());
 
 //	Here we look only at the block_0 when we need a coarse
@@ -313,7 +295,7 @@
 */
 	 std::vector<int16_t> ibits;
 	 ibits. resize (2 * params. get_carriers());
-	 FreqCorr	= std::complex<float> (0, 0);
+	 FreqCorr	= DSPCOMPLEX (0, 0);
 	 for (int ofdmSymbolCount = 1;
 	 ofdmSymbolCount < nrBlocks; ofdmSymbolCount ++) {
 	 myReader. getSamples (ofdmBuffer. data(),
@@ -361,10 +343,10 @@
 	 secondaries =
 	 my_TII_Detector. processNULL();
 	 showSecondaries (-1);
-	 if (secondaries. size() > 0) {
-	 showCoordinates (secondaries. at (0));
-	 for (i = 0; i < (int)(secondaries. size()); i ++)
-	 showSecondaries (secondaries. at (i));
+	 if (secondaries. size() > 0) {
+	 showCoordinates (secondaries. at (0));
+	 for (i = 0; i < (int)(secondaries. size()); i ++)
+	 showSecondaries (secondaries. at (i));
 	 }
 
 	 show_tii (1);

_service:download_url:qt-dab-2.7.1.tar.gz/dab-processor.h -> _service:download_url:qt-dab-2.7.4.tar.gz/dab-processor.h Changed

@@ -58,9 +58,10 @@
 	 int16_t,	// echo_depth
 	 QString,
 	 RingBuffer<float> *,
+	 RingBuffer<DSPCOMPLEX>	*,
 	 RingBuffer<std::complex<float>>	*,
-	 RingBuffer<std::complex<float>>	*,
-	 RingBuffer<std::complex<float>>	*
+	 RingBuffer<DSPCOMPLEX>	*,
+	 RingBuffer<uint8_t> *
 	 );
 		~dabProcessor();
 void		reset();
@@ -92,12 +93,13 @@
 	void		print_Overview();
 	void		clearEnsemble();
 private:
+	int		threshold;
 	bool		tiiSwitch;
 	int16_t		tii_depth;
 	int16_t		echo_depth;
 	virtualInput	*theRig;
 	dabParams	params;
-	RingBuffer<std::complex<float> > *tiiBuffer;
+	RingBuffer<DSPCOMPLEX> *tiiBuffer;
 	int16_t		tii_delay;
 	int16_t		tii_counter;
 
@@ -123,7 +125,7 @@
 	int32_t		coarseOffset;
 
 	bool		correctionNeeded;
-	std::vector<std::complex<float>	>ofdmBuffer;
+	std::vector<DSPCOMPLEX>ofdmBuffer;
 	bool		wasSecond		(int16_t, dabParams *);
 virtual	void		run();
 signals:

_service:download_url:qt-dab-2.7.4.tar.gz/devices/airspy-handler-new Added

_service:download_url:qt-dab-2.7.4.tar.gz/devices/airspy-handler-new/airspy-handler.cpp Added

@@ -0,0 +1,768 @@
+
+/**
+ * IW0HDV Extio
+ *
+ * Copyright 2015 by Andrea Montefusco IW0HDV
+ *
+ * Licensed under GNU General Public License 3.0 or later. 
+ * Some rights reserved. See COPYING, AUTHORS.
+ *
+ * @license GPL-3.0+ <http://spdx.org/licenses/GPL-3.0+>
+ *
+ *	recoding, taking parts and extending for the airspyHandler interface
+ *	for the Qt-DAB program
+ *	jan van Katwijk
+ *	Lazy Chair Computing
+ */
+
+#ifdef	__MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+#include	"airspy-handler.h"
+#include	"airspyfilter.h"
+
+static
+const	int	EXTIO_NS	= 8192;
+static
+const	int	EXTIO_BASE_TYPE_SIZE = sizeof (float);
+
+	airspyHandler::airspyHandler (QSettings *s) {
+int	result, i;
+int	distance	= 10000000;
+std::vector <uint32_t> sampleRates;
+uint32_t samplerateCount;
+
+	this	-> airspySettings	= s;
+	this	-> myFrame		= new QFrame (nullptr);
+	setupUi (this -> myFrame);
+	this	-> myFrame	-> show();
+
+	filter			= nullptr;
+	airspySettings	-> beginGroup ("airspyHandler");
+	int16_t temp 		= airspySettings -> value ("linearity", 10).
+	 toInt();
+	linearitySlider		-> setValue (temp);
+	linearityDisplay	-> display (temp);
+	temp			= airspySettings -> value ("sensitivity", 10).
+	 toInt();
+	sensitivitySlider	-> setValue (temp);
+	sensitivityDisplay	-> display (temp);
+
+	vgaGain			= airspySettings -> value ("vga", 5).toInt();
+	vgaSlider		-> setValue (vgaGain);
+	vgaDisplay		-> display (vgaGain);
+	mixerGain		= airspySettings -> value ("mixer", 10). toInt();
+	mixerSlider		-> setValue (mixerGain);
+	mixerDisplay		-> display (mixerGain);
+	mixer_agc		= false;
+	lnaGain			= airspySettings -> value ("lna", 5). toInt();
+	lnaSlider		-> setValue (lnaGain);
+	lnaDisplay		-> display (lnaGain);
+	mixer_agc		= false;
+	lna_agc			= false;
+	rf_bias			= false;
+	coarseOffset		= airspySettings -> value ("airspyOffset", 0). toInt();
+	airspySettings	-> endGroup();
+
+	device			= nullptr;
+	serialNumber		= 0;
+	theBuffer		= nullptr;
+#ifdef	__MINGW32__
+	const char *libraryString = "airspy.dll";
+	Handle		= LoadLibrary ((wchar_t *)L"airspy.dll");
+#else
+	const char *libraryString = "libairspy.so";
+	Handle		= dlopen ("libairspy.so", RTLD_LAZY);
+#endif
+
+	if (Handle == nullptr) {
+	 fprintf (stderr, "failed to open %s\n", libraryString);
+#ifndef	__MINGW32__
+	 fprintf (stderr, "Error = %s\n", dlerror());
+#endif
+	 delete myFrame;
+	 throw (20);
+	}
+
+	libraryLoaded	= true;
+
+	if (!load_airspyFunctions()) {
+	 fprintf (stderr, "problem in loading functions\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+	
+#endif
+	 delete myFrame;
+	}
+//
+	strcpy (serial,"");
+	result = this -> my_airspy_init();
+	if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airspy_init() failed: %s (%d)\n",
+	 my_airspy_error_name((airspy_error)result), result);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (21);
+	}
+
+	result = my_airspy_open (&device);
+	if (result != AIRSPY_SUCCESS) {
+	 printf ("my_airpsy_open() failed: %s (%d)\n",
+	 my_airspy_error_name ((airspy_error)result), result);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (22);
+	}
+
+	(void) my_airspy_set_sample_type (device, AIRSPY_SAMPLE_INT16_IQ);
+	(void) my_airspy_get_samplerates (device, &samplerateCount, 0);
+	fprintf (stderr, "%d samplerates are supported\n", samplerateCount); 
+	sampleRates. resize (samplerateCount);
+	my_airspy_get_samplerates (device,
+	 sampleRates. data(), samplerateCount);
+
+	selectedRate	= 0;
+	for (i = 0; i < (int)samplerateCount; i ++) {
+	 fprintf (stderr, "%d \n", sampleRates [i]);
+	 if (abs ((int)sampleRates [i] - 2048000) < distance) {
+	 distance	= abs ((int)sampleRates [i] - 2048000);
+	 selectedRate = sampleRates [i];
+	 }
+	}
+
+	if (selectedRate == 0) {
+	 fprintf (stderr, "Sorry. cannot help you\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (23);
+	}
+	else
+	 fprintf (stderr, "selected samplerate = %d\n", selectedRate);
+
+	result = my_airspy_set_samplerate (device, selectedRate);
+	if (result != AIRSPY_SUCCESS) {
+ printf("airspy_set_samplerate() failed: %s (%d)\n",
+	 my_airspy_error_name ((enum airspy_error)result), result);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (24);
+	}
+
+	airspySettings	-> beginGroup ("airspyHandler");
+	filtering 	= airspySettings -> value ("filtering", 0). toInt();
+	int filterDegree = airspySettings -> value ("filterdegree", 9). toInt();
+	filterDegree	= (filterDegree & ~01) + 1;
+//
+//	if we apply filtering it is using a symmetric lowpass filter
+	filter		= new airspyFilter (filterDegree,
+	 1024000, selectedRate);
+	airspySettings	-> endGroup();
+
+//	The sizes of the mapTables follow from the input and output rate
+//	(selectedRate / 1000) vs (2048000 / 1000)
+//	so we end up with buffers with 1 msec content
+	convBufferSize		= selectedRate / 1000;
+	for (i = 0; i < 2048; i ++) {
+	 float inVal	= float (selectedRate / 1000);
+	 mapTable_int [i]	= int (floor (i * (inVal / 2048.0)));
+	 mapTable_float [i]	= i * (inVal / 2048.0) - mapTable_int [i];
+	}
+	convIndex	= 0;
+	convBuffer. resize (convBufferSize + 1);
+
+	theBuffer	= new RingBuffer<std::complex<float>>
+	 (256 * 1024);
+	tabWidget	-> setCurrentIndex (0);
+	connect (linearitySlider, SIGNAL (valueChanged (int)),
+	 this, SLOT (set_linearity (int)));
+	connect (sensitivitySlider, SIGNAL (valueChanged (int)),

_service:download_url:qt-dab-2.7.4.tar.gz/devices/airspy-handler-new/airspy-handler.h Added

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/airspy-handler-new/airspy-widget.h Added

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

@@ -0,0 +1,89 @@
+#
+/*
+ * Copyright (C) 2008, 2009, 2010
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of qt-dab
+ *
+ * qt-dab is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation as version 2 of the License.
+ *
+ * qt-dab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with qt-dab; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	"airspyfilter.h"
+#include	<cmath>
+#ifndef M_PI
+# define M_PI 3.14159265358979323846 /* pi */
+#endif
+
+	airspyFilter::airspyFilter (int16_t firSize,
+	 int32_t cutoffFreq,
+	 int32_t sampleRate) {
+float	tmp [firSize];
+float	lo	= (float)(cutoffFreq) / sampleRate;
+float	sum	= 0.0;
+int16_t	i;
+
+	this	-> buffer_re	= new float [firSize];
+	this	-> buffer_im	= new float [firSize];
+	this	-> kernel	= new float [firSize];
+	this	-> firSize	= firSize;
+	ip			= 0;
+//
+//	create a low pass filter for lo;
+	for (i = 0; i < firSize; i ++) {
+	 if (i == firSize / 2)
+	 tmp [i] = 2 * M_PI * lo;
+	 else 
+	 tmp [i] = sin (2 * M_PI * lo * (i - firSize /2)) / (i - firSize/2);
+//
+//	windowing with Blackman
+	 tmp [i] *= (0.42 -
+		 0.5 * cos (2 * M_PI * (float)i / (float)firSize) +
+		 0.08 * cos (4 * M_PI * (float)i / (float)firSize));
+
+	 sum += tmp [i];
+	}
+//
+//	and the kernel
+	for (i = 0; i < firSize; i ++) 
+	 kernel [i] = tmp [i] / sum;
+}
+
+	airspyFilter::~airspyFilter() {
+	delete [] kernel;
+	delete [] buffer_re;
+	delete [] buffer_im;
+}
+
+// we process the samples backwards rather than reversing
+// the kernel
+std::complex<float>	airspyFilter::Pass (float re, float im) {
+int16_t i;
+float	tmp_1	= 0;
+float	tmp_2	= 0;
+
+ buffer_re [ip] = re;
+ buffer_im [ip] = im;
+ for (i = 0; i < firSize; i ++) {
+ int16_t index = ip - i;
+ if (index < 0)
+ index += firSize;
+ tmp_1	+= buffer_re [index] * kernel [i];
+ tmp_2	+= buffer_im [index] * kernel [i];
+ }
+
+ ip = (ip + 1) % firSize;
+ return std::complex<float> (tmp_1, tmp_2);;
+}
+

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

@@ -0,0 +1,44 @@
+#
+/*
+ * Copyright (C) 2010, 2011, 2012
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of qt-dab
+ *
+ * qt-dab is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * qt-dab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with qt-dab; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __AIRSPY_FILTER__
+#define __AIRSPY_FILTER__
+
+#include	<cstdlib>
+#include	<cmath>
+#include	<complex>
+
+class	airspyFilter {
+public:
+			airspyFilter	(int16_t, int32_t, int32_t);
+	 ~airspyFilter();
+	std::complex<float> Pass	(float re, float im);
+	int16_t		firSize;
+	float		*kernel;
+	float		*buffer_re;
+	float		*buffer_im;
+	int16_t		ip;
+	int32_t		sampleRate;
+};
+
+#endif

_service:download_url:qt-dab-2.7.4.tar.gz/devices/airspy-handler-new/libairspy Added

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

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

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

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

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

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

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

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

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

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

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

_service:download_url:qt-dab-2.7.1.tar.gz/devices/airspy-handler/airspy-widget.ui -> _service:download_url:qt-dab-2.7.4.tar.gz/devices/airspy-handler/airspy-widget.ui Changed

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

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/filereader-widget.h Added

@@ -0,0 +1,51 @@
+
+#ifndef	__FILEREADER_WIDGET__
+#define	__FILEREADER_WIDGET__
+#include	<QLabel>
+#include	<QProgressBar>
+#include	<QLCDNumber>
+#include	<QHBoxLayout>
+#include	<QVBoxLayout>
+
+class	filereaderWidget {
+public:
+	QLabel		*titleLabel;
+	QLabel		*nameofFile;
+	QProgressBar	*fileProgress;
+	QLCDNumber	*currentTime;
+	QLabel		*seconds;
+	QLCDNumber	*totalTime;
+
+	filereaderWidget () {}
+	~filereaderWidget () {}
+
+void	setupUi		(QWidget *qw) {
+	titleLabel	= new QLabel ("Playing pre-recorded file");
+	nameofFile	= new QLabel ();
+	fileProgress	= new QProgressBar ();
+	currentTime	= new QLCDNumber	();
+	currentTime	-> setFrameShape (QFrame::NoFrame);
+	currentTime	-> setSegmentStyle (QLCDNumber::Flat);
+
+	seconds		= new QLabel ("seconds of");
+	totalTime	= new QLCDNumber	();
+
+	totalTime	-> setFrameShape (QFrame::NoFrame);
+	totalTime	-> setSegmentStyle (QLCDNumber::Flat);
+
+	QHBoxLayout *bottom	= new QHBoxLayout ();
+	bottom		-> addWidget (currentTime);
+	bottom		-> addWidget (seconds);
+	bottom		-> addWidget (totalTime);
+
+	QVBoxLayout *base	= new QVBoxLayout ();
+	base		-> addWidget (titleLabel);
+	base		-> addWidget (nameofFile);
+	base		-> addWidget (fileProgress);
+	base		-> addItem (bottom);
+	
+	qw		-> setLayout (base);
+}
+};
+#endif
+

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

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

@@ -6,244 +6,163 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>256</width>
- <height>300</height>
+ <width>424</width>
+ <height>240</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>40</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>10</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>40</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>133</x>
- <y>10</y>
- <width>61</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>210</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>210</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>250</y>
- <width>231</width>
- <height>16</height>
- </rect>
- </property>
- <property name="font">
- 
- <pointsize>11</pointsize>
- 
- </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="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>

_service:download_url:qt-dab-2.7.4.tar.gz/devices/lime-handler-old Added

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

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

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

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/lime-handler-old/lime-handler.cpp Added

@@ -0,0 +1,453 @@
+#
+/*
+ * Copyright (C) 2014 .. 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
+ */
+
+#include	"lime-handler.h"
+
+#define	FIFO_SIZE	32768
+static
+float localBuffer [4 * FIFO_SIZE];
+lms_info_str_t limedevices [10];
+
+	limeHandler::limeHandler (QSettings *s) {
+	this	-> limeSettings	= s;
+
+	this	-> myFrame	= new QFrame (nullptr);
+	setupUi (this -> myFrame);
+	this	-> myFrame	-> show();
+
+#ifdef __MINGW32__
+ const char *libraryString = "LimeSuite.dll";
+ Handle = LoadLibrary ((wchar_t *)L"LimeSuite.dll");
+#elif __clang__
+ const char *libraryString = "/opt/local/lib/libLimeSuite.dylib";
+ Handle		= dlopen (libraryString, RTLD_NOW);
+#else
+ const char *libraryString = "libLimeSuite.so";
+ Handle = dlopen (libraryString, RTLD_NOW);
+#endif
+
+ if (Handle == nullptr) {
+ fprintf (stderr, "failed to open %s\n", libraryString);
+ delete myFrame;
+ throw (20);
+ }
+
+ libraryLoaded = true;
+	if (!load_limeFunctions()) {
+#ifdef __MINGW32__
+ FreeLibrary (Handle);
+#else
+ dlclose (Handle);
+#endif
+ delete myFrame;
+ throw (21);
+ }
+//
+// From here we have a library available
+
+	int ndevs	= LMS_GetDeviceList (limedevices);
+	if (ndevs == 0) {	// no devices found
+	 delete myFrame;
+	 throw (21);
+	}
+
+	for (int i = 0; i < ndevs; i ++)
+	 fprintf (stderr, "device %s\n", limedevices [i]);
+
+	int res		= LMS_Open (&theDevice, nullptr, nullptr);
+	if (res < 0) {	// some error
+	 delete myFrame;
+	 throw (22);
+	}
+
+	res		= LMS_Init (theDevice);
+	if (res < 0) {	// some error
+	 LMS_Close (&theDevice);
+	 delete myFrame;
+	 throw (23);
+	}
+
+	res		= LMS_GetNumChannels (theDevice, LMS_CH_RX);
+	if (res < 0) {	// some error
+	 LMS_Close (&theDevice);
+	 delete myFrame;
+	 throw (24);
+	}
+
+	fprintf (stderr, "device %s supports %d channels\n",
+	 limedevices [0], res);
+	res		= LMS_EnableChannel (theDevice, LMS_CH_RX, 0, true);
+	if (res < 0) {	// some error
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (24);
+	}
+
+	res	= LMS_SetSampleRate (theDevice, 2048000.0, 0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (25);
+	}
+
+	float_type host_Hz, rf_Hz;
+	res	= LMS_GetSampleRate (theDevice, LMS_CH_RX, 0,
+	 &host_Hz, &rf_Hz);
+
+	fprintf (stderr, "samplerate = %f %f\n", (float)host_Hz, (float)rf_Hz);
+	
+	res		= LMS_GetAntennaList (theDevice, LMS_CH_RX, 0, antennas);
+	for (int i = 0; i < res; i ++) 	
+	 antennaList	-> addItem (QString (antennas [i]));
+
+	limeSettings -> beginGroup ("limeSettings");
+	QString antenne	= limeSettings -> value ("antenna", "default"). toString();
+	limeSettings	-> endGroup();
+
+	int k = antennaList -> findText (antenne);
+ if (k != -1) 
+ antennaList -> setCurrentIndex (k);
+	
+	connect (antennaList, SIGNAL (activated (int)),
+	 this, SLOT (setAntenna (int)));
+
+
+//	default antenna setting
+	res		= LMS_SetAntenna (theDevice, LMS_CH_RX, 0, 
+	 antennaList -> currentIndex());
+
+//	default frequency
+	res		= LMS_SetLOFrequency (theDevice, LMS_CH_RX,
+	 0, 220000000.0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (26);
+	}
+
+	res		= LMS_SetLPFBW (theDevice, LMS_CH_RX,
+	 0, 1536000.0);
+	if (res < 0) {
+	 LMS_Close (theDevice);
+	 delete myFrame;
+	 throw (27);
+	}
+
+	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, 50);
+
+	LMS_Calibrate (theDevice, LMS_CH_RX, 0, 2500000.0, 0);
+	
+	theBuffer	= new RingBuffer<std::complex<float>> (64 * 32768);
+	
+	limeSettings	-> beginGroup ("limeSettings");
+	k	= limeSettings	-> value ("gain", 50). toInt();
+	limeSettings	-> endGroup();
+	gainSelector -> setValue (k);
+	setGain (k);
+	connect (gainSelector, SIGNAL (valueChanged (int)),
+	 this, SLOT (setGain (int)));
+	running. store (false);
+}
+
+	limeHandler::~limeHandler() {
+	running. store (false);
+	while (isRunning())
+	 usleep (100);
+	limeSettings	-> beginGroup ("limeSettings");
+	limeSettings	-> setValue ("antenna", antennaList -> currentText());
+	limeSettings	-> setValue ("gain", gainSelector -> value());
+	limeSettings	-> endGroup();
+	LMS_Close (theDevice);
+	delete theBuffer;
+	delete myFrame;
+}
+
+void	limeHandler::setVFOFrequency	(int32_t f) {
+	LMS_SetLOFrequency (theDevice, LMS_CH_RX, 0, f);
+}
+
+int32_t	limeHandler::getVFOFrequency() {
+float_type freq;
+	int res = LMS_GetLOFrequency (theDevice, LMS_CH_RX, 0, &freq);
+	return (int)freq;
+}
+
+void	limeHandler::setGain		(int g) {
+float_type gg;
+	LMS_SetGaindB (theDevice, LMS_CH_RX, 0, g);
+	LMS_GetNormalizedGain (theDevice, LMS_CH_RX, 0, &gg);
+	actualGain	-> display (gg);
+}

_service:download_url:qt-dab-2.7.4.tar.gz/devices/lime-handler-old/lime-handler.h Added

@@ -0,0 +1,163 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __LIME_HANDLER__
+#define	__LIME_HANDLER__
+
+#include	<QObject>
+#include	<QFrame>
+#include	<QSettings>
+#include	<atomic>
+#include	<vector>
+#include	"dab-constants.h"
+#include	"ringbuffer.h"
+#include	<LimeSuite.h>
+#include	"virtual-input.h"
+#include	"ui_lime-widget.h"
+
+#ifdef __MINGW32__
+#define GETPROCADDRESS GetProcAddress
+#else
+#define GETPROCADDRESS dlsym
+#endif
+
+//	DLL and ".so" function prototypes
+typedef int	(*pfn_LMS_GetDeviceList)(lms_info_str_t *dev_list);
+typedef	int	(*pfn_LMS_Open)(lms_device_t **device,
+	 const lms_info_str_t info, void* args);
+typedef	int	(*pfn_LMS_Close)(lms_device_t *);
+typedef	int	(*pfn_LMS_Init) (lms_device_t *);
+typedef	int	(*pfn_LMS_GetNumChannels) (lms_device_t *device, bool dir_tx);
+typedef	int	(*pfn_LMS_EnableChannel) (lms_device_t *device, bool dir_tx,
+	 size_t chan, bool enabled);
+typedef	int	(*pfn_LMS_SetSampleRate) (lms_device_t *device,
+	 float_type rate,
+	 size_t oversample);
+typedef	int	(*pfn_LMS_GetSampleRate)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *host_Hz, float_type *rf_Hz);
+typedef	int	(*pfn_LMS_SetLOFrequency)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type frequency);
+typedef	int	(*pfn_LMS_GetLOFrequency)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *frequency);
+typedef	int	(*pfn_LMS_GetAntennaList) (lms_device_t *device, bool dir_tx,
+	 size_t chan, lms_name_t *list);
+typedef	int	(*pfn_LMS_SetAntenna) (lms_device_t *dev, bool dir_tx,
+	 size_t chan, size_t index);
+typedef	int	(*pfn_LMS_GetAntenna)(lms_device_t *dev, bool dir_tx, size_t chan);
+typedef	int	(*pfn_LMS_GetAntennaBW)(lms_device_t *dev, bool dir_tx,
+	 size_t chan, size_t index, lms_range_t *range);
+typedef	int	(*pfn_LMS_SetNormalizedGain)(lms_device_t *device, bool dir_tx,
+	 size_t chan,float_type gain);
+typedef	int	(*pfn_LMS_SetGaindB)(lms_device_t *device, bool dir_tx,
+	 size_t chan, unsigned gain);
+typedef	int	(*pfn_LMS_GetNormalizedGain)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type *gain);
+typedef	int	(*pfn_LMS_GetGaindB)(lms_device_t *device, bool dir_tx,
+	 size_t chan, unsigned *gain);
+typedef	int	(*pfn_LMS_SetLPFBW)(lms_device_t *device, bool dir_tx,
+	 size_t chan, float_type bandwidth);
+typedef	int	(*pfn_LMS_GetLPFBW)(lms_device_t *device, bool dir_tx,
+ size_t chan, float_type *bandwidth);
+typedef	int 	(*pfn_LMS_Calibrate)(lms_device_t *device, bool dir_tx,
+	 size_t chan, double bw, unsigned flags);
+typedef	int	(*pfn_LMS_SetupStream)(lms_device_t *device,
+	 lms_stream_t *stream);
+typedef	int	(*pfn_LMS_DestroyStream)(lms_device_t *dev,
+	 lms_stream_t *stream);
+typedef	int	(*pfn_LMS_StartStream)(lms_stream_t *stream);
+typedef	int	(*pfn_LMS_StopStream)(lms_stream_t *stream);
+typedef	int	(*pfn_LMS_RecvStream)(lms_stream_t *stream, void *samples,
+ size_t sample_count,
+	 lms_stream_meta_t *meta,
+	 unsigned timeout_ms);
+typedef	int	(*pfn_LMS_GetStreamStatus)(lms_stream_t *stream,
+	 lms_stream_status_t* status);
+
+class	limeHandler: public virtualInput, public Ui_limeWidget {
+Q_OBJECT
+public:
+			limeHandler		(QSettings *);
+			~limeHandler();
+	void		setVFOFrequency		(int32_t);
+	int32_t		getVFOFrequency();
+	bool		restartReader();
+	void		stopReader();
+	int32_t getSamples (std::complex<float> *,
+ int32_t);
+ int32_t Samples();
+ void resetBuffer();
+ int16_t bitDepth();
+
+private:
+	QSettings	*limeSettings;
+	QFrame		*myFrame;
+	std::atomic<bool>	running;
+	lms_device_t	*theDevice;
+	lms_name_t	antennas [10];
+	RingBuffer<std::complex<float>> *theBuffer;
+	bool		load_limeFunctions();
+	HINSTANCE	Handle;
+	bool		libraryLoaded;
+	lms_stream_meta_t meta;
+ lms_stream_t stream;
+ void		run();
+
+//	imported functions
+public:
+	pfn_LMS_GetDeviceList	LMS_GetDeviceList;
+	pfn_LMS_Open		LMS_Open;
+	pfn_LMS_Close		LMS_Close;
+	pfn_LMS_Init		LMS_Init;
+	pfn_LMS_GetNumChannels	LMS_GetNumChannels;
+	pfn_LMS_EnableChannel	LMS_EnableChannel;
+	pfn_LMS_SetSampleRate	LMS_SetSampleRate;
+	pfn_LMS_GetSampleRate	LMS_GetSampleRate;
+	pfn_LMS_SetLOFrequency	LMS_SetLOFrequency;
+	pfn_LMS_GetLOFrequency	LMS_GetLOFrequency;
+	pfn_LMS_GetAntennaList	LMS_GetAntennaList;
+	pfn_LMS_SetAntenna	LMS_SetAntenna;
+	pfn_LMS_GetAntenna	LMS_GetAntenna;
+	pfn_LMS_GetAntennaBW	LMS_GetAntennaBW;
+	pfn_LMS_SetNormalizedGain	LMS_SetNormalizedGain;
+	pfn_LMS_SetGaindB	LMS_SetGaindB;
+	pfn_LMS_GetNormalizedGain	LMS_GetNormalizedGain;
+	pfn_LMS_GetGaindB	LMS_GetGaindB;
+	pfn_LMS_SetLPFBW	LMS_SetLPFBW;
+	pfn_LMS_GetLPFBW	LMS_GetLPFBW;
+	pfn_LMS_Calibrate	LMS_Calibrate;
+
+	pfn_LMS_SetupStream	LMS_SetupStream;
+	pfn_LMS_DestroyStream	LMS_DestroyStream;
+	pfn_LMS_StartStream	LMS_StartStream;
+	pfn_LMS_StopStream	LMS_StopStream;
+	pfn_LMS_RecvStream	LMS_RecvStream;
+	pfn_LMS_GetStreamStatus	LMS_GetStreamStatus;
+private slots:
+	void		setGain		(int);
+	void		setAntenna	(int);
+
+public slots:
+	void		showErrors	(int, int);
+};
+
+#endif
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/lime-handler-old/lime-widget.ui Changed

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

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/lime-handler/lime-widget.h Added

@@ -0,0 +1,75 @@
+#ifndef	__LIME_WIDGET__
+#define	__LIME_WIDGET__
+
+#include	<QLabel>
+#include	<QSpinBox>
+#include	<QLCDNumber>
+#include	<QComboBox>
+#include	<QHBoxLayout>
+#include	<QVBoxLayout>
+
+class	limeWidget {
+public:
+	QLabel		*titleLabel;
+	QSpinBox	*gainSelector;
+	QLCDNumber	*actualGain;
+	QLabel		*gainLabel;
+	QComboBox	*antennaList;
+	QLabel		*antennaLabel;
+	QLCDNumber	*underrunDisplay;
+	QLabel		*underrunLabel;
+	QLCDNumber	*overrunDisplay;
+	QLabel		*overrunLabel;
+
+	limeWidget	() {}
+	~limeWidget	() {}
+
+void	setupUi		(QWidget *qw) {
+	titleLabel	= new QLabel	("lime handler");
+	gainSelector	= new QSpinBox	();
+	gainLabel	= new QLabel	("gain");
+	actualGain	= new QLCDNumber ();
+	antennaList	= new QComboBox	();
+	antennaLabel	= new QLabel	("antennas");
+	underrunDisplay	= new QLCDNumber ();
+	underrunLabel	= new QLabel	("underruns");
+	overrunDisplay	= new QLCDNumber ();
+	overrunLabel	= new QLabel	("overruns");
+	actualGain	-> setFrameShape (QFrame::NoFrame);
+ actualGain	-> setSegmentStyle (QLCDNumber::Flat);
+	underrunDisplay	-> setFrameShape (QFrame::NoFrame);
+ underrunDisplay	-> setSegmentStyle (QLCDNumber::Flat);
+	overrunDisplay	-> setFrameShape (QFrame::NoFrame);
+ overrunDisplay	-> setSegmentStyle (QLCDNumber::Flat);
+
+	QHBoxLayout *line2	= new QHBoxLayout ();
+	line2		-> addWidget (gainSelector);
+	line2		-> addWidget (gainLabel);
+	line2		-> addWidget (actualGain);
+
+	QHBoxLayout *line3	= new QHBoxLayout ();
+	line3		-> addWidget (antennaList);
+	line3		-> addSpacing (3);
+	line3		-> addWidget (antennaLabel);
+
+	QHBoxLayout *line4	= new QHBoxLayout ();
+	line4		-> addWidget (underrunDisplay);
+	line4		-> addWidget (underrunLabel);
+
+	QHBoxLayout *line5	= new QHBoxLayout ();
+	line5		-> addWidget (overrunDisplay);
+	line5		-> addWidget (overrunLabel);
+
+	QVBoxLayout *base	= new QVBoxLayout ();
+	base		-> addWidget	(titleLabel);
+	base		-> addItem	(line2);
+	base		-> addItem	(line3);
+	base		-> addItem	(line4);
+	base		-> addItem	(line5);
+
+	qw	-> setLayout (base);
+}
+};
+
+#endif
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rawfiles-new Added

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

@@ -0,0 +1,110 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<sys/time.h>
+#include	"raw-reader.h"
+#include	"rawfiles.h"
+
+
+#define	BUFFERSIZE	32768
+static inline
+int64_t getMyTime() {
+struct timeval tv;
+
+ gettimeofday (&tv, nullptr);
+ return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
+}
+
+	rawReader::rawReader	(rawFiles *mr,
+	 FILE	*filePointer,
+	 RingBuffer<uint8_t> *theBuffer) {
+	this	-> parent	= mr;
+	this	-> filePointer	= filePointer;
+	this	-> theBuffer	= theBuffer;
+
+	fseek (filePointer, 0, SEEK_END);
+	fileLength		= ftell (filePointer);
+	fprintf (stderr, "fileLength = %d\n", fileLength);
+ fseek (filePointer, 0, SEEK_SET);
+	period = (32768 * 1000) / (2 * 2048); // full IQś read
+ fprintf (stderr, "Period = %ld\n", period);
+ bi = new uint8_t [BUFFERSIZE];
+	running. store (false);
+	start();
+}
+
+		rawReader::~rawReader() {
+	stopReader();
+	delete[] bi;
+}
+
+void	rawReader::stopReader() {
+	if (running) {
+	 running = false;
+	 while (isRunning())
+	 usleep (200);
+	}
+}
+
+void	rawReader::run() {
+int64_t	nextStop;
+int	i;
+int	teller	= 0;
+
+	connect (this, SIGNAL (setProgress (int, float)),
+	 parent, SLOT (setProgress (int, float)));
+	fseek (filePointer, 0, SEEK_SET);
+	running. store (true);
+	nextStop = getMyTime();
+	try {
+	 while (running. load()) {
+	 while (theBuffer -> WriteSpace() < BUFFERSIZE + 10) {
+	 if (!running. load())
+	 throw (32);
+	 usleep (100);
+ }
+	
+	 if (++teller >= 20) {
+	 int xx = ftell (filePointer);
+	 float progress = (float)xx / fileLength;
+	 setProgress ((int)(progress * 100), (float)xx / (2 * 2048000));
+ teller = 0;
+	 }
+
+	 nextStop += period;
+	 int n = fread (bi, sizeof (uint8_t), BUFFERSIZE, filePointer);
+	 if (n < BUFFERSIZE) {
+	 fprintf (stderr, "eof gehad\n");
+	 fseek (filePointer, 0, SEEK_SET);
+ for (i = n; i < BUFFERSIZE; i ++)
+ bi [i] = 0;
+ }
+
+ theBuffer -> putDataIntoBuffer (bi, BUFFERSIZE);
+ if (nextStop - getMyTime() > 0)
+ usleep (nextStop - getMyTime());
+ }
+	} catch (int e) {}
+ fprintf (stderr, "taak voor replay eindigt hier\n");
+}
+
+

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

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rawfiles-new/rawfiles.cpp Added

@@ -0,0 +1,125 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	File reader:
+ *	For the (former) files with 8 bit raw data from the
+ *	dabsticks 
+ */
+#include	"rawfiles.h"
+#include	<cstdio>
+#include	<unistd.h>
+#include	<cstdlib>
+#include	<fcntl.h>
+//
+#include	<sys/time.h>
+#include	<ctime>
+
+#include	"raw-reader.h"
+
+#define	INPUT_FRAMEBUFFERSIZE	8 * 32768
+//
+//
+	rawFiles::rawFiles (QString f) {
+	fileName	= f;
+	myFrame		= new QFrame;
+	setupUi	(myFrame);
+	myFrame		-> show();
+	_I_Buffer	= new RingBuffer<uint8_t>(INPUT_FRAMEBUFFERSIZE);
+	filePointer	= fopen (f. toUtf8(). data(), "rb");
+	if (filePointer == nullptr) {
+	 fprintf (stderr, "file %s cannot open\n",
+	 f. toUtf8(). data());
+	 perror ("file ?");
+	 delete myFrame;
+	 delete _I_Buffer;
+	 throw (31);
+	}
+	nameofFile	-> setText (f);
+	fseek (filePointer, 0, SEEK_END);
+	int64_t fileLength = ftell (filePointer);
+ totalTime -> display ((float)fileLength / (2048000 * 2));
+	fseek (filePointer, 0, SEEK_SET);
+	fileProgress -> setValue (0);
+ currentTime -> display (0);
+
+	running. store (false);
+}
+
+	rawFiles::~rawFiles() {
+	if (running. load()) {
+	 readerTask	-> stopReader();
+	 while (readerTask -> isRunning())
+	 usleep (100);
+	 delete readerTask;
+	}
+	if (filePointer != nullptr)
+	 fclose (filePointer);
+
+	delete _I_Buffer;
+	delete	myFrame;
+}
+
+bool	rawFiles::restartReader() {
+	if (running. load())
+	 return true;
+	readerTask	= new rawReader (this, filePointer, _I_Buffer);
+	running. store (true);
+	return true;
+}
+
+void	rawFiles::stopReader() {
+	if (running. load()) {
+	 readerTask	-> stopReader();
+	 while (readerTask -> isRunning())
+	 usleep (100);
+	 delete readerTask;
+	}
+	running. store (false);
+}
+
+//	size is in I/Q pairs, file contains 8 bits values
+int32_t	rawFiles::getSamples	(std::complex<float> *V, int32_t size) {
+int32_t	amount, i;
+uint8_t	temp [2 * size];
+
+	if (filePointer == nullptr)
+	 return 0;
+
+	while ((int32_t)(_I_Buffer -> GetRingBufferReadAvailable()) < 2 * size)
+	 usleep (500);
+
+	amount = _I_Buffer	-> getDataFromBuffer (temp, 2 * size);
+	for (i = 0; i < amount / 2; i ++)
+	 V [i] = std::complex<float> (float (temp [2 * i] - 128) / 128.0,
+	 float (temp [2 * i + 1] - 128) / 128.0);
+	return amount / 2;
+}
+
+int32_t	rawFiles::Samples() {
+	return _I_Buffer -> GetRingBufferReadAvailable() / 2;
+}
+
+void	rawFiles::setProgress (int progress, float timelength) {
+	fileProgress -> setValue (progress);
+	currentTime -> display (timelength);
+}
+
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rawfiles-new/rawfiles.h Added

@@ -0,0 +1,64 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__RAW_FILES__
+#define	__RAW_FILES__
+
+#include	<QThread>
+#include	<QString>
+#include	<QFrame>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"virtual-input.h"
+#include	"ringbuffer.h"
+
+#include	"filereader-widget.h"
+
+class	QLabel;
+class	QSettings;
+class	rawReader;
+/*
+ */
+class	rawFiles: public virtualInput,
+	 public filereaderWidget {
+Q_OBJECT
+public:
+
+			rawFiles	(QString);
+ ~rawFiles();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+ uint8_t		myIdentity();
+ int32_t		Samples();
+ bool		restartReader();
+	void		stopReader	(void);
+private:
+	QString		fileName;
+	QWidget		*myFrame;
+	RingBuffer<uint8_t>	*_I_Buffer;
+	FILE		*filePointer;
+	rawReader	*readerTask;
+	std::atomic<bool>	running;
+public slots:
+	void		setProgress	(int, float);
+};
+
+#endif
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rtlsdr-handler-xxx Added

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rtlsdr-handler-xxx/rtl-dongleselect.cpp Added

@@ -0,0 +1,64 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	"rtl-dongleselect.h"
+#include	<cstdio>
+#include	<QVBoxLayout>
+//
+//	Whenever there are two or more RT2832 based sticks connected
+//	to the computer, the user is asked to make a choice.
+
+	rtl_dongleSelect::rtl_dongleSelect() {
+	toptext		= new QLabel (this);
+	toptext		-> setText ("Select a dongle");
+	selectorDisplay	= new QListView (this);
+	QVBoxLayout	*layOut = new QVBoxLayout;
+	layOut		-> addWidget (selectorDisplay);
+	layOut		-> addWidget (toptext);
+	setWindowTitle (tr("dongle select"));
+	setLayout (layOut);
+
+	dongleList. setStringList (Dongles);
+	Dongles = QStringList();
+	dongleList. setStringList (Dongles);
+	selectorDisplay	-> setModel (&dongleList);
+	connect (selectorDisplay, SIGNAL (clicked (QModelIndex)),
+	 this, SLOT (selectDongle (QModelIndex)));
+	selectedItem	= -1;
+}
+
+	rtl_dongleSelect::~rtl_dongleSelect() {
+}
+
+void	rtl_dongleSelect::addtoDongleList (const char *v) {
+QString s (v);
+
+	Dongles << s;
+	dongleList. setStringList (Dongles);
+	selectorDisplay	-> setModel (&dongleList);
+	selectorDisplay	-> adjustSize();
+	adjustSize();
+}
+
+void	rtl_dongleSelect::selectDongle (QModelIndex s) {
+	QDialog::done (s. row());
+}
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rtlsdr-handler-xxx/rtl-dongleselect.h Added

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

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

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

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

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rtlsdr-handler-xxx/rtlsdr-handler.cpp Added

@@ -0,0 +1,554 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-SDR; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 	This particular driver is a very simple wrapper around the
+ * 	librtlsdr. In order to keep things simple, we dynamically
+ * 	load the dll (or .so). The librtlsdr is osmocom software and all rights
+ * 	are greatly acknowledged
+ */
+
+#include	<QThread>
+#include	<QFileDialog>
+#include	<QDir>
+#include	"rtlsdr-handler.h"
+#include	"rtl-dongleselect.h"
+#include	"rtl-sdr.h"
+
+#ifdef	__MINGW32__
+#define	GETPROCADDRESS	GetProcAddress
+#else
+#define	GETPROCADDRESS	dlsym
+#endif
+
+#define	READLEN_DEFAULT	8192
+//
+//	For the callback, we do need some environment which
+//	is passed through the ctx parameter
+//
+//	This is the user-side call back function
+//	ctx is the calling task
+static
+void	RTLSDRCallBack (uint8_t *buf, uint32_t len, void *ctx) {
+rtlsdrHandler	*theStick	= (rtlsdrHandler *)ctx;
+
+	if ((theStick == nullptr) || (len != READLEN_DEFAULT))
+	 return;
+
+	(void)theStick -> _I_Buffer -> putDataIntoBuffer (buf, len);
+}
+//
+//	for handling the events in libusb, we need a controlthread
+//	whose sole purpose is to process the rtlsdr_read_async function
+//	from the lib.
+class	dll_driver : public QThread {
+private:
+	rtlsdrHandler	*theStick;
+public:
+
+	dll_driver (rtlsdrHandler *d) {
+	theStick	= d;
+	start();
+	}
+
+	~dll_driver() {
+	}
+
+private:
+virtual void	run() {
+	(theStick -> rtlsdr_read_async) (theStick -> device,
+	 (rtlsdr_read_async_cb_t)&RTLSDRCallBack,
+	 (void *)theStick,
+	 0,
+	 READLEN_DEFAULT);
+	}
+};
+//
+//	Our wrapper is a simple classs
+	rtlsdrHandler::rtlsdrHandler (QSettings *s) {
+int16_t	deviceCount;
+int32_t	r;
+int16_t	deviceIndex;
+int16_t	i;
+QString	temp;
+int	k;
+char	manufac [256], product [256], serial [256];
+
+	rtlsdrSettings		= s;
+	this	-> myFrame	= new QFrame (nullptr);
+	setupUi (this -> myFrame);
+	this	-> myFrame	-> show();
+	inputRate		= 2048000;
+	libraryLoaded		= false;
+	open			= false;
+	_I_Buffer		= nullptr;
+	workerHandle		= nullptr;
+	lastFrequency		= KHz (22000);	// just a dummy
+	gains			= nullptr;
+
+#ifdef	__MINGW32__
+	const char *libraryString = "rtlsdr.dll";
+	Handle		= LoadLibrary ((wchar_t *)L"rtlsdr.dll");
+	if (Handle == nullptr) {
+	 fprintf (stderr, "failed to open %s (%d)\n", libraryString, GetLastError());
+	 delete myFrame;
+	 throw (20);
+	}
+#else
+	const char *libraryString = "librtlsdr.so";
+	Handle		= dlopen ("librtlsdr.so", RTLD_NOW);
+
+	if (Handle == nullptr) {
+	 fprintf (stderr, "failed to open %s (%s)\n", libraryString, dlerror());
+	 delete myFrame;
+	 throw (20);
+	}
+#endif
+	libraryLoaded	= true;
+	if (!load_rtlFunctions()) {
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (21);
+	}
+//
+//	Ok, from here we have the library functions accessible
+	deviceCount 		= this -> rtlsdr_get_device_count();
+	if (deviceCount == 0) {
+	 fprintf (stderr, "No devices found\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (22);
+	}
+
+	deviceIndex = 0;	// default
+	if (deviceCount > 1) {
+	 rtl_dongleSelect dongleSelector;
+	 for (deviceIndex = 0; deviceIndex < deviceCount; deviceIndex ++) {
+	 dongleSelector.
+	 addtoDongleList (rtlsdr_get_device_name (deviceIndex));
+	 }
+	 deviceIndex = dongleSelector. QDialog::exec();
+	}
+//
+//	OK, now open the hardware
+	r			= this -> rtlsdr_open (&device, deviceIndex);
+	if (r < 0) {
+	 fprintf (stderr, "Opening rtlsdr device failed\n");
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (23);
+	}
+
+	deviceName -> setText (rtlsdr_get_device_name (deviceIndex));
+
+	open			= true;
+	r			= this -> rtlsdr_set_sample_rate (device,
+	 inputRate);
+	if (r < 0) {
+	 fprintf (stderr, "Setting samplerate failed\n");
+	 rtlsdr_close (device);
+#ifdef __MINGW32__
+	 FreeLibrary (Handle);
+#else
+	 dlclose (Handle);
+#endif
+	 delete myFrame;
+	 throw (24);
+	}
+
+	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);
+	for (i = gainsCount; i > 0; i--) {
+	 fprintf(stderr, "%.1f ", gains [i - 1] / 10.0);
+	 combo_gain -> addItem (QString::number (gains [i - 1]));
+	}

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rtlsdr-handler-xxx/rtlsdr-handler.h Added

@@ -0,0 +1,133 @@
+#
+/*
+ * Copyright (C) 2014 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB
+ * Many of the ideas as implemented in Qt-DAB are derived from
+ * other work, made available through the GNU general Public License. 
+ * All copyrights of the original authors are recognized.
+ *
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef __RTLSDR_HANDLER__
+#define	__RTLSDR_HANDLER__
+
+#include	<QObject>
+#include	<QSettings>
+#include	<cstdio>
+#include	"dab-constants.h"
+#include	"virtual-input.h"
+#include	"ringbuffer.h"
+#include	"rtlsdr-widget.h"
+class	dll_driver;
+//
+//	create typedefs for the library functions
+typedef	struct rtlsdr_dev rtlsdr_dev_t;
+extern "C" {
+typedef	void (*rtlsdr_read_async_cb_t) (uint8_t *buf, uint32_t len, void *ctx);
+typedef	 int (* pfnrtlsdr_open )(rtlsdr_dev_t **, uint32_t);
+typedef	int (* pfnrtlsdr_close) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_get_usb_strings) (rtlsdr_dev_t *, char *, char *, char *);
+typedef	int (* pfnrtlsdr_set_center_freq) (rtlsdr_dev_t *, uint32_t);
+typedef uint32_t (* pfnrtlsdr_get_center_freq) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_get_tuner_gains) (rtlsdr_dev_t *, int *);
+typedef	int (* pfnrtlsdr_set_tuner_gain_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_agc_mode) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_set_sample_rate) (rtlsdr_dev_t *, uint32_t);
+typedef	int (* pfnrtlsdr_get_sample_rate) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_set_tuner_gain) (rtlsdr_dev_t *, int);
+typedef	int (* pfnrtlsdr_get_tuner_gain) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_reset_buffer) (rtlsdr_dev_t *);
+typedef	int (* pfnrtlsdr_read_async) (rtlsdr_dev_t *,
+	 rtlsdr_read_async_cb_t,
+	 void *,
+	 uint32_t,
+	 uint32_t);
+typedef int (* pfnrtlsdr_cancel_async) (rtlsdr_dev_t *);
+typedef int (* pfnrtlsdr_set_direct_sampling) (rtlsdr_dev_t *, int);
+typedef uint32_t (* pfnrtlsdr_get_device_count)();
+typedef	int (* pfnrtlsdr_set_freq_correction)(rtlsdr_dev_t *, int);
+typedef	char *(* pfnrtlsdr_get_device_name)(int);
+}
+//	This class is a simple wrapper around the
+//	rtlsdr library that is read in as dll (or .so file in linux)
+//	It does not do any processing
+class	rtlsdrHandler: public virtualInput, public rtlsdrWidget {
+Q_OBJECT
+public:
+			rtlsdrHandler	(QSettings *);
+			~rtlsdrHandler();
+	void		setVFOFrequency	(int32_t);
+	int32_t		getVFOFrequency();
+//	interface to the reader
+	bool		restartReader();
+	void		stopReader();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples();
+	void		resetBuffer();
+	int16_t		maxGain();
+	int16_t		bitDepth();
+//
+//	These need to be visible for the separate usb handling thread
+	RingBuffer<uint8_t>	*_I_Buffer;
+	pfnrtlsdr_read_async	rtlsdr_read_async;
+	struct rtlsdr_dev	*device;
+private:
+	QWidget		*myFrame;
+	QSettings	*rtlsdrSettings;
+	int32_t		inputRate;
+	int32_t		deviceCount;
+	HINSTANCE	Handle;
+	dll_driver	*workerHandle;
+	int32_t		lastFrequency;
+	bool		libraryLoaded;
+	bool		open;
+	int		*gains;
+	int16_t		gainsCount;
+	bool		dumping;
+	FILE		*dumpfilePointer;
+//	here we need to load functions from the dll
+	bool		load_rtlFunctions();
+	pfnrtlsdr_open	rtlsdr_open;
+	pfnrtlsdr_close	rtlsdr_close;
+	pfnrtlsdr_get_usb_strings rtlsdr_get_usb_strings;
+
+	pfnrtlsdr_set_center_freq rtlsdr_set_center_freq;
+	pfnrtlsdr_get_center_freq rtlsdr_get_center_freq;
+	pfnrtlsdr_get_tuner_gains rtlsdr_get_tuner_gains;
+	pfnrtlsdr_set_tuner_gain_mode rtlsdr_set_tuner_gain_mode;
+	pfnrtlsdr_set_agc_mode rtlsdr_set_agc_mode;
+	pfnrtlsdr_set_sample_rate rtlsdr_set_sample_rate;
+	pfnrtlsdr_get_sample_rate rtlsdr_get_sample_rate;
+	pfnrtlsdr_set_tuner_gain rtlsdr_set_tuner_gain;
+	pfnrtlsdr_get_tuner_gain rtlsdr_get_tuner_gain;
+	pfnrtlsdr_reset_buffer rtlsdr_reset_buffer;
+	pfnrtlsdr_cancel_async rtlsdr_cancel_async;
+	pfnrtlsdr_set_direct_sampling	rtlsdr_set_direct_sampling;
+	pfnrtlsdr_get_device_count rtlsdr_get_device_count;
+	pfnrtlsdr_set_freq_correction rtlsdr_set_freq_correction;
+	pfnrtlsdr_get_device_name rtlsdr_get_device_name;
+private slots:
+	void		set_ExternalGain	(const QString &);
+	void		set_autogain		(const QString &);
+	void		set_ppmCorrection	(int);
+	void		dumpButton_pressed();
+};
+#endif
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/rtlsdr-handler-xxx/rtlsdr-widget.h Added

@@ -0,0 +1,60 @@
+
+#ifndef	__RTLSDR_WIDGET__
+#define	__RTLSDR_WIDGET__
+
+#include	<QWidget>
+#include	<QSpinBox>
+#include	<QLabel>
+#include	<QComboBox>
+#include	<QPushButton>
+
+#include	<QVBoxLayout>
+#include	<QHBoxLayout>
+#include	<QFormLayout>
+
+class	rtlsdrWidget {
+public:
+QSpinBox	*ppm_correction;
+QLabel		*ppmCorrectionLabel;
+QComboBox	*combo_gain;
+QComboBox	*combo_autogain;
+QPushButton	*dumpButton;
+QLabel		*versionLabel;
+QLabel		*product_display;
+QLabel		*deviceName;
+
+	rtlsdrWidget	() {}
+void	setupUi		(QWidget *qw) {
+
+	ppm_correction	= new QSpinBox ();
+	ppmCorrectionLabel	= new QLabel ("ppm");
+	combo_gain	= new QComboBox ();
+	combo_autogain	= new QComboBox ();
+	dumpButton	= new QPushButton ("write raw");
+	versionLabel	= new QLabel ("dabstick");
+	product_display	= new QLabel ();
+	deviceName	= new QLabel ();
+
+	combo_autogain	-> addItem ("autogain_off");
+	combo_autogain	-> addItem ("autogain_on");
+
+	QFormLayout *line1	= new QFormLayout ();
+//	QHBoxLayout *line1	= new QHBoxLayout ();
+	line1		-> addWidget (ppmCorrectionLabel);
+	line1		-> addWidget (ppm_correction);
+
+	QVBoxLayout *base	= new QVBoxLayout ();
+	base		-> addWidget (versionLabel);
+	base		-> addWidget (combo_autogain);
+	base		-> addWidget (combo_gain);
+	base		-> addWidget (dumpButton);
+	base		-> addItem (line1);
+	base		-> addWidget (product_display);
+	base		-> addWidget (deviceName);
+
+	qw	-> setLayout (base);
+}
+
+};
+
+#endif

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

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

@@ -6,153 +6,111 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>219</width>
- <height>258</height>
+ <width>225</width>
+ <height>263</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>RT2832 dabstick</string>
 </property>
- <widget class="QFrame" name="contents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>201</width>
- <height>231</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <widget class="QLabel" name="label">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>140</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>dabstick</string>
- </property>
- </widget>
- <widget class="QSpinBox" name="ppm_correction">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>91</width>
- <height>21</height>
- </rect>
- </property>
- <property name="minimum">
- <number>-100</number>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- <widget class="QLabel" name="label_4">
- <property name="geometry">
- <rect>
- <x>110</x>
- <y>10</y>
- <width>51</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>ppm</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_5">
- <property name="geometry">
- <rect>
- <x>110</x>
- <y>30</y>
- <width>41</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>gain</string>
- </property>
- </widget>
- <widget class="QComboBox" name="combo_gain">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>30</y>
- <width>91</width>
- <height>21</height>
- </rect>
- </property>
- </widget>
- <widget class="QComboBox" name="combo_autogain">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>60</y>
- <width>131</width>
- <height>21</height>
- </rect>
- </property>
- <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>ppm</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="ppm_correction">
+ <property name="minimum">
+ <number>-100</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>gain</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="combo_gain">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QComboBox" name="combo_autogain">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>autogain_off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>autogain_on</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="dumpButton">
+ <property name="text">
+ <string>write raw bytes</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
 <property name="text">
- <string>autogain_off</string>
+ <string>dabstick</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="product_display">
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="deviceName">
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
 </property>
- </item>
- <item>
 <property name="text">
- <string>autogain_on</string>

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

@@ -48,7 +48,7 @@
 	   case 2:
 	      return RSP2_Table [lnaState];
 
-	   default:
+	   default: // both for DUO and RSP1a
 	      return RSP1A_Table [lnaState];
 	}
 }
@@ -63,6 +63,8 @@
 
 	sdrplaySettings			= s;
 	this	-> myFrame		= new QFrame (nullptr);
+	this	-> myFrame -> setSizePolicy (QSizePolicy::Expanding,
+	                                     QSizePolicy::Expanding);
 	setupUi (this -> myFrame);
 	this	-> myFrame	-> show();
 	antennaSelector		-> hide();
@@ -492,6 +494,7 @@
 	                                 (mir_sdr_StreamCallback_t)myStreamCallback,
 	                                 (mir_sdr_GainChangeCallback_t)myGainChangeCallback,
 	                                 this);
+	fprintf (stderr, "overall gain reduction %d\n", gRdBSystem);
 	if (err != mir_sdr_Success) {
 	   fprintf (stderr, "error = %s\n",
 	                errorCodes (err). toLatin1(). data());
@@ -517,6 +520,10 @@
 	if (err != mir_sdr_Success)
 	   fprintf (stderr, "error = %s\n",
 	                errorCodes (err). toLatin1(). data());
+	err		= my_mir_sdr_DCoffsetIQimbalanceControl (1, 0);
+	if (err != mir_sdr_Success)
+           fprintf (stderr, "error = %s\n",
+                        errorCodes (err). toLatin1(). data());
 	running. store (true);
 	return true;
 }

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

@@ -6,316 +6,344 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>350</width>
- <height>270</height>
+ <width>351</width>
+ <height>291</height>
 </rect>
 </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
 <property name="windowTitle">
 <string>SDRplay control</string>
 </property>
- <widget class="QFrame" name="frame">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>0</y>
- <width>321</width>
- <height>261</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <widget class="QLabel" name="deviceLabel">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>20</y>
- <width>121</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>mirics-SDRplay</string>
- </property>
- </widget>
- <widget class="QLabel" name="statusLabel">
- <property name="geometry">
- <rect>
- <x>16</x>
- <y>180</y>
- <width>121</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- <widget class="QLCDNumber" name="api_version">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>20</y>
- <width>81</width>
- <height>21</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version of the SDRplay library detected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="lineWidth">
- <number>0</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- <widget class="QCheckBox" name="agcControl">
- <property name="geometry">
- <rect>
- <x>200</x>
- <y>150</y>
- <width>71</width>
- <height>21</height>
- </rect>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans Mono</family>
- <weight>75</weight>
- <italic>true</italic>
- <bold>true</bold>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touch to switch on automatic gain control - based on the setting of the lnastate and the ifgain.&lt;/p&gt;&lt;p&gt;If switched on, the lnastate switch and the ifgain slider are switched off&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>agc</string>
- </property>
- </widget>
- <widget class="QSpinBox" name="ppmControl">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>80</y>
- <width>91</width>
- <height>31</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ppm control. Tells the device the offset (in ppm) of the observed oscillator offset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="minimum">
- <number>-200</number>
- </property>
- <property name="maximum">
- <number>200</number>
- </property>
- </widget>
- <widget class="QLabel" name="serialNumber">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>50</y>
- <width>171</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- <widget class="QComboBox" name="antennaSelector">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>220</y>
- <width>141</width>
- <height>31</height>
- </rect>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans Mono</family>
- <weight>75</weight>
- <italic>true</italic>
- <bold>true</bold>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select an antenna (RSP-II)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <item>
- <property name="text">
- <string>Antenna A</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Antenna B</string>
- </property>
- </item>
- </widget>
- <widget class="QSpinBox" name="lnaGainSetting">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>150</y>
- <width>101</width>
- <height>31</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Setting the lna state, determining the gain reduction applied in the lna.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- <widget class="QLCDNumber" name="lnaGRdBDisplay">
- <property name="geometry">
- <rect>
- <x>110</x>
- <y>150</y>
- <width>51</width>
- <height>31</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The display shows the gain reduction in the lna of the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="digitCount">
- <number>3</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- <widget class="QComboBox" name="tunerSelector">
- <property name="geometry">

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

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>sdrplayWidget</class>
+ <widget class="QWidget" name="sdrplayWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>350</width>
+ <height>270</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>SDRplay control</string>
+ </property>
+ <widget class="QFrame" name="frame">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>0</y>
+ <width>321</width>
+ <height>261</height>
+ </rect>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <widget class="QLabel" name="deviceLabel">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>20</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>mirics-SDRplay</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="statusLabel">
+ <property name="geometry">
+ <rect>
+ <x>16</x>
+ <y>180</y>
+ <width>121</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="api_version">
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>20</y>
+ <width>81</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version of the SDRplay library detected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="geometry">
+ <rect>
+ <x>200</x>
+ <y>150</y>
+ <width>71</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touch to switch on automatic gain control - based on the setting of the lnastate and the ifgain.&lt;/p&gt;&lt;p&gt;If switched on, the lnastate switch and the ifgain slider are switched off&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="ppmControl">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>80</y>
+ <width>91</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ppm control. Tells the device the offset (in ppm) of the observed oscillator offset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>-200</number>
+ </property>
+ <property name="maximum">
+ <number>200</number>
+ </property>
+ </widget>
+ <widget class="QLabel" name="serialNumber">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>50</y>
+ <width>171</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="antennaSelector">
+ <property name="geometry">
+ <rect>
+ <x>160</x>
+ <y>220</y>
+ <width>141</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select an antenna (RSP-II)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Antenna A</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Antenna B</string>
+ </property>
+ </item>
+ </widget>
+ <widget class="QSpinBox" name="lnaGainSetting">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>150</y>
+ <width>101</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Setting the lna state, determining the gain reduction applied in the lna.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ <widget class="QLCDNumber" name="lnaGRdBDisplay">
+ <property name="geometry">
+ <rect>
+ <x>110</x>
+ <y>150</y>
+ <width>51</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The display shows the gain reduction in the lna of the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="digitCount">
+ <number>3</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="tunerSelector">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>220</y>

_service:download_url:qt-dab-2.7.4.tar.gz/devices/sdrplay-handler/sdrplay-widget.ui-xxx Added

@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>sdrplayWidget</class>
+ <widget class="QWidget" name="sdrplayWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>356</width>
+ <height>307</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>SDRplay control</string>
+ </property>
+ <widget class="QWidget" name="horizontalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>250</y>
+ <width>331</width>
+ <height>38</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QComboBox" name="tunerSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the device is an rspduo, select the tuner with this combobox&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Tuner 1</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Tuner 2</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QComboBox" name="antennaSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select an antenna (RSP-II)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>Antenna A</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Antenna B</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="horizontalLayoutWidget_2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>70</y>
+ <width>331</width>
+ <height>44</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QSpinBox" name="ppmControl">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ppm control. Tells the device the offset (in ppm) of the observed oscillator offset.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="minimum">
+ <number>-200</number>
+ </property>
+ <property name="maximum">
+ <number>200</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="GRdBSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimum">
+ <number>20</number>
+ </property>
+ <property name="maximum">
+ <number>59</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="verticalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>260</x>
+ <y>160</y>
+ <width>81</width>
+ <height>81</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="agcControl">
+ <property name="font">
+ 
+ <family>DejaVu Sans Mono</family>
+ <weight>75</weight>
+ <italic>true</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touch to switch on automatic gain control - based on the setting of the lnastate and the ifgain.&lt;/p&gt;&lt;p&gt;If switched on, the lnastate switch and the ifgain slider are switched off&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>agc</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">

_service:download_url:qt-dab-2.7.1.tar.gz/devices/virtual-input.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/devices/virtual-input.cpp Changed

_service:download_url:qt-dab-2.7.4.tar.gz/devices/wavfiles-new Added

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

@@ -0,0 +1,110 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	<sys/time.h>
+#include	"wav-reader.h"
+#include	"wavfiles.h"
+
+
+#define	BUFFERSIZE	32768
+static inline
+int64_t getMyTime() {
+struct timeval tv;
+
+ gettimeofday (&tv, nullptr);
+ return ((int64_t)tv. tv_sec * 1000000 + (int64_t)tv. tv_usec);
+}
+
+	wavReader::wavReader	(wavFiles	*mr,
+	 SNDFILE	*filePointer,
+	 RingBuffer<std::complex<float> > *theBuffer) {
+	this	-> parent	= mr;
+	this	-> filePointer	= filePointer;
+	this	-> theBuffer	= theBuffer;
+	fileLength		= sf_seek (filePointer, 0, SEEK_END);
+	fprintf (stderr, "fileLength = %d\n", fileLength);
+ sf_seek (filePointer, 0, SEEK_SET);
+	period = (32768 * 1000) / (2048); // full IQś read
+ fprintf (stderr, "Period = %ld\n", period);
+	running. store (false);
+	start();
+}
+
+	wavReader::~wavReader() {
+	stopReader();
+}
+
+void	wavReader::stopReader() {
+	if (running. load()) {
+	 running. store (false);
+	 while (isRunning())
+	 usleep (200);
+	}
+}
+
+void	wavReader::run() {
+int32_t	t, i;
+std::complex<float>	*bi;
+int32_t	bufferSize	= 32768;
+int64_t	nextStop;
+int	teller		= 0;
+
+	connect (this, SIGNAL (setProgress (int, float)),
+ parent, SLOT (setProgress (int, float)));
+	sf_seek (filePointer, 0, SEEK_SET);
+
+	running. store (true);
+
+	bi		= new std::complex<float> [bufferSize];
+	nextStop	= getMyTime();
+	try {
+	 while (running. load()) {
+	 while (theBuffer -> WriteSpace() < bufferSize) {
+	 if (!running. load())
+	 throw (33);
+	 usleep (100);
+	 }
+
+	 if (++teller >= 20) {
+	 int xx = sf_seek (filePointer, 0, SEEK_CUR);
+	 float progress = (float)xx / fileLength;
+	 setProgress ((int)(progress * 100), (float)xx / 2048000);
+	 teller = 0;
+	 }
+
+	 nextStop += period;
+	 int n = sf_readf_float (filePointer,
+		 (float *)bi, bufferSize);
+	 if (n < bufferSize) {
+	 sf_seek (filePointer, 0, SEEK_SET);
+	 for (i = n; i < bufferSize; i ++)
+	 bi [i] = std::complex <float> (0, 0);
+	 }
+	 theBuffer -> putDataIntoBuffer (bi, bufferSize);
+	 if (nextStop - getMyTime() > 0)
+	 usleep (nextStop - getMyTime());
+	 }
+	} catch (int e) {}
+	fprintf (stderr, "taak voor replay eindigt hier\n"); fflush (stderr);
+	delete[] bi;
+}
+

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

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

_service:download_url:qt-dab-2.7.4.tar.gz/devices/wavfiles-new/wavfiles.cpp Added

@@ -0,0 +1,125 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include	<cstdio>
+#include	<unistd.h>
+#include	<cstdlib>
+#include	<fcntl.h>
+#include	<sys/time.h>
+#include	<ctime>
+#include	<QString>
+#include	"wavfiles.h"
+
+#define	__BUFFERSIZE	8 * 32768
+
+	wavFiles::wavFiles (QString f) {
+SF_INFO *sf_info;
+
+	fileName	= f;
+	myFrame		= new QFrame;
+	setupUi (myFrame);
+	myFrame		-> show();
+
+	_I_Buffer	= new RingBuffer<std::complex<float>> (__BUFFERSIZE);
+
+	sf_info		= (SF_INFO *)alloca (sizeof (SF_INFO));
+	sf_info	-> format	= 0;
+	filePointer	= sf_open (f. toUtf8(). data(), SFM_READ, sf_info);
+	if (filePointer == nullptr) {
+	 fprintf (stderr, "file %s no legitimate sound file\n", 
+	 f. toUtf8().data());
+	 delete myFrame;
+	 throw (24);
+	}
+	if ((sf_info -> samplerate != 2048000) ||
+	 (sf_info -> channels != 2)) {
+	 fprintf (stderr, "This is not a recorded dab file, sorry\n");
+	 sf_close (filePointer);
+	 delete myFrame;
+	 throw (25);
+	}
+	nameofFile	-> setText (f);
+	fileProgress	-> setValue (0);
+	currentTime	-> display (0);
+	int64_t fileLength	= sf_seek (filePointer, 0, SEEK_END);
+	totalTime	-> display ((float)fileLength / 2048000);
+	running. store (false);
+}
+//
+//	Note that running == true <==> readerTask has value assigned
+
+	wavFiles::~wavFiles() {
+	if (running. load()) {
+	 readerTask	-> stopReader();
+	 while (readerTask -> isRunning())
+	 usleep (500);
+	 delete readerTask;
+	}
+	if (filePointer != nullptr)
+	 sf_close (filePointer);
+	delete _I_Buffer;
+	delete	myFrame;
+}
+
+bool	wavFiles::restartReader() {
+	if (running. load())
+ return true;
+ readerTask = new wavReader (this, filePointer, _I_Buffer);
+ running. store (true);
+ return true;
+}
+
+void	wavFiles::stopReader() {
+ if (running. load()) {
+ readerTask -> stopReader();
+ while (readerTask -> isRunning())
+ usleep (100);
+	 delete readerTask;
+ }
+ running. store (false);
+}
+
+//	size is in I/Q pairs
+int32_t	wavFiles::getSamples	(std::complex<float> *V, int32_t size) {
+int32_t	amount;
+	
+	if (filePointer == nullptr)
+	 return 0;
+
+	while (_I_Buffer -> GetRingBufferReadAvailable() < size)
+	 usleep (100);
+
+	amount = _I_Buffer	-> getDataFromBuffer (V, size);
+	
+	return amount;
+}
+
+int32_t	wavFiles::Samples() {
+	return _I_Buffer -> GetRingBufferReadAvailable();
+}
+
+void wavFiles::setProgress (int progress, float timelength) {
+ fileProgress -> setValue (progress);
+ currentTime -> display (timelength);
+}
+
+
+

_service:download_url:qt-dab-2.7.4.tar.gz/devices/wavfiles-new/wavfiles.h Added

@@ -0,0 +1,59 @@
+#
+/*
+ * Copyright (C) 2013 .. 2017
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Computing
+ *
+ * This file is part of the Qt-DAB program
+ * Qt-DAB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qt-DAB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qt-DAB; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef	__WAV_FILES__
+#define	__WAV_FILES__
+
+#include	<QString>
+#include	<QFrame>
+#include	<sndfile.h>
+#include	<atomic>
+#include	"dab-constants.h"
+#include	"virtual-input.h"
+#include	"ringbuffer.h"
+
+#include	"filereader-widget.h"
+#include		"wav-reader.h"
+
+class	wavFiles: public virtualInput,
+	 public filereaderWidget {
+Q_OBJECT
+public:
+			wavFiles	(QString);
+	 		~wavFiles();
+	int32_t		getSamples	(std::complex<float> *, int32_t);
+	int32_t		Samples();
+	bool		restartReader();
+	void		stopReader();
+private:
+	QString		fileName;
+	QWidget		*myFrame;
+	RingBuffer<std::complex<float>>	*_I_Buffer;
+	int32_t		bufferSize;
+	SNDFILE		*filePointer;
+	wavReader	*readerTask;
+	std::atomic<bool>	running;
+public slots:
+	void		setProgress	(int, float);
+};
+
+#endif
+

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

@@ -6,312 +6,204 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>317</width>
- <height>315</height>
+ <width>462</width>
+ <height>440</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>audio description</string>
 </property>
- <widget class="QLabel" name="serviceName">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>70</y>
- <width>151</width>
- <height>20</height>
- </rect>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans Mono</family>
- <pointsize>10</pointsize>
- <weight>75</weight>
- <italic>true</italic>
- <bold>true</bold>
- 
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="subChannelId">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>130</y>
- <width>111</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="startAddress">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>150</y>
- <width>171</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="Length">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>170</y>
- <width>171</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="label">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>190</y>
- <width>101</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>bitRate</string>
- </property>
- </widget>
- <widget class="QLabel" name="protectionLevel">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>210</y>
- <width>161</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="programType">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>230</y>
- <width>161</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="Language">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>250</y>
- <width>181</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_2">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>130</y>
- <width>111</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>subchannel Id</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_3">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>150</y>
- <width>91</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>Start Address</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_4">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>170</y>
- <width>81</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>Length</string>
- </property>
- </widget>
- <widget class="QLabel" name="bitrate">
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>190</y>
- <width>59</width>
- <height>15</height>
- </rect>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_6">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>210</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>Protection level</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_7">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>230</y>
- <width>111</width>
- <height>21</height>
- </rect>
- </property>

_service:download_url:qt-dab-2.7.1.tar.gz/forms/dabradio.ui -> _service:download_url:qt-dab-2.7.4.tar.gz/forms/dabradio.ui Changed

@@ -6,741 +6,787 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>547</width>
- <height>348</height>
+ <width>523</width>
+ <height>388</height>
 </rect>
 </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
 <property name="windowTitle">
- <string>qt-dab</string>
+ <string>Qt-DAB</string>
 </property>
- <widget class="QListView" name="ensembleDisplay">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>90</y>
- <width>171</width>
- <height>251</height>
- </rect>
- </property>
- <property name="font">
- 
- <family>DejaVu Sans</family>
- <pointsize>10</pointsize>
- 
- </property>
- </widget>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>110</y>
- <width>118</width>
- <height>21</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <property name="spacing">
- <number>4</number>
- </property>
- <item>
- <widget class="QLabel" name="syncedLabel">
- <property name="palette">
- <palette>
- <active>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- </active>
- <inactive>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- </inactive>
- <disabled>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>190</red>
- <green>190</green>
- <blue>190</blue>
- </color>
- </brush>
- </colorrole>
- </disabled>
- </palette>
- </property>
- <property name="font">
- 
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indicator for time synchronization&lt;/p&gt;&lt;p&gt;Green means that the software recognizes that there are DAB frames, not necessarily that the software is able to decode the DAB stream.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>Sync</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="stereoLabel">
- <property name="palette">
- <palette>
- <active>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- </active>
- <inactive>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- </inactive>
- <disabled>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>190</red>
- <green>190</green>
- <blue>190</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>190</red>
- <green>190</green>
- <blue>190</blue>
- </color>
- </brush>
- </colorrole>
- </disabled>
- </palette>
- </property>
- <property name="font">
- 
- <pointsize>10</pointsize>
- 
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stereo label&lt;/p&gt;&lt;p&gt;Green means that the program is in stereo.&lt;br/&gt;Red means no audio or mono transmission.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>ST</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QLabel" name="versionName">
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>10</y>
- <width>181</width>

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

@@ -0,0 +1,788 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dabradio</class>
+ <widget class="QWidget" name="dabradio">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>549</width>
+ <height>400</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Qt-DAB</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QWidget" name="leftPane" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qt-DAB copyright:&lt;/p&gt;&lt;p&gt;J van Katwijk, Lazy Chair Computing. J.vanKatwijk@gmail.com&lt;/p&gt;&lt;p&gt;Copyright of the Qt toolkit used: the Qt Company&lt;/p&gt;&lt;p&gt;Copyright of the libraries used for SDRplay, rtl-sdr based sticks, AIRspy, portaudio, libsndfile and libsamplerate and libfftw3 to their developers&lt;/p&gt;&lt;p&gt;Copyright of the MP2 library used Martin J Fiedler&lt;/p&gt;&lt;p&gt;Copyright of the firecode checker: Gnu Radio&lt;/p&gt;&lt;p&gt;Copyright of the Reed Solomon Decoder software: Phil Karns&lt;/p&gt;&lt;p&gt;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>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="versionName">
+ <property name="font">
+ 
+ <pointsize>14</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright (C) 2016 - 2018 Jan van Katwijk (J.vanKatwijk@gmail.com), Lazy Chair Programming&lt;/p&gt;&lt;p&gt;Qt-DAB is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>version</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="ensembleName">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <italic>false</italic>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Ensemble Label</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListView" name="ensembleDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <family>DejaVu Sans</family>
+ <pointsize>10</pointsize>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting a service is by clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;left &lt;/span&gt;mouse button on the name of the service.&lt;/p&gt;&lt;p&gt;Clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;right mouse button on the name of the selected service &lt;/span&gt;in this list will add the service to the presets.&lt;/p&gt;&lt;p&gt;Clicking with the right mouse button on the name of any other of the listed services will show some data on that service.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="presetComboBox" name="presetSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Presets are short cuts to services - possibly in ensembles in different channels - that are obtained by clicking with the &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;right &lt;/span&gt;mouse button on the name of the service &lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;in the list of services when selected&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;Removing a name from the presets is by selecting the service in this combobox and pressing the shift+delete combination.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>presets</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="rightPane" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
+ <property name="text">
+ <string>SNR: </string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLCDNumber" name="snrDisplay">
+ <property name="font">
+ 
+ <pointsize>8</pointsize>
+ <underline>false</underline>
+ 
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A Signal to Noise (SNR) indicator&lt;/p&gt;&lt;p&gt;In general: higher is better. But do not take the value as a serious measure of the SNR, it strongly depends on the device and the amount of filtering applied in the device!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>6</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="font">
+ 
+ <pointsize>11</pointsize>
+ 
+ </property>
+ <property name="text">
+ <string>Offset [Hz]:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLCDNumber" name="correctorDisplay">
+ <property name="font">
+

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

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

_service:download_url:qt-dab-2.7.1.tar.gz/forms/technical_data.ui -> _service:download_url:qt-dab-2.7.4.tar.gz/forms/technical_data.ui Changed

@@ -6,529 +6,418 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>249</width>
- <height>561</height>
+ <width>336</width>
+ <height>602</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>Technical Details</string>
 </property>
- <widget class="QLCDNumber" name="startAddressDisplay">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>130</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="lengthDisplay">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>160</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- <widget class="QLabel" name="language">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>290</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Language (defined by provider)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>language</string>
- </property>
- </widget>
- <widget class="QLabel" name="label">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>130</y>
- <width>141</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Start Address of CU</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_2">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>160</y>
- <width>121</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Used CUs</string>
- </property>
- </widget>
- <widget class="QLabel" name="programType">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>310</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PTY (Program Type)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>programType</string>
- </property>
- </widget>
- <widget class="QLabel" name="l6">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>220</y>
- <width>121</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Bitrate in kBit/s</string>
- </property>
- </widget>
- <widget class="QLCDNumber" name="bitrateDisplay">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>220</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="subChIdDisplay">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>190</y>
- <width>64</width>
- <height>23</height>
- </rect>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
- <widget class="QLabel" name="label_6">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>190</y>
- <width>111</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Subchannel ID</string>
- </property>
- </widget>
- <widget class="QLabel" name="uepField">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>250</y>
- <width>101</width>
- <height>21</height>
- </rect>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shows Protection Level and Type (A or B)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>uepField</string>
- </property>
- </widget>
- <widget class="QLabel" name="ASCTy">
- <property name="geometry">
- <rect>
- <x>120</x>
- <y>270</y>
- <width>101</width>
- <height>21</height>
- </rect>

_service:download_url:qt-dab-2.7.1.tar.gz/i18n/de_DE.qm -> _service:download_url:qt-dab-2.7.4.tar.gz/i18n/de_DE.qm Changed

_service:download_url:qt-dab-2.7.1.tar.gz/i18n/de_DE.ts -> _service:download_url:qt-dab-2.7.4.tar.gz/i18n/de_DE.ts Changed

@@ -42,149 +42,171 @@
 <context>
 <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"/>
+ <location filename="../radio.cpp" line="369"/>
+ <location filename="../radio.cpp" line="985"/>
+ <location filename="../radio.cpp" line="1061"/>
+ <location filename="../radio.cpp" line="1076"/>
+ <location filename="../radio.cpp" line="1091"/>
+ <location filename="../radio.cpp" line="1106"/>
+ <location filename="../radio.cpp" line="1123"/>
+ <location filename="../radio.cpp" line="1139"/>
+ <location filename="../radio.cpp" line="1154"/>
+ <location filename="../radio.cpp" line="1168"/>
+ <location filename="../radio.cpp" line="1183"/>
+ <location filename="../radio.cpp" line="1206"/>
+ <location filename="../radio.cpp" line="1226"/>
+ <location filename="../radio.cpp" line="1248"/>
+ <location filename="../radio.cpp" line="1330"/>
+ <location filename="../radio.cpp" line="1596"/>
+ <location filename="../radio.cpp" line="1913"/>
 <source>Warning</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="354"/>
+ <location filename="../radio.cpp" line="370"/>
 <source>Opening input stream failed
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="936"/>
+ <location filename="../radio.cpp" line="986"/>
 <source>Device will not restart
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1011"/>
+ <location filename="../radio.cpp" line="1062"/>
 <source>Airspy or Airspy mini not found
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1025"/>
+ <location filename="../radio.cpp" line="1077"/>
 <source>hackrf not found
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1041"/>
+ <location filename="../radio.cpp" line="1092"/>
+ <source>no soapy device found
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1107"/>
+ <source>no lime device found
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../radio.cpp" line="1124"/>
 <source>extio: no luck
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1056"/>
+ <location filename="../radio.cpp" line="1140"/>
 <source>rtl_tcp: no luck
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1070"/>
+ <location filename="../radio.cpp" line="1155"/>
 <source>SDRplay: no library or device
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1084"/>
+ <location filename="../radio.cpp" line="1169"/>
 <source>elad-s1: no library or device
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1098"/>
+ <location filename="../radio.cpp" line="1184"/>
 <source>DAB stick not found! Please use one with RTL2832U or similar chipset!
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1107"/>
- <location filename="../radio.cpp" line="1126"/>
- <location filename="../radio.cpp" line="1144"/>
+ <location filename="../radio.cpp" line="1193"/>
+ <location filename="../radio.cpp" line="1214"/>
+ <location filename="../radio.cpp" line="1234"/>
 <source>Open file ...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1109"/>
+ <location filename="../radio.cpp" line="1195"/>
 <source>iq data (*.iq)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1119"/>
- <location filename="../radio.cpp" line="1137"/>
- <location filename="../radio.cpp" line="1157"/>
+ <location filename="../radio.cpp" line="1207"/>
+ <location filename="../radio.cpp" line="1227"/>
+ <location filename="../radio.cpp" line="1249"/>
 <source>file not found</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1128"/>
+ <location filename="../radio.cpp" line="1216"/>
 <source>raw data (*.raw)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1146"/>
- <location filename="../radio.cpp" line="1561"/>
+ <location filename="../radio.cpp" line="1236"/>
+ <location filename="../radio.cpp" line="1659"/>
 <source>raw data (*.sdr)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1264"/>
+ <location filename="../radio.cpp" line="1331"/>
 <source>unknown bitrate for this program
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1295"/>
+ <location filename="../radio.cpp" line="1361"/>
 <source>sdr</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1296"/>
+ <location filename="../radio.cpp" line="1362"/>
 <source>still insufficient data for this service
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1335"/>
- <source>unknown service
+ <location filename="../radio.cpp" line="1914"/>
+ <source>Incorrect preset
 </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1385"/>
- <location filename="../radio.cpp" line="1483"/>
- <location filename="../radio.cpp" line="1559"/>
+ <location filename="../radio.cpp" line="1455"/>
+ <location filename="../radio.cpp" line="1573"/>
+ <location filename="../radio.cpp" line="1657"/>
 <source>Save file ...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1387"/>
+ <location filename="../radio.cpp" line="1457"/>
 <source>PCM wave file (*.wav)</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../radio.cpp" line="1485"/>
+ <location filename="../radio.cpp" line="1576"/>

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

@@ -6,42 +6,38 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>367</width>
- <height>202</height>
+ <width>330</width>
+ <height>201</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>impulse response</string>
 </property>
- <widget class="QwtPlot" name="impulseGrid">
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>20</y>
- <width>321</width>
- <height>131</height>
- </rect>
- </property>
- <property name="toolTip">
- <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>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QwtPlot" name="impulseGrid">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrum display, shows the frequency spectrum from the channel currently being received.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="indexDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter is detected, the relative distance - in msec - is shown between&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>
+ </item>
+ </layout>
 </widget>
 <customwidgets>
 <customwidget>

_service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/audio/faad-decoder.h -> _service:download_url:qt-dab-2.7.4.tar.gz/includes/backend/audio/faad-decoder.h Changed

@@ -28,23 +28,27 @@
 
 class RadioInterface;
 
+typedef struct {
+ int rfa;
+ int dacRate;
+ int sbrFlag;
+ int psFlag;
+ int aacChannelMode;
+ int mpegSurround;
+} stream_parms;
+
+
 class	faadDecoder: public QObject{
 Q_OBJECT
 public:
 faadDecoder (RadioInterface *mr,
 RingBuffer<int16_t> *buffer);
 ~faadDecoder();
-int16_t MP42PCM (uint8_t dacRate,
- uint8_t sbrFlag,
- int16_t mpegSurround,
- uint8_t aacChannelMode,
+int16_t MP42PCM (stream_parms *sp,
 uint8_t buffer [],
 int16_t bufferLength);
 private:
-bool initialize (uint8_t dacRate,
- uint8_t sbrFlag,
- int16_t mpegSurround,
- uint8_t aacChannelMode);
+bool initialize (stream_parms *);
 
 bool processorOK;
 bool aacInitialized;

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

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

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

_service:download_url:qt-dab-2.7.1.tar.gz/includes/backend/backend.h -> _service:download_url:qt-dab-2.7.4.tar.gz/includes/backend/backend.h Changed

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

@@ -46,10 +46,11 @@
 public:
 			mscHandler		(RadioInterface *,
 	 uint8_t,
-	 QString);
+	 QString,
+	 RingBuffer<uint8_t> *);
 			~mscHandler();
-	void		processBlock_0		(std::complex<float> *);
-	void		process_Msc		(std::complex<float> *, int);
+	void		processBlock_0		(DSPCOMPLEX *);
+	void		process_Msc		(DSPCOMPLEX *, int);
 	void		set_Channel		(descriptorType *,
 	 RingBuffer<int16_t> *,
 	 RingBuffer<uint8_t> *);
@@ -65,11 +66,12 @@
 
 	RadioInterface	*myRadioInterface;
 	RingBuffer<uint8_t>	*dataBuffer;
+	RingBuffer<uint8_t>	*frameBuffer;
 	QString		picturesPath;
 	dabParams	params;
 	fftHandler my_fftHandler;
-	std::complex<float> *fft_buffer;
-	std::vector<complex<float>> phaseReference;
+	DSPCOMPLEX	*fft_buffer;
+	std::vector<DSPCOMPLEX> phaseReference;
 
 interLeaver myMapper;
 	QMutex		locker;
@@ -84,7 +86,7 @@
 	int16_t		blockCount;
 	void run();
 std::atomic<bool> running;
- std::vector<std::vector<std::complex<float> > > command;
+ std::vector<std::vector<DSPCOMPLEX> > command;
 int16_t amount;
 int16_t currentBlock;
 void processBlock_0();

_service:download_url:qt-dab-2.7.1.tar.gz/includes/dab-constants.h -> _service:download_url:qt-dab-2.7.4.tar.gz/includes/dab-constants.h Changed

@@ -49,7 +49,25 @@
 #include	"dlfcn.h"
 typedef	void	*HINSTANCE;
 #endif
-
+#ifdef	__HIGH_PRECISION__
+typedef	std::complex<double> DSPCOMPLEX;
+#define FFTW_MALLOC		fftw_malloc
+#define FFTW_PLAN_DFT_1D	fftw_plan_dft_1d
+#define FFTW_DESTROY_PLAN	fftw_destroy_plan
+#define FFTW_FREE		fftw_free
+#define FFTW_PLAN		fftw_plan
+#define FFTW_EXECUTE		fftw_execute
+#define	FFT_COMPLEX		fftw_complex
+#else
+typedef	std::complex<float> DSPCOMPLEX;
+#define FFTW_MALLOC		fftwf_malloc
+#define FFTW_PLAN_DFT_1D	fftwf_plan_dft_1d
+#define FFTW_DESTROY_PLAN	fftwf_destroy_plan
+#define FFTW_FREE		fftwf_free
+#define FFTW_PLAN		fftwf_plan
+#define FFTW_EXECUTE		fftwf_execute
+#define	FFT_COMPLEX		fftwf_complex
+#endif
 
 #ifndef	M_PI
 # define M_PI 3.14159265358979323846 /* pi */
@@ -64,7 +82,7 @@
 #define	MHz(x)		(KHz (x) * 1000)
 #define	mHz(x)		(kHz (x) * 1000)
 
-#define	CURRENT_VERSION	"2.7.1"
+#define	CURRENT_VERSION	"2.7.4"
 
 #define		DAB		0100
 #define		DAB_PLUS	0101
@@ -80,7 +98,7 @@
 #define		UNSYNCED	04
 //
 //	40 up shows good results
-#define		DIFF_LENGTH	40
+#define		DIFF_LENGTH	55
 static inline
 bool	isIndeterminate (float x) {
 	return x != x;
@@ -90,15 +108,14 @@
 bool	isInfinite (float x) {
 	return x == numeric_limits<float>::infinity();
 }
-
 static inline
-std::complex<float> cmul (std::complex<float> x, float y) {
-	return std::complex<float> (real (x) * y, imag (x) * y);
+DSPCOMPLEX cmul (DSPCOMPLEX x, float y) {
+	return DSPCOMPLEX (real (x) * y, imag (x) * y);
 }
 
 static inline
-std::complex<float> cdiv (std::complex<float> x, float y) {
-	return std::complex<float> (real (x) / y, imag (x) / y);
+DSPCOMPLEX cdiv (DSPCOMPLEX x, float y) {
+	return DSPCOMPLEX (real (x) / y, imag (x) / y);
 }
 
 static inline
@@ -134,6 +151,7 @@
 	int16_t	protLevel;
 	int16_t	length;
 	int16_t	bitRate;
+	QString	channel;	// just for presets
 public:
 		descriptorType() {
 	defined		= false;
@@ -166,7 +184,6 @@
 	audiodata() {
 	 type	= AUDIO_SERVICE;
 	}
-	
 };

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

@@ -40,12 +40,12 @@
 		ofdmDecoder		(RadioInterface *,
 	 uint8_t,
 	 int16_t,
-	 RingBuffer<std::complex<float>> * iqBuffer = nullptr);
+	 RingBuffer<std::complex<float>> *iqBuffer = nullptr);
 		~ofdmDecoder();
-	void	processBlock_0		(std::vector<std::complex<float> >);
-	void	decode			(std::vector<std::complex<float> >,
+	void	processBlock_0		(std::vector<DSPCOMPLEX>);
+	void	decode			(std::vector<DSPCOMPLEX>,
 	 int32_t n, int16_t *);
-	int16_t	get_snr			(std::complex<float> *);
+	int16_t	get_snr			(DSPCOMPLEX *);
 	void	stop();
 	void	reset();
 private:
@@ -62,9 +62,9 @@
 	int32_t		nrBlocks;
 	int32_t		carriers;
 	int16_t		getMiddle();
-	std::vector<complex<float>>	phaseReference;
+	std::vector<DSPCOMPLEX>	phaseReference;
 	std::vector<int16_t>		ibits;
-	std::complex<float>	*fft_buffer;
+	DSPCOMPLEX	*fft_buffer;
 	phaseTable	*phasetable;
 	int32_t		blockIndex;
 	int16_t		snrCount;

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

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

@@ -46,25 +46,25 @@
 public:
 			sampleReader	(RadioInterface *mr,
 	 	virtualInput *theRig,
-	 	RingBuffer<std::complex<float>> *spectrumBuffer = nullptr);
+	 	RingBuffer<DSPCOMPLEX> *spectrumBuffer = nullptr);
 
-			~sampleReader();
-		void	setRunning	(bool b);
-		float	get_sLevel();
-		std::complex<float> getSample	(int32_t);
-	 void	getSamples	(std::complex<float> *v,
+				~sampleReader();
+		void		setRunning	(bool b);
+		float		get_sLevel	();
+		DSPCOMPLEX	getSample	(int32_t);
+	 void		getSamples	(DSPCOMPLEX *v,
 	 int32_t n, int32_t phase);
 	 void	startDumping	(SNDFILE *);
 	 void	stopDumping();
 private:
 		RadioInterface	*myRadioInterface;
 		virtualInput	*theRig;
-		RingBuffer<std::complex<float>> *spectrumBuffer;
-		std::vector<std::complex<float>> localBuffer;
+		RingBuffer<DSPCOMPLEX> *spectrumBuffer;
+		std::vector<DSPCOMPLEX> localBuffer;
 		int32_t		localCounter;
 		int32_t		bufferSize;
 		int32_t		currentPhase;
-		std::complex<float>	*oscillatorTable;
+		DSPCOMPLEX	*oscillatorTable;
 		std::atomic<bool>	running;
 		int32_t		bufferContent;
 		float		sLevel;

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

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

_service:download_url:qt-dab-2.7.1.tar.gz/includes/support/fft-handler.h -> _service:download_url:qt-dab-2.7.4.tar.gz/includes/support/fft-handler.h Changed

@@ -28,12 +28,6 @@
 #include	"dab-constants.h"
 #include	"dab-params.h"
 
-#define FFTW_MALLOC		fftwf_malloc
-#define FFTW_PLAN_DFT_1D	fftwf_plan_dft_1d
-#define FFTW_DESTROY_PLAN	fftwf_destroy_plan
-#define FFTW_FREE		fftwf_free
-#define FFTW_PLAN		fftwf_plan
-#define FFTW_EXECUTE		fftwf_execute
 #include <fftw3.h>
 
 /*
@@ -44,27 +38,15 @@
 public:
 		fftHandler	(uint8_t);
 	~fftHandler();
- std::complex<float> *getVector();
+ DSPCOMPLEX	*getVector();
 void		do_FFT();
 void		do_IFFT();
- private:
+private:
 	dabParams	p;
 int32_t		fftSize;
- std::complex<float> *vector;
+ DSPCOMPLEX *vector;
 FFTW_PLAN plan;
 };
 
-class common_ifft {
-public:
-		common_ifft (int32_t);
- 	~common_ifft();
- std::complex<float> *getVector();
- void	do_IFFT();
- private:
- int32_t	fft_size;
- std::complex<float> *vector;
- FFTW_PLAN plan;
- void Scale(std::complex<float> *);
-};
 #endif

_service:download_url:qt-dab-2.7.4.tar.gz/includes/support/preset-handler.h Added

@@ -0,0 +1,53 @@
+#
+/*
+ * Copyright (C) 2014
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Programming
+ *
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef	__PRESET_HANDLER__
+#define	__PRESET_HANDLER__
+#include	<QString>
+#include	<QtXml>
+#include	<QFile>
+#include	<vector>
+#include <QStringList>
+#include <QObject>
+#include <QString>
+
+class RadioInterface;
+class	QComboBox;
+
+typedef struct {
+	QString serviceName;
+	QString channel;
+} presetData;
+
+class	presetHandler: public QObject {
+Q_OBJECT
+public:
+		presetHandler	(RadioInterface *);
+		~presetHandler	();
+	void	loadPresets	(QString, QComboBox *);
+	void	savePresets	(QComboBox *);
+private:
+	RadioInterface	*radio;
+	QString	fileName;
+};
+
+#endif

_service:download_url:qt-dab-2.7.4.tar.gz/includes/support/presetcombobox.h Added

@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (C) 2018 Shie Erlich <krusader@users.sourceforge.net> *
+ * Copyright (C) 2018 Rafi Yanai <krusader@users.sourceforge.net> *
+ * Copyright (C) 2018 Krusader Krew [https://krusader.org] *
+ * *
+ * This file is part of Krusader [https://krusader.org]. *
+ * *
+ * Krusader 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. *
+ * *
+ * Krusader 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 Krusader. If not, see [http://www.gnu.org/licenses/]. *
+ *****************************************************************************/
+#ifndef	__PRESET_COMBOBOX__
+#define	__PRESET_COMBOBOX__
+
+#include	<QComboBox>
+
+class KHBoxEventFilter : public QObject {
+Q_OBJECT
+public:
+	explicit KHBoxEventFilter(QObject *parent = nullptr):
+	 QObject(parent) {}
+
+protected:
+	bool eventFilter(QObject *obj, QEvent *event) override;
+};
+
+//! An event filter for the popup list of a presetComboBox, e.g.
+// it deletes the current item when the user presses Shift+Del
+class KHBoxListEventFilter : public QObject {
+Q_OBJECT
+public:
+ explicit KHBoxListEventFilter (QObject *parent = nullptr):
+	 QObject(parent) {}
+
+protected:
+ bool eventFilter(QObject *obj, QEvent *event) override;
+};
+
+//! A specialized version of a QComboBox, e.g. it deletes the current item when the user presses Shift+Del
+class presetComboBox : public QComboBox {
+Q_OBJECT
+
+public:
+	explicit presetComboBox(QWidget *parent = nullptr);
+
+protected:
+	KHBoxEventFilter boxEF;
+	KHBoxListEventFilter listEF;
+};
+
+#endif

_service:download_url:qt-dab-2.7.1.tar.gz/main.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/main.cpp Changed

@@ -36,7 +36,7 @@
 #include "radio.h"
 
 #define DEFAULT_INI ".qt-dab.ini"
-
+#define	PRESETS		".qt-dab-presets.xml"
 #ifndef	GITHASH
 #define	GITHASH	" "
 #endif
@@ -52,7 +52,7 @@
 
 #ifdef	OSX_INIT_FILE
 	char *PathFile;
-	PathFile = getenv("HOME");
+	PathFile = getenv ("HOME");
 	fileName = PathFile;
 	fileName.append("/.qt-dab.ini");
 	qDebug() << fileName;
@@ -77,6 +77,7 @@
 
 // Default values
 QSettings *dabSettings; // ini file
+QString		presetName	= PRESETS;
 int32_t		dataPort	= 8888;
 int opt;
 
@@ -102,12 +103,17 @@
 
 	dabSettings = new QSettings (initFileName, QSettings::IniFormat);
 
+	QString presets = QDir::homePath();
+	presets. append ("/");
+	presets. append (presetName);
+	presets = QDir::toNativeSeparators (presets);
+
 /*
 * Before we connect control to the gui, we have to
 * instantiate
 */
 #if QT_VERSION >= 0x050600
- QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
+	QGuiApplication::setAttribute (Qt::AA_EnableHighDpiScaling);
 #endif
 
 	QApplication a (argc, argv);
@@ -119,6 +125,7 @@
 	a. setWindowIcon (QIcon (":/qt-dab.ico"));
 
 	MyRadioInterface = new RadioInterface (dabSettings,
+	 presets,
 	 dataPort
 );
 	MyRadioInterface -> show();

_service:download_url:qt-dab-2.7.1.tar.gz/qt-dab-installer.iss -> _service:download_url:qt-dab-2.7.4.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 "2.7"
+#define MyAppVersion "2.7.4"
 #define MyAppPublisher "Lazy Chair Computing"
 #define MyAppURL "https://github.com/JvanKatwijk/qt-dab"
-#define MyAppExeName "qt-dab-2.7.exe";
+#define MyAppExeName "qt-dab-2.7.4.exe";
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -21,8 +21,8 @@
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=C:\Users\JvanK\windows-qt-dab\COPYRIGHT.this_software
-InfoBeforeFile=C:\Users\JvanK\windows-qt-dab\preamble.txt
+LicenseFile=D:\sdr-j-development\windows-qt-dab\COPYRIGHT.this_software
+InfoBeforeFile=D:\sdr-j-development\windows-qt-dab\preamble.txt
 OutputBaseFilename=setup-qt-dab
 Compression=lzma
 SolidCompression=yes
@@ -34,8 +34,8 @@
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Users\JvanK\windows-qt-dab\qt-dab-2.7.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\JvanK\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "D:\sdr-j-development\windows-qt-dab\qt-dab-2.7.4.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
 
 [Icons]
@@ -62,7 +62,7 @@
     if not found 
     then
        begin
-          MsgBox ('Software\MiricsSDR\API not found', mbInformation, MB_OK);
+          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

_service:download_url:qt-dab-2.7.4.tar.gz/qt-dab-presets.png Added

_service:download_url:qt-dab-2.7.4.tar.gz/qt-dab-servicedata.png Added

_service:download_url:qt-dab-2.7.4.tar.gz/qt-dab-x.png Added

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

_service:download_url:qt-dab-2.7.1.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-2.7.4.tar.gz/qt-dab.pro Changed

@@ -5,15 +5,16 @@
 ######################################################################
 
 TEMPLATE	= app
-TARGET		= qt-dab-2.7.1
-QT		+= widgets 
+TARGET		= qt-dab-2.7.4
+QT		+= widgets xml
+#CONFIG		+= console
 CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
-QMAKE_CFLAGS	+=  -flto -ffast-math
-MAKE_CXXFLAGS	+=  -flto -ffast-math
-#QMAKE_CFLAGS	+=  -g
-#QMAKE_CXXFLAGS	+=  -g
-#QMAKE_LFLAGS	+=  -g
+#QMAKE_CFLAGS	+=  -flto -ffast-math
+#MAKE_CXXFLAGS	+=  -flto -ffast-math
+QMAKE_CFLAGS	+=  -g
+QMAKE_CXXFLAGS	+=  -g
+QMAKE_LFLAGS	+=  -g
 QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
 RC_ICONS	=  qt-dab.ico
 RESOURCES	+= resources.qrc
@@ -35,9 +36,6 @@
 	      ./src/support \
 	      ./src/support/viterbi-jan \
 #	      ./src/support/viterbi-handler \
-	      ./devices \
-	      ./devices/rawfiles \
-	      ./devices/wavfiles \
 	      ./includes/ofdm \
 	      ./includes/protection \
 	      ./includes/backend \
@@ -48,8 +46,8 @@
 	      ./includes/output \
 	      ./includes/support \
 	      ./devices \
-	      ./devices/rawfiles \
-	      ./devices/wavfiles \
+	      ./devices/rawfiles-new \
+	      ./devices/wavfiles-new\
 	      ./includes/scopes-qwt6 \
               ./spectrum-viewer \
 	      ./impulse-viewer \
@@ -72,8 +70,8 @@
 	      ./includes/support/viterbi-jan \
 #	      ./includes/support/viterbi-handler \
 	      ./devices \
-	      ./devices/rawfiles \
-	      ./devices/wavfiles \
+	      ./devices/rawfiles-new \
+	      ./devices/wavfiles-new \
 	      ./includes/scopes-qwt6 \
               ./spectrum-viewer \
 	      ./impulse-viewer \
@@ -93,7 +91,7 @@
 	   ./includes/ofdm/phasereference.h \
 	   ./includes/ofdm/phasetable.h \
 	   ./includes/ofdm/freq-interleaver.h \
-	   ./includes/ofdm/tii_table.h \
+#	   ./includes/ofdm/tii_table.h \
 	   ./includes/ofdm/tii_detector.h \
 	   ./includes/ofdm/fic-handler.h \
 	   ./includes/ofdm/fib-decoder.h  \
@@ -145,13 +143,16 @@
 	   ./includes/support/text-mapper.h \
 	   ./includes/support/dab_tables.h \
 	   ./includes/support/ensemble-printer.h \
+	   ./includes/support/preset-handler.h \
+	   ./includes/support/presetcombobox.h \
 	   ./includes/scopes-qwt6/spectrogramdata.h \
 	   ./includes/scopes-qwt6/iqdisplay.h \
 	   ./devices/virtual-input.h \
-	   ./devices/rawfiles/rawfiles.h \
-	   ./devices/rawfiles/raw-reader.h \
-           ./devices/wavfiles/wavfiles.h \
-           ./devices/wavfiles/wav-reader.h \
+	   ./devices/filereader-widget.h \
+	   ./devices/rawfiles-new/rawfiles.h \
+	   ./devices/rawfiles-new/raw-reader.h \
+           ./devices/wavfiles-new/wavfiles.h \
+           ./devices/wavfiles-new/wav-reader.h \
 	   ./spectrum-viewer/spectrum-viewer.h \
 	   ./impulse-viewer/impulse-viewer.h \
 	   ./tii-viewer/tii-viewer.h
@@ -163,7 +164,7 @@
 FORMS	+= ./spectrum-viewer/scopewidget.ui
 FORMS	+= ./impulse-viewer/impulse-widget.ui
 FORMS	+= ./tii-viewer/tii-widget.ui
-FORMS	+= ./devices/filereader-widget.ui 
+#FORMS	+= ./devices/filereader-widget.ui 
 
 SOURCES += ./main.cpp \
 	   ./radio.cpp \
@@ -176,7 +177,7 @@
 	   ./src/ofdm/phasereference.cpp \
 	   ./src/ofdm/phasetable.cpp \
 	   ./src/ofdm/freq-interleaver.cpp \
-	   ./src/ofdm/tii_table.cpp \
+#	   ./src/ofdm/tii_table.cpp \
 	   ./src/ofdm/tii_detector.cpp \
 	   ./src/ofdm/fic-handler.cpp \
 	   ./src/ofdm/fib-decoder.cpp  \
@@ -225,12 +226,14 @@
 	   ./src/support/text-mapper.cpp \
 	   ./src/support/dab_tables.cpp \
 	   ./src/support/ensemble-printer.cpp \
+	   ./src/support/preset-handler.cpp \
+	   ./src/support/presetcombobox.cpp \
 	   ./src/scopes-qwt6/iqdisplay.cpp \
 	   ./devices/virtual-input.cpp \
-	   ./devices/rawfiles/rawfiles.cpp \
-	   ./devices/rawfiles/raw-reader.cpp \
-           ./devices/wavfiles/wavfiles.cpp \
-           ./devices/wavfiles/wav-reader.cpp \
+	   ./devices/rawfiles-new/rawfiles.cpp \
+	   ./devices/rawfiles-new/raw-reader.cpp \
+           ./devices/wavfiles-new/wavfiles.cpp \
+           ./devices/wavfiles-new/wav-reader.cpp \
 	   ./spectrum-viewer/spectrum-viewer.cpp \
 	   ./impulse-viewer/impulse-viewer.cpp \
 	   ./tii-viewer/tii-viewer.cpp
@@ -251,7 +254,7 @@
 
 INCLUDEPATH	+= /usr/local/include
 INCLUDEPATH	+= /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
-LIBS		+= -lfftw3f  -lusb-1.0 -ldl  #
+LIBS		+= -lfftw3f  -lfftw3 -lusb-1.0 -ldl  #
 LIBS		+= -lportaudio
 LIBS		+= -lz
 LIBS		+= -lsndfile
@@ -265,11 +268,11 @@
 # (you obviously have libraries installed for the selected ones)
 CONFIG		+= dabstick
 CONFIG		+= sdrplay
+CONFIG		+= lime
 CONFIG		+= rtl_tcp
 CONFIG		+= airspy
 CONFIG		+= hackrf
 #CONFIG		+= soapy
-CONFIG		+= lime
 #CONFIG		+= elad_s1	# does not work yet
 
 #very experimental, simple server for connecting to a tdc handler
@@ -285,9 +288,9 @@
 #comment both out if you just want to use the "normal" way
 
 CONFIG		+= try-epg		# do not use
-DEFINES		+= MSC_DATA__		# use at your own risk
 DEFINES		+= PRESET_NAME
 DEFINES		+= __THREADED_BACKEND
+DEFINES		+= __HIGH_PRECISION__
 #DEFINES	+= SHOW_MISSING
 
 # you might select SSE if you are compiling on a x64 with SSE support
@@ -328,7 +331,7 @@
 INCLUDEPATH	+= /mingw32/include/qwt
 LIBS		+= -L/usr/i686-w64-mingw32/sys-root/mingw/lib
 LIBS		+= -lfaad
-LIBS		+= -lfftw3f
+LIBS		+= -lfftw3f -lfftw3
 LIBS		+= -lportaudio
 LIBS		+= -lsndfile
 LIBS		+= -lsamplerate
@@ -362,16 +365,10 @@
 #CONFIG		+= qt-audio
 #comment both out if you just want to use the "normal" way
 
-#and certainly, you do not want this
 CONFIG		+= try-epg		# do not use
-
-#you do not want this
-DEFINES		+= MSC_DATA__		# use at your own risk
-
-#and this one is experimental
 DEFINES		+= PRESET_NAME
+DEFINES		+= __HIGH_PRECISION__
 }
-
 #	devices
 #
 #	dabstick
@@ -385,13 +382,14 @@
 	                   ./devices/rtlsdr-handler/rtl-dongleselect.cpp
 	FORMS		+= ./devices/rtlsdr-handler/rtlsdr-widget.ui
 }
+
 #
 #	the SDRplay
 #
 sdrplay {
 	DEFINES		+= HAVE_SDRPLAY
-	DEPENDPATH	+= ./devices/sdrplay-handler 
-	INCLUDEPATH	+= ./devices/sdrplay-handler 
+	DEPENDPATH	+= ./devices/sdrplay-handler
+	INCLUDEPATH	+= ./devices/sdrplay-handler
 	HEADERS		+= ./devices/sdrplay-handler/sdrplay-handler.h \
 	                   ./devices/sdrplay-handler/sdrplayselect.h
 	SOURCES		+= ./devices/sdrplay-handler/sdrplay-handler.cpp \

_service:download_url:qt-dab-2.7.1.tar.gz/radio.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/radio.cpp Changed

@@ -95,7 +95,7 @@
 bool get_cpu_times (size_t &idle_time, size_t &total_time) {
 	const std::vector <size_t> cpu_times = get_cpu_times();
 	if (cpu_times. size() < 4)
- return false;
+	 return false;
 	idle_time = cpu_times [3];
 	total_time = std::accumulate (cpu_times. begin(), cpu_times. end(), 0);
 	return true;
@@ -108,9 +108,11 @@
 */
 
 	RadioInterface::RadioInterface (QSettings	*Si,
+	 QString		presetFile,
 	 int32_t		dataPort,
 	 QWidget		*parent):
-	 QMainWindow (parent) {
+	 QWidget (parent),
+	 my_presetHandler (this) {
 int16_t	latency;
 int16_t k;
 QString h;
@@ -121,11 +123,12 @@
 	tiiSwitch		= false;
 	isSynced		= UNSYNCED;
 	dabBand			= BAND_III;
- spectrumBuffer = new RingBuffer<std::complex<float>> (2 * 32768);
+	spectrumBuffer = new RingBuffer<DSPCOMPLEX> (2 * 32768);
 	iqBuffer		= new RingBuffer<std::complex<float>> (2 * 1536);
 	responseBuffer		= new RingBuffer<float> (32768);
-	tiiBuffer		= new RingBuffer<std::complex<float>> (32768);
+	tiiBuffer		= new RingBuffer<DSPCOMPLEX> (32768);
 	audioBuffer		= new RingBuffer<int16_t>(16 * 32768);
+	frameBuffer		= new RingBuffer<uint8_t> (32768);
 
 /**	threshold is used in the phaseReference class 
 *	as threshold for checking the validity of the correlation result
@@ -148,6 +151,8 @@
 	if (tii_delay < 5)
 	 tii_delay = 5;
 
+	switchTime	=
+	 dabSettings -> value ("switch_time", 10000). toInt ();
 	dataBuffer		= new RingBuffer<uint8_t>(32768);
 ///	The default, most likely to be overruled
 #ifdef	_SEND_DATAGRAM_
@@ -161,7 +166,7 @@
 	currentName		= QString ("");
 
 	saveSlides	= dabSettings -> value ("saveSlides", 1). toInt();
-	showSlides	= dabSettings -> value ("showPictures", 1). toInt();
+	showSlides	= dabSettings -> value ("showSlides", 1). toInt();
 	if (saveSlides != 0)
 	 set_picturePath();
 
@@ -219,12 +224,12 @@
 //
 //	restore some settings from previous incarnations
 	QString t =
- dabSettings -> value ("dabBand", "VHF Band III"). toString();
- dabBand = t == "VHF Band III" ? BAND_III : L_BAND;
+	 dabSettings -> value ("dabBand", "VHF Band III"). toString();
+	dabBand = t == "VHF Band III" ? BAND_III : L_BAND;
 
- theBand. setupChannels (channelSelector, dabBand);
+	theBand. setupChannels (channelSelector, dabBand);
 
- dabMode = dabSettings -> value ("dabMode", "Mode 1"). toString();
+	dabMode = dabSettings -> value ("dabMode", "Mode 1"). toString();
 //
 	QPalette p	= techData. ficError_display -> palette();
 	p. setColor (QPalette::Highlight, Qt::green);
@@ -235,20 +240,21 @@
 	techData. rsError_display	-> hide();
 	techData. aacError_display	-> hide();
 	techData. motAvailable		-> 
- setStyleSheet ("QLabel {background-color : red}");
+	 setStyleSheet ("QLabel {background-color : red}");
 	techData. fmLabel		-> hide();
 	techData. fmFrequency		-> hide();
 //
 //
 	sourceDumping		= false;
 	dumpfilePointer		= nullptr;
+	frameDumper		= nullptr;
 	audioDumping		= false;
 	audiofilePointer	= nullptr;
 	ficBlocks		= 0;
 	ficSuccess		= 0;
 	pictureLabel		= nullptr;
 	syncedLabel		->
-	 setStyleSheet ("QLabel {background-color : red}");
+	 setStyleSheet ("QLabel {background-color : red; color: white}");
 
 	ensemble.setStringList (Services);
 	ensembleDisplay	-> setModel (&ensemble);
@@ -258,11 +264,12 @@
 //
 	connect (streamoutSelector, SIGNAL (activated (int)),
 	 this, SLOT (set_streamSelector (int)));
+	my_presetHandler. loadPresets (presetFile, presetSelector);
 //	
 //	display the version
 	QString v = "Qt-DAB -" + QString (CURRENT_VERSION);
 	QString versionText = "qt-dab version: " + QString(CURRENT_VERSION);
- versionText += " Build on: " + QString(__TIMESTAMP__) + QString (" ") + QString (GITHASH);
+	versionText += " Build on: " + QString(__TIMESTAMP__) + QString (" ") + QString (GITHASH);
 	versionName	-> setText (v);
 	versionName	-> setToolTip (versionText);
 
@@ -312,13 +319,13 @@
 	ensembleAvailable	= false;
 	inputDevice	= nullptr;
 	h =
- dabSettings -> value ("device", "no device"). toString();
+	 dabSettings -> value ("device", "no device"). toString();
 	k = deviceSelector -> findText (h);
 //	fprintf (stderr, "%d %s\n", k, h. toUtf8(). data());
- if (k != -1) {
- deviceSelector -> setCurrentIndex (k);
- inputDevice	= setDevice (deviceSelector -> currentText());
- }
+	if (k != -1) {
+	 deviceSelector -> setCurrentIndex (k);
+	 inputDevice	= setDevice (deviceSelector -> currentText());
+	}
 	
 	my_dabProcessor	= nullptr;
 //	if a device was selected, we just start, otherwise
@@ -332,8 +339,8 @@
 	currentService	= nullptr;
 }
 
-
 void	RadioInterface::doStart (QString dev) {
+	(void)dev;
 	inputDevice = setDevice	(deviceSelector -> currentText());
 	if (inputDevice == nullptr) {
 //	just in case someone wants to push all those nice buttons that
@@ -351,13 +358,13 @@
 int32_t	frequency;
 
 	QString h = dabSettings -> value ("channel", "12C"). toString();
- int k = channelSelector -> findText (h);
- if (k != -1) {
- channelSelector -> setCurrentIndex (k);
- }
+	int k = channelSelector -> findText (h);
+	if (k != -1) {
+	 channelSelector -> setCurrentIndex (k);
+	}
 	frequency	= theBand. Frequency (dabBand,
 	 channelSelector -> currentText());
- inputDevice -> setVFOFrequency (frequency);
+	inputDevice -> setVFOFrequency (frequency);
 	r = inputDevice		-> restartReader();
 	qDebug ("Starting %d\n", r);
 	if (!r) {
@@ -374,18 +381,20 @@
 //	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
+	connect (presetSelector, SIGNAL (activated (QString)),
+	 this, SLOT (handle_presetSelector (QString)));
 	connect (channelSelector, SIGNAL (activated (const QString &)),
-	 this, SLOT (selectChannel (const QString &)));
+	 this, SLOT (selectChannel_usingSelector (const QString &)));
 //	and we connect the deviceSelector to a handler
 	disconnect (deviceSelector, SIGNAL (activated (QString)),
- this, SLOT (doStart (QString)));
+	 this, SLOT (doStart (QString)));
 //
 //	Just to be sure we disconnect here.
 //	It would have been helpful to have a function
 //	testing whether or not a connection exists, we need a kind
 //	of "reset"
 	disconnect (deviceSelector, SIGNAL (activated (QString)),
- this, SLOT (newDevice (QString)));
+	 this, SLOT (newDevice (QString)));
 
 	connect (deviceSelector, SIGNAL (activated (QString)),
 	 this, SLOT (newDevice (QString)));
@@ -403,7 +412,8 @@
 	 responseBuffer,
 	 spectrumBuffer,
 	 iqBuffer,
-	 tiiBuffer
+	 tiiBuffer,
+	 frameBuffer
 	 );
 
 	if (has_presetName && (presetName != QString (""))) {
@@ -500,6 +510,8 @@
 	if (!running. load())
 	 return;
 	presetTimer. stop();
+	connect (&presetTimer, SIGNAL (timeout (void)),
+	 this, SLOT (setPresetStation (void)));
 	setStereo (false);
 	if (!running. load())

_service:download_url:qt-dab-2.7.1.tar.gz/radio.h -> _service:download_url:qt-dab-2.7.4.tar.gz/radio.h Changed

@@ -43,6 +43,7 @@
 #ifdef	DATA_STREAMER
 #include	"tcp-server.h"
 #endif
+#include	"preset-handler.h"
 class	QSettings;
 class	virtualInput;
 class	audioBase;
@@ -55,12 +56,13 @@
 class	tiiViewer;
 /*
 *	GThe main gui object. It inherits from
- *	QDialog and the generated form
+ *	QWidget and the generated form
 */
-class RadioInterface: public QMainWindow, private Ui_dabradio {
+class RadioInterface: public QWidget, private Ui_dabradio {
 Q_OBJECT
 public:
 		RadioInterface		(QSettings	*,
+	 QString	,
 	 int32_t	 dataPort,
 	 QWidget	*parent = nullptr);
 		~RadioInterface();
@@ -68,6 +70,8 @@
 protected:
 	bool	eventFilter (QObject *obj, QEvent *event);
 private:
+	presetHandler	my_presetHandler;
+	int		switchTime;
 	QSettings	*dabSettings;
 	int16_t		tii_delay;
 	int32_t dataPort;
@@ -89,6 +93,7 @@
 	void		showButtons();
 	virtualInput	*setDevice		(QString);
 
+	RingBuffer<uint8_t>	*frameBuffer;
 	std::vector<int> secondariesVector;
 	QString		dabMode;
 	uint8_t		dabBand;
@@ -122,6 +127,7 @@
 	void		stop_sourceDumping();
 	bool		sourceDumping;
 	SNDFILE		*dumpfilePointer;
+	FILE		*frameDumper;
 	bool		audioDumping;
 	SNDFILE		*audiofilePointer;
 	QStringList	soundChannels;
@@ -141,12 +147,12 @@
 	void		connectGUI();
 	void		disconnectGUI();
 spectrumViewer *my_spectrumViewer;
-	RingBuffer<std::complex<float>> *spectrumBuffer;
+	RingBuffer<DSPCOMPLEX> *spectrumBuffer;
 	RingBuffer<std::complex<float>> *iqBuffer;
 	impulseViewer		*my_impulseViewer;
 	RingBuffer<float>	*responseBuffer;
 	tiiViewer		*my_tiiViewer;
-	RingBuffer<std::complex<float>> *tiiBuffer;
+	RingBuffer<DSPCOMPLEX> *tiiBuffer;
 
 	QString		picturesPath;
 public slots:
@@ -190,6 +196,7 @@
 	void		showTime		(const QString &);
 	void		startAnnouncement	(const QString &, int);
 	void		stopAnnouncement	(const QString &, int);
+	void		newFrame		(int);
 //	Somehow, these must be connected to the GUI
 private slots:
 	void		set_nextChannel();
@@ -197,6 +204,7 @@
 	void		doStart			(QString);
 	void		doStart();
 	void		TerminateProcess();
+	void		selectChannel_usingSelector	(QString);
 	void		selectChannel		(QString);
 	void		updateTimeDisplay();
 	void		signalTimer_out();
@@ -213,6 +221,9 @@
 	void		set_tiiSwitch();
 	void		set_irSwitch();
 	void		set_spectrumSwitch();
+	void		select_presetService 	(QString, QString);
+	void		handle_presetSelector	(QString);
+	void		set_frameDump	();
 };
 #endif

_service:download_url:qt-dab-2.7.4.tar.gz/script-for-debian Added

@@ -0,0 +1,40 @@
+
+   sudo apt-get update
+   sudo apt-get install git cmake
+   sudo apt-get install qt5-qmake build-essential g++
+   sudo apt-get install libsndfile1-dev qt5-default
+   sudo apt-get install libfftw3-dev portaudio19-dev 
+   sudo apt-get install libfaad-dev zlib1g-dev rtl-sdr
+   sudo apt-get install libusb-1.0-0-dev mesa-common-dev
+   sudo apt-get install libgl1-mesa-dev libqt5opengl5-dev
+   sudo apt-get install libsamplerate0-dev libqwt-qt5-dev
+   sudo apt-get install qtbase5-dev
+   git clone git://git.osmocom.org/rtl-sdr.git
+   cd rtl-sdr/
+   mkdir build
+   cd build
+   cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
+   make
+   sudo make install
+   sudo ldconfig
+   cd ..
+   rm -rf build
+   cd ..
+   sudo apt-get install build-essential cmake libusb-1.0-0-dev pkg-config
+   wget https://github.com/airspy/host/archive/master.zip
+   unzip master.zip
+   cd airspyone_host-master
+   mkdir build
+   cd build
+   cmake ../ -DINSTALL_UDEV_RULES=ON
+   make
+   sudo make install
+   sudo ldconfig
+   cd ..
+   rm -rf build
+   cd ..
+   git clone https://github.com/JvanKatwijk/qt-dab.git
+   cd qt-dab
+   qmake qt-dab.pro
+   make
+

_service:download_url:qt-dab-2.7.1.tar.gz/script-ubuntu -> _service:download_url:qt-dab-2.7.4.tar.gz/script-ubuntu Changed

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

@@ -6,106 +6,76 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>612</width>
- <height>208</height>
+ <width>620</width>
+ <height>211</height>
 </rect>
 </property>
 <property name="windowTitle">
- <string>DAB signal</string>
+ <string>spectrumscope</string>
 </property>
- <widget class="QwtPlot" name="dabScope">
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>20</y>
- <width>361</width>
- <height>161</height>
- </rect>
- </property>
- <property name="toolTip">
- <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="QSlider" name="scopeAmplification">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>20</width>
- <height>171</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom in/out&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="value">
- <number>50</number>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- <widget class="QwtPlot" name="iqDisplay">
- <property name="geometry">
- <rect>
- <x>410</x>
- <y>20</y>
- <width>181</width>
- <height>111</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram, obtained from the first data block in a DAB frame. What is shown are the constellations of the carriers in the decoded OFDM symbol. &lt;/p&gt;&lt;p&gt;In DAB the bits are encoded as (1, 1), (1, -1), (-1, -1) and (1,1), so ideally there are 4 points, one in each corner. The quality of the signal is inverse to the clouds that are visible. The number indicated below this &amp;quot;cloud picture&amp;quot; shows the standard deviation of the dots on the cloud(s).&lt;/p&gt;&lt;p&gt;Hint: Lots of clouds mean poor signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- <widget class="QSlider" name="scopeSlider">
- <property name="geometry">
- <rect>
- <x>430</x>
- <y>140</y>
- <width>171</width>
- <height>24</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom in/out&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="value">
- <number>20</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- <widget class="QLCDNumber" name="quality_display">
- <property name="geometry">
- <rect>
- <x>450</x>
- <y>170</y>
- <width>81</width>
- <height>23</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality indicator (experimental). The number shows the standard phase deviation of the decoded signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="digitCount">
- <number>7</number>
- </property>
- <property name="segmentStyle">
- <enum>QLCDNumber::Flat</enum>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QSlider" name="scopeAmplification">
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="dabScope">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QwtPlot" name="iqDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLCDNumber" name="quality_display"/>
+ </item>
+ <item>
+ <widget class="QSlider" name="scopeSlider">
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
 </widget>
 <customwidgets>
 <customwidget>
 <class>QwtPlot</class>
 <extends>QFrame</extends>
 <header>qwt_plot.h</header>
- <container>1</container>
 </customwidget>
 </customwidgets>
 <resources/>

_service:download_url:qt-dab-2.7.4.tar.gz/spectrum-viewer/scopewidget.ui-old Added

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>scopeWidget</class>
+ <widget class="QWidget" name="scopeWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>697</width>
+ <height>211</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>DAB signal</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QSlider" name="scopeAmplification">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom in/out&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="dabScope">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrum display, shows the frequency spectrum from the channel currently being received.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QwtPlot" name="iqDisplay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram, obtained from the first data block in a DAB frame. What is shown are the constellations of the carriers in the decoded OFDM symbol. &lt;/p&gt;&lt;p&gt;In DAB the bits are encoded as (1, 1), (1, -1), (-1, -1) and (1,1), so ideally there are 4 points, one in each corner. The quality of the signal is inverse to the clouds that are visible. The number indicated below this &amp;quot;cloud picture&amp;quot; shows the standard deviation of the dots on the cloud(s).&lt;/p&gt;&lt;p&gt;Hint: Lots of clouds mean poor signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLCDNumber" name="quality_display">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality indicator (experimental). The number shows the standard phase deviation of the decoded signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>7</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="scopeSlider">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom in/out&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="value">
+ <number>20</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>QwtPlot</class>
+ <extends>QFrame</extends>
+ <header>qwt_plot.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-2.7.4.tar.gz/spectrum-viewer/scopewidget.ui-xxx Added

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>scopeWidget</class>
+ <widget class="QWidget" name="scopeWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>612</width>
+ <height>284</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>DAB signal</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QSlider" name="scopeAmplification">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom in/out&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="dabScope">
+ <property name="toolTip">
+ <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>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QwtPlot" name="iqDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constellation diagram, obtained from the first data block in a DAB frame. What is shown are the constellations of the carriers in the decoded OFDM symbol. &lt;/p&gt;&lt;p&gt;In DAB the bits are encoded as (1, 1), (1, -1), (-1, -1) and (1,1), so ideally there are 4 points, one in each corner. The quality of the signal is inverse to the clouds that are visible. The number indicated below this &amp;quot;cloud picture&amp;quot; shows the standard deviation of the dots on the cloud(s).&lt;/p&gt;&lt;p&gt;Hint: Lots of clouds mean poor signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLCDNumber" name="quality_display">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quality indicator (experimental). The number shows the standard phase deviation of the decoded signal.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="digitCount">
+ <number>7</number>
+ </property>
+ <property name="segmentStyle">
+ <enum>QLCDNumber::Flat</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="scopeSlider">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom in/out&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="value">
+ <number>20</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>QwtPlot</class>
+ <extends>QFrame</extends>
+ <header>qwt_plot.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-2.7.1.tar.gz/spectrum-viewer/spectrum-viewer.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/spectrum-viewer/spectrum-viewer.cpp Changed

@@ -27,7 +27,7 @@
 
 	spectrumViewer::spectrumViewer	(RadioInterface	*mr,
 	 QSettings	*dabSettings,
-	 RingBuffer<std::complex<float>> *sbuffer,
+	 RingBuffer<DSPCOMPLEX> *sbuffer,
 	 RingBuffer<std::complex<float>>* ibuffer) {
 int16_t	i;
 QString	colorString	= "black";
@@ -57,12 +57,11 @@
 	displayBuffer. resize (displaySize);
 	memset (displayBuffer. data(), 0, displaySize * sizeof (double));
 	this	-> spectrumSize	= 4 * displaySize;
-	spectrum		= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
- plan = fftwf_plan_dft_1d (spectrumSize,
- reinterpret_cast <fftwf_complex *>(spectrum),
- reinterpret_cast <fftwf_complex *>(spectrum),
+	spectrum		= (DSPCOMPLEX *)FFTW_MALLOC (sizeof (FFT_COMPLEX) * spectrumSize);
+ plan = FFTW_PLAN_DFT_1D (spectrumSize,
+ reinterpret_cast <FFT_COMPLEX *>(spectrum),
+ reinterpret_cast <FFT_COMPLEX *>(spectrum),
 FFTW_FORWARD, FFTW_ESTIMATE);
-	
 	plotgrid		= dabScope;
 	plotgrid	-> setCanvasBackground (displayColor);
 	grid			= new QwtPlotGrid;
@@ -106,8 +105,8 @@
 }
 
 	spectrumViewer::~spectrumViewer() {
-	fftwf_destroy_plan (plan);
-	fftwf_free	(spectrum);
+	FFTW_DESTROY_PLAN (plan);
+	FFTW_FREE	(spectrum);
 	myFrame		-> hide();
 	delete		Marker;
 	delete		ourBrush;
@@ -145,8 +144,7 @@
 //	get the buffer data
 	for (i = 0; i < spectrumSize; i ++)
 	 spectrum [i] = cmul (spectrum [i], Window [i]);
-
-	fftwf_execute (plan);
+	FFTW_EXECUTE (plan);
 //
 //	and map the spectrumSize values onto displaySize elements
 	for (i = 0; i < displaySize / 2; i ++) {

_service:download_url:qt-dab-2.7.1.tar.gz/spectrum-viewer/spectrum-viewer.h -> _service:download_url:qt-dab-2.7.4.tar.gz/spectrum-viewer/spectrum-viewer.h Changed

_service:download_url:qt-dab-2.7.4.tar.gz/spectrum-viewer/untitled.ui Added

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>521</width>
+ <height>216</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QWidget" name="layoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>10</y>
+ <width>471</width>
+ <height>191</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetNoConstraint</enum>
+ </property>
+ <item>
+ <widget class="QSlider" name="verticalSlider">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="qwtPlot"/>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetNoConstraint</enum>
+ </property>
+ <item>
+ <widget class="QwtPlot" name="qwtPlot_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLCDNumber" name="lcdNumber">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="horizontalSlider">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>QwtPlot</class>
+ <extends>QFrame</extends>
+ <header>qwt_plot.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

_service:download_url:qt-dab-2.7.1.tar.gz/src/backend/audio/faad-decoder.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/src/backend/audio/faad-decoder.cpp Changed

@@ -54,10 +54,7 @@
         }
 }
 
-bool    faadDecoder::initialize (uint8_t        dacRate,
-                                 uint8_t        sbrFlag,
-                                 int16_t        mpegSurround,
-                                 uint8_t        aacChannelMode) {
+bool    faadDecoder::initialize (stream_parms	*sp) {
 long unsigned int sample_rate;
 uint8_t channels;
 /* AudioSpecificConfig structure (the only way to select 960 transform here!)
@@ -78,13 +75,14 @@
  */
 
         int core_sr_index =
-                     dacRate ? (sbrFlag ? 6 : 3) :
-                               (sbrFlag ? 8 : 5);   // 24/48/16/32 kHz
-        int core_ch_config = get_aac_channel_configuration (mpegSurround,
-                                                            aacChannelMode);
+               sp -> dacRate ? (sp -> sbrFlag ? 6 : 3) :
+                               (sp -> sbrFlag ? 8 : 5);   // 24/48/16/32 kHz
+        int core_ch_config =
+	           get_aac_channel_configuration (sp -> mpegSurround,
+                                                  sp ->aacChannelMode);
         if (core_ch_config == -1) {
            printf ("Unrecognized mpeg surround config (ignored): %d\n",
-                                               mpegSurround);
+                                               sp -> mpegSurround);
            return false;
         }
 
@@ -106,10 +104,7 @@
         return true;
 }
 
-int16_t faadDecoder::MP42PCM (uint8_t   dacRate,
-                              uint8_t   sbrFlag,
-                              int16_t   mpegSurround,
-                              uint8_t   aacChannelMode,
+int16_t faadDecoder::MP42PCM (stream_parms *sp,
                               uint8_t   buffer [],
                               int16_t   bufferLength) {
 int16_t samples;
@@ -119,7 +114,7 @@
 uint8_t channels;
 
         if (!aacInitialized) {
-           if (!initialize (dacRate, sbrFlag, mpegSurround, aacChannelMode))
+           if (!initialize (sp))
               return 0;
            aacInitialized = true;
         }

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

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

@@ -41,12 +41,14 @@
 	mp4Processor::mp4Processor (RadioInterface	*mr,
 	 int16_t	bitRate,
 	 RingBuffer<int16_t> *b,
+	 RingBuffer<uint8_t> *frameBuffer,
 	 QString	picturesPath)
 	 :my_padhandler (mr, picturesPath),
 	 my_rsDecoder (8, 0435, 0, 1, 10),
 	 aacDecoder (mr, b) {
 
 	myRadioInterface	= mr;
+	this	-> frameBuffer	= frameBuffer;
 	connect (this, SIGNAL (show_frameErrors (int)),
 	 mr, SLOT (show_frameErrors (int)));
 	connect (this, SIGNAL (show_rsErrors (int)),
@@ -55,6 +57,9 @@
 	 mr, SLOT (show_aacErrors (int)));
 	connect (this, SIGNAL (isStereo (bool)),
 	 mr, SLOT (setStereo (bool)));
+	connect (this, SIGNAL (newFrame (int)),
+	 mr, SLOT (newFrame (int)));
+
 	this	-> bitRate	= bitRate;	// input rate
 
 	superFramesize		= 110 * (bitRate / 8);
@@ -148,12 +153,8 @@
 int16_t		i, j, k;
 uint8_t		rsIn	[120];
 uint8_t		rsOut	[110];
-uint8_t		dacRate;
-uint8_t		sbrFlag;
-uint8_t		aacChannelMode;
-uint8_t		psFlag;
-uint16_t	mpegSurround;
 int32_t		tmp;
+stream_parms streamParameters;
 
 /**
 *	apply reed-solomon error repar
@@ -177,14 +178,13 @@
 
 //	bits 0 .. 15 is firecode
 //	bit 16 is unused
-	dacRate		= (outVector [2] >> 6) & 01;	// bit 17
-	sbrFlag		= (outVector [2] >> 5) & 01;	// bit 18
-	aacChannelMode	= (outVector [2] >> 4) & 01;	// bit 19
-	psFlag		= (outVector [2] >> 3) & 01;	// bit 20
-	(void)psFlag;
-	mpegSurround	= (outVector [2] & 07);		// bits 21 .. 23
+	streamParameters. dacRate = (outVector [2] >> 6) & 01;	// bit 17
+	streamParameters. sbrFlag = (outVector [2] >> 5) & 01;	// bit 18
+	streamParameters. aacChannelMode = (outVector [2] >> 4) & 01;	// bit 19
+	streamParameters. psFlag = (outVector [2] >> 3) & 01;	// bit 20
+	streamParameters. mpegSurround	= (outVector [2] & 07);	// bits 21 .. 23
 
-	switch (2 * dacRate + sbrFlag) {
+	switch (2 * streamParameters. dacRate + streamParameters. sbrFlag) {
 	 default:		// cannot happen
 	 case 0:
 	 num_aus = 4;
@@ -261,6 +261,19 @@
 	 uint8_t L1	= buffer [count - 2];
 	 my_padhandler. processPAD (buffer, count - 3, L1, L0);
 	 }
+
+	 uint8_t fileBuffer [1024];
+	 buildHeader (aac_frame_length, &streamParameters, fileBuffer);
+	 memcpy (&fileBuffer [7],
+	 &outVector [au_start [i]],
+ aac_frame_length);
+	 frameBuffer -> putDataIntoBuffer (fileBuffer, 
+	 aac_frame_length + 7);
+	 newFrame (aac_frame_length + 7);
+//	 if (soundOut != nullptr)
+//	 (soundOut)((int16_t *)(&fileBuffer [0]),
+//	 aac_frame_length + 7, 0, false, nullptr);
+
 //
 //	then handle the audio
 
@@ -270,14 +283,11 @@
 	 &outVector [au_start [i]], aac_frame_length);
 	 memset (&theAudioUnit [aac_frame_length], 0, 10);
 
-	 tmp = aacDecoder. MP42PCM (dacRate,
-	 sbrFlag,
-	 mpegSurround,
-	 aacChannelMode,
-	 theAudioUnit,
-	 aac_frame_length);
+	 tmp = aacDecoder. MP42PCM (&streamParameters,
+	 theAudioUnit,
+	 aac_frame_length);
 	 err	= tmp == 0;
-	 emit isStereo (!err);
+	 emit isStereo (streamParameters. aacChannelMode);
 	 if (err) 
 	 aacErrors ++;
 	 if (++aacFrames > 25) {
@@ -294,3 +304,82 @@
 	return true;
 }
 
+void	mp4Processor::buildHeader (int16_t framelen,
+	 stream_parms *sp,
+	 uint8_t *header) {
+	struct adts_fixed_header {
+		unsigned : 4;
+		unsigned home : 1;
+		unsigned orig : 1;
+		unsigned channel_config : 3;
+		unsigned private_bit : 1;
+		unsigned sampling_freq_index : 4;
+		unsigned profile : 2;
+		unsigned protection_absent : 1;
+		unsigned layer : 2;
+		unsigned id : 1;
+		unsigned syncword : 12;
+	} fh;
+	struct adts_variable_header {
+		unsigned : 4;
+		unsigned num_raw_data_blks_in_frame : 2;
+		unsigned adts_buffer_fullness : 11;
+		unsigned frame_length : 13;
+		unsigned copyright_id_start : 1;
+		unsigned copyright_id_bit : 1;
+	} vh;
+	/* 32k 16k 48k 24k */
+	const unsigned short samptab[] = {0x5, 0x8, 0x3, 0x6};
+
+	fh. syncword = 0xfff;
+	fh. id = 0;
+	fh. layer = 0;
+	fh. protection_absent = 1;
+	fh. profile = 0;
+	fh. sampling_freq_index = samptab [sp -> dacRate << 1 | sp -> sbrFlag];
+
+	fh. private_bit = 0;
+	switch (sp -> mpegSurround) {
+	 default:
+	 fprintf (stderr, "Unrecognized mpeg_surround_config ignored\n");
+//	not nice, but deliberate: fall through
+	 case 0:
+	 if (sp -> sbrFlag && !sp -> aacChannelMode && sp -> psFlag)
+	 fh. channel_config = 2; /* Parametric stereo */
+	 else
+	 fh. channel_config = 1 << sp -> aacChannelMode ;
+	 break;
+
+	 case 1:
+	 fh. channel_config = 6;
+	 break;
+	}
+
+	fh. orig = 0;
+	fh. home = 0;
+	vh. copyright_id_bit = 0;
+	vh. copyright_id_start = 0;
+	vh. frame_length = framelen + 7; /* Includes header length */
+	vh. adts_buffer_fullness = 1999;
+	vh. num_raw_data_blks_in_frame = 0;
+	header [0]	= fh. syncword >> 4;
+	header [1]	= (fh. syncword & 0xf) << 4;
+	header [1]	|= fh. id << 3;
+	header [1]	|= fh. layer << 1;
+	header [1]	|= fh. protection_absent;
+ header [2]	= fh. profile << 6;
+	header [2]	|= fh. sampling_freq_index << 2;
+	header [2]	|= fh. private_bit << 1;
+	header [2]	|= (fh. channel_config & 0x4);
+	header [3]	= (fh. channel_config & 0x3) << 6;
+	header [3]	|= fh. orig << 5;
+	header [3]	|= fh. home << 4;
+	header [3]	|= vh. copyright_id_bit << 3;
+	header [3]	|= vh. copyright_id_start << 2;
+	header [3]	|= (vh. frame_length >> 11) & 0x3;
+	header [4]	= (vh. frame_length >> 3) & 0xff;
+	header [5]	= (vh. frame_length & 0x7) << 5;
+	header [5]	|= vh. adts_buffer_fullness >> 6;
+	header [6]	= (vh. adts_buffer_fullness & 0x3f) << 2;
+	header [6]	|= vh. num_raw_data_blks_in_frame;
+}

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

@@ -31,12 +31,14 @@
 	 descriptorType *d,
 	 RingBuffer<int16_t> *audioBuffer,
 	 RingBuffer<uint8_t> *dataBuffer,
+	 RingBuffer<uint8_t> *frameBuffer,
 	 QString		picturesPath) {
 	if (d -> type == AUDIO_SERVICE) {
 	 if (((audiodata *)d) -> ASCTy != 077) {
 theProcessor = new mp2Processor (mr,
 	 d -> bitRate,
 audioBuffer,
+	 frameBuffer,
 	 picturesPath);
 	 }
 else
@@ -44,6 +46,7 @@
 theProcessor = new mp4Processor (mr,
 	 d -> bitRate,
 audioBuffer,
+	 frameBuffer,
 	 picturesPath);
 	 }
 	}

_service:download_url:qt-dab-2.7.1.tar.gz/src/backend/backend.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/src/backend/backend.cpp Changed

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

@@ -37,12 +37,14 @@
 //
 		mscHandler::mscHandler	(RadioInterface *mr,
 	 uint8_t	dabMode,
-	 QString	picturesPath) :
+	 QString	picturesPath,
+	 RingBuffer<uint8_t> *frameBuffer) :
 	 params (dabMode),
 	 my_fftHandler (dabMode),
 	 myMapper (dabMode),
 	 bufferSpace (params. get_L()){
 	myRadioInterface	= mr;
+	this	-> frameBuffer	= frameBuffer;
 	this	-> picturesPath	= picturesPath;
 	cifVector. resize (55296);
 //	theBackends. push_back (new virtualBackend (0, 0));
@@ -79,20 +81,20 @@
 //
 //	Input is put into a buffer, a the code in a separate thread
 //	will handle the data from the buffer
-void	mscHandler::processBlock_0 (std::complex<float> *b) {
+void	mscHandler::processBlock_0 (DSPCOMPLEX *b) {
 	bufferSpace. acquire (1);
-	memcpy (command [0]. data(), b,
-	 params. get_T_u() * sizeof (std::complex<float>));
+	for (int i = 0; i < params. get_T_u (); i ++)
+	 command [0][i] = b [i];
 	helper. lock();
 	amount ++;
 commandHandler. wakeOne();
 helper. unlock();
 }
 
-void	mscHandler::process_Msc	(std::complex<float> *b, int blkno) {
+void	mscHandler::process_Msc	(DSPCOMPLEX *b, int blkno) {
 	bufferSpace. acquire (1);
- memcpy (command [blkno]. data(), b,
-	 params. get_T_u() * sizeof (std::complex<float>));
+	for (int i = 0; i < params. get_T_u (); i ++)
+	 command [blkno][i] = b [i];
 helper. lock();
 amount ++;
 commandHandler. wakeOne();
@@ -102,6 +104,7 @@
 void mscHandler::run() {
 int	currentBlock	= 0;
 std::vector<int16_t> ibits;
+int	T_u		= params. get_T_u ();
 
 	running. store (true);
 	ibits. resize (BitsperBlock);
@@ -110,8 +113,8 @@
 commandHandler. wait (&helper, 100);
 helper. unlock();
 while ((amount > 0) && running. load()) {
-	 memcpy (fft_buffer, command [currentBlock]. data(),
-	 params. get_T_u() * sizeof (std::complex<float>));
+	 for (int i = 0; i < T_u; i ++)
+	 fft_buffer [i] = command [currentBlock] [i];
 //
 //	block 3 and up are needed as basis for demodulation the "mext" block
 //	"our" msc blocks start with blkno 4
@@ -122,20 +125,20 @@
 if (index < 0)
 index += params. get_T_u();
 
- std::complex<float> r1 = fft_buffer [index] *
+ DSPCOMPLEX r1 = fft_buffer [index] *
 conj (phaseReference [index]);
- float ab1 = jan_abs (r1);
+ float ab1 = abs (r1);
 // Recall: the viterbi decoder wants 127 max pos, - 127 max neg
 // we make the bits into softbits in the range -127 .. 127
- ibits [i] = - real (r1) / ab1 * 127.0;
+ ibits [i] = - real (r1) / ab1 * 255.0;
 ibits [params. get_carriers() + i]
-	 = - imag (r1) / ab1 * 127.0;
+	 = - imag (r1) / ab1 * 255.0;
 }
 
 	 process_mscBlock (ibits, currentBlock);
 	 }
-	 memcpy (phaseReference. data(), fft_buffer,
-	 params. get_T_u() * sizeof (std::complex<float>));
+	 for (int i = 0; i < T_u; i ++)
+	 phaseReference [i] = fft_buffer [i];
 bufferSpace. release (1);
 helper. lock();
 currentBlock = (currentBlock + 1) % (nrBlocks);
@@ -183,6 +186,7 @@
 	 d,
 	 audioBuffer,
 	 dataBuffer,
+	 frameBuffer,
 	 picturesPath));
 	work_to_be_done. store (true);
 	locker. unlock();

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

@@ -216,17 +216,20 @@
 	 std::vector<uint16_t> services;
 	 bool	inUse;
 	 int	announcing;
+	 int	clusterId;
 	Cluster () {
 	 flags	= 0;
 	 services. resize (0);
 	 inUse	= false;
 	 announcing	= 0;
+	 clusterId	= -1;
 	}
 	~Cluster () {
 	 flags	= 0;
 	 services. resize (0);
 	 inUse	= false;
 	 announcing	= 0;
+	 clusterId	= -1;
 	}
 };
 
@@ -245,16 +248,25 @@
 	 serviceComps [i]. clear();
 	 }
 	}
-	Cluster	*getCluster (int16_t clusterId) {
-	 if (clusterTable [clusterId]. inUse)
-	 return &(clusterTable [clusterId]);
 
-	 clusterTable [clusterId]. inUse	= true;
-	 return &(clusterTable [clusterId]);
+	Cluster	*getCluster (int16_t clusterId) {
+	 for (int i = 0; i < 64; i ++)
+	 if ((clusterTable [i]. inUse) &&
+	 (clusterTable [i]. clusterId == clusterId))
+	 return &(clusterTable [i]);
+
+	 for (int i = 0; i < 64; i ++) {
+	 if (!clusterTable [i]. inUse) {
+	 clusterTable [i]. inUse = true;
+	 clusterTable [i]. clusterId = clusterId;
+	 return &(clusterTable [i]);
+	 }
+	 }
 	}
+
 	subChannelDescriptor subChannels [64];
 	serviceComponentDescriptor serviceComps [64];
-	Cluster			clusterTable [64];
+	Cluster			clusterTable [128];
 };
 
 //
@@ -409,11 +421,11 @@
 	 break;
 
 	 case 18:		// announcement support (8.1.6.1)
-//	 FIG0Extension18 (d);
+	 FIG0Extension18 (d);
 	 break;
 
 	 case 19:		// announcement switching (8.1.6.2)
-//	 FIG0Extension19 (d);
+	 FIG0Extension19 (d);
 	 break;
 
 	 case 20:		// service component information (8.1.4)
@@ -1046,19 +1058,19 @@
 	(void)CN_bit;
 	(void)OE_bit;
 	while (bitOffset < Length * 8) {
-	 uint16_t SId	= getBits (d, bitOffset, 16);
-	 bitOffset	+= 16;
+	 uint16_t SId		= getBits (d, bitOffset, 16);
+	 int16_t serviceIndex = findServiceIndex (SId);
+	 bitOffset		+= 16;
 	 uint16_t asuFlags	= getBits (d, bitOffset, 16);
 	 (void)asuFlags;
-	 bitOffset	+= 16;
+	 bitOffset		+= 16;
 	 uint8_t Rfa		= getBits (d, bitOffset, 5);
 	 (void)Rfa;
 	 uint8_t nrClusters	= getBits (d, bitOffset + 5, 3);
-	 int16_t serviceIndex = findServiceIndex (SId);
-	 bitOffset	+= 8;
+	 bitOffset		+= 8;
 	 bool flag = false;
 	 for (int i = 0; i < nrClusters; i ++) {
-	 if (getBits (d, bitOffset + 8 * i, 8) != 1)
+	 if (getBits (d, bitOffset + 8 * i, 8) == 0)
 	 continue;
 	 if ((serviceIndex != -1) &&
 	 (ensemble -> services [serviceIndex]. hasName))
@@ -1098,6 +1110,11 @@
 	 if (!syncReached ())
 	 return;
 	 Cluster *myCluster = currentBase -> getCluster (clusterId);
+	 if (myCluster == NULL) {	// should not happen
+//	 fprintf (stderr, "cluster fout\n");
+	 return;
+	 }
+	 
 	 if ((myCluster -> flags & AswFlags) != 0) {
 	 myCluster -> announcing ++;
 	 if (myCluster -> announcing == 5) {
@@ -1753,9 +1770,11 @@
 	if (!syncReached ())
 	 return;
 	Cluster *myCluster = currentBase -> getCluster (clusterId);
+	if (myCluster == NULL)
+	 return;
 	if (myCluster -> flags != asuFlags) {
-	 fprintf (stderr, "for cluster %d, the flags change from %x to %x\n",
-	 clusterId, myCluster -> flags, asuFlags);
+//	 fprintf (stderr, "for cluster %d, the flags change from %x to %x\n",
+//	 clusterId, myCluster -> flags, asuFlags);
 	 myCluster -> flags = asuFlags;
 	}
 
@@ -1763,10 +1782,10 @@
 	 if (myCluster -> services [i] == serviceIndex)
 	 return;
 	myCluster -> services. push_back (serviceIndex);
-	if (ensemble -> services [serviceIndex]. hasName)
-	 fprintf (stderr, "added for cluster %d service %s for announcement type %s\n",
-	 clusterId,
-	 ensemble -> services [serviceIndex]. serviceLabel. toLatin1 (). data (), 
-	 announcements (asuFlags). toLatin1 (). data ());
+//	if (ensemble -> services [serviceIndex]. hasName)
+//	 fprintf (stderr, "added for cluster %d service %s for announcement type %s\n",
+//	 clusterId,
+//	 ensemble -> services [serviceIndex]. serviceLabel. toLatin1 (). data (), 
+//	 announcements (asuFlags). toLatin1 (). data ());
 }

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

@@ -80,9 +80,9 @@
 
 /**
 */
-void	ofdmDecoder::processBlock_0 (std::vector <std::complex<float> > buffer) {
-	memcpy (fft_buffer, buffer. data(),
-	 T_u * sizeof (std::complex<float>));
+void	ofdmDecoder::processBlock_0 (std::vector <DSPCOMPLEX> buffer) {
+	for (int i = 0; i < T_u; i ++)
+	 fft_buffer [i] = buffer [i];
 
 	my_fftHandler. do_FFT();
 /**
@@ -100,8 +100,8 @@
 *	we are now in the frequency domain, and we keep the carriers
 *	as coming from the FFT as phase reference.
 */
-	memcpy (phaseReference. data(), fft_buffer,
-	 T_u * sizeof (std::complex<float>));
+	for (int i = 0; i < T_u; i ++)
+	 phaseReference [i] = fft_buffer [i];
 }
 //
 //	Just interested. In the ideal case the constellation of the
@@ -114,9 +114,12 @@
 std::complex<float>	x [T_u];
 float	avg	= 0;
 float	S	= 0;
-
+//
+//	extract the carriers and compute the average error
 	for (i = 0; i < carriers; i ++) {
-	 x [i]	= std::complex<float> (abs (real (v [T_u / 2 - carriers / 2 + i])), abs (imag (v [T_u / 2 - carriers / 2 + i])));
+	 int index = T_u / 2 - carriers / 2 + i;
+	 x [i]	= std::complex<float> (abs (real (v [index])),
+	 abs (imag (v [index])));
 	 avgPoint	+= x [i];
 	}
 
@@ -141,12 +144,13 @@
 */
 
 static	int	cnt	= 0;
-void	ofdmDecoder::decode (std::vector <std::complex<float>> buffer,
+void	ofdmDecoder::decode (std::vector <DSPCOMPLEX> buffer,
 	 int32_t blkno, int16_t *ibits) {
 int16_t	i;
 std::complex<float> conjVector [T_u];
-	memcpy (fft_buffer, &((buffer. data()) [T_g]),
-	 T_u * sizeof (std::complex<float>));
+
+	for (i = 0; i < T_u; i ++)
+	 fft_buffer [i] = buffer [T_g + i];
 
 //fftlabel:
 /**
@@ -174,19 +178,20 @@
 *	The carrier of a block is the reference for the carrier
 *	on the same position in the next block
 */
-	 std::complex<float>	r1 = fft_buffer [index] *
+	 DSPCOMPLEX r1 = fft_buffer [index] *
 	 conj (phaseReference [index]);
-	 conjVector [index] = r1;
-	 float ab1	= jan_abs (r1);
+	 conjVector [index] = std::complex<float> (real (r1), imag (r1));
+	 double ab1	= abs (r1);
 //	split the real and the imaginary part and scale it
 //	we make the bits into softbits in the range -127 .. 127
-	 ibits [i]		= - real (r1) / ab1 * 127.0;
-	 ibits [carriers + i] = - imag (r1) / ab1 * 127.0;
+	 ibits [i]		= - real (r1) / ab1 * 1024.0;
+	 ibits [carriers + i] = - imag (r1) / ab1 * 1024.0;
 	}
 
-	memcpy (phaseReference. data(), fft_buffer,
-	 T_u * sizeof (std::complex<float>));
+	for (i = 0; i < T_u; i ++)
+	 phaseReference [i] = fft_buffer [i];
 //	From time to time we show the constellation of symbol 2.
+	
 	if (blkno == 2) {
 	 if (++cnt > 7) {
 	 iqBuffer	-> putDataIntoBuffer (&conjVector [T_u / 2 - carriers / 2],
@@ -198,12 +203,15 @@
 	}
 }
 /**
+ *	Obsolete: we now compute the snr by looking at the 
+ *	ratio between the power of the data in the signal and the power
+ *	of the signal in the null period.
 *	for the snr we have a full T_u wide vector, with in the middle
 *	K carriers.
 *	Just get the strength from the selected carriers compared
 *	to the strength of the carriers outside that region
 */
-int16_t	ofdmDecoder::get_snr (std::complex<float> *v) {
+int16_t	ofdmDecoder::get_snr (DSPCOMPLEX *v) {
 int16_t	i;
 float	noise 	= 0;
 float	signal	= 0;

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

@@ -31,6 +31,7 @@
 *	The class inherits from the phaseTable.
 */
 
+
 	phaseReference::phaseReference (RadioInterface *mr,
 	 uint8_t		dabMode,
 	 int16_t		threshold,
@@ -45,36 +46,39 @@
 
 	this	-> response	= b;
 	this	-> threshold	= threshold;
-	this	-> diff_length	= diff_length;
+	this	-> diff_length	= (diff_length + 1) & ~01;
 	this	-> depth	= depth;
 	this	-> T_u		= params. get_T_u();
 	this	-> T_g		= params. get_T_g();
 	this	-> carriers	= params. get_carriers();
 	
 	refTable.		resize (T_u);
-	phaseDifferences. resize (diff_length);
+	phaseDifferences. resize (this -> diff_length);
 	fft_buffer		= my_fftHandler. getVector();
 
 	framesperSecond		= 2048000 / params. get_T_F();
 	displayCounter		= 0;
 	
 	for (i = 0; i < T_u; i ++)
-	 refTable [i] = std::complex<float> (0, 0);
+	 refTable [i] = DSPCOMPLEX (0, 0);
 
 	for (i = 1; i <= params. get_carriers() / 2; i ++) {
 	 Phi_k = get_Phi (i);
-	 refTable [i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
+	 refTable [i] = DSPCOMPLEX (cos (Phi_k), sin (Phi_k));
 	 Phi_k = get_Phi (-i);
-	 refTable [T_u - i] = std::complex<float> (cos (Phi_k), sin (Phi_k));
+	 refTable [T_u - i] = DSPCOMPLEX (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 ++)
-	 phaseDifferences [i - 1] = abs (arg (refTable [(T_u + i) % T_u] *
-	 conj (refTable [(T_u + i + 1) % T_u])));
+	shiftFactor	= this -> diff_length / 4;
+	for (i = 0; i < this -> diff_length; i ++) {
+	 phaseDifferences [i] = abs (arg (refTable [(T_u - shiftFactor + i) % T_u] *
+	 conj (refTable [(T_u - shiftFactor + i + 1) % T_u])));
+	 phaseDifferences [i] *= phaseDifferences [i];
+	}
 
 	connect (this, SIGNAL (showImpulse (int)),
 	 mr, SLOT (showImpulse (int)));
@@ -95,7 +99,7 @@
 *	looking for.
 */
 
-int32_t	phaseReference::findIndex (std::vector <std::complex<float>> v,
+int32_t	phaseReference::findIndex (std::vector <DSPCOMPLEX> v,
 	 int threshold ) {
 int32_t	i;
 int32_t	maxIndex	= -1;
@@ -105,7 +109,8 @@
 float	mbuf [T_u / 2];
 std::vector<int> resultVector;
 
-	memcpy (fft_buffer, v. data(), T_u * sizeof (std::complex<float>));
+	for (i = 0; i < T_u; i ++)
+	 fft_buffer [i] = v [i];
 	my_fftHandler. do_FFT();
 //
 //	into the frequency domain, now correlate
@@ -117,12 +122,11 @@
 *	We compute the average and the max signal values
 */
 	for (i = 0; i < T_u / 2; i ++) {
-	 lbuf [i] = jan_abs (fft_buffer [i]);
+	 lbuf [i] = abs (fft_buffer [i]);
 	 mbuf [i] = lbuf [i];
 	 sum	+= lbuf [i];
 	}
 	
-
 	sum /= T_u / 2;
 //	
 	for (i = 0; i < 100; i ++) {
@@ -138,16 +142,19 @@
 	else 
 	 resultVector. push_back (maxIndex);	
 
-//	fprintf (stderr, "%f (%d)\n", Max / sum, maxIndex);
-	float MMax = 0;
+	if (threshold <= 5)	//	
+	 return maxIndex;
 	for (int k = 0; k < depth; k ++) {
+	 float MMax = 0;
 	 int	lIndex = -1;
-	 for (i = T_g - 100; i < T_u / 2; i ++) {
+	 for (i = T_g - 100; i < T_u / 2 - 200; i ++) {
 	 if (lbuf [i] > MMax) {
 	 MMax = lbuf [i];
 	 lIndex = i;
 	 }
 	 }
+	 if (MMax < Max / 1.4)
+	 break;
 	 if (lIndex > 0) {
 	 resultVector . push_back (lIndex);
 	 for (i = lIndex - 15; i < lIndex + 15; i ++)
@@ -173,39 +180,51 @@
 	return resultVector. at (0);
 }
 //
-//
-//	an approach that works fine is to correlate the phasedifferences
-//	between subsequent carriers
+//	we look at the phasediferences of subsequent carriers,
+//	these should match with those in the reference tablw
 #define	SEARCH_RANGE	(2 * 35)
-int16_t	phaseReference::estimate_CarrierOffset (std::vector<std::complex<float>> v) {
-int16_t	i, j, index = 100;
+int16_t	phaseReference::estimate_CarrierOffset (std::vector<DSPCOMPLEX> v) {
+int16_t	i, j, index_1 = 100, index_2 = 100;
 float	computedDiffs [SEARCH_RANGE + diff_length + 1];
 
-	memcpy (fft_buffer, v. data(), T_u * sizeof (std::complex<float>));
+	for (i = 0; i < T_u; i ++)
+	 fft_buffer [i] = v [i];
 	my_fftHandler. do_FFT();
 
 	for (i = T_u - SEARCH_RANGE / 2;
 	 i < T_u + SEARCH_RANGE / 2 + diff_length; i ++) 
 	 computedDiffs [i - (T_u - SEARCH_RANGE / 2)] =
-	 abs (arg (fft_buffer [i % T_u] * conj (fft_buffer [(i + 1) % T_u])));
+	 arg (fft_buffer [(i - shiftFactor) % T_u] *
+	 conj (fft_buffer [(i - shiftFactor + 1) % T_u]));
 
-	float	Mmin = 1000;
-	for (i = T_u - SEARCH_RANGE /2;
+	for (i = 0; i < SEARCH_RANGE + diff_length; i ++)
+	 computedDiffs [i] *= computedDiffs [i];
+
+	float	Mmin_1 = 10000;
+	float	Mmin_2 = 10000;
+	for (i = T_u - SEARCH_RANGE / 2;
 	 i < T_u + SEARCH_RANGE / 2; i ++) {
-	 float sum = 0;
-
-	 for (j = 1; j < diff_length; j ++)
-	 if (phaseDifferences [j - 1] < 0.1)
-	 sum += computedDiffs [i - (T_u - SEARCH_RANGE / 2) + j];
-	 if (sum < Mmin) {
-	 Mmin = sum;
-	 index = i;
+	 int sum_1 = 0;
+	 int sum_2 = 0;
+	 for (j = 0; j < diff_length; j ++) {
+	 if (phaseDifferences [j] < 0.05)
+	 sum_1 += computedDiffs [i - (T_u - SEARCH_RANGE / 2) + j];
+	 sum_2 += abs (computedDiffs [i - (T_u - SEARCH_RANGE / 2) + j] -
+	 phaseDifferences [j]); 
+	 } 
+	 if (sum_1 < Mmin_1) {
+	 Mmin_1 = sum_1;
+	 index_1 = i;
+	 }
+	 if (sum_2 < Mmin_2) {
+	 Mmin_2 = sum_2;
+	 index_2 = i;
 	 }
 	}
-	
-	return index - T_u; 
+
+	return index_1 == index_2 ? index_1 - T_u : 100;
 }
-//	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
 //	in block 0, compared to the values as computed from the
@@ -213,13 +232,13 @@
 //	The values are reasonably close to the values computed
 //	on the fly
 #define	LLENGTH	100
-float	phaseReference::estimate_FrequencyOffset (std::vector <std::complex<float>> v) {
+float	phaseReference::estimate_FrequencyOffset (std::vector <DSPCOMPLEX> v) {
 int16_t	i;
 float pd	= 0;
 
 	for (i = - LLENGTH / 2 ; i < LLENGTH / 2; i ++) {
-	 std::complex<float> a1 = refTable [(T_u + i) % T_u] * conj (refTable [(T_u + i + 1) % T_u]);
-	 std::complex<float> a2 = fft_buffer [(T_u + i) % T_u] * conj (fft_buffer [(T_u + i + 1) % T_u]);
+	 DSPCOMPLEX a1 = refTable [(T_u + i) % T_u] * conj (refTable [(T_u + i + 1) % T_u]);
+	 DSPCOMPLEX a2 = fft_buffer [(T_u + i) % T_u] * conj (fft_buffer [(T_u + i + 1) % T_u]);
 	 pd += arg (a2) - arg (a1);
 	}

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

@@ -32,8 +32,8 @@
 }
 
 	sampleReader::sampleReader (RadioInterface *mr,
-	 virtualInput	*theRig
-	 ,RingBuffer<std::complex<float>> *spectrumBuffer
+	 virtualInput	*theRig,
+	 RingBuffer<DSPCOMPLEX> *spectrumBuffer
 	 ) {
 int	i;
 	this	-> theRig	= theRig;
@@ -48,9 +48,9 @@
 	currentPhase	= 0;
 	sLevel		= 0;
 	sampleCount	= 0;
-	oscillatorTable = new std::complex<float> [INPUT_RATE];
+	oscillatorTable = new DSPCOMPLEX [INPUT_RATE];
 for (i = 0; i < INPUT_RATE; i ++)
- oscillatorTable [i] = std::complex<float>
+ oscillatorTable [i] = DSPCOMPLEX
 	 (cos (2.0 * M_PI * i / INPUT_RATE),
 sin (2.0 * M_PI * i / INPUT_RATE));
 
@@ -74,7 +74,7 @@
 	return sLevel;
 }
 
-std::complex<float> sampleReader::getSample (int32_t phaseOffset) {
+DSPCOMPLEX sampleReader::getSample (int32_t phaseOffset) {
 std::complex<float> temp;
 
 	corrector	= phaseOffset;
@@ -115,7 +115,7 @@
 	currentPhase	= (currentPhase + INPUT_RATE) % INPUT_RATE;
 
 	temp		*= oscillatorTable [currentPhase];
-	sLevel		= 0.00001 * jan_abs (temp) + (1 - 0.00001) * sLevel;
+	sLevel		= 0.00001 * abs (temp) + (1 - 0.00001) * sLevel;
 #define	N	5
 	if (++ sampleCount > INPUT_RATE / N) {
 	 show_Corrector	(corrector);
@@ -129,11 +129,15 @@
 	}
 	return temp;
 }
-
-void	sampleReader::getSamples (std::complex<float> *v,
+//
+//	Since the devices present their data as floats
+//	in case of doubles, we have to convert
+void	sampleReader::getSamples (DSPCOMPLEX *v,
 	 int32_t n, int32_t phaseOffset) {
 int32_t		i;
-
+#ifdef	__HIGH_PRECISION__
+std::complex<float> buf [n];
+#endif
 	corrector	= phaseOffset;
 	if (!running. load())
 	 throw 21;
@@ -149,7 +153,13 @@
 	 throw 20;
 //
 //	so here, bufferContent >= n
+#ifdef	__HIGH_PRECISION__
+	n	= theRig -> getSamples (buf, n);
+	for (i = 0; i < n; i ++)
+	 v [i] = DSPCOMPLEX (real (buf [i]), imag (buf [i]));
+#else
 	n	= theRig -> getSamples (v, n);
+#endif
 	bufferContent -= n;
 	if (dumpfilePointer. load() != nullptr) {
 	 for (i = 0; i < n; i ++) {
@@ -173,7 +183,7 @@
 	 if (localCounter < bufferSize)
 	 localBuffer [localCounter ++] = v [i];
 	 v [i]	*= oscillatorTable [currentPhase];
-	 sLevel	= 0.00001 * jan_abs (v [i]) + (1 - 0.00001) * sLevel;
+	 sLevel	= 0.00001 * abs (v [i]) + (1 - 0.00001) * sLevel;
 	}
 
 	sampleCount	+= n;

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

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

@@ -20,18 +20,17 @@
 
 	syncBufferIndex = 0;
 	for (i = 0; i < C_LEVEL_SIZE; i ++) {
-	 std::complex<float> sample = myReader -> getSample (0);
-	 envBuffer [syncBufferIndex] = jan_abs (sample);
+	 DSPCOMPLEX sample = myReader -> getSample (0);
+	 envBuffer [syncBufferIndex] = abs (sample);
 	 cLevel += envBuffer [syncBufferIndex];
 	 syncBufferIndex ++;
 	}
 //SyncOnNull:
 	counter = 0;
 	while (cLevel / C_LEVEL_SIZE > 0.55 * myReader -> get_sLevel()) {
-	 std::complex<float> sample =
+	 DSPCOMPLEX sample =
 	 myReader -> getSample (0);
-//	 myReader. getSample (coarseOffset + fineCorrector);
-	 envBuffer [syncBufferIndex] = jan_abs (sample);
+	 envBuffer [syncBufferIndex] = abs (sample);
 // update the levels
 	 cLevel += envBuffer [syncBufferIndex] -
 	 envBuffer [(syncBufferIndex - C_LEVEL_SIZE) & syncBufferMask];
@@ -48,9 +47,9 @@
 	counter = 0;
 //SyncOnEndNull:
 	 while (cLevel / C_LEVEL_SIZE < 0.75 * myReader -> get_sLevel()) {
-	 std::complex<float> sample =
+	 DSPCOMPLEX sample =
 	 myReader -> getSample (0);
-	 envBuffer [syncBufferIndex] = jan_abs (sample);
+	 envBuffer [syncBufferIndex] = abs (sample);
 // update the levels
 	 cLevel += envBuffer [syncBufferIndex] -
 	 envBuffer [(syncBufferIndex - C_LEVEL_SIZE) & syncBufferMask];

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

@@ -54,11 +54,12 @@
 	return QString ("          ");
 }
 
-void	ensemblePrinter::showEnsembleData (QString channel,
-	                                   int32_t freq,
-	                                   QStringList Services,
+void	ensemblePrinter::showEnsembleData (QString	channel,
+	                                   int32_t	freq,
+	                                   QString	theTime,
+	                                   QStringList	Services,
 	                                   dabProcessor *my_dabProcessor,
-	                                   FILE *file_P) {
+	                                   FILE		*file_P) {
 uint8_t	countryId;
 int16_t	i;
 textMapper	theMapper;
@@ -72,11 +73,12 @@
 	if (ensembleLabel == QString (""))
 	   return;
 
-	fprintf (file_P, "%s; ensembleId %X; channel %s; frequency %d; \n\n",
+	fprintf (file_P, "%s; ensembleId %X; channel %s; frequency %d; time of recording  %s\n\n",
 	                  ensembleLabel. toUtf8(). data(),
 	                  ensembleId,
 	                  currentChannel. toUtf8(). data(),
-	                  frequency / 1000);
+	                  frequency / 1000,
+	                  theTime. toUtf8(). data ());
 	                
 	fprintf (file_P, "\nAudio services\nprogram name;country;serviceId;subchannelId;start address;length (CU); bit rate;DAB/DAB+; prot level; code rate; language; program type\n\n");
 	for (QString& audioService: Services) {

_service:download_url:qt-dab-2.7.1.tar.gz/src/support/fft-handler.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/src/support/fft-handler.cpp Changed

@@ -31,11 +31,11 @@
 //
 	fftHandler::fftHandler (uint8_t mode): p (mode) {
 	this	-> fftSize = p. get_T_u();
-	vector	= (std::complex<float> *)
-	 FFTW_MALLOC (sizeof (std::complex<float>) * fftSize);
+	vector	= (DSPCOMPLEX *)
+	 FFTW_MALLOC (sizeof (DSPCOMPLEX) * fftSize);
 	plan	= FFTW_PLAN_DFT_1D (fftSize,
-	 reinterpret_cast <fftwf_complex *>(vector),
-	 reinterpret_cast <fftwf_complex *>(vector),
+	 reinterpret_cast <FFT_COMPLEX *>(vector),
+	 reinterpret_cast <FFT_COMPLEX *>(vector),
 	 FFTW_FORWARD, FFTW_ESTIMATE);
 }
 
@@ -44,7 +44,7 @@
 	 FFTW_FREE (vector);
 }
 
-std::complex<float>	*fftHandler::getVector() {
+DSPCOMPLEX	*fftHandler::getVector() {
 	return vector;
 }
 
@@ -64,30 +64,3 @@
 	 vector [i] = conj (vector [i]);
 }
 
-//	Obsolete
-	common_ifft::common_ifft (int32_t fft_size) {
-int32_t	i;
-
-	this	-> fft_size = fft_size;
-	vector	= (std::complex<float> *)FFTW_MALLOC (sizeof (std::complex<float>) * fft_size);
-	for (i = 0; i < fft_size; i ++)
-	 vector [i] = 0;
-	plan	= FFTW_PLAN_DFT_1D (fft_size,
-	 reinterpret_cast <fftwf_complex *>(vector),
-	 reinterpret_cast <fftwf_complex *>(vector),
-	 FFTW_BACKWARD, FFTW_ESTIMATE);
-}
-
-	common_ifft::~common_ifft() {
-	 FFTW_DESTROY_PLAN (plan);
-	 FFTW_FREE (vector);
-}
-
-std::complex<float>	*common_ifft::getVector() {
-	return vector;
-}
-
-void	common_ifft::do_IFFT() {
-	FFTW_EXECUTE	(plan);
-}
-

_service:download_url:qt-dab-2.7.4.tar.gz/src/support/preset-handler.cpp Added

@@ -0,0 +1,86 @@
+#
+/*
+ * Copyright (C) 2019
+ * Jan van Katwijk (J.vanKatwijk@gmail.com)
+ * Lazy Chair Programming
+ *
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include	"preset-handler.h"
+#include	"radio.h"
+#include	<QComboBox>
+
+	presetHandler::presetHandler	(RadioInterface *radio) {
+	this	-> radio	= radio;
+	this	-> fileName	= "";
+}
+
+ presetHandler::~presetHandler () {
+}
+
+void	presetHandler::loadPresets (QString fileName, QComboBox *cb) {
+QDomDocument xmlBOM;
+QFile f (fileName);
+
+	this	-> fileName = fileName;
+	if (!f. open (QIODevice::ReadOnly)) 
+	 return;
+
+	xmlBOM. setContent (&f);
+	f. close ();
+	QDomElement root	= xmlBOM. documentElement ();
+	QDomElement component	= root. firstChild (). toElement ();
+	while (!component. isNull ()) {
+	 if (component. tagName () == "PRESET_ELEMENT") {
+	 presetData pd;
+	 pd. serviceName = component. attribute ("SERVICE_NAME", "???");
+	 pd. channel = component. attribute ("CHANNEL", "5A");
+	 cb -> addItem (pd. channel + ":" + pd. serviceName);
+	 }
+	 component = component. nextSibling (). toElement ();
+	}
+}
+
+void	presetHandler::savePresets (QComboBox *cb) {
+QDomDocument the_presets;
+QDomElement root = the_presets. createElement ("preset_db");
+
+	the_presets. appendChild (root);
+
+	for (uint i = 1; i < cb -> count (); i ++) {
+	 QStringList list = cb -> itemText (i).
+	 split (":", QString::SkipEmptyParts);
+ if (list. length () != 2)
+	 continue;
+ QString channel = list. at (0);
+ QString serviceName = list. at (1);
+	 QDomElement presetService = the_presets.
+	 createElement ("PRESET_ELEMENT");
+	 presetService. setAttribute ("SERVICE_NAME", serviceName);
+	 presetService. setAttribute ("CHANNEL", channel);
+	 root. appendChild (presetService);
+	}
+
+	QFile file (this -> fileName);
+	if (!file. open (QIODevice::WriteOnly | QIODevice::Text))
+	 return;
+
+	QTextStream stream (&file);
+	stream << the_presets. toString ();
+	file. close ();
+}
+

_service:download_url:qt-dab-2.7.4.tar.gz/src/support/presetcombobox.cpp Added

@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (C) 2018 Shie Erlich <krusader@users.sourceforge.net> *
+ * Copyright (C) 2018 Rafi Yanai <krusader@users.sourceforge.net> *
+ * Copyright (C) 2018 Krusader Krew [https://krusader.org] *
+ * *
+ * This file is part of Krusader [https://krusader.org]. *
+ * *
+ * Krusader 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. *
+ * *
+ * Krusader 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 Krusader. If not, see [http://www.gnu.org/licenses/]. *
+ *****************************************************************************/
+#include "presetcombobox.h"
+
+#include <QEvent>
+#include <QKeyEvent>
+#include <QAbstractItemView>
+
+bool KHBoxEventFilter::eventFilter (QObject *obj, QEvent *event) {
+	if (event -> type() == QEvent::KeyPress) {
+	 auto keyEvent = static_cast<QKeyEvent *>(event);
+	 if ((keyEvent->modifiers() == Qt::ShiftModifier) &&
+	 (keyEvent->key() == Qt::Key::Key_Delete)) {
+//	 auto box = dynamic_cast<QComboBox *>(obj);
+	 auto box = dynamic_cast<presetComboBox *>(obj);
+	 if (box != nullptr) {
+//	Delete the current item
+	 QString content = box -> currentText ();
+	 box->removeItem(box->currentIndex());
+	 return true;
+	 }
+	 }
+	}
+//	Perform the usual event processing
+	return QObject::eventFilter(obj, event);
+}
+
+bool KHBoxListEventFilter::eventFilter (QObject *obj, QEvent *event) {
+	if (event -> type() == QEvent::KeyPress) {
+	 auto keyEvent = static_cast<QKeyEvent *>(event);
+	 if ((keyEvent->modifiers() == Qt::ShiftModifier) &&
+	 (keyEvent->key() == Qt::Key::Key_Delete)) {
+	 auto iv = dynamic_cast<QAbstractItemView *>(obj);
+	 if (iv->model() != nullptr) {
+//	Delete the current item from the popup list
+	 iv -> model()->removeRow(iv->currentIndex().row());
+	 return true;
+	 }
+	 }
+	}
+//	Perform the usual event processing
+	return QObject::eventFilter(obj, event);
+}
+
+presetComboBox::presetComboBox (QWidget *parent):
+	 QComboBox(parent) {
+	installEventFilter (&boxEF);
+	QAbstractItemView* iv = view ();
+	if (iv != nullptr)
+	 iv -> installEventFilter (&listEF);
+}
+

_service:download_url:qt-dab-2.7.1.tar.gz/tii-viewer/tii-viewer.cpp -> _service:download_url:qt-dab-2.7.4.tar.gz/tii-viewer/tii-viewer.cpp Changed

@@ -25,7 +25,7 @@
 #include	<QColor>
 
 	tiiViewer::tiiViewer	(RadioInterface	*mr,
-	 RingBuffer<std::complex<float>> *sbuffer) {
+	 RingBuffer<DSPCOMPLEX> *sbuffer) {
 int16_t	i;
 QString	colorString	= "black";
 QColor	displayColor;
@@ -48,12 +48,11 @@
 	displayBuffer. resize (displaySize);
 	memset (displayBuffer. data(), 0, displaySize * sizeof (double));
 	this	-> spectrumSize	= 4 * displaySize;
-	spectrum		= (std::complex<float> *)fftwf_malloc (sizeof (fftwf_complex) * spectrumSize);
- plan = fftwf_plan_dft_1d (spectrumSize,
- reinterpret_cast <fftwf_complex *>(spectrum),
- reinterpret_cast <fftwf_complex *>(spectrum),
+	spectrum		= (DSPCOMPLEX *)FFTW_MALLOC (sizeof (FFT_COMPLEX) * spectrumSize);
+ plan = FFTW_PLAN_DFT_1D (spectrumSize,
+ reinterpret_cast <FFT_COMPLEX*>(spectrum),
+ reinterpret_cast <FFT_COMPLEX *>(spectrum),
 FFTW_FORWARD, FFTW_ESTIMATE);
-	
 	plotgrid		= tiiGrid;
 	plotgrid	-> setCanvasBackground (displayColor);
 	grid			= new QwtPlotGrid;
@@ -95,8 +94,8 @@
 }
 
 tiiViewer::~tiiViewer() {
-	fftwf_destroy_plan (plan);
-	fftwf_free	(spectrum);
+	FFTW_DESTROY_PLAN (plan);
+	FFTW_FREE	(spectrum);
 	myFrame		-> hide();
 	delete		Marker;
 	delete		ourBrush;
@@ -155,8 +154,7 @@
 //	get the buffer data
 	for (i = 0; i < spectrumSize; i ++)
 	 spectrum [i] = cmul (spectrum [i], Window [i]);
-
-	fftwf_execute (plan);
+	FFTW_EXECUTE (plan);
 //
 //	and map the spectrumSize values onto displaySize elements
 	for (i = 0; i < displaySize / 2; i ++) {

_service:download_url:qt-dab-2.7.1.tar.gz/tii-viewer/tii-viewer.h -> _service:download_url:qt-dab-2.7.4.tar.gz/tii-viewer/tii-viewer.h Changed

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

@@ -6,61 +6,55 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>387</width>
- <height>196</height>
+ <width>382</width>
+ <height>227</height>
 </rect>
 </property>
 <property name="windowTitle">
 <string>tii spectrum</string>
 </property>
- <widget class="QwtPlot" name="tiiGrid">
- <property name="geometry">
- <rect>
- <x>60</x>
- <y>10</y>
- <width>321</width>
- <height>131</height>
- </rect>
- </property>
- <property name="toolTip">
- <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="QSlider" name="AmplificationSlider">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>24</width>
- <height>111</height>
- </rect>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>50</number>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- <widget class="QLabel" name="secondariesDisplay">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>150</y>
- <width>331</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 in the SFN can be identified, the (mainId, subId) of the transmitter&lt;/p&gt;&lt;p&gt;is shown.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QSlider" name="AmplificationSlider">
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QwtPlot" name="tiiGrid">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spectrum display, shows the frequency spectrum from the channel currently being received.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="secondariesDisplay">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If more than one transmitter in the SFN can be identified, the (mainId, subId) of the transmitter&lt;/p&gt;&lt;p&gt;is shown.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
 </widget>
 <customwidgets>
 <customwidget>

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

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