Update README.md

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,11 +21,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 20
+      - uses: actions/checkout@v4
+      - name: Set up JDK 25
         uses: actions/setup-java@v3
         with:
-          java-version: '20'
+          java-version: '25'
           distribution: 'liberica'
           java-package: 'jdk+fx'
       - name: Build with Gradle

.github/workflows/nightly.yml

@@ -0,0 +1,47 @@
+# Create nightly release for Linux, Mac and Windows using the Linux runner.
+name: Nightly Release
+
+on:
+  push:
+    branches: [ master ]
+# Don't run nightly build for pull requests - uncomment to test changes to this action within scope of the PR review
+#  pull_request:
+#    branches: [ master ]
+
+jobs:
+  nightly:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v3
+        with:
+          java-version: '25'
+          distribution: 'liberica'
+          java-package: 'jdk+fx'
+
+      - name: Build Linux and Mac releases with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: runtimeZipOthers -PprojectVersion=nightly
+
+      - name: Build Windows release with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: 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
+        with:
+          tag: nightly
+          rm: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: |
+            build/image/*.zip
+            build/image/build_info.txt

.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>
@@ -29,6 +35,7 @@
       <w>talkgroups</w>
       <w>tgid</w>
       <w>ultravox</w>
+      <w>unsynchronized</w>
       <w>wacn</w>
       <w>xtea</w>
     </words>

.idea/misc.xml

@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="liberica-20" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25_PREVIEW" project-jdk-name="liberica-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

README.md

@@ -1,8 +1,28 @@
 ![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).
 
+* [Help/Wiki Home Page](https://github.com/DSheirer/sdrtrunk/wiki)
 * [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
 * [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
 * [Download](https://github.com/DSheirer/sdrtrunk/releases)
@@ -18,7 +38,14 @@ All release versions of sdrtrunk are available from the [releases](https://githu
 * **(beta)** These versions are currently being tested for bugs and functionality prior to final release.
 * **(final)** These versions have been tested and are the current release version.
 
+## Download Nightly Software Build
+The [nightly](https://github.com/DSheirer/sdrtrunk/releases/tag/nightly) release contains current builds of the software 
+for all supported operating systems.  This version of the software may contain bugs and may not run correctly.  However, 
+it let's you preview the most recent changes and fixes before the next software release.  **Always backup your 
+playlist(s) before you use the nightly builds.**  Note: the nightly release is updated each time code changes are 
+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.

artifacts/sdrplay-api-headers/README.txt

@@ -1,36 +0,0 @@
-Auto-generating Java code from SDRPlay API using jextract.
-
-Note: the api headers in the 3.11 folder are equivalent to the 3.08 headers.  The only
-difference from the 3.07 headers is the addition of the boolean 'valid' flag to DeviceT structure.
-
-1. Download JDK19 compatible build of jextract JDK: https://jdk.java.net/jextract/
-2. If generating on windows platform, modify the sdrplay_api.h to remove the windows
-   pieces of the file.  Specifically:
-2a. Comment out these lines but leave the *HANDLE typedef:
-
-//#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
-
-2b. Remove the '_SDRPLAY_DLL_QUALIFIER' from in front of the method declarations
-
-2c. Change the 3.11 version string to 3.08 either in the header file, or in the generated java class
-
-3. Open command prompt to the root source code where the generated files should be placed:
-..\SDRtrunk\sdrplay-api\src\main\java
-
-4. Generate the code:
-c:\Users\Denny\Downloads\jdk-19-ea2-panama\bin\jextract "C:\Users\Denny\git\sdrtrunk\sdrplay-api\api\v3_11\sdrplay_api.h" -l libsdrplay_api --source
-
-5. Do this for all versions of the API.
-

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

@@ -5,23 +5,23 @@
 #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__)
+#if defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64)
+#include "windows.h"
+#elif defined (__GNUC__)
 typedef void *HANDLE;
-//#endif
+#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
+#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.11)
+#define SDRPLAY_API_VERSION                   (float)(3.15)
 
 // API Constants
 #define SDRPLAY_MAX_DEVICES                   (16)
@@ -35,6 +35,8 @@ typedef void *HANDLE;
 #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
@@ -125,6 +127,7 @@ typedef enum
     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;
@@ -178,6 +181,7 @@ typedef sdrplay_api_ErrT        (*sdrplay_api_SelectDevice_t)(sdrplay_api_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
@@ -199,27 +203,28 @@ 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()
+    _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_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, double newSampleRate);
-     sdrplay_api_ErrT        sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
+    _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);
 

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

@@ -29,12 +29,19 @@ typedef struct
 } 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

build.gradle

@@ -1,8 +1,6 @@
-import java.text.SimpleDateFormat
-
 /*
  * *****************************************************************************
- * 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
@@ -19,12 +17,16 @@ import java.text.SimpleDateFormat
  * ****************************************************************************
  */
 
+import java.text.SimpleDateFormat
+
+
+
 /**
  * Instructions for building/compiling the sdrtrunk application.
  *
  * Prerequisites:
- * Install and configure an OpenJDK version 19+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
- * - Optional: install and configure Gradle 7.6+
+ * Install and configure an OpenJDK version 22+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
+ * - Optional: install and configure Gradle 8.10+
  *
  * Scenario 1: run the application via gradle command line from the source code root directory:
  * command: ./gradlew run
@@ -45,20 +47,21 @@ plugins {
     id 'application'
     id 'java'
     id 'idea'
-    id 'org.beryx.runtime' version '1.12.7'
+    id 'org.beryx.runtime' version '2.0.1'
 }
 
 repositories {
     mavenCentral()
-    maven { url "https://jitpack.io" }
+    maven { url = "https://jitpack.io" }
 }
 
-version = '0.6.0-beta1'
+//Version is defined in gradle.properties so that we can CLI override it for nightly builds.
+version = project.findProperty('projectVersion')
 
-//Java 20 is required for this version of the Project Panama preview/incubator feature
+//Java 24 is required for this version of the Project Panama preview/incubator feature
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(20)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
@@ -74,12 +77,11 @@ test {
 dependencies {
 
     // JUnit Tests
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.0')
-    testImplementation 'org.mockito:mockito-core:4.8.0'
-
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-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'
@@ -87,48 +89,48 @@ dependencies {
     implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'
 
     //mavenCentral/jcenter imports
-    implementation 'ch.qos.logback:logback-classic:1.4.5'
-    implementation 'ch.qos.logback:logback-core:1.4.5'
-    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.5.21'
+    implementation 'ch.qos.logback:logback-core:1.5.21'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.20.1'
+    implementation 'com.fazecast:jSerialComm:2.11.4'
     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:31.1-jre'
+    implementation 'com.google.code.gson:gson:2.13.2'
+    implementation 'com.google.guava:guava:33.5.0-jre'
     implementation 'com.jidesoft:jide-oss:3.6.18'
-    implementation 'com.miglayout:miglayout-swing:11.0'
+    implementation 'com.miglayout:miglayout-swing:11.4.2'
     implementation 'com.mpatric:mp3agic:0.9.1'
-    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.21.0'
     implementation 'eu.hansolo:charts:1.0.5'
-    implementation 'io.github.dsheirer:radio-reference-api:15.1.9'
+    implementation 'io.github.dsheirer:radio-reference-api:18.0.0'
+    implementation 'io.github.dsheirer:usb4java-native-libraries:1.3.3' //OSX & Windows aarch64 native libs
+    implementation 'io.github.dsheirer:usb4java:1.3.5' //Fork with Loader support for OSX Multi-Version
     implementation 'javax.usb:usb-api:1.0.2'
     implementation 'net.coderazzi:tablefilter-swing:5.5.4'
-    implementation 'org.apache.commons:commons-compress:1.21'
-    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.19.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.4'
+    implementation 'org.apache.mina:mina-http:2.2.4'
+    implementation 'org.controlsfx:controlsfx:11.2.2'
     implementation 'org.rauschig:jarchivelib:1.2.0'
-    implementation 'org.slf4j:slf4j-api:2.0.5'
+    implementation 'org.slf4j:slf4j-api:2.0.17'
     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 'pl.edu.icm:JLargeArrays:1.6'
 }
 
 def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem
 
 /**
- * This is needed for the JDK19 panama and 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) {
-    options.compilerArgs.add("--enable-preview") //Panama Foreign Function/Memory is preview in JDK 19
-    options.compilerArgs.add("--add-modules=jdk.incubator.vector") //Needed while Panama Vector API remains in incubator
+    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
 }
 
 /**
@@ -137,10 +139,13 @@ 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',   //Needed while Project Panama API is still in incubator
-         '--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
-         '--enable-native-access=ALL-UNNAMED',
-         '-Djava.library.path=c:\\Program Files\\SDRplay\\API\\x64'] //Allows Project Panama Foreign Function access to system library
+         '--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
+         '--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
+         '-XX:+UseCompactObjectHeaders',   //JDK25 - use compact object headers
+         '-Djava.library.path=c:\\Program Files\\SDRplay\\API\\x64'] //SDRPlay API library path
 
 /**
  * JVM Arguments for running the application on Linux.
@@ -149,11 +154,13 @@ 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
          '--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
-         '--enable-native-access=ALL-UNNAMED',
-         '-Djava.library.path=/usr/local/lib'] //Allows Project Panama Foreign Function access to system library
+         '--sun-misc-unsafe-memory-access=allow', //JDK24 - suppress sun.misc.Unsafe::allocateMemory warning
+         '-XX:+UseCompactObjectHeaders',   //JDK25 - use compact object headers
+         '--enable-native-access=javafx.graphics', //JDK24 - suppress restricted java.lang.System calls
+         '--enable-native-access=ALL-UNNAMED'] //SDRPlay API library path
 
 application {
-    mainClassName = "io.github.dsheirer.gui.SDRTrunk"
+    mainClass = "io.github.dsheirer.gui.SDRTrunk"
 
     if(os.isWindows()) {
         applicationDefaultJvmArgs = jvmArgsWindows
@@ -163,6 +170,15 @@ application {
     }
 }
 
+test {
+    if(os.isWindows()) {
+        jvmArgs = jvmArgsWindows
+    }
+    else {
+        jvmArgs = jvmArgsLinux
+    }
+}
+
 jar {
     manifest {
         attributes (
@@ -183,6 +199,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.
  */
@@ -191,28 +212,31 @@ String targetLinuxX86_64 = 'linux-x86_64-v' + version
 String targetOsxAarch64 = 'osx-aarch64-v' + version
 String targetOsxX86_64 = 'osx-x86_64-v' + version
 String targetWindowsX86_64 = 'windows-x86_64-v' + version
+String targetWindowsAarch64 = 'windows-aarch64-v' + version
 
 /**
  * Optional pre-downloaded Java Development Kit (JDK) for each target OS and CPU.  These locations are hard-coded to the
  * 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-20.0.1-full'
-String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-20.0.1-full'
-String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-20.0.1-full.jdk'
-String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-20.0.1-full.jdk'
-String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-20.0.1-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/20.0.1+10/bellsoft-jdk20.0.1+10-"
+def jdk_download_base = "https://download.bell-sw.com/java/25.0.1+11/bellsoft-jdk25.0.1+11-"
 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
-def jdk_download_osx_x86_64 = jdk_download_base + "macos-aarch64" + jdk_download_suffix
-def jdk_download_osx_aarch64 = jdk_download_base + "macos-amd64" + jdk_download_suffix
+def jdk_download_osx_x86_64 = jdk_download_base + "macos-amd64" + jdk_download_suffix
+def jdk_download_osx_aarch64 = jdk_download_base + "macos-aarch64" + jdk_download_suffix
 def jdk_download_windows_x86_64 = jdk_download_base + "windows-amd64-full.zip"
+def jdk_download_windows_aarch64 = jdk_download_base + "windows-aarch64-full.zip"
 
 /**
  * Configures the runtime zip task with additional options/settings.
@@ -228,7 +252,8 @@ def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
     //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
-    rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility')
+    //java.management for JVM resource monitoring
+    rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management')
 
     //Use auto-detected modules and 'add' any specified modules.
     rt.extension.additive.set(true)
@@ -254,7 +279,12 @@ tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
     def javaHome = org.gradle.internal.jvm.Jvm.current().getJavaHome().toString()
 
     if(os.isWindows()) {
-        rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
+        if(arch.equals("amd64")) {
+            rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
+        }
+        else if(arch.equals("aarch64")) {
+            rt.extension.targetPlatform(targetWindowsAarch64, javaHome)
+        }
         configure(rt, jvmArgsWindows)
     }
     else if(os.isLinux())
@@ -290,6 +320,16 @@ tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
  * Usage: ./gradlew runtimeZipWindows   (linux - using gradlew)
  */
 tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
+    //Windows aarch64
+    if(file(jdk_windows_aarch64).exists()) {
+        rt.extension.targetPlatform(targetWindowsAarch64, jdk_windows_aarch64, [])
+    }
+    else {
+        rt.extension.targetPlatform(targetWindowsAarch64) {
+            jdkHome = jdkDownload(jdk_download_windows_aarch64)
+        }
+    }
+    //Windows x86-64
     if(file(jdk_windows_x86_64).exists()) {
         rt.extension.targetPlatform(targetWindowsX86_64, jdk_windows_x86_64, [])
     }
@@ -339,7 +379,7 @@ tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
             jdkHome = jdkDownload(jdk_download_osx_aarch64)
         }
     }
-    //Linux x86-64
+    //OSX x86-64
     if(file(jdk_osx_x86_64).exists()) {
         rt.extension.targetPlatform(targetOsxX86_64, jdk_osx_x86_64, [])
     }
@@ -349,6 +389,5 @@ tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
         }
     }
 
-    configure(rt, jvmArgsLinux);
+    configure(rt, jvmArgsLinux)
 }
-

gradle.properties

@@ -0,0 +1,31 @@
+#
+# ******************************************************************************
+# 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/>
+# *****************************************************************************
+#
+
+# Version naming conventions:
+#   Alpha: maj.min.patch-alpha-build
+#    Beta: maj.min.patch-beta-build
+# Release: maj.min.patch
+#
+# Example: 0.6.0-beta-5
+#
+# Note: this is so that the file names for the resultant release build products match the GitLab release asset
+# tag name, specifically the dashes inserted before and after the alpha/beta labels.
+# See: https://github.com/DSheirer/sdrtrunk/issues/1651
+
+projectVersion=0.6.2-beta-1

gradle/wrapper/gradle-wrapper.properties

@@ -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
@@ -19,7 +19,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -2,7 +2,7 @@
 
 #
 # ******************************************************************************
-# 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
@@ -58,7 +58,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/HEAD/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,10 +86,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
+# 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
@@ -117,7 +115,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -136,10 +134,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -147,7 +148,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 +156,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
@@ -200,16 +201,20 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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 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,6 +13,8 @@
 @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 ##########################################################################
@@ -43,11 +45,11 @@ 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
 
@@ -57,22 +59,22 @@ 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
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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,11 +30,13 @@ 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.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.P25FullyQualifiedTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
 import io.github.dsheirer.alias.id.tone.TonesID;
@@ -77,6 +79,18 @@ public class AliasFactory
                 Min copyMin = new Min();
                 copyMin.setMin(originalMin.getMin());
                 return copyMin;
+            case P25_FULLY_QUALIFIED_RADIO_ID:
+                P25FullyQualifiedRadio originalP25 = (P25FullyQualifiedRadio) id;
+                P25FullyQualifiedRadio copyP25 = new P25FullyQualifiedRadio(originalP25.getWacn(),
+                        originalP25.getSystem(), originalP25.getValue());
+                copyP25.setOverlap(originalP25.overlapProperty().get());
+                return copyP25;
+            case P25_FULLY_QUALIFIED_TALKGROUP:
+                P25FullyQualifiedTalkgroup originalFqt = (P25FullyQualifiedTalkgroup) id;
+                P25FullyQualifiedTalkgroup copyFqt = new P25FullyQualifiedTalkgroup(originalFqt.getWacn(),
+                        originalFqt.getSystem(), originalFqt.getValue());
+                copyFqt.setOverlap(originalFqt.overlapProperty().get());
+                return copyFqt;
             case PRIORITY:
                 Priority originalPriority = (Priority)id;
                 Priority copyPriority = new Priority();
@@ -184,6 +198,7 @@ public class AliasFactory
         copy.setGroup(original.getGroup());
         copy.setColor(original.getColor());
         copy.setIconName(original.getIconName());
+        copy.setRecordable(original.isRecordable());
         return copy;
     }
 

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -24,10 +24,12 @@ import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.dcs.Dcs;
 import io.github.dsheirer.alias.id.esn.Esn;
 import io.github.dsheirer.alias.id.priority.Priority;
+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.status.UnitStatusID;
 import io.github.dsheirer.alias.id.status.UserStatusID;
+import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
 import io.github.dsheirer.alias.id.tone.TonesID;
@@ -37,9 +39,11 @@ import io.github.dsheirer.identifier.dcs.DCSIdentifier;
 import io.github.dsheirer.identifier.esn.ESNIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
+import io.github.dsheirer.identifier.radio.FullyQualifiedRadioIdentifier;
 import io.github.dsheirer.identifier.radio.RadioIdentifier;
 import io.github.dsheirer.identifier.status.UnitStatusIdentifier;
 import io.github.dsheirer.identifier.status.UserStatusIdentifier;
+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;
@@ -155,6 +159,32 @@ public class AliasList
 
                         talkgroupRangeAliasList.add(talkgroupRange, alias);
                         break;
+                    case P25_FULLY_QUALIFIED_RADIO_ID:
+                        P25FullyQualifiedRadio qualifiedRadio = (P25FullyQualifiedRadio) id;
+
+                        RadioAliasList p25RadioAliasList = mRadioProtocolMap.get(qualifiedRadio.getProtocol());
+
+                        if(p25RadioAliasList == null)
+                        {
+                            p25RadioAliasList = new RadioAliasList();
+                            mRadioProtocolMap.put(qualifiedRadio.getProtocol(), p25RadioAliasList);
+                        }
+
+                        p25RadioAliasList.add(qualifiedRadio, alias);
+                        break;
+                    case P25_FULLY_QUALIFIED_TALKGROUP:
+                        P25FullyQualifiedTalkgroup qualifiedTalkgroup = (P25FullyQualifiedTalkgroup) id;
+
+                        TalkgroupAliasList p25TalkgroupAliasList = mTalkgroupProtocolMap.get(qualifiedTalkgroup.getProtocol());
+
+                        if(p25TalkgroupAliasList == null)
+                        {
+                            p25TalkgroupAliasList = new TalkgroupAliasList();
+                            mTalkgroupProtocolMap.put(qualifiedTalkgroup.getProtocol(), p25TalkgroupAliasList);
+                        }
+
+                        p25TalkgroupAliasList.add(qualifiedTalkgroup, alias);
+                        break;
                     case RADIO_ID:
                         Radio radio = (Radio)id;
 
@@ -388,6 +418,8 @@ public class AliasList
                     }
                     break;
                 case PATCH_GROUP:
+                    List<Alias> aliases = new ArrayList<>();
+
                     PatchGroupIdentifier patchGroupIdentifier = (PatchGroupIdentifier)identifier;
                     PatchGroup patchGroup = patchGroupIdentifier.getValue();
 
@@ -395,8 +427,6 @@ public class AliasList
 
                     if(patchGroupAliasList != null)
                     {
-                        List<Alias> aliases = new ArrayList<>();
-
                         Alias alias = patchGroupAliasList.getAlias(patchGroup.getPatchGroup());
 
                         if(alias != null)
@@ -404,19 +434,36 @@ public class AliasList
                             aliases.add(alias);
                         }
 
-                        for(TalkgroupIdentifier patchedGroup: patchGroup.getPatchedGroupIdentifiers())
+                        for(TalkgroupIdentifier patchedTalkgroup: patchGroup.getPatchedTalkgroupIdentifiers())
                         {
-                            Alias patchedAlias = patchGroupAliasList.getAlias(patchedGroup);
+                            Alias patchedTalkgroupAlias = patchGroupAliasList.getAlias(patchedTalkgroup);
 
-                            if(patchedAlias != null && !aliases.contains(patchedAlias))
+                            if(patchedTalkgroupAlias != null && !aliases.contains(patchedTalkgroupAlias))
                             {
-                                aliases.add(patchedAlias);
+                                aliases.add(patchedTalkgroupAlias);
                             }
                         }
-
-                        return aliases;
                     }
-                    break;
+
+                    if(patchGroup.hasPatchedRadios())
+                    {
+                        RadioAliasList radioAliasList = mRadioProtocolMap.get(patchGroupIdentifier.getProtocol());
+
+                        if(radioAliasList != null)
+                        {
+                            for(RadioIdentifier patchedRadio: patchGroup.getPatchedRadioIdentifiers())
+                            {
+                                Alias patchedRadioAlias = radioAliasList.getAlias(patchedRadio);
+
+                                if(patchedRadioAlias != null && !aliases.contains(patchedRadioAlias))
+                                {
+                                    aliases.add(patchedRadioAlias);
+                                }
+                            }
+                        }
+                    }
+
+                    return aliases;
                 case RADIO:
                     RadioIdentifier radio = (RadioIdentifier)identifier;
 
@@ -427,7 +474,7 @@ public class AliasList
                         return toList(radioAliasList.getAlias(radio));
                     }
                     break;
