1723 Adds database folder as a user directory preference.

1723 Adds call event management and deletion by age or directory size, both options in the user preferences dialog.
#1723 Initial commit - audio call management feature.
2026-11-13 00:57:31 -05:00 · 2024-01-27 08:32:30 -05:00 · 2024-01-27 08:08:10 -05:00 · 2024-01-23 17:21:56 -05:00
1939 changed files with 55738 additions and 160529 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +0,0 @@
-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!!
--- a/.github/ISSUE_TEMPLATE/how-to-question-or-does-the-software-support-xxx.md
+++ b/.github/ISSUE_TEMPLATE/how-to-question-or-does-the-software-support-xxx.md
@@ -0,0 +1,16 @@
+---
+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
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -22,10 +22,10 @@ jobs:

    steps:
      - uses: actions/checkout@v4
-      - name: Set up JDK 27
+      - name: Set up JDK 20
        uses: actions/setup-java@v3
        with:
-          java-version: '27'
+          java-version: '20'
          distribution: 'liberica'
          java-package: 'jdk+fx'
      - name: Build with Gradle
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -15,11 +15,10 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: Set up JDK 27
+      - name: Set up JDK 20
        uses: actions/setup-java@v3
        with:
-          # Must match the JDK version downloaded in build.gradle (jdk_download_base) - jlink requires an exact version match
-          java-version: '27.0.0'
+          java-version: '20'
          distribution: 'liberica'
          java-package: 'jdk+fx'

@@ -38,12 +37,11 @@ jobs:
          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: softprops/action-gh-release@v2
+        uses: pyTooling/Actions/releaser@main
        with:
-          tag_name: nightly
-          prerelease: true
+          tag: nightly
+          rm: false
+          token: ${{ secrets.GITHUB_TOKEN }}
          files: |
            build/image/*.zip
            build/image/build_info.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.idea/dictionaries/denny.xml
+++ b/.idea/dictionaries/denny.xml
@@ -2,24 +2,18 @@
  <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>
@@ -35,7 +29,6 @@
      <w>talkgroups</w>
      <w>tgid</w>
      <w>ultravox</w>
-      <w>unsynchronized</w>
      <w>wacn</w>
      <w>xtea</w>
    </words>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,50 +4,7 @@
  <component name="FrameworkDetectionExcludesConfiguration">
    <file type="web" url="file://$PROJECT_DIR$" />
  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
-    <option name="myOrdered" value="true" />
-    <option name="myNullables">
-      <value>
-        <list size="13">
-          <item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-          <item index="5" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="7" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="9" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
-          <item index="10" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
-          <item index="11" class="java.lang.String" itemvalue="org.springframework.lang.Nullable" />
-          <item index="12" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="13">
-          <item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
-          <item index="1" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="2" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-          <item index="5" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
-          <item index="6" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="8" class="java.lang.String" itemvalue="lombok.NonNull" />
-          <item index="9" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
-          <item index="10" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
-          <item index="11" class="java.lang.String" itemvalue="org.springframework.lang.NonNull" />
-          <item index="12" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_27_PREVIEW" project-jdk-name="liberica-27" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20_PREVIEW" project-jdk-name="liberica-20" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/README.md
+++ b/README.md
@@ -1,24 +1,6 @@
 ![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).

@@ -46,6 +28,6 @@ playlist(s) before you use the nightly builds.**  Note: the nightly release is u
 committed to the code base, so it's not really 'nightly' as much as it is 'current'.

 ## Minimum System Requirements
-* **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac (64-bit, 12.x or higher)
+* **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac/Linux (64-bit, 10.14 or higher)
 * **CPU:** 4-core
 * **RAM:** 8GB or more (preferred).  Depending on usage, 4GB may be sufficient.
--- a/artifacts/sdrplay-api-headers/README.txt
+++ b/artifacts/sdrplay-api-headers/README.txt
@@ -0,0 +1,36 @@
+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.
+
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api.h
+++ b/artifacts/sdrplay-api-headers/v3_11/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.15)
+#define SDRPLAY_API_VERSION                   (float)(3.11)

 // API Constants
 #define SDRPLAY_MAX_DEVICES                   (16)
@@ -35,8 +35,6 @@ 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
@@ -127,7 +125,6 @@ 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;
@@ -181,7 +178,6 @@ 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
@@ -203,28 +199,27 @@ extern "C"
 #endif

    // Comman API function definitions
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Open(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_Close(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ApiVersion(float *apiVer);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_LockDeviceApi(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_UnlockDeviceApi(void);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);    
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);   
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);   
-    _SDRPLAY_DLL_QUALIFIER const char*             sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastErrorByType(sdrplay_api_DeviceT *device, int type, unsigned long long *time);
-    _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT        sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
+     sdrplay_api_ErrT        sdrplay_api_Open(void);
+     sdrplay_api_ErrT        sdrplay_api_Close(void);
+     sdrplay_api_ErrT        sdrplay_api_ApiVersion(float *apiVer);
+     sdrplay_api_ErrT        sdrplay_api_LockDeviceApi(void);
+     sdrplay_api_ErrT        sdrplay_api_UnlockDeviceApi(void);
+     sdrplay_api_ErrT        sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
+     sdrplay_api_ErrT        sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);
+     sdrplay_api_ErrT        sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);
+     const char*             sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
+     sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
+     sdrplay_api_ErrT        sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()

    // Device API function definitions
-    _SDRPLAY_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_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_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
                                                                              sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);

--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_callback.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_callback.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_control.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_control.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_dev.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_dev.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rsp1a.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rsp1a.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rsp2.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rsp2.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rspDuo.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rspDuo.h
@@ -29,19 +29,12 @@ 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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rspDx.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rspDx.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rx_channel.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rx_channel.h
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_tuner.h
+++ b/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_tuner.h
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,8 @@
+import java.text.SimpleDateFormat
+
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * 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
@@ -17,18 +19,12 @@
 * ****************************************************************************
 */

-import org.beryx.runtime.RuntimeZipTask
-import org.gradle.internal.jvm.Jvm
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
-
-import java.text.SimpleDateFormat
-
 /**
 * Instructions for building/compiling the sdrtrunk application.
 *
 * Prerequisites:
- * Install and configure an OpenJDK version 27+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
- * - Optional: install and configure Gradle 9.8+
+ * Install and configure an OpenJDK version 20 that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
+ * - Optional: install and configure Gradle 8.2+
 *
 * Scenario 1: run the application via gradle command line from the source code root directory:
 * command: ./gradlew run
@@ -49,43 +45,29 @@ plugins {
    id 'application'
    id 'java'
    id 'idea'
-    id 'org.beryx.runtime' version '2.0.1'
+    id 'org.beryx.runtime' version '1.12.7'
+    id 'org.springframework.boot' version '3.1.5'
+    id 'io.spring.dependency-management' version '1.1.3'
+}
+
+repositories {
+    mavenCentral()
+    maven { url "https://jitpack.io" }
 }

 //Version is defined in gradle.properties so that we can CLI override it for nightly builds.
 version = project.findProperty('projectVersion')

-//Java 27 is required for this version of the Project Panama preview/incubator feature
+//Java 20 is required for this version of the Project Panama preview/incubator feature
 java {
    toolchain {
-        languageVersion = JavaLanguageVersion.of(27)
-        vendor = JvmVendorSpec.BELLSOFT
+        languageVersion = JavaLanguageVersion.of(20)
    }
 }

-/**
- * Verifies that the selected toolchain JDK includes the JavaFX modules (e.g. Bellsoft Liberica 'Full JDK').
- *
- * Gradle's toolchain spec can only select by language version, vendor and implementation, so it can't distinguish
- * between the Liberica JDK packages that do and don't bundle JavaFX. This task fails the build with a clear message
- * instead of allowing compilation to fail with missing javafx packages.
- */
-tasks.register('verifyToolchainJavaFx') {
-    def jdkHome = javaToolchains.launcherFor(java.toolchain).map { it.metadata.installationPath.asFile }
-
-    doLast {
-        def release = new File(jdkHome.get(), 'release')
-
-        if(!release.exists() || !release.text.contains('javafx.base')) {
-            throw new GradleException("The JDK at [${jdkHome.get()}] does not include the JavaFX modules. Install " +
-                    "the Bellsoft Liberica JDK 27 'Full' package (includes LibericaFX), or use " +
-                    "-Porg.gradle.java.installations.paths=<jdk path> to specify the JDK that Gradle should use.")
-        }
-    }
-}
-
-tasks.named('compileJava') {
-    dependsOn 'verifyToolchainJavaFx'
+sourceSets {
+    main.java.srcDirs 'src/main'
+    test.java.srcDirs 'src/test'
 }

 test {
@@ -95,64 +77,66 @@ test {
 dependencies {

    // JUnit Tests
-    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")
+    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'

    //Jitpack imports
    implementation 'com.github.dnault:libresample4j:master'
-    implementation 'com.github.DSheirer.jmbe:api:v2.1.0'
+    implementation 'com.github.DSheirer.jmbe:jmbe-api:1.0.0'
    implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'

    //mavenCentral/jcenter imports
-    implementation 'ch.qos.logback:logback-classic:1.6.3'
-    implementation 'ch.qos.logback:logback-core:1.5.38'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.22.4'
-    implementation 'com.fazecast:jSerialComm:2.11.4'
-    implementation 'com.formdev:flatlaf:3.7.2'
-    implementation 'com.formdev:flatlaf-intellij-themes:3.7.2'
+    implementation '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 'com.github.jiconfont:jiconfont-elusive:2.0.3'
    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.2'
-    implementation 'com.google.code.gson:gson:2.14.0'
-    implementation 'com.google.guava:guava:33.6.0-jre'
+    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.jidesoft:jide-oss:3.6.18'
-    implementation 'com.miglayout:miglayout-swing:11.4.3'
+    implementation 'com.miglayout:miglayout-swing:11.0'
    implementation 'com.mpatric:mp3agic:0.9.1'
-    implementation 'commons-io:commons-io:2.22.0'
+    implementation 'commons-io:commons-io:2.11.0'
    implementation 'eu.hansolo:charts:1.0.5'
-    implementation 'io.github.dsheirer:jbladerf:2.6.0' //bladeRF tuners - GitHub release, see settings.gradle
-    implementation 'io.github.dsheirer:jhydrasdr:1.1.3' //HydraSDR tuners - GitHub release, see settings.gradle
-    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 'io.github.dsheirer:libusb4java-darwin-aarch64:1.3.1' //usb4java native lib for OSX M1 cpu
+    implementation 'io.github.dsheirer:radio-reference-api:15.1.9'
    implementation 'javax.usb:usb-api:1.0.2'
    implementation 'net.coderazzi:tablefilter-swing:5.5.4'
-    implementation 'org.apache.commons:commons-compress:1.28.0'
-    implementation 'org.apache.commons:commons-lang3:3.20.0'
+    implementation 'org.apache.commons:commons-compress:1.21'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
    implementation 'org.apache.commons:commons-math3:3.6.1'
-    implementation 'org.apache.commons:commons-csv:1.14.1'
-    implementation 'org.apache.mina:mina-core:2.2.9'
-    implementation 'org.apache.mina:mina-http:2.2.9'
-    implementation 'org.controlsfx:controlsfx:11.2.3'
+    implementation 'org.apache.commons:commons-csv:1.9.0'
+    implementation 'org.apache.derby:derby'
+    implementation 'org.apache.derby:derbytools'
+    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.rauschig:jarchivelib:1.2.0'
-    implementation 'org.slf4j:slf4j-api:2.0.17'
+    implementation 'org.slf4j:slf4j-api:2.0.5'
+    implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
    implementation 'org.usb4java:libusb4java:1.3.0'
+    implementation 'org.usb4java:usb4java:1.3.0'
    implementation 'org.usb4java:usb4java-javax:1.3.0'
    implementation 'pl.edu.icm:JLargeArrays:1.6'
 }

-def os = DefaultNativePlatform.currentOperatingSystem
+def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem

 /**
- * This is needed for the JDK23+ vector API ... until it moves out of incubation or preview
+ * This is needed for the JDK19 panama and vector API ... until it moves out of incubation or preview
 */
-tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator
-    options.compilerArgs.add("--add-modules=jdk.incubator.vector") //Project Panama Vector API is still in incubator
+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
 }

 /**
@@ -161,26 +145,23 @@ tasks.withType(JavaCompile).configureEach {
 def jvmArgsWindows =
        ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
         '--add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED', //windows users for JIDE
-         '--add-modules=jdk.incubator.vector',   //Project Panama vector API is still in incubator
-         '--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
-         '-Djava.library.path=c:\\Program Files\\SDRplay\\API\\x64'] //SDRPlay API library path
+         '--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

 /**
 * JVM Arguments for running the application on Linux.
 */
 def jvmArgsLinux =
        ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
-         '--add-modules=jdk.incubator.vector',   //Project Panama vector API is still in incubator
+         '--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
-         '--sun-misc-unsafe-memory-access=allow', //JDK24 - suppress sun.misc.Unsafe::allocateMemory warning
-         '--enable-native-access=javafx.graphics', //JDK24 - suppress restricted java.lang.System calls
-         '--enable-native-access=ALL-UNNAMED'] //SDRPlay API library path
+         '--enable-native-access=ALL-UNNAMED',
+         '-Djava.library.path=/usr/local/lib'] //Allows Project Panama Foreign Function access to system library

 application {
-    mainClass = "io.github.dsheirer.gui.SDRTrunk"
+    mainClassName = "io.github.dsheirer.gui.SDRTrunk"

    if(os.isWindows()) {
        applicationDefaultJvmArgs = jvmArgsWindows
@@ -190,15 +171,6 @@ application {
    }
 }

-test {
-    if(os.isWindows()) {
-        jvmArgs = jvmArgsWindows
-    }
-    else {
-        jvmArgs = jvmArgsLinux
-    }
-}
-
 jar {
    manifest {
        attributes (
@@ -219,11 +191,6 @@ 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.
 */
@@ -232,31 +199,28 @@ 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-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'
+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'

 /**
 * Download URLs to download the JDK as part of the gradle build packaging process
 */
-def jdk_download_base = "https://download.bell-sw.com/java/27+36/bellsoft-jdk27+36-"
+def jdk_download_base = "https://download.bell-sw.com/java/20.0.1+10/bellsoft-jdk20.0.1+10-"
 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-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.
@@ -264,17 +228,16 @@ def jdk_download_windows_aarch64 = jdk_download_base + "windows-aarch64-full.zip
 * @param jvmArgs to use (windows or linux)
 * @return configured task.
 */
-def configure(RuntimeZipTask rt, List<String> jvmArgs) {
+def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
    //Use the correct set of JVM arguments
    rt.extension.launcherData.get().jvmArgs = jvmArgs

    //Additional modules to include with auto-detected modules.
-    //jdk.charsets - NXDN BIG5 encoding support
    //jdk.crypto.ec - needed for HTTPS connections (broadcastify calls & map tile server)
    //jdk.incubator.vector - needed for Project Panama foreign function and vector apis
    //jdk.accessibility is used with assistive technologies like screen readers
    //java.management for JVM resource monitoring
-    rt.extension.addModules('jdk.charsets', 'jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management')
+    rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management', 'java.instrument')

    //Use auto-detected modules and 'add' any specified modules.
    rt.extension.additive.set(true)
@@ -283,8 +246,7 @@ def configure(RuntimeZipTask rt, List<String> jvmArgs) {
    rt.extension.addOptions('--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages')

    //Runtime images have auto appended version in image zip name.  Override to include version in single target image.
-//    rt.extension.imageDir=layout.buildDirectory.dir('image')
-    rt.extension.imageZip.set(file(layout.buildDirectory.dir('image').get().file('sdr-trunk.zip')))
+    rt.extension.imageZip.set(file("$buildDir/image/sdr-trunk.zip"))
 }

 /**
@@ -296,35 +258,30 @@ def configure(RuntimeZipTask rt, List<String> jvmArgs) {
 * Usage: gradlew runtimeZipCurrent   (windows - using gradlew)
 * Usage: ./gradlew runtimeZipCurrent   (linux - using gradlew)
 */
-tasks.register('runtimeZipCurrent', RuntimeZipTask) {rt ->
+tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
    def arch = System.properties.getProperty("os.arch")
-    def javaHome = Jvm.current().getJavaHome().toString()
+    def javaHome = org.gradle.internal.jvm.Jvm.current().getJavaHome().toString()

    if(os.isWindows()) {
-        if(arch == "amd64") {
-            rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
-        }
-        else if(arch == "aarch64") {
-            rt.extension.targetPlatform(targetWindowsAarch64, javaHome)
-        }
+        rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
        configure(rt, jvmArgsWindows)
    }
    else if(os.isLinux())
    {
-        if(arch == "amd64") {
+        if(arch.equals("amd64")) {
            rt.extension.targetPlatform(targetLinuxX86_64, javaHome)
        }
-        else if(arch == "aarch64") {
+        else if(arch.equals("aarch64")) {
            rt.extension.targetPlatform(targetLinuxAarch64, javaHome)
        }
        configure(rt, jvmArgsLinux)
    }
    else if(os.isMacOsX())
    {
-        if(arch == "amd64") {
+        if(arch.equals("amd64")) {
            rt.extension.targetPlatform(targetOsxX86_64, javaHome)
        }
-        else if(arch == "aarch64") {
+        else if(arch.equals("aarch64")) {
            rt.extension.targetPlatform(targetOsxAarch64, javaHome)
        }
        configure(rt, jvmArgsLinux)
@@ -341,17 +298,7 @@ tasks.register('runtimeZipCurrent', RuntimeZipTask) {rt ->
 * Usage: gradlew runtimeZipWindows   (windows - using gradlew)
 * Usage: ./gradlew runtimeZipWindows   (linux - using gradlew)
 */
-tasks.register('runtimeZipWindows', 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
+tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
    if(file(jdk_windows_x86_64).exists()) {
        rt.extension.targetPlatform(targetWindowsX86_64, jdk_windows_x86_64, [])
    }
@@ -373,7 +320,7 @@ tasks.register('runtimeZipWindows', RuntimeZipTask) {rt ->
 * Usage: gradlew runtimeZipOthers   (windows - using gradlew)
 * Usage: ./gradlew runtimeZipOthers   (linux - using gradlew)
 */
-tasks.register('runtimeZipOthers', RuntimeZipTask) {rt ->
+tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
    //Linux aarch64
    if(file(jdk_linux_aarch64).exists()) {
        rt.extension.targetPlatform(targetLinuxAarch64, jdk_linux_aarch64, [])
@@ -411,5 +358,5 @@ tasks.register('runtimeZipOthers', RuntimeZipTask) {rt ->
        }
    }

-    configure(rt, jvmArgsLinux)
+    configure(rt, jvmArgsLinux);
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 #
 # ******************************************************************************
-# Copyright (C) 2014-2026 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,4 +28,4 @@
 # tag name, specifically the dashes inserted before and after the alpha/beta labels.
 # See: https://github.com/DSheirer/sdrtrunk/issues/1651

-projectVersion=0.6.2-beta-1
+projectVersion=0.7.0-alpha-1
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,9 +1,25 @@
+#
+# ******************************************************************************
+# 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/>
+# *****************************************************************************
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/65
+++ b/65
@@ -1,26 +1,27 @@
 #!/bin/sh

 #
-# Copyright © 2015 the original authors.
+# ******************************************************************************
+# Copyright (C) 2014-2022 Dennis Sheirer
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This program is 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.
 #
-#      https://www.apache.org/licenses/LICENSE-2.0
+# 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.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>
+# *****************************************************************************
 #

 ##############################################################################
 #
-#   gradlew start up script for POSIX generated by Gradle.
+#   Gradle start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +30,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh gradlew
+#           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +58,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,8 +86,10 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# 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
+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"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +117,7 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@@ -132,13 +136,10 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    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.
+    which java >/dev/null 2>&1 || 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.
@@ -146,7 +147,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=SC2039,SC3045
+        # shellcheck disable=SC3045 
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -154,7 +155,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=SC2039,SC3045
+        # shellcheck disable=SC3045 
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -171,6 +172,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -198,19 +200,16 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and 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.
+# 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.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
        "$@"

 # Stop when "xargs" is not available.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,18 +13,16 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
-@rem  gradlew startup script for Windows
+@rem  Gradle startup script for Windows
@rem
@rem ##########################################################################

-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -45,13 +43,13 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-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
+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.

-"%COMSPEC%" /c exit 1
+goto fail

 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,24 +57,36 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-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
+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.

-"%COMSPEC%" /c exit 1
+goto fail

 :execute
@rem Setup the command line

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


-@rem Execute gradlew
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,28 +1 @@
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
-}
-rootProject.name = 'sdr-trunk'
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        mavenCentral()
-        maven { url 'https://jitpack.io' }
-
-        //jHydraSDR is published as a GitHub release, with the native libraries for all platforms in the jar
-        ivy {
-            url = 'https://github.com/DSheirer/jHydraSDR/releases/download'
-            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
-            metadataSources { artifact() }
-            content { includeModule 'io.github.dsheirer', 'jhydrasdr' }
-        }
-
-        //jBladeRF is published as a GitHub release, with the native libraries for all platforms in the jar
-        ivy {
-            url = 'https://github.com/DSheirer/jBladeRF/releases/download'
-            patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
-            metadataSources { artifact() }
-            content { includeModule 'io.github.dsheirer', 'jbladerf' }
-        }
-    }
-}
+rootProject.name = 'sdr-trunk'
--- a/src/main/java/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/main/java/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -1,81 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package com.sun.java.swing.plaf.windows;
-
-import javax.swing.LookAndFeel;
-import javax.swing.UIDefaults;
-
-/**
- * No-op stub for the JDK's Windows look-and-feel.
- *
- * <p>JIDE 3.6.18's {@code LookAndFeelFactory} contains compile-time
- * {@code instanceof com.sun.java.swing.plaf.windows.WindowsLookAndFeel} checks throughout its
- * dispatch logic.  On Linux and macOS JDK builds that class is genuinely absent from
- * {@code java.desktop}, so the JVM throws {@link NoClassDefFoundError} the first time JIDE's
- * dispatch code executes the {@code instanceof} bytecode.  That happens during
- * {@link com.jidesoft.swing.JideSplitPane#updateUI()} on every LAF change.
- *
- * <p>This stub lives in the classpath so the class reference resolves on non-Windows JDKs.
- * On Windows JDK builds the real {@code WindowsLookAndFeel} is loaded from the
- * {@code java.desktop} module via the boot class loader and shadows this class.
- *
- * <p>The stub reports itself as not native and not supported - JIDE never instantiates this
- * class, it only uses it for {@code instanceof} comparisons against the active LAF.  Since
- * sdrtrunk never installs this LAF, the {@code instanceof} check always returns false and
- * JIDE proceeds to its next branch.
- */
-public class WindowsLookAndFeel extends LookAndFeel
-{
-    @Override
-    public String getName()
-    {
-        return "Windows (stub)";
-    }
-
-    @Override
-    public String getID()
-    {
-        return "WindowsStub";
-    }
-
-    @Override
-    public String getDescription()
-    {
-        return "Compatibility stub for JIDE's instanceof checks on non-Windows JDKs.";
-    }
-
-    @Override
-    public boolean isNativeLookAndFeel()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean isSupportedLookAndFeel()
-    {
-        return false;
-    }
-
-    @Override
-    public UIDefaults getDefaults()
-    {
-        return new UIDefaults();
-    }
-}
--- a/src/main/java/io/github/dsheirer/alias/Alias.java
+++ b/src/main/java/io/github/dsheirer/alias/Alias.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * 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.
+ *  * ******************************************************************************
+ *  * 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 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;

@@ -27,22 +30,13 @@ 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;
@@ -52,6 +46,13 @@ 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.
@@ -73,7 +74,6 @@ 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,12 +180,6 @@ public class Alias
        return mColor;
    }

-    @JsonIgnore
-    public ObjectProperty streamTalkgroupAliasProperty()
-    {
-        return mStreamTalkgroupAlias;
-    }
-
    /**
     * Icon name property
     */
@@ -235,24 +229,6 @@ 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
     */
@@ -734,7 +710,6 @@ 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.priorityProperty(),
-                a.streamTalkgroupAliasProperty()};
+            a.aliasActions(), a.nonAudioIdentifierCountProperty(), a.overlapProperty()};
    }
 }
--- a/src/main/java/io/github/dsheirer/alias/AliasFactory.java
+++ b/src/main/java/io/github/dsheirer/alias/AliasFactory.java
@@ -30,16 +30,12 @@ import io.github.dsheirer.alias.id.legacy.mobileID.Min;
 import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
 import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
 import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
-import io.github.dsheirer.alias.id.radio.NXDNTypeDRadioRange;
 import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
 import io.github.dsheirer.alias.id.radio.Radio;
 import io.github.dsheirer.alias.id.radio.RadioRange;
 import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.status.UnitStatusID;
 import io.github.dsheirer.alias.id.status.UserStatusID;
-import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroup;
-import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroupRange;
 import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
@@ -83,31 +79,6 @@ public class AliasFactory
                Min copyMin = new Min();
                copyMin.setMin(originalMin.getMin());
                return copyMin;
-            case NXDN_TYPE_D_RADIO_ID:
-                NXDNTypeDRadio originalTypeDRadio = (NXDNTypeDRadio)id;
-                NXDNTypeDRadio copyTypeDRadio = new NXDNTypeDRadio(originalTypeDRadio.getHomeRepeater(),
-                        originalTypeDRadio.getIdentifier());
-                copyTypeDRadio.setOverlap(originalTypeDRadio.overlapProperty().get());
-                return copyTypeDRadio;
-            case NXDN_TYPE_D_RADIO_ID_RANGE:
-                NXDNTypeDRadioRange originalTypeDRadioRange = (NXDNTypeDRadioRange)id;
-                NXDNTypeDRadioRange copyTypeDRadioRange = new NXDNTypeDRadioRange(originalTypeDRadioRange.getHomeRepeater(),
-                        originalTypeDRadioRange.getMinIdentifier(), originalTypeDRadioRange.getMaxIdentifier());
-                copyTypeDRadioRange.setOverlap(originalTypeDRadioRange.overlapProperty().get());
-                return copyTypeDRadioRange;
-            case NXDN_TYPE_D_TALKGROUP:
-                NXDNTypeDTalkgroup originalTypeDTalkgroup = (NXDNTypeDTalkgroup)id;
-                NXDNTypeDTalkgroup copyTypeDTalkgroup = new NXDNTypeDTalkgroup(originalTypeDTalkgroup.getHomeRepeater(),
-                        originalTypeDTalkgroup.getIdentifier());
-                copyTypeDTalkgroup.setOverlap(originalTypeDTalkgroup.overlapProperty().get());
-                return copyTypeDTalkgroup;
-            case NXDN_TYPE_D_TALKGROUP_RANGE:
-                NXDNTypeDTalkgroupRange originalTypeDTalkgroupRange = (NXDNTypeDTalkgroupRange)id;
-                NXDNTypeDTalkgroupRange copyTypeDTalkgroupRange = new NXDNTypeDTalkgroupRange(
-                        originalTypeDTalkgroupRange.getHomeRepeater(), originalTypeDTalkgroupRange.getMinIdentifier(),
-                        originalTypeDTalkgroupRange.getMaxIdentifier());
-                copyTypeDTalkgroupRange.setOverlap(originalTypeDTalkgroupRange.overlapProperty().get());
-                return copyTypeDTalkgroupRange;
            case P25_FULLY_QUALIFIED_RADIO_ID:
                P25FullyQualifiedRadio originalP25 = (P25FullyQualifiedRadio) id;
                P25FullyQualifiedRadio copyP25 = new P25FullyQualifiedRadio(originalP25.getWacn(),
--- a/src/main/java/io/github/dsheirer/alias/AliasList.java
+++ b/src/main/java/io/github/dsheirer/alias/AliasList.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -47,7 +47,7 @@ import io.github.dsheirer.identifier.talkgroup.FullyQualifiedTalkgroupIdentifier
 import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
 import io.github.dsheirer.identifier.tone.ToneIdentifier;
 import io.github.dsheirer.identifier.tone.ToneSequence;
-import io.github.dsheirer.module.decode.squelch.dcs.DCSCode;
+import io.github.dsheirer.module.decode.dcs.DCSCode;
 import io.github.dsheirer.protocol.Protocol;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -134,7 +134,6 @@ public class AliasList
                switch(id.getType())
                {
                    case TALKGROUP:
-                    case NXDN_TYPE_D_TALKGROUP:
                        Talkgroup talkgroup = (Talkgroup)id;

                        TalkgroupAliasList talkgroupAliasList = mTalkgroupProtocolMap.get(talkgroup.getProtocol());
@@ -148,7 +147,6 @@ public class AliasList
                        talkgroupAliasList.add(talkgroup, alias);
                        break;
                    case TALKGROUP_RANGE:
-                    case NXDN_TYPE_D_TALKGROUP_RANGE:
                        TalkgroupRange talkgroupRange = (TalkgroupRange)id;

                        TalkgroupAliasList talkgroupRangeAliasList = mTalkgroupProtocolMap.get(talkgroupRange.getProtocol());
@@ -188,7 +186,6 @@ public class AliasList
                        p25TalkgroupAliasList.add(qualifiedTalkgroup, alias);
                        break;
                    case RADIO_ID:
-                    case NXDN_TYPE_D_RADIO_ID:
                        Radio radio = (Radio)id;

                        RadioAliasList radioAliasList = mRadioProtocolMap.get(radio.getProtocol());
@@ -202,7 +199,6 @@ public class AliasList
                        radioAliasList.add(radio, alias);
                        break;
                    case RADIO_ID_RANGE:
-                    case NXDN_TYPE_D_RADIO_ID_RANGE:
                        RadioRange radioRange = (RadioRange)id;

                        RadioAliasList radioRangeAliasList = mRadioProtocolMap.get(radioRange.getProtocol());
@@ -667,13 +663,11 @@ 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());
+                return mFullyQualifiedTalkgroupAliasMap.get(fqti.toString());
            }

-            //Attempt to match the talkgroup value
            int value = identifier.getValue();

            Alias mapValue = mTalkgroupAliasMap.get(value);
@@ -682,7 +676,6 @@ 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))
@@ -787,13 +780,11 @@ public class AliasList

        public Alias getAlias(RadioIdentifier identifier)
        {
-            //Match fully qualified identifier only.
            if(identifier instanceof FullyQualifiedRadioIdentifier fqri)
            {
-                return mFullyQualifiedRadioAliasMap.get(fqri.getFullyQualifiedRadioAddress());
+                return mFullyQualifiedRadioAliasMap.get(fqri.toString());
            }

-            //Attempt to match against the radio identifier
            int value = identifier.getValue();

            Alias mapValue = mRadioAliasMap.get(value);
@@ -802,7 +793,6 @@ 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))
--- a/src/main/java/io/github/dsheirer/alias/AliasModel.java
+++ b/src/main/java/io/github/dsheirer/alias/AliasModel.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -33,12 +33,14 @@ import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;

 /**
 * Alias Model contains all aliases and is responsible for creation and management of alias lists.  Alias lists are a
 * set of aliases that all share a common alias list name and can be attached to a decoding channel for aliasing
 * identifiers produced by channel decoder(s).
 */
+@Component("aliasModel")
 public class AliasModel
 {
    private final static Logger mLog = LoggerFactory.getLogger(AliasModel.class);
@@ -63,69 +65,6 @@ 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
     */
--- a/src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java
+++ b/src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.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
@@ -24,19 +24,19 @@ import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
 import io.github.dsheirer.audio.AudioFormats;
-import io.github.dsheirer.gui.preference.playback.ToneFrequency;
-import io.github.dsheirer.gui.preference.playback.ToneUtil;
-import io.github.dsheirer.gui.preference.playback.ToneVolume;
+import io.github.dsheirer.gui.preference.audio.playback.ToneFrequency;
+import io.github.dsheirer.gui.preference.audio.playback.ToneUtil;
+import io.github.dsheirer.gui.preference.audio.playback.ToneVolume;
 import io.github.dsheirer.message.IMessage;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.ShortBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
 import javax.sound.sampled.DataLine;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;

 public class BeepAction extends RecurringAction
 {
--- a/src/main/java/io/github/dsheirer/alias/id/AliasID.java
+++ b/src/main/java/io/github/dsheirer/alias/id/AliasID.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -35,18 +35,13 @@ import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
 import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
 import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
 import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
-import io.github.dsheirer.alias.id.radio.NXDNTypeDRadioRange;
 import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
 import io.github.dsheirer.alias.id.radio.Radio;
 import io.github.dsheirer.alias.id.radio.RadioRange;
 import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.status.UnitStatusID;
 import io.github.dsheirer.alias.id.status.UserStatusID;
-import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroup;
-import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroupRange;
 import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
-import io.github.dsheirer.alias.id.talkgroup.StreamAsTalkgroup;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
 import io.github.dsheirer.alias.id.tone.TonesID;
@@ -68,10 +63,6 @@ import javafx.util.Callback;
    @JsonSubTypes.Type(value = Min.class, name = "min"),
    @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
    @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
-    @JsonSubTypes.Type(value = NXDNTypeDRadio.class, name = "nxdnTypeDRadio"),
-    @JsonSubTypes.Type(value = NXDNTypeDRadioRange.class, name = "nxdnTypeDRadioRange"),
-    @JsonSubTypes.Type(value = NXDNTypeDTalkgroup.class, name = "nxdnTypeDTalkgroup"),
-    @JsonSubTypes.Type(value = NXDNTypeDTalkgroupRange.class, name = "nxdnTypeDTalkgroupRange"),
    @JsonSubTypes.Type(value = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
    @JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
    @JsonSubTypes.Type(value = Priority.class, name = "priority"),
@@ -79,7 +70,6 @@ import javafx.util.Callback;
    @JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),
    @JsonSubTypes.Type(value = Record.class, name = "record"),
    @JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
-    @JsonSubTypes.Type(value = StreamAsTalkgroup.class, name = "streamAsTalkgroup"),
    @JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
    @JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
    @JsonSubTypes.Type(value = TonesID.class, name = "tones"),
--- a/src/main/java/io/github/dsheirer/alias/id/AliasIDType.java
+++ b/src/main/java/io/github/dsheirer/alias/id/AliasIDType.java
@@ -29,10 +29,6 @@ public enum AliasIDType
    LOJACK("LoJack"),
    LTR_NET_UID("LTR-Net UID"),
    MIN("Passport MIN"),
-    NXDN_TYPE_D_RADIO_ID("NXDN Type-D Radio ID"),
-    NXDN_TYPE_D_RADIO_ID_RANGE("NXDN Type-D Radio ID Range"),
-    NXDN_TYPE_D_TALKGROUP("NXDN Type-D Talkgroup"),
-    NXDN_TYPE_D_TALKGROUP_RANGE("NXDN Type-D Talkgroup Range"),
    P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
    P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
    PRIORITY("Audio Priority"),
@@ -62,7 +58,6 @@ public enum AliasIDType

    //Values used by the View-By alias editor
    public static EnumSet<AliasIDType> VIEW_BY_VALUES = EnumSet.of(TALKGROUP, TALKGROUP_RANGE, RADIO_ID, RADIO_ID_RANGE,
-        NXDN_TYPE_D_RADIO_ID, NXDN_TYPE_D_RADIO_ID_RANGE, NXDN_TYPE_D_TALKGROUP, NXDN_TYPE_D_TALKGROUP_RANGE,
        P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);

    public String toString()
--- a/src/main/java/io/github/dsheirer/alias/id/INXDNTypeD.java
+++ b/src/main/java/io/github/dsheirer/alias/id/INXDNTypeD.java
@@ -1,46 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.alias.id;
-
-/**
- * NXDN Type-D alias identifier composed of a home repeater and a radio or talkgroup identifier value.
- */
-public interface INXDNTypeD
-{
-    /**
-     * Home repeater for the identifier
-     */
-    int getHomeRepeater();
-
-    /**
-     * Sets the home repeater for the identifier
-     */
-    void setHomeRepeater(int homeRepeater);
-
-    /**
-     * Radio or talkgroup value, without the home repeater.
-     */
-    int getIdentifier();
-
-    /**
-     * Sets the radio or talkgroup value, without the home repeater.
-     */
-    void setIdentifier(int identifier);
-}
--- a/src/main/java/io/github/dsheirer/alias/id/INXDNTypeDRange.java
+++ b/src/main/java/io/github/dsheirer/alias/id/INXDNTypeDRange.java
@@ -1,56 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.alias.id;
-
-/**
- * NXDN Type-D alias identifier range of radio or talkgroup values that share a common home repeater.
- */
-public interface INXDNTypeDRange
-{
-    /**
-     * Home repeater for the range
-     */
-    int getHomeRepeater();
-
-    /**
-     * Sets the home repeater for the range
-     */
-    void setHomeRepeater(int homeRepeater);
-
-    /**
-     * Minimum radio or talkgroup value, without the home repeater.
-     */
-    int getMinIdentifier();
-
-    /**
-     * Sets the minimum radio or talkgroup value, without the home repeater.
-     */
-    void setMinIdentifier(int identifier);
-
-    /**
-     * Maximum radio or talkgroup value, without the home repeater.
-     */
-    int getMaxIdentifier();
-
-    /**
-     * Sets the maximum radio or talkgroup value, without the home repeater.
-     */
-    void setMaxIdentifier(int identifier);
-}
--- a/src/main/java/io/github/dsheirer/alias/id/dcs/Dcs.java
+++ b/src/main/java/io/github/dsheirer/alias/id/dcs/Dcs.java
@@ -22,7 +22,7 @@ package io.github.dsheirer.alias.id.dcs;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.module.decode.squelch.dcs.DCSCode;
+import io.github.dsheirer.module.decode.dcs.DCSCode;

 /**
 * Digital Coded Squelch (DCS) tone identifier
--- a/src/main/java/io/github/dsheirer/alias/id/radio/NXDNTypeDRadio.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/NXDNTypeDRadio.java
@@ -1,96 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.alias.id.radio;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.INXDNTypeD;
-import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
-import io.github.dsheirer.protocol.Protocol;
-
-/**
- * NXDN Type-D radio.  The value is the over-the-air 16-bit identifier that combines the home repeater and radio so that
- * it matches the value of an NXDN Type-D radio identifier.
- */
-public class NXDNTypeDRadio extends Radio implements INXDNTypeD
-{
-    public NXDNTypeDRadio()
-    {
-        //No-arg JAXB constructor
-        setProtocol(Protocol.NXDN);
-    }
-
-    /**
-     * Constructs an instance
-     * @param homeRepeater for the radio
-     * @param radio value, without the home repeater
-     */
-    public NXDNTypeDRadio(int homeRepeater, int radio)
-    {
-        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, radio));
-    }
-
-    @Override
-    public AliasIDType getType()
-    {
-        return AliasIDType.NXDN_TYPE_D_RADIO_ID;
-    }
-
-    @JsonIgnore
-    @Override
-    public int getHomeRepeater()
-    {
-        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getValue());
-    }
-
-    @Override
-    public void setHomeRepeater(int homeRepeater)
-    {
-        setValue(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, getIdentifier()));
-    }
-
-    @JsonIgnore
-    @Override
-    public int getIdentifier()
-    {
-        return NXDNTalkgroupFormatter.getTypeDIdentifier(getValue());
-    }
-
-    @Override
-    public void setIdentifier(int identifier)
-    {
-        setValue(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Type-D Radio ID:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getIdentifier(), true));
-        sb.append(" Protocol:").append(getProtocol());
-
-        if(!isValid())
-        {
-            sb.append(" **NOT VALID**");
-        }
-
-        return sb.toString();
-    }
-}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/NXDNTypeDRadioRange.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/NXDNTypeDRadioRange.java
@@ -1,124 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.alias.id.radio;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.INXDNTypeDRange;
-import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
-import io.github.dsheirer.protocol.Protocol;
-
-/**
- * NXDN Type-D radio range for a single home repeater.  The min and max values are the over-the-air 16-bit identifiers
- * that combine the home repeater and radio.
- */
-public class NXDNTypeDRadioRange extends RadioRange implements INXDNTypeDRange
-{
-    public NXDNTypeDRadioRange()
-    {
-        //No-arg JAXB constructor
-        setProtocol(Protocol.NXDN);
-    }
-
-    /**
-     * Constructs an instance
-     * @param homeRepeater for the range
-     * @param minRadio value, without the home repeater
-     * @param maxRadio value, without the home repeater
-     */
-    public NXDNTypeDRadioRange(int homeRepeater, int minRadio, int maxRadio)
-    {
-        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, minRadio),
-                NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, maxRadio));
-    }
-
-    @Override
-    public AliasIDType getType()
-    {
-        return AliasIDType.NXDN_TYPE_D_RADIO_ID_RANGE;
-    }
-
-    @JsonIgnore
-    @Override
-    public int getHomeRepeater()
-    {
-        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMinRadio());
-    }
-
-    @Override
-    public void setHomeRepeater(int homeRepeater)
-    {
-        int min = getMinIdentifier();
-        int max = getMaxIdentifier();
-        setMinRadio(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, min));
-        setMaxRadio(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, max));
-    }
-
-    @JsonIgnore
-    @Override
-    public int getMinIdentifier()
-    {
-        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMinRadio());
-    }
-
-    @Override
-    public void setMinIdentifier(int identifier)
-    {
-        setMinRadio(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
-    }
-
-    @JsonIgnore
-    @Override
-    public int getMaxIdentifier()
-    {
-        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMaxRadio());
-    }
-
-    @Override
-    public void setMaxIdentifier(int identifier)
-    {
-        setMaxRadio(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
-    }
-
-    /**
-     * Valid when the base range is valid and both ends of the range use the same home repeater.
-     */
-    @Override
-    public boolean isValid()
-    {
-        return super.isValid() && getHomeRepeater() == NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMaxRadio());
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Type-D Radio ID Range:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMinIdentifier(), true));
-        sb.append(" to ").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMaxIdentifier(), true));
-        sb.append(" Protocol:").append(getProtocol());
-
-        if(!isValid())
-        {
-            sb.append(" **NOT VALID**");
-        }
-
-        return sb.toString();
-    }
-}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * 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 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;
@@ -35,11 +38,10 @@ public enum RadioFormat
        "<html>APCO25 valid range is 0 to 16,777,215"),
    DMR("********", 0, 0xFFFFFF, "0 to 16,777,215",
        "<html>DMR unit id valid range is 0 to 16,777,215"),
