Merge pull request #1770 from DSheirer/1769-release-0.6.0

#1769 Release version 0.6.0

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,38 @@
+---
+name: Bug Report
+about: Create a report to help us improve sdrtrunk
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**sdrtrunk Version**
+Indicate which sdrtrunk version you are using.  Use 'master-branch' if you are running the latest code.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Application Log**
+If applicable, include either the full application log,or a snippet of the error logging.
+
+**Desktop (optional - complete the following information):**
+ - OS: [e.g. iOS]
+ - CPU Cores: [e.g. 4 cores]
+ - RAM:[e.g. 16GB]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.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

.github/workflows/gradle.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    strategy:
+      matrix: 
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 20
+        uses: actions/setup-java@v3
+        with:
+          java-version: '20'
+          distribution: 'liberica'
+          java-package: 'jdk+fx'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean build

.github/workflows/nightly.yml

@@ -0,0 +1,47 @@
+# Create nightly release for Linux, Mac and Windows using the Linux runner.
+name: Nightly Release
+
+on:
+  push:
+    branches: [ master ]
+# Don't run nightly build for pull requests - uncomment to test changes to this action within scope of the PR review
+#  pull_request:
+#    branches: [ master ]
+
+jobs:
+  nightly:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 20
+        uses: actions/setup-java@v3
+        with:
+          java-version: '20'
+          distribution: 'liberica'
+          java-package: 'jdk+fx'
+
+      - name: Build Linux and Mac releases with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: runtimeZipOthers -PprojectVersion=nightly
+
+      - name: Build Windows release with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: runtimeZipWindows -PprojectVersion=nightly
+
+      - name: Create Build Info file
+        run: |
+          echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/image/build_info.txt
+
+      - name: Add build artifacts to nightly release
+        uses: pyTooling/Actions/releaser@main
+        with:
+          tag: nightly
+          rm: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: |
+            build/image/*.zip
+            build/image/build_info.txt

.gitignore

@@ -17,7 +17,7 @@ out/
 *.class
 *.log
 # Package Files #
-*.jar
+#*.jar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

.idea/compiler.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
-      <module name="sdr-trunk_main" target="1.8" />
-      <module name="sdr-trunk_test" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/dictionaries/denny.xml

@@ -2,8 +2,11 @@
   <dictionary name="denny">
     <words>
       <w>bahroo</w>
+      <w>basebanded</w>
       <w>broadcastify</w>
       <w>correlator</w>
+      <w>deinterleave</w>
+      <w>descrambled</w>
       <w>dinf</w>
       <w>esnid</w>
       <w>fleetsync</w>
@@ -23,6 +26,7 @@
       <w>shoutcast</w>
       <w>streamable</w>
       <w>talkgroup</w>
+      <w>talkgroups</w>
       <w>tgid</w>
       <w>ultravox</w>
       <w>wacn</w>

.idea/libraries/imports.xml

@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="imports">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/imports/jmbe-interface-0.3.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/java-lame-3.98.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/radioreference-14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/wsdl4j-1.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/commons-math3-3.6.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libresample4j-0.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/misc.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <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>

.idea/modules.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" group="sdr-trunk" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" group="sdr-trunk" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="IssueNavigationConfiguration">
-    <option name="links">
-      <list>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="#(\d+)" />
-          <option name="linkRegexp" value="https://github.com/DSheirer/sdrtrunk/issues/$1" />
-        </IssueNavigationLink>
-      </list>
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

CHANGELOG

@@ -1,3 +1,18 @@
+0.4.0 20200404
+ - Release includes embedded Java 14 & JavaFX 13 runtime
+ - Adds Polyphase Channelizer with 2x channel oversampling and redesigned source management
+ - Adds P25 Phase 2 decoder
+ - Adds P25 radio identifier aliasing
+ - JMBE library 1.0.4 with support for AMBE tone metadata
+ - New JavaFX User Preferences dialog
+ - HackRF tuner enhanced (sample rates and saturation issues)
+ - Adds support for Airspy mini tuner
+ - Redesigned audio sub-system that uses AudioSegments
+ - USB tuner bus saturation management/monitoring
+ - Bitstream (.bits) recording
+ - MP3 Audio Recording
+ - Numerous bug fixes
+
 0.3.4 20180418
  - New P25 C4FM decoder that uses Differential QPSK decoder instead of FM demodulation with 4FSK.
  - Adds channel auto-start and ordering capability with startup dialog allowing user to invoke or bypass channel

README.md

@@ -1,78 +1,33 @@
+![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)
+
 # sdrtrunk
 A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
 
-* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/GettingStarted_V0.3.0)
-* [User's Manual Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual_V0.3.0)
+* [Help/Wiki Home Page](https://github.com/DSheirer/sdrtrunk/wiki)
+* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
+* [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
 * [Download](https://github.com/DSheirer/sdrtrunk/releases)
-* [Support](https://groups.google.com/forum/#!forum/sdrtrunk)
+* [Support](https://github.com/DSheirer/sdrtrunk/wiki/Support)
 
-![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/v0.3/images/ApplicationOverview_V0.3.0.png)
-**Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
+![sdrtrunk Application](https://github.com/DSheirer/sdrtrunk/wiki/images/sdrtrunk.png)
+**Figure 1:** sdrtrunk Application Screenshot
 
-# End User Instructions:
-
-If you simply want to download and run the program, please follow these instructions.
-
-## Install Java 8 (or newer)
-
-## Download the latest sdrtrunk release
- 
+## Download the Latest Release
 All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
 
-**(final)** These versions have been tested and are the current release version.
+* **(alpha)** These versions are under development feature previews and likely to contain bugs and unexpected behavior.
+* **(beta)** These versions are currently being tested for bugs and functionality prior to final release.
+* **(final)** These versions have been tested and are the current release version.
 
-**(beta)** These versions are currently being tested for bugs and functionality.
+## Download Nightly Software Build
+The [nightly](https://github.com/DSheirer/sdrtrunk/releases/tag/nightly) release contains current builds of the software 
+for all supported operating systems.  This version of the software may contain bugs and may not run correctly.  However, 
+it let's you preview the most recent changes and fixes before the next software release.  **Always backup your 
+playlist(s) before you use the nightly builds.**  Note: the nightly release is updated each time code changes are 
+committed to the code base, so it's not really 'nightly' as much as it is 'current'.
 
-## Run the application
-
-Either double-click on the downloaded file (if supported on your operating system) or open a terminal/command window
-and change to the directory where you downloaded the release file and type:
-
-```
-java -jar downloaded-jar-filename 
-```
-
-Note: replace _downloaded-jar-filename_ with the actual name of the sdrtrunk release version that you downloaded 
-
-## Optional - P25 Audio
-If you're using sdrtrunk with a P25 trunked radio system, the [JMBE](https://github.com/DSheirer/sdrtrunk/wiki/JMBE) wiki page contains instructions
-for downloading the JMBE audio library source code and compiling the JMBE library.  Copy the resulting JMBE audio library 
-jar file to the same folder containing the sdrtrunk application to use the library with sdrtrunk.
-
-# Developer Instructions:
-
-If you're interested in modifying and/or compiling the source code, please follow these instructions to use gradle to compile the code. 
-
-## Build the project
-sdrtrunk uses gradle as the build system. You can build it with locally installed gradle or if you do not have/want 
-to install gradle you can use preconfigured linux/windows wrapper.
-
-### Build with locally installed gradle 4.3.1
-```
-gradle clean buildSdr
-```
-### Build with preconfigured wrapper for linux/windows
-Linux
-```
-./gradlew clean buildSdr
-```
-Windows
-```
-gradle.bat clean buildSdr
-```
-This would add gradle, download all project dependencies and build JAR
-
-## Development
-All dependencies/versions are controlled from build.gradle.
-To change the new release version tag of artifact - change property:
-```
-version = '0.3.2'
-```
-
-## Run SDRTrunk
-SDRTrunk is packed into single uber-jar file. There is need to have folders with dependencies and
-adding them with classpath. Just run with java.
-### Use Java8
-```
-java -jar build/libs/sdr-trunk-all-0.3.2.jar 
-```
+## Minimum System Requirements
+* **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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build.gradle

@@ -1,28 +1,182 @@
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-    }
-}
+import java.text.SimpleDateFormat
 
-apply plugin: 'java'
-apply plugin: 'idea'
+/*
+ * *****************************************************************************
+ * 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/>
+ * ****************************************************************************
+ */
+
+/**
+ * Instructions for building/compiling the sdrtrunk application.
+ *
+ * Prerequisites:
+ * Install and configure an OpenJDK version 19+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
+ * - Optional: install and configure Gradle 7.6+
+ *
+ * Scenario 1: run the application via gradle command line from the source code root directory:
+ * command: ./gradlew run
+ *
+ * Scenario 2: create an application release for the current operating system
+ * command: ./gradlew runtimeZipCurrent
+ * Note: release image is located in the /build/image/ directory
+ *
+ * Scenario 3: create releases for Linux and OSX operating systems using downloaded JDKs
+ * command: ./gradlew runtimeZipOthers
+ * Note: release images are located in the /build/image/ directory
+ *
+ * Scenario 4: create release for Windows operating system using downloaded JDK
+ * command: ./gradlew runtimeZipWindows
+ * Note: release image is located in the /build/image/ directory
+ */
+plugins {
+    id 'application'
+    id 'java'
+    id 'idea'
+    id 'org.beryx.runtime' version '1.12.7'
+}
 
 repositories {
-    jcenter()
     mavenCentral()
+    maven { url "https://jitpack.io" }
 }
 
-version = '0.4.0-alpha.3'
-sourceCompatibility = 1.8
+//Version is defined in gradle.properties so that we can CLI override it for nightly builds.
+version = project.findProperty('projectVersion')
+
+//Java 20 is required for this version of the Project Panama preview/incubator feature
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(20)
+    }
+}
 
 sourceSets {
     main.java.srcDirs 'src/main'
     test.java.srcDirs 'src/test'
 }
 
+test {
+    useJUnitPlatform()
+}
+
+dependencies {
+
+    // JUnit Tests
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.0')
+    testImplementation 'org.mockito:mockito-core:4.8.0'
+
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+
+    //Jitpack imports
+    implementation 'com.github.dnault:libresample4j:master'
+    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.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-font_awesome:4.7.0.1'
+    implementation 'com.github.jiconfont:jiconfont-javafx:1.0.0'
+    implementation 'com.github.jiconfont:jiconfont-swing:1.0.1'
+    implementation 'com.github.wendykierp:JTransforms:3.1'
+    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.jidesoft:jide-oss:3.6.18'
+    implementation 'com.miglayout:miglayout-swing:11.0'
+    implementation 'com.mpatric:mp3agic:0.9.1'
+    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'eu.hansolo:charts:1.0.5'
+    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.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.9.0'
+    implementation 'org.apache.mina:mina-core:2.2.1'
+    implementation 'org.apache.mina:mina-http:2.2.1'
+    implementation 'org.controlsfx:controlsfx:11.1.2'
+    implementation 'org.rauschig:jarchivelib:1.2.0'
+    implementation 'org.slf4j:slf4j-api:2.0.5'
+    implementation 'org.usb4java:libusb4java:1.3.0'
+    implementation 'org.usb4java:usb4java:1.3.0'
+    implementation 'org.usb4java:usb4java-javax:1.3.0'
+    implementation 'io.github.dsheirer:libusb4java-darwin-aarch64:1.3.1' //usb4java native lib for OSX M1 cpu
+    implementation 'pl.edu.icm:JLargeArrays:1.6'
+}
+
+def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem
+
+/**
+ * This is needed for the JDK19 panama and vector API ... until it moves out of incubation or preview
+ */
+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
+}
+
+/**
+ * JVM Arguments for running the application on Windows.
+ */
+def jvmArgsWindows =
+        ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
+         '--add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED', //windows users for JIDE
+         '--add-modules=jdk.incubator.vector',   //Needed while Project Panama API is still in incubator
+         '--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
+         '--enable-native-access=ALL-UNNAMED',
+         '-Djava.library.path=c:\\Program Files\\SDRplay\\API\\x64'] //Allows Project Panama Foreign Function access to system library
+
+/**
+ * JVM Arguments for running the application on Linux.
+ */
+def jvmArgsLinux =
+        ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
+         '--add-modules=jdk.incubator.vector',   //Needed while Project Panama API is still in incubator
+         '--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
+         '--enable-native-access=ALL-UNNAMED',
+         '-Djava.library.path=/usr/local/lib'] //Allows Project Panama Foreign Function access to system library
+
+application {
+    mainClassName = "io.github.dsheirer.gui.SDRTrunk"
+
+    if(os.isWindows()) {
+        applicationDefaultJvmArgs = jvmArgsWindows
+    }
+    else {
+        applicationDefaultJvmArgs = jvmArgsLinux
+    }
+}
+
+jar {
+    manifest {
+        attributes (
+                'Implementation-Title'  : 'sdrtrunk project',
+                'Implementation-Version' : archiveVersion,
+                'Created-By'            : "Gradle ${gradle.gradleVersion}",
+                'Build-Timestamp'       : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
+                'Build-JDK'             : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']}",
+                'Build-OS'              : "${System.properties['os.name']} (${System.properties['os.arch']} ${System.properties['os.version']}"
+        )
+    }
+}
+
 idea {
     module {
         downloadJavadoc = true
@@ -30,46 +184,172 @@ idea {
     }
 }
 
-dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    compile fileTree(dir: 'imports', include: '*.jar')
-    compile 'org.apache.commons:commons-lang3:3.7'
-    compile 'org.apache.commons:commons-io:1.3.2'
-    compile 'org.slf4j:slf4j-api:1.7.25'
-    compile 'ch.qos.logback:logback-core:1.2.3'
-    compile 'ch.qos.logback:logback-classic:1.2.3'
-    compile 'com.miglayout:miglayout-swing:5.0'
+/**
+ * Runtime target OS and CPU image names.  We append version here so that version details are at end of zip filename.
+ */
+String targetLinuxAarch64 = 'linux-aarch64-v' + version
+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
 
-    compile 'org.usb4java:usb4java-javax:1.2.0'
-    compile 'org.usb4java:usb4java:1.2.0'
-    compile 'org.usb4java:libusb4java:1.2.0'
-    compile 'javax.usb:usb-api:1.0.2'
-    compile 'com.github.wendykierp:JTransforms:3.1'
-    compile 'pl.edu.icm:JLargeArrays:1.6'
-    compile 'net.coderazzi:tablefilter-swing:5.3.1'
-    compile 'com.jidesoft:jide-oss:3.4.3'
-    compile 'org.apache.mina:mina-core:2.0.16'
-    compile 'org.apache.mina:mina-http:2.0.16'
-    compile 'org.apache.axis:axis-jaxrpc:1.4'
-    compile 'org.apache.axis:axis:1.4'
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.3'
-    compile 'org.kordamp.ikonli:ikonli-javafx:2.1.1'
-    compile 'org.kordamp.ikonli:ikonli-fontawesome-pack:2.1.1'
+/**
+ * Optional pre-downloaded Java Development Kit (JDK) for each target OS and CPU.  These locations are hard-coded to the
+ * author's development environment, but can be changed to your environment if you want to use this build pattern.
+ */
+String jdk_base = '/home/denny/java_jdks/'
+String jdk_linux_aarch64 = jdk_base + 'linux-arm64/jdk-20.0.1-full'
+String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-20.0.1-full'
+String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-20.0.1-full.jdk'
+String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-20.0.1-full.jdk'
+String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-20.0.1-full'
+
+/**
+ * Download URLs to download the JDK as part of the gradle build packaging process
+ */
+def jdk_download_base = "https://download.bell-sw.com/java/20.0.1+10/bellsoft-jdk20.0.1+10-"
+def jdk_download_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"
+
+/**
+ * Configures the runtime zip task with additional options/settings.
+ * @param rt task to configure
+ * @param jvmArgs to use (windows or linux)
+ * @return configured task.
+ */
+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.crypto.ec - needed for HTTPS connections (broadcastify calls & map tile server)
+    //jdk.incubator.vector - needed for Project Panama foreign function and vector apis
+    //jdk.accessibility is used with assistive technologies like screen readers
+    //java.management for JVM resource monitoring
+    rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management')
+
+    //Use auto-detected modules and 'add' any specified modules.
+    rt.extension.additive.set(true)
+
+    //Recommended options for reducing/shrinking runtime target image size
+    rt.extension.addOptions('--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages')
+
+    //Runtime images have auto appended version in image zip name.  Override to include version in single target image.
+    rt.extension.imageZip.set(file("$buildDir/image/sdr-trunk.zip"))
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3.1'
-}
+/**
+ * Creates a release package for the current operating system.
+ *
+ * Note: you cannot create both Windows and Linux releases at the same time due to limitations of the Runtime plugin
+ *
+ * Usage: gradle runtimeZipCurrent
+ * Usage: gradlew runtimeZipCurrent   (windows - using gradlew)
+ * Usage: ./gradlew runtimeZipCurrent   (linux - using gradlew)
+ */
+tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
+    def arch = System.properties.getProperty("os.arch")
+    def javaHome = org.gradle.internal.jvm.Jvm.current().getJavaHome().toString()
 
-task buildSdr(type: Jar) {
-    manifest {
-        attributes 'Implementation-Title': 'SdrTrunk project',
-                'Implementation-Version': version,
-                'Main-Class': 'io.github.dsheirer.gui.SDRTrunk',
-                'Class-Path': 'jmbe-0.3.2.jar jmbe-0.3.3.jar'
+    if(os.isWindows()) {
+        rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
+        configure(rt, jvmArgsWindows)
+    }
+    else if(os.isLinux())
+    {
+        if(arch.equals("amd64")) {
+            rt.extension.targetPlatform(targetLinuxX86_64, javaHome)
+        }
+        else if(arch.equals("aarch64")) {
+            rt.extension.targetPlatform(targetLinuxAarch64, javaHome)
+        }
+        configure(rt, jvmArgsLinux)
+    }
+    else if(os.isMacOsX())
+    {
+        if(arch.equals("amd64")) {
+            rt.extension.targetPlatform(targetOsxX86_64, javaHome)
+        }
+        else if(arch.equals("aarch64")) {
+            rt.extension.targetPlatform(targetOsxAarch64, javaHome)
+        }
+        configure(rt, jvmArgsLinux)
     }
-    baseName = project.name + '-all'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
+}
+
+
+/**
+ * Creates a Windows release package.
+ *
+ * Note: you cannot create both Windows and Linux releases at the same time due to limitations of the Runtime plugin
+ *
+ * Usage: gradle runtimeZipWindows
+ * Usage: gradlew runtimeZipWindows   (windows - using gradlew)
+ * Usage: ./gradlew runtimeZipWindows   (linux - using gradlew)
+ */
+tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
+    if(file(jdk_windows_x86_64).exists()) {
+        rt.extension.targetPlatform(targetWindowsX86_64, jdk_windows_x86_64, [])
+    }
+    else {
+        rt.extension.targetPlatform(targetWindowsX86_64) {
+            jdkHome = jdkDownload(jdk_download_windows_x86_64)
+        }
+    }
+
+    configure(rt, jvmArgsWindows)
+}
+
+/**
+ * Creates Linux & OSX release packages.
+ *
+ * Note: you cannot create both Windows and Linux releases at the same time due to limitations of the Runtime plugin
+ *
+ * Usage: gradle runtimeZipOthers
+ * Usage: gradlew runtimeZipOthers   (windows - using gradlew)
+ * Usage: ./gradlew runtimeZipOthers   (linux - using gradlew)
+ */
+tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
+    //Linux aarch64
+    if(file(jdk_linux_aarch64).exists()) {
+        rt.extension.targetPlatform(targetLinuxAarch64, jdk_linux_aarch64, [])
+    }
+    else {
+        rt.extension.targetPlatform(targetLinuxAarch64) {
+            jdkHome = jdkDownload(jdk_download_linux_aarch64)
+        }
+    }
+    //Linux x86-64
+    if(file(jdk_linux_x86_64).exists()) {
+        rt.extension.targetPlatform(targetLinuxX86_64, jdk_linux_x86_64, [])
+    }
+    else {
+        rt.extension.targetPlatform(targetLinuxX86_64) {
+            jdkHome = jdkDownload(jdk_download_linux_x86_64)
+        }
+    }
+    //OSX aarch64
+    if(file(jdk_osx_aarch64).exists()) {
+        rt.extension.targetPlatform(targetOsxAarch64, jdk_osx_aarch64, [])
+    }
+    else {
+        rt.extension.targetPlatform(targetOsxAarch64) {
+            jdkHome = jdkDownload(jdk_download_osx_aarch64)
+        }
+    }
+    //OSX x86-64
+    if(file(jdk_osx_x86_64).exists()) {
+        rt.extension.targetPlatform(targetOsxX86_64, jdk_osx_x86_64, [])
+    }
+    else {
+        rt.extension.targetPlatform(targetOsxX86_64) {
+            jdkHome = jdkDownload(jdk_download_osx_x86_64)
+        }
+    }
+
+    configure(rt, jvmArgsLinux);
 }

copyright.template

@@ -0,0 +1,16 @@
+******************************************************************************
+Copyright (C) 2014-${today.year} 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/>
+*****************************************************************************

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,25 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+#
+# ******************************************************************************
+# 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
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,78 +1,132 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# ******************************************************************************
+# 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
+# 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/>
+# *****************************************************************************
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +135,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +143,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# 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" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,19 +25,23 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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

sdrtrunk.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/images" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/config" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="imports" level="project" />
-  </component>
-</module>

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

@@ -1,20 +1,24 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -24,170 +28,474 @@ import io.github.dsheirer.alias.action.AliasAction;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
 import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.record.Record;
