Packman Build Service PMBS

welle-io.changes Changed

@@ -1,4 +1,33 @@
 -------------------------------------------------------------------
+Wed Dec 25 14:59:15 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
+
+- Update to official 2.6 release
+- Major changes since welle.io 2.5
+  * Core
+    + Round spectrum waterfall boundaries to two digits
+    + Improve station list scrolling via mouse
+    + Fix restore volume after mute
+    + Replace rtl-tcp port spinner by a text input field. Now it is
+      possible to use ports > 9999
+    + Fix broken RAW file input
+    + Add ensemble ID to service details
+    + Fix wrong display of DAB date time
+    + Phase_sync improvement
+    + Code quality improvements and small fixes
+    + Minor changes
+  * Linux
+    * Add Flatpak support (experimental)
+    + Drop AppImage support because of issue
+      probonopd/go-appimage#301
+    + Update to Qt 6.8.1
+- Removed patch:
+  * base_dir.patch
+    + not needed with this version
+- Added patch:
+  * welle-io-desktop-file.patch
+    + fix install
+
+-------------------------------------------------------------------
 Sat Nov  2 14:54:31 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
 
 - Update to official 2.5 release

welle-io.spec Changed

@@ -20,14 +20,14 @@
 %define with_gcc 13
 %endif
 Name:           welle-io
-Version:        2.5
+Version:        2.6
 Release:        0
 Summary:        Receiver for DAB and DAB+ broadcast radio
 License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Other
 URL:            https://www.welle.io/
 Source0:        %{name}-%{version}.tar.xz
-Patch0:         base_dir.patch
+Patch0:         %{name}-desktop-file.patch
 BuildRequires:  cmake
 BuildRequires:  gcc%{?with_gcc}-c++
 BuildRequires:  hicolor-icon-theme
@@ -86,14 +86,15 @@
 
 %install
 %cmake_install
+install -dm 0755 %{buildroot}%{_datadir}/appdata
+install -pm 0644 io.welle.welle_io.appdata.xml %{buildroot}%{_datadir}/appdata/
 
 %files
 %license COPYING
 %{_bindir}/welle-io