-    NXDN("*****", 1, 0xFFFF, "1 to 65,535", "NXDN valid range is 1 to 65,535"),
    PASSPORT("********", 0, 0x7FFFFF, "0 to 8,388,607",
        "<html>PASSPORT valid range is 0 to 8,388,607"),
    UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
-        "<html>Unknown protocol valid value range is 1-16,777,215");
+        "Unknown protocol valid value range is 1-16,777,215");

    private String mMask;
    private int mMinimumValue;
@@ -114,8 +116,6 @@ public enum RadioFormat
                return APCO25;
            case DMR:
                return DMR;
-            case NXDN:
-                return NXDN;
            case PASSPORT:
                return PASSPORT;
            default:
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * 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 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;
@@ -23,14 +26,14 @@ import io.github.dsheirer.preference.identifier.IntegerFormat;
 import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.AbstractIntegerFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.DMRTalkgroupFormatter;
-import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
 import io.github.dsheirer.protocol.Protocol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.text.ParseException;
 import java.util.EnumMap;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

 /**
 * Protocol-specific formatting of radio id values and parsing of formatted radio id values.
@@ -44,7 +47,6 @@ public class RadioFormatter
    {
        mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
        mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
-        mFormatterMap.put(Protocol.NXDN, new NXDNTalkgroupFormatter());
        mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
    }

--- a/src/main/java/io/github/dsheirer/alias/id/talkgroup/NXDNTypeDTalkgroup.java
+++ b/src/main/java/io/github/dsheirer/alias/id/talkgroup/NXDNTypeDTalkgroup.java
@@ -1,96 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.alias.id.talkgroup;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.INXDNTypeD;
-import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
-import io.github.dsheirer.protocol.Protocol;
-
-/**
- * NXDN Type-D talkgroup.  The value is the over-the-air 16-bit identifier that combines the home repeater and talkgroup
- * so that it matches the value of an NXDN Type-D talkgroup identifier.
- */
-public class NXDNTypeDTalkgroup extends Talkgroup implements INXDNTypeD
-{
-    public NXDNTypeDTalkgroup()
-    {
-        //No-arg JAXB constructor
-        setProtocol(Protocol.NXDN);
-    }
-
-    /**
-     * Constructs an instance
-     * @param homeRepeater for the talkgroup
-     * @param talkgroup value, without the home repeater
-     */
-    public NXDNTypeDTalkgroup(int homeRepeater, int talkgroup)
-    {
-        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, talkgroup));
-    }
-
-    @Override
-    public AliasIDType getType()
-    {
-        return AliasIDType.NXDN_TYPE_D_TALKGROUP;
-    }
-
-    @JsonIgnore
-    @Override
-    public int getHomeRepeater()
-    {
-        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getValue());
-    }
-
-    @Override
-    public void setHomeRepeater(int homeRepeater)
-    {
-        setValue(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, getIdentifier()));
-    }
-
-    @JsonIgnore
-    @Override
-    public int getIdentifier()
-    {
-        return NXDNTalkgroupFormatter.getTypeDIdentifier(getValue());
-    }
-
-    @Override
-    public void setIdentifier(int identifier)
-    {
-        setValue(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Type-D Talkgroup:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getIdentifier(), true));
-        sb.append(" Protocol:").append(getProtocol());
-
-        if(!isValid())
-        {
-            sb.append(" **NOT VALID**");
-        }
-
-        return sb.toString();
-    }
-}
--- a/src/main/java/io/github/dsheirer/alias/id/talkgroup/NXDNTypeDTalkgroupRange.java
+++ b/src/main/java/io/github/dsheirer/alias/id/talkgroup/NXDNTypeDTalkgroupRange.java
@@ -1,125 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.alias.id.talkgroup;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.INXDNTypeDRange;
-import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
-import io.github.dsheirer.protocol.Protocol;
-
-/**
- * NXDN Type-D talkgroup range for a single home repeater.  The min and max values are the over-the-air 16-bit
- * identifiers that combine the home repeater and talkgroup.
- */
-public class NXDNTypeDTalkgroupRange extends TalkgroupRange implements INXDNTypeDRange
-{
-    public NXDNTypeDTalkgroupRange()
-    {
-        //No-arg JAXB constructor
-        setProtocol(Protocol.NXDN);
-    }
-
-    /**
-     * Constructs an instance
-     * @param homeRepeater for the range
-     * @param minTalkgroup value, without the home repeater
-     * @param maxTalkgroup value, without the home repeater
-     */
-    public NXDNTypeDTalkgroupRange(int homeRepeater, int minTalkgroup, int maxTalkgroup)
-    {
-        super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, minTalkgroup),
-                NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, maxTalkgroup));
-    }
-
-    @Override
-    public AliasIDType getType()
-    {
-        return AliasIDType.NXDN_TYPE_D_TALKGROUP_RANGE;
-    }
-
-    @JsonIgnore
-    @Override
-    public int getHomeRepeater()
-    {
-        return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMinTalkgroup());
-    }
-
-    @Override
-    public void setHomeRepeater(int homeRepeater)
-    {
-        int min = getMinIdentifier();
-        int max = getMaxIdentifier();
-        setMinTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, min));
-        setMaxTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, max));
-    }
-
-    @JsonIgnore
-    @Override
-    public int getMinIdentifier()
-    {
-        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMinTalkgroup());
-    }
-
-    @Override
-    public void setMinIdentifier(int identifier)
-    {
-        setMinTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
-    }
-
-    @JsonIgnore
-    @Override
-    public int getMaxIdentifier()
-    {
-        return NXDNTalkgroupFormatter.getTypeDIdentifier(getMaxTalkgroup());
-    }
-
-    @Override
-    public void setMaxIdentifier(int identifier)
-    {
-        setMaxTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
-    }
-
-    /**
-     * Valid when the base range is valid and both ends of the range use the same home repeater.
-     */
-    @Override
-    public boolean isValid()
-    {
-        return super.isValid() &&
-                getHomeRepeater() == NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMaxTalkgroup());
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Type-D Talkgroup Range:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMinIdentifier(), true));
-        sb.append(" to ").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMaxIdentifier(), true));
-        sb.append(" Protocol:").append(getProtocol());
-
-        if(!isValid())
-        {
-            sb.append(" **NOT VALID**");
-        }
-
-        return sb.toString();
-    }
-}
--- a/src/main/java/io/github/dsheirer/alias/id/talkgroup/StreamAsTalkgroup.java
+++ b/src/main/java/io/github/dsheirer/alias/id/talkgroup/StreamAsTalkgroup.java
@@ -1,40 +0,0 @@
-/*
- * *****************************************************************************
- * 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
-    }
-}
--- a/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java
+++ b/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * 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 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;
@@ -47,8 +50,6 @@ public enum TalkgroupFormat
        "<html>MPT-1327 valid ranges are 0-127(prefix)<br>and 1-8192(ident) (ie. 000-0001 to 127-8192)"),
    NBFM("*****", 1, 0xFFFF, "1 to 65,535",
            "NBFM valid value range is 1-65,535"),
-    NXDN("*****", 0, 0xFFFF, "0 to 65,535",
-            "NXDN talkgroup valid range is 0 to 65,535"),
    PASSPORT("*****", 1, 0xFFFF, "1 to 65,535",
        "Passport valid value range is 1-65,535"),
    UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
@@ -138,8 +139,6 @@ public enum TalkgroupFormat
                return MPT1327;
            case NBFM:
                return NBFM;
-            case NXDN:
-                return NXDN;
            case PASSPORT:
                return PASSPORT;
            default:
--- a/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java
+++ b/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * 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
@@ -28,7 +28,6 @@ import io.github.dsheirer.preference.identifier.talkgroup.FleetsyncTalkgroupForm
 import io.github.dsheirer.preference.identifier.talkgroup.LTRTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.MDC1200TalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.MPT1327TalkgroupFormatter;
-import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.PassportTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
 import io.github.dsheirer.protocol.Protocol;
@@ -60,7 +59,6 @@ public class TalkgroupFormatter
        mFormatterMap.put(Protocol.LTR_NET, ltr);
        mFormatterMap.put(Protocol.MDC1200, new MDC1200TalkgroupFormatter());
        mFormatterMap.put(Protocol.MPT1327, new MPT1327TalkgroupFormatter());
-        mFormatterMap.put(Protocol.NXDN, new NXDNTalkgroupFormatter());
        mFormatterMap.put(Protocol.PASSPORT, new PassportTalkgroupFormatter());
        mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
    }
--- a/src/main/java/io/github/dsheirer/audio/AbstractAudioFilter.java
+++ b/src/main/java/io/github/dsheirer/audio/AbstractAudioFilter.java
@@ -1,17 +0,0 @@
-package io.github.dsheirer.audio;
-
-/**
- * Used for defining an array list of filter methods to be implemented in AudioModule
- * The filters will be applied in the order given in the list.
- * Each audio filter mush implement the filter method.
- */
-
-public abstract class AbstractAudioFilter
-{
-    /**
-     * To be overridden by each audio filter
-     * @param audio a buffer of 8 KHz audio samples
-     * @return float[] filtered buffer of 8 KHz audio samples
-     */
-    public abstract float[] filter(float[] audio);
-}
--- a/src/main/java/io/github/dsheirer/audio/AbstractAudioModule.java
+++ b/src/main/java/io/github/dsheirer/audio/AbstractAudioModule.java
@@ -20,6 +20,7 @@
 package io.github.dsheirer.audio;

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

    /**
@@ -89,7 +90,7 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen
            {
                mAudioSegment.completeProperty().set(true);
                mIdentifierUpdateNotificationBroadcaster.removeListener(mAudioSegment);
-                mAudioSegment.decrementConsumerCount();
+                mAudioSegment.removeLease(getClass().toString());
                mAudioSegment = null;
            }
        }
@@ -112,7 +113,7 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen
            if(mAudioSegment == null)
            {
                mAudioSegment = new AudioSegment(mAliasList, getTimeslot());
-                mAudioSegment.incrementConsumerCount();
+                mAudioSegment.addLease(getClass().toString());
                mAudioSegment.addIdentifiers(mIdentifierCollection.getIdentifiers());
                mIdentifierUpdateNotificationBroadcaster.addListener(mAudioSegment);

@@ -123,7 +124,6 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen

                if(mAudioSegmentListener != null)
                {
-                    mAudioSegment.incrementConsumerCount();
                    mAudioSegmentListener.receive(mAudioSegment);
                }

@@ -136,26 +136,33 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen

    public void addAudio(float[] audioBuffer)
    {
-        AudioSegment audioSegment = getAudioSegment();
+        if(audioBuffer != null)
+        {
+            AudioSegment audioSegment = getAudioSegment();

-        //If the current segment exceeds the max samples length, close it so that a new segment gets generated
-        //and then link the segments together
-        if(mAudioSampleCount >= mMaxSegmentAudioSampleLength)
-        {
-            AudioSegment previous = getAudioSegment();
-            closeAudioSegment();
-            audioSegment = getAudioSegment();
-            audioSegment.linkTo(previous);
-        }
+            //If the current segment exceeds the max samples length, close it so that a new segment gets generated
+            //and then link the segments together
+            if(mAudioSampleCount >= mMaxSegmentAudioSampleLength)
+            {
+                AudioSegment previous = getAudioSegment();
+                closeAudioSegment();
+                audioSegment = getAudioSegment();
+                audioSegment.linkTo(previous);
+            }

-        try
-        {
-            audioSegment.addAudio(audioBuffer);
-            mAudioSampleCount += audioBuffer.length;
+            try
+            {
+                audioSegment.addAudio(audioBuffer);
+                mAudioSampleCount += audioBuffer.length;
+            }
+            catch(Exception e)
+            {
+                closeAudioSegment();
+            }
        }
-        catch(Exception e)
+        else
        {
-            closeAudioSegment();
+            mLog.info("Attempt to add null audio from " + getClass());
        }
    }

--- a/src/main/java/io/github/dsheirer/audio/AudioGainFilter.java
+++ b/src/main/java/io/github/dsheirer/audio/AudioGainFilter.java
@@ -1,44 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
-package io.github.dsheirer.audio;
-
-import io.github.dsheirer.dsp.gain.AudioGainAndDcFilter;
-
-/**
- * This is a wrapper for the AudioGainAndDcFilter class so it can be used with the AudioModule filter list.
- * Usually instantiated in the DecoderFactory
- */
-public class AudioGainFilter extends AbstractAudioFilter
-{
-    AudioGainAndDcFilter mAudioGain;
-
-    public AudioGainFilter(float minGain, float maxGain, float objectiveAmplitude)
-    {
-        mAudioGain = new AudioGainAndDcFilter(minGain, maxGain, objectiveAmplitude);
-        mAudioGain.setDecayRate(2);     // to remove pumping effect
-        mAudioGain.reset();
-    }
-
-    @Override
-    public float[] filter(float[] audio)
-    {
-        return mAudioGain.process(audio);
-    }
-}
--- a/src/main/java/io/github/dsheirer/audio/AudioManager.java
+++ b/src/main/java/io/github/dsheirer/audio/AudioManager.java
@@ -0,0 +1,503 @@
+/*
+ * *****************************************************************************
+ * 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.audio;
+
+import io.github.dsheirer.audio.broadcast.AudioStreamingManager;
+import io.github.dsheirer.audio.call.ActiveAudioSegment;
+import io.github.dsheirer.audio.call.AudioSegment;
+import io.github.dsheirer.audio.call.Call;
+import io.github.dsheirer.audio.call.CallRepository;
+import io.github.dsheirer.audio.call.ICallEventListener;
+import io.github.dsheirer.audio.playback.AudioPlaybackManager;
+import io.github.dsheirer.audio.playbackfx.AudioPlaybackController;
+import io.github.dsheirer.log.LoggingSuppressor;
+import io.github.dsheirer.preference.UserPreferences;
+import io.github.dsheirer.preference.retention.AgeUnits;
+import io.github.dsheirer.preference.retention.RetentionPolicy;
+import io.github.dsheirer.preference.retention.RetentionPreference;
+import io.github.dsheirer.record.AudioRecordingManager;
+import io.github.dsheirer.sample.Listener;
+import io.github.dsheirer.util.ThreadPool;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Component;
+
+/**
+ * Manages handling and distribution of audio segments and calls across the application.
+ */
+@Component("audioManager")
+public class AudioManager implements Listener<AudioSegment>
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(AudioManager.class);
+    private static final LoggingSuppressor LOGGING_SUPPRESSOR = new LoggingSuppressor(LOGGER);
+    private static final long GIGABYTES = 1024l * 1024l * 1024l;
+
+    @Resource
+    private AudioPlaybackManager mAudioPlaybackManager;
+    @Resource
+    private AudioPlaybackController mAudioPlaybackController;
+    @Resource
+    private AudioRecordingManager mAudioRecordingManager;
+    @Resource
+    private AudioStreamingManager mAudioStreamingManager;
+    @Resource
+    private DuplicateCallDetector mDuplicateCallDetector;
+    @Resource
+    private UserPreferences mUserPreferences;
+    private CallRepository mCallRepository;
+    private List<ICallEventListener> mCallListeners = new CopyOnWriteArrayList<>();
+    private ActiveAudioSegmentProcessor mAudioSegmentProcessor = new ActiveAudioSegmentProcessor();
+    private CallAgeOffProcessor mCallAgeOffProcessor = new CallAgeOffProcessor();
+    private ScheduledFuture<?> mAudioSegmentProcessorFuture;
+    private ScheduledFuture<?> mCallRetentionProcessorFuture;
+
+    /**
+     * Constructs an instance
+     */
+    @Autowired
+    public AudioManager(CallRepository callRepository)
+    {
+        mCallRepository = callRepository;
+    }
+
+    @PostConstruct
+    public void postConstruct()
+    {
+        LOGGER.info("Post constructing ......");
+        mAudioSegmentProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(mAudioSegmentProcessor, 100,
+                500, TimeUnit.MILLISECONDS);
+        //Delay first run until 1-minute after startup.
+        mCallRetentionProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(mCallAgeOffProcessor,
+                30, 30, TimeUnit.SECONDS);
+
+        //Register call event listeners
+        add(mAudioRecordingManager);
+        add(mAudioPlaybackController);
+        add(mAudioStreamingManager);
+    }
+
+    @PreDestroy
+    public void preDestroy()
+    {
+        LOGGER.info("AudioManager shutting down");
+
+        if(mAudioSegmentProcessorFuture != null)
+        {
+            mAudioSegmentProcessorFuture.cancel(true);
+            mAudioSegmentProcessorFuture = null;
+        }
+        mAudioSegmentProcessor.shutdown();
+
+        if(mCallRetentionProcessorFuture != null)
+        {
+            mCallRetentionProcessorFuture.cancel(true);
+            mCallRetentionProcessorFuture = null;
+        }
+    }
+
+    /**
+     * Adds the call listener to be notified of call events.
+     * @param listener to add
+     */
+    public void add(ICallEventListener listener)
+    {
+        if(!mCallListeners.contains(listener))
+        {
+            mCallListeners.add(listener);
+        }
+    }
+
+    /**
+     * Broadcasts a call added event to registered listeners.
+     * @param call that was added
+     */
+    private void broadcastAdded(Call call)
+    {
+        for(ICallEventListener listener: mCallListeners)
+        {
+            listener.added(call);
+        }
+    }
+
+    /**
+     * Broadcasts a call updated event to registered listeners.
+     * @param call that was updated
+     */
+    private void broadcastUpdated(Call call)
+    {
+        for(ICallEventListener listener: mCallListeners)
+        {
+            listener.updated(call);
+        }
+    }
+
+    /**
+     * Broadcasts a call completed event to registered listeners.
+     * @param call that was completed
+     * @param audioSegment associated with the call.
+     */
+    private void broadcastCompleted(Call call, AudioSegment audioSegment)
+    {
+        for(ICallEventListener listener: mCallListeners)
+        {
+            audioSegment.addLease(listener.getClass().toString());
+            listener.completed(call, audioSegment);
+        }
+    }
+
+    /**
+     * Broadcasts a call deleted event to registered listeners.
+     * @param call that was deleted
+     */
+    private void broadcastDeleted(Call call)
+    {
+        for(ICallEventListener listener: mCallListeners)
+        {
+            listener.deleted(call);
+        }
+    }
+
+    /**
+     * Removes the listener from receiving call event notifications.
+     * @param listener to remove
+     */
+    public void remove(ICallEventListener listener)
+    {
+        mCallListeners.remove(listener);
+    }
+
+    @Override
+    public void receive(AudioSegment audioSegment)
+    {
+        //Let the duplicate call detector process the segment first to detect duplicates.
+        audioSegment.addLease(mDuplicateCallDetector.getClass().toString());
+        mDuplicateCallDetector.receive(audioSegment);
+        audioSegment.addLease(mAudioSegmentProcessor.getClass().toString());
+        mAudioSegmentProcessor.add(audioSegment);
+
+        //TODO: remove for cleanup
+//        audioSegment.addLease(mAudioPlaybackManager.getClass().toString());
+//        mAudioPlaybackManager.receive(audioSegment);
+    }
+
+    /**
+     * Active audio segment processor.  Single thread processor that runs as a scheduled task to process incoming
+     * audio segments, update existing active audio segments, and process completed audio segments.
+     */
+    private class ActiveAudioSegmentProcessor implements Runnable
+    {
+        private LinkedTransferQueue<AudioSegment> mQueuedAudioSegments = new LinkedTransferQueue<>();
+        private List<AudioSegment> mAudioSegmentsToProcess = new ArrayList<>();
+        private Map<AudioSegment,ActiveAudioSegment> mActiveAudioSegmentsMap = new HashMap<>();
+        private AtomicBoolean mProcessing = new AtomicBoolean();
+
+        /**
+         * Adds the new audio segment to be processed
+         * @param audioSegment to process
+         */
+        public void add(AudioSegment audioSegment)
+        {
+            mQueuedAudioSegments.add(audioSegment);
+        }
+
+        /**
+         * Performs shutdown and cleanup of any active audio segments that remain after the threaded processing
+         * is terminated.
+         */
+        public void shutdown()
+        {
+            for(Map.Entry<AudioSegment,ActiveAudioSegment> entry: mActiveAudioSegmentsMap.entrySet())
+            {
+                //Invoke dispose() method to remove the lease on the audio segment
+                entry.getValue().dispose();
+            }
+            mActiveAudioSegmentsMap.clear();
+
+            for(AudioSegment audioSegment: mQueuedAudioSegments)
+            {
+                audioSegment.removeLease(getClass().toString());
+            }
+            mQueuedAudioSegments.clear();
+        }
+
+        @Override
+        public void run()
+        {
+            if(mProcessing.compareAndSet(false, true))
+            {
+                //Process existing active audio segments
+                try
+                {
+                    Iterator<Map.Entry<AudioSegment,ActiveAudioSegment>> it = mActiveAudioSegmentsMap.entrySet().iterator();
+
+                    while(it.hasNext())
+                    {
+                        ActiveAudioSegment activeAudioSegment = it.next().getValue();
+
+                        if(activeAudioSegment.update())
+                        {
+                            broadcastUpdated(activeAudioSegment.getCall());
+                        }
+
+                        if(activeAudioSegment.isComplete())
+                        {
+                            //Process residual audio and close the wave recording file.
+                            activeAudioSegment.closeAudio();
+
+                            Call call = activeAudioSegment.getCall();
+                            call.setComplete(true);
+
+                            try
+                            {
+                                mCallRepository.save(call);
+                            }
+                            catch(Exception e)
+                            {
+                                LOGGER.error("Couldn't update call in database");
+                            }
+                            broadcastCompleted(call, activeAudioSegment.getAudioSegment());
+                            activeAudioSegment.dispose();
+                            it.remove();
+                        }
+                    }
+                }
+                catch(Throwable t)
+                {
+                    LOGGER.error("Error while processing existing active audio segments", t);
+                }
+
+                //Process new audio segments
+                try
+                {
+                    mQueuedAudioSegments.drainTo(mAudioSegmentsToProcess);
+
+                    for(AudioSegment audioSegment: mAudioSegmentsToProcess)
+                    {
+                        if(mActiveAudioSegmentsMap.containsKey(audioSegment))
+                        {
+                            ActiveAudioSegment activeAudioSegment = mActiveAudioSegmentsMap.get(audioSegment);
+
+                            if(activeAudioSegment.update())
+                            {
+                                broadcastUpdated(activeAudioSegment.getCall());
+                            }
+                        }
+                        else
+                        {
+                            Call call = ActiveAudioSegment.create(audioSegment);
+                            ActiveAudioSegment activeAudioSegment = new ActiveAudioSegment(audioSegment, call, mUserPreferences);
+                            mActiveAudioSegmentsMap.put(audioSegment, activeAudioSegment);
+                            mCallRepository.save(call);
+                            broadcastAdded(call);
+                        }
+                    }
+
+                    mAudioSegmentsToProcess.clear();
+                }
+                catch(Throwable t)
+                {
+                    LOGGER.error("Error while processing existing active audio segments", t);
+                }
+
+                mProcessing.set(false);
+            }
+        }
+    }
+
+    /**
+     * Call event retention and age-off processor.
+     */
+    public class CallAgeOffProcessor implements Runnable
+    {
+        @Override
+        public void run()
+        {
+            RetentionPreference retentionPreference = mUserPreferences.getRetentionPreference();
+            RetentionPolicy policy = retentionPreference.getRetentionPolicy();
+
+            try
+            {
+                if(policy.isAgePolicy())
+                {
+                    AgeUnits ageUnits = retentionPreference.getAgeUnits();
+                    int ageValue = retentionPreference.getAgeValue();
+                    long threshold = System.currentTimeMillis() - ageUnits.getDuration(ageValue);
+                    PageRequest requestPage1 = PageRequest.of(0, 100);
+                    long start = 0;
+                    Page<Call> page = mCallRepository.findCallsByEventTimeBetweenOrderByEventTime(start, threshold, requestPage1);
+
+                    while(page.getTotalElements() > 0)
+                    {
+                        List<Call> calls = page.get().collect(Collectors.toList());
+
+                        for(Call call: calls)
+                        {
+                            //Keep adjusting the start time to 1 millisecond more than the current call so that
+                            //if there's an error deleting any given call, we don't get stuck processing it every time
+                            start = call.getEventTime() + 1;
+
+                            //Only evaluate calls that are complete
+                            if(call.isComplete())
+                            {
+                                boolean deleteFailed = false;
+                                File file = new File(call.getFile());
+                                if(file.exists())
+                                {
+                                    try
+                                    {
+                                        File parentDirectory = file.getParentFile();
+                                        Files.delete(file.toPath());
+
+                                        //Delete parent directory if it is now empty
+                                        if(parentDirectory.exists() && parentDirectory.isDirectory())
+                                        {
+                                            if(!Files.list(parentDirectory.toPath()).findFirst().isPresent())
+                                            {
+                                                Files.delete(parentDirectory.toPath());
+                                            }
+                                        }
+                                    }
+                                    catch(Exception io)
+                                    {
+                                        LOGGING_SUPPRESSOR.error("Call Event Delete", 5,
+                                                "Error deleting call event recording: " + call.getFile() +
+                                                        " - " + io.getLocalizedMessage());
+                                        deleteFailed = true;
+                                    }
+                                }
+
+                                if(!deleteFailed)
+                                {
+                                    mCallRepository.delete(call);
+                                    broadcastDeleted(call);
+                                }
+                            }
+                        }
+
+                        page = mCallRepository.findCallsByEventTimeBetweenOrderByEventTime(start, threshold, requestPage1);
+                    }
+                }
+
+                if(policy.isSizePolicy())
+                {
+                    Path callsDirectory = mUserPreferences.getDirectoryPreference().getDirectoryCalls();
+
+                    if(Files.exists(callsDirectory))
+                    {
+                        long currentSize = FileUtils.sizeOfDirectory(callsDirectory.toFile());
+                        long objectiveSize = retentionPreference.getObjectiveDirectorySize();
+
+                        if(currentSize >= objectiveSize)
+                        {
+                            long start = 0;
+                            long now = System.currentTimeMillis();
+                            PageRequest pageable = PageRequest.of(0, 100);
+                            Page<Call> page = mCallRepository.findCallsByEventTimeBetweenOrderByEventTime(start, now, pageable);
+
+                            while(currentSize >= objectiveSize && page.getTotalElements() > 0)
+                            {
+                                List<Call> calls = page.get().collect(Collectors.toList());
+
+                                for(Call call: calls)
+                                {
+                                    //Keep adjusting the start time to 1 millisecond more than the current call so that
+                                    //if there's an error deleting any given call, we don't get stuck processing it every time
+                                    start = call.getEventTime() + 1;
+
+                                    if(currentSize < objectiveSize)
+                                    {
+                                        start = now - 1;
+                                        break;
+                                    }
+
+                                    //Only evaluate calls that are complete
+                                    if(call.isComplete())
+                                    {
+                                        boolean deleteFailed = false;
+                                        File file = new File(call.getFile());
+                                        if(file.exists())
+                                        {
+                                            try
+                                            {
+                                                File parentDirectory = file.getParentFile();
+                                                long fileSize = FileUtils.sizeOf(file);
+                                                Files.delete(file.toPath());
+                                                currentSize -= fileSize;
+
+                                                //Delete parent directory if it is now empty
+                                                if(parentDirectory.exists() && parentDirectory.isDirectory())
+                                                {
+                                                    if(!Files.list(parentDirectory.toPath()).findFirst().isPresent())
+                                                    {
+                                                        Files.delete(parentDirectory.toPath());
+                                                    }
+                                                }
+                                            }
+                                            catch(Exception io)
+                                            {
+                                                LOGGING_SUPPRESSOR.error("Call Event Delete", 5,
+                                                        "Error deleting call event recording: " + call.getFile() +
+                                                                " - " + io.getLocalizedMessage());
+                                                deleteFailed = true;
+                                            }
+                                        }
+
+                                        if(!deleteFailed)
+                                        {
+                                            mCallRepository.delete(call);
+                                            broadcastDeleted(call);
+                                        }
+                                    }
+                                }
+
+                                page = mCallRepository.findCallsByEventTimeBetweenOrderByEventTime(start, now, pageable);
+                            }
+                        }
+                    }
+                }
+            }
+            catch(Throwable t)
+            {
+                LOGGER.error("Unexpected error while deleting call events using retention policy: " + policy, t);
+            }
+        }
+    }
+}
--- a/src/main/java/io/github/dsheirer/audio/AudioModule.java
+++ b/src/main/java/io/github/dsheirer/audio/AudioModule.java
@@ -32,8 +32,6 @@ import io.github.dsheirer.sample.real.IRealBufferListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.util.List;
-
 /**
 * Provides packaging of demodulated audio sample buffers into audio segments for broadcast to registered listeners.
 * Includes audio packet metadata in constructed audio segments.
@@ -44,7 +42,36 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
    Listener<float[]>
 {
    private static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
-    private List<AbstractAudioFilter>mAudioFilters;
+    private static float[] sHighPassFilterCoefficients;
+    private final boolean mAudioFilterEnable;
+
+    static
+    {
+        FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
+            .sampleRate(8000)
+            .stopBandCutoff(200)
+            .stopBandAmplitude(0.0)
+            .stopBandRipple(0.025)
+            .passBandStart(300)
+            .passBandAmplitude(1.0)
+            .passBandRipple(0.01)
+            .build();
+        try
+        {
+            RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
+
+            if(designer.isValid())
+            {
+                sHighPassFilterCoefficients = designer.getImpulseResponse();
+            }
+        }
+        catch(FilterDesignException fde)
+        {
+            mLog.error("Filter design error", fde);
+        }
+    }
+
+    private final IRealFilter mHighPassFilter = FilterFactory.getRealFilter(sHighPassFilterCoefficients);
    private final SquelchStateListener mSquelchStateListener = new SquelchStateListener();
    private SquelchState mSquelchState = SquelchState.SQUELCH;

@@ -54,23 +81,23 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
     * @param aliasList for aliasing identifiers
     * @param timeslot for this audio module
     * @param maxAudioSegmentLength in milliseconds
-     * @param audioFilters a list of audio filters to apply to the incoming audio samples
+     * @param audioFilterEnable to enable or disable high-pass audio filter
     */