+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.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
+import javafx.util.Callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.awt.*;
+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.
+ */
 @JacksonXmlRootElement(localName = "alias")
 public class Alias
 {
-    private String mList;
-    private String mGroup;
-    private String mName;
-    private int mColor;
-    private String mIconName;
-    private List<AliasID> mAliasIDs = new ArrayList<AliasID>();
-    private List<AliasAction> mAliasActions = new ArrayList<AliasAction>();
+    private final static Logger mLog = LoggerFactory.getLogger(Alias.class);
 
-    public Alias()
-    {
-    }
+    private BooleanProperty mRecordable = new SimpleBooleanProperty();
+    private BooleanProperty mStreamable = new SimpleBooleanProperty();
+    private BooleanProperty mOverlap = new SimpleBooleanProperty();
+    private IntegerProperty mColor = new SimpleIntegerProperty();
+    private IntegerProperty mPriority = new SimpleIntegerProperty(Priority.DEFAULT_PRIORITY);
+    private IntegerProperty mNonAudioIdentifierCount = new SimpleIntegerProperty();
+    private StringProperty mAliasListName = new SimpleStringProperty();
+    private StringProperty mGroup = new SimpleStringProperty();
+    private StringProperty mIconName = new SimpleStringProperty();
+    private StringProperty mName = new SimpleStringProperty();
+    private ObservableList<AliasID> mAliasIDs = FXCollections.observableArrayList();
+    private ObservableList<AliasAction> mAliasActions = FXCollections.observableArrayList();
 
+    /**
+     * Constructs an instance and sets the specified name.
+     * @param name for the alias
+     */
     public Alias(String name)
     {
-        mName = name;
+        mName.set(name);
+
+        //Bind the non-audio identifier count property to the size of a filtered list of alias identifiers
+        mNonAudioIdentifierCount.bind(Bindings.size(new FilteredList<>(mAliasIDs, aliasID -> {
+            return aliasID != null && !aliasID.isAudioIdentifier();
+        })));
     }
 
+    /**
+     * Constructs an instance
+     */
+    public Alias()
+    {
+        this(null);
+    }
+
+    /**
+     * Count of non-audio identifiers for this alias
+     */
+    @JsonIgnore
+    public IntegerProperty nonAudioIdentifierCountProperty()
+    {
+        return mNonAudioIdentifierCount;
+    }
+
+    /**
+     * Audio playback priority
+     */
+    @JsonIgnore
+    public IntegerProperty priorityProperty()
+    {
+        return mPriority;
+    }
+
+    /**
+     * Indicates if one or more of the identifiers for this alias overlap with identifiers from another alias
+     * within the same alias list.
+     */
+    @JsonIgnore
+    public BooleanProperty overlapProperty()
+    {
+        return mOverlap;
+    }
+
+    /**
+     * Recordable property
+     */
+    @JsonIgnore
+    public BooleanProperty recordableProperty()
+    {
+        return mRecordable;
+    }
+
+    /**
+     * Streamable property
+     */
+    @JsonIgnore
+    public BooleanProperty streamableProperty()
+    {
+        return mStreamable;
+    }
+
+    /**
+     * Alias list name property
+     */
+    @JsonIgnore
+    public StringProperty aliasListNameProperty()
+    {
+        return mAliasListName;
+    }
+
+    /**
+     * Group property
+     */
+    @JsonIgnore
+    public StringProperty groupProperty()
+    {
+        return mGroup;
+    }
+
+    /**
+     * Alias name property
+     * @return
+     */
+    @JsonIgnore
+    public StringProperty nameProperty()
+    {
+        return mName;
+    }
+
+    /**
+     * Alias color value property
+     */
+    @JsonIgnore
+    public IntegerProperty colorProperty()
+    {
+        return mColor;
+    }
+
+    /**
+     * Icon name property
+     */
+    @JsonIgnore
+    public StringProperty iconNameProperty()
+    {
+        return mIconName;
+    }
+
+    /**
+     * Alias identifiers list property
+     */
+    @JsonIgnore
+    public ObservableList<AliasID> aliasIds()
+    {
+        return mAliasIDs;
+    }
+
+    /**
+     * Alias actions list property
+     */
+    @JsonIgnore
+    public ObservableList<AliasAction> aliasActions()
+    {
+        return mAliasActions;
+    }
+
+    /**
+     * Uses name value for string representation
+     */
     public String toString()
     {
         return getName();
     }
 
+    /**
+     * Alias name
+     */
     @JacksonXmlProperty(isAttribute = true, localName = "name")
     public String getName()
     {
-        return mName;
+        return mName.get();
     }
 
     public void setName(String name)
     {
-        mName = name;
+        mName.set(name);
     }
 
+    /**
+     * Alias list name for the alias list that this alias belongs to
+     */
     @JacksonXmlProperty(isAttribute = true, localName = "list")
-    public String getList()
+    public String getAliasListName()
     {
-        return mList;
+        return mAliasListName.get();
     }
 
-    public void setList(String list)
+    public void setAliasListName(String aliasListName)
     {
-        mList = list;
+        mAliasListName.set(aliasListName);
     }
 
+    @JsonIgnore
+    public boolean matchesAliasList(String aliasList)
+    {
+        boolean isEmptyArgument = aliasList == null || aliasList.isEmpty() || aliasList.contentEquals(AliasModel.NO_ALIAS_LIST);
+        boolean isEmptyThis = getAliasListName() == null || getAliasListName().isEmpty();
+
+        if(isEmptyArgument && isEmptyThis)
+        {
+            return true;
+        }
+        else if(!isEmptyArgument && !isEmptyThis && aliasList.contentEquals(getAliasListName()))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Indicates if this alias has a specified alias list name
+     */
     public boolean hasList()
     {
-        return mList != null;
+        return mAliasListName.get() != null;
     }
 
+    /**
+     * Grouping tag for this alias.
+     */
     @JacksonXmlProperty(isAttribute = true, localName = "group")
     public String getGroup()
     {
-        return mGroup;
+        return mGroup.get();
     }
 
     public void setGroup(String group)
     {
-        mGroup = group;
+        mGroup.set(group);
     }
 
+    /**
+     * Indicates if this alias has a grouping tag
+     */
     public boolean hasGroup()
     {
-        return mGroup != null;
+        return mGroup.get() != null;
     }
 
+    /**
+     * Color (RGBA) value to use for this alias
+     */
     @JacksonXmlProperty(isAttribute = true, localName = "color")
     public int getColor()
     {
-        return mColor;
+        return mColor.get();
+    }
+
+    @JsonIgnore
+    public String getColorHex()
+    {
+        return String.format("#%06X", (0xFFFFFF & mColor.get()));
     }
 
     public void setColor(int color)
     {
-        mColor = color;
+        mColor.set(color);
     }
 
+    /**
+     * Display color for this alias.
+     */
     @JsonIgnore
     public Color getDisplayColor()
     {
         return new Color(getColor());
     }
 
+    /**
+     * Icon name of the icon to use for this alias.
+     */
     @JacksonXmlProperty(isAttribute = true, localName = "iconName")
     public String getIconName()
     {
-        return mIconName;
+        return mIconName.get();
     }
 
     public void setIconName(String iconName)
     {
-        mIconName = iconName;
+        mIconName.set(iconName);
     }
 
+    /**
+     * List of alias identifiers for this alias.
+     */
     @JacksonXmlProperty(isAttribute = false, localName = "id")
-    public List<AliasID> getId()
+    public List<AliasID> getAliasIdentifiers()
     {
         return mAliasIDs;
     }
 
-    public void setId(ArrayList<AliasID> id)
+    public void setAliasIdentifiers(List<AliasID> id)
     {
-        mAliasIDs = id;
+        mAliasIDs.clear();
+
+        for(AliasID aliasID : id)
+        {
+            addAliasID(aliasID);
+        }
     }
 
+    /**
+     * Adds an alias identifier to this alias and updates the recordable and streamable attributes.
+     */
     public void addAliasID(AliasID id)
     {
         mAliasIDs.add(id);
+        validate();
+        updateOverlapBinding();
     }
 
+    /**
+     * Removes an alias identifier from this alias and updates the recordable and streamable attributes.
+     */
     public void removeAliasID(AliasID id)
     {
-        mAliasIDs.remove(id);
+        if(id != null)
+        {
+            mAliasIDs.remove(id);
+            validate();
+            updateOverlapBinding();
+        }
     }
 
+    /**
+     * List of alias actions associated with this alias.
+     */
     @JacksonXmlProperty(isAttribute = false, localName = "action")
-    public List<AliasAction> getAction()
+    public List<AliasAction> getAliasActions()
     {
         return mAliasActions;
     }
 
-    public void setAction(List<AliasAction> actions)
+    public void setAliasActions(List<AliasAction> actions)
     {
-        mAliasActions = actions;
+        mAliasActions.setAll(actions);
     }
 
+    /**
+     * Adds the specified alias action to this alias
+     */
     public void addAliasAction(AliasAction action)
     {
         mAliasActions.add(action);
     }
 
+    /**
+     * Removes the specified alias action from this alias
+     */
     public void removeAliasAction(AliasAction action)
     {
         mAliasActions.remove(action);
     }
 
+    /**
+     * Indicates if this alias has any associated
+     * @return
+     */
     public boolean hasActions()
     {
         return !mAliasActions.isEmpty();
     }
 
+
+    /**
+     * Updates the playback priority this alias
+     */
+    private void updatePriority()
+    {
+        for(AliasID aliasID: mAliasIDs)
+        {
+            if(aliasID instanceof Priority)
+            {
+                mPriority.set(((Priority)aliasID).getPriority());
+                return;
+            }
+        }
+
+        mPriority.set(Priority.DEFAULT_PRIORITY);
+    }
+
+    private void updateOverlapBinding()
+    {
+        mOverlap.unbind();
+
+        BooleanBinding binding = new SimpleBooleanProperty(true).not();
+
+        for(AliasID aliasID: mAliasIDs)
+        {
+            binding = binding.or(aliasID.overlapProperty());
+        }
+
+        mOverlap.bind(binding);
+    }
+
+    /**
+     * Updates the recordable status for this alias
+     */
+    private void updateRecordable()
+    {
+        for(AliasID aliasID: mAliasIDs)
+        {
+            if(aliasID instanceof Record)
+            {
+                mRecordable.set(true);
+                return;
+            }
+        }
+
+        mRecordable.set(false);
+    }
+
+    /**
+     * Updates the streamable status for this alias
+     */
+    private void updateStreamable()
+    {
+        for(AliasID aliasID: mAliasIDs)
+        {
+            if(aliasID instanceof BroadcastChannel)
+            {
+                mStreamable.set(true);
+                return;
+            }
+        }
+
+        mStreamable.set(false);
+    }
+
     /**
      * Perform any validation/cleanup actions on this alias.
      */
     public void validate()
     {
+        updatePriority();
+        updateRecordable();
+        updateStreamable();
     }
 
     /**
      * Returns the priority level of this alias, if defined, or the default priority
      */
     @JsonIgnore
-    public int getCallPriority()
+    public int getPlaybackPriority()
     {
         for(AliasID id : mAliasIDs)
         {
@@ -218,22 +526,23 @@ public class Alias
      */
     public void setCallPriority(int priority)
     {
-        if(priority == Priority.DO_NOT_MONITOR ||
-            (Priority.MIN_PRIORITY <= priority && priority <= Priority.MAX_PRIORITY))
-        {
-            for(AliasID id : mAliasIDs)
-            {
-                if(id.getType() == AliasIDType.PRIORITY)
-                {
-                    ((Priority)id).setPriority(priority);
-                    return;
-                }
-            }
+        AliasID priorityID = null;
 
-            //If we don't find a priority id, create one
-            Priority p = new Priority();
-            p.setPriority(priority);
-            addAliasID(p);
+        for(AliasID aliasID: mAliasIDs)
+        {
+            if(aliasID instanceof Priority)
+            {
+                priorityID = aliasID;
+            }
+        }
+
+        removeAliasID(priorityID);
+
+        //Don't add a priority alias id if the priority is MAX_PRIORITY or DEFAULT_PRIORITY since the getCallPriority()
+        //will return that as the default value
+        if(priority == Priority.DO_NOT_MONITOR || (Priority.MIN_PRIORITY <= priority && priority < Priority.MAX_PRIORITY))
+        {
+            addAliasID(new Priority(priority));
         }
     }
 
@@ -243,51 +552,29 @@ public class Alias
     @JsonIgnore
     public boolean isRecordable()
     {
-        for(AliasID id : getId())
-        {
-            if(id.getType() == AliasIDType.NON_RECORDABLE)
-            {
-                return false;
-            }
-        }
-
-        return true;
+        return mRecordable.get();
     }
 
     /**
-     * Sets or removes the non-recordable alias ID for this alias.
+     * Sets or removes the record alias ID for this alias.
      */
     public void setRecordable(boolean recordable)
     {
-        if(recordable)
+        AliasID recordID = null;
+
+        for(AliasID aliasID: mAliasIDs)
         {
-            AliasID toRemove = null;
-
-            for(AliasID id : getId())
+            if(aliasID instanceof Record)
             {
-                if(id.getType() == AliasIDType.NON_RECORDABLE)
-                {
-                    toRemove = id;
-                    break;
-                }
-            }
-
-            if(toRemove != null)
-            {
-                removeAliasID(toRemove);
+                recordID = aliasID;
             }
         }
-        else
-        {
-            for(AliasID id : getId())
-            {
-                if(id.getType() == AliasIDType.NON_RECORDABLE)
-                {
-                    return;
-                }
-            }
 
-            addAliasID(new NonRecordable());
+        removeAliasID(recordID);
+
+        if(recordable)
+        {
+            addAliasID(new Record());
         }
     }
 
@@ -297,15 +584,7 @@ public class Alias
     @JsonIgnore
     public boolean isStreamable()
     {
-        for(AliasID id : getId())
-        {
-            if(id.getType() == AliasIDType.BROADCAST_CHANNEL)
-            {
-                return true;
-            }
-        }
-
-        return false;
+        return mStreamable.get();
     }
 
     /**
@@ -316,7 +595,7 @@ public class Alias
     {
         Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
 
-        for(AliasID id : getId())
+        for(AliasID id : getAliasIdentifiers())
         {
             if(id.getType() == AliasIDType.BROADCAST_CHANNEL)
             {
@@ -337,15 +616,100 @@ public class Alias
             return false;
         }
 
-        for(AliasID id : getId())
+        for(AliasID id : getAliasIdentifiers())
         {
-            if(id.getType() == AliasIDType.BROADCAST_CHANNEL &&
-                ((BroadcastChannel)id).getChannelName().contentEquals(channel))
+            if(id instanceof BroadcastChannel)
             {
-                return true;
+                BroadcastChannel broadcastChannel = (BroadcastChannel)id;
+
+                if(broadcastChannel.getChannelName() != null && broadcastChannel.getChannelName().contentEquals(channel))
+                {
+                    return true;
+                }
             }
         }
 
         return false;
     }
+
+    /**
+     * Removes any broadcast channel(s) that match the argument
+     */
+    public void removeBroadcastChannel(String channel)
+    {
+        if(channel == null || channel.isEmpty())
+        {
+            return;
+        }
+
+        List<AliasID> toRemove = new ArrayList<>();
+
+        for(AliasID aliasID: getAliasIdentifiers())
+        {
+            if(aliasID instanceof BroadcastChannel &&
+                ((BroadcastChannel)aliasID).getChannelName().contentEquals(channel))
+            {
+                toRemove.add(aliasID);
+            }
+        }
+
+        for(AliasID aliasID: toRemove)
+        {
+            removeAliasID(aliasID);
+        }
+    }
+
+    /**
+     * Removes (clears) all broadcast channels from this alias
+     */
+    public void removeAllBroadcastChannels()
+    {
+        List<AliasID> toRemove = new ArrayList<>();
+        for(AliasID aliasID: mAliasIDs)
+        {
+            if(aliasID instanceof BroadcastChannel)
+            {
+                toRemove.add(aliasID);
+            }
+        }
+
+        for(AliasID aliasID: toRemove)
+        {
+            removeAliasID(aliasID);
+        }
+    }
+
+    /**
+     * Removes all non audio identifiers to prepare for replacing them from an editor.
+     */
+    public void removeNonAudioIdentifiers()
+    {
+        Iterator<AliasID> it = mAliasIDs.iterator();
+
+        while(it.hasNext())
+        {
+            if(!it.next().isAudioIdentifier())
+            {
+                it.remove();
+            }
+        }
+    }
+
+    /**
+     * Removes all alias actions from this alias
+     */
+    public void removeAllActions()
+    {
+        mAliasActions.clear();
+    }
+
+    /**
+     * Creates an observable property extractor for use with observable lists to detect changes internal to this object.
+     */
+    public static Callback<Alias,Observable[]> extractor()
+    {
+        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()};
+    }
 }

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

@@ -1,356 +0,0 @@
-package io.github.dsheirer.alias;
-
-import com.jidesoft.swing.JideSplitPane;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.icon.IconManager;
-import net.coderazzi.filters.gui.AutoChoices;
-import net.coderazzi.filters.gui.TableFilterHeader;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableCellRenderer;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-public class AliasController extends JPanel
-    implements ActionListener, ListSelectionListener
-{
-    private static final long serialVersionUID = 1L;
-
-    private AliasModel mAliasModel;
-    private JTable mAliasTable;
-    private TableFilterHeader mTableFilterHeader;
-    private AliasEditor mAliasEditor;
-    private MultipleAliasEditor mMultipleAliasEditor;
-    private JideSplitPane mSplitPane;
-
-    private static final String NEW_ALIAS = "New";
-    private static final String COPY_ALIAS = "Copy";
-    private static final String DELETE_ALIAS = "Delete";
-
-    private JButton mNewButton = new JButton(NEW_ALIAS);
-    private JButton mCopyButton = new JButton(COPY_ALIAS);
-    private JButton mDeleteButton = new JButton(DELETE_ALIAS);
-
-    private IconCellRenderer mIconCellRenderer;
-
-    public AliasController(AliasModel aliasModel, BroadcastModel broadcastModel, IconManager iconManager)
-    {
-        mAliasModel = aliasModel;
-
-        mAliasEditor = new AliasEditor(mAliasModel, broadcastModel, iconManager);
-        mMultipleAliasEditor = new MultipleAliasEditor(mAliasModel, broadcastModel, iconManager);
-
-        mIconCellRenderer = new IconCellRenderer(iconManager);
-
-        init();
-
-        mAliasModel.addListener(mAliasEditor);
-    }
-
-    private void init()
-    {
-        setLayout(new MigLayout("insets 0 0 0 0",
-            "[grow,fill]",
-            "[grow,fill]"));
-
-        //System Configuration View and Editor
-        mAliasTable = new JTable(mAliasModel);
-        mAliasTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-        mAliasTable.getSelectionModel().addListSelectionListener(this);
-        mAliasTable.setAutoCreateRowSorter(true);
-
-        mAliasTable.getColumnModel().getColumn(AliasModel.COLUMN_COLOR)
-            .setCellRenderer(new ColorCellRenderer());
-
-        mAliasTable.getColumnModel().getColumn(AliasModel.COLUMN_ICON)
-            .setCellRenderer(mIconCellRenderer);
-
-        mTableFilterHeader = new TableFilterHeader(mAliasTable, AutoChoices.ENABLED);
-        mTableFilterHeader.setFilterOnUpdates(true);
-
-        JScrollPane tableScroller = new JScrollPane(mAliasTable);
-
-        JPanel buttonsPanel = new JPanel();
-
-        buttonsPanel.setLayout(
-            new MigLayout("insets 0 0 0 0", "[grow,fill][grow,fill][grow,fill]", "[]"));
-
-        mNewButton.addActionListener(this);
-        mNewButton.setToolTipText("Adds a new alias");
-        buttonsPanel.add(mNewButton);
-
-        mCopyButton.addActionListener(this);
-        mCopyButton.setEnabled(false);
-        mCopyButton.setToolTipText("Creates a copy of the currently selected alias and adds it");
-        buttonsPanel.add(mCopyButton);
-
-        mDeleteButton.addActionListener(this);
-        mDeleteButton.setEnabled(false);
-        mDeleteButton.setToolTipText("Deletes the currently selected alias");
-        buttonsPanel.add(mDeleteButton);
-
-        JPanel listAndButtonsPanel = new JPanel();
-
-        listAndButtonsPanel.setLayout(
-            new MigLayout("insets 0 0 0 0", "[grow,fill]", "[grow,fill][]"));
-
-        listAndButtonsPanel.add(tableScroller, "wrap");
-        listAndButtonsPanel.add(buttonsPanel);
-
-        mSplitPane = new JideSplitPane(JideSplitPane.HORIZONTAL_SPLIT);
-        mSplitPane.setDividerSize(5);
-        mSplitPane.setShowGripper(true);
-        mSplitPane.add(listAndButtonsPanel);
-        mSplitPane.add(mAliasEditor);
-
-        add(mSplitPane);
-    }
-
-    /**
-     * Sets the editor argument as the currently visible alias editor
-     */
-    private void setEditor(Editor<?> editor)
-    {
-        if(mSplitPane.getComponentCount() == 3)
-        {
-            Component component = mSplitPane.getComponent(2);
-
-            if(component instanceof Editor<?> && component != editor)
-            {
-                //Get current divider location so that we can reapply it after
-                //changing out the editors, so that the interface doesn't move
-                int location = mSplitPane.getDividerLocation(0);
-
-                ((Editor<?>) component).setItem(null);
-
-                mSplitPane.remove(component);
-                editor.setPreferredSize(new Dimension(100, 100));
-                mSplitPane.add(editor);
-
-                mSplitPane.validate();
-                mSplitPane.setDividerLocation(0, location);
-                mSplitPane.repaint();
-            }
-        }
-    }
-
-    private Alias getAlias(int selectedRow)
-    {
-        if(selectedRow >= 0)
-        {
-            int index = mAliasTable.convertRowIndexToModel(selectedRow);
-
-            return mAliasModel.getAliasAtIndex(index);
-        }
-
-        return null;
-    }
-
-    @Override
-    public void valueChanged(ListSelectionEvent event)
-    {
-        //Limits event firing to only when selection is complete
-        if(!event.getValueIsAdjusting())
-        {
-            int[] selectedRows = mAliasTable.getSelectedRows();
-
-            if(selectedRows.length == 0)
-            {
-                mAliasEditor.setItem(null);
-                mCopyButton.setEnabled(false);
-                mDeleteButton.setEnabled(false);
-            }
-            else if(selectedRows.length == 1)
-            {
-                setEditor(mAliasEditor);
-
-                Alias selectedAlias = getAlias(selectedRows[0]);
-
-                mAliasEditor.setItem(selectedAlias);
-
-                if(selectedAlias != null)
-                {
-                    mCopyButton.setEnabled(true);
-                    mDeleteButton.setEnabled(true);
-                }
-                else
-                {
-                    mCopyButton.setEnabled(false);
-                    mDeleteButton.setEnabled(false);
-                }
-            }
-            else
-            {
-                setEditor(mMultipleAliasEditor);
-
-                mCopyButton.setEnabled(true);
-                mDeleteButton.setEnabled(true);
-
-                List<Alias> selectedAliases = new ArrayList<Alias>();
-
-                for(int selectedRow : selectedRows)
-                {
-                    Alias alias = getAlias(selectedRow);
-
-                    selectedAliases.add(alias);
-                }
-
-                mMultipleAliasEditor.setItem(selectedAliases);
-            }
-        }
-    }
-
-    /**
-     * Adds the alias to the alias table/model and scrolls the view it
-     */
-    private void addAlias(Alias alias)
-    {
-        //HACK: when inserting a row to the model, the JTable gets
-        //notified and attempts to tell the coderazzi table filter
-        //adaptive choices filter to refresh before the table filter is
-        //notified of the row additions, causing an index out of bounds
-        //exception.  We turn off adaptive choices temporarily, add the
-        //channel, and turn on adaptive choices again.
-        mTableFilterHeader.setAdaptiveChoices(false);
-
-        int index = mAliasModel.addAlias(alias);
-
-        mTableFilterHeader.setAdaptiveChoices(true);
-
-        if(index >= 0)
-        {
-            int translatedIndex = mAliasTable.convertRowIndexToView(index);
-            mAliasTable.setRowSelectionInterval(translatedIndex, translatedIndex);
-            mAliasTable.scrollRectToVisible(
-                new Rectangle(mAliasTable.getCellRect(translatedIndex, 0, true)));
-        }
-    }
-
-    private List<Alias> getSelectedAliases()
-    {
-        List<Alias> selected = new ArrayList<>();
-
-        int[] rows = mAliasTable.getSelectedRows();
-
-        for(int row : rows)
-        {
-            if(row >= 0)
-            {
-                Alias alias = mAliasModel.getAliasAtIndex(mAliasTable.convertRowIndexToModel(row));
-
-                if(alias != null)
-                {
-                    selected.add(alias);
-                }
-            }
-        }
-
-        return selected;
-    }
-
-    /**
-     * Responds to New, Copy and Delete Channel button invocations
-     */
-    @Override
-    public void actionPerformed(ActionEvent event)
-    {
-        switch(event.getActionCommand())
-        {
-            case NEW_ALIAS:
-                addAlias(new Alias("New Alias"));
-                break;
-            case COPY_ALIAS:
-                for(Alias alias : getSelectedAliases())
-                {
-                    addAlias(AliasFactory.copyOf(alias));
-                }
-                break;
-            case DELETE_ALIAS:
-                List<Alias> toDelete = getSelectedAliases();
-
-                if(toDelete != null && !toDelete.isEmpty())
-                {
-                    String title = toDelete.size() == 1 ? "Delete Alias?" : "Delete Aliases?";
-                    String prompt = toDelete.size() == 1 ? "Do you want to delete this alias?" :
-                        "Do you want to delete these " + toDelete.size() + " aliases?";
-
-                    int choice = JOptionPane.showConfirmDialog(AliasController.this,
-                        prompt, title, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-
-                    if(choice == JOptionPane.YES_OPTION)
-                    {
-                        for(Alias alias : toDelete)
-                        {
-                            mAliasModel.removeAlias(alias);
-                        }
-                    }
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Colorizes the cell based on the cell's integer value
-     */
-    public class ColorCellRenderer extends DefaultTableCellRenderer
-    {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public Component getTableCellRendererComponent(JTable table,
-                                                       Object value, boolean isSelected, boolean hasFocus, int row,
-                                                       int column)
-        {
-            JLabel label = (JLabel) super.getTableCellRendererComponent(table,
-                value, isSelected, hasFocus, row, column);
-
-            label.setBackground(new Color((int) value));
-
-            label.setText("");
-
-            return label;
-        }
-    }
-
-    /**
-     * Displays cell's icon and name
-     */
-    public class IconCellRenderer extends DefaultTableCellRenderer
-    {
-        private static final long serialVersionUID = 1L;
-
-        private IconManager mIconManager;
-
-        public IconCellRenderer(IconManager iconManager)
-        {
-            mIconManager = iconManager;
-        }
-
-        @Override
-        public Component getTableCellRendererComponent(JTable table,
-                                                       Object value, boolean isSelected, boolean hasFocus, int row,
-                                                       int column)
-        {
-            JLabel label = (JLabel) super.getTableCellRendererComponent(table,
-                value, isSelected, hasFocus, row, column);
-
-            ImageIcon icon = mIconManager.getIcon(label.getText(), 12);
-
-            if(icon != null)
-            {
-                label.setIcon(icon);
-            }
-
-            return label;
-        }
-    }
-}

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

@@ -1,158 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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;
-
-import com.jidesoft.swing.JideTabbedPane;
-import io.github.dsheirer.alias.action.AliasActionEditor;
-import io.github.dsheirer.alias.id.AliasIdentifierEditor;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.icon.IconManager;
-import io.github.dsheirer.sample.Listener;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-public class AliasEditor extends Editor<Alias> 
-			implements ActionListener, Listener<AliasEvent>
-{
-    private static final long serialVersionUID = 1L;
-
-	private static final String DEFAULT_NAME = "select an alias";
-
-	private AliasModel mAliasModel;
-	
-	private JLabel mAliasLabel;
-    private AliasNameEditor mAliasNameEditor;
-    private AliasIdentifierEditor mAliasIdentifierEditor;
-    private AliasActionEditor mAliasActionEditor;
-    
-    public AliasEditor(AliasModel aliasModel, BroadcastModel broadcastModel, IconManager iconManager )
-	{
-    	mAliasModel = aliasModel;
-    	mAliasNameEditor = new AliasNameEditor( mAliasModel, iconManager );
-    	mAliasIdentifierEditor = new AliasIdentifierEditor( aliasModel, broadcastModel );
-    	mAliasActionEditor = new AliasActionEditor( aliasModel );
-    	
-    	mAliasModel.addListener( this );
-		
-		init();
-	}
-
-    
-    @Override
-	public void setItem( Alias alias )
-	{
-		super.setItem( alias );
-		
-		if( hasItem() )
-		{
-    		mAliasLabel.setText( getItem().getName() );
-		}
-		else
-		{
-    		mAliasLabel.setText( DEFAULT_NAME );
-		}
-		
-		mAliasNameEditor.setItem( alias );
-		mAliasIdentifierEditor.setItem( alias );
-		mAliasActionEditor.setItem( alias );
-	}
-
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[grow,fill][grow,fill]", 
-				"[][][][][][grow,fill]" ) );
-		
-		add( new JLabel( "Alias:" ), "align right" );
-		mAliasLabel = new JLabel( DEFAULT_NAME );
-		add( mAliasLabel, "align left" );
-		
-		add( new JSeparator( JSeparator.HORIZONTAL ), "span,growx,push" );
-		
-		JideTabbedPane tabs = new JideTabbedPane();
-		tabs.setFont( this.getFont() );
-    	tabs.setForeground( Color.BLACK );
-
-		tabs.addTab( "Alias", mAliasNameEditor );
-		tabs.addTab( "Audio / Identifier", mAliasIdentifierEditor );
-		tabs.addTab( "Action", mAliasActionEditor );
-		add( tabs, "span,grow" );
-		
-		//Playlist management buttons
-		JButton btnSave = new JButton( "Save" );
-		btnSave.setToolTipText( "Save alias changes to the playlist" );
-		btnSave.addActionListener( AliasEditor.this );
-		add( btnSave );
-
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.setToolTipText( "Reset alias changes since last save" );
-		btnReset.addActionListener( AliasEditor.this );
-		add( btnReset, "wrap" );
-	}
-
-	@Override
-	public void receive( AliasEvent event )
-	{
-		//If this is the currently displayed alias, reload it
-		if( hasItem() && getItem() == event.getAlias() )
-		{
-			switch( event.getEvent() )
-			{
-				case CHANGE:
-					//Alias changed - reset the editor with changed alias
-					setItem( event.getAlias() );
-					break;
-				case DELETE:
-					setItem( null );
-					break;
-				default:
-					break;
-			}
-		}
-	}
-
-	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		if( hasItem() )
-		{
-			String command = e.getActionCommand();
-			
-			if( command.contentEquals( "Save" ) )
-			{
-				save();
-			}
-			else if( command.contentEquals( "Reset" ) )
-			{
-				reset();
-			}
-		}
-    }
-
-	@Override
-	public void save()
-	{
-		mAliasNameEditor.save();
-		mAliasIdentifierEditor.save();
-		mAliasActionEditor.save();
-	}
-}

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

@@ -1,55 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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;
-
-public class AliasEvent
-{
-	private Alias mAlias;
-	private Event mEvent;
-
-	/**
-	 * AliasEvent - event describing any changes to an alias
-	 * @param alias - alias that changed
-	 * @param event - change event
-	 */
-	public AliasEvent( Alias alias, Event event )
-	{
-		mAlias = alias;
-		mEvent = event;
-	}
-	
-	public Alias getAlias()
-	{
-		return mAlias;
-	}
-	
-	public Event getEvent()
-	{
-		return mEvent;
-	}
-	
-	/**
-	 * Channel events to describe the specific event
-	 */
-	public enum Event
-	{
-		ADD,
-		CHANGE,
-		DELETE;
-	}
-}

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

@@ -1,304 +1,249 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 package io.github.dsheirer.alias;
 
 import io.github.dsheirer.alias.action.AliasAction;
-import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.beep.BeepAction;
-import io.github.dsheirer.alias.action.beep.BeepActionEditor;
 import io.github.dsheirer.alias.action.clip.ClipAction;
-import io.github.dsheirer.alias.action.clip.ClipActionEditor;
 import io.github.dsheirer.alias.action.script.ScriptAction;
-import io.github.dsheirer.alias.action.script.ScriptActionEditor;
 import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasIDType;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannelEditor;
-import io.github.dsheirer.alias.id.esn.ESNEditor;
+import io.github.dsheirer.alias.id.dcs.Dcs;
 import io.github.dsheirer.alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncIDEditor;
+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.lojack.LoJackIDEditor;
-import io.github.dsheirer.alias.id.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mdc.MDC1200IDEditor;
-import io.github.dsheirer.alias.id.mobileID.MINEditor;
-import io.github.dsheirer.alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327IDEditor;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordableEditor;
 import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.priority.PriorityEditor;
-import io.github.dsheirer.alias.id.siteID.SiteID;
-import io.github.dsheirer.alias.id.siteID.SiteIDEditor;
-import io.github.dsheirer.alias.id.status.StatusID;
-import io.github.dsheirer.alias.id.status.StatusIDEditor;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupIDEditor;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueIDEditor;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.gui.editor.EmptyEditor;
+import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
+import io.github.dsheirer.alias.id.radio.Radio;
+import io.github.dsheirer.alias.id.radio.RadioRange;
+import io.github.dsheirer.alias.id.record.Record;
+import io.github.dsheirer.alias.id.status.UnitStatusID;
+import io.github.dsheirer.alias.id.status.UserStatusID;
+import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
+import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
+import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
+import io.github.dsheirer.alias.id.tone.TonesID;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AliasFactory
 {
-	public static AliasID copyOf( AliasID id )
-	{
-		switch( id.getType() )
-		{
-			case BROADCAST_CHANNEL:
-				BroadcastChannel originalBroadcast = (BroadcastChannel)id;
-				BroadcastChannel copyBroadcast = new BroadcastChannel();
-				copyBroadcast.setChannelName(originalBroadcast.getChannelName());
-				return copyBroadcast;
-			case ESN:
-				Esn originalESN = (Esn)id;
-				Esn copyESN = new Esn();
-				copyESN.setEsn( originalESN.getEsn() );
-				return copyESN;
-			case FLEETSYNC:
-				FleetsyncID originalFleetsyncID = (FleetsyncID)id;
-				FleetsyncID copyFleetsyncID = new FleetsyncID();
-				copyFleetsyncID.setIdent( originalFleetsyncID.getIdent() );
-				return copyFleetsyncID;
-			case LTR_NET_UID:
-				UniqueID originalUniqueID = (UniqueID)id;
-				UniqueID copyUniqueID = new UniqueID();
-				copyUniqueID.setUid( originalUniqueID.getUid() );
-				return copyUniqueID;
-			case LOJACK:
-				LoJackFunctionAndID originalLoJackFunctionAndID = (LoJackFunctionAndID)id;
-				LoJackFunctionAndID copyLoJackFunctionAndID = new LoJackFunctionAndID();
-				copyLoJackFunctionAndID.setFunction( originalLoJackFunctionAndID.getFunction() );
-				copyLoJackFunctionAndID.setID( originalLoJackFunctionAndID.getID() );
-				return copyLoJackFunctionAndID;
-			case MDC1200:
-				MDC1200ID originalMDC1200ID = (MDC1200ID)id;
-				MDC1200ID copyMDC1200ID = new MDC1200ID();
-				copyMDC1200ID.setIdent( originalMDC1200ID.getIdent() );
-				return copyMDC1200ID;
-			case MIN:
-				Min originalMin = (Min)id;
-				Min copyMin = new Min();
-				copyMin.setMin( originalMin.getMin() );
-				return copyMin;
-			case MPT1327:
-				MPT1327ID originalMPT1327ID = (MPT1327ID)id;
-				MPT1327ID copyMPT1327ID = new MPT1327ID();
-				copyMPT1327ID.setIdent( originalMPT1327ID.getIdent() );
-				return copyMPT1327ID;
-			case NON_RECORDABLE:
-				return new NonRecordable();
-			case PRIORITY:
-				Priority originalPriority = (Priority)id;
-				Priority copyPriority = new Priority();
-				copyPriority.setPriority( originalPriority.getPriority() );
-				return copyPriority;
-			case SITE:
-				SiteID originalSiteID = (SiteID)id;
-				SiteID copySiteID = new SiteID();
-				copySiteID.setSite( originalSiteID.getSite() );
-				return copySiteID;
-			case TALKGROUP:
-				TalkgroupID originalTalkgroupID = (TalkgroupID)id;
-				TalkgroupID copyTalkgroupID = new TalkgroupID();
-				copyTalkgroupID.setTalkgroup( originalTalkgroupID.getTalkgroup() );
-				return copyTalkgroupID;
-			case STATUS:
-				StatusID originalStatusID = (StatusID)id;
-				StatusID copyStatusID = new StatusID();
-				copyStatusID.setStatus( originalStatusID.getStatus() );
-				return copyStatusID;
-			default:
-		}
+    private static final Logger mLog = LoggerFactory.getLogger(AliasFactory.class);
 
-		return null;
-	}
-	
-	public static AliasAction copyOf( AliasAction action )
-	{
-		if( action instanceof BeepAction )
-		{
-			return new BeepAction();
-		}
-		else if( action instanceof ClipAction)
-		{
-			ClipAction originalClip = (ClipAction)action;
-			ClipAction copyClip = new ClipAction();
-			copyClip.setInterval( originalClip.getInterval() );
-			copyClip.setPath( originalClip.getPath() );
-			copyClip.setPeriod( originalClip.getPeriod() );
-			return copyClip;
-		}
-		else if( action instanceof ScriptAction )
-		{
-			ScriptAction originalScript = (ScriptAction)action;
-			ScriptAction copyScript = new ScriptAction();
-			copyScript.setInterval( originalScript.getInterval() );
-			copyScript.setPeriod( originalScript.getPeriod() );
-			copyScript.setScript( originalScript.getScript() );
-			return copyScript;
-		}
-		
-		return null;
-	}
-	
-	public static Alias copyOf( Alias original )
-	{
-		Alias copy = new Alias( original.getName() );
-		copy.setList( original.getList() );
-		copy.setGroup( original.getGroup() );
-		copy.setColor( original.getColor() );
-		copy.setIconName( original.getIconName() );
-		
-		for( AliasID id: original.getId() )
-		{
-			AliasID copyID = copyOf( id );
-			
-			if( copyID != null )
-			{
-				copy.addAliasID( copyID );
-			}
-		}
+    public static AliasID copyOf(AliasID id)
+    {
+        switch(id.getType())
+        {
+            case BROADCAST_CHANNEL:
+                BroadcastChannel originalBroadcast = (BroadcastChannel)id;
+                BroadcastChannel copyBroadcast = new BroadcastChannel();
+                copyBroadcast.setChannelName(originalBroadcast.getChannelName());
+                return copyBroadcast;
+            case DCS:
+                Dcs originalDcs = (Dcs)id;
+                Dcs copyDcs = new Dcs();
+                copyDcs.setDCSCode(originalDcs.getDCSCode());
+                return copyDcs;
+            case ESN:
+                Esn originalESN = (Esn)id;
+                Esn copyESN = new Esn();
+                copyESN.setEsn(originalESN.getEsn());
+                return copyESN;
+            case LOJACK:
+                LoJackFunctionAndID originalLoJackFunctionAndID = (LoJackFunctionAndID)id;
+                LoJackFunctionAndID copyLoJackFunctionAndID = new LoJackFunctionAndID();
+                copyLoJackFunctionAndID.setFunction(originalLoJackFunctionAndID.getFunction());
+                copyLoJackFunctionAndID.setID(originalLoJackFunctionAndID.getID());
+                return copyLoJackFunctionAndID;
+            case MIN:
+                Min originalMin = (Min)id;
+                Min copyMin = new Min();
+                copyMin.setMin(originalMin.getMin());
+                return copyMin;
+            case P25_FULLY_QUALIFIED_RADIO_ID:
+                P25FullyQualifiedRadio originalP25 = (P25FullyQualifiedRadio) id;
+                P25FullyQualifiedRadio copyP25 = new P25FullyQualifiedRadio(originalP25.getWacn(),
+                        originalP25.getSystem(), originalP25.getValue());
+                copyP25.setOverlap(originalP25.overlapProperty().get());
+                return copyP25;
+            case P25_FULLY_QUALIFIED_TALKGROUP:
+                P25FullyQualifiedTalkgroup originalFqt = (P25FullyQualifiedTalkgroup) id;
+                P25FullyQualifiedTalkgroup copyFqt = new P25FullyQualifiedTalkgroup(originalFqt.getWacn(),
+                        originalFqt.getSystem(), originalFqt.getValue());
+                copyFqt.setOverlap(originalFqt.overlapProperty().get());
+                return copyFqt;
+            case PRIORITY:
+                Priority originalPriority = (Priority)id;
+                Priority copyPriority = new Priority();
+                copyPriority.setPriority(originalPriority.getPriority());
+                return copyPriority;
+            case RADIO_ID:
+                Radio originalRadio = (Radio)id;
+                Radio copyRadio = new Radio(originalRadio.getProtocol(), originalRadio.getValue());
+                copyRadio.setOverlap(originalRadio.overlapProperty().get());
+                return copyRadio;
+            case RADIO_ID_RANGE:
+                RadioRange originalRadioRange = (RadioRange)id;
+                RadioRange copyRadioRange = new RadioRange(originalRadioRange.getProtocol(), originalRadioRange.getMinRadio(),
+                    originalRadioRange.getMaxRadio());
+                copyRadioRange.setOverlap(originalRadioRange.overlapProperty().get());
+                return copyRadioRange;
+            case RECORD:
+                return new Record();
+            case SITE:
+                SiteID originalSiteID = (SiteID)id;
+                SiteID copySiteID = new SiteID();
+                copySiteID.setSite(originalSiteID.getSite());
+                return copySiteID;
+            case STATUS:
+                UserStatusID originalUserStatusID = (UserStatusID)id;
+                UserStatusID copyUserStatusID = new UserStatusID();
+                copyUserStatusID.setStatus(originalUserStatusID.getStatus());
+                copyUserStatusID.setOverlap(originalUserStatusID.overlapProperty().get());
+                return copyUserStatusID;
+            case TALKGROUP:
+                Talkgroup originalTalkgroup = (Talkgroup)id;
+                Talkgroup copyTalkgroup = new Talkgroup(originalTalkgroup.getProtocol(), originalTalkgroup.getValue());
+                copyTalkgroup.setOverlap(originalTalkgroup.overlapProperty().get());
+                return copyTalkgroup;
+            case TALKGROUP_RANGE:
+                TalkgroupRange originalRange = (TalkgroupRange)id;
+                TalkgroupRange copyRange = new TalkgroupRange(originalRange.getProtocol(), originalRange.getMinTalkgroup(),
+                    originalRange.getMaxTalkgroup());
+                copyRange.setOverlap(originalRange.overlapProperty().get());
+                return copyRange;
+            case TONES:
+                TonesID originalTones = (TonesID)id;
+                TonesID copyTones = new TonesID();
+                copyTones.setToneSequence(originalTones.getToneSequence().copyOf());
+                return copyTones;
+            case UNIT_STATUS:
+                UnitStatusID originalUnitStatus = (UnitStatusID)id;
+                UnitStatusID copyUnitStatusID = new UnitStatusID();
+                copyUnitStatusID.setStatus(originalUnitStatus.getStatus());
+                copyUnitStatusID.setOverlap(originalUnitStatus.overlapProperty().get());
+                return copyUnitStatusID;
 
-		for( AliasAction action: original.getAction() )
-		{
-			AliasAction copyAction = copyOf( action );
-			
-			if( copyAction != null )
-			{
-				copy.addAliasAction( copyAction );
-			}
-		}
-		
-		return copy;
-	}
+            //Legacy identifiers ... not supported
+            case FLEETSYNC:
+            case LEGACY_TALKGROUP:
+            case LTR_NET_UID:
+            case MDC1200:
+            case MPT1327:
+            case NON_RECORDABLE:
+                return null;
+            default:
+                mLog.warn("Unrecognized Alias ID Type [" + id.getType() + "] cannot make copy of instance");
+                break;
+        }
 
-	public static Editor<AliasID> getEditor( AliasID aliasID, BroadcastModel broadcastModel )
-	{
-		if( aliasID != null )
-		{
-			switch( aliasID.getType() )
-			{
-				case BROADCAST_CHANNEL:
-					return new BroadcastChannelEditor(aliasID, broadcastModel);
-				case ESN:
-					return new ESNEditor( aliasID );
-				case FLEETSYNC:
-					return new FleetsyncIDEditor( aliasID );
-				case LTR_NET_UID:
-					return new UniqueIDEditor( aliasID );
-				case LOJACK:
-					return new LoJackIDEditor( aliasID );
-				case MDC1200:
-					return new MDC1200IDEditor( aliasID );
-				case MIN:
-					return new MINEditor( aliasID );
-				case MPT1327:
-					return new MPT1327IDEditor( aliasID );
-				case NON_RECORDABLE:
-					return new NonRecordableEditor( aliasID );
-				case PRIORITY:
-					return new PriorityEditor( aliasID );
-				case SITE:
-					return new SiteIDEditor( aliasID );
-				case STATUS:
-					return new StatusIDEditor( aliasID );
-				case TALKGROUP:
-					return new TalkgroupIDEditor( aliasID );
-				default:
-					break;
-			}
-		}
-		
-		return new EmptyEditor<AliasID>();
-	}
-	
-	public static Editor<AliasAction> getEditor( AliasAction aliasAction )
-	{
-		if( aliasAction != null )
-		{
-			switch( aliasAction.getType() )
-			{
-				case BEEP:
-					return new BeepActionEditor( aliasAction );
-				case CLIP:
-					return new ClipActionEditor( aliasAction );
-				case SCRIPT:
-					return new ScriptActionEditor( aliasAction );
-				default:
-					break;
-			}
-		}
-		
-		return new EmptyEditor<AliasAction>();
-	}
-	
-	public static AliasID getAliasID( AliasIDType type )
-	{
-		switch( type )
-		{
-			case BROADCAST_CHANNEL:
-				return new BroadcastChannel();
-			case ESN:
-				return new Esn();
-			case FLEETSYNC:
-				return new FleetsyncID();
-			case LTR_NET_UID:
-				return new UniqueID();
-			case LOJACK:
-				return new LoJackFunctionAndID();
-			case MDC1200:
-				return new MDC1200ID();
-			case MIN:
-				return new Min();
-			case MPT1327:
-				return new MPT1327ID();
-			case NON_RECORDABLE:
-				return new NonRecordable();
-			case PRIORITY:
-				return new Priority();
-			case SITE:
-				return new SiteID();
-			case STATUS:
-				return new StatusID();
-			case TALKGROUP:
-				return new TalkgroupID();
-			default:
-				throw new IllegalArgumentException( "Unrecognized Alias ID type: " + type );
-		}
-	}
-	
-	public static AliasAction getAliasAction( AliasActionType type )
-	{
-		switch( type )
-		{
-			case BEEP:
-				return new BeepAction();
-			case CLIP:
-				return new ClipAction();
-			case SCRIPT:
-				return new ScriptAction();
-			default:
-				throw new IllegalArgumentException( "Unrecognized Alias Action type: " + type );
-		}
-	}
-	
+        return null;
+    }
+
+    public static AliasAction copyOf(AliasAction action)
+    {
+        if(action instanceof BeepAction)
+        {
+            BeepAction original = (BeepAction)action;
+            BeepAction copyBeep = new BeepAction();
+            copyBeep.setInterval(original.getInterval());
+            copyBeep.setPeriod(original.getPeriod());
+            return copyBeep;
+        }
+        else if(action instanceof ClipAction)
+        {
+            ClipAction originalClip = (ClipAction)action;
+            ClipAction copyClip = new ClipAction();
+            copyClip.setInterval(originalClip.getInterval());
+            copyClip.setPath(originalClip.getPath());
+            copyClip.setPeriod(originalClip.getPeriod());
+            return copyClip;
+        }
+        else if(action instanceof ScriptAction)
+        {
+            ScriptAction originalScript = (ScriptAction)action;
+            ScriptAction copyScript = new ScriptAction();
+            copyScript.setInterval(originalScript.getInterval());
+            copyScript.setPeriod(originalScript.getPeriod());
+            copyScript.setScript(originalScript.getScript());
+            return copyScript;
+        }
+
+        return null;
+    }
+
+    public static Alias shallowCopyOf(Alias original)
+    {
+        Alias copy = new Alias(original.getName());
+        copy.setAliasListName(original.getAliasListName());
+        copy.setGroup(original.getGroup());
+        copy.setColor(original.getColor());
+        copy.setIconName(original.getIconName());
+        copy.setRecordable(original.isRecordable());
+        return copy;
+    }
+
+    public static List<AliasID> copyAliasIDs(Alias original)
+    {
+        List<AliasID> aliasIDS = new ArrayList<>();
+
+        for(AliasID id : original.getAliasIdentifiers())
+        {
+            aliasIDS.add(copyOf(id));
+        }
+
+        return aliasIDS;
+    }
+
+    public static List<AliasAction> copyAliasActions(Alias original)
+    {
+        List<AliasAction> actions = new ArrayList<>();
+
+        for(AliasAction aliasAction: original.getAliasActions())
+        {
+            actions.add(copyOf(aliasAction));
+        }
+
+        return actions;
+    }
+
+    public static Alias copyOf(Alias original)
+    {
+        Alias copy = shallowCopyOf(original);
+
+        List<AliasID> aliasIDS = copyAliasIDs(original);
+
+        for(AliasID aliasID: aliasIDS)
+        {
+            copy.addAliasID(aliasID);
+        }
+
+        List<AliasAction> actions = copyAliasActions(original);
+
+        for(AliasAction action: actions)
+        {
+            copy.addAliasAction(action);
+        }
+
+        return copy;
+    }
 }

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

@@ -1,53 +1,66 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 package io.github.dsheirer.alias;
 
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.sample.Broadcaster;
-import io.github.dsheirer.sample.Listener;
-
-import javax.swing.table.AbstractTableModel;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * Alias Model
+ * 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).
  */
-public class AliasModel extends AbstractTableModel
+public class AliasModel
 {
-    private static final long serialVersionUID = 1L;
-
-    public static final int COLUMN_LIST = 0;
-    public static final int COLUMN_GROUP = 1;
-    public static final int COLUMN_NAME = 2;
-    public static final int COLUMN_ICON = 3;
-    public static final int COLUMN_COLOR = 4;
-
-    private List<Alias> mAliases = new CopyOnWriteArrayList<>();
-    private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
+    private final static Logger mLog = LoggerFactory.getLogger(AliasModel.class);
+    public static final String NO_ALIAS_LIST = "(No Alias List)";
+    private ObservableList<Alias> mAliases = FXCollections.observableArrayList(Alias.extractor());
+    private ObservableList<String> mAliasListNames = FXCollections.observableArrayList();
     private Map<String,AliasList> mAliasListMap = new HashMap<>();
 
     public AliasModel()
     {
+        //Register a listener to detect alias changes and broadcast change events to cause playlist save requests
+        mAliases.addListener(new AliasListChangeListener());
+    }
+
+    public ObservableList<Alias> aliasList()
+    {
+        return mAliases;
+    }
+
+    public ObservableList<String> aliasListNames()
+    {
+        return mAliasListNames;
     }
 
     /**
@@ -58,41 +71,82 @@ public class AliasModel extends AbstractTableModel
         return Collections.unmodifiableList(mAliases);
     }
 
-    public Alias getAliasAtIndex(int row)
+    /**
+     * Removes all aliases from the list and broadcasts the alias delete event for each
+     */
+    public void clear()
     {
-        if(mAliases.size() >= row)
+        List<Alias> aliasToRemove = new ArrayList<>(mAliases);
+
+        for(Alias alias: aliasToRemove)
         {
-            return mAliases.get(row);
+            removeAlias(alias);
+        }
+
+        mAliasListNames.clear();
+    }
+
+    /**
+     * Returns an optional alias list associated with the identifier collection
+     *
+     * @return alias list or null
+     */
+    public AliasList getAliasList(IdentifierCollection identifierCollection)
+    {
+        if(identifierCollection != null)
+        {
+            return getAliasList(identifierCollection.getAliasListConfiguration());
         }
 
         return null;
     }
 
+    /**
+     * Retrieves an alias list specified by the alias list configuration identifier
+     *
+     * @param configurationIdentifier containing the name of an alias list
+     * @return alias list or null.
+     */
+    public AliasList getAliasList(AliasListConfigurationIdentifier configurationIdentifier)
+    {
+        if(configurationIdentifier != null && configurationIdentifier.isValid())
+        {
+            return getAliasList(configurationIdentifier.getValue());
+        }
+
+        return null;
+    }
+
+    /**
+     * Creates a new alias list containing all aliases that match the alias name, or returns a previously created and
+     * cached alias list.  Returned alias list is automatically registered as a listener to this model so that any
+     * updates to the list by the user will automatically be reflected in constructed alias lists.
+     */
     public AliasList getAliasList(String name)
     {
-        if(name != null && mAliasListMap.containsKey(name))
+        if(name == null || name.isEmpty())
         {
-            return mAliasListMap.get(name);
+            return new AliasList(name);
+        }
+
+        AliasList mapValue = mAliasListMap.get(name);
+        if (mapValue != null)
+        {
+            return mapValue;
         }
 
         AliasList aliasList = new AliasList(name);
 
-        if(name != null)
+        for(Alias alias : mAliases)
         {
-            for(Alias alias : mAliases)
+            if(alias.hasList() && alias.getAliasListName().equalsIgnoreCase(name))
             {
-                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
-                {
-                    aliasList.addAlias(alias);
-                }
+                aliasList.addAlias(alias);
             }
-
-            mAliasListMap.put(name, aliasList);
-
-            //Register the new alias list to receive updates from this model
-            addListener(aliasList);
         }
 
+        mAliasListMap.put(name, aliasList);
+
         return aliasList;
     }
 
@@ -101,19 +155,7 @@ public class AliasModel extends AbstractTableModel
      */
     public List<String> getListNames()
     {
-        List<String> listNames = new ArrayList<>();
-
-        for(Alias alias : mAliases)
-        {
-            if(alias.hasList() && !listNames.contains(alias.getList()))
-            {
-                listNames.add(alias.getList());
-            }
-        }
-
-        Collections.sort(listNames);
-
-        return listNames;
+        return mAliasListNames;
     }
 
     /**
@@ -136,214 +178,209 @@ public class AliasModel extends AbstractTableModel
         return groupNames;
     }
 
-    /**
-     * Returns a list of alias group names for all aliases that have a matching
-     * list name value
-     */
-    public List<String> getGroupNames(String listName)
-    {
-        List<String> groupNames = new ArrayList<>();
-
-        if(listName != null)
-        {
-            for(Alias alias : mAliases)
-            {
-                if(alias.hasList() &&
-                    alias.hasGroup() &&
-                    listName.equals(alias.getList()) &&
-                    !groupNames.contains(alias.getGroup()))
-                {
-                    groupNames.add(alias.getGroup());
-                }
-            }
-        }
-
-        Collections.sort(groupNames);
-
-        return groupNames;
-    }
-
     /**
      * Bulk loading of aliases
      */
     public void addAliases(List<Alias> aliases)
     {
-        for(Alias alias : aliases)
-        {
-            addAlias(alias);
-        }
+        removeAliases(aliases);
+        mAliases.addAll(aliases);
     }
 
     /**
      * Adds the alias to the model
      */
-    public int addAlias(Alias alias)
+    public void addAlias(Alias alias)
     {
-        if(alias != null)
+        if(mAliases.contains(alias))
         {
-            mAliases.add(alias);
-
-            int index = mAliases.size() - 1;
-
-            fireTableRowsInserted(index, index);
-
-            broadcast(new AliasEvent(alias, AliasEvent.Event.ADD));
-
-            return index;
+            removeAlias(alias);
         }
 
-        return -1;
+        mAliases.add(alias);
+    }
+
+    private boolean hasAliasList(String aliasListName)
+    {
+        return aliasListName != null && mAliasListMap.containsKey(aliasListName);
+    }
+
+    public void addAliasList(String aliasListName)
+    {
+        if(aliasListName != null && !aliasListName.isEmpty())
+        {
+            if(!mAliasListNames.contains(aliasListName))
+            {
+                mAliasListNames.add(aliasListName);
+            }
+        }
+        else if(!mAliasListNames.contains(NO_ALIAS_LIST))
+        {
+            //This list allows users to view unassigned aliases so that they can move them to a valid alias list, but
+            // it is not assignable to a channel
+            mAliasListNames.add(NO_ALIAS_LIST);
+        }
     }
 
     /**
-     * Removes the channel from the model and broadcasts a channel remove event
+     * Removes the alias from this model and an alias list (if one exists)
      */
     public void removeAlias(Alias alias)
     {
         if(alias != null)
         {
-            int index = mAliases.indexOf(alias);
-
             mAliases.remove(alias);
 
-            fireTableRowsDeleted(index, index);
-
-            broadcast(new AliasEvent(alias, AliasEvent.Event.DELETE));
+            if(hasAliasList(alias.getAliasListName()))
+            {
+                getAliasList(alias.getAliasListName()).removeAlias(alias);
+            }
         }
     }
 
     /**
-     * Renames any broadcast channels that have the previous name.
-     *
-     * @param previousName to rename
-     * @param newName to assign to the broadcast channel
+     * Removes the list of aliases from this model and any alias lists that might contain each alias.
+     * @param aliases
      */
-    public void renameBroadcastChannel(String previousName, String newName)
+    public void removeAliases(List<Alias> aliases)
     {
-        if(previousName == null || previousName.isEmpty() || newName == null || newName.isEmpty())
+        if(aliases != null && !aliases.isEmpty())
+        {
+            mAliases.removeAll(aliases);
+
+            for(Alias alias: aliases)
+            {
+                if(hasAliasList(alias.getAliasListName()))
+                {
+                    getAliasList(alias.getAliasListName()).removeAlias(alias);
+                }
+            }
+        }
+    }
+
+    /**
+     * Retrieves all aliases that match the alias list and have at least one alias ID of the specified type
+     * @param aliasListName to search
+     * @param type to find
+     * @return list of aliases
+     */
+    public List<Alias> getAliases(String aliasListName, AliasIDType type)
+    {
+        List<Alias> aliases = new ArrayList<>();
+
+        for(Alias alias : mAliases)
+        {
+            if(alias.hasList() && alias.getAliasListName().equalsIgnoreCase(aliasListName))
+            {
+                for(AliasID aliasID: alias.getAliasIdentifiers())
+                {
+                    if(aliasID.getType() == type)
+                    {
+                        aliases.add(alias);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return aliases;
+    }
+
+    /**
+     * Indicates that one or more of the aliases managed by this model are configured to stream to the specified
+     * broadcast channel argument.
+     * @param broadcastChannel to check
+     * @return true if the broadcast channel is non-null, non-empty and at least one alias is configured to stream to
+     * the specified stream name.
+     */
+    public boolean hasAliasesWithBroadcastChannel(String broadcastChannel)
+    {
+        if(broadcastChannel == null || broadcastChannel.isEmpty())
+        {
+            return false;
+        }
+
+        for(Alias alias: mAliases)
+        {
+            if(alias.hasBroadcastChannel(broadcastChannel))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Updates all aliases configured to stream to the previousStreamName with the updatedStreamName
+     * @param previousStreamName to be removed
+     * @param updatedStreamName to be added
+     */
+    public void updateBroadcastChannel(String previousStreamName, String updatedStreamName)
+    {
+        if(previousStreamName == null || previousStreamName.isEmpty() || updatedStreamName == null || updatedStreamName.isEmpty())
         {
             return;
         }
 
-        for(Alias alias : mAliases)
+        for(Alias alias: mAliases)
         {
-            if(alias.hasBroadcastChannel(previousName))
+            if(alias.hasBroadcastChannel(previousStreamName))
             {
-                for(BroadcastChannel broadcastChannel : alias.getBroadcastChannels())
+                for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
                 {
-                    if(broadcastChannel.getChannelName().contentEquals(previousName))
+                    if(broadcastChannel.getChannelName().contentEquals(previousStreamName))
                     {
-                        broadcastChannel.setChannelName(newName);
+                        alias.removeAliasID(broadcastChannel);
+
+                        if(!alias.hasBroadcastChannel(updatedStreamName))
+                        {
+                            alias.addAliasID(new BroadcastChannel(updatedStreamName));
+                        }
                     }
                 }
             }
         }
     }
 
-    @Override
-    public int getRowCount()
+    /**
+     * Monitors alias additions and removals and updates alias lists
+     */
+    public class AliasListChangeListener implements ListChangeListener<Alias>
     {
-        return mAliases.size();
-    }
-
-    @Override
-    public int getColumnCount()
-    {
-        return 5;
-    }
-
-    @Override
-    public String getColumnName(int columnIndex)
-    {
-        switch(columnIndex)
+        @Override
+        public void onChanged(ListChangeListener.Change<? extends Alias> change)
         {
-            case COLUMN_LIST:
-                return "List";
-            case COLUMN_GROUP:
-                return "Group";
-            case COLUMN_NAME:
-                return "Name";
-            case COLUMN_ICON:
-                return "Icon";
-            case COLUMN_COLOR:
-                return "Color";
+            while(change.next())
+            {
+                if(change.wasAdded())
+                {
+                    for(Alias alias: change.getAddedSubList())
+                    {
+                        addAliasList(alias.getAliasListName());
+
+                        if(hasAliasList(alias.getAliasListName()))
+                        {
+                            getAliasList(alias.getAliasListName()).addAlias(alias);
+                        }
+                    }
+                }
+                else if(change.wasRemoved())
+                {
+                    for(Alias alias: change.getRemoved())
+                    {
+                        if(hasAliasList(alias.getAliasListName()))
+                        {
+                            AliasList aliasList = getAliasList(alias.getName());
+
+                            if(alias != null)
+                            {
+                                aliasList.removeAlias(alias);
+                            }
+                        }
+                    }
+                }
+            }
         }
-
-        return null;
-    }
-
-    @Override
-    public Class<?> getColumnClass(int columnIndex)
-    {
-        if(columnIndex == COLUMN_COLOR)
-        {
-            return Integer.class;
-        }
-
-        return String.class;
-    }
-
-    @Override
-    public boolean isCellEditable(int rowIndex, int columnIndex)
-    {
-        return false;
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex)
-    {
-        Alias alias = mAliases.get(rowIndex);
-
-        switch(columnIndex)
-        {
-            case COLUMN_LIST:
-                return alias.getList();
-            case COLUMN_GROUP:
-                return alias.getGroup();
-            case COLUMN_NAME:
-                return alias.getName();
-            case COLUMN_ICON:
-                return alias.getIconName();
-            case COLUMN_COLOR:
-                return alias.getColor();
-        }
-
-        return null;
-    }
-
-    @Override
-    public void setValueAt(Object aValue, int rowIndex, int columnIndex)
-    {
-        throw new IllegalArgumentException("Not yet implemented");
-    }
-
-    public void broadcast(AliasEvent event)
-    {
-        Alias alias = event.getAlias();
-
-        //Validate the alias following a user action that changed the alias or any alias IDs
-        if(alias != null)
-        {
-            alias.validate();
-        }
-
-        if(event.getEvent() == AliasEvent.Event.CHANGE)
-        {
-            int index = mAliases.indexOf(event.getAlias());
-
-            fireTableRowsUpdated(index, index);
-        }
-
-        mAliasEventBroadcaster.broadcast(event);
-    }
-
-    public void addListener(Listener<AliasEvent> listener)
-    {
-        mAliasEventBroadcaster.addListener(listener);
-    }
-
-    public void removeListener(Listener<AliasEvent> listener)
-    {
-        mAliasEventBroadcaster.removeListener(listener);
     }
 }

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

@@ -1,333 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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;
-
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.icon.Icon;
-import io.github.dsheirer.icon.IconListCellRenderer;
-import io.github.dsheirer.icon.IconManager;
-import io.github.dsheirer.icon.IconTableModel;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.List;
-
-public class AliasNameEditor extends Editor<Alias>
-{
-    private static final long serialVersionUID = 1L;
-
-    private static ComboBoxModel<String> EMPTY_LIST_MODEL = new DefaultComboBoxModel<>();
-    private static ComboBoxModel<String> EMPTY_GROUP_MODEL = new DefaultComboBoxModel<>();
-
-    private JComboBox<String> mListCombo = new JComboBox<>(EMPTY_LIST_MODEL);
-    private JComboBox<String> mGroupCombo = new JComboBox<>(EMPTY_GROUP_MODEL);
-    private JComboBox<Icon> mIconCombo;
-    private JTextField mName;
-    private JButton mButtonColor;
-    private JButton mBtnIconManager;
-
-    private AliasModel mAliasModel;
-    private IconManager mIconManager;
-
-    public AliasNameEditor(AliasModel aliasModel, IconManager iconManager)
-    {
-        mAliasModel = aliasModel;
-        mIconManager = iconManager;
-
-        mIconManager.getModel().addTableModelListener(new TableModelListener()
-        {
-            @Override
-            public void tableChanged(TableModelEvent e)
-            {
-                refreshIcons();
-            }
-        });
-
-        init();
-    }
-
-    private void init()
-    {
-        setLayout(new MigLayout("fill,wrap 2", "[right][grow,fill]", "[][][][][][][grow]"));
-
-        add(new JLabel("Name:"));
-        mName = new JTextField();
-        mName.getDocument().addDocumentListener(new DocumentListener()
-        {
-            @Override
-            public void removeUpdate(DocumentEvent e)
-            {
-                setModified(true);
-            }
-
-            @Override
-            public void insertUpdate(DocumentEvent e)
-            {
-                setModified(true);
-            }
-
-            @Override
-            public void changedUpdate(DocumentEvent e)
-            {
-            }
-        });
-        add(mName, "wrap");
-
-        add(new JLabel("List:"));
-        mListCombo.setEditable(true);
-        mListCombo.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                if(mListCombo.getSelectedItem() != null)
-                {
-                    List<String> groups = mAliasModel
-                        .getGroupNames((String) mListCombo.getSelectedItem());
-
-                    if(groups.isEmpty())
-                    {
-                        mGroupCombo.setModel(EMPTY_GROUP_MODEL);
-                    }
-                    else
-                    {
-                        mGroupCombo.setModel(new DefaultComboBoxModel<String>(
-                            groups.toArray(new String[groups.size()])));
-                        ;
-                    }
-                }
-
-                setModified(true);
-            }
-        });
-        add(mListCombo, "wrap");
-
-        add(new JLabel("Group:"));
-        mGroupCombo.setEditable(true);
-        mGroupCombo.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                setModified(true);
-            }
-        });
-        add(mGroupCombo, "wrap");
-
-        add(new JLabel("Color:"));
-
-        mButtonColor = new JButton("Select ...");
-        mButtonColor.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                Color newColor = JColorChooser.showDialog(
-                    AliasNameEditor.this,
-                    "Choose color for this alias",
-                    (hasItem() ? getItem().getDisplayColor() : null));
-
-                if(newColor != null)
-                {
-                    mButtonColor.setForeground(newColor);
-                    mButtonColor.setBackground(newColor);
-
-                    setModified(true);
-                }
-            }
-        });
-        add(mButtonColor, "wrap");
-
-        add(new JLabel("Icon:"));
-
-        mIconCombo = new JComboBox<Icon>(mIconManager.getIcons());
-
-        IconListCellRenderer renderer = new IconListCellRenderer(mIconManager);
-        renderer.setPreferredSize(new Dimension(200, 30));
-        mIconCombo.setRenderer(renderer);
-        mIconCombo.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                setModified(true);
-            }
-        });
-
-        add(mIconCombo, "wrap");
-
-        //Dummy place holder
-        add(new JLabel());
-
-        mBtnIconManager = new JButton("Icon Manager");
-        mBtnIconManager.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent arg0)
-            {
-                mIconManager.showEditor(AliasNameEditor.this);
-            }
-        });
-
-        add(mBtnIconManager, "span 2,wrap");
-
-        setModified(false);
-    }
-
-    private void refreshIcons()
-    {
-        if(mIconCombo != null)
-        {
-            EventQueue.invokeLater(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
-
-                    if(hasItem())
-                    {
-                        String iconName = getItem().getIconName();
-                        Icon aliasIcon = mIconManager.getModel().getIcon(iconName);
-
-                        if(aliasIcon != null)
-                        {
-                            mIconCombo.setSelectedItem(aliasIcon);
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    @Override
-    public void setItem(Alias alias)
-    {
-        super.setItem(alias);
-
-        if(hasItem())
-        {
-            mName.setText(alias.getName());
-
-            mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
-
-            List<String> listNames = mAliasModel.getListNames();
-
-            if(listNames.isEmpty())
-            {
-                mListCombo.setModel(EMPTY_LIST_MODEL);
-            }
-            else
-            {
-                mListCombo.setModel(new DefaultComboBoxModel<String>(
-                    listNames.toArray(new String[listNames.size()])));
-                ;
-            }
-
-            mListCombo.setSelectedItem(alias.getList());
-
-            List<String> groupNames = mAliasModel.getGroupNames(alias.getList());
-
-            if(groupNames.isEmpty())
-            {
-                mGroupCombo.setModel(EMPTY_GROUP_MODEL);
-            }
-            else
-            {
-                mGroupCombo.setModel(new DefaultComboBoxModel<String>(
-                    groupNames.toArray(new String[groupNames.size()])));
-                ;
-            }
-
-            mGroupCombo.setSelectedItem(alias.getGroup());
-
-            Color color = alias.getDisplayColor();
-
-            mButtonColor.setBackground(color);
-            mButtonColor.setForeground(color);
-
-            String iconName = alias.getIconName();
-
-            if(iconName == null)
-            {
-                iconName = IconTableModel.DEFAULT_ICON;
-            }
-
-            Icon savedIcon = mIconManager.getModel().getIcon(iconName);
-
-            if(savedIcon != null)
-            {
-                mIconCombo.setSelectedItem(savedIcon);
-            }
-        }
-        else
-        {
-            mListCombo.setModel(EMPTY_LIST_MODEL);
-            mGroupCombo.setModel(EMPTY_GROUP_MODEL);
-            mName.setText(null);
-
-            mButtonColor.setBackground(getBackground());
-            mButtonColor.setForeground(getForeground());
-        }
-
-        repaint();
-
-        setModified(false);
-    }
-
-    @Override
-    public void save()
-    {
-        if(hasItem() && isModified())
-        {
-            Alias alias = getItem();
-
-            if(mListCombo.getSelectedItem() != null)
-            {
-                alias.setList((String) mListCombo.getSelectedItem());
-            }
-
-            if(mGroupCombo.getSelectedItem() != null)
-            {
-                alias.setGroup((String) mGroupCombo.getSelectedItem());
-            }
-
-            alias.setName(mName.getText());
-
-            alias.setColor(mButtonColor.getBackground().getRGB());
-
-            if(mIconCombo.getSelectedItem() != null)
-            {
-                alias.setIconName(((Icon) mIconCombo.getSelectedItem()).getName());
-            }
-
-            setModified(false);
-
-            //Broadcast an alias change event to save the updates
-            mAliasModel.broadcast(new AliasEvent(getItem(), AliasEvent.Event.CHANGE));
-        }
-    }
-}

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

@@ -1,121 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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;
-
-import javax.swing.*;
-import javax.swing.event.DocumentListener;
-
-public abstract class ComponentEditor<T> extends JPanel implements DocumentListener
-{
-    private static final long serialVersionUID = 1L;
-    private boolean mModified;
-    private ComponentModificationListener mListener;
-    protected T mComponent;
-    
-    /**
-     * Abstract class for editor with notifications when contents are modified
-     * and methods for saving or resetting the component values with the
-     * contents of the editor.
-     */
-    public ComponentEditor( T component )
-    {
-    	mComponent = component;
-    }
-    
-    public ComponentEditor()
-    {
-    }
-    
-    public void dispose()
-    {
-    	mComponent = null;
-    	mListener = null;
-    }
-    
-    public T getComponent()
-    {
-    	return mComponent;
-    }
-    
-    protected void setModified( boolean modified )
-    {
-    	mModified = modified;
-    	
-    	if( modified && mListener != null )
-    	{
-    		mListener.componentModified();
-    	}
-    }
-    
-    /**
-     * Indicates if the contents of the editor have been modified
-     */
-    public boolean isModified()
-    {
-    	return mModified;
-    }
-    
-	public void setComponentModificationListener( ComponentModificationListener listener )
-    {
-    	mListener = listener;
-    }
-    
-    /**
-     * Sets or resets the editable component
-     */
-    public abstract void setComponent( T t );
-    
-    /**
-     * Saves changed editor values to the component
-     */
-    public abstract void save();
-
-    /**
-     * Reloads the editor contents from the source component and resets the
-     * modified flag
-     */
-    public void reset()
-    {
-    	setComponent( getComponent() );
-    }
-    
-    /**
-     * Validate contents of other editors against this component editor before 
-     * saving.  Override this method to allow controller to pass other editors
-     * to this editor for content inspection/validation before indicating that
-     * this editor passes validation.  This allows for validating editor contents
-     * that are contingent on settings in other editors.
-     * 
-     * @throws ComponentValidationException if the contents of the editor 
-     * argument cannot be validated, with the exception containing a detailed
-     * description of the issue.
-     */
-    public void validate( ComponentEditor<?> editor ) throws ComponentValidationException
-    {
-    }
-    
-    /**
-     * Listener interface to receive notification that the contents of the
-     * editor have been modified from the original component value and either 
-     * need to be saved or reset
-     */
-    public interface ComponentModificationListener
-    {
-    	public void componentModified();
-    }
-}

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

@@ -1,14 +0,0 @@
-package io.github.dsheirer.alias;
-
-public class ComponentValidationException extends Exception
-{
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Component editor contents validation error
-	 */
-	public ComponentValidationException( String message )
-	{
-		super( message );
-	}
-}

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

@@ -1,466 +0,0 @@
-package io.github.dsheirer.alias;
-
-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.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.icon.Icon;
-import io.github.dsheirer.icon.IconListCellRenderer;
-import io.github.dsheirer.icon.IconManager;
-import io.github.dsheirer.sample.Listener;
-import net.miginfocom.swing.MigLayout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.List;
-
-public class MultipleAliasEditor extends Editor<List<Alias>>
-        implements Listener<AliasEvent>
-{
-    private static final long serialVersionUID = 1L;
-    private final static Logger mLog = LoggerFactory.getLogger(MultipleAliasEditor.class);
-
-    private static String HELP_TEXT =
-            "<html>Select attributes below to change for all selected aliases</html>";
-
-    private JLabel mAliasCountLabel;
-    private JLabel mAliasCount;
-
-    private JCheckBox mListCheckBox = new JCheckBox("List");
-    private JComboBox<String> mListCombo = new JComboBox<>();
-    private JCheckBox mGroupCheckBox = new JCheckBox("Group");
-    private JComboBox<String> mGroupCombo = new JComboBox<>();
-    private JCheckBox mIconCheckBox = new JCheckBox("Icon");
-    private JComboBox<Icon> mIconCombo;
-    private JCheckBox mColorCheckBox = new JCheckBox("Color");
-    private JButton mButtonColor;
-    private JButton mBtnIconManager;
-    private JCheckBox mRecordCheckBox = new JCheckBox("Record");
-    private JComboBox<Record> mRecordActionCombo = new JComboBox<>(Record.values());
-    private JCheckBox mPriorityCheckBox = new JCheckBox("Priority");
-    private JSlider mPrioritySlider;
-    private JLabel mPrioritySliderLabel;
-    private JCheckBox mStreamCheckBox = new JCheckBox("Stream");
-    private JComboBox<String> mStreamCombo;
-
-    private AliasModel mAliasModel;
-    private BroadcastModel mBroadcastModel;
-    private IconManager mIconManager;
-
-    public MultipleAliasEditor(AliasModel aliasModel, BroadcastModel broadcastModel, IconManager iconManager)
-    {
-        mAliasModel = aliasModel;
-        mBroadcastModel = broadcastModel;
-        mIconManager = iconManager;
-
-        mAliasModel.addListener(this);
-        mIconManager.getModel().addTableModelListener(new TableModelListener()
-        {
-            @Override
-            public void tableChanged(TableModelEvent e)
-            {
-                refreshIcons();
-            }
-        });
-
-        init();
-    }
-
-    public List<Alias> getAliases()
-    {
-        if (hasItem())
-        {
-            return (List<Alias>) getItem();
-        }
-
-        return null;
-    }
-
-    public void init()
-    {
-        setLayout(new MigLayout("fill,wrap 2", "[grow,fill][grow,fill]",
-                "[][][][][][][][][][][][][][grow,fill]"));
-
-        mAliasCountLabel = new JLabel("Alias:");
-        add(mAliasCountLabel);
-
-        mAliasCount = new JLabel("Multiple");
-        add(mAliasCount, "span");
-
-        add(new JSeparator(), "span");
-
-        add(new JLabel(HELP_TEXT), "span");
-
-        add(mListCheckBox);
-
-        mListCombo.setEditable(true);
-        add(mListCombo, "wrap");
-
-        add(mGroupCheckBox);
-
-        mGroupCombo.setEditable(true);
-        add(mGroupCombo, "wrap");
-
-        add(mColorCheckBox);
-
-        mButtonColor = new JButton("Select ...");
-        mButtonColor.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                Color newColor = JColorChooser.showDialog(
-                        MultipleAliasEditor.this,
-                        "Choose color for this alias", null);
-
-                if (newColor != null)
-                {
-                    mButtonColor.setForeground(newColor);
-                    mButtonColor.setBackground(newColor);
-                }
-            }
-        });
-        add(mButtonColor, "wrap");
-
-        add(mIconCheckBox);
-
-        mIconCombo = new JComboBox<Icon>(mIconManager.getIcons());
-
-        IconListCellRenderer renderer = new IconListCellRenderer(mIconManager);
-        renderer.setPreferredSize(new Dimension(200, 30));
-        mIconCombo.setRenderer(renderer);
-        add(mIconCombo, "wrap");
-
-        //Dummy place holder
-        add(new JLabel());
-
-        mBtnIconManager = new JButton("Icon Manager");
-        mBtnIconManager.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent arg0)
-            {
-                mIconManager.showEditor(MultipleAliasEditor.this);
-            }
-        });
-
-        add(mBtnIconManager, "span,wrap");
-
-        add(mRecordCheckBox);
-        add(mRecordActionCombo);
-
-        //Placeholder
-        add(new JLabel(" "));
-        mPrioritySliderLabel = new JLabel("Audio Priority: " + Priority.MIN_PRIORITY);
-        add(mPrioritySliderLabel);
-
-        add(mPriorityCheckBox);
-
-        mPrioritySlider = new JSlider(JSlider.HORIZONTAL,
-                Priority.MIN_PRIORITY,
-                Priority.MAX_PRIORITY + 1,
-                Priority.MIN_PRIORITY);
-
-        mPrioritySlider.setMajorTickSpacing(20);
-        mPrioritySlider.setMinorTickSpacing(5);
-        mPrioritySlider.setPaintTicks(true);
-        mPrioritySlider.setLabelTable(mPrioritySlider.createStandardLabels(25, 25));
-        mPrioritySlider.setPaintLabels(true);
-        mPrioritySlider.addChangeListener(new ChangeListener()
-        {
-            @Override
-            public void stateChanged(ChangeEvent e)
-            {
-                int priority = mPrioritySlider.getValue();
-
-                if (priority > Priority.MAX_PRIORITY)
-                {
-                    mPrioritySliderLabel.setText("Audio Priority: Do Not Monitor");
-                }
-                else
-                {
-                    mPrioritySliderLabel.setText("Audio Priority: " + mPrioritySlider.getValue());
-                }
-            }
-        });
-        mPrioritySlider.setToolTipText(HELP_TEXT);
-
-        add(mPrioritySlider);
-
-        add(mStreamCheckBox);
-
-        mStreamCombo = new JComboBox<String>();
-        mStreamCombo.setEditable(true);
-        add(mStreamCombo, "wrap");
-
-        JButton saveButton = new JButton("Save");
-        saveButton.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                save();
-            }
-        });
-        add(saveButton);
-
-        JButton resetButton = new JButton("Reset");
-        resetButton.addActionListener(new ActionListener()
-        {
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                reset();
-            }
-        });
-        add(resetButton);
-
-        setModified(false);
-    }
-
-    private void refreshIcons()
-    {
-        if(mIconCombo != null)
-        {
-            EventQueue.invokeLater(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
-                }
-            });
-        }
-    }
-
-    @Override
-    public void setItem(List<Alias> item)
-    {
-        super.setItem(item);
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("Multiple Selected [ ");
-
-        if (hasItem())
-        {
-            sb.append(String.valueOf(getAliases().size()));
-        }
-        else
-        {
-            sb.append("0");
-        }
-
-        sb.append(" ]");
-
-        mAliasCount.setText(sb.toString());
-
-        List<String> listNames = mAliasModel.getListNames();
-        listNames.add(0, "");
-        mListCombo.setModel(new DefaultComboBoxModel<String>(
-                listNames.toArray(new String[listNames.size()])));
-
-        List<String> groupNames = mAliasModel.getGroupNames();
-        groupNames.add(0, "");
-        mGroupCombo.setModel(new DefaultComboBoxModel<String>(
-                groupNames.toArray(new String[groupNames.size()])));
-
-        List<String> streamNames = mBroadcastModel.getBroadcastConfigurationNames();
-        mStreamCombo.setModel(new DefaultComboBoxModel<String>(streamNames.toArray(new String[streamNames.size()])));
-
-        mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
-
-        setCheckBoxesUnselected();
-
-        setModified(false);
-    }
-
-    private void setCheckBoxesUnselected()
-    {
-        mListCheckBox.setSelected(false);
-        mGroupCheckBox.setSelected(false);
-        mColorCheckBox.setSelected(false);
-        mIconCheckBox.setSelected(false);
-        mRecordCheckBox.setSelected(false);
-        mPriorityCheckBox.setSelected(false);
-        mStreamCheckBox.setSelected(false);
-    }
-
-    @Override
-    public void reset()
-    {
-        List<String> listNames = mAliasModel.getListNames();
-        listNames.add(0, "");
-        mListCombo.setModel(new DefaultComboBoxModel<String>(
-                listNames.toArray(new String[listNames.size()])));
-
-        List<String> groupNames = mAliasModel.getGroupNames();
-        groupNames.add(0, "");
-        mGroupCombo.setModel(new DefaultComboBoxModel<String>(
-                groupNames.toArray(new String[groupNames.size()])));
-
-        mButtonColor.setForeground(getForeground());
-        mButtonColor.setBackground(getBackground());
-
-        super.reset();
-    }
-
-    private boolean hasRequestedChanges()
-    {
-        return mListCheckBox.isSelected() ||
-                mGroupCheckBox.isSelected() ||
-                mColorCheckBox.isSelected() ||
-                mIconCheckBox.isSelected() ||
-                mRecordCheckBox.isSelected() ||
-                mPriorityCheckBox.isSelected() ||
-                mStreamCheckBox.isSelected();
-    }
-
-    @Override
-    public void save()
-    {
-        if (hasRequestedChanges() && hasItem())
-        {
-            List<Alias> aliases = getAliases();
-
-            for (Alias alias : aliases)
-            {
-                if (mListCheckBox.isSelected())
-                {
-                    String list = null;
-
-                    if (mListCombo.getSelectedItem() != null)
-                    {
-                        list = (String) mListCombo.getSelectedItem();
-                    }
-
-                    alias.setList(list);
-                }
-
-                if (mGroupCheckBox.isSelected())
-                {
-                    String group = null;
-
-                    if (mGroupCombo.getSelectedItem() != null)
-                    {
-                        group = (String) mGroupCombo.getSelectedItem();
-                    }
-
-                    alias.setGroup(group);
-                }
-
-                if (mColorCheckBox.isSelected())
-                {
-                    alias.setColor(mButtonColor.getForeground().getRGB());
-                }
-
-                if (mIconCheckBox.isSelected())
-                {
-                    if (mIconCombo.getSelectedItem() != null)
-                    {
-                        alias.setIconName(((Icon)mIconCombo.getSelectedItem()).getName());
-                    }
-                    else
-                    {
-                        alias.setIconName(null);
-                    }
-                }
-
-                if (mRecordCheckBox.isSelected())
-                {
-                    Record action =
-                            (Record) mRecordActionCombo.getSelectedItem();
-
-                    alias.setRecordable(action == Record.RECORDABLE);
-                }
-
-                if (mPriorityCheckBox.isSelected())
-                {
-                    int priority = mPrioritySlider.getValue();
-
-                    //This is a work-around -- we use max priority + 1 in the
-                    //gui to indicate do not monitor, and change the value here
-                    if (priority == Priority.MAX_PRIORITY + 1)
-                    {
-                        priority = Priority.DO_NOT_MONITOR;
-                    }
-
-                    alias.setCallPriority(priority);
-                }
-
-                if(mStreamCheckBox.isSelected())
-                {
-                    if(mStreamCombo.getSelectedItem() != null)
-                    {
-                        String streamName = (String)mStreamCombo.getSelectedItem();
-
-                        boolean hasChannel = false;
-
-                        //Ensure the alias doesn't already have the channel
-                        for(BroadcastChannel channel: alias.getBroadcastChannels())
-                        {
-                            if(channel.getChannelName().equals(streamName))
-                            {
-                                hasChannel = true;
-                                continue;
-                            }
-                        }
-
-                        if(!hasChannel)
-                        {
-                            BroadcastChannel channel = (BroadcastChannel)AliasFactory
-                                    .getAliasID(AliasIDType.BROADCAST_CHANNEL);
-
-                            channel.setChannelName(streamName);
-                            alias.addAliasID(channel);
-                        }
-                    }
-                }
-            }
-
-            for (Alias alias : aliases)
-            {
-                //Broadcast an alias change event to save the updates
-                mAliasModel.broadcast(new AliasEvent(alias, AliasEvent.Event.CHANGE));
-            }
-        }
-    }
-
-    @Override
-    public void receive(AliasEvent event)
-    {
-        if (event.getEvent() == AliasEvent.Event.DELETE &&
-                hasItem() &&
-                getAliases().contains(event.getAlias()))
-        {
-            getAliases().remove(event.getAlias());
-            setItem(getAliases());
-        }
-    }
-
-    public enum Record
-    {
-        NON_RECORDABLE("Non-Recordable"),
-        RECORDABLE("Recordable");
-
-        private String mLabel;
-
-        private Record(String label)
-        {
-            mLabel = label;
-        }
-
-        public String toString()
-        {
-            return mLabel;
-        }
-    }
-}

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

