#2557 DMR improved error detection in voice frames and voice events. (#2608)

Co-authored-by: denny <dennis.sheirer@gmail.com>

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support and Questions - How do I XXX?  Does it support XXX?
+    url: https://github.com/DSheirer/sdrtrunk/wiki/Support
+    about: Please ask your user questions here -- DO NOT create an issue if you have a user question please!!

.github/ISSUE_TEMPLATE/how-to-question-or-does-the-software-support-xxx.md

@@ -1,16 +0,0 @@
----
-name: How-To Question or Does The Software Support xxx
-about: End user question or support discussion
-title: STOP - Don't Use Issue Reporting to Post End-User Questions!!!
-labels: ''
-assignees: ''
-
----
-
-STOP !!!!
-
-GitHub issues are for reporting software bugs or requesting enhancements.
-
-If you have a question about how to use the software, or if you want to know if sdrtrunk supports a protocol, tuner, or other aspect, please post your question in one of the Support forums.
-
-Visit: https://github.com/DSheirer/sdrtrunk/wiki

.github/workflows/gradle.yml

@@ -21,14 +21,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 23
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v7
+      - name: Set up JDK 27
+        uses: actions/setup-java@v6
         with:
-          java-version: '23'
+          java-version: '27'
           distribution: 'liberica'
           java-package: 'jdk+fx'
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v6
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: clean build
+        run: ./gradlew clean build

.github/workflows/nightly.yml

@@ -13,35 +13,36 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - name: Set up JDK 23
-        uses: actions/setup-java@v3
+      - name: Set up JDK 27
+        uses: actions/setup-java@v6
         with:
-          java-version: '23'
+          # Must match the JDK version downloaded in build.gradle (jdk_download_base) - jlink requires an exact version match
+          java-version: '27.0.0'
           distribution: 'liberica'
           java-package: 'jdk+fx'
 
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v6
+
       - name: Build Linux and Mac releases with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: runtimeZipOthers -PprojectVersion=nightly
+        run: ./gradlew runtimeZipOthers -PprojectVersion=nightly
 
       - name: Build Windows release with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: runtimeZipWindows -PprojectVersion=nightly
+        run: ./gradlew runtimeZipWindows -PprojectVersion=nightly
 
       - name: Create Build Info file
         run: |
           echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/image/build_info.txt
 
       - name: Add build artifacts to nightly release
-        uses: pyTooling/Actions/releaser@main
+        uses: softprops/action-gh-release@v3
         with:
-          tag: nightly
-          rm: false
-          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: nightly
+          prerelease: true
           files: |
             build/image/*.zip
             build/image/build_info.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,130 @@
+# Publishes a release when a version tag is pushed. The tag has to match
+# projectVersion in gradle.properties with a leading 'v': v0.6.2 for a final
+# release, or v0.6.2-beta-1 / v0.6.2-alpha-1 for a pre-release.
+name: Release
+
+on:
+  push:
+    tags: ['v[0-9]+.[0-9]+.[0-9]+*']
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      previous_tag: ${{ steps.previous.outputs.tag }}
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          # Full history and tags, to find the previous release tag for the release notes
+          fetch-depth: 0
+
+      - id: version
+        run: |
+          expected="v$(sed -n 's/^projectVersion=//p' gradle.properties | tr -d '[:space:]')"
+          if [ "$GITHUB_REF_NAME" != "$expected" ]; then
+            echo "::error::Tag $GITHUB_REF_NAME does not match projectVersion in gradle.properties ($expected)"
+            exit 1
+          fi
+          echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
+
+      # Release notes list the PRs since the previous version tag (never 'nightly'). A final release
+      # starts from the previous final release, so it covers every alpha and beta in between.
+      - id: previous
+        run: |
+          exclude=(--exclude "$GITHUB_REF_NAME")
+          if [[ "$GITHUB_REF_NAME" != *-* ]]; then
+            exclude+=(--exclude '*-*')
+          fi
+          tag="$(git describe --tags --abbrev=0 --match 'v[0-9]*' "${exclude[@]}" HEAD 2>/dev/null || true)"
+          echo "Release notes start from: ${tag:-(GitHub default)}"
+          echo "tag=$tag" >> "$GITHUB_OUTPUT"
+
+      - name: Set up JDK 27
+        uses: actions/setup-java@v6
+        with:
+          # Must match the JDK version downloaded in build.gradle (jdk_download_base) - jlink requires an exact version match
+          java-version: '27.0.0'
+          distribution: 'liberica'
+          java-package: 'jdk+fx'
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v6
+
+      - name: Build and test
+        run: ./gradlew clean build --console=plain
+
+      # The runtime plugin can't build Windows and the other platforms in the same invocation.
+      - name: Build Linux and Mac releases
+        run: ./gradlew runtimeZipOthers --console=plain
+
+      - name: Build Windows release
+        run: ./gradlew runtimeZipWindows --console=plain
+
+      - name: Check release zips
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          missing=0
+          for platform in linux-aarch64 linux-x86_64 osx-aarch64 osx-x86_64 windows-aarch64 windows-x86_64; do
+            zip="build/image/sdr-trunk-${platform}-v${VERSION}.zip"
+            if [ ! -f "$zip" ]; then
+              echo "::error::Missing $zip"
+              missing=1
+            fi
+          done
+          ls -l build/image/*.zip
+          exit $missing
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: release-zips
+          path: build/image/*.zip
+          if-no-files-found: error
+          retention-days: 7
+
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/download-artifact@v8
+        with:
+          name: release-zips
+          path: zips
+
+      # Publishing is split into steps that can all be repeated, so a failed
+      # upload or a re-run finishes the draft left behind rather than failing on
+      # it: gh retries uploads, and a retry of an upload that had in fact
+      # succeeded fails with "ReleaseAsset.name already exists" unless clobbering.
+      - name: Create release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+          VERSION: ${{ needs.build.outputs.version }}
+          PREVIOUS_TAG: ${{ needs.build.outputs.previous_tag }}
+        run: |
+          (cd zips && sha256sum *.zip > SHA256SUMS)
+          prerelease=()
+          if [[ "$GITHUB_REF_NAME" == *-* ]]; then
+            prerelease=(--prerelease)
+          fi
+          notes_start=()
+          if [ -n "$PREVIOUS_TAG" ]; then
+            notes_start=(--notes-start-tag "$PREVIOUS_TAG")
+          fi
+          if gh release view "$GITHUB_REF_NAME" --json isDraft --jq .isDraft 2>/dev/null | grep -qx false; then
+            echo "::error::Release $GITHUB_REF_NAME is already published"
+            exit 1
+          elif gh release view "$GITHUB_REF_NAME" >/dev/null 2>&1; then
+            echo "Reusing the draft release $GITHUB_REF_NAME"
+          else
+            gh release create "$GITHUB_REF_NAME" --draft "${prerelease[@]}" \
+              --verify-tag --generate-notes "${notes_start[@]}" --title "Version $VERSION"
+          fi
+          gh release upload "$GITHUB_REF_NAME" zips/* --clobber
+          gh release edit "$GITHUB_REF_NAME" --draft=false

.idea/dictionaries/denny.xml

@@ -2,18 +2,24 @@
   <dictionary name="denny">
     <words>
       <w>bahroo</w>
+      <w>baseband</w>
       <w>basebanded</w>
       <w>broadcastify</w>
+      <w>cach</w>
       <w>correlator</w>
       <w>deinterleave</w>
       <w>descrambled</w>
+      <w>dibit</w>
       <w>dinf</w>
+      <w>dqpsk</w>
       <w>esnid</w>
       <w>fleetsync</w>
       <w>heterdyned</w>
       <w>heterodynes</w>
+      <w>hytera</w>
       <w>icecast</w>
       <w>ident</w>
+      <w>lcns</w>
       <w>nutall</w>
       <w>overflowable</w>
       <w>polyphase</w>

.idea/misc.xml

@@ -4,7 +4,50 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_23_PREVIEW" project-jdk-name="liberica-23" project-jdk-type="JavaSDK">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
+    <option name="myOrdered" value="true" />
+    <option name="myNullables">
+      <value>
+        <list size="13">
+          <item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="5" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="9" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="10" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="org.springframework.lang.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="13">
+          <item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
+          <item index="1" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="2" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="5" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="8" class="java.lang.String" itemvalue="lombok.NonNull" />
+          <item index="9" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="10" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.springframework.lang.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_27_PREVIEW" project-jdk-name="liberica-27" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

README.md

@@ -1,6 +1,24 @@
 ![Gradle Build](https://github.com/dsheirer/sdrtrunk/actions/workflows/gradle.yml/badge.svg)
 ![Nightly Release](https://github.com/dsheirer/sdrtrunk/actions/workflows/nightly.yml/badge.svg)
 
+# MacOS Tahoe 26.1 Users - Attention:
+Changes to USB support in Tahoe version 26.x cause sdrtrunk to fail to launch.  Do the following to install the latest libusb and create a symbolic link and then use the nightly build which includes an updated usb4java native library for Tahoe with ARM processor.  There may still be issue(s) with MacOS accessing your USB SDR tuners.
+
+```
+brew install libusb --HEAD
+cd /opt
+sudo mkdir local
+cd local
+sudo mkdir lib
+```
+Next, find where brew installed the libusb library, for example: ```/opt/homebrew/Cellar/libusb/HEAD-9ceaa52/lib/libusb-1.0.0.dylib```    Note: the folder "HEAD-9ceaa52" is the version stamp for HEAD when you installed from it.
+
+Finally, create a symbolic link from the installed library to the place where usb4java is expecting to find libusb (/opt/local/lib/libusb-1.0.0.dylib)
+
+```
+sudo ln -s /opt/homebrew/Cellar/libusb/HEAD-9ceaa52/lib/libusb-1.0.0.dylib /opt/local/lib/libusb-1.0.0.dylib
+```
+
 # sdrtrunk
 A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
 
@@ -28,6 +46,31 @@ playlist(s) before you use the nightly builds.**  Note: the nightly release is u
 committed to the code base, so it's not really 'nightly' as much as it is 'current'.
 
 ## Minimum System Requirements
-* **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac/Linux (64-bit, 10.14 or higher)
+* **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac (64-bit, 12.x or higher)
 * **CPU:** 4-core
 * **RAM:** 8GB or more (preferred).  Depending on usage, 4GB may be sufficient.
+
+## Creating a Release (Maintainers)
+Releases are built and published automatically by the [Release](.github/workflows/release.yml) GitHub workflow
+whenever a version tag is pushed to the repository.
+
+1. Update `projectVersion` in `gradle.properties` to the new version, following the naming convention described in
+that file (e.g. `0.6.2-alpha-1`, `0.6.2-beta-1` or `0.6.2`).
+2. Commit and push the change to `master`.
+3. Create and push a tag that matches the version with a leading `v`:
+```
+git tag v0.6.2-beta-1
+git push origin v0.6.2-beta-1
+```
+
+The workflow then:
+* Verifies that the tag matches `projectVersion` in `gradle.properties` and fails if it does not.
+* Builds and tests the code, then creates the release zips for Linux, Mac and Windows (x86-64 and aarch64).
+* Creates a GitHub release titled `Version <version>` with auto-generated release notes (a "What's Changed" list of
+the PRs merged since the previous version tag), and attaches the six zip
+files plus a `SHA256SUMS` checksum file.
+* Marks tags containing a dash (alpha and beta versions) as pre-releases. Tags without a dash become full releases.
+
+If the workflow fails part way through, fix the problem and re-run it from the Actions tab. It resumes from the
+draft release left behind. It won't modify a release that has already been published. To rebuild a published
+release, delete the release and the tag on GitHub, then push the tag again.

artifacts/sdrplay-api-headers/v3_07/sdrplay_api.h

@@ -1,229 +0,0 @@
-#ifndef SDRPLAY_API_H
-#define SDRPLAY_API_H
-
-#include "sdrplay_api_dev.h"
-#include "sdrplay_api_rx_channel.h"
-#include "sdrplay_api_callback.h"
-
-//#if defined(_M_X64) || defined(_M_IX86)
-//#include "windows.h"
-//#elif defined (__GNUC__)
-typedef void *HANDLE;
-//#endif
-
-//#ifndef _SDRPLAY_DLL_QUALIFIER
-//#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86))
-//#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
-//#elif defined(STATIC_LIB) || defined(__GNUC__)
-//#define _SDRPLAY_DLL_QUALIFIER
-//#endif
-//#endif  // _SDRPLAY_DLL_QUALIFIER
-
-// Application code should check that it is compiled against the same API version
-// sdrplay_api_ApiVersion() returns the API version 
-#define SDRPLAY_API_VERSION                   (float)(3.07)
-
-// API Constants
-#define SDRPLAY_MAX_DEVICES                   (16)
-#define SDRPLAY_MAX_TUNERS_PER_DEVICE         (2)
-
-#define SDRPLAY_MAX_SER_NO_LEN                (64)
-#define SDRPLAY_MAX_ROOT_NM_LEN               (32)
-
-#define SDRPLAY_RSP1_ID                       (1)
-#define SDRPLAY_RSP1A_ID                      (255)
-#define SDRPLAY_RSP2_ID                       (2)
-#define SDRPLAY_RSPduo_ID                     (3)
-#define SDRPLAY_RSPdx_ID                      (4)
-
-// Enum types
-typedef enum
-{
-    sdrplay_api_Success               = 0,
-    sdrplay_api_Fail                  = 1,
-    sdrplay_api_InvalidParam          = 2,
-    sdrplay_api_OutOfRange            = 3,
-    sdrplay_api_GainUpdateError       = 4,
-    sdrplay_api_RfUpdateError         = 5,
-    sdrplay_api_FsUpdateError         = 6,
-    sdrplay_api_HwError               = 7,
-    sdrplay_api_AliasingError         = 8,
-    sdrplay_api_AlreadyInitialised    = 9,
-    sdrplay_api_NotInitialised        = 10,
-    sdrplay_api_NotEnabled            = 11,
-    sdrplay_api_HwVerError            = 12,
-    sdrplay_api_OutOfMemError         = 13,
-    sdrplay_api_ServiceNotResponding  = 14,
-    sdrplay_api_StartPending          = 15,
-    sdrplay_api_StopPending           = 16,
-    sdrplay_api_InvalidMode           = 17,
-    sdrplay_api_FailedVerification1   = 18,
-    sdrplay_api_FailedVerification2   = 19,
-    sdrplay_api_FailedVerification3   = 20,
-    sdrplay_api_FailedVerification4   = 21,
-    sdrplay_api_FailedVerification5   = 22,
-    sdrplay_api_FailedVerification6   = 23,
-    sdrplay_api_InvalidServiceVersion = 24
-} sdrplay_api_ErrT;
-
-typedef enum
-{
-    sdrplay_api_Update_None                        = 0x00000000,
-
-    // Reasons for master only mode 
-    sdrplay_api_Update_Dev_Fs                      = 0x00000001,
-    sdrplay_api_Update_Dev_Ppm                     = 0x00000002,
-    sdrplay_api_Update_Dev_SyncUpdate              = 0x00000004,
-    sdrplay_api_Update_Dev_ResetFlags              = 0x00000008,
-
-    sdrplay_api_Update_Rsp1a_BiasTControl          = 0x00000010,
-    sdrplay_api_Update_Rsp1a_RfNotchControl        = 0x00000020,
-    sdrplay_api_Update_Rsp1a_RfDabNotchControl     = 0x00000040,
-
-    sdrplay_api_Update_Rsp2_BiasTControl           = 0x00000080,
-    sdrplay_api_Update_Rsp2_AmPortSelect           = 0x00000100,
-    sdrplay_api_Update_Rsp2_AntennaControl         = 0x00000200,
-    sdrplay_api_Update_Rsp2_RfNotchControl         = 0x00000400,
-    sdrplay_api_Update_Rsp2_ExtRefControl          = 0x00000800,
-
-    sdrplay_api_Update_RspDuo_ExtRefControl        = 0x00001000,
-
-    sdrplay_api_Update_Master_Spare_1              = 0x00002000,
-    sdrplay_api_Update_Master_Spare_2              = 0x00004000,
-
-    // Reasons for master and slave mode
-    // Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
-    sdrplay_api_Update_Tuner_Gr                    = 0x00008000,
-    sdrplay_api_Update_Tuner_GrLimits              = 0x00010000,
-    sdrplay_api_Update_Tuner_Frf                   = 0x00020000,
-    sdrplay_api_Update_Tuner_BwType                = 0x00040000,
-    sdrplay_api_Update_Tuner_IfType                = 0x00080000,
-    sdrplay_api_Update_Tuner_DcOffset              = 0x00100000,
-    sdrplay_api_Update_Tuner_LoMode                = 0x00200000,
-
-    sdrplay_api_Update_Ctrl_DCoffsetIQimbalance    = 0x00400000,
-    sdrplay_api_Update_Ctrl_Decimation             = 0x00800000,
-    sdrplay_api_Update_Ctrl_Agc                    = 0x01000000,
-    sdrplay_api_Update_Ctrl_AdsbMode               = 0x02000000,
-    sdrplay_api_Update_Ctrl_OverloadMsgAck         = 0x04000000,
-
-    sdrplay_api_Update_RspDuo_BiasTControl         = 0x08000000,
-    sdrplay_api_Update_RspDuo_AmPortSelect         = 0x10000000,
-    sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
-    sdrplay_api_Update_RspDuo_RfNotchControl       = 0x40000000,
-    sdrplay_api_Update_RspDuo_RfDabNotchControl    = 0x80000000,
-} sdrplay_api_ReasonForUpdateT;
-
-typedef enum
-{
-    sdrplay_api_Update_Ext1_None                   = 0x00000000,
-
-    // Reasons for master only mode 
-    sdrplay_api_Update_RspDx_HdrEnable             = 0x00000001,
-    sdrplay_api_Update_RspDx_BiasTControl          = 0x00000002,
-    sdrplay_api_Update_RspDx_AntennaControl        = 0x00000004,
-    sdrplay_api_Update_RspDx_RfNotchControl        = 0x00000008,
-    sdrplay_api_Update_RspDx_RfDabNotchControl     = 0x00000010,
-    sdrplay_api_Update_RspDx_HdrBw                 = 0x00000020,
-
-    // Reasons for master and slave mode
-} sdrplay_api_ReasonForUpdateExtension1T;
-
-typedef enum
-{
-    sdrplay_api_DbgLvl_Disable       = 0,
-    sdrplay_api_DbgLvl_Verbose       = 1,
-    sdrplay_api_DbgLvl_Warning       = 2,
-    sdrplay_api_DbgLvl_Error         = 3,
-    sdrplay_api_DbgLvl_Message       = 4,
-} sdrplay_api_DbgLvl_t;
-
-// Device structure 
-typedef struct 
-{
-    char SerNo[SDRPLAY_MAX_SER_NO_LEN];
-    unsigned char hwVer;
-    sdrplay_api_TunerSelectT tuner;
-    sdrplay_api_RspDuoModeT rspDuoMode;
-    double rspDuoSampleFreq;
-    HANDLE dev;
-} sdrplay_api_DeviceT;
-
-// Device parameter structure
-typedef struct 
-{
-    sdrplay_api_DevParamsT       *devParams;
-    sdrplay_api_RxChannelParamsT *rxChannelA;
-    sdrplay_api_RxChannelParamsT *rxChannelB;
-} sdrplay_api_DeviceParamsT;
-
-// Extended error message structure
-typedef struct 
-{
-    char file[256];
-    char function[256];
-    int  line;
-    char message[1024];
-} sdrplay_api_ErrorInfoT;
-
-// Comman API function types
-typedef sdrplay_api_ErrT        (*sdrplay_api_Open_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_Close_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_ApiVersion_t)(float *apiVer);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_LockDeviceApi_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_UnlockDeviceApi_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);    
-typedef const char*             (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
-typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
-typedef sdrplay_api_ErrT        (*sdrplay_api_DisableHeartbeat_t)(void);
-
-// Device API function types
-typedef sdrplay_api_ErrT        (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_Uninit_t)(HANDLE dev);
-typedef sdrplay_api_ErrT        (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
-                                                                sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
-                                                                sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-
-// API function definitions
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    // Comman API function definitions
-    sdrplay_api_ErrT        sdrplay_api_Open(void);
-    sdrplay_api_ErrT        sdrplay_api_Close(void);
-    sdrplay_api_ErrT        sdrplay_api_ApiVersion(float *apiVer);
-    sdrplay_api_ErrT        sdrplay_api_LockDeviceApi(void);
-    sdrplay_api_ErrT        sdrplay_api_UnlockDeviceApi(void);
-    sdrplay_api_ErrT        sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
-    sdrplay_api_ErrT        sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);
-    sdrplay_api_ErrT        sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);
-    const char*             sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
-    sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
-    sdrplay_api_ErrT        sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
-
-    // Device API function definitions
-    sdrplay_api_ErrT        sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable);
-    sdrplay_api_ErrT        sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
-    sdrplay_api_ErrT        sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
-    sdrplay_api_ErrT        sdrplay_api_Uninit(HANDLE dev);
-    sdrplay_api_ErrT        sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
-    sdrplay_api_ErrT        sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-    sdrplay_api_ErrT        sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate);
-    sdrplay_api_ErrT        sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
-                                                                              sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
-                                                                              sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //SDRPLAY_API_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_callback.h

@@ -1,78 +0,0 @@
-#ifndef SDRPLAY_API_CALLBACK_H
-#define SDRPLAY_API_CALLBACK_H
-
-// Event callback enums
-typedef enum
-{
-    sdrplay_api_Overload_Detected     = 0,
-    sdrplay_api_Overload_Corrected    = 1,
-} sdrplay_api_PowerOverloadCbEventIdT;
-
-typedef enum
-{
-    sdrplay_api_MasterInitialised      = 0,
-    sdrplay_api_SlaveAttached          = 1,
-    sdrplay_api_SlaveDetached          = 2,
-    sdrplay_api_SlaveInitialised       = 3,
-    sdrplay_api_SlaveUninitialised     = 4,
-    sdrplay_api_MasterDllDisappeared   = 5,
-    sdrplay_api_SlaveDllDisappeared    = 6,
-} sdrplay_api_RspDuoModeCbEventIdT;
-
-typedef enum
-{
-    sdrplay_api_GainChange            = 0,
-    sdrplay_api_PowerOverloadChange   = 1,
-    sdrplay_api_DeviceRemoved         = 2,
-    sdrplay_api_RspDuoModeChange      = 3,
-} sdrplay_api_EventT;
-
-// Event callback parameter structs
-typedef struct 
-{
-    unsigned int gRdB;
-    unsigned int lnaGRdB;
-    double currGain;
-} sdrplay_api_GainCbParamT;
-
-typedef struct 
-{
-    sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
-} sdrplay_api_PowerOverloadCbParamT;
-
-typedef struct 
-{
-    sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
-} sdrplay_api_RspDuoModeCbParamT;
-
-// Event parameters overlay
-typedef union
-{
-    sdrplay_api_GainCbParamT          gainParams;
-    sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
-    sdrplay_api_RspDuoModeCbParamT    rspDuoModeParams;
-} sdrplay_api_EventParamsT;
-
-// Stream callback parameter structs
-typedef struct 
-{
-    unsigned int firstSampleNum;
-    int grChanged;
-    int rfChanged;
-    int fsChanged;
-    unsigned int numSamples;
-} sdrplay_api_StreamCbParamsT;
-
-// Callback function prototypes
-typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext); 
-typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext); 
-
-// Callback function struct
-typedef struct 
-{
-    sdrplay_api_StreamCallback_t StreamACbFn;
-    sdrplay_api_StreamCallback_t StreamBCbFn;
-    sdrplay_api_EventCallback_t  EventCbFn;
-} sdrplay_api_CallbackFnsT;
-
-#endif //SDRPLAY_API_CALLBACK_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_control.h

@@ -1,55 +0,0 @@
-#ifndef SDRPLAY_API_CONTROL_H
-#define SDRPLAY_API_CONTROL_H
-
-// Control parameter enums
-typedef enum
-{
-    sdrplay_api_AGC_DISABLE  = 0,
-    sdrplay_api_AGC_100HZ    = 1,
-    sdrplay_api_AGC_50HZ     = 2,
-    sdrplay_api_AGC_5HZ      = 3,
-    sdrplay_api_AGC_CTRL_EN  = 4
-} sdrplay_api_AgcControlT;
-
-typedef enum
-{
-    sdrplay_api_ADSB_DECIMATION                  = 0,
-    sdrplay_api_ADSB_NO_DECIMATION_LOWPASS       = 1,
-    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
-    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
-} sdrplay_api_AdsbModeT;
-
-// Control parameter structs
-typedef struct 
-{
-    unsigned char DCenable;          // default: 1
-    unsigned char IQenable;          // default: 1
-} sdrplay_api_DcOffsetT;
-
-typedef struct 
-{
-    unsigned char enable;            // default: 0
-    unsigned char decimationFactor;  // default: 1
-    unsigned char wideBandSignal;    // default: 0
-} sdrplay_api_DecimationT;
-
-typedef struct 
-{
-    sdrplay_api_AgcControlT enable;    // default: sdrplay_api_AGC_50HZ
-    int setPoint_dBfs;                 // default: -60
-    unsigned short attack_ms;          // default: 0
-    unsigned short decay_ms;           // default: 0
-    unsigned short decay_delay_ms;     // default: 0
-    unsigned short decay_threshold_dB; // default: 0
-    int syncUpdate;                    // default: 0
-} sdrplay_api_AgcT;
-
-typedef struct 
-{
-    sdrplay_api_DcOffsetT dcOffset;
-    sdrplay_api_DecimationT decimation;
-    sdrplay_api_AgcT agc;
-    sdrplay_api_AdsbModeT adsbMode;  //default: sdrplay_api_ADSB_DECIMATION
-} sdrplay_api_ControlParamsT;
-
-#endif //SDRPLAY_API_CONTROL_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_dev.h

@@ -1,51 +0,0 @@
-#ifndef SDRPLAY_API_DEV_H
-#define SDRPLAY_API_DEV_H
-
-#include "sdrplay_api_rsp1a.h"
-#include "sdrplay_api_rsp2.h"
-#include "sdrplay_api_rspDuo.h"
-#include "sdrplay_api_rspDx.h"
-
-// Dev parameter enums
-typedef enum
-{
-    sdrplay_api_ISOCH = 0,
-    sdrplay_api_BULK  = 1
-} sdrplay_api_TransferModeT;
-
-// Dev parameter structs
-typedef struct 
-{
-    double fsHz;                        // default: 2000000.0
-    unsigned char syncUpdate;           // default: 0
-    unsigned char reCal;                // default: 0
-} sdrplay_api_FsFreqT;
-
-typedef struct 
-{
-    unsigned int sampleNum;             // default: 0
-    unsigned int period;                // default: 0
-} sdrplay_api_SyncUpdateT;
-
-typedef struct 
-{
-    unsigned char resetGainUpdate;      // default: 0
-    unsigned char resetRfUpdate;        // default: 0
-    unsigned char resetFsUpdate;        // default: 0
-} sdrplay_api_ResetFlagsT;   
-
-typedef struct 
-{
-    double ppm;                         // default: 0.0
-    sdrplay_api_FsFreqT fsFreq;
-    sdrplay_api_SyncUpdateT syncUpdate; 
-    sdrplay_api_ResetFlagsT resetFlags; 
-    sdrplay_api_TransferModeT mode;     // default: sdrplay_api_ISOCH
-    unsigned int samplesPerPkt;         // default: 0 (output param)
-    sdrplay_api_Rsp1aParamsT rsp1aParams;
-    sdrplay_api_Rsp2ParamsT rsp2Params;
-    sdrplay_api_RspDuoParamsT rspDuoParams;
-    sdrplay_api_RspDxParamsT rspDxParams;
-} sdrplay_api_DevParamsT;
-
-#endif //SDRPLAY_API_DEV_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rsp1a.h

@@ -1,22 +0,0 @@
-#ifndef SDRPLAY_API_RSP1A_H
-#define SDRPLAY_API_RSP1A_H
-
-#define RSPIA_NUM_LNA_STATES         10
-#define RSPIA_NUM_LNA_STATES_AM      7
-#define RSPIA_NUM_LNA_STATES_LBAND   9
-
-// RSP1A parameter enums
-
-// RSP1A parameter structs
-typedef struct 
-{
-    unsigned char rfNotchEnable;                              // default: 0
-    unsigned char rfDabNotchEnable;                           // default: 0
-} sdrplay_api_Rsp1aParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                   // default: 0
-} sdrplay_api_Rsp1aTunerParamsT;
-
-#endif //SDRPLAY_API_RSP1A_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rsp2.h

@@ -1,35 +0,0 @@
-#ifndef SDRPLAY_API_RSP2_H
-#define SDRPLAY_API_RSP2_H
-
-#define RSPII_NUM_LNA_STATES         9
-#define RSPII_NUM_LNA_STATES_AMPORT  5
-#define RSPII_NUM_LNA_STATES_420MHZ  6
-
-// RSP2 parameter enums
-typedef enum
-{
-    sdrplay_api_Rsp2_ANTENNA_A = 5,
-    sdrplay_api_Rsp2_ANTENNA_B = 6,
-} sdrplay_api_Rsp2_AntennaSelectT;
-
-typedef enum
-{
-    sdrplay_api_Rsp2_AMPORT_1 = 1,
-    sdrplay_api_Rsp2_AMPORT_2 = 0,
-} sdrplay_api_Rsp2_AmPortSelectT;
-
-// RSP2 parameter structs
-typedef struct 
-{
-    unsigned char extRefOutputEn;                // default: 0
-} sdrplay_api_Rsp2ParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                   // default: 0
-    sdrplay_api_Rsp2_AmPortSelectT amPortSel;    // default: sdrplay_api_Rsp2_AMPORT_2
-    sdrplay_api_Rsp2_AntennaSelectT antennaSel;  // default: sdrplay_api_Rsp2_ANTENNA_A
-    unsigned char rfNotchEnable;                 // default: 0
-} sdrplay_api_Rsp2TunerParamsT;
-
-#endif //SDRPLAY_API_RSP2_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rspDuo.h

@@ -1,40 +0,0 @@
-#ifndef SDRPLAY_API_RSPduo_H
-#define SDRPLAY_API_RSPduo_H
-
-#define RSPDUO_NUM_LNA_STATES         10
-#define RSPDUO_NUM_LNA_STATES_AMPORT  5
-#define RSPDUO_NUM_LNA_STATES_AM      7
-#define RSPDUO_NUM_LNA_STATES_LBAND   9
-
-// RSPduo parameter enums
-typedef enum
-{
-    sdrplay_api_RspDuoMode_Unknown      = 0,
-    sdrplay_api_RspDuoMode_Single_Tuner = 1,
-    sdrplay_api_RspDuoMode_Dual_Tuner   = 2,
-    sdrplay_api_RspDuoMode_Master       = 4,
-    sdrplay_api_RspDuoMode_Slave        = 8,
-} sdrplay_api_RspDuoModeT;
-
-typedef enum
-{
-    sdrplay_api_RspDuo_AMPORT_1 = 1,
-    sdrplay_api_RspDuo_AMPORT_2 = 0,
-} sdrplay_api_RspDuo_AmPortSelectT;
-
-// RSPduo parameter structs
-typedef struct 
-{
-    int extRefOutputEn;                             // default: 0
-} sdrplay_api_RspDuoParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                      // default: 0
-    sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
-    unsigned char tuner1AmNotchEnable;              // default: 0
-    unsigned char rfNotchEnable;                    // default: 0
-    unsigned char rfDabNotchEnable;                 // default: 0
-} sdrplay_api_RspDuoTunerParamsT;
-
-#endif //SDRPLAY_API_RSPduo_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rspDx.h

@@ -1,45 +0,0 @@
-#ifndef SDRPLAY_API_RSPDX_H
-#define SDRPLAY_API_RSPDX_H
-
-#include "sdrplay_api_tuner.h"
-
-#define RSPDX_NUM_LNA_STATES               28   // Number of LNA states in all bands (except where defined differently below)
-#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12  19   // Number of LNA states when using AM Port 2 between 0 and 12MHz
-#define RSPDX_NUM_LNA_STATES_AMPORT2_12_60 20   // Number of LNA states when using AM Port 2 between 12 and 60MHz
-#define RSPDX_NUM_LNA_STATES_VHF_BAND3     27   // Number of LNA states in VHF and Band3
-#define RSPDX_NUM_LNA_STATES_420MHZ        21   // Number of LNA states in 420MHz band
-#define RSPDX_NUM_LNA_STATES_LBAND         19   // Number of LNA states in L-band
-#define RSPDX_NUM_LNA_STATES_DX            26   // Number of LNA states in DX path
-
-// RSPdx parameter enums
-typedef enum
-{
-    sdrplay_api_RspDx_ANTENNA_A = 0,
-    sdrplay_api_RspDx_ANTENNA_B = 1,
-    sdrplay_api_RspDx_ANTENNA_C = 2,
-} sdrplay_api_RspDx_AntennaSelectT;
-
-typedef enum
-{
-    sdrplay_api_RspDx_HDRMODE_BW_0_200  = 0,
-    sdrplay_api_RspDx_HDRMODE_BW_0_500  = 1,
-    sdrplay_api_RspDx_HDRMODE_BW_1_200  = 2,
-    sdrplay_api_RspDx_HDRMODE_BW_1_700  = 3,
-} sdrplay_api_RspDx_HdrModeBwT;
-
-// RSPdx parameter structs
-typedef struct 
-{
-    unsigned char hdrEnable;                            // default: 0
-    unsigned char biasTEnable;                          // default: 0
-    sdrplay_api_RspDx_AntennaSelectT antennaSel;        // default: sdrplay_api_RspDx_ANTENNA_A
-    unsigned char rfNotchEnable;                        // default: 0
-    unsigned char rfDabNotchEnable;                     // default: 0
-} sdrplay_api_RspDxParamsT;
-
-typedef struct 
-{
-    sdrplay_api_RspDx_HdrModeBwT hdrBw;                 // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
-} sdrplay_api_RspDxTunerParamsT;
-
-#endif //SDRPLAY_API_RSPDX_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rx_channel.h

@@ -1,21 +0,0 @@
-#ifndef SDRPLAY_API_RX_CHANNEL_H
-#define SDRPLAY_API_RX_CHANNEL_H
-
-#include "sdrplay_api_tuner.h"
-#include "sdrplay_api_control.h"
-#include "sdrplay_api_rsp1a.h"
-#include "sdrplay_api_rsp2.h"
-#include "sdrplay_api_rspDuo.h"
-#include "sdrplay_api_rspDx.h"
-
-typedef struct 
-{
-    sdrplay_api_TunerParamsT        tunerParams;    
-    sdrplay_api_ControlParamsT      ctrlParams;     
-    sdrplay_api_Rsp1aTunerParamsT   rsp1aTunerParams; 
-    sdrplay_api_Rsp2TunerParamsT    rsp2TunerParams; 
-    sdrplay_api_RspDuoTunerParamsT  rspDuoTunerParams;    
-    sdrplay_api_RspDxTunerParamsT   rspDxTunerParams;    
-} sdrplay_api_RxChannelParamsT;
-
-#endif //SDRPLAY_API_RX_CHANNEL_H

artifacts/sdrplay-api-headers/v3_07/sdrplay_api_tuner.h

@@ -1,93 +0,0 @@
-#ifndef SDRPLAY_API_TUNER_H
-#define SDRPLAY_API_TUNER_H
-
-#define MAX_BB_GR                         (59)
-
-// Tuner parameter enums
-typedef enum
-{
-    sdrplay_api_BW_Undefined = 0,
-    sdrplay_api_BW_0_200     = 200,
-    sdrplay_api_BW_0_300     = 300,
-    sdrplay_api_BW_0_600     = 600,
-    sdrplay_api_BW_1_536     = 1536,
-    sdrplay_api_BW_5_000     = 5000,
-    sdrplay_api_BW_6_000     = 6000,
-    sdrplay_api_BW_7_000     = 7000,
-    sdrplay_api_BW_8_000     = 8000
-} sdrplay_api_Bw_MHzT;
-
-typedef enum
-{
-    sdrplay_api_IF_Undefined = -1,
-    sdrplay_api_IF_Zero      = 0,
-    sdrplay_api_IF_0_450     = 450,
-    sdrplay_api_IF_1_620     = 1620,
-    sdrplay_api_IF_2_048     = 2048
-} sdrplay_api_If_kHzT;
-
-typedef enum
-{
-    sdrplay_api_LO_Undefined = 0,
-    sdrplay_api_LO_Auto      = 1,
-    sdrplay_api_LO_120MHz    = 2,
-    sdrplay_api_LO_144MHz    = 3,
-    sdrplay_api_LO_168MHz    = 4
-} sdrplay_api_LoModeT;
-
-typedef enum
-{
-    sdrplay_api_EXTENDED_MIN_GR = 0,
-    sdrplay_api_NORMAL_MIN_GR   = 20
-} sdrplay_api_MinGainReductionT;
-
-typedef enum
-{
-    sdrplay_api_Tuner_Neither  = 0,
-    sdrplay_api_Tuner_A        = 1,
-    sdrplay_api_Tuner_B        = 2,
-    sdrplay_api_Tuner_Both     = 3,
-} sdrplay_api_TunerSelectT;
-
-// Tuner parameter structs
-typedef struct
-{
-    float curr;
-    float max;
-    float min;
-} sdrplay_api_GainValuesT;
-
-typedef struct 
-{
-    int gRdB;                            // default: 50
-    unsigned char LNAstate;              // default: 0
-    unsigned char syncUpdate;            // default: 0
-    sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
-    sdrplay_api_GainValuesT gainVals;    // output parameter
-} sdrplay_api_GainT;
-
-typedef struct 
-{
-    double rfHz;                         // default: 200000000.0
-    unsigned char syncUpdate;            // default: 0
-} sdrplay_api_RfFreqT;
-
-typedef struct 
-{
-    unsigned char dcCal;                 // default: 3 (Periodic mode)
-    unsigned char speedUp;               // default: 0 (No speedup)
-    int trackTime;                       // default: 1    (=> time in uSec = (72 * 3 * trackTime) / 24e6       = 9uSec)
-    int refreshRateTime;                 // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
-} sdrplay_api_DcOffsetTunerT;
-
-typedef struct 
-{
-    sdrplay_api_Bw_MHzT bwType;          // default: sdrplay_api_BW_0_200
-    sdrplay_api_If_kHzT ifType;          // default: sdrplay_api_IF_Zero
-    sdrplay_api_LoModeT loMode;          // default: sdrplay_api_LO_Auto
-    sdrplay_api_GainT gain;
-    sdrplay_api_RfFreqT rfFreq;
-    sdrplay_api_DcOffsetTunerT dcOffsetTuner;
-} sdrplay_api_TunerParamsT;
-
-#endif //SDRPLAY_API_TUNER_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api.h

@@ -1,230 +0,0 @@
-#ifndef SDRPLAY_API_H
-#define SDRPLAY_API_H
-
-#include "sdrplay_api_dev.h"
-#include "sdrplay_api_rx_channel.h"
-#include "sdrplay_api_callback.h"
-
-//#if defined(_M_X64) || defined(_M_IX86)
-//#include "windows.h"
-//#elif defined (__GNUC__)
-typedef void *HANDLE;
-//#endif
-//
-//#ifndef _SDRPLAY_DLL_QUALIFIER
-//#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86))
-//#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
-//#elif defined(STATIC_LIB) || defined(__GNUC__)
-//#define _SDRPLAY_DLL_QUALIFIER
-//#endif
-//#endif  // _SDRPLAY_DLL_QUALIFIER
-
-// Application code should check that it is compiled against the same API version
-// sdrplay_api_ApiVersion() returns the API version 
-#define SDRPLAY_API_VERSION                   (float)(3.08)
-
-// API Constants
-#define SDRPLAY_MAX_DEVICES                   (16)
-#define SDRPLAY_MAX_TUNERS_PER_DEVICE         (2)
-
-#define SDRPLAY_MAX_SER_NO_LEN                (64)
-#define SDRPLAY_MAX_ROOT_NM_LEN               (32)
-
-#define SDRPLAY_RSP1_ID                       (1)
-#define SDRPLAY_RSP1A_ID                      (255)
-#define SDRPLAY_RSP2_ID                       (2)
-#define SDRPLAY_RSPduo_ID                     (3)
-#define SDRPLAY_RSPdx_ID                      (4)
-
-// Enum types
-typedef enum
-{
-    sdrplay_api_Success               = 0,
-    sdrplay_api_Fail                  = 1,
-    sdrplay_api_InvalidParam          = 2,
-    sdrplay_api_OutOfRange            = 3,
-    sdrplay_api_GainUpdateError       = 4,
-    sdrplay_api_RfUpdateError         = 5,
-    sdrplay_api_FsUpdateError         = 6,
-    sdrplay_api_HwError               = 7,
-    sdrplay_api_AliasingError         = 8,
-    sdrplay_api_AlreadyInitialised    = 9,
-    sdrplay_api_NotInitialised        = 10,
-    sdrplay_api_NotEnabled            = 11,
-    sdrplay_api_HwVerError            = 12,
-    sdrplay_api_OutOfMemError         = 13,
-    sdrplay_api_ServiceNotResponding  = 14,
-    sdrplay_api_StartPending          = 15,
-    sdrplay_api_StopPending           = 16,
-    sdrplay_api_InvalidMode           = 17,
-    sdrplay_api_FailedVerification1   = 18,
-    sdrplay_api_FailedVerification2   = 19,
-    sdrplay_api_FailedVerification3   = 20,
-    sdrplay_api_FailedVerification4   = 21,
-    sdrplay_api_FailedVerification5   = 22,
-    sdrplay_api_FailedVerification6   = 23,
-    sdrplay_api_InvalidServiceVersion = 24
-} sdrplay_api_ErrT;
-
-typedef enum
-{
-    sdrplay_api_Update_None                        = 0x00000000,
-
-    // Reasons for master only mode 
-    sdrplay_api_Update_Dev_Fs                      = 0x00000001,
-    sdrplay_api_Update_Dev_Ppm                     = 0x00000002,
-    sdrplay_api_Update_Dev_SyncUpdate              = 0x00000004,
-    sdrplay_api_Update_Dev_ResetFlags              = 0x00000008,
-
-    sdrplay_api_Update_Rsp1a_BiasTControl          = 0x00000010,
-    sdrplay_api_Update_Rsp1a_RfNotchControl        = 0x00000020,
-    sdrplay_api_Update_Rsp1a_RfDabNotchControl     = 0x00000040,
-
-    sdrplay_api_Update_Rsp2_BiasTControl           = 0x00000080,
-    sdrplay_api_Update_Rsp2_AmPortSelect           = 0x00000100,
-    sdrplay_api_Update_Rsp2_AntennaControl         = 0x00000200,
-    sdrplay_api_Update_Rsp2_RfNotchControl         = 0x00000400,
-    sdrplay_api_Update_Rsp2_ExtRefControl          = 0x00000800,
-
-    sdrplay_api_Update_RspDuo_ExtRefControl        = 0x00001000,
-
-    sdrplay_api_Update_Master_Spare_1              = 0x00002000,
-    sdrplay_api_Update_Master_Spare_2              = 0x00004000,
-
-    // Reasons for master and slave mode
-    // Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
-    sdrplay_api_Update_Tuner_Gr                    = 0x00008000,
-    sdrplay_api_Update_Tuner_GrLimits              = 0x00010000,
-    sdrplay_api_Update_Tuner_Frf                   = 0x00020000,
-    sdrplay_api_Update_Tuner_BwType                = 0x00040000,
-    sdrplay_api_Update_Tuner_IfType                = 0x00080000,
-    sdrplay_api_Update_Tuner_DcOffset              = 0x00100000,
-    sdrplay_api_Update_Tuner_LoMode                = 0x00200000,
-
-    sdrplay_api_Update_Ctrl_DCoffsetIQimbalance    = 0x00400000,
-    sdrplay_api_Update_Ctrl_Decimation             = 0x00800000,
-    sdrplay_api_Update_Ctrl_Agc                    = 0x01000000,
-    sdrplay_api_Update_Ctrl_AdsbMode               = 0x02000000,
-    sdrplay_api_Update_Ctrl_OverloadMsgAck         = 0x04000000,
-
-    sdrplay_api_Update_RspDuo_BiasTControl         = 0x08000000,
-    sdrplay_api_Update_RspDuo_AmPortSelect         = 0x10000000,
-    sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
-    sdrplay_api_Update_RspDuo_RfNotchControl       = 0x40000000,
-    sdrplay_api_Update_RspDuo_RfDabNotchControl    = 0x80000000,
-} sdrplay_api_ReasonForUpdateT;
-
-typedef enum
-{
-    sdrplay_api_Update_Ext1_None                   = 0x00000000,
-
-    // Reasons for master only mode 
-    sdrplay_api_Update_RspDx_HdrEnable             = 0x00000001,
-    sdrplay_api_Update_RspDx_BiasTControl          = 0x00000002,
-    sdrplay_api_Update_RspDx_AntennaControl        = 0x00000004,
-    sdrplay_api_Update_RspDx_RfNotchControl        = 0x00000008,
-    sdrplay_api_Update_RspDx_RfDabNotchControl     = 0x00000010,
-    sdrplay_api_Update_RspDx_HdrBw                 = 0x00000020,
-
-    // Reasons for master and slave mode
-} sdrplay_api_ReasonForUpdateExtension1T;
-
-typedef enum
-{
-    sdrplay_api_DbgLvl_Disable       = 0,
-    sdrplay_api_DbgLvl_Verbose       = 1,
-    sdrplay_api_DbgLvl_Warning       = 2,
-    sdrplay_api_DbgLvl_Error         = 3,
-    sdrplay_api_DbgLvl_Message       = 4,
-} sdrplay_api_DbgLvl_t;
-
-// Device structure 
-typedef struct 
-{
-    char SerNo[SDRPLAY_MAX_SER_NO_LEN];
-    unsigned char hwVer;
-    sdrplay_api_TunerSelectT tuner;
-    sdrplay_api_RspDuoModeT rspDuoMode;
-    unsigned char valid;
-    double rspDuoSampleFreq;
-    HANDLE dev;
-} sdrplay_api_DeviceT;
-
-// Device parameter structure
-typedef struct 
-{
-    sdrplay_api_DevParamsT       *devParams;
-    sdrplay_api_RxChannelParamsT *rxChannelA;
-    sdrplay_api_RxChannelParamsT *rxChannelB;
-} sdrplay_api_DeviceParamsT;
-
-// Extended error message structure
-typedef struct 
-{
-    char file[256];
-    char function[256];
-    int  line;
-    char message[1024];
-} sdrplay_api_ErrorInfoT;
-
-// Comman API function types
-typedef sdrplay_api_ErrT        (*sdrplay_api_Open_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_Close_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_ApiVersion_t)(float *apiVer);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_LockDeviceApi_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_UnlockDeviceApi_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);    
-typedef const char*             (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
-typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
-typedef sdrplay_api_ErrT        (*sdrplay_api_DisableHeartbeat_t)(void);
-
-// Device API function types
-typedef sdrplay_api_ErrT        (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_Uninit_t)(HANDLE dev);
-typedef sdrplay_api_ErrT        (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate, double newSampleRate);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
-                                                                sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
-                                                                sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-
-// API function definitions
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-//    // Comman API function definitions
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Open(void);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Close(void);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ApiVersion(float *apiVer);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_LockDeviceApi(void);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_UnlockDeviceApi(void);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);
-//    _SDRPLAY_DLL_QUALIFIER const char*             sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
-//
-//    // Device API function definitions
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Uninit(HANDLE dev);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate, double newSampleRate);
-//    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
-//                                                                              sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
-//                                                                              sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //SDRPLAY_API_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_callback.h

@@ -1,78 +0,0 @@
-#ifndef SDRPLAY_API_CALLBACK_H
-#define SDRPLAY_API_CALLBACK_H
-
-// Event callback enums
-typedef enum
-{
-    sdrplay_api_Overload_Detected     = 0,
-    sdrplay_api_Overload_Corrected    = 1,
-} sdrplay_api_PowerOverloadCbEventIdT;
-
-typedef enum
-{
-    sdrplay_api_MasterInitialised      = 0,
-    sdrplay_api_SlaveAttached          = 1,
-    sdrplay_api_SlaveDetached          = 2,
-    sdrplay_api_SlaveInitialised       = 3,
-    sdrplay_api_SlaveUninitialised     = 4,
-    sdrplay_api_MasterDllDisappeared   = 5,
-    sdrplay_api_SlaveDllDisappeared    = 6,
-} sdrplay_api_RspDuoModeCbEventIdT;
-
-typedef enum
-{
-    sdrplay_api_GainChange            = 0,
-    sdrplay_api_PowerOverloadChange   = 1,
-    sdrplay_api_DeviceRemoved         = 2,
-    sdrplay_api_RspDuoModeChange      = 3,
-} sdrplay_api_EventT;
-
-// Event callback parameter structs
-typedef struct 
-{
-    unsigned int gRdB;
-    unsigned int lnaGRdB;
-    double currGain;
-} sdrplay_api_GainCbParamT;
-
-typedef struct 
-{
-    sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
-} sdrplay_api_PowerOverloadCbParamT;
-
-typedef struct 
-{
-    sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
-} sdrplay_api_RspDuoModeCbParamT;
-
-// Event parameters overlay
-typedef union
-{
-    sdrplay_api_GainCbParamT          gainParams;
-    sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
-    sdrplay_api_RspDuoModeCbParamT    rspDuoModeParams;
-} sdrplay_api_EventParamsT;
-
-// Stream callback parameter structs
-typedef struct 
-{
-    unsigned int firstSampleNum;
-    int grChanged;
-    int rfChanged;
-    int fsChanged;
-    unsigned int numSamples;
-} sdrplay_api_StreamCbParamsT;
-
-// Callback function prototypes
-typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext); 
-typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext); 
-
-// Callback function struct
-typedef struct 
-{
-    sdrplay_api_StreamCallback_t StreamACbFn;
-    sdrplay_api_StreamCallback_t StreamBCbFn;
-    sdrplay_api_EventCallback_t  EventCbFn;
-} sdrplay_api_CallbackFnsT;
-
-#endif //SDRPLAY_API_CALLBACK_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_control.h

@@ -1,55 +0,0 @@
-#ifndef SDRPLAY_API_CONTROL_H
-#define SDRPLAY_API_CONTROL_H
-
-// Control parameter enums
-typedef enum
-{
-    sdrplay_api_AGC_DISABLE  = 0,
-    sdrplay_api_AGC_100HZ    = 1,
-    sdrplay_api_AGC_50HZ     = 2,
-    sdrplay_api_AGC_5HZ      = 3,
-    sdrplay_api_AGC_CTRL_EN  = 4
-} sdrplay_api_AgcControlT;
-
-typedef enum
-{
-    sdrplay_api_ADSB_DECIMATION                  = 0,
-    sdrplay_api_ADSB_NO_DECIMATION_LOWPASS       = 1,
-    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
-    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
-} sdrplay_api_AdsbModeT;
-
-// Control parameter structs
-typedef struct 
-{
-    unsigned char DCenable;          // default: 1
-    unsigned char IQenable;          // default: 1
-} sdrplay_api_DcOffsetT;
-
-typedef struct 
-{
-    unsigned char enable;            // default: 0
-    unsigned char decimationFactor;  // default: 1
-    unsigned char wideBandSignal;    // default: 0
-} sdrplay_api_DecimationT;
-
-typedef struct 
-{
-    sdrplay_api_AgcControlT enable;    // default: sdrplay_api_AGC_50HZ
-    int setPoint_dBfs;                 // default: -60
-    unsigned short attack_ms;          // default: 0
-    unsigned short decay_ms;           // default: 0
-    unsigned short decay_delay_ms;     // default: 0
-    unsigned short decay_threshold_dB; // default: 0
-    int syncUpdate;                    // default: 0
-} sdrplay_api_AgcT;
-
-typedef struct 
-{
-    sdrplay_api_DcOffsetT dcOffset;
-    sdrplay_api_DecimationT decimation;
-    sdrplay_api_AgcT agc;
-    sdrplay_api_AdsbModeT adsbMode;  //default: sdrplay_api_ADSB_DECIMATION
-} sdrplay_api_ControlParamsT;
-
-#endif //SDRPLAY_API_CONTROL_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_dev.h

@@ -1,51 +0,0 @@
-#ifndef SDRPLAY_API_DEV_H
-#define SDRPLAY_API_DEV_H
-
-#include "sdrplay_api_rsp1a.h"
-#include "sdrplay_api_rsp2.h"
-#include "sdrplay_api_rspDuo.h"
-#include "sdrplay_api_rspDx.h"
-
-// Dev parameter enums
-typedef enum
-{
-    sdrplay_api_ISOCH = 0,
-    sdrplay_api_BULK  = 1
-} sdrplay_api_TransferModeT;
-
-// Dev parameter structs
-typedef struct 
-{
-    double fsHz;                        // default: 2000000.0
-    unsigned char syncUpdate;           // default: 0
-    unsigned char reCal;                // default: 0
-} sdrplay_api_FsFreqT;
-
-typedef struct 
-{
-    unsigned int sampleNum;             // default: 0
-    unsigned int period;                // default: 0
-} sdrplay_api_SyncUpdateT;
-
-typedef struct 
-{
-    unsigned char resetGainUpdate;      // default: 0
-    unsigned char resetRfUpdate;        // default: 0
-    unsigned char resetFsUpdate;        // default: 0
-} sdrplay_api_ResetFlagsT;   
-
-typedef struct 
-{
-    double ppm;                         // default: 0.0
-    sdrplay_api_FsFreqT fsFreq;
-    sdrplay_api_SyncUpdateT syncUpdate; 
-    sdrplay_api_ResetFlagsT resetFlags; 
-    sdrplay_api_TransferModeT mode;     // default: sdrplay_api_ISOCH
-    unsigned int samplesPerPkt;         // default: 0 (output param)
-    sdrplay_api_Rsp1aParamsT rsp1aParams;
-    sdrplay_api_Rsp2ParamsT rsp2Params;
-    sdrplay_api_RspDuoParamsT rspDuoParams;
-    sdrplay_api_RspDxParamsT rspDxParams;
-} sdrplay_api_DevParamsT;
-
-#endif //SDRPLAY_API_DEV_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_rsp1a.h

@@ -1,22 +0,0 @@
-#ifndef SDRPLAY_API_RSP1A_H
-#define SDRPLAY_API_RSP1A_H
-
-#define RSPIA_NUM_LNA_STATES         10
-#define RSPIA_NUM_LNA_STATES_AM      7
-#define RSPIA_NUM_LNA_STATES_LBAND   9
-
-// RSP1A parameter enums
-
-// RSP1A parameter structs
-typedef struct 
-{
-    unsigned char rfNotchEnable;                              // default: 0
-    unsigned char rfDabNotchEnable;                           // default: 0
-} sdrplay_api_Rsp1aParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                   // default: 0
-} sdrplay_api_Rsp1aTunerParamsT;
-
-#endif //SDRPLAY_API_RSP1A_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_rsp2.h

@@ -1,35 +0,0 @@
-#ifndef SDRPLAY_API_RSP2_H
-#define SDRPLAY_API_RSP2_H
-
-#define RSPII_NUM_LNA_STATES         9
-#define RSPII_NUM_LNA_STATES_AMPORT  5
-#define RSPII_NUM_LNA_STATES_420MHZ  6
-
-// RSP2 parameter enums
-typedef enum
-{
-    sdrplay_api_Rsp2_ANTENNA_A = 5,
-    sdrplay_api_Rsp2_ANTENNA_B = 6,
-} sdrplay_api_Rsp2_AntennaSelectT;
-
-typedef enum
-{
-    sdrplay_api_Rsp2_AMPORT_1 = 1,
-    sdrplay_api_Rsp2_AMPORT_2 = 0,
-} sdrplay_api_Rsp2_AmPortSelectT;
-
-// RSP2 parameter structs
-typedef struct 
-{
-    unsigned char extRefOutputEn;                // default: 0
-} sdrplay_api_Rsp2ParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                   // default: 0
-    sdrplay_api_Rsp2_AmPortSelectT amPortSel;    // default: sdrplay_api_Rsp2_AMPORT_2
-    sdrplay_api_Rsp2_AntennaSelectT antennaSel;  // default: sdrplay_api_Rsp2_ANTENNA_A
-    unsigned char rfNotchEnable;                 // default: 0
-} sdrplay_api_Rsp2TunerParamsT;
-
-#endif //SDRPLAY_API_RSP2_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_rspDuo.h

@@ -1,40 +0,0 @@
-#ifndef SDRPLAY_API_RSPduo_H
-#define SDRPLAY_API_RSPduo_H
-
-#define RSPDUO_NUM_LNA_STATES         10
-#define RSPDUO_NUM_LNA_STATES_AMPORT  5
-#define RSPDUO_NUM_LNA_STATES_AM      7
-#define RSPDUO_NUM_LNA_STATES_LBAND   9
-
-// RSPduo parameter enums
-typedef enum
-{
-    sdrplay_api_RspDuoMode_Unknown      = 0,
-    sdrplay_api_RspDuoMode_Single_Tuner = 1,
-    sdrplay_api_RspDuoMode_Dual_Tuner   = 2,
-    sdrplay_api_RspDuoMode_Master       = 4,
-    sdrplay_api_RspDuoMode_Slave        = 8,
-} sdrplay_api_RspDuoModeT;
-
-typedef enum
-{
-    sdrplay_api_RspDuo_AMPORT_1 = 1,
-    sdrplay_api_RspDuo_AMPORT_2 = 0,
-} sdrplay_api_RspDuo_AmPortSelectT;
-
-// RSPduo parameter structs
-typedef struct 
-{
-    int extRefOutputEn;                             // default: 0
-} sdrplay_api_RspDuoParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                      // default: 0
-    sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
-    unsigned char tuner1AmNotchEnable;              // default: 0
-    unsigned char rfNotchEnable;                    // default: 0
-    unsigned char rfDabNotchEnable;                 // default: 0
-} sdrplay_api_RspDuoTunerParamsT;
-
-#endif //SDRPLAY_API_RSPduo_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_rspDx.h

@@ -1,45 +0,0 @@
-#ifndef SDRPLAY_API_RSPDX_H
-#define SDRPLAY_API_RSPDX_H
-
-#include "sdrplay_api_tuner.h"
-
-#define RSPDX_NUM_LNA_STATES               28   // Number of LNA states in all bands (except where defined differently below)
-#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12  19   // Number of LNA states when using AM Port 2 between 0 and 12MHz
-#define RSPDX_NUM_LNA_STATES_AMPORT2_12_60 20   // Number of LNA states when using AM Port 2 between 12 and 60MHz
-#define RSPDX_NUM_LNA_STATES_VHF_BAND3     27   // Number of LNA states in VHF and Band3
-#define RSPDX_NUM_LNA_STATES_420MHZ        21   // Number of LNA states in 420MHz band
-#define RSPDX_NUM_LNA_STATES_LBAND         19   // Number of LNA states in L-band
-#define RSPDX_NUM_LNA_STATES_DX            26   // Number of LNA states in DX path
-
-// RSPdx parameter enums
-typedef enum
-{
-    sdrplay_api_RspDx_ANTENNA_A = 0,
-    sdrplay_api_RspDx_ANTENNA_B = 1,
-    sdrplay_api_RspDx_ANTENNA_C = 2,
-} sdrplay_api_RspDx_AntennaSelectT;
-
-typedef enum
-{
-    sdrplay_api_RspDx_HDRMODE_BW_0_200  = 0,
-    sdrplay_api_RspDx_HDRMODE_BW_0_500  = 1,
-    sdrplay_api_RspDx_HDRMODE_BW_1_200  = 2,
-    sdrplay_api_RspDx_HDRMODE_BW_1_700  = 3,
-} sdrplay_api_RspDx_HdrModeBwT;
-
-// RSPdx parameter structs
-typedef struct 
-{
-    unsigned char hdrEnable;                            // default: 0
-    unsigned char biasTEnable;                          // default: 0
-    sdrplay_api_RspDx_AntennaSelectT antennaSel;        // default: sdrplay_api_RspDx_ANTENNA_A
-    unsigned char rfNotchEnable;                        // default: 0
-    unsigned char rfDabNotchEnable;                     // default: 0
-} sdrplay_api_RspDxParamsT;
-
-typedef struct 
-{
-    sdrplay_api_RspDx_HdrModeBwT hdrBw;                 // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
-} sdrplay_api_RspDxTunerParamsT;
-
-#endif //SDRPLAY_API_RSPDX_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_rx_channel.h

@@ -1,21 +0,0 @@
-#ifndef SDRPLAY_API_RX_CHANNEL_H
-#define SDRPLAY_API_RX_CHANNEL_H
-
-#include "sdrplay_api_tuner.h"
-#include "sdrplay_api_control.h"
-#include "sdrplay_api_rsp1a.h"
-#include "sdrplay_api_rsp2.h"
-#include "sdrplay_api_rspDuo.h"
-#include "sdrplay_api_rspDx.h"
-
-typedef struct 
-{
-    sdrplay_api_TunerParamsT        tunerParams;    
-    sdrplay_api_ControlParamsT      ctrlParams;     
-    sdrplay_api_Rsp1aTunerParamsT   rsp1aTunerParams; 
-    sdrplay_api_Rsp2TunerParamsT    rsp2TunerParams; 
-    sdrplay_api_RspDuoTunerParamsT  rspDuoTunerParams;    
-    sdrplay_api_RspDxTunerParamsT   rspDxTunerParams;    
-} sdrplay_api_RxChannelParamsT;
-
-#endif //SDRPLAY_API_RX_CHANNEL_H

artifacts/sdrplay-api-headers/v3_08/sdrplay_api_tuner.h

@@ -1,93 +0,0 @@
-#ifndef SDRPLAY_API_TUNER_H
-#define SDRPLAY_API_TUNER_H
-
-#define MAX_BB_GR                         (59)
-
-// Tuner parameter enums
-typedef enum
-{
-    sdrplay_api_BW_Undefined = 0,
-    sdrplay_api_BW_0_200     = 200,
-    sdrplay_api_BW_0_300     = 300,
-    sdrplay_api_BW_0_600     = 600,
-    sdrplay_api_BW_1_536     = 1536,
-    sdrplay_api_BW_5_000     = 5000,
-    sdrplay_api_BW_6_000     = 6000,
-    sdrplay_api_BW_7_000     = 7000,
-    sdrplay_api_BW_8_000     = 8000
-} sdrplay_api_Bw_MHzT;
-
-typedef enum
-{
-    sdrplay_api_IF_Undefined = -1,
-    sdrplay_api_IF_Zero      = 0,
-    sdrplay_api_IF_0_450     = 450,
-    sdrplay_api_IF_1_620     = 1620,
-    sdrplay_api_IF_2_048     = 2048
-} sdrplay_api_If_kHzT;
-
-typedef enum
-{
-    sdrplay_api_LO_Undefined = 0,
-    sdrplay_api_LO_Auto      = 1,
-    sdrplay_api_LO_120MHz    = 2,
-    sdrplay_api_LO_144MHz    = 3,
-    sdrplay_api_LO_168MHz    = 4
-} sdrplay_api_LoModeT;
-
-typedef enum
-{
-    sdrplay_api_EXTENDED_MIN_GR = 0,
-    sdrplay_api_NORMAL_MIN_GR   = 20
-} sdrplay_api_MinGainReductionT;
-
-typedef enum
-{
-    sdrplay_api_Tuner_Neither  = 0,
-    sdrplay_api_Tuner_A        = 1,
-    sdrplay_api_Tuner_B        = 2,
-    sdrplay_api_Tuner_Both     = 3,
-} sdrplay_api_TunerSelectT;
-
-// Tuner parameter structs
-typedef struct
-{
-    float curr;
-    float max;
-    float min;
-} sdrplay_api_GainValuesT;
-
-typedef struct 
-{
-    int gRdB;                            // default: 50
-    unsigned char LNAstate;              // default: 0
-    unsigned char syncUpdate;            // default: 0
-    sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
-    sdrplay_api_GainValuesT gainVals;    // output parameter
-} sdrplay_api_GainT;
-
-typedef struct 
-{
-    double rfHz;                         // default: 200000000.0
-    unsigned char syncUpdate;            // default: 0
-} sdrplay_api_RfFreqT;
-
-typedef struct 
-{
-    unsigned char dcCal;                 // default: 3 (Periodic mode)
-    unsigned char speedUp;               // default: 0 (No speedup)
-    int trackTime;                       // default: 1    (=> time in uSec = (72 * 3 * trackTime) / 24e6       = 9uSec)
-    int refreshRateTime;                 // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
-} sdrplay_api_DcOffsetTunerT;
-
-typedef struct 
-{
-    sdrplay_api_Bw_MHzT bwType;          // default: sdrplay_api_BW_0_200
-    sdrplay_api_If_kHzT ifType;          // default: sdrplay_api_IF_Zero
-    sdrplay_api_LoModeT loMode;          // default: sdrplay_api_LO_Auto
-    sdrplay_api_GainT gain;
-    sdrplay_api_RfFreqT rfFreq;
-    sdrplay_api_DcOffsetTunerT dcOffsetTuner;
-} sdrplay_api_TunerParamsT;
-
-#endif //SDRPLAY_API_TUNER_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api.h

@@ -1,235 +0,0 @@
-#ifndef SDRPLAY_API_H
-#define SDRPLAY_API_H
-
-#include "sdrplay_api_dev.h"
-#include "sdrplay_api_rx_channel.h"
-#include "sdrplay_api_callback.h"
-
-#if defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64)
-#include "windows.h"
-#elif defined (__GNUC__)
-typedef void *HANDLE;
-#endif
-
-#ifndef _SDRPLAY_DLL_QUALIFIER
-#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64)) 
-#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
-#elif defined(STATIC_LIB) || defined(__GNUC__) 
-#define _SDRPLAY_DLL_QUALIFIER
-#endif
-#endif  // _SDRPLAY_DLL_QUALIFIER
-
-// Application code should check that it is compiled against the same API version
-// sdrplay_api_ApiVersion() returns the API version 
-#define SDRPLAY_API_VERSION                   (float)(3.15)
-
-// API Constants
-#define SDRPLAY_MAX_DEVICES                   (16)
-#define SDRPLAY_MAX_TUNERS_PER_DEVICE         (2)
-
-#define SDRPLAY_MAX_SER_NO_LEN                (64)
-#define SDRPLAY_MAX_ROOT_NM_LEN               (32)
-
-#define SDRPLAY_RSP1_ID                       (1)
-#define SDRPLAY_RSP1A_ID                      (255)
-#define SDRPLAY_RSP2_ID                       (2)
-#define SDRPLAY_RSPduo_ID                     (3)
-#define SDRPLAY_RSPdx_ID                      (4)
-#define SDRPLAY_RSP1B_ID                      (6)
-#define SDRPLAY_RSPdxR2_ID                    (7)
-
-// Enum types
-typedef enum
-{
-    sdrplay_api_Success               = 0,
-    sdrplay_api_Fail                  = 1,
-    sdrplay_api_InvalidParam          = 2,
-    sdrplay_api_OutOfRange            = 3,
-    sdrplay_api_GainUpdateError       = 4,
-    sdrplay_api_RfUpdateError         = 5,
-    sdrplay_api_FsUpdateError         = 6,
-    sdrplay_api_HwError               = 7,
-    sdrplay_api_AliasingError         = 8,
-    sdrplay_api_AlreadyInitialised    = 9,
-    sdrplay_api_NotInitialised        = 10,
-    sdrplay_api_NotEnabled            = 11,
-    sdrplay_api_HwVerError            = 12,
-    sdrplay_api_OutOfMemError         = 13,
-    sdrplay_api_ServiceNotResponding  = 14,
-    sdrplay_api_StartPending          = 15,
-    sdrplay_api_StopPending           = 16,
-    sdrplay_api_InvalidMode           = 17,
-    sdrplay_api_FailedVerification1   = 18,
-    sdrplay_api_FailedVerification2   = 19,
-    sdrplay_api_FailedVerification3   = 20,
-    sdrplay_api_FailedVerification4   = 21,
-    sdrplay_api_FailedVerification5   = 22,
-    sdrplay_api_FailedVerification6   = 23,
-    sdrplay_api_InvalidServiceVersion = 24
-} sdrplay_api_ErrT;
-
-typedef enum
-{
-    sdrplay_api_Update_None                        = 0x00000000,
-
-    // Reasons for master only mode 
-    sdrplay_api_Update_Dev_Fs                      = 0x00000001,
-    sdrplay_api_Update_Dev_Ppm                     = 0x00000002,
-    sdrplay_api_Update_Dev_SyncUpdate              = 0x00000004,
-    sdrplay_api_Update_Dev_ResetFlags              = 0x00000008,
-
-    sdrplay_api_Update_Rsp1a_BiasTControl          = 0x00000010,
-    sdrplay_api_Update_Rsp1a_RfNotchControl        = 0x00000020,
-    sdrplay_api_Update_Rsp1a_RfDabNotchControl     = 0x00000040,
-
-    sdrplay_api_Update_Rsp2_BiasTControl           = 0x00000080,
-    sdrplay_api_Update_Rsp2_AmPortSelect           = 0x00000100,
-    sdrplay_api_Update_Rsp2_AntennaControl         = 0x00000200,
-    sdrplay_api_Update_Rsp2_RfNotchControl         = 0x00000400,
-    sdrplay_api_Update_Rsp2_ExtRefControl          = 0x00000800,
-
-    sdrplay_api_Update_RspDuo_ExtRefControl        = 0x00001000,
-
-    sdrplay_api_Update_Master_Spare_1              = 0x00002000,
-    sdrplay_api_Update_Master_Spare_2              = 0x00004000,
-
-    // Reasons for master and slave mode
-    // Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
-    sdrplay_api_Update_Tuner_Gr                    = 0x00008000,
-    sdrplay_api_Update_Tuner_GrLimits              = 0x00010000,
-    sdrplay_api_Update_Tuner_Frf                   = 0x00020000,
-    sdrplay_api_Update_Tuner_BwType                = 0x00040000,
-    sdrplay_api_Update_Tuner_IfType                = 0x00080000,
-    sdrplay_api_Update_Tuner_DcOffset              = 0x00100000,
-    sdrplay_api_Update_Tuner_LoMode                = 0x00200000,
-
-    sdrplay_api_Update_Ctrl_DCoffsetIQimbalance    = 0x00400000,
-    sdrplay_api_Update_Ctrl_Decimation             = 0x00800000,
-    sdrplay_api_Update_Ctrl_Agc                    = 0x01000000,
-    sdrplay_api_Update_Ctrl_AdsbMode               = 0x02000000,
-    sdrplay_api_Update_Ctrl_OverloadMsgAck         = 0x04000000,
-
-    sdrplay_api_Update_RspDuo_BiasTControl         = 0x08000000,
-    sdrplay_api_Update_RspDuo_AmPortSelect         = 0x10000000,
-    sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
-    sdrplay_api_Update_RspDuo_RfNotchControl       = 0x40000000,
-    sdrplay_api_Update_RspDuo_RfDabNotchControl    = 0x80000000,
-} sdrplay_api_ReasonForUpdateT;
-
-typedef enum
-{
-    sdrplay_api_Update_Ext1_None                   = 0x00000000,
-
-    // Reasons for master only mode 
-    sdrplay_api_Update_RspDx_HdrEnable             = 0x00000001,
-    sdrplay_api_Update_RspDx_BiasTControl          = 0x00000002,
-    sdrplay_api_Update_RspDx_AntennaControl        = 0x00000004,
-    sdrplay_api_Update_RspDx_RfNotchControl        = 0x00000008,
-    sdrplay_api_Update_RspDx_RfDabNotchControl     = 0x00000010,
-    sdrplay_api_Update_RspDx_HdrBw                 = 0x00000020,
-    sdrplay_api_Update_RspDuo_ResetSlaveFlags      = 0x00000040,
-
-    // Reasons for master and slave mode
-} sdrplay_api_ReasonForUpdateExtension1T;
-
-typedef enum
-{
-    sdrplay_api_DbgLvl_Disable       = 0,
-    sdrplay_api_DbgLvl_Verbose       = 1,
-    sdrplay_api_DbgLvl_Warning       = 2,
-    sdrplay_api_DbgLvl_Error         = 3,
-    sdrplay_api_DbgLvl_Message       = 4,
-} sdrplay_api_DbgLvl_t;
-
-// Device structure 
-typedef struct 
-{
-    char SerNo[SDRPLAY_MAX_SER_NO_LEN];
-    unsigned char hwVer;
-    sdrplay_api_TunerSelectT tuner;
-    sdrplay_api_RspDuoModeT rspDuoMode;
-    unsigned char valid;
-    double rspDuoSampleFreq;
-    HANDLE dev;
-} sdrplay_api_DeviceT;
-
-// Device parameter structure
-typedef struct 
-{
-    sdrplay_api_DevParamsT       *devParams;
-    sdrplay_api_RxChannelParamsT *rxChannelA;
-    sdrplay_api_RxChannelParamsT *rxChannelB;
-} sdrplay_api_DeviceParamsT;
-
-// Extended error message structure
-typedef struct 
-{
-    char file[256];
-    char function[256];
-    int  line;
-    char message[1024];
-} sdrplay_api_ErrorInfoT;
-
-// Comman API function types
-typedef sdrplay_api_ErrT        (*sdrplay_api_Open_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_Close_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_ApiVersion_t)(float *apiVer);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_LockDeviceApi_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_UnlockDeviceApi_t)(void);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);    
-typedef sdrplay_api_ErrT        (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);    
-typedef const char*             (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
-typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
-typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastErrorByType_t)(sdrplay_api_DeviceT *device, int type, unsigned long long *time);
-typedef sdrplay_api_ErrT        (*sdrplay_api_DisableHeartbeat_t)(void);
-
-// Device API function types
-typedef sdrplay_api_ErrT        (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext); 
-typedef sdrplay_api_ErrT        (*sdrplay_api_Uninit_t)(HANDLE dev);
-typedef sdrplay_api_ErrT        (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate, double newSampleRate);
-typedef sdrplay_api_ErrT        (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
-                                                                sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
-                                                                sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-
-// API function definitions
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    // Comman API function definitions
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Open(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Close(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ApiVersion(float *apiVer);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_LockDeviceApi(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_UnlockDeviceApi(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);   
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);   
-    _SDRPLAY_DLL_QUALIFIER const char*             sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastErrorByType(sdrplay_api_DeviceT *device, int type, unsigned long long *time);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
-
-    // Device API function definitions
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable); 
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams); 
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext); 
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Uninit(HANDLE dev);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate, double newSampleRate);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
-                                                                              sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
-                                                                              sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //SDRPLAY_API_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_callback.h

@@ -1,79 +0,0 @@
-#ifndef SDRPLAY_API_CALLBACK_H
-#define SDRPLAY_API_CALLBACK_H
-
-// Event callback enums
-typedef enum
-{
-    sdrplay_api_Overload_Detected     = 0,
-    sdrplay_api_Overload_Corrected    = 1,
-} sdrplay_api_PowerOverloadCbEventIdT;
-
-typedef enum
-{
-    sdrplay_api_MasterInitialised      = 0,
-    sdrplay_api_SlaveAttached          = 1,
-    sdrplay_api_SlaveDetached          = 2,
-    sdrplay_api_SlaveInitialised       = 3,
-    sdrplay_api_SlaveUninitialised     = 4,
-    sdrplay_api_MasterDllDisappeared   = 5,
-    sdrplay_api_SlaveDllDisappeared    = 6,
-} sdrplay_api_RspDuoModeCbEventIdT;
-
-typedef enum
-{
-    sdrplay_api_GainChange            = 0,
-    sdrplay_api_PowerOverloadChange   = 1,
-    sdrplay_api_DeviceRemoved         = 2,
-    sdrplay_api_RspDuoModeChange      = 3,
-    sdrplay_api_DeviceFailure         = 4,
-} sdrplay_api_EventT;
-
-// Event callback parameter structs
-typedef struct 
-{
-    unsigned int gRdB;
-    unsigned int lnaGRdB;
-    double currGain;
-} sdrplay_api_GainCbParamT;
-
-typedef struct 
-{
-    sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
-} sdrplay_api_PowerOverloadCbParamT;
-
-typedef struct 
-{
-    sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
-} sdrplay_api_RspDuoModeCbParamT;
-
-// Event parameters overlay
-typedef union
-{
-    sdrplay_api_GainCbParamT          gainParams;
-    sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
-    sdrplay_api_RspDuoModeCbParamT    rspDuoModeParams;
-} sdrplay_api_EventParamsT;
-
-// Stream callback parameter structs
-typedef struct 
-{
-    unsigned int firstSampleNum;
-    int grChanged;
-    int rfChanged;
-    int fsChanged;
-    unsigned int numSamples;
-} sdrplay_api_StreamCbParamsT;
-
-// Callback function prototypes
-typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext); 
-typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext); 
-
-// Callback function struct
-typedef struct 
-{
-    sdrplay_api_StreamCallback_t StreamACbFn;
-    sdrplay_api_StreamCallback_t StreamBCbFn;
-    sdrplay_api_EventCallback_t  EventCbFn;
-} sdrplay_api_CallbackFnsT;
-
-#endif //SDRPLAY_API_CALLBACK_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_control.h

@@ -1,55 +0,0 @@
-#ifndef SDRPLAY_API_CONTROL_H
-#define SDRPLAY_API_CONTROL_H
-
-// Control parameter enums
-typedef enum
-{
-    sdrplay_api_AGC_DISABLE  = 0,
-    sdrplay_api_AGC_100HZ    = 1,
-    sdrplay_api_AGC_50HZ     = 2,
-    sdrplay_api_AGC_5HZ      = 3,
-    sdrplay_api_AGC_CTRL_EN  = 4
-} sdrplay_api_AgcControlT;
-
-typedef enum
-{
-    sdrplay_api_ADSB_DECIMATION                  = 0,
-    sdrplay_api_ADSB_NO_DECIMATION_LOWPASS       = 1,
-    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
-    sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
-} sdrplay_api_AdsbModeT;
-
-// Control parameter structs
-typedef struct 
-{
-    unsigned char DCenable;          // default: 1
-    unsigned char IQenable;          // default: 1
-} sdrplay_api_DcOffsetT;
-
-typedef struct 
-{
-    unsigned char enable;            // default: 0
-    unsigned char decimationFactor;  // default: 1
-    unsigned char wideBandSignal;    // default: 0
-} sdrplay_api_DecimationT;
-
-typedef struct 
-{
-    sdrplay_api_AgcControlT enable;    // default: sdrplay_api_AGC_50HZ
-    int setPoint_dBfs;                 // default: -60
-    unsigned short attack_ms;          // default: 0
-    unsigned short decay_ms;           // default: 0
-    unsigned short decay_delay_ms;     // default: 0
-    unsigned short decay_threshold_dB; // default: 0
-    int syncUpdate;                    // default: 0
-} sdrplay_api_AgcT;
-
-typedef struct 
-{
-    sdrplay_api_DcOffsetT dcOffset;
-    sdrplay_api_DecimationT decimation;
-    sdrplay_api_AgcT agc;
-    sdrplay_api_AdsbModeT adsbMode;  //default: sdrplay_api_ADSB_DECIMATION
-} sdrplay_api_ControlParamsT;
-
-#endif //SDRPLAY_API_CONTROL_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_dev.h

@@ -1,51 +0,0 @@
-#ifndef SDRPLAY_API_DEV_H
-#define SDRPLAY_API_DEV_H
-
-#include "sdrplay_api_rsp1a.h"
-#include "sdrplay_api_rsp2.h"
-#include "sdrplay_api_rspDuo.h"
-#include "sdrplay_api_rspDx.h"
-
-// Dev parameter enums
-typedef enum
-{
-    sdrplay_api_ISOCH = 0,
-    sdrplay_api_BULK  = 1
-} sdrplay_api_TransferModeT;
-
-// Dev parameter structs
-typedef struct 
-{
-    double fsHz;                        // default: 2000000.0
-    unsigned char syncUpdate;           // default: 0
-    unsigned char reCal;                // default: 0
-} sdrplay_api_FsFreqT;
-
-typedef struct 
-{
-    unsigned int sampleNum;             // default: 0
-    unsigned int period;                // default: 0
-} sdrplay_api_SyncUpdateT;
-
-typedef struct 
-{
-    unsigned char resetGainUpdate;      // default: 0
-    unsigned char resetRfUpdate;        // default: 0
-    unsigned char resetFsUpdate;        // default: 0
-} sdrplay_api_ResetFlagsT;   
-
-typedef struct 
-{
-    double ppm;                         // default: 0.0
-    sdrplay_api_FsFreqT fsFreq;
-    sdrplay_api_SyncUpdateT syncUpdate; 
-    sdrplay_api_ResetFlagsT resetFlags; 
-    sdrplay_api_TransferModeT mode;     // default: sdrplay_api_ISOCH
-    unsigned int samplesPerPkt;         // default: 0 (output param)
-    sdrplay_api_Rsp1aParamsT rsp1aParams;
-    sdrplay_api_Rsp2ParamsT rsp2Params;
-    sdrplay_api_RspDuoParamsT rspDuoParams;
-    sdrplay_api_RspDxParamsT rspDxParams;
-} sdrplay_api_DevParamsT;
-
-#endif //SDRPLAY_API_DEV_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_rsp1a.h

@@ -1,22 +0,0 @@
-#ifndef SDRPLAY_API_RSP1A_H
-#define SDRPLAY_API_RSP1A_H
-
-#define RSPIA_NUM_LNA_STATES         10
-#define RSPIA_NUM_LNA_STATES_AM      7
-#define RSPIA_NUM_LNA_STATES_LBAND   9
-
-// RSP1A parameter enums
-
-// RSP1A parameter structs
-typedef struct 
-{
-    unsigned char rfNotchEnable;                              // default: 0
-    unsigned char rfDabNotchEnable;                           // default: 0
-} sdrplay_api_Rsp1aParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                   // default: 0
-} sdrplay_api_Rsp1aTunerParamsT;
-
-#endif //SDRPLAY_API_RSP1A_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_rsp2.h

@@ -1,35 +0,0 @@
-#ifndef SDRPLAY_API_RSP2_H
-#define SDRPLAY_API_RSP2_H
-
-#define RSPII_NUM_LNA_STATES         9
-#define RSPII_NUM_LNA_STATES_AMPORT  5
-#define RSPII_NUM_LNA_STATES_420MHZ  6
-
-// RSP2 parameter enums
-typedef enum
-{
-    sdrplay_api_Rsp2_ANTENNA_A = 5,
-    sdrplay_api_Rsp2_ANTENNA_B = 6,
-} sdrplay_api_Rsp2_AntennaSelectT;
-
-typedef enum
-{
-    sdrplay_api_Rsp2_AMPORT_1 = 1,
-    sdrplay_api_Rsp2_AMPORT_2 = 0,
-} sdrplay_api_Rsp2_AmPortSelectT;
-
-// RSP2 parameter structs
-typedef struct 
-{
-    unsigned char extRefOutputEn;                // default: 0
-} sdrplay_api_Rsp2ParamsT;
-
-typedef struct 
-{
-    unsigned char biasTEnable;                   // default: 0
-    sdrplay_api_Rsp2_AmPortSelectT amPortSel;    // default: sdrplay_api_Rsp2_AMPORT_2
-    sdrplay_api_Rsp2_AntennaSelectT antennaSel;  // default: sdrplay_api_Rsp2_ANTENNA_A
-    unsigned char rfNotchEnable;                 // default: 0
-} sdrplay_api_Rsp2TunerParamsT;
-
-#endif //SDRPLAY_API_RSP2_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_rspDuo.h

@@ -1,47 +0,0 @@
-#ifndef SDRPLAY_API_RSPduo_H
-#define SDRPLAY_API_RSPduo_H
-
-#define RSPDUO_NUM_LNA_STATES         10
-#define RSPDUO_NUM_LNA_STATES_AMPORT  5
-#define RSPDUO_NUM_LNA_STATES_AM      7
-#define RSPDUO_NUM_LNA_STATES_LBAND   9
-
-// RSPduo parameter enums
-typedef enum
-{
-    sdrplay_api_RspDuoMode_Unknown      = 0,
-    sdrplay_api_RspDuoMode_Single_Tuner = 1,
-    sdrplay_api_RspDuoMode_Dual_Tuner   = 2,
-    sdrplay_api_RspDuoMode_Master       = 4,
-    sdrplay_api_RspDuoMode_Slave        = 8,
-} sdrplay_api_RspDuoModeT;
-
-typedef enum
-{
-    sdrplay_api_RspDuo_AMPORT_1 = 1,
-    sdrplay_api_RspDuo_AMPORT_2 = 0,
-} sdrplay_api_RspDuo_AmPortSelectT;
-
-// RSPduo parameter structs
-typedef struct 
-{
-    int extRefOutputEn;                             // default: 0
-} sdrplay_api_RspDuoParamsT;
-
-typedef struct 
-{
-   unsigned char resetGainUpdate;      // default: 0
-   unsigned char resetRfUpdate;        // default: 0
-} sdrplay_api_RspDuo_ResetSlaveFlagsT;
-
-typedef struct
-{
-    unsigned char biasTEnable;                      // default: 0
-    sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
-    unsigned char tuner1AmNotchEnable;              // default: 0
-    unsigned char rfNotchEnable;                    // default: 0
-    unsigned char rfDabNotchEnable;                 // default: 0
-    sdrplay_api_RspDuo_ResetSlaveFlagsT resetSlaveFlags;
-} sdrplay_api_RspDuoTunerParamsT;
-
-#endif //SDRPLAY_API_RSPduo_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_rspDx.h

@@ -1,46 +0,0 @@
-#ifndef SDRPLAY_API_RSPDX_H
-#define SDRPLAY_API_RSPDX_H
-
-#include "sdrplay_api_tuner.h"
-
-#define RSPDX_NUM_LNA_STATES               28   // Number of LNA states in all bands (except where defined differently below)
-#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12  19   // Number of LNA states when using AM Port 2 between 0 and 12MHz
-#define RSPDX_NUM_LNA_STATES_AMPORT2_12_50 20   // Number of LNA states when using AM Port 2 between 12 and 50MHz
-#define RSPDX_NUM_LNA_STATES_AMPORT2_50_60 25   // Number of LNA states when using AM Port 2 between 50 and 60MHz
-#define RSPDX_NUM_LNA_STATES_VHF_BAND3     27   // Number of LNA states in VHF and Band3
-#define RSPDX_NUM_LNA_STATES_420MHZ        21   // Number of LNA states in 420MHz band
-#define RSPDX_NUM_LNA_STATES_LBAND         19   // Number of LNA states in L-band
-#define RSPDX_NUM_LNA_STATES_DX            22   // Number of LNA states in DX path
-
-// RSPdx parameter enums
-typedef enum
-{
-    sdrplay_api_RspDx_ANTENNA_A = 0,
-    sdrplay_api_RspDx_ANTENNA_B = 1,
-    sdrplay_api_RspDx_ANTENNA_C = 2,
-} sdrplay_api_RspDx_AntennaSelectT;
-
-typedef enum
-{
-    sdrplay_api_RspDx_HDRMODE_BW_0_200  = 0,
-    sdrplay_api_RspDx_HDRMODE_BW_0_500  = 1,
-    sdrplay_api_RspDx_HDRMODE_BW_1_200  = 2,
-    sdrplay_api_RspDx_HDRMODE_BW_1_700  = 3,
-} sdrplay_api_RspDx_HdrModeBwT;
-
-// RSPdx parameter structs
-typedef struct 
-{
-    unsigned char hdrEnable;                            // default: 0
-    unsigned char biasTEnable;                          // default: 0
-    sdrplay_api_RspDx_AntennaSelectT antennaSel;        // default: sdrplay_api_RspDx_ANTENNA_A
-    unsigned char rfNotchEnable;                        // default: 0
-    unsigned char rfDabNotchEnable;                     // default: 0
-} sdrplay_api_RspDxParamsT;
-
-typedef struct 
-{
-    sdrplay_api_RspDx_HdrModeBwT hdrBw;                 // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
-} sdrplay_api_RspDxTunerParamsT;
-
-#endif //SDRPLAY_API_RSPDX_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_rx_channel.h

@@ -1,21 +0,0 @@
-#ifndef SDRPLAY_API_RX_CHANNEL_H
-#define SDRPLAY_API_RX_CHANNEL_H
-
-#include "sdrplay_api_tuner.h"
-#include "sdrplay_api_control.h"
-#include "sdrplay_api_rsp1a.h"
-#include "sdrplay_api_rsp2.h"
-#include "sdrplay_api_rspDuo.h"
-#include "sdrplay_api_rspDx.h"
-
-typedef struct 
-{
-    sdrplay_api_TunerParamsT        tunerParams;    
-    sdrplay_api_ControlParamsT      ctrlParams;     
-    sdrplay_api_Rsp1aTunerParamsT   rsp1aTunerParams; 
-    sdrplay_api_Rsp2TunerParamsT    rsp2TunerParams; 
-    sdrplay_api_RspDuoTunerParamsT  rspDuoTunerParams;    
-    sdrplay_api_RspDxTunerParamsT   rspDxTunerParams;    
-} sdrplay_api_RxChannelParamsT;
-
-#endif //SDRPLAY_API_RX_CHANNEL_H

artifacts/sdrplay-api-headers/v3_15/sdrplay_api_tuner.h

@@ -1,93 +0,0 @@
-#ifndef SDRPLAY_API_TUNER_H
-#define SDRPLAY_API_TUNER_H
-
-#define MAX_BB_GR                         (59)
-
-// Tuner parameter enums
-typedef enum
-{
-    sdrplay_api_BW_Undefined = 0,
-    sdrplay_api_BW_0_200     = 200,
-    sdrplay_api_BW_0_300     = 300,
-    sdrplay_api_BW_0_600     = 600,
-    sdrplay_api_BW_1_536     = 1536,
-    sdrplay_api_BW_5_000     = 5000,
-    sdrplay_api_BW_6_000     = 6000,
-    sdrplay_api_BW_7_000     = 7000,
-    sdrplay_api_BW_8_000     = 8000
-} sdrplay_api_Bw_MHzT;
-
-typedef enum
-{
-    sdrplay_api_IF_Undefined = -1,
-    sdrplay_api_IF_Zero      = 0,
-    sdrplay_api_IF_0_450     = 450,
-    sdrplay_api_IF_1_620     = 1620,
-    sdrplay_api_IF_2_048     = 2048
-} sdrplay_api_If_kHzT;
-
-typedef enum
-{
-    sdrplay_api_LO_Undefined = 0,
-    sdrplay_api_LO_Auto      = 1,
-    sdrplay_api_LO_120MHz    = 2,
-    sdrplay_api_LO_144MHz    = 3,
-    sdrplay_api_LO_168MHz    = 4
-} sdrplay_api_LoModeT;
-
-typedef enum
-{
-    sdrplay_api_EXTENDED_MIN_GR = 0,
-    sdrplay_api_NORMAL_MIN_GR   = 20
-} sdrplay_api_MinGainReductionT;
-
-typedef enum
-{
-    sdrplay_api_Tuner_Neither  = 0,
-    sdrplay_api_Tuner_A        = 1,
-    sdrplay_api_Tuner_B        = 2,
-    sdrplay_api_Tuner_Both     = 3,
-} sdrplay_api_TunerSelectT;
-
-// Tuner parameter structs
-typedef struct
-{
-    float curr;
-    float max;
-    float min;
-} sdrplay_api_GainValuesT;
-
-typedef struct 
-{
-    int gRdB;                            // default: 50
-    unsigned char LNAstate;              // default: 0
-    unsigned char syncUpdate;            // default: 0
-    sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
-    sdrplay_api_GainValuesT gainVals;    // output parameter
-} sdrplay_api_GainT;
-
-typedef struct 
-{
-    double rfHz;                         // default: 200000000.0
-    unsigned char syncUpdate;            // default: 0
-} sdrplay_api_RfFreqT;
-
-typedef struct 
-{
-    unsigned char dcCal;                 // default: 3 (Periodic mode)
-    unsigned char speedUp;               // default: 0 (No speedup)
-    int trackTime;                       // default: 1    (=> time in uSec = (72 * 3 * trackTime) / 24e6       = 9uSec)
-    int refreshRateTime;                 // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
-} sdrplay_api_DcOffsetTunerT;
-
-typedef struct 
-{
-    sdrplay_api_Bw_MHzT bwType;          // default: sdrplay_api_BW_0_200
-    sdrplay_api_If_kHzT ifType;          // default: sdrplay_api_IF_Zero
-    sdrplay_api_LoModeT loMode;          // default: sdrplay_api_LO_Auto
-    sdrplay_api_GainT gain;
-    sdrplay_api_RfFreqT rfFreq;
-    sdrplay_api_DcOffsetTunerT dcOffsetTuner;
-} sdrplay_api_TunerParamsT;
-
-#endif //SDRPLAY_API_TUNER_H

build.gradle

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -17,16 +17,18 @@
  * ****************************************************************************
  */
 