-    public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength, List<AbstractAudioFilter> audioFilters)
+    public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength, boolean audioFilterEnable)
    {
        super(aliasList, timeslot, maxAudioSegmentLength);
-        mAudioFilters = audioFilters;
+        mAudioFilterEnable = audioFilterEnable;
    }

    /**
     * Creates an Audio Module.
     * @param aliasList for aliasing identifiers
-     * @param audioFilters a list of audio filters to apply to the incoming audio samples
+     * @param audioFilterEnable to enable or disable high-pass audio filter
     */
-    public AudioModule(AliasList aliasList,  List<AbstractAudioFilter> audioFilters)
+    public AudioModule(AliasList aliasList, boolean audioFilterEnable)
    {
        super(aliasList);
-        mAudioFilters = audioFilters;
+        mAudioFilterEnable = audioFilterEnable;
    }

    @Override
@@ -101,13 +128,9 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
    {
        if(mSquelchState == SquelchState.UNSQUELCH)
        {
-            // apply audio filters if any (i.e. deemphasis, high pass, etc.)
-            if(!mAudioFilters.isEmpty())
+            if(mAudioFilterEnable)
            {
-                for(AbstractAudioFilter filter : mAudioFilters)
-                {
-                    audioBuffer = filter.filter(audioBuffer);
-                }
+                audioBuffer = mHighPassFilter.filter(audioBuffer);
            }

            addAudio(audioBuffer);
--- a/src/main/java/io/github/dsheirer/audio/DuplicateCallDetector.java
+++ b/src/main/java/io/github/dsheirer/audio/DuplicateCallDetector.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -19,6 +19,7 @@

 package io.github.dsheirer.audio;

+import io.github.dsheirer.audio.call.AudioSegment;
 import io.github.dsheirer.identifier.Form;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierClass;
@@ -28,9 +29,11 @@ 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.ICallManagementProvider;
+import io.github.dsheirer.preference.duplicate.CallManagementPreference;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.util.ThreadPool;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -38,10 +41,10 @@ import java.util.Map;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;

 /**
 * Detects duplicate calls that occur within the same system.  This detector is thread safe for the receive() method.
@@ -49,44 +52,32 @@ import org.slf4j.LoggerFactory;
 * Note: system in this context refers to the system name value that is used in channel configurations.  All decoder
 * channels must share the same system name for call duplication detection.
 */
+@Component("duplicateCallDetector")
 public class DuplicateCallDetector implements Listener<AudioSegment>
 {
    private final static Logger mLog = LoggerFactory.getLogger(DuplicateCallDetector.class);
-    private ICallManagementProvider mCallManagementProvider;
+    private CallManagementPreference mCallManagementPreference;
    private Map<String,SystemDuplicateCallDetector> mDetectorMap = new HashMap();
-    protected Listener<AudioSegment> mDuplicateCallDetectionListener;
+    @Resource
+    private UserPreferences mUserPreferences;

    /**
-     * Constructs an instance.
-     * @param userPreferences to access the duplicate call detection preferences.
+     * Constructs an instance
     */
-    public DuplicateCallDetector(UserPreferences userPreferences)
+    public DuplicateCallDetector()
    {
-        this(userPreferences.getCallManagementPreference());
    }

-    /**
-     * Constructs an instance.
-     * @param callManagementProvider to provide call management preferences.
-     */
-    public DuplicateCallDetector(ICallManagementProvider callManagementProvider)
+    @PostConstruct
+    public void postConstruct()
    {
-        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;
+        mCallManagementPreference = mUserPreferences.getCallManagementPreference();
    }

    @Override
    public void receive(AudioSegment audioSegment)
    {
-        if(mCallManagementProvider.isDuplicateCallDetectionEnabled())
+        if(mCallManagementPreference.isDuplicateCallDetectionEnabled())
        {
            Identifier identifier = audioSegment.getIdentifierCollection()
                .getIdentifier(IdentifierClass.CONFIGURATION, Form.SYSTEM, Role.ANY);
@@ -101,109 +92,57 @@ public class DuplicateCallDetector implements Listener<AudioSegment>

                    if(detector == null)
                    {
-                        detector = new SystemDuplicateCallDetector(mCallManagementProvider, system);
+                        detector = new SystemDuplicateCallDetector();
                        mDetectorMap.put(system, detector);
                    }

+                    audioSegment.addLease(detector.getClass().toString());
                    detector.add(audioSegment);
+                    audioSegment.removeLease(getClass().toString());
                }
            }
        }
    }

-    /**
-     * 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 final LinkedTransferQueue<AudioSegment> mAudioSegmentQueue = new LinkedTransferQueue<>();
-        private final List<AudioSegment> mAudioSegments = new ArrayList<>();
+        private LinkedTransferQueue<AudioSegment> mAudioSegmentQueue = new LinkedTransferQueue<>();
+        private List<AudioSegment> mAudioSegments = new ArrayList<>();
+        private AtomicBoolean mMonitoring = new AtomicBoolean();
        private ScheduledFuture<?> mProcessorFuture;
-        private Lock mLock = new ReentrantLock();
-        private boolean mMonitoring = false;
-        private final ICallManagementProvider mCallManagementProvider;
-        private String mSystem;

-        /**
-         * Constructs an instance
-         * @param callManagementProvider to check for duplicate monitoring preferences
-         */
-        public SystemDuplicateCallDetector(ICallManagementProvider callManagementProvider, String system)
+        public SystemDuplicateCallDetector()
        {
-            mCallManagementProvider = callManagementProvider;
-            mSystem = system;
        }

-        /**
-         * Adds the audio segment to the monitoring queue.
-         * @param audioSegment to add
-         */
        public void add(AudioSegment audioSegment)
        {
-            mLock.lock();
-
-            try
+            //Block on audio segment queue so that we don't interfere with monitoring shutdown
+            synchronized(mAudioSegmentQueue)
            {
                mAudioSegmentQueue.add(audioSegment);
                startMonitoring();
            }
-            finally
-            {
-                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)
+            if(mMonitoring.compareAndSet(false, true))
            {
-                mProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(this::process,
+                mProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(() -> 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()
        {
-            mLock.lock();
-
-            try
+            if(mMonitoring.compareAndSet(true, false))
            {
-                //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())
+                if(mProcessorFuture != null)
                {
-                    if(mProcessorFuture != null)
-                    {
-                        mProcessorFuture.cancel(true);
-                        mProcessorFuture = null;
-                    }
-
-                    mMonitoring = false;
+                    mProcessorFuture.cancel(true);
                }
            }
-            finally
-            {
-                mLock.unlock();
-            }
        }

        /**
@@ -214,7 +153,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
         */
        private boolean isDuplicate(AudioSegment segment1, AudioSegment segment2)
        {
-            if(mCallManagementProvider.isDuplicateCallDetectionByTalkgroupEnabled())
+            if(mCallManagementPreference.isDuplicateCallDetectionByTalkgroupEnabled())
            {
                //Step 1 check for duplicate TO values
                List<Identifier> to1 = segment1.getIdentifierCollection().getIdentifiers(Role.TO);
@@ -226,7 +165,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                }
            }

-            if(mCallManagementProvider.isDuplicateCallDetectionByRadioEnabled())
+            if(mCallManagementPreference.isDuplicateCallDetectionByRadioEnabled())
            {
                //Step 2 check for duplicate FROM values
                List<Identifier> from1 = segment1.getIdentifierCollection().getIdentifiers(Role.FROM);
@@ -246,51 +185,53 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
         * @param identifiers2
         * @return
         */
-        public static boolean isDuplicate(List<Identifier> identifiers1, List<Identifier> identifiers2)
+        private boolean isDuplicate(List<Identifier> identifiers1, List<Identifier> identifiers2)
        {
            for(Identifier identifier1: identifiers1)
            {
-                if(identifier1 instanceof TalkgroupIdentifier tgId1)
+                if(identifier1 instanceof TalkgroupIdentifier)
                {
-                    int tg1 = tgId1.getValue();
+                    int talkgroup1 = ((TalkgroupIdentifier)identifier1).getValue();

                    for(Identifier identifier2: identifiers2)
                    {
-                        if(identifier2 instanceof TalkgroupIdentifier tgId2 && tgId2.getValue() == tg1)
+                        if(identifier2 instanceof TalkgroupIdentifier &&
+                           ((TalkgroupIdentifier)identifier2).getValue() == talkgroup1)
                        {
                            return true;
                        }
-                        else if(identifier2 instanceof PatchGroupIdentifier pgId2 &&
-                                pgId2.getValue().getPatchGroup().getValue() == tg1)
+                        else if(identifier2 instanceof PatchGroupIdentifier &&
+                            ((PatchGroupIdentifier)identifier2).getValue().getPatchGroup().getValue() == talkgroup1)
                        {
                            return true;
                        }
                    }
                }
-                else if(identifier1 instanceof PatchGroupIdentifier pgId1)
+                else if(identifier1 instanceof PatchGroupIdentifier)
                {
-                    int talkgroup1 = pgId1.getValue().getPatchGroup().getValue();
+                    int talkgroup1 = ((PatchGroupIdentifier)identifier1).getValue().getPatchGroup().getValue();

                    for(Identifier identifier2: identifiers2)
                    {
-                        if(identifier2 instanceof TalkgroupIdentifier tgId2 && tgId2.getValue() == talkgroup1)
+                        if(identifier2 instanceof TalkgroupIdentifier &&
+                            ((TalkgroupIdentifier)identifier2).getValue() == talkgroup1)
                        {
                            return true;
                        }
-                        else if(identifier2 instanceof PatchGroupIdentifier pgId2 &&
-                                pgId2.getValue().getPatchGroup().getValue() == talkgroup1)
+                        else if(identifier2 instanceof PatchGroupIdentifier &&
+                            ((PatchGroupIdentifier)identifier2).getValue().getPatchGroup().getValue() == talkgroup1)
                        {
                            return true;
                        }
                    }
                }
-                else if(identifier1 instanceof RadioIdentifier raId1)
+                else if(identifier1 instanceof RadioIdentifier)
                {
-                    int radio1 = raId1.getValue();
+                    int radio1 = ((RadioIdentifier)identifier1).getValue();

                    for(Identifier identifier2: identifiers2)
                    {
-                        if(identifier2 instanceof RadioIdentifier raId2 && raId2.getValue() == radio1)
+                        if(identifier2 instanceof RadioIdentifier && ((RadioIdentifier)identifier2).getValue() == radio1)
                        {
                            return true;
                        }
@@ -306,8 +247,6 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
         */
        private void process()
        {
-            mLock.lock();
-
            try
            {
                //Transfer in newly arrived audio segments
@@ -319,25 +258,12 @@ public class DuplicateCallDetector implements Listener<AudioSegment>

                    if(complete)
                    {
-                        audioSegment.decrementConsumerCount();
+                        audioSegment.removeLease(getClass().toString());
                    }

                    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)
                {
@@ -348,7 +274,7 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                    {
                        AudioSegment current = mAudioSegments.get(currentIndex);

-                        if(current.hasAudio() && !current.isDuplicate())
+                        if(!current.isDuplicate())
                        {
                            int checkIndex = currentIndex + 1;

@@ -361,14 +287,8 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                                    if(isDuplicate(current, toCheck))
                                    {
                                        toCheck.setDuplicate(true);
-                                        toCheck.decrementConsumerCount();
+                                        toCheck.removeLease(getClass().toString());
                                        duplicates.add(toCheck);
-
-                                        //Notify optional listener that we flagged the call as duplicate.
-                                        if(mDuplicateCallDetectionListener != null)
-                                        {
-                                            mDuplicateCallDetectionListener.receive(toCheck);
-                                        }
                                    }
                                }

@@ -382,12 +302,26 @@ public class DuplicateCallDetector implements Listener<AudioSegment>
                    mAudioSegments.removeAll(duplicates);
                }

-                //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.
+                //Finally, if the audio segment queue is empty, shutdown montitoring until a new segment arrives
                if(mAudioSegments.isEmpty())
                {
-                    ThreadPool.CACHED.submit(this::stopMonitoring);
+                    //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
+                            }
+                        }
+                    }
                }
            }
            catch(Throwable t)
@@ -395,10 +329,6 @@ 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();
-            }
        }
    }
 }
--- a/src/main/java/io/github/dsheirer/audio/HighPassAudioFilter.java
+++ b/src/main/java/io/github/dsheirer/audio/HighPassAudioFilter.java
@@ -1,50 +0,0 @@
-package io.github.dsheirer.audio;
-
-import io.github.dsheirer.dsp.filter.FilterFactory;
-import io.github.dsheirer.dsp.filter.design.FilterDesignException;
-import io.github.dsheirer.dsp.filter.fir.FIRFilterSpecification;
-import io.github.dsheirer.dsp.filter.fir.real.IRealFilter;
-import io.github.dsheirer.dsp.filter.fir.remez.RemezFIRFilterDesigner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HighPassAudioFilter extends AbstractAudioFilter
-{
-    private static final Logger mLog = LoggerFactory.getLogger(HighPassAudioFilter.class);
-    private static float[] sHighPassFilterCoefficients;
-
-    static
-    {
-        FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
-                .sampleRate(8000)
-                .stopBandCutoff(200)
-                .stopBandAmplitude(0.0)
-                .stopBandRipple(0.025)
-                .passBandStart(300)
-                .passBandAmplitude(1.0)
-                .passBandRipple(0.01)
-                .build();
-        try
-        {
-            RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
-
-            if(designer.isValid())
-            {
-                sHighPassFilterCoefficients = designer.getImpulseResponse();
-            }
-        }
-        catch(FilterDesignException fde)
-        {
-            mLog.error("Filter design error", fde);
-        }
-    }
-
-    private final IRealFilter mHighPassFilter = FilterFactory.getRealFilter(sHighPassFilterCoefficients);
-
-    @Override
-    public float[] filter(float[] audio)
-    {
-        audio = mHighPassFilter.filter(audio);
-        return audio;
-    }
-}
--- a/src/main/java/io/github/dsheirer/audio/IAudioController.java
+++ b/src/main/java/io/github/dsheirer/audio/IAudioController.java
@@ -1,27 +1,9 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-
 package io.github.dsheirer.audio;

-import io.github.dsheirer.audio.playback.AudioChannel;
-import io.github.dsheirer.audio.playback.AudioPlaybackDeviceDescriptor;
+import io.github.dsheirer.audio.playback.AudioOutput;
 import io.github.dsheirer.sample.Listener;
+import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
+
 import java.util.List;

 /**
@@ -30,13 +12,13 @@ import java.util.List;
 public interface IAudioController
 {
 	/* Current Mixer and MixerChannel configuration */
-	public void setAudioPlaybackDevice(AudioPlaybackDeviceDescriptor device ) throws AudioException;
-	public AudioPlaybackDeviceDescriptor getAudioPlaybackDevice() throws AudioException;
+	public void setMixerChannelConfiguration( MixerChannelConfiguration entry ) throws AudioException;
+	public MixerChannelConfiguration getMixerChannelConfiguration() throws AudioException;
 	
-	/* Audio Channel(s) */
-	public List<AudioChannel> getAudioChannels();
+	/* Audio Output(s) */
+	public List<AudioOutput> getAudioOutputs();

 	/* Controller Audio Event Listener */
-	public void addAudioEventListener(Listener<AudioEvent> listener );
-	public void removeAudioEventListener(Listener<AudioEvent> listener );
+	public void addControllerListener( Listener<AudioEvent> listener );
+	public void removeControllerListener( Listener<AudioEvent> listener );
 }
--- a/src/main/java/io/github/dsheirer/audio/IAudioSegmentListener.java
+++ b/src/main/java/io/github/dsheirer/audio/IAudioSegmentListener.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * 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
@@ -19,6 +19,7 @@

 package io.github.dsheirer.audio;

+import io.github.dsheirer.audio.call.AudioSegment;
 import io.github.dsheirer.sample.Listener;

 /**
--- a/src/main/java/io/github/dsheirer/audio/IAudioSegmentProvider.java
+++ b/src/main/java/io/github/dsheirer/audio/IAudioSegmentProvider.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * 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
@@ -19,6 +19,7 @@

 package io.github.dsheirer.audio;

+import io.github.dsheirer.audio.call.AudioSegment;
 import io.github.dsheirer.sample.Listener;

 /**
--- a/src/main/java/io/github/dsheirer/audio/broadcast/AbstractAudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/AbstractAudioBroadcaster.java
@@ -34,9 +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 mDuplicateRejectedAudioCount = 0;
    protected int mErrorAudioCount = 0;
    protected int mAgedOffAudioCount = 0;

@@ -57,14 +55,6 @@ 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
     */
@@ -78,26 +68,10 @@ 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
     */
@@ -164,22 +138,6 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
        mStreamedAudioCount++;
    }

-    /**
-     * Number of audio recordings rejected by the remote service as duplicates.
-     */
-    public int getDuplicateRejectedAudioCount()
-    {
-        return mDuplicateRejectedAudioCount;
-    }
-
-    /**
-     * Increments the duplicate-rejected audio count by one.
-     */
-    public void incrementDuplicateRejectedAudioCount()
-    {
-        mDuplicateRejectedAudioCount++;
-    }
-
    /**
     * Number of audio recordings that were removed for exceeding age limit
     */
--- a/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingBroadcaster.java
@@ -211,17 +211,9 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration

            super.setBroadcastState(state);

-            if(mBroadcastState.get() != null)
+            if(mBroadcastState.get() != null && mBroadcastState.get().isErrorState())
            {
-                if(mBroadcastState.get().isErrorState())
-                {
-                    mLog.error("[" + getStreamName() + "] status: " + mBroadcastState.get().toString());
-                    stop();
-                }
-                else if(mBroadcastState.get().isWarningState())
-                {
-                    mLog.warn("[" + getStreamName() + "] status: " + mBroadcastState.get().toString());
-                }
+                stop();
            }

            if(!connected())
--- a/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingManager.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingManager.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -22,7 +22,10 @@ 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.audio.call.AudioSegment;
+import io.github.dsheirer.audio.call.Call;
+import io.github.dsheirer.audio.call.CompletedCall;
+import io.github.dsheirer.audio.call.ICallEventListener;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.identifier.MutableIdentifierCollection;
@@ -32,14 +35,15 @@ 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 jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
 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;
@@ -47,59 +51,50 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;

 /**
 * Audio streaming manager monitors audio segments through completion and creates temporary streaming recordings on
 * disk and enqueues the temporary recording for streaming.
 */
-public class AudioStreamingManager implements Listener<AudioSegment>
+@Component("audioStreamingManager")
+public class AudioStreamingManager implements ICallEventListener
 {
    private final static Logger mLog = LoggerFactory.getLogger(AudioStreamingManager.class);
-    private LinkedTransferQueue<AudioSegment> mNewAudioSegments = new LinkedTransferQueue<>();
-    private List<AudioSegment> mAudioSegments = new ArrayList<>();
-    private Listener<AudioRecording> mAudioRecordingListener;
-    private BroadcastFormat mBroadcastFormat;
+    @Resource
+    private BroadcastModel mBroadcastModel;
+    @Resource
    private UserPreferences mUserPreferences;
+    private LinkedTransferQueue<CompletedCall> mCompletedCallQueue = new LinkedTransferQueue<>();
+    private List<CompletedCall> mCompletedCalls = new ArrayList<>();
+    private BroadcastFormat mBroadcastFormat = BroadcastFormat.MP3;
    private ScheduledFuture<?> mAudioSegmentProcessorFuture;
    private int mNextRecordingNumber = 1;

    /**
     * Constructs an instance
-     * @param listener to receive completed audio recordings
-     * @param broadcastFormat for temporary recordings
-     * @param userPreferences to manage recording directories
     */
-    public AudioStreamingManager(Listener<AudioRecording> listener, BroadcastFormat broadcastFormat, UserPreferences userPreferences)
+    public AudioStreamingManager()
    {
-        mAudioRecordingListener = listener;
-        mBroadcastFormat = broadcastFormat;
-        mUserPreferences = userPreferences;
-    }
-
-    /**
-     * Primary receive method
-     */
-    @Override
-    public void receive(AudioSegment audioSegment)
-    {
-        mNewAudioSegments.add(audioSegment);
    }

    /**
     * Starts the scheduled audio segment processor
     */
+    @PostConstruct
    public void start()
    {
        if(mAudioSegmentProcessorFuture == null)
        {
-            mAudioSegmentProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(new AudioSegmentProcessor(),
-                0, 250, TimeUnit.MILLISECONDS);
+            mAudioSegmentProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(new CompletedCallProcessor(),
+                    0, 250, TimeUnit.MILLISECONDS);
        }
    }

    /**
     * Stops the scheduled audio segment processor
     */
+    @PreDestroy
    public void stop()
    {
        if(mAudioSegmentProcessorFuture != null)
@@ -108,44 +103,53 @@ public class AudioStreamingManager implements Listener<AudioSegment>
            mAudioSegmentProcessorFuture = null;
        }

-        for(AudioSegment audioSegment: mNewAudioSegments)
+        for(CompletedCall completedCall: mCompletedCallQueue)
        {
-            audioSegment.decrementConsumerCount();
+            completedCall.audioSegment().removeLease(getClass().toString());
        }

-        mNewAudioSegments.clear();
+        mCompletedCallQueue.clear();

-        for(AudioSegment audioSegment: mAudioSegments)
+        for(CompletedCall completedCall: mCompletedCalls)
        {
-            audioSegment.decrementConsumerCount();
+            completedCall.audioSegment().removeLease(getClass().toString());
        }

-        mAudioSegments.clear();
+        mCompletedCalls.clear();
    }

+    /**
+     * Implements the ICallEventListener interface to receive and enqueue completed calls to process for streaming.
+     * @param call that was completed.
+     * @param audioSegment for the call
+     */
+    @Override
+    public void completed(Call call, AudioSegment audioSegment)
+    {
+        mCompletedCallQueue.add(new CompletedCall(call, audioSegment));
+    }
+
+    @Override
+    public void added(Call call) {} //Not implemented
+    @Override
+    public void updated(Call call) {} //Not implemented
+    @Override
+    public void deleted(Call call) {} //Not implemented
+
    /**
     * Main processing method to process audio segments
     */
-    private void processAudioSegments()
+    private void processCompletedCalls()
    {
-        mNewAudioSegments.drainTo(mAudioSegments);
+        CompletedCall completedCall = mCompletedCallQueue.poll();

-        Iterator<AudioSegment> it = mAudioSegments.iterator();
-        AudioSegment audioSegment;
-        while(it.hasNext())
+        while(completedCall != null)
        {
-            audioSegment = it.next();
+            AudioSegment audioSegment = completedCall.audioSegment();

-            if(audioSegment.isDuplicate() && mUserPreferences.getCallManagementPreference().isDuplicateStreamingSuppressionEnabled())
+            if(!(audioSegment.isDuplicate() && mUserPreferences.getCallManagementPreference().isDuplicateStreamingSuppressionEnabled()))
            {
-                it.remove();
-                audioSegment.decrementConsumerCount();
-            }
-            else if(audioSegment.completeProperty().get())
-            {
-                it.remove();
-
-                if(mAudioRecordingListener != null && audioSegment.hasBroadcastChannels())
+                if(mBroadcastModel != null && audioSegment.hasBroadcastChannels())
                {
                    IdentifierCollection identifiers =
                            new IdentifierCollection(audioSegment.getIdentifierCollection().getIdentifiers());
@@ -203,9 +207,10 @@ public class AudioStreamingManager implements Listener<AudioSegment>
                        processAudioSegment(audioSegment, identifiers, audioSegment.getBroadcastChannels());
                    }
                }
-
-                audioSegment.decrementConsumerCount();
            }
+
+            audioSegment.removeLease(getClass().toString());
+            completedCall = mCompletedCallQueue.poll();
        }
    }

@@ -235,7 +240,7 @@ public class AudioStreamingManager implements Listener<AudioSegment>

            AudioRecording audioRecording = new AudioRecording(path, broadcastChannels, identifierCollection,
                    audioSegment.getStartTimestamp(), length);
-            mAudioRecordingListener.receive(audioRecording);
+            mBroadcastModel.receive(audioRecording);
        }
        catch(IOException ioe)
        {
@@ -269,20 +274,20 @@ public class AudioStreamingManager implements Listener<AudioSegment>
    }

    /**
-     * Scheduled runnable to process audio segments.
+     * Scheduled runnable to process completed calls.
     */