@@ -1,379 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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;
-
-import io.github.dsheirer.alias.action.AliasAction;
-import io.github.dsheirer.alias.id.AliasID;
-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.talkgroup.TalkgroupID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-public class PatchGroupAlias extends Alias
-{
-    private final static Logger mLog = LoggerFactory.getLogger(PatchGroupAlias.class);
-
-    private Alias mPatchGroupAlias;
-    private List<Alias> mPatchedAliases = new ArrayList<>();
-    private List<String> mPatchedTalkgroupIDs = new ArrayList<>();
-
-    /**
-     * Patch group alias is a single alias for a group of aliases that are temporarily patched together.  This will
-     * normally be used for patched talkgroups, but could be used with any type of alias identifiers that can be
-     * temporarily joined to form a patch group.
-     *
-     * Alias properties such as recordable, streamable and call priority are an aggregation from the set of patched
-     * aliases contained in this patch group alias and the patch group ID alias and where applicable, return the highest
-     * value/priority from the group of patched aliases.
-     */
-    public PatchGroupAlias()
-    {
-    }
-
-    @Override
-    public int getColor()
-    {
-        if(mPatchGroupAlias != null)
-        {
-            return mPatchGroupAlias.getColor();
-        }
-
-        return super.getColor();
-    }
-
-    /**
-     * Sets an alias for this patch group ID
-     */
-    public void setPatchGroupAlias(Alias alias)
-    {
-        mPatchGroupAlias = alias;
-    }
-
-    /**
-     * Alias for this patch group
-     */
-    public Alias getPatchGroupAlias()
-    {
-        return mPatchGroupAlias;
-    }
-
-    /**
-     * Indicates if this patch group has an alias
-     */
-    public boolean hasPatchGroupAlias()
-    {
-        return mPatchGroupAlias != null;
-    }
-
-    /**
-     * List of patched aliases contained in this patch group
-     */
-    public List<Alias> getPatchedAliases()
-    {
-        return mPatchedAliases;
-    }
-
-    /**
-     * Removes/clears all patched aliases from this patch alias group
-     */
-    public void clearPatchedAliases()
-    {
-        mPatchedAliases.clear();
-    }
-
-    /**
-     * Adds the patched alias to this patch alias group
-     */
-    public void addPatchedAlias(Alias alias)
-    {
-        if(alias == PatchGroupAlias.this)
-        {
-            throw new IllegalArgumentException("Can't add patch group alias to itself - would create an infinite loop");
-        }
-
-        mPatchedAliases.add(alias);
-    }
-
-    /**
-     * Removes the patched alias from this patch alias group
-     */
-    public void removePatchedAlias(Alias alias)
-    {
-        mPatchedAliases.remove(alias);
-    }
-
-    /**
-     * Sets the list of patched talkgroup IDs for this patch group
-     */
-    public void setPatchedTalkgroupIDs(List<String> talkgroupIDs)
-    {
-        mPatchedTalkgroupIDs = talkgroupIDs;
-    }
-
-    /**
-     * List of patched talkgroup IDs for this patch group
-     */
-    public List<String> getPatchedTalkgroupIDs()
-    {
-        return mPatchedTalkgroupIDs;
-    }
-
-    @Override
-    public String getName()
-    {
-        if(hasPatchGroupAlias())
-        {
-            return getPatchGroupAlias().getName();
-        }
-        else
-        {
-            for(AliasID id: getId())
-            {
-                if(id.getType() == AliasIDType.TALKGROUP)
-                {
-                    return "PATCH:" + ((TalkgroupID)id).getTalkgroup();
-                }
-            }
-        }
-
-        return "PATCH:****";
-    }
-
-    @Override
-    public List<AliasAction> getAction()
-    {
-        List<AliasAction> aliasActions = new ArrayList<>();
-
-        if(hasPatchGroupAlias())
-        {
-            aliasActions.addAll(getPatchGroupAlias().getAction());
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias))
-            {
-                for(AliasAction action: alias.getAction())
-                {
-                    if(!aliasActions.contains(action))
-                    {
-                        aliasActions.add(action);
-                    }
-                }
-            }
-        }
-
-        return aliasActions;
-    }
-
-    @Override
-    public boolean hasActions()
-    {
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasActions())
-            {
-                return true;
-            }
-        }
-
-        return hasPatchGroupAlias() && getPatchGroupAlias().hasActions();
-    }
-
-    /**
-     * Returns the highest listenable audio priority defined among the aliases in the group, or returns 'Do Not Monitor'
-     * if that is the only priority defined.  Otherwise, returns default (100) priority.
-     */
-    @Override
-    public int getCallPriority()
-    {
-        boolean hasDoNotMonitor = false;
-
-        int highestPriority = (hasPatchGroupAlias() ? getPatchGroupAlias().getCallPriority() : Priority.DEFAULT_PRIORITY + 1);
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasCallPriority() && alias.getCallPriority() < highestPriority)
-            {
-                if(alias.getCallPriority() == Priority.DO_NOT_MONITOR)
-                {
-                    hasDoNotMonitor = true;
-                }
-                else
-                {
-                    highestPriority = alias.getCallPriority();
-                }
-            }
-        }
-
-        if(highestPriority <= Priority.DEFAULT_PRIORITY)
-        {
-            return highestPriority;
-        }
-        else if(hasDoNotMonitor)
-        {
-            return Priority.DO_NOT_MONITOR;
-        }
-        else
-        {
-            return Priority.DEFAULT_PRIORITY;
-        }
-    }
-
-    @Override
-    public boolean hasCallPriority()
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().hasCallPriority())
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasCallPriority())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isRecordable()
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().isRecordable())
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.isRecordable())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isStreamable()
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().isStreamable())
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.isStreamable())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public Set<BroadcastChannel> getBroadcastChannels()
-    {
-        Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
-
-        if(hasPatchGroupAlias())
-        {
-            broadcastChannels.addAll(getPatchGroupAlias().getBroadcastChannels());
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias))
-            {
-                broadcastChannels.addAll(alias.getBroadcastChannels());
-            }
-        }
-
-        return broadcastChannels;
-    }
-
-    @Override
-    public boolean hasBroadcastChannel(String channel)
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().hasBroadcastChannel(channel))
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasBroadcastChannel(channel))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static void main(String[] args)
-    {
-        Alias a1 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        Alias a2 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        Alias a3 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        Alias a4 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        PatchGroupAlias pga = new PatchGroupAlias();
-        pga.setPatchGroupAlias(a1);
-        pga.addPatchedAlias(a2);
-        pga.addPatchedAlias(a3);
-        pga.addPatchedAlias(a4);
-
-        Set<BroadcastChannel> bc = pga.getBroadcastChannels();
-
-        mLog.debug("Channels:" + bc);
-    }
-}