-                case DCS:
+                case ESN:
                     if(identifier instanceof ESNIdentifier)
                     {
                         return toList(getESNAlias(((ESNIdentifier)identifier).getValue()));
@@ -483,9 +530,7 @@ public class AliasList
     {
         if(alias != null)
         {
-            List<Alias> aliases = new ArrayList<>();
-            aliases.add(alias);
-            return aliases;
+            return Collections.singletonList(alias);
         }
 
         return Collections.emptyList();
@@ -608,6 +653,7 @@ public class AliasList
      */
     public class TalkgroupAliasList
     {
+        private Map<String,Alias> mFullyQualifiedTalkgroupAliasMap = new HashMap<>();
         private Map<Integer,Alias> mTalkgroupAliasMap = new TreeMap<>();
         private Map<TalkgroupRange, Alias> mTalkgroupRangeAliasMap = new HashMap<>();
 
@@ -617,6 +663,13 @@ public class AliasList
 
         public Alias getAlias(TalkgroupIdentifier identifier)
         {
+            //Attempt to do a fully qualified identifier match only
+            if(identifier instanceof FullyQualifiedTalkgroupIdentifier fqti)
+            {
+                return mFullyQualifiedTalkgroupAliasMap.get(fqti.getFullyQualifiedTalkgroupAddress());
+            }
+
+            //Attempt to match the talkgroup value
             int value = identifier.getValue();
 
             Alias mapValue = mTalkgroupAliasMap.get(value);
@@ -625,6 +678,7 @@ public class AliasList
                 return mapValue;
             }
 
+            //Alternatively, match the talkgroup to any talkgroup ranges
             for(Map.Entry<TalkgroupRange, Alias> entry : mTalkgroupRangeAliasMap.entrySet())
             {
                 if(entry.getKey().contains(value))
@@ -638,26 +692,55 @@ public class AliasList
 
         public void add(Talkgroup talkgroup, Alias alias)
         {
-            //Detect talkgroup collisions and set overlap flag for both
-            if(mTalkgroupAliasMap.containsKey(talkgroup.getValue()))
+            if(talkgroup instanceof P25FullyQualifiedTalkgroup fqt)
             {
-                Alias existing = mTalkgroupAliasMap.get(talkgroup.getValue());
-
-                if(!existing.equals(alias))
+                //Detect collisions
+                if(mFullyQualifiedTalkgroupAliasMap.containsKey(fqt.getHashKey()))
                 {
-                    talkgroup.setOverlap(true);
+                    Alias existing = mFullyQualifiedTalkgroupAliasMap.get(fqt.getHashKey());
 
-                    for(AliasID aliasID: existing.getAliasIdentifiers())
+                    if(!existing.equals(alias))
                     {
-                        if(aliasID instanceof Talkgroup && ((Talkgroup)aliasID).getValue() == talkgroup.getValue())
+                        fqt.setOverlap(true);
+
+                        for(AliasID aliasID: existing.getAliasIdentifiers())
                         {
-                            aliasID.setOverlap(true);
+                            if(aliasID instanceof P25FullyQualifiedTalkgroup existingFqt &&
+                                    existingFqt.getHashKey().contentEquals(fqt.getHashKey()))
+                            {
+                                aliasID.setOverlap(true);
+                            }
                         }
                     }
                 }
+                else
+                {
+                    mFullyQualifiedTalkgroupAliasMap.put(fqt.getHashKey(), alias);
+                }
             }
+            else
+            {
+                //Detect talkgroup collisions and set overlap flag for both
+                if(mTalkgroupAliasMap.containsKey(talkgroup.getValue()))
+                {
+                    Alias existing = mTalkgroupAliasMap.get(talkgroup.getValue());
 
-            mTalkgroupAliasMap.put(talkgroup.getValue(), alias);
+                    if(!existing.equals(alias))
+                    {
+                        talkgroup.setOverlap(true);
+
+                        for(AliasID aliasID: existing.getAliasIdentifiers())
+                        {
+                            if(aliasID instanceof Talkgroup && ((Talkgroup)aliasID).getValue() == talkgroup.getValue())
+                            {
+                                aliasID.setOverlap(true);
+                            }
+                        }
+                    }
+                }
+
+                mTalkgroupAliasMap.put(talkgroup.getValue(), alias);
+            }
         }
 
         public void add(TalkgroupRange talkgroupRange, Alias alias)
@@ -690,6 +773,7 @@ public class AliasList
      */
     public class RadioAliasList
     {
+        private Map<String,Alias> mFullyQualifiedRadioAliasMap = new HashMap<>();
         private Map<Integer,Alias> mRadioAliasMap = new TreeMap<>();
         private Map<RadioRange, Alias> mRadioRangeAliasMap = new HashMap<>();
 
@@ -699,6 +783,13 @@ public class AliasList
 
         public Alias getAlias(RadioIdentifier identifier)
         {
+            //Match fully qualified identifier only.
+            if(identifier instanceof FullyQualifiedRadioIdentifier fqri)
+            {
+                return mFullyQualifiedRadioAliasMap.get(fqri.getFullyQualifiedRadioAddress());
+            }
+
+            //Attempt to match against the radio identifier
             int value = identifier.getValue();
 
             Alias mapValue = mRadioAliasMap.get(value);
@@ -707,6 +798,7 @@ public class AliasList
                 return mapValue;
             }
 
+            //Alternatively, attempt to match the radio address against any radio ranges.
             for(Map.Entry<RadioRange, Alias> entry : mRadioRangeAliasMap.entrySet())
             {
                 if(entry.getKey().contains(value))
@@ -720,26 +812,55 @@ public class AliasList
 
         public void add(Radio radio, Alias alias)
         {
-            //Detect collisions
-            if(mRadioAliasMap.containsKey(radio.getValue()))
+            if(radio instanceof P25FullyQualifiedRadio fqr)
             {
-                Alias existing = mRadioAliasMap.get(radio.getValue());
-
-                if(!existing.equals(alias))
+                //Detect collisions
+                if(mFullyQualifiedRadioAliasMap.containsKey(fqr.getHashKey()))
                 {
-                    radio.setOverlap(true);
+                    Alias existing = mFullyQualifiedRadioAliasMap.get(fqr.getHashKey());
 
-                    for(AliasID aliasID: existing.getAliasIdentifiers())
+                    if(!existing.equals(alias))
                     {
-                        if(aliasID instanceof Radio && ((Radio)aliasID).getValue() == radio.getValue())
+                        fqr.setOverlap(true);
+
+                        for(AliasID aliasID: existing.getAliasIdentifiers())
                         {
-                            aliasID.setOverlap(true);
+                            if(aliasID instanceof P25FullyQualifiedRadio existingFqr &&
+                                    existingFqr.getHashKey().contentEquals(fqr.getHashKey()))
+                            {
+                                aliasID.setOverlap(true);
+                            }
                         }
                     }
                 }
+                else
+                {
+                    mFullyQualifiedRadioAliasMap.put(fqr.getHashKey(), alias);
+                }
             }
+            else
+            {
+                //Detect collisions
+                if(mRadioAliasMap.containsKey(radio.getValue()))
+                {
+                    Alias existing = mRadioAliasMap.get(radio.getValue());
 
-            mRadioAliasMap.put(radio.getValue(), alias);
+                    if(!existing.equals(alias))
+                    {
+                        radio.setOverlap(true);
+
+                        for(AliasID aliasID: existing.getAliasIdentifiers())
+                        {
+                            if(aliasID instanceof Radio existingRadio && (existingRadio.getValue() == radio.getValue()))
+                            {
+                                aliasID.setOverlap(true);
+                            }
+                        }
+                    }
+                }
+
+                mRadioAliasMap.put(radio.getValue(), alias);
+            }
         }
 
         public void add(RadioRange radioRange, Alias alias)

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -63,6 +63,69 @@ public class AliasModel
         return mAliasListNames;
     }
 
+    /**
+     * Clears and reloads the list of alias list names from the current set of aliases.
+     */
+    public void refreshAliasListNames()
+    {
+        mAliasListNames.clear();
+
+        for(Alias alias : mAliases)
+        {
+            String aliasListName = alias.getAliasListName();
+
+            if(aliasListName != null && !aliasListName.isEmpty() && !mAliasListNames.contains(aliasListName))
+            {
+                mAliasListNames.add(aliasListName);
+            }
+        }
+    }
+
+    /**
+     * Renames the alias list across the set of aliases.
+     * @param oldName currently used by the alias
+     * @param newName to apply to the alias
+     */
+    public void renameAliasList(String oldName, String newName)
+    {
+        if(oldName == null || oldName.isEmpty() || newName == null || newName.isEmpty())
+        {
+            return;
+        }
+
+        mAliases.stream().filter(alias -> alias.getAliasListName().equals(oldName)).forEach(alias -> alias.setAliasListName(newName));
+    }
+
+    /**
+     * Deletes any aliases that have the alias list name
+     * @param aliasListName to delete
+     */
+    public void deleteAliasList(String aliasListName)
+    {
+        if(aliasListName == null || aliasListName.isEmpty())
+        {
+            return;
+        }
+
+        mAliases.removeIf(alias -> alias.getAliasListName().equals(aliasListName));
+        mAliasListMap.remove(aliasListName);
+    }
+
+    /**
+     * Adds the list of alias list names to the currently managed set of alias list names.
+     * @param aliasListNames to add
+     */
+    public void addAliasListNames(List<String> aliasListNames)
+    {
+        for(String aliasListName : aliasListNames)
+        {
+            if(!mAliasListNames.contains(aliasListName))
+            {
+                mAliasListNames.add(aliasListName);
+            }
+        }
+    }
+
     /**
      * Unmodifiable list of all aliases currently in the model
      */

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,11 +35,14 @@ 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.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.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;
@@ -61,11 +64,14 @@ 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 = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
+    @JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
     @JsonSubTypes.Type(value = Priority.class, name = "priority"),
     @JsonSubTypes.Type(value = Radio.class, name = "radio"),
     @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,8 @@ public enum AliasIDType
     LOJACK("LoJack"),
     LTR_NET_UID("LTR-Net UID"),
     MIN("Passport MIN"),
+    P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
+    P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
     PRIORITY("Audio Priority"),
     RADIO_ID("Radio ID"),
     RADIO_ID_RANGE("Radio ID Range"),
@@ -56,7 +58,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,
-        UNIT_STATUS, STATUS, TONES);
+        P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);
 
     public String toString()
     {

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

@@ -0,0 +1,127 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 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 com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Fully qualified radio.  Note: this is only for P25.
+ */
+public class P25FullyQualifiedRadio extends Radio
+{
+    private int mWacn;
+    private int mSystem;
+
+    public P25FullyQualifiedRadio()
+    {
+        //No-arg JAXB constructor
+    }
+
+    /**
+     * Constructs an instance
+     * @param wacn for the radio
+     * @param system for the radio
+     * @param id for the radio
+     */
+    public P25FullyQualifiedRadio(int wacn, int system, int id)
+    {
+        super(Protocol.APCO25, id);
+        mWacn = wacn;
+        mSystem = system;
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.P25_FULLY_QUALIFIED_RADIO_ID;
+    }
+
+    /**
+     * WACN for this radio
+     * @return wacn
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "wacn")
+    public int getWacn()
+    {
+        return mWacn;
+    }
+
+    /**
+     * Sets the WACN for this radio
+     * @param wacn for this radio
+     */
+    public void setWacn(int wacn)
+    {
+        mWacn = wacn;
+    }
+
+    /**
+     * System for this radio
+     * @return system
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "system")
+    public int getSystem()
+    {
+        return mSystem;
+    }
+
+    /**
+     * Sets the system for this radio
+     * @param system for this radio
+     */
+    public void setSystem(int system)
+    {
+        mSystem = system;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Fully Qualified Radio ID:").append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        sb.append(" Protocol:").append((getProtocol()));
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Hashable string key for use in a lookup map
+     */
+    @JsonIgnore
+    public String getHashKey()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,128 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 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 com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Fully qualified talkgroup.  Note: this is only for P25.
+ */
+public class P25FullyQualifiedTalkgroup extends Talkgroup
+{
+    private int mWacn;
+    private int mSystem;
+
+    public P25FullyQualifiedTalkgroup()
+    {
+        //No-arg JAXB constructor
+    }
+
+    /**
+     * Constructs an instance
+     * @param wacn for the radio
+     * @param system for the radio
+     * @param talkgroup value
+     */
+    public P25FullyQualifiedTalkgroup(int wacn, int system, int talkgroup)
+    {
+        super(Protocol.APCO25, talkgroup);
+        mWacn = wacn;
+        mSystem = system;
+    }
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.P25_FULLY_QUALIFIED_TALKGROUP;
+    }
+
+    /**
+     * WACN for this radio
+     * @return wacn
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "wacn")
+    public int getWacn()
+    {
+        return mWacn;
+    }
+
+    /**
+     * Sets the WACN for this radio
+     * @param wacn for this radio
+     */
+    public void setWacn(int wacn)
+    {
+        mWacn = wacn;
+    }
+
+    /**
+     * System for this radio
+     * @return system
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "system")
+    public int getSystem()
+    {
+        return mSystem;
+    }
+
+    /**
+     * Sets the system for this radio
+     * @param system for this radio
+     */
+    public void setSystem(int system)
+    {
+        mSystem = system;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Fully Qualified Radio ID:").append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        sb.append(" Protocol:").append((getProtocol()));
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Hashable string key for use in a lookup map
+     * @return
+     */
+    @JsonIgnore
+    public String getHashKey()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getWacn());
+        sb.append(".").append(getSystem());
+        sb.append(".").append(getValue());
+        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/audio/AudioSegment.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -27,6 +27,7 @@ import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.identifier.IdentifierUpdateNotification;
 import io.github.dsheirer.identifier.MutableIdentifierCollection;
+import io.github.dsheirer.identifier.encryption.EncryptionKeyIdentifier;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import java.util.Collection;
@@ -68,6 +69,7 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
     private final static Logger mLog = LoggerFactory.getLogger(AudioSegment.class);
     private BooleanProperty mComplete = new SimpleBooleanProperty(false);
     private BooleanProperty mDuplicate = new SimpleBooleanProperty(false);
+    private BooleanProperty mEncrypted = new SimpleBooleanProperty(false);
     private BooleanProperty mRecordAudio = new SimpleBooleanProperty(false);
     private IntegerProperty mMonitorPriority = new SimpleIntegerProperty(Priority.DEFAULT_PRIORITY);
     private ObservableSet<BroadcastChannel> mBroadcastChannels = FXCollections.observableSet(new HashSet<>());
@@ -129,6 +131,25 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
         return (mSampleCount / 8); //8 kHz audio generates 8 samples per millisecond
     }
 
+    /**
+     * Indicates if the audio segment contains encrypted audio.
+     *
+     * @return encrypted property
+     */
+    public BooleanProperty encryptedProperty()
+    {
+        return mEncrypted;
+    }
+
+    /**
+     * Indicates if this audio segment is encrypted
+     * @return true if encrypted.
+     */
+    public boolean isEncrypted()
+    {
+        return mEncrypted.get();
+    }
+
     /**
      * The complete property is used by the audio segment producer to signal that the segment is complete and no
      * additional audio or identifiers will be added to the segment.
@@ -386,6 +407,11 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
             throw new IllegalStateException("Can't add audio to an audio segment that is being disposed");
         }
 
+        if(mAudioBuffers.isEmpty())
+        {
+            mStartTimestamp = System.currentTimeMillis() - 20;
+        }
+
         mAudioBuffers.add(audioBuffer);
         mSampleCount += audioBuffer.length;
     }
@@ -415,6 +441,14 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
     {
         mIdentifierCollection.update(identifier);
 
+        /**
+         * If we have a late-add encryption key, set the encrypted flag to true.
+         */
+        if(identifier instanceof EncryptionKeyIdentifier eki)
+        {
+            mEncrypted.set(eki.isEncrypted());
+        }
+
         List<Alias> aliases = mAliasList.getAliases(identifier);
 
         for(Alias alias: aliases)

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * 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
@@ -28,12 +28,9 @@ 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.preference.UserPreferences;
-import io.github.dsheirer.preference.duplicate.DuplicateCallDetectionPreference;
+import io.github.dsheirer.preference.duplicate.ICallManagementProvider;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.util.ThreadPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -41,7 +38,10 @@ import java.util.Map;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Detects duplicate calls that occur within the same system.  This detector is thread safe for the receive() method.
@@ -52,18 +52,41 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class DuplicateCallDetector implements Listener<AudioSegment>
 {
     private final static Logger mLog = LoggerFactory.getLogger(DuplicateCallDetector.class);
-    private DuplicateCallDetectionPreference mDuplicateCallDetectionPreference;
+    private ICallManagementProvider mCallManagementProvider;
     private Map<String,SystemDuplicateCallDetector> mDetectorMap = new HashMap();
+    protected Listener<AudioSegment> mDuplicateCallDetectionListener;
 
+    /**
+     * Constructs an instance.
+     * @param userPreferences to access the duplicate call detection preferences.
+     */
     public DuplicateCallDetector(UserPreferences userPreferences)
     {
-        mDuplicateCallDetectionPreference = userPreferences.getDuplicateCallDetectionPreference();
+        this(userPreferences.getCallManagementPreference());
+    }
+
+    /**
+     * Constructs an instance.
+     * @param callManagementProvider to provide call management preferences.
+     */
+    public DuplicateCallDetector(ICallManagementProvider callManagementProvider)
+    {
+        mCallManagementProvider = callManagementProvider;
+    }
+
+    /**
+     * Optional listener to be notified each time an audio segment is flagged as duplicate.
+     * @param listener to register
+     */
+    public void setDuplicateCallDetectionListener(Listener<AudioSegment> listener)
+    {
+        mDuplicateCallDetectionListener = listener;
     }
 
     @Override
     public void receive(AudioSegment audioSegment)
     {
-        if(mDuplicateCallDetectionPreference.isDuplicateCallDetectionEnabled())
+        if(mCallManagementProvider.isDuplicateCallDetectionEnabled())
         {
             Identifier identifier = audioSegment.getIdentifierCollection()
                 .getIdentifier(IdentifierClass.CONFIGURATION, Form.SYSTEM, Role.ANY);
@@ -78,7 +101,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
 
                     if(detector == null)
                     {
-                        detector = new SystemDuplicateCallDetector();
+                        detector = new SystemDuplicateCallDetector(mCallManagementProvider, system);
                         mDetectorMap.put(system, detector);
                     }
 
@@ -88,45 +111,99 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
         }
     }
 
+    /**
+     * System level duplicate call detector.  Uses a scheduled executor to run every 25 ms to compare all ongoing call
+     * audio segments to detect duplicates.
+     *
+     * All audio segments remain in the queue until they are flagged as complete.  While in the queue, each call is
+     * compared against the others to detect duplicates.  Once all calls are either flagged as complete or flagged as
+     * duplicate and removed, the queue is empty and the monitoring is shutdown until a new audio segment arrives and
+     * then the monitoring starts again.
+     */
     public class SystemDuplicateCallDetector
     {
-        private LinkedTransferQueue<AudioSegment> mAudioSegmentQueue = new LinkedTransferQueue<>();
-        private List<AudioSegment> mAudioSegments = new ArrayList<>();
-        private AtomicBoolean mMonitoring = new AtomicBoolean();
+        private final LinkedTransferQueue<AudioSegment> mAudioSegmentQueue = new LinkedTransferQueue<>();
+        private final List<AudioSegment> mAudioSegments = new ArrayList<>();
         private ScheduledFuture<?> mProcessorFuture;
+        private Lock mLock = new ReentrantLock();
+        private boolean mMonitoring = false;
+        private final ICallManagementProvider mCallManagementProvider;
+        private String mSystem;
 
-        public SystemDuplicateCallDetector()
+        /**
+         * Constructs an instance
+         * @param callManagementProvider to check for duplicate monitoring preferences
+         */
+        public SystemDuplicateCallDetector(ICallManagementProvider callManagementProvider, String system)
         {
+            mCallManagementProvider = callManagementProvider;
+            mSystem = system;
         }
 
+        /**
+         * Adds the audio segment to the monitoring queue.
+         * @param audioSegment to add
+         */
         public void add(AudioSegment audioSegment)
         {
-            //Block on audio segment queue so that we don't interfere with monitoring shutdown
-            synchronized(mAudioSegmentQueue)
+            mLock.lock();
+
+            try
             {
                 mAudioSegmentQueue.add(audioSegment);
                 startMonitoring();
             }
-        }
-
-        private void startMonitoring()
-        {
-            if(mMonitoring.compareAndSet(false, true))
+            finally
             {
-                mProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(() -> process(),
-                    0, 25, TimeUnit.MILLISECONDS);
+                mLock.unlock();
             }
         }
 
+        /**
+         * Starts the call monitoring thread if it's not already running.
+         *
+         * Note: this method should only be called from a thread with the lock acquired.
+         */
+        private void startMonitoring()
+        {
+            if(!mMonitoring)
+            {
+                mProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(this::process,
+                    0, 25, TimeUnit.MILLISECONDS);
+                mMonitoring = true;
+            }
+        }
+
+        /**
+         * Stops the call monitoring thread if the audio segements queue is empty.
+         *
+         * Note: this should only be called from a separate thread and not from within the scheduled monitoring thread
+         * because cancelling the scheduled timer from within the process() method would kill the thread without
+         * releasing the lock, causing a deadlock.
+         */
         private void stopMonitoring()
         {
-            if(mMonitoring.compareAndSet(true, false))
+            mLock.lock();
+
+            try
             {
-                if(mProcessorFuture != null)
+                //Recheck the audio segments queue to make sure we didn't slip in another audio segment before we can
+                //shut down the scheduled monitoring thread.
+                if(mMonitoring && mAudioSegments.isEmpty())
                 {
-                    mProcessorFuture.cancel(true);
+                    if(mProcessorFuture != null)
+                    {
+                        mProcessorFuture.cancel(true);
+                        mProcessorFuture = null;
+                    }
+
+                    mMonitoring = false;
                 }
             }
+            finally
+            {
+                mLock.unlock();
+            }
         }
 
         /**
@@ -137,7 +214,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
          */
         private boolean isDuplicate(AudioSegment segment1, AudioSegment segment2)
         {
-            if(mDuplicateCallDetectionPreference.isDuplicateCallDetectionByTalkgroupEnabled())
+            if(mCallManagementProvider.isDuplicateCallDetectionByTalkgroupEnabled())
             {
                 //Step 1 check for duplicate TO values
                 List<Identifier> to1 = segment1.getIdentifierCollection().getIdentifiers(Role.TO);
@@ -149,7 +226,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                 }
             }
 
-            if(mDuplicateCallDetectionPreference.isDuplicateCallDetectionByRadioEnabled())
+            if(mCallManagementProvider.isDuplicateCallDetectionByRadioEnabled())
             {
                 //Step 2 check for duplicate FROM values
                 List<Identifier> from1 = segment1.getIdentifierCollection().getIdentifiers(Role.FROM);
@@ -169,53 +246,51 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
          * @param identifiers2
          * @return
          */
-        private boolean isDuplicate(List<Identifier> identifiers1, List<Identifier> identifiers2)
+        public static boolean isDuplicate(List<Identifier> identifiers1, List<Identifier> identifiers2)
         {
             for(Identifier identifier1: identifiers1)
             {
-                if(identifier1 instanceof TalkgroupIdentifier)
+                if(identifier1 instanceof TalkgroupIdentifier tgId1)
                 {
-                    int talkgroup1 = ((TalkgroupIdentifier)identifier1).getValue();
+                    int tg1 = tgId1.getValue();
 
                     for(Identifier identifier2: identifiers2)
                     {
-                        if(identifier2 instanceof TalkgroupIdentifier &&
-                           ((TalkgroupIdentifier)identifier2).getValue() == talkgroup1)
+                        if(identifier2 instanceof TalkgroupIdentifier tgId2 && tgId2.getValue() == tg1)
                         {
                             return true;
                         }
-                        else if(identifier2 instanceof PatchGroupIdentifier &&
-                            ((PatchGroupIdentifier)identifier2).getValue().getPatchGroup().getValue() == talkgroup1)
+                        else if(identifier2 instanceof PatchGroupIdentifier pgId2 &&
+                                pgId2.getValue().getPatchGroup().getValue() == tg1)
                         {
                             return true;
                         }
                     }
                 }
-                else if(identifier1 instanceof PatchGroupIdentifier)
+                else if(identifier1 instanceof PatchGroupIdentifier pgId1)
                 {
-                    int talkgroup1 = ((PatchGroupIdentifier)identifier1).getValue().getPatchGroup().getValue();
+                    int talkgroup1 = pgId1.getValue().getPatchGroup().getValue();
 
                     for(Identifier identifier2: identifiers2)
                     {
-                        if(identifier2 instanceof TalkgroupIdentifier &&
-                            ((TalkgroupIdentifier)identifier2).getValue() == talkgroup1)
+                        if(identifier2 instanceof TalkgroupIdentifier tgId2 && tgId2.getValue() == talkgroup1)
                         {
                             return true;
                         }
-                        else if(identifier2 instanceof PatchGroupIdentifier &&
-                            ((PatchGroupIdentifier)identifier2).getValue().getPatchGroup().getValue() == talkgroup1)
+                        else if(identifier2 instanceof PatchGroupIdentifier pgId2 &&
+                                pgId2.getValue().getPatchGroup().getValue() == talkgroup1)
                         {
                             return true;
                         }
                     }
                 }
-                else if(identifier1 instanceof RadioIdentifier)
+                else if(identifier1 instanceof RadioIdentifier raId1)
                 {
-                    int radio1 = ((RadioIdentifier)identifier1).getValue();
+                    int radio1 = raId1.getValue();
 
                     for(Identifier identifier2: identifiers2)
                     {
-                        if(identifier2 instanceof RadioIdentifier && ((RadioIdentifier)identifier2).getValue() == radio1)
+                        if(identifier2 instanceof RadioIdentifier raId2 && raId2.getValue() == radio1)
                         {
                             return true;
                         }
@@ -231,6 +306,8 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
          */
         private void process()
         {
+            mLock.lock();
+
             try
             {
                 //Transfer in newly arrived audio segments
@@ -248,6 +325,19 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                     return complete;
                 });
 
+                //Remove any encrypted audio segments.
+                mAudioSegments.removeIf(audioSegment -> {
+                    boolean encrypted = audioSegment.isEncrypted();
+
+                    if(encrypted)
+                    {
+                        audioSegment.decrementConsumerCount();
+                    }
+
+
+                    return encrypted;
+                });
+
                 //Only check for duplicates if there is more than one call
                 if(mAudioSegments.size() > 1)
                 {
@@ -258,7 +348,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                     {
                         AudioSegment current = mAudioSegments.get(currentIndex);
 
-                        if(!current.isDuplicate())
+                        if(current.hasAudio() && !current.isDuplicate())
                         {
                             int checkIndex = currentIndex + 1;
 
@@ -273,6 +363,12 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                                         toCheck.setDuplicate(true);
                                         toCheck.decrementConsumerCount();
                                         duplicates.add(toCheck);
+
+                                        //Notify optional listener that we flagged the call as duplicate.
+                                        if(mDuplicateCallDetectionListener != null)
+                                        {
+                                            mDuplicateCallDetectionListener.receive(toCheck);
+                                        }
                                     }
                                 }
 
@@ -286,26 +382,12 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                     mAudioSegments.removeAll(duplicates);
                 }
 
-                //Finally, if the audio segment queue is empty, shutdown montitoring until a new segment arrives
+                //Finally, if the audio segment queue is now empty, shutdown monitoring until a new segment arrives.
+                //The monitor shutdown method has to be called on a separate thread so that we don't kill our current
+                // thread and fail to release the lock.
                 if(mAudioSegments.isEmpty())
                 {
-                    //Block on the audio segment queue so that we can shutdown before any new segments are added, and
-                    //allow the add(segment) to restart monitoring as soon as needed.
-                    synchronized(mAudioSegmentQueue)
-                    {
-                        if(mAudioSegmentQueue.isEmpty())
-                        {
-                            try
-                            {
-                                stopMonitoring();
-                            }
-                            catch(Exception e)
-                            {
-                                mLog.error("Unexpected error during duplicate audio segment monitoring shutdown", e);
-                                //Do nothing, we got interrupted
-                            }
-                        }
-                    }
+                    ThreadPool.CACHED.submit(this::stopMonitoring);
                 }
             }
             catch(Throwable t)
@@ -313,6 +395,10 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                 mLog.error("Unknown error while processing audio segments for duplicate call detection.  Please report " +
                     "this to the developer.", t);
             }
+            finally
+            {
+                mLock.unlock();
+            }
         }
     }
 }

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

@@ -34,6 +34,7 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
     private Listener<BroadcastEvent> mBroadcastEventListener;
     private T mBroadcastConfiguration;
     protected ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>(BroadcastState.READY);
+    protected ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
     protected int mStreamedAudioCount = 0;
     protected int mErrorAudioCount = 0;
     protected int mAgedOffAudioCount = 0;
@@ -55,6 +56,14 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
         return mBroadcastState;
     }
 
+    /**
+     * Observable last bad broadcast state property
+     */
+    public ObjectProperty<BroadcastState> lastBadBroadcastStateProperty()
+    {
+        return mLastBadBroadcastState;
+    }
+
     /**
      * Current state of the broadcastAudio connection
      */
@@ -68,10 +77,26 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
      */
     public void setBroadcastState(BroadcastState broadcastState)
     {
+        if(broadcastState == BroadcastState.CONNECTED)
+        {
+            mLastBadBroadcastState.setValue(null);
+        }
+        else if(broadcastState.isErrorState() || broadcastState.isWarningState())
+        {
+            mLastBadBroadcastState.setValue(broadcastState);
+        }
         mBroadcastState.setValue(broadcastState);
         broadcast(new BroadcastEvent(this, BroadcastEvent.Event.BROADCASTER_STATE_CHANGE));
     }
 
+    /**
+     * Last bad state of the broadcastAudio connection
+     */
+    public BroadcastState getLastBadBroadcastState()
+    {
+        return mLastBadBroadcastState.get();
+    }
+
     /**
      * Starts the broadcaster
      */

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

@@ -211,9 +211,17 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
 
             super.setBroadcastState(state);
 
-            if(mBroadcastState.get() != null && mBroadcastState.get().isErrorState())
+            if(mBroadcastState.get() != null)
             {
-                stop();
+                if(mBroadcastState.get().isErrorState())
+                {
+                    mLog.error("[" + getStreamName() + "] status: " + mBroadcastState.get().toString());
+                    stop();
+                }
+                else if(mBroadcastState.get().isWarningState())
+                {
+                    mLog.warn("[" + getStreamName() + "] status: " + mBroadcastState.get().toString());
+                }
             }
 
             if(!connected())

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -19,25 +19,34 @@
 
 package io.github.dsheirer.audio.broadcast;
 
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.audio.AudioSegment;
+import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.MutableIdentifierCollection;
+import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.identifier.patch.PatchGroup;
+import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.record.AudioSegmentRecorder;
 import io.github.dsheirer.record.RecordFormat;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.util.ThreadPool;
 import io.github.dsheirer.util.TimeStamp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Audio streaming manager monitors audio segments through completion and creates temporary streaming recordings on
@@ -127,7 +136,7 @@ public class AudioStreamingManager implements Listener<AudioSegment>
         {
             audioSegment = it.next();
 
-            if(audioSegment.isDuplicate() && mUserPreferences.getDuplicateCallDetectionPreference().isDuplicateStreamingSuppressionEnabled())
+            if(audioSegment.isDuplicate() && mUserPreferences.getCallManagementPreference().isDuplicateStreamingSuppressionEnabled())
             {
                 it.remove();
                 audioSegment.decrementConsumerCount();
@@ -138,29 +147,60 @@ public class AudioStreamingManager implements Listener<AudioSegment>
 
                 if(mAudioRecordingListener != null && audioSegment.hasBroadcastChannels())
                 {
-                    Path path = getTemporaryRecordingPath();
-                    long length = 0;
-
-                    for(float[] audioBuffer: audioSegment.getAudioBuffers())
-                    {
-                        length += audioBuffer.length;
-                    }
-
-                    length /= 8; //Sample rate is 8000 samples per second, or 8 samples per millisecond.
-
-                    try
-                    {
-                        AudioSegmentRecorder.record(audioSegment, path, RecordFormat.MP3, mUserPreferences);
-                        IdentifierCollection identifierCollectionCopy =
+                    IdentifierCollection identifiers =
                             new IdentifierCollection(audioSegment.getIdentifierCollection().getIdentifiers());
 
-                        AudioRecording audioRecording = new AudioRecording(path, audioSegment.getBroadcastChannels(),
-                            identifierCollectionCopy, audioSegment.getStartTimestamp(), length);
-                        mAudioRecordingListener.receive(audioRecording);
-                    }
-                    catch(IOException ioe)
+                    if(identifiers.getToIdentifier() instanceof PatchGroupIdentifier patchGroupIdentifier)
                     {
-                        mLog.error("Error recording temporary stream MP3");
+                        if(mUserPreferences.getCallManagementPreference()
+                                .getPatchGroupStreamingOption() == PatchGroupStreamingOption.TALKGROUPS)
+                        {
+                            //Decompose the patch group into the individual (patched) talkgroups and process the audio
+                            //segment for each patched talkgroup.
+                            PatchGroup patchGroup = patchGroupIdentifier.getValue();
+
+                            List<Identifier> ids = new ArrayList<>();
+                            ids.addAll(patchGroup.getPatchedTalkgroupIdentifiers());
+                            ids.addAll(patchGroup.getPatchedRadioIdentifiers());
+
+                            //If there are no patched radios/talkgroups, override user preference and stream as a patch group
+                            if(ids.isEmpty() || audioSegment.getAliasList() == null)
+                            {
+                                processAudioSegment(audioSegment, identifiers, audioSegment.getBroadcastChannels());
+                            }
+                            else
+                            {
+                                AliasList aliasList = audioSegment.getAliasList();
+
+                                for(Identifier identifier: ids)
+                                {
+                                    List<Alias> aliases = aliasList.getAliases(identifier);
+                                    Set<BroadcastChannel> broadcastChannels = new HashSet<>();
+                                    for(Alias alias: aliases)
+                                    {
+                                        broadcastChannels.addAll(alias.getBroadcastChannels());
+                                    }
+
+                                    if(!broadcastChannels.isEmpty())
+                                    {
+                                        MutableIdentifierCollection decomposedIdentifiers =
+                                                new MutableIdentifierCollection(identifiers.getIdentifiers());
+                                        //Remove patch group TO identifier & replace with the patched talkgroup/radio
+                                        decomposedIdentifiers.remove(Role.TO);
+                                        decomposedIdentifiers.update(identifier);
+                                        processAudioSegment(audioSegment, decomposedIdentifiers, broadcastChannels);
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            processAudioSegment(audioSegment, identifiers, audioSegment.getBroadcastChannels());
+                        }
+                    }
+                    else
+                    {
+                        processAudioSegment(audioSegment, identifiers, audioSegment.getBroadcastChannels());
                     }
                 }
 
@@ -169,6 +209,40 @@ public class AudioStreamingManager implements Listener<AudioSegment>
         }
     }
 
+    /**
+     * Processes an audio segment for streaming by creating a temporary MP3 recording and submitting the recording
+     * to the specific broadcast channel(s).
+     * @param audioSegment to process for streaming
+     * @param identifierCollection to use for the streamed audio recording.
+     * @param broadcastChannels to receive the audio recording
+     */
+    private void processAudioSegment(AudioSegment audioSegment, IdentifierCollection identifierCollection,
+                                     Set<BroadcastChannel> broadcastChannels)
+    {
+        Path path = getTemporaryRecordingPath();
+        long length = 0;
+
+        for(float[] audioBuffer: audioSegment.getAudioBuffers())
+        {
+            length += audioBuffer.length;
+        }
+
+        length /= 8; //Sample rate is 8000 samples per second, or 8 samples per millisecond.
+
+        try
+        {
+            AudioSegmentRecorder.record(audioSegment, path, RecordFormat.MP3, mUserPreferences, identifierCollection);
+
+            AudioRecording audioRecording = new AudioRecording(path, broadcastChannels, identifierCollection,
+                    audioSegment.getStartTimestamp(), length);
+            mAudioRecordingListener.receive(audioRecording);
+        }
+        catch(IOException ioe)
+        {
+            mLog.error("Error recording temporary stream MP3");
+        }
+    }
+
     /**
      * Creates a temporary streaming recording file path
      */

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

@@ -25,6 +25,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyCallConfiguration;
 import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
+import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
 import io.github.dsheirer.audio.broadcast.icecast.IcecastConfiguration;
 import io.github.dsheirer.audio.broadcast.shoutcast.v1.ShoutcastV1Configuration;
 import io.github.dsheirer.audio.broadcast.shoutcast.v2.ShoutcastV2Configuration;
@@ -48,6 +49,7 @@ import java.net.SocketAddress;
 @JsonSubTypes({
     @JsonSubTypes.Type(value = BroadcastifyCallConfiguration.class, name="broadcastifyCallConfiguration"),
     @JsonSubTypes.Type(value = RdioScannerConfiguration.class, name="RdioScannerConfiguration"),
+    @JsonSubTypes.Type(value = OpenMHzConfiguration.class, name="OpenMHzConfiguration"),
     @JsonSubTypes.Type(value = IcecastConfiguration.class, name="icecastConfiguration"),
     @JsonSubTypes.Type(value = ShoutcastV1Configuration.class, name="shoutcastV1Configuration"),
     @JsonSubTypes.Type(value = ShoutcastV2Configuration.class, name="shoutcastV2Configuration"),

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

@@ -25,6 +25,9 @@ import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyFeedConfigura
 import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerBroadcaster;
 import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
 import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerFeedConfiguration;
+import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
+import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
+import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzFeedConfiguration;
 import io.github.dsheirer.audio.broadcast.icecast.IcecastHTTPAudioBroadcaster;
 import io.github.dsheirer.audio.broadcast.icecast.IcecastHTTPConfiguration;
 import io.github.dsheirer.audio.broadcast.icecast.IcecastTCPAudioBroadcaster;
@@ -67,6 +70,9 @@ public class BroadcastFactory
                 case RDIOSCANNER_CALL:
                     return new RdioScannerBroadcaster((RdioScannerConfiguration)configuration,
                             inputAudioFormat, mp3Setting, aliasModel);
+                case OPENMHZ:
+                    return new OpenMHzBroadcaster((OpenMHzConfiguration)configuration,
+                        inputAudioFormat, mp3Setting, aliasModel);
                 case BROADCASTIFY:
                     return new IcecastTCPAudioBroadcaster((BroadcastifyFeedConfiguration) configuration,
                             inputAudioFormat, mp3Setting, aliasModel);
@@ -109,6 +115,8 @@ public class BroadcastFactory
                 return new RdioScannerConfiguration(format);
             case BROADCASTIFY:
                 return new BroadcastifyFeedConfiguration(format);
+            case OPENMHZ:
+                return new OpenMHzConfiguration(format);
             case ICECAST_HTTP:
                 return new IcecastHTTPConfiguration(format);
             case ICECAST_TCP:

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -344,14 +344,13 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                 deleteBroadcaster(configuredBroadcast);
             }
 
-            AbstractAudioBroadcaster audioBroadcaster = BroadcastFactory.getBroadcaster(broadcastConfiguration,
+            final AbstractAudioBroadcaster audioBroadcaster = BroadcastFactory.getBroadcaster(broadcastConfiguration,
                     mAliasModel, mUserPreferences);
 
             if(audioBroadcaster != null)
             {
                 configuredBroadcast.setAudioBroadcaster(audioBroadcaster);
                 audioBroadcaster.setListener(mBroadcastEventListener);
-                audioBroadcaster.start();
                 mBroadcasterMap.put(audioBroadcaster.getBroadcastConfiguration().getId(), audioBroadcaster);
 
                 int index = mConfiguredBroadcasts.indexOf(configuredBroadcast);
@@ -362,6 +361,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                 }
 
                 broadcast(new BroadcastEvent(audioBroadcaster, BroadcastEvent.Event.BROADCASTER_ADD));
+                ThreadPool.CACHED.submit(audioBroadcaster::start);
             }
         }
     }

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

@@ -32,6 +32,7 @@ public enum BroadcastServerType
 
     ICECAST_HTTP("Icecast 2 (v2.4+)", "images/icecast.png"),
     RDIOSCANNER_CALL("Rdio Scanner", "images/rdioscanner.png"),
+    OPENMHZ("OpenMHz", "images/openmhz.png"),
     ICECAST_TCP("Icecast (v2.3)", "images/icecast.png"),
     SHOUTCAST_V1("Shoutcast v1.x", "images/shoutcast.png"),
     SHOUTCAST_V2("Shoutcast v2.x", "images/shoutcast.png"),

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

@@ -23,90 +23,92 @@ public enum BroadcastState
     /**
      * General error in configuration that causes the remote server to reject the connection
      */
-    CONFIGURATION_ERROR("Configuration Error", true),
+    CONFIGURATION_ERROR("Configuration Error", true, false),
 
     /**
      * Connected to the broadcastAudio server and capable of streaming
      */
-    CONNECTED("Connected", false),
+    CONNECTED("Connected", false, false),
 
     /**
      * Connection interrupted, attempting to reconnect.
      */
-    CONNECTING("Connecting", false),
+    CONNECTING("Connecting", false, false),
 
     /**
      * Indicates the configuration is disabled
      */
-    DISABLED("Disabled", true),
+    DISABLED("Disabled", true, false),
 
     /**
      * Disconnected from the broadcastAudio server
      */
-    DISCONNECTED("Disconnected", false),
+    DISCONNECTED("Disconnected", false, false),
 
     /**
      * Invalid credentials - user name or password
      */
-    INVALID_CREDENTIALS("Invalid User Name/Password", true),
+    INVALID_CREDENTIALS("Invalid User Name/Password", true, false),
 
     /**
      * Invalid mount point
      */
-    INVALID_MOUNT_POINT("Invalid Mount/Stream ID", true),
+    INVALID_MOUNT_POINT("Invalid Mount/Stream ID", true, false),
 
     /**
      * Invalid configuration settings
      */
-    INVALID_SETTINGS("Invalid Settings", true),
+    INVALID_SETTINGS("Invalid Settings", true, false),
 
     /**
      * Remote server max sources has been exceeded
      */
-    MAX_SOURCES_EXCEEDED("Max Sources Exceeded", true),
+    MAX_SOURCES_EXCEEDED("Max Sources Exceeded", false, true),
 
     /**
      * Specified mount point is already in use
      */
-    MOUNT_POINT_IN_USE("Mount Point In Use", false),
+    MOUNT_POINT_IN_USE("Mount Point In Use", false, true),
 
     /**
      * Network is unavailable or the server address cannot be resolved
      */
-    NETWORK_UNAVAILABLE("Network Unavailable", false),
+    NETWORK_UNAVAILABLE("Network Unavailable", false, false),
 
     /**
      * Server is not known or reachable
      */
-    NO_SERVER("No Server", false),
+    NO_SERVER("No Server", false, false),
 
     /**
      * Initial state with no connection attempted.
      */
-    READY("Ready", false),
+    READY("Ready", false, false),
 
     /**
      * Error while broadcasting stream data.  Temporary error state to allow connection to be reset.
      */
-    TEMPORARY_BROADCAST_ERROR("Temporary Broadcast Error", false),
+    TEMPORARY_BROADCAST_ERROR("Temporary Broadcast Error", false, false),
 
     /**
      * Unsupported audio format
      */
-    UNSUPPORTED_AUDIO_FORMAT("Unsupported Audio Type", true),
+    UNSUPPORTED_AUDIO_FORMAT("Unsupported Audio Type", true, false),
 
     /**
      * Unspecified error
      */
-    ERROR("Error", true);
+    ERROR("Error", true, false);
 
     private String mLabel;
     private boolean mErrorState;
+    private boolean mWarningState;
 
-    BroadcastState(String label, boolean errorState)
+    BroadcastState(String label, boolean errorState, boolean warningState)
     {
         mLabel = label;
         mErrorState = errorState;
+        mWarningState = warningState;
     }
 
     public String toString()
@@ -118,4 +120,9 @@ public enum BroadcastState
     {
         return mErrorState;
     }
+
+    public boolean isWarningState()
+    {
+        return mWarningState;
+    }
 }

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

@@ -37,6 +37,7 @@ public class ConfiguredBroadcast
     private BroadcastConfiguration mBroadcastConfiguration;
     private AbstractAudioBroadcaster mAudioBroadcaster;
     private ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>();
+    private ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
 
     /**
      * Constructs an instance
@@ -89,6 +90,14 @@ public class ConfiguredBroadcast
         return mBroadcastState;
     }
 
+    /**
+     * Last bad broadcast state of the configured audio broadcaster (optional)
+     */
+    public ObjectProperty<BroadcastState> lastBadBroadcastStateProperty()
+    {
+        return mLastBadBroadcastState;
+    }
+
     /**
      * Sets the audio broadcaster
      * @param audioBroadcaster to use for this configuration
@@ -96,11 +105,13 @@ public class ConfiguredBroadcast
     public void setAudioBroadcaster(AbstractAudioBroadcaster audioBroadcaster)
     {
         mBroadcastState.unbind();
+        mLastBadBroadcastState.unbind();
         mAudioBroadcaster = audioBroadcaster;
 
         if(audioBroadcaster != null)
         {
             mBroadcastState.bind(mAudioBroadcaster.broadcastStateProperty());
+            mLastBadBroadcastState.bind(mAudioBroadcaster.lastBadBroadcastStateProperty());
         }
         else
         {
@@ -120,6 +131,7 @@ public class ConfiguredBroadcast
             {
                 mBroadcastState.setValue(BroadcastState.CONFIGURATION_ERROR);
             }
+            mLastBadBroadcastState.setValue(null);
         }
     }
 

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

@@ -0,0 +1,48 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 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.broadcast;
+
+/**
+ * Options for streaming management of patch groups.  These options are used when streaming an audio call that is
+ * tagged to a patch group.  The audio will either be streamed once and identified as the patch group, or it will
+ * be streamed multiple times, once for each individual patched talkgroup.
+ */
+public enum PatchGroupStreamingOption
+{
+    PATCH_GROUP("Patch Group"),
+    TALKGROUPS("Individual Talkgroups");
+
+    private String mLabel;
+
+    /**
+     * Constructs an instance
+     * @param label to display
+     */
+    PatchGroupStreamingOption(String label)
+    {
+        mLabel = label;
+    }
+
+    @Override
+    public String toString()
+    {
+        return mLabel;
+    }
+}

src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.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
@@ -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,15 +34,13 @@ 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.configuration.AliasListConfigurationIdentifier;
 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.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
@@ -54,6 +54,8 @@ 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;
 
 /**
  * Audio broadcaster to push completed audio recordings to the Broadcastify call push API.
@@ -78,6 +80,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
@@ -88,6 +91,7 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                                        MP3Setting mp3Setting, AliasModel aliasModel)
     {
         super(config);
+        mAliasModel = aliasModel;
     }
 
     /**
@@ -445,10 +449,34 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
     /**
      * 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);
@@ -475,7 +503,11 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
 
         StringBuilder sb = new StringBuilder();
         sb.append(patchGroup.getPatchGroup().getValue().toString());
-        for(TalkgroupIdentifier patched: patchGroup.getPatchedGroupIdentifiers())
+        for(TalkgroupIdentifier patched: patchGroup.getPatchedTalkgroupIdentifiers())
+        {
+            sb.append(",").append(patched.getValue());
+        }
+        for(RadioIdentifier patched: patchGroup.getPatchedRadioIdentifiers())
         {
             sb.append(",").append(patched.getValue());
         }

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

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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.broadcastify;
 
@@ -35,6 +32,7 @@ public class BroadcastifyFeedConfiguration extends IcecastTCPConfiguration
     private final static Logger mLog = LoggerFactory.getLogger(BroadcastifyFeedConfiguration.class);
 
     private int mFeedID;
+    private boolean mVerboseLogging = false;
 
     public BroadcastifyFeedConfiguration()
     {
@@ -123,4 +121,15 @@ public class BroadcastifyFeedConfiguration extends IcecastTCPConfiguration
     {
         mFeedID = feedID;
     }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "verbose_logging")
+    public boolean isVerboseLogging()
+    {
+        return mVerboseLogging;
+    }
+
+    public void setVerboseLogging(boolean verboseLogging)
+    {
+        mVerboseLogging = verboseLogging;
+    }
 }

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

@@ -52,6 +52,7 @@ 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";
 
@@ -61,6 +62,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 +143,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 +163,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 +234,11 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
         {
             mStreamingSession.closeNow();
         }
+        
+        mLastConnectionAttempt = System.currentTimeMillis();
+        if(!getBroadcastState().isErrorState()) {
+            setBroadcastState(BroadcastState.DISCONNECTED);
+        }
     }
 
     /**
@@ -288,6 +317,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())
             {
@@ -323,6 +353,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                     if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP))
                     {
                         setBroadcastState(BroadcastState.CONNECTED);
+						mConnectionFailureLogged.set(false);
                     }
                     else
                     {
@@ -341,15 +372,29 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                                     }
                                     else
                                     {
-                                        mLog.error("String [" + getStreamName() + "] - HTTP protocol decoder error - message:\n\n" + message);
+                                        mLog.error("String [" + getStreamName() + "] - HTTP 403 protocol decoder error - message:\n\n" + message);
+                                        setBroadcastState(BroadcastState.DISCONNECTED);
+                                        disconnect();
+                                    }
+                                    break;
+                                case 401: //Unauthorized
+                                    if(message.toString().contains("Authentication Required"))
+                                    {
+                                        mLog.error("Stream [" + getStreamName() + "] - unable to connect - invalid credentials");
+                                        setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
+                                        disconnect();
+                                    }
+                                    else
+                                    {
+                                        mLog.error("String [" + getStreamName() + "] - HTTP 401 protocol decoder error - message:\n\n" + message);
                                         setBroadcastState(BroadcastState.DISCONNECTED);
                                         disconnect();
                                     }
                                     break;
                                 default:
-                                    mLog.error("String [" + getStreamName() + "] - HTTP protocol decoder error - message:\n\n" + message);
-                                    setBroadcastState(BroadcastState.DISCONNECTED);
-                                    disconnect();
+                                        mLog.error("String [" + getStreamName() + "] - HTTP protocol decoder error - message:\n\n" + message);
+                                        setBroadcastState(BroadcastState.DISCONNECTED);
+                                        disconnect();
                             }
                         }
                         else
@@ -391,6 +436,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                     case SUCCESS_OK:
                         setBroadcastState(BroadcastState.CONNECTED);
                         mConnecting.set(false);
+						mConnectionFailureLogged.set(false);
                         break;
                     case CLIENT_ERROR_UNAUTHORIZED:
                         setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
@@ -401,9 +447,16 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                         disconnect();
                         break;
                     default:
-                        setBroadcastState(BroadcastState.ERROR);
-                        disconnect();
+                        /**
+                         * Only allow a generic error to update state if we've not already experienced a more
+                         * specific error. Otherwise, trailing messages will clear the more meaningful error state.
+                         */
+                        if(!getBroadcastState().isErrorState())
+                        {
+                            setBroadcastState(BroadcastState.ERROR);
+                        }
                         mLog.debug("Unspecified error: " + response.toString() + " Class:" + object.getClass());
+                        disconnect();
                         break;
                 }
             }

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -20,6 +20,7 @@ package io.github.dsheirer.audio.broadcast.icecast;
 
 import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
+import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyFeedConfiguration;
 import io.github.dsheirer.audio.broadcast.icecast.codec.IcecastCodecFactory;
 import io.github.dsheirer.audio.convert.InputAudioFormat;
 import io.github.dsheirer.audio.convert.MP3AudioConverter;
@@ -39,6 +40,8 @@ import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.logging.LogLevel;
+import org.apache.mina.filter.logging.LoggingFilter;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,6 +59,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
     private IoSession mStreamingSession = null;
 
     private long mLastConnectionAttempt = 0;
+    private boolean mVerboseLogging = false;
     private AtomicBoolean mConnecting = new AtomicBoolean();
 
     /**
@@ -73,6 +77,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                                       MP3Setting mp3Setting, AliasModel aliasModel)
     {
         super(configuration, inputAudioFormat, mp3Setting, aliasModel);
+
+        if(configuration instanceof BroadcastifyFeedConfiguration broadcastify)
+        {
+            mVerboseLogging = broadcastify.isVerboseLogging();
+        }
     }
 
     /**
@@ -85,7 +94,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
         {
             if(mInlineActive)
             {
-                byte[] metadata = IcecastMetadata.formatInline(IcecastMetadata.getTitle(identifierCollection, mAliasModel)).getBytes();
                 if (mInlineRemaining == -1)
                 {
                     mInlineRemaining = mInlineInterval;
@@ -96,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);
             }
         }
@@ -132,9 +158,12 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                 mSocketConnector = new NioSocketConnector();
                 mSocketConnector.getSessionConfig().setWriteTimeout(WRITE_TIMEOUT_SECONDS);
 
-//                LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
-//                loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
-//                mSocketConnector.getFilterChain().addLast("logger", loggingFilter);
+                if(mVerboseLogging)
+                {
+                    LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
+                    loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
+                    mSocketConnector.getFilterChain().addLast("logger", loggingFilter);
+                }
 
                 mSocketConnector.getFilterChain().addLast("codec",
                     new ProtocolCodecFilter(new IcecastCodecFactory()));
@@ -148,6 +177,10 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                 @Override
                 public void run()
                 {
+                    if(mVerboseLogging)
+                    {
+                        mLog.info("Attempting connection ...");
+                    }
                     setBroadcastState(BroadcastState.CONNECTING);
 
                     try
@@ -156,19 +189,42 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                             .connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
                                 getBroadcastConfiguration().getPort()));
 
+                        if(mVerboseLogging)
+                        {
+                            mLog.info("Socket created - asynchronous connect requested - entering wait period");
+                        }
+
                         boolean connected = future.await(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
 
                         if(connected)
                         {
+                            if(mVerboseLogging)
+                            {
+                                mLog.info("Connected.");
+                            }
+
                             mStreamingSession = future.getSession();
                             mConnecting.set(false);
                             return;
                         }
+                        else
+                        {
+                            if(mVerboseLogging)
+                            {
+                                mLog.info("Not Connected.  Connection attempt timeout [" + CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS + "ms] exceeded");
+                            }
+                        }
                     }
                     catch(RuntimeIoException rioe)
                     {
                         if(rioe.getCause() instanceof SocketException)
                         {
+                            if(mVerboseLogging)
+                            {
+                                mLog.info("Socket error.  This usually indicates sdrtrunk can't reach the server " +
+                                        "address over the current network connection.  Setting state to " +
+                                        "NETWORK UNAVAILABLE", rioe);
+                            }
                             setBroadcastState(BroadcastState.NETWORK_UNAVAILABLE);
                             mConnecting.set(false);
                             return;
@@ -176,12 +232,22 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                     }
                     catch(UnresolvedAddressException uae)
                     {
+                        if(mVerboseLogging)
+                        {
+                            mLog.info("Unresolved Address error.  This means the domain name services can't resolve " +
+                                    "the server URL to an IP address.  Setting state to NETWORK UNAVAILABLE", uae);
+                        }
+
                         setBroadcastState(BroadcastState.NETWORK_UNAVAILABLE);
                         mConnecting.set(false);
                         return;
                     }
                     catch(Exception e)
                     {
+                        if(mVerboseLogging)
+                        {
+                            mLog.info("Unknown error.  An error occurred while attempting to connect to the server.", e);
+                        }
                         mLog.error("Error", e);
                         //Disregard ... we'll disconnect and try again
                     }
@@ -190,6 +256,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                         mLog.error("Throwable error caught", t);
                     }
 
+                    if(mVerboseLogging)
+                    {
+                        mLog.info("Starting disconnect sequence since an error occurred while trying to connect.");
+                    }
+
                     disconnect();
                     mConnecting.set(false);
                 }
@@ -209,6 +280,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
     {
         if(connected() && mStreamingSession != null)
         {
+            if(mVerboseLogging)
+            {
+                mLog.info("Routine disconnect requested from a connected state with a non-null streaming session");
+            }
+
             mStreamingSession.closeNow();
         }
         else
@@ -217,6 +293,12 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
             //want to preserve the error state that got us here, so the user can see it.
             if(!getBroadcastState().isErrorState())
             {
+                if(mVerboseLogging)
+                {
+                    mLog.info("Disconnect requested - previous non-error state was [" + getBroadcastState() +
+                            "] - changing state to DISCONNECTED");
+                }
+
                 setBroadcastState(BroadcastState.DISCONNECTED);
             }
 
@@ -282,12 +364,23 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                 mInlineActive = false;
             }
 
+            if(mVerboseLogging)
+            {
+                mLog.info("Session opened. Sending: " + sb);
+            }
+
+
             session.write(sb.toString());
         }
 
         @Override
         public void sessionClosed(IoSession session) throws Exception
         {
+            if(mVerboseLogging)
+            {
+                mLog.info("Session closed.  Setting connecting flag to false.");
+            }
+
             mLastConnectionAttempt = System.currentTimeMillis();
 
             //If there is already an error state, don't override it.  Otherwise, set state to disconnected
@@ -311,15 +404,23 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                 mLog.error("[" + getStreamName() + "] Broadcast error", cause);
             }
 
+            if(mVerboseLogging)
+            {
+                mLog.info("Session error caught.", cause);
+            }
+
             disconnect();
         }
 
         @Override
         public void messageReceived(IoSession session, Object object) throws Exception
         {
-            if(object instanceof String)
+            if(object instanceof String message)
             {
-                String message = (String) object;
+                if(mVerboseLogging)
+                {
+                    mLog.info("Message Received [" + message + "]");
+                }
 
                 if(message != null && !message.trim().isEmpty())
                 {
@@ -347,7 +448,15 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                     else
                     {
                         mLog.error("Unrecognized server response:" + message);
-                        setBroadcastState(BroadcastState.ERROR);
+
+                        /**
+                         * Only allow a generic error to update state if we've not already experienced a more
+                         * specific error. Otherwise, trailing messages will clear the more meaningful error state.
+                         */
+                        if(!getBroadcastState().isErrorState())
+                        {
+                            setBroadcastState(BroadcastState.ERROR);
+                        }
                     }
                 }
             }

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

@@ -0,0 +1,51 @@
+/*
+ * *****************************************************************************
+ *  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/>
+ * ****************************************************************************
+ */
+
+ package io.github.dsheirer.audio.broadcast.openmhz;
+
+ /**
+  * HTTP headers used for posting to Rdio Scanner API
+  */
+ public enum FormField
+ {
+     CALL("call"),
+     FREQ("freq"),
+     START_TIME("start_time"),
+     STOP_TIME("stop_time"),
+     CALL_LENGTH("call_length"),
+     TALKGROUP_NUM("talkgroup_num"),
+     EMERGENCY("emergency"),
+     API_KEY("api_key"),
+     SOURCE_LIST("source_list"),
+     FREQ_LIST("freq_list"),
+     PATCH_LIST("patch_list"),
+     TALKER_ALIAS("talker_alias");
+
+     private String mHeader;
+
+     FormField(String header)
+     {
+         mHeader = header;
+     }
+
+     public String getHeader()
+     {
+         return mHeader;
+     }
+ }

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

@@ -0,0 +1,681 @@
+/*
+ * *****************************************************************************
+ * 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.audio.broadcast.openmhz;
+
+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;
+
+
+
+ /**
+  * Audio broadcaster to push completed audio recordings to the OpenMHz call upload API.
+  *
+  */
+ public class OpenMHzBroadcaster extends AbstractAudioBroadcaster<OpenMHzConfiguration>
+ {
+     private final static Logger mLog = LoggerFactory.getLogger(OpenMHzBroadcaster.class);
+
+     private static final String ENCODING_TYPE_MP3 = "mp3";
+     private static final String MULTIPART_TYPE = "multipart";
+     private static final String DEFAULT_SUBTYPE = "form-data";
+     private static final String MULTIPART_FORM_DATA = MULTIPART_TYPE + "/" + DEFAULT_SUBTYPE;
+     private static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
+     private Queue<AudioRecording> mAudioRecordingQueue = new LinkedTransferQueue<>();
+     private ScheduledFuture<?> mAudioRecordingProcessorFuture;
+     private HttpClient mHttpClient = HttpClient.newBuilder()
+         .version(HttpClient.Version.HTTP_2)
+         .followRedirects(HttpClient.Redirect.NORMAL)
+         .connectTimeout(Duration.ofSeconds(20))
+         .build();
+     private long mLastConnectionAttempt;
+     private long mConnectionAttemptInterval = 5000; //Every 5 seconds
+     private AliasModel mAliasModel;
+
+     /**
+      * Constructs an instance of the broadcaster
+      * @param config to use
+      * @param aliasModel for access to aliases
+      */
+     public OpenMHzBroadcaster(OpenMHzConfiguration config, InputAudioFormat inputAudioFormat,
+                                        MP3Setting mp3Setting, AliasModel aliasModel)
+     {
+         super(config);
+         mAliasModel = aliasModel;
+     }
+
+     /**
+      * Starts the audio recording processor thread
+      */
+     @Override
+     public void start()
+     {
+         setBroadcastState(BroadcastState.CONNECTING);
+         String response = testConnection(getBroadcastConfiguration());
+         mLastConnectionAttempt = System.currentTimeMillis();
+
+         if(response == "OK")
+         {
+             setBroadcastState(BroadcastState.CONNECTED);
+         }
+         else if (response == "No Response")
+         {
+            setBroadcastState(BroadcastState.NO_SERVER);
+            mLog.error("Error connecting to OpenMHz server [Server not found or not reachable]");
+         }
+         else
+         {
+             mLog.error("Error connecting to OpenMHz server on startup [" + response + "]");
+             setBroadcastState(BroadcastState.ERROR);
+         }
+
+         if(mAudioRecordingProcessorFuture == null)
+         {
+             mAudioRecordingProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(new AudioRecordingProcessor(),
+                 0, 500, TimeUnit.MILLISECONDS);
+         }
+     }
+
+     /**
+      * Stops the audio recording processor thread
+      */
+     @Override
+     public void stop()
+     {
+         if(mAudioRecordingProcessorFuture != null)
+         {
+             mAudioRecordingProcessorFuture.cancel(true);
+             mAudioRecordingProcessorFuture = null;
+             dispose();
+             setBroadcastState(BroadcastState.DISCONNECTED);
+         }
+     }
+
+     /**
+      * Prepares for disposal
+      */
+     @Override
+     public void dispose()
+     {
+         AudioRecording audioRecording = mAudioRecordingQueue.poll();
+
+         while(audioRecording != null)
+         {
+             audioRecording.removePendingReplay();
+             audioRecording = mAudioRecordingQueue.poll();
+         }
+     }
+
+     /**
+      * Indicates if this broadcaster continues to have successful connections to and transactions with the remote
+      * server.  If there is a connectivity or other issue, the broadcast state is set to temporary error and
+      * the audio processor thread will persistently invoke this method to attempt a reconnect.
+      */
+     private boolean connected()
+     {
+         if(getBroadcastState() != BroadcastState.CONNECTED &&
+             (System.currentTimeMillis() - mLastConnectionAttempt > mConnectionAttemptInterval))
+         {
+             setBroadcastState(BroadcastState.CONNECTING);
+
+             String response = testConnection(getBroadcastConfiguration());
+             mLastConnectionAttempt = System.currentTimeMillis();
+
+             if(response == "OK")
+             {
+                 setBroadcastState(BroadcastState.CONNECTED);
+             }
+             else if (response == "No Response")
+             {
+                setBroadcastState(BroadcastState.NO_SERVER);
+                mLog.error("Error reconnecting to OpenMHz server [Server not found or not reachable]");
+             }
+             else
+             {
+                 setBroadcastState(BroadcastState.ERROR);
+                 mLog.error("Error reconnecting to OpenMHz server [" + response + "]");
+             }
+
+         }
+
+         return getBroadcastState() == BroadcastState.CONNECTED;
+     }
+
+     @Override
+     public int getAudioQueueSize()
+     {
+         return mAudioRecordingQueue.size();
+     }
+
+     @Override
+     public void receive(AudioRecording audioRecording)
+     {
+         mAudioRecordingQueue.offer(audioRecording);
+         broadcast(new BroadcastEvent(this, BroadcastEvent.Event.BROADCASTER_QUEUE_CHANGE));
+     }
+
+     /**
+      * Indicates if the audio recording is non-null and not too old, meaning that the age of the recording has not
+      * exceeded the max age value indicated in the broadcast configuration.  Audio recordings that are too old will be
+      * deleted to ensure that the in-memory queue size doesn't blow up.
+      * @param audioRecording to test
+      * @return true if the recording is valid
+      */
+     private boolean isValid(AudioRecording audioRecording)
+     {
+         return audioRecording != null && System.currentTimeMillis() - audioRecording.getStartTime() <=
+             getBroadcastConfiguration().getMaximumRecordingAge();
+     }
+
+     /**
+      * Processes any enqueued audio recordings. This method employs asynchronous
+      * interaction with the server, so multiple audio recording uploads can occur simultaneously.
+      */
+     private void processRecordingQueue()
+     {
+
+
+         while(connected() && !mAudioRecordingQueue.isEmpty())
+         {
+             final AudioRecording audioRecording = mAudioRecordingQueue.poll();
+             broadcast(new BroadcastEvent(this, BroadcastEvent.Event.BROADCASTER_QUEUE_CHANGE));
+
+             if(isValid(audioRecording) && audioRecording.getRecordingLength() > 0)
+             {
+                 int durationSeconds = (int)(audioRecording.getRecordingLength() / 1E3f);
+                 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);
+                 String talkgroupGroup = getTalkgroupGroup(audioRecording);
+                 String systemLabel = getSystemLabel(audioRecording);
+
+                 try
+                 {
+                     byte[] audioBytes = null;
+
+                     try
+                     {
+                         audioBytes = Files.readAllBytes(audioRecording.getPath());
+                     }
+                     catch(IOException e)
+                     {
+                         mLog.error("OpenMHz - audio recording file not found - ignoring upload");
+                     }
+
+                     if(audioBytes != null)
+                     {
+                        String uri = getBroadcastConfiguration().getHost() + "/" + getBroadcastConfiguration().getSystemName() + "/upload";
+
+                         OpenMHzBuilder bodyBuilder = new OpenMHzBuilder();
+                             bodyBuilder
+                             .addFile(audioBytes)
+                             .addPart(FormField.FREQ, frequency)
+                             .addPart(FormField.START_TIME, timestampSeconds)
+                             .addPart(FormField.STOP_TIME, timestampSeconds)
+                             .addPart(FormField.CALL_LENGTH, durationSeconds)
+                             .addPart(FormField.TALKGROUP_NUM, talkgroup)
+                             .addPart(FormField.EMERGENCY, 0)
+                             .addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
+                             .addPart(FormField.PATCH_LIST, patches)
+                             .addPart(FormField.TALKER_ALIAS, talkerAlias)
+                             .addPart(FormField.SOURCE_LIST, "[{ \"pos\": 0.00, \"src\": " + radioId + "}]");
+
+                         HttpRequest fileRequest = HttpRequest.newBuilder()
+                             .uri(URI.create(uri))
+                             .header(HttpHeaders.CONTENT_TYPE, MULTIPART_FORM_DATA + "; boundary=" + bodyBuilder.getBoundary())
+                             .header(HttpHeaders.USER_AGENT, "sdrtrunk")
+                             .POST(bodyBuilder.build())
+                             .build();
+
+                         mHttpClient.sendAsync(fileRequest, HttpResponse.BodyHandlers.ofString())
+                             .whenComplete((fileResponse, throwable1) -> {
+                                 if(throwable1 != null || fileResponse.statusCode() != 200)
+                                 {
+                                     if(throwable1 instanceof IOException || throwable1 instanceof CompletionException)
+                                     {
+                                         //We get socket reset exceptions occasionally when the remote server doesn't
+                                         //fully read our request and immediately responds.
+                                         setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
+                                         mLog.error("OpenMHz API file upload fail [" +
+                                             fileResponse.statusCode() + "] response [" +
+                                             fileResponse.body() + "]");
+                                     }
+                                     else
+                                     {
+                                         setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
+                                         mLog.error("OpenMHz API file upload fail [" +
+                                             fileResponse.statusCode() + "] response [" +
+                                             fileResponse.body() + "]");
+                                     }
+
+                                     incrementErrorAudioCount();
+                                     broadcast(new BroadcastEvent(OpenMHzBroadcaster.this,
+                                         BroadcastEvent.Event.BROADCASTER_ERROR_COUNT_CHANGE));
+                                 }
+                                 else
+                                 {
+
+                                     if(fileResponse.statusCode() == 200)
+                                     {
+                                         incrementStreamedAudioCount();
+                                         broadcast(new BroadcastEvent(OpenMHzBroadcaster.this,
+                                             BroadcastEvent.Event.BROADCASTER_STREAMED_COUNT_CHANGE)); 
+                                         audioRecording.removePendingReplay(); 
+                                     }
+                                     else
+                                     {
+                                         setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
+                                         mLog.error("OpenMHz API file upload fail [" +
+                                             fileResponse.statusCode() + "] response [" +
+                                             fileResponse.body() + "]");
+                                     }
+
+
+                                 }
+
+                             });
+                     }
+                     else
+                     {
+                         //Register an error for the file not found exception
+                         mLog.error("OpenMHz API - upload file not found [" +
+                             audioRecording.getPath().toString() + "]");
+                         incrementErrorAudioCount();
+                         broadcast(new BroadcastEvent(OpenMHzBroadcaster.this,
+                             BroadcastEvent.Event.BROADCASTER_ERROR_COUNT_CHANGE));
+                         audioRecording.removePendingReplay();
+                     }
+                 }
+                 catch(Exception e)
+                 {
+                     mLog.error("Unknown Error", e);
+                     setBroadcastState(BroadcastState.ERROR);
+                     incrementErrorAudioCount();
+                     broadcast(new BroadcastEvent(this, BroadcastEvent.Event.BROADCASTER_ERROR_COUNT_CHANGE));
+                     audioRecording.removePendingReplay();
+                 }
+             }
+         }
+
+         //If we're not connected and there are recordings in the queue, check the recording at the head of the queue
+         // and start age-off once the recordings become too old.  The recordings should be time ordered in the queue.
+         AudioRecording audioRecording = mAudioRecordingQueue.peek();
+
+         while(audioRecording != null)
+         {
+             if(isValid(audioRecording))
+             {
+                 return;
+             }
+             else
+             {
+                 //Remove the recording from the queue, remove a replay, and peek at the next recording in the queue
+                 mAudioRecordingQueue.poll();
+                 audioRecording.removePendingReplay();
+                 incrementAgedOffAudioCount();
+                 broadcast(new BroadcastEvent(this, BroadcastEvent.Event.BROADCASTER_AGED_OFF_COUNT_CHANGE));
+                 audioRecording = mAudioRecordingQueue.peek();
+             }
+         }
+     }
+
+     /**
+      * Creates a frequency value from the audio recording identifier collection.
+      */
+     private static Long getFrequency(AudioRecording audioRecording)
+     {
+         Identifier identifier = audioRecording.getIdentifierCollection().getIdentifier(IdentifierClass.CONFIGURATION,
+             Form.CHANNEL_FREQUENCY, Role.ANY);
+
+         if(identifier instanceof ConfigurationLongIdentifier)
+         {
+             Long value = ((ConfigurationLongIdentifier)identifier).getValue();
+
+             if(value != null)
+             {
+                 return value;
+             }
+         }
+
+         return Long.valueOf(0);
+     }
+
+     /**
+      * Creates a formatted string with the FROM identifier or uses a default of zero(0)
+      */
+     private static String getFrom(AudioRecording audioRecording)
+     {
+         for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
+         {
+             if(identifier instanceof RadioIdentifier)
+             {
+                 return ((RadioIdentifier)identifier).getValue().toString();
+             }
+         }
+
+         return "0";
+     }
+
+     /**
+      * Creates a formatted string with the TO identifiers or uses a default of zero (0)
+      * 
+      */
+     private String getTo(AudioRecording audioRecording)
+     {
+         Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
+
+         if(identifier != null)
+         {
+             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";
+     }
+
+     /**
+      * Creates a formatted string with the Talkgroup Label from the Audio Recording Alias
+      * If this is a PatchGroup we return only the first label as the primary talkgroup label.
+      * 
+      */
+     private String getTalkgroupLabel(AudioRecording audioRecording)
+     {
+
+         AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
+         Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
+
+         StringBuilder sb = new StringBuilder();
+         if(identifier != null)
+         {
+             List<Alias> aliases = aliasList.getAliases(identifier);
+             if(!aliases.isEmpty())
+             {
+                 sb.append(aliases.get(0));
+             }
+
+         }
+
+         return sb.toString();
+     }
+
+     /**
+      * Creates a formatted string with the Talkgroup Group from the Audio Recording Alias
+      * If this is a PatchGroup we return only the first group as the primary talkgroup group.
+      * 
+      */
+     private String getTalkgroupGroup(AudioRecording audioRecording)
+     {
+
+         AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
+         Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
+
+         StringBuilder sb = new StringBuilder();
+         if(identifier != null)
+         {
+             List<Alias> aliases = aliasList.getAliases(identifier);
+             if(!aliases.isEmpty())
+             {
+                 sb.append(aliases.get(0).getGroup());
+             }
+         }
+
+         return sb.toString();
+     }
+
+     /**
+      * Creates a formatted string with the System Label from the Audio Recording Alias
+      * If this is a PatchGroup we return only the first sytem as the primary talkgroup system.
+      * 
+      */
+     private String getSystemLabel(AudioRecording audioRecording)
+     {
+         List<Identifier> systems = audioRecording.getIdentifierCollection().getIdentifiers(Form.SYSTEM);
+
+         StringBuilder sb = new StringBuilder();
+         if(!systems.isEmpty())
+         {
+            sb.append(systems.get(0));
+         }
+
+         return sb.toString();
+     }
+
+    /**
+     * Creates a formatted string with the patched talkgroups
+     */
+    public static String getPatches(AudioRecording audioRecording)
+    {
+        Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
+
+        if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
+        {
+            PatchGroup patchGroup = patchGroupIdentifier.getValue();
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("[");
+            
+            sb.append(patchGroup.getPatchGroup().getValue().toString());
+            
+            for(TalkgroupIdentifier patched: patchGroup.getPatchedTalkgroupIdentifiers())
+            {
+                sb.append(",").append(patched.getValue());
+            }
+
+            for(RadioIdentifier patched: patchGroup.getPatchedRadioIdentifiers())
+            {
+                sb.append(",").append(patched.getValue());
+            }
+            
+            sb.append("]");
+            return sb.toString();
+        }
+
+        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
+      * @return error string or null if test is successful
+      */
+     public static String testConnection(OpenMHzConfiguration configuration)
+     {
+         String uri = configuration.getHost() + "/" + configuration.getSystemName() + "/authorize";
+
+         HttpClient httpClient = HttpClient.newBuilder()
+             .version(HttpClient.Version.HTTP_1_1)
+             .followRedirects(HttpClient.Redirect.NORMAL)
+             .connectTimeout(Duration.ofSeconds(20))
+             .build();
+
+         HttpRequest request = HttpRequest.newBuilder()
+             .uri(URI.create(uri))
+             .header(HttpHeaders.CONTENT_TYPE, APPLICATION_FORM_URLENCODED)
+             .header(HttpHeaders.USER_AGENT, "sdrtrunk")
+             .POST(HttpRequest.BodyPublishers.ofString("api_key="+configuration.getApiKey()))
+             .build();
+
+         HttpResponse.BodyHandler<String> responseHandler = HttpResponse.BodyHandlers.ofString();
+
+         try
+         {
+            HttpResponse<String> response = httpClient.send(request, responseHandler);
+
+             if (response.statusCode() == 200)
+             {
+                return "OK";
+             }
+             else if(response.statusCode() == 403)
+             {
+                return "Invalid API Key";
+             }
+             else if(response.statusCode() == 500)
+             {
+                return "Invalid System Name";
+             }
+
+             return "No Response";
+         }
+         catch(Exception e)
+         {  
+            Throwable throwableCause = e.getCause();
+
+            if(throwableCause instanceof ConnectException)
+            {
+                return "No Response";
+            }
+
+            mLog.error("Exception connecting to OpenMHz server [" + e.toString() + "]");
+            return "Uknown Exception";
+         }
+     }
+
+     public class AudioRecordingProcessor implements Runnable
+     {
+         @Override
+         public void run()
+         {
+             processRecordingQueue();
+         }
+     }
+
+     public static void main(String[] args)
+     {
+         mLog.debug("Starting ...");
+
+         OpenMHzConfiguration config = new OpenMHzConfiguration();
+         config.setHost("https://api.OpenMHz.com/call-upload-dev");
+         config.setApiKey("c33aae37-8572-11ea-bd8b-0ecc8ab9ccec");
+         config.setSystemName("systemx");
+
+         String response = testConnection(config);
+         mLog.error("Response: " + response);
+
+         if(response == "OK")
+         {
+             mLog.debug("Test Successful!");
+         }
+         else
+         {
+             if(response.contains("Invalid API Key"))
+             {
+                 mLog.error("Invalid API Key");
+             }
+             else if(response.contains("Invalid System Name"))
+             {
+                 mLog.error("Invalid System Name");
+             }
+             else
+             {
+                 mLog.debug("Response: " + response);
+             }
+         }
+
+         mLog.debug("Finished!");
+     }
+ }

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

@@ -0,0 +1,216 @@
+/*
+ * *****************************************************************************
+ *  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/>
+ * ****************************************************************************
+ */
+
+ package io.github.dsheirer.audio.broadcast.openmhz;
+
+ import java.net.http.HttpRequest;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.lang.*;
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+
+ /**
+  * Builder for an HTTP body publisher to produce a OpenMHz call event
+  */
+ public class OpenMHzBuilder
+ {
+     private static final String DASH_DASH = "--";
+     private static final String BOUNDARY = "--sdrtrunk-sdrtrunk-sdrtrunk";
+     private List<Part> mParts = new ArrayList<>();
+     private byte[] audioBytes = null; 
+
+     /**
+      * Constructs an instance
+      */
+     public OpenMHzBuilder()
+     {
+     }
+
+     /**
+      * Access the static multi-part boundary string
+      */
+     public String getBoundary()
+     {
+         return BOUNDARY;
+     }
+
+     /**
+      * Adds a Audio bytes part to the call
+      */
+     public OpenMHzBuilder addFile(byte[] value)
+     {
+         audioBytes = value;
+         return this;
+     }
+
+     /**
+      * Adds a string part to the call
+      */
+     public OpenMHzBuilder addPart(FormField key, String value)
+     {
+         if(key != null && value != null)
+         {
+             mParts.add(new Part(key.getHeader(), value));
+         }
+
+         return this;
+     }
+
+     /**
+      * Adds a number part to the call
+      */
+     public OpenMHzBuilder addPart(FormField key, Number value)
+     {
+         if(key != null && value != null)
+         {
+             mParts.add(new Part(key.getHeader(), value.toString()));
+         }
+
+         return this;
+     }
+
+     /**
+      * Creates a form-data item
+      */
+     private static String formatPart(Part part, String boundary)
+     {
+         StringBuilder sb = new StringBuilder();
+         sb.append(DASH_DASH).append(boundary).append("\r\n");
+         sb.append("Content-Disposition: form-data; name=\"").append(part.mKey).append("\"\r\n\r\n");
+         sb.append(part.getValue()).append("\r\n");
+         return sb.toString();
+     }
+
+     /**
+      * Creates the audio file item
+      */
+     private String formatFilePart(String boundary)
+     {
+
+         if(audioBytes == null)
+         {
+             return "";
+         }
+         StringBuilder sb= new StringBuilder();
+         sb.append(DASH_DASH).append(boundary).append("\r\n");
+         sb.append("Content-Disposition: form-data; name=\"").append("call").append("\"; filename=\"audio.mp3\"\r\n\r\n");
+         return sb.toString();
+
+     }
+
+     /**
+      * Creates the boundary closing item
+      */
+     private static String getClosingBoundary(String boundary)
+     {
+         StringBuilder sb = new StringBuilder();
+         sb.append(DASH_DASH).append(boundary).append(DASH_DASH).append("\r\n");
+         return sb.toString();
+     }
+
+     /**
+      * Creates a BodyPublisher for accessing the call form data
+      */
+     public HttpRequest.BodyPublisher build()
+     {
+         StringBuilder sb = new StringBuilder();
+
+         for(Part part: mParts)
+         {
+             sb.append(formatPart(part, BOUNDARY));
+         }
+
+         sb.append(formatFilePart(BOUNDARY));
+
+
+         /**
+         * We need to create a ByteArray consisting of the Sting "parts" and the audio file bytes
+         */
+         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+         try
+         {
+
+             outputStream.write(sb.toString().getBytes());
+
+             if(audioBytes != null)
+             {
+                 outputStream.write(audioBytes);
+             }
+
+             sb = new StringBuilder();
+             sb.append("\r\n");
+             sb.append(getClosingBoundary(BOUNDARY));
+
+             outputStream.write(sb.toString().getBytes());
+         }
+         catch(IOException e)
+         {
+             //mLog.error("Rdio Scanner API - unable to create POST reqeust.");
+         }
+
+         return HttpRequest.BodyPublishers.ofByteArray(outputStream.toByteArray());
+     }
+
+     @Override
+     public String toString()
+     {
+         StringBuilder sb = new StringBuilder();
+
+         for(Part part: mParts)
+         {
+             sb.append(formatPart(part, BOUNDARY));
+         }
+
+         sb.append(getClosingBoundary(BOUNDARY));
+
+         return sb.toString();
+     }
+
+     /**
+      * Key:Value pair holder
+      */
+     public class Part
+     {
+         private String mKey;
+         private String mValue;
+
+         /**
+          * Constructs a new part
+          * @param key value
+          * @param value item
+          */
+         public Part(String key, String value)
+         {
+             mKey = key;
+             mValue = value;
+         }
+
+         public String getKey()
+         {
+             return mKey;
+         }
+
+         public String getValue()
+         {
+             return mValue;
+         }
+     }
+ }

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

@@ -0,0 +1,139 @@
+/*
+ * *****************************************************************************
+ *  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/>
+ * ****************************************************************************
+ */
+
+ package io.github.dsheirer.audio.broadcast.openmhz;
+
+ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+ import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
+ import io.github.dsheirer.audio.broadcast.BroadcastFormat;
+ import io.github.dsheirer.audio.broadcast.BroadcastServerType;
+ import javafx.beans.binding.Bindings;
+ import javafx.beans.property.BooleanProperty;
+ import javafx.beans.property.IntegerProperty;
+ import javafx.beans.property.SimpleBooleanProperty;
+ import javafx.beans.property.SimpleIntegerProperty;
+ import javafx.beans.property.SimpleStringProperty;
+ import javafx.beans.property.StringProperty;
+
+ /**
+  * Streaming configuration for Rdio Scanner API.
+  *
+  * Note: this API is not a streaming audio service, rather a completed call push service.  However, it fits nicely
+  * with the structure of the audio streaming subsystem in sdrtrunk
+  */
+ public class OpenMHzConfiguration extends BroadcastConfiguration
+ {
+    public static final String PRODUCTION_ENDPOINT = "https://api.openmhz.com";
+
+     private StringProperty mSystemName = new SimpleStringProperty();
+     private StringProperty mApiKey = new SimpleStringProperty();
+
+     /**
+      * Constructor for faster jackson
+      */
+     public OpenMHzConfiguration()
+     {
+         this(BroadcastFormat.MP3);
+     }
+
+     /**
+      * Public constructor.
+      * @param format to use for audio recording (MP3)
+      */
+     public OpenMHzConfiguration(BroadcastFormat format)
+     {
+         super(format);
+
+         if(getHost() == null)
+         {
+             setHost(PRODUCTION_ENDPOINT);
+         }
+
+         //The parent class binds this property, so we unbind it and rebind it here
+         mValid.unbind();
+         mValid.bind(Bindings.and(Bindings.and(Bindings.isNotNull(mSystemName), Bindings.isNotNull(mApiKey)),
+             Bindings.isNotNull(mHost)));
+     }
+
+     /**
+      * System ID as a property
+      */
+     public StringProperty systemIDProperty()
+     {
+         return mSystemName;
+     }
+
+     /**
+      * API key as a property
+      */
+     public StringProperty apiKeyProperty()
+     {
+         return mApiKey;
+     }
+
+     /**
+      * API Key
+      */
+     @JacksonXmlProperty(isAttribute = true, localName = "api_key")
+     public String getApiKey()
+     {
+         return mApiKey.get();
+     }
+
+     /**
+      * Sets the api key
+      * @param apiKey
+      */
+     public void setApiKey(String apiKey)
+     {
+         mApiKey.setValue(apiKey);
+     }
+
+     /**
+      * System name as provided by OpenMHz.com
+      */
+     @JacksonXmlProperty(isAttribute = true, localName = "system_name")
+     public String getSystemName()
+     {
+         return mSystemName.get();
+     }
+
+     /**
+      * Sets the system name provided by OpenMHz.com
+      */
+     public void setSystemName(String systemName)
+     {
+         mSystemName.set(systemName);
+     }
+
+     @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+     @Override
+     public BroadcastServerType getBroadcastServerType()
+     {
+         return BroadcastServerType.OPENMHZ;
+     }
+
+     @Override
+     public BroadcastConfiguration copyOf()
+     {
+         OpenMHzConfiguration copy = new OpenMHzConfiguration();
+         copy.setSystemName(getSystemName());
+         return copy;
+     }
+ }

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

@@ -0,0 +1,233 @@
+/*
+ * *****************************************************************************
+ *  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/>
+ * ****************************************************************************
+ */
+
+ package io.github.dsheirer.gui.playlist.streaming;
+
+ 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 javafx.geometry.HPos;
+ import javafx.geometry.Insets;
+ import javafx.scene.control.Alert;
+ import javafx.scene.control.Button;
+ import javafx.scene.control.ButtonType;
+ import javafx.scene.control.Label;
+ import javafx.scene.control.TextField;
+ import javafx.scene.layout.GridPane;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.controlsfx.control.ToggleSwitch;
+
+ /**
+  * OpenMHz calls API configuration editor
+  */
+ public class OpenMHzEditor extends AbstractBroadcastEditor<OpenMHzConfiguration>
+ {
+     private final static Logger mLog = LoggerFactory.getLogger(OpenMHzEditor.class);
+     private TextField mSystemNameTextField;
+     private IntegerTextField mMaxAgeTextField;
+     private TextField mApiKeyTextField;
+     private TextField mHostTextField;
+     private GridPane mEditorPane;
+
+     /**
+      * Constructs an instance
+      * @param playlistManager for accessing the broadcast model
+      */
+     public OpenMHzEditor(PlaylistManager playlistManager)
+     {
+         super(playlistManager);
+     }
+
+     @Override
+     public void setItem(OpenMHzConfiguration item)
+     {
+         super.setItem(item);
+
+         getSystemNameTextField().setDisable(item == null);
+         getApiKeyTextField().setDisable(item == null);
+         getHostTextField().setDisable(item == null);
+         getMaxAgeTextField().setDisable(item == null);
+
+         if(item != null)
+         {
+             getSystemNameTextField().setText(item.getSystemName());
+             getApiKeyTextField().setText(item.getApiKey());
+             getHostTextField().setText(item.getHost());
+             getMaxAgeTextField().set((int)(item.getMaximumRecordingAge() / 1000));
+         }
+         else
+         {
+             getSystemNameTextField().setText(null);
+             getApiKeyTextField().setText(null);
+             getHostTextField().setText(null);
+             getMaxAgeTextField().set(0);
+         }
+
+         modifiedProperty().set(false);
+     }
+
+     @Override
+     public void dispose()
+     {
+     }
+
+     @Override
+     public void save()
+     {
+         if(getItem() != null)
+         {
+             getItem().setSystemName(getSystemNameTextField().getText());
+             getItem().setHost(getHostTextField().getText());
+             getItem().setApiKey(getApiKeyTextField().getText());
+             getItem().setMaximumRecordingAge(getMaxAgeTextField().get() * 1000);
+         }
+
+         super.save();
+     }
+
+     public BroadcastServerType getBroadcastServerType()
+     {
+         return BroadcastServerType.OPENMHZ;
+     }
+
+     protected GridPane getEditorPane()
+     {
+         if(mEditorPane == null)
+         {
+             mEditorPane = new GridPane();
+             mEditorPane.setPadding(new Insets(10, 5, 10,10));
+             mEditorPane.setVgap(10);
+             mEditorPane.setHgap(5);
+
+             int row = 0;
+
+             Label formatLabel = new Label("Format");
+             GridPane.setHalignment(formatLabel, HPos.RIGHT);
+             GridPane.setConstraints(formatLabel, 0, row);
+             mEditorPane.getChildren().add(formatLabel);
+
+             GridPane.setConstraints(getFormatField(), 1, row);
+             mEditorPane.getChildren().add(getFormatField());
+
+             Label enabledLabel = new Label("Enabled");
+             GridPane.setHalignment(enabledLabel, HPos.RIGHT);
+             GridPane.setConstraints(enabledLabel, 2, row);
+             mEditorPane.getChildren().add(enabledLabel);
+
+             GridPane.setConstraints(getEnabledSwitch(), 3, row);
+             mEditorPane.getChildren().add(getEnabledSwitch());
+
+             Label systemLabel = new Label("Name");
+             GridPane.setHalignment(systemLabel, HPos.RIGHT);
+             GridPane.setConstraints(systemLabel, 0, ++row);
+             mEditorPane.getChildren().add(systemLabel);
+
+             GridPane.setConstraints(getNameTextField(), 1, row);
+             mEditorPane.getChildren().add(getNameTextField());
+
+             Label apiKeyLabel = new Label("API Key");
+             GridPane.setHalignment(apiKeyLabel, HPos.RIGHT);
+             GridPane.setConstraints(apiKeyLabel, 0, ++row);
+             mEditorPane.getChildren().add(apiKeyLabel);
+
+             GridPane.setConstraints(getApiKeyTextField(), 1, row);
+             mEditorPane.getChildren().add(getApiKeyTextField());
+
+             Label systemNameLabel = new Label("System Short Name");
+             GridPane.setHalignment(systemNameLabel, HPos.RIGHT);
+             GridPane.setConstraints(systemNameLabel, 0, ++row);
+             mEditorPane.getChildren().add(systemNameLabel);
+
+             GridPane.setConstraints(getSystemNameTextField(), 1, row);
+             mEditorPane.getChildren().add(getSystemNameTextField());
+
+             Label hostLabel = new Label("OpenMHz Upload Server (API)");
+             GridPane.setHalignment(hostLabel, HPos.RIGHT);
+             GridPane.setConstraints(hostLabel, 0, ++row);
+             mEditorPane.getChildren().add(hostLabel);
+
+             GridPane.setConstraints(getHostTextField(), 1, row);
+             mEditorPane.getChildren().add(getHostTextField());
+
+             Label maxAgeLabel = new Label("Max Recording Age (seconds)");
+             GridPane.setHalignment(maxAgeLabel, HPos.RIGHT);
+             GridPane.setConstraints(maxAgeLabel, 0, ++row);
+             mEditorPane.getChildren().add(maxAgeLabel);
+
+             GridPane.setConstraints(getMaxAgeTextField(), 1, row);
+             mEditorPane.getChildren().add(getMaxAgeTextField());
+
+         }
+
+         return mEditorPane;
+     }
+
+     private IntegerTextField getMaxAgeTextField()
+     {
+         if(mMaxAgeTextField == null)
+         {
+             mMaxAgeTextField = new IntegerTextField();
+             mMaxAgeTextField.setDisable(true);
+             mMaxAgeTextField.textProperty().addListener(mEditorModificationListener);
+         }
+
+         return mMaxAgeTextField;
+     }
+
+     private TextField getHostTextField()
+     {
+         if(mHostTextField == null)
+         {
+             mHostTextField = new TextField();
+             mHostTextField.setDisable(true);
+             mHostTextField.textProperty().addListener(mEditorModificationListener);
+         }
+
+         return mHostTextField;
+     }
+
+     private TextField getApiKeyTextField()
+     {
+         if(mApiKeyTextField == null)
+         {
+             mApiKeyTextField = new TextField();
+             mApiKeyTextField.setDisable(true);
+             mApiKeyTextField.textProperty().addListener(mEditorModificationListener);
+         }
+
+         return mApiKeyTextField;
+     }
+
+     private TextField getSystemNameTextField()
+     {
+         if(mSystemNameTextField == null)
+         {
+             mSystemNameTextField = new TextField();
+             mSystemNameTextField.setDisable(true);
+             mSystemNameTextField.textProperty().addListener(mEditorModificationListener);
+         }
+
+         return mSystemNameTextField;
+     }
+
+
+ }

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

@@ -0,0 +1,126 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * 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/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+package io.github.dsheirer.audio.broadcast.openmhz;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
+import io.github.dsheirer.audio.broadcast.BroadcastFormat;
+import io.github.dsheirer.audio.broadcast.BroadcastServerType;
+import io.github.dsheirer.audio.broadcast.icecast.IcecastTCPConfiguration;
+import io.github.dsheirer.rrapi.type.UserFeedBroadcast;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OpenMHzFeedConfiguration extends IcecastTCPConfiguration
+{
+    private final static Logger mLog = LoggerFactory.getLogger(OpenMHzFeedConfiguration.class);
+
+    private int mFeedID;
+
+    public OpenMHzFeedConfiguration()
+    {
+        //No-arg constructor for JAXB
+        this(BroadcastFormat.MP3);
+    }
+
+    /**
+     * OpenMHz configuration for Icecast 2.3.2 compatible servers
+     *
+     * @param format of output audio (MP3)
+     */
+    public OpenMHzFeedConfiguration(BroadcastFormat format)
+    {
+        super(format);
+
+        setBitRate(16);
+        setChannels(1);
+        setSampleRate(8000);
+        setInline(true);
+    }
+
+    public static OpenMHzFeedConfiguration from(UserFeedBroadcast userFeedBroadcast)
+    {
+        OpenMHzFeedConfiguration config = new OpenMHzFeedConfiguration(BroadcastFormat.MP3);
+        config.setName(userFeedBroadcast.getDescription());
+        config.setHost(userFeedBroadcast.getHostname());
+        config.setMountPoint(userFeedBroadcast.getMount());
+        config.setFeedID(userFeedBroadcast.getFeedId());
+        config.setPassword(userFeedBroadcast.getPassword());
+
+        try
+        {
+            config.setPort(Integer.parseInt(userFeedBroadcast.getPort()));
+        }
+        catch(Exception e)
+        {
+            mLog.error("Error creating Rdio Scanner configuration from radio reference user feed instance");
+        }
+
+        return config;
+    }
+
+    @Override
+    public BroadcastConfiguration copyOf()
+    {
+        OpenMHzFeedConfiguration copy = new OpenMHzFeedConfiguration(getBroadcastFormat());
+
+        //Broadcast Configuration Parameters
+        copy.setName(getName());
+        copy.setHost(getHost());
+        copy.setPort(getPort());
+        copy.setInline(getInline());
+        copy.setPassword(getPassword());
+        copy.setDelay(getDelay());
+        copy.setEnabled(false);
+
+        //Icecast Configuration Parameters
+        copy.setUserName(getUserName());
+        copy.setMountPoint(getMountPoint());
+        copy.setDescription(getDescription());
+        copy.setGenre(getGenre());
+        copy.setPublic(isPublic());
+        copy.setURL(getURL());
+
+        //OpenMHz Configuration Parameters
+        copy.setFeedID(getFeedID());
+
+        return copy;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public BroadcastServerType getBroadcastServerType()
+    {
+        return BroadcastServerType.OPENMHZ;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "feed_id")
+    public int getFeedID()
+    {
+        return mFeedID;
+    }
+
+    public void setFeedID(int feedID)
+    {
+        mFeedID = feedID;
+    }
+}

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-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
@@ -20,7 +20,6 @@
 package io.github.dsheirer.audio.broadcast.rdioscanner;
 
 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;
@@ -34,39 +33,30 @@ 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.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 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.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.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;
 
 
 /**
@@ -239,11 +229,15 @@ 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);
                 String talkgroupGroup = getTalkgroupGroup(audioRecording);
                 String systemLabel = getSystemLabel(audioRecording);
+                String path = audioRecording.getPath().toString();
+                // Remove TEMPORARY_STREAM_FILE_SUFFIX
+                String audioName = path.substring(path.substring(0, path.lastIndexOf("_")).lastIndexOf("_") + 1);
 
                 try
                 {
@@ -264,11 +258,13 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
                         RdioScannerBuilder bodyBuilder = new RdioScannerBuilder();
                             bodyBuilder.addPart(FormField.KEY, getBroadcastConfiguration().getApiKey())
                             .addPart(FormField.SYSTEM, getBroadcastConfiguration().getSystemID())
+                            .addAudioName(audioName)
                             .addFile(audioBytes)
                             .addPart(FormField.DATE_TIME, timestampSeconds)
                             .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)
@@ -278,7 +274,6 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
                             .uri(URI.create(getBroadcastConfiguration().getHost()))
                             .header(HttpHeaders.CONTENT_TYPE, MULTIPART_FORM_DATA + "; boundary=" + bodyBuilder.getBoundary())
                             .header(HttpHeaders.USER_AGENT, "sdrtrunk")
-                            .header(HttpHeaders.CONTENT_TYPE, "audio/mpeg")
                             .POST(bodyBuilder.build())
                             .build();
 
@@ -417,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";
@@ -525,7 +556,12 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
             
             sb.append(patchGroup.getPatchGroup().getValue().toString());
             
-            for(TalkgroupIdentifier patched: patchGroup.getPatchedGroupIdentifiers())
+            for(TalkgroupIdentifier patched: patchGroup.getPatchedTalkgroupIdentifiers())
+            {
+                sb.append(",").append(patched.getValue());
+            }
+
+            for(RadioIdentifier patched: patchGroup.getPatchedRadioIdentifiers())
             {
                 sb.append(",").append(patched.getValue());
             }

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

@@ -34,7 +34,8 @@ public class RdioScannerBuilder
     private static final String DASH_DASH = "--";
     private static final String BOUNDARY = "--sdrtrunk-sdrtrunk-sdrtrunk";
     private List<Part> mParts = new ArrayList<>();
-    private byte[] audioBytes = null; 
+    private byte[] audioBytes = null;
+    private String audioName = null;
 
     /**
      * Constructs an instance
@@ -51,6 +52,15 @@ public class RdioScannerBuilder
         return BOUNDARY;
     }
 
+    /**
+     * Adds a Audio file name part to the call
+     */
+    public RdioScannerBuilder addAudioName(String value)
+    {
+        audioName = value;
+        return this;
+    }
+
     /**
      * Adds a Audio bytes part to the call
      */
@@ -110,7 +120,8 @@ public class RdioScannerBuilder
         }
         StringBuilder sb= new StringBuilder();
         sb.append(DASH_DASH).append(boundary).append("\r\n");
-        sb.append("Content-Disposition: form-data; name=\"").append("audio").append("\"\r\n\r\n");
+        sb.append("Content-Disposition: form-data; filename=\"").append(audioName);
+        sb.append("\"; name=\"").append("audio").append("\"\r\n\r\n");
         return sb.toString();
 
     }

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -41,6 +41,9 @@ import jmbe.iface.IAudioCodecLibrary;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Base audio module for protocols that use the JMBE audio codec.
+ */
 public abstract class JmbeAudioModule extends AbstractAudioModule implements Listener<IMessage>, IMessageListener,
     ISquelchStateListener
 {
@@ -59,12 +62,23 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
         loadConverter();
     }
 
+    @Override
+    protected void closeAudioSegment()
+    {
+        super.closeAudioSegment();
+
+        //Reset the audio codec to clear any leftover frame data from the previous call.
+        if(mAudioCodec != null)
+        {
+            mAudioCodec.reset();
+        }
+    }
+
     @Override
     public void dispose()
     {
         super.dispose();
         MyEventBus.getGlobalEventBus().unregister(this);
-        mAudioCodec = null;
     }
 
     public IAudioCodec getAudioCodec()

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

@@ -36,7 +36,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 +77,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

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

@@ -125,7 +125,7 @@ public class MBECallSequenceConverter
 
                 try
                 {
-                    AudioSegmentRecorder.recordWAVE(audioSegment, outputPath);
+                    AudioSegmentRecorder.recordWAVE(audioSegment, outputPath, audioSegment.getIdentifierCollection());
                 }
                 catch(IOException ioe)
                 {

src/main/java/io/github/dsheirer/audio/playback/AudioOutput.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
@@ -25,6 +25,7 @@ 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;
@@ -58,6 +59,7 @@ import javax.sound.sampled.SourceDataLine;
 public abstract class AudioOutput implements LineListener, Listener<IdentifierUpdateNotification>
 {
     private final static 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;
@@ -82,6 +84,9 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
     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;
 
     /**
      * Single audio channel playback with automatic starting and stopping of the
@@ -105,11 +110,14 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
         mScheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory(
                 "sdrtrunk audio output " + mixerChannel.name()));
         mUserPreferences = userPreferences;
-        mDropDuplicates = mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled();
+        mDropDuplicates = mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled();
+        mAudioFormat = audioFormat;
+        mLineInfo = lineInfo;
+        mRequestedBufferSize = requestedBufferSize;
 
         try
         {
-            mOutput = (SourceDataLine) mMixer.getLine(lineInfo);
+            mOutput = (SourceDataLine) mMixer.getLine(mLineInfo);
 
             if(mOutput != null)
             {
@@ -132,8 +140,9 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
                     }
                     catch(IllegalArgumentException iae)
                     {
-                        mLog.warn("Couldn't obtain MASTER GAIN control for stereo line [" +
-                            mixer.getMixerInfo().getName() + " | " + getChannelName() + "]");
+                        LOGGING_SUPPRESSOR.error("no gain control", 2, "Couldn't obtain " +
+                            "MASTER GAIN control for stereo line [" + mixer.getMixerInfo().getName() + " | " +
+                                getChannelName() + "]");
                     }
 
                     try
@@ -143,8 +152,9 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
                     }
                     catch(IllegalArgumentException iae)
                     {
-                        mLog.warn("Couldn't obtain MUTE control for stereo line [" +
-                            mixer.getMixerInfo().getName() + " | " + getChannelName() + "]");
+                        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
@@ -230,7 +240,7 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
         }
         else if(preferenceType == PreferenceType.DUPLICATE_CALL_DETECTION)
         {
-            mDropDuplicates = mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled();
+            mDropDuplicates = mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled();
         }
     }
 
@@ -266,7 +276,13 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
      */
     private void playAudio(ByteBuffer buffer)
     {
-        if(buffer != null)
+        if(mOutput == null)
+        {
+            LOGGING_SUPPRESSOR.error("null output", 2, "Audio Output is null - ignoring audio playback request");
+            return;
+        }
+
+        if(buffer != null && buffer.array().length > 0)
         {
             int wrote = 0;
 
@@ -286,6 +302,25 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
                 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.  When this happens, close and then re-open the
+                //data line to clear the error state.  Note: in testing this error condition, the line is showing
+                //the buffer is empty and the capacity is fully available, so it should have accepted attempts to write
+                //data, but it failed, as indicated by wrote=0.
+                if(!mOutput.isRunning() && wrote <= 0)
+                {
+                    mOutput.close();
+
+                    try
+                    {
+                        mOutput.open();
+                    }
+                    catch(Exception e)
+                    {
+                        mLog.error("Error after closing and attempting to reopen audio output", e);
+                    }
+                }
             }
 
             if(mOutput.isRunning() && wrote < buffer.array().length)

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

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -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;
 
@@ -65,6 +66,8 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
     private LinkedTransferQueue<AudioSegment> mNewAudioSegmentQueue = new LinkedTransferQueue<>();
     private ScheduledExecutorService mScheduledExecutorService =
             Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory("sdrtrunk audio manager"));
+    private AudioSegmentPrioritySorter mAudioSegmentPrioritySorter = new AudioSegmentPrioritySorter();
+    private ReentrantLock mAudioOutputLock = new ReentrantLock();
 
     /**
      * Constructs an instance.
@@ -95,6 +98,9 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
         {
             mLog.warn("No audio output devices available");
         }
+
+        mProcessingTask = mScheduledExecutorService.scheduleAtFixedRate(new AudioSegmentProcessor(),
+                0, 100, TimeUnit.MILLISECONDS);
     }
 
     /**
@@ -120,7 +126,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
         while(newSegment != null)
         {
             if(newSegment.isDuplicate() &&
-               mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled())
+               mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled())
             {
                 newSegment.decrementConsumerCount();
             }
@@ -148,7 +154,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
                 audioSegment = it.next();
 
                 if(audioSegment.isDuplicate() &&
-                   mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled())
+                   mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled())
                 {
                     it.remove();
                     audioSegment.decrementConsumerCount();
@@ -182,43 +188,60 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
                 audioSegment = it.next();
 
                 if(audioSegment.isDoNotMonitor() || (audioSegment.isDuplicate() &&
-                   mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled()))
+                   mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled()))
                 {
                     it.remove();
                     audioSegment.decrementConsumerCount();
                 }
                 else if(audioSegment.isLinked())
                 {
-                    for(AudioOutput audioOutput: mAudioOutputs)
+                    mAudioOutputLock.lock();
+
+                    try
                     {
-                        if(audioOutput.isLinkedTo(audioSegment))
+                        for(AudioOutput audioOutput: mAudioOutputs)
                         {
-                            it.remove();
-                            audioOutput.play(audioSegment);
+                            if(audioOutput.isLinkedTo(audioSegment))
+                            {
+                                it.remove();
+                                audioOutput.play(audioSegment);
+                            }
                         }
                     }
+                    finally
+                    {
+                        mAudioOutputLock.unlock();
+                    }
                 }
             }
 
             //Sort audio segments by playback priority and assign to empty audio outputs
             if(!mAudioSegments.isEmpty())
             {
-                //TODO: change this to take audio segment start time into account also
-                mAudioSegments.sort(Comparator.comparingInt(o -> o.monitorPriorityProperty().get()));
+                mAudioSegments.sort(mAudioSegmentPrioritySorter);
 
-                //Assign empty audio outputs first
-                for(AudioOutput audioOutput: mAudioOutputs)
+                mAudioOutputLock.lock();
+
+                try
                 {
-                    if(audioOutput.isEmpty())
+                    //Assign empty audio outputs first
+                    for(AudioOutput audioOutput: mAudioOutputs)
                     {
-                        audioOutput.play(mAudioSegments.remove(0));
-
-                        if(mAudioSegments.isEmpty())
+                        if(audioOutput.isEmpty())
                         {
-                            return;
+                            audioOutput.play(mAudioSegments.remove(0));
+
+                            if(mAudioSegments.isEmpty())
+                            {
+                                return;
+                            }
                         }
                     }
                 }
+                finally
+                {
+                    mAudioOutputLock.unlock();
+                }
             }
 
             //Remove any audio segments marked as complete that didn't get assigned to an output
@@ -228,7 +251,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
                 audioSegment = it.next();
 
                 if(audioSegment.completeProperty().get() || (audioSegment.isDuplicate() &&
-                   mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled()))
+                   mUserPreferences.getCallManagementPreference().isDuplicatePlaybackSuppressionEnabled()))
                 {
                     it.remove();
                     audioSegment.decrementConsumerCount();
@@ -288,37 +311,39 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
         {
             mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_STARTED);
 
-            if(mProcessingTask != null)
+            mAudioOutputLock.lock();
+
+            try
             {
-                mProcessingTask.cancel(true);
+                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());
+                }
+            }
+            finally
+            {
+                mAudioOutputLock.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;
         }
@@ -389,4 +414,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 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/bits/BinaryMessage.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,7 @@ package io.github.dsheirer.bits;
 
 import io.github.dsheirer.edac.CRC;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.BitSet;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.math3.util.FastMath;
@@ -242,6 +243,16 @@ public class BinaryMessage extends BitSet
         return mSize;
     }
 
+    /**
+     * Current size of the message indicating the quantity of bits that have been added to this message.  This value
+     * is less than or equal to the size() value.
+     * @return current size in bits.
+     */
+    public int currentSize()
+    {
+        return mPointer;
+    }
+
     public void setSize(int size)
     {
         mSize = size;
@@ -280,6 +291,20 @@ public class BinaryMessage extends BitSet
         }
     }
 
+    /**
+     * Adds bit1 and bit2 to this bitset.
+     *
+     * Note: this method does not provide overfill protection.
+     *
+     * @param bit1 to add.
+     * @param bit2 to add.
+     */
+    public void add(boolean bit1, boolean bit2)
+    {
+        set(mPointer++, bit1);
+        set(mPointer++, bit2);
+    }
+
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
@@ -306,8 +331,8 @@ public class BinaryMessage extends BitSet
 
     /**
      * Overrides the parent method which returns a BitSet so that we can return a BinaryMessage
-     * @param from
-     * @param to
+     * @param from inclusive
+     * @param to exclusive
      * @return
      */
     @Override
@@ -400,8 +425,8 @@ public class BinaryMessage extends BitSet
         boolean[] returnValue = null;
 
         if(startIndex >= 0 &&
-            startIndex < endIndex &&
-            endIndex < mSize)
+                startIndex < endIndex &&
+                endIndex < mSize)
         {
             returnValue = new boolean[endIndex - startIndex + 1];
 
@@ -432,7 +457,7 @@ public class BinaryMessage extends BitSet
         if(bits.length > 32)
         {
             throw new IllegalArgumentException("Overflow - must be 32 bits "
-                + "or less to fit into a primitive integer value");
+                    + "or less to fit into a primitive integer value");
         }
 
         int value = 0;
@@ -450,6 +475,203 @@ public class BinaryMessage extends BitSet
         return value;
     }
 
+    /**
+     * Returns the integer value of the message field described by the field argument.
+     * @param intField with start and end indices (inclusive).
+     * @return integer field value.
+     */
+    public int getInt(IntField intField)
+    {
+        int value = 0;
+
+        for(int index = intField.start(); index <= intField.end(); index++)
+        {
+            value = Integer.rotateLeft(value, 1);
+
+            if(get(index))
+            {
+                value++;
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Returns the integer value of the message field described by the field argument.
+     * @param fragmentedField with an array of message indices
+     * @return integer field value.
+     */
+    public int getInt(FragmentedIntField fragmentedField)
+    {
+        int value = 0;
+
+        for(int index: fragmentedField.indices())
+        {
+            value = Integer.rotateLeft(value, 1);
+
+            if(get(index))
+            {
+                value++;
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Indicates if the message field contains a non-zero value indicated by any bits set in the int field indices.
+     * @param intField to inspect
+     * @return true if any of the bits are set, indicating a non-zero value.
+     */
+    public boolean hasInt(IntField intField)
+    {
+        return nextSetBit(intField.start()) <= intField.end();
+    }
+
+    /**
+     * Indicates if the message field contains a non-zero value indicated by any bits set in the int field indices.
+     * @param fragmentedField to inspect
+     * @return true if any of the bits are set, indicating a non-zero value.
+     */
+    public boolean hasInt(FragmentedIntField fragmentedField)
+    {
+        for(int index: fragmentedField.indices())
+        {
+            if(get(index))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the integer value of the message field described by the field argument where the message start index is
+     * offset within this binary message.
+     * @param intField with start and end indices (inclusive).
+     * @param offset to the start of the first message index.
+     * @return integer field value.
+     */
+    public int getInt(IntField intField, int offset)
+    {
+        int value = 0;
+
+        for(int index = intField.start() + offset; index <= intField.end() + offset; index++)
+        {
+            value = Integer.rotateLeft(value, 1);
+
+            if(get(index))
+            {
+                value++;
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Returns the integer value of the message field described by the field argument where the message start index is
+     * offset within this binary message.
+     * @param fragmentedField with an array of field indices
+     * @param offset to the start of the first message index.
+     * @return integer field value.
+     */
+    public int getInt(FragmentedIntField fragmentedField, int offset)
+    {
+        int value = 0;
+
+        for(int index: fragmentedField.indices())
+        {
+            value = Integer.rotateLeft(value, 1);
+
+            if(get(index + offset))
+            {
+                value++;
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Indicates if the message field contains a non-zero value indicated by any bits set in the int field indices.
+     * @param intField to inspect
+     * @param offset to the first bit of the message.
+     * @return true if any of the bits are set, indicating a non-zero value.
+     */
+    public boolean hasInt(IntField intField, int offset)
+    {
+        return nextSetBit(intField.start() + offset) <= (intField.end() + offset);
+    }
+
+    /**
+     * Indicates if the message field contains a non-zero value indicated by any bits set in the int field indices.
+     * @param intField to inspect
+     * @param offset to the first bit of the message.
+     * @return true if any of the bits are set, indicating a non-zero value.
+     */
+    public boolean hasInt(FragmentedIntField fragmentedField, int offset)
+    {
+        for(int index: fragmentedField.indices())
+        {
+            if(get(index + offset))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the long value of the message field described by the field argument.
+     * @param intField with start and end indices (inclusive).
+     * @return integer field value.
+     */
+    public long getLong(LongField intField)
+    {
+        long value = 0;
+
+        for(int index = intField.start(); index <= intField.end(); index++)
+        {
+            value = Long.rotateLeft(value, 1);
+
+            if(get(index))
+            {
+                value++;
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Returns the long value of the message field described by the field argument where the message start index is
+     * offset within this binary message.
+     * @param intField with start and end indices (inclusive).
+     * @param offset to the start of the first message index.
+     * @return field value.
+     */
+    public long getLong(LongField intField, int offset)
+    {
+        long value = 0;
+
+        for(int index = intField.start() + offset; index <= intField.end() + offset; index++)
+        {
+            value = Long.rotateLeft(value, 1);
+
+            if(get(index))
+            {
+                value++;
+            }
+        }
+
+        return value;
+    }
+
+
     /**
      * Returns the integer value represented by the bit array
      *
@@ -464,7 +686,7 @@ public class BinaryMessage extends BitSet
         if(bits.length > 32)
         {
             throw new IllegalArgumentException("Overflow - must be 32 bits "
-                + "or less to fit into a primitive integer value");
+                    + "or less to fit into a primitive integer value");
         }
 
         int value = 0;
@@ -499,6 +721,28 @@ public class BinaryMessage extends BitSet
         }
     }
 
+    /**
+     * Sets the integer value to the field described by the argument.
+     * @param value to set
+     * @param intField describing the indices of the field.
+     */
+    public void setInt(int value, IntField intField)
+    {
+        for(int x = 0; x < intField.width(); x++)
+        {
+            int mask = 1 << (intField.width() - x - 1);
+
+            if((value & mask) == mask)
+            {
+                set(intField.start() + x);
+            }
+            else
+            {
+                clear(intField.start() + x);
+            }
+        }
+    }
+
     /**
      * Returns the byte value represented by the bit array
      *
@@ -512,7 +756,7 @@ public class BinaryMessage extends BitSet
         if(bits.length != 8)
         {
             throw new IllegalArgumentException("Invalid - there must be 8"
-                + "indexes to form a proper byte");
+                    + "indexes to form a proper byte");
         }
 
         int value = 0;
@@ -544,7 +788,7 @@ public class BinaryMessage extends BitSet
         if(bits.length != 8)
         {
             throw new IllegalArgumentException("Invalid - there must be 8"
-                + "indexes to form a proper byte");
+                    + "indexes to form a proper byte");
         }
 
         int value = 0;
@@ -672,7 +916,7 @@ public class BinaryMessage extends BitSet
         if(bits.length > 64)
         {
             throw new IllegalArgumentException("Overflow - must be 64 bits "
-                + "or less to fit into a primitive long value");
+                    + "or less to fit into a primitive long value");
         }
 
         long value = 0;
@@ -704,7 +948,7 @@ public class BinaryMessage extends BitSet
         if(bits.length > 64)
         {
             throw new IllegalArgumentException("Overflow - must be 64 bits "
-                + "or less to fit into a primitive long value");
+                    + "or less to fit into a primitive long value");
         }
 
         long value = 0;
@@ -741,6 +985,18 @@ public class BinaryMessage extends BitSet
         return sb.toString();
     }
 
+    /**
+     * Returns the integer field formatted as a hex value using zero prefixes to pad the hex character count to fully
+     * represent the size (width) of the field.
+     * @param field to parse as hex
+     * @return hex value.
+     */
+    public String getHex(IntField field)
+    {
+        int width = Math.ceilDiv(field.width(), 4);
+        return String.format("%0" + width + "X", getInt(field));
+    }
+
     /**
      * Format the byte value that starts at the specified index as hexadecimal.  If the length of the message is less
      * than the start index plus 7 bits, then the value represents those bits as high-order bits with zero padding in
@@ -780,7 +1036,7 @@ public class BinaryMessage extends BitSet
         else
         {
             throw new IllegalArgumentException("BitSetBuffer.getHex() "
-                + "maximum array length is 63 bits");
+                    + "maximum array length is 63 bits");
         }
     }
 
@@ -801,7 +1057,7 @@ public class BinaryMessage extends BitSet
         if(FastMath.abs(end - start) > 32)
         {
             throw new IllegalArgumentException("Overflow - must be 32 bits "
-                + "or less to fit into a primitive integer value");
+                    + "or less to fit into a primitive integer value");
         }
 
         int value = 0;
@@ -844,13 +1100,18 @@ public class BinaryMessage extends BitSet
      */
     public int getTwosComplement(int start, int end)
     {
-        BinaryMessage sub = getSubMessage(start, end);
-        boolean negative = sub.get(start);
-        sub.flip(0, sub.size());
-
-        int value = sub.getInt(0, sub.size()) + 1;
-        value *= (negative ? -1 : 1);
-        return value;
+        if(get(start))
+        {
+            //Negative value - flip and add one
+            BinaryMessage fragment = getSubMessage(start, end + 1);
+            fragment.flip(0, fragment.size());
+            return -(fragment.getInt(0, fragment.size() - 1) + 1);
+        }
+        else
+        {
+            //Positive value - return the contents.
+            return getInt(start, end);
+        }
     }
 
 
@@ -871,7 +1132,7 @@ public class BinaryMessage extends BitSet
         if(FastMath.abs(end - start) > 64)
         {
             throw new IllegalArgumentException("Overflow - must be 64 bits "
-                + "or less to fit into a primitive long value");
+                    + "or less to fit into a primitive long value");
         }
 
         long value = 0;
@@ -1026,7 +1287,7 @@ public class BinaryMessage extends BitSet
         if(!message.matches("[01]*"))
         {
             throw new IllegalArgumentException(
-                "Message must contain only zeros and ones");
+                    "Message must contain only zeros and ones");
         }
 
         BinaryMessage buffer = new BinaryMessage(message.length());
@@ -1192,9 +1453,22 @@ public class BinaryMessage extends BitSet
     {
         byte[] bytes = new byte[characterCount];
 
+        int index;
         for(int x = 0; x < characterCount; x++)
         {
-            bytes[x] = getByte(CHARACTER_7_BIT, x * 7 + offset);
+            index = x * 7 + offset;
+
+            if(index == 0)
+            {
+                bytes[x] = getByte(CHARACTER_8_BIT, index);
+                bytes[x] = (byte)((bytes[x] >> 1) & 0x7F);
+            }
+            else
+            {
+                index--;
+                bytes[x] = getByte(CHARACTER_8_BIT, index);
+                bytes[x] &= (byte)0x7F;  //mask off the high bit since we have to parse it as an 8-bit byte.
+            }
         }
 
         return new String(bytes);
@@ -1273,7 +1547,7 @@ public class BinaryMessage extends BitSet
             bytes[x] = getByte(CHARACTER_8_BIT, x * 8 + offset);
         }
 
-        return new String(bytes);
+        return new String(bytes, Charset.forName("UTF-16"));
     }
 
     /**

src/main/java/io/github/dsheirer/bits/CorrectedBinaryMessage.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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.bits;
 
@@ -84,9 +81,9 @@ public class CorrectedBinaryMessage extends BinaryMessage
     /**
      * Returns a new binary message containing the bits from (inclusive) to end (exclusive).
      *
-     * @param start bit
-     * @param end bit
-     * @return message
+     * @param start bit inclusive
+     * @param end bit exclusive
+     * @return message with sub message bits
      */
     public CorrectedBinaryMessage getSubMessage(int start, int end)
     {

src/main/java/io/github/dsheirer/bits/FragmentedIntField.java

@@ -0,0 +1,45 @@
+/*
+ * *****************************************************************************
+ * 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.bits;
+
+/**
+ * Defines a fragmented or non-contiguous bit field within a binary message.
+ * @param indices for the bits in the field.
+ */
+public record FragmentedIntField(int... indices)
+{
+    public FragmentedIntField
+    {
+        if(indices.length > 32)
+        {
+            throw new IllegalArgumentException("Integer field indices size [" + indices.length + "] cannot exceed 32-bits for an integer");
+        }
+    }
+
+    /**
+     * Utility constructor method.
+     * @param indices (inclusive)
+     * @return constructed fragmented integer field.
+     */
+    public static FragmentedIntField of(int... indices)
+    {
+        return new FragmentedIntField(indices);
+    }
+}

src/main/java/io/github/dsheirer/bits/IntField.java

@@ -0,0 +1,141 @@
+/*
+ * *****************************************************************************
+ * 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.bits;
+
+/**
+ * Defines a contiguous bit field within a binary message.
+ * @param start bit index, inclusive.
+ * @param end bit index, inclusive.
+ */
+public record IntField(int start, int end)
+{
+    public IntField
+    {
+        if(end - start > 32)
+        {
+            throw new IllegalArgumentException("Integer field length [" + (end - start) + "] cannot exceed 32-bits for an integer");
+        }
+
+        if(end < start)
+        {
+            throw new IllegalArgumentException("Integer field start index must be less than end index");
+        }
+    }
+
+    /**
+     * Width of the field in bit positions
+     * @return width
+     */
+    public int width()
+    {
+        return end() - start() + 1;
+    }
+
+    /**
+     * Utility constructor method.
+     * @param start index (inclusive)
+     * @param end index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField range(int start, int end)
+    {
+        return new IntField(start, end);
+    }
+
+    /**
+     * Utility constructor method for a field with one four bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length4(int start)
+    {
+        return new IntField(start, (start + 3));
+    }
+
+    /**
+     * Utility constructor method for a field with one four bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length6(int start)
+    {
+        return new IntField(start, (start + 5));
+    }
+
+    /**
+     * Utility constructor method for a field with one octet of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length8(int start)
+    {
+        return new IntField(start, (start + 7));
+    }
+
+    /**
+     * Utility constructor method for a field with 12 bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length12(int start)
+    {
+        return new IntField(start, (start + 11));
+    }
+
+    /**
+     * Utility constructor method for a field with two octets of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length16(int start)
+    {
+        return new IntField(start, (start + 15));
+    }
+
+    /**
+     * Utility constructor method for a field with 20 bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length20(int start)
+    {
+        return new IntField(start, (start + 19));
+    }
+
+    /**
+     * Utility constructor method for a field with two octets of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length24(int start)
+    {
+        return new IntField(start, (start + 23));
+    }
+
+    /**
+     * Utility constructor method for a field with three octets of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static IntField length32(int start)
+    {
+        return new IntField(start, (start + 31));
+    }
+}

src/main/java/io/github/dsheirer/bits/LongField.java

@@ -0,0 +1,122 @@
+/*
+ * *****************************************************************************
+ * 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/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.bits;
+
+/**
+ * Defines a contiguous bit field within a binary message.
+ * @param start bit index, inclusive.
+ * @param end bit index, inclusive.
+ */
+public record LongField(int start, int end)
+{
+    public LongField
+    {
+        if(end - start > 64)
+        {
+            throw new IllegalArgumentException("Long field length [" + (end - start) + "] cannot exceed 64-bits for a long");
+        }
+
+        if(end < start)
+        {
+            throw new IllegalArgumentException("Long field start index must be less than end index");
+        }
+    }
+
+    /**
+     * Utility constructor method.
+     * @param start index (inclusive)
+     * @param end index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField range(int start, int end)
+    {
+        return new LongField(start, end);
+    }
+
+    /**
+     * Utility constructor method for a field with one four bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length4(int start)
+    {
+        return new LongField(start, (start + 3));
+    }
+
+    /**
+     * Utility constructor method for a field with one octet of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length8(int start)
+    {
+        return new LongField(start, (start + 7));
+    }
+
+    /**
+     * Utility constructor method for a field with 12 bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length12(int start)
+    {
+        return new LongField(start, (start + 11));
+    }
+
+    /**
+     * Utility constructor method for a field with two octets of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length16(int start)
+    {
+        return new LongField(start, (start + 15));
+    }
+
+    /**
+     * Utility constructor method for a field with 20 bits of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length20(int start)
+    {
+        return new LongField(start, (start + 19));
+    }
+
+    /**
+     * Utility constructor method for a field with two octets of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length24(int start)
+    {
+        return new LongField(start, (start + 23));
+    }
+
+    /**
+     * Utility constructor method for a field with three octets of length.
+     * @param start index (inclusive)
+     * @return constructed bit field.
+     */
+    public static LongField length32(int start)
+    {
+        return new LongField(start, (start + 31));
+    }
+}

src/main/java/io/github/dsheirer/bits/MultiSyncPatternMatcher.java

@@ -1,35 +1,31 @@
 /*
+ * *****************************************************************************
+ * 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.bits;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.math3.util.FastMath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Multi-Sync pattern matcher.  Accepts multiple sync detector objects for
  * comparision against the incoming bit stream.
@@ -39,6 +35,7 @@ import java.util.List;
  * of the Long.rotate methods will wrap the MSB around to the LSB and
  * corrupt the matching value.
  */
+@Deprecated //remove after P25P2 decoder is updated
 public class MultiSyncPatternMatcher
 {
     private final static Logger mLog = LoggerFactory.getLogger(MultiSyncPatternMatcher.class);

src/main/java/io/github/dsheirer/bits/SoftSyncDetector.java

@@ -1,23 +1,27 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 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  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.bits;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
 import org.apache.commons.lang3.Validate;
 
+@Deprecated //Remove after P25P2 decoder is updated.
 public class SoftSyncDetector implements ISyncProcessor
 {
     private ISyncDetectListener mListener;

src/main/java/io/github/dsheirer/buffer/ByteNativeBuffer.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,7 +29,7 @@ import java.util.Iterator;
  */
 public class ByteNativeBuffer extends AbstractNativeBuffer
 {
-    private static final int FRAGMENT_SIZE = 2048;
+    private static final int FRAGMENT_SIZE = 8192;
     private final static float[] LOOKUP_VALUES;
     private float mAverageDc;
 

src/main/java/io/github/dsheirer/buffer/FloatAveragingBuffer.java

@@ -1,57 +1,153 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 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/>
- ******************************************************************************/
+/*
+ * *****************************************************************************
+ * 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.buffer;
 
+import java.util.Arrays;
+
+/**
+ * Averaging buffer backed by a ring buffer implemented with a float array.
+ */
 public class FloatAveragingBuffer
 {
-	private float[] mBuffer;
-	private float mAverage = 0.0f;
-	private int mBufferSize;
-	private int mBufferPointer;
-	
-	public FloatAveragingBuffer( int size )
-	{
-		mBufferSize = size;
-		mBuffer = new float[ size ];
-	}
-	
-	public float get( float newValue )
-	{
-		float oldValue = mBuffer[ mBufferPointer ];
+    private final float[] mBuffer;
+    private final int mBufferSize;
+    private float mAverage = 0.0f;
+    private int mBufferPointer;
+    private boolean mRapidFill = false;
+    private int mRapidFillCounter = 0;
+    private int mRapidFillIncrement;
 
-		if( Float.isInfinite( newValue ) || Float.isNaN( newValue ) )
-		{
-			mAverage = mAverage - ( oldValue / mBufferSize );
+    /**
+     * Constructs an instance that uses a rapid fill increment value where the initial values get counted multiple times
+     * to more quickly get to the average value instead of walking up to the average from the default average value of 0.
+     * @param size of buffer
+     * @param rapidFillIncrement indicating how many value additions per individual add to execute until the averaging
+     * buffer is filled.  After the initial fill state is achieved, reverts to using a single value addition.
+     */
+    public FloatAveragingBuffer(int size, int rapidFillIncrement)
+    {
+        this(size);
+        mRapidFillIncrement = rapidFillIncrement;
+        mRapidFill = true;
+    }
 
-			mBuffer[ mBufferPointer++ ] = 0.0f;
-		}
-		else
-		{
-			mAverage = mAverage - ( oldValue / mBufferSize ) + ( newValue / mBufferSize );
+    /**
+     * Constructs an instance that uses a ring buffer of the specified size.
+     * @param size of the averaging buffer.
+     */
+    public FloatAveragingBuffer(int size)
+    {
+        mBufferSize = size;
+        mBuffer = new float[size];
+    }
 
-			mBuffer[ mBufferPointer++ ] = newValue;
-		}
+    /**
+     * Resets this buffer to an empty state
+     */
+    public void reset()
+    {
+        Arrays.fill(mBuffer, 0);
+        mBufferPointer = 0;
+        mAverage = 0.0f;
 
-		if( mBufferPointer >= mBufferSize )
-		{
-			mBufferPointer = 0;
-		}
+        if(mRapidFillIncrement > 0)
+        {
+            mRapidFill = true;
+            mRapidFillCounter = 0;
+        }
+    }
 
-		return mAverage;
-	}
+    /**
+     * Current average value.
+     * @return average
+     */
+    public float getAverage()
+    {
+        return mAverage;
+    }
+
+    /**
+     * Adds the value to the buffer and updates the average.
+     * @param value to add
+     */
+    public void add(float value)
+    {
+        if(mRapidFill)
+        {
+            for(int x = 0; x < mRapidFillIncrement; x++)
+            {
+                float oldValue = mBuffer[mBufferPointer];
+
+                if(Float.isInfinite(value) || Float.isNaN(value))
+                {
+                    mAverage = mAverage - (oldValue / mBufferSize);
+                    mBuffer[mBufferPointer++] = 0.0f;
+                }
+                else
+                {
+                    mAverage = mAverage - (oldValue / mBufferSize) + (value / mBufferSize);
+                    mBuffer[mBufferPointer++] = value;
+                }
+
+                if(mBufferPointer >= mBufferSize)
+                {
+                    mBufferPointer = 0;
+                }
+            }
+
+            mRapidFillCounter += mRapidFillIncrement;
+
+            if(mRapidFillCounter > mBufferSize)
+            {
+                mRapidFill = false;
+            }
+        }
+        else
+        {
+            float oldValue = mBuffer[mBufferPointer];
+
+            if(Float.isInfinite(value) || Float.isNaN(value))
+            {
+                mAverage = mAverage - (oldValue / mBufferSize);
+                mBuffer[mBufferPointer++] = 0.0f;
+            }
+            else
+            {
+                mAverage = mAverage - (oldValue / mBufferSize) + (value / mBufferSize);
+                mBuffer[mBufferPointer++] = value;
+            }
+
+            if(mBufferPointer >= mBufferSize)
+            {
+                mBufferPointer = 0;
+            }
+        }
+    }
+
+    /**
+     * Adds the value to the buffer and calculates a new average.
+     * @param value to add
+     * @return updated average
+     */
+    public float get(float value)
+    {
+        add(value);
+        return mAverage;
+    }
 }

src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIterator.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
@@ -30,7 +30,7 @@ import java.util.Iterator;
 public abstract class AirspyBufferIterator<T> implements Iterator<T>
 {
     protected static final float SCALE_SIGNED_12_BIT_TO_FLOAT = 1.0f / 2048.0f;
-    protected static final int FRAGMENT_SIZE = 2048;
+    protected static final int FRAGMENT_SIZE = 4096;
     protected static final float[] COEFFICIENTS =
             HilbertTransform.convertHalfBandToHilbert(HilbertTransform.HALF_BAND_FILTER_47_TAP);
 

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -22,6 +22,7 @@ package io.github.dsheirer.channel.metadata;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.AliasList;
 import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierUpdateListener;
 import io.github.dsheirer.identifier.IdentifierUpdateNotification;
@@ -35,11 +36,10 @@ import io.github.dsheirer.identifier.configuration.SystemConfigurationIdentifier
 import io.github.dsheirer.identifier.decoder.ChannelStateIdentifier;
 import io.github.dsheirer.identifier.decoder.DecoderLogicalChannelNameIdentifier;
 import io.github.dsheirer.sample.Listener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collections;
 import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Channel metadata containing details about the channel configuration, decoder state and current
@@ -58,6 +58,7 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
     private DecoderTypeConfigurationIdentifier mDecoderTypeConfigurationIdentifier;
     private Identifier mFromIdentifier;
     private List<Alias> mFromIdentifierAliases;
+    private Identifier mTalkerAliasIdentifier;
     private Identifier mToIdentifier;
     private List<Alias> mToIdentifierAliases;
     private Integer mTimeslot;
@@ -66,17 +67,51 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
     private AliasModel mAliasModel;
     private AliasList mAliasList;
 
+    /**
+     * Constructs an instance
+     * @param aliasModel for alias lookups
+     * @param timeslot for this metadata
+     */
     public ChannelMetadata(AliasModel aliasModel, Integer timeslot)
     {
         mAliasModel = aliasModel;
         mTimeslot = timeslot;
     }
 
+    /**
+     * Constructs an instance
+     * @param aliasModel for alias lookups
+     */
     public ChannelMetadata(AliasModel aliasModel)
     {
         this(aliasModel, null);
     }
 
+    /**
+     * Creates a textual description of this channel metadata.
+     */
+    public String getDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Channel Metadata Description\n");
+        sb.append("\tTimeslot: ").append(mTimeslot).append("\n");
+        Identifier decoder = getDecoderTypeConfigurationIdentifier();
+        sb.append("\tDecoder: ").append(decoder != null ? decoder : "(null)").append("\n");
+        Identifier state = getChannelStateIdentifier();
+        sb.append("\tState: ").append(state != null ? state : "(null)").append("\n");
+        Identifier system = getSystemConfigurationIdentifier();
+        sb.append("\tSystem: ").append(system != null ? system : "(null)").append("\n");
+        Identifier site = getSiteConfigurationIdentifier();
+        sb.append("\tSite: ").append(site != null ? site : "(null)").append("\n");
+        Identifier channel = getChannelNameConfigurationIdentifier();
+        sb.append("\tChannel: ").append(channel != null ? channel : "(null)").append("\n");
+        Identifier frequency = getFrequencyConfigurationIdentifier();
+        sb.append("\tFrequency: ").append(frequency != null ? frequency : "(null)").append("\n");
+        Identifier logical = getDecoderLogicalChannelNameIdentifier();
+        sb.append("\tLogical Channel: ").append(logical != null ? logical : "(null)").append("\n");
+        return sb.toString();
+    }
+
     public Integer getTimeslot()
     {
         return mTimeslot;
@@ -205,6 +240,22 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
         return mFromIdentifierAliases;
     }
 
+    /**
+     * Optional talker alias identifier
+     */
+    public Identifier getTalkerAliasIdentifier()
+    {
+        return mTalkerAliasIdentifier;
+    }
+
+    /**
+     * Indicates if we have a non-null talker alias identifier
+     */
+    public boolean hasTalkerAliasIdentifier()
+    {
+        return mTalkerAliasIdentifier != null;
+    }
+
     /**
      * Current call event TO identifier
      */
@@ -376,15 +427,22 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
             case USER:
                 if(identifier.getRole() == Role.FROM)
                 {
-                    mFromIdentifier = update.isAdd() ? identifier : null;
-
-                    if(mAliasList != null && mFromIdentifier != null)
+                    if(identifier.getForm() == Form.TALKER_ALIAS)
                     {
-                        mFromIdentifierAliases = mAliasList.getAliases(mFromIdentifier);
+                        mTalkerAliasIdentifier = identifier;
                     }
                     else
                     {
-                        mFromIdentifierAliases = Collections.EMPTY_LIST;
+                        mFromIdentifier = update.isAdd() ? identifier : null;
+
+                        if(mAliasList != null && mFromIdentifier != null)
+                        {
+                            mFromIdentifierAliases = mAliasList.getAliases(mFromIdentifier);
+                        }
+                        else
+                        {
+                            mFromIdentifierAliases = Collections.EMPTY_LIST;
+                        }
                     }
 
                     broadcastUpdate(ChannelMetadataField.USER_FROM);

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataModel.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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.channel.metadata;
 
@@ -29,16 +26,16 @@ import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.decoder.DecoderLogicalChannelNameIdentifier;
 import io.github.dsheirer.preference.PreferenceType;
 import io.github.dsheirer.sample.Listener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.table.AbstractTableModel;
 import java.awt.EventQueue;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.table.AbstractTableModel;
 
 public class ChannelMetadataModel extends AbstractTableModel implements IChannelMetadataUpdateListener
 {
@@ -84,6 +81,47 @@ public class ChannelMetadataModel extends AbstractTableModel implements IChannel
         }
     }
 
+    /**
+     * Creates a diagnostic description of the channel metadata and metadata-channel map.
+     * @return diagnostic description.
+     */
+    public String getDiagnosticInformation()
+    {
+        StringBuilder sb = new StringBuilder();
+        Map<ChannelMetadata,Channel> mapCopy = new HashMap<>(mMetadataChannelMap);
+        List<ChannelMetadata> metadataCopy = new ArrayList<>(mChannelMetadata);
+
+        sb.append("Channel Metadata Model Diagnostics\n");
+
+        for(ChannelMetadata channelMetadata: metadataCopy)
+        {
+            sb.append("\n--------------- CHANNEL METADATA ITEM --------------------\n\n");
+            if(mapCopy.containsKey(channelMetadata))
+            {
+                Channel channel = mapCopy.get(channelMetadata);
+                sb.append("\tMapped Channel:").append(channel).append("\n");
+                sb.append("\t\tSource Configuration: ").append(channel.getSourceConfiguration()).append("\n");
+            }
+            else
+            {
+                sb.append("\tMapped Channel: **Channel Metadata Is Not In the Metadata:Channel Map**\n");
+            }
+
+            sb.append(channelMetadata.getDescription());
+        }
+
+        //Check for orphaned map entries that don't match the current channel metadata list.
+        for(Map.Entry<ChannelMetadata,Channel> entry: mapCopy.entrySet())
+        {
+            if(!metadataCopy.contains(entry.getKey()))
+            {
+                sb.append("\n\tWARNING: orphaned Metadata Channel map entry - channel: " + entry.getValue()).append("\n");
+            }
+        }
+
+        return sb.toString();
+    }
+
     public void dispose()
     {
         MyEventBus.getGlobalEventBus().unregister(this);
@@ -241,7 +279,8 @@ public class ChannelMetadataModel extends AbstractTableModel implements IChannel
                         }
                         else
                         {
-                            String value = id.getValue().replace(" TS0", "").replace(" TS1", "");
+                            String value = id.getValue().replace(" TS1", "")
+                                    .replace(" TS2", "");
                             return value + " TS:" + channelMetadata.getTimeslot();
                         }
                     }

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataPanel.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * 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
@@ -38,6 +38,14 @@ import io.github.dsheirer.preference.identifier.TalkgroupFormatPreference;
 import io.github.dsheirer.preference.swing.JTableColumnWidthMonitor;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.text.DecimalFormat;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
 import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,14 +60,6 @@ import javax.swing.SwingConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.DecimalFormat;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
 
 public class ChannelMetadataPanel extends JPanel implements ListSelectionListener
 {
@@ -294,6 +294,10 @@ public class ChannelMetadataPanel extends JPanel implements ListSelectionListene
                 {
                     text = EMPTY_VALUE;
                 }
+                else if(hasAdditionalIdentifier(channelMetadata))
+                {
+                    text = text + " " + getAdditionalIdentifier(channelMetadata);
+                }
 
                 label.setText(text);
             }
@@ -306,6 +310,8 @@ public class ChannelMetadataPanel extends JPanel implements ListSelectionListene
         }
 
         public abstract Identifier getIdentifier(ChannelMetadata channelMetadata);
+        public abstract boolean hasAdditionalIdentifier(ChannelMetadata channelMetadata);
+        public abstract Identifier getAdditionalIdentifier(ChannelMetadata channelMetadata);
     }
 
     /**
@@ -323,6 +329,18 @@ public class ChannelMetadataPanel extends JPanel implements ListSelectionListene
         {
             return channelMetadata.getFromIdentifier();
         }
+
+        @Override
+        public Identifier getAdditionalIdentifier(ChannelMetadata channelMetadata)
+        {
+            return channelMetadata.getTalkerAliasIdentifier();
+        }
+
+        @Override
+        public boolean hasAdditionalIdentifier(ChannelMetadata channelMetadata)
+        {
+            return channelMetadata.hasTalkerAliasIdentifier();
+        }
     }
 
     /**
@@ -340,6 +358,11 @@ public class ChannelMetadataPanel extends JPanel implements ListSelectionListene
         {
             return channelMetadata.getToIdentifier();
         }
+
+        @Override
+        public Identifier getAdditionalIdentifier(ChannelMetadata channelMetadata) {return null;}
+        @Override
+        public boolean hasAdditionalIdentifier(ChannelMetadata channelMetadata) {return false;}
     }
 
     public class ColoredStateCellRenderer extends DefaultTableCellRenderer

src/main/java/io/github/dsheirer/channel/metadata/NowPlayingPanel.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
@@ -21,7 +21,7 @@ package io.github.dsheirer.channel.metadata;
 import com.jidesoft.swing.JideSplitPane;
 import com.jidesoft.swing.JideTabbedPane;
 import io.github.dsheirer.channel.details.ChannelDetailPanel;
-import io.github.dsheirer.gui.power.ChannelPowerPanel;
+import io.github.dsheirer.gui.channel.ChannelSpectrumPanel;
 import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.module.decode.event.DecodeEventPanel;
 import io.github.dsheirer.module.decode.event.MessageActivityPanel;
@@ -33,55 +33,108 @@ import net.miginfocom.swing.MigLayout;
 
 import javax.swing.JPanel;
 
+/**
+ * Swing panel for Now Playing channels table and channel details tab set.
+ */
 public class NowPlayingPanel extends JPanel
 {
     private final ChannelMetadataPanel mChannelMetadataPanel;
     private final ChannelDetailPanel mChannelDetailPanel;
     private final DecodeEventPanel mDecodeEventPanel;
     private final MessageActivityPanel mMessageActivityPanel;
-    private final ChannelPowerPanel mChannelPowerPanel;
+    private final ChannelSpectrumPanel mChannelSpectrumSquelchPanel;
+    private JideTabbedPane mTabbedPane;
+    private JideSplitPane mSplitPane;
+    private boolean mDetailTabsVisible;
 
     /**
      * GUI panel that combines the currently decoding channels metadata table and viewers for channel details,
      * messages, events, and spectral view.
      */
     public NowPlayingPanel(PlaylistManager playlistManager, IconModel iconModel, UserPreferences userPreferences,
-                           SettingsManager settingsManager)
+                           SettingsManager settingsManager, boolean detailTabsVisible)
     {
         mChannelDetailPanel = new ChannelDetailPanel(playlistManager.getChannelProcessingManager());
         mDecodeEventPanel = new DecodeEventPanel(iconModel, userPreferences, playlistManager.getAliasModel());
         mMessageActivityPanel = new MessageActivityPanel(userPreferences);
         mChannelMetadataPanel = new ChannelMetadataPanel(playlistManager, iconModel, userPreferences);
-        mChannelPowerPanel = new ChannelPowerPanel(playlistManager, settingsManager);
+        mChannelSpectrumSquelchPanel = new ChannelSpectrumPanel(playlistManager, settingsManager);
+        mDetailTabsVisible = detailTabsVisible;
 
         init();
     }
 
+    /**
+     * Change the visibility of the channel details tabs panel.
+     * @param visible true to show or false to hide.
+     */
+    public void setDetailTabsVisible(boolean visible)
+    {
+        //Only adjust if there is a change in state
+        if(visible ^ mDetailTabsVisible)
+        {
+            mDetailTabsVisible = visible;
+
+            if(mDetailTabsVisible)
+            {
+                getSplitPane().add(getTabbedPane());
+            }
+            else
+            {
+                getSplitPane().remove(getTabbedPane());
+            }
+
+            revalidate();
+        }
+    }
+
+    private JideTabbedPane getTabbedPane()
+    {
+        if(mTabbedPane == null)
+        {
+            mTabbedPane = new JideTabbedPane();
+            mTabbedPane.addTab("Details", mChannelDetailPanel);
+            mTabbedPane.addTab("Events", mDecodeEventPanel);
+            mTabbedPane.addTab("Messages", mMessageActivityPanel);
+            mTabbedPane.addTab("Channel", mChannelSpectrumSquelchPanel);
+            mTabbedPane.setFont(this.getFont());
+            mTabbedPane.setForeground(Color.BLACK);
+            //Register state change listener to toggle visibility state for channel tab to turn-on/off FFT processing
+            mTabbedPane.addChangeListener(e -> mChannelSpectrumSquelchPanel.setPanelVisible(getTabbedPane().getSelectedIndex() == getTabbedPane()
+                    .indexOfComponent(mChannelSpectrumSquelchPanel)));
+        }
+
+        return mTabbedPane;
+    }
+
+    /**
+     * Split pane for channels table and channel details tabs.
+     */
+    private JideSplitPane getSplitPane()
+    {
+        if(mSplitPane == null)
+        {
+            mSplitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT);
+            mSplitPane.setShowGripper(true);
+        }
+
+        return mSplitPane;
+    }
+
     private void init()
     {
         setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[grow,fill]") );
+        getSplitPane().add(mChannelMetadataPanel);
 
-        JideTabbedPane tabbedPane = new JideTabbedPane();
-        tabbedPane.addTab("Details", mChannelDetailPanel);
-        tabbedPane.addTab("Events", mDecodeEventPanel);
-        tabbedPane.addTab("Messages", mMessageActivityPanel);
-        tabbedPane.addTab("Channel", mChannelPowerPanel);
-        tabbedPane.setFont(this.getFont());
-        tabbedPane.setForeground(Color.BLACK);
-
-        //Register state change listener to toggle visibility state for channel tab to turn-on/off FFT processing
-        tabbedPane.addChangeListener(e -> mChannelPowerPanel.setPanelVisible(tabbedPane.getSelectedIndex() == tabbedPane
-                .indexOfComponent(mChannelPowerPanel)));
-
-        JideSplitPane splitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT);
-        splitPane.setShowGripper(true);
-        splitPane.add(mChannelMetadataPanel);
-        splitPane.add(tabbedPane);
-        add(splitPane);
+        if(mDetailTabsVisible)
+        {
+            getSplitPane().add(getTabbedPane());
+        }
 
+        add(getSplitPane());
         mChannelMetadataPanel.addProcessingChainSelectionListener(mChannelDetailPanel);
         mChannelMetadataPanel.addProcessingChainSelectionListener(mDecodeEventPanel);
         mChannelMetadataPanel.addProcessingChainSelectionListener(mMessageActivityPanel);
-        mChannelMetadataPanel.addProcessingChainSelectionListener(mChannelPowerPanel);
+        mChannelMetadataPanel.addProcessingChainSelectionListener(mChannelSpectrumSquelchPanel);
     }
 }

src/main/java/io/github/dsheirer/channel/state/AbstractChannelState.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -35,11 +35,10 @@ import io.github.dsheirer.source.ISourceEventProvider;
 import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.source.heartbeat.Heartbeat;
 import io.github.dsheirer.source.heartbeat.IHeartbeatListener;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 public abstract class AbstractChannelState extends Module implements IChannelEventProvider, IDecodeEventProvider,
     IDecoderStateEventProvider, ISourceEventProvider, IHeartbeatListener, ISquelchStateProvider,
     IdentifierUpdateProvider, IOverflowListener
@@ -53,7 +52,8 @@ public abstract class AbstractChannelState extends Module implements IChannelEve
     private Channel mChannel;
     protected boolean mSourceOverflow = false;
     private HeartbeatReceiver mHeartbeatReceiver = new HeartbeatReceiver();
-
+    protected boolean mTeardownSequenceStarted = false;
+    protected boolean mTeardownSequenceCompleted = false;
 
     //TODO: remove the IOverflowListener code from this class
 
@@ -66,6 +66,22 @@ public abstract class AbstractChannelState extends Module implements IChannelEve
         mChannel = channel;
     }
 
+    /**
+     * Indicates if the teardown sequence was started.
+     */
+    public boolean isTeardownSequenceCompleted()
+    {
+        return mTeardownSequenceCompleted;
+    }
+
+    /**
+     * Indicates if the teardown sequence was completed, meaning that the request disable channel event was dispatched.
+     */
+    public boolean isTeardownSequenceStarted()
+    {
+        return mTeardownSequenceStarted;
+    }
+
     /**
      * Updates/replaces the current channel configuration with the argument.
      */
@@ -89,6 +105,11 @@ public abstract class AbstractChannelState extends Module implements IChannelEve
      */
     protected abstract void checkState();
 
+    /**
+     * Indicates if any timeslot is currently in a TEARDOWN state.
+     */
+    public abstract boolean isTeardownState();
+
     public abstract List<ChannelMetadata> getChannelMetadata();
 
     public abstract void updateChannelStateIdentifiers(IdentifierUpdateNotification notification);

src/main/java/io/github/dsheirer/channel/state/AbstractDecoderState.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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.channel.state;
@@ -29,6 +26,7 @@ import io.github.dsheirer.message.IMessageListener;
 import io.github.dsheirer.module.Module;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.event.ActivitySummaryProvider;
+import io.github.dsheirer.module.decode.event.DecodeEventDuplicateDetector;
 import io.github.dsheirer.module.decode.event.IDecodeEvent;
 import io.github.dsheirer.module.decode.event.IDecodeEventProvider;
 import io.github.dsheirer.sample.Broadcaster;
@@ -47,9 +45,38 @@ public abstract class AbstractDecoderState extends Module implements ActivitySum
     protected Broadcaster<IDecodeEvent> mDecodeEventBroadcaster = new Broadcaster<>();
     protected Listener<DecoderStateEvent> mDecoderStateListener;
     private DecoderStateEventListener mDecoderStateEventListener = new DecoderStateEventListener();
+    private static final DecodeEventDuplicateDetector mDuplicateEventDetector = new DecodeEventDuplicateDetector();
+    private boolean mRunning;
 
     public abstract DecoderType getDecoderType();
 
+    /**
+     * Implements module start and sets the mRunning flag to true so that messages can be processed.
+     */
+    @Override
+    public void start()
+    {
+        mRunning = true;
+    }
+
+    /**
+     * Implements the module stop and sets the mRunning flag to false to stop message processing
+     */
+    @Override
+    public void stop()
+    {
+        mRunning = false;
+    }
+
+    /**
+     * Indicates if this module is running and can process/pass messages down to sub-class implementations.
+     * @return true if running
+     */
+    public boolean isRunning()
+    {
+        return mRunning;
+    }
+
     /**
      * Provides subclass reference to the decode event broadcaster
      */
@@ -80,7 +107,10 @@ public abstract class AbstractDecoderState extends Module implements ActivitySum
      */
     protected void broadcast(IDecodeEvent event)
     {
-        mDecodeEventBroadcaster.broadcast(event);
+        if(!mDuplicateEventDetector.isDuplicate(event, System.currentTimeMillis()))
+        {
+            mDecodeEventBroadcaster.broadcast(event);
+        }
     }
 
     /**
@@ -136,6 +166,9 @@ public abstract class AbstractDecoderState extends Module implements ActivitySum
         mDecoderStateListener = null;
     }
 
+    /**
+     * Wrapper that implements the IDecoderStateEventListener interface
+     */
     private class DecoderStateEventListener implements Listener<DecoderStateEvent>
     {
         @Override
@@ -144,5 +177,4 @@ public abstract class AbstractDecoderState extends Module implements ActivitySum
             receiveDecoderStateEvent(event);
         }
     }
-
 }

src/main/java/io/github/dsheirer/channel/state/AlwaysUnsquelchedDecoderState.java

@@ -1,102 +0,0 @@
-/*
- * *****************************************************************************
- *  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/>
- * ****************************************************************************
- */
-package io.github.dsheirer.channel.state;
-
-import io.github.dsheirer.channel.state.DecoderStateEvent.Event;
-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.string.SimpleStringIdentifier;
-import io.github.dsheirer.message.IMessage;
-import io.github.dsheirer.module.decode.DecoderType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Basic decoder channel state - provides the minimum channel state functionality
- * to support an always un-squelched audio decoder.
- */
-public class AlwaysUnsquelchedDecoderState extends DecoderState
-{
-    private final static Logger mLog = LoggerFactory.getLogger(AlwaysUnsquelchedDecoderState.class);
-    private static final String NO_SQUELCH = "No Squelch";
-    private Identifier mChannelNameIdentifier;
-
-    private DecoderType mDecoderType;
-    private String mChannelName;
-
-    public AlwaysUnsquelchedDecoderState(DecoderType decoderType, String channelName)
-    {
-        mDecoderType = decoderType;
-        mChannelName = (channelName != null && !channelName.isEmpty()) ? channelName : decoderType.name() + " CHANNEL";
-        mChannelNameIdentifier = new SimpleStringIdentifier(mChannelName, IdentifierClass.USER, Form.CHANNEL_NAME, Role.TO);
-    }
-
-    @Override
-    public void init()
-    {
-    }
-
-    @Override
-    public String getActivitySummary()
-    {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("Activity Summary\n");
-        sb.append("\tDecoder:\t");
-        sb.append(mDecoderType);
-        sb.append("\n\n");
-
-        return sb.toString();
-    }
-
-    @Override
-    public void receive(IMessage t)
-    {
-        /* Not implemented */
-    }
-
-    @Override
-    public void receiveDecoderStateEvent(DecoderStateEvent event)
-    {
-        if(event.getEvent() == Event.REQUEST_RESET)
-        {
-            getIdentifierCollection().update(mChannelNameIdentifier);
-        }
-    }
-
-    @Override
-    public DecoderType getDecoderType()
-    {
-        return mDecoderType;
-    }
-
-    @Override
-    public void start()
-    {
-        broadcast(new DecoderStateEvent(this, Event.REQUEST_ALWAYS_UNSQUELCH, State.IDLE));
-        getIdentifierCollection().update(mChannelNameIdentifier);
-    }
-
-    @Override
-    public void stop()
-    {
-    }
-}

src/main/java/io/github/dsheirer/channel/state/DecoderState.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -25,6 +25,7 @@ import io.github.dsheirer.identifier.IdentifierUpdateNotification;
 import io.github.dsheirer.identifier.MutableIdentifierCollection;
 import io.github.dsheirer.identifier.configuration.ChannelDescriptorConfigurationIdentifier;
 import io.github.dsheirer.identifier.configuration.DecoderTypeConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.FrequencyConfigurationIdentifier;
 import io.github.dsheirer.sample.Listener;
 
 /**
@@ -38,13 +39,21 @@ public abstract class DecoderState extends AbstractDecoderState
     private MutableIdentifierCollection mIdentifierCollection;
     protected Listener<IdentifierUpdateNotification> mConfigurationIdentifierListener;
     protected IChannelDescriptor mCurrentChannel;
+    private long mCurrentFrequency;
 
+    /**
+     * Constructs an instance
+     * @param mutableIdentifierCollection to preload into this decoder state
+     */
     public DecoderState(MutableIdentifierCollection mutableIdentifierCollection)
     {
         mIdentifierCollection = mutableIdentifierCollection;
         mIdentifierCollection.update(new DecoderTypeConfigurationIdentifier(getDecoderType()));
     }
 
+    /**
+     * Constructs an instance using an empty identifier collection.
+     */
     public DecoderState()
     {
         this(new MutableIdentifierCollection());
@@ -54,10 +63,28 @@ public abstract class DecoderState extends AbstractDecoderState
     @Override
     public void start()
     {
+        super.start();
         //Broadcast the existing identifiers (as add events) so that they can be received by external listeners
         mIdentifierCollection.broadcastIdentifiers();
     }
 
+    /**
+     * Current frequency for this channel.
+     */
+    public long getCurrentFrequency()
+    {
+        return mCurrentFrequency;
+    }
+
+    /**
+     * Sets the current frequency for this channel.
+     * @param frequency to set.
+     */
+    public void setCurrentFrequency(long frequency)
+    {
+        mCurrentFrequency = frequency;
+    }
+
     /**
      * Registers the listener to receive identifier update notifications
      */
@@ -95,7 +122,7 @@ public abstract class DecoderState extends AbstractDecoderState
     /**
      * Sets the current channel descriptor
      */
-    protected void setCurrentChannel(IChannelDescriptor channel)
+    public void setCurrentChannel(IChannelDescriptor channel)
     {
         mCurrentChannel = channel;
     }
@@ -152,9 +179,13 @@ public abstract class DecoderState extends AbstractDecoderState
         {
             getIdentifierCollection().receive(identifierUpdateNotification);
 
-            if(identifierUpdateNotification.getIdentifier() instanceof ChannelDescriptorConfigurationIdentifier)
+            if(identifierUpdateNotification.getIdentifier() instanceof ChannelDescriptorConfigurationIdentifier cdci)
             {
-                setCurrentChannel(((ChannelDescriptorConfigurationIdentifier)identifierUpdateNotification.getIdentifier()).getValue());
+                setCurrentChannel(cdci.getValue());
+            }
+            else if(identifierUpdateNotification.getIdentifier() instanceof FrequencyConfigurationIdentifier fci)
+            {
+                setCurrentFrequency(fci.getValue());
             }
         }
     }

src/main/java/io/github/dsheirer/channel/state/MultiChannelState.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -44,13 +44,12 @@ import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.source.SourceType;
 import io.github.dsheirer.source.config.SourceConfigTuner;
 import io.github.dsheirer.source.config.SourceConfigTunerMultipleFrequency;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Multi-Channel state tracks the overall state of all processing modules and decoders configured for the channel
@@ -166,6 +165,7 @@ public class MultiChannelState extends AbstractChannelState implements IDecoderS
                 mStateMachineMap.get(timeslot).setState(State.IDLE);
                 break;
             case TEARDOWN:
+                mTeardownSequenceStarted = true;
                 if(getChannel().isTrafficChannel())
                 {
                     checkTeardown();
@@ -206,7 +206,16 @@ public class MultiChannelState extends AbstractChannelState implements IDecoderS
         {
             if(getChannel().isTrafficChannel())
             {
-                broadcast(new ChannelEvent(getChannel(), ChannelEvent.Event.REQUEST_DISABLE));
+                try
+                {
+                    broadcast(new ChannelEvent(getChannel(), ChannelEvent.Event.REQUEST_DISABLE));
+                }
+                catch(Throwable t)
+                {
+                    mLog.error("Error broadcasting shutdown channel event", t);
+                }
+
+                mTeardownSequenceStarted = true;
             }
             else
             {
@@ -238,6 +247,20 @@ public class MultiChannelState extends AbstractChannelState implements IDecoderS
         }
     }
 
+    @Override
+    public boolean isTeardownState()
+    {
+        for(StateMachine stateMachine: mStateMachineMap.values())
+        {
+            if(stateMachine.getState() == State.TEARDOWN)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Creates configuration identifiers for the channel name, system, site and alias list name.
      */

src/main/java/io/github/dsheirer/channel/state/SingleChannelState.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -46,11 +46,10 @@ import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.source.SourceType;
 import io.github.dsheirer.source.config.SourceConfigTuner;
 import io.github.dsheirer.source.config.SourceConfigTunerMultipleFrequency;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collections;
 import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Channel state tracks the overall state of all processing modules and decoders configured for the channel and
@@ -163,9 +162,11 @@ public class SingleChannelState extends AbstractChannelState implements IDecoder
                 mStateMachine.setState(State.IDLE);
                 break;
             case TEARDOWN:
+                mTeardownSequenceStarted = true;
                 if(getChannel().isTrafficChannel())
                 {
                     broadcast(new ChannelEvent(getChannel(), ChannelEvent.Event.REQUEST_DISABLE));
+                    mTeardownSequenceCompleted = true;
                 }
                 else
                 {
@@ -175,6 +176,12 @@ public class SingleChannelState extends AbstractChannelState implements IDecoder
         }
     }
 
+    @Override
+    public boolean isTeardownState()
+    {
+        return mStateMachine.getState() == State.TEARDOWN;
+    }
+
     @Override
     protected void checkState()
     {

src/main/java/io/github/dsheirer/channel/state/TimeslotDecoderState.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -26,12 +26,20 @@ import io.github.dsheirer.identifier.IdentifierClass;
 import io.github.dsheirer.identifier.IdentifierUpdateNotification;
 import io.github.dsheirer.identifier.MutableIdentifierCollection;
 import io.github.dsheirer.identifier.configuration.ChannelDescriptorConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.FrequencyConfigurationIdentifier;
 import io.github.dsheirer.sample.Listener;
 
+/**
+ * Base decoder state implementation for a multi-timeslot protocol that tracks the state for a single timeslot.
+ */
 public abstract class TimeslotDecoderState extends DecoderState
 {
     private int mTimeslot;
 
+    /**
+     * Constructs an instance
+     * @param timeslot to monitor/maintain state.
+     */
     public TimeslotDecoderState(int timeslot)
     {
         super(new MutableIdentifierCollection(timeslot));
@@ -39,6 +47,9 @@ public abstract class TimeslotDecoderState extends DecoderState
         mConfigurationIdentifierListener = new TimeslotConfigurationIdentifierListener();
     }
 
+    /**
+     * Monitored timeslot for this decoder state instance.
+     */
     protected int getTimeslot()
     {
         return mTimeslot;
@@ -82,6 +93,10 @@ public abstract class TimeslotDecoderState extends DecoderState
                     {
                         setCurrentChannel((IChannelDescriptor)identifier);
                     }
+                    else if(identifier instanceof FrequencyConfigurationIdentifier fci)
+                    {
+                        setCurrentFrequency(fci.getValue());
+                    }
                 }
             }
         }

src/main/java/io/github/dsheirer/controller/ControllerPanel.java

@@ -59,17 +59,25 @@ public class ControllerPanel extends JPanel
 
     public ControllerPanel(PlaylistManager playlistManager, AudioPlaybackManager audioPlaybackManager,
                            IconModel iconModel, MapService mapService, SettingsManager settingsManager,
-                           TunerManager tunerManager, UserPreferences userPreferences)
+                           TunerManager tunerManager, UserPreferences userPreferences, boolean detailTabsVisible)
     {
         mAudioPanel = new AudioPanel(iconModel, userPreferences, settingsManager, audioPlaybackManager,
             playlistManager.getAliasModel());
-        mNowPlayingPanel = new NowPlayingPanel(playlistManager, iconModel, userPreferences, settingsManager);
+        mNowPlayingPanel = new NowPlayingPanel(playlistManager, iconModel, userPreferences, settingsManager, detailTabsVisible);
         mMapPanel = new MapPanel(mapService, playlistManager.getAliasModel(), iconModel, settingsManager);
         mTunerManagerPanel = new TunerViewPanel(tunerManager, userPreferences);
 
         init();
     }
 
+    /**
+     * Now playing panel.
+     */
+    public NowPlayingPanel getNowPlayingPanel()
+    {
+        return mNowPlayingPanel;
+    }
+
     private void init()
     {
         setLayout(new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[]0[grow,fill]0[]"));
@@ -97,8 +105,8 @@ public class ControllerPanel extends JPanel
         mTabbedPane.addTab("Map", mMapPanel);
         mTabbedPane.addTab("Tuners", mTunerManagerPanel);
 
-        Icon gearIcon = IconFontSwing.buildIcon(FontAwesome.COG, 20, Color.DARK_GRAY);
-        mTabbedPane.addTab("Playlist Editor", gearIcon, new JLabel("Show Playlist Manager"));
+        Icon playIcon = IconFontSwing.buildIcon(FontAwesome.PLAY_CIRCLE_O, 20, Color.DARK_GRAY);
+        mTabbedPane.addTab("Playlist Editor", playIcon, new JLabel("Show Playlist Manager"));
         mSettingsTabIndex = mTabbedPane.getTabCount() - 1;
 
         //Set preferred size to influence the split between these panels

src/main/java/io/github/dsheirer/controller/channel/Channel.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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.controller.channel;
 
@@ -35,13 +32,16 @@ import io.github.dsheirer.record.RecorderType;
 import io.github.dsheirer.record.config.RecordConfiguration;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.source.SourceEvent;
-import io.github.dsheirer.source.SourceType;
 import io.github.dsheirer.source.config.SourceConfigFactory;
 import io.github.dsheirer.source.config.SourceConfigRecording;
 import io.github.dsheirer.source.config.SourceConfigTuner;
 import io.github.dsheirer.source.config.SourceConfigTunerMultipleFrequency;
 import io.github.dsheirer.source.config.SourceConfiguration;
 import io.github.dsheirer.source.tuner.channel.TunerChannel;
+import java.beans.Transient;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
@@ -55,9 +55,6 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.beans.Transient;
-import java.util.Objects;
-
 @JacksonXmlRootElement(localName = "channel")
 public class Channel extends Configuration implements Listener<SourceEvent>
 {
@@ -88,7 +85,7 @@ public class Channel extends Configuration implements Listener<SourceEvent>
     private BooleanProperty mAutoStart = new SimpleBooleanProperty();
     private IntegerProperty mAutoStartOrder = new SimpleIntegerProperty();
     private boolean mSelected;
-    private TunerChannel mTunerChannel = null;
+    private List<TunerChannel> mTunerChannels = null;
 
     private ChannelType mChannelType = ChannelType.STANDARD;
 
@@ -634,9 +631,8 @@ public class Channel extends Configuration implements Listener<SourceEvent>
 
         updateFrequencies();
 
-        //Clear the tune channel object so that it can be recreated if the
-        //source configuration changes
-        mTunerChannel = null;
+        //Clear the tune channels object so that it can be recreated if the source configuration changes
+        mTunerChannels = null;
     }
 
     /**
@@ -680,35 +676,50 @@ public class Channel extends Configuration implements Listener<SourceEvent>
     }
 
     /**
-     * Convenience method to construct a tuner channel object representing a
-     * tuner or recording source frequency and bandwidth that can be used by
-     * application components for graphically representing this channel.
+     * Convenience method to construct a tuner channel object representing a tuner or recording source frequency and
+     * bandwidth that can be used by application components for graphically representing this channel.
      *
-     * If the source configuration is not a tuner or recording, this method
-     * returns null.
+     * If the source configuration is not a tuner or recording, this method returns an empty list.
      */
     @JsonIgnore
-    public TunerChannel getTunerChannel()
+    public List<TunerChannel> getTunerChannels()
     {
-        if(mTunerChannel == null)
+        if(mTunerChannels == null && mSourceConfiguration != null)
         {
-            if(mSourceConfiguration.getSourceType() == SourceType.TUNER)
-            {
-                SourceConfigTuner config = (SourceConfigTuner)mSourceConfiguration;
+            mTunerChannels = new ArrayList<>();
 
-                mTunerChannel = new TunerChannel(config.getFrequency(),
-                    mDecodeConfiguration.getChannelSpecification().getBandwidth());
-            }
-            else if(mSourceConfiguration.getSourceType() == SourceType.RECORDING)
+            switch(mSourceConfiguration.getSourceType())
             {
-                SourceConfigRecording config = (SourceConfigRecording)mSourceConfiguration;
-
-                mTunerChannel = new TunerChannel(config.getFrequency(),
-                    mDecodeConfiguration.getChannelSpecification().getBandwidth());
+                case TUNER:
+                    if(mSourceConfiguration instanceof SourceConfigTuner tunerConfig)
+                    {
+                        mTunerChannels.add(new TunerChannel(tunerConfig.getFrequency(),
+                                mDecodeConfiguration.getChannelSpecification().getBandwidth()));
+                    }
+                    break;
+                case TUNER_MULTIPLE_FREQUENCIES:
+                    if(mSourceConfiguration instanceof SourceConfigTunerMultipleFrequency multiConfig)
+                    {
+                        for(long frequency: multiConfig.getFrequencies())
+                        {
+                            mTunerChannels.add(new TunerChannel(frequency,
+                                    mDecodeConfiguration.getChannelSpecification().getBandwidth()));
+                        }
+                    }
+                    break;
+                case RECORDING:
+                    if(mSourceConfiguration instanceof  SourceConfigRecording recordingConfig)
+                    {
+                        mTunerChannels.add(new TunerChannel(recordingConfig.getFrequency(),
+                                mDecodeConfiguration.getChannelSpecification().getBandwidth()));
+                    }
+                    break;
+                default:
+                    mLog.warn("Unrecognized channel source type: " + mSourceConfiguration.getSourceType());
             }
         }
 
-        return mTunerChannel;
+        return mTunerChannels;
     }
 
     /**
@@ -717,9 +728,15 @@ public class Channel extends Configuration implements Listener<SourceEvent>
      */
     public boolean isWithin(long minimum, long maximum)
     {
-        TunerChannel tunerChannel = getTunerChannel();
+        for(TunerChannel tunerChannel: getTunerChannels())
+        {
+            if(tunerChannel.overlaps(minimum, maximum))
+            {
+                return true;
+            }
+        }
 
-        return tunerChannel != null && tunerChannel.overlaps(minimum, maximum);
+        return false;
     }
 
     /**

src/main/java/io/github/dsheirer/controller/channel/ChannelModel.java

@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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.controller.channel;
 
@@ -26,15 +23,13 @@ import io.github.dsheirer.controller.channel.Channel.ChannelType;
 import io.github.dsheirer.controller.channel.ChannelEvent.Event;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 /**
  * Channel Model
  */
@@ -55,6 +50,58 @@ public class ChannelModel implements Listener<ChannelEvent>
         mTrafficChannels.addListener(changeListener);
     }
 
+    /**
+     * Get a deduplicated list of alias list names from across the channel configurations.
+     * @return list of alias list names.
+     */
+    public List<String> getAliasListNames()
+    {
+        List<String> aliasListNames = new ArrayList<>();
+
+        for(Channel channel : mChannels)
+        {
+            String aliasListName = channel.getAliasListName();
+
+            if(aliasListName != null && !aliasListName.isEmpty() && !aliasListNames.contains(aliasListName))
+            {
+                aliasListNames.add(aliasListName);
+            }
+        }
+
+        return aliasListNames;
+    }
+
+    /**
+     * Renames the alias list across the set of aliases.
+     * @param oldName currently used by the alias
+     * @param newName to apply to the alias
+     */
+    public void renameAliasList(String oldName, String newName)
+    {
+        if(oldName == null || oldName.isEmpty() || newName == null || newName.isEmpty())
+        {
+            return;
+        }
+
+        mChannels.stream().filter(channel -> channel.getAliasListName().equals(oldName))
+                .forEach(channel -> channel.setAliasListName(newName));
+    }
+
+    /**
+     * Deletes any aliases that have the alias list name
+     * @param aliasListName to delete
+     */
+    public void deleteAliasList(String aliasListName)
+    {
+        if(aliasListName == null || aliasListName.isEmpty())
+        {
+            return;
+        }
+
+        mChannels.stream().filter(channel -> channel.getAliasListName().equals(aliasListName))
+                .forEach(channel -> channel.setAliasListName(null));
+    }
+
     /**
      * Observable list of channel configurations managed by this model
      */
@@ -109,6 +156,45 @@ public class ChannelModel implements Listener<ChannelEvent>
         return null;
     }
 
+    /**
+     * Renames the alias list across all channels.
+     * @param existing alias list name
+     * @param renamed alias list name.
+     */
+    public void renameAliaslistForChannels(String existing, String renamed)
+    {
+        if(existing == null || existing.isEmpty() || renamed == null || renamed.isEmpty())
+        {
+            return;
+        }
+
+        mChannels.forEach(channel -> {
+            if(channel.getAliasListName() != null && channel.getAliasListName().equals(existing))
+            {
+                channel.setAliasListName(renamed);
+            }
+        });
+    }
+
+    /**
+     * Removes the alias list name from any channels.
+     * @param name to delete
+     */
+    public void deleteAliasListName(String name)
+    {
+        if(name == null || name.isEmpty())
+        {
+            return;
+        }
+
+        mChannels.forEach(channel -> {
+            if(channel.getAliasListName() != null && channel.getAliasListName().equals(name))
+            {
+                channel.setAliasListName(null);
+            }
+        });
+    }
+
     /**
      * Returns a list of unique system values from across the channel set
      */

src/main/java/io/github/dsheirer/controller/channel/ChannelProcessingManager.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -24,6 +24,7 @@ import io.github.dsheirer.audio.AudioSegment;
 import io.github.dsheirer.channel.metadata.ChannelAndMetadata;
 import io.github.dsheirer.channel.metadata.ChannelMetadata;
 import io.github.dsheirer.channel.metadata.ChannelMetadataModel;
+import io.github.dsheirer.channel.state.AbstractChannelState;
 import io.github.dsheirer.controller.channel.event.ChannelStartProcessingRequest;
 import io.github.dsheirer.controller.channel.event.ChannelStopProcessingRequest;
 import io.github.dsheirer.controller.channel.event.PreloadDataContent;
@@ -52,6 +53,7 @@ import io.github.dsheirer.source.tuner.manager.TunerManager;
 import io.github.dsheirer.util.ThreadPool;
 import java.awt.GraphicsEnvironment;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -72,9 +74,10 @@ import org.slf4j.LoggerFactory;
  */
 public class ChannelProcessingManager implements Listener<ChannelEvent>
 {
+    private static final String DIVIDER = "-------------------------------------------------------------------------\n";
     private final static Logger mLog = LoggerFactory.getLogger(ChannelProcessingManager.class);
     private static final String TUNER_UNAVAILABLE_DESCRIPTION = "TUNER UNAVAILABLE";
-    private Map<Channel,ProcessingChain> mProcessingChains = new ConcurrentHashMap<>();
+    private Map<Channel,ProcessingChain> mProcessingChainsMap = new ConcurrentHashMap<>();
     private Lock mLock = new ReentrantLock();
 
     private ChannelSourceEventErrorListener mSourceErrorListener = new ChannelSourceEventErrorListener();
@@ -131,7 +134,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         try
         {
-            isProcessing = mProcessingChains.containsKey(channel) && mProcessingChains.get(channel).isProcessing();
+            isProcessing = mProcessingChainsMap.containsKey(channel) && mProcessingChainsMap.get(channel).isProcessing();
         }
         finally
         {
@@ -147,7 +150,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
      */
     public boolean isProcessing()
     {
-        return !mProcessingChains.isEmpty();
+        return !mProcessingChainsMap.isEmpty();
     }
 
     /**
@@ -156,7 +159,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
      */
     public ProcessingChain getProcessingChain(Channel channel)
     {
-        return mProcessingChains.get(channel);
+        return mProcessingChainsMap.get(channel);
     }
 
     /**
@@ -175,7 +178,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
             try
             {
-                for(Map.Entry<Channel,ProcessingChain> entry : mProcessingChains.entrySet())
+                for(Map.Entry<Channel,ProcessingChain> entry : mProcessingChainsMap.entrySet())
                 {
                     if(entry.getValue() == processingChain)
                     {
@@ -206,7 +209,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         try
         {
-            for(Map.Entry<Channel,ProcessingChain> entry : mProcessingChains.entrySet())
+            for(Map.Entry<Channel,ProcessingChain> entry : mProcessingChainsMap.entrySet())
             {
                 if(entry.getValue().hasSource(tunerChannelSource))
                 {
@@ -276,15 +279,27 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
                 break;
             case REQUEST_DISABLE:
             case NOTIFICATION_DELETE:
-                if(channel.isProcessing())
+                if(channel != null)
                 {
                     try
                     {
                         stopProcessing(channel);
                     }
-                    catch(ChannelException ce)
+                    catch(Throwable t)
                     {
-                        mLog.error("Error stopping channel [" + channel.getName() + "] - " + ce.getMessage());
+                        mLog.error("Error stopping channel [" + channel + "]", t);
+                    }
+                }
+                else
+                {
+                    try
+                    {
+                        throw new IllegalArgumentException("Request to disable channel must have non-null channel");
+                    }
+                    catch(IllegalArgumentException iae)
+                    {
+                        mLog.error("Caught a [" + event.getEvent() + "] non-standard channel event - logging stack trace.  " +
+                                "This should not happen, please send this error to the developer.", iae);
                     }
                 }
                 break;
@@ -365,7 +380,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
      * @param request containing channel and other details
      * @throws ChannelException if a source is not available for the channel
      */
-    private void startProcessing(ChannelStartProcessingRequest request) throws ChannelException
+    private synchronized void startProcessing(ChannelStartProcessingRequest request) throws ChannelException
     {
         Channel channel = request.getChannel();
 
@@ -379,8 +394,10 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         try
         {
+            String threadName = "sdrtrunk channel [" + channel.getChannelID() + "/" +
+                    channel.getDecodeConfiguration().getDecoderType().getShortDisplayString() + "]";
             source = mTunerManager.getSource(channel.getSourceConfiguration(),
-                channel.getDecodeConfiguration().getChannelSpecification());
+                channel.getDecodeConfiguration().getChannelSpecification(), threadName);
         }
         catch(SourceException se)
         {
@@ -390,7 +407,10 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
         if(source == null)
         {
             //This has to be done on the FX event thread when the playlist editor is constructed
-            Platform.runLater(() -> channel.setProcessing(false));
+            if(!GraphicsEnvironment.isHeadless())
+            {
+                Platform.runLater(() -> channel.setProcessing(false));
+            }
 
             mChannelEventBroadcaster.broadcast(new ChannelEvent(channel,
                 ChannelEvent.Event.NOTIFICATION_PROCESSING_START_REJECTED, TUNER_UNAVAILABLE_DESCRIPTION));
@@ -442,7 +462,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         /* Processing Modules */
         List<Module> modules = DecoderFactory.getModules(mChannelMapModel, channel, mAliasModel, mUserPreferences,
-            request.getTrafficChannelManager());
+            request.getTrafficChannelManager(), request.getChannelDescriptor());
         processingChain.addModules(modules);
 
         //Post preload data from the request to the event bus.  Modules that can handle preload data will annotate
@@ -513,7 +533,14 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         if(addProcessingChain(channel, processingChain))
         {
-            processingChain.start();
+            try
+            {
+                processingChain.start();
+            }
+            catch(Throwable t)
+            {
+                mLog.error("Error caught during processing chain startup - continuing", t);
+            }
 
             if(GraphicsEnvironment.isHeadless())
             {
@@ -556,10 +583,10 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         try
         {
-            if(!mProcessingChains.containsKey(channel))
+            if(!mProcessingChainsMap.containsKey(channel))
             {
                 added = true;
-                mProcessingChains.put(channel, processingChain);
+                mProcessingChainsMap.put(channel, processingChain);
                 getChannelMetadataModel().add(new ChannelAndMetadata(channel, processingChain.getChannelState().getChannelMetadata()));
             }
         }
@@ -584,7 +611,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
         try
         {
-            removed = mProcessingChains.remove(channel);
+            removed = mProcessingChainsMap.remove(channel);
 
             if(removed != null)
             {
@@ -619,8 +646,28 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
             }
             else
             {
-                //This has to be done on the FX event thread when the playlist editor is constructed
-                Platform.runLater(() -> channel.setProcessing(false));
+                //When we're in non-headless mode we have to change the processing property on the JavaFX
+                //event thread.  However, if it hasn't yet been initialized (ie an FX window opened), we'll
+                //get an ISE.  In that case, just set the property to false because there won't be any
+                //property listeners being triggered.
+                try
+                {
+                    Platform.runLater(() -> {
+                        try
+                        {
+                            channel.setProcessing(false);
+                        }
+                        catch(Exception e)
+                        {
+                            mLog.error("Error during channel stop while setting processing to false [" + channel +
+                                    "] - continuing channel stop process", e);
+                        }
+                    });
+                }
+                catch(IllegalStateException e)
+                {
+                    channel.setProcessing(false);
+                }
             }
 
             try
@@ -633,6 +680,8 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
                 processingChain.removeFrequencyChangeListener(channel);
                 channel.resetFrequencyCorrection();
 
+                //Notify all processing chains that this channel is shutting down so that if this is a traffic channel,
+                //the owning parent channel's traffic channel manager can cleanup it's accounting.
                 mChannelEventBroadcaster.broadcast(new ChannelEvent(channel, ChannelEvent.Event.NOTIFICATION_PROCESSING_STOP));
                 mChannelEventBroadcaster.removeListener(processingChain);
 
@@ -660,7 +709,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
             mDelayedChannelStartTasks.remove(delayedTask);
         }
 
-        List<Channel> channelsToStop = new ArrayList<>(mProcessingChains.keySet());
+        List<Channel> channelsToStop = new ArrayList<>(mProcessingChainsMap.keySet());
 
         for(Channel channel : channelsToStop)
         {
@@ -683,7 +732,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
     public void convertToTrafficChannel(ChannelConversionRequest request)
     {
         //Update the channel to processing chain map.
-        ProcessingChain processingChain = mProcessingChains.remove(request.getCurrentChannel());
+        ProcessingChain processingChain = mProcessingChainsMap.remove(request.getCurrentChannel());
 
         if(processingChain != null)
         {
@@ -697,7 +746,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
                 request.getTrafficChannel().setProcessing(true);
             });
 
-            mProcessingChains.put(request.getTrafficChannel(), processingChain);
+            mProcessingChainsMap.put(request.getTrafficChannel(), processingChain);
             mChannelMetadataModel.updateChannelMetadataToChannelMap(processingChain.getChannelState().getChannelMetadata(),
                 request.getTrafficChannel());
 
@@ -803,7 +852,7 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
 
                 try
                 {
-                    for(Map.Entry<Channel,ProcessingChain> entry: mProcessingChains.entrySet())
+                    for(Map.Entry<Channel,ProcessingChain> entry: mProcessingChainsMap.entrySet())
                     {
                         if(entry.getValue().hasSource(sourceEvent.getSource()))
                         {
@@ -837,8 +886,64 @@ public class ChannelProcessingManager implements Listener<ChannelEvent>
                         mLog.error("Error stopping channel [" + (toShutdown != null ? toShutdown.getName() : "unknown") +
                                 "] with source error - " + ce.getMessage());
                     }
+                    catch(Throwable t)
+                    {
+                        mLog.error("Error stopping channel [" + toShutdown + "]", t);
+                    }
                 }
             }
         }
     }
+
+    /**
+     * Creates a diagnostic report.
+     * @return report text.
+     */
+    public String getDiagnosticInformation()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Channel Processing Manager - Diagnostics Report\n\n");
+        sb.append(DIVIDER);
+        sb.append("\tChannel to Processing Chain Map Contents\n");
+        Map<Channel,ProcessingChain> mapCopy = new HashMap<>(mProcessingChainsMap);
+        for(Map.Entry<Channel,ProcessingChain> entry: mapCopy.entrySet())
+        {
+            sb.append("\n\n--------------- CHANNEL:PROCESSING CHAIN MAP ENTRY --------------------\n");
+            try
+            {
+                Channel channel = entry.getKey();
+                sb.append("\tChannel: " + channel).append("\n");
+                sb.append("\t\tSource Configuration: " + channel.getSourceConfiguration()).append("\n");
+                ProcessingChain chain = entry.getValue();
+                sb.append("\tProcessing Chain - Processing: ").append(chain.isProcessing()).append("\n");
+                AbstractChannelState state = chain.getChannelState();
+                sb.append("Channel State: ").append(state.getClass()).append("\n");
+                sb.append(" Teardown Started:").append(state.isTeardownSequenceStarted()).append("\n");
+                sb.append(" Teardown Completed:").append(state.isTeardownSequenceCompleted()).append("\n");
+                for(ChannelMetadata metadata: state.getChannelMetadata())
+                {
+                    sb.append(metadata.getDescription()).append("\n");
+                }
+
+                Source source = chain.getSource();
+
+                if(source != null)
+                {
+                    sb.append("Channel Source Class: " + source.getClass()).append("\n");
+                    sb.append("\t\tTo String:").append(source).append("\n");
+                    sb.append("\t\tHash:").append(Integer.toHexString(source.hashCode()).toUpperCase()).append("\n");
+                }
+                else
+                {
+                    sb.append("Channel Source: (null)\n");
+                }
+            }
+            catch(Throwable t)
+            {
+                sb.append("\tError while logging diagnostics of map entry - " + t.getMessage()).append("\n");
+            }
+        }
+
+        return sb.toString();
+    }
 }

src/main/java/io/github/dsheirer/dsp/filter/FilterFactory.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -56,15 +56,14 @@ import io.github.dsheirer.dsp.window.WindowType;
 import io.github.dsheirer.vector.calibrate.CalibrationManager;
 import io.github.dsheirer.vector.calibrate.CalibrationType;
 import io.github.dsheirer.vector.calibrate.Implementation;
+import java.text.DecimalFormat;
+import java.util.Set;
+import java.util.TreeSet;
 import org.apache.commons.math3.util.FastMath;
 import org.jtransforms.fft.FloatFFT_1D;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.DecimalFormat;
-import java.util.Set;
-import java.util.TreeSet;
-
 /**
  * Utility methods for designing various types of filters.
  */
@@ -627,11 +626,13 @@ public class FilterFactory
      * @param samplesPerSymbol - number of samples per symbol
      * @param symbolCount - number of symbol intervals for the filter.  This directly impacts the filter size
      * @param alpha - roll-off factor.
+     * @param gain of the filter
      * @return - filter coefficients
      */
     public static float[] getRootRaisedCosine(double samplesPerSymbol, int symbolCount, float alpha)
     {
-        int taps = (int)(samplesPerSymbol * symbolCount);
+        samplesPerSymbol /= 2;
+        int taps = (int)Math.round(samplesPerSymbol * symbolCount);
 
         float scale = 0;
 
@@ -639,47 +640,47 @@ public class FilterFactory
 
         for(int x = 0; x < taps; x++)
         {
-            float index = (float)x - ((float)taps / 2.0f);
+            double index = x - (taps / 2.0f);
 
-            float x1 = (float)FastMath.PI * index / (float)samplesPerSymbol;
-            float x2 = 4.0f * alpha * index / (float)samplesPerSymbol;
-            float x3 = x2 * x2 - 1.0f;
+            double x1 = FastMath.PI * index / samplesPerSymbol;
+            double x2 = 4.0 * alpha * index / samplesPerSymbol;
+            double x3 = x2 * x2 - 1.0;
 
-            float numerator, denominator;
+            double numerator, denominator;
 
             if(FastMath.abs(x3) >= 0.000001)
             {
                 if(x != taps / 2)
                 {
-                    numerator = (float)FastMath.cos((1.0 + alpha) * x1) +
-                        (float)FastMath.sin((1.0f - alpha) * x1) / (4.0f * alpha * index / (float)samplesPerSymbol);
+                    numerator = FastMath.cos((1.0 + alpha) * x1) +
+                        FastMath.sin((1.0 - alpha) * x1) / (4.0 * alpha * index / samplesPerSymbol);
                 }
                 else
                 {
-                    numerator = (float)FastMath.cos((1.0f + alpha) * x1) + (1.0f - alpha) * (float)FastMath.PI / (4.0f * alpha);
+                    numerator = FastMath.cos((1.0 + alpha) * x1) + (1.0 - alpha) * FastMath.PI / (4.0 * alpha);
                 }
 
-                denominator = x3 * (float)FastMath.PI;
+                denominator = x3 * FastMath.PI;
             }
             else
             {
-                if(alpha == 1.0f)
+                if(alpha == 1.0)
                 {
                     coefficients[x] = -1.0f;
                     continue;
                 }
 
-                x3 = (1.0f - alpha) * x1;
-                x2 = (1.0f + alpha) * x1;
+                x3 = (1.0 - alpha) * x1;
+                x2 = (1.0 + alpha) * x1;
 
-                numerator = (float)(FastMath.sin(x2) * (1.0f + alpha) * FastMath.PI - FastMath.cos(x3) * ((1.0 - alpha) * FastMath.PI *
-                    (double)samplesPerSymbol) / (4.0 * alpha * index) + FastMath.sin(x3) * (double)samplesPerSymbol *
-                    (double)samplesPerSymbol / (4.0 * alpha * index * index));
+                numerator = (FastMath.sin(x2) * (1.0 + alpha) * FastMath.PI - FastMath.cos(x3) * ((1.0 - alpha) * FastMath.PI *
+                    samplesPerSymbol) / (4.0 * alpha * index) + FastMath.sin(x3) * samplesPerSymbol *
+                    samplesPerSymbol / (4.0 * alpha * index * index));
 
-                denominator = (float)(-32.0 * FastMath.PI * alpha * alpha * index / (double)samplesPerSymbol);
+                denominator = -32.0 * FastMath.PI * alpha * alpha * index / samplesPerSymbol;
             }
 
-            coefficients[x] = 4.0f * alpha * numerator / denominator;
+            coefficients[x] = (float)(4.0 * alpha * numerator / denominator);
 
             scale += coefficients[x];
         }
@@ -1210,13 +1211,20 @@ public class FilterFactory
     {
         DecimalFormat df = new DecimalFormat("0.000000");
 
-        int length = 15;
+        int length = 49;
 
-        float [] taps = FilterFactory.getHalfBand(length, WindowType.HAMMING);
-
-        for(int x = 0; x < length; x++)
+        try
         {
-            mLog.debug("Tap: " + x + " Value: " + df.format(taps[x]));
+            float [] taps = FilterFactory.getSinc(0.5, length, WindowType.NONE);
+
+            for(int x = 0; x < length; x++)
+            {
+                mLog.debug("Tap: " + x + " Value: " + df.format(taps[x]));
+            }
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
         }
 
         mLog.debug("Done!");

src/main/java/io/github/dsheirer/dsp/filter/channelizer/ComplexPolyphaseChannelizerM2.java

@@ -68,8 +68,8 @@ public class ComplexPolyphaseChannelizerM2 extends AbstractComplexPolyphaseChann
      */
     private static final int PROCESSED_CHANNEL_RESULTS_THRESHOLD = 1024;
 
-    //Sized to process 1/20th batch of 152 buffers a second,  at 40 times per second
-    private IFFTProcessorDispatcher mIFFTProcessorDispatcher = new IFFTProcessorDispatcher(152 / 20, 25);
+    //Sized to process 40 times per second
+    private IFFTProcessorDispatcher mIFFTProcessorDispatcher = new IFFTProcessorDispatcher(25);
     private FloatFFT_1D mFFT;
     private float[] mInlineSamples;
     private float[] mInlineFilter;
@@ -406,9 +406,9 @@ public class ComplexPolyphaseChannelizerM2 extends AbstractComplexPolyphaseChann
      */
     public class IFFTProcessorDispatcher extends Dispatcher<List<float[]>>
     {
-        public IFFTProcessorDispatcher(int batchSize, long interval)
+        public IFFTProcessorDispatcher(long interval)
         {
-            super("sdrtrunk polyphase ifft processor", batchSize, interval);
+            super("sdrtrunk polyphase ifft processor", interval);
 
             //We create a listener interface to receive the batched channel results arrays from the scheduled thread pool
             //dispatcher thread that is part of this continuous buffer processor.  We perform an IFFT on each

src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelManager.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
@@ -23,6 +23,7 @@ import io.github.dsheirer.buffer.INativeBufferProvider;
 import io.github.dsheirer.controller.channel.event.ChannelStopProcessingRequest;
 import io.github.dsheirer.dsp.filter.design.FilterDesignException;
 import io.github.dsheirer.eventbus.MyEventBus;
+import io.github.dsheirer.log.LoggingSuppressor;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
@@ -65,6 +66,7 @@ import org.slf4j.LoggerFactory;
 public class PolyphaseChannelManager implements ISourceEventProcessor
 {
     private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
+    private static final LoggingSuppressor LOGGING_SUPPRESSOR = new LoggingSuppressor(LoggerFactory.getLogger(PolyphaseChannelManager.class));
     private final static Logger mLog = LoggerFactory.getLogger(PolyphaseChannelManager.class);
     private static final double MINIMUM_CHANNEL_BANDWIDTH = 25000.0;
     private static final double CHANNEL_OVERSAMPLING = 2.0;
@@ -108,7 +110,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
         }
 
         mChannelCalculator = new ChannelCalculator(sampleRate, channelCount, frequency, CHANNEL_OVERSAMPLING);
-        mBufferDispatcher = new Dispatcher("sdrtrunk polyphase buffer processor", 50, 10);
+        mBufferDispatcher = new Dispatcher("sdrtrunk polyphase buffer processor", 10);
         mBufferDispatcher.setListener(mNativeBufferReceiver);
     }
 
@@ -145,6 +147,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
             sb.append(" REQUESTED CF: ").append(FREQUENCY_FORMAT.format(requestedCenterFrequency / 1E6d));
             sb.append(" MIXER:").append(FREQUENCY_FORMAT.format(appliedFrequencyOffset / 1E6d));
             sb.append(" | Polyphase Indices: ").append(indexes);
+            sb.append(" HASH:").append(Integer.toHexString(pcs.hashCode()).toUpperCase());
         }
 
         return sb.toString();
@@ -186,9 +189,10 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
      * Provides a Digital Drop Channel (DDC) for the specified tuner channel or returns null if the channel can't be
      * sourced due to the current center frequency and/or sample rate.
      * @param tunerChannel specifying center frequency and bandwidth.
+     * @param threadName for the channel's dispatcher
      * @return source or null.
      */
-    public TunerChannelSource getChannel(TunerChannel tunerChannel)
+    public TunerChannelSource getChannel(TunerChannel tunerChannel, String threadName)
     {
         PolyphaseChannelSource channelSource = null;
 
@@ -197,13 +201,14 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
             try
             {
                 channelSource = new PolyphaseChannelSource(tunerChannel, mChannelCalculator, mFilterManager,
-                        mChannelSourceEventListener);
+                        mChannelSourceEventListener, threadName);
 
                 mChannelSources.add(channelSource);
             }
             catch(IllegalArgumentException iae)
             {
-                mLog.debug("Couldn't design final output low pass filter for polyphase channel source");
+                LOGGING_SUPPRESSOR.error(iae.getMessage(), 3, "Couldn't allocate channel. " + iae.getMessage());
+                channelSource = null;
             }
         }
 
@@ -247,11 +252,16 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
         synchronized(mBufferDispatcher)
         {
             mChannelSources.remove(channelSource);
-            mPolyphaseChannelizer.removeChannel(channelSource);
+
+            if(mPolyphaseChannelizer != null)
+            {
+                mPolyphaseChannelizer.removeChannel(channelSource);
+            }
+
             mSourceEventBroadcaster.broadcast(SourceEvent.channelCountChange(getTunerChannelCount()));
 
             //If this is the last/only channel, deregister to stop the sample buffers
-            if(mPolyphaseChannelizer.getRegisteredChannelCount() == 0)
+            if(mPolyphaseChannelizer != null && mPolyphaseChannelizer.getRegisteredChannelCount() == 0)
             {
                 mNativeBufferProvider.removeBufferListener(mBufferDispatcher);
                 mBufferDispatcher.stop();
@@ -292,10 +302,17 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
                 break;
             case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED:
             case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED:
-            case NOTIFICATION_FREQUENCY_CORRECTION_CHANGE:
             case NOTIFICATION_RECORDING_FILE_LOADED:
                 //no-op
                 break;
+            case NOTIFICATION_FREQUENCY_CORRECTION_CHANGE:
+                //Re-broadcast this event to each channel so that the decoders can reset error tracking function(s).
+                List<TunerChannelSource> channels = new ArrayList<>(mChannelSources);
+                for(TunerChannelSource channel: channels)
+                {
+                    channel.broadcastConsumerSourceEvent(sourceEvent);
+                }
+                break;
             default:
                 mLog.info("Unrecognized source event: " + sourceEvent);
                 break;

src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -56,12 +56,14 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
      * @param channelCalculator for current channel center frequency and sample rate and index calculations
      * @param filterManager for access to new or cached synthesis filters
      * @param producerSourceEventListener to receive source event requests (e.g. start/stop sample stream)
+     * @param threadName for the channel's dispatcher
      * @throws IllegalArgumentException if a channel low pass filter can't be designed to the channel specification
      */
     public PolyphaseChannelSource(TunerChannel tunerChannel, ChannelCalculator channelCalculator, SynthesisFilterManager filterManager,
-                                  Listener<SourceEvent> producerSourceEventListener) throws IllegalArgumentException
+                                  Listener<SourceEvent> producerSourceEventListener, String threadName)
+            throws IllegalArgumentException
     {
-        super(producerSourceEventListener, tunerChannel);
+        super(producerSourceEventListener, tunerChannel, threadName);
         mChannelSampleRate = channelCalculator.getChannelSampleRate();
         doUpdateOutputProcessor(channelCalculator, filterManager);
     }
@@ -222,7 +224,7 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
             {
                 case 1:
                     mPolyphaseChannelOutputProcessor = new OneChannelOutputProcessor(channelCalculator.getChannelSampleRate(),
-                            indexes, channelCalculator.getChannelCount(), getHeartbeatManager());
+                            indexes, channelCalculator.getChannelCount(), getHeartbeatManager(), mThreadName);
                     mPolyphaseChannelOutputProcessor.setListener(this);
                     mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
                     mPolyphaseChannelOutputProcessor.start();
@@ -233,7 +235,7 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
                         float[] filter = filterManager.getFilter(channelCalculator.getChannelSampleRate(),
                                 channelCalculator.getChannelBandwidth(), 2);
                         mPolyphaseChannelOutputProcessor = new TwoChannelOutputProcessor(channelCalculator.getChannelSampleRate(),
-                                indexes, filter, channelCalculator.getChannelCount(), getHeartbeatManager());
+                                indexes, filter, channelCalculator.getChannelCount(), getHeartbeatManager(), mThreadName);
                         mPolyphaseChannelOutputProcessor.setListener(this);
                         mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
                         mPolyphaseChannelOutputProcessor.start();

src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/ChannelOutputProcessor.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -41,17 +41,15 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
      * oscillator support to apply frequency correction to the channel sample stream as requested by sample consumer.
      *
      * @param inputChannelCount is the number of input channels for this output processor
-     * @param sampleRate of the output channel.  This is used to match the oscillator's sample rate to the output
-     * channel sample rate for frequency translation/correction.
      * @param heartbeatManager to receive pings on the dispatcher thread
+     * @param threadName for the dispatcher
      */
-    public ChannelOutputProcessor(int inputChannelCount, double sampleRate, HeartbeatManager heartbeatManager)
+    public ChannelOutputProcessor(int inputChannelCount, HeartbeatManager heartbeatManager, String threadName)
     {
         mInputChannelCount = inputChannelCount;
         //Process 1/10th of the sample rate per second at a rate of 20 times a second (200% of anticipated rate)
         mHeartbeatManager = heartbeatManager;
-        mChannelResultsDispatcher = new Dispatcher("sdrtrunk polyphase channel", (int)(sampleRate / 10),
-                50, mHeartbeatManager);
+        mChannelResultsDispatcher = new Dispatcher(threadName,50, mHeartbeatManager);
         mChannelResultsDispatcher.setListener(floats -> {
             try
             {

src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/OneChannelOutputProcessor.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -38,11 +38,12 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
      * @param channelIndexes containing a single channel index.
      * @param gain value to apply.  This is typically the same as the channelizer's channel count.
      * @param heartbeatManager to receive heartbeats on the dispatch thread
+     * @param threadName to use for this processor
      */
     public OneChannelOutputProcessor(double sampleRate, List<Integer> channelIndexes, float gain,
-                                     HeartbeatManager heartbeatManager)
+                                     HeartbeatManager heartbeatManager, String threadName)
     {
-        super(1, sampleRate, heartbeatManager);
+        super(1, heartbeatManager, threadName);
         setPolyphaseChannelIndices(channelIndexes);
         mMixerAssembler = new OneChannelMixerAssembler(gain);
         mMixerAssembler.getMixer().setSampleRate(sampleRate);

src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/TwoChannelOutputProcessor.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2023 Dennis Sheirer
+ * 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
@@ -37,15 +37,17 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
      *
      * @param sampleRate of the output sample stream.
      * @param channelIndexes containing two channel indices.
+     * @param filter to use
      * @param gain to apply to output.  Typically this is equal to the channelizer's channel count.
      * @param heartbeatManager to be pinged on the dispatcher thread
+     * @param threadName for the dispatcher
      */
     public TwoChannelOutputProcessor(double sampleRate, List<Integer> channelIndexes, float[] filter, float gain,
-                                     HeartbeatManager heartbeatManager)
+                                     HeartbeatManager heartbeatManager, String threadName)
     {
         //Set the frequency correction oscillator to 2 x output sample rate since we'll be correcting the frequency
         //after synthesizing both input channels
-        super(2, sampleRate, heartbeatManager);
+        super(2, heartbeatManager, threadName);
         setPolyphaseChannelIndices(channelIndexes);
         mMixerAssembler = new TwoChannelMixerAssembler(gain);
         mMixerAssembler.getMixer().setSampleRate(sampleRate);

src/main/java/io/github/dsheirer/dsp/filter/decimate/DecimationFilterFactory.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
@@ -42,6 +42,7 @@ public class DecimationFilterFactory
         switch(decimationRate)
         {
             case 0:
+            case 1:
                 return new RealDecimateX0Filter();
             case 2:
                 return new RealDecimateX2Filter();

src/main/java/io/github/dsheirer/dsp/filter/design/FilterViewer.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
@@ -20,7 +20,7 @@
 package io.github.dsheirer.dsp.filter.design;
 
 import io.github.dsheirer.dsp.filter.FilterFactory;
-import io.github.dsheirer.dsp.filter.hilbert.HilbertTransform;
+import io.github.dsheirer.dsp.filter.fir.FIRFilterSpecification;
 import io.github.dsheirer.dsp.window.WindowType;
 import javafx.application.Application;
 import javafx.scene.Scene;
@@ -59,12 +59,32 @@ public class FilterViewer extends Application
      */
     private float[] getFilter()
     {
-        int filterLength = 47;
-        WindowType windowType = WindowType.HAMMING;
+        int filterLength = 31;
+        WindowType windowType = WindowType.BLACKMAN_HARRIS_7;
 
-        float[] taps = FilterFactory.getHalfBand(filterLength, windowType);
+        FIRFilterSpecification specification = FIRFilterSpecification
+                .lowPassBuilder()
+                .sampleRate(12500)
+                .passBandCutoff(5200)
+                .passBandAmplitude(1.0).passBandRipple(0.01) //.01
+                .stopBandAmplitude(0.0).stopBandStart(6500) //6500
+                .stopBandRipple(0.01).build();
 
-        taps = HilbertTransform.HALF_BAND_FILTER_47_TAP;
+        float[] taps = null;
+
+        try
+        {
+            taps = FilterFactory.getTaps(specification);
+        }
+        catch(Exception fde) //FilterDesignException
+        {
+            System.out.println("Error");
+        }
+
+        //        float[] taps = FilterFactory.getHighPass(8000, 3000, filterLength, windowType);
+//        float[] taps = FilterFactory.getRootRaisedCosine(50000.0 / 4800.0, 20, 0.2f);
+
+//        taps = HilbertTransform.HALF_BAND_FILTER_47_TAP;
 
         if(taps == null)
         {