-    public class AudioSegmentProcessor implements Runnable
+    public class CompletedCallProcessor implements Runnable
    {
        @Override
        public void run()
        {
            try
            {
-                processAudioSegments();
+                processCompletedCalls();
            }
            catch(Throwable t)
            {
-                mLog.error("Error processing audio segments for streaming", t);
+                mLog.error("Error processing completed calls for streaming", t);
            }
        }
    }
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastEvent.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastEvent.java
@@ -82,7 +82,6 @@ public class BroadcastEvent
        BROADCASTER_QUEUE_CHANGE,
        BROADCASTER_STATE_CHANGE,
        BROADCASTER_STREAMED_COUNT_CHANGE,
-        BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE,
        BROADCASTER_AGED_OFF_COUNT_CHANGE,
        BROADCASTER_ERROR_COUNT_CHANGE,
        BROADCASTER_DELETE,
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -22,16 +22,14 @@ import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyCallBroadcaster;
 import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyCallConfiguration;
 import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyFeedConfiguration;
-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;
 import io.github.dsheirer.audio.broadcast.icecast.IcecastTCPConfiguration;
+import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
+import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
+import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerBroadcaster;
+import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
 import io.github.dsheirer.audio.broadcast.shoutcast.v1.ShoutcastV1AudioBroadcaster;
 import io.github.dsheirer.audio.broadcast.shoutcast.v1.ShoutcastV1Configuration;
 import io.github.dsheirer.audio.broadcast.shoutcast.v2.ShoutcastV2AudioStreamingBroadcaster;
@@ -65,29 +63,26 @@ public class BroadcastFactory
            switch(configuration.getBroadcastServerType())
            {
                case BROADCASTIFY_CALL:
-                    return new BroadcastifyCallBroadcaster((BroadcastifyCallConfiguration)configuration,
-                            inputAudioFormat, mp3Setting, aliasModel);
+                    return new BroadcastifyCallBroadcaster((BroadcastifyCallConfiguration)configuration);
                case RDIOSCANNER_CALL:
-                    return new RdioScannerBroadcaster((RdioScannerConfiguration)configuration,
-                            inputAudioFormat, mp3Setting, aliasModel);
+                    return new RdioScannerBroadcaster((RdioScannerConfiguration)configuration);
                case OPENMHZ:
-                    return new OpenMHzBroadcaster((OpenMHzConfiguration)configuration,
-                        inputAudioFormat, mp3Setting, aliasModel);
+                    return new OpenMHzBroadcaster((OpenMHzConfiguration)configuration);
                case BROADCASTIFY:
                    return new IcecastTCPAudioBroadcaster((BroadcastifyFeedConfiguration) configuration,
-                            inputAudioFormat, mp3Setting, aliasModel);
+                            inputAudioFormat, mp3Setting);
                case ICECAST_TCP:
                    return new IcecastTCPAudioBroadcaster((IcecastTCPConfiguration) configuration, inputAudioFormat,
-                            mp3Setting, aliasModel);
+                            mp3Setting);
                case ICECAST_HTTP:
                    return new IcecastHTTPAudioBroadcaster((IcecastHTTPConfiguration) configuration, inputAudioFormat,
-                            mp3Setting, aliasModel);
+                            mp3Setting);
                case SHOUTCAST_V1:
                    return new ShoutcastV1AudioBroadcaster((ShoutcastV1Configuration) configuration, inputAudioFormat,
-                            mp3Setting, aliasModel);
+                            mp3Setting);
                case SHOUTCAST_V2:
                    return new ShoutcastV2AudioStreamingBroadcaster((ShoutcastV2Configuration) configuration,
-                            inputAudioFormat, mp3Setting, aliasModel);
+                            inputAudioFormat, mp3Setting);
                case UNKNOWN:
                default:
                    mLog.info("Unrecognized broadcastAudio configuration: " + configuration.getBroadcastFormat().name());
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -20,12 +20,13 @@ package io.github.dsheirer.audio.broadcast;

 import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.util.ThreadPool;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -45,9 +46,11 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;

 import javax.swing.table.AbstractTableModel;

+@Component("broadcastModel")
 public class BroadcastModel extends AbstractTableModel implements Listener<AudioRecording>
 {
    private final static Logger mLog = LoggerFactory.getLogger(BroadcastModel.class);
@@ -62,35 +65,36 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
    public static final int COLUMN_BROADCASTER_STATUS = 2;
    public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
    public static final int COLUMN_BROADCASTER_STREAMED_COUNT = 4;
-    public static final int COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT = 5;
-    public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 6;
-    public static final int COLUMN_BROADCASTER_ERROR_COUNT = 7;
+    public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 5;
+    public static final int COLUMN_BROADCASTER_ERROR_COUNT = 6;

    public static final String[] COLUMN_NAMES = new String[]
-        {"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Duplicate Rejected", "Aged Off", "Upload Error"};
+        {"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Aged Off", "Upload Error"};
+
+    @Resource
+    private AliasModel mAliasModel;
+    @Resource
+    private UserPreferences mUserPreferences;

    private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
        FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
    private List<AudioRecording> mRecordingQueue = new CopyOnWriteArrayList<>();
    private Map<Integer,AbstractAudioBroadcaster> mBroadcasterMap = new HashMap<>();
-    private IconModel mIconModel;
-    private AliasModel mAliasModel;
    private Broadcaster<BroadcastEvent> mBroadcastEventBroadcaster = new Broadcaster<>();
    private BroadcastEventListener mBroadcastEventListener = new BroadcastEventListener();
-    private UserPreferences mUserPreferences;

    /**
     * Model for managing Broadcast configurations and any associated broadcaster instances.
     */
-    public BroadcastModel(AliasModel aliasModel, IconModel iconModel, UserPreferences userPreferences)
+    public BroadcastModel()
    {
-        mAliasModel = aliasModel;
-        mIconModel = iconModel;
-        mUserPreferences = userPreferences;
+    }

+    @PostConstruct
+    public void postConstruct()
+    {
        //Monitor to remove temporary recording files that have been streamed by all audio broadcasters
        ThreadPool.SCHEDULED.scheduleAtFixedRate(new RecordingDeletionMonitor(), 15l, 15l, TimeUnit.SECONDS);
-
        removeOrphanedTemporaryRecordings();
    }

@@ -345,13 +349,14 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                deleteBroadcaster(configuredBroadcast);
            }

-            final AbstractAudioBroadcaster audioBroadcaster = BroadcastFactory.getBroadcaster(broadcastConfiguration,
+            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,7 +367,6 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                }

                broadcast(new BroadcastEvent(audioBroadcaster, BroadcastEvent.Event.BROADCASTER_ADD));
-                ThreadPool.CACHED.submit(() -> audioBroadcaster.start());
            }
        }
    }
@@ -532,12 +536,6 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                        fireTableCellUpdated(row, COLUMN_BROADCASTER_STREAMED_COUNT);
                    }
                    break;
-                case BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE:
-                    if(row >= 0)
-                    {
-                        fireTableCellUpdated(row, COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT);
-                    }
-                    break;
                case BROADCASTER_AGED_OFF_COUNT_CHANGE:
                    if(row >= 0)
                    {
@@ -614,12 +612,6 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                                return configuredBroadcast.getAudioBroadcaster().getStreamedAudioCount();
                            }
                            break;
-                        case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
-                            if(configuredBroadcast.hasAudioBroadcaster())
-                            {
-                                return configuredBroadcast.getAudioBroadcaster().getDuplicateRejectedAudioCount();
-                            }
-                            break;
                        case COLUMN_BROADCASTER_AGED_OFF_COUNT:
                            if(configuredBroadcast.hasAudioBroadcaster())
                            {
@@ -656,7 +648,6 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
            case COLUMN_BROADCASTER_AGED_OFF_COUNT:
            case COLUMN_BROADCASTER_QUEUE_SIZE:
            case COLUMN_BROADCASTER_STREAMED_COUNT:
-            case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
            case COLUMN_BROADCASTER_ERROR_COUNT:
                return Integer.class;
            case COLUMN_BROADCAST_SERVER_TYPE:
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -31,9 +31,9 @@ public enum BroadcastServerType
    BROADCASTIFY_CALL("Broadcastify Call", "images/broadcastify.png"),

    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"),
+    OPENMHZ("OpenMHz", "images/openmhz.png"),
+    RDIOSCANNER_CALL("Rdio Scanner", "images/rdioscanner.png"),
    SHOUTCAST_V1("Shoutcast v1.x", "images/shoutcast.png"),
    SHOUTCAST_V2("Shoutcast v2.x", "images/shoutcast.png"),
    UNKNOWN("Unknown", null);
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastState.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastState.java
@@ -23,92 +23,90 @@ public enum BroadcastState
    /**
     * General error in configuration that causes the remote server to reject the connection
     */
-    CONFIGURATION_ERROR("Configuration Error", true, false),
+    CONFIGURATION_ERROR("Configuration Error", true),

    /**
     * Connected to the broadcastAudio server and capable of streaming
     */
-    CONNECTED("Connected", false, false),
+    CONNECTED("Connected", false),

    /**
     * Connection interrupted, attempting to reconnect.
     */
-    CONNECTING("Connecting", false, false),
+    CONNECTING("Connecting", false),

    /**
     * Indicates the configuration is disabled
     */
-    DISABLED("Disabled", true, false),
+    DISABLED("Disabled", true),

    /**
     * Disconnected from the broadcastAudio server
     */
-    DISCONNECTED("Disconnected", false, false),
+    DISCONNECTED("Disconnected", false),

    /**
     * Invalid credentials - user name or password
     */
-    INVALID_CREDENTIALS("Invalid User Name/Password", true, false),
+    INVALID_CREDENTIALS("Invalid User Name/Password", true),

    /**
     * Invalid mount point
     */
-    INVALID_MOUNT_POINT("Invalid Mount/Stream ID", true, false),
+    INVALID_MOUNT_POINT("Invalid Mount/Stream ID", true),

    /**
     * Invalid configuration settings
     */
-    INVALID_SETTINGS("Invalid Settings", true, false),
+    INVALID_SETTINGS("Invalid Settings", true),

    /**
     * Remote server max sources has been exceeded
     */
-    MAX_SOURCES_EXCEEDED("Max Sources Exceeded", false, true),
+    MAX_SOURCES_EXCEEDED("Max Sources Exceeded", true),

    /**
     * Specified mount point is already in use
     */
-    MOUNT_POINT_IN_USE("Mount Point In Use", false, true),
+    MOUNT_POINT_IN_USE("Mount Point In Use", false),

    /**
     * Network is unavailable or the server address cannot be resolved
     */
-    NETWORK_UNAVAILABLE("Network Unavailable", false, false),
+    NETWORK_UNAVAILABLE("Network Unavailable", false),

    /**
     * Server is not known or reachable
     */
-    NO_SERVER("No Server", false, false),
+    NO_SERVER("No Server", false),

    /**
     * Initial state with no connection attempted.
     */
-    READY("Ready", false, false),
+    READY("Ready", false),

    /**
     * Error while broadcasting stream data.  Temporary error state to allow connection to be reset.
     */
-    TEMPORARY_BROADCAST_ERROR("Temporary Broadcast Error", false, false),
+    TEMPORARY_BROADCAST_ERROR("Temporary Broadcast Error", false),

    /**
     * Unsupported audio format
     */
-    UNSUPPORTED_AUDIO_FORMAT("Unsupported Audio Type", true, false),
+    UNSUPPORTED_AUDIO_FORMAT("Unsupported Audio Type", true),

    /**
     * Unspecified error
     */
-    ERROR("Error", true, false);
+    ERROR("Error", true);

    private String mLabel;
    private boolean mErrorState;
-    private boolean mWarningState;

-    BroadcastState(String label, boolean errorState, boolean warningState)
+    BroadcastState(String label, boolean errorState)
    {
        mLabel = label;
        mErrorState = errorState;
-        mWarningState = warningState;
    }

    public String toString()
@@ -120,9 +118,4 @@ public enum BroadcastState
    {
        return mErrorState;
    }
-
-    public boolean isWarningState()
-    {
-        return mWarningState;
-    }
 }
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastStatusPanel.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastStatusPanel.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -20,10 +20,12 @@ package io.github.dsheirer.audio.broadcast;

 import io.github.dsheirer.icon.Icon;
 import io.github.dsheirer.icon.IconModel;
-import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.preference.swing.JTableColumnWidthMonitor;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import net.miginfocom.swing.MigLayout;

 import javax.swing.ImageIcon;
@@ -42,23 +44,15 @@ public class BroadcastStatusPanel extends JPanel
    private JTable mTable;
    private JTableColumnWidthMonitor mColumnWidthMonitor;
    private JScrollPane mScrollPane;
+    @Resource
    private BroadcastModel mBroadcastModel;
-    private UserPreferences mUserPreferences;
-    private String mPreferenceKey;
+    private String mPreferenceKey = "application.broadcast.status.panel";

    /**
     * Constructs an instance
-     * @param broadcastModel to access the streams
-     * @param userPreferences for configuring the panel
-     * @param preferenceKey to store column preferences for this panel.
     */
-    public BroadcastStatusPanel(BroadcastModel broadcastModel, UserPreferences userPreferences, String preferenceKey)
+    public BroadcastStatusPanel()
    {
-        mBroadcastModel = broadcastModel;
-        mUserPreferences = userPreferences;
-        mPreferenceKey = preferenceKey;
-
-        init();
    }

    public JTable getTable()
@@ -66,21 +60,19 @@ public class BroadcastStatusPanel extends JPanel
        return mTable;
    }

-    private void init()
+    @PostConstruct
+    private void postConstruct()
    {
+        setPreferredSize(new Dimension(880, 70));
        setLayout(new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]"));
-
        mTable = new JTable(mBroadcastModel);
-
+        mTable.setEnabled(false);
        DefaultTableCellRenderer renderer = (DefaultTableCellRenderer)mTable.getDefaultRenderer(String.class);
        renderer.setHorizontalAlignment(SwingConstants.CENTER);
-
        mTable.getColumnModel().getColumn(BroadcastModel.COLUMN_BROADCASTER_STATUS).setCellRenderer(new StatusCellRenderer());
        mTable.getColumnModel().getColumn(BroadcastModel.COLUMN_BROADCAST_SERVER_TYPE).setCellRenderer(new ServerTypeRenderer());
-        mColumnWidthMonitor = new JTableColumnWidthMonitor(mUserPreferences, mTable, mPreferenceKey);
-
+        mColumnWidthMonitor = new JTableColumnWidthMonitor(mTable, mPreferenceKey);
        mScrollPane = new JScrollPane(mTable);
-
        add(mScrollPane);
    }

@@ -151,10 +143,7 @@ public class BroadcastStatusPanel extends JPanel
                    else if(state == BroadcastState.DISABLED)
                    {
                        setBackground(table.getBackground());
-                        //Use the LAF's disabled-foreground so the cell reads correctly on any
-                        //theme - LIGHT_GRAY is invisible on a light background.
-                        Color disabled = javax.swing.UIManager.getColor("Label.disabledForeground");
-                        setForeground(disabled != null ? disabled : table.getForeground());
+                        setForeground(Color.LIGHT_GRAY);
                    }
                    else if(state == BroadcastState.INVALID_SETTINGS ||
                            state == BroadcastState.NETWORK_UNAVAILABLE)
--- a/src/main/java/io/github/dsheirer/audio/broadcast/ConfiguredBroadcast.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/ConfiguredBroadcast.java
@@ -37,7 +37,6 @@ public class ConfiguredBroadcast
    private BroadcastConfiguration mBroadcastConfiguration;
    private AbstractAudioBroadcaster mAudioBroadcaster;
    private ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>();
-    private ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();

    /**
     * Constructs an instance
@@ -90,14 +89,6 @@ 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
@@ -105,13 +96,11 @@ 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
        {
@@ -131,7 +120,6 @@ public class ConfiguredBroadcast
            {
                mBroadcastState.setValue(BroadcastState.CONFIGURATION_ERROR);
            }
-            mLastBadBroadcastState.setValue(null);
        }
    }

--- a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyCallBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -20,22 +20,15 @@
 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;
 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.AliasListConfigurationIdentifier;
 import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
@@ -49,7 +42,6 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.LinkedTransferQueue;
@@ -81,18 +73,14 @@ 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
     * @param config to use
-     * @param aliasModel for access to aliases
     */
-    public BroadcastifyCallBroadcaster(BroadcastifyCallConfiguration config, InputAudioFormat inputAudioFormat,
-                                       MP3Setting mp3Setting, AliasModel aliasModel)
+    public BroadcastifyCallBroadcaster(BroadcastifyCallConfiguration config)
    {
        super(config);
-        mAliasModel = aliasModel;
    }

    /**
@@ -254,8 +242,6 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                String radioId = getFrom(audioRecording);
                float frequency = getFrequency(audioRecording);

-                String radioIdAlias = getFromAlias(audioRecording);
-
                BroadcastifyCallBuilder bodyBuilder = new BroadcastifyCallBuilder();
                bodyBuilder.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
                    .addPart(FormField.SYSTEM_ID, getBroadcastConfiguration().getSystemID())
@@ -266,11 +252,6 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                    .addPart(FormField.FREQUENCY, frequency)
                    .addPart(FormField.ENCODING, ENCODING_TYPE_MP3);

-                if(radioIdAlias != null && !radioIdAlias.isEmpty())
-                {
-                    bodyBuilder.addPart(FormField.RADIO_ID_ALIAS, radioIdAlias);
-                }
-
                try
                {
                    HttpRequest request = HttpRequest.newBuilder()
@@ -370,9 +351,6 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
                                else if(urlResponse.startsWith("1 SKIPPED"))
                                {
                                    //Broadcastify is telling us to skip audio upload - someone already uploaded it
-                                    incrementDuplicateRejectedAudioCount();
-                                    broadcast(new BroadcastEvent(BroadcastifyCallBroadcaster.this,
-                                        BroadcastEvent.Event.BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE));
                                    audioRecording.removePendingReplay();
                                }
                                else
@@ -457,58 +435,13 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
        return "0";
    }

-    /**
-     * Resolves the over-the-air talker alias for the FROM (source radio) identifier, acquired in real-time from RF
-     * (e.g. P25 Motorola Talker Alias or DMR Talker Alias). Returns null if no OTA alias was received for this call.
-     * This is sent as the srcId_alias field in Broadcastify uploads.
-     */
-    private static String getFromAlias(AudioRecording audioRecording)
-    {
-        for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
-        {
-            if(identifier instanceof TalkerAliasIdentifier talkerAliasIdentifier)
-            {
-                if(talkerAliasIdentifier.isValid())
-                {
-                    return talkerAliasIdentifier.getValue();
-                }
-            }
-        }
-
-        return null;
-    }
-
    /**
     * Creates a formatted string with the TO identifiers or uses a default of zero (0)
     */
-    private String getTo(AudioRecording audioRecording)
+    private static 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);
--- a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyFeedConfiguration.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyFeedConfiguration.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * 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.
+ *  * ******************************************************************************
+ *  * 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 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;

@@ -32,7 +35,6 @@ public class BroadcastifyFeedConfiguration extends IcecastTCPConfiguration
    private final static Logger mLog = LoggerFactory.getLogger(BroadcastifyFeedConfiguration.class);

    private int mFeedID;
-    private boolean mVerboseLogging = false;

    public BroadcastifyFeedConfiguration()
    {
@@ -121,15 +123,4 @@ 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;
-    }
 }
--- a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/FormField.java
@@ -30,7 +30,6 @@ public enum FormField
    TIMESTAMP("ts"),
    TALKGROUP_ID("tg"),
    RADIO_ID("src"),
-    RADIO_ID_ALIAS("srcId_alias"),
    FREQUENCY("freq"),
    ENCODING("enc"),
    TEST("test");
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastAudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastAudioBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -18,7 +18,6 @@
 */
 package io.github.dsheirer.audio.broadcast.icecast;

-import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.AudioStreamingBroadcaster;
 import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
@@ -28,13 +27,11 @@ import io.github.dsheirer.audio.convert.MP3Setting;
 public abstract class IcecastAudioBroadcaster extends AudioStreamingBroadcaster
 {
    private IBroadcastMetadataUpdater mMetadataUpdater;
-    protected AliasModel mAliasModel;

    public IcecastAudioBroadcaster(BroadcastConfiguration broadcastConfiguration, InputAudioFormat inputAudioFormat,
-                                   MP3Setting mp3Setting, AliasModel aliasModel)
+                                   MP3Setting mp3Setting)
    {
        super(broadcastConfiguration, inputAudioFormat, mp3Setting);
-        mAliasModel = aliasModel;
    }

    /**
@@ -50,7 +47,7 @@ public abstract class IcecastAudioBroadcaster extends AudioStreamingBroadcaster
    {
        if(mMetadataUpdater == null)
        {
-            mMetadataUpdater = new IcecastBroadcastMetadataUpdater(getConfiguration(), mAliasModel);
+            mMetadataUpdater = new IcecastBroadcastMetadataUpdater(getConfiguration());
        }

        return mMetadataUpdater;
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -18,23 +18,12 @@
 */
 package io.github.dsheirer.audio.broadcast.icecast;

-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.IBroadcastMetadataUpdater;
-import io.github.dsheirer.audio.broadcast.icecast.IcecastConfiguration;
-import io.github.dsheirer.audio.broadcast.icecast.IcecastMetadata;
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
@@ -42,7 +31,8 @@ import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdater
 {
@@ -50,6 +40,7 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
    private final static String UTF8 = "UTF-8";
    private HttpClient mHttpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
    private IcecastConfiguration mIcecastConfiguration;
+    @Resource
    private AliasModel mAliasModel;
    private boolean mConnectionLoggingSuppressed = false;

@@ -59,10 +50,9 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
     * broadcaster.  When multiple metadata updates are received prior to completion of the current ongoing update
     * sequence, those updates will be queued and processed in the order received.
     */
-    public IcecastBroadcastMetadataUpdater(IcecastConfiguration icecastConfiguration, AliasModel aliasModel)
+    public IcecastBroadcastMetadataUpdater(IcecastConfiguration icecastConfiguration)
    {
        mIcecastConfiguration = icecastConfiguration;
-        mAliasModel = aliasModel;
    }

    /**
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -26,6 +26,7 @@ import io.github.dsheirer.audio.convert.MP3Setting;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
+import jakarta.annotation.Resource;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.util.Arrays;
@@ -52,18 +53,16 @@ import org.slf4j.LoggerFactory;
 public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 {
    private static final Logger mLog = LoggerFactory.getLogger(IcecastHTTPAudioBroadcaster.class);
-    private static final long CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS = 5000; // 5 seconds
    private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
    private static final String HTTP_1_0_OK_HEX_DUMP = "48 54 54 50 2F 31 2E 30 20 32 30 30 20 4F 4B";
-    private static final String HTTP_1_1_CONTINUE_HEX_DUMP = "48 54 54 50 2F 31 2E 31 20 31 30 30";
-
+    @Resource
+    private AliasModel mAliasModel;
    private NioSocketConnector mSocketConnector;
    private IoSession mStreamingSession = null;
    private Map<String,String> mHTTPHeaders;

    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
@@ -77,9 +76,9 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
     * @param configuration for the Icecast stream
     */
    public IcecastHTTPAudioBroadcaster(IcecastHTTPConfiguration configuration, InputAudioFormat inputAudioFormat,
-                                       MP3Setting mp3Setting, AliasModel aliasModel)
+                                       MP3Setting mp3Setting)
    {
-        super(configuration, inputAudioFormat, mp3Setting, aliasModel);
+        super(configuration, inputAudioFormat, mp3Setting);
    }

    /**
@@ -144,8 +143,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
            if(mSocketConnector == null)
            {
                mSocketConnector = new NioSocketConnector();
-                mSocketConnector.setConnectTimeoutMillis(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
-                mSocketConnector.setConnectTimeoutCheckInterval(1000);
+                mSocketConnector.setConnectTimeoutCheckInterval(10000);

 //                LoggingFilter loggingFilter = new LoggingFilter(IcecastHTTPAudioBroadcaster.class);
 //                loggingFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
@@ -164,58 +162,37 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                {
                    setBroadcastState(BroadcastState.CONNECTING);

-                    try {
+                    try
+                    {
                        ConnectFuture future = mSocketConnector
                            .connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
                                getBroadcastConfiguration().getPort()));
-
-                        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();
-                        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);
-                        }
+                        future.awaitUninterruptibly();
+                        mStreamingSession = future.getSession();
                    }
+                    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");
+                        }
+
+                        disconnect();
+                    }
+
+                    mConnecting.set(false);
                }
            };

@@ -235,11 +212,6 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
        {
            mStreamingSession.closeNow();
        }
-        
-        mLastConnectionAttempt = System.currentTimeMillis();
-        if(!getBroadcastState().isErrorState()) {
-            setBroadcastState(BroadcastState.DISCONNECTED);
-        }
    }

    /**
@@ -263,7 +235,6 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
            {
                mHTTPHeaders = new HashMap<>();
                mHTTPHeaders.put(IcecastHeader.ACCEPT.getValue(), "*/*");
-                mHTTPHeaders.put(IcecastHeader.EXPECT.getValue(), "100-continue");
                mHTTPHeaders.put(IcecastHeader.CONTENT_TYPE.getValue(), getConfiguration().getBroadcastFormat().getValue());
                mHTTPHeaders.put(IcecastHeader.USER_AGENT.getValue(), SystemProperties.getInstance().getApplicationName());
                mHTTPHeaders.put(IcecastHeader.AUTHORIZATION.getValue(), getConfiguration().getBase64EncodedCredentials());