+import org.beryx.runtime.RuntimeZipTask
+import org.gradle.internal.jvm.Jvm
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 import java.text.SimpleDateFormat
 
-
-
 /**
  * Instructions for building/compiling the sdrtrunk application.
  *
  * Prerequisites:
- * Install and configure an OpenJDK version 22+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
- * - Optional: install and configure Gradle 8.10+
+ * Install and configure an OpenJDK version 27+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
+ * - Optional: install and configure Gradle 9.8+
  *
  * Scenario 1: run the application via gradle command line from the source code root directory:
  * command: ./gradlew run
@@ -47,27 +49,43 @@ plugins {
     id 'application'
     id 'java'
     id 'idea'
-    id 'org.beryx.runtime' version '1.12.7'
-}
-
-repositories {
-    mavenCentral()
-    maven { url "https://jitpack.io" }
+    id 'org.beryx.runtime' version '2.0.1'
 }
 
 //Version is defined in gradle.properties so that we can CLI override it for nightly builds.
 version = project.findProperty('projectVersion')
 
-//Java 23 is required for this version of the Project Panama preview/incubator feature
+//Java 27 is required for this version of the Project Panama preview/incubator feature
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(23)
+        languageVersion = JavaLanguageVersion.of(27)
+        vendor = JvmVendorSpec.BELLSOFT
     }
 }
 
-sourceSets {
-    main.java.srcDirs 'src/main'
-    test.java.srcDirs 'src/test'
+/**
+ * Verifies that the selected toolchain JDK includes the JavaFX modules (e.g. Bellsoft Liberica 'Full JDK').
+ *
+ * Gradle's toolchain spec can only select by language version, vendor and implementation, so it can't distinguish
+ * between the Liberica JDK packages that do and don't bundle JavaFX. This task fails the build with a clear message
+ * instead of allowing compilation to fail with missing javafx packages.
+ */
+tasks.register('verifyToolchainJavaFx') {
+    def jdkHome = javaToolchains.launcherFor(java.toolchain).map { it.metadata.installationPath.asFile }
+
+    doLast {
+        def release = new File(jdkHome.get(), 'release')
+
+        if(!release.exists() || !release.text.contains('javafx.base')) {
+            throw new GradleException("The JDK at [${jdkHome.get()}] does not include the JavaFX modules. Install " +
+                    "the Bellsoft Liberica JDK 27 'Full' package (includes LibericaFX), or use " +
+                    "-Porg.gradle.java.installations.paths=<jdk path> to specify the JDK that Gradle should use.")
+        }
+    }
+}
+
+tasks.named('compileJava') {
+    dependsOn 'verifyToolchainJavaFx'
 }
 
 test {
@@ -77,58 +95,64 @@ test {
 dependencies {
 
     // JUnit Tests
-    testImplementation(platform("org.junit:junit-bom:5.11.0"))
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
-
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+    testImplementation(platform("org.junit:junit-bom:6.0.1"))
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:6.0.1'
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.0.1")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:6.0.1")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     //Jitpack imports
     implementation 'com.github.dnault:libresample4j:master'
-    implementation 'com.github.DSheirer.jmbe:jmbe-api:1.0.0'
+    implementation 'com.github.DSheirer.jmbe:api:v2.1.0'
     implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'
 
     //mavenCentral/jcenter imports
-    implementation 'ch.qos.logback:logback-classic:1.4.12'
-    implementation 'ch.qos.logback:logback-core:1.4.14'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.0'
-    implementation 'com.fazecast:jSerialComm:2.9.3'
+    implementation 'ch.qos.logback:logback-classic:1.6.3'
+    implementation 'ch.qos.logback:logback-core:1.5.38'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.22.4'
+    implementation 'com.fazecast:jSerialComm:2.11.4'
+    implementation 'com.formdev:flatlaf:3.7.2'
+    implementation 'com.formdev:flatlaf-intellij-themes:3.7.2'
     implementation 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
     implementation 'com.github.jiconfont:jiconfont-javafx:1.0.0'
     implementation 'com.github.jiconfont:jiconfont-swing:1.0.1'
-    implementation 'com.github.wendykierp:JTransforms:3.1'
-    implementation 'com.google.code.gson:gson:2.10'
-    implementation 'com.google.guava:guava:33.3.0-jre'
+    implementation 'com.github.wendykierp:JTransforms:3.2'
+    implementation 'com.google.code.gson:gson:2.14.0'
+    implementation 'com.google.guava:guava:33.6.0-jre'
     implementation 'com.jidesoft:jide-oss:3.6.18'
-    implementation 'com.miglayout:miglayout-swing:11.0'
+    implementation 'com.miglayout:miglayout-swing:11.4.3'
     implementation 'com.mpatric:mp3agic:0.9.1'
-    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.22.0'
     implementation 'eu.hansolo:charts:1.0.5'
+    implementation 'io.github.dsheirer:jairspy:1.0.12.1' //Airspy tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jairspyhf:1.8.1.1' //Airspy HF+ tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jbladerf:2.6.0.1' //bladeRF tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jhackrf:2026.01.3.1' //HackRF tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jlibusb:1.0.30.1' //libusb and USB hotplug for the tuner libraries - GitHub release; not pulled in transitively
+    implementation 'io.github.dsheirer:jhydrasdr:1.1.4.1' //HydraSDR tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jlimesdr:25.1.0.2' //LimeSDR tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jrtl:1.4.0.2' //RTL-SDR tuners - GitHub release, see settings.gradle
+    implementation 'io.github.dsheirer:jsdrplay:3.15.3' //SDRplay RSP tuners - GitHub release, see settings.gradle
     implementation 'io.github.dsheirer:radio-reference-api:18.0.0'
-    implementation 'javax.usb:usb-api:1.0.2'
     implementation 'net.coderazzi:tablefilter-swing:5.5.4'
-    implementation 'org.apache.commons:commons-compress:1.26.0'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-compress:1.28.0'
+    implementation 'org.apache.commons:commons-lang3:3.20.0'
     implementation 'org.apache.commons:commons-math3:3.6.1'
-    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'org.apache.mina:mina-core:2.2.1'
-    implementation 'org.apache.mina:mina-http:2.2.1'
-    implementation 'org.controlsfx:controlsfx:11.1.2'
+    implementation 'org.apache.commons:commons-csv:1.14.1'
+    implementation 'org.apache.mina:mina-core:2.2.9'
+    implementation 'org.apache.mina:mina-http:2.2.9'
+    implementation 'org.controlsfx:controlsfx:11.2.3'
     implementation 'org.rauschig:jarchivelib:1.2.0'
-    implementation 'org.slf4j:slf4j-api:2.0.5'
-    implementation 'org.usb4java:libusb4java:1.3.0'
-    implementation 'org.usb4java:usb4java:1.3.0'
-    implementation 'org.usb4java:usb4java-javax:1.3.0'
-    implementation 'io.github.dsheirer:libusb4java-darwin-aarch64:1.3.1' //usb4java native lib for OSX M1 cpu
+    implementation 'org.slf4j:slf4j-api:2.0.17'
     implementation 'pl.edu.icm:JLargeArrays:1.6'
 }
 
-def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem
+def os = DefaultNativePlatform.currentOperatingSystem
 
 /**
- * This is needed for the JDK23 vector API ... until it moves out of incubation or preview
+ * This is needed for the JDK23+ vector API ... until it moves out of incubation or preview
  */
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator
     options.compilerArgs.add("--add-modules=jdk.incubator.vector") //Project Panama Vector API is still in incubator
 }
@@ -139,22 +163,25 @@ tasks.withType(JavaCompile) {
 def jvmArgsWindows =
         ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
          '--add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED', //windows users for JIDE
-         '--add-modules=jdk.incubator.vector',   //Project Panama Vector API is still in incubator
+         '--add-modules=jdk.incubator.vector',   //Project Panama vector API is still in incubator
          '--enable-preview', //Project Panama Vector API is still in incubator
          '--enable-native-access=ALL-UNNAMED', //Suppress unsafe warnings for FFM API Foreign Memory calls
-         '-Djava.library.path=c:\\Program Files\\SDRplay\\API\\x64'] //SDRPlay API library path
+         '--enable-native-access=javafx.graphics', //JDK24 - suppress restricted java.lang.System calls
+         '--sun-misc-unsafe-memory-access=allow'] //JDK24 - suppress sun.misc.Unsafe::allocateMemory warning
 
 /**
  * JVM Arguments for running the application on Linux.
  */
 def jvmArgsLinux =
         ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
-         '--add-modules=jdk.incubator.vector',   //Needed while Project Panama API is still in incubator
+         '--add-modules=jdk.incubator.vector',   //Project Panama vector API is still in incubator
          '--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
