Skip to content

Commit

Permalink
changed scanoutput
Browse files Browse the repository at this point in the history
  • Loading branch information
@JvanKatwijk
JvanKatwijk committed Feb 26, 2022
1 parent a35bf91 commit 5c09e8b
Show file tree
Hide file tree
Showing 67 changed files with 2,399 additions and 1,173 deletions.
104 changes: 33 additions & 71 deletions README.md
View file
@@ -1,51 +1,10 @@
# Qt-DAB-4.3 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)
# Qt-DAB-4.35 [![Build Status](https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)](https://travis-ci.com/JvanKatwijk/qt-dab)

Qt-DAB-4.3 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
Qt-DAB-4.35 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.

![overview](/screen-4.2-2.png?raw=true)
![4.2](/screen-4.2-1.png?raw=true)
![overview](/screen-4.35.png?raw=true)
[4.35](/screen-4.351.png?raw=true)

----------------------------------------------------------------------
IMPORTANT: What is new in 4.3
----------------------------------------------------------------------

Qt-DAB-4.3 adds as configuration option, the possibility to show
the name of the tranmitter whose TII (Transmitter Identification
Information) is seen, as well as the distance of the receiver to that
transmitter and the azimuth.

Note that - since the provider of the database has asked to keep
the source of the database out of sight, and some "user's" are
showing contempt to that request - I am unfortunately forced to
leave the database related code decoupled from the source tree
and the sources are only available under a restricted license.

There are basically three options for building your own executable

* just compile the stuff without code for handling tii tables
configure with "CONFIG += noTables", which is the default.

* configure on an x64 Linux box with "CONFIG += tiiLib".
To actually use the tii-tables a shared library,
"libtii-lib.so", which is available under a restricted
license, has to be installed (the functions of that
library will be loaded dynamically, so if "libtii-lib.so" is
not in the library search path, behaviour is as with the
previous option).
Note that the libtii-lib.so itself depends (a.o) on libcurl,
that needs to be installed for proper functioning.

* configure for "CONGIG += preCompiled", but then you will need some
additional source which is only available under a restricted license
(contact me privately for information)

The precompiled versions, i.e. the AppImage and the Windows setup
file have the facilities compiled in, but the database used
might be differently encoded.

Note that the documentation is NOT updated, and since I do not have
time right now, it will take some time before this README and the
manual are updated

------------------------------------------------------------------
Table of Contents
Expand Down Expand Up @@ -78,13 +37,7 @@ Table of Contents
Introduction
------------------------------------------------------------------

**Qt-DAB-4.2** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI 2 and up.

4.2 differs in details from 4.1, apart from some technical changes (hopefully
not seen by users), changes are that some settings are moved from the
configuration widget to the widget the settings refers to.
New is a "logger" setting on the configuration widget that well
store -when set - some information on a file.
**Qt-DAB-4.35** is a rich implementation of a DAB decoder for use on Linux and Windows based PC's, including some ARM based boards, such as the Raspberry PI 2 and up.