@@ -319,7 +290,6 @@ 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())
            {
@@ -352,10 +322,9 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                {
                    String hexDump = ((ProtocolDecoderException)throwable).getHexdump();

-                    if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP) || hexDump.startsWith(HTTP_1_1_CONTINUE_HEX_DUMP))
+                    if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP))
                    {
                        setBroadcastState(BroadcastState.CONNECTED);
-						mConnectionFailureLogged.set(false);
                    }
                    else
                    {
@@ -374,29 +343,15 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                                    }
                                    else
                                    {
-                                        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);
+                                        mLog.error("String [" + getStreamName() + "] - HTTP 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
@@ -434,15 +389,10 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                switch(response.getStatus())
                {
                    case INFORMATIONAL_CONTINUE:
-                        //Icecast 2.5+ signals that we can start sending audio with 100-continue
-                        setBroadcastState(BroadcastState.CONNECTED);
-                        mConnecting.set(false);
-                        mConnectionFailureLogged.set(false);
                        break;
                    case SUCCESS_OK:
                        setBroadcastState(BroadcastState.CONNECTED);
                        mConnecting.set(false);
-						mConnectionFailureLogged.set(false);
                        break;
                    case CLIENT_ERROR_UNAUTHORIZED:
                        setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
@@ -453,16 +403,9 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                        disconnect();
                        break;
                    default:
-                        /**
-                         * 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());
+                        setBroadcastState(BroadcastState.ERROR);
                        disconnect();
+                        mLog.debug("Unspecified error: " + response.toString() + " Class:" + object.getClass());
                        break;
                }
            }
@@ -506,8 +449,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster

            mMessage = new String(bytes);

-            //Icecast 2.4+ responds with HTTP/1.0 and Icecast 2.5+ responds with HTTP/1.1
-            Pattern pattern = Pattern.compile("HTTP/1\\.[01] (\\d{3})");
+            Pattern pattern = Pattern.compile("HTTP/1.0 (\\d{3})");
            Matcher m = pattern.matcher(mMessage);

            if(m.find())
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastMetadata.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastMetadata.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * 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.
+ *  * ******************************************************************************
+ *  * 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 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;

@@ -22,16 +25,21 @@ 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 java.util.List;
-import java.util.Optional;
+import io.github.dsheirer.properties.SystemProperties;
+import io.github.dsheirer.util.ThreadPool;
 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);
@@ -65,23 +73,13 @@ public class IcecastMetadata

            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())
+                if(aliases != null && !aliases.isEmpty())
                {
-                    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));
-                    }
+                    sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
                }
            }
            else
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -20,7 +20,6 @@ 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;
@@ -28,6 +27,7 @@ import io.github.dsheirer.audio.convert.MP3Setting;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
@@ -40,8 +40,6 @@ 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;
@@ -54,12 +52,12 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
    private static final long RECONNECT_INTERVAL_MILLISECONDS = 3000; //3 seconds
    private static final long CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS = 5000; //5 seconds
    private static final int WRITE_TIMEOUT_SECONDS = 5;
-
+    @Resource
+    private AliasModel mAliasModel;
    private NioSocketConnector mSocketConnector;
    private IoSession mStreamingSession = null;

    private long mLastConnectionAttempt = 0;
-    private boolean mVerboseLogging = false;
    private AtomicBoolean mConnecting = new AtomicBoolean();

    /**
@@ -74,14 +72,9 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
     * @param configuration for the Icecast stream
     */
    public IcecastTCPAudioBroadcaster(IcecastTCPConfiguration configuration, InputAudioFormat inputAudioFormat,
-                                      MP3Setting mp3Setting, AliasModel aliasModel)
+                                      MP3Setting mp3Setting)
    {
-        super(configuration, inputAudioFormat, mp3Setting, aliasModel);
-
-        if(configuration instanceof BroadcastifyFeedConfiguration broadcastify)
-        {
-            mVerboseLogging = broadcastify.isVerboseLogging();
-        }
+        super(configuration, inputAudioFormat, mp3Setting);
    }

    /**
@@ -94,6 +87,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
        {
            if(mInlineActive)
            {
+                byte[] metadata = IcecastMetadata.formatInline(IcecastMetadata.getTitle(identifierCollection, mAliasModel)).getBytes();
                if (mInlineRemaining == -1)
                {
                    mInlineRemaining = mInlineInterval;
@@ -104,34 +98,16 @@ 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);
            }
        }
@@ -158,12 +134,9 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                mSocketConnector = new NioSocketConnector();
                mSocketConnector.getSessionConfig().setWriteTimeout(WRITE_TIMEOUT_SECONDS);

-                if(mVerboseLogging)
-                {
-                    LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
-                    loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
-                    mSocketConnector.getFilterChain().addLast("logger", loggingFilter);
-                }
+//                LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
+//                loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
+//                mSocketConnector.getFilterChain().addLast("logger", loggingFilter);

                mSocketConnector.getFilterChain().addLast("codec",
                    new ProtocolCodecFilter(new IcecastCodecFactory()));
@@ -177,10 +150,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                @Override
                public void run()
                {
-                    if(mVerboseLogging)
-                    {
-                        mLog.info("Attempting connection ...");
-                    }
                    setBroadcastState(BroadcastState.CONNECTING);

                    try
@@ -189,42 +158,19 @@ 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;
@@ -232,22 +178,12 @@ 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
                    }
@@ -256,11 +192,6 @@ 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);
                }
@@ -280,11 +211,6 @@ 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
@@ -293,12 +219,6 @@ 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);
            }

@@ -364,23 +284,12 @@ 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
@@ -404,23 +313,15 @@ 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 message)
+            if(object instanceof String)
            {
-                if(mVerboseLogging)
-                {
-                    mLog.info("Message Received [" + message + "]");
-                }
+                String message = (String) object;

                if(message != null && !message.trim().isEmpty())
                {
@@ -448,15 +349,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                    else
                    {
                        mLog.error("Unrecognized server response:" + message);
-
-                        /**
-                         * 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);
-                        }
+                        setBroadcastState(BroadcastState.ERROR);
                    }
                }
            }
--- a/src/main/java/io/github/dsheirer/audio/broadcast/openmhz/FormField.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/openmhz/FormField.java
@@ -34,8 +34,7 @@
     API_KEY("api_key"),
     SOURCE_LIST("source_list"),
     FREQ_LIST("freq_list"),
-     PATCH_LIST("patch_list"),
-     TALKER_ALIAS("talker_alias");
+     PATCHES("patches");

     private String mHeader;

--- a/src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -27,20 +27,21 @@ 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 jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.URI;
@@ -50,14 +51,11 @@ 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;



@@ -83,18 +81,16 @@ import org.slf4j.LoggerFactory;
         .build();
     private long mLastConnectionAttempt;
     private long mConnectionAttemptInterval = 5000; //Every 5 seconds
+     @Resource
     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)
+     public OpenMHzBroadcaster(OpenMHzConfiguration config)
     {
         super(config);
-         mAliasModel = aliasModel;
     }

     /**
@@ -239,7 +235,6 @@ import org.slf4j.LoggerFactory;
                 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);
@@ -273,8 +268,8 @@ import org.slf4j.LoggerFactory;
                             .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)
+                             // For future use if OpenMHz supports patch information
+                             //.addPart(FormField.PATCHES, patches)
                             .addPart(FormField.SOURCE_LIST, "[{ \"pos\": 0.00, \"src\": " + radioId + "}]");

                         HttpRequest fileRequest = HttpRequest.newBuilder()
@@ -417,40 +412,22 @@ import org.slf4j.LoggerFactory;
      * Creates a formatted string with the TO identifiers or uses a default of zero (0)
      * 
      */
-     private String getTo(AudioRecording audioRecording)
+     private static String getTo(AudioRecording audioRecording)
     {
         Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();

-         if(identifier != null)
+         if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
         {
-             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 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";
@@ -556,28 +533,6 @@ import org.slf4j.LoggerFactory;
        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
@@ -622,7 +577,7 @@ import org.slf4j.LoggerFactory;
             return "No Response";
         }
         catch(Exception e)
-         {  
+         {
            Throwable throwableCause = e.getCause();

            if(throwableCause instanceof ConnectException)
--- a/src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzEditor.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzEditor.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * 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
@@ -19,23 +19,16 @@

 package io.github.dsheirer.audio.broadcast.openmhz;

- import io.github.dsheirer.audio.broadcast.BroadcastServerType;
- import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
- import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
- import io.github.dsheirer.gui.control.IntegerTextField;
+import io.github.dsheirer.audio.broadcast.BroadcastServerType;
+import io.github.dsheirer.gui.control.IntegerTextField;
 import io.github.dsheirer.gui.playlist.streaming.AbstractBroadcastEditor;
-import io.github.dsheirer.playlist.PlaylistManager;
- import javafx.geometry.HPos;
- import javafx.geometry.Insets;
- import javafx.scene.control.Alert;
- 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;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
  * OpenMHz calls API configuration editor
@@ -51,11 +44,9 @@ import io.github.dsheirer.playlist.PlaylistManager;

     /**
      * Constructs an instance
-      * @param playlistManager for accessing the broadcast model
      */
-     public OpenMHzEditor(PlaylistManager playlistManager)
+     public OpenMHzEditor()
     {
-         super(playlistManager);
     }

     @Override
--- a/src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/FormField.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/FormField.java
@@ -36,7 +36,6 @@ public enum FormField
    SOURCES("sources"),
    SYSTEM("system"),
    SYSTEM_LABEL("systemLabel"),
-    TALKER_ALIAS("talkerAlias"),
    TALKGROUP_ID("talkgroup"),
    TALKGROUP_GROUP("talkgroupGroup"),
    TALKGROUP_LABEL("talkgroupLabel"),
--- a/src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/RdioScannerBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/rdioscanner/RdioScannerBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -27,20 +27,18 @@ 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 jakarta.annotation.Resource;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -49,7 +47,6 @@ 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;
@@ -80,18 +77,16 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
        .build();
    private long mLastConnectionAttempt;
    private long mConnectionAttemptInterval = 5000; //Every 5 seconds
+    @Resource
    private AliasModel mAliasModel;

    /**
     * Constructs an instance of the broadcaster
     * @param config to use
-     * @param aliasModel for access to aliases
     */
-    public RdioScannerBroadcaster(RdioScannerConfiguration config, InputAudioFormat inputAudioFormat,
-                                       MP3Setting mp3Setting, AliasModel aliasModel)
+    public RdioScannerBroadcaster(RdioScannerConfiguration config)
    {
        super(config);
-        mAliasModel = aliasModel;
    }

    /**
@@ -229,7 +224,6 @@ 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);
@@ -264,7 +258,6 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
                            .addPart(FormField.TALKGROUP_ID, talkgroup)
                            .addPart(FormField.SOURCE, radioId)
                            .addPart(FormField.FREQUENCY, frequency)
-                            .addPart(FormField.TALKER_ALIAS, talkerAlias)
                            .addPart(FormField.TALKGROUP_LABEL, talkgroupLabel)
                            .addPart(FormField.TALKGROUP_GROUP, talkgroupGroup)
                            .addPart(FormField.SYSTEM_LABEL, systemLabel)
@@ -412,62 +405,26 @@ 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 String getTo(AudioRecording audioRecording)
+    private static String getTo(AudioRecording audioRecording)
    {
        Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();

-        if(identifier != null)
+        if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
        {
-            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 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";
@@ -480,7 +437,6 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
     */
    private String getTalkgroupLabel(AudioRecording audioRecording)
    {
-
        AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
        Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();

@@ -505,7 +461,6 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
     */
    private String getTalkgroupGroup(AudioRecording audioRecording)
    {
-
        AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
        Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();

--- a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -18,7 +18,6 @@
 */
 package io.github.dsheirer.audio.broadcast.shoutcast.v1;

-import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.AudioStreamingBroadcaster;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
@@ -26,6 +25,10 @@ import io.github.dsheirer.audio.convert.InputAudioFormat;
 import io.github.dsheirer.audio.convert.MP3Setting;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.util.ThreadPool;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.mina.core.RuntimeIoException;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.future.ConnectFuture;
@@ -37,11 +40,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class ShoutcastV1AudioBroadcaster extends AudioStreamingBroadcaster
 {
    private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV1AudioBroadcaster.class);
@@ -50,7 +48,6 @@ public class ShoutcastV1AudioBroadcaster extends AudioStreamingBroadcaster
    private NioSocketConnector mSocketConnector;
    private IoSession mStreamingSession = null;
    private IBroadcastMetadataUpdater mMetadataUpdater;
-    private AliasModel mAliasModel;
    private long mLastConnectionAttempt = 0;
    private AtomicBoolean mConnecting = new AtomicBoolean();

@@ -65,10 +62,9 @@ public class ShoutcastV1AudioBroadcaster extends AudioStreamingBroadcaster
     * @param configuration for the Shoutcast stream
     */
    public ShoutcastV1AudioBroadcaster(ShoutcastV1Configuration configuration, InputAudioFormat inputAudioFormat,
-                                       MP3Setting mp3Setting, AliasModel aliasModel)
+                                       MP3Setting mp3Setting)
    {
        super(configuration, inputAudioFormat, mp3Setting);
-        mAliasModel = aliasModel;
    }

    /**
@@ -84,7 +80,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioStreamingBroadcaster
    {
        if(mMetadataUpdater == null)
        {
-            mMetadataUpdater = new ShoutcastV1BroadcastMetadataUpdater(getConfiguration(), mAliasModel);
+            mMetadataUpdater = new ShoutcastV1BroadcastMetadataUpdater(getConfiguration());
        }

        return mMetadataUpdater;
--- a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -29,6 +29,7 @@ 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 jakarta.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
@@ -36,7 +37,6 @@ 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;
@@ -58,6 +58,7 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
    private final static String UTF8 = "UTF-8";

    private ShoutcastV1Configuration mShoutcastV1Configuration;
+    @Resource
    private AliasModel mAliasModel;
    private NioSocketConnector mSocketConnector;
    private AtomicBoolean mUpdating = new AtomicBoolean();
@@ -70,10 +71,9 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
     * broadcaster.  When multiple metadata updates are received prior to completion of the current ongoing update
     * sequence, those updates will be queued and processed in the order received.
     */
-    public ShoutcastV1BroadcastMetadataUpdater(ShoutcastV1Configuration shoutcastV1Configuration, AliasModel aliasModel)
+    public ShoutcastV1BroadcastMetadataUpdater(ShoutcastV1Configuration shoutcastV1Configuration)
    {
        mShoutcastV1Configuration = shoutcastV1Configuration;
-        mAliasModel = aliasModel;
    }

    /**
@@ -212,20 +212,10 @@ 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));
--- a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2AudioStreamingBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2AudioStreamingBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -49,13 +49,13 @@ 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 jakarta.annotation.Resource;
 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;
@@ -72,12 +72,13 @@ public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcas
 {
    private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV2AudioStreamingBroadcaster.class);
    private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
-    private int mMaxPayloadSize = 16377;

+    @Resource
+    private AliasModel mAliasModel;
    private NioSocketConnector mSocketConnector;
    private IoSession mStreamingSession = null;
-    private AliasModel mAliasModel;
    private long mLastConnectionAttempt = 0;
+    private int mMaxPayloadSize = 16377;
    private AtomicBoolean mConnecting = new AtomicBoolean();
    private LinkedTransferQueue<UltravoxMessage> mMetadataMessageQueue = new LinkedTransferQueue<>();

@@ -94,10 +95,9 @@ public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcas
     * @param configuration for the Shoutcast V2 stream
     */
    public ShoutcastV2AudioStreamingBroadcaster(ShoutcastV2Configuration configuration, InputAudioFormat inputAudioFormat,
-                                                MP3Setting mp3Setting, AliasModel aliasModel)
+                                                MP3Setting mp3Setting)
    {
        super(configuration, inputAudioFormat, mp3Setting);
-        mAliasModel = aliasModel;
    }

    public ShoutcastV2Configuration getConfiguration()
@@ -303,23 +303,13 @@ public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcas

                if(to != null)
                {
+                    sbTitle2.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())
+                    if(!aliases.isEmpty())
                    {
-                        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));
-                        }
+                        sbTitle2.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
                    }
                }
                else