-         '--enable-native-access=ALL-UNNAMED'] //SDRPlay API library path
+         '--sun-misc-unsafe-memory-access=allow', //JDK24 - suppress sun.misc.Unsafe::allocateMemory warning
+         '--enable-native-access=javafx.graphics', //JDK24 - suppress restricted java.lang.System calls
+         '--enable-native-access=ALL-UNNAMED'] //Suppress warnings for FFM API native calls (tuner libraries)
 
 application {
-    mainClassName = "io.github.dsheirer.gui.SDRTrunk"
+    mainClass = "io.github.dsheirer.gui.SDRTrunk"
 
     if(os.isWindows()) {
         applicationDefaultJvmArgs = jvmArgsWindows
@@ -164,6 +191,15 @@ application {
     }
 }
 
+test {
+    if(os.isWindows()) {
+        jvmArgs = jvmArgsWindows
+    }
+    else {
+        jvmArgs = jvmArgsLinux
+    }
+}
+
 jar {
     manifest {
         attributes (
@@ -184,6 +220,11 @@ idea {
     }
 }
 
+javadoc {
+    options.addStringOption('-add-modules', 'jdk.incubator.vector')
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
 /**
  * Runtime target OS and CPU image names.  We append version here so that version details are at end of zip filename.
  */
@@ -199,17 +240,17 @@ String targetWindowsAarch64 = 'windows-aarch64-v' + version
  * author's development environment, but can be changed to your environment if you want to use this build pattern.
  */
 String jdk_base = '/home/denny/java_jdks/'
-String jdk_linux_aarch64 = jdk_base + 'linux-arm64/jdk-22.0.2-full'
-String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-22.0.2-full'
-String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-22.0.2-full.jdk'
-String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-22.0.2-full.jdk'
-String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-22.0.2-full'
-String jdk_windows_aarch64 = jdk_base + 'windows-arm64/jdk-22.0.2-full'
+String jdk_linux_aarch64 = jdk_base + 'linux-arm64/jdk-25.0.1-full'
+String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-25.0.1-full'
+String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-25.0.1-full.jdk'
+String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-25.0.1-full.jdk'
+String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-25.0.1-full'
+String jdk_windows_aarch64 = jdk_base + 'windows-arm64/jdk-25.0.1-full'
 
 /**
  * Download URLs to download the JDK as part of the gradle build packaging process
  */
-def jdk_download_base = "https://download.bell-sw.com/java/23.0.1+13/bellsoft-jdk23.0.1+13-"
+def jdk_download_base = "https://download.bell-sw.com/java/27+36/bellsoft-jdk27+36-"
 def jdk_download_suffix = "-full.tar.gz"
 def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix
 def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix
@@ -224,16 +265,17 @@ def jdk_download_windows_aarch64 = jdk_download_base + "windows-aarch64-full.zip
  * @param jvmArgs to use (windows or linux)
  * @return configured task.
  */
-def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
+def configure(RuntimeZipTask rt, List<String> jvmArgs) {
     //Use the correct set of JVM arguments
     rt.extension.launcherData.get().jvmArgs = jvmArgs
 
     //Additional modules to include with auto-detected modules.
+    //jdk.charsets - NXDN BIG5 encoding support
     //jdk.crypto.ec - needed for HTTPS connections (broadcastify calls & map tile server)
     //jdk.incubator.vector - needed for Project Panama foreign function and vector apis
     //jdk.accessibility is used with assistive technologies like screen readers
     //java.management for JVM resource monitoring
-    rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management')
+    rt.extension.addModules('jdk.charsets', 'jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management')
 
     //Use auto-detected modules and 'add' any specified modules.
     rt.extension.additive.set(true)
@@ -242,7 +284,8 @@ def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
     rt.extension.addOptions('--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages')
 
     //Runtime images have auto appended version in image zip name.  Override to include version in single target image.
-    rt.extension.imageZip.set(file("$buildDir/image/sdr-trunk.zip"))
+//    rt.extension.imageDir=layout.buildDirectory.dir('image')
+    rt.extension.imageZip.set(file(layout.buildDirectory.dir('image').get().file('sdr-trunk.zip')))
 }
 
 /**
@@ -254,35 +297,35 @@ def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
  * Usage: gradlew runtimeZipCurrent   (windows - using gradlew)
  * Usage: ./gradlew runtimeZipCurrent   (linux - using gradlew)
  */
-tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
+tasks.register('runtimeZipCurrent', RuntimeZipTask) {rt ->
     def arch = System.properties.getProperty("os.arch")
-    def javaHome = org.gradle.internal.jvm.Jvm.current().getJavaHome().toString()
+    def javaHome = Jvm.current().getJavaHome().toString()
 
     if(os.isWindows()) {
-        if(arch.equals("amd64")) {
+        if(arch == "amd64") {
             rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
         }
-        else if(arch.equals("aarch64")) {
+        else if(arch == "aarch64") {
             rt.extension.targetPlatform(targetWindowsAarch64, javaHome)
         }
         configure(rt, jvmArgsWindows)
     }
     else if(os.isLinux())
     {
-        if(arch.equals("amd64")) {
+        if(arch == "amd64") {
             rt.extension.targetPlatform(targetLinuxX86_64, javaHome)
         }
-        else if(arch.equals("aarch64")) {
+        else if(arch == "aarch64") {
             rt.extension.targetPlatform(targetLinuxAarch64, javaHome)
         }
         configure(rt, jvmArgsLinux)
     }
     else if(os.isMacOsX())
     {
-        if(arch.equals("amd64")) {
+        if(arch == "amd64") {
             rt.extension.targetPlatform(targetOsxX86_64, javaHome)
         }
-        else if(arch.equals("aarch64")) {
+        else if(arch == "aarch64") {
             rt.extension.targetPlatform(targetOsxAarch64, javaHome)
         }
         configure(rt, jvmArgsLinux)
@@ -299,7 +342,7 @@ tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
  * Usage: gradlew runtimeZipWindows   (windows - using gradlew)
  * Usage: ./gradlew runtimeZipWindows   (linux - using gradlew)
  */
-tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
+tasks.register('runtimeZipWindows', RuntimeZipTask) {rt ->
     //Windows aarch64
     if(file(jdk_windows_aarch64).exists()) {
         rt.extension.targetPlatform(targetWindowsAarch64, jdk_windows_aarch64, [])
@@ -331,7 +374,7 @@ tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
  * Usage: gradlew runtimeZipOthers   (windows - using gradlew)
  * Usage: ./gradlew runtimeZipOthers   (linux - using gradlew)
  */
-tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
+tasks.register('runtimeZipOthers', RuntimeZipTask) {rt ->
     //Linux aarch64
     if(file(jdk_linux_aarch64).exists()) {
         rt.extension.targetPlatform(targetLinuxAarch64, jdk_linux_aarch64, [])
@@ -369,5 +412,5 @@ tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
         }
     }
 
-    configure(rt, jvmArgsLinux);
+    configure(rt, jvmArgsLinux)
 }

gradle.properties

@@ -1,6 +1,6 @@
 #
 # ******************************************************************************
-# Copyright (C) 2014-2024 Dennis Sheirer
+# Copyright (C) 2014-2026 Dennis Sheirer
 #
 # 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
@@ -28,4 +28,4 @@
 # tag name, specifically the dashes inserted before and after the alpha/beta labels.
 # See: https://github.com/DSheirer/sdrtrunk/issues/1651
 
-projectVersion=0.6.1-beta-3
+projectVersion=1.0.0-beta-1

gradle/wrapper/gradle-wrapper.properties

@@ -1,26 +1,9 @@
-#
-# ******************************************************************************
-# Copyright (C) 2014-2024 Dennis Sheirer
-#
-# 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 3 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/>
-# *****************************************************************************
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,27 +1,26 @@
 #!/bin/sh
 
 #
-# ******************************************************************************
-# Copyright (C) 2014-2024 Dennis Sheirer
+# Copyright © 2015 the original authors.
 #
-# 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 3 of the License, or
-# (at your option) any later version.
+# 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
 #
-# 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.
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>
-# *****************************************************************************
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -30,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -58,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -147,7 +146,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -155,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -204,16 +202,15 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,16 +13,18 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -43,13 +45,13 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -57,36 +59,24 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

settings.gradle

@@ -1 +1,86 @@
-rootProject.name = 'sdr-trunk'
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+rootProject.name = 'sdr-trunk'
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+
+        //jAirspy is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jAirspy/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jairspy' }
+        }
+
+        //jAirspyHF is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jAirspyHF/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jairspyhf' }
+        }
+
+        //jRTL is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jRTL/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jrtl' }
+        }
+
+        //jlibusb is published as a GitHub release, with libusb for all platforms in the jar.  Tuner libraries built on
+        //jlibusb (jAirspy, jAirspyHF, jBladeRF, jHackRF, jHydraSDR, jLimeSDR, jRTL) load their native library next to its libusb, so the process shares one copy.
+        ivy {
+            url = 'https://github.com/DSheirer/jlibusb/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jlibusb' }
+        }
+
+        //jHackRF is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jHackRF/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jhackrf' }
+        }
+
+        //jHydraSDR is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jHydraSDR/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jhydrasdr' }
+        }
+
+        //jLimeSDR is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jLimeSDR/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jlimesdr' }
+        }
+
+        //jsdrplay is published as a GitHub release.  The jar does not contain the SDRplay API native library, which
+        //users install separately from sdrplay.com
+        ivy {
+            url = 'https://github.com/DSheirer/jsdrplay/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jsdrplay' }
+        }
+
+        //jBladeRF is published as a GitHub release, with the native libraries for all platforms in the jar
+        ivy {
+            url = 'https://github.com/DSheirer/jBladeRF/releases/download'
+            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
+            metadataSources { artifact() }
+            content { includeModule 'io.github.dsheirer', 'jbladerf' }
+        }
+    }
+}

src/main/java/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java

@@ -0,0 +1,81 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package com.sun.java.swing.plaf.windows;
+
+import javax.swing.LookAndFeel;
+import javax.swing.UIDefaults;
+
+/**
+ * No-op stub for the JDK's Windows look-and-feel.
+ *
+ * <p>JIDE 3.6.18's {@code LookAndFeelFactory} contains compile-time
+ * {@code instanceof com.sun.java.swing.plaf.windows.WindowsLookAndFeel} checks throughout its
+ * dispatch logic.  On Linux and macOS JDK builds that class is genuinely absent from
+ * {@code java.desktop}, so the JVM throws {@link NoClassDefFoundError} the first time JIDE's
+ * dispatch code executes the {@code instanceof} bytecode.  That happens during
+ * {@link com.jidesoft.swing.JideSplitPane#updateUI()} on every LAF change.
+ *
+ * <p>This stub lives in the classpath so the class reference resolves on non-Windows JDKs.
+ * On Windows JDK builds the real {@code WindowsLookAndFeel} is loaded from the
+ * {@code java.desktop} module via the boot class loader and shadows this class.
+ *
+ * <p>The stub reports itself as not native and not supported - JIDE never instantiates this
+ * class, it only uses it for {@code instanceof} comparisons against the active LAF.  Since
+ * sdrtrunk never installs this LAF, the {@code instanceof} check always returns false and
+ * JIDE proceeds to its next branch.
+ */
+public class WindowsLookAndFeel extends LookAndFeel
+{
+    @Override
+    public String getName()
+    {
+        return "Windows (stub)";
+    }
+
+    @Override
+    public String getID()
+    {
+        return "WindowsStub";
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return "Compatibility stub for JIDE's instanceof checks on non-Windows JDKs.";
+    }
+
+    @Override
+    public boolean isNativeLookAndFeel()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean isSupportedLookAndFeel()
+    {
+        return false;
+    }
+
+    @Override
+    public UIDefaults getDefaults()
+    {
+        return new UIDefaults();
+    }
+}

src/main/java/io/github/dsheirer/alias/Alias.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2020 Dennis Sheirer
- *  *
- *  * 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 3 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/>
- *  * *****************************************************************************
+ * 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 3 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/>
+ * ****************************************************************************
  */
 package io.github.dsheirer.alias;
 
@@ -30,13 +27,22 @@ import io.github.dsheirer.alias.id.AliasIDType;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.priority.Priority;
 import io.github.dsheirer.alias.id.record.Record;
+import io.github.dsheirer.alias.id.talkgroup.StreamAsTalkgroup;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
@@ -46,13 +52,6 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
 /**
  * Alias provides an aliasing (e.g. name, color, etc) container that is linked to multiple alias identifiers and
  * provides a corresponding set of actions related to the alias.
@@ -74,6 +73,7 @@ public class Alias
     private StringProperty mName = new SimpleStringProperty();
     private ObservableList<AliasID> mAliasIDs = FXCollections.observableArrayList();
     private ObservableList<AliasAction> mAliasActions = FXCollections.observableArrayList();
+    private ObjectProperty<StreamAsTalkgroup> mStreamTalkgroupAlias = new SimpleObjectProperty<>();
 
     /**
      * Constructs an instance and sets the specified name.
@@ -180,6 +180,12 @@ public class Alias
         return mColor;
     }
 
+    @JsonIgnore
+    public ObjectProperty streamTalkgroupAliasProperty()
+    {
+        return mStreamTalkgroupAlias;
+    }
+
     /**
      * Icon name property
      */
@@ -229,6 +235,24 @@ public class Alias
         mName.set(name);
     }
 
+    /**
+     * Alias name
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "stream_talkgroup_alias")
+    public StreamAsTalkgroup getStreamTalkgroupAlias()
+    {
+        return mStreamTalkgroupAlias.get();
+    }
+
+    /**
+     * Sets the stream as talkgroup value that will be used in the TO field for streamed audio calls.
+     * @param streamTalkgroupAlias with a talkgroup value.
+     */
+    public void setStreamTalkgroupAlias(StreamAsTalkgroup streamTalkgroupAlias)
+    {
+        mStreamTalkgroupAlias.set(streamTalkgroupAlias);
+    }
+
     /**
      * Alias list name for the alias list that this alias belongs to
      */
@@ -710,6 +734,7 @@ public class Alias
     {
         return (Alias a) -> new Observable[] {a.recordableProperty(), a.streamableProperty(), a.colorProperty(),
             a.aliasListNameProperty(), a.groupProperty(), a.iconNameProperty(), a.nameProperty(), a.aliasIds(),
-            a.aliasActions(), a.nonAudioIdentifierCountProperty(), a.overlapProperty()};
+            a.aliasActions(), a.nonAudioIdentifierCountProperty(), a.overlapProperty(), a.priorityProperty(),
+                a.streamTalkgroupAliasProperty()};
     }
 }

src/main/java/io/github/dsheirer/alias/AliasFactory.java

@@ -30,12 +30,16 @@ import io.github.dsheirer.alias.id.legacy.mobileID.Min;
 import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
 import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
 import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
+import io.github.dsheirer.alias.id.radio.NXDNTypeDRadioRange;
 import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
 import io.github.dsheirer.alias.id.radio.Radio;
 import io.github.dsheirer.alias.id.radio.RadioRange;
 import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.status.UnitStatusID;
 import io.github.dsheirer.alias.id.status.UserStatusID;
+import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroup;
+import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroupRange;
 import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
@@ -79,6 +83,31 @@ public class AliasFactory
                 Min copyMin = new Min();
                 copyMin.setMin(originalMin.getMin());
                 return copyMin;
+            case NXDN_TYPE_D_RADIO_ID:
+                NXDNTypeDRadio originalTypeDRadio = (NXDNTypeDRadio)id;
+                NXDNTypeDRadio copyTypeDRadio = new NXDNTypeDRadio(originalTypeDRadio.getHomeRepeater(),
+                        originalTypeDRadio.getIdentifier());
+                copyTypeDRadio.setOverlap(originalTypeDRadio.overlapProperty().get());
+                return copyTypeDRadio;
+            case NXDN_TYPE_D_RADIO_ID_RANGE:
+                NXDNTypeDRadioRange originalTypeDRadioRange = (NXDNTypeDRadioRange)id;
+                NXDNTypeDRadioRange copyTypeDRadioRange = new NXDNTypeDRadioRange(originalTypeDRadioRange.getHomeRepeater(),
+                        originalTypeDRadioRange.getMinIdentifier(), originalTypeDRadioRange.getMaxIdentifier());
+                copyTypeDRadioRange.setOverlap(originalTypeDRadioRange.overlapProperty().get());
+                return copyTypeDRadioRange;
+            case NXDN_TYPE_D_TALKGROUP:
+                NXDNTypeDTalkgroup originalTypeDTalkgroup = (NXDNTypeDTalkgroup)id;
+                NXDNTypeDTalkgroup copyTypeDTalkgroup = new NXDNTypeDTalkgroup(originalTypeDTalkgroup.getHomeRepeater(),
+                        originalTypeDTalkgroup.getIdentifier());
+                copyTypeDTalkgroup.setOverlap(originalTypeDTalkgroup.overlapProperty().get());
+                return copyTypeDTalkgroup;
+            case NXDN_TYPE_D_TALKGROUP_RANGE:
+                NXDNTypeDTalkgroupRange originalTypeDTalkgroupRange = (NXDNTypeDTalkgroupRange)id;
+                NXDNTypeDTalkgroupRange copyTypeDTalkgroupRange = new NXDNTypeDTalkgroupRange(
+                        originalTypeDTalkgroupRange.getHomeRepeater(), originalTypeDTalkgroupRange.getMinIdentifier(),
+                        originalTypeDTalkgroupRange.getMaxIdentifier());
+                copyTypeDTalkgroupRange.setOverlap(originalTypeDTalkgroupRange.overlapProperty().get());
+                return copyTypeDTalkgroupRange;
             case P25_FULLY_QUALIFIED_RADIO_ID:
                 P25FullyQualifiedRadio originalP25 = (P25FullyQualifiedRadio) id;
                 P25FullyQualifiedRadio copyP25 = new P25FullyQualifiedRadio(originalP25.getWacn(),

src/main/java/io/github/dsheirer/alias/AliasList.java

@@ -47,7 +47,7 @@ import io.github.dsheirer.identifier.talkgroup.FullyQualifiedTalkgroupIdentifier
 import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
 import io.github.dsheirer.identifier.tone.ToneIdentifier;
 import io.github.dsheirer.identifier.tone.ToneSequence;
-import io.github.dsheirer.module.decode.dcs.DCSCode;
+import io.github.dsheirer.module.decode.squelch.dcs.DCSCode;
 import io.github.dsheirer.protocol.Protocol;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -134,6 +134,7 @@ public class AliasList
                 switch(id.getType())
                 {
                     case TALKGROUP:
+                    case NXDN_TYPE_D_TALKGROUP:
                         Talkgroup talkgroup = (Talkgroup)id;
 
                         TalkgroupAliasList talkgroupAliasList = mTalkgroupProtocolMap.get(talkgroup.getProtocol());
@@ -147,6 +148,7 @@ public class AliasList
                         talkgroupAliasList.add(talkgroup, alias);
                         break;
                     case TALKGROUP_RANGE:
+                    case NXDN_TYPE_D_TALKGROUP_RANGE:
                         TalkgroupRange talkgroupRange = (TalkgroupRange)id;
 
                         TalkgroupAliasList talkgroupRangeAliasList = mTalkgroupProtocolMap.get(talkgroupRange.getProtocol());
@@ -186,6 +188,7 @@ public class AliasList
                         p25TalkgroupAliasList.add(qualifiedTalkgroup, alias);
                         break;
                     case RADIO_ID:
+                    case NXDN_TYPE_D_RADIO_ID:
                         Radio radio = (Radio)id;
 
                         RadioAliasList radioAliasList = mRadioProtocolMap.get(radio.getProtocol());
@@ -199,6 +202,7 @@ public class AliasList
                         radioAliasList.add(radio, alias);
                         break;
                     case RADIO_ID_RANGE:
+                    case NXDN_TYPE_D_RADIO_ID_RANGE:
                         RadioRange radioRange = (RadioRange)id;
 
                         RadioAliasList radioRangeAliasList = mRadioProtocolMap.get(radioRange.getProtocol());

src/main/java/io/github/dsheirer/alias/id/AliasID.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
  * 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
@@ -35,13 +35,18 @@ import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
 import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
 import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
 import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
+import io.github.dsheirer.alias.id.radio.NXDNTypeDRadioRange;
 import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
 import io.github.dsheirer.alias.id.radio.Radio;
 import io.github.dsheirer.alias.id.radio.RadioRange;
 import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.status.UnitStatusID;
 import io.github.dsheirer.alias.id.status.UserStatusID;
+import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroup;
+import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroupRange;
 import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
+import io.github.dsheirer.alias.id.talkgroup.StreamAsTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
 import io.github.dsheirer.alias.id.tone.TonesID;
@@ -63,6 +68,10 @@ import javafx.util.Callback;
     @JsonSubTypes.Type(value = Min.class, name = "min"),
     @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
     @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
+    @JsonSubTypes.Type(value = NXDNTypeDRadio.class, name = "nxdnTypeDRadio"),
+    @JsonSubTypes.Type(value = NXDNTypeDRadioRange.class, name = "nxdnTypeDRadioRange"),
+    @JsonSubTypes.Type(value = NXDNTypeDTalkgroup.class, name = "nxdnTypeDTalkgroup"),
+    @JsonSubTypes.Type(value = NXDNTypeDTalkgroupRange.class, name = "nxdnTypeDTalkgroupRange"),
     @JsonSubTypes.Type(value = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
     @JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
     @JsonSubTypes.Type(value = Priority.class, name = "priority"),
@@ -70,6 +79,7 @@ import javafx.util.Callback;
     @JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),
     @JsonSubTypes.Type(value = Record.class, name = "record"),
     @JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
+    @JsonSubTypes.Type(value = StreamAsTalkgroup.class, name = "streamAsTalkgroup"),
     @JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
     @JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
     @JsonSubTypes.Type(value = TonesID.class, name = "tones"),

src/main/java/io/github/dsheirer/alias/id/AliasIDType.java

@@ -29,6 +29,10 @@ public enum AliasIDType
     LOJACK("LoJack"),
     LTR_NET_UID("LTR-Net UID"),
     MIN("Passport MIN"),
+    NXDN_TYPE_D_RADIO_ID("NXDN Type-D Radio ID"),
+    NXDN_TYPE_D_RADIO_ID_RANGE("NXDN Type-D Radio ID Range"),
+    NXDN_TYPE_D_TALKGROUP("NXDN Type-D Talkgroup"),
+    NXDN_TYPE_D_TALKGROUP_RANGE("NXDN Type-D Talkgroup Range"),
     P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
     P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
     PRIORITY("Audio Priority"),
@@ -58,6 +62,7 @@ public enum AliasIDType
 
     //Values used by the View-By alias editor
     public static EnumSet<AliasIDType> VIEW_BY_VALUES = EnumSet.of(TALKGROUP, TALKGROUP_RANGE, RADIO_ID, RADIO_ID_RANGE,
+        NXDN_TYPE_D_RADIO_ID, NXDN_TYPE_D_RADIO_ID_RANGE, NXDN_TYPE_D_TALKGROUP, NXDN_TYPE_D_TALKGROUP_RANGE,
         P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);
 
     public String toString()

src/main/java/io/github/dsheirer/alias/id/INXDNTypeD.java

@@ -0,0 +1,46 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id;
+
+/**
+ * NXDN Type-D alias identifier composed of a home repeater and a radio or talkgroup identifier value.
+ */
+public interface INXDNTypeD
+{
+    /**
+     * Home repeater for the identifier
+     */
+    int getHomeRepeater();
+
+    /**
+     * Sets the home repeater for the identifier
+     */
+    void setHomeRepeater(int homeRepeater);
+
+    /**
+     * Radio or talkgroup value, without the home repeater.
+     */
+    int getIdentifier();
+
+    /**
+     * Sets the radio or talkgroup value, without the home repeater.
+     */
+    void setIdentifier(int identifier);
+}

src/main/java/io/github/dsheirer/alias/id/INXDNTypeDRange.java

@@ -0,0 +1,56 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id;
+
+/**
+ * NXDN Type-D alias identifier range of radio or talkgroup values that share a common home repeater.
+ */
+public interface INXDNTypeDRange
+{
+    /**
+     * Home repeater for the range
+     */
+    int getHomeRepeater();
+
+    /**
+     * Sets the home repeater for the range
+     */
+    void setHomeRepeater(int homeRepeater);
+
+    /**
+     * Minimum radio or talkgroup value, without the home repeater.
+     */
+    int getMinIdentifier();
+
+    /**
+     * Sets the minimum radio or talkgroup value, without the home repeater.
+     */
+    void setMinIdentifier(int identifier);
+
+    /**
+     * Maximum radio or talkgroup value, without the home repeater.
+     */
+    int getMaxIdentifier();
+
+    /**
+     * Sets the maximum radio or talkgroup value, without the home repeater.
+     */
+    void setMaxIdentifier(int identifier);
+}

src/main/java/io/github/dsheirer/alias/id/dcs/Dcs.java

@@ -22,7 +22,7 @@ package io.github.dsheirer.alias.id.dcs;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.module.decode.dcs.DCSCode;
+import io.github.dsheirer.module.decode.squelch.dcs.DCSCode;
 
 /**
  * Digital Coded Squelch (DCS) tone identifier

src/main/java/io/github/dsheirer/alias/id/radio/NXDNTypeDRadio.java

@@ -0,0 +1,96 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.radio;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.alias.id.INXDNTypeD;
+import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * NXDN Type-D radio.  The value is the over-the-air 16-bit identifier that combines the home repeater and radio so that
+ * it matches the value of an NXDN Type-D radio identifier.
+ */
+public class NXDNTypeDRadio extends Radio implements INXDNTypeD
+{
+    public NXDNTypeDRadio()
+    {
+        //No-arg JAXB constructor
+        setProtocol(Protocol.NXDN);
+    }
+
+    /**
+     * Constructs an instance
+     * @param homeRepeater for the radio
+     * @param radio value, without the home repeater
+     */
+    public NXDNTypeDRadio(int homeRepeater, int radio)
+    {
+        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, radio));
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.NXDN_TYPE_D_RADIO_ID;
+    }
+
+    @JsonIgnore
+    @Override
+    public int getHomeRepeater()
+    {
+        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getValue());
+    }
+
+    @Override
+    public void setHomeRepeater(int homeRepeater)
+    {
+        setValue(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, getIdentifier()));
+    }
+
+    @JsonIgnore
+    @Override
+    public int getIdentifier()
+    {
+        return NXDNTalkgroupFormatter.getTypeDIdentifier(getValue());
+    }
+
+    @Override
+    public void setIdentifier(int identifier)
+    {
+        setValue(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Type-D Radio ID:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getIdentifier(), true));
+        sb.append(" Protocol:").append(getProtocol());
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+}

src/main/java/io/github/dsheirer/alias/id/radio/NXDNTypeDRadioRange.java

@@ -0,0 +1,124 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.radio;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.alias.id.INXDNTypeDRange;
+import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * NXDN Type-D radio range for a single home repeater.  The min and max values are the over-the-air 16-bit identifiers
+ * that combine the home repeater and radio.
+ */
+public class NXDNTypeDRadioRange extends RadioRange implements INXDNTypeDRange
+{
+    public NXDNTypeDRadioRange()
+    {
+        //No-arg JAXB constructor
+        setProtocol(Protocol.NXDN);
+    }
+
+    /**
+     * Constructs an instance
+     * @param homeRepeater for the range
+     * @param minRadio value, without the home repeater
+     * @param maxRadio value, without the home repeater
+     */
+    public NXDNTypeDRadioRange(int homeRepeater, int minRadio, int maxRadio)
+    {
+        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, minRadio),
+                NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, maxRadio));
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.NXDN_TYPE_D_RADIO_ID_RANGE;
+    }
+
+    @JsonIgnore
+    @Override
+    public int getHomeRepeater()
+    {
+        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMinRadio());
+    }
+
+    @Override
+    public void setHomeRepeater(int homeRepeater)
+    {
+        int min = getMinIdentifier();
+        int max = getMaxIdentifier();
+        setMinRadio(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, min));
+        setMaxRadio(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, max));
+    }
+
+    @JsonIgnore
+    @Override
+    public int getMinIdentifier()
+    {
+        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMinRadio());
+    }
+
+    @Override
+    public void setMinIdentifier(int identifier)
+    {
+        setMinRadio(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
+    }
+
+    @JsonIgnore
+    @Override
+    public int getMaxIdentifier()
+    {
+        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMaxRadio());
+    }
+
+    @Override
+    public void setMaxIdentifier(int identifier)
+    {
+        setMaxRadio(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
+    }
+
+    /**
+     * Valid when the base range is valid and both ends of the range use the same home repeater.
+     */
+    @Override
+    public boolean isValid()
+    {
+        return super.isValid() && getHomeRepeater() == NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMaxRadio());
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Type-D Radio ID Range:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMinIdentifier(), true));
+        sb.append(" to ").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMaxIdentifier(), true));
+        sb.append(" Protocol:").append(getProtocol());
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+}

src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2020 Dennis Sheirer
- *  *
- *  * 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 3 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/>
- *  * *****************************************************************************
+ * 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 3 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/>
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.alias.id.radio;
@@ -38,10 +35,11 @@ public enum RadioFormat
         "<html>APCO25 valid range is 0 to 16,777,215"),
     DMR("********", 0, 0xFFFFFF, "0 to 16,777,215",
         "<html>DMR unit id valid range is 0 to 16,777,215"),
+    NXDN("*****", 1, 0xFFFF, "1 to 65,535", "NXDN valid range is 1 to 65,535"),
     PASSPORT("********", 0, 0x7FFFFF, "0 to 8,388,607",
         "<html>PASSPORT valid range is 0 to 8,388,607"),
     UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
-        "Unknown protocol valid value range is 1-16,777,215");
+        "<html>Unknown protocol valid value range is 1-16,777,215");
 
     private String mMask;
     private int mMinimumValue;
@@ -116,6 +114,8 @@ public enum RadioFormat
                 return APCO25;
             case DMR:
                 return DMR;
+            case NXDN:
+                return NXDN;
             case PASSPORT:
                 return PASSPORT;
             default:

src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
- *  *
- *  * 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 3 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/>
- *  * *****************************************************************************
+ * 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 3 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/>
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.alias.id.radio;
@@ -26,14 +23,14 @@ import io.github.dsheirer.preference.identifier.IntegerFormat;
 import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.AbstractIntegerFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.DMRTalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
 import io.github.dsheirer.protocol.Protocol;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.ParseException;
 import java.util.EnumMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Protocol-specific formatting of radio id values and parsing of formatted radio id values.
@@ -47,6 +44,7 @@ public class RadioFormatter
     {
         mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
         mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
+        mFormatterMap.put(Protocol.NXDN, new NXDNTalkgroupFormatter());
         mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
     }
 

src/main/java/io/github/dsheirer/alias/id/talkgroup/NXDNTypeDTalkgroup.java

@@ -0,0 +1,96 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.talkgroup;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.alias.id.INXDNTypeD;
+import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * NXDN Type-D talkgroup.  The value is the over-the-air 16-bit identifier that combines the home repeater and talkgroup
+ * so that it matches the value of an NXDN Type-D talkgroup identifier.
+ */
+public class NXDNTypeDTalkgroup extends Talkgroup implements INXDNTypeD
+{
+    public NXDNTypeDTalkgroup()
+    {
+        //No-arg JAXB constructor
+        setProtocol(Protocol.NXDN);
+    }
+
+    /**
+     * Constructs an instance
+     * @param homeRepeater for the talkgroup
+     * @param talkgroup value, without the home repeater
+     */
+    public NXDNTypeDTalkgroup(int homeRepeater, int talkgroup)
+    {
+        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, talkgroup));
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.NXDN_TYPE_D_TALKGROUP;
+    }
+
+    @JsonIgnore
+    @Override
+    public int getHomeRepeater()
+    {
+        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getValue());
+    }
+
+    @Override
+    public void setHomeRepeater(int homeRepeater)
+    {
+        setValue(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, getIdentifier()));
+    }
+
+    @JsonIgnore
+    @Override
+    public int getIdentifier()
+    {
+        return NXDNTalkgroupFormatter.getTypeDIdentifier(getValue());
+    }
+
+    @Override
+    public void setIdentifier(int identifier)
+    {
+        setValue(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Type-D Talkgroup:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getIdentifier(), true));
+        sb.append(" Protocol:").append(getProtocol());
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/NXDNTypeDTalkgroupRange.java

@@ -0,0 +1,125 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.talkgroup;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.alias.id.INXDNTypeDRange;
+import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * NXDN Type-D talkgroup range for a single home repeater.  The min and max values are the over-the-air 16-bit
+ * identifiers that combine the home repeater and talkgroup.
+ */
+public class NXDNTypeDTalkgroupRange extends TalkgroupRange implements INXDNTypeDRange
+{
+    public NXDNTypeDTalkgroupRange()
+    {
+        //No-arg JAXB constructor
+        setProtocol(Protocol.NXDN);
+    }
+
+    /**
+     * Constructs an instance
+     * @param homeRepeater for the range
+     * @param minTalkgroup value, without the home repeater
+     * @param maxTalkgroup value, without the home repeater
+     */
+    public NXDNTypeDTalkgroupRange(int homeRepeater, int minTalkgroup, int maxTalkgroup)
+    {
+        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, minTalkgroup),
+                NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, maxTalkgroup));
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.NXDN_TYPE_D_TALKGROUP_RANGE;
+    }
+
+    @JsonIgnore
+    @Override
+    public int getHomeRepeater()
+    {
+        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMinTalkgroup());
+    }
+
+    @Override
+    public void setHomeRepeater(int homeRepeater)
+    {
+        int min = getMinIdentifier();
+        int max = getMaxIdentifier();
+        setMinTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, min));
+        setMaxTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, max));
+    }
+
+    @JsonIgnore
+    @Override
+    public int getMinIdentifier()
+    {
+        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMinTalkgroup());
+    }
+
+    @Override
+    public void setMinIdentifier(int identifier)
+    {
+        setMinTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
+    }
+
+    @JsonIgnore
+    @Override
+    public int getMaxIdentifier()
+    {
+        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMaxTalkgroup());
+    }
+
+    @Override
+    public void setMaxIdentifier(int identifier)
+    {
+        setMaxTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
+    }
+
+    /**
+     * Valid when the base range is valid and both ends of the range use the same home repeater.
+     */
+    @Override
+    public boolean isValid()
+    {
+        return super.isValid() &&
+                getHomeRepeater() == NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMaxTalkgroup());
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Type-D Talkgroup Range:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMinIdentifier(), true));
+        sb.append(" to ").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMaxIdentifier(), true));
+        sb.append(" Protocol:").append(getProtocol());
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/StreamAsTalkgroup.java

@@ -0,0 +1,40 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2025 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.talkgroup;
+
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Streaming talkgroup alias.  For streamed audio metadata, this value is used to replace the decoded talkgroup or TO
+ * value with an alias value when there are talkgroup collisions resulting from streaming multiple channels to the
+ * same stream.  This is common in P25 conventional repeater setups where each radio channel is using talkgroup 1.
+ */
+public class StreamAsTalkgroup extends Talkgroup
+{
+    public StreamAsTalkgroup(int talkgroup)
+    {
+        super(Protocol.UNKNOWN, talkgroup);
+    }
+
+    public StreamAsTalkgroup()
+    {
+        //No arg JAXB constructor
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2020 Dennis Sheirer
- *  *
- *  * 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 3 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/>
- *  * *****************************************************************************
+ * 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 3 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/>
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.alias.id.talkgroup;
@@ -50,6 +47,8 @@ public enum TalkgroupFormat
         "<html>MPT-1327 valid ranges are 0-127(prefix)<br>and 1-8192(ident) (ie. 000-0001 to 127-8192)"),
     NBFM("*****", 1, 0xFFFF, "1 to 65,535",
             "NBFM valid value range is 1-65,535"),
+    NXDN("*****", 0, 0xFFFF, "0 to 65,535",
+            "NXDN talkgroup valid range is 0 to 65,535"),
     PASSPORT("*****", 1, 0xFFFF, "1 to 65,535",
         "Passport valid value range is 1-65,535"),
     UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
@@ -139,6 +138,8 @@ public enum TalkgroupFormat
                 return MPT1327;
             case NBFM:
                 return NBFM;
+            case NXDN:
+                return NXDN;
             case PASSPORT:
                 return PASSPORT;
             default:

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -28,6 +28,7 @@ import io.github.dsheirer.preference.identifier.talkgroup.FleetsyncTalkgroupForm
 import io.github.dsheirer.preference.identifier.talkgroup.LTRTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.MDC1200TalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.MPT1327TalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.PassportTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
 import io.github.dsheirer.protocol.Protocol;
@@ -59,6 +60,7 @@ public class TalkgroupFormatter
         mFormatterMap.put(Protocol.LTR_NET, ltr);
         mFormatterMap.put(Protocol.MDC1200, new MDC1200TalkgroupFormatter());
         mFormatterMap.put(Protocol.MPT1327, new MPT1327TalkgroupFormatter());
+        mFormatterMap.put(Protocol.NXDN, new NXDNTalkgroupFormatter());
         mFormatterMap.put(Protocol.PASSPORT, new PassportTalkgroupFormatter());
         mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
     }

src/main/java/io/github/dsheirer/audio/AbstractAudioFilter.java

@@ -0,0 +1,17 @@
+package io.github.dsheirer.audio;
+
+/**
+ * Used for defining an array list of filter methods to be implemented in AudioModule
+ * The filters will be applied in the order given in the list.
+ * Each audio filter mush implement the filter method.
+ */
+
+public abstract class AbstractAudioFilter
+{
+    /**
+     * To be overridden by each audio filter
+     * @param audio a buffer of 8 KHz audio samples
+     * @return float[] filtered buffer of 8 KHz audio samples
+     */
+    public abstract float[] filter(float[] audio);
+}

src/main/java/io/github/dsheirer/audio/AbstractAudioModule.java