src/main/java/io/github/dsheirer/alias/action/AliasAction.java

@@ -26,9 +26,10 @@ import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.beep.BeepAction;
 import io.github.dsheirer.alias.action.clip.ClipAction;
 import io.github.dsheirer.alias.action.script.ScriptAction;
-import io.github.dsheirer.message.Message;
-
-import java.util.concurrent.ScheduledExecutorService;
+import io.github.dsheirer.message.IMessage;
+import javafx.beans.Observable;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.util.Callback;
 
 /**
  * Alias action defines an action to execute when an alias is detected active.
@@ -43,10 +44,33 @@ import java.util.concurrent.ScheduledExecutorService;
 @JacksonXmlRootElement(localName = "action")
 public abstract class AliasAction
 {
+    private SimpleStringProperty mValueProperty = new SimpleStringProperty();
+
     public AliasAction()
     {
     }
 
+    /**
+     * String property representation of this alias ID
+     */
+    @JsonIgnore
+    public SimpleStringProperty valueProperty()
+    {
+        return mValueProperty;
+    }
+
+    /**
+     * Updates the value property for this alias ID.  Note: this method is intended to be invoked by all subclasses
+     * each time that any of the subclass member variable values change.
+     */
+    public void updateValueProperty()
+    {
+        valueProperty().set(toString());
+
+        //Hack: harmless, but the list extractor does not consistently update unless we do this.
+        valueProperty().get();
+    }
+
     @JsonIgnore
     public abstract AliasActionType getType();
 
