#1405 resolves issue with polyphase channel thread not shutting down correctly. Resolves issue with building distro releases using non-local JDKs. (#1477 )

Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>
#1471 Adds support for Hytera Proprietary Long Data Service SMS messages. Resolves issue parsing Multi-Block CSBKs. (#1472 )
2026-11-12 08:37:25 -05:00 · 2023-03-05 05:55:01 -05:00 · 2023-02-26 10:23:00 -05:00 · 2023-02-20 12:10:17 -05:00 · 2023-02-20 12:04:48 -05:00 · 2023-02-20 04:55:50 -05:00
3249 changed files with 320959 additions and 135801 deletions
--- a/.classpath
+++ b/.classpath
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="imports/commons-lang3-3.2.1.jar"/>
-	<classpathentry kind="lib" path="imports/jide-oss-3.5.15.jar"/>
-	<classpathentry kind="lib" path="imports/jsr80-1.0.1.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-arm.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-x86_64.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-x86.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-osx-x86_64.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-osx-x86.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-windows-x86_64.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-windows-x86.jar"/>
-	<classpathentry kind="lib" path="imports/miglayout-4.0-swing.jar"/>
-	<classpathentry kind="lib" path="imports/usb-api-1.0.2.jar"/>
-	<classpathentry kind="lib" path="imports/usb4java-1.2.0.jar"/>
-	<classpathentry kind="lib" path="imports/usb4java-javax-1.2.0.jar"/>
-	<classpathentry kind="lib" path="config"/>
-	<classpathentry kind="lib" path="imports/JTransforms-3.0.jar" sourcepath="/home/denny/.m2/repository/com/github/wendykierp/JTransforms/3.0/JTransforms-3.0-sources.jar"/>
-	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-ppc.jar"/>
-	<classpathentry kind="lib" path="imports/JLargeArrays-1.2.jar"/>
-	<classpathentry kind="lib" path="imports/slf4j-api-1.7.7.jar"/>
-	<classpathentry kind="lib" path="imports/logback-classic-1.1.2.jar"/>
-	<classpathentry kind="lib" path="imports/logback-core-1.1.2.jar"/>
-	<classpathentry kind="lib" path="imports/commons-io-2.4.jar"/>
-	<classpathentry kind="lib" path="imports/jmbe-interface-0.3.2.jar"/>
-	<classpathentry kind="lib" path="imports/tablefilter-swing-5.2.1.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/home/denny/Downloads/tablefilter-swing-5.2.1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/.directory
+++ b/.directory
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,9,8,20,39,49
-Version=3
-ViewMode=1
--- a/.github/workflows/gradle.yml
+++ b/.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@v2
+      - name: Set up JDK 19
+        uses: actions/setup-java@v2
+        with:
+          java-version: '19'
+          distribution: 'liberica'
+          java-package: 'jdk+fx'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+        with:
+          arguments: clean build
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,35 @@
-*.class
+### JetBrains template
+.idea/
 /classes*
 /product*
-/bin*
+out/
 .directory
-.settings
+.settings
+
+## File-based project format:
+*.iws
+*.iml
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+### Java template
+*.class
+*.log
+# Package Files #
+#*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+### Gradle template
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value />
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
-  </component>
-</project>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="sdrtrunk">
-    <LanguageOptions name="__TEMPLATE__">
-      <option name="addBlankAfter" value="false" />
-      <option name="separateBefore" value="true" />
-      <option name="separateAfter" value="true" />
-    </LanguageOptions>
-  </settings>
-</component>
--- a/.idea/copyright/sdrtrunk.xml
+++ b/.idea/copyright/sdrtrunk.xml
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="myName" value="sdrtrunk" />
-    <option name="notice" value="sdrtrunk &#10;Copyright (C) 2014-&amp;#36;today.year Dennis Sheirer&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10; &#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;&#10;" />
-  </copyright>
-</component>
--- a/.idea/dictionaries/denny.xml
+++ b/.idea/dictionaries/denny.xml
@@ -2,20 +2,31 @@
  <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>
+      <w>heterdyned</w>
+      <w>heterodynes</w>
      <w>icecast</w>
      <w>ident</w>
+      <w>nutall</w>
      <w>overflowable</w>
      <w>polyphase</w>
+      <w>qpsk</w>
      <w>remez</w>
+      <w>resampler</w>
      <w>samplerate</w>
      <w>sdrtrunk</w>
      <w>sheirer</w>
      <w>shoutcast</w>
      <w>streamable</w>
      <w>talkgroup</w>
+      <w>talkgroups</w>
      <w>tgid</w>
      <w>ultravox</w>
      <w>wacn</w>
--- a/.idea/libraries/imports.xml
+++ b/.idea/libraries/imports.xml
@@ -1,35 +0,0 @@
-<component name="libraryTable">
-  <library name="imports">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/imports/logback-classic-1.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/usb-api-1.0.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/commons-io-2.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/commons-lang3-3.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/tablefilter-swing-5.2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-x86.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/JLargeArrays-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-ppc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-windows-x86.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-osx-x86.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/miglayout-4.0-swing.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-windows-x86_64.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/usb4java-1.2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/jide-oss-3.5.15.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-x86_64.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/logback-core-1.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/usb4java-javax-1.2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/jsr80-1.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-arm.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-osx-x86_64.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/JTransforms-3.0.jar!/" />
-      <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/commons-codec-1.9.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/commons-logging-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/slf4j-api-1.7.21.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-aarch64.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/.idea/libraries/org_asynchttpclient_async_http_client_2_0_18.xml
+++ b/.idea/libraries/org_asynchttpclient_async_http_client_2_0_18.xml
@@ -1,20 +0,0 @@
-<component name="libraryTable">
-  <library name="org.asynchttpclient:async-http-client:2.0.18" type="repository">
-    <properties maven-id="org.asynchttpclient:async-http-client:2.0.18" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/imports/slf4j-api-1.7.21.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/javassist-3.20.0-GA.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/axis.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/jaxrpc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/commons-discovery-0.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/activation-1.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/java-mail-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/wsdl4j-1.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/radioreference-14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/mina-core-2.0.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/imports/mina-http-2.0.16.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,44 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ClientPropertiesManager">
-    <properties class="javax.swing.AbstractButton">
-      <property name="hideActionText" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JComponent">
-      <property name="html.disable" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JEditorPane">
-      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
-      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
-      <property name="charset" class="java.lang.String" />
-    </properties>
-    <properties class="javax.swing.JList">
-      <property name="List.isFileList" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JPasswordField">
-      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JSlider">
-      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
-      <property name="JSlider.isFilled" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JTable">
-      <property name="Table.isFileList" class="java.lang.Boolean" />
-      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
-      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JToolBar">
-      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JTree">
-      <property name="JTree.lineStyle" class="java.lang.String" />
-    </properties>
-    <properties class="javax.swing.text.JTextComponent">
-      <property name="caretAspectRatio" class="java.lang.Double" />
-      <property name="caretWidth" class="java.lang.Integer" />
-    </properties>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19_PREVIEW" project-jdk-name="liberica-19.0.1.fx" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/sdrtrunk.iml" filepath="$PROJECT_DIR$/sdrtrunk.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
--- a/.project
+++ b/.project
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sdrtrunk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
--- a/38
+++ b/38
@@ -1,5 +1,39 @@
+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.0-beta1 20170129
+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
+   auto-start.  Provides user with more control over startup configuration.
+ - Adds preferred tuner attribute to channel configuration allowing user to select a preferred tuner for the channel
+
+0.3.3 20171225
+ - Changes build system from ant to gradle.  Thanks to: Roman Tsypuk https://github.com/tsypuk
+ - Adds LIST and ID3 metadata to wav audio recordings
+
+0.3.2 20171105
+ - Resolves issue with tuner frequency adjustments that was causing channel processing
+   to lockup and show persistent 'overflow' state in each channel status
+ - Resolves issue with broadcastify 'mountpoint-in-use' error handling and updates
+   memory usage logging
+ - Resolves issue with Shoutcast 2 login error
+
+0.3.1 20171009
+ - Resolves Java 9 incompatibility issues
+
+0.3.0 20170922
 - REQUIRES: Java 8 (or newer) for compatibility and eventual changeover to JavaFX
 - FEATURE: audio streaming - adds capability to stream to multiple remote broadcast
   servers (Broadcastify, Icecast v2.3 and v2.4+, and Shoutcast V1 and V2).  Each