@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractAudioModule extends Module implements IAudioSegmentProvider, IdentifierUpdateListener
 {
     private final static Logger mLog = LoggerFactory.getLogger(AbstractAudioModule.class);
-    public static final long DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH = 60 * 8000; // 1 minute @ 8kHz
+    public static final long DEFAULT_MAX_SEGMENT_LENGTH_MILLIS = 60_000; // 1 minute
     public static final int DEFAULT_TIMESLOT = 0;
     private final int mMaxSegmentAudioSampleLength;
     private Listener<AudioSegment> mAudioSegmentListener;
@@ -51,12 +51,12 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen
      * Constructs an abstract audio module
      *
      * @param aliasList for aliasing identifiers
-     * @param maxSegmentAudioSampleLength in milliseconds
+     * @param maxSegmentLengthMillis maximum audio segment length in milliseconds
      */
-    public AbstractAudioModule(AliasList aliasList, int timeslot, long maxSegmentAudioSampleLength)
+    public AbstractAudioModule(AliasList aliasList, int timeslot, long maxSegmentLengthMillis)
     {
         mAliasList = aliasList;
-        mMaxSegmentAudioSampleLength = (int)(maxSegmentAudioSampleLength * 8); //Convert milliseconds to samples
+        mMaxSegmentAudioSampleLength = (int)(maxSegmentLengthMillis * 8); //Convert milliseconds to samples
         mTimeslot = timeslot;
         mIdentifierCollection = new MutableIdentifierCollection(getTimeslot());
         mIdentifierUpdateNotificationBroadcaster.addListener(mIdentifierCollection);
@@ -67,7 +67,7 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen
      */
     public AbstractAudioModule(AliasList aliasList)
     {
-        this(aliasList, DEFAULT_TIMESLOT, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
+        this(aliasList, DEFAULT_TIMESLOT, DEFAULT_MAX_SEGMENT_LENGTH_MILLIS);
     }
 
     /**

src/main/java/io/github/dsheirer/audio/AudioGainFilter.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -17,31 +17,28 @@
  * ****************************************************************************
  */
 
-package io.github.dsheirer.source.tuner.sdrplay.api.parameter.event;
+package io.github.dsheirer.audio;
 
-import io.github.dsheirer.source.tuner.sdrplay.api.v3_07.sdrplay_api_RspDuoModeCbParamT;
-import java.lang.foreign.MemorySegment;
+import io.github.dsheirer.dsp.gain.AudioGainAndDcFilter;
 
 /**
- * RSP-Duo Mode Callback Parameters (sdrplay_api_RspDuoModeCbParamT)
+ * This is a wrapper for the AudioGainAndDcFilter class so it can be used with the AudioModule filter list.
+ * Usually instantiated in the DecoderFactory
  */
-public class RspDuoModeCallbackParameters
+public class AudioGainFilter extends AbstractAudioFilter
 {
-    private final RspDuoModeEventType mRspDuoModeEventType;
+    AudioGainAndDcFilter mAudioGain;
 
-    /**
-     * Constructs an instance from the foreign memory segment
-     */
-    public RspDuoModeCallbackParameters(MemorySegment rspDuoModeCbParam)
+    public AudioGainFilter(float minGain, float maxGain, float objectiveAmplitude)
     {
-        mRspDuoModeEventType = RspDuoModeEventType.fromValue(sdrplay_api_RspDuoModeCbParamT.modeChangeType(rspDuoModeCbParam));
+        mAudioGain = new AudioGainAndDcFilter(minGain, maxGain, objectiveAmplitude);
+        mAudioGain.setDecayRate(2);     // to remove pumping effect
+        mAudioGain.reset();
     }
 
-    /**
-     * Event type
-     */
-    public RspDuoModeEventType getRspDuoModeEvent()
+    @Override
+    public float[] filter(float[] audio)
     {
-        return mRspDuoModeEventType;
+        return mAudioGain.process(audio);
     }
 }

src/main/java/io/github/dsheirer/audio/AudioModule.java

@@ -32,6 +32,8 @@ import io.github.dsheirer.sample.real.IRealBufferListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * Provides packaging of demodulated audio sample buffers into audio segments for broadcast to registered listeners.
  * Includes audio packet metadata in constructed audio segments.
@@ -42,36 +44,7 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
     Listener<float[]>
 {
     private static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
-    private static float[] sHighPassFilterCoefficients;
-    private final boolean mAudioFilterEnable;
-
-    static
-    {
-        FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
-            .sampleRate(8000)
-            .stopBandCutoff(200)
-            .stopBandAmplitude(0.0)
-            .stopBandRipple(0.025)
-            .passBandStart(300)
-            .passBandAmplitude(1.0)
-            .passBandRipple(0.01)
-            .build();
-        try
-        {
-            RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
-
-            if(designer.isValid())
-            {
-                sHighPassFilterCoefficients = designer.getImpulseResponse();
-            }
-        }
-        catch(FilterDesignException fde)
-        {
-            mLog.error("Filter design error", fde);
-        }
-    }
-
-    private final IRealFilter mHighPassFilter = FilterFactory.getRealFilter(sHighPassFilterCoefficients);
+    private List<AbstractAudioFilter>mAudioFilters;
     private final SquelchStateListener mSquelchStateListener = new SquelchStateListener();
     private SquelchState mSquelchState = SquelchState.SQUELCH;
 
@@ -81,23 +54,23 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
      * @param aliasList for aliasing identifiers
      * @param timeslot for this audio module
      * @param maxAudioSegmentLength in milliseconds
-     * @param audioFilterEnable to enable or disable high-pass audio filter
+     * @param audioFilters a list of audio filters to apply to the incoming audio samples
      */
-    public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength, boolean audioFilterEnable)
+    public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength, List<AbstractAudioFilter> audioFilters)
     {
         super(aliasList, timeslot, maxAudioSegmentLength);
-        mAudioFilterEnable = audioFilterEnable;
+        mAudioFilters = audioFilters;
     }
 
     /**
      * Creates an Audio Module.
      * @param aliasList for aliasing identifiers
-     * @param audioFilterEnable to enable or disable high-pass audio filter
+     * @param audioFilters a list of audio filters to apply to the incoming audio samples
      */
-    public AudioModule(AliasList aliasList, boolean audioFilterEnable)
+    public AudioModule(AliasList aliasList,  List<AbstractAudioFilter> audioFilters)
     {
         super(aliasList);
-        mAudioFilterEnable = audioFilterEnable;
+        mAudioFilters = audioFilters;
     }
 
     @Override
@@ -128,9 +101,13 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
     {
         if(mSquelchState == SquelchState.UNSQUELCH)
         {
-            if(mAudioFilterEnable)
+            // apply audio filters if any (i.e. deemphasis, high pass, etc.)
+            if(!mAudioFilters.isEmpty())
             {
-                audioBuffer = mHighPassFilter.filter(audioBuffer);
+                for(AbstractAudioFilter filter : mAudioFilters)
+                {
+                    audioBuffer = filter.filter(audioBuffer);
+                }
             }
 
             addAudio(audioBuffer);

src/main/java/io/github/dsheirer/audio/AudioSegment.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
  *
  * Producers will add audio buffers and update identifiers throughout the life-cycle of an audio segment.  The producer
  * will signal the completion of an audio segment by setting the complete property to true.  This allows consumers the
- * option to process the audio buffers throughout the life-cycle of the segment, or to process all of the buffers once
+ * option to process the audio buffers throughout the life-cycle of the segment, or to process all the buffers once
  * the segment is complete.
  */
 public class AudioSegment implements Listener<IdentifierUpdateNotification>

src/main/java/io/github/dsheirer/audio/HighPassAudioFilter.java

@@ -0,0 +1,50 @@
+package io.github.dsheirer.audio;
+
+import io.github.dsheirer.dsp.filter.FilterFactory;
+import io.github.dsheirer.dsp.filter.design.FilterDesignException;
+import io.github.dsheirer.dsp.filter.fir.FIRFilterSpecification;
+import io.github.dsheirer.dsp.filter.fir.real.IRealFilter;
+import io.github.dsheirer.dsp.filter.fir.remez.RemezFIRFilterDesigner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HighPassAudioFilter extends AbstractAudioFilter
+{
+    private static final Logger mLog = LoggerFactory.getLogger(HighPassAudioFilter.class);
+    private static float[] sHighPassFilterCoefficients;
+
+    static
+    {
+        FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
+                .sampleRate(8000)
+                .stopBandCutoff(200)
+                .stopBandAmplitude(0.0)
+                .stopBandRipple(0.025)
+                .passBandStart(300)
+                .passBandAmplitude(1.0)
+                .passBandRipple(0.01)
+                .build();
+        try
+        {
+            RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
+
+            if(designer.isValid())
+            {
+                sHighPassFilterCoefficients = designer.getImpulseResponse();
+            }
+        }
+        catch(FilterDesignException fde)
+        {
+            mLog.error("Filter design error", fde);
+        }
+    }
+
+    private final IRealFilter mHighPassFilter = FilterFactory.getRealFilter(sHighPassFilterCoefficients);
+
+    @Override
+    public float[] filter(float[] audio)
+    {
+        audio = mHighPassFilter.filter(audio);
+        return audio;
+    }
+}

src/main/java/io/github/dsheirer/audio/IAudioController.java

@@ -1,9 +1,27 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.audio;
 
-import io.github.dsheirer.audio.playback.AudioOutput;
+import io.github.dsheirer.audio.playback.AudioChannel;
+import io.github.dsheirer.audio.playback.AudioPlaybackDeviceDescriptor;
 import io.github.dsheirer.sample.Listener;
-import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
-
 import java.util.List;
 
 /**
@@ -12,13 +30,13 @@ import java.util.List;
 public interface IAudioController
 {
 	/* Current Mixer and MixerChannel configuration */
-	public void setMixerChannelConfiguration( MixerChannelConfiguration entry ) throws AudioException;
-	public MixerChannelConfiguration getMixerChannelConfiguration() throws AudioException;
+	public void setAudioPlaybackDevice(AudioPlaybackDeviceDescriptor device ) throws AudioException;
+	public AudioPlaybackDeviceDescriptor getAudioPlaybackDevice() throws AudioException;
 	
-	/* Audio Output(s) */
-	public List<AudioOutput> getAudioOutputs();
+	/* Audio Channel(s) */
+	public List<AudioChannel> getAudioChannels();
 
 	/* Controller Audio Event Listener */
-	public void addControllerListener( Listener<AudioEvent> listener );
-	public void removeControllerListener( Listener<AudioEvent> listener );
+	public void addAudioEventListener(Listener<AudioEvent> listener );
+	public void removeAudioEventListener(Listener<AudioEvent> listener );
 }

src/main/java/io/github/dsheirer/audio/broadcast/AbstractAudioBroadcaster.java

@@ -36,6 +36,7 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
     protected ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>(BroadcastState.READY);
     protected ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
     protected int mStreamedAudioCount = 0;
+    protected int mDuplicateRejectedAudioCount = 0;
     protected int mErrorAudioCount = 0;
     protected int mAgedOffAudioCount = 0;
 
@@ -163,6 +164,22 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
         mStreamedAudioCount++;
     }
 
+    /**
+     * Number of audio recordings rejected by the remote service as duplicates.
+     */
+    public int getDuplicateRejectedAudioCount()
+    {
+        return mDuplicateRejectedAudioCount;
+    }
+
+    /**
+     * Increments the duplicate-rejected audio count by one.
+     */
+    public void incrementDuplicateRejectedAudioCount()
+    {
+        mDuplicateRejectedAudioCount++;
+    }
+
     /**
      * Number of audio recordings that were removed for exceeding age limit
      */

src/main/java/io/github/dsheirer/audio/broadcast/BroadcastEvent.java

@@ -82,6 +82,7 @@ public class BroadcastEvent
         BROADCASTER_QUEUE_CHANGE,
         BROADCASTER_STATE_CHANGE,
         BROADCASTER_STREAMED_COUNT_CHANGE,
+        BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE,
         BROADCASTER_AGED_OFF_COUNT_CHANGE,
         BROADCASTER_ERROR_COUNT_CHANGE,
         BROADCASTER_DELETE,

src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java

@@ -62,11 +62,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
     public static final int COLUMN_BROADCASTER_STATUS = 2;
     public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
     public static final int COLUMN_BROADCASTER_STREAMED_COUNT = 4;
-    public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 5;
-    public static final int COLUMN_BROADCASTER_ERROR_COUNT = 6;
+    public static final int COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT = 5;
+    public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 6;
+    public static final int COLUMN_BROADCASTER_ERROR_COUNT = 7;
 
     public static final String[] COLUMN_NAMES = new String[]
-        {"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Aged Off", "Upload Error"};
+        {"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Duplicate Rejected", "Aged Off", "Upload Error"};
 
     private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
         FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
@@ -361,7 +362,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                 }
 
                 broadcast(new BroadcastEvent(audioBroadcaster, BroadcastEvent.Event.BROADCASTER_ADD));
-                ThreadPool.CACHED.submit(audioBroadcaster::start);
+                ThreadPool.CACHED.submit(() -> audioBroadcaster.start());
             }
         }
     }
@@ -531,6 +532,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                         fireTableCellUpdated(row, COLUMN_BROADCASTER_STREAMED_COUNT);
                     }
                     break;
+                case BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE:
+                    if(row >= 0)
+                    {
+                        fireTableCellUpdated(row, COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT);
+                    }
+                    break;
                 case BROADCASTER_AGED_OFF_COUNT_CHANGE:
                     if(row >= 0)
                     {
@@ -607,6 +614,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                                 return configuredBroadcast.getAudioBroadcaster().getStreamedAudioCount();
                             }
                             break;
+                        case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
+                            if(configuredBroadcast.hasAudioBroadcaster())
+                            {
+                                return configuredBroadcast.getAudioBroadcaster().getDuplicateRejectedAudioCount();
+                            }
+                            break;
                         case COLUMN_BROADCASTER_AGED_OFF_COUNT:
                             if(configuredBroadcast.hasAudioBroadcaster())
                             {
@@ -643,6 +656,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
             case COLUMN_BROADCASTER_AGED_OFF_COUNT:
             case COLUMN_BROADCASTER_QUEUE_SIZE:
             case COLUMN_BROADCASTER_STREAMED_COUNT:
+            case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
             case COLUMN_BROADCASTER_ERROR_COUNT:
                 return Integer.class;
             case COLUMN_BROADCAST_SERVER_TYPE:

src/main/java/io/github/dsheirer/audio/broadcast/BroadcastStatusPanel.java

@@ -151,7 +151,10 @@ public class BroadcastStatusPanel extends JPanel
                     else if(state == BroadcastState.DISABLED)
                     {
                         setBackground(table.getBackground());
-                        setForeground(Color.LIGHT_GRAY);
+                        //Use the LAF's disabled-foreground so the cell reads correctly on any
+                        //theme - LIGHT_GRAY is invisible on a light background.
+                        Color disabled = javax.swing.UIManager.getColor("Label.disabledForeground");
+                        setForeground(disabled != null ? disabled : table.getForeground());
                     }
                     else if(state == BroadcastState.INVALID_SETTINGS ||
                             state == BroadcastState.NETWORK_UNAVAILABLE)

src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
  * 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
@@ -20,6 +20,8 @@
 package io.github.dsheirer.audio.broadcast.broadcastify;
 
 import com.google.common.net.HttpHeaders;
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
 import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
 import io.github.dsheirer.audio.broadcast.AudioRecording;
@@ -32,6 +34,8 @@ import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
 import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
+import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
 import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
@@ -45,6 +49,7 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
+import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.LinkedTransferQueue;
@@ -76,6 +81,7 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
         .build();
     private long mLastConnectionAttempt;
     private long mConnectionAttemptInterval = 5000; //Every 5 seconds
+    final private AliasModel mAliasModel;
 
     /**
      * Constructs an instance of the broadcaster
@@ -86,6 +92,7 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                                        MP3Setting mp3Setting, AliasModel aliasModel)
     {
         super(config);
+        mAliasModel = aliasModel;
     }
 
     /**
@@ -247,6 +254,8 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                 String radioId = getFrom(audioRecording);
                 float frequency = getFrequency(audioRecording);
 
+                String radioIdAlias = getFromAlias(audioRecording);
+
                 BroadcastifyCallBuilder bodyBuilder = new BroadcastifyCallBuilder();
                 bodyBuilder.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
                     .addPart(FormField.SYSTEM_ID, getBroadcastConfiguration().getSystemID())
@@ -257,6 +266,11 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                     .addPart(FormField.FREQUENCY, frequency)
                     .addPart(FormField.ENCODING, ENCODING_TYPE_MP3);
 
+                if(radioIdAlias != null && !radioIdAlias.isEmpty())
+                {
+                    bodyBuilder.addPart(FormField.RADIO_ID_ALIAS, radioIdAlias);
+                }
+
                 try
                 {
                     HttpRequest request = HttpRequest.newBuilder()
@@ -356,6 +370,9 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                                 else if(urlResponse.startsWith("1 SKIPPED"))
                                 {
                                     //Broadcastify is telling us to skip audio upload - someone already uploaded it
+                                    incrementDuplicateRejectedAudioCount();
+                                    broadcast(new BroadcastEvent(BroadcastifyCallBroadcaster.this,
+                                        BroadcastEvent.Event.BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE));
                                     audioRecording.removePendingReplay();
                                 }
                                 else
@@ -440,13 +457,58 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
         return "0";
     }
 
+    /**
+     * Resolves the over-the-air talker alias for the FROM (source radio) identifier, acquired in real-time from RF
+     * (e.g. P25 Motorola Talker Alias or DMR Talker Alias). Returns null if no OTA alias was received for this call.
+     * This is sent as the srcId_alias field in Broadcastify uploads.
+     */
+    private static String getFromAlias(AudioRecording audioRecording)
+    {
+        for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
+        {
+            if(identifier instanceof TalkerAliasIdentifier talkerAliasIdentifier)
+            {
+                if(talkerAliasIdentifier.isValid())
+                {
+                    return talkerAliasIdentifier.getValue();
+                }
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Creates a formatted string with the TO identifiers or uses a default of zero (0)
      */
-    private static String getTo(AudioRecording audioRecording)
+    private String getTo(AudioRecording audioRecording)
     {
         Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
 
+        //Alias the TO value when the user specifies a 'Stream As Talkgroup'
+        if(identifier != null)
+        {
+            AliasListConfigurationIdentifier config = audioRecording.getIdentifierCollection().getAliasListConfiguration();
+
+            if(config != null)
+            {
+                AliasList aliasList = mAliasModel.getAliasList(config.getValue());
+
+                if(aliasList != null)
+                {
+                    List<Alias> aliases = aliasList.getAliases(identifier);
+
+                    for(Alias a: aliases)
+                    {
+                        if(a.getStreamTalkgroupAlias() != null)
+                        {
+                            return String.valueOf(a.getStreamTalkgroupAlias().getValue());
+                        }
+                    }
+                }
+            }
+        }
+
         if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
         {
             return format(patchGroupIdentifier);

src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java

@@ -30,6 +30,7 @@ public enum FormField
     TIMESTAMP("ts"),
     TALKGROUP_ID("tg"),
     RADIO_ID("src"),
+    RADIO_ID_ALIAS("srcId_alias"),
     FREQUENCY("freq"),
     ENCODING("enc"),
     TEST("test");

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java

@@ -52,8 +52,10 @@ import org.slf4j.LoggerFactory;
 public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 {
     private static final Logger mLog = LoggerFactory.getLogger(IcecastHTTPAudioBroadcaster.class);
+    private static final long CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS = 5000; // 5 seconds
     private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
     private static final String HTTP_1_0_OK_HEX_DUMP = "48 54 54 50 2F 31 2E 30 20 32 30 30 20 4F 4B";
+    private static final String HTTP_1_1_CONTINUE_HEX_DUMP = "48 54 54 50 2F 31 2E 31 20 31 30 30";
 
     private NioSocketConnector mSocketConnector;
     private IoSession mStreamingSession = null;
@@ -61,6 +63,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 
     private long mLastConnectionAttempt = 0;
     private AtomicBoolean mConnecting = new AtomicBoolean();
+	private AtomicBoolean mConnectionFailureLogged = new AtomicBoolean(false);
 
     /**
      * Creates an Icecast 2.4.x compatible broadcaster using HTTP 1.1 protocol.  This broadcaster is
@@ -141,7 +144,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
             if(mSocketConnector == null)
             {
                 mSocketConnector = new NioSocketConnector();
-                mSocketConnector.setConnectTimeoutCheckInterval(10000);
+                mSocketConnector.setConnectTimeoutMillis(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
+                mSocketConnector.setConnectTimeoutCheckInterval(1000);
 
 //                LoggingFilter loggingFilter = new LoggingFilter(IcecastHTTPAudioBroadcaster.class);
 //                loggingFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
@@ -160,37 +164,58 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                 {
                     setBroadcastState(BroadcastState.CONNECTING);
 
-                    try
-                    {
+                    try {
                         ConnectFuture future = mSocketConnector
                             .connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
                                 getBroadcastConfiguration().getPort()));
-                        future.awaitUninterruptibly();
-                        mStreamingSession = future.getSession();
-                    }
-                    catch(RuntimeIoException rie)
-                    {
+
+                        boolean connected;
+                        try {
+                            connected = future.await(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
+                        } catch (InterruptedException ie) {
+                            Thread.currentThread().interrupt();
+							if (mConnectionFailureLogged.compareAndSet(false, true)) {
+								mLog.debug("HTTP connect attempt interrupted");
+							}
+                            setBroadcastState(BroadcastState.DISCONNECTED);
+                            mLastConnectionAttempt = System.currentTimeMillis();
+                            future.cancel();
+                            disconnect();
+                            return;
+                        }
+
+                        if (connected && future.isConnected()) {
+                            mStreamingSession = future.getSession();
+                            mConnecting.set(false);
+							mConnectionFailureLogged.set(false);
+                            return;
+                        } else {
+							if (mConnectionFailureLogged.compareAndSet(false, true)) {
+								mLog.debug("HTTP connect attempt timed out ({} ms) or not connected",
+										   CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
+							}
+                            setBroadcastState(BroadcastState.DISCONNECTED);
+                            mLastConnectionAttempt = System.currentTimeMillis();
+                            future.cancel();
+                            disconnect();
+                        }
+                    } catch (RuntimeIoException rie) {
                         Throwable throwableCause = rie.getCause();
-
-                        if(throwableCause instanceof ConnectException)
-                        {
-                            setBroadcastState(BroadcastState.NO_SERVER);
-                        }
-                        else if(throwableCause != null)
-                        {
-                            setBroadcastState(BroadcastState.DISCONNECTED);
-                            mLog.debug("Failed to connect", rie);
-                        }
-                        else
-                        {
-                            setBroadcastState(BroadcastState.DISCONNECTED);
-                            mLog.debug("Failed to connect - no exception is available");
-                        }
-
+                        setBroadcastState(BroadcastState.DISCONNECTED);
+						if (mConnectionFailureLogged.compareAndSet(false, true)) {
+							if (throwableCause != null) {
+								mLog.debug("Failed to connect", rie);
+							} else {
+								mLog.debug("Failed to connect - no exception is available");
+							}
+						}
+                        mLastConnectionAttempt = System.currentTimeMillis();
                         disconnect();
+                    } finally {
+                        if (!connected()) {
+                            mConnecting.set(false);
+                        }
                     }
-
-                    mConnecting.set(false);
                 }
             };
 
@@ -210,6 +235,11 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
         {
             mStreamingSession.closeNow();
         }
+        
+        mLastConnectionAttempt = System.currentTimeMillis();
+        if(!getBroadcastState().isErrorState()) {
+            setBroadcastState(BroadcastState.DISCONNECTED);
+        }
     }
 
     /**
@@ -233,6 +263,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
             {
                 mHTTPHeaders = new HashMap<>();
                 mHTTPHeaders.put(IcecastHeader.ACCEPT.getValue(), "*/*");
+                mHTTPHeaders.put(IcecastHeader.EXPECT.getValue(), "100-continue");
                 mHTTPHeaders.put(IcecastHeader.CONTENT_TYPE.getValue(), getConfiguration().getBroadcastFormat().getValue());
                 mHTTPHeaders.put(IcecastHeader.USER_AGENT.getValue(), SystemProperties.getInstance().getApplicationName());
                 mHTTPHeaders.put(IcecastHeader.AUTHORIZATION.getValue(), getConfiguration().getBase64EncodedCredentials());
@@ -288,6 +319,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
         @Override
         public void sessionClosed(IoSession session) throws Exception
         {
+            mLastConnectionAttempt = System.currentTimeMillis();
             //If there is already an error state, don't override it.  Otherwise, set state to disconnected
             if(!getBroadcastState().isErrorState())
             {
@@ -320,9 +352,10 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                 {
                     String hexDump = ((ProtocolDecoderException)throwable).getHexdump();
 
-                    if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP))
+                    if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP) || hexDump.startsWith(HTTP_1_1_CONTINUE_HEX_DUMP))
                     {
                         setBroadcastState(BroadcastState.CONNECTED);
+						mConnectionFailureLogged.set(false);
                     }
                     else
                     {
@@ -401,10 +434,15 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                 switch(response.getStatus())
                 {
                     case INFORMATIONAL_CONTINUE:
+                        //Icecast 2.5+ signals that we can start sending audio with 100-continue
+                        setBroadcastState(BroadcastState.CONNECTED);
+                        mConnecting.set(false);
+                        mConnectionFailureLogged.set(false);
                         break;
                     case SUCCESS_OK:
                         setBroadcastState(BroadcastState.CONNECTED);
                         mConnecting.set(false);
+						mConnectionFailureLogged.set(false);
                         break;
                     case CLIENT_ERROR_UNAUTHORIZED:
                         setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
@@ -468,7 +506,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 
             mMessage = new String(bytes);
 
-            Pattern pattern = Pattern.compile("HTTP/1.0 (\\d{3})");
+            //Icecast 2.4+ responds with HTTP/1.0 and Icecast 2.5+ responds with HTTP/1.1
+            Pattern pattern = Pattern.compile("HTTP/1\\.[01] (\\d{3})");
             Matcher m = pattern.matcher(mMessage);
 
             if(m.find())

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastMetadata.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2020 Dennis Sheirer
- *  *
- *  * 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 3 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/>
- *  * *****************************************************************************
+ * 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 3 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/>
+ * ****************************************************************************
  */
 package io.github.dsheirer.audio.broadcast.icecast;
 
@@ -25,21 +22,16 @@ import com.google.common.base.Joiner;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.AliasList;
 import io.github.dsheirer.alias.AliasModel;
-import io.github.dsheirer.audio.broadcast.icecast.IcecastConfiguration;
 import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.identifier.Role;
-import io.github.dsheirer.properties.SystemProperties;
-import io.github.dsheirer.util.ThreadPool;
+import java.util.List;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-
 public class IcecastMetadata
 {
     private final static Logger mLog = LoggerFactory.getLogger(IcecastMetadata.class);
@@ -73,13 +65,23 @@ public class IcecastMetadata
 
             if(to != null)
             {
-                sb.append("TO:").append(to);
-
                 List<Alias> aliases = aliasList.getAliases(to);
 
-                if(aliases != null && !aliases.isEmpty())
+                //Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
+                Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
+
+                if(streamAs.isPresent())
                 {
-                    sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                    sb.append("TO:").append(streamAs.get().getStreamTalkgroupAlias().getValue());
+                }
+                else
+                {
+                    sb.append("TO:").append(to);
+
+                    if(!aliases.isEmpty())
+                    {
+                        sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                    }
                 }
             }
             else

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java

@@ -94,7 +94,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
         {
             if(mInlineActive)
             {
-                byte[] metadata = IcecastMetadata.formatInline(IcecastMetadata.getTitle(identifierCollection, mAliasModel)).getBytes();
                 if (mInlineRemaining == -1)
                 {
                     mInlineRemaining = mInlineInterval;
@@ -105,16 +104,34 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                     byte[] chunk = Arrays.copyOfRange(audio, audioOffset, Math.min(audioOffset + mInlineRemaining, audio.length));
                     mInlineRemaining -= chunk.length;
                     audioOffset += chunk.length;
+
+                    if(mVerboseLogging)
+                    {
+                        mLog.info("Broadcasting audio data - sending [" + chunk.length + "/" + audio.length + "] bytes");
+                    }
+
                     mStreamingSession.write(chunk);
                     if(mInlineRemaining == 0)
                     {
                         mInlineRemaining = mInlineInterval;
+
+                        byte[] metadata = IcecastMetadata.formatInline(IcecastMetadata.getTitle(identifierCollection, mAliasModel)).getBytes();
+
+                        if(mVerboseLogging)
+                        {
+                            mLog.info("Sending inline metadata: " + new String(metadata));
+                        }
+
                         mStreamingSession.write(metadata);
                     }
                 }
             }
             else
             {
+                if(mVerboseLogging)
+                {
+                    mLog.info("Broadcasting audio data [" + audio.length + "] bytes");
+                }
                 mStreamingSession.write(audio);
             }
         }

src/main/java/io/github/dsheirer/audio/broadcast/openmhz/FormField.java

@@ -34,7 +34,8 @@
      API_KEY("api_key"),
      SOURCE_LIST("source_list"),
      FREQ_LIST("freq_list"),
-     PATCHES("patches");
+     PATCH_LIST("patch_list"),
+     TALKER_ALIAS("talker_alias");
 
      private String mHeader;
 

src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzBroadcaster.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
  * 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
@@ -19,55 +19,45 @@
 
  package io.github.dsheirer.audio.broadcast.openmhz;
 
- import com.google.common.net.HttpHeaders;
- import com.google.common.base.Joiner;
- import io.github.dsheirer.alias.Alias;
- import io.github.dsheirer.alias.AliasList;
- import io.github.dsheirer.alias.AliasModel;
- import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
- import io.github.dsheirer.audio.broadcast.AudioRecording;
- import io.github.dsheirer.audio.broadcast.BroadcastEvent;
- import io.github.dsheirer.audio.broadcast.BroadcastState;
- import io.github.dsheirer.audio.convert.InputAudioFormat;
- import io.github.dsheirer.audio.convert.MP3Setting;
- import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceDecoder;
- import io.github.dsheirer.identifier.Form;
- import io.github.dsheirer.identifier.Identifier;
- import io.github.dsheirer.identifier.IdentifierClass;
- import io.github.dsheirer.identifier.MutableIdentifierCollection;
- import io.github.dsheirer.identifier.Role;
- import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
- import io.github.dsheirer.identifier.patch.PatchGroup;
- import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
- import io.github.dsheirer.identifier.radio.RadioIdentifier;
- import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
- import io.github.dsheirer.util.ThreadPool;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-
- import java.io.File;
- import java.nio.file.Files;
- import java.io.FileInputStream;
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.io.PrintWriter;
- import java.io.BufferedReader;
- import java.io.InputStreamReader;
- import java.io.OutputStreamWriter;
- import java.net.ConnectException;
- import java.net.URI;
- import java.net.URL;
- import java.net.URLConnection;
- import java.net.http.HttpClient;
- import java.net.http.HttpRequest;
- import java.net.http.HttpResponse;
- import java.time.Duration;
- import java.util.List;
- import java.util.Queue;
- import java.util.concurrent.CompletionException;
- import java.util.concurrent.LinkedTransferQueue;
- import java.util.concurrent.ScheduledFuture;
- import java.util.concurrent.TimeUnit;
+import com.google.common.net.HttpHeaders;
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
+import io.github.dsheirer.audio.broadcast.AudioRecording;
+import io.github.dsheirer.audio.broadcast.BroadcastEvent;
+import io.github.dsheirer.audio.broadcast.BroadcastState;
+import io.github.dsheirer.audio.convert.InputAudioFormat;
+import io.github.dsheirer.audio.convert.MP3Setting;
+import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceDecoder;
+import io.github.dsheirer.identifier.Form;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.identifier.IdentifierClass;
+import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
+import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
+import io.github.dsheirer.identifier.patch.PatchGroup;
+import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
+import io.github.dsheirer.identifier.radio.RadioIdentifier;
+import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
+import io.github.dsheirer.util.ThreadPool;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -249,6 +239,7 @@
                  long timestampSeconds = (int)(audioRecording.getStartTime() / 1E3);
                  String talkgroup = getTo(audioRecording);
                  String radioId = getFrom(audioRecording);
+                 String talkerAlias = getTalkerAlias(audioRecording);
                  Long frequency = getFrequency(audioRecording);
                  String patches = getPatches(audioRecording);
                  String talkgroupLabel = getTalkgroupLabel(audioRecording);
@@ -282,8 +273,8 @@
                              .addPart(FormField.TALKGROUP_NUM, talkgroup)
                              .addPart(FormField.EMERGENCY, 0)
                              .addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
-                             // For future use if OpenMHz supports patch information
-                             //.addPart(FormField.PATCHES, patches)
+                             .addPart(FormField.PATCH_LIST, patches)
+                             .addPart(FormField.TALKER_ALIAS, talkerAlias)
                              .addPart(FormField.SOURCE_LIST, "[{ \"pos\": 0.00, \"src\": " + radioId + "}]");
 
                          HttpRequest fileRequest = HttpRequest.newBuilder()
@@ -426,22 +417,40 @@
       * Creates a formatted string with the TO identifiers or uses a default of zero (0)
       * 
       */
-     private static String getTo(AudioRecording audioRecording)
+     private String getTo(AudioRecording audioRecording)
      {
          Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
 
-         if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
+         if(identifier != null)
          {
-             return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
-         }
-         else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
-         {
-             return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
-                     talkgroupIdentifier.getProtocol()));
-         }
-         else if(identifier instanceof RadioIdentifier radioIdentifier)
-         {
-             return radioIdentifier.getValue().toString();
+             AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
+
+             if(aliasList != null)
+             {
+                 List<Alias> aliases = aliasList.getAliases(identifier);
+
+                 //Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
+                 Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
+
+                 if(streamAs.isPresent())
+                 {
+                     return String.valueOf(streamAs.get().getStreamTalkgroupAlias().getValue());
+                 }
+             }
+
+             if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
+             {
+                 return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
+             }
+             else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
+             {
+                 return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
+                         talkgroupIdentifier.getProtocol()));
+             }
+             else if(identifier instanceof RadioIdentifier radioIdentifier)
+             {
+                 return radioIdentifier.getValue().toString();
+             }
          }
 
          return "0";
@@ -547,6 +556,28 @@
         return "[]";
     }
 
+    /**
+     * Creates a formatted string with talkerAlias identifier
+     */
+    private static String getTalkerAlias(AudioRecording audioRecording)
+    {
+        for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
+        {
+            if(identifier instanceof TalkerAliasIdentifier)
+            {
+                TalkerAliasIdentifier talkerID = (TalkerAliasIdentifier)identifier;
+
+                if(talkerID.isValid())
+                {
+                    return talkerID.getValue();
+                }
+            }
+        }
+
+        return "";
+    }
+
+
      /**
       * Tests both the connection and configuration against the OpenMHz Call API service
       * @param configuration containing API key and system id

src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzEditor.java

@@ -17,13 +17,14 @@
  * ****************************************************************************
  */
 
- package io.github.dsheirer.gui.playlist.streaming;
+ package io.github.dsheirer.audio.broadcast.openmhz;
 
  import io.github.dsheirer.audio.broadcast.BroadcastServerType;
  import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
  import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
  import io.github.dsheirer.gui.control.IntegerTextField;
- import io.github.dsheirer.playlist.PlaylistManager;
+import io.github.dsheirer.gui.playlist.streaming.AbstractBroadcastEditor;
+import io.github.dsheirer.playlist.PlaylistManager;
  import javafx.geometry.HPos;
  import javafx.geometry.Insets;
  import javafx.scene.control.Alert;

src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/FormField.java

@@ -36,6 +36,7 @@ public enum FormField
     SOURCES("sources"),
     SYSTEM("system"),
     SYSTEM_LABEL("systemLabel"),
+    TALKER_ALIAS("talkerAlias"),
     TALKGROUP_ID("talkgroup"),
     TALKGROUP_GROUP("talkgroupGroup"),
     TALKGROUP_LABEL("talkgroupLabel"),

src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/RdioScannerBroadcaster.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
  * 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
@@ -34,6 +34,7 @@ import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
 import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
 import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
@@ -48,6 +49,7 @@ import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.LinkedTransferQueue;
@@ -227,6 +229,7 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
                 long timestampSeconds = (int)(audioRecording.getStartTime() / 1E3);
                 String talkgroup = getTo(audioRecording);
                 String radioId = getFrom(audioRecording);
+                String talkerAlias = getTalkerAlias(audioRecording);
                 Long frequency = getFrequency(audioRecording);
                 String patches = getPatches(audioRecording);
                 String talkgroupLabel = getTalkgroupLabel(audioRecording);
@@ -261,6 +264,7 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
                             .addPart(FormField.TALKGROUP_ID, talkgroup)
                             .addPart(FormField.SOURCE, radioId)
                             .addPart(FormField.FREQUENCY, frequency)
+                            .addPart(FormField.TALKER_ALIAS, talkerAlias)
                             .addPart(FormField.TALKGROUP_LABEL, talkgroupLabel)
                             .addPart(FormField.TALKGROUP_GROUP, talkgroupGroup)
                             .addPart(FormField.SYSTEM_LABEL, systemLabel)
@@ -408,26 +412,62 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
         return "0";
     }
 
+    private static String getTalkerAlias(AudioRecording audioRecording)
+    {
+        for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
+        {
+            if(identifier instanceof TalkerAliasIdentifier)
+            {
+                TalkerAliasIdentifier talkerID = (TalkerAliasIdentifier)identifier;
+
+                if(talkerID.isValid())
+                {
+                    return talkerID.getValue();
+                }
+            }
+        }
+
+        return "";
+    }
+
     /**
      * Creates a formatted string with the TO identifiers or uses a default of zero (0)
      * 
      */
-    private static String getTo(AudioRecording audioRecording)
+    private String getTo(AudioRecording audioRecording)
     {
         Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
 
-        if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
+        if(identifier != null)
         {
-            return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
-        }
-        else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
-        {
-            return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
-                    talkgroupIdentifier.getProtocol()));
-        }
-        else if(identifier instanceof RadioIdentifier radioIdentifier)
-        {
-            return radioIdentifier.getValue().toString();
+            AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
+
+            if(aliasList != null)
+            {
+                List<Alias> aliases = aliasList.getAliases(identifier);
+
+                //Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
+                Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
+
+                if(streamAs.isPresent())
+                {
+                    return String.valueOf(streamAs.get().getStreamTalkgroupAlias().getValue());
+                }
+            }
+
+            if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
+            {
+                return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
+            }
+            else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
+            {
+                return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
+                        talkgroupIdentifier.getProtocol()));
+            }
+            else if(identifier instanceof RadioIdentifier radioIdentifier)
+            {
+                return radioIdentifier.getValue().toString();
+            }
         }
 
         return "0";

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
  * 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
@@ -29,6 +29,17 @@ import io.github.dsheirer.identifier.IdentifierClass;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.identifier.Role;
 import io.github.dsheirer.util.ThreadPool;
+import java.io.UnsupportedEncodingException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IoSession;
@@ -41,17 +52,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.UnsupportedEncodingException;
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.LinkedTransferQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUpdater
 {
     private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV1BroadcastMetadataUpdater.class);
@@ -212,10 +212,20 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
 
             if(to != null)
             {
-                sb.append("TO:").append(to);
-
                 List<Alias> aliases = aliasList.getAliases(to);
 
+                //Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
+                Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
+
+                if(streamAs.isPresent())
+                {
+                    sb.append("TO:").append(streamAs.get().getStreamTalkgroupAlias().getValue());
+                }
+                else
+                {
+                    sb.append("TO:").append(to);
+                }
+
                 if(!aliases.isEmpty())
                 {
                     sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2AudioStreamingBroadcaster.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2025 Dennis Sheirer
  *
  * 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
@@ -49,6 +49,15 @@ import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.identifier.Role;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.math3.util.FastMath;
 import org.apache.mina.core.RuntimeIoException;
 import org.apache.mina.core.future.ConnectFuture;
@@ -59,15 +68,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.LinkedTransferQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcaster implements IBroadcastMetadataUpdater
 {
     private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV2AudioStreamingBroadcaster.class);
@@ -303,13 +303,23 @@ public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcas
 
                 if(to != null)
                 {
-                    sbTitle2.append("TO:").append(to);
-
                     List<Alias> aliases = aliasList.getAliases(to);
 
-                    if(!aliases.isEmpty())
+                    //Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
+                    Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
+
+                    if(streamAs.isPresent())
                     {
-                        sbTitle2.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                        sbTitle2.append("TO:").append(streamAs.get().getStreamTalkgroupAlias().getValue());
+                    }
+                    else
+                    {
+                        sbTitle2.append("TO:").append(to);
+
+                        if(!aliases.isEmpty())
+                        {
+                            sbTitle2.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                        }
                     }
                 }
                 else

src/main/java/io/github/dsheirer/audio/codec/mbe/JmbeAudioModule.java

@@ -35,9 +35,12 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import jmbe.iface.IAudioCodec;
 import jmbe.iface.IAudioCodecLibrary;
+import jmbe.iface.IAudioCodecLibraryV2;
+import jmbe.iface.IAudioCodecV2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +50,7 @@ import org.slf4j.LoggerFactory;
 public abstract class JmbeAudioModule extends AbstractAudioModule implements Listener<IMessage>, IMessageListener,
     ISquelchStateListener
 {
-    private static final Logger mLog = LoggerFactory.getLogger(JmbeAudioModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmbeAudioModule.class);
     private static final String JMBE_AUDIO_LIBRARY = "JMBE";
     private static final List<String> mLibraryLoadStatusLogged = new ArrayList<>();
     private IAudioCodec mAudioCodec;
@@ -56,12 +59,43 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
 
     public JmbeAudioModule(UserPreferences userPreferences, AliasList aliasList, int timeslot)
     {
-        super(aliasList, timeslot, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
+        super(aliasList, timeslot, DEFAULT_MAX_SEGMENT_LENGTH_MILLIS);
         mUserPreferences = userPreferences;
         MyEventBus.getGlobalEventBus().register(this);
         loadConverter();
     }
 
+    /**
+     * List of features supported by the JMBE audio library.  Note: features are only supported in Version 2.0+
+     * @return list of features or an empty list if the current library version doesn't support features.
+     */
+    public List<String> getFeatures()
+    {
+        if(mAudioCodec instanceof IAudioCodecV2 v2)
+        {
+            return v2.getFeatures();
+        }
+
+        return Collections.emptyList();
+    }
+
+    /**
+     * Sets the JMBE feature
+     * @param name of the feature
+     * @param value for the feature
+     */
+    public void setFeature(String name, Object value)
+    {
+        if(mAudioCodec instanceof IAudioCodecV2 v2)
+        {
+            v2.setFeature(name, value);
+        }
+        else
+        {
+            LOG.info("Feature [" + name + "] is not supported by the current JMBE audio codec library version");
+        }
+    }
+
     @Override
     protected void closeAudioSegment()
     {
@@ -135,7 +169,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
             {
                 if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                 {
-                    mLog.info("Loading JMBE library from [" + path + "]");
+                    LOG.info("Loading JMBE library from [" + path + "]");
                 }
 
                 try
@@ -143,13 +177,32 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                     URLClassLoader childClassLoader = new URLClassLoader(new URL[]{path.toUri().toURL()},
                             this.getClass().getClassLoader());
 
-                    sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibrary", true, childClassLoader);
+                    try
+                    {
+                        sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibraryV2", true, childClassLoader);
+                    }
+                    catch(ClassNotFoundException legacyLibrary)
+                    {
+                        try
+                        {
+                            sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibrary", true, childClassLoader);
+                        }
+                        catch(ClassNotFoundException missingLibrary)
+                        {
+                            if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
+                            {
+                                LOG.error("Couldn't load JMBE audio conversion library from [" + path +
+                                    "] - neither V2 nor V1 library class was found");
+                                mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
+                            }
+                        }
+                    }
                 }
                 catch(IllegalArgumentException iae)
                 {
                     if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY + getCodecName()))
                     {
-                        mLog.error("Couldn't load JMBE audio conversion library - " + iae.getMessage());
+                        LOG.error("Couldn't load JMBE audio conversion library - " + iae.getMessage());
                         mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY + getCodecName());
                     }
                 }
@@ -157,18 +210,11 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                 {
                     if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                     {
-                        mLog.error("Couldn't load JMBE audio conversion library from path [" + path + "]");
-                        mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
-                    }
-                }
-                catch(ClassNotFoundException e1)
-                {
-                    if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
-                    {
-                        mLog.error("Couldn't load JMBE audio conversion library - class not found");
+                        LOG.error("Couldn't load JMBE audio conversion library from path [" + path + "]");
                         mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                     }
                 }
+
             }
         }
 
@@ -183,11 +229,23 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                     if((library.getMajorVersion() == 1 && library.getMinorVersion() >= 0 &&
                             library.getBuildVersion() >= 0) || library.getMajorVersion() >= 1)
                     {
-                        audioConverter = library.getAudioConverter(getCodecName());
+                        audioConverter = library instanceof IAudioCodecLibraryV2 libraryV2 ?
+                            libraryV2.getAudioConverterV2(getCodecName()) :
+                            library.getAudioConverter(getCodecName());
+
+                        String codecStatusKey = JMBE_AUDIO_LIBRARY + ":codec:" + getCodecName();
+                        if(!mLibraryLoadStatusLogged.contains(codecStatusKey))
+                        {
+                            LOG.info("JMBE codec [" + getCodecName() + "] class [" +
+                                audioConverter.getClass().getName() + "] features [" +
+                                (audioConverter instanceof IAudioCodecV2 v2 ?
+                                    v2.getFeatures() : Collections.emptyList()) + "]");
+                            mLibraryLoadStatusLogged.add(codecStatusKey);
+                        }
 
                         if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                         {
-                            mLog.info("JMBE audio conversion library loaded: " + library.getVersion());
+                            LOG.info("JMBE audio conversion library loaded: " + library.getVersion());
                             mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                         }
                     }
@@ -195,7 +253,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                     {
                         if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                         {
-                            mLog.warn("JMBE library version 1.0.0 or higher is required - found: " + library.getVersion());
+                            LOG.warn("JMBE library version 1.0.0 or higher is required - found: " + library.getVersion());
                             mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                         }
                     }
@@ -204,7 +262,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                 {
                     if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                     {
-                        mLog.info("JMBE audio conversion library NOT FOUND");
+                        LOG.info("JMBE audio conversion library NOT FOUND");
                         mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                     }
                 }
@@ -213,7 +271,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
             {
                 if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                 {
-                    mLog.error("Couldn't load JMBE audio conversion library - invocation target exception", ite);
+                    LOG.error("Couldn't load JMBE audio conversion library - invocation target exception", ite);
                     mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                 }
             }
@@ -221,7 +279,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
             {
                 if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                 {
-                    mLog.error("Couldn't load JMBE audio conversion library - instantiation exception", e1);
+                    LOG.error("Couldn't load JMBE audio conversion library - instantiation exception", e1);
                     mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                 }
             }
@@ -229,7 +287,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
             {
                 if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                 {
-                    mLog.error("Couldn't load JMBE audio conversion library - security restrictions");
+                    LOG.error("Couldn't load JMBE audio conversion library - security restrictions");
                     mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                 }
             }
@@ -237,7 +295,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
             {
                 if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                 {
-                    mLog.error("Couldn't load JMBE audio conversion library - no such method exception");
+                    LOG.error("Couldn't load JMBE audio conversion library - no such method exception");
                     mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                 }
             }
@@ -246,7 +304,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
         {
             if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
             {
-                mLog.warn("JMBE audio library path is NOT SET in your User Preferences.");
+                LOG.warn("JMBE audio library path is NOT SET in your User Preferences.");
                 mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
             }
         }

src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequence.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.encryption.EncryptionKey;
-import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +35,7 @@ import java.util.List;
  * radio identifiers.
  */
 @JsonRootName("mbe_call")
-@JsonPropertyOrder({"protocol", "call_type", "from", "to", "encrypted", "frames"})
+@JsonPropertyOrder({"protocol", "version", "call_type", "from", "to", "encrypted", "system", "site", "frames"})
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MBECallSequence
 {
@@ -77,6 +76,15 @@ public class MBECallSequence
         mProtocol = protocol;
     }
 
+    /**
+     * Gets the version number for the mbe file structure.
+     * Should be incremented only on breaking structural changes, not minor additions.
+     */
+    @JsonProperty("version")
+    public Integer getVersion()
+    {
+        return 2;
+    }
 
     /**
      * Indicates if this sequences contains any audio frames
@@ -279,10 +287,18 @@ public class MBECallSequence
         }
         else
         {
-            mVoiceFrames.add(new VoiceFrame(timestamp, frame));
+            add(new VoiceFrame(timestamp, frame));
         }
     }
 
+    /**
+     * Adds the voice frame to the sequence
+     */
+    public void add(VoiceFrame voiceFrame)
+    {
+        mVoiceFrames.add(voiceFrame);
+    }
+
     /**
      * Adds an encrypted audio frame to this call sequence
      *
@@ -308,6 +324,6 @@ public class MBECallSequence
      */
     public void addEncryptedVoiceFrame(long timestamp, String frame, int algorithm, int keyid, String messageIndicator)
     {
-        mVoiceFrames.add(new VoiceFrame(timestamp, frame, algorithm, keyid, messageIndicator));
+        add(new VoiceFrame(timestamp, frame, algorithm, keyid, messageIndicator));
     }
 }