@@ -56,10 +80,18 @@ public abstract class AliasAction
      * action attached.  The alias argument is the parent alias containing the
      * alias action.
      */
-    public abstract void execute(ScheduledExecutorService scheduledExecutorService, Alias alias, Message message);
+    public abstract void execute(Alias alias, IMessage message);
 
     /**
      * Dismiss a persistent alias action
      */
     public abstract void dismiss(boolean reset);
+
+    /**
+     * Creates an observable property extractor for use with observable lists to detect changes internal to this object.
+     */
+    public static Callback<AliasAction,Observable[]> extractor()
+    {
+        return (AliasAction aliasAction) -> new Observable[] {aliasAction.valueProperty()};
+    }
 }

src/main/java/io/github/dsheirer/alias/action/AliasActionEditor.java

@@ -1,339 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.action;
-
-import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.alias.AliasEvent;
-import io.github.dsheirer.alias.AliasEvent.Event;
-import io.github.dsheirer.alias.AliasFactory;
-import io.github.dsheirer.alias.AliasModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.gui.editor.EmptyEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class AliasActionEditor extends Editor<Alias>
-{
-	private static final long serialVersionUID = 1L;
-
-	private static ListModel<AliasAction> EMPTY_MODEL = new DefaultListModel<>();
-	private JList<AliasAction> mAliasActionList = new JList<>( EMPTY_MODEL );
-	private JButton mNewActionButton;
-	private JButton mCloneActionButton;
-	private JButton mDeleteActionButton;
-	private EditorContainer mEditorContainer = new EditorContainer();
-
-	private AliasModel mAliasModel;
-	
-	public AliasActionEditor( AliasModel model )
-	{
-		mAliasModel = model;
-		init();
-	}
-
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 3", 
-			"[grow,fill][grow,fill][grow,fill]", "[][grow,fill][]" ) );
-
-		mAliasActionList.setVisibleRowCount( 6 );
-		mAliasActionList.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
-		mAliasActionList.setLayoutOrientation( JList.VERTICAL );
-		mAliasActionList.addListSelectionListener( new ListSelectionListener()
-		{
-			@Override
-			public void valueChanged( ListSelectionEvent event )
-			{
-				if( !event.getValueIsAdjusting() )
-				{
-					JList<?> list = (JList<?>)event.getSource();
-					
-					Object selectedItem = list.getSelectedValue();
-					
-					if( selectedItem != null && selectedItem instanceof AliasAction )
-					{
-						AliasAction selected = (AliasAction)selectedItem;
-
-						mEditorContainer.setAliasAction( selected );
-						
-						mCloneActionButton.setEnabled( true );
-						mDeleteActionButton.setEnabled( true );
-					}
-					else
-					{
-						mCloneActionButton.setEnabled( false );
-						mDeleteActionButton.setEnabled( false );
-					}
-				}
-			}
-		} );
-		
-		JScrollPane scroller = new JScrollPane( mAliasActionList );
-		add( scroller, "span,grow" );
-		
-		add( mEditorContainer, "span,grow" );
-
-		mNewActionButton = new JButton( "New ..." );
-		mNewActionButton.setToolTipText( "Create a new Alias Action" );
-		mNewActionButton.addMouseListener( new MouseAdapter()
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JPopupMenu menu = new JPopupMenu();
-
-				menu.add( new AddAliasActionItem( AliasActionType.BEEP ) );
-				menu.add( new AddAliasActionItem( AliasActionType.CLIP ) );
-				menu.add( new AddAliasActionItem( AliasActionType.SCRIPT ) );
-				
-				menu.show( e.getComponent(), e.getX(), e.getY() );
-			}
-		} );
-		
-		add( mNewActionButton );
-		
-		mCloneActionButton = new JButton( "Clone" );
-		mCloneActionButton.setToolTipText( "Create a copy of the currently selected action" );
-		mCloneActionButton.setEnabled( false );
-		mCloneActionButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				AliasAction selected = mAliasActionList.getSelectedValue();
-				
-				if( selected != null )
-				{
-					AliasAction clone = AliasFactory.copyOf( selected );
-
-					if( clone != null )
-					{
-						addAliasActionToList( clone );
-					}
-				}
-			}
-		} );
-		add( mCloneActionButton );
-		
-		mDeleteActionButton = new JButton( "Delete" );
-		mDeleteActionButton.setToolTipText( "Delete the currently selected action" );
-		mDeleteActionButton.setEnabled( false );
-		mDeleteActionButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				final AliasAction selected = mAliasActionList.getSelectedValue();
-				
-				if( selected != null )
-				{
-					int choice = JOptionPane.showConfirmDialog( mDeleteActionButton, 
-						"Do you want to delete [" + selected.toString() + "]", 
-						"Are you sure?", JOptionPane.YES_NO_OPTION );
-					
-					if( choice == JOptionPane.YES_OPTION && hasItem() )
-					{
-						Alias alias = getItem();
-						
-						alias.removeAliasAction( selected );
-						
-						mAliasModel.broadcast( new AliasEvent( alias, Event.CHANGE ) );
-
-						setItem( alias );
-					}
-				}
-			}
-		} );
-		add( mDeleteActionButton, "wrap" );
-	}
-	
-	@Override
-	public void setItem( Alias alias )
-	{
-		super.setItem( alias );
-		
-		if( alias == null || alias.getAction().isEmpty() )
-		{
-			mAliasActionList.setModel( EMPTY_MODEL );
-		}
-		else
-		{
-			DefaultListModel<AliasAction> model = new DefaultListModel<>();
-
-			List<AliasAction> actions = alias.getAction();
-			
-			Collections.sort( actions, new Comparator<AliasAction>()
-			{
-				@Override
-				public int compare( AliasAction o1, AliasAction o2 )
-				{
-					return o1.toString().compareTo( o2.toString() );
-				}
-			} );
-			
-			for( AliasAction action: actions )
-			{
-				model.addElement( action );
-			}
-			
-			mAliasActionList.setModel( model );
-		}
-		
-		mEditorContainer.setAliasAction( null );
-	}
-	
-	@Override
-	public void save()
-	{
-		if( isModified() || mEditorContainer.isModified() )
-		{
-			if( mEditorContainer.isModified() )
-			{
-				mEditorContainer.save();
-			}
-			
-			setModified( false );
-			
-			if( hasItem() )
-			{
-				mAliasModel.broadcast( new AliasEvent( getItem(), Event.CHANGE ) );
-			}
-		}
-	}
-	
-	public class EditorContainer extends JPanel
-	{
-		private static final long serialVersionUID = 1L;
-
-		private Editor<AliasAction> mEditor = new EmptyEditor<>();
-
-		public EditorContainer()
-		{
-			setLayout( new MigLayout( "","[grow,fill]", "[grow,fill]" ) );
-
-			add( mEditor );
-		}
-		
-		public boolean isModified()
-		{
-			if( mEditor != null )
-			{
-				return mEditor.isModified();
-			}
-			
-			return false;
-		}
-		
-		public void save()
-		{
-			if( mEditor != null )
-			{
-				mEditor.save();
-			}
-		}
-		
-		public void setAliasAction( AliasAction aliasAction )
-		{
-			if( mEditor != null )
-			{
-				if( mEditor.isModified() )
-				{
-					int option = JOptionPane.showConfirmDialog( 
-							EditorContainer.this, 
-							"Action settings have changed.  Do you want to save these changes?",
-							"Save Changes?",
-							JOptionPane.YES_NO_OPTION,
-							JOptionPane.QUESTION_MESSAGE );
-					
-					if( option == JOptionPane.YES_OPTION )
-					{
-						mEditor.save();
-					}
-				}
-			}
-			removeAll();
-			
-			//This will always give us an editor
-			mEditor = AliasFactory.getEditor( aliasAction );
-			
-			add( mEditor );
-
-			revalidate();
-		}
-	}
-	
-	private void addAliasActionToList( final AliasAction action )
-	{
-		if( action != null && hasItem() )
-		{
-			final Alias alias = getItem();
-			
-			alias.addAliasAction( action );
-			
-			EventQueue.invokeLater( new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					setItem( alias );
-					
-					mAliasActionList.setSelectedValue( action, true );
-					
-					AliasActionEditor.this.setModified( true );
-				}
-			} );
-		}
-	}
-	
-	public class AddAliasActionItem extends JMenuItem
-	{
-		private static final long serialVersionUID = 1L;
-		
-		private AliasActionType mAliasActionType;
-
-		public AddAliasActionItem( AliasActionType type )
-		{
-			super( type.toString() );
-			
-			mAliasActionType = type;
-			
-			addActionListener( new ActionListener()
-			{
-				@Override
-				public void actionPerformed( ActionEvent e )
-				{
-					final AliasAction action = 
-							AliasFactory.getAliasAction( mAliasActionType );
-					
-					addAliasActionToList( action );
-				}
-			} );
-		}
-	}
-}