--- a/src/main/java/io/github/dsheirer/audio/call/ActiveAudioSegment.java
+++ b/src/main/java/io/github/dsheirer/audio/call/ActiveAudioSegment.java
@@ -0,0 +1,461 @@
+/*
+ * *****************************************************************************
+ * 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.audio.call;
+
+import com.google.common.base.Joiner;
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.audio.AudioFormats;
+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.ChannelNameConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.DecoderTypeConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.FrequencyConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.SiteConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.SystemConfigurationIdentifier;
+import io.github.dsheirer.log.LoggingSuppressor;
+import io.github.dsheirer.preference.UserPreferences;
+import io.github.dsheirer.record.wave.AudioMetadata;
+import io.github.dsheirer.record.wave.AudioMetadataUtils;
+import io.github.dsheirer.record.wave.WaveWriter;
+import io.github.dsheirer.sample.ConversionUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Manages an active audio segment through to completion and provides options for refreshing the associated call
+ * object.
+ */
+public class ActiveAudioSegment
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(ActiveAudioSegment.class);
+    private static final LoggingSuppressor LOGGING_SUPPRESSOR = new LoggingSuppressor(LOGGER);
+    private static final SimpleDateFormat DIRECTORY_SDF = new SimpleDateFormat("yyyyMMdd");
+    private static final SimpleDateFormat FILE_NAME_SDF = new SimpleDateFormat("yyyyMMdd_HHmmss");
+    private static int sFileNameCounter = 1;
+
+    private AudioSegment mAudioSegment;
+    private Call mCall;
+    private UserPreferences mUserPreferences;
+    private WaveWriter mWaveWriter;
+    private Path mPath;
+    private int mAudioBufferPointer = 0;
+
+    /**
+     * Constructs an instance
+     * @param audioSegment
+     * @param call
+     * @param userPreferences for lookup of recording directory
+     */
+    public ActiveAudioSegment(AudioSegment audioSegment, Call call, UserPreferences userPreferences)
+    {
+        mAudioSegment = audioSegment;
+        mAudioSegment.addLease(getClass().toString());
+        mCall = call;
+        mUserPreferences = userPreferences;
+
+        mPath = getAudioRecordingPath();
+        mCall.setFile(mPath.toString());
+    }
+
+    /**
+     * Performs disposal workflow.
+     */
+    public void dispose()
+    {
+        if(mWaveWriter != null)
+        {
+            closeAudio();
+        }
+        mCall.setComplete(true);
+        mAudioSegment.removeLease(getClass().toString());
+        mAudioSegment = null;
+        mCall = null;
+    }
+
+    /**
+     * Audio Segment that is active.
+     * @return audio segment
+     */
+    public AudioSegment getAudioSegment()
+    {
+        return mAudioSegment;
+    }
+
+    /**
+     * Call entity associated with this audio segment
+     * @return call entity
+     */
+    public Call getCall()
+    {
+        return mCall;
+    }
+
+    /**
+     * Indicates if this audio segment is active and continues to receive audio buffer and identifier updates.
+     * @return true if active or false if the audio segment is complete.
+     */
+    public boolean isComplete()
+    {
+        return getAudioSegment().isComplete();
+    }
+
+    /**
+     * Attempts to update/refresh the call entity with details from the audio segment and returns true if any details in
+     * the call entity were updated or false otherwise.
+     * @return status of the update, true if updated or false if no update.
+     */
+    public boolean update()
+    {
+        boolean updated = false;
+        updated |= updateTo(mCall, mAudioSegment.getIdentifierCollection().getToIdentifier(), getAudioSegment().getAliasList());
+        updated |= updateFrom(mCall, mAudioSegment.getIdentifierCollection().getFromIdentifier(), getAudioSegment().getAliasList());
+        updated |= updateDuration(mCall, mAudioSegment.getDuration());
+        updated |= updateFlags(mCall, mAudioSegment);
+        updated |= processAudio();
+        return updated;
+    }
+
+    /**
+     * Generates a unique audio recording file path.
+     * @return audio recording path.
+     */
+    private Path getAudioRecordingPath()
+    {
+        Date now = new Date();
+        String dailyFolder = DIRECTORY_SDF.format(now);
+        Path recordingDirectory = mUserPreferences.getDirectoryPreference().getDirectoryCalls()
+                .resolve(dailyFolder);
+
+        if(!Files.exists(recordingDirectory))
+        {
+            try
+            {
+                Files.createDirectories(recordingDirectory);
+            }
+            catch(IOException ioe)
+            {
+                LOGGING_SUPPRESSOR.error(dailyFolder, 1, "Unable to create daily calls recording " +
+                        "folder [" + dailyFolder + "]", ioe);
+                return null;
+            }
+        }
+
+        int recordingNumber = sFileNameCounter++;
+        String fileName = FILE_NAME_SDF.format(now) + "_call_" + recordingNumber + ".wav";
+        return recordingDirectory.resolve(fileName);
+    }
+
+    /**
+     * Writes any buffered audio to the wave recording.
+     * @return true if the call was updated with the audio recording path.
+     */
+    private boolean processAudio()
+    {
+        boolean updated = false;
+
+        if(mAudioSegment.hasAudio())
+        {
+            if(mWaveWriter == null)
+            {
+                try
+                {
+                    mWaveWriter = new WaveWriter(AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO, mPath);
+                    updated = true;
+                }
+                catch(IOException ioe)
+                {
+                    LOGGER.error("Error creating wave file: " + mPath);
+                }
+            }
+
+            List<float[]> audioBuffers = mAudioSegment.getAudioBuffers();
+            int size = audioBuffers.size();
+
+            if(mWaveWriter != null && size > mAudioBufferPointer)
+            {
+                for(int x = mAudioBufferPointer; x < audioBuffers.size(); x++)
+                {
+                    try
+                    {
+                        mWaveWriter.writeData(ConversionUtils.convertToSigned16BitSamples(audioBuffers.get(x)));
+                    }
+                    catch(IOException ioe)
+                    {
+                        LOGGING_SUPPRESSOR.error("Call Wave Writer", 3, "Error while recording call audio", ioe);
+                    }
+                }
+
+                mAudioBufferPointer = size;
+            }
+        }
+
+        return updated;
+    }
+
+    /**
+     * Writes remaining audio and metadata to wave file and closes the recorder.
+     */
+    public void closeAudio()
+    {
+        processAudio();
+
+        if(mWaveWriter != null)
+        {
+            Map<AudioMetadata,String> metadataMap = AudioMetadataUtils.getMetadataMap(mAudioSegment.getIdentifierCollection(),
+                    mAudioSegment.getAliasList());
+
+            ByteBuffer listChunk = AudioMetadataUtils.getLISTChunk(metadataMap);
+            byte[] id3Bytes = AudioMetadataUtils.getMP3ID3(metadataMap);
+            ByteBuffer id3Chunk = AudioMetadataUtils.getID3Chunk(id3Bytes);
+            try
+            {
+                mWaveWriter.writeMetadata(listChunk, id3Chunk);
+            }
+            catch(IOException ioe)
+            {
+                LOGGING_SUPPRESSOR.error("Metadata Write Error", 3,
+                        "Error writing call ID3 metadata to recording", ioe);
+            }
+
+            try
+            {
+                mWaveWriter.close();
+            }
+            catch(IOException ioe)
+            {
+                LOGGING_SUPPRESSOR.error("Recording Close Error", 3, "Error closing audio wave recording", ioe);
+            }
+
+            mWaveWriter = null;
+        }
+    }
+
+    /**
+     * Utility method to create an initial call instance from an Audio Segment.  Note: this static method is used by
+     * an external database controller so that the call event can be stored in the database before
+     * @param audioSegment
+     * @return
+     */
+    public static Call create(AudioSegment audioSegment)
+    {
+        if(audioSegment == null)
+        {
+            return null;
+        }
+
+        Call call = new Call();
+
+        call.setEventTime(audioSegment.getStartTimestamp());
+
+        Identifier decoder = audioSegment.getIdentifierCollection().getIdentifier(IdentifierClass.CONFIGURATION,
+                Form.DECODER_TYPE, Role.ANY);
+
+        if(decoder instanceof DecoderTypeConfigurationIdentifier dtci)
+        {
+            call.setProtocol(dtci.getValue().toString());
+        }
+
+        Identifier systemId = audioSegment.getIdentifierCollection()
+                .getIdentifier(IdentifierClass.CONFIGURATION, Form.SYSTEM, Role.ANY);
+
+        if(systemId instanceof SystemConfigurationIdentifier sci)
+        {
+            call.setSystem(sci.getValue());
+        }
+
+        Identifier siteId = audioSegment.getIdentifierCollection()
+                .getIdentifier(IdentifierClass.CONFIGURATION, Form.SITE, Role.ANY);
+
+        if(siteId instanceof SiteConfigurationIdentifier siteci)
+        {
+            call.setSite(siteci.getValue());
+        }
+
+        Identifier channelId = audioSegment.getIdentifierCollection()
+                .getIdentifier(IdentifierClass.CONFIGURATION, Form.CHANNEL, Role.ANY);
+
+        if(channelId instanceof ChannelNameConfigurationIdentifier cnci)
+        {
+            call.setChannel(cnci.getValue());
+        }
+
+        Identifier frequency = audioSegment.getIdentifierCollection()
+                .getIdentifier(IdentifierClass.CONFIGURATION, Form.CHANNEL_FREQUENCY, Role.ANY);
+
+        if(frequency instanceof FrequencyConfigurationIdentifier fci)
+        {
+            //Convert Hertz to MegaHertz for the call value.
+            call.setFrequency(fci.getValue() / 1E6d);
+        }
+
+        updateFrom(call, audioSegment.getIdentifierCollection().getFromIdentifier(), audioSegment.getAliasList());
+        updateTo(call, audioSegment.getIdentifierCollection().getToIdentifier(), audioSegment.getAliasList());
+        updateDuration(call, audioSegment.getDuration());
+        updateFlags(call, audioSegment);
+
+        return call;
+    }
+
+    /**
+     * Updates the duplicate, record, stream and other call flags/info
+     * @param call to update
+     * @param audioSegment containing flags/info
+     * @return true if the call is updated.
+     */
+    private static boolean updateFlags(Call call, AudioSegment audioSegment)
+    {
+        boolean updated = false;
+
+        if(call.isDuplicate() ^ audioSegment.isDuplicate())
+        {
+            call.setDuplicate(true);
+            updated = true;
+        }
+
+        if(call.isRecord() ^ audioSegment.recordAudioProperty().get())
+        {
+            call.setRecord(true);
+            updated = true;
+        }
+
+        if(call.isStream() ^ audioSegment.hasBroadcastChannels())
+        {
+            call.setStream(true);
+            updated = true;
+        }
+
+        if(call.getMonitor() != audioSegment.monitorPriorityProperty().get())
+        {
+            call.setMonitor(audioSegment.monitorPriorityProperty().get());
+            updated = true;
+        }
+
+        return updated;
+    }
+
+    /**
+     * Updates the call duration field
+     * @param call to update
+     * @param durationMs value
+     * @return true if the value was updated
+     */
+    private static boolean updateDuration(Call call,  long durationMs)
+    {
+        double durationSeconds = durationMs / 1000.0;
+
+        if(call.getDuration() != durationSeconds)
+        {
+            call.setDuration(durationSeconds);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Updates the FROM identifier value.
+     * @param call to update
+     * @param fromIdentifier value
+     * @param aliasList for alias lookups
+     * @return true if the value was updated
+     */
+    private static boolean updateFrom(Call call, Identifier fromIdentifier, AliasList aliasList)
+    {
+        if(fromIdentifier == null)
+        {
+            return false;
+        }
+
+        if(call.getFromId() == null || call.getFromId().contentEquals(fromIdentifier.toString()))
+        {
+            call.setFromId(fromIdentifier.toString());
+
+            if(aliasList != null)
+            {
+                List<Alias> aliases = aliasList.getAliases(fromIdentifier);
+
+                if(!aliases.isEmpty())
+                {
+                    call.setFromAlias(Joiner.on(";").join(aliases));
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Updates the TO identifier value.
+     * @param call to update
+     * @param toIdentifier value
+     * @return true if the value was updated
+     */
+    private static boolean updateTo(Call call, Identifier toIdentifier, AliasList aliasList)
+    {
+        if(toIdentifier == null)
+        {
+            return false;
+        }
+
+        if(call.getToId() == null || call.getToId().contentEquals(toIdentifier.toString()))
+        {
+            call.setToId(toIdentifier.toString());
+
+            if(aliasList != null)
+            {
+                List<Alias> aliases = aliasList.getAliases(toIdentifier);
+
+                if(!aliases.isEmpty())
+                {
+                    call.setToAlias(Joiner.on(";").join(aliases));
+                }
+            }
+
+            switch(toIdentifier.getForm())
+            {
+                case TALKGROUP -> call.setCallType("Talk Group");
+                case RADIO ->
+                {
+                    LOGGER.info("Private Call detected - TO identifier: " + toIdentifier);
+                    call.setCallType("Private");
+                }
+                case PATCH_GROUP -> call.setCallType("Patch Group");
+                default -> call.setCallType(toIdentifier.getForm().toString());
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+}
--- a/src/main/java/io/github/dsheirer/audio/call/AudioPlaybackControlView.java
+++ b/src/main/java/io/github/dsheirer/audio/call/AudioPlaybackControlView.java
@@ -0,0 +1,241 @@
+/*
+ * *****************************************************************************
+ * 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.call;
+
+import io.github.dsheirer.audio.playbackfx.AudioPlaybackChannelController;
+import io.github.dsheirer.audio.playbackfx.IAudioPlaybackStatusListener;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.scene.control.Separator;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
+import javafx.scene.media.MediaPlayer;
+import javafx.scene.paint.Color;
+import jiconfont.icons.font_awesome.FontAwesome;
+import jiconfont.javafx.IconNode;
+
+/**
+ * Audio playback controller.
+ */
+public class AudioPlaybackControlView extends HBox implements IAudioPlaybackStatusListener
+{
+    private static final int ICON_SIZE = 16;
+    private ObjectProperty<MediaPlayer> mMediaPlayer = new SimpleObjectProperty<>();
+    private ToggleButton mAutoRepeatButton;
+    private ToggleGroup mPlaybackGroup;
+    private ToggleButton mPlayButton;
+    private ToggleButton mPauseButton;
+    private ToggleButton mStopButton;
+    private boolean mUpdating = false;
+
+    /**
+     * Constructs an instance
+     */
+    public AudioPlaybackControlView()
+    {
+        setSpacing(2);
+        Separator separator = new Separator(Orientation.VERTICAL);
+        separator.setPadding(new Insets(0, 5, 0 , 7));
+        getChildren().addAll(getStopButton(), getPlayButton(), getPauseButton(), getAutoRepeatButton());
+        mediaPlayerProperty().addListener((observable, oldValue, newValue) -> updateControls());
+    }
+
+    /**
+     * Implements the IAudioPLaybackStatusListener method to click the stop button when end of media is detected.
+     * @param controller where this occurred.
+     */
+    @Override
+    public void endOfMedia(AudioPlaybackChannelController controller)
+    {
+        getStopButton().setSelected(true);
+    }
+
+    @Override
+    public void playbackStatusUpdated(AudioPlaybackChannelController controller, MediaPlayer.Status previousStatus,
+                                      MediaPlayer.Status currentStatus)
+    {
+        if(currentStatus != null)
+        {
+            switch(currentStatus)
+            {
+                case UNKNOWN:
+                    break;
+                case READY:
+                    break;
+                case PAUSED:
+                    mUpdating = true;
+                    getPauseButton().setSelected(true);
+                    mUpdating = false;
+                    break;
+                case PLAYING:
+                    mUpdating = true;
+                    getPlayButton().setSelected(true);
+                    mUpdating = false;
+                    break;
+                case STOPPED:
+                    mUpdating = true;
+                    getStopButton().setSelected(true);
+                    mUpdating = false;
+                    if(getAutoRepeatButton().isSelected())
+                    {
+                        getPlayButton().setSelected(true);
+                    }
+                    break;
+                case STALLED:
+                case HALTED:
+                case DISPOSED:
+                    System.out.println("Playback is " + currentStatus);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Update the controls when the media player changes
+     */
+    private void updateControls()
+    {
+        boolean disable = mediaPlayerProperty().get() == null;
+        getStopButton().setDisable(disable);
+        getPlayButton().setDisable(disable);
+        getPauseButton().setDisable(disable);
+        getAutoRepeatButton().setDisable(disable);
+    }
+
+    /**
+     * Media player property that can be bound to a media player controller.
+     */
+    public ObjectProperty<MediaPlayer> mediaPlayerProperty()
+    {
+        return mMediaPlayer;
+    }
+
+    /**
+     * Playback toggle buttons group (play, stop, and pause)
+     */
+    private ToggleGroup getPlaybackGroup()
+    {
+        if(mPlaybackGroup == null)
+        {
+            mPlaybackGroup = new ToggleGroup();
+            mPlaybackGroup.selectedToggleProperty().addListener((observable, oldValue, selectedToggle) -> {
+                MediaPlayer mediaPlayer = mediaPlayerProperty().get();
+
+                if(!mUpdating && mediaPlayer != null)
+                {
+                    if(getPlayButton().equals(selectedToggle))
+                    {
+                        mediaPlayer.play();
+                    }
+                    else if(getPauseButton().equals(selectedToggle))
+                    {
+                        mediaPlayer.pause();
+                    }
+                    else if(getStopButton().equals(selectedToggle))
+                    {
+                        mediaPlayer.stop();
+                    }
+                }
+            });
+        }
+
+        return mPlaybackGroup;
+    }
+
+    /**
+     * Play button
+     */
+    private ToggleButton getPlayButton()
+    {
+        if(mPlayButton == null)
+        {
+            mPlayButton = new ToggleButton();
+            mPlayButton.setToggleGroup(getPlaybackGroup());
+            mPlayButton.setTooltip(new Tooltip("Play Audio"));
+            mPlayButton.setDisable(true);
+            IconNode iconNode = new IconNode(FontAwesome.PLAY);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mPlayButton.setGraphic(iconNode);
+        }
+
+        return mPlayButton;
+    }
+
+    /**
+     * Pause button
+     */
+    private ToggleButton getPauseButton()
+    {
+        if(mPauseButton == null)
+        {
+            mPauseButton = new ToggleButton();
+            mPauseButton.setToggleGroup(getPlaybackGroup());
+            mPauseButton.setTooltip(new Tooltip("Pause Audio Playback"));
+            mPauseButton.setDisable(true);
+            IconNode iconNode = new IconNode(FontAwesome.PAUSE);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mPauseButton.setGraphic(iconNode);
+        }
+
+        return mPauseButton;
+    }
+
+    /**
+     * Stop button
+     */
+    private ToggleButton getStopButton()
+    {
+        if(mStopButton == null)
+        {
+            mStopButton = new ToggleButton();
+            mStopButton.setToggleGroup(getPlaybackGroup());
+            mStopButton.setTooltip(new Tooltip("Stop Audio Playback"));
+            mStopButton.setDisable(true);
+            IconNode iconNode = new IconNode(FontAwesome.STOP);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mStopButton.setGraphic(iconNode);
+        }
+
+        return mStopButton;
+    }
+
+    private ToggleButton getAutoRepeatButton()
+    {
+        if(mAutoRepeatButton == null)
+        {
+            mAutoRepeatButton = new ToggleButton();
+            mAutoRepeatButton.setTooltip(new Tooltip("Auto-repeat audio playback"));
+            mAutoRepeatButton.setDisable(true);
+            IconNode iconNode = new IconNode(FontAwesome.REPEAT);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mAutoRepeatButton.setGraphic(iconNode);
+        }
+
+        return mAutoRepeatButton;
+    }
+}
--- a/src/main/java/io/github/dsheirer/audio/call/AudioSegment.java
+++ b/src/main/java/io/github/dsheirer/audio/call/AudioSegment.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * 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
@@ -17,7 +17,7 @@
 * ****************************************************************************
 */

-package io.github.dsheirer.audio;
+package io.github.dsheirer.audio.call;

 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.AliasList;
@@ -27,9 +27,9 @@ 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.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -37,7 +37,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicInteger;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -61,7 +60,7 @@ import org.slf4j.LoggerFactory;
 *
 * Producers will add audio buffers and update identifiers throughout the life-cycle of an audio segment.  The producer
 * will signal the completion of an audio segment by setting the complete property to true.  This allows consumers the
- * option to process the audio buffers throughout the life-cycle of the segment, or to process all the buffers once
+ * option to process the audio buffers throughout the life-cycle of the segment, or to process all of the buffers once
 * the segment is complete.
 */
 public class AudioSegment implements Listener<IdentifierUpdateNotification>
@@ -69,20 +68,19 @@ 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<>());
    private MutableIdentifierCollection mIdentifierCollection = new MutableIdentifierCollection();
    private Broadcaster<IdentifierUpdateNotification> mIdentifierUpdateNotificationBroadcaster = new Broadcaster<>();
    private List<float[]> mAudioBuffers = new CopyOnWriteArrayList();
-    private AtomicInteger mConsumerCount = new AtomicInteger();
    private AliasList mAliasList;
    private long mStartTimestamp = System.currentTimeMillis();
    private long mSampleCount = 0;
    private boolean mDisposing = false;
    private AudioSegment mLinkedAudioSegment;
    private int mTimeslot;
+    private List<String> mLeases = new ArrayList<>();

    /**
     * Constructs an instance
@@ -96,6 +94,50 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
        mIdentifierCollection.setTimeslot(timeslot);
    }

+    /**
+     * Adds a lease to this audio segment.  This audio segment will remain alive until all leases are removed.
+     * @param lease to add
+     */
+    public void addLease(String lease)
+    {
+        synchronized(mLeases)
+        {
+            if(mLeases.contains(lease))
+            {
+                mLog.warn("Attempt to obtain duplicate lease: " + lease);
+            }
+            else
+            {
+                mLeases.add(lease);
+            }
+        }
+    }
+
+    /**
+     * Removes the lease from this audio segment.  Once all leases are removed, the audio segment is disposed.
+     * @param lease to remove
+     */
+    public void removeLease(String lease)
+    {
+        synchronized(mLeases)
+        {
+            if(mLeases.contains(lease))
+            {
+                mLeases.remove(lease);
+            }
+            else
+            {
+                mLog.warn("Attempt to remove a non-existent lease: " + lease);
+            }
+
+            if(mLeases.isEmpty())
+            {
+                mLog.warn("Invoking dispose() on non-leased audio segment - last lease was: " + lease);
+                dispose();
+            }
+        }
+    }
+
    /**
     * Timeslot for this audio segment
     */
@@ -131,25 +173,6 @@ 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.
@@ -170,28 +193,6 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
        return mComplete.get();
    }

-    /**
-     * Duplicate call audio property.  This flag is set to true whenever a duplicate call detection function detects
-     * an audio segment is a duplicate.
-     */
-    public BooleanProperty duplicateProperty()
-    {
-        return mDuplicate;
-    }
-
-    /**
-     * An observable list of broadcast channels for this audio segment.  Broadcast channels are added to this segment
-     * across the life-cycle of the segment.  As each new alias identifier is added to the segment, any broadcast
-     * channels assigned to the alias are added to this list.  The audio segment producer can also add broadcast
-     * channels to this list.
-     *
-     * @return observable set of broadcast channels
-     */
-    public ObservableSet<BroadcastChannel> broadcastChannelsProperty()
-    {
-        return mBroadcastChannels;
-    }
-
    /**
     * Set of broadcast channels from identifier associated aliases for this segment.
     */
@@ -294,7 +295,7 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
     * Adds the collection of identifiers to this segment's identifier collection
     * @param identifiers to pre-load into this audio segment
     */
-    void addIdentifiers(Collection<Identifier> identifiers)
+    public void addIdentifiers(Collection<Identifier> identifiers)
    {
        for(Identifier identifier: identifiers)
        {
@@ -322,24 +323,6 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
        return mAudioBuffers.size();
    }

-    /**
-     * Gets the audio buffer at the specified index
-     * @param index of the buffer to fetch
-     * @return audio buffer
-     * @throws IllegalArgumentException if requested index is not valid
-     */
-    public float[] getAudioBuffer(int index)
-    {
-        if(0 <= index && index < getAudioBufferCount())
-        {
-            return mAudioBuffers.get(index);
-        }
-        else
-        {
-            throw new IllegalArgumentException("Requested audio buffer at index [" + index + "] does not exist");
-        }
-    }
-
    /**
     * Indicates if this audio segment has one or more audio buffers
     */
@@ -360,34 +343,6 @@ public class AudioSegment implements Listener<IdentifierUpdateNotification>
        mLinkedAudioSegment = null;
    }

-    /**
-     * Increments the consumer count to indicate that a consumer is currently processing this segment.  When the
-     * consumer count returns to zero, this indicates that all consumers are finished with the audio segment and the
-     * resources can be reclaimed.
-     *
-     * Consumer count should only be increased by the producer of the audio segment, or if a consumer distributes the
-     * segment to additional consumers.
-     */
-    public void incrementConsumerCount()
-    {
-        mConsumerCount.incrementAndGet();
-    }
-
-    /**
-     * Decrements the consumer count.  Consumers of this audio segment should invoke this method to signal that they
-     * will no longer need this audio segment.  When all consumers are finished with an audio segment, the audio
-     * segment resources will be reclaimed.
-     */
-    public void decrementConsumerCount()
-    {
-        int count = mConsumerCount.decrementAndGet();
-
-        if(count <= 0)
-        {
-            dispose();
-        }
-    }
-
    /**
     * Adds an audio buffer to this segment.  Note the producer of the audio buffer should increment the user count
     * of the buffer prior to adding it to this segment.  This segment will decrement the audio buffer user count once
@@ -407,11 +362,6 @@ 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;
    }
@@ -441,14 +391,6 @@ 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)
--- a/src/main/java/io/github/dsheirer/audio/call/AudioSegmentBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/call/AudioSegmentBroadcaster.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * 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
@@ -16,7 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 * ****************************************************************************
 */
-package io.github.dsheirer.audio;
+package io.github.dsheirer.audio.call;

 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
@@ -41,11 +41,8 @@ public class AudioSegmentBroadcaster<T extends AudioSegment> extends Broadcaster
    {
        for(Listener<T> listener : getListeners())
        {
-            audioSegment.incrementConsumerCount();
+            audioSegment.addLease(listener.getClass().toString());
            listener.receive(audioSegment);
        }
-
-        //Decrement consumer counter for this broadcaster
-        audioSegment.decrementConsumerCount();
    }
 }
--- a/src/main/java/io/github/dsheirer/audio/call/Call.java
+++ b/src/main/java/io/github/dsheirer/audio/call/Call.java
@@ -0,0 +1,495 @@
+/*
+ * *****************************************************************************
+ * 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.audio.call;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import javafx.application.Platform;
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+/**
+ * Call database entity.
+ */
+@Entity
+@Table(name="calls", schema="sdrtrunk")
+public class Call
+{
+    public static final String COLUMN_CALL_TYPE = "callType";
+    public static final String COLUMN_CHANNEL = "channel";
+    public static final String COLUMN_DUPLICATE = "duplicate";
+    public static final String COLUMN_DURATION = "duration";
+    public static final String COLUMN_EVENT_TIME = "eventTime";
+    public static final String COLUMN_FILE = "file";
+    public static final String COLUMN_FREQUENCY = "frequency";
+    public static final String COLUMN_FROM_ALIAS = "fromAlias";
+    public static final String COLUMN_FROM_ID = "fromId";
+    public static final String COLUMN_ID = "id";
+    public static final String COLUMN_MONITOR = "monitor";
+    public static final String COLUMN_PROTOCOL = "protocol";
+    public static final String COLUMN_RECORD = "record";
+    public static final String COLUMN_STREAM = "stream";
+    public static final String COLUMN_TO_ALIAS = "toAlias";
+    public static final String COLUMN_TO_ID = "toId";
+    public static final String COLUMN_SITE = "site";
+    public static final String COLUMN_SYSTEM = "system";
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "id_generator")
+    @SequenceGenerator(name = "id_generator", allocationSize = 1)
+    @Column(name=COLUMN_ID)
+    private long id;
+    @Column(name=COLUMN_CALL_TYPE)
+    private String callType;
+    @Column(name=COLUMN_CHANNEL)
+    private String channel;
+    @Column(name=COLUMN_DUPLICATE)
+    private boolean duplicate;
+    @Column(name=COLUMN_DURATION)
+    private double duration;
+    @Column(name=COLUMN_EVENT_TIME)
+    private long eventTime;
+    @Column(name=COLUMN_FILE)
+    private String file;
+    @Column(name=COLUMN_FREQUENCY)
+    private double frequency;
+    @Column(name=COLUMN_FROM_ALIAS)
+    private String fromAlias;
+    @Column(name=COLUMN_FROM_ID)
+    private String fromId;
+    @Column(name=COLUMN_MONITOR)
+    private int monitor;
+    @Column(name=COLUMN_PROTOCOL)
+    private String protocol;
+    @Column(name=COLUMN_RECORD)
+    private boolean record;
+    @Column(name=COLUMN_SITE)
+    private String site;
+    @Column(name=COLUMN_STREAM)
+    private boolean stream;
+    @Column(name=COLUMN_SYSTEM)
+    private String system;
+    @Column(name=COLUMN_TO_ALIAS)
+    private String toAlias;
+    @Column(name=COLUMN_TO_ID)
+    private String toId;
+
+    @Transient
+    private boolean mComplete = true;
+    @Transient
+    private LongProperty mLastUpdated = new SimpleLongProperty();
+    @Transient
+    private StringProperty mPlaybackChannel = new SimpleStringProperty();
+
+    /**
+     * Constructs an instance
+     */
+    public Call()
+    {
+    }
+
+    /**
+     * Record ID, auto-assigned by the database.
+     * @return id
+     */
+    public long getId()
+    {
+        return id;
+    }
+
+    /**
+     * Timestamp for the event
+     * @return timestamp in milliseconds since epoch
+     */
+    public long getEventTime()
+    {
+        return eventTime;
+    }
+
+    /**
+     * Sets the timestamp
+     * @param eventTime in ms.
+     */
+    public void setEventTime(long eventTime)
+    {
+        this.eventTime = eventTime;
+    }
+
+    /**
+     * From identifier
+     * @return from ID
+     */
+    public String getFromId()
+    {
+        return fromId;
+    }
+
+    /**
+     * Sets the from identifier
+     * @param fromId ID
+     */
+    public void setFromId(String fromId)
+    {
+        this.fromId = fromId;
+        updateTimestamp();
+    }
+
+    /**
+     * From alias
+     * @return from alias
+     */
+    public String getFromAlias()
+    {
+        return fromAlias;
+    }
+
+    /**
+     * Sets the from alias value.
+     * @param fromAlias value
+     */
+    public void setFromAlias(String fromAlias)
+    {
+        this.fromAlias = fromAlias;
+        updateTimestamp();
+    }
+
+    /**
+     * To identifier
+     * @return to
+     */
+    public String getToId()
+    {
+        return toId;
+    }
+
+    /**
+     * Sets the to identifier
+     * @param toId value
+     */
+    public void setToId(String toId)
+    {
+        this.toId = toId;
+        updateTimestamp();
+    }
+
+    /**
+     * To alias value
+     * @return alias value
+     */
+    public String getToAlias()
+    {
+        return toAlias;
+    }
+
+    /**
+     * Sets the to alias value.
+     * @param toAlias value
+     */
+    public void setToAlias(String toAlias)
+    {
+        this.toAlias = toAlias;
+        updateTimestamp();
+    }
+
+    /**
+     * System name
+     * @return name
+     */
+    public String getSystem()
+    {
+        return system;
+    }
+
+    /**
+     * Sets the system name
+     * @param system name
+     */
+    public void setSystem(String system)
+    {
+        this.system = system;
+    }
+
+    /**
+     * Site name
+     * @return site
+     */
+    public String getSite()
+    {
+        return site;
+    }
+
+    /**
+     * Sets the site name
+     * @param site name
+     */
+    public void setSite(String site)
+    {
+        this.site = site;
+    }
+
+    /**
+     * Channel name
+     * @return channel
+     */
+    public String getChannel()
+    {
+        return channel;
+    }
+
+    /**
+     * Sets the channel name
+     * @param channel name
+     */
+    public void setChannel(String channel)
+    {
+        this.channel = channel;
+    }
+
+    /**
+     * Frequency for the channel
+     * @return frequency.
+     */
+    public double getFrequency()
+    {
+        return frequency;
+    }
+
+    /**
+     * Sets the frequency value for the channel.
+     * @param frequency value.
+     */
+    public void setFrequency(double frequency)
+    {
+        this.frequency = frequency;
+    }
+
+    /**
+     * File path for the call
+     * @return file path
+     */
+    public String getFile()
+    {
+        return file;
+    }
+
+    /**
+     * Sets the file path for the call.
+     * @param file path
+     */
+    public void setFile(String file)
+    {
+        this.file = file;
+    }
+
+    /**
+     * Duration of the call in seconds
+     * @return duration seconds
+     */
+    public double getDuration()
+    {
+        return duration;
+    }
+
+    /**
+     * Sets the call duration.
+     * @param duration value in seconds
+     */
+    public void setDuration(double duration)
+    {
+        this.duration = duration;
+        updateTimestamp();
+    }
+
+    /**
+     * Radio protocol
+     * @return protocol
+     */
+    public String getProtocol()
+    {
+        return protocol;
+    }
+
+    /**
+     * Sets the radio protocol
+     * @param protocol for the call
+     */
+    public void setProtocol(String protocol)
+    {
+        this.protocol = protocol;
+    }
+
+    /**
+     * Indicates if this call is complete and will receive no further updates.
+     * @return true if complete.
+     */
+    public boolean isComplete()
+    {
+        return mComplete;
+    }
+
+    /**
+     * Sets the complete status for this call.
+     * @param complete true if complete
+     */
+    public void setComplete(boolean complete)
+    {
+        mComplete = complete;
+        updateTimestamp();
+    }
+
+    /**
+     * Call type
+     * @return call type
+     */
+    public String getCallType()
+    {
+        return callType;
+    }
+
+    /**
+     * Sets the call type
+     * @param callType of call
+     */
+    public void setCallType(String callType)
+    {
+        this.callType = callType;
+    }
+
+    /**
+     * Indicates if this call was flagged as a duplicate
+     * @return true if duplicate
+     */
+    public boolean isDuplicate()
+    {
+        return duplicate;
+    }
+
+    /**
+     * Sets the duplicate flag for this call.
+     * @param duplicate flag
+     */
+    public void setDuplicate(boolean duplicate)
+    {
+        this.duplicate = duplicate;
+    }
+
+    /**
+     * Monitor/listen priority
+     * @return priority where a -1 value is do not monitor.
+     */
+    public int getMonitor()
+    {
+        return monitor;
+    }
+
+    /**
+     * Sets the monitor/listen priority
+     * @param monitor priority
+     */
+    public void setMonitor(int monitor)
+    {
+        this.monitor = monitor;
+    }
+
+    /**
+     * Indicates if the call is recordable/retainable.
+     * @return is recordable
+     */
+    public boolean isRecord()
+    {
+        return record;
+    }
+
+    /**
+     * Sets the record/retain flag.
+     * @param record flag
+     */
+    public void setRecord(boolean record)
+    {
+        this.record = record;
+    }
+
+    /**
+     * Indicates if the call is streamable.
+     * @return streamable
+     */
+    public boolean isStream()
+    {
+        return stream;
+    }
+
+    /**
+     * Sets the stream flag
+     * @param stream flag
+     */
+    public void setStream(boolean stream)
+    {
+        this.stream = stream;
+    }
+
+    /**
+     * Updates the last updated timestamp.
+     */
+    private void updateTimestamp()
+    {
+        if(Platform.isFxApplicationThread())
+        {
+            lastUpdatedProperty().set(System.currentTimeMillis());
+        }
+        else
+        {
+            Platform.runLater(() -> lastUpdatedProperty().set(System.currentTimeMillis()));
+        }
+    }
+
+    /**
+     * Last updated timestamp.  This value is updated each time any attribute in the call record is updated so that
+     * consumer processes can monitor this property to be notified of updates.
+     * @return timestamp of last update in milliseconds.
+     */
+    public LongProperty lastUpdatedProperty()
+    {
+        return mLastUpdated;
+    }
+
+    /**
+     * Current playback channel for this call.
+     * @return current playback channel or null if this call is not being played back.
+     */
+    public StringProperty playbackChannelProperty()
+    {
+        return mPlaybackChannel;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return obj instanceof Call c && getId() == c.getId();
+    }
+}
+
--- a/src/main/java/io/github/dsheirer/audio/call/CallRepository.java
+++ b/src/main/java/io/github/dsheirer/audio/call/CallRepository.java
@@ -0,0 +1,63 @@
+/*
+ * *****************************************************************************
+ * 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.audio.call;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+/**
+ * Calls database repository
+ */
+public interface CallRepository extends JpaRepository<Call,Long>
+{
+    @Query("SELECT t FROM Call t WHERE t.toId like ?1 OR t.toAlias like ?1 OR t.fromId like ?1 OR t.fromAlias like ?1")
+    Page<Call> findByAnyIdWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.toId like ?1 OR t.toAlias like ?1")
+    Page<Call> findByToWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.fromId like ?1 OR t.fromAlias like ?1")
+    Page<Call> findByFromWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.callType like ?1")
+    Page<Call> findByCallTypeWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.channel like ?1")
+    Page<Call> findByChannelWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.protocol like ?1")
+    Page<Call> findByProtocolWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.site like ?1")
+    Page<Call> findBySiteWithPagination(String value, Pageable pageable);
+
+    @Query("SELECT t FROM Call t WHERE t.system like ?1")
+    Page<Call> findBySystemWithPagination(String value, Pageable pageable);
+
+    /**
+     * Find all calls between the timestamp range arguments.
+     * @param start timestamp
+     * @param end timestamp
+     * @return pageable set of calls.
+     */
+    Page<Call> findCallsByEventTimeBetweenOrderByEventTime(long start, long end, Pageable pageable);
+}
--- a/src/main/java/io/github/dsheirer/audio/call/CallView.java
+++ b/src/main/java/io/github/dsheirer/audio/call/CallView.java
@@ -0,0 +1,971 @@
+/*
+ * *****************************************************************************
+ * 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.audio.call;
+
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.audio.AudioManager;
+import io.github.dsheirer.audio.playbackfx.AudioPlaybackChannelController;
+import io.github.dsheirer.audio.playbackfx.AudioPlaybackController;
+import io.github.dsheirer.audio.playbackfx.PlaybackMode;
+import io.github.dsheirer.gui.control.TimestampTableCellFactory;
+import io.github.dsheirer.gui.javafx.table.TableColumnEditor;
+import io.github.dsheirer.gui.javafx.table.TableViewColumnController;
+import io.github.dsheirer.source.mixer.MixerChannel;
+import io.github.dsheirer.util.ThreadPool;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import javafx.application.Platform;
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.Separator;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.util.Callback;
+import jiconfont.icons.elusive.Elusive;
+import jiconfont.icons.font_awesome.FontAwesome;
+import jiconfont.javafx.IconNode;
+import org.controlsfx.control.textfield.TextFields;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Audio call events playback and audio event database control/view.
+ */
+public class CallView extends VBox implements IPageRequestListener
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(CallView.class);
+    private static final Sort DEFAULT_SORT = Sort.by("eventTime").descending();
+
+    @Resource
+    private AudioManager mAudioManager;
+    @Resource
+    private CallRepository mCallRepository;
+    @Resource
+    private AudioPlaybackController mAudioPlaybackController;
+
+    private CallEventListener mCallEventListener = new CallEventListener();
+    private SortOrderListener mSortOrderListener = new SortOrderListener();
+    private ObservableList<Call> mCalls = FXCollections.observableArrayList();
+    private TableView<Call> mCallTableView;
+    private TableViewColumnController mCallTableViewMonitor;
+    private ProgressIndicator mPlaceholderProgressIndicator;
+    private HBox mSearchBox;
+    private HBox mPagingBox;
+    private TextField mSearchField;
+    private PagingController mPagingController;
+    private ComboBox<Integer> mPageSizeComboBox;
+    private Label mCallsCountLabel;
+    private LongProperty mCallCount = new SimpleLongProperty();
+    private Sort mSort = DEFAULT_SORT;
+    private ComboBox<SearchColumn> mSearchColumnComboBox;
+    private CheckBox mSearchExactCheckBox;
+    private AudioPlaybackControlView mAudioPlaybackControlView;
+    private Button mAutoModeLeftButton;
+    private Button mAutoModeRightButton;
+    private Button mLockModeLeftButton;
+    private Button mLockModeRightButton;
+    private TableColumnEditor mTableColumnEditor;
+    private SplitPane mTableSplitPane;
+    private Button mConfigureColumnsButton;
+
+    /**
+     * Constructs an instance
+     */
+    public CallView()
+    {
+        mCallCount.addListener((observable, oldValue, newValue) -> {
+            getCallsCountLabel().setText("Calls: " + newValue);
+            int pageCount = (int)(mCallCount.get() / getPageSize());
+            if(mCallCount.get() % getPageSize() != 0)
+            {
+                pageCount++;
+            }
+            getPagingController().update(getPagingController().getCurrentPage(), pageCount);
+        });
+    }
+
+    /**
+     * Post instantiation/startup steps.
+     */
+    @PostConstruct
+    public void postConstruct()
+    {
+        //Register the audio playback control view as a playback status listener with the primary audio channel controller
+        mAudioPlaybackController.getPrimaryController().add(getAudioPlaybackControlView());
+
+        HBox controlBox = new HBox();
+        controlBox.setAlignment(Pos.CENTER);
+        controlBox.setSpacing(2);
+        controlBox.setPadding(new Insets(5, 5, 5, 5));
+        getAudioPlaybackControlView().setAlignment(Pos.CENTER_LEFT);
+        HBox.setHgrow(getSearchBox(), Priority.ALWAYS);
+        getSearchBox().setAlignment(Pos.CENTER_RIGHT);
+
+        Separator separator1 = new Separator(Orientation.VERTICAL);
+        separator1.setPadding(new Insets(0, 10, 0, 10));
+        Separator separator2 = new Separator(Orientation.VERTICAL);
+        separator2.setPadding(new Insets(0, 10, 0, 10));
+        Label autoLabel = new Label("Auto:");
+        Label lockLabel = new Label("Lock:");
+        getSearchExactCheckBox().setPadding(new Insets(0, 10, 0, 0));
+        controlBox.getChildren().addAll(getAudioPlaybackControlView(), separator1, autoLabel, getAutoModeLeftButton(),
+                getAutoModeRightButton(), separator2, lockLabel, getLockModeLeftButton(), getLockModeRightButton(),
+                getSearchBox(), getConfigureColumnsButton());
+
+        getTableColumnEditor().closedProperty().addListener((observable, previouslyClosed, closed) -> {
+            if(closed && !previouslyClosed)
+            {
+                getTableSplitPane().getItems().remove(getTableColumnEditor());
+            }
+        });
+
+        VBox.setVgrow(getTableSplitPane(), Priority.ALWAYS);
+        getChildren().addAll(controlBox, getTableSplitPane(), getPagingBox());
+
+        getPagingController().setPadding(new Insets(5, 5, 5, 5));
+        getPagingController().update(1, 20);
+
+        //Register for call event notifications
+        mAudioManager.add(mCallEventListener);
+
+        getPlaceholderProgressIndicator().setVisible(true);
+    }
+
+    /**
+     * Pre-destruction or shutdown steps
+     */
+    @PreDestroy
+    public void preDestroy()
+    {
+        //De-register from call event notifications
+        mAudioManager.remove(mCallEventListener);
+    }
+
+    /**
+     * Shows first page of results.
+     */
+    private void showFirstPage()
+    {
+        showPage(1);
+    }
+
+    /**
+     * Sets the page to view.  This implements the IPageRequestListener interface.
+     * @param page number to display.
+     */
+    @Override
+    public void showPage(int page)
+    {
+        if(page >= 1)
+        {
+            Platform.runLater(() -> getPlaceholderProgressIndicator().setVisible(true));
+
+            final String searchTerm = getSearchField().getText();
+            final SearchColumn searchColumn = getSearchColumnComboBox().getSelectionModel().getSelectedItem();
+            final boolean wildcard = !getSearchExactCheckBox().isSelected();
+
+            //Spin the query off onto a cached thread and then place the results back onto the FX thread.
+            ThreadPool.CACHED.submit(() ->
+            {
+                final PageRequest pageRequest = PageRequest.of(page - 1, getPageSize(), mSort);
+
+                try
+                {
+                    Page<Call> callPage = null;
+
+                    if(searchTerm != null && !searchTerm.isEmpty() && searchColumn != null)
+                    {
+                        final String wildcardSearch = (wildcard ? "%" : "") + searchTerm + (wildcard ? "%" : "");
+
+                        switch(searchColumn)
+                        {
+                            case ANY_ID ->  callPage = mCallRepository.findByAnyIdWithPagination(wildcardSearch, pageRequest);
+                            case CALL_TYPE -> callPage = mCallRepository.findByCallTypeWithPagination(wildcardSearch, pageRequest);
+                            case CHANNEL -> callPage = mCallRepository.findByChannelWithPagination(wildcardSearch, pageRequest);
+                            case FROM -> callPage = mCallRepository.findByFromWithPagination(wildcardSearch, pageRequest);
+                            case PROTOCOL -> callPage = mCallRepository.findByProtocolWithPagination(wildcardSearch, pageRequest);
+                            case SITE -> callPage = mCallRepository.findBySiteWithPagination(wildcardSearch, pageRequest);
+                            case SYSTEM -> callPage = mCallRepository.findBySystemWithPagination(wildcardSearch, pageRequest);
+                            case TO -> callPage = mCallRepository.findByToWithPagination(wildcardSearch, pageRequest);
+                        }
+                    }
+                    else
+                    {
+                        callPage = mCallRepository.findAll(pageRequest);
+                    }
+
+                    if(callPage != null)
+                    {
+                        final Page<Call> finalCallPage = callPage;
+
+                        Platform.runLater(() -> {
+                            mCalls.clear();
+                            mCalls.addAll(finalCallPage.stream().toList());
+                            getPlaceholderProgressIndicator().setVisible(false);
+                            getPagingController().update(finalCallPage.getNumber() + 1, finalCallPage.getTotalPages());
+                            mCallCount.set(finalCallPage.getTotalElements());
+                        });
+                    }
+                }
+                catch(Throwable t)
+                {
+                    LOGGER.error("Error submitting paging [" + page + "] query to database", t);
+
+                    Platform.runLater(() -> {
+                        getPlaceholderProgressIndicator().setVisible(false);
+                        Alert alert = new Alert(Alert.AlertType.ERROR);
+                        if(getParent() != null)
+                        {
+                            alert.initOwner(getParent().getScene().getWindow());
+                        }
+                        alert.setHeaderText("Database Error!");
+                        alert.setContentText("Error retrieving page " + page + " from the database - reason: " + t.getMessage());
+                        alert.showAndWait();
+                    });
+                }
+            });
+        }
+        else
+        {
+            LOGGER.warn("Invalid page [" + page + "] number request");
+        }
+    }
+
+    /**
+     * Updates the sort order for the table and resets the page to page 1.
+     */
+    private void updateSortOrder()
+    {
+        mSort = null;
+
+        for(TableColumn<Call,?> tableColumn: getCallTableView().getSortOrder())
+        {
+            Sort columnSort = Sort.by(tableColumn.getId());
+            if(tableColumn.getSortType() == TableColumn.SortType.DESCENDING)
+            {
+                columnSort = columnSort.descending();
+            }
+
+            if(mSort == null)
+            {
+                mSort = columnSort;
+            }
+            else
+            {
+                mSort = mSort.and(columnSort);
+            }
+        }
+
+        if(mSort == null)
+        {
+            mSort = DEFAULT_SORT;
+        }
+
+        showFirstPage();
+    }
+
+    /**
+     * Current page size
+     */
+    private int getPageSize()
+    {
+        return getPageSizeComboBox().getValue();
+    }
+
+    /**
+     * Configure column order and visibility button
+     */
+    private Button getConfigureColumnsButton()
+    {
+        if(mConfigureColumnsButton == null)
+        {
+            mConfigureColumnsButton = new Button();
+            mConfigureColumnsButton.setTooltip(new Tooltip("Configure call table column ordering and visibility"));
+            IconNode icon = new IconNode(FontAwesome.COG);
+            mConfigureColumnsButton.setGraphic(icon);
+            mConfigureColumnsButton.setOnAction(event -> {
+                //Set the split pane to expose the column configuration panel.
+                if(!getTableSplitPane().getItems().contains(getTableColumnEditor()))
+                {
+                    getTableSplitPane().getItems().add(getTableColumnEditor());
+                }
+                getTableColumnEditor().closedProperty().set(false);
+                double splitWidth = getTableSplitPane().getWidth();
+                double scale = 0.5;
+                if(splitWidth > 260)
+                {
+                    scale = (splitWidth - 260) / splitWidth;
+                }
+                getTableSplitPane().setDividerPosition(0, scale);
+            });
+        }
+
+        return mConfigureColumnsButton;
+    }
+
+    /**
+     * Split pane for call table and table column editor
+     */
+    private SplitPane getTableSplitPane()
+    {
+        if(mTableSplitPane == null)
+        {
+            mTableSplitPane = new SplitPane(getCallTableView());
+        }
+
+        return mTableSplitPane;
+    }
+
+    /**
+     * Table column order/visibility editor
+     */
+    private TableColumnEditor getTableColumnEditor()
+    {
+        if(mTableColumnEditor == null)
+        {
+            mTableColumnEditor = new TableColumnEditor(getCallTableView(), mCallTableViewMonitor);
+        }
+
+        return mTableColumnEditor;
+    }
+
+    /**
+     * Sets playback mode to auto
+     */
+    private Button getAutoModeLeftButton()
+    {
+        if(mAutoModeLeftButton == null)
+        {
+            mAutoModeLeftButton = new Button("Left");
+            mAutoModeLeftButton.setTooltip(new Tooltip("Set left audio channel to auto playback mode"));
+            AudioPlaybackChannelController left = mAudioPlaybackController.getChannelController(MixerChannel.LEFT);
+            mAutoModeLeftButton.disableProperty().bind(left.playbackModeProperty().isEqualTo(PlaybackMode.AUTO));
+            mAutoModeLeftButton.setOnAction(event -> {
+                final AudioPlaybackChannelController controller = mAudioPlaybackController.getChannelController(MixerChannel.LEFT);
+                if(controller != null)
+                {
+                    getCallTableView().getSelectionModel().clearSelection();
+                    controller.auto();
+                }
+            });
+        }
+
+        return mAutoModeLeftButton;
+    }
+
+    /**
+     * Sets playback mode to auto
+     */
+    private Button getAutoModeRightButton()
+    {
+        if(mAutoModeRightButton == null)
+        {
+            mAutoModeRightButton = new Button("Right");
+            mAutoModeRightButton.setTooltip(new Tooltip("Set right audio channel to auto playback mode"));
+            AudioPlaybackChannelController right = mAudioPlaybackController.getChannelController(MixerChannel.RIGHT);
+            mAutoModeRightButton.disableProperty().bind(right.playbackModeProperty().isEqualTo(PlaybackMode.AUTO));
+            mAutoModeRightButton.setOnAction(event -> {
+                final AudioPlaybackChannelController controller = mAudioPlaybackController.getChannelController(MixerChannel.RIGHT);
+                if(controller != null)
+                {
+                    getCallTableView().getSelectionModel().clearSelection();
+                    controller.auto();
+                }
+            });
+        }
+
+        return mAutoModeRightButton;
+    }
+
+    /**
+     * Sets playback mode to auto - locked to the currently selected TO identifier to the left channel
+     */
+    private Button getLockModeLeftButton()
+    {
+        if(mLockModeLeftButton == null)
+        {
+            mLockModeLeftButton = new Button("Left");
+            mLockModeLeftButton.setTooltip(new Tooltip("Lock the left audio channel for auto playback of selected call talkgroup"));
+            mLockModeLeftButton.setDisable(true);
+            mLockModeLeftButton.setOnAction(event -> {
+                final AudioPlaybackChannelController left = mAudioPlaybackController.getChannelController(MixerChannel.LEFT);
+                if(left != null)
+                {
+                    final Call selected = getCallTableView().getSelectionModel().getSelectedItem();
+                    getCallTableView().getSelectionModel().clearSelection();
+                    getLockModeLeftButton().setDisable(true);
+
+                    if(selected != null)
+                    {
+                        //If the right controller is locked for this same call, reset it to auto so that only 1 is locked
+                        final AudioPlaybackChannelController right = mAudioPlaybackController.getChannelController(MixerChannel.RIGHT);
+                        if(right.isLockedFor(selected))
+                        {
+                            right.auto();
+                        }
+
+                        left.lockAutoTo(selected.getToId(), selected.getSystem());
+                    }
+                    else
+                    {
+                        left.auto();
+                    }
+                }
+            });
+        }
+
+        return mLockModeLeftButton;
+    }
+
+    /**
+     * Sets playback mode to auto - locked to the currently selected TO identifier to the left channel
+     */
+    private Button getLockModeRightButton()
+    {
+        if(mLockModeRightButton == null)
+        {
+            mLockModeRightButton = new Button("Right");
+            mLockModeRightButton.setTooltip(new Tooltip("Lock the left audio channel for auto playback of selected call talkgroup"));
+            mLockModeRightButton.setDisable(true);
+            mLockModeRightButton.setOnAction(event -> {
+                final AudioPlaybackChannelController right = mAudioPlaybackController.getChannelController(MixerChannel.RIGHT);
+                if(right != null)
+                {
+                    final Call selected = getCallTableView().getSelectionModel().getSelectedItem();
+                    getCallTableView().getSelectionModel().clearSelection();
+                    getLockModeRightButton().setDisable(true);
+
+                    if(selected != null)
+                    {
+                        //If the left controller is locked for this same call, reset it to auto so that only 1 is locked
+                        final AudioPlaybackChannelController left = mAudioPlaybackController.getChannelController(MixerChannel.RIGHT);
+                        if(left.isLockedFor(selected))
+                        {
+                            left.auto();
+                        }
+
+                        right.lockAutoTo(selected.getToId(), selected.getSystem());
+                    }
+                    else
+                    {
+                        right.auto();
+                    }
+                }
+            });
+        }
+
+        return mLockModeRightButton;
+    }
+
+    /**
+     * Audio playback control view.
+     */
+    private AudioPlaybackControlView getAudioPlaybackControlView()
+    {
+        if(mAudioPlaybackControlView == null)
+        {
+            mAudioPlaybackControlView = new AudioPlaybackControlView();
+        }
+
+        return mAudioPlaybackControlView;
+    }
+
+    /**
+     * Calls label to display the number of calls in the database.
+     */
+    private Label getCallsCountLabel()
+    {
+        if(mCallsCountLabel == null)
+        {
+            mCallsCountLabel = new Label("Calls: 0");
+        }
+
+        return mCallsCountLabel;
+    }
+
+    /**
+     * Toggles wildcard searching
+     * @return true for exact match or false for wildcard/fuzzy matching.
+     */
+    private CheckBox getSearchExactCheckBox()
+    {
+        if(mSearchExactCheckBox == null)
+        {
+            mSearchExactCheckBox = new CheckBox("Exact Match");
+            mSearchExactCheckBox.setTooltip(new Tooltip("Toggle exact matching (checked) or wildcard/fuzzy " +
+                    "matching (unchecked)"));
+            mSearchExactCheckBox.selectedProperty().addListener((observable, oldValue, newValue) -> showFirstPage());
+        }
+
+        return mSearchExactCheckBox;
+    }
+
+    /**
+     * Page size selection combo box.
+     *
+     * Note: when the user changes the page size, we always request page 1 again.
+     */
+    private ComboBox<Integer> getPageSizeComboBox()
+    {
+        if(mPageSizeComboBox == null)
+        {
+            ObservableList<Integer> pageSizes = FXCollections.observableArrayList();
+            pageSizes.addAll(25, 50, 100, 200);
+            mPageSizeComboBox = new ComboBox<>(pageSizes);
+            mPageSizeComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> showFirstPage());
+            mPageSizeComboBox.setTooltip(new Tooltip("Select the page size"));
+            mPageSizeComboBox.getSelectionModel().select(0);
+        }
+
+        return mPageSizeComboBox;
+    }
+
+    /**
+     * Page size selection combo box.
+     *
+     * Note: when the user changes the page size, we always request page 1 again.
+     */
+    private ComboBox<SearchColumn> getSearchColumnComboBox()
+    {
+        if(mSearchColumnComboBox == null)
+        {
+            mSearchColumnComboBox = new ComboBox<>(FXCollections.observableArrayList(SearchColumn.values()));
+            mSearchColumnComboBox.getSelectionModel().select(SearchColumn.ANY_ID);
+            mSearchColumnComboBox.setTooltip(new Tooltip("Select the field(s) to search against"));
+        }
+
+        return mSearchColumnComboBox;
+    }
+
+    /**
+     * Paging controls panel
+     */
+    private HBox getPagingBox()
+    {
+        if(mPagingBox == null)
+        {
+            mPagingBox = new HBox();
+            mPagingBox.setAlignment(Pos.CENTER_LEFT);
+            mPagingBox.setSpacing(3);
+            Label pageSizeLabel = new Label("Page Size:");
+            pageSizeLabel.setPadding(new Insets(0, 2, 0, 10));
+            getCallsCountLabel().setPadding(new Insets(0, 0, 0, 10));
+            mPagingBox.getChildren().addAll(getPagingController(), pageSizeLabel, getPageSizeComboBox(), getCallsCountLabel());
+        }
+
+        return mPagingBox;
+    }
+
+    /**
+     * Call table view
+     * @return
+     */
+    private TableView<Call> getCallTableView()
+    {
+        if(mCallTableView == null)
+        {
+            mCallTableView = new TableView<>(mCalls);
+            mCallTableView.setMaxWidth(Double.MAX_VALUE);
+
+            TableColumn playbackColumn = new TableColumn();
+            playbackColumn.setSortable(false);
+            playbackColumn.setId("playback");
+            playbackColumn.sortTypeProperty().addListener(mSortOrderListener);
+            IconNode iconNode = new IconNode(Elusive.VOLUME_UP);
+            iconNode.setIconSize(16);
+            iconNode.setFill(Color.BLACK);
+            playbackColumn.setGraphic(iconNode);
+            playbackColumn.setCellValueFactory(new PropertyValueFactory<>("playbackChannel"));
+            playbackColumn.setPrefWidth(40);
+
+            TableColumn eventTimeColumn = new TableColumn();
+            eventTimeColumn.setId("eventTime");
+            eventTimeColumn.sortTypeProperty().addListener(mSortOrderListener);
+            eventTimeColumn.setText("Date/Time");
+            eventTimeColumn.setCellValueFactory(new PropertyValueFactory<Call, Long>(Call.COLUMN_EVENT_TIME));
+            eventTimeColumn.setCellFactory(new TimestampTableCellFactory<Call>());
+            eventTimeColumn.setPrefWidth(160);
+
+            TableColumn durationColumn = new TableColumn();
+            durationColumn.setId("duration");
+            durationColumn.sortTypeProperty().addListener(mSortOrderListener);
+            durationColumn.setText("Duration");
+            durationColumn.setCellValueFactory(new PropertyValueFactory<Call, Double>(Call.COLUMN_DURATION));
+            durationColumn.setPrefWidth(70);
+
+            TableColumn callTypeColumn = new TableColumn();
+            callTypeColumn.setId("callType");
+            callTypeColumn.sortTypeProperty().addListener(mSortOrderListener);
+            callTypeColumn.setText("Type");
+            callTypeColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_CALL_TYPE));
+            callTypeColumn.setPrefWidth(85);
+
+            TableColumn toIdColumn = new TableColumn();
+            toIdColumn.setId("toId");
+            toIdColumn.sortTypeProperty().addListener(mSortOrderListener);
+            toIdColumn.setText("To");
+            toIdColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_TO_ID));
+            toIdColumn.setPrefWidth(80);
+
+            TableColumn toAliasColumn = new TableColumn();
+            toAliasColumn.setId("toAlias");
+            toAliasColumn.sortTypeProperty().addListener(mSortOrderListener);
+            toAliasColumn.setText("To Alias");
+            toAliasColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_TO_ALIAS));
+            toAliasColumn.setPrefWidth(100);
+
+            TableColumn fromIdColumn = new TableColumn();
+            fromIdColumn.setId("fromId");
+            fromIdColumn.sortTypeProperty().addListener(mSortOrderListener);
+            fromIdColumn.setText("From");
+            fromIdColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_FROM_ID));
+            fromIdColumn.setPrefWidth(70);
+
+            TableColumn fromAliasColumn = new TableColumn();
+            fromAliasColumn.setId("fromAlias");
+            fromAliasColumn.sortTypeProperty().addListener(mSortOrderListener);
+            fromAliasColumn.setText("From Alias");
+            fromAliasColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_FROM_ALIAS));
+            fromAliasColumn.setPrefWidth(100);
+
+            TableColumn protocolColumn = new TableColumn();
+            protocolColumn.setId("protocol");
+            protocolColumn.sortTypeProperty().addListener(mSortOrderListener);
+            protocolColumn.setText("Protocol");
+            protocolColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_PROTOCOL));
+            protocolColumn.setPrefWidth(90);
+
+            TableColumn frequencyColumn = new TableColumn();
+            frequencyColumn.setId("frequency");
+            frequencyColumn.sortTypeProperty().addListener(mSortOrderListener);
+            frequencyColumn.setText("Frequency");
+            frequencyColumn.setCellValueFactory(new PropertyValueFactory<Call, Double>(Call.COLUMN_FREQUENCY));
+            frequencyColumn.setPrefWidth(80);
+
+            TableColumn systemColumn = new TableColumn();
+            systemColumn.setId("system");
+            systemColumn.sortTypeProperty().addListener(mSortOrderListener);
+            systemColumn.setText("System");
+            systemColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_SYSTEM));
+            systemColumn.setPrefWidth(80);
+
+            TableColumn siteColumn = new TableColumn();
+            siteColumn.setVisible(false);
+            siteColumn.setId("mSite");
+            siteColumn.sortTypeProperty().addListener(mSortOrderListener);
+            siteColumn.setText("Site");
+            siteColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_SITE));
+            siteColumn.setPrefWidth(80);
+
+            TableColumn channelColumn = new TableColumn();
+            channelColumn.setVisible(false);
+            channelColumn.setId("channel");
+            channelColumn.sortTypeProperty().addListener(mSortOrderListener);
+            channelColumn.setText("Channel");
+            channelColumn.setCellValueFactory(new PropertyValueFactory<Call, String>(Call.COLUMN_CHANNEL));
+            channelColumn.setPrefWidth(80);
+
+            TableColumn duplicateColumn = new TableColumn();
+            duplicateColumn.setVisible(false);
+            duplicateColumn.setId("duplicate");
+            duplicateColumn.sortTypeProperty().addListener(mSortOrderListener);
+            duplicateColumn.setText("Duplicate");
+            duplicateColumn.setCellValueFactory(new PropertyValueFactory<Call, Boolean>(Call.COLUMN_DUPLICATE));
+            duplicateColumn.setPrefWidth(80);
+
+            TableColumn recordColumn = new TableColumn();
+            recordColumn.setVisible(false);
+            recordColumn.setId("record");
+            recordColumn.sortTypeProperty().addListener(mSortOrderListener);
+            recordColumn.setText("Record");
+            recordColumn.setCellValueFactory(new PropertyValueFactory<Call, Boolean>(Call.COLUMN_RECORD));
+            recordColumn.setPrefWidth(80);
+
+            TableColumn streamColumn = new TableColumn();
+            streamColumn.setVisible(false);
+            streamColumn.setId("stream");
+            streamColumn.sortTypeProperty().addListener(mSortOrderListener);
+            streamColumn.setText("Stream");
+            streamColumn.setCellValueFactory(new PropertyValueFactory<Call, Boolean>(Call.COLUMN_STREAM));
+            streamColumn.setPrefWidth(80);
+
+            TableColumn monitorColumn = new TableColumn();
+            monitorColumn.setVisible(false);
+            monitorColumn.setId("monitor");
+            monitorColumn.sortTypeProperty().addListener(mSortOrderListener);
+            monitorColumn.setText("Monitor");
+            monitorColumn.setCellValueFactory(new PropertyValueFactory<Call, Integer>(Call.COLUMN_MONITOR));
+            monitorColumn.setCellFactory(new PriorityCellFactory());
+            monitorColumn.setPrefWidth(80);
+
+            mCallTableView.getSortOrder().addListener(mSortOrderListener);
+            mCallTableView.getColumns().addAll(playbackColumn, eventTimeColumn, durationColumn, callTypeColumn,
+                    toIdColumn, toAliasColumn, fromIdColumn, fromAliasColumn, protocolColumn, frequencyColumn,
+                    systemColumn, siteColumn, channelColumn, duplicateColumn, recordColumn, streamColumn, monitorColumn);
+            mCallTableView.setPlaceholder(getPlaceholderProgressIndicator());
+            mCallTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, selectedCall) -> {
+                if(selectedCall != null)
+                {
+                    mAudioPlaybackController.replay(MixerChannel.LEFT, selectedCall);
+                }
+                else if(oldValue != null && selectedCall == null)
+                {
+                    //We were in replay but now we don't have a selected call
+                    mAudioPlaybackController.auto(MixerChannel.LEFT, null, null);
+                }
+
+                AudioPlaybackChannelController left = mAudioPlaybackController.getChannelController(MixerChannel.LEFT);
+                AudioPlaybackChannelController right = mAudioPlaybackController.getChannelController(MixerChannel.RIGHT);
+                getLockModeLeftButton().setDisable(selectedCall == null || left.isLockedFor(selectedCall));
+                getLockModeRightButton().setDisable(selectedCall == null || right.isLockedFor(selectedCall));
+            });
+            getPlaceholderProgressIndicator().setVisible(true);
+
+            //Bind the playback control view to the primary audio channel playback controller
+            getAudioPlaybackControlView().mediaPlayerProperty()
+                    .bind(mAudioPlaybackController.getPrimaryController().mediaPlayerProperty());
+
+            mCallTableViewMonitor = new TableViewColumnController(mCallTableView, "call_table_view");
+        }
+
+        return mCallTableView;
+    }
+
+    /**
+     * Paging controller
+     */
+    public PagingController getPagingController()
+    {
+        if(mPagingController == null)
+        {
+            mPagingController = new PagingController(this::showPage);
+        }
+
+        return mPagingController;
+    }
+
+    /**
+     * Progress indicator to convey data loading status when the table content is being updated.
+     * @return progress indicator
+     */
+    public ProgressIndicator getPlaceholderProgressIndicator()
+    {
+        if(mPlaceholderProgressIndicator == null)
+        {
+            mPlaceholderProgressIndicator = new ProgressIndicator();
+            mPlaceholderProgressIndicator.setVisible(false);
+            mPlaceholderProgressIndicator.setProgress(-1); //always spinning
+        }
+
+        return mPlaceholderProgressIndicator;
+    }
+
+    private HBox getSearchBox()
+    {
+        if(mSearchBox == null)
+        {
+            mSearchBox = new HBox();
+            mSearchBox.setAlignment(Pos.CENTER_LEFT);
+            mSearchBox.setSpacing(5);
+
+            Label searchLabel = new Label("Search:");
+            searchLabel.setAlignment(Pos.CENTER_RIGHT);
+            mSearchBox.getChildren().addAll(searchLabel, getSearchField(), getSearchColumnComboBox(), getSearchExactCheckBox());
+        }
+
+        return mSearchBox;
+    }
+
+    private TextField getSearchField()
+    {
+        if(mSearchField == null)
+        {
+            mSearchField = TextFields.createClearableTextField();
+            mSearchField.setTooltip(new Tooltip("Type a value to search against the selected database field(s)"));
+            mSearchField.textProperty().addListener((observable, oldValue, newValue) -> {
+                showFirstPage();
+            });
+        }
+
+        return mSearchField;
+    }
+
+    /**
+     * Monitors the calls table view for sort column and sort order changes to refresh the call event records.
+     */
+    private class SortOrderListener implements ListChangeListener<TableColumn<Call, ?>>, ChangeListener
+    {
+        @Override
+        public void onChanged(Change<? extends TableColumn<Call, ?>> c)
+        {
+            updateSortOrder();
+        }
+
+        @Override
+        public void changed(ObservableValue observable, Object oldValue, Object newValue)
+        {
+            updateSortOrder();
+        }
+    }
+
+    /**
+     * Handles call events from the AudioManager.
+     */
+    private class CallEventListener implements ICallEventListener
+    {
+        @Override
+        public void added(Call call)
+        {
+            Platform.runLater(() -> {
+                //Only update the calls table if we're viewing page 1
+                if(getPagingController().getCurrentPage() == 1)
+                {
+                    if(mCalls.size() == getPageSize())
+                    {
+                        mCalls.remove(mCalls.size() - 1);
+                    }
+
+                    mCalls.add(0, call);
+
+                    getCallTableView().sort();
+
+                    //If the user hasn't selected an item, scroll to the new item.
+                    if(getCallTableView().getSelectionModel().getSelectedItem() != null)
+                    {
+                        getCallTableView().scrollTo(call);
+                    }
+                }
+
+                mCallCount.set(mCallCount.get() + 1);
+            });
+        }
+
+        @Override
+        public void updated(Call call)
+        {
+            Platform.runLater(() -> {
+                if(mCalls.contains(call))
+                {
+                    mCalls.set(mCalls.indexOf(call), call);
+                }
+            });
+        }
+
+        @Override
+        public void completed(Call call, AudioSegment audioSegment)
+        {
+            Platform.runLater(() -> {
+                if(mCalls.contains(call))
+                {
+                    mCalls.set(mCalls.indexOf(call), call);
+                }
+            });
+
+            audioSegment.removeLease(getClass().toString());
+        }
+
+        @Override
+        public void deleted(Call call)
+        {
+            Platform.runLater(() -> {
+                if(mCalls.contains(call))
+                {
+                    mCalls.remove(call);
+                }
+
+                mCallCount.set(mCallCount.get() - 1);
+            });
+        }
+    }
+
+    public class PriorityCellFactory implements Callback<TableColumn<Alias, Integer>, TableCell<Alias, Integer>>
+    {
+        @Override
+        public TableCell<Alias, Integer> call(TableColumn<Alias, Integer> param)
+        {
+            TableCell tableCell = new TableCell<Alias, Integer>()
+            {
+                @Override
+                protected void updateItem(Integer item, boolean empty)
+                {
+                    if(empty)
+                    {
+                        setText(null);
+                        setGraphic(null);
+                    }
+                    else if(item == io.github.dsheirer.alias.id.priority.Priority.DO_NOT_MONITOR)
+                    {
+                        setText("Mute");
+                        final IconNode iconNode = new IconNode(FontAwesome.VOLUME_OFF);
+                        iconNode.setIconSize(20);
+                        iconNode.setFill(Color.RED);
+                        setGraphic(iconNode);
+                    }
+                    else if(item == io.github.dsheirer.alias.id.priority.Priority.DEFAULT_PRIORITY)
+                    {
+                        setText("Default");
+                        final IconNode iconNode = new IconNode(FontAwesome.VOLUME_UP);
+                        iconNode.setIconSize(20);
+                        iconNode.setFill(Color.GREEN);
+                        setGraphic(iconNode);
+                    }
+                    else
+                    {
+                        setText(item.toString());
+                        final IconNode iconNode = new IconNode(FontAwesome.VOLUME_UP);
+                        iconNode.setIconSize(20);
+                        iconNode.setFill(Color.GREEN);
+                        setGraphic(iconNode);
+                    }
+                }
+            };
+
+            return tableCell;
+        }
+    }
+
+}
--- a/src/main/java/io/github/dsheirer/module/decode/dmr/sync/DMRSyncDetectMode.java
+++ b/src/main/java/io/github/dsheirer/module/decode/dmr/sync/DMRSyncDetectMode.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -17,12 +17,13 @@
 * ****************************************************************************
 */