src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceConverter.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -25,7 +25,6 @@ import io.github.dsheirer.audio.AudioSegment;
 import io.github.dsheirer.identifier.IdentifierUpdateNotification;
 import io.github.dsheirer.module.decode.p25.audio.P25P1AudioModule;
 import io.github.dsheirer.module.decode.p25.audio.P25P1CallSequenceRecorder;
-import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;
 import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.preference.UserPreferences;

src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceReader.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
- *  *
- *  * 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 3 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/>
- *  * *****************************************************************************
+ * 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 3 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/>
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.audio.codec.mbe;
@@ -25,7 +22,6 @@ package io.github.dsheirer.audio.codec.mbe;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Joiner;
-import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;
 
 import java.io.IOException;
 import java.nio.file.Files;

src/main/java/io/github/dsheirer/audio/codec/mbe/VoiceFrame.java

@@ -1,20 +1,23 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
- * 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 3 of the License, or  (at your option) any
- * later version.
+ * 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 3 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.
+ * 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/>
- *
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 
-package io.github.dsheirer.module.decode.p25.audio;
+package io.github.dsheirer.audio.codec.mbe;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -27,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
  */
 @JsonRootName(value = "frame")
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"encryption_algorithm", "encryption_key_id", "encryption_mi", "time", "hex"})
+@JsonPropertyOrder({"tag", "encryption_algorithm", "encryption_key_id", "encryption_mi", "time", "hex"})
 public class VoiceFrame
 {
     private long mTimestamp;
@@ -35,6 +38,7 @@ public class VoiceFrame
     private Integer mAlgorithm;
     private Integer mKeyId;
     private String mMessageIndicator;
+    private String mTag;
 
     public VoiceFrame()
     {
@@ -70,6 +74,24 @@ public class VoiceFrame
         mMessageIndicator = messageIndicator;
     }
 
+    /**
+     * Tag value for the voice frame
+     */
+    @JsonProperty("tag")
+    public String getTag()
+    {
+        return mTag;
+    }
+
+    /**
+     * Sets the optional tag value for the frame
+     * @param tag to set
+     */
+    public void setTag(String tag)
+    {
+        mTag = tag;
+    }
+
     /**
      * Timestamp the frame was transmitted
      *

src/main/java/io/github/dsheirer/audio/playback/AudioChannel.java

@@ -0,0 +1,663 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.audio.playback;
+
+import com.google.common.eventbus.Subscribe;
+import io.github.dsheirer.audio.AudioEvent;
+import io.github.dsheirer.audio.AudioSegment;
+import io.github.dsheirer.eventbus.MyEventBus;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.IdentifierUpdateNotification;
+import io.github.dsheirer.preference.PreferenceType;
+import io.github.dsheirer.preference.UserPreferences;
+import io.github.dsheirer.sample.Broadcaster;
+import io.github.dsheirer.sample.Listener;
+import java.util.Arrays;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Manages the incoming audio segments and provides access to audio buffers from those segments.
+ */
+public class AudioChannel implements Listener<IdentifierUpdateNotification>
+{
+    /**
+     * Quantity of audio samples to deliver per getAudio() method invocation, equivalent to 20 milliseconds at an 8 kHz
+     * sample rate.
+     */
+    public static final int SAMPLES_PER_INTERVAL = 160;
+    /**
+     * Quantity of consecutive intervals without new audio (1 second) before an incomplete audio segment is treated as
+     * stalled and abandoned.  An audio segment is delivered once to a single channel, so abandoning a segment that is
+     * still live loses the rest of the call.  This has to tolerate decoder gaps, such as a missed P25 LDU (180 ms).
+     */
+    static final int MAX_STALLED_INTERVALS = 50;
+    private static final Logger LOGGER = LoggerFactory.getLogger(AudioChannel.class);
+    private final AudioBuffer mAudioBuffer = new AudioBuffer();
+    private final Broadcaster<AudioEvent> mAudioEventBroadcaster = new Broadcaster<>();
+    private final LinkedTransferQueue<AudioSegment> mAudioSegmentQueue = new LinkedTransferQueue<>();
+    private final UserPreferences mUserPreferences;
+    private final String mChannelName;
+
+    private AudioSegment mCurrentAudioSegment;
+    private Listener<IdentifierCollection> mIdentifierCollectionListener;
+    private boolean mDropDuplicates;
+    private boolean mMetadataSent = false;
+    private boolean mMuted;
+    private boolean mDisabled;
+    private float[] mAudioSegmentStartTone;
+    private float[] mAudioSegmentDropTone;
+    private int mCurrentBufferIndex = -1;
+    private int mNoAudioFromSegmentIntervalCount = 0;
+
+    /**
+     * Constructs an instance
+     */
+    public AudioChannel(UserPreferences userPreferences, String channelName)
+    {
+        mUserPreferences = userPreferences;
+        mChannelName = channelName;
+
+        mDropDuplicates = mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled();
+        updateToneInsertionAudioClips();
+
+        //Register to receive preference update notifications so we can update the preference items
+        MyEventBus.getGlobalEventBus().register(this);
+    }
+
+    /**
+     * Enables or disables this audio channel.
+     * @param disabled state
+     */
+    public void setDisabled(boolean disabled)
+    {
+        mDisabled = disabled;
+
+        if(disabled)
+        {
+            AudioSegment segment = mAudioSegmentQueue.poll();
+
+            while(segment != null)
+            {
+                segment.decrementConsumerCount();
+                segment = mAudioSegmentQueue.poll();
+            }
+        }
+    }
+
+    /**
+     * Indicates if this audio channel is enabled.
+     */
+    public boolean isDisabled()
+    {
+        return mDisabled;
+    }
+
+    /**
+     * Switches this channel's muted state
+     * @param muted true to mute and false to unmute
+     */
+    public void setMuted(boolean muted)
+    {
+        mMuted = muted;
+        notify(muted ? AudioEvent.Type.AUDIO_MUTED : AudioEvent.Type.AUDIO_UNMUTED);
+    }
+
+    /**
+     * Indicates if this channel is muted
+     * @return muted state
+     */
+    public boolean isMuted()
+    {
+        return mMuted;
+    }
+
+    /**
+     * Plays the test audio sample data at higher priority that current audio queue.
+     * @param samples of test audio to play.
+     */
+    public void playTest(float[] samples)
+    {
+        if(isDisabled())
+        {
+            return;
+        }
+
+        mAudioBuffer.insert(samples);
+    }
+
+    /**
+     * Indicates if this channel has an audio segment, indicating that it is right in the middle of playback and
+     * the audio output should temporarily pause until more audio is available from the segment.
+     * @return true if this channel is processing a non-complete audio segment.
+     */
+    public boolean hasAudioSegment()
+    {
+        return mCurrentAudioSegment != null;
+    }
+
+    /**
+     * Broadcasts a null identifier collection to the UI to clear any displayed metadata (TO/FROM) identifiers
+     */
+    public void clearMetadata()
+    {
+        if(mMetadataSent)
+        {
+            broadcast(null);
+            mMetadataSent = false;
+        }
+    }
+
+    /**
+     * Provides audio for this channel from the audio segment queue.
+     * @return audio or null if there are no audio segments or test audio to play.
+     */
+    public float[] getAudio()
+    {
+        if(mAudioBuffer.isFull())
+        {
+            float[] audio = mAudioBuffer.get();
+
+            if(isMuted())
+            {
+                return new float[SAMPLES_PER_INTERVAL];
+            }
+            else
+            {
+                return audio;
+            }
+        }
+
+        if(mCurrentAudioSegment == null)
+        {
+            loadNextAudioSegment();
+        }
+
+        //Evaluate current audio segment to see if the status has changed for duplicate or do-not-monitor.
+        while(isThrowaway(mCurrentAudioSegment))
+        {
+            if(mCurrentBufferIndex > 0)
+            {
+                //Flush the buffer and insert the drop tone
+                mAudioBuffer.replace(mAudioSegmentDropTone);
+            }
+
+            disposeCurrentAudioSegment();
+            loadNextAudioSegment();
+        }
+
+        if(mCurrentAudioSegment != null)
+        {
+            mNoAudioFromSegmentIntervalCount++;
+        }
+
+        while(!mAudioBuffer.isFull() && mCurrentAudioSegment != null &&
+                mCurrentBufferIndex < mCurrentAudioSegment.getAudioBufferCount())
+        {
+            if(mCurrentBufferIndex < 0)
+            {
+                mAudioBuffer.add(mAudioSegmentStartTone);
+                mAudioBuffer.add(mCurrentAudioSegment.getAudioBuffer(0));
+                mCurrentBufferIndex = 1;
+                broadcast(mCurrentAudioSegment.getIdentifierCollection());
+                mMetadataSent = true;
+            }
+            else
+            {
+                mAudioBuffer.add(mCurrentAudioSegment.getAudioBuffer(mCurrentBufferIndex++));
+            }
+
+            mNoAudioFromSegmentIntervalCount = 0;
+        }
+
+        //Dispose completed/fully-played audio segments and segments that have stalled/failed to progress
+        if(mCurrentAudioSegment != null && ((mNoAudioFromSegmentIntervalCount >= MAX_STALLED_INTERVALS) ||
+          (mCurrentAudioSegment.isComplete() && (mCurrentBufferIndex >= mCurrentAudioSegment.getAudioBufferCount()))))
+        {
+            disposeCurrentAudioSegment();
+            mNoAudioFromSegmentIntervalCount = 0;
+        }
+
+        float[] audio = null;
+
+        if(mAudioBuffer.isFull())
+        {
+            audio = mAudioBuffer.get();
+        }
+        else if(mCurrentAudioSegment == null && !mAudioBuffer.isEmpty())
+        {
+            audio = mAudioBuffer.flush();
+        }
+
+        //Finally, if we have buffer audio and we're muted, return silence
+        if(isMuted() && audio != null)
+        {
+            audio = new float[SAMPLES_PER_INTERVAL];
+        }
+
+        return audio;
+    }
+
+    /**
+     * Notifies listener(s) of the audio event.
+     * @param eventType to notify for this channel
+     */
+    public void notify(AudioEvent.Type eventType)
+    {
+        broadcastAudioEvent(new AudioEvent(eventType, getChannelName()));
+    }
+    /**
+     * Registers a single listener to receive audio start and audio stop events
+     */
+    public void addAudioEventListener(Listener<AudioEvent> listener)
+    {
+        mAudioEventBroadcaster.addListener(listener);
+    }
+
+    /**
+     * Removes the audio event listener
+     * @param listener to remove
+     */
+    public void removeAudioEventListener(Listener<AudioEvent> listener)
+    {
+        mAudioEventBroadcaster.removeListener(listener);
+    }
+
+    /**
+     * Broadcasts an audio event to the registered listener
+     */
+    private void broadcastAudioEvent(AudioEvent audioEvent)
+    {
+        mAudioEventBroadcaster.broadcast(audioEvent);
+    }
+
+    /**
+     * Indicates if the audio segment should be thrown away because it is marked as duplicate or do-not-monitor.
+     * @param audioSegment to evaluate
+     * @return true if the audio should be thrown away.
+     */
+    private boolean isThrowaway(AudioSegment audioSegment)
+    {
+        return audioSegment != null && (audioSegment.isDoNotMonitor() || mDropDuplicates && (audioSegment.isDuplicate()));
+    }
+
+    /**
+     * Channel name
+     */
+    public String getChannelName()
+    {
+        return mChannelName;
+    }
+
+    /**
+     * Broadcasts audio identifier collection metadata to the registered listener
+     */
+    private void broadcast(IdentifierCollection identifierCollection)
+    {
+        if(mIdentifierCollectionListener != null)
+        {
+            mIdentifierCollectionListener.receive(identifierCollection);
+        }
+    }
+
+    /**
+     * Registers a single listener to receive the audio metadata from each
+     * audio packet
+     */
+    public void setIdentifierCollectionListener(Listener<IdentifierCollection> listener)
+    {
+        mIdentifierCollectionListener = listener;
+    }
+
+    /**
+     * Unregisters the current audio metadata listener
+     */
+    public void removeAudioMetadataListener()
+    {
+        mIdentifierCollectionListener = null;
+    }
+
+    /**
+     * Prepares this audio output for disposal.
+     */
+    public void dispose()
+    {
+
+        MyEventBus.getGlobalEventBus().unregister(this);
+        disposeCurrentAudioSegment();
+        mAudioEventBroadcaster.clear();
+        mIdentifierCollectionListener = null;
+    }
+
+    /**
+     * Guava event bus notifications that the preferences have been updated, so that we can update audio segment tones.
+     */
+    @Subscribe
+    public void preferenceUpdated(PreferenceType preferenceType)
+    {
+        if(preferenceType == PreferenceType.PLAYBACK)
+        {
+            updateToneInsertionAudioClips();
+        }
+        else if(preferenceType == PreferenceType.DUPLICATE_CALL_DETECTION)
+        {
+            mDropDuplicates = mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled();
+        }
+    }
+
+    /**
+     * Indicates if the audio segment is linked to the current playback audio segment
+     */
+    public boolean isLinkedTo(AudioSegment audioSegment)
+    {
+        return audioSegment.isLinked() && audioSegment.isLinkedTo(mCurrentAudioSegment);
+    }
+
+    /**
+     * Receive and process audio identifier update notifications.
+     */
+    public void receive(IdentifierUpdateNotification identifierUpdateNotification)
+    {
+        if(mCurrentAudioSegment != null)
+        {
+            IdentifierCollection identifierCollection = mCurrentAudioSegment.getIdentifierCollection();
+
+            if(identifierCollection != null)
+            {
+                broadcast(identifierCollection);
+            }
+        }
+    }
+
+    /**
+     * Updates audio segment start, drop and preempt tone insertion clips
+     */
+    private void updateToneInsertionAudioClips()
+    {
+        mAudioSegmentStartTone = mUserPreferences.getPlaybackPreference().getStartTone();
+        mAudioSegmentDropTone = mUserPreferences.getPlaybackPreference().getDropTone();;
+    }
+
+    /**
+     * Indicates if this audio output doesn't currently have any audio segments queued for playback.
+     * @return true if empty
+     */
+    public boolean isEmpty()
+    {
+        return mAudioSegmentQueue.isEmpty();
+    }
+
+    /**
+     * Next audio segment queued for playback, without removing it from the queue.
+     * @return queued audio segment or null if the queue is empty.
+     */
+    AudioSegment peekQueuedAudioSegment()
+    {
+        return mAudioSegmentQueue.peek();
+    }
+
+    /**
+     * Removes the next audio segment from the queue, transferring it (and its consumer count) to the caller.
+     * @return queued audio segment or null if the queue is empty.
+     */
+    AudioSegment pollQueuedAudioSegment()
+    {
+        return mAudioSegmentQueue.poll();
+    }
+
+    /**
+     * Schedules the audio segment for playback.  The audio segment user count should already be incremented by the
+     * calling entity.
+     *
+     * @param audioSegment to schedule for playback.
+     */
+    public void play(AudioSegment audioSegment)
+    {
+        if(audioSegment != null)
+        {
+            //Audio segment user count has already been incremented by the external caller.
+            if(isDisabled())
+            {
+                audioSegment.decrementConsumerCount();
+            }
+            else
+            {
+                mAudioSegmentQueue.add(audioSegment);
+            }
+        }
+    }
+
+    /**
+     * Dispose of the currently assigned audio segment.
+     */
+    private void disposeCurrentAudioSegment()
+    {
+        if(mCurrentAudioSegment != null)
+        {
+            mCurrentAudioSegment.decrementConsumerCount();
+            mCurrentAudioSegment.removeIdentifierUpdateNotificationListener(this);
+            mCurrentAudioSegment = null;
+        }
+    }
+
+    /**
+     * Loads the next audio segment from the queue.
+     */
+    private void loadNextAudioSegment()
+    {
+        AudioSegment audioSegment = mAudioSegmentQueue.poll();
+
+        boolean verificationInProgress = (audioSegment != null);
+
+        while(verificationInProgress)
+        {
+            if(audioSegment != null)
+            {
+                //Throw away the audio segment if it has been flagged as do not monitor or is duplicate
+                if(isThrowaway(audioSegment))
+                {
+                    audioSegment.decrementConsumerCount();
+                    audioSegment = mAudioSegmentQueue.poll();
+                }
+                else
+                {
+                    verificationInProgress = false;
+                }
+            }
+            else
+            {
+                verificationInProgress = false;
+            }
+        }
+
+        mCurrentAudioSegment = audioSegment;
+
+        if(audioSegment != null)
+        {
+            mCurrentAudioSegment.addIdentifierUpdateNotificationListener(this);
+            broadcast(mCurrentAudioSegment.getIdentifierCollection());
+        }
+
+        mCurrentBufferIndex = -1;
+        mNoAudioFromSegmentIntervalCount = 0;
+    }
+
+    /**
+     * Manages a stream of float PCM audio samples.  Employs thread locking of the audio buffer to support both the
+     * audio processor thread and user initiated test audio replay.
+     */
+    static class AudioBuffer
+    {
+        private final Lock mLock = new ReentrantLock();
+        private float[] mBuffer = new float[0];
+
+        /**
+         * Indicates if the buffer has at least one interval of samples available
+         */
+        public boolean isFull()
+        {
+            return mBuffer.length >= SAMPLES_PER_INTERVAL;
+        }
+
+        /**
+         * Indicates if the buffer is empty
+         */
+        public boolean isEmpty()
+        {
+            return mBuffer.length == 0;
+        }
+
+        /**
+         * Appends the audio to the buffer
+         * @param audio to add
+         */
+        public void add(float[] audio)
+        {
+            if(audio != null)
+            {
+                mLock.lock();
+
+                try
+                {
+                    mBuffer = concatenate(mBuffer, audio);
+                }
+                finally
+                {
+                    mLock.unlock();
+                }
+            }
+        }
+
+        /**
+         * Inserts the audio to the front of the buffer.  This can be used to insert test audio ahead of any queued audio.
+         * @param audio to insert
+         */
+        public void insert(float[] audio)
+        {
+            if(audio != null)
+            {
+                mLock.lock();
+                try
+                {
+                    mBuffer = concatenate(audio, mBuffer);
+                }
+                finally
+                {
+                    mLock.unlock();
+                }
+            }
+        }
+
+        /**
+         * Replaces the content in the buffer with the audio argument
+         * @param audio to replace into the buffer
+         */
+        public void replace(float[] audio)
+        {
+            if(audio != null)
+            {
+                mLock.lock();
+
+                try
+                {
+                    mBuffer = audio;
+                }
+                finally
+                {
+                    mLock.unlock();
+                }
+            }
+        }
+
+        /**
+         * Concatenate two arrays.  Note: this does not null check either array.
+         * @param a first array
+         * @param b second array
+         * @return concatenated array
+         */
+        private static float[] concatenate(float[] a, float[] b)
+        {
+            a = Arrays.copyOf(a, a.length + b.length);
+            System.arraycopy(b, 0, a, a.length - b.length, b.length);
+            return a;
+        }
+
+        /**
+         * Retrieves an array of 160 samples if available, otherwise returns null.
+         * @return 160 samples or null.
+         */
+        public float[] get()
+        {
+            if(mBuffer.length >= SAMPLES_PER_INTERVAL)
+            {
+                mLock.lock();
+                try
+                {
+                    float[] fragment = Arrays.copyOf(mBuffer, SAMPLES_PER_INTERVAL);
+                    mBuffer = Arrays.copyOfRange(mBuffer, SAMPLES_PER_INTERVAL, mBuffer.length);
+                    return fragment;
+                }
+                finally
+                {
+                    mLock.unlock();
+                }
+            }
+
+            return null;
+        }
+
+        /**
+         * Flushes remaining samples from the buffer when the quantity is less than a full sample set.
+         * @return remaining samples or null.
+         */
+        public float[] flush()
+        {
+            mLock.lock();
+
+            try
+            {
+                if(mBuffer.length > 0)
+                {
+                    float[] fragment = Arrays.copyOf(mBuffer, SAMPLES_PER_INTERVAL);
+
+                    if(mBuffer.length > SAMPLES_PER_INTERVAL)
+                    {
+                        mBuffer = Arrays.copyOfRange(mBuffer, SAMPLES_PER_INTERVAL, mBuffer.length);
+                    }
+                    else
+                    {
+                        mBuffer = new float[0];
+                    }
+
+                    return fragment;
+                }
+
+                return null;
+            }
+            finally
+            {
+                mLock.unlock();
+            }
+        }
+    }
+}

src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java

@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -15,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
  */
 package io.github.dsheirer.audio.playback;
 
@@ -40,13 +39,6 @@ import io.github.dsheirer.settings.ColorSetting;
 import io.github.dsheirer.settings.Setting;
 import io.github.dsheirer.settings.SettingChangeListener;
 import io.github.dsheirer.settings.SettingsManager;
-import net.miginfocom.swing.MigLayout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.ImageIcon;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 import java.awt.Color;
 import java.awt.EventQueue;
 import java.awt.Font;
@@ -54,7 +46,17 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import net.miginfocom.swing.MigLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ * UI to wrap an audio channel and provide display of metadata and playback state information.
+ */
 public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, SettingChangeListener
 {
     private static final long serialVersionUID = 1L;
@@ -66,30 +68,36 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
     public static final String PROPERTY_COLOR_MUTED = PROPERTY_PREFIX + "muted";
     public static final String PROPERTY_COLOR_VALUE = PROPERTY_PREFIX + "value";
 
-    private Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16);
-
-    private Color mBackgroundColor;
-    private Color mLabelColor;
-    private Color mMutedColor;
-    private Color mValueColor;
-
-    private IconModel mIconModel;
-    private SettingsManager mSettingsManager;
-    private UserPreferences mUserPreferences;
-    private TalkgroupFormatPreference mTalkgroupFormatPreference;
-    private AudioOutput mAudioOutput;
-
-    private JLabel mMutedLabel = new JLabel("M");
-    private JLabel mChannelName = new JLabel(" ");
-    private JLabel mIconLabel = new JLabel(" ");
-    private JLabel mIdentifierLabel = new JLabel("-----");
+    private final AudioChannel mAudioChannel;
+    private final AliasModel mAliasModel;
+    private final IconModel mIconModel;
+    private final SettingsManager mSettingsManager;
+    private final UserPreferences mUserPreferences;
+    private final TalkgroupFormatPreference mTalkgroupFormatPreference;
     private Identifier mIdentifier;
     private List<Alias> mAliases = Collections.EMPTY_LIST;
-    private AliasModel mAliasModel;
-    private Lock mLock = new ReentrantLock();
+    private final Lock mLock = new ReentrantLock();
 
-    public AudioChannelPanel(IconModel iconModel, UserPreferences userPreferences, SettingsManager settingsManager,
-                             AudioOutput audioOutput, AliasModel aliasModel)
+    private final Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16);
+    private final Color mBackgroundColor;
+    private final Color mLabelColor;
+    private final Color mMutedColor;
+    private final Color mValueColor;
+    private final JLabel mMutedLabel = new JLabel("M");
+    private JLabel mChannelName = new JLabel(" ");
+    private final JLabel mIconLabel = new JLabel(" ");
+    private final JLabel mIdentifierLabel = new JLabel("-----");
+
+    /**
+     * Constructs an instance
+     * @param audioChannel to wrap by this panel
+     * @param aliasModel for alias lookup
+     * @param iconModel for icon lookup
+     * @param settingsManager for monitoring changes to tone insertion
+     * @param userPreferences for lookup of tone and other preferences
+     */
+    public AudioChannelPanel(AudioChannel audioChannel, AliasModel aliasModel, IconModel iconModel,
+                             SettingsManager settingsManager, UserPreferences userPreferences)
     {
         mIconModel = iconModel;
         mSettingsManager = settingsManager;
@@ -97,12 +105,12 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
         mAliasModel = aliasModel;
         mUserPreferences = userPreferences;
         mTalkgroupFormatPreference = mUserPreferences.getTalkgroupFormatPreference();
-        mAudioOutput = audioOutput;
+        mAudioChannel = audioChannel;
 
-        if(mAudioOutput != null)
+        if(mAudioChannel != null)
         {
-            mAudioOutput.addAudioEventListener(this);
-            mAudioOutput.setIdentifierCollectionListener(new AudioMetadataProcessor());
+            mAudioChannel.addAudioEventListener(this);
+            mAudioChannel.setIdentifierCollectionListener(new AudioMetadataProcessor());
         }
 
         mBackgroundColor = SystemProperties.getInstance().get(PROPERTY_COLOR_BACKGROUND, Color.BLACK);
@@ -131,10 +139,10 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
         //Deregister from receiving preference update notifications
         MyEventBus.getGlobalEventBus().unregister(this);
 
-        if(mAudioOutput != null)
+        if(mAudioChannel != null)
         {
-            mAudioOutput.removeAudioEventListener(this);
-            mAudioOutput.removeAudioMetadataListener();
+            mAudioChannel.removeAudioEventListener(this);
+            mAudioChannel.removeAudioMetadataListener();
         }
     }
 
@@ -152,7 +160,7 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
         mMutedLabel.setVisible(false);
         add(mMutedLabel);
 
-        mChannelName = new JLabel(mAudioOutput != null ? mAudioOutput.getChannelName() : " ");
+        mChannelName = new JLabel(mAudioChannel != null ? mAudioChannel.getChannelName() : " ");
         mChannelName.setFont(mFont);
         mChannelName.setForeground(mLabelColor);
         add(mChannelName);
@@ -172,25 +180,11 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
         switch(audioEvent.getType())
         {
             case AUDIO_STOPPED:
-                EventQueue.invokeLater(new Runnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        resetLabels();
-                    }
-                });
+                EventQueue.invokeLater(this::resetLabels);
                 break;
             case AUDIO_MUTED:
             case AUDIO_UNMUTED:
-                EventQueue.invokeLater(new Runnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        mMutedLabel.setVisible(mAudioOutput.isMuted());
-                    }
-                });
+                EventQueue.invokeLater(() -> mMutedLabel.setVisible(mAudioChannel.isMuted()));
                 break;
             default:
                 break;

src/main/java/io/github/dsheirer/audio/playback/AudioChannelsPanel.java

@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -15,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
  */
 package io.github.dsheirer.audio.playback;
 
@@ -24,18 +23,26 @@ import io.github.dsheirer.audio.IAudioController;
 import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.settings.SettingsManager;