src/main/java/io/github/dsheirer/alias/action/AliasActionListener.java

@@ -1,32 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.action;
-
-import io.github.dsheirer.alias.AliasEvent;
-
-/**
- * Interface for receiving alias events.  Each listener will receive
- * notification of all alias events.
- */
-public interface AliasActionListener
-{
-	/**
-	 * Notifies the listener that an alias event has occurred
-	 */
-	public void aliasChanged( AliasEvent event );
-}

src/main/java/io/github/dsheirer/alias/action/AliasActionManager.java

@@ -1,69 +1,104 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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.action;
 
 import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.message.IMessage;
+import io.github.dsheirer.message.IMessageListener;
+import io.github.dsheirer.module.Module;
 import io.github.dsheirer.sample.Listener;
-import io.github.dsheirer.util.ThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 /**
- * Manages all alias action events.  Each received message is interrogated for
- * any alias entries and then each alias is interrogated for any alias actions.
+ * Manages all alias action events.  Each received message is interrogated for any identifiers that may be aliasable
+ * and have associated alias actions.
  *
- * Each alias action is executed and provided a copy of the source message so
- * that the contents of the message can be used as part of the action.
+ * Each alias action is executed and provided a copy of the source message so that the contents of the message can be
+ * used as part of the action.
  */
-public class AliasActionManager implements Listener<Message>
+public class AliasActionManager extends Module implements IMessageListener, Listener<IMessage>
 {
-    public AliasActionManager()
+    private final static Logger mLog = LoggerFactory.getLogger(AliasActionManager.class);
+    private AliasList mAliasList;
+
+    public AliasActionManager(AliasList aliasList)
     {
+        mAliasList = aliasList;
     }
 
     @Override
-    public void receive(Message message)
+    public void receive(IMessage message)
     {
-        if(message.isValid())
+        if(mAliasList != null && message.isValid())
         {
-            List<Alias> aliases = message.getAliases();
+            List<Identifier> identifiers = message.getIdentifiers();
 
-            if(aliases != null)
+            for(Identifier identifier: identifiers)
             {
-                for(Alias alias : aliases)
-                {
-                    if(alias.hasActions())
-                    {
-                        List<AliasAction> actions = alias.getAction();
+                List<Alias> aliases = mAliasList.getAliases(identifier);
 
-                        for(AliasAction action : actions)
+                for(Alias alias: aliases)
+                {
+                    if(alias != null && alias.hasActions())
+                    {
+                        for(AliasAction action: alias.getAliasActions())
                         {
-                            /* Provide access to the thread pool manager in case the
-							 * action needs to setup a timer, and provide the original
-							 * message to be used as part of the action (e.g. sending
-							 * the message as a text message to a cell phone */
-                            action.execute(ThreadPool.SCHEDULED, alias, message);
+                            action.execute(alias, message);
                         }
                     }
                 }
             }
         }
     }
+
+    @Override
+    public void reset()
+    {
+        //No actions needed
+    }
+
+    @Override
+    public void start()
+    {
+        //No actions needed
+    }
+
+    @Override
+    public void stop()
+    {
+        //No actions neeeded
+    }
+
+    /**
+     * IMessageListener interface ... delegates to this class implementation of Listener<Message>
+     */
+    @Override
+    public Listener<IMessage> getMessageListener()
+    {
+        return this;
+    }
 }

src/main/java/io/github/dsheirer/alias/action/RecurringAction.java

@@ -1,13 +1,32 @@
+/*
+ * *****************************************************************************
+ * 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
+ * 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.action;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
+import io.github.dsheirer.util.ThreadPool;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -18,19 +37,15 @@ public abstract class RecurringAction extends AliasAction
     protected AtomicBoolean mRunning = new AtomicBoolean(false);
     @JsonIgnore
     private ScheduledFuture<?> mPerpetualAction;
-    @JsonIgnore
-    protected ScheduledExecutorService mScheduledExecutorService;
 
     protected Interval mInterval = Interval.ONCE;
     protected int mPeriod = 5;
 
-    public abstract void performAction(Alias alias, Message message);
+    public abstract void performAction(Alias alias, IMessage message);
 
     @Override
-    public void execute(ScheduledExecutorService scheduledExecutorService, Alias alias, Message message)
+    public void execute(Alias alias, IMessage message)
     {
-        mScheduledExecutorService = scheduledExecutorService;
-
         if(mRunning.compareAndSet(false, true))
         {
             switch(mInterval)
@@ -41,11 +56,11 @@ public abstract class RecurringAction extends AliasAction
                     break;
                 case DELAYED_RESET:
                     performThreadedAction(alias, message);
-                    mScheduledExecutorService.schedule(new ResetTask(), mPeriod, TimeUnit.SECONDS);
+                    ThreadPool.SCHEDULED.schedule(new ResetTask(), mPeriod, TimeUnit.SECONDS);
                     break;
                 case UNTIL_DISMISSED:
-                    mPerpetualAction = mScheduledExecutorService.scheduleAtFixedRate(
-                        new PerformActionTask(alias, message), mPeriod, mPeriod, TimeUnit.SECONDS);
+                    mPerpetualAction = ThreadPool.SCHEDULED.scheduleAtFixedRate(
+                        new PerformActionTask(alias, message), 0, mPeriod, TimeUnit.SECONDS);
 
                     StringBuilder sb = new StringBuilder();
                     sb.append("<html><div width='250'>Alias [");
@@ -56,18 +71,13 @@ public abstract class RecurringAction extends AliasAction
 
                     final String text = sb.toString();
 
-                    EventQueue.invokeLater(new Runnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            JOptionPane.showMessageDialog(null, text,
-                                "Alias Alert", JOptionPane.INFORMATION_MESSAGE);
+                    EventQueue.invokeLater(() -> {
+                        JOptionPane.showMessageDialog(null, text,
+                            "Alias Alert", JOptionPane.INFORMATION_MESSAGE);
 
-                            dismiss(false);
+                        dismiss(false);
 
-                            mScheduledExecutorService.schedule(new ResetTask(), 15, TimeUnit.SECONDS);
-                        }
+                        ThreadPool.SCHEDULED.schedule(new ResetTask(), 15, TimeUnit.SECONDS);
                     });
                     break;
                 default:
@@ -79,16 +89,9 @@ public abstract class RecurringAction extends AliasAction
      * Spawns the performAction() event into a new thread so that it doesn't
      * delay any decoder actions.
      */
-    private void performThreadedAction(final Alias alias, final Message message)
+    private void performThreadedAction(final Alias alias, final IMessage message)
     {
-        mScheduledExecutorService.schedule(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                performAction(alias, message);
-            }
-        }, 0, TimeUnit.SECONDS);
+        ThreadPool.CACHED.execute(() -> performAction(alias, message));
     }
 
     @Override
@@ -116,6 +119,7 @@ public abstract class RecurringAction extends AliasAction
     public void setPeriod(int period)
     {
         mPeriod = period;
+        updateValueProperty();
     }
 
     @JacksonXmlProperty(isAttribute = true, localName = "interval")
@@ -127,19 +131,19 @@ public abstract class RecurringAction extends AliasAction
     public void setInterval(Interval interval)
     {
         mInterval = interval;
-
         mRunning.set(false);
+        updateValueProperty();
     }
 
     public enum Interval
     {
         ONCE("Once"),
-        DELAYED_RESET("Once, Reset After Delay"),
+        DELAYED_RESET("Once - Reset After Delay"),
         UNTIL_DISMISSED("Until Dismissed");
 
         private String mLabel;
 
-        private Interval(String label)
+        Interval(String label)
         {
             mLabel = label;
         }
@@ -153,9 +157,9 @@ public abstract class RecurringAction extends AliasAction
     public class PerformActionTask implements Runnable
     {
         private Alias mAlias;
-        private Message mMessage;
+        private IMessage mMessage;
 
-        public PerformActionTask(Alias alias, Message message)
+        public PerformActionTask(Alias alias, IMessage message)
         {
             mAlias = alias;
             mMessage = message;

src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java

@@ -1,13 +1,65 @@
+/*
+ * *****************************************************************************
+ * 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
+ * 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.action.beep;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.message.Message;
+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.message.IMessage;
+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
 {
+	private static final Logger mLog = LoggerFactory.getLogger(BeepAction.class);
+	private byte[] mToneBytes;
+
+	public BeepAction()
+	{
+		setInterval(Interval.ONCE);
+		float[] tone = ToneUtil.getTone(ToneFrequency.F700, ToneVolume.V10, 1000);
+
+		/* Little-endian byte buffer */
+		ByteBuffer buffer = ByteBuffer.allocate(tone.length * 2).order(ByteOrder.LITTLE_ENDIAN);
+
+		ShortBuffer shortBuffer = buffer.asShortBuffer();
+
+		for(float sample : tone)
+		{
+			shortBuffer.put((short) (sample * Short.MAX_VALUE));
+		}
+
+		mToneBytes = buffer.array();
+	}
 
 	@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
 	@Override
@@ -17,14 +69,50 @@ public class BeepAction extends RecurringAction
 	}
 
 	@Override
-	public void performAction(Alias alias, Message message )
+	public void performAction(Alias alias, IMessage message )
 	{
-		System.out.println( "\007" );
+		DataLine.Info info = new DataLine.Info(Clip.class, AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO);
+
+		if(!AudioSystem.isLineSupported(info))
+		{
+			mLog.error("Audio clip playback is not supported on this system");
+			return;
+		}
+
+		try
+		{
+			Clip clip = (Clip)AudioSystem.getLine(info);
+			clip.open(AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO, mToneBytes, 0, mToneBytes.length);
+			clip.start();
+		}
+		catch(Exception e)
+		{
+			mLog.error("Error attempting to play audio test tone");
+		}
 	}
 
 	@Override
 	public String toString()
 	{
-		return "Beep";
+		StringBuilder sb = new StringBuilder();
+		sb.append("Beep");
+
+		if(getInterval() != null)
+		{
+			switch(getInterval())
+			{
+				case ONCE:
+					sb.append(" Once");
+					break;
+				case DELAYED_RESET:
+					sb.append(" Once, Reset After ").append(getPeriod()).append(" Seconds");
+					break;
+				case UNTIL_DISMISSED:
+					sb.append(" Every ").append(getPeriod()).append(" Seconds Until Dismissed");
+					break;
+			}
+		}
+
+		return sb.toString();
 	}
 }

src/main/java/io/github/dsheirer/alias/action/beep/BeepActionEditor.java

@@ -1,185 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.action.beep;
-
-import io.github.dsheirer.alias.action.AliasAction;
-import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class BeepActionEditor extends DocumentListenerEditor<AliasAction>
-{
-    private static final long serialVersionUID = 1L;
-    
-	private static final String HELP_TEXT = 
-		"<html><h3>Beep Action</h3>"
-		+ "This action will sound a beep according to the interval<br>"
-		+ "that you select:<br><br>"
-		+ "<b>Once:</b> Beep the first time the alias is active and<br>"
-		+ "never again<br><br>"
-		+ "<b>Once, Reset After Delay:</b> Beep once and suppress<br>"
-		+ "subsequent beeps for the specified period in seconds.<br>"
-		+ "After the reset period, beep again when the alias is active.<br><br>"
-		+ "<b>Until Dismissed:</b> Beep every period seconds until you<br>"
-		+ "click OK on the dialog that appears. Alerting is suppressed<br>"
-		+ "for 15 seconds after you click OK.<br>"
-		+ "</html>";
-
-    private JComboBox<RecurringAction.Interval> mComboInterval;
-    private JSlider mPeriodSlider;
-    private JLabel mPeriodSliderLabel;
-
-	public BeepActionEditor( AliasAction aliasAction )
-	{
-		init();
-
-		setItem( aliasAction );
-	}
-	
-	public BeepAction getBeepAction()
-	{
-		if( getItem() instanceof BeepAction )
-		{
-			return (BeepAction)getItem();
-		}
-		
-		return null;
-	}
-	
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][]" ) );
-
-		add( new JLabel( "Beep Interval:" ) );
-		
-		mComboInterval = new JComboBox<RecurringAction.Interval>( RecurringAction.Interval.values() );
-		mComboInterval.setToolTipText( HELP_TEXT );
-		mComboInterval.addActionListener( new ActionListener()
-		{
-			@Override
-           public void actionPerformed( ActionEvent e )
-           {
-				RecurringAction.Interval selected = mComboInterval
-						.getItemAt( mComboInterval.getSelectedIndex() );
-				
-				if( selected != null )
-				{
-					/* Enable/disable period spinner based on selection */
-					boolean enabled = selected != RecurringAction.Interval.ONCE;
-					
-					mPeriodSlider.setEnabled( enabled );
-					mPeriodSliderLabel.setEnabled( enabled );
-				}
-				
-				setModified( true );
-           }
-		});
-		add( mComboInterval, "wrap" );
-
-		final SpinnerModel model = new SpinnerNumberModel( 1, 1, 30, 1 );
-		model.addChangeListener( new ChangeListener() 
-		{
-			@Override
-			public void stateChanged( ChangeEvent e )
-			{
-				setModified( true );
-			}
-		} );
-		
-		mPeriodSlider = new JSlider( JSlider.HORIZONTAL, 1, 60, 1 );
-		mPeriodSlider.setMajorTickSpacing( 10 );
-		mPeriodSlider.setMinorTickSpacing( 2 );
-		mPeriodSlider.setPaintTicks( true );
-		mPeriodSlider.setLabelTable( mPeriodSlider.createStandardLabels( 10, 10 ) );
-		mPeriodSlider.setPaintLabels( true );
-		mPeriodSlider.addChangeListener( new ChangeListener()
-		{
-			@Override
-			public void stateChanged( ChangeEvent e )
-			{
-				mPeriodSliderLabel.setText( "Period: " + mPeriodSlider.getValue() );
-				setModified( true );
-			}
-		} );
-		mPeriodSlider.setToolTipText( HELP_TEXT );
-		
-		mPeriodSliderLabel = new JLabel( "Period: " + mPeriodSlider.getValue() + " " );
-		add( mPeriodSliderLabel );
-		add( mPeriodSlider, "wrap,grow" );
-		
-		JLabel help = new JLabel( "Help ..." );
-		help.setForeground( Color.BLUE.brighter() );
-		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
-		help.addMouseListener( new MouseAdapter() 
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JOptionPane.showMessageDialog( BeepActionEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	@Override
-	public void setItem( AliasAction item )
-	{
-		super.setItem( item );
-		
-		if( hasItem() )
-		{
-			BeepAction beep = getBeepAction();
-
-			RecurringAction.Interval interval = beep.getInterval();
-			
-			mComboInterval.setSelectedItem( interval );
-
-			boolean enabled = interval != RecurringAction.Interval.ONCE;
-			
-			mPeriodSliderLabel.setEnabled( enabled );
-			mPeriodSlider.setEnabled( enabled );
-			mPeriodSlider.setValue( beep.getPeriod() );
-		}
-		
-		setModified( false );
-	}
-
-	@Override
-	public void save()
-	{
-		if( hasItem() && isModified() )
-		{
-			BeepAction beep = getBeepAction();
-			
-			beep.setInterval( (RecurringAction.Interval)mComboInterval.getSelectedItem() );
-			beep.setPeriod( mPeriodSlider.getValue() );
-		}
-		
-		setModified( false );
-	}
-}

src/main/java/io/github/dsheirer/alias/action/clip/ClipAction.java

@@ -1,3 +1,23 @@
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 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.action.clip;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -5,7 +25,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,6 +45,7 @@ public class ClipAction extends RecurringAction
 
     public ClipAction()
     {
+        updateValueProperty();
     }
 
     @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
@@ -42,10 +63,11 @@ public class ClipAction extends RecurringAction
     public void setPath(String path)
     {
         mFilePath = path;
+        updateValueProperty();
     }
 
     @Override
-    public void performAction(Alias alias, Message message)
+    public void performAction(Alias alias, IMessage message)
     {
         try
         {
@@ -67,8 +89,7 @@ public class ClipAction extends RecurringAction
                 {
                     mClip = AudioSystem.getClip();
 
-                    AudioInputStream ais =
-                        AudioSystem.getAudioInputStream(new File(mFilePath));
+                    AudioInputStream ais = AudioSystem.getAudioInputStream(new File(mFilePath));
 
                     mClip.open(ais);
                 }
@@ -93,17 +114,33 @@ public class ClipAction extends RecurringAction
         }
     }
 
-
     @Override
     public String toString()
     {
-        if(mFilePath == null)
+        StringBuilder sb = new StringBuilder();
+        sb.append("Play Audio Clip");
+
+        if(getInterval() != null)
         {
-            return "Play Clip";
+            switch(getInterval())
+            {
+                case ONCE:
+                    sb.append(" Once");
+                    break;
+                case DELAYED_RESET:
+                    sb.append(" Once, Reset After ").append(getPeriod()).append(" Seconds");
+                    break;
+                case UNTIL_DISMISSED:
+                    sb.append(" Every ").append(getPeriod()).append(" Seconds Until Dismissed");
+                    break;
+            }
         }
-        else
+
+        if(getPath() == null)
         {
-            return "Play Clip: " + mFilePath;
+            sb.append(" - (audio file empty)");
         }
+
+        return sb.toString();
     }
 }

src/main/java/io/github/dsheirer/alias/action/clip/ClipActionEditor.java