-%{_datadir}/applications/welle-io.desktop
+%{_datadir}/appdata
+%{_datadir}/applications/io.welle.welle_io.desktop
 %{_datadir}/icons/hicolor/*/apps/welle-io.png
-%{_datadir}/welle-io
-%{_datadir}/metainfo
 %{_mandir}/man1/welle-io.1%{?ext_man}
 %doc README.md AUTHORS THANKS

base_dir.patch Deleted

@@ -1,142 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7dbdc9ca..d0ab53c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.2)
-+cmake_minimum_required(VERSION 3.10)
- 
- project(Welle.Io LANGUAGES C CXX)
- 
-@@ -13,7 +13,7 @@ if(NOT WELLE-IO_VERSION)
- endif()
- 
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- 
- option(BUILD_WELLE_IO    "Build Welle.io"                        ON  )
- option(BUILD_WELLE_CLI   "Build welle-cli"                       ON  )
-@@ -200,8 +200,8 @@ endif()
- 
- if (SOAPYSDR)
-   find_package(SoapySDR NO_MODULE REQUIRED)
--  # Note: SoapySDRConfig.cmake sets C++11 standard so it needs to be reset to C++14
--  set(CMAKE_CXX_STANDARD 14)
-+  # Note: SoapySDRConfig.cmake sets C++11 standard so it needs to be reset to C++17
-+  set(CMAKE_CXX_STANDARD 17)
- endif()
- 
- include_directories(
-diff --git a/src/welle-cli/webradiointerface.cpp b/src/welle-cli/webradiointerface.cpp
-index 74c51425..d57ceecc 100644
---- a/src/welle-cli/webradiointerface.cpp
-+++ b/src/welle-cli/webradiointerface.cpp
-@@ -24,6 +24,7 @@
-  */
- 
- #include "welle-cli/webradiointerface.h"
-+#include <filesystem>
- #include <algorithm>
- #include <cmath>
- #include <complex>
-@@ -131,13 +132,15 @@ static bool send_http_response(Socket& s, const string& statuscode,
- 
- WebRadioInterface::WebRadioInterface(CVirtualInput& in,
-         int port,
-+        const string &base_dir,
-         DecodeSettings ds,
-         RadioReceiverOptions rro) :
-     dabparams(1),
-     input(in),
-     spectrum_fft_handler(dabparams.T_u),
-     rro(rro),
--    decode_settings(ds)
-+    decode_settings(ds),
-+    base_dir(base_dir)
- {
-     {
-         // Ensure that rx always exists when rx_mut is free!
-@@ -563,7 +566,17 @@ bool WebRadioInterface::send_file(Socket& s,
-         const std::string& filename,
-         const std::string& content_type)
- {
--    FILE *fd = fopen(filename.c_str(), "r");
-+    std::filesystem::path path_name;
-+    if (!base_dir.empty())
-+    {
-+        path_name = base_dir;
-+        path_name /= filename;
-+    }
-+    else
-+    {
-+        path_name = filename;
-+    }
-+    FILE *fd = fopen(path_name.c_str(), "r");
-     if (fd) {
-         if (not send_http_response(s, http_ok, "", content_type)) {
-             cerr << "Failed to send file headers" << endl;
-diff --git a/src/welle-cli/webradiointerface.h b/src/welle-cli/webradiointerface.h
-index f029e48b..81cae0ea 100644
---- a/src/welle-cli/webradiointerface.h
-+++ b/src/welle-cli/webradiointerface.h
-@@ -75,6 +75,7 @@ class WebRadioInterface : public RadioControllerInterface {
-         WebRadioInterface(
-                 CVirtualInput& in,
-                 int port,
-+                const std::string& base_dir,
-                 DecodeSettings cs,
-                 RadioReceiverOptions rro);
-         ~WebRadioInterface();
-@@ -215,4 +216,6 @@ class WebRadioInterface : public RadioControllerInterface {
-             std::chrono::time_point<std::chrono::steady_clock> time_change;
-         };
-         std::list<ActiveCarouselService> carousel_services_active;
-+
-+        std::string base_dir;
- };
-diff --git a/src/welle-cli/welle-cli.cpp b/src/welle-cli/welle-cli.cpp
-index cf84060e..c02f5106 100644
---- a/src/welle-cli/welle-cli.cpp
-+++ b/src/welle-cli/welle-cli.cpp
-@@ -275,6 +275,7 @@ class RadioInterface : public RadioControllerInterface {
- struct options_t {
-     string soapySDRDriverArgs = "";
-     string antenna = "";
-+    string base_dir = "";
-     int gain = -1;
-     string channel = "10B";
-     string iqsource = "";
-@@ -314,6 +315,7 @@ static void usage()
-     endl <<
-     "Web server mode:" << endl <<
-     "    -w port       Enable web server on port <port>." << endl <<
-+    "    -b path       Base directory of index.html and index.js files." << endl <<
-     "    -C number     Number of programmes to decode in a carousel" << endl <<
-     "                  (to be used with -w, cannot be used with -D)." << endl <<
-     "                  This is useful if your machine cannot decode all programmes" << endl <<
-@@ -409,11 +411,14 @@ options_t parse_cmdline(int argc, char **argv)
-     options.rro.decodeTII = true;
- 
-     int opt;
--    while ((opt = getopt(argc, argv, "A:c:C:dDf:F:g:hp:O:Ps:Tt:uvw:")) != -1) {
-+    while ((opt = getopt(argc, argv, "A:b:c:C:dDf:F:g:hp:O:Ps:Tt:uvw:")) != -1) {
-         switch (opt) {
-             case 'A':
-                 options.antenna = optarg;
-                 break;
-+            case 'b':
-+                options.base_dir = optarg;
-+                break;
-             case 'c':
-                 options.channel = optarg;
-                 break;
-@@ -605,7 +610,7 @@ int main(int argc, char **argv)
-             return 1;
-         }
- 
--        WebRadioInterface wri(*in, options.web_port, ds, options.rro);
-+        WebRadioInterface wri(*in, options.web_port, options.base_dir, ds, options.rro);
-         wri.serve();
-     }
-     else {

welle-io-desktop-file.patch Added

@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e28ab1..83add27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -444,8 +444,7 @@ if(BUILD_WELLE_IO)
+         INSTALL (FILES src/welle-gui/doc/man/welle-io.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
+ 
+         if(UNIX AND NOT APPLE)
+-            INSTALL (FILES ${PROJECT_SOURCE_DIR}/welle-io.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+-            INSTALL (FILES ${PROJECT_SOURCE_DIR}/io.welle.welle_io.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
++            INSTALL (FILES ${PROJECT_SOURCE_DIR}/io.welle.welle_io.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+ 
+             INSTALL (FILES ${PROJECT_SOURCE_DIR}/src/welle-gui/icons/16x16/welle-io.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps)
+             INSTALL (FILES ${PROJECT_SOURCE_DIR}/src/welle-gui/icons/24x24/welle-io.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps)

_service Changed

welle-io-2.5.tar.xz/io.welle.welle_io.json Deleted

@@ -1,57 +0,0 @@
-{
-    "app-id": "io.welle.welle_io",
-    "runtime": "org.kde.Platform",
-    "runtime-version": "5.15",
-    "sdk": "org.kde.Sdk",
-    "command": "welle-io",
-    "finish-args": 
-        "--share=network",
-        "--filesystem=host",
-        "--socket=pulseaudio",
-        "--socket=wayland",
-        "--socket=x11",
-        "--device=dri"
-    ,
-    "modules": 
-        {
-		"name": "fftw",
-		"buildsystem": "autotools",
-		"config-opts": "--enable-float","--enable-sse",
-		"sources":  {"type": "archive", "url": "http://fftw.org/fftw-3.3.9.tar.gz", "md5":"50145bb68a8510b5d77605f11cadf8dc" } 
-        },
-        {
-		"name": "libfaad",
-		"buildsystem": "autotools",
-		"sources":  {"type": "git", "url": "https://salsa.debian.org/multimedia-team/faad2.git" } 
-        },
-	{
-		"name": "libusb",
-		"buildsystem": "autotools",
-		"sources":  {"type": "git", "url": "https://github.com/libusb/libusb.git" } 
-	},
-	{
-		"name": "librtlsdr",
-		"buildsystem": "cmake",
-		"sources":  {"type": "git", "url": "git://git.osmocom.org/rtl-sdr.git" } 
-	},
-	{
-		"name": "libairspy",
-		"buildsystem": "cmake",
-		"sources":  {"type": "git", "url": "https://github.com/airspy/airspyone_host.git" } 
-	},
-	{
-		"name": "SoapySDR",
-		"buildsystem": "cmake",
-		"config-opts": "-DCMAKE_BUILD_TYPE=Release",
-		"sources":  {"type": "git", "url": "https://github.com/pothosware/SoapySDR.git" } 
-        },
-        {
-		"name": "welle.io",
-		"buildsystem": "qmake",
-		"build-commands" : "cp src/welle-gui/welle-io /app/bin",
-		"config-opts":  "LIBS+=-L/app/lib",
-		"sources":  {"type": "dir", "path": "."} 
-        }
-    
-}
-

welle-io-2.5.tar.xz/io.welle.welle_io.metainfo.xml Deleted

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop-application">
-  <id>io.welle.welle_io</id>
-  <launchable type="desktop-id">welle-io.desktop</launchable>
-  <name>welle.io</name>
-  <summary>A DAB/DAB+ Software Radio</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <developer_name>Albrecht Lohofener</developer_name>
-  <url type="homepage">https://www.welle.io</url>
-  <description>
-    <p>
-      welle.io is an open source DAB and DAB+ software defined radio (SDR) with support for rtl-sdr (RTL2832U), airspy and other devices supported by SoapySDR.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://www.welle.io/images/welle-io_standard_mode.png</image>
-    </screenshot>
-  </screenshots>
-  <update_contact>albrechtloh@gmx.de</update_contact>
-  <content_rating type="oars-1.1" />
-</component>

welle-io-2.5.tar.xz/welle-io.desktop Deleted

welle-io-2.6.tar.xz/.github/dependabot.yml Added

welle-io-2.5.tar.xz/.github/workflows/android.yml -> welle-io-2.6.tar.xz/.github/workflows/android.yml Changed

welle-io-2.5.tar.xz/.github/workflows/linux.yml -> welle-io-2.6.tar.xz/.github/workflows/linux.yml Changed

@@ -6,20 +6,13 @@
       - master
       - next
       - 'next*'
-    tags:
-      - 'v*'
 
 jobs:
   qtbuild:
     name: Build with Qt
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: '6.7.2'
-          modules: 'qtcharts qtmultimedia qt5compat qtshadertools'
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -29,67 +22,54 @@
         run: |
           echo "DATE=`date +%Y%m%d`" >> $GITHUB_ENV
           echo "GIT_HASH=`git rev-parse --short HEAD`" >> $GITHUB_ENV
-          #echo "QTDIR=$QT_ROOT_DIR" >> $GITHUB_ENV
           cat $GITHUB_ENV
 
       - name: Display environment variables
         run: env | sort
 
-      - name: Install build dependencies
+      - name: Install flatpak build dependencies
         run: |
             set -x
-            sudo apt-get -y install build-essential libfaad-dev libmpg123-dev libfftw3-dev librtlsdr-dev libusb-1.0-0-dev mesa-common-dev libglu1-mesa-dev libpulse-dev libsoapysdr-dev libairspy-dev libmp3lame-dev libflac++-dev
-     
-      - name: Build
-        id: build
-        run: |
-            mkdir build
-            cd build
-            qmake PREFIX=/usr ..
-            make -j4
-            cd ..
-            echo $PWD
 
-      - name: Prepare welle-io AppImage
-        id: prepare_app_image
-        run: |
-            find build/
-            mkdir -p ./appdir/usr/share/applications
-            cp welle-io.desktop ./appdir/usr/share/applications
-            mkdir -p ./appdir/usr/bin
-            cp build/src/welle-gui/welle-io ./appdir/usr/bin
-            mkdir -p ./appdir/usr/lib
-            mkdir -p ./appdir/usr/share/icons/hicolor/256x256/apps/
-            cp src/welle-gui/icons/icon.png ./appdir/usr/share/icons/hicolor/256x256/apps/welle-io.png
-            find appdir/
-      
-      - name: Create AppImage
-        id: create_appimage
+            # Install build dependencies
+            sudo apt-get -y install flatpak-builder appstream-compose
+            flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+            # For flatpak-builder-lint
+            flatpak install -y flathub org.flatpak.Builder
+
+      - name: Prepare flatpak build
         run: |
-          # Get appimagetool
-          # wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
-          wget https://welle-io-nightlies.albrechtloh.de/appimagetool-843-x86_64.AppImage # just for testing
-          chmod +x appimagetool-*.AppImage
+            # Add current build date into appdata.xml
+            APPDATA_DATE=`date +%Y-%m-%d`
+            sed -i 's/date="1970-01-01"/'date=\""$APPDATA_DATE"\"'/g' io.welle.welle_io.appdata.xml
+
+            # Add githash into appdata.xml
+            APPDATA_DATE_VERSION="2.6-$GIT_HASH"
+            sed -i 's/version="0.0.0"/'version=\""$APPDATA_DATE_VERSION"\"'/g' io.welle.welle_io.appdata.xml
+
+            # Check if file "io.welle.welle_io.appdata.xml" is valid
+            flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream io.welle.welle_io.appdata.xml
 
-          # Create AppImage
-          ./appimagetool-*.AppImage -s deploy ./appdir/usr/share/applications/*.desktop # Bundle EVERYTHING
-          find appdir/
-          VERSION=1.0 ./appimagetool-*.AppImage ./appdir # turn AppDir into AppImage
+      - name: Build
+        id: build
+        run: |
+            # Create welle-gui Flatpak
+            flatpak-builder --force-clean --user --install-deps-from=flathub --repo=repo --install builddir io.welle.welle_io.yml
+            flatpak build-bundle repo welle-io.flatpak io.welle.welle_io --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 
-          # Preapre publish
-          mkdir publish
-          mv welle.io-1.0-x86_64.AppImage publish/"$DATE"_"$GIT_HASH"_Linux_welle-io-x86_64.AppImage
+            # Prepare publish
+            mkdir publish
+            mv welle-io.flatpak publish/"$DATE"_"$GIT_HASH"_Linux_welle-io-x86_64.flatpak
         
-      - name: Archive artifacts (welle.io AppImage)
-        if: always() && steps.create_appimage.outcome == 'success'
+      - name: Archive artifacts (welle.io Flatpak)
         uses: actions/upload-artifact@v4
         with:
-          name: welle.io AppImage
-          path: publish/*welle-io-x86_64.AppImage
+          name: welle.io Flatpak
+          path: publish/*.flatpak
           if-no-files-found: error
 
       - name: Upload to nightly server
-        if: always() && steps.create_appimage.outcome == 'success'
         uses: dennisameling/ftp-upload-action@v1
         with:
           server: a2f24.netcup.net # welle-io-nightlies.albrechtloh.de is redirected to here

welle-io-2.5.tar.xz/.github/workflows/raspberrypi.yml -> welle-io-2.6.tar.xz/.github/workflows/raspberrypi.yml Changed

welle-io-2.5.tar.xz/.github/workflows/windows.yml -> welle-io-2.6.tar.xz/.github/workflows/windows.yml Changed

@@ -6,8 +6,6 @@
       - master
       - next
       - 'next*'
-    tags:
-      - 'v*'
 
 jobs:
   qtbuild:
@@ -18,10 +16,11 @@
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.7.2'
+          version: '6.8.1'
           modules: 'qtcharts qtmultimedia qt5compat qtshadertools'
           arch: 'win64_mingw'
-          tools: 'tools_mingw90'
+          tools: 'tools_mingw1310'
+          aqtversion: '==3.1.19' # See https://github.com/jurplel/install-qt-action/issues/270
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -54,7 +53,9 @@
         run: |
             echo "*** Create new folders ***"
             New-Item -ItemType directory -Path installer
+            New-Item -ItemType directory -Path to_publish
             New-Item -ItemType directory -Path publish
+            New-Item -ItemType directory -Path publish_production
             
             echo "*** Copy non QT DLLs from welle.io-win-libs repository ***"
             Copy-Item ..\welle.io-win-libs\x64\*.dll installer -recurse # Libs
@@ -79,22 +80,70 @@
             $Filename = $current_date + "_" + $git_hash + "_Windows_welle-io-setup_x64"
 
             echo ""*** Run InnoSetup "***"
-            & ISCC /Opublish\ /F$Filename /DGitHash=$git_hash windows_installer.iss
+            & ISCC /Oto_publish\ /F$Filename /DGitHash=$git_hash windows_installer.iss
 
       - name: Archive artifacts (welle.io Windows installer)
-        if: always() && steps.create_installer.outcome == 'success'
+        id: upload_artifact
         uses: actions/upload-artifact@v4
         with:
           name: welle.io Windows installer
+          path: to_publish\*.exe
+          if-no-files-found: error
+
+      - name: Sign installer with self-signed certificate with SignPath
+        id: signing_installer
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: 'b7a507e8-ab76-445f-bfb5-05944bcbbee9'
+          project-slug: 'welle.io'
+          signing-policy-slug: 'test-signing'
+          github-artifact-id: '${{steps.upload_artifact.outputs.artifact-id}}'
+          wait-for-completion: true
+          output-artifact-directory: 'publish'
+
+      - name: Archive artifacts (welle.io Windows installer signed)
+        id: upload_artifact_self_signed
+        uses: actions/upload-artifact@v4
+        with:
+          name: welle.io Windows installer self-signed
           path: publish\*.exe
           if-no-files-found: error
 
       - name: Upload to nightly server
-        if: always() && steps.create_installer.outcome == 'success'
         uses: dennisameling/ftp-upload-action@v1
         with:
           server: a2f24.netcup.net # welle-io-nightlies.albrechtloh.de is redirected to here
           secure: true
           username: ${{ secrets.SFTP_USER }}
           password: ${{ secrets.SFTP_PASSWORD }}
-          local_dir: publish/
\ No newline at end of file
+          local_dir: publish/
+
+      - name: Production sign installer with SignPath
+        id: production_signing_installer
+        uses: signpath/github-action-submit-signing-request@v1
+
+        # Production signing needs a manual step in SignPath within 5 minutes.
+        # During development we don't need each build signed with a production key.
+        # So we can accept to fail here
+        continue-on-error: true
+
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: 'b7a507e8-ab76-445f-bfb5-05944bcbbee9'
+          project-slug: 'welle.io'
+          signing-policy-slug: 'release-signing'
+          github-artifact-id: '${{steps.upload_artifact.outputs.artifact-id}}'
+          wait-for-completion: true
+          output-artifact-directory: 'publish_production'
+
+      - name: Archive artifacts (welle.io Windows installer signed)
+        id: upload_artifact_production_signed
+        uses: actions/upload-artifact@v4
+        if: always() && steps.production_signing_installer.outcome == 'success'
+        with:
+          name: welle.io Windows installer production-signed
+          path: publish_production\*.exe
+          if-no-files-found: error
+
+

welle-io-2.5.tar.xz/.gitignore -> welle-io-2.6.tar.xz/.gitignore Changed

welle-io-2.5.tar.xz/CMakeLists.txt -> welle-io-2.6.tar.xz/CMakeLists.txt Changed

@@ -77,7 +77,7 @@
 if(BUILD_WELLE_CLI AND NOT ANDROID)
     find_package(Lame REQUIRED)
     if (FLAC)
-    find_package(FLACPP REQUIRED) # test if FLAC is installed on the system     
+    find_package(FLACPP REQUIRED) # test if FLAC is installed on the system
     add_definitions(-DHAVE_FLAC)
     endif()
 endif()
@@ -205,6 +205,7 @@
 endif()
 
 include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
     src
     src/backend
     src/output
@@ -458,7 +459,14 @@
 
 if(BUILD_WELLE_CLI AND NOT ANDROID)
     set(cliExecutableName welle-cli)
-    add_executable (${cliExecutableName} ${welle_cli_sources} ${backend_sources} ${input_sources} ${fft_sources})
+    add_executable (${cliExecutableName}
+        ${welle_cli_sources}
+        ${backend_sources}
+        ${input_sources}
+        ${fft_sources}
+        index.html.h
+        index.js.h
+        favicon.ico.h)
 
     if(CMAKE_BUILD_TYPE MATCHES Debug)
       SET_TARGET_PROPERTIES(${cliExecutableName} PROPERTIES COMPILE_FLAGS "-O2 -fno-omit-frame-pointer -fsanitize=address")
@@ -478,34 +486,34 @@
       Threads::Threads
     )
 
+    find_program(RESOURCE_COMPILER xxd)
     add_custom_command(
-            TARGET ${cliExecutableName} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-                    ${CMAKE_SOURCE_DIR}/src/welle-cli/index.html
-                    ${CMAKE_CURRENT_BINARY_DIR}/index.html)
+        OUTPUT index.html.h
+        COMMAND ${RESOURCE_COMPILER} -i -n index_html
+                ${CMAKE_SOURCE_DIR}/src/welle-cli/index.html
+                index.html.h
+        DEPENDS ${CMAKE_SOURCE_DIR}/src/welle-cli/index.html)
+    set_property(SOURCE index.html.h PROPERTY SKIP_AUTOMOC ON)
+
     add_custom_command(
-            TARGET ${cliExecutableName} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-                    ${CMAKE_SOURCE_DIR}/src/welle-cli/index.js
-                    ${CMAKE_CURRENT_BINARY_DIR}/index.js)
+        OUTPUT index.js.h
+        COMMAND ${RESOURCE_COMPILER} -i -n index_js
+                ${CMAKE_SOURCE_DIR}/src/welle-cli/index.js
+                index.js.h
+        DEPENDS ${CMAKE_SOURCE_DIR}/src/welle-cli/index.js)
+    set_property(SOURCE index.js.h PROPERTY SKIP_AUTOMOC ON)
 
-    if(APPLE AND WITH_APP_BUNDLE)
-        INSTALL (TARGETS ${cliExecutableName} RUNTIME DESTINATION ${GUI_INSTALL_DIR}/${executableName}.app/Contents/MacOS)
-        INSTALL (
-            FILES
-                ${PROJECT_SOURCE_DIR}/src/welle-cli/index.html
-                ${PROJECT_SOURCE_DIR}/src/welle-cli/index.js
-            DESTINATION ${GUI_INSTALL_DIR}/${executableName}.app/Contents/Resources/welle-cli
-        )
-    elseif(UNIX)
+    add_custom_command(
+        OUTPUT favicon.ico.h
+        COMMAND ${RESOURCE_COMPILER} -i -n favicon_ico
+                ${CMAKE_SOURCE_DIR}/src/welle-cli/favicon.ico
+                favicon.ico.h
+        DEPENDS ${CMAKE_SOURCE_DIR}/src/welle-cli/favicon.ico)
+    set_property(SOURCE favicon.ico.h PROPERTY SKIP_AUTOMOC ON)
+
+    if(UNIX AND NOT APPLE OR NOT WITH_APP_BUNDLE)
         INSTALL (TARGETS ${cliExecutableName} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
         INSTALL (FILES src/welle-cli/doc/man/welle-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
-        INSTALL (
-            FILES
-                ${PROJECT_SOURCE_DIR}/src/welle-cli/index.html
-                ${PROJECT_SOURCE_DIR}/src/welle-cli/index.js
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/welle-io/html/
-        )
     endif()
 endif()

welle-io-2.5.tar.xz/README.md -> welle-io-2.6.tar.xz/README.md Changed

@@ -28,6 +28,7 @@
     * Examples(#examples)
   * Limitations(#limitations)
   * Development(#development)
+  * Sponsors(#sponsors)
 
 Download
 ========
@@ -401,3 +402,15 @@
 If you build with cmake and add `-DPROFILING=ON`, welle-io will generate a few `.csv` files and a graphviz `.dot` file that can be used
 to analyse and understand which parts of the backend use CPU resources. Use `dot -Tpdf profiling.dot > profiling.pdf` to generate a graph
 visualisation. Search source code for the `PROFILE()` macro to see where the profiling marks are placed.
+
+Sponsors
+===
+
+<table>
+ <tbody>
+  <tr>
+   <td align="center"><img alt="SignPath" src="https://avatars.githubusercontent.com/u/34448643" height="30"/></td>
+   <td>Free code signing on Windows provided by <a href="https://signpath.io/?utm_source=foundation&utm_medium=github&utm_campaign=welle">SignPath.io</a>, certificate by <a href="https://signpath.org/?utm_source=foundation&utm_medium=github&utm_campaign=welle">SignPath Foundation</a></td>
+  </tr>
+ </tbody>
+</table>

welle-io-2.5.tar.xz/cmake/cmake_uninstall.cmake.in -> welle-io-2.6.tar.xz/cmake/cmake_uninstall.cmake.in Changed

welle-io-2.6.tar.xz/io.welle.welle_io.appdata.xml Added

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>io.welle.welle_io</id>
+  <launchable type="desktop-id">io.welle.welle_io.desktop</launchable>
+  <name>welle.io</name>
+  <summary>A DAB/DAB+ Software Radio</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <developer id="io.welle.welle_io">
+    <name>Albrecht Lohofener</name>
+  </developer>
+  <url type="homepage">https://www.welle.io</url>
+  <description>
+    <p>
+      welle.io is an open source DAB and DAB+ software defined radio (SDR) with support for rtl-sdr (RTL2832U), airspy and other devices supported by SoapySDR.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://www.welle.io/images/welle-io_standard_mode.png</image>
+    </screenshot>
+  </screenshots>
+  <update_contact>albrechtloh@gmx.de</update_contact>
+  <content_rating type="oars-1.1" />
+  <releases>
+    <release date="1970-01-01" version="0.0.0"/>
+  </releases>
+</component>

welle-io-2.6.tar.xz/io.welle.welle_io.desktop Added

welle-io-2.6.tar.xz/io.welle.welle_io.yml Added

@@ -0,0 +1,105 @@
+app-id: io.welle.welle_io
+runtime: org.kde.Platform
+runtime-version: '6.8'
+sdk: org.kde.Sdk
+command: welle-io
+finish-args:
+  - '--share=network'
+  - '--share=ipc'
+  - '--filesystem=xdg-documents'
+  - '--socket=pulseaudio'
+  - '--socket=wayland'
+  - '--socket=fallback-x11'
+  - '--device=dri'
+  - '--device=all'
+
+modules:
+  - name: fftw
+    buildsystem: autotools
+    config-opts:
+      - '--enable-shared'
+      - '--disable-static'
+      - '--enable-threads'
+      - '--enable-float'
+    sources:
+      - type: archive
+        url: 'http://fftw.org/fftw-3.3.10.tar.gz'
+        md5: 8ccbf6a5ea78a16dbc3e1306e234cc5c
+
+  - name: libfaad
+    buildsystem: cmake
+    sources:
+      - type: git
+        url: 'https://salsa.debian.org/multimedia-team/faad2.git'
+
+  - name: libusb
+    buildsystem: autotools
+    config-opts:
+      - '--disable-udev'
+    sources:
+      - type: git
+        url: 'https://github.com/libusb/libusb.git'
+
+  - name: librtlsdr
+    buildsystem: cmake
+    config-opts:
+      - '-Wno-dev'
+      - '-DDETACH_KERNEL_DRIVER=ON'
+    sources:
+      - type: git
+        url: 'git://git.osmocom.org/rtl-sdr.git'
+
+  - name: libairspy
+    buildsystem: cmake
+    config-opts:
+      - '-Wno-dev'
+    sources:
+      - type: git
+        url: 'https://github.com/airspy/airspyone_host.git'
+
+  - name: SoapySDR
+    buildsystem: cmake
+    config-opts:
+      - '-DCMAKE_BUILD_TYPE=Release'
+      - '-Wno-dev'
+    sources:
+      - type: git
+        url: 'https://github.com/pothosware/SoapySDR.git'
+
+  - name: welle.io
+    buildsystem: qmake
+    build-commands:
+      - cp src/welle-gui/welle-io /app/bin
+      - install -Dm644 io.welle.welle_io.appdata.xml -t /app/share/metainfo
+      - install -Dm644 io.welle.welle_io.desktop -t /app/share/applications
+      - install -Dm644 icon_16.png /app/share/icons/hicolor/16x16/apps/io.welle.welle_io.png
+      - install -Dm644 icon_32.png /app/share/icons/hicolor/32x32/apps/io.welle.welle_io.png
+      - install -Dm644 icon_48.png /app/share/icons/hicolor/48x48/apps/io.welle.welle_io.png
+      - install -Dm644 icon_128.png /app/share/icons/hicolor/128x128/apps/io.welle.welle_io.png
+      - install -Dm644 icon_256.png /app/share/icons/hicolor/256x256/apps/io.welle.welle_io.png
+    config-opts:
+      - LIBS+=-L/app/lib
+      - LIBS+=-L/app/lib64
+      - 'QMAKE_LFLAGS+=-Wl,-rpath,/app/lib64'
+    sources:
+      - type: dir
+        path: .
+      - type: file
+        path: io.welle.welle_io.appdata.xml
+      - type: file
+        path: io.welle.welle_io.desktop
+      - type: file
+        path: src/welle-gui/icons/16x16/welle-io.png
+        dest-filename: icon_16.png
+      - type: file
+        path: src/welle-gui/icons/32x32/welle-io.png
+        dest-filename: icon_32.png
+      - type: file
+        path: src/welle-gui/icons/48x48/welle-io.png
+        dest-filename: icon_48.png
+      - type: file
+        path: src/welle-gui/icons/128x128/welle-io.png
+        dest-filename: icon_128.png
+      - type: file
+        path: src/welle-gui/icons/256x256/welle-io.png
+        dest-filename: icon_256.png
\ No newline at end of file

welle-io-2.5.tar.xz/src/backend/fib-processor.cpp -> welle-io-2.6.tar.xz/src/backend/fib-processor.cpp Changed

@@ -143,17 +143,18 @@
 
     if (changeflag == 0)
         return;
-    // else if (changeflag == 1) {
-    //     std::clog << "fib-processor:" << "Changes in sub channel organization\n") << std::endl;
-    //     std::clog << "fib-processor:" << "cifcount = %d\n", highpart * 250 + lowpart) << std::endl;
-    //     std::clog << "fib-processor:" << "Change happening in %d CIFs\n", occurrenceChange) << std::endl;
-    //  }
-    //  else if (changeflag == 3) {
-    //     std::clog << "fib-processor:" << "Changes in subchannel and service organization\n") << std::endl;
-    //     std::clog << "fib-processor:" << "cifcount = %d\n", highpart * 250 + lowpart) << std::endl;
-    //     std::clog << "fib-processor:" << "Change happening in %d CIFs\n", occurrenceChange) << std::endl;
-    //  }
-    std::clog << "fib-processor: " << "changes in config not supported, choose again" << std::endl;
+    else if (changeflag == 1) {
+        std::clog << "fib-processor:" << "Changes in sub channel organization" << std::endl;
+        std::clog << "fib-processor:" << "cifcount = " << highpart * 250 + lowpart << std::endl;
+        std::clog << "fib-processor:" << "Change happening in " << occurrenceChange << " CIFs" << std::endl;
+     }
+     else if (changeflag == 3) {
+        std::clog << "fib-processor:" << "Changes in subchannel and service organization" << std::endl;
+        std::clog << "fib-processor:" << "cifcount = " << highpart * 250 + lowpart << std::endl;
+        std::clog << "fib-processor:" << "Change happening in " << occurrenceChange << " CIFs" << std::endl;
+     }
+
+    myRadioInterface.onRestartService();
 }
 
 //  FIG0 extension 1 creates a mapping between the
@@ -456,14 +457,14 @@
 
     uint8_t lsFlag  = getBits_1(d, lOffset);
     if (lsFlag == 1) {
-        int16_t SCid = getBits(d, lOffset + 4, 12);
+        /* int16_t SCid = */ getBits(d, lOffset + 4, 12);
         lOffset += 16;
         //           if (findPacketComponent ((SCIds << 4) | SCid) != NULL) {
         //              std::clog << "fib-processor:" << "packet component bestaat !!\n") << std::endl;
         //           }
     }
     else {
-        int16_t SubChId = getBits_6(d, lOffset + 4);
+        /* int16_t SubChId = */ getBits_6(d, lOffset + 4);
         lOffset += 8;
     }

welle-io-2.5.tar.xz/src/backend/phasereference.cpp -> welle-io-2.6.tar.xz/src/backend/phasereference.cpp Changed

welle-io-2.5.tar.xz/src/backend/radio-controller.h -> welle-io-2.6.tar.xz/src/backend/radio-controller.h Changed

welle-io-2.5.tar.xz/src/input/raw_file.cpp -> welle-io-2.6.tar.xz/src/input/raw_file.cpp Changed

welle-io-2.5.tar.xz/src/input/rtl_tcp.cpp -> welle-io-2.6.tar.xz/src/input/rtl_tcp.cpp Changed

welle-io-2.5.tar.xz/src/libs/json.hpp -> welle-io-2.6.tar.xz/src/libs/json.hpp Changed

welle-io-2.5.tar.xz/src/various/channels.cpp -> welle-io-2.6.tar.xz/src/various/channels.cpp Changed

welle-io-2.6.tar.xz/src/welle-cli/favicon.ico Added

welle-io-2.5.tar.xz/src/welle-cli/index.html -> welle-io-2.6.tar.xz/src/welle-cli/index.html Changed

welle-io-2.5.tar.xz/src/welle-cli/index.js -> welle-io-2.6.tar.xz/src/welle-cli/index.js Changed

welle-io-2.5.tar.xz/src/welle-cli/tests.cpp -> welle-io-2.6.tar.xz/src/welle-cli/tests.cpp Changed

@@ -260,7 +260,7 @@
     while (not service_selected) {
         this_thread::sleep_for(chrono::seconds(1));
 
-        for (const auto s : rx.getServiceList()) {
+        for (const auto& s : rx.getServiceList()) {
             if (rx.playSingleProgramme(tph, dumpFileName, s) == false) {
                 cerr << "Tune to " << s.serviceLabel.utf8_label() << " failed" << endl;
             }
@@ -330,7 +330,7 @@
     while (not service_selected) {
         this_thread::sleep_for(chrono::seconds(1));
 
-        for (const auto s : rx.getServiceList()) {
+        for (const auto& s : rx.getServiceList()) {
             if (rx.playSingleProgramme(tph, dumpFileName, s) == false) {
                 cerr << "Tune to " << s.serviceLabel.utf8_label() << " failed" << endl;
             }
@@ -357,12 +357,12 @@
         fprintf(fd, "fname,ofdmthreshold,with_coarse,num_syncs,num_desyncs,time_to_first_sync,frameerrors,aacerrors,rserrors\n");
     }
 
-    fprintf(fd, "%s,%s,%d,%zu,%zu,%ld,%d,%d,%d\n",
+    fprintf(fd, "%s,%s,%d,%zu,%zu,%lld,%d,%d,%d\n",
             intf.getFileName().c_str(),
             fftPlacementMethodToString(rro.fftPlacementMethod),
             rro.disableCoarseCorrector ? 0 : 1,
             ri.num_syncs, ri.num_desyncs,
-            chrono::duration_cast<chrono::milliseconds>(start_time-ri.first_sync_time).count(),
+            static_cast<long long>(chrono::duration_cast<chrono::milliseconds>(start_time-ri.first_sync_time).count()),
             std::accumulate(tph.frameErrorStats.begin(), tph.frameErrorStats.end(), 0),
             std::accumulate(tph.aacErrorStats.begin(), tph.aacErrorStats.end(), 0),
             std::accumulate(tph.rsErrorStats.begin(), tph.rsErrorStats.end(), 0));

welle-io-2.5.tar.xz/src/welle-cli/webprogrammehandler.cpp -> welle-io-2.6.tar.xz/src/welle-cli/webprogrammehandler.cpp Changed

welle-io-2.5.tar.xz/src/welle-cli/webprogrammehandler.h -> welle-io-2.6.tar.xz/src/welle-cli/webprogrammehandler.h Changed

welle-io-2.5.tar.xz/src/welle-cli/webradiointerface.cpp -> welle-io-2.6.tar.xz/src/welle-cli/webradiointerface.cpp Changed

@@ -56,6 +56,10 @@
 #include "welle-cli/jsonconvert.h"
 #include "welle-cli/webprogrammehandler.h"
 
+#include "index.html.h"
+#include "index.js.h"
+#include "favicon.ico.h"
+
 #ifdef __unix__
 # include <unistd.h>
 # if _POSIX_VERSION >= 200809L
@@ -104,14 +108,17 @@
 static const char* http_contenttype_html =
         "Content-Type: text/html; charset=utf-8\r\n";
 
+static const char* http_contenttype_ico =
+        "Content-Type: image/x-icon\r\n";
+
 static const char* http_nocache = "Cache-Control: no-cache\r\n";
 
 static string to_hex(uint32_t value, int width)
 {
-    std::stringstream sidstream;
+    stringstream sidstream;
     sidstream << "0x" <<
-        std::setfill('0') << std::setw(width) <<
-        std::hex << value;
+        setfill('0') << setw(width) <<
+        hex << value;
     return sidstream.str();
 }
 
@@ -188,7 +195,7 @@
             const auto sid = s.serviceId;
 
             try {
-                const bool is_active = std::find_if(
+                const bool is_active = find_if(
                         carousel_services_active.cbegin(),
                         carousel_services_active.cend(),
                         &(const ActiveCarouselService& acs) {
@@ -241,7 +248,7 @@
     phs_changed.notify_all();
 }
 
-void WebRadioInterface::retune(const std::string& channel)
+void WebRadioInterface::retune(const string& channel)
 {
     // Ensure two closely occurring retune() calls don't get stuck
     unique_lock<mutex> retune_lock(retune_mut);
@@ -420,7 +427,7 @@
         constexpr auto CL = "Content-Length";
         if (r.headers.count(CL) == 1) {
             try {
-                const int content_length = std::stoi(r.headersCL);
+                const int content_length = stoi(r.headersCL);
                 if (content_length > 1024 * 1024) {
                     cerr << "Unreasonable POST Content-Length: " << content_length << endl;
                     return r;
@@ -463,10 +470,13 @@
     else {
         if (req.is_get) {
             if (req.url == "/") {
-                success = send_file(s, "index.html", http_contenttype_html);
+                success = send_file(s, index_html, index_html_len, http_contenttype_html);
             }
             else if (req.url == "/index.js") {
-                success = send_file(s, "index.js", http_contenttype_js);
+                success = send_file(s, index_js, index_js_len, http_contenttype_js);
+            }
+            else if (req.url == "/favicon.ico") {
+                success = send_file(s, favicon_ico, favicon_ico_len, http_contenttype_ico);
             }
             else if (req.url == "/mux.json") {
                 success = send_mux_json(s);
@@ -498,37 +508,42 @@
                 return false;
             }
             else {
+                bool url_handled = false;
                 const regex regex_slide(R"(^/slide/(^ +))");
-                std::smatch match_slide;
+                smatch match_slide;
+                if (regex_search(req.url, match_slide, regex_slide)) {
+                    success = send_slide(s, match_slide1);
+                    url_handled = true;
+                }
 
                 const regex regex_stream(R"(^/stream/(^ +))");
-                std::smatch match_stream;
+                smatch match_stream;
                 if (regex_search(req.url, match_stream, regex_stream)) {
                     success = send_stream(s, match_stream1);
+                    url_handled = true;
                 }
 
                 if (decode_settings.outputCodec == OutputCodec::MP3)
                 {
                     const regex regex_mp3(R"(^/mp3/(^ +))");
-                    std::smatch match_mp3;
+                    smatch match_mp3;
                     if (regex_search(req.url, match_mp3, regex_mp3)) {
                         success = send_stream(s, match_mp31);
+                        url_handled = true;
                     }
                 }
 
                 if (decode_settings.outputCodec == OutputCodec::FLAC)
                 {
                     const regex regex_flac(R"(^/flac/(^ +))");
-                    std::smatch match_flac;
+                    smatch match_flac;
                     if (regex_search(req.url, match_flac, regex_flac)) {
                         success = send_stream(s, match_flac1);
+                        url_handled = true;
                     }
                 }
 
-                else if (regex_search(req.url, match_slide, regex_slide)) {
-                    success = send_slide(s, match_slide1);
-                }
-                else {
+                if (not url_handled) {
                     cerr << "Could not understand GET request " << req.url << endl;
                 }
             }
@@ -560,37 +575,22 @@
 }
 
 bool WebRadioInterface::send_file(Socket& s,
-        const std::string& filename,
-        const std::string& content_type)
+        const unsigned char *file,
+        const unsigned int file_length,
+        const string& content_type)
 {
-    FILE *fd = fopen(filename.c_str(), "r");
-    if (fd) {
-        if (not send_http_response(s, http_ok, "", content_type)) {
-            cerr << "Failed to send file headers" << endl;
-            fclose(fd);
-            return false;
-        }
-
-        vector<char> data(1024);
-        ssize_t ret = 0;
-        do {
-            ret = fread(data.data(), 1, data.size(), fd);
-            ret = s.send(data.data(), ret, MSG_NOSIGNAL);
-            if (ret == -1) {
-                cerr << "Failed to send file data" << endl;
-                fclose(fd);
-                return false;
-            }
-
-        } while (ret > 0);
-
-        fclose(fd);
-        return true;
+    if (not send_http_response(s, http_ok, "", content_type)) {
+        cerr << "Failed to send file headers" << endl;
+        return false;
     }
-    else {
-        return send_http_response(s, http_500, "file '" + filename + "' is missing!");
+
+    ssize_t ret = 0;
+    ret = s.send((void*)file, file_length, MSG_NOSIGNAL);
+    if (ret == -1) {
+        cerr << "Failed to send file data" << endl;
+        return false;
     }
-    return false;
+    return true;
 }
 
 static vector<PeakJson> calculate_cir_peaks(const vector<float>& cir_linear)
@@ -772,10 +772,10 @@
                     m.timestamp.time_since_epoch());
 
             const auto s = duration_cast<seconds>(ms);
-            const std::time_t t = s.count();
-            const std::size_t fractional_seconds = ms.count() % 1000;
+            const time_t t = s.count();
+            const size_t fractional_seconds = ms.count() % 1000;
 
-            ss << std::ctime(&t) << "." << fractional_seconds;
+            ss << ctime(&t) << "." << fractional_seconds;
 
             switch (m.level) {
                 case message_level_t::Information:
@@ -865,7 +865,7 @@
     return true;
 }
 
-bool WebRadioInterface::send_stream(Socket& s, const std::string& stream)
+bool WebRadioInterface::send_stream(Socket& s, const string& stream)
 {
     unique_lock<mutex> lock(rx_mut);
     ASSERT_RX;

welle-io-2.5.tar.xz/src/welle-cli/webradiointerface.h -> welle-io-2.6.tar.xz/src/welle-cli/webradiointerface.h Changed

welle-io-2.5.tar.xz/src/welle-cli/welle-cli.cpp -> welle-io-2.6.tar.xz/src/welle-cli/welle-cli.cpp Changed

welle-io-2.5.tar.xz/src/welle-gui/QML/MainView.qml -> welle-io-2.6.tar.xz/src/welle-gui/QML/MainView.qml Changed

@@ -235,10 +235,13 @@
 
                 onPressAndHold: volumePopup.open()
                 onClicked: {
-                    if(radioController.volume !== 0)
+                    if(radioController.volume !== 0) {
+                        volumeSlider.valueBeforeMute = volumeSlider.value
                         volumeSlider.value = 0
-                    else
-                        volumeSlider.value = 1
+                    }
+                    else {
+                        volumeSlider.value = volumeSlider.valueBeforeMute
+                    }
                 }
 
                 Accessible.role: Accessible.Button
@@ -265,6 +268,8 @@
                         Slider {
                             id: volumeSlider
 
+                            property real valueBeforeMute: 1
+
                             Layout.alignment: Qt.AlignCenter
 
                             height: 100
@@ -541,7 +546,7 @@
                     }
                 }
 
-                ScrollIndicator.vertical: ScrollIndicator { }
+                ScrollBar.vertical: ScrollBar { }
 
                 Shortcut {
                     context: Qt.ApplicationShortcut
@@ -664,6 +669,7 @@
 
                 WComboBox {
                     id: manualChannelBox
+                    enabled: globalSettingsLoader.item.device != 5 // disable when RAW file is used
                     sizeToContents: true
                     model: "5A", "5B", "5C", "5D",
                         "6A", "6B", "6C", "6D",

welle-io-2.5.tar.xz/src/welle-gui/QML/components/WSpectrum.qml -> welle-io-2.6.tar.xz/src/welle-gui/QML/components/WSpectrum.qml Changed

welle-io-2.5.tar.xz/src/welle-gui/QML/expertviews/ServiceDetails.qml -> welle-io-2.6.tar.xz/src/welle-gui/QML/expertviews/ServiceDetails.qml Changed

welle-io-2.5.tar.xz/src/welle-gui/QML/settingpages/GlobalSettings.qml -> welle-io-2.6.tar.xz/src/welle-gui/QML/settingpages/GlobalSettings.qml Changed

welle-io-2.5.tar.xz/src/welle-gui/QML/settingpages/RTLTCPSettings.qml -> welle-io-2.6.tar.xz/src/welle-gui/QML/settingpages/RTLTCPSettings.qml Changed

@@ -34,84 +34,46 @@
 
 SettingSection {
     text: qsTr("rtl-tcp settings")
+    id: rtltcpsettings
 
     property bool isLoaded : false
 
     Settings {
-        property alias ipByte1: ipAddress1.currentIndex
-        property alias ipByte2: ipAddress2.currentIndex
-        property alias ipByte3: ipAddress3.currentIndex
-        property alias ipByte4: ipAddress4.currentIndex
-        property alias ipPort: ipPort.currentIndex
-        property alias rtlTcpEnableHostName: enableHostName.checked
-        property alias rtlTcpHostName: hostName.text
-    }
+        id: settings
 
-    WSwitch {
-        id: enableHostName
-        text: qsTr("Use host name")
-        Layout.fillWidth: true
-        checked: false
+        // Deprecated: Necessary for migration from version <=2.5, can be removed in future versions
+        property int ipByte1
+        property int ipByte2
+        property int ipByte3
+        property int ipByte4
+
+        property alias ipPort: hostPort.text
+        property alias rtlTcpHostName: hostName.text
     }
 
     RowLayout {
-        spacing: Units.dp(20)
-
-        ColumnLayout {
-            TextStandart {
-                text: qsTr("IP address")
-                Layout.alignment: Qt.AlignHCenter
-            }
-
-            RowLayout {
-                id:layout
-                height: Units.dp(120)
-                spacing: Units.dp(5)
-                enabled: !enableHostName.checked
-
-                WTumbler {
-                    id: ipAddress1
-                    currentIndex: 192
-                }
-                WTumbler {
-                    id: ipAddress2
-                    currentIndex: 168
-                }
-                WTumbler {
-                    id: ipAddress3
-                    currentIndex: 1
-                }
-                WTumbler {
-                    id: ipAddress4
-                    currentIndex: 10
-                }
-            }
+        TextField {
+            id: hostName
+            placeholderText: qsTr("Enter host name or IP address")
+            implicitWidth: 200
         }
 
-        ColumnLayout {
-            TextStandart {
-                text: qsTr("IP port")
-            }
-
-            WTumbler {
-                id: ipPort
-                model: 65536
-                currentIndex: 1234
-            }
+        TextStandart {
+            text: qsTr("Host name or IP-address")
+            Layout.fillWidth: true
         }
     }
 
     RowLayout {
-        enabled: enableHostName.checked
-
         TextField {
-            id: hostName
-            placeholderText: qsTr("Enter host name")
+            id: hostPort
+            placeholderText: qsTr("Enter IP-port")
             implicitWidth: 200
+            text: "1234"
         }
 
         TextStandart {
-            text: qsTr("Host name")
+            text: qsTr("IP-Port")
             Layout.fillWidth: true
         }
     }
@@ -131,16 +93,23 @@
     function __openDevice() {
         var serverAddress = "";
 
-        if(!enableHostName.checked)
+        if(settings.ipByte1) {
+            // Deprecated: Necessary for migration from version <=2.5, can be removed in future versions
             serverAddress =
-                ipAddress1.currentIndex + "."
-                + ipAddress2.currentIndex + "."
-                + ipAddress3.currentIndex + "."
-                + ipAddress4.currentIndex
-        else
-            serverAddress = hostName.text
-
-        guiHelper.openRtlTcp(serverAddress, ipPort.currentIndex, true)
+                settings.ipByte1 + "."
+                + settings.ipByte2 + "."
+                + settings.ipByte3 + "."
+                + settings.ipByte4
+            hostName.text = serverAddress
+
+            // Clear IP address to avoid further usage
+            settings.ipByte1 = 0
+            settings.ipByte2 = 0
+            settings.ipByte3 = 0
+            settings.ipByte4 = 0
+        }
+
+        guiHelper.openRtlTcp(hostName.text, hostPort.text, true)
     }
 }

welle-io-2.5.tar.xz/src/welle-gui/QML/settingpages/RawFileSettings.qml -> welle-io-2.6.tar.xz/src/welle-gui/QML/settingpages/RawFileSettings.qml Changed

welle-io-2.5.tar.xz/src/welle-gui/_current_version -> welle-io-2.6.tar.xz/src/welle-gui/_current_version Changed

welle-io-2.5.tar.xz/src/welle-gui/mpris/mpris.cpp -> welle-io-2.6.tar.xz/src/welle-gui/mpris/mpris.cpp Changed

@@ -169,7 +169,7 @@
 
 QString Mpris::loopStatus() const { return "None"; }
 
-void Mpris::setLoopStatus(const QString &value) {}
+void Mpris::setLoopStatus(const QString & /* value */) {}
 
 double Mpris::maximumRate() const { return 1.0; }
 
@@ -197,7 +197,7 @@
     EmitNotification("Volume", volume);
 }
 
-void Mpris::motChanged(QString pictureName, QString categoryTitle, int categoryId, int slideId)
+void Mpris::motChanged(QString pictureName, QString /* categoryTitle */, int /* categoryId */, int /* slideId */)
 {
     //qDebug() << "MPRIS: pictureName: " << pictureName;
 
@@ -252,11 +252,11 @@
 
 double Mpris::rate() const { return 1.0; }
 
-void Mpris::setRate(double value) {}
+void Mpris::setRate(double /* value */) {}
 
 bool Mpris::shuffle() const { return false; }
 
-void Mpris::setShuffle(bool value) {}
+void Mpris::setShuffle(bool /* value */) {}
 
 double Mpris::volume() const { return (double) qvariant_cast< qreal >(radioController->property("volume")); }
 
@@ -274,7 +274,7 @@
         radioController->play(autoChannel, title, autoService);
 }
 
-void Mpris::OpenUri(const QString &Uri) {}
+void Mpris::OpenUri(const QString & /* Uri */) {}
 
 void Mpris::Pause() { Stop(); }
 
@@ -306,9 +306,9 @@
         radioController->play(autoChannel, title, autoService);
 }
 
-void Mpris::Seek(qlonglong Offset) {}
+void Mpris::Seek(qlonglong /* Offset */) {}
 
-void Mpris::SetPosition(const QDBusObjectPath &TrackId, qlonglong Position) {}
+void Mpris::SetPosition(const QDBusObjectPath & /* TrackId */, qlonglong /* Position */) {}
 
 void Mpris::Stop() { radioController->stop(); }

welle-io-2.5.tar.xz/src/welle-gui/radio_controller.cpp -> welle-io-2.6.tar.xz/src/welle-gui/radio_controller.cpp Changed

@@ -34,6 +34,7 @@
 #include <QDebug>
 #include <QSettings>
 #include <QStandardPaths>
+#include <QTimeZone>
 #include <stdexcept>
 
 #include "radio_controller.h"
@@ -105,6 +106,9 @@
     qRegisterMetaType<dab_date_time_t>("dab_date_time_t");
     connect(this, &CRadioController::dateTimeUpdated,
             this, &CRadioController::displayDateTime);
+
+    connect(this, &CRadioController::restartServiceRequested,
+            this, &CRadioController::restartService);
 }
 
 CRadioController::~CRadioController()
@@ -363,6 +367,7 @@
         if (!isScan)
             emit autoChannelChanged(autoChannel);
         emit ensembleChanged();
+        emit ensembleIdChanged();
         emit frequencyChanged();
     }
 }
@@ -606,7 +611,7 @@
  ********************/
 void CRadioController::initialise(void)
 {
-    for (const auto param_value : deviceParametersString) {
+    for (const auto& param_value : deviceParametersString) {
         device->setDeviceParam(param_value.first, param_value.second);
     }
 
@@ -651,6 +656,7 @@
     currentEId = 0;
     currentEnsembleLabel = "";
     emit ensembleChanged();
+    emit ensembleIdChanged();
 
     currentFrequency = 0;
     emit frequencyChanged();
@@ -727,12 +733,13 @@
  *****************/
 void CRadioController::ensembleId(quint16 eId)
 {
-    qDebug() << "RadioController: ID of ensemble:" << eId;
+    qDebug() << "RadioController: ID of ensemble:" << Qt::hex << eId;
 
     if (currentEId == eId)
         return;
 
     currentEId = eId;
+    emit ensembleIdChanged();
 
     //auto label = radioReceiver->getEnsembleLabel();
     //currentEnsembleLabel = QString::fromStdString(label.utf8_label());
@@ -882,10 +889,9 @@
     Date.setDate(dateTime.year, dateTime.month, dateTime.day);
     currentDateTime.setDate(Date);
 
-    int OffsetFromUtc = dateTime.hourOffset * 3600 +
-                        dateTime.minuteOffset * 60;
-    currentDateTime.setOffsetFromUtc(OffsetFromUtc);
-    currentDateTime.setTimeSpec(Qt::OffsetFromUTC);
+    // int OffsetFromUtc = dateTime.hourOffset * 3600 +
+    //                     dateTime.minuteOffset * 60;
+    currentDateTime.setTimeZone(QTimeZone::UTC);
 
     emit dateTimeChanged(currentDateTime);
 }
@@ -1121,3 +1127,13 @@
 {
     stop();
 }
+
+void CRadioController::onRestartService()
+{
+    emit restartServiceRequested();
+}
+
+void CRadioController::restartService(void)
+{
+    setService(currentService, true);
+}

welle-io-2.5.tar.xz/src/welle-gui/radio_controller.h -> welle-io-2.6.tar.xz/src/welle-gui/radio_controller.h Changed

@@ -89,6 +89,7 @@
     Q_PROPERTY(QStringList lastChannel MEMBER currentLastChannel NOTIFY lastChannelChanged)
     Q_PROPERTY(QString autoChannel MEMBER autoChannel NOTIFY autoChannelChanged)
     Q_PROPERTY(QString ensemble MEMBER currentEnsembleLabel NOTIFY ensembleChanged)
+    Q_PROPERTY(int ensembleId MEMBER currentEId NOTIFY ensembleIdChanged)
     Q_PROPERTY(int frequency MEMBER currentFrequency NOTIFY frequencyChanged)
     Q_PROPERTY(quint32 service MEMBER currentService NOTIFY stationChanged)
     Q_PROPERTY(quint32 autoService MEMBER autoService NOTIFY autoServiceChanged)
@@ -158,6 +159,7 @@
     virtual void onTIIMeasurement(tii_measurement_t&& m) override;
     virtual void onMessage(message_level_t level, const std::string& text, const std::string& text2 = std::string()) override;
     virtual void onInputFailure(void) override;
+    virtual void onRestartService(void) override;
 
 private:
     void initialise(void);
@@ -246,6 +248,7 @@
     void channelTimerTimeout(void);
     void nextChannel(bool isWait);
     void displayDateTime(const dab_date_time_t& dateTime);
+    void restartService(void);
 
 signals:
     void switchToNextChannel(bool isWait);
@@ -282,11 +285,13 @@
     void volumeChanged(qreal volume);
     void motChanged(mot_file_t);
     void motReseted(void);
+    void restartServiceRequested(void);
 
     void channelChanged();
     void lastChannelChanged();
     void autoChannelChanged(QString autoChannel);
     void ensembleChanged();
+    void ensembleIdChanged();
     void frequencyChanged();
     void stationChanged();
     void autoServiceChanged(quint32 autoService);

welle-io-2.5.tar.xz/windows_installer.iss -> welle-io-2.6.tar.xz/windows_installer.iss Changed

Changes of Revision 9