It provides an abundant amount of selectors and displays, most of
which can be switched off, but are of interest for those who want to see aspects of the DAB signal and want to be in control.
Expand Down Expand Up @@ -122,6 +75,7 @@ Features
* Detailed information on reception and selected service (SNR, bitrate, frequency, ensemble name, ensemble ID, subchannel ID, used CUs, protection level, CPU usage, program type, language, alternative FM frequency if available, 4 quality bars),
* Detailed information for *other* services by right-clicking on their name (bitrate, subchannel ID, used CU's protection level, program type) in the service list,
* Automatic display of TII (Transmitter Identification Information) data when transmitted,
* If configured, the TII data is mapped upon a transmitter's name,
* *Presets* for easy switching of programs in different ensembles (see section *Presets*),
* *Dumping* of the input data of the DAB channel (Warning: produces large raw files!) into \* sdr files or xml file formats and playing them again later (see section on xml format),
* Saving audio as uncompressed wave files,
Expand Down Expand Up @@ -175,7 +129,7 @@ The buttons and other controls on the main widget are equipped with
of the element (the tooltip on the copyright label shows (a.o) the date the executable was generated.)


![4.](/screen-4.2-2.png?raw=true)
![4.](/mainwidget.png?raw=true)

The elements in the **left part** of the widget, below the list of services,
are concerned with selecting a channel and a service. To ease operation the channel selector is augmented with a "-" and a "+" button for selecting the previous resp. next channel.
Expand Down Expand Up @@ -223,7 +177,7 @@ shows the contents of the ensembles found in the selected channels.
Since 3.5 the
possibility exists to save a detailed description of the services
in the different channels, in a format easy to process with LibreOffice
or comparable programs.
or comparable programs (a csv file).

Depending on a setting in configuration widget, a logo or slide, transmitted
as Program Associated Data with the audio transmission, will be shown here or on a separate widget.
Expand Down Expand Up @@ -436,30 +390,38 @@ For Linux-x64 systems, an **appImage** can be found in the releases section,
http::github.com/JvanKatwijk/qt-dab/releases. The appImage contains
next to the executable qt-dab program, the required libraries.

The precompiled versions, i.e. the AppImage and the Windows setup
file have the facilities compiled in, but the database used
might be differently encoded.

Of course it is possible to generate an executable, the
aforementioned user's manual
contains a complete script that can be used to install all required
libraries, download the sources and build an executable on an Ubuntu
(Debian) based system.

Since the main OS on the RPI's, has the same roots
as Ubuntu, the script for Ubuntu can be used to install Qt-DAB
on an RPI.

Note that the source tree contains two variants next to the Qt-DAB program,
a **dabMini** program, a dab decoder with a minimal interface, and **dab-2**
an experimental variant.
Both use large parts of the same sources as Qt-DAB does.

For **dabMini**, an appImage is available for use on an x64 based
Linux system. The user's manual contains a complete
script, tested on an RPI 2 and 3 for generating an executable.

**dab-2** is experimental and **NOT** supported
Qt-DAB-4.30 added as configuration option, the possibility to show
the name of the tranmitter whose TII (Transmitter Identification
Information) is seen, as well as the distance of the receiver to that
transmitter and the azimuth.

Note that Linux allows connecting audio handlers as "pulse" and "pipewire"
to bluetooth, making it easy to listen using a bluetooth
connected soundbar or bluetooth connected ear- or headphomes.
Note that - since the provider of the database has asked to keep
the source of the database out of sight, and some "user's" are
showing contempt to that request - I am unfortunately forced to
leave the database related code decoupled from the source tree
and the sources are only available under a restricted license.
A library in binary formar, containing the functionality, is available for use
under Linux-x64 and RPI's

The default for compilation is with "CONFIG += tiiLib".
On start up, Qt-DAB will look for the library "libtii-lib.so",
and - if found - will load the functions from that library.
If no library is found, Qt-DAB will function without being able to
map TII data onto transmitter names.

The alternative is to configure for "CONGIG += preCompiled",
but then you will need some additional source which is only available
under a restricted license (contact me privately for information)

-----------------------------------------------------------------------
Interfacing to another SDR device
Expand Down
Binary file removed dab-content.png
View file
Binary file not shown.
13 changes: 4 additions & 9 deletions dab-maxi/CMakeLists.txt
View file
@@ -1,5 +1,5 @@
cmake_minimum_required( VERSION 2.8.11 )
set (objectName qt-dab-4.3)
set (objectName qt-dab-4.35)
set (CMAKE_CXX_FLAGS "${CMAKE_XCC_FLAGS} -Wall -std=c++14 -flto")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")

Expand Down Expand Up @@ -194,7 +194,7 @@ endif ()
../includes/backend/data/journaline
../includes/backend/data/mot
../includes/support
../src/support/tii-codes
../src/support/tii-library
../includes/support/viterbi-jan
../includes/support/viterbi-spiral
../includes/output
Expand Down Expand Up @@ -273,7 +273,6 @@ endif ()
../includes/support/band-handler.h
../includes/support/text-mapper.h
../includes/support/dab-tables.h
../includes/support/ensemble-printer.h
../includes/support/viterbi-jan/viterbi-handler.h
../includes/support/viterbi-spiral/viterbi-spiral.h
../includes/support/preset-handler.h
Expand All @@ -285,7 +284,6 @@ endif ()
../includes/support/verysmallpushbutton.h
../includes/support/smallcombobox.h
../includes/support/history-handler.h
../includes/support/scanner-table.h
../includes/support/color-selector.h
../includes/support/scheduler.h
../includes/support/schedule-selector.h
Expand All @@ -296,7 +294,7 @@ endif ()
../includes/support/dl-cache.h
../includes/support/ITU_Region_1.h
../includes/support/coordinates.h
../src/support/tii-codes/tii-codes.h
../src/support/tii-library/tii-codes.h
../includes/scopes-qwt6/iqdisplay.h
../spectrum-viewer/spectrum-viewer.h
../correlation-viewer/correlation-viewer.h
Expand Down Expand Up @@ -370,7 +368,6 @@ endif ()
../src/support/band-handler.cpp
../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/smallqlistview.cpp
Expand All @@ -382,7 +379,6 @@ endif ()
../src/support/history-handler.cpp
../src/support/viterbi-jan/viterbi-handler.cpp
../src/support/viterbi-spiral/viterbi-spiral.cpp
../src/support/scanner-table.cpp
../src/support/color-selector.cpp
../src/support/scheduler.cpp
../src/support/schedule-selector.cpp
Expand All @@ -392,7 +388,7 @@ endif ()
../src/support/content-table.cpp
../src/support/ITU_Region_1.cpp
../src/support/coordinates.cpp
../src/support/tii-codes/tii-codes.cpp
../src/support/tii-library/tii-codes.cpp
../src/scopes-qwt6/iqdisplay.cpp
../spectrum-viewer/spectrum-viewer.cpp
../correlation-viewer/correlation-viewer.cpp
Expand Down Expand Up @@ -443,7 +439,6 @@ endif ()
../includes/support/verysmallpushbutton.h
../includes/support/smallcombobox.h
../includes/support/history-handler.h
../includes/support/scanner-table.h
../includes/support/color-selector.h
../includes/support/scheduler.h
../includes/support/schedule-selector.h
Expand Down
20 changes: 7 additions & 13 deletions dab-maxi/qt-dab.pro
View file
Expand Up @@ -156,12 +156,10 @@ HEADERS += ./radio.h \
../includes/support/viterbi-spiral/viterbi-spiral.h \
../includes/support/fft-handler.h \
../includes/support/ringbuffer.h \
# ../includes/support/Xtan2.h \
../includes/support/dab-params.h \
../includes/support/band-handler.h \
../includes/support/text-mapper.h \
../includes/support/dab-tables.h \
../includes/support/ensemble-printer.h \
../includes/support/preset-handler.h \
../includes/support/presetcombobox.h \
../includes/support/smallcombobox.h \
Expand All @@ -171,7 +169,6 @@ HEADERS += ./radio.h \
../includes/support/smallqlistview.h \
../includes/support/smallspinbox.h \
../includes/support/history-handler.h \
../includes/support/scanner-table.h \
../includes/support/color-selector.h \
../includes/support/scheduler.h \
../includes/support/schedule-selector.h \
Expand Down Expand Up @@ -267,12 +264,10 @@ SOURCES += ./main.cpp \
../src/support/viterbi-jan/viterbi-handler.cpp \
../src/support/viterbi-spiral/viterbi-spiral.cpp \
../src/support/fft-handler.cpp \
# ../src/support/Xtan2.cpp \
../src/support/dab-params.cpp \
../src/support/band-handler.cpp \
../src/support/text-mapper.cpp \
../src/support/dab-tables.cpp \
../src/support/ensemble-printer.cpp \
../src/support/preset-handler.cpp \
../src/support/presetcombobox.cpp \
../src/support/smallcombobox.cpp \
Expand All @@ -282,7 +277,6 @@ SOURCES += ./main.cpp \
../src/support/smallqlistview.cpp \
../src/support/smallspinbox.cpp \
../src/support/history-handler.cpp \
../src/support/scanner-table.cpp \
../src/support/color-selector.cpp \
../src/support/scheduler.cpp \
../src/support/schedule-selector.cpp \
Expand Down Expand Up @@ -310,7 +304,7 @@ SOURCES += ./main.cpp \
#
unix {
DESTDIR = ./linux-bin
TARGET = qt-dab-4.3
TARGET = qt-dab-4.35
exists ("../.git") {
GITHASHSTRING = $$system(git rev-parse --short HEAD)
!isEmpty(GITHASHSTRING) {
Expand Down Expand Up @@ -352,9 +346,9 @@ CONFIG += lime
CONFIG += faad
#CONFIG += fdk-aac
#CONFIG += JAN
#CONFIG += preCompiled
CONFIG += preCompiled
#CONFIG += tiiLib
CONFIG += noTables
#CONFIG += noTables
#very experimental, simple server for connecting to a tdc handler
#CONFIG += datastreamer
#to handle output of embedded an IP data stream, uncomment
Expand Down Expand Up @@ -389,7 +383,7 @@ isEmpty(GITHASHSTRING) {
}

##for for 64 bit
# TARGET = qt-dab64-4.3
# TARGET = qt-dab64-4.35
# DEFINES += __BITS64__
# DESTDIR = /usr/shared/w64-programs/windows-dab64-qt
# INCLUDEPATH += /usr/x64-w64-mingw32/sys-root/mingw/include
Expand All @@ -409,7 +403,7 @@ isEmpty(GITHASHSTRING) {
# DEFINES += __THREADED_BACKEND
#
#for win32, comment out the lines above
TARGET = qt-dab32-4.3
TARGET = qt-dab32-4.35
DESTDIR = /usr/shared/w32-programs/windows-dab32-qt
INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include
INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
Expand All @@ -425,9 +419,9 @@ isEmpty(GITHASHSTRING) {
CONFIG += pluto-2
CONFIG += NO_SSE
DEFINES += __THREADED_BACKEND
CONFIG += noTables
# CONFIG += noTables
# CONFIG += JAN
# CONFIG += preCompiled
CONFIG += preCompiled
#
# end of 32/64 specifics
INCLUDEPATH += /usr/local/include
Expand Down

0 comments on commit 5c09e8b

Please sign in to comment.