@@ -1,285 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.action.clip;
-
-import io.github.dsheirer.alias.action.AliasAction;
-import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.File;
-
-public class ClipActionEditor extends DocumentListenerEditor<AliasAction>
-{
-    private static final long serialVersionUID = 1L;
-    
-    private static final String PLEASE_SELECT_A_FILE = "Please select a file";
-	private static final String HELP_TEXT = 
-		"<html><h3>Clip Action</h3>"
-		+ "This action will play an audio clip according to the interval<br>"
-		+ "that you select:<br><br>"
-		+ "<b>Once:</b> play the first time the alias is active and<br>"
-		+ "never again<br><br>"
-		+ "<b>Once, Reset After Delay:</b> play once and suppress<br>"
-		+ "subsequent runs for the specified period in seconds.<br>"
-		+ "After the reset period, play again when the alias is active.<br><br>"
-		+ "<b>Until Dismissed:</b> play every period seconds until you<br>"
-		+ "click OK on the dialog that appears. Alerting is suppressed<br>"
-		+ "for 15 seconds after you click OK.<br>"
-		+ "</html>";
-
-    private JComboBox<RecurringAction.Interval> mComboInterval;
-    private JSlider mPeriodSlider;
-    private JLabel mPeriodSliderLabel;
-    private JTextField mTextFilePath;
-
-	public ClipActionEditor( AliasAction aliasAction )
-	{
-		init();
-
-		setItem( aliasAction );
-	}
-	
-	public ClipAction getClipAction()
-	{
-		if( getItem() instanceof ClipAction )
-		{
-			return (ClipAction)getItem();
-		}
-		
-		return null;
-	}
-	
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][][]" ) );
-
-		add( new JLabel( "Play Interval:" ) );
-		
-		mComboInterval = new JComboBox<RecurringAction.Interval>( RecurringAction.Interval.values() );
-		mComboInterval.setToolTipText( HELP_TEXT );
-		mComboInterval.addActionListener( new ActionListener()
-		{
-			@Override
-           public void actionPerformed( ActionEvent e )
-           {
-				RecurringAction.Interval selected = mComboInterval
-						.getItemAt( mComboInterval.getSelectedIndex() );
-				
-				if( selected != null )
-				{
-					/* Enable/disable period slider based on selection */
-					boolean enabled = selected != RecurringAction.Interval.ONCE;
-					
-					mPeriodSlider.setEnabled( enabled );
-					mPeriodSliderLabel.setEnabled( enabled );
-				}
-				
-				setModified( true );
-           }
-		});
-		add( mComboInterval );
-
-		final SpinnerModel model = new SpinnerNumberModel( 1, 1, 30, 1 );
-		model.addChangeListener( new ChangeListener() 
-		{
-			@Override
-			public void stateChanged( ChangeEvent e )
-			{
-				setModified( true );
-			}
-		} );
-		
-		mPeriodSlider = new JSlider( JSlider.HORIZONTAL, 1, 60, 1 );
-		mPeriodSlider.setMajorTickSpacing( 10 );
-		mPeriodSlider.setMinorTickSpacing( 2 );
-		mPeriodSlider.setPaintTicks( true );
-		mPeriodSlider.setLabelTable( mPeriodSlider.createStandardLabels( 10, 10 ) );
-		mPeriodSlider.setPaintLabels( true );
-		mPeriodSlider.addChangeListener( new ChangeListener()
-		{
-			@Override
-			public void stateChanged( ChangeEvent e )
-			{
-				mPeriodSliderLabel.setText( "Period: " + mPeriodSlider.getValue() );
-				setModified( true );
-			}
-		} );
-		mPeriodSlider.setToolTipText( HELP_TEXT );
-		
-		mPeriodSliderLabel = new JLabel( "Period: " + mPeriodSlider.getValue() + " " );
-		add( mPeriodSliderLabel );
-		add( mPeriodSlider, "wrap,grow" );
-		
-		mTextFilePath = new JTextField( PLEASE_SELECT_A_FILE );
-		add( mTextFilePath, "growx,span" );
-		
-		JButton fileButton = new JButton( "File" );
-		
-		fileButton.addActionListener( new ActionListener() 
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				final JFileChooser chooser = new JFileChooser();
-
-				int value = chooser.showOpenDialog( ClipActionEditor.this );
-
-				if( value == JFileChooser.APPROVE_OPTION )
-					{
-						File file = chooser.getSelectedFile();
-						
-						mTextFilePath.setText( file.getAbsolutePath() );
-						
-						setModified( true );
-					}
-				}
-		} );
-		
-		add( fileButton, "grow" );
-		
-		JButton testButton = new JButton( "Test" );
-		
-		testButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				if( hasItem() )
-				{
-					String path = mTextFilePath.getText();
-					
-					if( path == null || path.trim().isEmpty() )
-					{
-						JOptionPane.showMessageDialog( ClipActionEditor.this, 
-								"Please select an audio file", PLEASE_SELECT_A_FILE,
-								JOptionPane.ERROR_MESSAGE );
-					}
-					else
-					{
-						if( isModified() )
-						{
-							int option = JOptionPane.showConfirmDialog( 
-								ClipActionEditor.this, 
-								"Settings have changed.  Do you want to save these changes?", 
-								"Save Changes?",
-								JOptionPane.YES_NO_OPTION,
-								JOptionPane.QUESTION_MESSAGE );
-							
-							if( option == JOptionPane.YES_OPTION )
-							{
-								save();
-							}
-						}
-
-						new Thread( new Runnable()
-						{
-							@Override
-							public void run()
-							{
-								try
-								{
-									getClipAction().play();
-								}
-								catch( Exception e1 )
-								{
-									JOptionPane.showMessageDialog( ClipActionEditor.this, 
-										"Couldn't play audio clip [" + e1.getMessage() + "]",
-										"Error", JOptionPane.ERROR_MESSAGE );
-								}
-							}
-						}).start();
-					}
-				}
-			}
-		} );
-
-		add( testButton, "grow,wrap" );
-		
-		JLabel help = new JLabel( "Help ..." );
-		help.setForeground( Color.BLUE.brighter() );
-		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
-		help.addMouseListener( new MouseAdapter() 
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JOptionPane.showMessageDialog( ClipActionEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	@Override
-	public void setItem( AliasAction item )
-	{
-		super.setItem( item );
-		
-		if( hasItem() )
-		{
-			ClipAction clip = getClipAction();
-
-			RecurringAction.Interval interval = clip.getInterval();
-			
-			mComboInterval.setSelectedItem( interval );
-
-			boolean enabled = interval != RecurringAction.Interval.ONCE;
-			
-			mPeriodSliderLabel.setEnabled( enabled );
-			mPeriodSlider.setEnabled( enabled );
-			mPeriodSlider.setValue( clip.getPeriod() );
-			
-			String filepath = clip.getPath();
-			
-			if( filepath != null && !filepath.isEmpty() )
-			{
-				mTextFilePath.setText( filepath );
-			}
-			else
-			{
-				mTextFilePath.setText( PLEASE_SELECT_A_FILE );
-			}
-		}
-		
-		setModified( false );
-	}
-
-	@Override
-	public void save()
-	{
-		if( hasItem() && isModified() )
-		{
-			ClipAction script = getClipAction();
-			
-			script.setInterval( (RecurringAction.Interval)mComboInterval.getSelectedItem() );
-			script.setPeriod( mPeriodSlider.getValue() );
-			script.setPath( mTextFilePath.getText() );
-		}
-		
-		setModified( false );
-	}
-}

src/main/java/io/github/dsheirer/alias/action/script/ScriptAction.java

@@ -1,10 +1,30 @@
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 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.action.script;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,6 +39,7 @@ public class ScriptAction extends RecurringAction
 
     public ScriptAction()
     {
+        updateValueProperty();
     }
 
     @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
@@ -36,10 +57,11 @@ public class ScriptAction extends RecurringAction
     public void setScript(String script)
     {
         mScript = script;
+        updateValueProperty();
     }
 
     @Override
-    public void performAction(Alias alias, Message message)
+    public void performAction(Alias alias, IMessage message)
     {
         try
         {
@@ -63,8 +85,7 @@ public class ScriptAction extends RecurringAction
 
             int exitCode = p.waitFor();
 
-            BufferedReader reader = new BufferedReader(
-                new InputStreamReader(p.getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
 
             String line = "";
 
@@ -77,8 +98,7 @@ public class ScriptAction extends RecurringAction
 
             if(exitCode != 0)
             {
-                throw new RuntimeException("Exit Code: " + exitCode +
-                    " Console:" + sb.toString());
+                throw new RuntimeException("Exit Code: " + exitCode + " Console:" + sb.toString());
             }
         }
     }
@@ -86,13 +106,30 @@ public class ScriptAction extends RecurringAction
     @Override
     public String toString()
     {
-        if(mScript == null)
+        StringBuilder sb = new StringBuilder();
+        sb.append("Run Script");
+
+        if(getInterval() != null)
         {
-            return "Run Script";
+            switch(getInterval())
+            {
+                case ONCE:
+                    sb.append(" Once");
+                    break;
+                case DELAYED_RESET:
+                    sb.append(" Once, Reset After ").append(getPeriod()).append(" Seconds");
+                    break;
+                case UNTIL_DISMISSED:
+                    sb.append(" Every ").append(getPeriod()).append(" Seconds Until Dismissed");
+                    break;
+            }
         }
-        else
+
+        if(getScript() == null)
         {
-            return "Run Script: " + mScript;
+            sb.append(" - (script file empty)");
         }
+
+        return sb.toString();
     }
 }

src/main/java/io/github/dsheirer/alias/action/script/ScriptActionEditor.java

@@ -1,281 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.action.script;
-
-import io.github.dsheirer.alias.action.AliasAction;
-import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.File;
-
-public class ScriptActionEditor extends DocumentListenerEditor<AliasAction>
-{
-    private static final long serialVersionUID = 1L;
-    
-    private static final String PLEASE_SELECT_A_FILE = "Please select a file";
-	private static final String HELP_TEXT = 
-		"<html><h3>Script Action</h3>"
-		+ "This action will run a script according to the interval<br>"
-		+ "that you select:<br><br>"
-		+ "<b>Once:</b> run the first time the alias is active and<br>"
-		+ "never again<br><br>"
-		+ "<b>Once, Reset After Delay:</b> run once and suppress<br>"
-		+ "subsequent runs for the specified period in seconds.<br>"
-		+ "After the reset period, run again when the alias is active.<br><br>"
-		+ "<b>Until Dismissed:</b> run every period seconds until you<br>"
-		+ "click OK on the dialog that appears. Alerting is suppressed<br>"
-		+ "for 15 seconds after you click OK.<br>"
-		+ "</html>";
-
-    private JComboBox<RecurringAction.Interval> mComboInterval;
-    private JSlider mPeriodSlider;
-    private JLabel mPeriodSliderLabel;
-    private JTextField mTextFilePath;
-
-	public ScriptActionEditor( AliasAction aliasAction )
-	{
-		init();
-
-		setItem( aliasAction );
-	}
-	
-	public ScriptAction getScriptAction()
-	{
-		if( getItem() instanceof ScriptAction )
-		{
-			return (ScriptAction)getItem();
-		}
-		
-		return null;
-	}
-	
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][][]" ) );
-
-		add( new JLabel( "Run Interval:" ) );
-		
-		mComboInterval = new JComboBox<RecurringAction.Interval>( RecurringAction.Interval.values() );
-		mComboInterval.setToolTipText( HELP_TEXT );
-		mComboInterval.addActionListener( new ActionListener()
-		{
-			@Override
-           public void actionPerformed( ActionEvent e )
-           {
-				RecurringAction.Interval selected = mComboInterval
-						.getItemAt( mComboInterval.getSelectedIndex() );
-				
-				if( selected != null )
-				{
-					/* Enable/disable period slider based on selection */
-					boolean enabled = selected != RecurringAction.Interval.ONCE;
-					
-					mPeriodSlider.setEnabled( enabled );
-					mPeriodSliderLabel.setEnabled( enabled );
-				}
-				
-				setModified( true );
-           }
-		});
-		add( mComboInterval );
-
-		final SpinnerModel model = new SpinnerNumberModel( 1, 1, 30, 1 );
-		model.addChangeListener( new ChangeListener() 
-		{
-			@Override
-			public void stateChanged( ChangeEvent e )
-			{
-				setModified( true );
-			}
-		} );
-		
-		mPeriodSlider = new JSlider( JSlider.HORIZONTAL, 1, 60, 1 );
-		mPeriodSlider.setMajorTickSpacing( 10 );
-		mPeriodSlider.setMinorTickSpacing( 2 );
-		mPeriodSlider.setPaintTicks( true );
-		mPeriodSlider.setLabelTable( mPeriodSlider.createStandardLabels( 10, 10 ) );
-		mPeriodSlider.setPaintLabels( true );
-		mPeriodSlider.addChangeListener( new ChangeListener()
-		{
-			@Override
-			public void stateChanged( ChangeEvent e )
-			{
-				mPeriodSliderLabel.setText( "Period: " + mPeriodSlider.getValue() );
-				setModified( true );
-			}
-		} );
-		mPeriodSlider.setToolTipText( HELP_TEXT );
-		
-		mPeriodSliderLabel = new JLabel( "Period: " + mPeriodSlider.getValue() + " " );
-		add( mPeriodSliderLabel );
-		add( mPeriodSlider, "wrap,grow" );
-		
-		mTextFilePath = new JTextField( PLEASE_SELECT_A_FILE );
-		add( mTextFilePath, "growx,span" );
-		
-		JButton fileButton = new JButton( "File" );
-		
-		fileButton.addActionListener( new ActionListener() 
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				final JFileChooser chooser = new JFileChooser();
-
-				int value = chooser.showOpenDialog( ScriptActionEditor.this );
-
-				if( value == JFileChooser.APPROVE_OPTION )
-					{
-						File file = chooser.getSelectedFile();
-						
-						mTextFilePath.setText( file.getAbsolutePath() );
-						
-						setModified( true );
-					}
-				}
-		} );
-		
-		add( fileButton, "grow" );
-		
-		JButton testButton = new JButton( "Test" );
-		testButton.addActionListener( new ActionListener() 
-		{
-			@Override
-			public void actionPerformed( ActionEvent actionEvent )
-			{
-				String script = mTextFilePath.getText();
-				
-				if( script == null || script.trim().isEmpty() )
-				{
-					JOptionPane.showMessageDialog( ScriptActionEditor.this, 
-							"Please select a script file", PLEASE_SELECT_A_FILE, 
-							JOptionPane.ERROR_MESSAGE );
-				}
-				else
-				{
-					if( isModified() )
-					{
-						int option = JOptionPane.showConfirmDialog( 
-							ScriptActionEditor.this, 
-							"Settings have changed.  Do you want to save these changes?", 
-							"Save Changes?",
-							JOptionPane.YES_NO_OPTION,
-							JOptionPane.QUESTION_MESSAGE );
-						
-						if( option == JOptionPane.YES_OPTION )
-						{
-							save();
-						}
-					}
-					
-					new Thread( new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							try
-							{
-								getScriptAction().play();
-							}
-							catch( Exception e1 )
-							{
-								JOptionPane.showMessageDialog( ScriptActionEditor.this, 
-									e1.getMessage(), "Error", JOptionPane.ERROR_MESSAGE );
-							}
-						}
-					}).start();
-				}
-				
-			}
-		} );
-		
-		add( testButton, "grow,wrap" );
-		
-		JLabel help = new JLabel( "Help ..." );
-		help.setForeground( Color.BLUE.brighter() );
-		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
-		help.addMouseListener( new MouseAdapter() 
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JOptionPane.showMessageDialog( ScriptActionEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	@Override
-	public void setItem( AliasAction item )
-	{
-		super.setItem( item );
-		
-		if( hasItem() )
-		{
-			ScriptAction script = getScriptAction();
-
-			RecurringAction.Interval interval = script.getInterval();
-			
-			mComboInterval.setSelectedItem( interval );
-
-			boolean enabled = interval != RecurringAction.Interval.ONCE;
-			
-			mPeriodSliderLabel.setEnabled( enabled );
-			mPeriodSlider.setEnabled( enabled );
-			mPeriodSlider.setValue( script.getPeriod() );
-			
-			String filepath = script.getScript();
-			
-			if( filepath != null && !filepath.isEmpty() )
-			{
-				mTextFilePath.setText( filepath );
-			}
-			else
-			{
-				mTextFilePath.setText( PLEASE_SELECT_A_FILE );
-			}
-		}
-		
-		setModified( false );
-	}
-
-	@Override
-	public void save()
-	{
-		if( hasItem() && isModified() )
-		{
-			ScriptAction script = getScriptAction();
-			
-			script.setInterval( (RecurringAction.Interval)mComboInterval.getSelectedItem() );
-			script.setPeriod( mPeriodSlider.getValue() );
-			script.setScript( mTextFilePath.getText() );
-		}
-		
-		setModified( false );
-	}
-}

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

@@ -1,20 +1,21 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 package io.github.dsheirer.alias.id;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -22,47 +23,146 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import io.github.dsheirer.alias.id.dcs.Dcs;
 import io.github.dsheirer.alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
+import io.github.dsheirer.alias.id.legacy.fleetsync.FleetsyncID;
+import io.github.dsheirer.alias.id.legacy.mdc.MDC1200ID;
+import io.github.dsheirer.alias.id.legacy.mobileID.Min;
+import io.github.dsheirer.alias.id.legacy.mpt1327.MPT1327ID;
+import io.github.dsheirer.alias.id.legacy.nonrecordable.NonRecordable;
+import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
+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.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
 import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.siteID.SiteID;
-import io.github.dsheirer.alias.id.status.StatusID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
+import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
+import io.github.dsheirer.alias.id.radio.Radio;
+import io.github.dsheirer.alias.id.radio.RadioRange;
+import io.github.dsheirer.alias.id.record.Record;
+import io.github.dsheirer.alias.id.status.UnitStatusID;
+import io.github.dsheirer.alias.id.status.UserStatusID;
+import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
+import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
+import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
+import io.github.dsheirer.alias.id.tone.TonesID;
+import javafx.beans.Observable;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.util.Callback;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include= JsonTypeInfo.As.PROPERTY, property="type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes({
-    @JsonSubTypes.Type(value=BroadcastChannel.class, name="broadcastChannel"),
-    @JsonSubTypes.Type(value=Esn.class, name="esn"),
-    @JsonSubTypes.Type(value=FleetsyncID.class, name="fleetsyncID"),
+    @JsonSubTypes.Type(value = BroadcastChannel.class, name = "broadcastChannel"),
+    @JsonSubTypes.Type(value = Dcs.class, name = "dcs"),
+    @JsonSubTypes.Type(value = Esn.class, name = "esn"),
+    @JsonSubTypes.Type(value = FleetsyncID.class, name = "fleetsyncID"),
+    @JsonSubTypes.Type(value = LegacyTalkgroupID.class, name = "talkgroupID"),
     @JsonSubTypes.Type(value = LoJackFunctionAndID.class, name = "loJackFunctionAndID"),
     @JsonSubTypes.Type(value = MDC1200ID.class, name = "mdc1200ID"),
     @JsonSubTypes.Type(value = Min.class, name = "min"),
     @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
     @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
+    @JsonSubTypes.Type(value = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
+    @JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
     @JsonSubTypes.Type(value = Priority.class, name = "priority"),
+    @JsonSubTypes.Type(value = Radio.class, name = "radio"),
+    @JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),
+    @JsonSubTypes.Type(value = Record.class, name = "record"),
     @JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
-    @JsonSubTypes.Type(value = StatusID.class, name = "statusID"),
-    @JsonSubTypes.Type(value = TalkgroupID.class, name = "talkgroupID"),
+    @JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
+    @JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
+    @JsonSubTypes.Type(value = TonesID.class, name = "tones"),
+    @JsonSubTypes.Type(value = UserStatusID.class, name = "statusID"),
+    @JsonSubTypes.Type(value = UnitStatusID.class, name = "unitStatusID"),
     @JsonSubTypes.Type(value = UniqueID.class, name = "uniqueID")
 })
-@JacksonXmlRootElement( localName = "id" )
+@JacksonXmlRootElement(localName = "id")
 public abstract class AliasID
 {
-	public AliasID()
-	{
-	}
+    private SimpleStringProperty mValueProperty = new SimpleStringProperty();
+    private BooleanProperty mOverlapProperty = new SimpleBooleanProperty();
 
-	@JsonIgnore
-	public abstract AliasIDType getType();
-	
-	public abstract boolean matches( AliasID id );
+    public AliasID()
+    {
+    }
 
-	@JsonIgnore
-	public abstract boolean isValid();
+    /**
+     * String property representation of this alias ID
+     */
+    @JsonIgnore
+    public SimpleStringProperty valueProperty()
+    {
+        return mValueProperty;
+    }
+
+    /**
+     * Indicates if this alias identifier overlaps with any other alias identifier in the same alias list
+     */
+    @JsonIgnore
+    public BooleanProperty overlapProperty()
+    {
+        return mOverlapProperty;
+    }
+
+    /**
+     * Sets the overlap flag for this alias id.  Overlap indicates that this identifier collides with another
+     * identifier within the same alias list.
+     */
+    public void setOverlap(boolean overlap)
+    {
+        mOverlapProperty.set(overlap);
+        updateValueProperty();
+    }
+
+    /**
+     * Updates the value property for this alias ID.  Note: this method is intended to be invoked by all subclasses
+     * each time that any of the subclass member variable values change.
+     */
+    public void updateValueProperty()
+    {
+        if(overlapProperty().get())
+        {
+            valueProperty().set(toString() + " - Error: Overlap");
+        }
+        else
+        {
+            valueProperty().set(toString());
+        }
+
+        //Hack: harmless, but the list extractor does not consistently update unless we do this.
+        valueProperty().get();
+    }
+
+    @JsonIgnore
+    public abstract AliasIDType getType();
+
+    public abstract boolean matches(AliasID id);
+
+    /**
+     * Indicates if this alias ID overlaps with another alias ID.
+     * Note: this method is intended to be overridden by certain subclass implementations.
+     */
+    @JsonIgnore
+    public boolean overlaps(AliasID id)
+    {
+        return false;
+    }
+
+    @JsonIgnore
+    public abstract boolean isValid();
+
+    /**
+     * Indicates if the identifier is an audio identifier (monitor, record, stream)
+     */
+    @JsonIgnore
+    public abstract boolean isAudioIdentifier();
+
+    /**
+     * Creates an observable property extractor for use with observable lists to detect changes internal to this object.
+     */
+    public static Callback<AliasID,Observable[]> extractor()
+    {
+        return (AliasID aid) -> new Observable[] {aid.valueProperty(), aid.overlapProperty()};
+    }
 }

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

@@ -1,49 +1,67 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 package io.github.dsheirer.alias.id;
 
+import java.util.EnumSet;
+
 public enum AliasIDType
 {
-	ESN( "ESN" ),
-	FLEETSYNC( "Fleetsync" ),
-	LOJACK( "LoJack" ),
-	LTR_NET_UID( "LTR-Net UID" ),
-	MDC1200( "MDC-1200" ),
-	MIN( "Passport MIN" ),
-	MPT1327( "MPT-1327" ),
-	SITE( "Site" ),
-	STATUS( "Status" ),
-	TALKGROUP( "Talkgroup" ),
+    BROADCAST_CHANNEL("Audio Broadcast Channel"),
+    DCS("Digital Coded Squelch (DCS)"),
+    ESN("ESN"),
+    INVERT("Audio Inversion"),
+    LOJACK("LoJack"),
+    LTR_NET_UID("LTR-Net UID"),
+    MIN("Passport MIN"),
+    P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
+    P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
+    PRIORITY("Audio Priority"),
+    RADIO_ID("Radio ID"),
+    RADIO_ID_RANGE("Radio ID Range"),
+    RECORD("Record"),
+    SITE("Site"),
+    STATUS("User Status"),
+    TONES("Tone Sequence"),
+    UNIT_STATUS("Unit Status"),
+    TALKGROUP("Talkgroup"),
+    TALKGROUP_RANGE("Talkgroup Range"),
 
-	INVERT( "Audio Inversion" ),
-	PRIORITY( "Audio Priority" ),
-	NON_RECORDABLE( "Audio Non-Recordable" ),
-	BROADCAST_CHANNEL( "Audio Broadcast Channel" );
-	
-	private String mLabel;
-	
-	private AliasIDType( String label )
-	{
-		mLabel = label;
-	}
-	
-	public String toString()
-	{
-		return mLabel;
-	}
+    //Legacy identifier types - no longer used
+    FLEETSYNC("Fleetsync"),
+    LEGACY_TALKGROUP("Legacy Talkgroup"),
+    MDC1200("MDC-1200"),
+    MPT1327("MPT-1327"),
+    NON_RECORDABLE("Audio Non-Recordable");
+
+    private String mLabel;
+
+    AliasIDType(String label)
+    {
+        mLabel = label;
+    }
+
+    //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,
+        P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);
+
+    public String toString()
+    {
+        return mLabel;
+    }
 }

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