+import java.awt.Color;
+import java.awt.Component;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import java.awt.Color;
-import java.awt.Component;
-import java.util.List;
 
+/**
+ * Displays one or more audio channel panels.
+ */
 public class AudioChannelsPanel extends JPanel
 {
-    private static final long serialVersionUID = 1L;
-
+    /**
+     * Constructs an instance
+     * @param iconModel for icon access
+     * @param userPreferences to monitor for audio playback changes
+     * @param settingsManager for tone insertion settings
+     * @param controller for the audio channels
+     * @param aliasModel for accessing aliases
+     */
     public AudioChannelsPanel(IconModel iconModel, UserPreferences userPreferences, SettingsManager settingsManager,
                               IAudioController controller, AliasModel aliasModel)
     {
@@ -44,15 +51,13 @@ public class AudioChannelsPanel extends JPanel
 
         setBackground(Color.BLACK);
 
-        List<AudioOutput> outputs = controller.getAudioOutputs();
-
         addSeparator();
 
-        for(int x = 0; x < outputs.size(); x++)
+        for(int x = 0; x < controller.getAudioChannels().size(); x++)
         {
-            add(new AudioChannelPanel(iconModel, userPreferences, settingsManager, outputs.get(x), aliasModel));
+            add(new AudioChannelPanel(controller.getAudioChannels().get(x), aliasModel, iconModel, settingsManager, userPreferences));
 
-            if(x < outputs.size() - 1)
+            if(x < controller.getAudioChannels().size() - 1)
             {
                 addSeparator();
             }
@@ -60,10 +65,10 @@ public class AudioChannelsPanel extends JPanel
 
 		/* Add an empty channel panel so that the panel is sized appropriately
          * for either a single channel or two channels */
-        if(outputs.size() == 1)
+        if(controller.getAudioChannels().size() == 1)
         {
             addSeparator();
-            add(new AudioChannelPanel(iconModel, userPreferences, settingsManager, null, aliasModel), "growx");
+            add(new AudioChannelPanel(null, aliasModel, iconModel, settingsManager, userPreferences), "growx");
         }
     }
 
@@ -81,6 +86,9 @@ public class AudioChannelsPanel extends JPanel
         }
     }
 
+    /**
+     * Adds a separator to this panel.
+     */
     private void addSeparator()
     {
         JSeparator separator = new JSeparator(JSeparator.VERTICAL);

src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -18,22 +18,14 @@
  */
 package io.github.dsheirer.audio.playback;
 
-import com.google.common.eventbus.Subscribe;
 import io.github.dsheirer.audio.AudioEvent;
-import io.github.dsheirer.audio.AudioSegment;
 import io.github.dsheirer.controller.NamingThreadFactory;
-import io.github.dsheirer.eventbus.MyEventBus;
-import io.github.dsheirer.identifier.IdentifierCollection;
-import io.github.dsheirer.identifier.IdentifierUpdateNotification;
 import io.github.dsheirer.log.LoggingSuppressor;
-import io.github.dsheirer.preference.PreferenceType;
-import io.github.dsheirer.preference.UserPreferences;
-import io.github.dsheirer.sample.Broadcaster;
-import io.github.dsheirer.sample.Listener;
-import io.github.dsheirer.source.mixer.MixerChannel;
+import io.github.dsheirer.preference.playback.PlayTestAudioRequest;
 import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -41,11 +33,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.BooleanControl;
+import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Control;
+import javax.sound.sampled.DataLine;
 import javax.sound.sampled.FloatControl;
-import javax.sound.sampled.Line;
 import javax.sound.sampled.LineEvent;
 import javax.sound.sampled.LineListener;
 import javax.sound.sampled.LineUnavailableException;
@@ -56,498 +47,214 @@ import javax.sound.sampled.SourceDataLine;
  * Audio output/playback channel for a single audio mixer channel.  Providers support for playback of audio segments
  * and broadcasts audio segment metadata to registered listeners (ie gui components).
  */
-public abstract class AudioOutput implements LineListener, Listener<IdentifierUpdateNotification>
+public class AudioOutput implements LineListener
 {
-    private final static Logger mLog = LoggerFactory.getLogger(AudioOutput.class);
+    private static final Logger mLog = LoggerFactory.getLogger(AudioOutput.class);
     private static final LoggingSuppressor LOGGING_SUPPRESSOR = new LoggingSuppressor(mLog);
-    private int mBufferStartThreshold;
-    private int mBufferStopThreshold;
-    private Listener<IdentifierCollection> mIdentifierCollectionListener;
-    private Broadcaster<AudioEvent> mAudioEventBroadcaster = new Broadcaster<>();
-    private SourceDataLine mOutput;
-    private Mixer mMixer;
-    private MixerChannel mMixerChannel;
+    private static final int BUFFER_SIZE_SAMPLES = 1000; //At 8 kHz audio
+    private final AudioPlaybackDeviceDescriptor mAudioPlaybackDeviceDescriptor;
+    private final AudioProvider mAudioProvider;
     private FloatControl mGainControl;
-    private BooleanControl mMuteControl;
-    private AudioEvent mAudioStartEvent;
-    private AudioEvent mAudioStopEvent;
-    private boolean mCanProcessAudio = false;
-    private LinkedTransferQueue<AudioSegment> mAudioSegmentQueue = new LinkedTransferQueue<>();
-    private AudioSegment mCurrentAudioSegment;
-    private int mCurrentBufferIndex = 0;
-    private UserPreferences mUserPreferences;
-    private ByteBuffer mAudioSegmentStartTone;
-    private ByteBuffer mAudioSegmentDropTone;
-    private boolean mRunning = false;
     private ScheduledExecutorService mScheduledExecutorService;
     private ScheduledFuture<?> mProcessorFuture;
-    private boolean mDropDuplicates;
-    private long mOutputLastTimestamp = 0;
-    private static final long STALE_PLAYBACK_THRESHOLD_MS = 500;
-    private AudioFormat mAudioFormat;
-    private Line.Info mLineInfo;
-    private int mRequestedBufferSize;
+    private SourceDataLine mSourceDataLine;
+    private boolean mCanProcessAudio = false;
+    private boolean mRunning = false;
+
 
     /**
-     * Single audio channel playback with automatic starting and stopping of the
-     * underlying sourcedataline specified by the mixer and mixer channel
-     * arguments.
+     * Audio output for the selected audio playback device and provider.  Opens a SourceDataLine from the miser for the
+     * audio format specified in the descriptor.  Employs a single threaded executor to process audio 10x a second and
+     * manages the start/stop control for the dataline based on audio availability.
      *
-     * Maintains an internal non-blocking audio packet queue and processes this
-     * queue 25 times a second (every 40 ms).
-     *
-     * @param mixer to obtain source data line
-     * @param mixerChannel either mono or left/right stereo
-     * @param audioFormat to use during playback
-     * @param lineInfo to use when obtaining the source data line
-     * @param requestedBufferSize of approximately 1 second of audio
+     * @param descriptor for the mixer and audio format
+     * @param audioProvider for access to audio from audio segments
      */
-    public AudioOutput(Mixer mixer, MixerChannel mixerChannel, AudioFormat audioFormat, Line.Info lineInfo,
-                       int requestedBufferSize, UserPreferences userPreferences)
+    public AudioOutput(AudioPlaybackDeviceDescriptor descriptor, AudioProvider audioProvider)
     {
-        mMixer = mixer;
-        mMixerChannel = mixerChannel;
-        mScheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory(
-                "sdrtrunk audio output " + mixerChannel.name()));
-        mUserPreferences = userPreferences;
-        mDropDuplicates = mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled();
-        mAudioFormat = audioFormat;
-        mLineInfo = lineInfo;
-        mRequestedBufferSize = requestedBufferSize;
+        mAudioProvider = audioProvider;
+        Mixer mixer = AudioSystem.getMixer(descriptor.getMixerInfo());
 
-        try
+        if(mixer == null)
         {
-            mOutput = (SourceDataLine) mMixer.getLine(mLineInfo);
+            List<AudioPlaybackDeviceDescriptor> descriptors = AudioPlaybackDeviceManager.getAudioPlaybackDevices();
 
-            if(mOutput != null)
+            int selected = 0;
+
+            while((mixer == null) && (selected < descriptors.size()))
             {
-                mOutput.open(audioFormat, requestedBufferSize);
+                descriptor = descriptors.get(selected++);
+                mixer = AudioSystem.getMixer(descriptor.getMixerInfo());
+            }
+        }
 
-                //Start threshold: buffer is full with 10% or less of capacity remaining
-                mBufferStartThreshold = (int) (mOutput.getBufferSize() * 0.10);
+        mAudioPlaybackDeviceDescriptor = descriptor;
 
-                //Stop threshold: buffer is empty with 90% or more capacity available
-                mBufferStopThreshold = (int) (mOutput.getBufferSize() * 0.90);
+        if(mixer != null)
+        {
+            try
+            {
+                mSourceDataLine = (SourceDataLine) mixer.getLine(new DataLine.Info(SourceDataLine.class,
+                        descriptor.getAudioFormat()));
 
-                mOutput.addLineListener(this);
-
-                if(mOutput != null)
+                if(mSourceDataLine != null)
                 {
+                    mSourceDataLine.addLineListener(this);
                     try
                     {
-                        Control gain = mOutput.getControl(FloatControl.Type.MASTER_GAIN);
+                        Control gain = mSourceDataLine.getControl(FloatControl.Type.MASTER_GAIN);
                         mGainControl = (FloatControl) gain;
                     }
                     catch(IllegalArgumentException iae)
                     {
                         LOGGING_SUPPRESSOR.error("no gain control", 2, "Couldn't obtain " +
-                            "MASTER GAIN control for stereo line [" + mixer.getMixerInfo().getName() + " | " +
-                                getChannelName() + "]");
+                                "MASTER GAIN control for stereo line [" + mixer.getMixerInfo().getName() + "]");
                     }
 
-                    try
-                    {
-                        Control mute = mOutput.getControl(BooleanControl.Type.MUTE);
-                        mMuteControl = (BooleanControl) mute;
-                    }
-                    catch(IllegalArgumentException iae)
-                    {
-                        LOGGING_SUPPRESSOR.error("no mute control", 2, "Couldn't obtain " +
-                            "MUTE control for stereo line [" + mixer.getMixerInfo().getName() + " | " +
-                            getChannelName() + "]");
-                    }
-
-					//Run the queue processor task every 100 milliseconds or 10 times a second
-                    mProcessorFuture = mScheduledExecutorService.scheduleAtFixedRate(new AudioSegmentProcessor(),
-                        0, 100, TimeUnit.MILLISECONDS);
+                    mCanProcessAudio = true;
                 }
+            }
+            catch(LineUnavailableException e)
+            {
+                mLog.error("Couldn't open source data line for mixer: " + descriptor.getMixerInfo().getName(), e);
+            }
 
-                mAudioStartEvent = new AudioEvent(AudioEvent.Type.AUDIO_STARTED, getChannelName());
-                mAudioStopEvent = new AudioEvent(AudioEvent.Type.AUDIO_STOPPED, getChannelName());
-                mCanProcessAudio = true;
+            if(mCanProcessAudio)
+            {
+                openSourceDataLine();
+
+                //The audio provider gives us audio 160 samples per interval representing 20 milliseconds of audio.
+                // Run the scheduled executor at just slightly faster than that time, recognizing that it will
+                // block against the mixer source data line until it can write all 160 samples.
+                mScheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory(
+                        "sdrtrunk audio output " + descriptor.getMixerInfo().getName()));
+                mProcessorFuture = mScheduledExecutorService.scheduleAtFixedRate(new AudioProcessor(),
+                        0, 19, TimeUnit.MILLISECONDS);
+            }
+            else
+            {
+                //Disable each of the audio channels so they don't queue audio segments.
+                for(AudioChannel audioChannel: mAudioProvider.getAudioChannels())
+                {
+                    audioChannel.setDisabled(true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Opens and starts the source data line.
+     */
+    private void openSourceDataLine()
+    {
+        try
+        {
+            if(mSourceDataLine != null && !mSourceDataLine.isOpen())
+            {
+                int bufferSize = BUFFER_SIZE_SAMPLES * 2 * mAudioPlaybackDeviceDescriptor.getAudioFormat().getChannels();
+                mSourceDataLine.open(mAudioProvider.getAudioFormat(), bufferSize);
+                bufferSize = mSourceDataLine.getBufferSize();
+                //Fill the line with silence so we can start it
+                mSourceDataLine.write(new byte[bufferSize], 0, bufferSize);
+                mSourceDataLine.start();
+
+                for(AudioChannel audioChannel: mAudioProvider.getAudioChannels())
+                {
+                    audioChannel.setDisabled(false);
+                }
             }
         }
         catch(LineUnavailableException e)
         {
-            mLog.error("Couldn't obtain audio source data line for audio output - mixer [" +
-                mMixer.getMixerInfo().getName() + "]");
-        }
+            LOGGING_SUPPRESSOR.error("Can't open", 3, "Error opening source data line", e);
+            mRunning = false;
 
-        updateToneInsertionAudioClips();
-
-        //Register to receive preference update notifications so we can update the preference items
-        MyEventBus.getGlobalEventBus().register(this);
-    }
-
-    /**
-     * Indicates if this audio output doesn't currently have any audio segments queued for playback.
-     * @return true if empty
-     */
-    public boolean isEmpty()
-    {
-        return mAudioSegmentQueue.isEmpty();
-    }
-
-    /**
-     * Schedules the audio segment for playback.  The audio segment user count should already be incremented by the
-     * calling entity.
-     *
-     * @param audioSegment to schedule for playback.
-     */
-    public void play(AudioSegment audioSegment)
-    {
-        if(audioSegment != null)
-        {
-            //Audio segment use count has already been incremented by the external caller.
-            mAudioSegmentQueue.add(audioSegment);
-        }
-    }
-
-    /**
-     * Indicates if the audio segment is linked to the current playback audio segment
-     */
-    public boolean isLinkedTo(AudioSegment audioSegment)
-    {
-        return audioSegment.isLinked() && audioSegment.isLinkedTo(mCurrentAudioSegment);
-    }
-
-    /**
-     * Receive and process audio identifier update notifications.
-     */
-    @Override
-    public void receive(IdentifierUpdateNotification identifierUpdateNotification)
-    {
-        if(mCurrentAudioSegment != null)
-        {
-            IdentifierCollection identifierCollection = mCurrentAudioSegment.getIdentifierCollection();
-
-            if(identifierCollection != null)
+            for(AudioChannel audioChannel: mAudioProvider.getAudioChannels())
             {
-                broadcast(identifierCollection);
+                audioChannel.setDisabled(true);
             }
         }
     }
 
     /**
-     * Guava event bus notifications that the preferences have been updated, so that we can update audio segment tones.
+     * Plays the test audio over the selected audio channel(s)
+     * @param request to play test audio
      */
-    @Subscribe
-    public void preferenceUpdated(PreferenceType preferenceType)
+    public void playTestAudio(PlayTestAudioRequest request)
     {
-        if(preferenceType == PreferenceType.PLAYBACK)
+        //If we're not running, resize the audio samples to fill the buffer enough to trigger playback.
+        float[] audio = mRunning ? request.audio() : Arrays.copyOf(request.audio(), BUFFER_SIZE_SAMPLES);
+
+        List<AudioChannel> channels = mAudioProvider.getAudioChannels();
+
+        if(request.isAllChannels())
         {
-            updateToneInsertionAudioClips();
-        }
-        else if(preferenceType == PreferenceType.DUPLICATE_CALL_DETECTION)
-        {
-            mDropDuplicates = mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled();
-        }
-    }
-
-    /**
-     * Updates audio segment start, drop and preempt tone insertion clips
-     */
-    private void updateToneInsertionAudioClips()
-    {
-        mAudioSegmentStartTone = null;
-        mAudioSegmentDropTone = null;
-
-        float[] start = mUserPreferences.getPlaybackPreference().getStartTone();
-
-        if(start != null)
-        {
-            mAudioSegmentStartTone = convert(start);
-        }
-
-        float[] drop = mUserPreferences.getPlaybackPreference().getDropTone();
-
-        if(drop != null)
-        {
-            mAudioSegmentDropTone = convert(drop);
-        }
-    }
-
-    /**
-     * Writes the audio buffer data to the source data line.  If the data line is not currently playing, write as
-     * much of the buffer to the data line as will fit, start the dataline, and then finish writing the residual
-     * buffer content to the data line as a blocking call.
-     *
-     * @param buffer of audio to playback
-     */
-    private void playAudio(ByteBuffer buffer)
-    {
-        if(mOutput == null)
-        {
-            LOGGING_SUPPRESSOR.error("null output", 2, "Audio Output is null - ignoring audio playback request");
-            return;
-        }
-
-        if(buffer != null)
-        {
-            int wrote = 0;
-
-            //If the output data line is not running, we can only write up to the available capacity.  So, only write
-            //what will fit initially, start playback, and then use a blocking write for the remainder.
-            if(!mOutput.isRunning())
+            for(AudioChannel channel : channels)
             {
-                int toWrite = mOutput.available();
-
-                if(toWrite > buffer.array().length)
-                {
-                    toWrite = buffer.array().length;
-                }
-
-                //Top off the buffer and check if we can start it
-                wrote += mOutput.write(buffer.array(), 0, toWrite);
-                mOutputLastTimestamp = System.currentTimeMillis();
-
-                checkStart();
-
-                 //Something is causing the source data line to fail to accept audio byte data via the write() method
-                 //and this seems to have started around JDK22, maybe.  We can detect when this happens and close() and
-                 //reopen the data line to clear the error.
-                if(!mOutput.isRunning() && wrote <= 0 && buffer.array().length > 0)
-                {
-                    mOutput.close();
-
-                    try
-                    {
-                        mOutput = (SourceDataLine)mMixer.getLine(mLineInfo);
-
-                        if(mOutput != null)
-                        {
-                            try
-                            {
-                                Control gain = mOutput.getControl(FloatControl.Type.MASTER_GAIN);
-                                mGainControl = (FloatControl) gain;
-                            }
-                            catch(IllegalArgumentException iae)
-                            {
-                                LOGGING_SUPPRESSOR.error("no gain control", 2, "Couldn't obtain " +
-                                        "MASTER GAIN control for stereo line [" + mMixer.getMixerInfo().getName() + " | " +
-                                        getChannelName() + "]");
-                            }
-
-                            try
-                            {
-                                Control mute = mOutput.getControl(BooleanControl.Type.MUTE);
-                                mMuteControl = (BooleanControl) mute;
-                            }
-                            catch(IllegalArgumentException iae)
-                            {
-                                LOGGING_SUPPRESSOR.error("no mute control", 2, "Couldn't obtain " +
-                                        "MASTER MUTE control for stereo line [" + mMixer.getMixerInfo().getName() + " | " +
-                                        getChannelName() + "]");
-                            }
-
-                            LOGGING_SUPPRESSOR.info("reopen audio output success", 2,
-                                    "Closed and reopened audio output - success - mOutput is not null");
-                        }
-                        else
-                        {
-                            LOGGING_SUPPRESSOR.info("reopen audio output fail", 2,
-                                    "Closed and reopened audio output - fail - mOutput is null");
-                            return;
-                        }
-                    }
-                    catch(LineUnavailableException lue)
-                    {
-                        LOGGING_SUPPRESSOR.error("reopen fail for lua", 2, "Attempt to reopen " +
-                                "audio source data line failed", lue);
-                        return;
-                    }
-
-                    try
-                    {
-                        mOutput.open(mAudioFormat, mRequestedBufferSize);
-
-                        //Start threshold: buffer is full with 10% or less of capacity remaining
-                        mBufferStartThreshold = (int) (mOutput.getBufferSize() * 0.10);
-
-                        //Stop threshold: buffer is empty with 90% or more capacity available
-                        mBufferStopThreshold = (int) (mOutput.getBufferSize() * 0.90);
-
-                        try
-                        {
-                            Control gain = mOutput.getControl(FloatControl.Type.MASTER_GAIN);
-                            mGainControl = (FloatControl) gain;
-                        }
-                        catch(IllegalArgumentException iae)
-                        {
-                            mLog.warn("Couldn't obtain MASTER GAIN control for stereo line [" + getChannelName() +
-                                    "] after reopening the source data line");
-                        }
-
-                        try
-                        {
-                            Control mute = mOutput.getControl(BooleanControl.Type.MUTE);
-                            mMuteControl = (BooleanControl) mute;
-                        }
-                        catch(IllegalArgumentException iae)
-                        {
-                            mLog.warn("Couldn't obtain MUTE control for stereo line [" + getChannelName() +
-                                    "] after reopening the source data line");
-                        }
-
-                        mAudioStartEvent = new AudioEvent(AudioEvent.Type.AUDIO_STARTED, getChannelName());
-                        mAudioStopEvent = new AudioEvent(AudioEvent.Type.AUDIO_STOPPED, getChannelName());
-                        mCanProcessAudio = true;
-                    }
-                    catch(LineUnavailableException e)
-                    {
-                        LOGGING_SUPPRESSOR.error("failed reopen source data line lua", 2,
-                                "Failed to (re)open the source data line for audio output - mixer [" +
-                                mMixer.getMixerInfo().getName() + "]");
-                        return;
-                    }
-                }
-            }
-
-            if(mOutput.isRunning() && wrote < buffer.array().length)
-            {
-                //This will block until the buffer is fully written to the data line
-                mOutput.write(buffer.array(), wrote, buffer.array().length - wrote);
-                mOutputLastTimestamp = System.currentTimeMillis();
+                channel.playTest(audio);
             }
         }
-    }
-
-    /**
-     * Dispose of the currently assigned audio segment.
-     */
-    private void disposeCurrentAudioSegment()
-    {
-        if(mCurrentAudioSegment != null)
+        else if(request.channel() < channels.size())
         {
-            mCurrentAudioSegment.decrementConsumerCount();
-            mCurrentAudioSegment.removeIdentifierUpdateNotificationListener(this);
-            mCurrentAudioSegment = null;
-            broadcast(null);
+            channels.get(request.channel()).playTest(audio);
+        }
+        else if(!channels.isEmpty())
+        {
+            channels.getFirst().playTest(audio);
+        }
+        else
+        {
+            LOGGING_SUPPRESSOR.info("No Audio Channels", 2,
+                    "Unable to play test audio - no audio channels configured currently");
         }
     }
 
     /**
-     * Loads the next audio segment from the queue.
+     * Audio playback device descriptor for this audio output
      */
-    private void loadNextAudioSegment()
+    public AudioPlaybackDeviceDescriptor getAudioPlaybackDeviceDescriptor()
     {
-        AudioSegment audioSegment = mAudioSegmentQueue.poll();
-
-        boolean verificationInProgress = (audioSegment != null);
-
-        while(verificationInProgress)
-        {
-            if(audioSegment != null)
-            {
-                //Throw away the audio segment if it has been flagged as do not monitor or is duplicate
-                if(isThrowaway(audioSegment))
-                {
-                    audioSegment.decrementConsumerCount();
-                    audioSegment = mAudioSegmentQueue.poll();
-                }
-                else
-                {
-                    verificationInProgress = false;
-                }
-            }
-            else
-            {
-                verificationInProgress = false;
-            }
-        }
-
-        mCurrentAudioSegment = audioSegment;
-
-        if(audioSegment != null)
-        {
-            mCurrentAudioSegment.addIdentifierUpdateNotificationListener(this);
-            broadcast(mCurrentAudioSegment.getIdentifierCollection());
-        }
-
-        mCurrentBufferIndex = 0;
+        return mAudioPlaybackDeviceDescriptor;
     }
 
     /**
-     * Indicates if the audio segment should be thrown away because it is marked as duplicate or do-not-monitor.
-     * @param audioSegment to evaluate
-     * @return true if the audio should be thrown away.
+     * Audio provider managed by this audio output
      */
-    private boolean isThrowaway(AudioSegment audioSegment)
+    public AudioProvider getAudioProvider()
     {
-        return audioSegment != null && (audioSegment.isDoNotMonitor() || mDropDuplicates && (audioSegment.isDuplicate()));
+        return mAudioProvider;
     }
 
     /**
-     * Manage audio segment playback and process audio segment buffers.  This method is designed to be called
-     * by a threaded processor repeatedly to playback the current audio segment and check for and start newly
-     * added audio segments.  It also handles starting and stopping the playback source data line to avoid audio
-     * discontinuities due to buffer underruns.
+     * Process audio from the audio provider and writes it to the mixer's source data line.  Calls to this method can
+     * block on the source data line until it has capacity available to accept the audio.
      */
     private void processAudio()
     {
-        if(mCurrentAudioSegment == null)
+        if(mSourceDataLine == null)
         {
-            loadNextAudioSegment();
+            LOGGING_SUPPRESSOR.error("null output", 2,
+                    "Audio Output source data line is null - ignoring audio playback request");
+            return;
         }
 
-        //Evaluate current audio segment to see if the status has changed for duplicate or do-not-monitor.
-        while(isThrowaway(mCurrentAudioSegment))
+        ByteBuffer buffer = mAudioProvider.getAudio();
+
+        if(buffer != null)
         {
-            if(mCurrentBufferIndex > 0)
+            //This is a blocking method call.
+            int wrote = mSourceDataLine.write(buffer.array(), 0, buffer.array().length);
+
+            //Around JDK 22 something started causing the source data line to fail to accept audio byte data via the
+            //write() method. When this happens, close and reopen the data line to clear the error state.
+            if(wrote <= 0)
             {
-                playAudio(mAudioSegmentDropTone);
-            }
-
-            disposeCurrentAudioSegment();
-            loadNextAudioSegment();
-        }
-
-        while(mCurrentAudioSegment != null && mCurrentBufferIndex < mCurrentAudioSegment.getAudioBufferCount())
-        {
-            //Continuously evaluate current audio segment to see if the status has changed for duplicate or do-not-monitor.
-            if(isThrowaway(mCurrentAudioSegment))
-            {
-                if(mCurrentBufferIndex > 0)
-                {
-                    playAudio(mAudioSegmentDropTone);
-                }
-
-                disposeCurrentAudioSegment();
-            }
-            else
-            {
-                if(mCurrentBufferIndex == 0)
-                {
-                    playAudio(mAudioSegmentStartTone);
-                }
-
-                try
-                {
-                    float[] audioBuffer = mCurrentAudioSegment.getAudioBuffers().get(mCurrentBufferIndex++);
-
-                    if(audioBuffer != null)
-                    {
-                        ByteBuffer audio = convert(audioBuffer);
-                        //This call blocks until all audio bytes are dumped into the data line.
-                        playAudio(audio);
-                    }
-                }
-                catch(Exception e)
-                {
-                    mLog.error("Error while processing audio for [" + mMixerChannel.name() + "]", e);
-                }
+                LOGGING_SUPPRESSOR.info("Stalled Data Line", 3,
+                        "Audio playback data line has stopped accepting samples - recycling to clear the error");
+                mSourceDataLine.close();
+                openSourceDataLine();
             }
         }
-
-        //Check for completed and fully-played audio segment to closeout
-        if(mCurrentAudioSegment != null &&
-           mCurrentAudioSegment.isComplete() &&
-           (mCurrentBufferIndex >= mCurrentAudioSegment.getAudioBufferCount()))
-        {
-            disposeCurrentAudioSegment();
-        }
-
-        checkStop();
     }
 
     /**
@@ -555,156 +262,30 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
      */
     public void dispose()
     {
-        MyEventBus.getGlobalEventBus().unregister(this);
-        mCanProcessAudio = false;
-
         if(mProcessorFuture != null)
         {
             mProcessorFuture.cancel(true);
         }
-
         mProcessorFuture = null;
-        disposeCurrentAudioSegment();
-        mAudioEventBroadcaster.clear();
-        mIdentifierCollectionListener = null;
 
-        if(mOutput != null)
+        if(mScheduledExecutorService != null)
         {
-            mOutput.close();
+            mScheduledExecutorService.shutdownNow();
+            mScheduledExecutorService = null;
         }
 
-        mOutput = null;
+        mAudioProvider.dispose();
+        mCanProcessAudio = false;
+
+        if(mSourceDataLine != null)
+        {
+            mSourceDataLine.stop();
+            mSourceDataLine.flush();
+            mSourceDataLine.close();
+        }
+        mSourceDataLine = null;
         mGainControl = null;
-        mMuteControl = null;
-    }
-
-    /**
-     * Converts the audio buffer data into a byte buffer format appropriate for the underlying source data line.
-     */
-    protected abstract ByteBuffer convert(float[] buffer);
-
-    /**
-     * Audio output channel name
-     */
-    public String getChannelName()
-    {
-        return mMixerChannel.getLabel();
-    }
-
-    /**
-     * Mixer Channel for this audio output
-     */
-    protected MixerChannel getMixerChannel()
-    {
-        return mMixerChannel;
-    }
-
-    /**
-     * Registers a single listener to receive audio start and audio stop events
-     */
-    public void addAudioEventListener(Listener<AudioEvent> listener)
-    {
-        mAudioEventBroadcaster.addListener(listener);
-    }
-
-    public void removeAudioEventListener(Listener<AudioEvent> listener)
-    {
-        mAudioEventBroadcaster.removeListener(listener);
-    }
-
-    /**
-     * Broadcasts an audio event to the registered listener
-     */
-    private void broadcastAudioEvent(AudioEvent audioEvent)
-    {
-        mAudioEventBroadcaster.broadcast(audioEvent);
-    }
-
-    /**
-     * Registers a single listener to receive the audio metadata from each
-     * audio packet
-     */
-    public void setIdentifierCollectionListener(Listener<IdentifierCollection> listener)
-    {
-        mIdentifierCollectionListener = listener;
-    }
-
-    /**
-     * Unregisters the current audio metadata listener
-     */
-    public void removeAudioMetadataListener()
-    {
-        mIdentifierCollectionListener = null;
-    }
-
-    /**
-     * Broadcasts audio identifier collection metadata to the registered listener
-     */
-    private void broadcast(IdentifierCollection identifierCollection)
-    {
-        if(mIdentifierCollectionListener != null)
-        {
-            mIdentifierCollectionListener.receive(identifierCollection);
-        }
-    }
-
-    /**
-     * Starts audio playback once audio buffer is almost full and remaining capacity falls below the start threshold.
-     *
-     * Note: this method should only be invoked from the processAudio() method
-     */
-    private void checkStart()
-    {
-        if(mCanProcessAudio && !mOutput.isRunning() && mOutput.available() <= mBufferStartThreshold)
-        {
-            mOutput.start();
-            mRunning = true;
-        }
-    }
-
-    /**
-     * Stops audio playback and drains the audio buffer to empty when the audio buffer is mostly empty and the
-     * available buffer capacity exceeds the stop threshold
-     *
-     * Note: this method should only be invoked from the processAudio() method
-     */
-    private void checkStop()
-    {
-        if(mRunning)
-        {
-            //If the output buffer falls below the threshold then drain the output and stop playback
-            if(mOutput.isRunning())
-            {
-                if(mOutput.available() >= mBufferStopThreshold)
-                {
-                    mOutput.drain();
-                    mOutput.stop();
-                    mRunning = false;
-                }
-                //Detect when we have a partially filled output that will neither start nor stop and the last write
-                //timestamp was more than the staleness threshold (500 ms) -- stop the output and discard stale contents
-                else if(mOutput.available() < mBufferStopThreshold &&
-                        mOutput.available() > mBufferStartThreshold &&
-                        (System.currentTimeMillis() - mOutputLastTimestamp >= STALE_PLAYBACK_THRESHOLD_MS))
-                {
-                    mOutput.stop();
-                    //Discard the stale buffer contents.
-                    mOutput.flush();
-                    mRunning = false;
-                }
-            }
-            //If output playback stopped on its own because the buffer emptied, then cleanup
-            else
-            {
-                mRunning = false;
-            }
-
-            //If we stopped audio playback, broadcast a null identifier to clear the gui panel
-            if(!mRunning)
-            {
-                broadcast(null);
-            }
-        }
+        mRunning = false;
     }
 
     /**
@@ -712,11 +293,13 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
      */
     public void setMuted(boolean muted)
     {
-        if(mMuteControl != null)
+        for(AudioChannel audioChannel: mAudioProvider.getAudioChannels())
         {
-            mMuteControl.setValue(muted);
-            broadcastAudioEvent(new AudioEvent(muted ? AudioEvent.Type.AUDIO_MUTED : AudioEvent.Type.AUDIO_UNMUTED, getChannelName()));
+            audioChannel.setMuted(muted);
         }
+
+        AudioEvent.Type type = muted ? AudioEvent.Type.AUDIO_MUTED : AudioEvent.Type.AUDIO_UNMUTED;
+        mAudioProvider.notify(type);
     }
 
     /**
@@ -724,9 +307,9 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
      */
     public boolean isMuted()
     {
-        if(mMuteControl != null)
+        if(!mAudioProvider.getAudioChannels().isEmpty())
         {
-            return mMuteControl.getValue();
+            return mAudioProvider.getAudioChannels().getFirst().isMuted();
         }
 
         return false;
@@ -759,20 +342,20 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
 
         if(type == LineEvent.Type.START)
         {
-            mAudioEventBroadcaster.broadcast(mAudioStartEvent);
+            mAudioProvider.notify(AudioEvent.Type.AUDIO_STARTED);
         }
         else if(type == LineEvent.Type.STOP)
         {
-            mAudioEventBroadcaster.broadcast(mAudioStopEvent);
+            mAudioProvider.notify(AudioEvent.Type.AUDIO_STOPPED);
         }
     }
 
     /**
-     * Runnable audio segment processor
+     * Audio Processor thread
      */
-    public class AudioSegmentProcessor implements Runnable
+    public class AudioProcessor implements Runnable
     {
-        private AtomicBoolean mProcessing = new AtomicBoolean();
+        private final AtomicBoolean mProcessing = new AtomicBoolean();
 
         @Override
         public void run()

src/main/java/io/github/dsheirer/audio/playback/AudioPanel.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -20,8 +20,6 @@ package io.github.dsheirer.audio.playback;
 
 import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.AudioEvent;
-import io.github.dsheirer.audio.AudioException;
-import io.github.dsheirer.audio.IAudioController;
 import io.github.dsheirer.eventbus.MyEventBus;
 import io.github.dsheirer.gui.preference.PreferenceEditorType;
 import io.github.dsheirer.gui.preference.ViewUserPreferenceEditorRequest;
@@ -29,81 +27,77 @@ import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.settings.SettingsManager;
-import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import jiconfont.icons.font_awesome.FontAwesome;
-import jiconfont.swing.IconFontSwing;
+import io.github.dsheirer.gui.theme.ThemedFontIcon;
 import net.miginfocom.swing.MigLayout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.sound.sampled.FloatControl;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JMenu;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSlider;
 import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.Color;
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 
+/**
+ * Audio playback panel
+ */
 public class AudioPanel extends JPanel implements Listener<AudioEvent>
 {
-    private static final long serialVersionUID = 1L;
-
-    private static final Logger mLog = LoggerFactory.getLogger(AudioPanel.class);
-
-    private static ImageIcon MUTED_ICON = IconModel.getScaledIcon("images/audio_muted.png", 20);
-    private static ImageIcon UNMUTED_ICON = IconModel.getScaledIcon("images/audio_unmuted.png", 20);
-
-    private IconModel mIconModel;
-    private SettingsManager mSettingsManager;
-    private IAudioController mController;
-    private AliasModel mAliasModel;
-    private UserPreferences mUserPreferences;
-
-    private JButton mMuteButton;
+    private static final ImageIcon MUTED_ICON = IconModel.getScaledIcon("images/audio_muted.png", 20);
+    private static final ImageIcon UNMUTED_ICON = IconModel.getScaledIcon("images/audio_unmuted.png", 20);
+    private final AliasModel mAliasModel;
+    private final AudioPlaybackManager mAudioPlaybackManager;
+    private final IconModel mIconModel;
+    private final SettingsManager mSettingsManager;
+    private final UserPreferences mUserPreferences;
     private AudioChannelsPanel mAudioChannelsPanel;
+    private JButton mMuteButton;
 
+    /**
+     * Constructs an instance
+     * @param iconModel for icon lookup
+     * @param userPreferences for preference lookup
+     * @param settingsManager to monitor for changes
+     * @param audioPlaybackManager for accessing the audio output
+     * @param aliasModel for alias lookup
+     */
     public AudioPanel(IconModel iconModel, UserPreferences userPreferences, SettingsManager settingsManager,
-                      IAudioController controller, AliasModel aliasModel)
+                      AudioPlaybackManager audioPlaybackManager, AliasModel aliasModel)
     {
         mIconModel = iconModel;
         mSettingsManager = settingsManager;
-        mController = controller;
+        mAudioPlaybackManager = audioPlaybackManager;
         mAliasModel = aliasModel;
         mUserPreferences = userPreferences;
-
-        mController.addControllerListener(this);
-
+        mAudioPlaybackManager.addAudioEventListener(this);
         init();
     }
 
+    /**
+     * Initialize the display
+     */
     private void init()
     {
         setLayout(new MigLayout("insets 0 0 0 0", "[]0[grow,fill]", "[fill]0[]"));
         setBackground(Color.BLACK);
-
         mMuteButton = new MuteButton();
         mMuteButton.setBackground(getBackground());
         add(mMuteButton);
-
-        mAudioChannelsPanel = new AudioChannelsPanel(mIconModel, mUserPreferences, mSettingsManager, mController, mAliasModel);
-
+        mAudioChannelsPanel = new AudioChannelsPanel(mIconModel, mUserPreferences, mSettingsManager, mAudioPlaybackManager, mAliasModel);
         add(mAudioChannelsPanel);
-
         addMouseListener(new MouseSelectionListener());
     }
 
+    /**
+     * Receive audio event notifications from the audio playback controller
+     */
     @Override
     public void receive(AudioEvent event)
     {
@@ -112,19 +106,14 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
             case AUDIO_CONFIGURATION_CHANGE_STARTED:
                 break;
             case AUDIO_CONFIGURATION_CHANGE_COMPLETE:
-                EventQueue.invokeLater(new Runnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        remove(mAudioChannelsPanel);
-                        mAudioChannelsPanel.dispose();
-                        mAudioChannelsPanel = new AudioChannelsPanel(mIconModel, mUserPreferences, mSettingsManager, mController, mAliasModel);
-                        add(mAudioChannelsPanel);
-                        mAudioChannelsPanel.repaint();
-                        revalidate();
-                        repaint();
-                    }
+                EventQueue.invokeLater(() -> {
+                    remove(mAudioChannelsPanel);
+                    mAudioChannelsPanel.dispose();
+                    mAudioChannelsPanel = new AudioChannelsPanel(mIconModel, mUserPreferences, mSettingsManager, mAudioPlaybackManager, mAliasModel);
+                    add(mAudioChannelsPanel);
+                    mAudioChannelsPanel.repaint();
+                    revalidate();
+                    repaint();
                 });
                 break;
             default:
@@ -135,26 +124,19 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
     /**
      * Audio output mute control menu item.
      */
-    public class AudioOutputMuteItem extends JMenuItem
+    public static class AudioOutputMuteItem extends JMenuItem
     {
-        private static final long serialVersionUID = 1L;
-
-        private AudioOutput mAudioOutput;
+        private final AudioOutput mAudioOutput;
 
+        /**
+         * Constructs an instance
+         * @param audioOutput to mute/unmute
+         */
         public AudioOutputMuteItem(AudioOutput audioOutput)
         {
             super(audioOutput.isMuted() ? "Unmute" : "Mute");
-
             mAudioOutput = audioOutput;
-
-            addActionListener(new ActionListener()
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    mAudioOutput.setMuted(!mAudioOutput.isMuted());
-                }
-            });
+            addActionListener(e -> mAudioOutput.setMuted(!mAudioOutput.isMuted()));
         }
     }
 
@@ -169,37 +151,23 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
             if(SwingUtilities.isRightMouseButton(event))
             {
                 JPopupMenu popup = new JPopupMenu();
-
-				/* Audio mixer/output selection menus */
-                JMenuItem outputMenu = new JMenuItem("Configure ...");
-                Icon icon = IconFontSwing.buildIcon(FontAwesome.COG, 14);
+                JMenuItem outputMenu = new JMenuItem("Audio Playback Device ...");
+                Icon icon = new ThemedFontIcon(FontAwesome.COG, 14);
                 outputMenu.setIcon(icon);
-                outputMenu.addActionListener(new ActionListener()
-                {
-                    @Override
-                    public void actionPerformed(ActionEvent e)
-                    {
-                        MyEventBus.getGlobalEventBus().post(new ViewUserPreferenceEditorRequest(PreferenceEditorType.AUDIO_OUTPUT));
-                    }
-                });
+                outputMenu.addActionListener(e -> MyEventBus.getGlobalEventBus()
+                        .post(new ViewUserPreferenceEditorRequest(PreferenceEditorType.AUDIO_OUTPUT)));
                 popup.add(outputMenu);
-                popup.add(new JPopupMenu.Separator());
 
-				/* Audio output mute and volume control */
-                for(AudioOutput output : mController.getAudioOutputs())
+                //Add optional gain controller for th eaudio output
+                if(mAudioPlaybackManager.getAudioOutput() != null && mAudioPlaybackManager.getAudioOutput().hasGainControl())
                 {
-                    JMenu menu = new JMenu("Channel: " + output.getChannelName());
-
-                    menu.add(new AudioOutputMuteItem(output));
-
-                    if(output.hasGainControl())
-                    {
-                        JMenu volume = new JMenu("Volume");
-                        volume.add(new VolumeSlider(output.getGainControl()));
-                        menu.add(volume);
-                    }
-
-                    popup.add(menu);
+                    popup.add(new JPopupMenu.Separator());
+                    JMenuItem volume = new JMenuItem("Audio Volume");
+                    volume.setEnabled(false);
+                    Icon volumeIcon = new ThemedFontIcon(FontAwesome.VOLUME_UP, 14);
+                    volume.setIcon(volumeIcon);
+                    popup.add(volume);
+                    popup.add(new VolumeSlider(mAudioPlaybackManager.getAudioOutput().getGainControl()));
                 }
 
                 popup.show(event.getComponent(), event.getX(), event.getY());
@@ -230,12 +198,14 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
     /**
      * Audio volume (gain) adjustment slider control
      */
-    public class VolumeSlider extends JSlider
+    public static class VolumeSlider extends JSlider
     {
-        private static final long serialVersionUID = 1L;
-
-        private FloatControl mFloatControl;
+        private final FloatControl mFloatControl;
 
+        /**
+         * Constructs an instance
+         * @param control to be controlled
+         */
         public VolumeSlider(FloatControl control)
         {
             super(0, 100, 0);
@@ -244,21 +214,11 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
             setMinorTickSpacing(5);
             setPaintTicks(true);
             setPaintLabels(true);
-
             mFloatControl = control;
-
             setValue(getIntegerValue(mFloatControl.getValue()));
-
-            addChangeListener(new ChangeListener()
-            {
-                @Override
-                public void stateChanged(ChangeEvent event)
-                {
-                    mFloatControl.shift(mFloatControl.getValue(),
-                        getFloatValue(VolumeSlider.this.getValue()),
-                        1000);
-                }
-            });
+            addChangeListener(event -> mFloatControl.shift(mFloatControl.getValue(),
+                getFloatValue(VolumeSlider.this.getValue()),
+                1000));
 
             addMouseListener(new MouseListener()
             {
@@ -270,22 +230,10 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
                         VolumeSlider.this.setValue(50);
                     }
                 }
-
-                public void mouseReleased(MouseEvent arg0)
-                {
-                }
-
-                public void mousePressed(MouseEvent arg0)
-                {
-                }
-
-                public void mouseExited(MouseEvent arg0)
-                {
-                }
-
-                public void mouseEntered(MouseEvent arg0)
-                {
-                }
+                public void mouseReleased(MouseEvent arg0) {}
+                public void mousePressed(MouseEvent arg0) {}
+                public void mouseExited(MouseEvent arg0) {}
+                public void mouseEntered(MouseEvent arg0) {}
             });
         }
 
@@ -331,52 +279,12 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
         }
     }
 
-    /**
-     * Mixer/Channel configuration selection item
-     */
-    public class MixerSelectionItem extends JMenuItem
-    {
-        private static final long serialVersionUID = 1L;
-
-        private MixerChannelConfiguration mConfiguration;
-
-        public MixerSelectionItem(MixerChannelConfiguration config)
-        {
-            super(config.toString());
-
-            mConfiguration = config;
-
-            addActionListener(new ActionListener()
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    try
-                    {
-                        mController.setMixerChannelConfiguration(mConfiguration);
-                    }
-                    catch(AudioException e1)
-                    {
-                        mLog.error("Couldn't set mixer channel configuration "
-                            + "to: " + mConfiguration.toString());
-
-                        JOptionPane.showMessageDialog(MixerSelectionItem.this,
-                            "Couldn't set [" + mConfiguration.toString() +
-                                "] as the audio output device");
-                    }
-                }
-            });
-        }
-    }
-
     /**
      * Mute button to mute all audio output channels exposed by the audio
      * controller
      */
     public class MuteButton extends JButton
     {
-        private static final long serialVersionUID = 1L;
-
         private boolean mMuted = false;
 
         public MuteButton()
@@ -384,29 +292,13 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
             setIcon(UNMUTED_ICON);
             setBorderPainted(false);
             getAccessibleContext().setAccessibleName("Mute");
-
-            addActionListener(new ActionListener()
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    mMuted = !mMuted;
-
-                    for(AudioOutput output : mController.getAudioOutputs())
-                    {
-                        output.setMuted(mMuted);
-                    }
-
-                    EventQueue.invokeLater(new Runnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            setIcon(mMuted ? MUTED_ICON : UNMUTED_ICON);
-                            getAccessibleContext().setAccessibleName(mMuted ? "Unmute" : "Mute");
-                        }
-                    });
-                }
+            addActionListener(e -> {
+                mMuted = !mMuted;
+                mAudioPlaybackManager.getAudioOutput().setMuted(mMuted);
+                EventQueue.invokeLater(() -> {
+                    setIcon(mMuted ? MUTED_ICON : UNMUTED_ICON);
+                    getAccessibleContext().setAccessibleName(mMuted ? "Unmute" : "Mute");
+                });
             });
         }
     }