-package io.github.dsheirer.module.decode.dmr.sync;
+package io.github.dsheirer.audio.call;

 /**
- * DMR sync detection modes enumeration.
+ * Completed call record
+ * @param call associated with the audio segment.
+ * @param audioSegment associated with the call.
 */
-public enum DMRSyncDetectMode
+public record CompletedCall(Call call, AudioSegment audioSegment)
 {
-    AUTOMATIC, BASE_ONLY, MOBILE_ONLY, DIRECT_ONLY;
 }
--- a/src/main/java/io/github/dsheirer/module/decode/p25/phase2/message/mac/IP25ChannelGrantDetailProvider.java
+++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase2/message/mac/IP25ChannelGrantDetailProvider.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -17,34 +17,35 @@
 * ****************************************************************************
 */

-package io.github.dsheirer.module.decode.p25.phase2.message.mac;
-
-import io.github.dsheirer.identifier.Identifier;
-import io.github.dsheirer.module.decode.p25.identifier.channel.APCO25Channel;
-import io.github.dsheirer.module.decode.p25.reference.ServiceOptions;
+package io.github.dsheirer.audio.call;

 /**
- * Channel grant details
+ * Call event listener interface
 */
-public interface IP25ChannelGrantDetailProvider
+public interface ICallEventListener
 {
    /**
-     * Channel where the call will take place
+     * Call added event.
+     * @param call that was added
     */
-    APCO25Channel getChannel();
+    void added(Call call);

    /**
-     * Optional from radio unit.  This can be null.
+     * Call updated event.
+     * @param call that was updated
     */
-    Identifier getSourceAddress();
+    void updated(Call call);

    /**
-     * Target radio unit or talkgroup
+     * Call completed event.  This indicates that the call was completed and no further updates will be available.
+     * @param call that was completed.
+     * @param audioSegment for the call
     */
-    Identifier getTargetAddress();
+    void completed(Call call, AudioSegment audioSegment);

    /**
-     * Service options for the call.
+     * Call that was deleted (age-off) from the database.
+     * @param call that was deleted.
     */
-    ServiceOptions getServiceOptions();
+    void deleted(Call call);
 }
--- a/src/main/java/io/github/dsheirer/module/decode/nxdn/layer2/Framing.java
+++ b/src/main/java/io/github/dsheirer/module/decode/nxdn/layer2/Framing.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * 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
@@ -17,14 +17,16 @@
 * ****************************************************************************
 */

-package io.github.dsheirer.module.decode.nxdn.layer2;
+package io.github.dsheirer.audio.call;

 /**
- * NXDN frame structure
+ * Listener interface for receiving paging requests from user initiated actions.
 */
-public enum Framing
+public interface IPageRequestListener
 {
-    SUPER,
-    SINGLE,
-    UNKNOWN;
+    /**
+     * Indicates the user requests to display a page number
+     * @param page number to display.
+     */
+    void showPage(int page);
 }