@@ -1,367 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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;
-
-import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.alias.AliasEvent;
-import io.github.dsheirer.alias.AliasFactory;
-import io.github.dsheirer.alias.AliasModel;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.gui.editor.EmptyEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class AliasIdentifierEditor extends Editor<Alias>
-{
-	private static final long serialVersionUID = 1L;
-
-	private static ListModel<AliasID> EMPTY_MODEL = new DefaultListModel<>();
-	private JList<AliasID> mAliasIDList = new JList<>( EMPTY_MODEL );
-	private JButton mNewIDButton;
-	private JButton mCloneIDButton;
-	private JButton mDeleteIDButton;
-	private EditorContainer mEditorContainer = new EditorContainer();
-
-	private AliasModel mAliasModel;
-    private BroadcastModel mBroadcastModel;
-	
-	public AliasIdentifierEditor( AliasModel aliasModel, BroadcastModel broadcastModel )
-	{
-		mAliasModel = aliasModel;
-        mBroadcastModel = broadcastModel;
-
-		init();
-	}
-
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 3", 
-			"[grow,fill][grow,fill][grow,fill]", "[][grow,fill][]" ) );
-
-		mAliasIDList.setVisibleRowCount( 6 );
-		mAliasIDList.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
-		mAliasIDList.setLayoutOrientation( JList.VERTICAL );
-		mAliasIDList.addListSelectionListener( new ListSelectionListener()
-		{
-			@Override
-			public void valueChanged( ListSelectionEvent event )
-			{
-				if( !event.getValueIsAdjusting() )
-				{
-					JList<?> list = (JList<?>)event.getSource();
-					
-					Object selectedItem = list.getSelectedValue();
-					
-					if( selectedItem != null && selectedItem instanceof AliasID )
-					{
-						AliasID selected = (AliasID)selectedItem;
-
-						mEditorContainer.setAliasID( selected );
-						
-						mCloneIDButton.setEnabled( true );
-						mDeleteIDButton.setEnabled( true );
-					}
-					else
-					{
-						mCloneIDButton.setEnabled( false );
-						mDeleteIDButton.setEnabled( false );
-					}
-				}
-			}
-		} );
-		
-		JScrollPane scroller = new JScrollPane( mAliasIDList );
-		add( scroller, "span,grow" );
-		
-		add( mEditorContainer, "span,grow" );
-
-		mNewIDButton = new JButton( "New ..." );
-		mNewIDButton.setToolTipText( "Create a new Alias Identifier" );
-		mNewIDButton.addMouseListener( new MouseAdapter()
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JPopupMenu menu = new JPopupMenu();
-
-				menu.add( new AddAliasIdentifierItem( AliasIDType.ESN ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.FLEETSYNC) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.LOJACK) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.LTR_NET_UID) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.MDC1200 ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.MPT1327 ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.MIN ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.SITE) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.STATUS) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.TALKGROUP) );
-
-				menu.addSeparator();
-
-                menu.add( new AddAliasIdentifierItem( AliasIDType.BROADCAST_CHANNEL) );
-
-				if( hasItem() )
-				{
-					Alias alias = getItem();
-
-					if( alias.isRecordable() )
-					{
-						menu.add( new AddAliasIdentifierItem( AliasIDType.NON_RECORDABLE) );
-					}
-
-					if( !alias.hasCallPriority() )
-					{
-						menu.add( new AddAliasIdentifierItem( AliasIDType.PRIORITY) );
-					}
-				}
-
-				menu.show( e.getComponent(), e.getX(), e.getY() );
-			}
-		} );
-		
-		add( mNewIDButton );
-		
-		mCloneIDButton = new JButton( "Clone" );
-		mCloneIDButton.setToolTipText( "Create a copy of the currently selected identifier" );
-		mCloneIDButton.setEnabled( false );
-		mCloneIDButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				AliasID selected = mAliasIDList.getSelectedValue();
-				
-				if( selected != null )
-				{
-					AliasID clone = AliasFactory.copyOf( selected );
-
-					if( clone != null )
-					{
-						addAliasIDToList( clone );
-					}
-				}
-			}
-		} );
-		add( mCloneIDButton );
-		
-		mDeleteIDButton = new JButton( "Delete" );
-		mDeleteIDButton.setToolTipText( "Delete the currently selected identifier" );
-		mDeleteIDButton.setEnabled( false );
-		mDeleteIDButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				final AliasID selected = mAliasIDList.getSelectedValue();
-				
-				if( selected != null )
-				{
-					int choice = JOptionPane.showConfirmDialog( mDeleteIDButton, 
-						"Do you want to delete [" + selected.toString() + "]", 
-						"Are you sure?", JOptionPane.YES_NO_OPTION );
-					
-					if( choice == JOptionPane.YES_OPTION && hasItem() )
-					{
-						Alias alias = getItem();
-						
-						alias.removeAliasID( selected );
-						
-						mAliasModel.broadcast( new AliasEvent( alias, AliasEvent.Event.CHANGE ) );
-
-						setItem( alias );
-					}
-				}
-			}
-		} );
-		add( mDeleteIDButton, "wrap" );
-	}
-	
-	@Override
-	public void setItem( Alias alias )
-	{
-		super.setItem( alias );
-		
-		if( alias == null || alias.getId().isEmpty() )
-		{
-			mAliasIDList.setModel( EMPTY_MODEL );
-		}
-		else
-		{
-			DefaultListModel<AliasID> model = new DefaultListModel<AliasID>();
-
-			List<AliasID> ids = alias.getId();
-			
-			Collections.sort( ids, new Comparator<AliasID>()
-			{
-				@Override
-				public int compare( AliasID o1, AliasID o2 )
-				{
-					return o1.toString().compareTo( o2.toString() );
-				}
-			} );
-			
-			for( AliasID id: ids )
-			{
-				model.addElement( id );
-			}
-			
-			mAliasIDList.setModel( model );
-		}
-		
-		mEditorContainer.setAliasID( null );
-	}
-	
-	@Override
-	public void save()
-	{
-		if( isModified() || mEditorContainer.isModified() )
-		{
-			if( mEditorContainer.isModified() )
-			{
-				mEditorContainer.save();
-			}
-			
-			setModified( false );
-			
-			if( hasItem() )
-			{
-				mAliasModel.broadcast( new AliasEvent( getItem(), AliasEvent.Event.CHANGE ) );
-			}
-		}
-	}
-	
-	public class EditorContainer extends JPanel
-	{
-		private static final long serialVersionUID = 1L;
-
-		private Editor<AliasID> mEditor = new EmptyEditor<>();
-
-		public EditorContainer()
-		{
-			setLayout( new MigLayout( "","[grow,fill]", "[grow,fill]" ) );
-
-			add( mEditor );
-		}
-		
-		public boolean isModified()
-		{
-			if( mEditor != null )
-			{
-				return mEditor.isModified();
-			}
-			
-			return false;
-		}
-		
-		public void save()
-		{
-			if( mEditor != null )
-			{
-				mEditor.save();
-			}
-		}
-		
-		public void setAliasID( AliasID aliasID )
-		{
-			if( mEditor != null )
-			{
-				if( mEditor.isModified() )
-				{
-					int option = JOptionPane.showConfirmDialog( 
-							EditorContainer.this, 
-							"Identifier settings have changed.  Do you want to save these changes?",
-							"Save Changes?",
-							JOptionPane.YES_NO_OPTION,
-							JOptionPane.QUESTION_MESSAGE );
-					
-					if( option == JOptionPane.YES_OPTION )
-					{
-						mEditor.save();
-					}
-				}
-			}
-			removeAll();
-			
-			//This will always give us an editor
-			mEditor = AliasFactory.getEditor( aliasID, mBroadcastModel );
-			
-			add( mEditor );
-
-			revalidate();
-		}
-	}
-	
-	private void addAliasIDToList( final AliasID id )
-	{
-		if( id != null && hasItem() )
-		{
-			final Alias alias = getItem();
-			
-			alias.addAliasID( id );
-			
-			EventQueue.invokeLater( new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					setItem( alias );
-					
-					mAliasIDList.setSelectedValue( id, true );
-					
-					AliasIdentifierEditor.this.setModified( true );
-				}
-			} );
-		}
-	}
-	
-	public class AddAliasIdentifierItem extends JMenuItem
-	{
-		private static final long serialVersionUID = 1L;
-		
-		private AliasIDType mAliasIDType;
-
-		public AddAliasIdentifierItem( AliasIDType type )
-		{
-			super( type.toString() );
-			
-			mAliasIDType = type;
-			
-			addActionListener( new ActionListener()
-			{
-				@Override
-				public void actionPerformed( ActionEvent e )
-				{
-					final AliasID id = AliasFactory.getAliasID( mAliasIDType );
-					
-					addAliasIDToList( id );
-				}
-			} );
-		}
-	}
-}

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

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2016 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;
-
-import org.apache.commons.lang3.Validate;
-
-import java.util.regex.Pattern;
-
-public class WildcardID implements Comparable<WildcardID>
-{
-    public static final String WILDCARD = "*";
-    public static final String REGEX_WILDCARD = ".";
-
-    private String mValue;
-    private Pattern mPattern;
-    private int mWeight;
-
-    /**
-     * Wildcard identifier for matching to string identifiers containing single-character (*) wildcard values.
-     *
-     * Supports ordering from most-specific to least-specific using the build-in weighting calculation where identifier
-     * patterns containing fewer wildcards closer to the least significant digit will be weighted more heavily than
-     * identifier patterns containing more wildcards, or wildcard characters in the most significant digits.
-     *
-     * @param value is a string value containing one or more asterisk (*) single character wildcard with a maximum
-     * length of 10 characters.
-     *
-     * @throws AssertionError if the value is null, longer than 10 characters, or doesn't contain at least 1 asterisk
-     * @throws IllegalArgumentException if the value cannot be compiled as a regular expression after converting the
-     * asterisk characters to the regex single-character wildcard value (.)
-     */
-    public WildcardID(String value)
-    {
-        Validate.isTrue(value != null && value.contains(WILDCARD) && value.length() < 10);
-
-        mValue = value;
-
-        try
-        {
-            mPattern = Pattern.compile(value.replace(WILDCARD, REGEX_WILDCARD));
-        }
-        catch(Exception e)
-        {
-            throw new IllegalArgumentException("Invalid regex pattern for alias ID value [" + value + "]", e);
-        }
-
-        mWeight = calculateWeight();
-    }
-
-    public String value()
-    {
-        return mValue;
-    }
-
-    /**
-     * Indicates if the id matches the internal regex pattern for this wildcard alias ID
-     * @param id
-     * @return
-     */
-    public boolean matches(String id)
-    {
-        return id != null && mPattern.matcher(id).matches();
-    }
-
-    public int weight()
-    {
-        return mWeight;
-    }
-
-    /**
-     * Calculates a weighting value for wildcard character quantity and significant digit location
-     */
-    private int calculateWeight()
-    {
-        int weight = 0;
-        int characterCount = -1;
-
-        for( int x = 0; x < mValue.length(); x++)
-        {
-            if(mValue.substring(x, x + 1).equals(WILDCARD))
-            {
-                weight += (int)(Math.pow(2, mValue.length() - x - 1));         //Position weight
-                characterCount++;
-            }
-        }
-
-        weight += (int)(Math.pow(2, characterCount)) * 1000; //Character count weight
-
-        return weight;
-    }
-
-    @Override
-    public int compareTo(WildcardID otherWildcardID)
-    {
-        return Integer.compare(this.weight(), otherWildcardID.weight());
-    }
-}

src/main/java/io/github/dsheirer/alias/id/broadcast/BroadcastChannel.java

@@ -1,21 +1,24 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2016 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.broadcast;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -31,6 +34,12 @@ public class BroadcastChannel extends AliasID implements Comparable<BroadcastCha
         //JAXB Constructor
     }
 
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return true;
+    }
+
     @Override
     public int compareTo(BroadcastChannel other)
     {
@@ -94,6 +103,7 @@ public class BroadcastChannel extends AliasID implements Comparable<BroadcastCha
     public void setChannelName(String channel)
     {
         mChannelName = channel;
+        updateValueProperty();
     }
 
     @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
@@ -118,13 +128,6 @@ public class BroadcastChannel extends AliasID implements Comparable<BroadcastCha
     @Override
     public String toString()
     {
-        if(isValid())
-        {
-            return "Broadcast Channel: " + mChannelName;
-        }
-        else
-        {
-            return "Broadcast Channel: None Selected";
-        }
+        return isValid() ? mChannelName : "(invalid)";
     }
 }

src/main/java/io/github/dsheirer/alias/id/broadcast/BroadcastChannelEditor.java

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2016 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.broadcast;
-
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.List;
-
-public class BroadcastChannelEditor extends DocumentListenerEditor<AliasID>
-{
-    private static final long serialVersionUID = 1L;
-
-    private static final String HELP_TEXT = "<html>"
-    		+ "<h3>Audio Broadcast Channel</h3>"
-    		+ "Name of a audio streaming broadcast configuration<br>"
-			+ "to be used for streaming audio to an external<br>"
-			+ "streaming server";
-
-	private JComboBox<String> mBroadcastConfigurations;
-	private BroadcastModel mBroadcastModel;
-
-	public BroadcastChannelEditor(AliasID aliasID, BroadcastModel broadcastModel)
-	{
-		mBroadcastModel = broadcastModel;
-
-		initGUI();
-		setItem( aliasID );
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][]" ) );
-
-		add( new JLabel( "Broadcast Channel" ), "grow" );
-
-		List<String> channelNames = mBroadcastModel.getBroadcastConfigurationNames();
-
-		mBroadcastConfigurations = new JComboBox<String>(channelNames.toArray(new String[channelNames.size()]));
-		mBroadcastConfigurations.addActionListener(new ActionListener()
-		{
-			@Override
-			public void actionPerformed(ActionEvent e)
-			{
-				setModified(true);
-			}
-		});
-
-        add(mBroadcastConfigurations, "grow");
-
-		JLabel help = new JLabel( "Help ..." );
-		help.setForeground( Color.BLUE.brighter() );
-		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
-		help.addMouseListener( new MouseAdapter() 
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JOptionPane.showMessageDialog( BroadcastChannelEditor.this,
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-
-		add( help, "align left" );
-	}
-
-	@Override
-	public void setItem(AliasID item)
-	{
-		super.setItem(item);
-
-		if(item instanceof BroadcastChannel)
-		{
-            BroadcastChannel channel = (BroadcastChannel)item;
-
-            if(channel.isValid())
-            {
-                mBroadcastConfigurations.setSelectedItem(channel.getChannelName());
-            }
-		}
-
-		setModified(false);
-	}
-
-	@Override
-	public void save()
-	{
-        String channel = (String)mBroadcastConfigurations.getSelectedItem();
-
-        BroadcastConfiguration selectedConfiguration = mBroadcastModel.getBroadcastConfiguration(channel);
-
-
-		if(selectedConfiguration != null)
-		{
-			((BroadcastChannel)getItem()).setChannelName(selectedConfiguration.getName());
-		}
-		else
-		{
-			((BroadcastChannel)getItem()).setChannelName(null);
-		}
-	}
-
-
-}

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

@@ -0,0 +1,111 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.alias.id.dcs;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.module.decode.dcs.DCSCode;
+
+/**
+ * Digital Coded Squelch (DCS) tone identifier
+ */
+public class Dcs extends AliasID implements Comparable<Dcs>
+{
+    private DCSCode mDCSCode;
+
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.DCS;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        if(isValid() && id instanceof Dcs other)
+        {
+            return other.isValid() && getDCSCode().equals(other.getDCSCode());
+        }
+
+        return false;
+    }
+
+    /**
+     * DCS code
+     * @return DCS code or null.
+     */
+    @JacksonXmlProperty(isAttribute = true, localName = "code")
+    public DCSCode getDCSCode()
+    {
+        return mDCSCode;
+    }
+
+    /**
+     * Sets the DCS code value.
+     * @param dcsCode to set
+     */
+    public void setDCSCode(DCSCode dcsCode)
+    {
+        mDCSCode = dcsCode;
+        updateValueProperty();
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mDCSCode != null;
+    }
+
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return false;
+    }
+
+    @Override
+    public String toString()
+    {
+        if(isValid())
+        {
+            return getDCSCode().toString();
+        }
+
+        return "DCS-Invalid - No Tone Selected";
+    }
+
+    @Override
+    public int compareTo(Dcs o)
+    {
+        if(isValid())
+        {
+            if(o.isValid())
+            {
+                return getDCSCode().compareTo(o.getDCSCode());
+            }
+            else
+            {
+                return 1;
+            }
+        }
+
+        return -1;
+    }
+}

src/main/java/io/github/dsheirer/alias/id/esn/ESNEditor.java

@@ -1,113 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.esn;
-
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class ESNEditor extends DocumentListenerEditor<AliasID>
-{
-    private static final long serialVersionUID = 1L;
-
-    private static final String HELP_TEXT = 
-    		"<html><h3>Electronic Serial Number (ESN)</h3>"
-    		+ "<b>ESN:</b> hexadecimal 0-9, A-F (e.g. <u>ABCD1234</u> )<br>"
-    		+ "<b>Wildcard:</b> use an asterisk (*) to wildcard individual<br>"
-    		+ "digits (e.g. <u>ABCD123*</u> or <u>AB**1**4</u>)"
-    		+ "</html>";
-
-    private JTextField mTextField;
-
-	public ESNEditor( AliasID aliasID )
-	{
-		initGUI();
-		
-		setItem( aliasID );
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][]" ) );
-
-		add( new JLabel( "ESN:" ) );
-		mTextField = new JTextField();
-		mTextField.getDocument().addDocumentListener( this );
-		mTextField.setToolTipText( HELP_TEXT );
-		add( mTextField, "growx,push" );
-
-		JLabel help = new JLabel( "Help ..." );
-		help.setForeground( Color.BLUE.brighter() );
-		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
-		help.addMouseListener( new MouseAdapter() 
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JOptionPane.showMessageDialog( ESNEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	public Esn getEsn()
-	{
-		if( getItem() instanceof Esn )
-		{
-			return (Esn)getItem();
-		}
-		
-		return null;
-	}
-
-	@Override
-	public void setItem( AliasID aliasID )
-	{
-		super.setItem( aliasID );
-		
-		Esn esn = getEsn();
-		
-		if( esn != null )
-		{
-			mTextField.setText( esn.getEsn() );
-		}
-		
-		setModified( false );
-		
-		repaint();
-	}
-
-	@Override
-	public void save()
-	{
-		Esn esn = getEsn();
-		
-		if( esn != null )
-		{
-			esn.setEsn( mTextField.getText() );
-		}
-		
-		setModified( false );
-	}
-}

src/main/java/io/github/dsheirer/alias/id/esn/Esn.java

@@ -29,6 +29,12 @@ public class Esn extends AliasID
 	{
 	}
 
+	@Override
+	public boolean isAudioIdentifier()
+	{
+		return false;
+	}
+
 	@JacksonXmlProperty(isAttribute = true, localName = "esn")
 	public String getEsn()
 	{
@@ -44,11 +50,18 @@ public class Esn extends AliasID
 	public void setEsn(String esn )
 	{
 		mEsn = esn;
+		updateValueProperty();
 	}
 	
 	public String toString()
 	{
-		return "ESN: " + mEsn;
+		StringBuilder sb = new StringBuilder();
+		sb.append("ESN: ").append(mEsn != null ? mEsn : "(empty)");
+		if(!isValid())
+		{
+			sb.append(" **NOT VALID**");
+		}
+		return sb.toString();
 	}
 
 	@Override

src/main/java/io/github/dsheirer/alias/id/fleetsync/FleetsyncIDEditor.java

@@ -1,131 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 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.fleetsync;
-
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.*;
-import javax.swing.text.MaskFormatter;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class FleetsyncIDEditor extends DocumentListenerEditor<AliasID>
-{
-	private final static Logger mLog = LoggerFactory.getLogger( FleetsyncIDEditor.class );
-
-	private static final long serialVersionUID = 1L;
-
-    private static final String HELP_TEXT = "<html>"
-    		+ "<h3>Fleetsync Identifier</h3>"
-    		+ "<b>Fleetsync:</b> ggg-uuuu where g=Group and u=Unit (e.g. <u>001-0001</u>)<br>"
-    		+ "<b>Wildcard:</b> use an asterisk (*) for each digit (e.g. <u>001-****</u>)"
-    		+ "</html>";
-
-    private JTextField mTextField;
-
-	public FleetsyncIDEditor( AliasID aliasID )
-	{
-		initGUI();
-		
-		setItem( aliasID );
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][]" ) );
-
-		add( new JLabel( "Fleetsync ID:" ) );
-
-		MaskFormatter formatter = null;
-
-		try
-		{
-			//Mask: 3 digits - 4 digits
-			formatter = new MaskFormatter( "###-####" );
-		}
-		catch( Exception e )
-		{
-			//Do nothing, the mask was invalid
-		}
-		
-		mTextField = new JFormattedTextField( formatter );
-		mTextField.getDocument().addDocumentListener( this );
-		mTextField.setToolTipText( HELP_TEXT );
-
-		add( mTextField, "growx,push" );
-		
-		JLabel help = new JLabel( "Help ..." );
-		help.setForeground( Color.BLUE.brighter() );
-		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
-		help.addMouseListener( new MouseAdapter() 
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JOptionPane.showMessageDialog( FleetsyncIDEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	public FleetsyncID getFleetsyncID()
-	{
-		if( getItem() instanceof FleetsyncID )
-		{
-			return (FleetsyncID)getItem();
-		}
-		
-		return null;
-	}
-
-	@Override
-	public void setItem( AliasID aliasID )
-	{
-		super.setItem( aliasID );
-		
-		FleetsyncID fleetsync = getFleetsyncID();
-		
-		if( fleetsync != null )
-		{
-			mTextField.setText( fleetsync.getIdent() );
-		}
-		
-		setModified( false );
-		
-		repaint();
-	}
-
-	@Override
-	public void save()
-	{
-		FleetsyncID fleetsync = getFleetsyncID();
-		
-		if( fleetsync != null )
-		{
-			fleetsync.setIdent( mTextField.getText() );
-		}
-		
-		setModified( false );
-	}
-}

src/main/java/io/github/dsheirer/alias/id/legacy/fleetsync/FleetsyncID.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package io.github.dsheirer.alias.id.fleetsync;
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 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.legacy.fleetsync;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
@@ -29,6 +31,12 @@ public class FleetsyncID extends AliasID
 	{
 	}
 
+	@Override
+	public boolean isAudioIdentifier()
+	{
+		return false;
+	}
+
 	@JacksonXmlProperty(isAttribute = true, localName = "ident")
 	public String getIdent()
 	{
@@ -48,7 +56,7 @@ public class FleetsyncID extends AliasID
 
 	public String toString()
 	{
-		return "Fleetsync: " + mID;
+		return "Fleetsync: " + (mID != null ? mID : "(empty)") + " **INVALID - USE TALKGROUP INSTEAD";
 	}
 
 	@Override

src/main/java/io/github/dsheirer/alias/id/legacy/mdc/MDC1200ID.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 Dennis Sheirer
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package io.github.dsheirer.alias.id.mdc;
+ * 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.legacy.mdc;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -30,6 +32,12 @@ public class MDC1200ID extends AliasID
     {
     }
 
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return false;
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "ident")
     public String getIdent()
     {
@@ -49,7 +57,7 @@ public class MDC1200ID extends AliasID
 
     public String toString()
     {
-        return "MDC-1200: " + mID;
+        return "MDC-1200: " + (mID != null ? mID : "(empty)") + " **INVALID - USE TALKGROUP INSTEAD**";
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/mobileID/Min.java

@@ -15,7 +15,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
-package io.github.dsheirer.alias.id.mobileID;
+package io.github.dsheirer.alias.id.legacy.mobileID;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -33,6 +33,12 @@ public class Min extends AliasID
     {
     }
 
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return false;
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "min")
     public String getMin()
     {
@@ -52,7 +58,7 @@ public class Min extends AliasID
 
     public String toString()
     {
-        return "MIN: " + mMin;
+        return "MIN: " + (mMin != null ? mMin : "(empty)") + (isValid() ? "" : " **INVALID - USE TALKGROUP INSTEAD");
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/mpt1327/MPT1327ID.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 Dennis Sheirer
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package io.github.dsheirer.alias.id.mpt1327;
+ * 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.legacy.mpt1327;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -30,6 +32,12 @@ public class MPT1327ID extends AliasID
     {
     }
 
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return false;
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "ident")
     public String getIdent()
     {
@@ -49,7 +57,7 @@ public class MPT1327ID extends AliasID
 
     public String toString()
     {
-        return "MPT-1327: " + mID;
+        return "MPT-1327: " + (mID != null ? mID : "(empty)") + " **INVALID - USE TALKGROUP INSTEAD**";
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/nonrecordable/NonRecordable.java

@@ -0,0 +1,59 @@
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 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.legacy.nonrecordable;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+
+public class NonRecordable extends AliasID
+{
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.NON_RECORDABLE;
+    }
+
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        return false;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Audio Non-Recordable - **INVALID - USE RECORD INSTEAD**";
+    }
+}

src/main/java/io/github/dsheirer/alias/id/legacy/siteID/SiteID.java

@@ -15,7 +15,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
-package io.github.dsheirer.alias.id.siteID;
+package io.github.dsheirer.alias.id.legacy.siteID;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
@@ -29,6 +29,12 @@ public class SiteID extends AliasID
     {
     }
 
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return false;
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "site")
     public String getSite()
     {
@@ -48,7 +54,7 @@ public class SiteID extends AliasID
 
     public String toString()
     {
-        return "Site: " + mSite;
+        return "Site: " + (mSite != null ? mSite : "(empty)") + (isValid() ? "" : " **NOT VALID**");
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/talkgroup/LegacyTalkgroupID.java

@@ -0,0 +1,97 @@
+/*
+ * ******************************************************************************
+ * sdrtrunk
+ * Copyright (C) 2014-2018 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.legacy.talkgroup;
+
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+
+public class LegacyTalkgroupID extends AliasID
+{
+    private String mTalkgroup;
+
+    public LegacyTalkgroupID()
+    {
+        //No arg JAXB constructor
+    }
+
+    public LegacyTalkgroupID(String talkgroup)
+    {
+        mTalkgroup = talkgroup;
+    }
+
+    @Override
+    public boolean isAudioIdentifier()
+    {
+        return false;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "talkgroup")
+    public String getTalkgroup()
+    {
+        return mTalkgroup;
+    }
+
+    public void setTalkgroup(String talkgroup)
+    {
+        mTalkgroup = talkgroup;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mTalkgroup != null;
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Legacy Talkgroup:").append(mTalkgroup).append(" *Disabled - Please use Talkgroup instead");
+
+        return sb.toString();
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(id instanceof LegacyTalkgroupID)
+        {
+            LegacyTalkgroupID tgid = (LegacyTalkgroupID)id;
+
+            //Create a pattern - replace * wildcards with regex single-char wildcard
+            String pattern = mTalkgroup.replace("*", ".?");
+
+            retVal = tgid.getTalkgroup().matches(pattern);
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.LEGACY_TALKGROUP;
+    }
+}