@@ -34,7 +68,7 @@
 - Updated Baseband (I/Q) recording at 48 kHz
 - Added Airspy tuner support
 - New traffic channel pool manager for trunked call following
- - P25 Decoder for C4FM and LSM with trunked call following and audio 
+ - P25 Decoder for C4FM and LSM with trunked call following and audio
   decoding via the JMBE library
 - Updated MPT1327 decoder and trunked call following.
 - Updated spectral and waterfall display with zoom (2-64x) and pan and automatic
--- a/README.md
+++ b/README.md
@@ -1,10 +1,24 @@
+![Gradle Build](https://github.com/dsheirer/sdrtrunk/actions/workflows/gradle.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)
-* [User's Manual Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual_Version0.3.0)
+* [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/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
+
+## Download the Latest Release
+All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
+
+* **(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.
+
+## 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.
--- a/artifacts/sdrplay-api-headers/README.txt
+++ b/artifacts/sdrplay-api-headers/README.txt
@@ -0,0 +1,36 @@
+Auto-generating Java code from SDRPlay API using jextract.
+
+Note: the api headers in the 3.11 folder are equivalent to the 3.08 headers.  The only
+difference from the 3.07 headers is the addition of the boolean 'valid' flag to DeviceT structure.
+
+1. Download JDK19 compatible build of jextract JDK: https://jdk.java.net/jextract/
+2. If generating on windows platform, modify the sdrplay_api.h to remove the windows
+   pieces of the file.  Specifically:
+2a. Comment out these lines but leave the *HANDLE typedef:
+
+//#if defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64)
+//#include "windows.h"
+//#elif defined (__GNUC__)
+typedef void *HANDLE;
+//#endif
+
+//#ifndef _SDRPLAY_DLL_QUALIFIER
+//#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64))
+//#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
+//#elif defined(STATIC_LIB) || defined(__GNUC__)
+//#define _SDRPLAY_DLL_QUALIFIER
+//#endif
+//#endif  // _SDRPLAY_DLL_QUALIFIER
+
+2b. Remove the '_SDRPLAY_DLL_QUALIFIER' from in front of the method declarations
+
+2c. Change the 3.11 version string to 3.08 either in the header file, or in the generated java class
+
+3. Open command prompt to the root source code where the generated files should be placed:
+..\SDRtrunk\sdrplay-api\src\main\java
+
+4. Generate the code:
+c:\Users\Denny\Downloads\jdk-19-ea2-panama\bin\jextract "C:\Users\Denny\git\sdrtrunk\sdrplay-api\api\v3_11\sdrplay_api.h" -l libsdrplay_api --source
+
+5. Do this for all versions of the API.
+
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_callback.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_control.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_dev.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rsp1a.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rsp2.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rspDuo.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rspDx.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_rx_channel.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_07/sdrplay_api_tuner.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_callback.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_control.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_dev.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rsp1a.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rsp2.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rspDuo.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rspDx.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_rx_channel.h
+++ b/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
--- a/artifacts/sdrplay-api-headers/v3_11/sdrplay_api_tuner.h
+++ b/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
--- a/build.gradle
+++ b/build.gradle
@@ -0,0 +1,354 @@
+import java.text.SimpleDateFormat
+
+/*
+ * *****************************************************************************
+ * 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 {
+    mavenCentral()
+    maven { url "https://jitpack.io" }
+}
+
+version = '0.6.0-alpha4'
+
+//Java 19 is required for this version of the Project Panama preview/incubator feature
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(19)
+    }
+}
+
+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
+        downloadSources = true
+    }
+}
+
+/**
+ * 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
+
+/**
+ * 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-19.0.1-full'
+String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-19.0.1-full'
+String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-19.0.1-full.jdk'
+String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-19.0.1-full.jdk'
+String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-19.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/19.0.1+11/bellsoft-jdk19.0.1+11-"
+def jdk_download_suffix = "-full.tar.gz"
+def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix
+def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix
+def jdk_download_osx_x86_64 = jdk_download_base + "macos-aarch64" + jdk_download_suffix
+def jdk_download_osx_aarch64 = jdk_download_base + "macos-amd64" + jdk_download_suffix
+def jdk_download_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
+    rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility')
+
+    //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"))
+}
+
+/**
+ * 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()
+
+    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)
+    }
+}
+
+
+/**
+ * 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)
+        }
+    }
+    //Linux 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);
+}
+
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,142 +0,0 @@
-<project name="SDRTrunk" default="SDRTrunk" basedir=".">
-    <description>
-        Ant build script for SDRTrunk Decoder Application
-    </description>
-
-    <!-- version properties -->
-    <property name="major" value="0"/>
-    <property name="minor" value="3"/>
-    <property name="patch" value="1"/>
-    <property name="release" value="final"/>
-    <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
-
-    <!-- Build properties -->
-    <property name="repo" location=".."/>
-    <property name="source.code" location="${repo}/src"/>
-    <property name="source.configs" location="${repo}/config"/>
-    <property name="source.images" location="${repo}/images"/>
-    <property name="source.libs" location="${repo}/imports"/>
-    <property name="source.scripts" location="${repo}/scripts"/>
-
-    <property name="output" location="${repo}/product"/>
-    <property name="output.classes" location="${repo}/classes"/>
-    <property name="output.folder" location="${output}/sdrtrunk"/>
-    <property name="output.config" location="${output.folder}/config"/>
-    <property name="output.images" location="${output.folder}/images"/>
-    <property name="output.libs" location="${output.folder}/libs"/>
-
-    <path id="classpath">
-        <fileset dir="${source.libs}" includes="*.jar"/>
-    </path>
-
-    <target name="init">
-        <!-- Create the classes folder to contain the compiled java classes -->
-        <mkdir dir="${output.classes}"/>
-
-        <!-- Create version file -->
-        <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/>
-    </target>
-
-    <target name="compile" depends="clean,init,compile-java-8,compile-java-9"
-            description="Compile java classes" />
-
-    <target name="compile-java-8" depends="check-java-version" if="java.8" description="Compiles code with Java 8 arguments">
-        <echo message="Compiling with Java 8 Options"/>
-        <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false"/>
-    </target>
-
-    <target name="compile-java-9" depends="check-java-version" if="java.9" description="Compiles code with Java 9 arguments">
-        <echo message="Compiling with Java 9 Options"/>
-        <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false">
-            <compilerarg value="--add-modules"/>
-            <compilerarg value="java.xml.bind"/>
-        </javac>
-    </target>
-
-    <target name="check-java-version" description="Determines if the compiler is Java 8 or 9">
-        <condition property="java.8" value="true">
-            <contains string="${java.version}" substring="1.8"/>
-        </condition>
-        <condition property="java.9" value="true">
-            <equals arg1="${java.version}" arg2="9"/>
-        </condition>
-        <echo message="Java Version: ${java.version}"/>
-    </target>
-
-    <target name="SDRTrunk" depends="compile" description="Create SDRTrunk application">
-        <!-- Create the distribution directory -->
-        <mkdir dir="${output.folder}"/>
-
-        <!-- Create jar file -->
-        <jar jarfile="${output.folder}/sdrtrunk.jar" basedir="${output.classes}">
-            <manifest>
-                <attribute name="Title" value="sdrtrunk"/>
-                <attribute name="Main-Class" value="gui.SDRTrunk"/>
-                <attribute name="Version" value="${major}.${minor}.${patch}-${release}"/>
-            </manifest>
-            <fileset dir="${source.configs}">
-                <exclude name="*.rules"/>
-            </fileset>
-
-            <fileset dir="${repo}">
-                <include name="LICENSE"/>
-            </fileset>
-        </jar>
-
-        <!-- Copy third-party libraries -->
-        <mkdir dir="${output.libs}"/>
-        <copy todir="${output.libs}">
-            <fileset dir="${source.libs}" includes="*.jar"/>
-        </copy>
-
-        <!-- Copy config files -->
-        <mkdir dir="${output.config}"/>
-
-        <copy todir="${output.config}">
-            <fileset dir="${source.configs}">
-                <include name="*.rules"/>
-            </fileset>
-        </copy>
-
-        <!-- Copy image files -->
-        <mkdir dir="${output.images}"/>
-        <copy todir="${output.images}">
-            <fileset dir="${source.images}"/>
-        </copy>
-
-        <!-- Copy license file -->
-        <copy todir="${output.folder}">
-            <fileset dir="${repo}">
-                <include name="LICENSE"/>
-            </fileset>
-        </copy>
-
-        <!-- Copy program scripts -->
-        <copy todir="${output.folder}">
-            <fileset dir="${source.scripts}"/>
-        </copy>
-
-
-        <!-- Bundle the files into .zip -->
-        <zip destfile="${output}/${filename}.zip" basedir="${output}"/>
-
-        <!-- Remove linux start script before tar task -->
-        <delete file="${output.folder}/run_sdrtrunk_linux.sh"/>
-
-        <!-- Bundle files into .tar.gz and copy/set permissions on linux start script -->
-        <tar destfile="${output}/${filename}.tar.gz" compression="gzip">
-            <tarfileset dir="${output.folder}" prefix="sdrtrunk"/>
-            <tarfileset dir="${source.scripts}" prefix="sdrtrunk" filemode="777">
-                <include name="run_sdrtrunk_linux.sh"/>
-            </tarfileset>
-        </tar>
-
-        <delete dir="${output.folder}"/>
-    </target>
-
-    <target name="clean" description="Clean previous build artifacts">
-        <delete dir="${output.classes}"/>
-        <delete dir="${output}"/>
-    </target>
-
-</project>
--- a/config/logback.xml
+++ b/config/logback.xml
@@ -1,33 +0,0 @@
-<configuration>
-  <timestamp key="appstart" datePattern="HHmmss"/>
-
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${user.home}/SDRTrunk/logs/sdrtrunk_app.log</file>
-	<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-	  <!-- daily log rollover -->
-	  <fileNamePattern>${user.home}/SDRTrunk/logs/%d{yyyyMMdd}_sdrtrunk_app.log</fileNamePattern>	
-      <maxHistory>10</maxHistory>
-	</rollingPolicy>
-    <encoder>
-      <pattern>%-25(%d{yyyyMMdd HHmmss.SSS} [%thread]) %-5level %logger{30} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="DEBUG">
-    <appender-ref ref="FILE" />
-  </root>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%-12(%d{HH:mm:ss.SSS}) %-5level %logger{25} - %msg%n</pattern>
-    </encoder>
-  </appender>
-          
-  <root level="DEBUG">
-    <appender-ref ref="STDOUT" />
-  </root>
-
-  <!-- Apache Mina TCP/HTTP library -->
-  <logger name="org.apache.mina" level="INFO" />
-
-</configuration>
--- a/copyright.template
+++ b/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/>
+*****************************************************************************
--- a/copyright_header.txt
+++ b/copyright_header.txt
@@ -1,17 +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/>
- ******************************************************************************/
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,25 @@
+#
+# ******************************************************************************
+# 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/>
+# *****************************************************************************
+#
+
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/247
+++ b/247
@@ -0,0 +1,247 @@
+#!/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 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
+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='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+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  ;; #(
+  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
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+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
+
+# 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.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # 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" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@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
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+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="-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% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/images/.directory
+++ b/images/.directory
@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2013,9,20,8,54,21
-Version=3
--- a/imports/.directory
+++ b/imports/.directory
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2013,4,7,10,12,39
-Version=3
-ViewMode=1
--- a/imports/JLargeArrays-1.2.jar
+++ b/imports/JLargeArrays-1.2.jar
--- a/imports/JTransforms-3.0.jar
+++ b/imports/JTransforms-3.0.jar
--- a/imports/activation-1.1.jar
+++ b/imports/activation-1.1.jar
--- a/imports/axis.jar
+++ b/imports/axis.jar
--- a/imports/commons-codec-1.9.jar
+++ b/imports/commons-codec-1.9.jar
--- a/imports/commons-discovery-0.2.jar
+++ b/imports/commons-discovery-0.2.jar
--- a/imports/commons-io-2.4.jar
+++ b/imports/commons-io-2.4.jar
--- a/imports/commons-lang3-3.2.1.jar
+++ b/imports/commons-lang3-3.2.1.jar
--- a/imports/commons-logging-1.2.jar
+++ b/imports/commons-logging-1.2.jar
--- a/imports/java-lame-3.98.4.jar
+++ b/imports/java-lame-3.98.4.jar
--- a/imports/java-mail-1.4.jar
+++ b/imports/java-mail-1.4.jar
--- a/imports/javassist-3.20.0-GA.jar
+++ b/imports/javassist-3.20.0-GA.jar
--- a/imports/jaxrpc.jar
+++ b/imports/jaxrpc.jar
--- a/imports/jide-oss-3.5.15.jar
+++ b/imports/jide-oss-3.5.15.jar
--- a/imports/jmbe-interface-0.3.3.jar
+++ b/imports/jmbe-interface-0.3.3.jar
--- a/imports/jsr80-1.0.1.jar
+++ b/imports/jsr80-1.0.1.jar
--- a/imports/libusb4java-1.2.0-linux-aarch64.jar
+++ b/imports/libusb4java-1.2.0-linux-aarch64.jar
--- a/imports/libusb4java-1.2.0-linux-arm.jar
+++ b/imports/libusb4java-1.2.0-linux-arm.jar
--- a/imports/libusb4java-1.2.0-linux-ppc.jar
+++ b/imports/libusb4java-1.2.0-linux-ppc.jar
--- a/imports/libusb4java-1.2.0-linux-x86.jar
+++ b/imports/libusb4java-1.2.0-linux-x86.jar
--- a/imports/libusb4java-1.2.0-linux-x86_64.jar
+++ b/imports/libusb4java-1.2.0-linux-x86_64.jar
--- a/imports/libusb4java-1.2.0-osx-x86.jar
+++ b/imports/libusb4java-1.2.0-osx-x86.jar
--- a/imports/libusb4java-1.2.0-osx-x86_64.jar
+++ b/imports/libusb4java-1.2.0-osx-x86_64.jar
--- a/imports/libusb4java-1.2.0-windows-x86.jar
+++ b/imports/libusb4java-1.2.0-windows-x86.jar
--- a/imports/libusb4java-1.2.0-windows-x86_64.jar
+++ b/imports/libusb4java-1.2.0-windows-x86_64.jar
--- a/imports/logback-classic-1.1.2.jar
+++ b/imports/logback-classic-1.1.2.jar
--- a/imports/logback-core-1.1.2.jar
+++ b/imports/logback-core-1.1.2.jar
--- a/imports/miglayout-4.0-swing.jar
+++ b/imports/miglayout-4.0-swing.jar
--- a/imports/mina-core-2.0.16.jar
+++ b/imports/mina-core-2.0.16.jar
--- a/imports/mina-http-2.0.16.jar
+++ b/imports/mina-http-2.0.16.jar
--- a/imports/radioreference-14.jar
+++ b/imports/radioreference-14.jar
--- a/imports/slf4j-api-1.7.21.jar
+++ b/imports/slf4j-api-1.7.21.jar
--- a/imports/tablefilter-swing-5.2.1.jar
+++ b/imports/tablefilter-swing-5.2.1.jar
--- a/imports/usb-api-1.0.2.jar
+++ b/imports/usb-api-1.0.2.jar
--- a/imports/usb4java-1.2.0.jar
+++ b/imports/usb4java-1.2.0.jar
--- a/imports/usb4java-javax-1.2.0.jar
+++ b/imports/usb4java-javax-1.2.0.jar
--- a/imports/wsdl4j-1.5.1.jar
+++ b/imports/wsdl4j-1.5.1.jar
--- a/scripts/run_sdrtrunk_linux.sh
+++ b/scripts/run_sdrtrunk_linux.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-java -version
-
-# Test for java version 9
-JAVA_9=$(java -version 2>&1 | grep -i version | sed 's/.* "\([9]\).*/\1/')
-
-if [ -z ${JAVA_9+x} ]; then
-  echo Using Java 9 program options
-  # Java 9 uses the G1 garbage collector by default and requires that we specify the
-  # java.xml.bind package since it's been removed from the java se core library
-  java -cp "*:libs/*" --add-modules java.xml.bind gui.SDRTrunk;
-else
-  echo Using Java 8 program options
-  java -XX:+UseG1GC -cp "*:libs/*" gui.SDRTrunk;
-fi
--- a/scripts/run_sdrtrunk_windows.bat
+++ b/scripts/run_sdrtrunk_windows.bat
@@ -1,25 +0,0 @@
-@echo off
-
-java -version
-
-SETLOCAL ENABLEDELAYEDEXPANSION
-
-for /f "usebackq tokens=3" %%a in (`java -version 2^>^&1 ^| find "version"`) do ( 
-	rem set b to the unquoted version string parsed from the java version command
-	set b=%%~a
-
-	rem set c to the first character of the unquoted version string
-	set c=!b:~0,1!
-
-	if !c! equ 9 (
-		echo Using Java 9 options		
-		java -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" --add-modules java.xml.bind gui.SDRTrunk
-	) else (
-		echo Using Java 8 options		
-		java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk
-	)
-)
-
-ENDLOCAL
-
-@echo on
--- a/sdr-trunk.ipr
+++ b/sdr-trunk.ipr
--- a/sdrtrunk.iml
+++ b/sdrtrunk.iml
@@ -1,25 +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" />
-      <sourceFolder url="file://$MODULE_DIR$" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="imports" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../jmbe/jmbe/library/jmbe-0.3.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="org.asynchttpclient:async-http-client:2.0.18" level="project" />
-  </component>
-</module>
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'sdr-trunk'
--- a/src/.directory
+++ b/src/.directory
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,9,1,6,42,59
-Version=3
-ViewMode=1
--- a/src/alias/Alias.java
+++ b/src/alias/Alias.java
@@ -1,354 +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 alias;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-
-import alias.action.AliasAction;
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-import alias.id.broadcast.BroadcastChannel;
-import alias.id.nonrecordable.NonRecordable;
-import alias.id.priority.Priority;
-
-@XmlSeeAlso( { AliasID.class, AliasAction.class } )
-@XmlRootElement( name = "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>();
-	
-	public Alias()
-	{
-	}
-
-	public Alias( String name )
-	{
-		mName = name;
-	}
-	
-	public String toString()
-	{
-		return getName();
-	}
-
-	@XmlAttribute( name="name" )
-	public String getName()
-	{
-		return mName;
-	}
-	
-	public void setName( String name )
-	{
-		mName = name;
-	}
-
-	@XmlAttribute( name="list" )
-	public String getList()
-	{
-		return mList;
-	}
-	
-	public void setList( String list )
-	{
-		mList = list;
-	}
-	
-	public boolean hasList()
-	{
-		return mList != null;
-	}
-
-	@XmlAttribute( name="group" )
-	public String getGroup()
-	{
-		return mGroup;
-	}
-	
-	public void setGroup( String group )
-	{
-		mGroup = group;
-	}
-	
-	public boolean hasGroup()
-	{
-		return mGroup != null;
-	}
-
-	@XmlAttribute
-	public int getColor()
-	{
-		return mColor;
-	}
-
-	public void setColor( int color )
-	{
-		mColor = color;
-	}
-
-	public Color getDisplayColor()
-	{
-		return new Color( getColor() );
-	}
-	
-	@XmlAttribute
-	public String getIconName()
-	{
-		return mIconName;
-	}
-	
-	public void setIconName( String iconName )
-	{
-		mIconName = iconName;
-	}
-	
-	@XmlElement( name="id" )
-	public List<AliasID> getId()
-	{
-		return mAliasIDs;
-	}
-	
-	public void setId( ArrayList<AliasID> id )
-	{
-		mAliasIDs = id;
-	}
-	
-	public void addAliasID( AliasID id )
-	{
-		mAliasIDs.add( id );
-	}
-	
-	public void removeAliasID( AliasID id )
-	{
-		mAliasIDs.remove( id );
-	}
-	
-	@XmlElement( name="action" )
-	public List<AliasAction> getAction()
-	{
-		return mAliasActions;
-	}
-	
-	public void setAction( List<AliasAction> actions )
-	{
-		mAliasActions = actions;
-	}
-	
-	public void addAliasAction( AliasAction action )
-	{
-		mAliasActions.add( action );
-	}
-	
-	public void removeAliasAction( AliasAction action )
-	{
-		mAliasActions.remove( action );
-	}
-	
-	public boolean hasActions()
-	{
-		return !mAliasActions.isEmpty();
-	}
-
-	/**
-	 * Perform any validation/cleanup actions on this alias.
-	 */
-	public void validate()
-	{
-	}
-	/**
-	 * Returns the priority level of this alias, if defined, or the default priority
-	 */
-	@XmlTransient
-	public int getCallPriority()
-	{
-		for( AliasID id: mAliasIDs )
-		{
-			if( id.getType() == AliasIDType.PRIORITY)
-			{
-				return ((Priority)id).getPriority();
-			}
-		}
-		
-		return Priority.DEFAULT_PRIORITY;
-	}
-	
-	public boolean hasCallPriority()
-	{
-		for( AliasID id: mAliasIDs )
-		{
-			if( id.getType() == AliasIDType.PRIORITY)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sets or updates the call priority
-	 */
-	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;
-				}
-			}
-			
-			//If we don't find a priority id, create one
-			Priority p = new Priority();
-			p.setPriority( priority );
-			addAliasID( p );
-		}
-	}
-
-	/**
-	 * Inspects the alias for a non-recordable alias id.  Default is true;
-	 */
-	@XmlTransient
-	public boolean isRecordable()
-	{
-		for( AliasID id: getId() )
-		{
-			if( id.getType() == AliasIDType.NON_RECORDABLE)
-			{
-				return false;
-			}
-		}
-		
-		return true;
-	}
-
-	/**
-	 * Sets or removes the non-recordable alias ID for this alias.
-	 */
-	public void setRecordable( boolean recordable )
-	{
-		if( recordable )
-		{
-			AliasID toRemove = null;
-			
-			for( AliasID id: getId() )
-			{
-				if( id.getType() == AliasIDType.NON_RECORDABLE)
-				{
-					toRemove = id;
-					break;
-				}
-			}
-			
-			if( toRemove != null )
-			{
-				removeAliasID( toRemove );
-			}
-		}
-		else
-		{
-			for( AliasID id: getId() )
-			{
-				if( id.getType() == AliasIDType.NON_RECORDABLE)
-				{
-					return;
-				}
-			}
-			
-			addAliasID( new NonRecordable() );
-		}
-	}
-
-    /**
-     * Inspects the alias for broadcast channel/streamable alias ids.  Default is false;
-     */
-    @XmlTransient
-    public boolean isStreamable()
-    {
-        for( AliasID id: getId() )
-        {
-            if( id.getType() == AliasIDType.BROADCAST_CHANNEL)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-	 * List of broadcast channels specified for this alias.
-	 */
-    @XmlTransient
-	public Set<BroadcastChannel> getBroadcastChannels()
-	{
-		Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
-
-		for(AliasID id: getId())
-		{
-			if(id.getType() == AliasIDType.BROADCAST_CHANNEL)
-			{
-				broadcastChannels.add((BroadcastChannel)id);
-			}
-		}
-
-		return broadcastChannels;
-	}
-
-	/**
-	 * Indicates if this alias contains a broadcast channel alias id with the channel name.
-	 */
-	public boolean hasBroadcastChannel(String channel)
-	{
-		if(channel == null || channel.isEmpty())
-		{
-			return false;
-		}
-
-		for(AliasID id: getId())
-		{
-			if(id.getType() == AliasIDType.BROADCAST_CHANNEL &&
-			   ((BroadcastChannel)id).getChannelName().contentEquals(channel))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
--- a/src/alias/AliasController.java
+++ b/src/alias/AliasController.java
@@ -1,356 +0,0 @@
-package alias;
-
-import audio.broadcast.BroadcastModel;
-import com.jidesoft.swing.JideSplitPane;
-import gui.editor.Editor;
-import 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;
-        }
-    }
-}
--- a/src/alias/AliasEditor.java
+++ b/src/alias/AliasEditor.java
@@ -1,164 +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 alias;
-
-import audio.broadcast.BroadcastModel;
-import gui.editor.Editor;
-
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JSeparator;
-
-import icon.IconManager;
-import net.miginfocom.swing.MigLayout;
-import sample.Listener;
-import settings.SettingsManager;
-import alias.action.AliasActionEditor;
-import alias.id.AliasIdentifierEditor;
-
-import com.jidesoft.swing.JideTabbedPane;
-
-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();
-	}
-}
--- a/src/alias/AliasEvent.java
+++ b/src/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 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;
-	}
-}
--- a/src/alias/AliasFactory.java
+++ b/src/alias/AliasFactory.java
@@ -1,304 +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 alias;
-
-import alias.action.AliasAction;
-import alias.action.AliasActionType;
-import alias.action.beep.BeepAction;
-import alias.action.beep.BeepActionEditor;
-import alias.action.clip.ClipAction;
-import alias.action.clip.ClipActionEditor;
-import alias.action.script.ScriptAction;
-import alias.action.script.ScriptActionEditor;
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-import alias.id.broadcast.BroadcastChannel;
-import alias.id.broadcast.BroadcastChannelEditor;
-import alias.id.esn.ESNEditor;
-import alias.id.esn.Esn;
-import alias.id.fleetsync.FleetsyncID;
-import alias.id.fleetsync.FleetsyncIDEditor;
-import alias.id.lojack.LoJackFunctionAndID;
-import alias.id.lojack.LoJackIDEditor;
-import alias.id.mdc.MDC1200ID;
-import alias.id.mdc.MDC1200IDEditor;
-import alias.id.mobileID.MINEditor;
-import alias.id.mobileID.Min;
-import alias.id.mpt1327.MPT1327ID;
-import alias.id.mpt1327.MPT1327IDEditor;
-import alias.id.nonrecordable.NonRecordable;
-import alias.id.nonrecordable.NonRecordableEditor;
-import alias.id.priority.Priority;
-import alias.id.priority.PriorityEditor;
-import alias.id.siteID.SiteID;
-import alias.id.siteID.SiteIDEditor;
-import alias.id.status.StatusID;
-import alias.id.status.StatusIDEditor;
-import alias.id.talkgroup.TalkgroupID;
-import alias.id.talkgroup.TalkgroupIDEditor;
-import alias.id.uniqueID.UniqueID;
-import alias.id.uniqueID.UniqueIDEditor;
-import audio.broadcast.BroadcastModel;
-import gui.editor.Editor;
-import gui.editor.EmptyEditor;
-
-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:
-		}
-
-		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 );
-			}
-		}
-
-		for( AliasAction action: original.getAction() )
-		{
-			AliasAction copyAction = copyOf( action );
-			
-			if( copyAction != null )
-			{
-				copy.addAliasAction( copyAction );
-			}
-		}
-		
-		return copy;
-	}
-
-	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 );
-		}
-	}
-	
-}
--- a/src/alias/AliasList.java
+++ b/src/alias/AliasList.java
@@ -1,677 +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 alias;
-
-import alias.id.AliasID;
-import alias.id.WildcardID;
-import alias.id.esn.Esn;
-import alias.id.fleetsync.FleetsyncID;
-import alias.id.lojack.LoJackFunctionAndID;
-import alias.id.mdc.MDC1200ID;
-import alias.id.mobileID.Min;
-import alias.id.mpt1327.MPT1327ID;
-import alias.id.siteID.SiteID;
-import alias.id.status.StatusID;
-import alias.id.talkgroup.TalkgroupID;
-import alias.id.uniqueID.UniqueID;
-import module.decode.lj1200.LJ1200Message.Function;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sample.Listener;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AliasList implements Listener<AliasEvent>
-{
-    private final static Logger mLog = LoggerFactory.getLogger(AliasList.class);
-    public static final String WILDCARD = "*";
-    public static final String REGEX_WILDCARD = ".";
-
-    private Map<String,Alias> mESN = new HashMap<>();
-    private Map<String,Alias> mFleetsync = new HashMap<>();
-    private Map<LoJackFunctionAndID,Alias> mLoJack = new HashMap<>();
-    private Map<String,Alias> mMDC1200 = new HashMap<>();
-    private Map<String,Alias> mMobileID = new HashMap<>();
-    private Map<String,Alias> mMPT1327 = new HashMap<>();
-    private Map<String,Alias> mSiteID = new HashMap<>();
-    private Map<Integer,Alias> mStatus = new HashMap<>();
-    private Map<String,Alias> mTalkgroup = new HashMap<>();
-    private Map<Integer,Alias> mUniqueID = new HashMap<>();
-
-    private List<WildcardID> mESNWildcards = new ArrayList<>();
-    private List<WildcardID> mMobileIDWildcards = new ArrayList<>();
-    private List<WildcardID> mFleetsyncWildcards = new ArrayList<>();
-    private List<WildcardID> mMDC1200Wildcards = new ArrayList<>();
-    private List<WildcardID> mMPT1327Wildcards = new ArrayList<>();
-    private List<WildcardID> mSiteWildcards = new ArrayList<>();
-    private List<WildcardID> mTalkgroupWildcards = new ArrayList<>();
-
-    private String mName;
-
-    /**
-     * List of aliases where all aliases share the same list name.  Contains
-     * several methods for alias lookup from identifier values, like talkgroups.
-     *
-     * Responds to alias change events to keep the internal alias list updated.
-     */
-    public AliasList(String name)
-    {
-        mName = name;
-    }
-
-    /**
-     * Adds the alias to this list
-     */
-    public void addAlias(Alias alias)
-    {
-        if(alias != null)
-        {
-            for(AliasID aliasID : alias.getId())
-            {
-                addAliasID(aliasID, alias);
-            }
-        }
-    }
-
-    /**
-     * Adds the alias and alias identifier to the internal type mapping.
-     */
-    private void addAliasID(AliasID id, Alias alias)
-    {
-        if(id.isValid())
-        {
-            try
-            {
-                switch(id.getType())
-                {
-                    case ESN:
-                        String esn = ((Esn) id).getEsn();
-
-                        if(esn != null)
-                        {
-                            if(esn.contains(WILDCARD))
-                            {
-                                mESNWildcards.add(new WildcardID(esn));
-                                Collections.sort(mESNWildcards);
-                            }
-
-                            mESN.put(esn, alias);
-                        }
-                        break;
-                    case FLEETSYNC:
-                        String fleetsync = ((FleetsyncID) id).getIdent();
-
-                        if(fleetsync != null)
-                        {
-                            if(fleetsync.contains(WILDCARD))
-                            {
-                                mFleetsyncWildcards.add(new WildcardID(fleetsync));
-                                Collections.sort(mFleetsyncWildcards);
-                            }
-
-                            mFleetsync.put(fleetsync, alias);
-                        }
-                        break;
-                    case LOJACK:
-                        mLoJack.put((LoJackFunctionAndID) id, alias);
-                        break;
-                    case MDC1200:
-                        String mdc = ((MDC1200ID) id).getIdent();
-
-                        if(mdc != null)
-                        {
-                            if(mdc.contains(WILDCARD))
-                            {
-                                mMDC1200Wildcards.add(new WildcardID(mdc));
-                                Collections.sort(mMDC1200Wildcards);
-                            }
-
-                            mMDC1200.put(mdc, alias);
-                        }
-                        break;
-                    case MPT1327:
-                        String mpt = ((MPT1327ID) id).getIdent();
-
-                        if(mpt != null)
-                        {
-                            if(mpt.contains(WILDCARD))
-                            {
-                                mMPT1327Wildcards.add(new WildcardID(mpt));
-                                Collections.sort(mMPT1327Wildcards);
-                            }
-
-                            mMPT1327.put(mpt, alias);
-                        }
-                        break;
-                    case MIN:
-                        String min = ((Min) id).getMin();
-
-                        if(min != null)
-                        {
-                            if(min.contains(WILDCARD))
-                            {
-                                mMobileIDWildcards.add(new WildcardID(min));
-                                Collections.sort(mMobileIDWildcards);
-                            }
-
-                            mMobileID.put(min, alias);
-                        }
-                        break;
-                    case LTR_NET_UID:
-                        mUniqueID.put(((UniqueID) id).getUid(), alias);
-                        break;
-                    case SITE:
-                        String siteID = ((SiteID) id).getSite();
-
-                        if(siteID != null)
-                        {
-                            if(siteID.contains(WILDCARD))
-                            {
-                                mSiteWildcards.add(new WildcardID(siteID));
-                                Collections.sort(mSiteWildcards);
-                            }
-
-                            mSiteID.put(siteID, alias);
-                        }
-                        break;
-                    case STATUS:
-                        mStatus.put(((StatusID) id).getStatus(), alias);
-                        break;
-                    case TALKGROUP:
-                        String tgid = ((TalkgroupID) id).getTalkgroup();
-
-                        if(tgid != null)
-                        {
-                            if(tgid.contains(WILDCARD))
-                            {
-                                mTalkgroupWildcards.add(new WildcardID(tgid));
-                                Collections.sort(mTalkgroupWildcards);
-                            }
-
-                            mTalkgroup.put(tgid, alias);
-                        }
-                        break;
-                    case BROADCAST_CHANNEL:
-                    case NON_RECORDABLE:
-                    case PRIORITY:
-                        //We don't maintain lookups for these items
-                        break;
-                    default:
-                        mLog.warn("Unrecognized Alias ID Type:" + id.getType().name() + " - can't ADD to lookup table");
-                        break;
-                }
-            }
-            catch(Exception e)
-            {
-                mLog.error("Couldn't add alias ID " + id + " for alias " + alias);
-            }
-        }
-    }
-
-    /**
-     * Removes the alias from this list
-     */
-    public void removeAlias(Alias alias)
-    {
-        if(alias != null)
-        {
-            for(AliasID aliasID : alias.getId())
-            {
-                removeAliasID(aliasID, alias);
-            }
-        }
-    }
-
-    private void removeWildcard(String value, List<WildcardID> wildcards)
-    {
-        if(value != null)
-        {
-            for(WildcardID wildcardID : wildcards)
-            {
-                if(wildcardID.value().equals(value))
-                {
-                    wildcards.remove(wildcardID);
-                }
-            }
-        }
-    }
-
-    /**
-     * Removes the alias and alias identifier from internal mappings.
-     */
-    private void removeAliasID(AliasID id, Alias alias)
-    {
-        if(id.isValid())
-        {
-            switch(id.getType())
-            {
-                case ESN:
-                    String esn = ((Esn) id).getEsn();
-
-                    if(esn != null)
-                    {
-                        if(esn.contains(WILDCARD))
-                        {
-                            removeWildcard(esn, mESNWildcards);
-                        }
-                    }
-
-                    mESN.remove(esn);
-                    break;
-                case FLEETSYNC:
-                    String fleetsync = ((FleetsyncID) id).getIdent();
-
-                    if(fleetsync != null)
-                    {
-                        if(fleetsync.contains(WILDCARD))
-                        {
-                            removeWildcard(fleetsync, mFleetsyncWildcards);
-                        }
-
-                        mFleetsync.remove(fleetsync);
-                    }
-                    break;
-                case LOJACK:
-                    mLoJack.remove((LoJackFunctionAndID) id);
-                    break;
-                case MDC1200:
-                    String mdc = ((MDC1200ID) id).getIdent();
-
-                    if(mdc != null)
-                    {
-                        if(mdc.contains(WILDCARD))
-                        {
-                            removeWildcard(mdc, mMDC1200Wildcards);
-                        }
-
-                        mMDC1200.remove(mdc);
-                    }
-                    break;
-                case MPT1327:
-                    String mpt = ((MPT1327ID) id).getIdent();
-
-                    if(mpt != null)
-                    {
-                        if(mpt.contains(WILDCARD))
-                        {
-                            removeWildcard(mpt, mMPT1327Wildcards);
-                        }
-
-                        mMPT1327.remove(mpt);
-                    }
-                    break;
-                case MIN:
-                    String min = ((Min) id).getMin();
-
-                    if(min != null)
-                    {
-                        if(min.contains(WILDCARD))
-                        {
-                            removeWildcard(min, mMobileIDWildcards);
-                        }
-
-                        mMobileID.remove(min);
-                    }
-                    break;
-                case LTR_NET_UID:
-                    mUniqueID.remove(((UniqueID) id).getUid());
-                    break;
-                case SITE:
-                    mSiteID.remove(((SiteID) id).getSite());
-                    break;
-                case STATUS:
-                    mStatus.remove(((StatusID) id).getStatus());
-                    break;
-                case TALKGROUP:
-                    String tgid = ((TalkgroupID) id).getTalkgroup();
-
-                    if(tgid != null)
-                    {
-                        if(tgid.contains(WILDCARD))
-                        {
-                            removeWildcard(tgid, mTalkgroupWildcards);
-                        }
-
-                        mTalkgroup.remove(tgid);
-                    }
-                    break;
-                case NON_RECORDABLE:
-                case PRIORITY:
-                case BROADCAST_CHANNEL:
-                    //We don't maintain lookups for these items
-                    break;
-                default:
-                    mLog.warn("Unrecognized Alias ID Type:" + id.getType().name() + " - can't REMOVE from lookup table");
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Returns the first matching regex wildcard from the list of wildcards that matches the
-     * identifier.
-     *
-     * @param id to match
-     * @param wildcards to match against
-     * @return matching wildcard ID or null
-     */
-    private String getWildcardMatch(String id, List<WildcardID> wildcards)
-    {
-        if(id != null)
-        {
-            for(WildcardID wildcard : wildcards)
-            {
-                if(wildcard.matches(id))
-                {
-                    return wildcard.value();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Lookup alias by site ID
-     */
-    public Alias getSiteID(String siteID)
-    {
-        Alias alias = null;
-
-        if(siteID != null)
-        {
-            alias = mSiteID.get(siteID);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(siteID, mSiteWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mSiteID.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by status ID
-     */
-    public Alias getStatus(int status)
-    {
-        return mStatus.get(status);
-    }
-
-    /**
-     * Lookup alias by Unique ID (UID)
-     */
-    public Alias getUniqueID(int uniqueID)
-    {
-        return mUniqueID.get(uniqueID);
-    }
-
-    /**
-     * Lookup alias by ESN
-     */
-    public Alias getESNAlias(String esn)
-    {
-        Alias alias = null;
-
-        if(esn != null)
-        {
-            alias = mESN.get(esn);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(esn, mESNWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mESN.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by fleetsync ID
-     */
-    public Alias getFleetsyncAlias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mFleetsync.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mFleetsyncWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mFleetsync.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by lojack function and ID
-     */
-    public Alias getLoJackAlias(Function function, String id)
-    {
-        if(id != null)
-        {
-            for(LoJackFunctionAndID lojack : mLoJack.keySet())
-            {
-                if(lojack.matches(function, id))
-                {
-                    return mLoJack.get(lojack);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Lookup alias by MDC1200 ID
-     */
-    public Alias getMDC1200Alias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mMDC1200.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mMDC1200Wildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mMDC1200.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by MPT1327 Ident
-     */
-    public Alias getMPT1327Alias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mMPT1327.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mMPT1327Wildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mMPT1327.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by Mobile ID Number (MIN)
-     */
-    public Alias getMobileIDNumberAlias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mMobileID.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mMobileIDWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mMobileID.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by talkgroup
-     *
-     * @param tgid to use when searching for an alias
-     * @param includeWildcards true if you want to additionally search for a matching alias that contains wildcard(s)
-     * when there is not a direct match to the TGID.
-     */
-    public Alias getTalkgroupAlias(String tgid, boolean includeWildcards)
-    {
-        Alias alias = null;
-
-        if(tgid != null)
-        {
-            alias = mTalkgroup.get(tgid);
-
-            if(alias == null && includeWildcards)
-            {
-                String wildcard = getWildcardMatch(tgid, mTalkgroupWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mTalkgroup.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by talkgroup.  Defaults to matching to wildcard talkgroups.
-     */
-    public Alias getTalkgroupAlias(String tgid)
-    {
-        return getTalkgroupAlias(tgid, true);
-    }
-
-    /**
-     * Alias list name
-     */
-    public String toString()
-    {
-        return mName;
-    }
-
-    /**
-     * Alias list name
-     */
-    @XmlAttribute
-    public String getName()
-    {
-        return mName;
-    }
-
-    /**
-     * Indicates if this alias list has a non-null, non-empty name
-     */
-    private boolean hasName()
-    {
-        return mName != null && !mName.isEmpty();
-    }
-
-    /**
-     * Receive alias change event notifications and modify this list accordingly
-     */
-    @Override
-    public void receive(AliasEvent event)
-    {
-        if(hasName())
-        {
-            Alias alias = event.getAlias();
-
-            switch(event.getEvent())
-            {
-                case ADD:
-                    if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
-                    {
-                        addAlias(alias);
-                    }
-                    break;
-                case CHANGE:
-                    if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
-                    {
-                        addAlias(alias);
-                    }
-                    break;
-                case DELETE:
-                    if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
-                    {
-                        removeAlias(alias);
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-}
--- a/src/alias/AliasModel.java
+++ b/src/alias/AliasModel.java
@@ -1,350 +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 alias;
-
-import alias.AliasEvent.Event;
-import alias.id.broadcast.BroadcastChannel;
-import sample.Broadcaster;
-import sample.Listener;
-
-import javax.swing.table.AbstractTableModel;
-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;
-
-/**
- * Alias Model
- */
-public class AliasModel extends AbstractTableModel
-{
-    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 Map<String,AliasList> mAliasListMap = new HashMap<>();
-
-    public AliasModel()
-    {
-    }
-
-    /**
-     * Unmodifiable list of all aliases currently in the model
-     */
-    public List<Alias> getAliases()
-    {
-        return Collections.unmodifiableList(mAliases);
-    }
-
-    public Alias getAliasAtIndex(int row)
-    {
-        if(mAliases.size() >= row)
-        {
-            return mAliases.get(row);
-        }
-
-        return null;
-    }
-
-    public AliasList getAliasList(String name)
-    {
-        if(name != null && mAliasListMap.containsKey(name))
-        {
-            return mAliasListMap.get(name);
-        }
-
-        AliasList aliasList = new AliasList(name);
-
-        if(name != null)
-        {
-            for(Alias alias : mAliases)
-            {
-                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
-                {
-                    aliasList.addAlias(alias);
-                }
-            }
-
-            mAliasListMap.put(name, aliasList);
-
-            //Register the new alias list to receive updates from this model
-            addListener(aliasList);
-        }
-
-        return aliasList;
-    }
-
-    /**
-     * Returns a list of unique alias list names from across the alias set
-     */
-    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;
-    }
-
-    /**
-     * Returns a list of alias group names for all aliases
-     */
-    public List<String> getGroupNames()
-    {
-        List<String> groupNames = new ArrayList<>();
-
-        for(Alias alias : mAliases)
-        {
-            if(alias.hasGroup() && !groupNames.contains(alias.getGroup()))
-            {
-                groupNames.add(alias.getGroup());
-            }
-        }
-
-        Collections.sort(groupNames);
-
-        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);
-        }
-    }
-
-    /**
-     * Adds the alias to the model
-     */
-    public int addAlias(Alias alias)
-    {
-        if(alias != null)
-        {
-            mAliases.add(alias);
-
-            int index = mAliases.size() - 1;
-
-            fireTableRowsInserted(index, index);
-
-            broadcast(new AliasEvent(alias, Event.ADD));
-
-            return index;
-        }
-
-        return -1;
-    }
-
-    /**
-     * Removes the channel from the model and broadcasts a channel remove event
-     */
-    public void removeAlias(Alias alias)
-    {
-        if(alias != null)
-        {
-            int index = mAliases.indexOf(alias);
-
-            mAliases.remove(alias);
-
-            fireTableRowsDeleted(index, index);
-
-            broadcast(new AliasEvent(alias, Event.DELETE));
-        }
-    }
-
-    /**
-     * Renames any broadcast channels that have the previous name.
-     *
-     * @param previousName to rename
-     * @param newName to assign to the broadcast channel
-     */
-    public void renameBroadcastChannel(String previousName, String newName)
-    {
-        if(previousName == null || previousName.isEmpty() || newName == null || newName.isEmpty())
-        {
-            return;
-        }
-
-        for(Alias alias : mAliases)
-        {
-            if(alias.hasBroadcastChannel(previousName))
-            {
-                for(BroadcastChannel broadcastChannel : alias.getBroadcastChannels())
-                {
-                    if(broadcastChannel.getChannelName().contentEquals(previousName))
-                    {
-                        broadcastChannel.setChannelName(newName);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public int getRowCount()
-    {
-        return mAliases.size();
-    }
-
-    @Override
-    public int getColumnCount()
-    {
-        return 5;
-    }
-
-    @Override
-    public String getColumnName(int columnIndex)
-    {
-        switch(columnIndex)
-        {
-            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";
-        }
-
-        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() == 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);
-    }
-}
--- a/Show More
+++ b/Show More