src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackDeviceDescriptor.java

@@ -0,0 +1,123 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.audio.playback;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Mixer;
+
+/**
+ * Audio playback device descriptor for a mixer and a supported audio output format (ie number of channels).
+ */
+public class AudioPlaybackDeviceDescriptor implements Comparable<AudioPlaybackDeviceDescriptor>
+{
+    private final Mixer.Info mMixerInfo;
+    private final AudioFormat mAudioFormat;
+
+    /**
+     * Constructs an instance
+     *
+     * @param mixerInfo for the mixer
+     * @param audioFormat supported by the mixer
+     */
+    public AudioPlaybackDeviceDescriptor(Mixer.Info mixerInfo, AudioFormat audioFormat)
+    {
+        mMixerInfo = mixerInfo;
+        mAudioFormat = audioFormat;
+    }
+
+    @Override
+    public String toString()
+    {
+        return getCleanDescription(getMixerInfo()) + "(" + getMixerInfo().getName() + ") - " +
+                getChannelDescription(getAudioFormat());
+    }
+
+    /**
+     * Cleans the mixer description to reformat/reword certain mixer descriptions
+     * @param mixerInfo containing a description
+     * @return cleaned description
+     */
+    private static String getCleanDescription(Mixer.Info mixerInfo)
+    {
+        if(mixerInfo.getDescription().contains("Direct Audio Device: "))
+        {
+            return mixerInfo.getDescription().replace("Direct Audio Device: ", "");
+        }
+        else if(mixerInfo.getDescription().contains("alsa_playback.java"))
+        {
+            return "Default (Java/ALSA)";
+        }
+        else
+        {
+            return mixerInfo.getDescription();
+        }
+    }
+
+    /**
+     * Provides a description of the channels for the audio format
+     * @param audioFormat with channels
+     * @return pretty string
+     */
+    private static String getChannelDescription(AudioFormat audioFormat)
+    {
+        return switch(audioFormat.getChannels())
+        {
+            case 1 -> "Mono";
+            case 2 -> "Stereo";
+            case AudioSystem.NOT_SPECIFIED -> "Unknown number of channels";
+            default -> audioFormat.getChannels() + " Channels";
+        };
+    }
+
+    /**
+     * Audio format supported by the mixer
+     *
+     * @return audio format
+     */
+    public AudioFormat getAudioFormat()
+    {
+        return mAudioFormat;
+    }
+
+    /**
+     * Mixer information for the available system mixer.
+     */
+    public Mixer.Info getMixerInfo()
+    {
+        return mMixerInfo;
+    }
+
+    @Override
+    public int compareTo(AudioPlaybackDeviceDescriptor other)
+    {
+        if(other == null)
+        {
+            return 1;
+        }
+
+        if(other.getMixerInfo().getDescription().equals(getMixerInfo().getDescription()))
+        {
+            return Integer.compare(getAudioFormat().getChannels(), other.getAudioFormat().getChannels());
+        }
+
+        return getMixerInfo().getDescription().compareTo(other.getMixerInfo().getDescription());
+    }
+}

src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackDeviceManager.java

@@ -0,0 +1,171 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.audio.playback;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.DataLine;
+import javax.sound.sampled.Line;
+import javax.sound.sampled.Mixer;
+
+/**
+ * Audio playback device manager.
+ */
+public class AudioPlaybackDeviceManager
+{
+    /**
+     * Always returns the first available device in the system.
+     */
+    public static AudioPlaybackDeviceDescriptor getDefaultAudioPLaybackDevice()
+    {
+        List<AudioPlaybackDeviceDescriptor> devices = getAudioPlaybackDevices();
+
+        if(!devices.isEmpty())
+        {
+            return devices.getFirst();
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the matching audio playback device
+     * @param name of the device
+     * @param channels count
+     * @return matching entry or the default playback device.
+     */
+    public static AudioPlaybackDeviceDescriptor getAudioPlaybackDevice(String name, int channels)
+    {
+        for(AudioPlaybackDeviceDescriptor device: getAudioPlaybackDevices())
+        {
+            if(device.getMixerInfo().getName().equals(name) && device.getAudioFormat().getChannels() == channels)
+            {
+                return device;
+            }
+        }
+
+        return getDefaultAudioPLaybackDevice();
+    }
+
+    public static List<AudioPlaybackDeviceDescriptor> getAudioPlaybackDevices()
+    {
+        List<AudioPlaybackDeviceDescriptor> devices = new ArrayList<>();
+
+        Mixer.Info[] mixerInfos = AudioSystem.getMixerInfo();
+
+        for(Mixer.Info mixerInfo : mixerInfos)
+        {
+            Mixer mixer = AudioSystem.getMixer(mixerInfo);
+
+            if(mixer != null)
+            {
+                List<AudioFormat> discoveredFormats = new ArrayList<>();
+
+                for(Line.Info sourceLineInfo : mixer.getSourceLineInfo())
+                {
+                    if(sourceLineInfo instanceof DataLine.Info dataLineInfo)
+                    {
+                        for(AudioFormat audioFormat : dataLineInfo.getFormats())
+                        {
+                            if(!audioFormat.isBigEndian() && audioFormat.getSampleSizeInBits() == 16 &&
+                               !discoveredFormats.contains(audioFormat))
+                            {
+                                if(audioFormat.getChannels() == 1)
+                                {
+                                    if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
+                                    {
+                                        discoveredFormats.add(audioFormat);
+                                        //Modify the format for 8 kHz sample rate
+                                        AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
+                                                8000, 16, audioFormat.getChannels(), audioFormat.getFrameSize(),
+                                                8000, false);
+                                        devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
+                                    }
+                                    else if(audioFormat.getSampleRate() == 8000)
+                                    {
+                                        discoveredFormats.add(audioFormat);
+                                        devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, audioFormat));
+                                    }
+                                }
+                                //Stereo and 64-channel formats
+                                else if(audioFormat.getChannels() == 2 || audioFormat.getChannels() > 8)
+                                {
+                                    if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
+                                    {
+                                        discoveredFormats.add(audioFormat);
+                                        //Modify the format for 8 kHz sample rate, 2 channels, 4 bytes per frame
+                                        AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
+                                                8000, 16, 2, 4,
+                                                8000, false);
+                                        devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
+                                    }
+                                    else if(audioFormat.getSampleRate() == 8000)
+                                    {
+                                        discoveredFormats.add(audioFormat);
+                                        //Modify the format for 8 kHz sample rate, 2 channels, 4 bytes per frame
+                                        AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
+                                                audioFormat.getSampleRate(), 16, 2, 4,
+                                                audioFormat.getFrameRate(), false);
+                                        devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
+                                    }
+                                }
+                                //TODO: remove the 2 channels max restriction once supported
+//                                else if(audioFormat.getChannels() > 2 && audioFormat.getChannels() <= 8)
+//                                {
+//                                    if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
+//                                    {
+//                                        discoveredFormats.add(audioFormat);
+//                                        //Modify the format for 8 kHz sample rate
+//                                        AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
+//                                                8000, 16, audioFormat.getChannels(), audioFormat.getFrameSize(),
+//                                                8000, false);
+//                                        devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
+//                                    }
+//                                    else if(audioFormat.getSampleRate() == 8000)
+//                                    {
+//                                        discoveredFormats.add(audioFormat);
+//                                        devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, audioFormat));
+//                                    }
+//                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Collections.sort(devices);
+        return devices;
+    }
+
+
+    static void main()
+    {
+        List<AudioPlaybackDeviceDescriptor> devices = getAudioPlaybackDevices();
+        for(AudioPlaybackDeviceDescriptor device : devices)
+        {
+            System.out.println(device);
+        }
+    }
+}

src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackManager.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * Copyright (C) 2014-2026 Dennis Sheirer
  *
  * 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
@@ -27,11 +27,11 @@ import io.github.dsheirer.controller.NamingThreadFactory;
 import io.github.dsheirer.eventbus.MyEventBus;
 import io.github.dsheirer.preference.PreferenceType;
 import io.github.dsheirer.preference.UserPreferences;
+import io.github.dsheirer.preference.playback.PlayTestAudioRequest;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
-import io.github.dsheirer.source.mixer.MixerChannel;
-import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
@@ -41,6 +41,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,21 +51,16 @@ import org.slf4j.LoggerFactory;
 public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioController
 {
     private static final Logger mLog = LoggerFactory.getLogger(AudioPlaybackManager.class);
-
-    public static final AudioEvent CONFIGURATION_CHANGE_STARTED =
-        new AudioEvent(AudioEvent.Type.AUDIO_CONFIGURATION_CHANGE_STARTED, null);
-    public static final AudioEvent CONFIGURATION_CHANGE_COMPLETE =
-        new AudioEvent(AudioEvent.Type.AUDIO_CONFIGURATION_CHANGE_COMPLETE, null);
-    private Broadcaster<AudioEvent> mControllerBroadcaster = new Broadcaster<>();
+    private final AudioSegmentPrioritySorter mAudioSegmentPrioritySorter = new AudioSegmentPrioritySorter();
+    private final Broadcaster<AudioEvent> mControllerBroadcaster = new Broadcaster<>();
+    private final List<AudioSegment> mAudioSegments = new ArrayList<>();
+    private final List<AudioSegment> mPendingAudioSegments = new ArrayList<>();
+    private final LinkedTransferQueue<AudioSegment> mNewAudioSegmentQueue = new LinkedTransferQueue<>();
+    private final ReentrantLock mAudioChannelsLock = new ReentrantLock();
+    private final UserPreferences mUserPreferences;
+    private AudioPlaybackDeviceDescriptor mAudioPlaybackDevice;
+    private AudioOutput mAudioOutput;
     private ScheduledFuture<?> mProcessingTask;
-    private UserPreferences mUserPreferences;
-    private MixerChannelConfiguration mMixerChannelConfiguration;
-    private List<AudioOutput> mAudioOutputs = new ArrayList<>();
-    private List<AudioSegment> mAudioSegments = new ArrayList<>();
-    private List<AudioSegment> mPendingAudioSegments = new ArrayList<>();
-    private LinkedTransferQueue<AudioSegment> mNewAudioSegmentQueue = new LinkedTransferQueue<>();
-    private ScheduledExecutorService mScheduledExecutorService =
-            Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory("sdrtrunk audio manager"));
 
     /**
      * Constructs an instance.
@@ -75,31 +71,35 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
     {
         mUserPreferences = userPreferences;
         MyEventBus.getGlobalEventBus().register(this);
+        AudioPlaybackDeviceDescriptor device = mUserPreferences.getPlaybackPreference().getAudioPlaybackDevice();
 
-        MixerChannelConfiguration configuration = mUserPreferences.getPlaybackPreference().getMixerChannelConfiguration();
-
-        if(configuration != null)
+        if(device != null)
         {
             try
             {
-                setMixerChannelConfiguration(configuration);
+                setAudioPlaybackDevice(device);
             }
             catch(AudioException ae)
             {
-                mLog.error("Error during setup of audio playback configuration.  Attempted to use audio mixer [" +
-                    (configuration != null ? configuration.getMixer().toString() : "null") + "] and channel [" +
-                    (configuration != null ? configuration.getMixerChannel().name() : "null") + "]", ae);
+                mLog.error("Error during setup of audio playback configuration.  Attempted to use device [" +
+                        device + "]", ae);
             }
         }
         else
         {
             mLog.warn("No audio output devices available");
         }
+
+        //Even if we don't have an audio device, setup the queue processor to always process the audio segment queue
+        ScheduledExecutorService scheduledExecutorService =
+                Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory("sdrtrunk audio manager"));
+        mProcessingTask = scheduledExecutorService.scheduleAtFixedRate(new AudioSegmentProcessor(),
+                0, 100, TimeUnit.MILLISECONDS);
     }
 
     /**
      * Receives audio segments from channel audio modules.
-     * @param audioSegment
+     * @param audioSegment to receive and process
      */
     @Override
     public void receive(AudioSegment audioSegment)
@@ -173,6 +173,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
         {
             Iterator<AudioSegment> it = mAudioSegments.iterator();
             AudioSegment audioSegment;
+            List<AudioSegment> displaced = new ArrayList<>();
 
             //Remove any audio segments flagged as do not monitor.  Don't remove completed segments yet, because
             //we want to give them a brief chance at playback.  Automatically assign linked audio segments to the
@@ -189,35 +190,67 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
                 }
                 else if(audioSegment.isLinked())
                 {
-                    for(AudioOutput audioOutput: mAudioOutputs)
+                    if(mAudioOutput != null)
                     {
-                        if(audioOutput.isLinkedTo(audioSegment))
+                        mAudioChannelsLock.lock();
+
+                        try
                         {
-                            it.remove();
-                            audioOutput.play(audioSegment);
+                            for(AudioChannel audioOutput: mAudioOutput.getAudioProvider().getAudioChannels())
+                            {
+                                if(audioOutput.isLinkedTo(audioSegment))
+                                {
+                                    it.remove();
+
+                                    //Linked audio continues the current call, so it goes ahead of anything queued
+                                    AudioSegment queued = audioOutput.pollQueuedAudioSegment();
+
+                                    while(queued != null)
+                                    {
+                                        displaced.add(queued);
+                                        queued = audioOutput.pollQueuedAudioSegment();
+                                    }
+
+                                    audioOutput.play(audioSegment);
+                                }
+                            }
+                        }
+                        finally
+                        {
+                            mAudioChannelsLock.unlock();
                         }
                     }
                 }
             }
 
+            mAudioSegments.addAll(displaced);
+
             //Sort audio segments by playback priority and assign to empty audio outputs
-            if(!mAudioSegments.isEmpty())
+            if(!mAudioSegments.isEmpty() && mAudioOutput != null)
             {
-                //TODO: change this to take audio segment start time into account also
-                mAudioSegments.sort(Comparator.comparingInt(o -> o.monitorPriorityProperty().get()));
+                mAudioSegments.sort(mAudioSegmentPrioritySorter);
+                mAudioChannelsLock.lock();
 
-                //Assign empty audio outputs first
-                for(AudioOutput audioOutput: mAudioOutputs)
+                try
                 {
-                    if(audioOutput.isEmpty())
+                    //Assign empty audio outputs first
+                    for(AudioChannel audioChannel: mAudioOutput.getAudioProvider().getAudioChannels())
                     {
-                        audioOutput.play(mAudioSegments.remove(0));
-
-                        if(mAudioSegments.isEmpty())
+                        if(audioChannel.isEmpty())
                         {
-                            return;
+                            audioChannel.play(mAudioSegments.removeFirst());
+                            if(mAudioSegments.isEmpty())
+                            {
+                                return;
+                            }
                         }
                     }
+
+                    replaceLowerPriorityQueuedSegments(mAudioSegments, mAudioOutput.getAudioProvider().getAudioChannels());
+                }
+                finally
+                {
+                    mAudioChannelsLock.unlock();
                 }
             }
 
@@ -237,6 +270,40 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
         }
     }
 
+    /**
+     * Swaps audio segments queued on the audio channels for waiting audio segments that have a higher playback priority,
+     * so that a segment queued behind the current playback can't hold a higher priority segment out of the channel.
+     * Audio that is currently playing is not interrupted.  Displaced segments are returned to the waiting list.
+     *
+     * @param waiting audio segments, sorted by playback priority.
+     * @param audioChannels to evaluate.
+     */
+    static void replaceLowerPriorityQueuedSegments(List<AudioSegment> waiting, List<AudioChannel> audioChannels)
+    {
+        for(AudioChannel audioChannel: audioChannels)
+        {
+            if(waiting.isEmpty())
+            {
+                return;
+            }
+
+            AudioSegment queued = audioChannel.peekQueuedAudioSegment();
+
+            if(queued != null &&
+               waiting.getFirst().monitorPriorityProperty().get() < queued.monitorPriorityProperty().get())
+            {
+                //The audio thread may have taken the queued segment since the peek, so only return what we removed.
+                queued = audioChannel.pollQueuedAudioSegment();
+                audioChannel.play(waiting.removeFirst());
+
+                if(queued != null)
+                {
+                    waiting.add(queued);
+                }
+            }
+        }
+    }
+
     public void dispose()
     {
         MyEventBus.getGlobalEventBus().unregister(this);
@@ -250,6 +317,19 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
         mAudioSegments.clear();
     }
 
+    /**
+     * Receives a request from the global event bus to playback a test audio sequence via the specified audio channel
+     * @param request with test audio and channel number
+     */
+    @Subscribe
+    public void playTestAudio(PlayTestAudioRequest request)
+    {
+        if(mAudioOutput != null)
+        {
+            mAudioOutput.playTestAudio(request);
+        }
+    }
+
     /**
      * Receive user preference update notifications so that we can detect when the user changes the audio output
      * device in the user preferences editor.
@@ -259,98 +339,112 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
     {
         if(preferenceType == PreferenceType.PLAYBACK)
         {
-            MixerChannelConfiguration configuration = mUserPreferences.getPlaybackPreference().getMixerChannelConfiguration();
+            AudioPlaybackDeviceDescriptor device = mUserPreferences.getPlaybackPreference().getAudioPlaybackDevice();
 
-            if(configuration != null && !configuration.equals(mMixerChannelConfiguration))
+            if(device != null && !device.equals(getAudioPlaybackDevice()))
             {
                 try
                 {
-                    setMixerChannelConfiguration(configuration);
+                    setAudioPlaybackDevice(device);
                 }
                 catch(AudioException ae)
                 {
-                    mLog.error("Error changing audio output to [" + configuration + "]", ae);
+                    mLog.error("Error changing audio output to [" + device + "]", ae);
                 }
             }
         }
     }
 
     /**
-     * Configures audio playback to use the configuration specified in the entry argument.
+     * Configures audio playback to use the audio device argument.
      *
-     * @param entry to use in configuring the audio playback setup.
+     * @param audioDevice to use in configuring the audio playback setup.
      * @throws AudioException if there is an error
      */
     @Override
-    public void setMixerChannelConfiguration(MixerChannelConfiguration entry) throws AudioException
+    public void setAudioPlaybackDevice(AudioPlaybackDeviceDescriptor audioDevice) throws AudioException
     {
-        if(entry != null)
+        if(audioDevice != null)
         {
-            mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_STARTED);
+            mControllerBroadcaster.broadcast(new AudioEvent(AudioEvent.Type.AUDIO_CONFIGURATION_CHANGE_STARTED,
+                    audioDevice.getMixerInfo().getName()));
 
-            if(mProcessingTask != null)
+            mAudioChannelsLock.lock();
+
+            try
             {
-                mProcessingTask.cancel(true);
+                if(mAudioOutput != null)
+                {
+                    mAudioOutput.dispose();
+                }
+
+                int channelCount = audioDevice.getAudioFormat().getChannels();
+
+                switch(channelCount)
+                {
+                    case 1:
+                        mAudioOutput = new AudioOutput(audioDevice, new AudioProviderMono(mUserPreferences));
+                        break;
+                    case 2:
+                        mAudioOutput = new AudioOutput(audioDevice, new AudioProviderStereo(mUserPreferences));
+                        break;
+                    default:
+//                        mAudioOutput = new AudioOutput(audioDevice, new AudioProviderMultiChannel(mUserPreferences,
+//                                audioDevice.getAudioFormat()));
+                        throw new AudioException("Unsupported mixer channel configuration channel count: " + channelCount);
+                }
+
+                //Note: audio output can use an alternate device if the requested device can't be used, so we assign
+                //the descriptor that was actually used by the audio output
+                mAudioPlaybackDevice = mAudioOutput.getAudioPlaybackDeviceDescriptor();
+            }
+            finally
+            {
+                mAudioChannelsLock.unlock();
             }
 
-            for(AudioOutput audioOutput: mAudioOutputs)
-            {
-                audioOutput.dispose();
-            }
-
-            mAudioOutputs.clear();
-
-            switch(entry.getMixerChannel())
-            {
-                case MONO:
-                    AudioOutput mono = new MonoAudioOutput(entry.getMixer(), mUserPreferences);
-                    mAudioOutputs.add(mono);
-                    break;
-                case STEREO:
-                    AudioOutput left = new StereoAudioOutput(entry.getMixer(), MixerChannel.LEFT, mUserPreferences);
-                    mAudioOutputs.add(left);
-
-                    AudioOutput right = new StereoAudioOutput(entry.getMixer(), MixerChannel.RIGHT, mUserPreferences);
-                    mAudioOutputs.add(right);
-                    break;
-                default:
-                    throw new AudioException("Unsupported mixer channel configuration: " + entry.getMixerChannel());
-            }
-
-            mProcessingTask = mScheduledExecutorService.scheduleAtFixedRate(new AudioSegmentProcessor(),
-                0, 100, TimeUnit.MILLISECONDS);
-            mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_COMPLETE);
-            mMixerChannelConfiguration = entry;
+            mControllerBroadcaster.broadcast(new AudioEvent(AudioEvent.Type.AUDIO_CONFIGURATION_CHANGE_COMPLETE,
+                    mAudioPlaybackDevice.getMixerInfo().getName()));
         }
     }
 
+    /**
+     * Audio output device.  Note: this can be null depending on when it is accessed.
+     * @return audio output or null.
+     */
+    public AudioOutput getAudioOutput()
+    {
+        return mAudioOutput;
+    }
+
     /**
      * Current audio playback mixer channel configuration setting.
      */
     @Override
-    public MixerChannelConfiguration getMixerChannelConfiguration()
+    public AudioPlaybackDeviceDescriptor getAudioPlaybackDevice()
     {
-        return mMixerChannelConfiguration;
+        return mAudioPlaybackDevice;
     }
 
     /**
      * List of sorted audio outputs available for the current mixer channel configuration
      */
     @Override
-    public List<AudioOutput> getAudioOutputs()
+    public List<AudioChannel> getAudioChannels()
     {
-        List<AudioOutput> outputs = new ArrayList<>(mAudioOutputs);
+        if(mAudioOutput != null)
+        {
+            return mAudioOutput.getAudioProvider().getAudioChannels();
+        }
 
-        outputs.sort(Comparator.comparing(AudioOutput::getChannelName));
-
-        return outputs;
+        return Collections.emptyList();
     }
 
     /**
      * Adds an audio event listener to receive audio event notifications.
      */
     @Override
-    public void addControllerListener(Listener<AudioEvent> listener)
+    public void addAudioEventListener(Listener<AudioEvent> listener)
     {
         mControllerBroadcaster.addListener(listener);
     }
@@ -359,7 +453,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
      * Removes an audio event listener from receiving audio event notifications.
      */
     @Override
-    public void removeControllerListener(Listener<AudioEvent> listener)
+    public void removeAudioEventListener(Listener<AudioEvent> listener)
     {
         mControllerBroadcaster.removeListener(listener);
     }
@@ -369,7 +463,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
      */
     public class AudioSegmentProcessor implements Runnable
     {
-        private AtomicBoolean mProcessing = new AtomicBoolean();
+        private final AtomicBoolean mProcessing = new AtomicBoolean();
 
         @Override
         public void run()
@@ -389,4 +483,30 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
             }
         }
     }
+
+    /**
+     * Audio segment comparator for sorting audio segments by: 1)Playback priority and 2)Segment start time
+     */
+    public static class AudioSegmentPrioritySorter implements Comparator<AudioSegment>
+    {
+        @Override
+        public int compare(AudioSegment segment1, AudioSegment segment2)
+        {
+            if(segment1 == null || segment2 == null)
+            {
+                return -1;
+            }
+
+            //If priority is the same, sort by start time
+            if(segment1.monitorPriorityProperty().get() == segment2.monitorPriorityProperty().get())
+            {
+                return Long.compare(segment1.getStartTimestamp(), segment2.getStartTimestamp());
+            }
+            //Otherwise, sort by priority
+            else
+            {
+                return Integer.compare(segment1.monitorPriorityProperty().get(), segment2.monitorPriorityProperty().get());
+            }
+        }
+    }
 }

src/main/java/io/github/dsheirer/audio/playback/AudioProvider.java

@@ -0,0 +1,82 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2026 Dennis Sheirer
+ *
+ * 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 3 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.audio.playback;
+
+import io.github.dsheirer.audio.AudioEvent;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import javax.sound.sampled.AudioFormat;
+
+/**
+ * Abstract audio provider implementation
+ */
+public abstract class AudioProvider
+{
+    /**
+     * Converts the audio sample to a 16-bit PCM sample, limiting out of range values instead of allowing them to wrap.
+     * @param sample in range -1.0 to 1.0
+     * @return PCM sample
+     */
+    protected static short toPcm(float sample)
+    {
+        return (short)(Math.clamp(sample, -1.0f, 1.0f) * Short.MAX_VALUE);
+    }
+
+    /**
+     * Audio format for this provider
+     */
+    public abstract AudioFormat getAudioFormat();
+
+    /**
+     * Provide a non-null, 160-sample/20-millisecond buffer of audio at 8 kHz
+     * @return audio buffer
+     */
+    public abstract ByteBuffer getAudio();
+
+    /**
+     * Provides access to the audio channels for this provider
+     * @return list of audio channels
+     */
+    public abstract List<AudioChannel> getAudioChannels();
+
+    /**
+     * Notifies audio event listener(s) of the event
+     * @param eventType to broadcast
+     */
+    public void notify(AudioEvent.Type eventType)
+    {
+        for(AudioChannel audioChannel : getAudioChannels())
+        {
+            audioChannel.notify(eventType);
+        }
+    }
+
+    /**
+     * Disposes the audio channel to prepare for audio output changes or shutdown.
+     */
+    public void dispose()
+    {
+        for(AudioChannel audioChannel: getAudioChannels())
+        {
+            audioChannel.dispose();
+        }
+    }
+}