--- a/src/main/java/io/github/dsheirer/audio/call/PagingController.java
+++ b/src/main/java/io/github/dsheirer/audio/call/PagingController.java
@@ -0,0 +1,236 @@
+/*
+ * *****************************************************************************
+ * 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.call;
+
+import java.text.NumberFormat;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
+import javafx.scene.paint.Color;
+import jiconfont.icons.font_awesome.FontAwesome;
+import jiconfont.javafx.IconNode;
+
+/**
+ * Implements a set of paging controls.
+ */
+public class PagingController extends HBox
+{
+    private static final int ICON_SIZE = 20;
+    private NumberFormat mNumberFormat = NumberFormat.getIntegerInstance();
+    private Button mFirstButton;
+    private Button mLastButton;
+    private Button mNextButton;
+    private Button mPreviousButton;
+    private Label mPageLabel;
+    private int mPageCount = 1;
+    private int mCurrentPage = 1;
+    private IPageRequestListener mPageRequestListener;
+
+    /**
+     * Constructs an instance
+     * @param listener to receive page requests
+     */
+    public PagingController(IPageRequestListener listener)
+    {
+        mPageRequestListener = listener;
+        setAlignment(Pos.CENTER);
+        setSpacing(0);
+        getChildren().addAll(getFirstButton(), getPreviousButton(), getPageLabel(), getNextButton(), getLastButton());
+        update(1, 1);
+    }
+
+    /**
+     * Updates the current state of this paging controller.
+     * @param currentPage number to display.
+     * @param pageCount the total number of available pages.
+     */
+    public void update(int currentPage, int pageCount)
+    {
+        mPageCount = pageCount;
+        mCurrentPage = currentPage;
+        getFirstButton().setDisable(mCurrentPage <= 1);
+        getFirstButton().setTooltip(mCurrentPage <= 1 ? null : new Tooltip("Move to page 1"));
+        getPreviousButton().setDisable(mCurrentPage <= 1);
+        getPreviousButton().setTooltip(mCurrentPage <= 1 ? null : new Tooltip("Move to page " + (mCurrentPage - 1)));
+        getNextButton().setDisable(mCurrentPage >= mPageCount);
+        getNextButton().setTooltip(mCurrentPage >= mPageCount ? null : new Tooltip("Move to page " + (mCurrentPage + 1)));
+        getLastButton().setDisable(mCurrentPage >= mPageCount);
+        getLastButton().setTooltip(mCurrentPage >= mPageCount ? null : new Tooltip("Move to page " + mPageCount));
+        getPageLabel().setText("Page " + mNumberFormat.format(mCurrentPage) + " of " + mNumberFormat.format(mPageCount));
+    }
+
+    /**
+     * Total pages available
+     * @return page count
+     */
+    public int getPageCount()
+    {
+        return mPageCount;
+    }
+
+    /**
+     * Current page number
+     * @return current page.
+     */
+    public int getCurrentPage()
+    {
+        return mCurrentPage;
+    }
+
+    /**
+     * Notifies the listener that the user requests the page number
+     * @param page number requested
+     */
+    private void request(int page)
+    {
+        if(mPageRequestListener != null)
+        {
+            mPageRequestListener.showPage(page);
+        }
+    }
+
+    /**
+     * Next page
+     */
+    private void next()
+    {
+        request(mCurrentPage + 1);
+    }
+
+    /**
+     * Previous page
+     */
+    private void previous()
+    {
+        request(mCurrentPage - 1);
+    }
+
+    /**
+     * First page
+     */
+    private void first()
+    {
+        request(1);
+    }
+
+    /**
+     * Last page
+     */
+    private void last()
+    {
+        request(mPageCount);
+    }
+
+    /**
+     * Current page status label.
+     */
+    private Label getPageLabel()
+    {
+        if(mPageLabel == null)
+        {
+            mPageLabel = new Label("Page 1 of 1");
+            mPageLabel.setTooltip(new Tooltip("Current Page and Total Page Count"));
+            mPageLabel.setAlignment(Pos.CENTER);
+            mPageLabel.setMaxWidth(Double.MAX_VALUE);
+            mPageLabel.setPadding(new Insets(0, 20, 0, 20));
+        }
+
+        return mPageLabel;
+    }
+
+    /**
+     * First page button.
+     */
+    private Button getFirstButton()
+    {
+        if(mFirstButton == null)
+        {
+            mFirstButton = new Button();
+            mFirstButton.setTooltip(new Tooltip("Go To First Page"));
+            IconNode iconNode = new IconNode(FontAwesome.ANGLE_DOUBLE_LEFT);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mFirstButton.setGraphic(iconNode);
+            mFirstButton.setOnAction(event -> first());
+        }
+
+        return mFirstButton;
+    }
+
+    /**
+     * Last page button
+     */
+    private Button getLastButton()
+    {
+        if(mLastButton == null)
+        {
+            mLastButton = new Button();
+            mLastButton.setTooltip(new Tooltip("Go To Last Page"));
+            IconNode iconNode = new IconNode(FontAwesome.ANGLE_DOUBLE_RIGHT);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mLastButton.setGraphic(iconNode);
+            mLastButton.setOnAction(event -> last());
+        }
+
+        return mLastButton;
+    }
+
+    /**
+     * Next page button
+     */
+    private Button getNextButton()
+    {
+        if(mNextButton == null)
+        {
+            mNextButton = new Button();
+            mNextButton.setTooltip(new Tooltip("Go To Next Page"));
+            IconNode iconNode = new IconNode(FontAwesome.ANGLE_RIGHT);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mNextButton.setGraphic(iconNode);
+            mNextButton.setOnAction(event -> next());
+        }
+
+        return mNextButton;
+    }
+
+    /**
+     * Previous page button.
+     */
+    private Button getPreviousButton()
+    {
+        if(mPreviousButton == null)
+        {
+            mPreviousButton = new Button();
+            mPreviousButton.setTooltip(new Tooltip("Go To Previous Page"));
+            IconNode iconNode = new IconNode(FontAwesome.ANGLE_LEFT);
+            iconNode.setIconSize(ICON_SIZE);
+            iconNode.setFill(Color.BLACK);
+            mPreviousButton.setGraphic(iconNode);
+            mPreviousButton.setOnAction(event -> previous());
+        }
+
+        return mPreviousButton;
+    }
+}
--- a/src/main/java/io/github/dsheirer/module/decode/nxdn/layer3/type/Duplex.java
+++ b/src/main/java/io/github/dsheirer/module/decode/nxdn/layer3/type/Duplex.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2025 Dennis Sheirer
+ * 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
@@ -17,32 +17,36 @@
 * ****************************************************************************
 */

-package io.github.dsheirer.module.decode.nxdn.layer3.type;
+package io.github.dsheirer.audio.call;

 /**
- * Access method
+ * Search columns
 */
-public enum Duplex
+public enum SearchColumn
 {
-    HALF_DUPLEX("HALF DUPLEX"),
-    DUPLEX("FULL DUPLEX");
+    ANY_ID("Any ID"),
+    TO("To / Alias"),
+    FROM("From / Alias"),
+    CHANNEL("Channel"),
+    PROTOCOL("Protocol"),
+    SITE("Site"),
+    SYSTEM("System"),
+    CALL_TYPE("Type");

-    private final String mLabel;
+    private String mLabel;

    /**
     * Constructs an instance
     * @param label to display
     */
-    Duplex(String label)
+    private SearchColumn(String label)
    {
        mLabel = label;
    }

    /**
-     * Pretty format
-     * @return format
+     * Display label
     */
-    @Override
    public String toString()
    {
        return mLabel;
--- a/src/main/java/io/github/dsheirer/audio/codec/mbe/JmbeAudioModule.java
+++ b/src/main/java/io/github/dsheirer/audio/codec/mbe/JmbeAudioModule.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2024 Dennis Sheirer
+ * 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
@@ -19,100 +19,63 @@

 package io.github.dsheirer.audio.codec.mbe;

-import com.google.common.eventbus.Subscribe;
 import io.github.dsheirer.alias.AliasList;
 import io.github.dsheirer.audio.AbstractAudioModule;
 import io.github.dsheirer.audio.squelch.ISquelchStateListener;
-import io.github.dsheirer.eventbus.MyEventBus;
 import io.github.dsheirer.message.IMessage;
 import io.github.dsheirer.message.IMessageListener;
+import io.github.dsheirer.preference.IPreferenceUpdateListener;
 import io.github.dsheirer.preference.PreferenceType;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.sample.Listener;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import jmbe.iface.IAudioCodec;
 import jmbe.iface.IAudioCodecLibrary;
-import jmbe.iface.IAudioCodecLibraryV2;
-import jmbe.iface.IAudioCodecV2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-/**
- * Base audio module for protocols that use the JMBE audio codec.
- */
 public abstract class JmbeAudioModule extends AbstractAudioModule implements Listener<IMessage>, IMessageListener,
-    ISquelchStateListener
+    ISquelchStateListener, IPreferenceUpdateListener
 {
-    private static final Logger LOG = LoggerFactory.getLogger(JmbeAudioModule.class);
+    private static final Logger mLog = LoggerFactory.getLogger(JmbeAudioModule.class);
    private static final String JMBE_AUDIO_LIBRARY = "JMBE";
    private static final List<String> mLibraryLoadStatusLogged = new ArrayList<>();
    private IAudioCodec mAudioCodec;
-    private final UserPreferences mUserPreferences;
+    private UserPreferences mUserPreferences;
    private static Class sLoadedJmbeAudioConverterClass;

    public JmbeAudioModule(UserPreferences userPreferences, AliasList aliasList, int timeslot)
    {
-        super(aliasList, timeslot, DEFAULT_MAX_SEGMENT_LENGTH_MILLIS);
+        super(aliasList, timeslot, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
        mUserPreferences = userPreferences;
-        MyEventBus.getGlobalEventBus().register(this);
        loadConverter();
    }

-    /**
-     * List of features supported by the JMBE audio library.  Note: features are only supported in Version 2.0+
-     * @return list of features or an empty list if the current library version doesn't support features.
-     */
-    public List<String> getFeatures()
+    @PostConstruct
+    public void init()
    {
-        if(mAudioCodec instanceof IAudioCodecV2 v2)
-        {
-            return v2.getFeatures();
-        }
-
-        return Collections.emptyList();
+        mUserPreferences.addUpdateListener(this);
    }

-    /**
-     * Sets the JMBE feature
-     * @param name of the feature
-     * @param value for the feature
-     */
-    public void setFeature(String name, Object value)
+    @PreDestroy
+    public void destroy()
    {
-        if(mAudioCodec instanceof IAudioCodecV2 v2)
-        {
-            v2.setFeature(name, value);
-        }
-        else
-        {
-            LOG.info("Feature [" + name + "] is not supported by the current JMBE audio codec library version");
-        }
-    }
-
-    @Override
-    protected void closeAudioSegment()
-    {
-        super.closeAudioSegment();
-
-        //Reset the audio codec to clear any leftover frame data from the previous call.
-        if(mAudioCodec != null)
-        {
-            mAudioCodec.reset();
-        }
+        mUserPreferences.removeUpdateListener(this);
    }

    @Override
    public void dispose()
    {
        super.dispose();
-        MyEventBus.getGlobalEventBus().unregister(this);
+        mAudioCodec = null;
    }

    public IAudioCodec getAudioCodec()
@@ -139,7 +102,6 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
     *
     * @param preferenceType that was updated
     */
-    @Subscribe
    public void preferenceUpdated(PreferenceType preferenceType)
    {
        if(preferenceType == PreferenceType.JMBE_LIBRARY)
@@ -169,7 +131,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
            {
                if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                {
-                    LOG.info("Loading JMBE library from [" + path + "]");
+                    mLog.info("Loading JMBE library from [" + path + "]");
                }

                try
@@ -177,32 +139,13 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                    URLClassLoader childClassLoader = new URLClassLoader(new URL[]{path.toUri().toURL()},
                            this.getClass().getClassLoader());

-                    try
-                    {
-                        sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibraryV2", true, childClassLoader);
-                    }
-                    catch(ClassNotFoundException legacyLibrary)
-                    {
-                        try
-                        {
-                            sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibrary", true, childClassLoader);
-                        }
-                        catch(ClassNotFoundException missingLibrary)
-                        {
-                            if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
-                            {
-                                LOG.error("Couldn't load JMBE audio conversion library from [" + path +
-                                    "] - neither V2 nor V1 library class was found");
-                                mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
-                            }
-                        }
-                    }
+                    sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibrary", true, childClassLoader);
                }
                catch(IllegalArgumentException iae)
                {
                    if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY + getCodecName()))
                    {
-                        LOG.error("Couldn't load JMBE audio conversion library - " + iae.getMessage());
+                        mLog.error("Couldn't load JMBE audio conversion library - " + iae.getMessage());
                        mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY + getCodecName());
                    }
                }
@@ -210,11 +153,18 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                {
                    if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                    {
-                        LOG.error("Couldn't load JMBE audio conversion library from path [" + path + "]");
+                        mLog.error("Couldn't load JMBE audio conversion library from path [" + path + "]");
+                        mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
+                    }
+                }
+                catch(ClassNotFoundException e1)
+                {
+                    if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
+                    {
+                        mLog.error("Couldn't load JMBE audio conversion library - class not found");
                        mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                    }
                }
-
            }
        }

@@ -229,23 +179,11 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                    if((library.getMajorVersion() == 1 && library.getMinorVersion() >= 0 &&
                            library.getBuildVersion() >= 0) || library.getMajorVersion() >= 1)
                    {
-                        audioConverter = library instanceof IAudioCodecLibraryV2 libraryV2 ?
-                            libraryV2.getAudioConverterV2(getCodecName()) :
-                            library.getAudioConverter(getCodecName());
-
-                        String codecStatusKey = JMBE_AUDIO_LIBRARY + ":codec:" + getCodecName();
-                        if(!mLibraryLoadStatusLogged.contains(codecStatusKey))
-                        {
-                            LOG.info("JMBE codec [" + getCodecName() + "] class [" +
-                                audioConverter.getClass().getName() + "] features [" +
-                                (audioConverter instanceof IAudioCodecV2 v2 ?
-                                    v2.getFeatures() : Collections.emptyList()) + "]");
-                            mLibraryLoadStatusLogged.add(codecStatusKey);
-                        }
+                        audioConverter = library.getAudioConverter(getCodecName());

                        if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                        {
-                            LOG.info("JMBE audio conversion library loaded: " + library.getVersion());
+                            mLog.info("JMBE audio conversion library loaded: " + library.getVersion());
                            mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                        }
                    }
@@ -253,7 +191,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                    {
                        if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                        {
-                            LOG.warn("JMBE library version 1.0.0 or higher is required - found: " + library.getVersion());
+                            mLog.warn("JMBE library version 1.0.0 or higher is required - found: " + library.getVersion());
                            mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                        }
                    }
@@ -262,7 +200,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
                {
                    if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                    {
-                        LOG.info("JMBE audio conversion library NOT FOUND");
+                        mLog.info("JMBE audio conversion library NOT FOUND");
                        mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                    }
                }
@@ -271,7 +209,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
            {
                if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                {
-                    LOG.error("Couldn't load JMBE audio conversion library - invocation target exception", ite);
+                    mLog.error("Couldn't load JMBE audio conversion library - invocation target exception", ite);
                    mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                }
            }
@@ -279,7 +217,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
            {
                if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                {
-                    LOG.error("Couldn't load JMBE audio conversion library - instantiation exception", e1);
+                    mLog.error("Couldn't load JMBE audio conversion library - instantiation exception", e1);
                    mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                }
            }
@@ -287,7 +225,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
            {
                if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                {
-                    LOG.error("Couldn't load JMBE audio conversion library - security restrictions");
+                    mLog.error("Couldn't load JMBE audio conversion library - security restrictions");
                    mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                }
            }
@@ -295,7 +233,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
            {
                if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
                {
-                    LOG.error("Couldn't load JMBE audio conversion library - no such method exception");
+                    mLog.error("Couldn't load JMBE audio conversion library - no such method exception");
                    mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
                }
            }
@@ -304,7 +242,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
        {
            if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
            {
-                LOG.warn("JMBE audio library path is NOT SET in your User Preferences.");
+                mLog.warn("JMBE audio library path is NOT SET in your User Preferences.");
                mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
            }
        }
--- a/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequence.java
+++ b/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequence.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * Copyright (C) 2014-2022 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,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.identifier.encryption.EncryptionKey;
+import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;

 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +36,7 @@ import java.util.List;
 * radio identifiers.
 */
@JsonRootName("mbe_call")
-@JsonPropertyOrder({"protocol", "version", "call_type", "from", "to", "encrypted", "system", "site", "frames"})
+@JsonPropertyOrder({"protocol", "call_type", "from", "to", "encrypted", "frames"})
@JsonInclude(JsonInclude.Include.NON_NULL)
 public class MBECallSequence
 {
@@ -76,15 +77,6 @@ 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
@@ -287,18 +279,10 @@ public class MBECallSequence
        }
        else
        {
-            add(new VoiceFrame(timestamp, frame));
+            mVoiceFrames.add(new VoiceFrame(timestamp, frame));
        }
    }

-    /**
-     * Adds the voice frame to the sequence
-     */
-    public void add(VoiceFrame voiceFrame)
-    {
-        mVoiceFrames.add(voiceFrame);
-    }
-
    /**
     * Adds an encrypted audio frame to this call sequence
     *
@@ -324,6 +308,6 @@ public class MBECallSequence
     */
    public void addEncryptedVoiceFrame(long timestamp, String frame, int algorithm, int keyid, String messageIndicator)
    {
-        add(new VoiceFrame(timestamp, frame, algorithm, keyid, messageIndicator));
+        mVoiceFrames.add(new VoiceFrame(timestamp, frame, algorithm, keyid, messageIndicator));
    }
 }
--- a/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceConverter.java
+++ b/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceConverter.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * 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
@@ -21,25 +21,20 @@ package io.github.dsheirer.audio.codec.mbe;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.dsheirer.alias.AliasList;
-import io.github.dsheirer.audio.AudioSegment;
+import io.github.dsheirer.audio.call.AudioSegment;
 import io.github.dsheirer.identifier.IdentifierUpdateNotification;
 import io.github.dsheirer.module.decode.p25.audio.P25P1AudioModule;
 import io.github.dsheirer.module.decode.p25.audio.P25P1CallSequenceRecorder;
+import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;
 import io.github.dsheirer.module.decode.p25.identifier.radio.APCO25RadioIdentifier;
 import io.github.dsheirer.module.decode.p25.identifier.talkgroup.APCO25Talkgroup;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.record.AudioSegmentRecorder;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collection;
 import jmbe.iface.IAudioCodec;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -56,15 +51,15 @@ public class MBECallSequenceConverter
     * @param output path to write the WAVE recording.
     * @throws IOException if there is an error.
     */
-    public static void convert(Path input, Path output) throws IOException
+    public static void convert(UserPreferences userPreferences, Path input, Path output) throws IOException
    {
        InputStream inputStream = Files.newInputStream(input);
        ObjectMapper mapper = new ObjectMapper();
        MBECallSequence sequence = mapper.readValue(inputStream, MBECallSequence.class);
-        convert(sequence, output);
+        convert(userPreferences, sequence, output);
    }

-    public static void convert(MBECallSequence callSequence, Path outputPath)
+    public static void convert(UserPreferences userPreferences, MBECallSequence callSequence, Path outputPath)
    {
        if(callSequence == null || callSequence.isEncrypted())
        {
@@ -75,7 +70,7 @@ public class MBECallSequenceConverter
        {
            if(callSequence.getProtocol().equals(P25P1CallSequenceRecorder.PROTOCOL))
            {
-                P25P1AudioModule audioModule = new P25P1AudioModule(new UserPreferences(), new AliasList("mbe generator"));
+                P25P1AudioModule audioModule = new P25P1AudioModule(userPreferences, new AliasList("mbe generator"));
                audioModule.setRecordAudio(true);
                audioModule.start();

@@ -135,45 +130,4 @@ public class MBECallSequenceConverter
            }
        }
    }
-
-    public static void main(String[] args)
-    {
-        boolean all = true;
-
-        String path = "/home/denny/SDRTrunk/recordings";
-        Path input = Paths.get(path);
-
-        if(all)
-        {
-            Collection<File> mbeFiles = FileUtils.listFiles(input.toFile(), new SuffixFileFilter(".mbe"), DirectoryFileFilter.DIRECTORY);
-
-            for(File inputFile: mbeFiles)
-            {
-                Path output = Paths.get(inputFile.getAbsolutePath().replace(".mbe", ".wav"));
-                mLog.info("Converting: " + inputFile);
-                try
-                {
-                    MBECallSequenceConverter.convert(inputFile.toPath(), output);
-                }
-                catch(IOException ioe)
-                {
-                    mLog.error("Error", ioe);
-                }
-            }
-        }
-        else
-        {
-            Path output = Paths.get(path.replace(".mbe", ".wav"));
-            mLog.info("Converting: " + path);
-
-            try
-            {
-                MBECallSequenceConverter.convert(input, output);
-            }
-            catch(IOException ioe)
-            {
-                mLog.error("Error", ioe);
-            }
-        }
-    }
 }
--- a/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceReader.java
+++ b/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceReader.java
@@ -1,20 +1,23 @@
 /*
- * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * 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 distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
 */

 package io.github.dsheirer.audio.codec.mbe;
@@ -22,6 +25,7 @@ package io.github.dsheirer.audio.codec.mbe;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Joiner;
+import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;

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

-/**
- * UI to wrap an audio channel and provide display of metadata and playback state information.
- */
-public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, SettingChangeListener
+public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, SettingChangeListener, IPreferenceUpdateListener
 {
    private static final long serialVersionUID = 1L;
    private static final Logger mLog = LoggerFactory.getLogger(AudioChannelPanel.class);
@@ -68,59 +65,54 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
    public static final String PROPERTY_COLOR_MUTED = PROPERTY_PREFIX + "muted";
    public static final String PROPERTY_COLOR_VALUE = PROPERTY_PREFIX + "value";

-    private final AudioChannel mAudioChannel;
-    private final AliasModel mAliasModel;
-    private final IconModel mIconModel;
-    private final SettingsManager mSettingsManager;
-    private final UserPreferences mUserPreferences;
-    private final TalkgroupFormatPreference mTalkgroupFormatPreference;
+    private AliasModel mAliasModel;
+    private IconModel mIconModel;
+    private SettingsManager mSettingsManager;
+    private UserPreferences mUserPreferences;
+
+    private Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16);
+    private Color mBackgroundColor;
+    private Color mLabelColor;
+    private Color mMutedColor;
+    private Color mValueColor;
+    private TalkgroupFormatPreference mTalkgroupFormatPreference;
+    private AudioOutput mAudioOutput;
+    private JLabel mMutedLabel = new JLabel("M");
+    private JLabel mChannelName = new JLabel(" ");
+    private JLabel mIconLabel = new JLabel(" ");
+    private JLabel mIdentifierLabel = new JLabel("-----");
    private Identifier mIdentifier;
    private List<Alias> mAliases = Collections.EMPTY_LIST;
-    private final Lock mLock = new ReentrantLock();
+    private Lock mLock = new ReentrantLock();

-    private final Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16);
-    private final Color mBackgroundColor;
-    private final Color mLabelColor;
-    private final Color mMutedColor;
-    private final Color mValueColor;
-    private final JLabel mMutedLabel = new JLabel("M");
-    private JLabel mChannelName = new JLabel(" ");
-    private final JLabel mIconLabel = new JLabel(" ");
-    private final JLabel mIdentifierLabel = new JLabel("-----");
-
-    /**
-     * Constructs an instance
-     * @param audioChannel to wrap by this panel
-     * @param aliasModel for alias lookup
-     * @param iconModel for icon lookup
-     * @param settingsManager for monitoring changes to tone insertion
-     * @param userPreferences for lookup of tone and other preferences
-     */
-    public AudioChannelPanel(AudioChannel audioChannel, AliasModel aliasModel, IconModel iconModel,
-                             SettingsManager settingsManager, UserPreferences userPreferences)
+    public AudioChannelPanel(UserPreferences userPreferences, SettingsManager settingsManager, AliasModel aliasModel,
+                             IconModel iconModel, AudioOutput audioOutput)
    {
-        mIconModel = iconModel;
-        mSettingsManager = settingsManager;
-        mSettingsManager.addListener(this);
-        mAliasModel = aliasModel;
        mUserPreferences = userPreferences;
-        mTalkgroupFormatPreference = mUserPreferences.getTalkgroupFormatPreference();
-        mAudioChannel = audioChannel;
-
-        if(mAudioChannel != null)
+        mSettingsManager = settingsManager;
+        mAliasModel = aliasModel;
+        mAudioOutput = audioOutput;
+        mIconModel = iconModel;
+        mSettingsManager.addListener(this);
+        if(mAudioOutput != null)
        {
-            mAudioChannel.addAudioEventListener(this);
-            mAudioChannel.setIdentifierCollectionListener(new AudioMetadataProcessor());
+            mAudioOutput.addAudioEventListener(this);
+            mAudioOutput.setIdentifierCollectionListener(new AudioMetadataProcessor());
        }
-
+        mUserPreferences.addUpdateListener(this);
+        mTalkgroupFormatPreference = mUserPreferences.getTalkgroupFormatPreference();
        mBackgroundColor = SystemProperties.getInstance().get(PROPERTY_COLOR_BACKGROUND, Color.BLACK);
        mLabelColor = SystemProperties.getInstance().get(PROPERTY_COLOR_LABEL, Color.LIGHT_GRAY);
        mMutedColor = SystemProperties.getInstance().get(PROPERTY_COLOR_MUTED, Color.RED);
        mValueColor = SystemProperties.getInstance().get(PROPERTY_COLOR_VALUE, Color.GREEN);
-
        init();
    }

+    public void preDestroy()
+    {
+        mUserPreferences.removeUpdateListener(this);
+    }
+
    /**
     * Receives preference update notifications via the event bus
     * @param preferenceType that was updated
@@ -136,21 +128,15 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S

    public void dispose()
    {
-        //Deregister from receiving preference update notifications
-        MyEventBus.getGlobalEventBus().unregister(this);
-
-        if(mAudioChannel != null)
+        if(mAudioOutput != null)
        {
-            mAudioChannel.removeAudioEventListener(this);
-            mAudioChannel.removeAudioMetadataListener();
+            mAudioOutput.removeAudioEventListener(this);
+            mAudioOutput.removeAudioMetadataListener();
        }
    }

    private void init()
    {
-        //Register to receive preference updates
-        MyEventBus.getGlobalEventBus().register(this);
-
        setLayout(new MigLayout("align center center, insets 0 0 0 0",
            "[][][align right]0[grow,fill]", ""));
        setBackground(mBackgroundColor);
@@ -160,7 +146,7 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
        mMutedLabel.setVisible(false);
        add(mMutedLabel);

-        mChannelName = new JLabel(mAudioChannel != null ? mAudioChannel.getChannelName() : " ");
+        mChannelName = new JLabel(mAudioOutput != null ? mAudioOutput.getChannelName() : " ");
        mChannelName.setFont(mFont);
        mChannelName.setForeground(mLabelColor);
        add(mChannelName);
@@ -180,11 +166,18 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
        switch(audioEvent.getType())
        {
            case AUDIO_STOPPED:
-                EventQueue.invokeLater(this::resetLabels);
+                EventQueue.invokeLater(new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        resetLabels();
+                    }
+                });
                break;
            case AUDIO_MUTED:
            case AUDIO_UNMUTED:
-                EventQueue.invokeLater(() -> mMutedLabel.setVisible(mAudioChannel.isMuted()));
+                EventQueue.invokeLater(() -> mMutedLabel.setVisible(mAudioOutput.isMuted()));
                break;
            default:
                break;
--- a/src/main/java/io/github/dsheirer/audio/playback/AudioChannelsPanel.java
+++ b/src/main/java/io/github/dsheirer/audio/playback/AudioChannelsPanel.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2026 Dennis Sheirer
+ * 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
@@ -25,39 +25,33 @@ import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.settings.SettingsManager;
 import java.awt.Color;
 import java.awt.Component;
+import java.util.List;
 import net.miginfocom.swing.MigLayout;

 import javax.swing.JPanel;
 import javax.swing.JSeparator;

-/**
- * Displays one or more audio channel panels.
- */
 public class AudioChannelsPanel extends JPanel
 {
-    /**
-     * Constructs an instance
-     * @param iconModel for icon access
-     * @param userPreferences to monitor for audio playback changes
-     * @param settingsManager for tone insertion settings
-     * @param controller for the audio channels
-     * @param aliasModel for accessing aliases
-     */
-    public AudioChannelsPanel(IconModel iconModel, UserPreferences userPreferences, SettingsManager settingsManager,
-                              IAudioController controller, AliasModel aliasModel)
+    private static final long serialVersionUID = 1L;
+
+    public AudioChannelsPanel(IAudioController controller, UserPreferences userPreferences, SettingsManager settingsManager,
+                              AliasModel aliasModel, IconModel iconModel)
    {
        setLayout(new MigLayout("insets 0 0 0 0",
            "[][sizegroup abc,grow,fill][][sizegroup abc,grow,fill]", "[grow,fill]"));

        setBackground(Color.BLACK);

+        List<AudioOutput> outputs = controller.getAudioOutputs();
+
        addSeparator();

-        for(int x = 0; x < controller.getAudioChannels().size(); x++)
+        for(int x = 0; x < outputs.size(); x++)
        {
-            add(new AudioChannelPanel(controller.getAudioChannels().get(x), aliasModel, iconModel, settingsManager, userPreferences));
+            add(new AudioChannelPanel(userPreferences, settingsManager, aliasModel, iconModel, outputs.get(x)));

-            if(x < controller.getAudioChannels().size() - 1)
+            if(x < outputs.size() - 1)
            {
                addSeparator();
            }
@@ -65,10 +59,10 @@ public class AudioChannelsPanel extends JPanel

 		/* Add an empty channel panel so that the panel is sized appropriately
         * for either a single channel or two channels */
-        if(controller.getAudioChannels().size() == 1)
+        if(outputs.size() == 1)
        {
            addSeparator();
-            add(new AudioChannelPanel(null, aliasModel, iconModel, settingsManager, userPreferences), "growx");
+            add(new AudioChannelPanel(userPreferences, settingsManager, aliasModel, iconModel, null), "growx");
        }
    }

@@ -86,9 +80,6 @@ public class AudioChannelsPanel extends JPanel
        }
    }

-    /**
-     * Adds a separator to this panel.
-     */
    private void addSeparator()
    {
        JSeparator separator = new JSeparator(JSeparator.VERTICAL);
--- a/Show More
+++ b/Show More